ab80: resync to m100

1127 files changed, 36254 insertions, 32710 deletions

diff --git a/chart2/prj/build.lst b/chart2/prj/build.lst
index 5526e2964..ec6658d21 100644
--- a/chart2/prj/build.lst
+++ b/chart2/prj/build.lst
@@ -1,4 +1,4 @@
-ch	chart2	:    l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
+ch	chart2	:    offapi offuh l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
 ch	chart2										usr1	-	all	ch_mkout NULL
 ch	chart2\inc									nmake	-	all	ch_inc NULL
 ch	chart2\source\inc							get		-	all	ch_source_inc NULL
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index 63ec07705..0a6a2d3da 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -52,7 +52,7 @@ AccessibleViewForwarder::~AccessibleViewForwarder()
 
 // ________ IAccessibleViewforwarder ________
 
-BOOL AccessibleViewForwarder::IsValid() const
+sal_Bool AccessibleViewForwarder::IsValid() const
 {
     return sal_True;
 }
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
index 629201a9c..af8b70f6f 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
@@ -44,7 +44,7 @@ public:
     virtual ~AccessibleViewForwarder();
     
     // ________ IAccessibleViewforwarder ________
-    virtual BOOL IsValid() const;
+    virtual sal_Bool IsValid() const;
     virtual Rectangle GetVisibleArea() const;
     virtual Point LogicToPixel( const Point& rPoint ) const;
     virtual Size LogicToPixel( const Size& rSize ) const;
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index dbf05261e..baf1d58e2 100755
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -29,10 +29,15 @@
 #include "precompiled_chart2.hxx"
 #include "AxisWrapper.hxx"
 #include "AxisHelper.hxx"
+#include "TitleHelper.hxx"
 #include "Chart2ModelContact.hxx"
 #include "ContainerHelper.hxx"
 #include "macros.hxx"
 #include "WrappedDirectStateProperty.hxx"
+#include "GridWrapper.hxx"
+#include "TitleWrapper.hxx"
+#include "DisposeHelper.hxx"
+
 #include <comphelper/InlineContainer.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp>
@@ -82,6 +87,9 @@ enum
     PROP_AXIS_AUTO_MIN,
     PROP_AXIS_AUTO_STEPMAIN,
     PROP_AXIS_AUTO_STEPHELP,
+    PROP_AXIS_TYPE,
+    PROP_AXIS_TIME_INCREMENT,
+    PROP_AXIS_EXPLICIT_TIME_INCREMENT,
     PROP_AXIS_LOGARITHMIC,
     PROP_AXIS_REVERSEDIRECTION,
     PROP_AXIS_VISIBLE,
@@ -174,6 +182,27 @@ void lcl_AddPropertiesToVector(
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
+        Property( C2U( "AxisType" ),
+                  PROP_AXIS_TYPE,
+                  ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), //type com::sun::star::chart::ChartAxisType
+                  //#i111967# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::MAYBEDEFAULT ));
+
+    rOutProperties.push_back(
+        Property( C2U( "TimeIncrement" ),
+                  PROP_AXIS_TIME_INCREMENT,
+                  ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::TimeIncrement * >(0)),
+                  //#i111967# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::MAYBEVOID ));
+
+    rOutProperties.push_back(
+        Property( C2U( "ExplicitTimeIncrement" ),
+                  PROP_AXIS_EXPLICIT_TIME_INCREMENT,
+                  ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::TimeIncrement * >(0)),
+                  beans::PropertyAttribute::READONLY |
+                  beans::PropertyAttribute::MAYBEVOID ));
+
+    rOutProperties.push_back(
         Property( C2U( "Logarithmic" ),
                   PROP_AXIS_LOGARITHMIC,
                   ::getBooleanCppuType(),
@@ -374,6 +403,83 @@ AxisWrapper::~AxisWrapper()
 {
 }
 
+// ____ chart::XAxis ____
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException)
+{
+    if( !m_xAxisTitle.is() )
+    {
+        TitleHelper::eTitleType eTitleType( TitleHelper::X_AXIS_TITLE    );
+        switch( m_eType )
+        {
+            case X_AXIS:
+                eTitleType = TitleHelper::X_AXIS_TITLE;
+                break;
+            case Y_AXIS:
+                eTitleType = TitleHelper::Y_AXIS_TITLE;
+                break;
+            case Z_AXIS:
+                eTitleType = TitleHelper::Z_AXIS_TITLE;
+                break;
+            case SECOND_X_AXIS:
+                eTitleType = TitleHelper::SECONDARY_X_AXIS_TITLE;
+                break;
+            case SECOND_Y_AXIS:
+                eTitleType = TitleHelper::SECONDARY_Y_AXIS_TITLE;
+                break;
+            default:
+                return 0;
+        }
+        m_xAxisTitle = new TitleWrapper( eTitleType, m_spChart2ModelContact );
+    }
+    return m_xAxisTitle;
+}
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException)
+{
+    if( !m_xMajorGrid.is() )
+    {
+        GridWrapper::tGridType eGridType( GridWrapper::X_MAJOR_GRID );
+        switch( m_eType )
+        {
+            case X_AXIS:
+                eGridType = GridWrapper::X_MAJOR_GRID;
+                break;
+            case Y_AXIS:
+                eGridType = GridWrapper::Y_MAJOR_GRID;
+                break;
+            case Z_AXIS:
+                eGridType = GridWrapper::Z_MAJOR_GRID;
+                break;
+            default:
+                return 0;
+        }
+        m_xMajorGrid = new GridWrapper( eGridType, m_spChart2ModelContact );
+    }
+    return m_xMajorGrid;
+}
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException)
+{
+    if( !m_xMinorGrid.is() )
+    {
+        GridWrapper::tGridType eGridType( GridWrapper::X_MAJOR_GRID );
+        switch( m_eType )
+        {
+            case X_AXIS:
+                eGridType = GridWrapper::X_MINOR_GRID;
+                break;
+            case Y_AXIS:
+                eGridType = GridWrapper::Y_MINOR_GRID;
+                break;
+            case Z_AXIS:
+                eGridType = GridWrapper::Z_MINOR_GRID;
+                break;
+            default:
+                return 0;
+        }
+        m_xMinorGrid = new GridWrapper( eGridType, m_spChart2ModelContact );
+    }
+    return m_xMinorGrid;
+}
+
 // ____ XShape ____
 awt::Point SAL_CALL AxisWrapper::getPosition()
     throw (uno::RuntimeException)
@@ -454,6 +560,10 @@ void SAL_CALL AxisWrapper::dispose()
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
 
+    DisposeHelper::DisposeAndClear( m_xAxisTitle );
+    DisposeHelper::DisposeAndClear( m_xMajorGrid );
+    DisposeHelper::DisposeAndClear( m_xMinorGrid );
+        
     clearWrappedPropertySet();
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index c8da648d9..64f8160c2 100644..100755
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -30,9 +30,10 @@
 #include "WrappedPropertySet.hxx"
 #include "ReferenceSizePropertyProvider.hxx"
 #include "ServiceMacros.hxx"
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase5.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
+#include <com/sun/star/chart/XAxis.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -45,14 +46,13 @@
 
 namespace chart
 {
-
 namespace wrapper
 {
-
 class Chart2ModelContact;
 
-class AxisWrapper : public ::cppu::ImplInheritanceHelper4<
+class AxisWrapper : public ::cppu::ImplInheritanceHelper5<
                       WrappedPropertySet
+                    , com::sun::star::chart::XAxis
                     , com::sun::star::drawing::XShape
                     , com::sun::star::lang::XComponent
                     , com::sun::star::lang::XServiceInfo
@@ -93,6 +93,11 @@ public:
                                                ::com::sun::star::lang::XEventListener >& aListener )
         throw (::com::sun::star::uno::RuntimeException);
 
+    // ____ chart::XAxis ____
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid(  ) throw (::com::sun::star::uno::RuntimeException);
+
     // ____ XShape ____
     virtual ::com::sun::star::awt::Point SAL_CALL getPosition()
         throw (::com::sun::star::uno::RuntimeException);
@@ -131,6 +136,10 @@ private: //member
     
     tAxisType           m_eType;
     ::com::sun::star::uno::Any m_aTemporaryHelpStepValue;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xAxisTitle;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xMajorGrid;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xMinorGrid;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index 6f2420f0e..a80b8b07a 100644..100755
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -27,8 +27,7 @@
 #ifndef CHART_CHART2MODELCONTACT_HXX
 #define CHART_CHART2MODELCONTACT_HXX
 
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
-#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
+#include <chartview/ExplicitScaleValues.hxx>
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XDataSeries.hpp>
@@ -79,8 +78,8 @@ public:
     sal_Bool getExplicitValuesForAxis(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XAxis > & xAxis,
-        ::com::sun::star::chart2::ExplicitScaleData &  rOutExplicitScale,
-        ::com::sun::star::chart2::ExplicitIncrementData & rOutExplicitIncrement );
+        ExplicitScaleData &  rOutExplicitScale,
+        ExplicitIncrementData & rOutExplicitIncrement );
 
     sal_Int32 getExplicitNumberFormatKeyForAxis(
             const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index f27e05012..6c4b01b7f 100755
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -64,9 +64,11 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::rtl::OUString;
 using ::osl::MutexGuard;
+using ::com::sun::star::chart2::XAnyDescriptionAccess;
 using ::com::sun::star::chart::XComplexDescriptionAccess;
 using ::com::sun::star::chart::XChartData;
 using ::com::sun::star::chart::XChartDataArray;
+using ::com::sun::star::chart::XDateCategories;
 
 namespace
 {
@@ -132,7 +134,7 @@ struct lcl_Operator
     virtual ~lcl_Operator()
     {
     }
-    virtual void apply( const Reference< XComplexDescriptionAccess >& xDataAccess ) = 0;
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) = 0;
 
     virtual bool setsCategories( bool /*bDataInColumns*/ )
     {
@@ -155,13 +157,20 @@ struct lcl_AllOperator : public lcl_Operator
         return true;
     }
 
-    virtual void apply( const Reference< XComplexDescriptionAccess >& xDataAccess )
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
     {
         if( !xDataAccess.is() )
             return;
 
+        Reference< XAnyDescriptionAccess > xNewAny( m_xDataToApply, uno::UNO_QUERY );
         Reference< XComplexDescriptionAccess > xNewComplex( m_xDataToApply, uno::UNO_QUERY );
-        if( xNewComplex.is() )
+        if( xNewAny.is() )
+        {
+            xDataAccess->setData( xNewAny->getData() );
+            xDataAccess->setComplexRowDescriptions( xNewAny->getComplexRowDescriptions() );
+            xDataAccess->setComplexColumnDescriptions( xNewAny->getComplexColumnDescriptions() );
+        }
+        else if( xNewComplex.is() )
         {
             xDataAccess->setData( xNewComplex->getData() );
             xDataAccess->setComplexRowDescriptions( xNewComplex->getComplexRowDescriptions() );
@@ -192,7 +201,7 @@ struct lcl_DataOperator : public lcl_Operator
     {
     }
 
-    virtual void apply( const Reference< XComplexDescriptionAccess >& xDataAccess )
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
     {
         if( xDataAccess.is() )
             xDataAccess->setData( lcl_getNANInsteadDBL_MIN( m_rData ) );
@@ -205,96 +214,208 @@ struct lcl_DataOperator : public lcl_Operator
 
 struct lcl_RowDescriptionsOperator : public lcl_Operator
 {
-    lcl_RowDescriptionsOperator( const Sequence< OUString >& rRowDescriptions )
+    lcl_RowDescriptionsOperator( const Sequence< OUString >& rRowDescriptions
+        , const Reference< chart2::XChartDocument >& xChartDoc )
         : lcl_Operator()
         , m_rRowDescriptions( rRowDescriptions )
+        , m_xChartDoc(xChartDoc)
+        , m_bDataInColumns(true)
     {
     }
 
     virtual bool setsCategories( bool bDataInColumns )
     {
+        m_bDataInColumns = bDataInColumns;
         return bDataInColumns;
     }
 
-    virtual void apply( const Reference< XComplexDescriptionAccess >& xDataAccess )
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
     {
         if( xDataAccess.is() )
+        {
             xDataAccess->setRowDescriptions( m_rRowDescriptions );
+            if( m_bDataInColumns )
+                DiagramHelper::switchToTextCategories( m_xChartDoc );
+        }
     }
 
     const Sequence< OUString >& m_rRowDescriptions;
+    Reference< chart2::XChartDocument > m_xChartDoc;
+    bool m_bDataInColumns;
 };
 
 //--------------------------------------------------------------------------
 
 struct lcl_ComplexRowDescriptionsOperator : public lcl_Operator
 {
-    lcl_ComplexRowDescriptionsOperator( const Sequence< Sequence< OUString > >& rComplexRowDescriptions )
+    lcl_ComplexRowDescriptionsOperator( const Sequence< Sequence< OUString > >& rComplexRowDescriptions
+        , const Reference< chart2::XChartDocument >& xChartDoc )
         : lcl_Operator()
         , m_rComplexRowDescriptions( rComplexRowDescriptions )
+        , m_xChartDoc(xChartDoc)
+        , m_bDataInColumns(true)
     {
     }
 
     virtual bool setsCategories( bool bDataInColumns )
     {
+        m_bDataInColumns = bDataInColumns;
         return bDataInColumns;
     }
 
-    virtual void apply( const Reference< XComplexDescriptionAccess >& xDataAccess )
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
     {
         if( xDataAccess.is() )
+        {
             xDataAccess->setComplexRowDescriptions( m_rComplexRowDescriptions );
+            if( m_bDataInColumns )
+                DiagramHelper::switchToTextCategories( m_xChartDoc );
+        }
     }
 
     const Sequence< Sequence< OUString > >& m_rComplexRowDescriptions;
+    Reference< chart2::XChartDocument > m_xChartDoc;
+    bool m_bDataInColumns;
+};
+//--------------------------------------------------------------------------
+
+struct lcl_AnyRowDescriptionsOperator : public lcl_Operator
+{
+    lcl_AnyRowDescriptionsOperator( const Sequence< Sequence< uno::Any > >& rAnyRowDescriptions )
+        : lcl_Operator()
+        , m_rAnyRowDescriptions( rAnyRowDescriptions )
+    {
+    }
+
+    virtual bool setsCategories( bool bDataInColumns )
+    {
+        return bDataInColumns;
+    }
+
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
+    {
+        if( xDataAccess.is() )
+            xDataAccess->setAnyRowDescriptions( m_rAnyRowDescriptions );
+    }
+
+    const Sequence< Sequence< uno::Any > >& m_rAnyRowDescriptions;
 };
 
 //--------------------------------------------------------------------------
 
 struct lcl_ColumnDescriptionsOperator : public lcl_Operator
 {
-    lcl_ColumnDescriptionsOperator( const Sequence< OUString >& rColumnDescriptions )
+    lcl_ColumnDescriptionsOperator( const Sequence< OUString >& rColumnDescriptions
+        , const Reference< chart2::XChartDocument >& xChartDoc )
         : lcl_Operator()
         , m_rColumnDescriptions( rColumnDescriptions )
+        , m_xChartDoc(xChartDoc)
+        , m_bDataInColumns(true)
     {
     }
 
     virtual bool setsCategories( bool bDataInColumns )
     {
+        m_bDataInColumns = bDataInColumns;
         return !bDataInColumns;
     }
 
-    virtual void apply( const Reference< XComplexDescriptionAccess >& xDataAccess )
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
     {
         if( xDataAccess.is() )
+        {
             xDataAccess->setColumnDescriptions( m_rColumnDescriptions );
+            if( !m_bDataInColumns )
+                DiagramHelper::switchToTextCategories( m_xChartDoc );
+        }
     }
 
     const Sequence< OUString >& m_rColumnDescriptions;
+    Reference< chart2::XChartDocument > m_xChartDoc;
+    bool m_bDataInColumns;
 };
 
 //--------------------------------------------------------------------------
 
 struct lcl_ComplexColumnDescriptionsOperator : public lcl_Operator
 {
-    lcl_ComplexColumnDescriptionsOperator( const Sequence< Sequence< OUString > >& rComplexColumnDescriptions )
+    lcl_ComplexColumnDescriptionsOperator( const Sequence< Sequence< OUString > >& rComplexColumnDescriptions
+        , const Reference< chart2::XChartDocument >& xChartDoc )
         : lcl_Operator()
         , m_rComplexColumnDescriptions( rComplexColumnDescriptions )
+        , m_xChartDoc(xChartDoc)
+        , m_bDataInColumns(true)
     {
     }
 
     virtual bool setsCategories( bool bDataInColumns )
     {
+        m_bDataInColumns = bDataInColumns;
         return !bDataInColumns;
     }
 
-    virtual void apply( const Reference< XComplexDescriptionAccess >& xDataAccess )
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
     {
         if( xDataAccess.is() )
+        {
             xDataAccess->setComplexColumnDescriptions( m_rComplexColumnDescriptions );
+            if( !m_bDataInColumns )
+                DiagramHelper::switchToTextCategories( m_xChartDoc );
+        }
     }
 
     const Sequence< Sequence< OUString > >& m_rComplexColumnDescriptions;
+    Reference< chart2::XChartDocument > m_xChartDoc;
+    bool m_bDataInColumns;
+};
+
+//--------------------------------------------------------------------------
+
+struct lcl_AnyColumnDescriptionsOperator : public lcl_Operator
+{
+    lcl_AnyColumnDescriptionsOperator( const Sequence< Sequence< uno::Any > >& rAnyColumnDescriptions )
+        : lcl_Operator()
+        , m_rAnyColumnDescriptions( rAnyColumnDescriptions )
+    {
+    }
+
+    virtual bool setsCategories( bool bDataInColumns )
+    {
+        return bDataInColumns;
+    }
+
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
+    {
+        if( xDataAccess.is() )
+            xDataAccess->setAnyColumnDescriptions( m_rAnyColumnDescriptions );
+    }
+
+    const Sequence< Sequence< uno::Any > >& m_rAnyColumnDescriptions;
+};
+
+//--------------------------------------------------------------------------
+
+struct lcl_DateCategoriesOperator : public lcl_Operator
+{
+    lcl_DateCategoriesOperator( const Sequence< double >& rDates )
+        : lcl_Operator()
+        , m_rDates( rDates )
+    {
+    }
+
+    virtual bool setsCategories( bool /*bDataInColumns*/ )
+    {
+        return true;
+    }
+
+    virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess )
+    {
+        Reference< XDateCategories > xDateCategories( xDataAccess, uno::UNO_QUERY );
+        if( xDateCategories.is() )
+            xDateCategories->setDateCategories( m_rDates );
+    }
+
+    const Sequence< double >& m_rDates;
 };
 
 //--------------------------------------------------------------------------
@@ -353,6 +474,7 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions()
         return m_xDataAccess->getColumnDescriptions();
     return Sequence< OUString > ();
 }
+
 // ____ XComplexDescriptionAccess (read) ____
 Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException)
 {
@@ -369,6 +491,32 @@ Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDesc
     return Sequence< Sequence< OUString > >();
 }
 
+// ____ XAnyDescriptionAccess (read) ____
+Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException)
+{
+    initDataAccess();
+    if( m_xDataAccess.is() )
+        return m_xDataAccess->getAnyRowDescriptions();
+    return Sequence< Sequence< uno::Any > >();
+}
+Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() throw (uno::RuntimeException)
+{
+    initDataAccess();
+    if( m_xDataAccess.is() )
+        return m_xDataAccess->getAnyColumnDescriptions();
+    return Sequence< Sequence< uno::Any > >();
+}
+
+// ____ XDateCategories (read) ____
+Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException)
+{
+    initDataAccess();
+    Reference< XDateCategories > xDateCategories( m_xDataAccess, uno::UNO_QUERY );
+    if( xDateCategories.is() )
+        return xDateCategories->getDateCategories();
+    return Sequence< double >();
+}
+
 // ____ XChartDataArray (write)____
 void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& rData )
     throw (uno::RuntimeException)
@@ -379,28 +527,50 @@ void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& r
 void SAL_CALL ChartDataWrapper::setRowDescriptions( const Sequence< OUString >& rRowDescriptions )
     throw (uno::RuntimeException)
 {
-    lcl_RowDescriptionsOperator aOperator( rRowDescriptions );
+    lcl_RowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() );
     applyData( aOperator );
 }
 void SAL_CALL ChartDataWrapper::setColumnDescriptions( const Sequence< OUString >& rColumnDescriptions )
     throw (uno::RuntimeException)
 {
-    lcl_ColumnDescriptionsOperator aOperator( rColumnDescriptions );
+    lcl_ColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() );
     applyData( aOperator );
 }
 
 // ____ XComplexDescriptionAccess (write) ____
 void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< ::rtl::OUString > >& rRowDescriptions ) throw (uno::RuntimeException)
 {
-    lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions );
+    lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() );
     applyData( aOperator );
 }
 void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< ::rtl::OUString > >& rColumnDescriptions ) throw (uno::RuntimeException)
 {
-    lcl_ComplexColumnDescriptionsOperator aOperator( rColumnDescriptions );
+    lcl_ComplexColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() );
+    applyData( aOperator );
+}
+
+// ____ XAnyDescriptionAccess (write) ____
+void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) throw (uno::RuntimeException)
+{
+    lcl_AnyRowDescriptionsOperator aOperator( rRowDescriptions );
+    applyData( aOperator );
+}
+void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException)
+{
+    lcl_AnyColumnDescriptionsOperator aOperator( rColumnDescriptions );
     applyData( aOperator );
 }
 
+// ____ XDateCategories (write) ____
+void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException)
+{
+    Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
+    ControllerLockGuard aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ));
+    lcl_DateCategoriesOperator aOperator( rDates );
+    applyData( aOperator );
+    DiagramHelper::switchToDateCategories( xChartDoc );
+}
+
 //--------------------------------------------------------------------------------------
 
 // ____ XChartData (base of XChartDataArray) ____
@@ -508,11 +678,11 @@ void ChartDataWrapper::initDataAccess()
     if( !xChartDoc.is() )
         return;
     if( xChartDoc->hasInternalDataProvider() )
-        m_xDataAccess = Reference< XComplexDescriptionAccess >( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW );
+        m_xDataAccess = Reference< XAnyDescriptionAccess >( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW );
     else
     {
         //create a separate "internal data provider" that is not connected to the model
-        m_xDataAccess = Reference< XComplexDescriptionAccess >( ChartModelHelper::createInternalDataProvider(
+        m_xDataAccess = Reference< XAnyDescriptionAccess >( ChartModelHelper::createInternalDataProvider(
             xChartDoc, false /*bConnectToModel*/ ), uno::UNO_QUERY_THROW );
     }
 }
@@ -569,30 +739,9 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
         return;
     uno::Reference< chart2::data::XDataSource > xSource( xDataProvider->createDataSource( aArguments ) );
 
-    // determine a template
-    uno::Reference< lang::XMultiServiceFactory > xFact( xChartDoc->getChartTypeManager(), uno::UNO_QUERY );
-    uno::Reference< chart2::XDiagram > xDia( xChartDoc->getFirstDiagram());
-    DiagramHelper::tTemplateWithServiceName aTemplateAndService =
-        DiagramHelper::getTemplateForDiagram( xDia, xFact );
-    ::rtl::OUString aServiceName( aTemplateAndService.second );
-    uno::Reference< chart2::XChartTypeTemplate > xTemplate = aTemplateAndService.first;
-
-    // (fall-back)
-    if( ! xTemplate.is())
-    {
-        if( aServiceName.getLength() == 0 )
-            aServiceName = C2U("com.sun.star.chart2.template.Column");
-        xTemplate.set( xFact->createInstance( aServiceName ), uno::UNO_QUERY );
-    }
-    OSL_ASSERT( xTemplate.is());
-
-    if( xTemplate.is() && xSource.is())
-    {
-        // argument detection works with internal knowledge of the
-        // ArrayDataProvider
-        OSL_ASSERT( xDia.is());
-        xTemplate->changeDiagramData( xDia, xSource, aArguments );
-    }
+    uno::Reference< chart2::XDiagram > xDia( xChartDoc->getFirstDiagram() );
+    if( xDia.is() )
+        xDia->setDiagramData( xSource, aArguments );
 
     //correct stacking mode
     if( bStacked || bPercent || bDeep )
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index af101edd2..5144669f1 100644..100755
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -29,9 +29,10 @@
 
 #include "ServiceMacros.hxx"
 #include "MutexContainer.hxx"
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
+#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
+#include <com/sun/star/chart/XDateCategories.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
@@ -48,8 +49,9 @@ class Chart2ModelContact;
 struct lcl_Operator;
 
 class ChartDataWrapper : public MutexContainer, public
-    ::cppu::WeakImplHelper4<
-    com::sun::star::chart::XComplexDescriptionAccess,
+    ::cppu::WeakImplHelper5<
+    com::sun::star::chart2::XAnyDescriptionAccess,
+    com::sun::star::chart::XDateCategories,
     com::sun::star::lang::XServiceInfo,
     com::sun::star::lang::XEventListener,
     com::sun::star::lang::XComponent >
@@ -64,7 +66,25 @@ public:
     APPHELPER_XSERVICEINFO_DECL()
 
 protected:
-    // ____ XComplexDescriptionAccess ____
+    // ____ XDateCategories ____
+    virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException);
+
+    // ____ XAnyDescriptionAccess ____
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL
+        getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setAnyRowDescriptions(
+        const ::com::sun::star::uno::Sequence<
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions )
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL
+        getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setAnyColumnDescriptions( 
+        const ::com::sun::star::uno::Sequence<
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
         getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setComplexRowDescriptions(
@@ -136,7 +156,7 @@ private: //methods
 
 private: //member
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart::XComplexDescriptionAccess > m_xDataAccess;
+        ::com::sun::star::chart2::XAnyDescriptionAccess > m_xDataAccess;
 
     ::boost::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
     ::cppu::OInterfaceContainerHelper           m_aEventListenerContainer;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 3d3d36c24..6ca0a99ec 100755
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -56,11 +56,9 @@
 #include "WrappedAddInProperty.hxx"
 #include "WrappedIgnoreProperty.hxx"
 #include "ChartRenderer.hxx"
-#include "UndoManager.hxx"
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
-#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
 #include <comphelper/InlineContainer.hxx>
 // header for function SvxShapeCollection_NewInstance
 #include <svx/unoshcol.hxx>
@@ -81,8 +79,8 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart;
 
-using ::com::sun::star::chart::XComplexDescriptionAccess;
 using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
@@ -1413,12 +1411,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
         xResult.set( m_xChartView );
         bServiceFound = true;
     }
-    else if ( aServiceSpecifier.equals( CHART_UNDOMANAGER_SERVICE_NAME ) )
-    {
-        Reference< chart2::XUndoManager > xUndoManager( new UndoManager() );
-        xResult.set( xUndoManager );
-        bServiceFound = true;
-    }
     else
     {
         // try to create a shape
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 0ab39a153..d9b942f86 100755
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -30,14 +30,11 @@
 #include "DiagramWrapper.hxx"
 #include "macros.hxx"
 #include "servicenames_charttypes.hxx"
-#include "TitleWrapper.hxx"
 #include "DataSeriesPointWrapper.hxx"
 #include "AxisWrapper.hxx"
 #include "AxisHelper.hxx"
 #include "Chart2ModelContact.hxx"
 #include "PositionAndSizeHelper.hxx"
-#include "TitleHelper.hxx"
-#include "GridWrapper.hxx"
 #include "WallFloorWrapper.hxx"
 #include "MinMaxLineWrapper.hxx"
 #include "UpDownBarWrapper.hxx"
@@ -88,6 +85,7 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
+using ::com::sun::star::chart::XAxis;
 using ::osl::MutexGuard;
 using ::rtl::OUString;
 
@@ -884,193 +882,209 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( cons
     return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle();
 }
 
-// ____ XAxisZSupplier ____
-Reference<
-    drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle()
+// ____ XAxisSupplier ____
+Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex )
     throw (uno::RuntimeException)
 {
-    if( !m_xZAxisTitle.is() )
+    Reference< XAxis > xAxis;
+    if(!nDimensionIndex)
+    {
+        if( !m_xXAxis.is() )
+            m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact );
+        xAxis = m_xXAxis;
+    }
+    else if(1==nDimensionIndex)
+    {
+        if( !m_xYAxis.is() )
+            m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact );
+        xAxis = m_xYAxis;
+    }
+    else if(2==nDimensionIndex)
     {
-        m_xZAxisTitle = new TitleWrapper( TitleHelper::Z_AXIS_TITLE, m_spChart2ModelContact );
+        if( !m_xZAxis.is() )
+            m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact );
+        xAxis = m_xZAxis;
     }
-    return m_xZAxisTitle;
+    return xAxis;
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid()
+Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensionIndex )
     throw (uno::RuntimeException)
 {
-    if( ! m_xZMainGrid.is())
+    Reference< XAxis > xAxis;
+    if(!nDimensionIndex)
     {
-        m_xZMainGrid = new GridWrapper( GridWrapper::Z_MAIN_GRID, m_spChart2ModelContact );
+        if( !m_xSecondXAxis.is() )
+            m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact );
+        xAxis = m_xSecondXAxis;
     }
-    return m_xZMainGrid;
+    else if(1==nDimensionIndex)
+    {
+        if( !m_xSecondYAxis.is() )
+            m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact );
+        xAxis = m_xSecondYAxis;
+    }
+    return xAxis;
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid()
+// ____ XAxisZSupplier ____
+Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle()
     throw (uno::RuntimeException)
 {
-    if( !m_xZHelpGrid.is() )
-    {
-        m_xZHelpGrid = new GridWrapper( GridWrapper::Z_SUB_GRID, m_spChart2ModelContact );
-    }
-    return m_xZHelpGrid;
+    Reference< drawing::XShape > xRet;
+    Reference< XAxis > xAxis( getAxis(2) );
+    if( xAxis.is() )
+        xRet = Reference< drawing::XShape >( xAxis->getAxisTitle(), uno::UNO_QUERY );
+    return xRet;
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid()
+    throw (uno::RuntimeException)
+{
+    Reference< beans::XPropertySet > xRet;
+    Reference< XAxis > xAxis( getAxis(2) );
+    if( xAxis.is() )
+        xRet = xAxis->getMajorGrid();
+    return xRet;
+}
+
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid()
+    throw (uno::RuntimeException)
+{
+    Reference< beans::XPropertySet > xRet;
+    Reference< XAxis > xAxis( getAxis(2) );
+    if( xAxis.is() )
+        xRet = xAxis->getMinorGrid();
+    return xRet;
+}
+
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis()
     throw (uno::RuntimeException)
 {
     if( ! m_xZAxis.is())
-    {
         m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact );
-    }
-    return m_xZAxis;
+    return Reference< beans::XPropertySet >( m_xZAxis, uno::UNO_QUERY );
 }
 
 
 // ____ XTwoAxisXSupplier ____
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis()
     throw (uno::RuntimeException)
 {
     if( ! m_xSecondXAxis.is())
-    {
         m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact );
-    }
-    return m_xSecondXAxis;
+    return Reference< beans::XPropertySet >( m_xSecondXAxis, uno::UNO_QUERY );
 }
 
 
 // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____
-Reference<
-    drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle()
+Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle()
     throw (uno::RuntimeException)
 {
-
-    if( !m_xXAxisTitle.is() )
-    {
-        m_xXAxisTitle = new TitleWrapper( TitleHelper::X_AXIS_TITLE, m_spChart2ModelContact );
-    }
-    return m_xXAxisTitle;
+    Reference< drawing::XShape > xRet;
+    Reference< XAxis > xAxis( getAxis(0) );
+    if( xAxis.is() )
+        xRet = Reference< drawing::XShape >( xAxis->getAxisTitle(), uno::UNO_QUERY );
+    return xRet;
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis()
     throw (uno::RuntimeException)
 {
     if( ! m_xXAxis.is())
-    {
         m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact );
-    }
-
-    return m_xXAxis;
+    return Reference< beans::XPropertySet >( m_xXAxis, uno::UNO_QUERY );
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid()
     throw (uno::RuntimeException)
 {
-    if( ! m_xXMainGrid.is())
-    {
-        m_xXMainGrid = new GridWrapper( GridWrapper::X_MAIN_GRID, m_spChart2ModelContact );
-    }
-
-    return m_xXMainGrid;
+    Reference< beans::XPropertySet > xRet;
+    Reference< XAxis > xAxis( getAxis(0) );
+    if( xAxis.is() )
+        xRet = xAxis->getMajorGrid();
+    return xRet;
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid()
     throw (uno::RuntimeException)
 {
-    if( ! m_xXHelpGrid.is())
-    {
-        m_xXHelpGrid = new GridWrapper( GridWrapper::X_SUB_GRID, m_spChart2ModelContact );
-    }
-    return m_xXHelpGrid;
+    Reference< beans::XPropertySet > xRet;
+    Reference< XAxis > xAxis( getAxis(0) );
+    if( xAxis.is() )
+        xRet = xAxis->getMinorGrid();
+    return xRet;
 }
 
 
 // ____ XTwoAxisYSupplier ____
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis()
     throw (uno::RuntimeException)
 {
     if( ! m_xSecondYAxis.is())
-    {
         m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact );
-    }
-    return m_xSecondYAxis;
+    return Reference< beans::XPropertySet >( m_xSecondYAxis, uno::UNO_QUERY );
 }
 
 
 // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____
-Reference<
-    drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle()
+Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle()
     throw (uno::RuntimeException)
 {
-    if( !m_xYAxisTitle.is() )
-    {
-        m_xYAxisTitle = new TitleWrapper( TitleHelper::Y_AXIS_TITLE, m_spChart2ModelContact );
-    }
-    return m_xYAxisTitle;
+    Reference< drawing::XShape > xRet;
+    Reference< XAxis > xAxis( getAxis(1) );
+    if( xAxis.is() )
+        xRet = Reference< drawing::XShape >( xAxis->getAxisTitle(), uno::UNO_QUERY );
+    return xRet;
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis()
     throw (uno::RuntimeException)
 {
     if( ! m_xYAxis.is())
-    {
         m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact );
-    }
-    return m_xYAxis;
+    return Reference< beans::XPropertySet >( m_xYAxis, uno::UNO_QUERY );
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid()
     throw (uno::RuntimeException)
 {
-    if( ! m_xYHelpGrid.is())
-    {
-        m_xYHelpGrid = new GridWrapper( GridWrapper::Y_SUB_GRID, m_spChart2ModelContact );
-    }
-    return m_xYHelpGrid;
+    Reference< beans::XPropertySet > xRet;
+    Reference< XAxis > xAxis( getAxis(1) );
+    if( xAxis.is() )
+        xRet = xAxis->getMajorGrid();
+    return xRet;
 }
 
-Reference<
-    beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid()
+Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid()
     throw (uno::RuntimeException)
 {
-    if( ! m_xYMainGrid.is())
-    {
-        m_xYMainGrid = new GridWrapper( GridWrapper::Y_MAIN_GRID, m_spChart2ModelContact );
-    }
-    return m_xYMainGrid;
+    Reference< beans::XPropertySet > xRet;
+    Reference< XAxis > xAxis( getAxis(1) );
+    if( xAxis.is() )
+        xRet = xAxis->getMinorGrid();
+    return xRet;
 }
 
 // ____ XSecondAxisTitleSupplier ____
-Reference<
-    drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle()
+Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle()
     throw (uno::RuntimeException)
 {
-    if( !m_xSecondXAxisTitle.is() )
-    {
-        m_xSecondXAxisTitle = new TitleWrapper( TitleHelper::SECONDARY_X_AXIS_TITLE, m_spChart2ModelContact );
-    }
-    return m_xSecondXAxisTitle;
+    Reference< drawing::XShape > xRet;
+    Reference< XAxis > xAxis( getSecondaryAxis(0) );
+    if( xAxis.is() )
+        xRet = Reference< drawing::XShape >( xAxis->getAxisTitle(), uno::UNO_QUERY );
+    return xRet;
 }
 
-Reference<
-    drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle()
+Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle()
     throw (uno::RuntimeException)
 {
-    if( !m_xSecondYAxisTitle.is() )
-    {
-        m_xSecondYAxisTitle = new TitleWrapper( TitleHelper::SECONDARY_Y_AXIS_TITLE, m_spChart2ModelContact );
-    }
-    return m_xSecondYAxisTitle;
+    Reference< drawing::XShape > xRet;
+    Reference< XAxis > xAxis( getSecondaryAxis(1) );
+    if( xAxis.is() )
+        xRet = Reference< drawing::XShape >( xAxis->getAxisTitle(), uno::UNO_QUERY );
+    return xRet;
 }
 
 // ____ XStatisticDisplay ____
@@ -1163,22 +1177,11 @@ void SAL_CALL DiagramWrapper::dispose()
     // /--
     MutexGuard aGuard( GetMutex());
     
-    DisposeHelper::DisposeAndClear( m_xXAxisTitle );
-    DisposeHelper::DisposeAndClear( m_xYAxisTitle );
-    DisposeHelper::DisposeAndClear( m_xZAxisTitle );
-    DisposeHelper::DisposeAndClear( m_xSecondXAxisTitle );
-    DisposeHelper::DisposeAndClear( m_xSecondYAxisTitle );
     DisposeHelper::DisposeAndClear( m_xXAxis );
     DisposeHelper::DisposeAndClear( m_xYAxis );
     DisposeHelper::DisposeAndClear( m_xZAxis );
     DisposeHelper::DisposeAndClear( m_xSecondXAxis );
     DisposeHelper::DisposeAndClear( m_xSecondYAxis );
-    DisposeHelper::DisposeAndClear( m_xXMainGrid );
-    DisposeHelper::DisposeAndClear( m_xYMainGrid );
-    DisposeHelper::DisposeAndClear( m_xZMainGrid );
-    DisposeHelper::DisposeAndClear( m_xXHelpGrid );
-    DisposeHelper::DisposeAndClear( m_xYHelpGrid );
-    DisposeHelper::DisposeAndClear( m_xZHelpGrid );
     DisposeHelper::DisposeAndClear( m_xWall );
     DisposeHelper::DisposeAndClear( m_xFloor );
     DisposeHelper::DisposeAndClear( m_xMinMaxLineWrapper );
@@ -2147,3 +2150,4 @@ APPHELPER_XSERVICEINFO_IMPL( DiagramWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 1b4c81353..f7fe1ebbd 100644..100755
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -30,7 +30,13 @@
 #include "WrappedPropertySet.hxx"
 #include "ServiceMacros.hxx"
 #include "DiagramHelper.hxx"
-#include <cppuhelper/implbase12.hxx>
+
+#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13)
+#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13
+#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 13
+#include "comphelper/implbase_var.hxx"
+#endif
+
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
@@ -41,6 +47,7 @@
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <com/sun/star/chart2/XChartTypeManager.hpp>
 #include <com/sun/star/chart/XDiagram.hpp>
+#include <com/sun/star/chart/XAxisSupplier.hpp>
 #include <com/sun/star/chart/XAxisZSupplier.hpp>
 #include <com/sun/star/chart/XTwoAxisXSupplier.hpp>
 #include <com/sun/star/chart/XTwoAxisYSupplier.hpp>
@@ -56,15 +63,15 @@
 
 namespace chart
 {
-
 namespace wrapper
 {
 
 class Chart2ModelContact;
 
-class DiagramWrapper : public ::cppu::ImplInheritanceHelper12<
+class DiagramWrapper : public ::comphelper::ImplInheritanceHelper13<
                       WrappedPropertySet
                      , ::com::sun::star::chart::XDiagram
+                     , ::com::sun::star::chart::XAxisSupplier
                      , ::com::sun::star::chart::XAxisZSupplier
                      , ::com::sun::star::chart::XTwoAxisXSupplier	//	: XAxisXSupplier
                      , ::com::sun::star::chart::XTwoAxisYSupplier	//	: XAxisYSupplier
@@ -123,6 +130,14 @@ public:
     virtual ::rtl::OUString SAL_CALL getShapeType()
         throw (::com::sun::star::uno::RuntimeException);
 
+    // ____ XAxisSupplier ____
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex )
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex )
+        throw (::com::sun::star::uno::RuntimeException);
+    
     // ____ XAxisZSupplier ____
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::drawing::XShape > SAL_CALL getZAxisTitle()
@@ -244,72 +259,27 @@ private:
     ::cppu::OInterfaceContainerHelper           m_aEventListenerContainer;
 
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape >
-                        m_xXAxisTitle;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape >
-                        m_xYAxisTitle;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape >
-                        m_xZAxisTitle;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape >
-                        m_xSecondXAxisTitle;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape >
-                        m_xSecondYAxisTitle;
-
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xXAxis;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xYAxis;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xZAxis;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xSecondXAxis;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xSecondYAxis;
-
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xXMainGrid;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xYMainGrid;
+        ::com::sun::star::chart::XAxis >        m_xXAxis;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xZMainGrid;
+        ::com::sun::star::chart::XAxis >        m_xYAxis;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xXHelpGrid;
+        ::com::sun::star::chart::XAxis >        m_xZAxis;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xYHelpGrid;
+        ::com::sun::star::chart::XAxis >        m_xSecondXAxis;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xZHelpGrid;
+        ::com::sun::star::chart::XAxis >        m_xSecondYAxis;
 
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xWall;
+        ::com::sun::star::beans::XPropertySet > m_xWall;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xFloor;
+        ::com::sun::star::beans::XPropertySet > m_xFloor;
 
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xMinMaxLineWrapper;
+        ::com::sun::star::beans::XPropertySet > m_xMinMaxLineWrapper;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xUpBarWrapper;
+        ::com::sun::star::beans::XPropertySet > m_xUpBarWrapper;
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-                        m_xDownBarWrapper;
+        ::com::sun::star::beans::XPropertySet > m_xDownBarWrapper;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index f64e1d3ef..ea5d37a9d 100755
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -112,17 +112,17 @@ void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDime
 
     switch( eType )
     {
-        case X_MAIN_GRID:
+        case X_MAJOR_GRID:
             rnDimensionIndex = 0; rbSubGrid = false; break;
-        case Y_MAIN_GRID:
+        case Y_MAJOR_GRID:
             rnDimensionIndex = 1; rbSubGrid = false; break;
-        case Z_MAIN_GRID:
+        case Z_MAJOR_GRID:
             rnDimensionIndex = 2; rbSubGrid = false; break;
-        case X_SUB_GRID:
+        case X_MINOR_GRID:
             rnDimensionIndex = 0; rbSubGrid = true;  break;
-        case Y_SUB_GRID:
+        case Y_MINOR_GRID:
             rnDimensionIndex = 1; rbSubGrid = true;  break;
-        case Z_SUB_GRID:
+        case Z_MINOR_GRID:
             rnDimensionIndex = 2; rbSubGrid = true;  break;
     }
 }
@@ -209,3 +209,4 @@ APPHELPER_XSERVICEINFO_IMPL( GridWrapper, lcl_aServiceName );
 
 } //  namespace wrapper
 } //  namespace chart
+
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index ee0c14951..839e68077 100644..100755
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -42,7 +42,6 @@
 
 namespace chart
 {
-
 namespace wrapper
 {
 
@@ -57,12 +56,12 @@ class GridWrapper : public ::cppu::ImplInheritanceHelper2<
 public:
     enum tGridType
     {
-        X_MAIN_GRID,
-        Y_MAIN_GRID,
-        Z_MAIN_GRID,
-        X_SUB_GRID,
-        Y_SUB_GRID,
-        Z_SUB_GRID
+        X_MAJOR_GRID,
+        Y_MAJOR_GRID,
+        Z_MAJOR_GRID,
+        X_MINOR_GRID,
+        Y_MINOR_GRID,
+        Z_MINOR_GRID
     };
 
     GridWrapper( tGridType eType, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 055a62f7f..a87006af4 100755
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -33,9 +33,8 @@
 #include "CommonConverters.hxx"
 #include "AxisHelper.hxx"
 #include <com/sun/star/chart2/XAxis.hpp>
-#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
-#include <com/sun/star/chart2/AxisOrientation.hpp>
+#include <com/sun/star/chart/ChartAxisType.hpp>
+#include <chartview/ExplicitScaleValues.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
@@ -43,6 +42,7 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::rtl::OUString;
+using ::com::sun::star::chart::TimeIncrement;
 
 //.............................................................................
 namespace chart
@@ -91,6 +91,15 @@ WrappedScaleProperty::WrappedScaleProperty( tScaleProperty eScaleProperty
         case SCALE_PROP_AUTO_STEPHELP:
             m_aOuterName = C2U("AutoStepHelp");
             break;
+        case SCALE_PROP_AXIS_TYPE:
+            m_aOuterName = C2U("AxisType");
+            break;
+        case SCALE_PROP_DATE_INCREMENT:
+            m_aOuterName = C2U("TimeIncrement");
+            break;
+        case SCALE_PROP_EXPLICIT_DATE_INCREMENT:
+            m_aOuterName = C2U("ExplicitTimeIncrement");
+            break;
         case SCALE_PROP_LOGARITHMIC:
             m_aOuterName = C2U("Logarithmic");
             break;
@@ -121,6 +130,9 @@ void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* >
     rList.push_back( new WrappedScaleProperty( SCALE_PROP_AUTO_ORIGIN, spChart2ModelContact ) );
     rList.push_back( new WrappedScaleProperty( SCALE_PROP_AUTO_STEPMAIN, spChart2ModelContact ) );
     rList.push_back( new WrappedScaleProperty( SCALE_PROP_AUTO_STEPHELP, spChart2ModelContact ) );
+    rList.push_back( new WrappedScaleProperty( SCALE_PROP_AXIS_TYPE, spChart2ModelContact ) );
+    rList.push_back( new WrappedScaleProperty( SCALE_PROP_DATE_INCREMENT, spChart2ModelContact ) );
+    rList.push_back( new WrappedScaleProperty( SCALE_PROP_EXPLICIT_DATE_INCREMENT, spChart2ModelContact ) );
     rList.push_back( new WrappedScaleProperty( SCALE_PROP_LOGARITHMIC, spChart2ModelContact ) );
     rList.push_back( new WrappedScaleProperty( SCALE_PROP_REVERSEDIRECTION, spChart2ModelContact ) );
 }
@@ -265,6 +277,43 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
             bSetScaleData = true;
             break;
         }
+        case SCALE_PROP_AXIS_TYPE:
+        {
+            sal_Int32 nType = 0;
+            if( (rOuterValue >>= nType) )
+            {
+                if( ::com::sun::star::chart::ChartAxisType::AUTOMATIC == nType )
+                {
+                    aScaleData.AutoDateAxis = true;
+                    if( aScaleData.AxisType == AxisType::DATE )
+                        aScaleData.AxisType = AxisType::CATEGORY;
+                }
+                else if( ::com::sun::star::chart::ChartAxisType::CATEGORY == nType )
+                {
+                    aScaleData.AutoDateAxis = false;
+                    if( aScaleData.AxisType == AxisType::DATE )
+                        aScaleData.AxisType = AxisType::CATEGORY;
+                }
+                else if( ::com::sun::star::chart::ChartAxisType::DATE == nType )
+                {
+                    if( aScaleData.AxisType == AxisType::CATEGORY )
+                        aScaleData.AxisType = AxisType::DATE;
+                }
+                bSetScaleData = true;
+            }
+            break;
+        }
+        case SCALE_PROP_DATE_INCREMENT:
+        {
+            TimeIncrement aTimeIncrement;
+            rOuterValue >>= aTimeIncrement;
+            aScaleData.TimeIncrement = aTimeIncrement;
+            bSetScaleData = true;
+            break;
+        }
+        case SCALE_PROP_EXPLICIT_DATE_INCREMENT:
+            //read only property
+            break;
         case SCALE_PROP_LOGARITHMIC:
         {
             if( rOuterValue >>= bBool )
@@ -319,8 +368,8 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
     
     chart2::ScaleData aScaleData( xAxis->getScaleData() );
     
-    chart2::ExplicitScaleData aExplicitScale;
-    chart2::ExplicitIncrementData aExplicitIncrement;
+    ExplicitScaleData aExplicitScale;
+    ExplicitIncrementData aExplicitIncrement;
         
     switch( eScaleProperty )
     {
@@ -400,7 +449,8 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
             {
                 m_spChart2ModelContact->getExplicitValuesForAxis(
                     xAxis, aExplicitScale, aExplicitIncrement );
-                if( aExplicitIncrement.SubIncrements.getLength() > 0 &&
+                
+                if( !aExplicitIncrement.SubIncrements.empty() &&
                      aExplicitIncrement.SubIncrements[ 0 ].IntervalCount > 0 )
                 {
                     if( bLogarithmic )
@@ -439,7 +489,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
             if( bNeedToCalculateExplicitValues )
             {
                 m_spChart2ModelContact->getExplicitValuesForAxis( xAxis, aExplicitScale, aExplicitIncrement );
-                if( aExplicitIncrement.SubIncrements.getLength() > 0 )
+                if( !aExplicitIncrement.SubIncrements.empty() )
                     nIntervalCount = aExplicitIncrement.SubIncrements[ 0 ].IntervalCount;
             }
             aRet = uno::makeAny( nIntervalCount );
@@ -485,6 +535,46 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
             aRet <<= !hasDoubleValue(aScaleData.Origin);
             break;
         }
+        case SCALE_PROP_AXIS_TYPE:
+        {
+            sal_Int32 nType = ::com::sun::star::chart::ChartAxisType::AUTOMATIC;
+            if( aScaleData.AxisType == AxisType::DATE )
+            {
+                nType = ::com::sun::star::chart::ChartAxisType::DATE;
+            }
+            else if( aScaleData.AxisType == AxisType::CATEGORY )
+            {
+                if( !aScaleData.AutoDateAxis )
+                    nType = ::com::sun::star::chart::ChartAxisType::CATEGORY;
+            }
+            aRet = uno::makeAny( nType );
+            break;
+        }
+        case SCALE_PROP_DATE_INCREMENT:
+        {
+            if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
+                aRet = uno::makeAny( aScaleData.TimeIncrement );
+            break;
+        }
+        case SCALE_PROP_EXPLICIT_DATE_INCREMENT:
+        {
+            if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
+            {
+                m_spChart2ModelContact->getExplicitValuesForAxis( xAxis, aExplicitScale, aExplicitIncrement );
+                if( aExplicitScale.AxisType == AxisType::DATE )
+                {
+                    TimeIncrement aTimeIncrement;
+                    aTimeIncrement.MajorTimeInterval = uno::makeAny( aExplicitIncrement.MajorTimeInterval );
+                    aTimeIncrement.MinorTimeInterval = uno::makeAny( aExplicitIncrement.MinorTimeInterval );
+                    aTimeIncrement.TimeResolution = uno::makeAny( aExplicitScale.TimeResolution );
+                    aRet = uno::makeAny(aTimeIncrement);
+                }
+            }
+
+            if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
+                aRet = uno::makeAny( aScaleData.TimeIncrement );
+            break;
+        }
         case SCALE_PROP_LOGARITHMIC:
         {
             aRet <<= static_cast< sal_Bool >( AxisHelper::isLogarithmic(aScaleData.Scaling) );
@@ -506,5 +596,5 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
 }
 
 } //  namespace wrapper
-} //namespace chart
+} //  namespace chart
 //.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
index 5f8b8fb6d..cf8e56c4b 100644..100755
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
@@ -55,6 +55,9 @@ public:
         , SCALE_PROP_AUTO_ORIGIN
         , SCALE_PROP_AUTO_STEPMAIN
         , SCALE_PROP_AUTO_STEPHELP
+        , SCALE_PROP_AXIS_TYPE
+        , SCALE_PROP_DATE_INCREMENT
+        , SCALE_PROP_EXPLICIT_DATE_INCREMENT
         , SCALE_PROP_LOGARITHMIC
         , SCALE_PROP_REVERSEDIRECTION
     };
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 8cab60653..73531be70 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -47,7 +47,7 @@
 #include "ChartModelHelper.hxx"
 #include "CommonConverters.hxx"
 #include "macros.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "servicenames_charttypes.hxx"
 #include "ResId.hxx"
 #include "Bitmaps.hrc"
@@ -64,6 +64,7 @@
 #include <com/sun/star/chart2/XChartType.hpp>
 
 #include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/util/XNumberFormats.hpp>
 
 #include <algorithm>
 #include <functional>
@@ -105,7 +106,7 @@ sal_Int32 lcl_getRowInData( long nRow )
     return static_cast< sal_Int32 >( nRow );
 }
 
-sal_Int32 lcl_getColumnInData( USHORT nCol )
+sal_Int32 lcl_getColumnInData( sal_uInt16 nCol )
 {
     return static_cast< sal_Int32 >( nCol ) - 1;
 }
@@ -215,7 +216,7 @@ private:
     DECL_LINK( SeriesNameChanged, void * );
     DECL_LINK( SeriesNameEdited, void * );
 
-    /// @param bHC </TRUE> for hight-contrast image
+    /// @param bHC </sal_True> for hight-contrast image
     static Image GetChartTypeImage(
         const Reference< chart2::XChartType > & xChartType,
         bool bSwapXAndYAxis,
@@ -476,13 +477,13 @@ bool lcl_SeriesHeaderHasFocus(
 }
 
 sal_Int32 lcl_getColumnInDataOrHeader(
-    USHORT nCol, const ::std::vector< ::boost::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader )
+    sal_uInt16 nCol, const ::std::vector< ::boost::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader )
 {
     sal_Int32 nColIdx = 0;
     bool bHeaderHasFocus( lcl_SeriesHeaderHasFocus( rSeriesHeader, &nColIdx ));
 
     if( bHeaderHasFocus )
-        nColIdx = lcl_getColumnInData( static_cast< USHORT >( rSeriesHeader[nColIdx]->GetStartColumn()));
+        nColIdx = lcl_getColumnInData( static_cast< sal_uInt16 >( rSeriesHeader[nColIdx]->GetStartColumn()));
     else
         nColIdx = lcl_getColumnInData( nCol );
 
@@ -507,7 +508,7 @@ DataBrowser::DataBrowser( Window* pParent, const ResId& rId, bool bLiveUpdate )
     double fNan;
     ::rtl::math::setNan( & fNan );
     m_aNumberEditField.SetDefaultValue( fNan );
-    m_aNumberEditField.TreatAsNumber( TRUE );
+    m_aNumberEditField.TreatAsNumber( sal_True );
     RenewTable();
     SetClean();
 }
@@ -583,10 +584,10 @@ void DataBrowser::RenewTable()
         return;
 
     long   nOldRow     = GetCurRow();
-    USHORT nOldColId   = GetCurColumnId();
+    sal_uInt16 nOldColId   = GetCurColumnId();
 
-    BOOL bLastUpdateMode = GetUpdateMode();
-    SetUpdateMode( FALSE );
+    sal_Bool bLastUpdateMode = GetUpdateMode();
+    SetUpdateMode( sal_False );
 
     if( IsModified() )
         SaveModified();
@@ -614,7 +615,7 @@ void DataBrowser::RenewTable()
 
     RowInserted( 1, nRowCountLocal );
     GoToRow( ::std::min( nOldRow, GetRowCount() - 1 ));
-    GoToColumnId( ::std::min( nOldColId, static_cast< USHORT >( ColCount() - 1 )));
+    GoToColumnId( ::std::min( nOldColId, static_cast< sal_uInt16 >( ColCount() - 1 )));
 
     Window * pWin = this->GetParent();
     if( !pWin )
@@ -671,7 +672,7 @@ String DataBrowser::GetRowString( sal_Int32 nRow ) const
     return String::CreateFromInt32( nRow + 1 );
 }
 
-String DataBrowser::GetCellText( long nRow, USHORT nColumnId ) const
+String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
 {
     String aResult;
 
@@ -696,6 +697,23 @@ String DataBrowser::GetCellText( long nRow, USHORT nColumnId ) const
                                       GetNumberFormatKey( nRow, nColumnId ),
                                       fData, nLabelColor, bColorChanged ));
         }
+        else if( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXTORDATE )
+        {
+            uno::Any aAny = m_apDataBrowserModel->getCellAny( nColIndex, nRow );
+            OUString aText;
+            double fDouble=0.0;
+            if( aAny>>=aText )
+                aResult = aText;
+            else if( aAny>>=fDouble )
+            {
+                sal_Int32 nLabelColor;
+                bool bColorChanged = false;
+                sal_Int32 nDateNumberFormat = DiagramHelper::getDateNumberFormat( Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY) );
+                if( ! ::rtl::math::isNan( fDouble ) && m_spNumberFormatterWrapper.get() )
+                    aResult = String( m_spNumberFormatterWrapper->getFormattedString(
+                        nDateNumberFormat, fDouble, nLabelColor, bColorChanged ));
+            }
+        }
         else
         {
             OSL_ASSERT( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXT );
@@ -706,7 +724,7 @@ String DataBrowser::GetCellText( long nRow, USHORT nColumnId ) const
     return aResult;
 }
 
-double DataBrowser::GetCellNumber( long nRow, USHORT nColumnId ) const
+double DataBrowser::GetCellNumber( long nRow, sal_uInt16 nColumnId ) const
 {
     double fResult;
     ::rtl::math::setNan( & fResult );
@@ -723,8 +741,8 @@ double DataBrowser::GetCellNumber( long nRow, USHORT nColumnId ) const
 
 void DataBrowser::Resize()
 {
-    BOOL bLastUpdateMode = GetUpdateMode();
-    SetUpdateMode( FALSE );
+    sal_Bool bLastUpdateMode = GetUpdateMode();
+    SetUpdateMode( sal_False );
 
     ::svt::EditBrowseBox::Resize();
     ImplAdjustHeaderControls();
@@ -854,6 +872,9 @@ void DataBrowser::SetDataFromModel(
         new NumberFormatterWrapper(
             Reference< util::XNumberFormatsSupplier >( m_xChartDoc, uno::UNO_QUERY )));
 
+    if( m_spNumberFormatterWrapper.get() )
+        m_aNumberEditField.SetFormatter( m_spNumberFormatterWrapper->getSvNumberFormatter() );
+
     RenewTable();
 
     const sal_Int32 nColCnt  = m_apDataBrowserModel->getColumnCount();
@@ -1134,6 +1155,22 @@ sal_uInt32 DataBrowser::GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) co
     return m_apDataBrowserModel->getNumberFormatKey( lcl_getColumnInData( nCol ), lcl_getRowInData( nRow ));
 }
 
+bool DataBrowser::isDateString( rtl::OUString aInputString, double& fOutDateValue )
+{
+    sal_uInt32 nNumberFormat=0;
+    SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0;
+    if( aInputString.getLength() > 0 &&  pSvNumberFormatter && pSvNumberFormatter->IsNumberFormat( aInputString, nNumberFormat, fOutDateValue ) )
+    {
+        Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( m_xChartDoc, uno::UNO_QUERY );
+        Reference< util::XNumberFormats > xNumberFormats;
+        if( xNumberFormatsSupplier.is() )
+             xNumberFormats = Reference< util::XNumberFormats >( xNumberFormatsSupplier->getNumberFormats() );
+        if( DiagramHelper::isDateNumberFormat( nNumberFormat, xNumberFormats ) )
+            return true;
+    }
+    return false;
+}
+
 sal_Bool DataBrowser::SaveModified()
 {
     if( ! IsModified() )
@@ -1146,6 +1183,7 @@ sal_Bool DataBrowser::SaveModified()
 
     DBG_ASSERT( nRow >= 0 || nCol >= 0, "This cell should not be modified!" );
 
+    SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : 0;
     switch( m_apDataBrowserModel->getCellType( nCol, nRow ))
     {
         case DataBrowserModel::NUMBER:
@@ -1155,11 +1193,8 @@ sal_Bool DataBrowser::SaveModified()
             String aText( m_aNumberEditField.GetText());
             // an empty string is valid, if no numberformatter exists, all
             // values are treated as valid
-            if( aText.Len() > 0 &&
-                m_spNumberFormatterWrapper.get() &&
-                m_spNumberFormatterWrapper->getSvNumberFormatter() &&
-                ! m_spNumberFormatterWrapper->getSvNumberFormatter()->IsNumberFormat(
-                    aText, nDummy, fDummy ))
+            if( aText.Len() > 0 && pSvNumberFormatter &&
+                ! pSvNumberFormatter->IsNumberFormat( aText, nDummy, fDummy ) )
             {
                 bChangeValid = sal_False;
             }
@@ -1170,6 +1205,17 @@ sal_Bool DataBrowser::SaveModified()
             }
         }
         break;
+        case DataBrowserModel::TEXTORDATE:
+        {
+            OUString aText( m_aTextEditField.GetText() );
+            double fDateValue=0.0;
+            bChangeValid = sal_False;
+            if( isDateString( aText, fDateValue ) )
+                bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( fDateValue ) );
+            if(!bChangeValid)
+                bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( aText ) );
+        }
+        break;
         case DataBrowserModel::TEXT:
         {
             OUString aText( m_aTextEditField.GetText());
@@ -1210,10 +1256,10 @@ sal_Int16 DataBrowser::GetFirstVisibleColumNumber() const
     return GetFirstVisibleColNumber();
 }
 
-void DataBrowser::ColumnResized( USHORT nColId )
+void DataBrowser::ColumnResized( sal_uInt16 nColId )
 {
-    BOOL bLastUpdateMode = GetUpdateMode();
-    SetUpdateMode( FALSE );
+    sal_Bool bLastUpdateMode = GetUpdateMode();
+    SetUpdateMode( sal_False );
 
     EditBrowseBox::ColumnResized( nColId );
     ImplAdjustHeaderControls();
@@ -1224,8 +1270,8 @@ void DataBrowser::ColumnResized( USHORT nColId )
 
 void DataBrowser::EndScroll()
 {
-    BOOL bLastUpdateMode = GetUpdateMode();
-    SetUpdateMode( FALSE );
+    sal_Bool bLastUpdateMode = GetUpdateMode();
+    SetUpdateMode( sal_False );
 
     EditBrowseBox::EndScroll();
     RenewSeriesHeaders();
@@ -1354,8 +1400,8 @@ IMPL_LINK( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit )
 
 sal_Int32 DataBrowser::GetTotalWidth() const
 {
-    ULONG nWidth = 0;
-    for ( USHORT nCol = 0; nCol < ColCount(); ++nCol )
+    sal_uLong nWidth = 0;
+    for ( sal_uInt16 nCol = 0; nCol < ColCount(); ++nCol )
         nWidth += GetColumnWidth( nCol );
     return static_cast< sal_Int32 >( nWidth );
 }
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 8ba66d264..4bad968dc 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -68,7 +68,7 @@ protected:
     virtual void CursorMoved();
     // called whenever the control of the current cell has been modified
     virtual void CellModified();
-    virtual void ColumnResized( USHORT nColId );
+    virtual void ColumnResized( sal_uInt16 nColId );
     virtual void EndScroll();
     virtual void MouseButtonDown( const BrowserMouseEvent& rEvt );
 
@@ -86,12 +86,14 @@ public:
         @return
             the text out of the cell
     */
-    virtual String	GetCellText(long nRow, USHORT nColId) const;
+    virtual String	GetCellText(long nRow, sal_uInt16 nColId) const;
 
     /** returns the number in the given cell. If a cell is empty or contains a
         string, the result will be Nan
     */
-    double GetCellNumber( long nRow, USHORT nColumnId ) const;
+    double GetCellNumber( long nRow, sal_uInt16 nColumnId ) const;
+
+    bool isDateString( rtl::OUString aInputString, double& fOutDateValue );
 
     // Window
     virtual void Resize();
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 1440210ce..f95cd327a 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -43,6 +43,7 @@
 #include "ExplicitCategoriesProvider.hxx"
 
 #include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
@@ -589,7 +590,7 @@ Reference< chart2::XDataSeries >
     return 0;
 }
 
-DataBrowserModel::eCellType DataBrowserModel::getCellType( sal_Int32 nAtColumn, sal_Int32 /* nAtRow */ )
+DataBrowserModel::eCellType DataBrowserModel::getCellType( sal_Int32 nAtColumn, sal_Int32 /* nAtRow */ ) const
 {
     eCellType eResult = TEXT;
     tDataColumnVector::size_type nIndex( nAtColumn );
@@ -619,6 +620,26 @@ double DataBrowserModel::getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow )
     return fResult;
 }
 
+uno::Any DataBrowserModel::getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow )
+{
+    uno::Any aResult;
+
+    tDataColumnVector::size_type nIndex( nAtColumn );
+    if( nIndex < m_aColumns.size() &&
+        m_aColumns[ nIndex ].m_xLabeledDataSequence.is())
+    {
+        Reference< chart2::data::XDataSequence > xData(
+            m_aColumns[ nIndex ].m_xLabeledDataSequence->getValues() );
+        if( xData.is() )
+        {
+            Sequence< uno::Any > aValues( xData->getData());
+            if( nAtRow < aValues.getLength())
+                aResult = aValues[nAtRow];
+        }
+    }
+    return aResult;
+}
+
 OUString DataBrowserModel::getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow )
 {
     OUString aResult;
@@ -800,7 +821,7 @@ void DataBrowserModel::updateFromModel()
                 aCategories.m_aUIRoleName = DialogModel::GetRoleDataLabel();
             else
                 aCategories.m_aUIRoleName = lcl_getUIRoleName( xCategories );
-            aCategories.m_eCellType = TEXT;
+            aCategories.m_eCellType = TEXTORDATE;
             m_aColumns.push_back( aCategories );
             ++nHeaderStart;
         }
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index 2331cd023..5f9bbad59 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -81,18 +81,20 @@ public:
     enum eCellType
     {
         NUMBER,
-        TEXT
+        TEXT,
+        TEXTORDATE
     };
 
-    eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow );
+    eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow ) const;
     /// If getCellType( nAtColumn, nAtRow ) returns TEXT, the result will be Nan
     double getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow );
     ::rtl::OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow );
+    ::com::sun::star::uno::Any getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow );
     sal_uInt32 getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 nAtRow );
 
-    /// returns </TRUE> if the number could successfully be set at the given position
+    /// returns </sal_True> if the number could successfully be set at the given position
     bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue );
-    /// returns </TRUE> if the text could successfully be set at the given position
+    /// returns </sal_True> if the text could successfully be set at the given position
     bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText );
     bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue );
 
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 9c4ad5289..99fcf9364 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -160,7 +160,7 @@ void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap )
 struct lcl_DataSeriesContainerAppend : public
     ::std::iterator< ::std::output_iterator_tag, Reference< XDataSeriesContainer > >
 {
-    typedef ::std::vector< chart::DialogModel::tSeriesWithChartTypeByName > tContainerType;
+    typedef ::std::vector< ::chart::DialogModel::tSeriesWithChartTypeByName > tContainerType;
 
     explicit lcl_DataSeriesContainerAppend( tContainerType & rCnt )
             : m_rDestCnt( rCnt )
@@ -180,7 +180,7 @@ struct lcl_DataSeriesContainerAppend : public
                 for( sal_Int32 nI = 0; nI < aSeq.getLength(); ++ nI )
                 {
                     m_rDestCnt.push_back(
-                        chart::DialogModel::tSeriesWithChartTypeByName(
+                        ::chart::DialogModel::tSeriesWithChartTypeByName(
                             ::chart::DataSeriesHelper::getDataSeriesLabel( aSeq[nI], aRole ),
                             ::std::make_pair( aSeq[nI], xCT )));
                 }
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index b83ebf311..73c850013 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -40,7 +40,7 @@
 #include "AxisIndexDefines.hxx"
 #include "ExplicitCategoriesProvider.hxx"
 #include "CommonConverters.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "RegressionCurveHelper.hxx"
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
@@ -191,14 +191,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal
 
     if( aX.getLength() == 0 )
     {
-        rtl::OUString aCategory = ::rtl::OUString( String(SchResId(STR_TIP_CATEGORY_VALUE)));
-
-        replaceParamterInString( aCategory
-            , C2U("%CATEGORYVALUE")
-            , ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex )
-            );
-        
-        aRet = aCategory;
+        aRet = ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, xChartModel, nPointIndex );
     }
     else
     {
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index 6b684d023..d3c2e0d9f 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -388,11 +388,6 @@ String STR_TIP_DATAPOINT_VALUES
     Text [ en-US ] = "Values: %POINTVALUES";
 };
 
-String STR_TIP_CATEGORY_VALUE
-{
-    Text [ en-US ] = "'%CATEGORYVALUE'";
-};
-
 String STR_TIP_DATAPOINT
 {
     Text [ en-US ] = "Data Point %POINTNUMBER, data series %SERIESNUMBER, values: %POINTVALUES";
@@ -463,6 +458,10 @@ String STR_ACTION_NOTPOSSIBLE
 {
     Text [ en-US ] = "This function cannot be completed with the selected objects." ;
 };
+String STR_ACTION_EDIT_TEXT
+{
+    Text [ en-US ] = "Edit text";
+};
 
 String STR_COLUMN_LABEL
 {
diff --git a/chart2/source/controller/dialogs/Strings_Scale.src b/chart2/source/controller/dialogs/Strings_Scale.src
index 9185552cb..e8fb55674 100644
--- a/chart2/source/controller/dialogs/Strings_Scale.src
+++ b/chart2/source/controller/dialogs/Strings_Scale.src
@@ -42,3 +42,11 @@ String STR_MIN_GREATER_MAX
 {
     Text [ en-US ] = "The minimum must be lower than the maximum. Check your input." ;
 };
+String STR_INVALID_INTERVALS
+{
+    Text [ en-US ] = "The major interval needs to be greater than the minor interval. Check your input." ;
+};
+String STR_INVALID_TIME_UNIT
+{
+    Text [ en-US ] = "The major and minor interval need to be greater or equal to the resolution. Check your input." ;
+};
diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc
index 342495738..cd3883af5 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -111,31 +111,6 @@
 #define FT_AXIS_TEXTDIR                 19
 #define LB_AXIS_TEXTDIR                 20
 
-//#define TP_SCALE		  903
-
-#define FL_SCALE			1
-
-#define TXT_MIN				1
-#define TXT_MAX				2
-#define TXT_STEP_MAIN		3
-#define TXT_STEP_HELP		4
-#define TXT_ORIGIN			5
-
-#define CBX_AUTO_MIN		1
-#define CBX_AUTO_MAX		2
-#define CBX_AUTO_STEP_MAIN	3
-#define CBX_AUTO_STEP_HELP	4
-#define CBX_AUTO_ORIGIN		5
-#define CBX_LOGARITHM		6
-#define CBX_REVERSE         7
-
-#define EDT_STEP_MAIN		1
-#define EDT_MAX				2
-#define EDT_MIN				3
-#define EDT_ORIGIN          4
-
-#define MT_STEPHELP		    10
-
 //#define TP_AXIS_POSITIONS   904
 
 #define FL_AXIS_LINE        1
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 47e7faf73..7eccbd32d 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -96,7 +96,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
     m_apDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
     // Do not call FreeResource(), because there are no sub-elements defined in
     // the dialog resource
-    ShowButtonFixedLine( TRUE );
+    ShowButtonFixedLine( sal_True );
     defaultButton( WZB_FINISH );
 
     if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount )
@@ -236,7 +236,7 @@ void CreationWizard::setValidPage( TabPage * /* pTabPage */ )
 
 String CreationWizard::getStateDisplayName( WizardState nState ) const
 {
-    USHORT nResId = 0;
+    sal_uInt16 nResId = 0;
     switch( nState )
     {
     case STATE_CHARTTYPE:
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index d63928e37..202bc9e82 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -191,13 +191,13 @@ void DataEditor::SetReadOnly( bool bReadOnly )
     m_bReadOnly = bReadOnly;
     if( m_bReadOnly )
     {
-        m_aTbxData.EnableItem( TBI_DATA_INSERT_ROW, FALSE );
-        m_aTbxData.EnableItem( TBI_DATA_INSERT_COL, FALSE );
-        m_aTbxData.EnableItem( TBI_DATA_INSERT_TEXT_COL, FALSE );
-        m_aTbxData.EnableItem( TBI_DATA_DELETE_ROW, FALSE );
-        m_aTbxData.EnableItem( TBI_DATA_DELETE_COL, FALSE );
-        m_aTbxData.EnableItem( TBI_DATA_SWAP_COL, FALSE );
-        m_aTbxData.EnableItem( TBI_DATA_SWAP_ROW, FALSE );
+        m_aTbxData.EnableItem( TBI_DATA_INSERT_ROW, sal_False );
+        m_aTbxData.EnableItem( TBI_DATA_INSERT_COL, sal_False );
+        m_aTbxData.EnableItem( TBI_DATA_INSERT_TEXT_COL, sal_False );
+        m_aTbxData.EnableItem( TBI_DATA_DELETE_ROW, sal_False );
+        m_aTbxData.EnableItem( TBI_DATA_DELETE_COL, sal_False );
+        m_aTbxData.EnableItem( TBI_DATA_SWAP_COL, sal_False );
+        m_aTbxData.EnableItem( TBI_DATA_SWAP_ROW, sal_False );
     }
 
     m_apBrwData->SetReadOnly( m_bReadOnly );
@@ -258,7 +258,7 @@ void DataEditor::UpdateData()
 // }
 
 // {
-//     BOOL bRet = TRUE;
+//     sal_Bool bRet = sal_True;
 
 //     // confirm changes currently made and not saved
 //     m_apBrwData->EndEditing();
@@ -281,7 +281,7 @@ void DataEditor::UpdateData()
 //     if( bRet )
 //     {
 //         // close child window
-//         SfxBoolItem aItem( SID_DIAGRAM_DATA, FALSE );
+//         SfxBoolItem aItem( SID_DIAGRAM_DATA, sal_False );
 //         if( m_pBindings )
 //         {
 //             SfxDispatcher* pDisp = m_pBindings->GetDispatcher();
@@ -292,7 +292,7 @@ void DataEditor::UpdateData()
 //         }
 //     }
 
-//     return ( bRet? SfxFloatingWindow::Close(): FALSE );
+//     return ( bRet? SfxFloatingWindow::Close(): sal_False );
 // }
 
 void DataEditor::AdaptBrowseBoxSize()
@@ -313,12 +313,12 @@ void DataEditor::Resize()
 //     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
 }
 
-BOOL DataEditor::Close()
+sal_Bool DataEditor::Close()
 {
     if( ApplyChangesToModel() )
         return ModalDialog::Close();
     else
-        return TRUE;
+        return sal_True;
 }
 
 bool DataEditor::ApplyChangesToModel()
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 72e62701e..7cad1bf7c 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -146,7 +146,7 @@ void DataSourceTabControl::EnableTabToggling()
 
 // ----------------------------------------
 
-USHORT DataSourceDialog::m_nLastPageId = 0;
+sal_uInt16 DataSourceDialog::m_nLastPageId = 0;
 
 DataSourceDialog::DataSourceDialog(
     Window * pParent,
@@ -220,7 +220,7 @@ void DataSourceDialog::setInvalidPage( TabPage * pTabPage )
 
     if( ! (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid ))
     {
-        m_aBtnOK.Enable( FALSE );
+        m_aBtnOK.Enable( sal_False );
         OSL_ASSERT( m_pTabControl );
         // note: there seems to be no suitable mechanism to address pages by
         // identifier, at least it is unclear what the page identifiers are.
@@ -242,7 +242,7 @@ void DataSourceDialog::setValidPage( TabPage * pTabPage )
 
     if( m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid )
     {
-        m_aBtnOK.Enable( TRUE );
+        m_aBtnOK.Enable( sal_True );
         OSL_ASSERT( m_pTabControl );
         m_pTabControl->EnableTabToggling();
     }
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 09d34f337..39138c8bf 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -63,7 +63,7 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
 //==============================
 
 SchAxisDlg::SchAxisDlg( Window* pWindow
-                       , const InsertAxisOrGridDialogData& rInput, BOOL bAxisDlg )
+                       , const InsertAxisOrGridDialogData& rInput, sal_Bool bAxisDlg )
                        :
         ModalDialog( pWindow, SchResId( DLG_AXIS_OR_GRID )),
 
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index f8604ffbf..04a6a8a1a 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -118,7 +118,7 @@ double InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals(
             pExplicitValueProvider->getExplicitValuesForAxis( xAxis,aExplicitScale, aExplicitIncrement );
 
             fStepWidth = aExplicitIncrement.Distance;
-            if( aExplicitIncrement.SubIncrements.getLength()  && aExplicitIncrement.SubIncrements[0].IntervalCount>0 )
+            if( !aExplicitIncrement.SubIncrements.empty() && aExplicitIncrement.SubIncrements[0].IntervalCount>0 )
                 fStepWidth=fStepWidth/double(aExplicitIncrement.SubIncrements[0].IntervalCount);
             else
                 fStepWidth/=10;
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 5f71d5e29..c519be9c8 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -69,7 +69,7 @@ NumberFormatDialog::~NumberFormatDialog()
 
 SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool )
 {
-    static const USHORT nWhichPairs[] =    
+    static const sal_uInt16 nWhichPairs[] =    
     {
         SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO,
         SID_ATTR_NUMBERFORMAT_NOLANGUAGE, SID_ATTR_NUMBERFORMAT_NOLANGUAGE,
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 2a04b958f..d96af980d 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -56,7 +56,7 @@
 #include "ChartTypeHelper.hxx"
 #include "ObjectNameProvider.hxx"
 #include "DiagramHelper.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "AxisIndexDefines.hxx"
 #include "AxisHelper.hxx"
 #include "ExplicitCategoriesProvider.hxx"
@@ -181,7 +181,7 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
                 ScaleData aData( xAxis->getScaleData() );
                 if( chart2::AxisType::SERIES == aData.AxisType )
                     m_bHasScaleProperties = false;
-                if( chart2::AxisType::REALNUMBER == aData.AxisType || chart2::AxisType::PERCENT == aData.AxisType )
+                if( chart2::AxisType::SERIES != aData.AxisType )
                     m_bHasNumberProperties = true;
 
                 sal_Int32 nCooSysIndex=0;
@@ -336,8 +336,8 @@ bool ObjectPropertiesDialogParameter::IsComplexCategoriesAxis() const
     return m_bComplexCategoriesAxis;
 }
 
-//const USHORT nNoArrowDlg          = 1100;
-const USHORT nNoArrowNoShadowDlg    = 1101;
+//const sal_uInt16 nNoArrowDlg          = 1100;
+const sal_uInt16 nNoArrowNoShadowDlg    = 1101;
 
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
@@ -518,7 +518,7 @@ SchAttribTabDlg::~SchAttribTabDlg()
     delete m_pAutoSymbolGraphic;
 }
 
-void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
+void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     switch (nId)
@@ -623,7 +623,7 @@ void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
             break;
 
         case RID_SVXPAGE_NUMBERFORMAT:
-               aSet.Put (SvxNumberInfoItem( m_pNumberFormatter, (const USHORT)SID_ATTR_NUMBERFORMAT_INFO));
+               aSet.Put (SvxNumberInfoItem( m_pNumberFormatter, (const sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
             rPage.PageCreated(aSet);
             break;
 
diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index dfae2910b..6ce935c98 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -63,7 +63,7 @@ ShapeFontDialog::~ShapeFontDialog()
 {
 }
 
-void ShapeFontDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
+void ShapeFontDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
 {
     SfxAllItemSet aSet( *( GetInputSetImpl()->GetPool() ) );
     switch ( nId )
diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index ea464743b..4629cfbc8 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -69,7 +69,7 @@ ShapeParagraphDialog::~ShapeParagraphDialog()
 {
 }
 
-void ShapeParagraphDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
+void ShapeParagraphDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
 {
     SfxAllItemSet aSet( *( GetInputSetImpl()->GetPool() ) );
     switch ( nId )
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 424530637..3ed48493b 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star::chart2;
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 
-USHORT View3DDialog::m_nLastPageId = 0;
+sal_uInt16 View3DDialog::m_nLastPageId = 0;
 
 View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, XColorTable* pColorTable )
     : TabDialog(pParent,SchResId(DLG_3D_VIEW))
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index 5a0824406..ee0bac62b 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -92,15 +92,15 @@ void BarGeometryResources::Enable( bool bEnable )
     m_aLB_Geometry.Enable( bEnable );
 }
 
-USHORT BarGeometryResources::GetSelectEntryCount() const
+sal_uInt16 BarGeometryResources::GetSelectEntryCount() const
 {
     return m_aLB_Geometry.GetSelectEntryCount();
 }
-USHORT BarGeometryResources::GetSelectEntryPos() const
+sal_uInt16 BarGeometryResources::GetSelectEntryPos() const
 {
     return m_aLB_Geometry.GetSelectEntryPos();
 }
-void BarGeometryResources::SelectEntryPos( USHORT nPos )
+void BarGeometryResources::SelectEntryPos( sal_uInt16 nPos )
 {
     if( nPos < m_aLB_Geometry.GetEntryCount() )
         m_aLB_Geometry.SelectEntryPos( nPos );
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index e5135e627..0af8c8878 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -49,9 +49,9 @@ public:
     void Show( bool bShow );
     void Enable( bool bEnable );
 
-    USHORT GetSelectEntryCount() const;
-    USHORT GetSelectEntryPos() const;
-    void SelectEntryPos( USHORT nPos );
+    sal_uInt16 GetSelectEntryCount() const;
+    sal_uInt16 GetSelectEntryPos() const;
+    void SelectEntryPos( sal_uInt16 nPos );
 
     void SetSelectHdl( const Link& rLink );
 
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index b98172979..2061f4a31 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -65,11 +65,11 @@ namespace chart
 namespace
 {
 
-bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, USHORT nValueWhich, USHORT nSourceFormatWhich, ULONG& rnFormatKeyOut, bool& rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
+bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
 {
     bool bSet = false;
     const SfxPoolItem *pItem1 = NULL;
-    if( rSet.GetItemState( nValueWhich, TRUE, &pItem1 ) == SFX_ITEM_SET )
+    if( rSet.GetItemState( nValueWhich, sal_True, &pItem1 ) == SFX_ITEM_SET )
     {
         const SfxUInt32Item * pNumItem = dynamic_cast< const SfxUInt32Item * >( pItem1 );
         if( pNumItem )
@@ -81,7 +81,7 @@ bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, USHORT nValueWhich
 
     rbSourceFormatMixedStateOut=true;
     const SfxPoolItem *pItem2 = NULL;
-    if( rSet.GetItemState( nSourceFormatWhich, TRUE, &pItem2 ) == SFX_ITEM_SET )
+    if( rSet.GetItemState( nSourceFormatWhich, sal_True, &pItem2 ) == SFX_ITEM_SET )
     {
         const SfxBoolItem * pBoolItem = dynamic_cast< const SfxBoolItem * >( pItem2 );
         if( pBoolItem )
@@ -93,16 +93,16 @@ bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, USHORT nValueWhich
     return bSet;
 }
 
-void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, USHORT nWhichId, CheckBox& rCheckbox )
+void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 nWhichId, CheckBox& rCheckbox )
 {
-    rCheckbox.EnableTriState( FALSE );
+    rCheckbox.EnableTriState( sal_False );
 
     const SfxPoolItem *pPoolItem = NULL;
-    if( rInAttrs.GetItemState(nWhichId, TRUE, &pPoolItem) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState(nWhichId, sal_True, &pPoolItem) == SFX_ITEM_SET )
         rCheckbox.Check( ((const SfxBoolItem*)pPoolItem)->GetValue() );
     else
     {
-        rCheckbox.EnableTriState( TRUE );
+        rCheckbox.EnableTriState( sal_True );
         rCheckbox.SetState( STATE_DONTKNOW );
     }
 }
@@ -140,17 +140,17 @@ DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet& rInAt
     //fill label placement list
     std::map< sal_Int32, XubString > aPlacementToStringMap;
     for( sal_Int32 nEnum=0; nEnum<m_aLB_LabelPlacement.GetEntryCount(); ++nEnum )
-        aPlacementToStringMap[nEnum]=m_aLB_LabelPlacement.GetEntry(static_cast<USHORT>(nEnum));
+        aPlacementToStringMap[nEnum]=m_aLB_LabelPlacement.GetEntry(static_cast<sal_uInt16>(nEnum));
 
     ::com::sun::star::uno::Sequence < sal_Int32 > aAvailabelPlacementList;
     const SfxPoolItem *pPoolItem = NULL;
-    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, TRUE, &pPoolItem) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, sal_True, &pPoolItem) == SFX_ITEM_SET )
         aAvailabelPlacementList =((const SfxIntegerListItem*)pPoolItem)->GetConstSequence();
 
     m_aLB_LabelPlacement.Clear();
     for( sal_Int32 nN=0; nN<aAvailabelPlacementList.getLength(); ++nN )
     {
-        USHORT nListBoxPos = static_cast<USHORT>( nN );
+        sal_uInt16 nListBoxPos = static_cast<sal_uInt16>( nN );
         sal_Int32 nPlacement = aAvailabelPlacementList[nN];
         m_aPlacementToListBoxMap[nPlacement]=nListBoxPos;
         m_aListBoxToPlacementMap[nListBoxPos]=nPlacement;
@@ -212,7 +212,7 @@ DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet& rInAt
     m_bNumberFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_SOURCE, m_nNumberFormatForValue, m_bSourceFormatForValue, m_bSourceFormatMixedState );
     m_bPercentFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, m_nNumberFormatForPercent, m_bSourceFormatForPercent , m_bPercentSourceMixedState);
 
-    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_NO_PERCENTVALUE, TRUE, &pPoolItem) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_NO_PERCENTVALUE, sal_True, &pPoolItem) == SFX_ITEM_SET )
     {
         bool bForbidPercentValue = (static_cast< const SfxBoolItem & >( rInAttrs.Get( SCHATTR_DATADESCR_NO_PERCENTVALUE )).GetValue() );
         if( bForbidPercentValue )
@@ -245,11 +245,11 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton )
         m_aCBPercent.Check();
 
     SfxItemSet aNumberSet = NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( *m_pPool );
-    aNumberSet.Put (SvxNumberInfoItem( m_pNumberFormatter, (const USHORT)SID_ATTR_NUMBERFORMAT_INFO));
+    aNumberSet.Put (SvxNumberInfoItem( m_pNumberFormatter, (const sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
 
     bool bPercent = ( pButton == &m_aPB_NumberFormatForPercent );
 
-    ULONG& rnFormatKey = bPercent ? m_nNumberFormatForPercent : m_nNumberFormatForValue;
+    sal_uLong& rnFormatKey = bPercent ? m_nNumberFormatForPercent : m_nNumberFormatForValue;
     bool& rUseSourceFormat = bPercent ? m_bSourceFormatForPercent : m_bSourceFormatForValue;
     bool& rbMixedState = bPercent ? m_bPercentFormatMixedState : m_bNumberFormatMixedState;
     bool& rbSourceMixedState = bPercent ? m_bPercentSourceMixedState : m_bSourceFormatMixedState;
@@ -267,7 +267,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton )
         if( pResult )
         {
             bool bOldSource = rUseSourceFormat;
-            ULONG nOldFormat = rnFormatKey;
+            sal_uLong nOldFormat = rnFormatKey;
             bool bOldMixedState = rbMixedState || rbSourceMixedState;
 
             rbMixedState = !lcl_ReadNumberFormatFromItemSet( *pResult, SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_SOURCE, rnFormatKey, rUseSourceFormat, rbSourceMixedState );
@@ -283,7 +283,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton )
 IMPL_LINK( DataLabelResources, CheckHdl, CheckBox*, pBox )
 {
     if( pBox )
-        pBox->EnableTriState( FALSE );
+        pBox->EnableTriState( sal_False );
     EnableControls();
     return 0;
 }
@@ -320,7 +320,7 @@ void DataLabelResources::EnableControls()
     m_aNF_Degrees.Enable( bEnableRotation );
 }
 
-BOOL DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
+sal_Bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
 {
     if( m_aCBNumber.IsChecked() )
     {
@@ -347,7 +347,7 @@ BOOL DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
         rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYMBOL, m_aCBSymbol.IsChecked()) );
 
     rOutAttrs.Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, m_aSeparatorResources.GetValue() ) );
-    ::std::map< USHORT, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_aLB_LabelPlacement.GetSelectEntryPos()) );
+    ::std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_aLB_LabelPlacement.GetSelectEntryPos()) );
     if(aIt!=m_aListBoxToPlacementMap.end())
     {
         sal_Int32 nValue = aIt->second;
@@ -363,13 +363,13 @@ BOOL DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
         rOutAttrs.Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
 {
     // default state
-    m_aCBSymbol.Enable( FALSE );
+    m_aCBSymbol.Enable( sal_False );
 
     lcl_setBoolItemToCheckBox( rInAttrs, SCHATTR_DATADESCR_SHOW_NUMBER, m_aCBNumber );
     lcl_setBoolItemToCheckBox( rInAttrs, SCHATTR_DATADESCR_SHOW_PERCENTAGE, m_aCBPercent );
@@ -380,18 +380,18 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
     m_bPercentFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, m_nNumberFormatForPercent, m_bSourceFormatForPercent ,  m_bPercentSourceMixedState);
 
     const SfxPoolItem *pPoolItem = NULL;
-    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_SEPARATOR, TRUE, &pPoolItem) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_SEPARATOR, sal_True, &pPoolItem) == SFX_ITEM_SET )
         m_aSeparatorResources.SetValue( ((const SfxStringItem*)pPoolItem)->GetValue() );
     else
         m_aSeparatorResources.SetDefault();
 
-    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, TRUE, &pPoolItem) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, sal_True, &pPoolItem) == SFX_ITEM_SET )
     {
         sal_Int32 nPlacement = ((const SfxInt32Item*)pPoolItem)->GetValue();
-        ::std::map< sal_Int32, USHORT >::const_iterator aIt( m_aPlacementToListBoxMap.find(nPlacement) );
+        ::std::map< sal_Int32, sal_uInt16 >::const_iterator aIt( m_aPlacementToListBoxMap.find(nPlacement) );
         if(aIt!=m_aPlacementToListBoxMap.end())
         {
-            USHORT nPos = aIt->second;
+            sal_uInt16 nPos = aIt->second;
             m_aLB_LabelPlacement.SelectEntryPos( nPos );
         }
         else
@@ -400,10 +400,10 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
     else
         m_aLB_LabelPlacement.SetNoSelection();
 
-    if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, sal_True, &pPoolItem ) == SFX_ITEM_SET )
         m_aLB_TextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
 
-    if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, sal_True, &pPoolItem ) == SFX_ITEM_SET )
     {
         sal_Int32 nDegrees = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
         m_aDC_Dial.SetRotation( nDegrees );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index f15025d72..df6c2bc12 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -49,7 +49,7 @@ public:
     DataLabelResources( Window* pParent, const SfxItemSet& rInAttrs );
     virtual ~DataLabelResources();
 
-    BOOL FillItemSet(SfxItemSet& rOutAttrs) const;
+    sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const;
     void Reset(const SfxItemSet& rInAttrs);
 
     void SetNumberFormatter( SvNumberFormatter* pFormatter );
@@ -75,14 +75,14 @@ private:
     FixedText               m_aFT_TextDirection;
     TextDirectionListBox    m_aLB_TextDirection;
 
-    ::std::map< sal_Int32, USHORT > m_aPlacementToListBoxMap;
-    ::std::map< USHORT, sal_Int32 > m_aListBoxToPlacementMap;
+    ::std::map< sal_Int32, sal_uInt16 > m_aPlacementToListBoxMap;
+    ::std::map< sal_uInt16, sal_Int32 > m_aListBoxToPlacementMap;
 
     SvNumberFormatter*  m_pNumberFormatter;
     bool                m_bNumberFormatMixedState;
     bool                m_bPercentFormatMixedState;
-    ULONG               m_nNumberFormatForValue;
-    ULONG               m_nNumberFormatForPercent;
+    sal_uLong               m_nNumberFormatForValue;
+    sal_uLong               m_nNumberFormatForPercent;
 
     bool                m_bSourceFormatMixedState;
     bool                m_bPercentSourceMixedState;
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 7a1c337d2..44a17a196 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -51,8 +51,8 @@ void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog )
 {
     if( pDialog )
     {
-        pDialog->Show( bEnable ? FALSE : TRUE );
-        pDialog->SetModalInputMode( bEnable ? FALSE : TRUE );
+        pDialog->Show( bEnable ? sal_False : sal_True );
+        pDialog->SetModalInputMode( bEnable ? sal_False : sal_True );
     }
 }
 
@@ -162,7 +162,7 @@ ErrorBarResources::ErrorBarResources( Window* pParent, Dialog * pParentDialog,
     m_aRbRange.SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen ));
     m_aLbFunction.SetSelectHdl( LINK( this, ErrorBarResources, CategoryChosen ));
 
-    m_aCbSyncPosNeg.Check( FALSE );
+    m_aCbSyncPosNeg.Check( sal_False );
     m_aCbSyncPosNeg.SetToggleHdl( LINK( this, ErrorBarResources, SynchronizePosAndNeg ));
 
     m_aMfPositive.SetModifyHdl( LINK( this, ErrorBarResources, PosValueChanged ));
@@ -474,12 +474,12 @@ IMPL_LINK( ErrorBarResources, ChooseRange, RangeSelectionButton *, pButton )
     if( pButton == &m_aIbRangePositive )
     {
         m_pCurrentRangeChoosingField = &m_aEdRangePositive;
-        aUIString = ::rtl::OUString( String( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS )));
+        aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS ));
     }
     else
     {
         m_pCurrentRangeChoosingField = &m_aEdRangeNegative;
-        aUIString = ::rtl::OUString( String( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS )));
+        aUIString = String( SchResId( STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS ));
     }
 
     OSL_ASSERT( m_pParentDialog );
@@ -520,7 +520,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
 
     // category
      m_eErrorKind = CHERROR_NONE;
-    aState = rInAttrs.GetItemState( SCHATTR_STAT_KIND_ERROR, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_STAT_KIND_ERROR, sal_True, &pPoolItem );
     m_bErrorKindUnique = ( aState != SFX_ITEM_DONTCARE );
 
     if( aState == SFX_ITEM_SET )
@@ -554,14 +554,14 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
     }
     else
     {
-        m_aRbNone.Check( FALSE );
-        m_aRbConst.Check( FALSE );
-        m_aRbPercent.Check( FALSE );
-        m_aRbFunction.Check( FALSE );
+        m_aRbNone.Check( sal_False );
+        m_aRbConst.Check( sal_False );
+        m_aRbPercent.Check( sal_False );
+        m_aRbFunction.Check( sal_False );
     }
 
     // parameters
-    aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTPLUS, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTPLUS, sal_True, &pPoolItem );
     m_bPlusUnique = ( aState != SFX_ITEM_DONTCARE );
     double fPlusValue = 0.0;
     if( aState == SFX_ITEM_SET )
@@ -571,7 +571,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
         m_aMfPositive.SetValue( nPlusValue );
     }
 
-    aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, sal_True, &pPoolItem );
     m_bMinusUnique = ( aState != SFX_ITEM_DONTCARE );
     double fMinusValue = 0.0;
     if( aState == SFX_ITEM_SET )
@@ -586,7 +586,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
     }
 
     // indicator
-    aState = rInAttrs.GetItemState( SCHATTR_STAT_INDICATE, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_STAT_INDICATE, sal_True, &pPoolItem );
     m_bIndicatorUnique = ( aState != SFX_ITEM_DONTCARE );
     if( aState == SFX_ITEM_SET)
         m_eIndicate = ((const SvxChartIndicateItem * ) pPoolItem)->GetValue();
@@ -609,13 +609,13 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
     }
     else
     {
-        m_aRbBoth.Check( FALSE );
-        m_aRbPositive.Check( FALSE );
-        m_aRbNegative.Check( FALSE );
+        m_aRbBoth.Check( sal_False );
+        m_aRbPositive.Check( sal_False );
+        m_aRbNegative.Check( sal_False );
     }
 
     // ranges
-    aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_POS, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_POS, sal_True, &pPoolItem );
     m_bRangePosUnique = ( aState != SFX_ITEM_DONTCARE );
     if( aState == SFX_ITEM_SET )
     {
@@ -623,7 +623,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
         m_aEdRangePositive.SetText( sRangePositive );
     }
 
-    aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_NEG, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_STAT_RANGE_NEG, sal_True, &pPoolItem );
     m_bRangeNegUnique = ( aState != SFX_ITEM_DONTCARE );
     if( aState == SFX_ITEM_SET )
     {
@@ -638,7 +638,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
     UpdateControlStates();
 }
 
-BOOL ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
+sal_Bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
 {
     if( m_bErrorKindUnique )
         rOutAttrs.Put( SvxChartKindErrorItem( m_eErrorKind, SCHATTR_STAT_KIND_ERROR ));
@@ -691,7 +691,7 @@ BOOL ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void ErrorBarResources::FillValueSets()
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 19292ecaa..81e4b98f8 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -183,7 +183,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen
 
 IMPL_LINK( LegendPositionResources, PositionEnableHdl, void*, EMPTYARG )
 {
-    BOOL bEnable = m_aCbxShow.IsChecked();
+    sal_Bool bEnable = m_aCbxShow.IsChecked();
 
     m_aRbtLeft.Enable( bEnable );
     m_aRbtTop.Enable( bEnable );
@@ -201,7 +201,7 @@ void LegendPositionResources::initFromItemSet( const SfxItemSet& rInAttrs )
 
     const SfxPoolItem* pPoolItem = NULL;
     if( rInAttrs.GetItemState( SCHATTR_LEGEND_POS,
-                               TRUE, &pPoolItem ) != SFX_ITEM_SET )
+                               sal_True, &pPoolItem ) != SFX_ITEM_SET )
         pPoolItem = &(rInAttrs.GetPool()->GetDefaultItem( SCHATTR_LEGEND_POS ));
 
     if( pPoolItem )
@@ -210,16 +210,16 @@ void LegendPositionResources::initFromItemSet( const SfxItemSet& rInAttrs )
     switch( ePos )
     {
         case CHLEGEND_LEFT:
-            m_aRbtLeft.Check(TRUE);
+            m_aRbtLeft.Check(sal_True);
             break;
         case CHLEGEND_TOP:
-            m_aRbtTop.Check(TRUE);
+            m_aRbtTop.Check(sal_True);
             break;
         case CHLEGEND_RIGHT:
-            m_aRbtRight.Check(TRUE);
+            m_aRbtRight.Check(sal_True);
             break;
         case CHLEGEND_BOTTOM:
-            m_aRbtBottom.Check(TRUE);
+            m_aRbtBottom.Check(sal_True);
             break;
         default:
             break;
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx
index 45b57a663..e43dd42fd 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -124,7 +124,7 @@ Size TextSeparatorResources::GetCurrentListBoxSize() const
 
 void TextSeparatorResources::SetValue( const rtl::OUString& rSeparator )
 {
-    ::std::map< ::rtl::OUString, USHORT >::iterator aIter( m_aEntryMap.find(rSeparator) );
+    ::std::map< ::rtl::OUString, sal_uInt16 >::iterator aIter( m_aEntryMap.find(rSeparator) );
     if( aIter == m_aEntryMap.end() )
         m_aLB_Separator.SelectEntryPos( m_nDefaultPos );
     else
@@ -138,8 +138,8 @@ void TextSeparatorResources::SetDefault()
 
 rtl::OUString TextSeparatorResources::GetValue() const
 {
-    USHORT nPos = m_aLB_Separator.GetSelectEntryPos();
-    ::std::map< ::rtl::OUString, USHORT >::const_iterator aIter( m_aEntryMap.begin() );
+    sal_uInt16 nPos = m_aLB_Separator.GetSelectEntryPos();
+    ::std::map< ::rtl::OUString, sal_uInt16 >::const_iterator aIter( m_aEntryMap.begin() );
     while( aIter != m_aEntryMap.end() )
     {
         if(aIter->second==nPos )
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.hxx b/chart2/source/controller/dialogs/res_TextSeparator.hxx
index 949fa87ea..2c522f841 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.hxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.hxx
@@ -63,9 +63,9 @@ private:
     FixedText   m_aFT_Separator;
     ListBox     m_aLB_Separator;
 
-    ::std::map< ::rtl::OUString, USHORT > m_aEntryMap;
+    ::std::map< ::rtl::OUString, sal_uInt16 > m_aEntryMap;
 
-    const USHORT m_nDefaultPos;
+    const sal_uInt16 m_nDefaultPos;
 };
 
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index fbbdd80f7..0f5cbcb2c 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -126,7 +126,7 @@ TitleResources::~TitleResources()
 
 void TitleResources::SetUpdateDataHdl( const Link& rLink )
 {
-    ULONG nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT;
+    sal_uLong nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT;
 
     m_aEd_Main.EnableUpdateData( nTimeout );
     m_aEd_Main.SetUpdateDataHdl( rLink );
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index deaad8266..1ccc9c877 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -187,7 +187,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
     const SfxPoolItem *pPoolItem = NULL;
     SfxItemState aState = SFX_ITEM_UNKNOWN;
 
-    aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_TYPE, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_TYPE, sal_True, &pPoolItem );
     m_bTrendLineUnique = ( aState != SFX_ITEM_DONTCARE );
     if( aState == SFX_ITEM_SET )
     {
@@ -196,28 +196,28 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
             m_eTrendLineType = pItem->GetValue();
     }
 
-    aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_EQUATION, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_EQUATION, sal_True, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
-        m_aCBShowEquation.EnableTriState( TRUE );
+        m_aCBShowEquation.EnableTriState( sal_True );
         m_aCBShowEquation.SetState( STATE_DONTKNOW );
     }
     else
     {
-        m_aCBShowEquation.EnableTriState( FALSE );
+        m_aCBShowEquation.EnableTriState( sal_False );
         if( aState == SFX_ITEM_SET )
             m_aCBShowEquation.Check( static_cast< const SfxBoolItem * >( pPoolItem )->GetValue());
     }
 
-    aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_COEFF, TRUE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_COEFF, sal_True, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
-        m_aCBShowCorrelationCoeff.EnableTriState( TRUE );
+        m_aCBShowCorrelationCoeff.EnableTriState( sal_True );
         m_aCBShowCorrelationCoeff.SetState( STATE_DONTKNOW );
     }
     else
     {
-        m_aCBShowCorrelationCoeff.EnableTriState( FALSE );
+        m_aCBShowCorrelationCoeff.EnableTriState( sal_False );
         if( aState == SFX_ITEM_SET )
             m_aCBShowCorrelationCoeff.Check( static_cast< const SfxBoolItem * >( pPoolItem )->GetValue());
     }
@@ -246,7 +246,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
     }
 }
 
-BOOL TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
+sal_Bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
 {
     if( m_bTrendLineUnique )
         rOutAttrs.Put( SvxChartRegressItem( m_eTrendLineType, SCHATTR_REGRESSION_TYPE ));
@@ -254,7 +254,7 @@ BOOL TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
         rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_EQUATION, m_aCBShowEquation.IsChecked() ));
     if( m_aCBShowCorrelationCoeff.GetState() != STATE_DONTKNOW )
         rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_COEFF, m_aCBShowCorrelationCoeff.IsChecked() ));
-    return TRUE;
+    return sal_True;
 }
 
 void TrendlineResources::FillValueSets()
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 76b891c10..b40c8cfdb 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -44,7 +44,7 @@ public:
     virtual ~TrendlineResources();
 
     void Reset(const SfxItemSet& rInAttrs);
-    BOOL FillItemSet(SfxItemSet& rOutAttrs) const;
+    sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const;
 
     void FillValueSets();
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index f22e2c7df..1d3ece2f2 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -128,9 +128,9 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(
     m_aCB_Shading.SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectShading ) );
     m_aCB_ObjectLines.SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines ) );
 
-    m_aCB_RoundedEdge.EnableTriState( TRUE );
-    m_aCB_Shading.EnableTriState( TRUE );
-    m_aCB_ObjectLines.EnableTriState( TRUE );
+    m_aCB_RoundedEdge.EnableTriState( sal_True );
+    m_aCB_Shading.EnableTriState( sal_True );
+    m_aCB_ObjectLines.EnableTriState( sal_True );
 
     initControlsFromModel();
 }
@@ -220,50 +220,50 @@ void ThreeD_SceneAppearance_TabPage::initControlsFromModel()
 
     if(aProps.m_aShadeMode == drawing::ShadeMode_FLAT)
     {
-        m_aCB_Shading.EnableTriState( FALSE );
-        m_aCB_Shading.Check(FALSE);
+        m_aCB_Shading.EnableTriState( sal_False );
+        m_aCB_Shading.Check(sal_False);
     }
     else if(aProps.m_aShadeMode == drawing::ShadeMode_SMOOTH)
     {
-        m_aCB_Shading.EnableTriState( FALSE );
-        m_aCB_Shading.Check(TRUE);
+        m_aCB_Shading.EnableTriState( sal_False );
+        m_aCB_Shading.Check(sal_True);
     }
     else
     {
-        m_aCB_Shading.EnableTriState( TRUE );
+        m_aCB_Shading.EnableTriState( sal_True );
         m_aCB_Shading.SetState( STATE_DONTKNOW );
     }
 
     if(aProps.m_nObjectLines == 0)
     {
-        m_aCB_ObjectLines.EnableTriState( FALSE );
-        m_aCB_ObjectLines.Check(FALSE);
+        m_aCB_ObjectLines.EnableTriState( sal_False );
+        m_aCB_ObjectLines.Check(sal_False);
     }
     else if(aProps.m_nObjectLines==1)
     {
-        m_aCB_ObjectLines.EnableTriState( FALSE );
-        m_aCB_ObjectLines.Check(TRUE);
+        m_aCB_ObjectLines.EnableTriState( sal_False );
+        m_aCB_ObjectLines.Check(sal_True);
     }
     else
     {
-        m_aCB_ObjectLines.EnableTriState( TRUE );
+        m_aCB_ObjectLines.EnableTriState( sal_True );
         m_aCB_ObjectLines.SetState( STATE_DONTKNOW );
     }
 
     if(aProps.m_nRoundedEdges >= 5)
     {
-        m_aCB_RoundedEdge.EnableTriState( FALSE );
-        m_aCB_RoundedEdge.Check(TRUE);
+        m_aCB_RoundedEdge.EnableTriState( sal_False );
+        m_aCB_RoundedEdge.Check(sal_True);
     }
     else if(aProps.m_nRoundedEdges<0)
     {
-        m_aCB_RoundedEdge.EnableTriState( FALSE );
+        m_aCB_RoundedEdge.EnableTriState( sal_False );
         m_aCB_RoundedEdge.SetState( STATE_DONTKNOW );
     }
     else
     {
-        m_aCB_RoundedEdge.EnableTriState( TRUE );
-        m_aCB_RoundedEdge.Check(FALSE);
+        m_aCB_RoundedEdge.EnableTriState( sal_True );
+        m_aCB_RoundedEdge.Check(sal_False);
     }
     m_aCB_RoundedEdge.Enable( !m_aCB_ObjectLines.IsChecked() );
 
@@ -332,7 +332,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectShading, void*, EMPTYARG )
     if( !m_bUpdateOtherControls )
         return 0;
 
-    m_aCB_Shading.EnableTriState( FALSE );
+    m_aCB_Shading.EnableTriState( sal_False );
     applyShadeModeToModel();
     updateScheme();
     return 0;
@@ -344,15 +344,15 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, Check
 
     if( pCheckBox == &m_aCB_ObjectLines )
     {
-        m_aCB_ObjectLines.EnableTriState( FALSE );
+        m_aCB_ObjectLines.EnableTriState( sal_False );
         m_bUpdateOtherControls = false; 
         m_aCB_RoundedEdge.Enable( !m_aCB_ObjectLines.IsChecked() );
         if(!m_aCB_RoundedEdge.IsEnabled())
-            m_aCB_RoundedEdge.Check(FALSE);
+            m_aCB_RoundedEdge.Check(sal_False);
         m_bUpdateOtherControls = true;
     }
     else
-        m_aCB_RoundedEdge.EnableTriState( FALSE ); 
+        m_aCB_RoundedEdge.EnableTriState( sal_False ); 
     applyRoundedEdgeAndObjectLinesToModel();
     updateScheme();
     return 0;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 06cec9121..63a35a115 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -116,7 +116,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
     m_aMFYRotation.SetValue(m_nYRotation);
     m_aMFZRotation.SetValue(m_nZRotation);
 
-    const ULONG nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT;
+    const sal_uLong nTimeout = 4*EDIT_UPDATEDATA_TIMEOUT;
     Link aAngleChangedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleChanged ));
     Link aAngleEditedLink( LINK( this, ThreeD_SceneGeometry_TabPage, AngleEdited ));
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 2e8abdba2..6f077f1c2 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -164,13 +164,13 @@ namespace
     rtl::OUString lcl_makeColorName( Color rColor )
     {
         String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R));
-        aStr += String::CreateFromInt32((INT32)rColor.GetRed());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetRed());
         aStr += sal_Unicode(' ');
         aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G));
-        aStr += String::CreateFromInt32((INT32)rColor.GetGreen());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetGreen());
         aStr += sal_Unicode(' ');
         aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B));
-        aStr += String::CreateFromInt32((INT32)rColor.GetBlue());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetBlue());
         return aStr;
     }
     void lcl_selectColor( ColorListBox& rListBox, const Color& rColor )
@@ -179,7 +179,7 @@ namespace
         rListBox.SelectEntry( rColor );
         if( rListBox.GetSelectEntryCount() == 0 )
         {
-            USHORT nPos = rListBox.InsertEntry( rColor, lcl_makeColorName( rColor ) );
+            sal_uInt16 nPos = rListBox.InsertEntry( rColor, lcl_makeColorName( rColor ) );
             rListBox.SelectEntryPos( nPos );
         }
     }
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index fb291648f..1a850c876 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -83,7 +83,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn
 {
     FreeResource();
 
-    aCbStacked.EnableTriState( FALSE );
+    aCbStacked.EnableTriState( sal_False );
     aOrientHlp.AddDependentWindow( aFlOrient );
     aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK );
 
@@ -108,7 +108,7 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet& rAtt
     return new SchAxisLabelTabPage( pParent, rAttrs );
 }
 
-BOOL SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
 {
     bool bStacked = false;
     if( aOrientHlp.GetStackedState() != STATE_DONTKNOW )
@@ -142,20 +142,20 @@ BOOL SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
             bRadioButtonChecked = false;
 
         if( bRadioButtonChecked )
-            rOutAttrs.Put( SvxChartTextOrderItem( eOrder, SCHATTR_TEXT_ORDER ));
+            rOutAttrs.Put( SvxChartTextOrderItem( eOrder, SCHATTR_AXIS_LABEL_ORDER ));
     }
 
     if( aCbTextOverlap.GetState() != STATE_DONTKNOW )
-        rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_OVERLAP, aCbTextOverlap.IsChecked() ) );
+        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_OVERLAP, aCbTextOverlap.IsChecked() ) );
     if( aCbTextBreak.GetState() != STATE_DONTKNOW )
-        rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXTBREAK, aCbTextBreak.IsChecked() ) );
+        rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_BREAK, aCbTextBreak.IsChecked() ) );
     if( aCbShowDescription.GetState() != STATE_DONTKNOW )
         rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, aCbShowDescription.IsChecked() ) );
 
     if( m_aLbTextDirection.GetSelectEntryCount() > 0 )
         rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_aLbTextDirection.GetSelectEntryValue() ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
@@ -164,16 +164,16 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     SfxItemState aState = SFX_ITEM_UNKNOWN;
 
     // show description ----------
-    aState = rInAttrs.GetItemState( SCHATTR_AXIS_SHOWDESCR, FALSE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_AXIS_SHOWDESCR, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
-        aCbShowDescription.EnableTriState( TRUE );
+        aCbShowDescription.EnableTriState( sal_True );
         aCbShowDescription.SetState( STATE_DONTKNOW );
     }
     else
     {
-        aCbShowDescription.EnableTriState( FALSE );
-        BOOL bCheck = FALSE;
+        aCbShowDescription.EnableTriState( sal_False );
+        sal_Bool bCheck = sal_False;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         aCbShowDescription.Check( bCheck );
@@ -186,7 +186,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
 
     // check new degree item
     m_nInitialDegrees = 0;
-    aState = rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, FALSE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_SET )
         m_nInitialDegrees = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
 
@@ -198,7 +198,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
 
     // check stacked item
     m_bInitialStacking = false;
-    aState = rInAttrs.GetItemState( SCHATTR_TEXT_STACKED, FALSE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_TEXT_STACKED, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_SET )
         m_bInitialStacking = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
 
@@ -208,20 +208,20 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     else
         aOrientHlp.SetStackedState( STATE_DONTKNOW );
 
-    if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, sal_True, &pPoolItem ) == SFX_ITEM_SET )
         m_aLbTextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
 
     // Text overlap ----------
-    aState = rInAttrs.GetItemState( SCHATTR_TEXT_OVERLAP, FALSE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
-        aCbTextOverlap.EnableTriState( TRUE );
+        aCbTextOverlap.EnableTriState( sal_True );
         aCbTextOverlap.SetState( STATE_DONTKNOW );
     }
     else
     {
-        aCbTextOverlap.EnableTriState( FALSE );
-        BOOL bCheck = FALSE;
+        aCbTextOverlap.EnableTriState( sal_False );
+        sal_Bool bCheck = sal_False;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         aCbTextOverlap.Check( bCheck );
@@ -231,16 +231,16 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     }
 
     // text break ----------
-    aState = rInAttrs.GetItemState( SCHATTR_TEXTBREAK, FALSE, &pPoolItem );
+    aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_BREAK, sal_False, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
-        aCbTextBreak.EnableTriState( TRUE );
+        aCbTextBreak.EnableTriState( sal_True );
         aCbTextBreak.SetState( STATE_DONTKNOW );
     }
     else
     {
-        aCbTextBreak.EnableTriState( FALSE );
-        BOOL bCheck = FALSE;
+        aCbTextBreak.EnableTriState( sal_False );
+        sal_Bool bCheck = sal_False;
         if( aState == SFX_ITEM_SET )
             bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         aCbTextBreak.Check( bCheck );
@@ -256,7 +256,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     // text order ----------
     if( m_bShowStaggeringControls )
     {
-        aState = rInAttrs.GetItemState( SCHATTR_TEXT_ORDER, FALSE, &pPoolItem );
+        aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_ORDER, sal_False, &pPoolItem );
         if( aState == SFX_ITEM_SET )
         {
             SvxChartTextOrder eOrder = static_cast< const SvxChartTextOrderItem * >( pPoolItem )->GetValue();
@@ -282,7 +282,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     ToggleShowLabel( (void*)0 );
 }
 
-void SchAxisLabelTabPage::ShowStaggeringControls( BOOL bShowStaggeringControls )
+void SchAxisLabelTabPage::ShowStaggeringControls( sal_Bool bShowStaggeringControls )
 {
     m_bShowStaggeringControls = bShowStaggeringControls;
 
@@ -306,7 +306,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
 
 IMPL_LINK ( SchAxisLabelTabPage, ToggleShowLabel, void *, EMPTYARG )
 {
-    BOOL bEnable = ( aCbShowDescription.GetState() != STATE_NOCHECK );
+    sal_Bool bEnable = ( aCbShowDescription.GetState() != STATE_NOCHECK );
 
     aOrientHlp.Enable( bEnable );
     aFlOrder.Enable( bEnable );
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 00554b8a0..841b31ee7 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -70,7 +70,7 @@ private:
     FixedText               m_aFtTextDirection;
     TextDirectionListBox    m_aLbTextDirection;
 
-    BOOL                m_bShowStaggeringControls;
+    sal_Bool                m_bShowStaggeringControls;
 
     sal_Int32           m_nInitialDegrees;
     bool                m_bHasInitialDegrees;       /// false = DialControl in tristate
@@ -87,10 +87,10 @@ public:
     void	Construct();
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
-    virtual BOOL FillItemSet( SfxItemSet& rOutAttrs );
+    virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
     virtual void Reset( const SfxItemSet& rInAttrs );
 
-    void ShowStaggeringControls( BOOL bShowStaggeringControls );
+    void ShowStaggeringControls( sal_Bool bShowStaggeringControls );
     void SetComplexCategories( bool bComplexCategories );
 };
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 9c541d421..6d5032043 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -229,10 +229,10 @@ SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutA
     return new AxisPositionsTabPage(pWindow, rOutAttrs);
 }
 
-BOOL AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+sal_Bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     // axis line
-    USHORT nPos = m_aLB_CrossesAt.GetSelectEntryPos();
+    sal_uInt16 nPos = m_aLB_CrossesAt.GetSelectEntryPos();
     rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 ));
     if( 2==nPos )
     {
@@ -243,7 +243,7 @@ BOOL AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
     }
 
     // labels
-    USHORT nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos();
+    sal_uInt16 nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos();
     if( nLabelPos != LISTBOX_ENTRY_NOTFOUND )
         rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos ));
 
@@ -263,11 +263,11 @@ BOOL AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
     rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks));
     rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks));
 
-    USHORT nMarkPos = m_aLB_PlaceTicks.GetSelectEntryPos();
+    sal_uInt16 nMarkPos = m_aLB_PlaceTicks.GetSelectEntryPos();
     if( nMarkPos != LISTBOX_ENTRY_NOTFOUND )
         rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos ));
 
-    return TRUE;
+    return sal_True;
 }
 
 void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
@@ -281,7 +281,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
         for( sal_Int32 nN=0; nN<m_aCategories.getLength() && nN<nMaxCount; nN++ )
             m_aED_CrossesAtCategory.InsertEntry( m_aCategories[nN] );
 
-        USHORT nCount = m_aED_CrossesAtCategory.GetEntryCount();
+        sal_uInt16 nCount = m_aED_CrossesAtCategory.GetEntryCount();
         if( nCount>30 )
             nCount=30;
         m_aED_CrossesAtCategory.SetDropDownLineCount( nCount );
@@ -299,10 +299,10 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
     const SfxPoolItem *pPoolItem = NULL;
 
     //axis line
-    if(rInAttrs.GetItemState(SCHATTR_AXIS_POSITION,TRUE, &pPoolItem)== SFX_ITEM_SET)
+    if(rInAttrs.GetItemState(SCHATTR_AXIS_POSITION,sal_True, &pPoolItem)== SFX_ITEM_SET)
     {
         bool bZero = false;
-        USHORT nPos = (USHORT)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
+        sal_uInt16 nPos = (sal_uInt16)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
         if(nPos==0)
         {
             //switch to value
@@ -316,13 +316,13 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
             m_aLB_CrossesAt.SelectEntryPos( nPos );
         CrossesAtSelectHdl( (void*)0 );
 
-        if( rInAttrs.GetItemState(SCHATTR_AXIS_POSITION_VALUE,TRUE, &pPoolItem)== SFX_ITEM_SET || bZero )
+        if( rInAttrs.GetItemState(SCHATTR_AXIS_POSITION_VALUE,sal_True, &pPoolItem)== SFX_ITEM_SET || bZero )
         {
             double fCrossover = 0.0;
             if( !bZero )
                 fCrossover = (((const SvxDoubleItem*)pPoolItem)->GetValue());
             if( m_bCrossingAxisIsCategoryAxis )
-                m_aED_CrossesAtCategory.SelectEntryPos( static_cast<USHORT>(::rtl::math::round(fCrossover-1.0)) );
+                m_aED_CrossesAtCategory.SelectEntryPos( static_cast<sal_uInt16>(::rtl::math::round(fCrossover-1.0)) );
             else
                 m_aED_CrossesAt.SetValue(fCrossover);
         }
@@ -335,13 +335,13 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
     else
     {
         m_aLB_CrossesAt.SetNoSelection();
-        m_aED_CrossesAt.Enable( FALSE );
+        m_aED_CrossesAt.Enable( sal_False );
     }
 
     // Labels
-    if( rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_POSITION, FALSE, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_POSITION, sal_False, &pPoolItem ) == SFX_ITEM_SET )
     {
-        USHORT nPos = (USHORT)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
+        sal_uInt16 nPos = (sal_uInt16)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
         if( nPos < m_aLB_PlaceLabels.GetEntryCount() )
             m_aLB_PlaceLabels.SelectEntryPos( nPos );
     }
@@ -351,20 +351,20 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
 
     // Tick marks
     long nTicks=0,nMinorTicks=0;
-    if(rInAttrs.GetItemState(SCHATTR_AXIS_TICKS,TRUE, &pPoolItem)== SFX_ITEM_SET)
+    if(rInAttrs.GetItemState(SCHATTR_AXIS_TICKS,sal_True, &pPoolItem)== SFX_ITEM_SET)
         nTicks=((const SfxInt32Item*)pPoolItem)->GetValue();
-    if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,TRUE, &pPoolItem)== SFX_ITEM_SET)
+    if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,sal_True, &pPoolItem)== SFX_ITEM_SET)
         nMinorTicks=((const SfxInt32Item*)pPoolItem)->GetValue();
 
-    m_aCB_TicksInner.Check(BOOL(nTicks&CHAXIS_MARK_INNER));
-    m_aCB_TicksOuter.Check(BOOL(nTicks&CHAXIS_MARK_OUTER));
-    m_aCB_MinorInner.Check(BOOL(nMinorTicks&CHAXIS_MARK_INNER));
-    m_aCB_MinorOuter.Check(BOOL(nMinorTicks&CHAXIS_MARK_OUTER));
+    m_aCB_TicksInner.Check(sal_Bool(nTicks&CHAXIS_MARK_INNER));
+    m_aCB_TicksOuter.Check(sal_Bool(nTicks&CHAXIS_MARK_OUTER));
+    m_aCB_MinorInner.Check(sal_Bool(nMinorTicks&CHAXIS_MARK_INNER));
+    m_aCB_MinorOuter.Check(sal_Bool(nMinorTicks&CHAXIS_MARK_OUTER));
 
     // Tick position
-    if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, FALSE, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, sal_False, &pPoolItem ) == SFX_ITEM_SET )
     {
-        USHORT nPos = (USHORT)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
+        sal_uInt16 nPos = (sal_uInt16)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
         if( nPos < m_aLB_PlaceTicks.GetEntryCount() )
             m_aLB_PlaceTicks.SelectEntryPos( nPos );
     }
@@ -439,9 +439,9 @@ void AxisPositionsTabPage::SetNumFormatter( SvNumberFormatter* pFormatter )
     m_aED_CrossesAt.UseInputStringForFormatting();
     
     const SfxPoolItem *pPoolItem = NULL;
-    if( GetItemSet().GetItemState( SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+    if( GetItemSet().GetItemState( SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, sal_True, &pPoolItem ) == SFX_ITEM_SET )
     {
-        ULONG nFmt = (ULONG)((const SfxInt32Item*)pPoolItem)->GetValue();
+        sal_uLong nFmt = (sal_uLong)((const SfxInt32Item*)pPoolItem)->GetValue();
         m_aED_CrossesAt.SetFormatKey( nFmt );
     }
 }
@@ -463,7 +463,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning
 
 IMPL_LINK ( AxisPositionsTabPage, CrossesAtSelectHdl, void *, EMPTYARG )
 {
-    USHORT nPos = m_aLB_CrossesAt.GetSelectEntryPos();
+    sal_uInt16 nPos = m_aLB_CrossesAt.GetSelectEntryPos();
     m_aED_CrossesAt.Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis );
     m_aED_CrossesAtCategory.Show( (2==nPos) && m_bCrossingAxisIsCategoryAxis );
 
@@ -478,12 +478,12 @@ IMPL_LINK ( AxisPositionsTabPage, CrossesAtSelectHdl, void *, EMPTYARG )
 
 IMPL_LINK ( AxisPositionsTabPage, PlaceLabelsSelectHdl, void *, EMPTYARG )
 {
-    USHORT nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos();
+    sal_uInt16 nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos();
 
     bool bEnableTickmarkPlacement = (nLabelPos>1);
     if( bEnableTickmarkPlacement )
     {
-        USHORT nAxisPos = m_aLB_CrossesAt.GetSelectEntryPos();
+        sal_uInt16 nAxisPos = m_aLB_CrossesAt.GetSelectEntryPos();
         if( nLabelPos-2 == nAxisPos )
             bEnableTickmarkPlacement=false;
     }
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index ea5d2fc95..660ee8484 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -47,7 +47,7 @@ public:
     AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs );
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
-    virtual BOOL FillItemSet( SfxItemSet& rOutAttrs );
+    virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
     virtual void Reset( const SfxItemSet& rInAttrs );
     using TabPage::DeactivatePage;
     virtual int DeactivatePage( SfxItemSet* pItemSet = NULL );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 11a6d7ae8..ad1b45c53 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -228,7 +228,7 @@ void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter& rParameter
 void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter )
 {
     rParameter.b3DLook = m_aCB_3DLook.IsChecked();
-    USHORT nPos = m_aLB_Scheme.GetSelectEntryPos();
+    sal_uInt16 nPos = m_aLB_Scheme.GetSelectEntryPos();
     if( POS_3DSCHEME_SIMPLE == nPos )
         rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
     else if( POS_3DSCHEME_REALISTIC == nPos )
@@ -707,7 +707,7 @@ IMPL_LINK( SplineResourceGroup, SplineDetailsDialogHdl, void*, EMPTYARG )
     ChartTypeParameter aOldParameter;
     getSplinePropertiesDialog().fillParameter( aOldParameter, m_aCB_Splines.IsChecked() );
 
-    BOOL bOldSmoothLines = m_aCB_Splines.IsChecked();
+    sal_Bool bOldSmoothLines = m_aCB_Splines.IsChecked();
     m_aCB_Splines.Check();
     if( RET_OK == getSplinePropertiesDialog().Execute() )
     {
@@ -768,7 +768,7 @@ void GeometryResourceGroup::setPosition( const Point& rPoint )
 
 void GeometryResourceGroup::fillControls( const ChartTypeParameter& rParameter )
 {
-    USHORT nGeometry3D = static_cast<USHORT>(rParameter.nGeometry3D);
+    sal_uInt16 nGeometry3D = static_cast<sal_uInt16>(rParameter.nGeometry3D);
     m_aGeometryResources.SelectEntryPos(nGeometry3D);
     m_aGeometryResources.Enable(rParameter.b3DLook);
 }
@@ -1090,7 +1090,7 @@ void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bo
         bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() );
         m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, bIsHighContrast, rParameter );
     }
-    m_aSubTypeList.SelectItem( static_cast<USHORT>( rParameter.nSubTypeIndex) );
+    m_aSubTypeList.SelectItem( static_cast<sal_uInt16>( rParameter.nSubTypeIndex) );
     m_pAxisTypeResourceGroup->fillControls( rParameter );
     m_pDim3DLookResourceGroup->fillControls( rParameter );
     m_pStackingResourceGroup->fillControls( rParameter );
@@ -1115,7 +1115,7 @@ void ChartTypeTabPage::initializePage()
 
     ::std::vector< ChartTypeDialogController* >::iterator             aIter = m_aChartTypeDialogControllerList.begin();
     const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd  = m_aChartTypeDialogControllerList.end();
-    for( USHORT nM=0; aIter != aEnd; aIter++, nM++ )
+    for( sal_uInt16 nM=0; aIter != aEnd; aIter++, nM++ )
     {
         if( (*aIter)->isSubType(aServiceName) )
         {
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index a0a34f3f6..fdd74d62c 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -54,7 +54,7 @@ SfxTabPage* DataLabelsTabPage::Create(Window* pWindow,
     return new DataLabelsTabPage(pWindow, rOutAttrs);
 }
 
-BOOL DataLabelsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+sal_Bool DataLabelsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     return m_aDataLabelResources.FillItemSet(rOutAttrs);
 }
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index c71e4032f..5dc7f2ed3 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -52,7 +52,7 @@ public:
     void SetNumberFormatter( SvNumberFormatter* pFormatter );
 
     virtual void Reset(const SfxItemSet& rInAttrs);
-    virtual BOOL FillItemSet(SfxItemSet& rOutAttrs);
+    virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
 
 private:
     DataLabelResources  m_aDataLabelResources;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 79796414a..9970fbb35 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -151,7 +151,7 @@ static long lcl_pRoleListBoxTabs[] =
 void lcl_ShowChooserButton(
     ::chart::RangeSelectionButton & rChooserButton,
     Edit & rEditField,
-    BOOL bShow )
+    sal_Bool bShow )
 {
     if( rChooserButton.IsVisible() != bShow )
     {
@@ -169,8 +169,8 @@ void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog )
 {
     if( pDialog )
     {
-        pDialog->Show( bEnable ? FALSE : TRUE );
-        pDialog->SetModalInputMode( bEnable ? FALSE : TRUE );
+        pDialog->Show( bEnable ? sal_False : sal_True );
+        pDialog->SetModalInputMode( bEnable ? sal_False : sal_True );
     }
 }
 
@@ -459,7 +459,7 @@ void DataSourceTabPage::updateControlsFromDialogModel()
 
 void DataSourceTabPage::fillSeriesListBox()
 {
-    m_apLB_SERIES->SetUpdateMode( FALSE );
+    m_apLB_SERIES->SetUpdateMode( sal_False );
 
     Reference< XDataSeries > xSelected;
     SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected());
@@ -511,7 +511,7 @@ void DataSourceTabPage::fillSeriesListBox()
     if( bHasSelectedEntry && pSelectedEntry )
         m_apLB_SERIES->Select( pSelectedEntry );
 
-    m_apLB_SERIES->SetUpdateMode( TRUE );
+    m_apLB_SERIES->SetUpdateMode( sal_True );
 }
 
 void DataSourceTabPage::fillRoleListBox()
@@ -520,7 +520,7 @@ void DataSourceTabPage::fillRoleListBox()
     bool bHasSelectedEntry = (pSeriesEntry != 0);
 
     SvLBoxEntry * pRoleEntry =  m_aLB_ROLE.FirstSelected();
-    ULONG nRoleIndex = SAL_MAX_UINT32;
+    sal_uLong nRoleIndex = SAL_MAX_UINT32;
     if( pRoleEntry )
         nRoleIndex = m_aLB_ROLE.GetModel()->GetAbsPos( pRoleEntry );
 
@@ -533,7 +533,7 @@ void DataSourceTabPage::fillRoleListBox()
                 pSeriesEntry->m_xChartType ));
 
         // fill role list
-        m_aLB_ROLE.SetUpdateMode( FALSE );
+        m_aLB_ROLE.SetUpdateMode( sal_False );
         m_aLB_ROLE.Clear();
         m_aLB_ROLE.RemoveSelection();
 
@@ -551,7 +551,7 @@ void DataSourceTabPage::fillRoleListBox()
             m_aLB_ROLE.Select( m_aLB_ROLE.GetEntry( nRoleIndex ));
         }
 
-        m_aLB_ROLE.SetUpdateMode( TRUE );
+        m_aLB_ROLE.SetUpdateMode( sal_True );
     }
 }
 
@@ -578,7 +578,7 @@ void DataSourceTabPage::updateControlState()
 
     m_aFT_DATALABELS.Show(!bHasCategories);
     m_aFT_CATEGORIES.Show( bHasCategories);
-    BOOL bShowIB = bHasRangeChooser;
+    sal_Bool bShowIB = bHasRangeChooser;
     lcl_ShowChooserButton( m_aIMB_RANGE_CAT, m_aEDT_CATEGORIES, bShowIB );
 
     m_aFT_SERIES.Enable();
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index d20dc93d3..6760e3041 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -126,12 +126,12 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >
         getSelectionRangeListener();
 
-    /** @return </TRUE>, if the edit field contains a valid range entry. if no
-        XCellRangesAccess can be obtained, </TRUE> is returned.
+    /** @return </sal_True>, if the edit field contains a valid range entry. if no
+        XCellRangesAccess can be obtained, </sal_True> is returned.
      */
     bool isRangeFieldContentValid( Edit & rEdit );
 
-    /** @return </TRUE>, if the tab-page is in a consistent (commitable) state
+    /** @return </sal_True>, if the tab-page is in a consistent (commitable) state
      */
     bool isValid();
     void setDirty();
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 1e525f4bf..ff25f0412 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -61,7 +61,7 @@ SfxTabPage* ErrorBarsTabPage::Create(
     return new ErrorBarsTabPage( pParent, rOutAttrs );
 }
 
-BOOL ErrorBarsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+sal_Bool ErrorBarsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
 {
     return m_aErrorBarResources.FillItemSet( rOutAttrs );
 }
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index ccf77f9a7..77eae0315 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -49,7 +49,7 @@ public:
             ::com::sun::star::chart2::XChartDocument > & xChartDocument );
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
-    virtual BOOL FillItemSet( SfxItemSet& rOutAttrs );
+    virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
     virtual void Reset( const SfxItemSet& rInAttrs );
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 709b3fc0f..a78d8e1b8 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -64,14 +64,14 @@ SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow,
     return new SchLegendPosTabPage(pWindow, rOutAttrs);
 }
 
-BOOL SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+sal_Bool SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     m_apLegendPositionResources->writeToItemSet(rOutAttrs);
 
     if( m_aLbTextDirection.GetSelectEntryCount() > 0 )
         rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_aLbTextDirection.GetSelectEntryValue() ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs)
@@ -79,7 +79,7 @@ void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs)
     m_apLegendPositionResources->initFromItemSet(rInAttrs);
 
     const SfxPoolItem* pPoolItem = 0;
-    if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, sal_True, &pPoolItem ) == SFX_ITEM_SET )
         m_aLbTextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
 }
 
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index a70ba4ce3..c401a70f3 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -57,7 +57,7 @@ public:
     virtual ~SchLegendPosTabPage();
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
-    virtual BOOL FillItemSet(SfxItemSet& rOutAttrs);
+    virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
     virtual void Reset(const SfxItemSet& rInAttrs);
 };
 
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 5dd900e71..35c3dc051 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -66,7 +66,7 @@ SfxTabPage* SchLayoutTabPage::Create(Window* pWindow,
     return new SchLayoutTabPage(pWindow, rOutAttrs);
 }
 
-BOOL SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+sal_Bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
 
     if(m_pGeometryResources && m_pGeometryResources->GetSelectEntryCount())
@@ -81,19 +81,19 @@ BOOL SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
         rOutAttrs.Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape));
         rOutAttrs.Put(Svx3DHorizontalSegmentsItem(nSegs));
     }
-    return TRUE;
+    return sal_True;
 }
 
 void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs)
 {
     const SfxPoolItem *pPoolItem = NULL;
 
-    if (rInAttrs.GetItemState(SCHATTR_STYLE_SHAPE,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_STYLE_SHAPE,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
         if(m_pGeometryResources)
         {
-            m_pGeometryResources->SelectEntryPos(static_cast<USHORT>(nVal));
+            m_pGeometryResources->SelectEntryPos(static_cast<sal_uInt16>(nVal));
             m_pGeometryResources->Show( true );
         }
     }
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index 1796219a7..4cde56625 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -43,7 +43,7 @@ public:
     virtual ~SchLayoutTabPage();
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
-    virtual BOOL FillItemSet(SfxItemSet& rOutAttrs);
+    virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
     virtual void Reset(const SfxItemSet& rInAttrs);
 
 private:
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 8425741cd..d42085e66 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -65,7 +65,7 @@ SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet& rOutA
     return new PolarOptionsTabPage( pWindow, rOutAttrs );
 }
 
-BOOL PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+sal_Bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
 {
     if( m_aAngleDial.IsVisible() )
     {
@@ -79,7 +79,7 @@ BOOL PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
     if (m_aCB_IncludeHiddenCells.IsVisible())
         rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_aCB_IncludeHiddenCells.IsChecked()));
 
-    return TRUE;
+    return sal_True;
 }
 
 void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
@@ -87,7 +87,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
     const SfxPoolItem *pPoolItem = NULL;
 
     long nTmp;
-    if (rInAttrs.GetItemState(SCHATTR_STARTING_ANGLE, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_STARTING_ANGLE, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
 
@@ -95,29 +95,29 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
     }
     else
     {
-        m_aFL_StartingAngle.Show(FALSE);
-        m_aAngleDial.Show(FALSE);
-        m_aNF_StartingAngle.Show(FALSE);
-        m_aFT_Degrees.Show(FALSE);
+        m_aFL_StartingAngle.Show(sal_False);
+        m_aAngleDial.Show(sal_False);
+        m_aNF_StartingAngle.Show(sal_False);
+        m_aFT_Degrees.Show(sal_False);
     }
-    if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
-        BOOL bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+        sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_aCB_Clockwise.Check(bCheck);
     }
     else
     {
-        m_aCB_Clockwise.Show(FALSE);
+        m_aCB_Clockwise.Show(sal_False);
     }
-    if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
         m_aCB_IncludeHiddenCells.Check(bVal);
     }
     else
     {
-        m_aCB_IncludeHiddenCells.Show(FALSE);
-        m_aFL_PlotOptions.Show(FALSE);
+        m_aCB_IncludeHiddenCells.Show(sal_False);
+        m_aFL_PlotOptions.Show(sal_False);
     }
 }
 
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index 8c5791b71..2654d5519 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -46,7 +46,7 @@ public:
     virtual ~PolarOptionsTabPage();
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
-    virtual BOOL FillItemSet(SfxItemSet& rOutAttrs);
+    virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
     virtual void Reset(const SfxItemSet& rInAttrs);
     
 private:
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 9dbf77210..19f26110f 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -48,7 +48,7 @@ namespace
 void lcl_ShowChooserButton(
     ::chart::RangeSelectionButton & rChooserButton,
     Edit & rEditField,
-    BOOL bShow )
+    sal_Bool bShow )
 {
     if( rChooserButton.IsVisible() != bShow )
     {
@@ -65,8 +65,8 @@ void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog )
 {
     if( pDialog )
     {
-        pDialog->Show( bEnable ? FALSE : TRUE );
-        pDialog->SetModalInputMode( bEnable ? FALSE : TRUE );
+        pDialog->Show( bEnable ? sal_False : sal_True );
+        pDialog->SetModalInputMode( bEnable ? sal_False : sal_True );
     }
 }
 void lcl_shiftControlY( Control & rControl, long nYOffset )
@@ -341,7 +341,7 @@ bool RangeChooserTabPage::isValid()
         m_aCB_FirstRowAsLabel.Enable( bIsValid );
         m_aCB_FirstColumnAsLabel.Enable( bIsValid );
 }
-    BOOL bShowIB = m_rDialogModel.getRangeSelectionHelper()->hasRangeSelection();
+    sal_Bool bShowIB = m_rDialogModel.getRangeSelectionHelper()->hasRangeSelection();
     lcl_ShowChooserButton( m_aIB_Range, m_aED_Range, bShowIB );
 
     return bIsValid;
@@ -366,7 +366,7 @@ IMPL_LINK( RangeChooserTabPage, ChooseRangeHdl, void *, EMPTYARG )
 {
     rtl::OUString aRange = m_aED_Range.GetText();
     // using assignment for broken gcc 3.3
-    rtl::OUString aTitle = ::rtl::OUString( String( SchResId( STR_PAGE_DATA_RANGE ) ));
+    rtl::OUString aTitle = String( SchResId( STR_PAGE_DATA_RANGE ) );
 
     lcl_enableRangeChoosing( true, m_pParentDialog );
     m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 2f7085215..3652533a1 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -28,9 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_chart2.hxx"
 #include "tp_Scale.hxx"
+#include "tp_Scale.hrc"
 
 #include "ResId.hxx"
-#include "TabPages.hrc"
 #include "Strings.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
 #include "NoWarningThisInCTOR.hxx"
@@ -72,6 +72,20 @@ namespace chart
 namespace
 {
 
+void lcl_placeControlAtX( Control& rControl, long nNewXPos )
+{
+    Point aPos( rControl.GetPosPixel() );
+    aPos.X() = nNewXPos;
+    rControl.SetPosPixel(aPos);
+}
+
+void lcl_placeControlAtY( Control& rControl, long nNewYPos )
+{
+    Point aPos( rControl.GetPosPixel() );
+    aPos.Y() = nNewYPos;
+    rControl.SetPosPixel(aPos);
+}
+
 void lcl_shiftControls( Control& rEdit, Control& rAuto, long nNewXPos )
 {
     Point aPos( rEdit.GetPosPixel() );
@@ -84,16 +98,15 @@ void lcl_shiftControls( Control& rEdit, Control& rAuto, long nNewXPos )
     rAuto.SetPosPixel(aPos);
 }
 
-void lcl_placeControlsAtY( Control& rTop, Control& rBottom, long nNewYPos )
+long lcl_getLabelDistance( Control& rControl )
 {
-    Point aPos( rTop.GetPosPixel() );
-    long nShift = nNewYPos - aPos.Y();
-    aPos.Y() = nNewYPos;
-    rTop.SetPosPixel(aPos);
+    return rControl.LogicToPixel( Size(RSC_SP_CTRL_DESC_X, 0), MapMode(MAP_APPFONT) ).Width();
+}
 
-    aPos = rBottom.GetPosPixel();
-    aPos.Y() += nShift;
-    rBottom.SetPosPixel(aPos);
+void lcl_setValue( FormattedField& rFmtField, double fValue )
+{
+    rFmtField.SetValue( fValue );
+    rFmtField.SetDefaultValue( fValue );
 }
 
 }
@@ -102,32 +115,51 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     SfxTabPage(pWindow, SchResId(TP_SCALE), rInAttrs),
 
     aFlScale(this, SchResId(FL_SCALE)),
+
+    aCbxReverse(this, SchResId(CBX_REVERSE)),
+    aCbxLogarithm(this, SchResId(CBX_LOGARITHM)),
+    
+    m_aTxt_AxisType(this, SchResId (TXT_AXIS_TYPE)),
+    m_aLB_AxisType(this, SchResId(LB_AXIS_TYPE)),
+
     aTxtMin (this, SchResId (TXT_MIN)),
     aFmtFldMin(this, SchResId(EDT_MIN)),
     aCbxAutoMin(this, SchResId(CBX_AUTO_MIN)),
+
     aTxtMax(this, SchResId (TXT_MAX)),
     aFmtFldMax(this, SchResId(EDT_MAX)),
     aCbxAutoMax(this, SchResId(CBX_AUTO_MAX)),
+
+    m_aTxt_TimeResolution(this, SchResId (TXT_TIME_RESOLUTION)),
+    m_aLB_TimeResolution(this, SchResId(LB_TIME_RESOLUTION)),
+    m_aCbx_AutoTimeResolution(this, SchResId(CBX_AUTO_TIME_RESOLUTION)),
+
     aTxtMain (this, SchResId (TXT_STEP_MAIN)),
     aFmtFldStepMain(this, SchResId(EDT_STEP_MAIN)),
+    m_aMt_MainDateStep(this, SchResId(MT_MAIN_DATE_STEP)),
+    m_aLB_MainTimeUnit(this, SchResId(LB_MAIN_TIME_UNIT)),
     aCbxAutoStepMain(this, SchResId(CBX_AUTO_STEP_MAIN)),
+
+    aTxtHelpCount (this, SchResId (TXT_STEP_HELP_COUNT)),
     aTxtHelp (this, SchResId (TXT_STEP_HELP)),
     aMtStepHelp (this, SchResId (MT_STEPHELP)),
+    m_aLB_HelpTimeUnit(this, SchResId(LB_HELP_TIME_UNIT)),
     aCbxAutoStepHelp(this, SchResId(CBX_AUTO_STEP_HELP)),
     
     aTxtOrigin (this, SchResId (TXT_ORIGIN)),
     aFmtFldOrigin(this, SchResId(EDT_ORIGIN)),
     aCbxAutoOrigin(this, SchResId(CBX_AUTO_ORIGIN)),
-
-    aCbxLogarithm(this, SchResId(CBX_LOGARITHM)),
-    aCbxReverse(this, SchResId(CBX_REVERSE)),
-    
+        
     fMin(0.0),
     fMax(0.0),
     fStepMain(0.0),
     nStepHelp(0),
     fOrigin(0.0),
-    nAxisType(chart2::AxisType::REALNUMBER),
+    m_nTimeResolution(1),
+    m_nMainTimeUnit(1),
+    m_nHelpTimeUnit(1),
+    m_nAxisType(chart2::AxisType::REALNUMBER),
+    m_bAllowDateAxis(false),
     pNumFormatter(NULL),
     m_bShowAxisOrigin(false)
 {
@@ -139,6 +171,26 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     aCbxAutoStepMain.SetClickHdl(LINK(this, ScaleTabPage, EnableValueHdl));
     aCbxAutoStepHelp.SetClickHdl(LINK(this, ScaleTabPage, EnableValueHdl));
     aCbxAutoOrigin.SetClickHdl(LINK(this, ScaleTabPage, EnableValueHdl));
+    m_aCbx_AutoTimeResolution.SetClickHdl(LINK(this, ScaleTabPage, EnableValueHdl));
+
+    m_aLB_AxisType.SetDropDownLineCount(3);
+    m_aLB_AxisType.SetSelectHdl(LINK(this, ScaleTabPage, SelectAxisTypeHdl));    
+
+    m_aLB_TimeResolution.SetDropDownLineCount(3);
+    m_aLB_MainTimeUnit.SetDropDownLineCount(3);
+    m_aLB_HelpTimeUnit.SetDropDownLineCount(3);
+
+    aFmtFldMin.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+    aFmtFldMax.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+    aFmtFldStepMain.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+    aFmtFldOrigin.SetModifyHdl(LINK(this, ScaleTabPage, FmtFieldModifiedHdl));
+}
+
+IMPL_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField*, pFmtFied )
+{
+    if( pFmtFied )
+        pFmtFied->SetDefaultValue( pFmtFied->GetValue() );
+    return 0;
 }
 
 void ScaleTabPage::StateChanged( StateChangedType nType )
@@ -148,17 +200,20 @@ void ScaleTabPage::StateChanged( StateChangedType nType )
     if( nType == STATE_CHANGE_INITSHOW )  
         AdjustControlPositions();
 }
- 
+
 void ScaleTabPage::AdjustControlPositions()
 {
     //optimize position of the controls
     long nLabelWidth = ::std::max( aTxtMin.CalcMinimumSize().Width(), aTxtMax.CalcMinimumSize().Width() );
     nLabelWidth = ::std::max( aTxtMain.CalcMinimumSize().Width(), nLabelWidth );
     nLabelWidth = ::std::max( aTxtHelp.CalcMinimumSize().Width(), nLabelWidth );
+    nLabelWidth = ::std::max( aTxtHelpCount.CalcMinimumSize().Width(), nLabelWidth );
     nLabelWidth = ::std::max( aTxtOrigin.CalcMinimumSize().Width(), nLabelWidth );
+    nLabelWidth = ::std::max( m_aTxt_TimeResolution.CalcMinimumSize().Width(), nLabelWidth );
+    nLabelWidth = ::std::max( m_aTxt_AxisType.CalcMinimumSize().Width(), nLabelWidth );
     nLabelWidth+=1;
 
-    long nLabelDistance = aTxtMin.LogicToPixel( Size(RSC_SP_CTRL_DESC_X, 0), MapMode(MAP_APPFONT) ).Width();
+    long nLabelDistance = lcl_getLabelDistance(aTxtMin);
     long nNewXPos = aTxtMin.GetPosPixel().X() + nLabelWidth + nLabelDistance;
 
     //ensure that the auto checkboxes are wide enough and have correct size for calculation
@@ -167,9 +222,10 @@ void ScaleTabPage::AdjustControlPositions()
     aCbxAutoStepMain.SetSizePixel( aCbxAutoStepMain.CalcMinimumSize() );
     aCbxAutoStepHelp.SetSizePixel( aCbxAutoStepHelp.CalcMinimumSize() );
     aCbxAutoOrigin.SetSizePixel( aCbxAutoOrigin.CalcMinimumSize() );
+    m_aCbx_AutoTimeResolution.SetSizePixel( m_aCbx_AutoTimeResolution.CalcMinimumSize() );
     
     //ensure new pos is ok
-    long nWidthOfOtherControls = aCbxAutoMin.GetPosPixel().X() + aCbxAutoMin.GetSizePixel().Width() - aFmtFldMin.GetPosPixel().X();
+    long nWidthOfOtherControls = m_aLB_MainTimeUnit.GetPosPixel().X() + m_aLB_MainTimeUnit.GetSizePixel().Width() - aFmtFldMin.GetPosPixel().X();
     long nDialogWidth = GetSizePixel().Width();
 
     long nLeftSpace = nDialogWidth - nNewXPos - nWidthOfOtherControls;
@@ -181,85 +237,201 @@ void ScaleTabPage::AdjustControlPositions()
         aTxtMax.SetSizePixel(aSize);
         aTxtMain.SetSizePixel(aSize);
         aTxtHelp.SetSizePixel(aSize);
+        aTxtHelpCount.SetSizePixel(aSize);
         aTxtOrigin.SetSizePixel(aSize);
+        m_aTxt_TimeResolution.SetSizePixel(aSize);
+        m_aTxt_AxisType.SetSizePixel(aSize);
         
+        long nOrgAutoCheckX = aCbxAutoMin.GetPosPixel().X();
+        lcl_placeControlAtX( aCbxAutoStepMain, nOrgAutoCheckX );
+        lcl_placeControlAtX( aCbxAutoStepHelp, nOrgAutoCheckX );
+
         lcl_shiftControls( aFmtFldMin, aCbxAutoMin, nNewXPos );
         lcl_shiftControls( aFmtFldMax, aCbxAutoMax, nNewXPos );
         lcl_shiftControls( aFmtFldStepMain, aCbxAutoStepMain, nNewXPos );
+        lcl_placeControlAtX( m_aMt_MainDateStep, aFmtFldStepMain.GetPosPixel().X() );
         lcl_shiftControls( aMtStepHelp, aCbxAutoStepHelp, nNewXPos );
         lcl_shiftControls( aFmtFldOrigin, aCbxAutoOrigin, nNewXPos );
+        lcl_shiftControls( m_aLB_TimeResolution, m_aCbx_AutoTimeResolution, nNewXPos );
+        lcl_placeControlAtX( m_aLB_AxisType, nNewXPos );
+
+        nNewXPos = aCbxAutoStepMain.GetPosPixel().X() + aCbxAutoStepMain.GetSizePixel().Width() + nLabelDistance;
+        lcl_placeControlAtX( m_aLB_MainTimeUnit, nNewXPos );
+        lcl_placeControlAtX( m_aLB_HelpTimeUnit, nNewXPos );
     }
+    PlaceIntervalControlsAccordingToAxisType();
 }
 
-void ScaleTabPage::EnableControls()
+void ScaleTabPage::PlaceIntervalControlsAccordingToAxisType()
 {
-    bool bEnableForValueOrPercentAxis = chart2::AxisType::REALNUMBER == nAxisType || chart2::AxisType::PERCENT == nAxisType;
-    aFlScale.Enable( bEnableForValueOrPercentAxis );
-    aTxtMin.Enable( bEnableForValueOrPercentAxis );
-    aFmtFldMin.Enable( bEnableForValueOrPercentAxis );
-    aCbxAutoMin.Enable( bEnableForValueOrPercentAxis );
-    aTxtMax.Enable( bEnableForValueOrPercentAxis );
-    aFmtFldMax.Enable( bEnableForValueOrPercentAxis );
-    aCbxAutoMax.Enable( bEnableForValueOrPercentAxis );
-    aTxtMain.Enable( bEnableForValueOrPercentAxis );
-    aFmtFldStepMain.Enable( bEnableForValueOrPercentAxis );
-    aCbxAutoStepMain.Enable( bEnableForValueOrPercentAxis );
-    aTxtHelp.Enable( bEnableForValueOrPercentAxis );
-    aMtStepHelp.Enable( bEnableForValueOrPercentAxis );
-    aCbxAutoStepHelp.Enable( bEnableForValueOrPercentAxis );
-    aCbxLogarithm.Enable( bEnableForValueOrPercentAxis );
-
-    aTxtOrigin.Show( m_bShowAxisOrigin && bEnableForValueOrPercentAxis );
-    aFmtFldOrigin.Show( m_bShowAxisOrigin && bEnableForValueOrPercentAxis );
-    aCbxAutoOrigin.Show( m_bShowAxisOrigin && bEnableForValueOrPercentAxis );
-
-    long nNewYPos = aTxtOrigin.GetPosPixel().Y();
-    if( m_bShowAxisOrigin )
-        nNewYPos += ( aTxtOrigin.GetPosPixel().Y() - aTxtHelp.GetPosPixel().Y() );
-    lcl_placeControlsAtY( aCbxLogarithm, aCbxReverse, nNewYPos );
+    long nMinX = std::min( aCbxAutoStepMain.GetPosPixel().X(), m_aLB_MainTimeUnit.GetPosPixel().X() );
+    long nLabelDistance = lcl_getLabelDistance(aTxtMin);
+    long nListWidth = m_aLB_MainTimeUnit.GetSizePixel().Width();
+    
+    if( chart2::AxisType::DATE == m_nAxisType )
+    {
+        lcl_placeControlAtX( m_aLB_MainTimeUnit, nMinX );
+        lcl_placeControlAtX( m_aLB_HelpTimeUnit, nMinX );
+        long nSecondX = nMinX + nListWidth + nLabelDistance;
+        lcl_placeControlAtX( aCbxAutoStepMain, nSecondX );
+        lcl_placeControlAtX( aCbxAutoStepHelp, nSecondX );
+
+        long nOne = m_aMt_MainDateStep.LogicToPixel( Size(0, 1), MapMode(MAP_APPFONT) ).Height();
+
+        long nYMajor = m_aMt_MainDateStep.GetPosPixel().Y();
+        lcl_placeControlAtY( aCbxAutoStepMain , nYMajor+(3*nOne));
+        lcl_placeControlAtY( aTxtMain , nYMajor+nOne+nOne);
+
+        long nYMinor = m_aLB_HelpTimeUnit.GetPosPixel().Y();
+        lcl_placeControlAtY( aMtStepHelp , nYMinor );
+        lcl_placeControlAtY( aCbxAutoStepHelp , nYMinor+(3*nOne));
+    }
+    else
+    {
+        lcl_placeControlAtX( aCbxAutoStepMain, nMinX );
+        lcl_placeControlAtX( aCbxAutoStepHelp, nMinX );
+        long nSecondX = nMinX + aCbxAutoStepMain.GetSizePixel().Width() + nLabelDistance;
+        long nSecondXMax = GetSizePixel().Width() - nListWidth;
+        if( nSecondX > nSecondXMax )
+            nSecondX = nSecondXMax;
+        lcl_placeControlAtX( m_aLB_MainTimeUnit, nSecondX );
+        lcl_placeControlAtX( m_aLB_HelpTimeUnit, nSecondX );
+    }
 }
 
+void ScaleTabPage::EnableControls()
+{
+    bool bValueAxis = chart2::AxisType::REALNUMBER == m_nAxisType || chart2::AxisType::PERCENT == m_nAxisType || chart2::AxisType::DATE == m_nAxisType;
+    bool bDateAxis = chart2::AxisType::DATE == m_nAxisType;
+        
+    m_aTxt_AxisType.Show(m_bAllowDateAxis);
+    m_aLB_AxisType.Show(m_bAllowDateAxis);
+    
+    aCbxLogarithm.Show( bValueAxis && !bDateAxis );
+    aTxtMin.Show( bValueAxis );
+    aFmtFldMin.Show( bValueAxis );
+    aCbxAutoMin.Show( bValueAxis );
+    aTxtMax.Show( bValueAxis );
+    aFmtFldMax.Show( bValueAxis );
+    aCbxAutoMax.Show( bValueAxis );
+    aTxtMain.Show( bValueAxis );
+    aFmtFldStepMain.Show( bValueAxis );
+    aCbxAutoStepMain.Show( bValueAxis );
+    aTxtHelp.Show( bValueAxis );
+    aTxtHelpCount.Show( bValueAxis );
+    aMtStepHelp.Show( bValueAxis );
+    aCbxAutoStepHelp.Show( bValueAxis );
+    
+    aTxtOrigin.Show( m_bShowAxisOrigin && bValueAxis );
+    aFmtFldOrigin.Show( m_bShowAxisOrigin && bValueAxis );
+    aCbxAutoOrigin.Show( m_bShowAxisOrigin && bValueAxis );
+
+    aTxtHelpCount.Show( bValueAxis && !bDateAxis );
+    aTxtHelp.Show( bDateAxis );
+
+    m_aTxt_TimeResolution.Show( bDateAxis );
+    m_aLB_TimeResolution.Show( bDateAxis );
+    m_aCbx_AutoTimeResolution.Show( bDateAxis );
+
+    bool bWasDateAxis = m_aMt_MainDateStep.IsVisible();
+    if( bWasDateAxis != bDateAxis )
+    {
+        //transport value from one to other control
+        if( bWasDateAxis )
+            lcl_setValue( aFmtFldStepMain, m_aMt_MainDateStep.GetValue() );
+        else
+            m_aMt_MainDateStep.SetValue( static_cast<sal_Int32>(aFmtFldStepMain.GetValue()) );
+    }
+    aFmtFldStepMain.Show( bValueAxis && !bDateAxis );
+    m_aMt_MainDateStep.Show( bDateAxis );
+
+    m_aLB_MainTimeUnit.Show( bDateAxis );
+    m_aLB_HelpTimeUnit.Show( bDateAxis );
 
+    EnableValueHdl(&aCbxAutoMin);
+    EnableValueHdl(&aCbxAutoMax);
+    EnableValueHdl(&aCbxAutoStepMain);
+    EnableValueHdl(&aCbxAutoStepHelp);
+    EnableValueHdl(&aCbxAutoOrigin);
+    EnableValueHdl(&m_aCbx_AutoTimeResolution);
+}
 
 IMPL_LINK( ScaleTabPage, EnableValueHdl, CheckBox *, pCbx )
 {
+    bool bEnable = pCbx && !pCbx->IsChecked() && pCbx->IsEnabled();
     if (pCbx == &aCbxAutoMin)
     {
-        aFmtFldMin.Enable(!aCbxAutoMin.IsChecked());
+        aFmtFldMin.Enable( bEnable );
     }
     else if (pCbx == &aCbxAutoMax)
     {
-        aFmtFldMax.Enable(!aCbxAutoMax.IsChecked());
+        aFmtFldMax.Enable( bEnable );
     }
     else if (pCbx == &aCbxAutoStepMain)
     {
-        aFmtFldStepMain.Enable(!aCbxAutoStepMain.IsChecked());
+        aFmtFldStepMain.Enable( bEnable );
+        m_aMt_MainDateStep.Enable( bEnable );
+        m_aLB_MainTimeUnit.Enable( bEnable );
     }
     else if (pCbx == &aCbxAutoStepHelp)
     {
-        aMtStepHelp.Show ();
-        aMtStepHelp.Enable( ! aCbxAutoStepHelp.IsChecked() );
+        aMtStepHelp.Enable( bEnable );
+        m_aLB_HelpTimeUnit.Enable( bEnable );
+    }
+    else if (pCbx == &m_aCbx_AutoTimeResolution)
+    {
+        m_aLB_TimeResolution.Enable( bEnable );
     }
     else if (pCbx == &aCbxAutoOrigin)
     {
-        aFmtFldOrigin.Enable(!aCbxAutoOrigin.IsChecked());
+        aFmtFldOrigin.Enable( bEnable );
     }
     return 0;
 }
 
+enum AxisTypeListBoxEntry
+{
+    TYPE_AUTO=0,
+    TYPE_TEXT=1,
+    TYPE_DATE=2
+};
+
+IMPL_LINK( ScaleTabPage, SelectAxisTypeHdl, void *, EMPTYARG )
+{
+    sal_uInt16 nPos = m_aLB_AxisType.GetSelectEntryPos();
+    if( nPos==TYPE_DATE )
+        m_nAxisType = chart2::AxisType::DATE;
+    else
+        m_nAxisType = chart2::AxisType::CATEGORY;
+    if( chart2::AxisType::DATE == m_nAxisType )
+        aCbxLogarithm.Check(false);
+    EnableControls();
+    PlaceIntervalControlsAccordingToAxisType();
+    SetNumFormat();
+    return 0;
+}
+
 SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
 {
     return new ScaleTabPage(pWindow, rOutAttrs);
 }
 
-BOOL ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     DBG_ASSERT( pNumFormatter, "No NumberFormatter available" );
 
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN		 ,aCbxAutoMin.IsChecked()));
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX		 ,aCbxAutoMax.IsChecked()));
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,aCbxAutoStepHelp.IsChecked()));
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN   ,aCbxAutoOrigin.IsChecked()));
+    rOutAttrs.Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType));
+    if(m_bAllowDateAxis)
+        rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, TYPE_AUTO==m_aLB_AxisType.GetSelectEntryPos()));
+
+    bool bAutoScale = false;
+    if( m_nAxisType==chart2::AxisType::CATEGORY )
+        bAutoScale = true;//reset scaling for category charts
+
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN		 ,bAutoScale || aCbxAutoMin.IsChecked()));
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX		 ,bAutoScale || aCbxAutoMax.IsChecked()));
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,bAutoScale || aCbxAutoStepHelp.IsChecked()));
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN   ,bAutoScale || aCbxAutoOrigin.IsChecked()));
     rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM     ,aCbxLogarithm.IsChecked()));
     rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_REVERSE       ,aCbxReverse.IsChecked()));
     rOutAttrs.Put(SvxDoubleItem(fMax	 , SCHATTR_AXIS_MAX));
@@ -267,10 +439,16 @@ BOOL ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
     rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp));
     rOutAttrs.Put(SvxDoubleItem(fOrigin	 , SCHATTR_AXIS_ORIGIN));
 
-    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,aCbxAutoStepMain.IsChecked()));
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,bAutoScale || aCbxAutoStepMain.IsChecked()));
     rOutAttrs.Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN));
 
-    return TRUE;
+    rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,bAutoScale || m_aCbx_AutoTimeResolution.IsChecked()));
+    rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_TIME_RESOLUTION,m_nTimeResolution));
+
+    rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,m_nMainTimeUnit));
+    rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,m_nHelpTimeUnit));
+
+    return sal_True;
 }
 
 void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
@@ -280,63 +458,110 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
         return;
 
     const SfxPoolItem *pPoolItem = NULL;
-    nAxisType=chart2::AxisType::REALNUMBER;
-    if (rInAttrs.GetItemState(SCHATTR_AXISTYPE, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, sal_True, &pPoolItem) == SFX_ITEM_SET)
+        m_bAllowDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
+    m_nAxisType=chart2::AxisType::REALNUMBER;
+    if (rInAttrs.GetItemState(SCHATTR_AXISTYPE, sal_True, &pPoolItem) == SFX_ITEM_SET)
+        m_nAxisType = (int) ((const SfxInt32Item*)pPoolItem)->GetValue();
+    if( m_nAxisType==chart2::AxisType::DATE && !m_bAllowDateAxis )
+        m_nAxisType=chart2::AxisType::CATEGORY;
+    if( m_bAllowDateAxis )
     {
-        nAxisType = (int) ((const SfxInt32Item*)pPoolItem)->GetValue();
-        EnableControls();
+        bool bAutoDateAxis = false;
+        if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, sal_True, &pPoolItem) == SFX_ITEM_SET)
+            bAutoDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
+
+        sal_uInt16 nPos = 0;
+        if( m_nAxisType==chart2::AxisType::DATE )
+            nPos=TYPE_DATE;
+        else if( bAutoDateAxis )
+            nPos=TYPE_AUTO;
+        else
+            nPos=TYPE_TEXT;
+        m_aLB_AxisType.SelectEntryPos( nPos );
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MIN,TRUE,&pPoolItem) == SFX_ITEM_SET)
+    if( m_bAllowDateAxis )
+        aCbxReverse.SetHelpId("chart2:CheckBox:TP_SCALE:CBX_REVERSE:MayBeDateAxis");
+    else if( m_nAxisType==chart2::AxisType::CATEGORY || m_nAxisType==chart2::AxisType::SERIES )
+        aCbxReverse.SetHelpId("chart2:CheckBox:TP_SCALE:CBX_REVERSE:Category");
+        
+    PlaceIntervalControlsAccordingToAxisType();
+
+    aCbxAutoMin.Check( true );
+    aCbxAutoMax.Check( true );
+    aCbxAutoStepMain.Check( true );
+    aCbxAutoStepHelp.Check( true );
+    aCbxAutoOrigin.Check( true );
+    m_aCbx_AutoTimeResolution.Check( true );
+
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MIN,sal_True,&pPoolItem) == SFX_ITEM_SET)
         aCbxAutoMin.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_MIN,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_MIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         fMin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
-        aFmtFldMin.SetValue( fMin );
+        lcl_setValue( aFmtFldMin, fMin );
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MAX,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MAX,sal_True, &pPoolItem) == SFX_ITEM_SET)
         aCbxAutoMax.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_MAX,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_MAX,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         fMax = ((const SvxDoubleItem*)pPoolItem)->GetValue();
-        aFmtFldMax.SetValue( fMax );
+        lcl_setValue( aFmtFldMax, fMax );
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
         aCbxAutoStepMain.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_MAIN,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_MAIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         fStepMain = ((const SvxDoubleItem*)pPoolItem)->GetValue();
-        aFmtFldStepMain.SetValue( fStepMain );
+        lcl_setValue( aFmtFldStepMain, fStepMain );
+        m_aMt_MainDateStep.SetValue( static_cast<sal_Int32>(fStepMain) );
     }
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,sal_True, &pPoolItem) == SFX_ITEM_SET)
         aCbxAutoStepHelp.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_LOGARITHM,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_LOGARITHM,sal_True, &pPoolItem) == SFX_ITEM_SET)
         aCbxLogarithm.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_REVERSE,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_REVERSE,sal_True, &pPoolItem) == SFX_ITEM_SET)
         aCbxReverse.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_HELP,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_HELP,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         nStepHelp = ((const SfxInt32Item*)pPoolItem)->GetValue();
         aMtStepHelp.SetValue( nStepHelp );
     }
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
         aCbxAutoOrigin.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_ORIGIN,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_ORIGIN,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         fOrigin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
-        aFmtFldOrigin.SetValue( fOrigin );
+        lcl_setValue( aFmtFldOrigin, fOrigin );
     }
 
-    EnableValueHdl(&aCbxAutoMin);
-    EnableValueHdl(&aCbxAutoMax);
-    EnableValueHdl(&aCbxAutoStepMain);
-    EnableValueHdl(&aCbxAutoStepHelp);
-    EnableValueHdl(&aCbxAutoOrigin);
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,sal_True, &pPoolItem) == SFX_ITEM_SET)
+        m_aCbx_AutoTimeResolution.Check(((const SfxBoolItem*)pPoolItem)->GetValue());
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,sal_True, &pPoolItem) == SFX_ITEM_SET)
+    {
+        m_nTimeResolution = ((const SfxInt32Item*)pPoolItem)->GetValue();
+        m_aLB_TimeResolution.SelectEntryPos( m_nTimeResolution );
+    }
+
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,sal_True, &pPoolItem) == SFX_ITEM_SET)
+    {
+        m_nMainTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
+        m_aLB_MainTimeUnit.SelectEntryPos( m_nMainTimeUnit );
+    }
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,sal_True, &pPoolItem) == SFX_ITEM_SET)
+    {
+        m_nHelpTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
+        m_aLB_HelpTimeUnit.SelectEntryPos( m_nHelpTimeUnit );
+    }
+
+    EnableControls();
+    SetNumFormat();
 }
 
 int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
@@ -347,84 +572,116 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
         return LEAVE_PAGE;
     }
 
+    bool bDateAxis = chart2::AxisType::DATE == m_nAxisType;
+
     sal_uInt32 nIndex = pNumFormatter->GetStandardIndex(LANGUAGE_SYSTEM);
     const SfxPoolItem *pPoolItem = NULL;
-    if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+    if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
         nIndex = static_cast< sal_uInt32 >( static_cast< const SfxInt32Item* >(pPoolItem)->GetValue());
     else
     {
         OSL_ENSURE( false, "Using Standard Language" );
     }
 
-    Edit* pEdit = NULL;
-    USHORT nErrStrId = 0;
+    Control* pControl = NULL;
+    sal_uInt16 nErrStrId = 0;
     double fDummy;
 
     fMax = aFmtFldMax.GetValue();
     fMin = aFmtFldMin.GetValue();
     fOrigin = aFmtFldOrigin.GetValue();
-    fStepMain = aFmtFldStepMain.GetValue();
+    fStepMain = bDateAxis ? m_aMt_MainDateStep.GetValue() : aFmtFldStepMain.GetValue();
     nStepHelp = static_cast< sal_Int32 >( aMtStepHelp.GetValue());
+    m_nTimeResolution = m_aLB_TimeResolution.GetSelectEntryPos();
+    m_nMainTimeUnit = m_aLB_MainTimeUnit.GetSelectEntryPos();
+    m_nHelpTimeUnit = m_aLB_HelpTimeUnit.GetSelectEntryPos();
+
+    if( chart2::AxisType::REALNUMBER != m_nAxisType )
+        aCbxLogarithm.Show( false );
+
+    //check wich entries need user action
 
-    //do some reasonable automatic correction of user input if necessary
-    if (!aCbxAutoMax.IsChecked() && !aCbxAutoMin.IsChecked() &&
-             fMin >= fMax)
-    {
-        pEdit = &aFmtFldMin;
-        nErrStrId = STR_MIN_GREATER_MAX;
-    }
-    // check for entries in invalid ranges
     if ( aCbxLogarithm.IsChecked() &&
             ( ( !aCbxAutoMin.IsChecked() && fMin <= 0.0 )
              || ( !aCbxAutoMax.IsChecked() && fMax <= 0.0 ) ) )
     {
-        pEdit = &aFmtFldMin;
+        pControl = &aFmtFldMin;
         nErrStrId = STR_BAD_LOGARITHM;
     }
-    if (!aCbxAutoStepMain.IsChecked() && fStepMain <= 0)
+    else if (!aCbxAutoMax.IsChecked() && !aCbxAutoMin.IsChecked() &&
+             fMin >= fMax)
+    {
+        pControl = &aFmtFldMin;
+        nErrStrId = STR_MIN_GREATER_MAX;
+    }
+    else if (!aCbxAutoStepMain.IsChecked() && fStepMain <= 0)
     {
-        pEdit = &aFmtFldStepMain;
+        pControl = &aFmtFldStepMain;
         nErrStrId = STR_STEP_GT_ZERO;
     }
-    
-    //check wich entries need user action
-
     // check for entries that cannot be parsed for the current number format
-    if ( aFmtFldMin.IsModified()
+    else if ( aFmtFldMin.IsModified()
         && !aCbxAutoMin.IsChecked()
         && !pNumFormatter->IsNumberFormat(aFmtFldMin.GetText(), nIndex, fDummy))
     {
-        pEdit = &aFmtFldMin;
+        pControl = &aFmtFldMin;
         nErrStrId = STR_INVALID_NUMBER;
     }
     else if (aFmtFldMax.IsModified() && !aCbxAutoMax.IsChecked() &&
              !pNumFormatter->IsNumberFormat(aFmtFldMax.GetText(),
                                             nIndex, fDummy))
     {
-        pEdit = &aFmtFldMax;
+        pControl = &aFmtFldMax;
         nErrStrId = STR_INVALID_NUMBER;
     }
-    else if (aFmtFldStepMain.IsModified() && !aCbxAutoStepMain.IsChecked() &&
+    else if ( !bDateAxis && aFmtFldStepMain.IsModified() && !aCbxAutoStepMain.IsChecked() &&
              !pNumFormatter->IsNumberFormat(aFmtFldStepMain.GetText(),
                                             nIndex, fDummy))
     {
-        pEdit = &aFmtFldStepMain;
+        pControl = &aFmtFldStepMain;
         nErrStrId = STR_STEP_GT_ZERO;
     }
     else if (aFmtFldOrigin.IsModified() && !aCbxAutoOrigin.IsChecked() &&
              !pNumFormatter->IsNumberFormat(aFmtFldOrigin.GetText(),
                                             nIndex, fDummy))
     {
-        pEdit = &aFmtFldOrigin;
+        pControl = &aFmtFldOrigin;
         nErrStrId = STR_INVALID_NUMBER;
     }
     else if (!aCbxAutoStepMain.IsChecked() && fStepMain <= 0.0)
     {
-        pEdit = &aFmtFldStepMain;
+        pControl = &aFmtFldStepMain;
         nErrStrId = STR_STEP_GT_ZERO;
     }
+    else if( bDateAxis )
+    {
+        if( !aCbxAutoStepMain.IsChecked() && !aCbxAutoStepHelp.IsChecked() )
+        {
+            if( m_nHelpTimeUnit > m_nMainTimeUnit )
+            {
+                pControl = &m_aLB_MainTimeUnit;
+                nErrStrId = STR_INVALID_INTERVALS;
+            }
+            else if( m_nHelpTimeUnit == m_nMainTimeUnit && nStepHelp > fStepMain )
+            {
+                pControl = &m_aLB_MainTimeUnit;
+                nErrStrId = STR_INVALID_INTERVALS;
+            }
+        }
+        if( !nErrStrId && !m_aCbx_AutoTimeResolution.IsChecked() )
+        {
+            if( (!aCbxAutoStepMain.IsChecked() && m_nTimeResolution > m_nMainTimeUnit )
+                ||
+                (!aCbxAutoStepHelp.IsChecked() && m_nTimeResolution > m_nHelpTimeUnit )
+                )
+            {
+                pControl = &m_aLB_TimeResolution;
+                nErrStrId = STR_INVALID_TIME_UNIT;
+            }
+        }
+    }
     
-    if( ShowWarning( nErrStrId, pEdit ) )
+    if( ShowWarning( nErrStrId, pControl ) )
         return KEEP_PAGE;
 
     if( pItemSet )
@@ -457,9 +714,9 @@ void ScaleTabPage::SetNumFormat()
 {
     const SfxPoolItem *pPoolItem = NULL;
 
-    if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+    if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
     {
-        ULONG nFmt = (ULONG)((const SfxInt32Item*)pPoolItem)->GetValue();
+        sal_uLong nFmt = (sal_uLong)((const SfxInt32Item*)pPoolItem)->GetValue();
 
         aFmtFldMax.SetFormatKey( nFmt );
         aFmtFldMin.SetFormatKey( nFmt );
@@ -486,6 +743,19 @@ void ScaleTabPage::SetNumFormat()
                 else
                     nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_TIME );
             }
+
+            if( chart2::AxisType::DATE == m_nAxisType && ( eType != NUMBERFORMAT_DATE && eType != NUMBERFORMAT_DATETIME) )
+            {
+                const SvNumberformat* pFormat = pNumFormatter->GetEntry( nFmt );
+                if( pFormat )
+                    nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_DATE, pFormat->GetLanguage() );
+                else
+                    nFmt = pNumFormatter->GetStandardFormat( NUMBERFORMAT_DATE );
+
+                aFmtFldMax.SetFormatKey( nFmt );
+                aFmtFldMin.SetFormatKey( nFmt );
+                aFmtFldOrigin.SetFormatKey( nFmt );
+            }
         }
 
         aFmtFldStepMain.SetFormatKey( nFmt );
@@ -499,7 +769,7 @@ void ScaleTabPage::ShowAxisOrigin( bool bShowOrigin )
         m_bShowAxisOrigin = true;
 }
 
-bool ScaleTabPage::ShowWarning( USHORT nResIdMessage, Edit * pControl /* = NULL */ )
+bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* = NULL */ )
 {
     if( nResIdMessage == 0 )
         return false;
@@ -508,7 +778,9 @@ bool ScaleTabPage::ShowWarning( USHORT nResIdMessage, Edit * pControl /* = NULL
     if( pControl )
     {
         pControl->GrabFocus();
-        pControl->SetSelection( Selection( 0, SELECTION_MAX ));
+        Edit* pEdit = dynamic_cast<Edit*>(pControl);
+        if(pEdit)
+            pEdit->SetSelection( Selection( 0, SELECTION_MAX ));
     }
     return true;
 }
diff --git a/chart2/source/controller/dialogs/tp_Scale.hrc b/chart2/source/controller/dialogs/tp_Scale.hrc
new file mode 100644
index 000000000..83d2e27bc
--- /dev/null
+++ b/chart2/source/controller/dialogs/tp_Scale.hrc
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include "ResourceIds.hrc"
+
+#define FL_SCALE			1
+
+#define TXT_MIN				1
+#define TXT_MAX				2
+#define TXT_STEP_MAIN		3
+#define TXT_STEP_HELP_COUNT	4
+#define TXT_ORIGIN			5
+#define TXT_TIME_RESOLUTION 6
+#define TXT_AXIS_TYPE       7
+#define TXT_STEP_HELP       8
+
+#define CBX_AUTO_MIN		1
+#define CBX_AUTO_MAX		2
+#define CBX_AUTO_STEP_MAIN	3
+#define CBX_AUTO_STEP_HELP	4
+#define CBX_AUTO_ORIGIN		5
+#define CBX_LOGARITHM		6
+#define CBX_REVERSE         7
+#define CBX_AUTO_TIME_RESOLUTION 8
+
+#define EDT_STEP_MAIN		1
+#define EDT_MAX				2
+#define EDT_MIN				3
+#define EDT_ORIGIN          4
+
+#define MT_STEPHELP		    10
+#define MT_MAIN_DATE_STEP   11
+
+#define LB_AXIS_TYPE        1
+#define LB_MAIN_TIME_UNIT   2
+#define LB_HELP_TIME_UNIT   3
+#define LB_TIME_RESOLUTION  4
+
+#define STR_LIST_TIME_UNIT  1
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 2001b5f33..0fef2d34f 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -37,6 +37,8 @@
 #include <vcl/button.hxx>
 // header for MetricField
 #include <vcl/field.hxx>
+// header for class ListBox
+#include <vcl/lstbox.hxx>
 
 //.............................................................................
 namespace chart
@@ -49,7 +51,7 @@ public:
     ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
-    virtual BOOL FillItemSet( SfxItemSet& rOutAttrs );
+    virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
     virtual void Reset( const SfxItemSet& rInAttrs );
     using TabPage::DeactivatePage;
     virtual int DeactivatePage( SfxItemSet* pItemSet = NULL );
@@ -64,6 +66,13 @@ public:
 private:
     FixedLine			aFlScale;
 
+    CheckBox            aCbxReverse;
+
+    CheckBox			aCbxLogarithm;
+
+    FixedText			m_aTxt_AxisType;
+    ListBox             m_aLB_AxisType;
+
     FixedText			aTxtMin;
     FormattedField		aFmtFldMin;
     CheckBox			aCbxAutoMin;
@@ -72,35 +81,47 @@ private:
     FormattedField		aFmtFldMax;
     CheckBox			aCbxAutoMax;
 
+    FixedText           m_aTxt_TimeResolution;
+    ListBox             m_aLB_TimeResolution;
+    CheckBox			m_aCbx_AutoTimeResolution;
+
     FixedText           aTxtMain;
     FormattedField		aFmtFldStepMain;
+    MetricField         m_aMt_MainDateStep;
+    ListBox             m_aLB_MainTimeUnit;
     CheckBox			aCbxAutoStepMain;
 
+    FixedText           aTxtHelpCount;
     FixedText           aTxtHelp;
     MetricField         aMtStepHelp;
+    ListBox             m_aLB_HelpTimeUnit;
     CheckBox			aCbxAutoStepHelp;
 
     FixedText           aTxtOrigin;
     FormattedField		aFmtFldOrigin;
     CheckBox			aCbxAutoOrigin;
-    
-    CheckBox			aCbxLogarithm;
-    CheckBox            aCbxReverse;
-    
+           
     double				fMin;
     double				fMax;
     double				fStepMain;
     sal_Int32           nStepHelp;
     double				fOrigin;
-    int                 nAxisType;
+    sal_Int32           m_nTimeResolution;
+    sal_Int32           m_nMainTimeUnit;
+    sal_Int32           m_nHelpTimeUnit;
+    int                 m_nAxisType;
+    bool                m_bAllowDateAxis;
     SvNumberFormatter*	pNumFormatter;
 
     bool                m_bShowAxisOrigin;
     
     void AdjustControlPositions();
     void EnableControls();
+    void PlaceIntervalControlsAccordingToAxisType();
     
+    DECL_LINK( SelectAxisTypeHdl, void* );
     DECL_LINK( EnableValueHdl, CheckBox* );
+    DECL_LINK( FmtFieldModifiedHdl, FormattedField* );
     
     /** shows a warning window due to an invalid input.
 
@@ -115,7 +136,7 @@ private:
 
         @return false, if nResIdMessage was 0, true otherwise
      */
-    bool ShowWarning( USHORT nResIdMessage, Edit * pControl = NULL );
+    bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl = NULL );
 };
 
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src
index f4cc592f3..9290306ce 100644..100755
--- a/chart2/source/controller/dialogs/tp_Scale.src
+++ b/chart2/source/controller/dialogs/tp_Scale.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 #include "HelpIds.hrc"
-#include "TabPages.hrc"
+#include "tp_Scale.hrc"
 
 #define YLine1 3
 #define Y1 (YLine1+13)
@@ -33,17 +33,27 @@
 #define Y3 (Y2+16)
 #define Y4 (Y3+16)
 #define Y5 (Y4+16)
-#define Y6 (Y5+17)
-#define Y7 (Y6+15)
+#define Y6 (Y5+16)
+#define Y7 (Y6+16)
+#define Y8 (Y7+16)
 
 #define LABELWIDTH 88
-#define AUTOCHECKWIDTH 88
+#define AUTOCHECKWIDTH 41
 #define EDITWIDTH 50
 #define X1 6
 #define X2 11
 #define X3 (X2+LABELWIDTH+4)
 #define X4 (X3+EDITWIDTH+5)
+#define X5 (X4+AUTOCHECKWIDTH+5)
 
+#define STR_LIST_TIME_UNIT  \
+    StringList [ en-US ] = \
+    { \
+        "Days" ; \
+        "Months" ; \
+        "Years" ; \
+    };
+    
 TabPage TP_SCALE
 {
     HelpID = "chart2:TabPage:TP_SCALE";
@@ -57,86 +67,201 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Scale" ;
     };
-    FixedText TXT_MIN
+    //---------------------------
+    CheckBox CBX_REVERSE
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_REVERSE:ValueAxis";
         Pos = MAP_APPFONT ( X2 , Y1  ) ;
+        Size = MAP_APPFONT ( 244 , 10 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "~Reverse direction" ;
+    };
+    //---------------------------
+    CheckBox CBX_LOGARITHM
+    {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_LOGARITHM";
+        Pos = MAP_APPFONT ( X2 , Y2  ) ;
+        Size = MAP_APPFONT ( 244 , 10 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "~Logarithmic scale" ;
+    };
+    //---------------------------
+    FixedText TXT_AXIS_TYPE
+    {
+        Pos = MAP_APPFONT ( X2 , Y2  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "~Minimum:" ;
+        Text [ en-US ] = "T~ype" ;
+    };
+    ListBox LB_AXIS_TYPE
+    {
+        HelpID = "chart2:ListBox:TP_SCALE:LB_AXIS_TYPE";
+        Border = TRUE ;
+        AutoHScroll = TRUE ;
+        Pos = MAP_APPFONT ( X3 , Y2-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Group = TRUE ;
+        DropDown=TRUE;
+        DDExtraWidth = TRUE ;
+        
+        StringList [ en-US ] =
+        {
+            "Automatic" ;
+            "Text" ;
+            "Date" ;
+        };
+    };
+    //---------------------------
+    FixedText TXT_MIN
+    {
+        Pos = MAP_APPFONT ( X2 , Y3  ) ;
+        Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
+        Text [ en-US ] = "~Minimum" ;
     };
     SpinField EDT_MIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_MIN";
         Border = TRUE ;
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y1-2 ) ;
+        Pos = MAP_APPFONT ( X3 , Y3-2 ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
     CheckBox CBX_AUTO_MIN
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN";
-        Pos = MAP_APPFONT ( X4 , Y1-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y3+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Automatic" ;
     };
-    
+    //---------------------------
     FixedText TXT_MAX
     {
-        Pos = MAP_APPFONT ( X2 , Y2  ) ;
+        Pos = MAP_APPFONT ( X2 , Y4  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "Ma~ximum:" ;
+        Text [ en-US ] = "Ma~ximum" ;
     };
     SpinField EDT_MAX
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_MAX";
         Border = TRUE ;
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y2-2  ) ;
+        Pos = MAP_APPFONT ( X3 , Y4-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
     CheckBox CBX_AUTO_MAX
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX";
-        Pos = MAP_APPFONT ( X4 , Y2-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y4+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "A~utomatic" ;
     };
+    //---------------------------
+    FixedText TXT_TIME_RESOLUTION
+    {
+        Pos = MAP_APPFONT ( X2 , Y5  ) ;
+        Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
+        Text [ en-US ] = "R~esolution" ;
+    };
+    ListBox LB_TIME_RESOLUTION
+    {
+        HelpID = "chart2:ListBox:TP_SCALE:LB_TIME_RESOLUTION";
+        Border = TRUE ;
+        AutoHScroll = TRUE ;
+        Pos = MAP_APPFONT ( X3 , Y5-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Group = TRUE ;
+        DropDown=TRUE;
+        DDExtraWidth = TRUE ;
+        
+        STR_LIST_TIME_UNIT
+    };
+    CheckBox CBX_AUTO_TIME_RESOLUTION
+    {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_TIME_RESOLUTION";
+        Pos = MAP_APPFONT ( X4 , Y5+1  ) ;
+        Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "Automat~ic" ;
+    };
+    //---------------------------
     FixedText TXT_STEP_MAIN
     {
-        Pos = MAP_APPFONT ( X2 , Y3  ) ;
+        Pos = MAP_APPFONT ( X2 , Y5  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "Ma~jor interval:" ;
+        Text [ en-US ] = "Ma~jor interval" ;
     };
     SpinField EDT_STEP_MAIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_STEP_MAIN";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y3-2  ) ;
+        Pos = MAP_APPFONT ( X3 , Y5-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
+    MetricField MT_MAIN_DATE_STEP
+    {
+        HelpID = "chart2:MetricField:TP_SCALE:MT_MAIN_DATE_STEP";
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( X3 , Y6-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 1 ;
+        Maximum = 100000 ;
+        StrictFormat = TRUE ;
+        Unit = FUNIT_CUSTOM ;
+        First = 1 ;
+        Last = 100000 ;
+        SpinSize = 1 ;
+    };
+        
+    ListBox LB_MAIN_TIME_UNIT
+    {
+        HelpID = "chart2:ListBox:TP_SCALE:LB_MAIN_TIME_UNIT";
+        Border = TRUE ;
+        AutoHScroll = TRUE ;
+        Pos = MAP_APPFONT ( X5 , Y6-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Group = TRUE ;
+        DropDown=TRUE;
+        DDExtraWidth = TRUE ;
+        
+        STR_LIST_TIME_UNIT
+    };
+    
     CheckBox CBX_AUTO_STEP_MAIN
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN";
-        Pos = MAP_APPFONT ( X4 , Y3-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y5+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Au~tomatic" ;
     };
+    //---------------------------
+    FixedText TXT_STEP_HELP_COUNT
+    {
+        Pos = MAP_APPFONT ( X2 , Y6  ) ;
+        Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
+        Text [ en-US ] = "Minor inter~val count" ;
+    };
     FixedText TXT_STEP_HELP
     {
-        Pos = MAP_APPFONT ( X2 , Y4  ) ;
+        Pos = MAP_APPFONT ( X2 , Y7  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "Minor interval ~count:" ;
+        Text [ en-US ] = "Minor inter~val" ;
     };
     MetricField MT_STEPHELP
     {
         HelpID = "chart2:MetricField:TP_SCALE:MT_STEPHELP";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y4-2  ) ;
+        Pos = MAP_APPFONT ( X3 , Y6-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -149,55 +274,51 @@ TabPage TP_SCALE
         Last = 100 ;
         SpinSize = 1 ;
     };
+    ListBox LB_HELP_TIME_UNIT
+    {
+        HelpID = "chart2:ListBox:TP_SCALE:LB_HELP_TIME_UNIT";
+        Border = TRUE ;
+        AutoHScroll = TRUE ;
+        Pos = MAP_APPFONT ( X5 , Y7-2  ) ;
+        Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
+        TabStop = TRUE ;
+        Group = TRUE ;
+        DropDown=TRUE;
+        DDExtraWidth = TRUE ;
+        
+        STR_LIST_TIME_UNIT
+    };
     CheckBox CBX_AUTO_STEP_HELP
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP";
-        Pos = MAP_APPFONT ( X4 , Y4-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y6+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Aut~omatic" ;
     };
-    
+    //---------------------------
     FixedText TXT_ORIGIN
     {
-        Pos = MAP_APPFONT ( X2 , Y5  ) ;
+        Pos = MAP_APPFONT ( X2 , Y7  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
-        Text [ en-US ] = "Reference ~value:" ;
+        Text [ en-US ] = "Re~ference value" ;
     };
     SpinField EDT_ORIGIN
     {
         HelpID = "chart2:SpinField:TP_SCALE:EDT_ORIGIN";
         Border = TRUE ;
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( X3 , Y5-2  ) ;
+        Pos = MAP_APPFONT ( X3 , Y7-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
     CheckBox CBX_AUTO_ORIGIN
     {
         HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN";
-        Pos = MAP_APPFONT ( X4 , Y5-1  ) ;
+        Pos = MAP_APPFONT ( X4 , Y7+1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Automat~ic" ;
     };
-    
-    CheckBox CBX_LOGARITHM
-    {
-        HelpID = "chart2:CheckBox:TP_SCALE:CBX_LOGARITHM";
-        Pos = MAP_APPFONT ( X2 , Y6  ) ;
-        Size = MAP_APPFONT ( 244 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Logarithmic scale" ;
-    };
-        
-    CheckBox CBX_REVERSE
-    {
-        HelpID = "chart2:CheckBox:TP_SCALE:CBX_REVERSE";
-        Pos = MAP_APPFONT ( X2 , Y7  ) ;
-        Size = MAP_APPFONT ( 244 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Reverse direction" ;
-    };
-    
+    //---------------------------    
 };
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 97fc327c8..bcf88bade 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -96,7 +96,7 @@ SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs
     return new SchOptionTabPage(pWindow, rOutAttrs);
 }
 
-BOOL SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+sal_Bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     if(aRbtAxis2.IsChecked())
         rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_SECONDARY_Y));
@@ -127,113 +127,113 @@ BOOL SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
     if (m_aCBIncludeHiddenCells.IsVisible())
         rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_aCBIncludeHiddenCells.IsChecked()));
 
-    return TRUE;
+    return sal_True;
 }
 
 void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
 {
     const SfxPoolItem *pPoolItem = NULL;
 
-    aRbtAxis1.Check(TRUE);
-    aRbtAxis2.Check(FALSE);
-    if (rInAttrs.GetItemState(SCHATTR_AXIS,TRUE, &pPoolItem) == SFX_ITEM_SET)
+    aRbtAxis1.Check(sal_True);
+    aRbtAxis2.Check(sal_False);
+    if (rInAttrs.GetItemState(SCHATTR_AXIS,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
         if(nVal==CHART_AXIS_SECONDARY_Y)
         {
-            aRbtAxis2.Check(TRUE);
-            aRbtAxis1.Check(FALSE);
+            aRbtAxis2.Check(sal_True);
+            aRbtAxis1.Check(sal_False);
         }
     }
 
     long nTmp;
-    if (rInAttrs.GetItemState(SCHATTR_BAR_GAPWIDTH, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_BAR_GAPWIDTH, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
         aMTGap.SetValue(nTmp);
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_BAR_OVERLAP, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_BAR_OVERLAP, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
         aMTOverlap.SetValue(nTmp);
     }
     
-    if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
-        BOOL bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+        sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         aCBConnect.Check(bCheck);
     }
     
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
         aCBAxisSideBySide.Disable();
     }
-    if (rInAttrs.GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         // model property is "group bars per axis", UI feature is the other way
         // round: "show bars side by side"
-        BOOL bCheck = ! static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+        sal_Bool bCheck = ! static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         aCBAxisSideBySide.Check( bCheck );
     }
     else
     {
-        aCBAxisSideBySide.Show(FALSE);
+        aCBAxisSideBySide.Show(sal_False);
     }
 
 
     //missing value treatment
     {
         ::com::sun::star::uno::Sequence < sal_Int32 > aMissingValueTreatments;
-        if( rInAttrs.GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, TRUE, &pPoolItem) == SFX_ITEM_SET )
+        if( rInAttrs.GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, sal_True, &pPoolItem) == SFX_ITEM_SET )
             aMissingValueTreatments =((const SfxIntegerListItem*)pPoolItem)->GetConstSequence();
 
-        if ( aMissingValueTreatments.getLength()>1 && rInAttrs.GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,TRUE, &pPoolItem) == SFX_ITEM_SET)
+        if ( aMissingValueTreatments.getLength()>1 && rInAttrs.GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,sal_True, &pPoolItem) == SFX_ITEM_SET)
         {
-            m_aRB_DontPaint.Enable(FALSE);
-            m_aRB_AssumeZero.Enable(FALSE);
-            m_aRB_ContinueLine.Enable(FALSE);
+            m_aRB_DontPaint.Enable(sal_False);
+            m_aRB_AssumeZero.Enable(sal_False);
+            m_aRB_ContinueLine.Enable(sal_False);
             
             for( sal_Int32 nN =0; nN<aMissingValueTreatments.getLength(); nN++ )
             {
                 sal_Int32 nVal = aMissingValueTreatments[nN];
                 if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)
-                    m_aRB_DontPaint.Enable(TRUE);
+                    m_aRB_DontPaint.Enable(sal_True);
                 else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO)
-                    m_aRB_AssumeZero.Enable(TRUE);
+                    m_aRB_AssumeZero.Enable(sal_True);
                 else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE)
-                    m_aRB_ContinueLine.Enable(TRUE);
+                    m_aRB_ContinueLine.Enable(sal_True);
             }
 
             long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
             if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)
-                m_aRB_DontPaint.Check(TRUE);
+                m_aRB_DontPaint.Check(sal_True);
             else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO)
-                m_aRB_AssumeZero.Check(TRUE);
+                m_aRB_AssumeZero.Check(sal_True);
             else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE)
-                m_aRB_ContinueLine.Check(TRUE);
+                m_aRB_ContinueLine.Check(sal_True);
         }
         else
         {
-            m_aFT_MissingValues.Show(FALSE);
-            m_aRB_DontPaint.Show(FALSE);
-            m_aRB_AssumeZero.Show(FALSE);
-            m_aRB_ContinueLine.Show(FALSE);
+            m_aFT_MissingValues.Show(sal_False);
+            m_aRB_DontPaint.Show(sal_False);
+            m_aRB_AssumeZero.Show(sal_False);
+            m_aRB_ContinueLine.Show(sal_False);
         }
     }
 
     // Include hidden cells
-    if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
         m_aCBIncludeHiddenCells.Check(bVal);
     }
     else
     {
-        m_aCBIncludeHiddenCells.Show(FALSE);
+        m_aCBIncludeHiddenCells.Show(sal_False);
         if(!m_aFT_MissingValues.IsVisible())
-            m_aFL_PlotOptions.Show(FALSE);
+            m_aFL_PlotOptions.Show(sal_False);
     }
 
     AdaptControlPositionsAndVisibility();
@@ -275,7 +275,7 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility()
     
     if( !aMTGap.IsVisible() && !aMTOverlap.IsVisible() )
     {
-        aGrpBar.Show(FALSE);
+        aGrpBar.Show(sal_False);
         Point aPos;
         if( !aRbtAxis1.IsVisible() && !aRbtAxis2.IsVisible() )
             aPos = aGrpAxis.GetPosPixel();
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index afd644d56..d03334593 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -50,7 +50,7 @@ public:
     virtual ~SchOptionTabPage();
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
-    virtual BOOL FillItemSet(SfxItemSet& rOutAttrs);
+    virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
     virtual void Reset(const SfxItemSet& rInAttrs);
 
     void Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlapAndGapWidth, bool bProvidesBarConnectors );
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 9adbb66b2..5e39ea5df 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -58,7 +58,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow,
 {
     FreeResource();
 
-    aCbStacked.EnableTriState( FALSE );
+    aCbStacked.EnableTriState( sal_False );
     aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK );
 
     if( !bWithRotation )
@@ -88,7 +88,7 @@ SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent,
     return new SchAlignmentTabPage(pParent, rInAttrs, false);
 }
 
-BOOL SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+sal_Bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     //Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES
     bool bStacked = aOrientHlp.GetStackedState() == STATE_CHECK;
@@ -100,7 +100,7 @@ BOOL SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
     SvxFrameDirection aDirection( aLbTextDirection.GetSelectEntryValue() );
     rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, aDirection ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs)
@@ -115,7 +115,7 @@ void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs)
     aOrientHlp.SetStackedState( bStacked ? STATE_CHECK : STATE_NOCHECK );
 
 
-    if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, TRUE, &pItem) == SFX_ITEM_SET)
+    if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, sal_True, &pItem) == SFX_ITEM_SET)
         aLbTextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pItem)->GetValue()) );
 }
 
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 1624e7039..b9d8854b0 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -58,7 +58,7 @@ public:
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
     static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet& rInAttrs);
-    virtual BOOL FillItemSet(SfxItemSet& rOutAttrs);
+    virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
     virtual void Reset(const SfxItemSet& rInAttrs);
 };
 
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index 4466c81f2..b8ff48350 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -54,7 +54,7 @@ SfxTabPage* TrendlineTabPage::Create(
     return new TrendlineTabPage( pParent, rOutAttrs );
 }
 
-BOOL TrendlineTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+sal_Bool TrendlineTabPage::FillItemSet( SfxItemSet& rOutAttrs )
 {
     return m_aTrendlineResources.FillItemSet( rOutAttrs );
 }
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index 936e4722e..4a5215304 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -43,7 +43,7 @@ public:
     virtual ~TrendlineTabPage ();
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
-    virtual BOOL FillItemSet( SfxItemSet& rOutAttrs );
+    virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
     virtual void Reset( const SfxItemSet& rInAttrs );
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 34afdc32d..2172fbc3d 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -126,7 +126,7 @@ void lcl_initOutliner( SdrOutliner* pTargetOutliner, SdrOutliner* pSourceOutline
     //if( bInit )
     {
         pTargetOutliner->EraseVirtualDevice();
-        pTargetOutliner->SetUpdateMode(FALSE);
+        pTargetOutliner->SetUpdateMode(sal_False);
         pTargetOutliner->SetEditTextObjectPool( pSourceOutliner->GetEditTextObjectPool() );
         pTargetOutliner->SetDefTab( pSourceOutliner->GetDefTab() );
     }
@@ -140,7 +140,7 @@ void lcl_initOutliner( SdrOutliner* pTargetOutliner, SdrOutliner* pSourceOutline
     pTargetOutliner->SetDefaultLanguage( pSourceOutliner->GetDefaultLanguage() );
     pTargetOutliner->SetHyphenator( pSourceOutliner->GetHyphenator() );
 
-    USHORT nX, nY;
+    sal_uInt16 nX, nY;
     pSourceOutliner->GetGlobalCharStretching( nX, nY );
     pTargetOutliner->SetGlobalCharStretching( nX, nY );
 
@@ -234,8 +234,8 @@ void DrawViewWrapper::SetMarkHandles()
 SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
 {
     SdrObject* pRet = NULL;
-    //ULONG nOptions =SDRSEARCH_DEEP|SDRSEARCH_PASS2BOUND|SDRSEARCH_PASS3NEAREST;
-    ULONG nOptions = SDRSEARCH_DEEP | SDRSEARCH_TESTMARKABLE;
+    //sal_uLong nOptions =SDRSEARCH_DEEP|SDRSEARCH_PASS2BOUND|SDRSEARCH_PASS3NEAREST;
+    sal_uLong nOptions = SDRSEARCH_DEEP | SDRSEARCH_TESTMARKABLE;
 
     SdrPageView* pSdrPageView = this->GetPageView();
     this->SdrView::PickObj(rPnt, lcl_getHitTolerance( this->GetFirstOutputDevice() ), pRet, pSdrPageView, nOptions);
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index e89d2f2ea..200a4bd82 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -181,7 +181,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co
     aVDev.SetMapMode(MapMode(MAP_100TH_MM));
     SdrModel* pModel = new SdrModel();
     pModel->GetItemPool().FreezeIdRanges();
-    SdrPage* pPage = new SdrPage( *pModel, FALSE );
+    SdrPage* pPage = new SdrPage( *pModel, sal_False );
     pPage->SetSize(Size(1000,1000));
     pModel->InsertPage( pPage, 0 );
     SdrView* pView = new SdrView( pModel, &aVDev );
@@ -224,7 +224,7 @@ FontList* ViewElementListProvider::getFontList() const
         OutputDevice* pDefaultOut = Application::GetDefaultDevice();	// #67730#
         m_pFontList = new FontList( pRefDev ? pRefDev    : pDefaultOut
                                 , pRefDev ? pDefaultOut : NULL
-                                , FALSE );
+                                , sal_False );
     }
     return m_pFontList;
 }
@@ -243,14 +243,14 @@ SfxPrinter* ObjectPropertiesDialogParameter::getPrinter()
     bool bOwnPrinter = true;
     if (!pPrinter)
     {
-        SfxBoolItem aItem(SID_PRINTER_NOTFOUND_WARN, TRUE);
+        SfxBoolItem aItem(SID_PRINTER_NOTFOUND_WARN, sal_True);
         // ItemSet mit speziellem Poolbereich anlegen
         SfxItemSet* pSet = new SfxItemSet(GetPool(),
                                           SID_PRINTER_NOTFOUND_WARN,
                                           SID_PRINTER_NOTFOUND_WARN, 0);
         pSet->Put(aItem);
         pPrinter = new SfxPrinter(pSet); //@todo ->need to remember and delete
-        bOwnPrinter = TRUE;
+        bOwnPrinter = sal_True;
 
         MapMode aMapMode = pPrinter->GetMapMode();
         aMapMode.SetMapUnit(MAP_100TH_MM);
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index 6e30e6c7b..a6a219c6e 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -27,8 +27,7 @@
 #ifndef CHART_AXISITEMCONVERTER_HXX
 #define CHART_AXISITEMCONVERTER_HXX
 
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
-#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
+#include <chartview/ExplicitScaleValues.hxx>
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/awt/Size.hpp>
@@ -55,8 +54,8 @@ public:
         SdrModel& rDrawModel,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartDocument > & xChartDoc,
-        ::com::sun::star::chart2::ExplicitScaleData * pScale = NULL,
-        ::com::sun::star::chart2::ExplicitIncrementData * pIncrement = NULL,
+        ExplicitScaleData * pScale = NULL,
+        ExplicitIncrementData * pIncrement = NULL,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize =
             ::std::auto_ptr< ::com::sun::star::awt::Size >() );
     virtual ~AxisItemConverter();
@@ -65,12 +64,12 @@ public:
     virtual bool ApplyItemSet( const SfxItemSet & rItemSet );
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
@@ -81,8 +80,8 @@ private:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XChartDocument >      m_xChartDoc;
 
-    ::com::sun::star::chart2::ExplicitScaleData *       m_pExplicitScale;
-    ::com::sun::star::chart2::ExplicitIncrementData *   m_pExplicitIncrement;
+    ExplicitScaleData*      m_pExplicitScale;
+    ExplicitIncrementData*  m_pExplicitIncrement;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 40dc37f8d..96d2f7b6e 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -59,12 +59,12 @@ public:
     virtual ~CharacterPropertyItemConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
     ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 72dce1cce..e8f2361a1 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -29,7 +29,7 @@
 
 #include "ItemConverter.hxx"
 #include "GraphicPropertyItemConverter.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/awt/Size.hpp>
@@ -81,12 +81,12 @@ public:
     virtual bool ApplyItemSet( const SfxItemSet & rItemSet );
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
index 23d69e0ba..8254461c6 100644
--- a/chart2/source/controller/inc/DrawViewWrapper.hxx
+++ b/chart2/source/controller/inc/DrawViewWrapper.hxx
@@ -69,11 +69,11 @@ public:
     SdrPageView*    GetPageView() const;
 
     SdrObject* getHitObject( const Point& rPnt ) const;
-    //BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum=NULL, USHORT* pnPassNum=NULL) const;
-    //BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const;
-    //BOOL PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
+    //sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uLong nOptions, SdrObject** ppRootObj, sal_uLong* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const;
+    //sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uLong nOptions=0) const;
+    //sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uLong nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
 
-    //void MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark=FALSE, BOOL bImpNoSetMarkHdl=FALSE);
+    //void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False);
     void MarkObject( SdrObject* pObj );
 
     //----------------------
diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
index 1d7f969e7..51b88bf5b 100755
--- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
+++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
@@ -29,7 +29,7 @@
 
 #include "ItemConverter.hxx"
 #include "GraphicPropertyItemConverter.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -63,12 +63,12 @@ public:
     virtual bool ApplyItemSet( const SfxItemSet & rItemSet );
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 2e2af8139..1993bc3a8 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -63,12 +63,12 @@ public:
     virtual ~GraphicPropertyItemConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index e10e42728..0a8d65793 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -89,9 +89,9 @@ public:
 
     // typedefs -------------------------------
 
-    typedef USHORT          tWhichIdType;
+    typedef sal_uInt16          tWhichIdType;
     typedef ::rtl::OUString tPropertyNameType;
-    typedef BYTE            tMemberIdType;
+    typedef sal_uInt8            tMemberIdType;
 
     typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId;
 
@@ -133,7 +133,7 @@ protected:
 
     /** implement this method to provide an array of which-ranges of the form:
 
-        const USHORT aMyPairs[] =
+        const sal_uInt16 aMyPairs[] =
         {
             from_1, to_1,
             from_2, to_2,
@@ -142,7 +142,7 @@ protected:
             0
         };
     */
-    virtual const USHORT * GetWhichPairs() const = 0;
+    virtual const sal_uInt16 * GetWhichPairs() const = 0;
 
     /** implement this method to return a Property object for a given which id.
 
@@ -161,7 +161,7 @@ protected:
 
         The default implementation does nothing except showing an assertion
      */
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
 
     /** for items that can not be mapped directly to a property.
@@ -173,7 +173,7 @@ protected:
 
         @return true if the item changed a property, false otherwise.
      */
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
     // ________
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index 4ed8392bb..ca2b0b314 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -60,12 +60,12 @@ public:
     virtual bool ApplyItemSet( const SfxItemSet & rItemSet );
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index bcbb42057..79a6b5a17 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -55,7 +55,7 @@ public:
     virtual ~AllAxisItemConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
 };
 
 class AllGridItemConverter : public ::comphelper::MultipleItemConverter
@@ -71,7 +71,7 @@ public:
     virtual ~AllGridItemConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
 };
 
 class AllDataLabelItemConverter : public ::comphelper::MultipleItemConverter
@@ -89,7 +89,7 @@ public:
     virtual ~AllDataLabelItemConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
 };
 
 class AllTitleItemConverter : public ::comphelper::MultipleItemConverter
@@ -107,7 +107,7 @@ public:
     virtual ~AllTitleItemConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
 };
 
 class AllSeriesStatisticsConverter : public ::comphelper::MultipleItemConverter
@@ -120,7 +120,7 @@ public:
     virtual ~AllSeriesStatisticsConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx
index de8f785cc..3c8a3e026 100644
--- a/chart2/source/controller/inc/MultipleItemConverter.hxx
+++ b/chart2/source/controller/inc/MultipleItemConverter.hxx
@@ -36,7 +36,7 @@
 namespace comphelper
 {
 
-/** Note: virtual const USHORT * GetWhichPairs() const; is still pure virtual
+/** Note: virtual const sal_uInt16 * GetWhichPairs() const; is still pure virtual
  */
 class MultipleItemConverter : public ItemConverter
 {
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index 2c62edbc5..77d445e50 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -61,12 +61,12 @@ public:
     virtual bool ApplyItemSet( const SfxItemSet & rItemSet );
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index a149f39d7..2f0ff532e 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -64,12 +64,12 @@ public:
     virtual bool ApplyItemSet( const SfxItemSet & rItemSet );
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index 627d0cae9..1eb05c71e 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -54,12 +54,12 @@ public:
     virtual ~SeriesOptionsItemConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx
index 1755420c1..9db38c015 100644
--- a/chart2/source/controller/inc/StatisticsItemConverter.hxx
+++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx
@@ -31,7 +31,7 @@
 
 #include "ItemConverter.hxx"
 #include "GraphicPropertyItemConverter.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 
 #include <vector>
 
@@ -55,12 +55,12 @@ public:
     virtual ~StatisticsItemConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index 8e5466fa9..24e536358 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -61,12 +61,12 @@ public:
     virtual bool ApplyItemSet( const SfxItemSet & rItemSet );
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const;
 
-    virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index a30831bd2..89d1eb90c 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -62,7 +62,7 @@ public:
     virtual void Resize();
 
     // Dialog
-    virtual BOOL Close();
+    virtual sal_Bool Close();
 
     void SetReadOnly( bool bReadOnly );
     bool ApplyChangesToModel();
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index dcbdc6699..50ec173f2 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -91,7 +91,7 @@ private:
     bool                  m_bRangeChooserTabIsValid;
     bool                  m_bDataSourceTabIsValid;
 
-    static USHORT         m_nLastPageId;
+    static sal_uInt16         m_nLastPageId;
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index da1ac0660..567541833 100644
--- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
+++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
@@ -75,7 +75,7 @@ protected:
     HelpButton	 		aPbHelp;
 
 public:
-    SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput, BOOL bAxisDlg=true );
+    SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput, sal_Bool bAxisDlg=true );
     virtual ~SchAxisDlg();
 
     void getResult( InsertAxisOrGridDialogData& rOutput );
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 70e9298b1..c402c7f68 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -115,8 +115,8 @@ class SchAttribTabDlg : public SfxTabDialog
 private:
     ObjectType               eObjectType;
     bool                     bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles)
-    USHORT		  	         nDlgType;
-    USHORT		  	         nPageType;
+    sal_uInt16		  	         nDlgType;
+    sal_uInt16		  	         nPageType;
 
     const ObjectPropertiesDialogParameter * const        m_pParameter;
     const ViewElementListProvider* const				 m_pViewElementListProvider;
@@ -128,7 +128,7 @@ private:
     double          m_fAxisMinorStepWidthForErrorBarDecimals;
     bool            m_bOKPressed;
 
-    virtual void PageCreated(USHORT nId, SfxTabPage& rPage);
+    virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage);
 
     Link m_aOriginalOKClickHdl;
     DECL_LINK( OKPressed, void * );
diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx
index c576d82cf..c43d992fa 100644
--- a/chart2/source/controller/inc/dlg_ShapeFont.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx
@@ -46,7 +46,7 @@ public:
     virtual ~ShapeFontDialog();
 
 private:
-    virtual void PageCreated( USHORT nId, SfxTabPage& rPage );
+    virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage );
 
     const ViewElementListProvider* m_pViewElementListProvider;
 };
diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
index c326e1cb9..e7a91329b 100644
--- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
@@ -43,7 +43,7 @@ public:
     virtual ~ShapeParagraphDialog();
 
 private:
-    virtual void PageCreated( USHORT nId, SfxTabPage& rPage );
+    virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage );
 };
 
 //.............................................................................
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx
index ebfd7a168..96c3bf545 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -74,7 +74,7 @@ private:
 
     ControllerLockHelper                m_aControllerLocker;
 
-    static USHORT m_nLastPageId;
+    static sal_uInt16 m_nLastPageId;
 };
 
 //.............................................................................
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index f0007199c..7af3417d9 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -73,7 +73,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartDocument > & xChartDocument );
     void Reset(const SfxItemSet& rInAttrs);
-    BOOL FillItemSet(SfxItemSet& rOutAttrs) const;
+    sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const;
 
     void FillValueSets();
 
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index a2b35e155..4af512b6d 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -38,12 +38,14 @@
 #include "ChartModelHelper.hxx"
 #include "AxisHelper.hxx"
 #include "CommonConverters.hxx"
+#include "ChartTypeHelper.hxx"
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/AxisOrientation.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
 
 // for SfxBoolItem
 #include <svl/eitem.hxx>
@@ -58,6 +60,8 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
+using ::com::sun::star::chart::TimeInterval;
+using ::com::sun::star::chart::TimeIncrement;
 
 namespace
 {
@@ -65,13 +69,13 @@ namespace
 {
     static ::comphelper::ItemPropertyMapType aAxisPropertyMap(
         ::comphelper::MakeItemPropertyMap
-        IPM_MAP_ENTRY( SCHATTR_AXIS_SHOWDESCR, "DisplayLabels",    0 )
-        IPM_MAP_ENTRY( SCHATTR_AXIS_TICKS,     "MajorTickmarks",   0 )
-        IPM_MAP_ENTRY( SCHATTR_AXIS_HELPTICKS, "MinorTickmarks",   0 )
-        IPM_MAP_ENTRY( SCHATTR_TEXT_ORDER,     "ArrangeOrder",     0 )
-        IPM_MAP_ENTRY( SCHATTR_TEXT_STACKED,   "StackCharacters",  0 )
-        IPM_MAP_ENTRY( SCHATTR_TEXTBREAK,      "TextBreak",        0 )
-        IPM_MAP_ENTRY( SCHATTR_TEXT_OVERLAP,   "TextOverlap",      0 )
+        IPM_MAP_ENTRY( SCHATTR_AXIS_SHOWDESCR,     "DisplayLabels",    0 )
+        IPM_MAP_ENTRY( SCHATTR_AXIS_TICKS,         "MajorTickmarks",   0 )
+        IPM_MAP_ENTRY( SCHATTR_AXIS_HELPTICKS,     "MinorTickmarks",   0 )
+        IPM_MAP_ENTRY( SCHATTR_AXIS_LABEL_ORDER,   "ArrangeOrder",     0 )
+        IPM_MAP_ENTRY( SCHATTR_TEXT_STACKED,       "StackCharacters",  0 )
+        IPM_MAP_ENTRY( SCHATTR_AXIS_LABEL_BREAK,   "TextBreak",        0 )
+        IPM_MAP_ENTRY( SCHATTR_AXIS_LABEL_OVERLAP, "TextOverlap",      0 )
         );
 
     return aAxisPropertyMap;
@@ -88,8 +92,8 @@ AxisItemConverter::AxisItemConverter(
     SfxItemPool& rItemPool,
     SdrModel& rDrawModel,
     const Reference< chart2::XChartDocument > & xChartDoc,
-    chart2::ExplicitScaleData * pScale /* = NULL */,
-    chart2::ExplicitIncrementData * pIncrement /* = NULL */,
+    ::chart::ExplicitScaleData * pScale /* = NULL */,
+    ::chart::ExplicitIncrementData * pIncrement /* = NULL */,
     ::std::auto_ptr< awt::Size > pRefSize /* = NULL */ ) :
         ItemConverter( rPropertySet, rItemPool ),
         m_xChartDoc( xChartDoc ),
@@ -99,9 +103,9 @@ AxisItemConverter::AxisItemConverter(
     Reference< lang::XMultiServiceFactory > xNamedPropertyContainerFactory( xChartDoc, uno::UNO_QUERY );
 
     if( pScale )
-        m_pExplicitScale = new chart2::ExplicitScaleData( *pScale );
+        m_pExplicitScale = new ::chart::ExplicitScaleData( *pScale );
     if( pIncrement )
-        m_pExplicitIncrement = new chart2::ExplicitIncrementData( *pIncrement );
+        m_pExplicitIncrement = new ::chart::ExplicitIncrementData( *pIncrement );
    
     m_aConverters.push_back( new GraphicPropertyItemConverter(
                                  rPropertySet, rItemPool, rDrawModel,
@@ -143,7 +147,7 @@ bool AxisItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
     return ItemConverter::ApplyItemSet( rItemSet ) || bResult;
 }
 
-const USHORT * AxisItemConverter::GetWhichPairs() const
+const sal_uInt16 * AxisItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nAxisWhichPairs;
@@ -162,30 +166,40 @@ bool AxisItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWit
     return true;
 }
 
-void AxisItemConverter::FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+bool lcl_hasTimeIntervalValue( const uno::Any& rAny )
+{
+    bool bRet = false;
+    TimeInterval aValue;
+    if( rAny >>= aValue )
+        bRet = true;
+    return bRet;
+}
+
+void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
-    if( ! m_xAxis.is() )
+    if( !m_xAxis.is() )
         return;
 
-    const chart2::ScaleData     aScale( m_xAxis->getScaleData() );
-    const chart2::IncrementData aInc( aScale.IncrementData );
-    const uno::Sequence< chart2::SubIncrement > aSubIncs( aScale.IncrementData.SubIncrements );
+    const chart2::ScaleData&     rScale( m_xAxis->getScaleData() );
+    const chart2::IncrementData& rIncrement( rScale.IncrementData );
+    const uno::Sequence< chart2::SubIncrement >& rSubIncrements( rScale.IncrementData.SubIncrements );
+    const TimeIncrement& rTimeIncrement( rScale.TimeIncrement );
+    bool bDateAxis = (chart2::AxisType::DATE == rScale.AxisType);
+    if( m_pExplicitScale )
+        bDateAxis = (chart2::AxisType::DATE == m_pExplicitScale->AxisType);
 
     switch( nWhichId )
     {
         case SCHATTR_AXIS_AUTO_MAX:
-            // if the any has no value => auto is on
-            rOutItemSet.Put( SfxBoolItem( nWhichId, !hasDoubleValue(aScale.Maximum) ) );
+                rOutItemSet.Put( SfxBoolItem( nWhichId, !hasDoubleValue(rScale.Maximum) ) );
             break;
 
         case SCHATTR_AXIS_MAX:
             {
                 double fMax = 10.0;
-                if( aScale.Maximum >>= fMax )
-                {
+                if( rScale.Maximum >>= fMax )
                     rOutItemSet.Put( SvxDoubleItem( fMax, nWhichId ) );
-                }
                 else
                 {
                     if( m_pExplicitScale )
@@ -196,106 +210,141 @@ void AxisItemConverter::FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemS
             break;
 
         case SCHATTR_AXIS_AUTO_MIN:
-            // if the any has no value => auto is on
-            rOutItemSet.Put( SfxBoolItem( nWhichId, !hasDoubleValue(aScale.Minimum) ) );
+                rOutItemSet.Put( SfxBoolItem( nWhichId, !hasDoubleValue(rScale.Minimum) ) );
             break;
 
         case SCHATTR_AXIS_MIN:
             {
                 double fMin = 0.0;
-                if( aScale.Minimum >>= fMin )
-                {
+                if( rScale.Minimum >>= fMin )
                     rOutItemSet.Put( SvxDoubleItem( fMin, nWhichId ) );
-                }
-                else
-                {
-                    if( m_pExplicitScale )
-                        rOutItemSet.Put( SvxDoubleItem( m_pExplicitScale->Minimum, nWhichId ));
-                }
+                else if( m_pExplicitScale )
+                    rOutItemSet.Put( SvxDoubleItem( m_pExplicitScale->Minimum, nWhichId ));
             }
             break;
 
         case SCHATTR_AXIS_LOGARITHM:
-        {
-            BOOL bValue = AxisHelper::isLogarithmic( aScale.Scaling );
-            rOutItemSet.Put( SfxBoolItem( nWhichId, bValue ));
-        }
-        break;
+            {
+                sal_Bool bValue = AxisHelper::isLogarithmic( rScale.Scaling );
+                rOutItemSet.Put( SfxBoolItem( nWhichId, bValue ));
+            }
+            break;
 
         case SCHATTR_AXIS_REVERSE:
-            rOutItemSet.Put( SfxBoolItem( nWhichId, (AxisOrientation_REVERSE == aScale.Orientation) ));
+                rOutItemSet.Put( SfxBoolItem( nWhichId, (AxisOrientation_REVERSE == rScale.Orientation) ));
             break;
 
         // Increment
         case SCHATTR_AXIS_AUTO_STEP_MAIN:
-            // if the any has no value => auto is on
-            rOutItemSet.Put( SfxBoolItem( nWhichId, !hasDoubleValue(aInc.Distance) ) );
+            if( bDateAxis )
+                rOutItemSet.Put( SfxBoolItem( nWhichId, !lcl_hasTimeIntervalValue(rTimeIncrement.MajorTimeInterval) ) );
+            else
+                rOutItemSet.Put( SfxBoolItem( nWhichId, !hasDoubleValue(rIncrement.Distance) ) );
+            break;
+
+        case SCHATTR_AXIS_MAIN_TIME_UNIT:
+            {
+                TimeInterval aTimeInterval;
+                if( rTimeIncrement.MajorTimeInterval >>= aTimeInterval )
+                    rOutItemSet.Put( SfxInt32Item( nWhichId, aTimeInterval.TimeUnit ) );
+                else if( m_pExplicitIncrement )
+                    rOutItemSet.Put( SfxInt32Item( nWhichId, m_pExplicitIncrement->MajorTimeInterval.TimeUnit ) );
+            }
             break;
 
         case SCHATTR_AXIS_STEP_MAIN:
+            if( bDateAxis )
+            {
+                TimeInterval aTimeInterval;
+                if( rTimeIncrement.MajorTimeInterval >>= aTimeInterval )
+                    rOutItemSet.Put( SvxDoubleItem(aTimeInterval.Number, nWhichId ));
+                else if( m_pExplicitIncrement )
+                    rOutItemSet.Put( SvxDoubleItem( m_pExplicitIncrement->MajorTimeInterval.Number, nWhichId ));
+            }
+            else
             {
                 double fDistance = 1.0;
-                if( aInc.Distance >>= fDistance )
-                {
+                if( rIncrement.Distance >>= fDistance )
                     rOutItemSet.Put( SvxDoubleItem(fDistance, nWhichId ));
-                }
-                else
-                {
-                    if( m_pExplicitIncrement )
-                        rOutItemSet.Put( SvxDoubleItem( m_pExplicitIncrement->Distance, nWhichId ));
-                }
+                else if( m_pExplicitIncrement )
+                    rOutItemSet.Put( SvxDoubleItem( m_pExplicitIncrement->Distance, nWhichId ));
             }
             break;
 
         // SubIncrement
         case SCHATTR_AXIS_AUTO_STEP_HELP:
-        {
-            // if the any has no value => auto is on
-            rOutItemSet.Put(
-                SfxBoolItem(
-                    nWhichId,
-                    ! ( aSubIncs.getLength() > 0 &&
-                        aSubIncs[0].IntervalCount.hasValue() )));
-        }
-        break;
+            if( bDateAxis )
+                rOutItemSet.Put( SfxBoolItem( nWhichId, !lcl_hasTimeIntervalValue(rTimeIncrement.MinorTimeInterval) ) );
+            else
+                rOutItemSet.Put( SfxBoolItem( nWhichId,
+                    ! ( rSubIncrements.getLength() > 0 && rSubIncrements[0].IntervalCount.hasValue() )));
+            break;
+
+        case SCHATTR_AXIS_HELP_TIME_UNIT:
+            {
+                TimeInterval aTimeInterval;
+                if( rTimeIncrement.MinorTimeInterval >>= aTimeInterval )
+                    rOutItemSet.Put( SfxInt32Item( nWhichId, aTimeInterval.TimeUnit ) );
+                else if( m_pExplicitIncrement )
+                    rOutItemSet.Put( SfxInt32Item( nWhichId, m_pExplicitIncrement->MinorTimeInterval.TimeUnit ) );
+            }
+            break;
 
         case SCHATTR_AXIS_STEP_HELP:
-        {
-            if( aSubIncs.getLength() > 0 &&
-                aSubIncs[0].IntervalCount.hasValue())
+            if( bDateAxis )
             {
-                OSL_ASSERT( aSubIncs[0].IntervalCount.getValueTypeClass() == uno::TypeClass_LONG );
-                rOutItemSet.Put(
-                    SfxInt32Item(
-                        nWhichId,
-                        *reinterpret_cast< const sal_Int32 * >(
-                            aSubIncs[0].IntervalCount.getValue()) ));
+                TimeInterval aTimeInterval;
+                if( rTimeIncrement.MinorTimeInterval >>= aTimeInterval )
+                    rOutItemSet.Put( SfxInt32Item( nWhichId, aTimeInterval.Number ));
+                else if( m_pExplicitIncrement )
+                    rOutItemSet.Put( SfxInt32Item( nWhichId, m_pExplicitIncrement->MinorTimeInterval.Number ));
             }
             else
             {
-                if( m_pExplicitIncrement &&
-                    m_pExplicitIncrement->SubIncrements.getLength() > 0 )
+                if( rSubIncrements.getLength() > 0 && rSubIncrements[0].IntervalCount.hasValue())
+                {
+                    OSL_ASSERT( rSubIncrements[0].IntervalCount.getValueTypeClass() == uno::TypeClass_LONG );
+                    rOutItemSet.Put( SfxInt32Item( nWhichId,
+                            *reinterpret_cast< const sal_Int32 * >(
+                                rSubIncrements[0].IntervalCount.getValue()) ));
+                }
+                else
                 {
-                    rOutItemSet.Put(
-                        SfxInt32Item(
-                            nWhichId,
-                            m_pExplicitIncrement->SubIncrements[0].IntervalCount ));
+                    if( m_pExplicitIncrement && !m_pExplicitIncrement->SubIncrements.empty() )
+                    {
+                        rOutItemSet.Put( SfxInt32Item( nWhichId,
+                                m_pExplicitIncrement->SubIncrements[0].IntervalCount ));
+                    }
                 }
             }
-        }
-        break;
+            break;
+
+        case SCHATTR_AXIS_AUTO_TIME_RESOLUTION:
+            {
+                rOutItemSet.Put( SfxBoolItem( nWhichId,
+                        !rTimeIncrement.TimeResolution.hasValue() ));
+            }
+            break;
+        case SCHATTR_AXIS_TIME_RESOLUTION:
+            {
+                long nTimeResolution=0;
+                if( rTimeIncrement.TimeResolution >>= nTimeResolution )
+                    rOutItemSet.Put( SfxInt32Item( nWhichId, nTimeResolution ) );
+                else if( m_pExplicitScale )
+                    rOutItemSet.Put( SfxInt32Item( nWhichId, m_pExplicitScale->TimeResolution ) );
+            }
+            break;
 
         case SCHATTR_AXIS_AUTO_ORIGIN:
         {
-            // if the any has no double value => auto is on
-            rOutItemSet.Put( SfxBoolItem( nWhichId, ( !hasDoubleValue(aScale.Origin) )));
+            rOutItemSet.Put( SfxBoolItem( nWhichId, ( !hasDoubleValue(rScale.Origin) )));
         }
         break;
 
         case SCHATTR_AXIS_ORIGIN:
         {
             double fOrigin = 0.0;
-            if( !(aScale.Origin >>= fOrigin) )
+            if( !(rScale.Origin >>= fOrigin) )
             {
                 if( m_pExplicitScale )
                     fOrigin = m_pExplicitScale->Origin;
@@ -367,7 +416,6 @@ void AxisItemConverter::FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemS
         break;
 
         case SID_ATTR_NUMBERFORMAT_VALUE:
-//         case SCHATTR_AXIS_NUMFMT:
         {
             if( m_pExplicitScale )
             {
@@ -391,12 +439,45 @@ void AxisItemConverter::FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemS
         break;
 
         case SCHATTR_AXISTYPE:
-        rOutItemSet.Put( SfxInt32Item( nWhichId, aScale.AxisType ));
+            rOutItemSet.Put( SfxInt32Item( nWhichId, rScale.AxisType ));
+        break;
+
+        case SCHATTR_AXIS_AUTO_DATEAXIS:
+            rOutItemSet.Put( SfxBoolItem( nWhichId, rScale.AutoDateAxis ));
+        break;
+
+        case SCHATTR_AXIS_ALLOW_DATEAXIS:
+        {
+            Reference< chart2::XCoordinateSystem > xCooSys(
+                AxisHelper::getCoordinateSystemOfAxis( m_xAxis, ChartModelHelper::findDiagram( m_xChartDoc ) ) );
+            sal_Int32 nDimensionIndex=0; sal_Int32 nAxisIndex=0;
+            AxisHelper::getIndicesForAxis(m_xAxis, xCooSys, nDimensionIndex, nAxisIndex );
+            bool bChartTypeAllowsDateAxis = ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( xCooSys, 0 ), 2, nDimensionIndex );
+            rOutItemSet.Put( SfxBoolItem( nWhichId, bChartTypeAllowsDateAxis ));
+        }
         break;
     }
 }
 
-bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+bool lcl_isDateAxis( const SfxItemSet & rItemSet )
+{
+    sal_Int32 nAxisType = static_cast< const SfxInt32Item & >( rItemSet.Get( SCHATTR_AXISTYPE )).GetValue();//::com::sun::star::chart2::AxisType
+    return (chart2::AxisType::DATE == nAxisType);
+}
+
+bool lcl_isAutoMajor( const SfxItemSet & rItemSet )
+{
+    bool bRet = static_cast< const SfxBoolItem & >( rItemSet.Get( SCHATTR_AXIS_AUTO_STEP_MAIN )).GetValue();
+    return bRet;
+}
+
+bool lcl_isAutoMinor( const SfxItemSet & rItemSet )
+{
+    bool bRet = static_cast< const SfxBoolItem & >( rItemSet.Get( SCHATTR_AXIS_AUTO_STEP_HELP )).GetValue();
+    return bRet;
+}
+
+bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     if( !m_xAxis.is() )
@@ -502,23 +583,47 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI
 
         // Increment
         case SCHATTR_AXIS_AUTO_STEP_MAIN:
-            if( (static_cast< const SfxBoolItem & >(
-                     rItemSet.Get( nWhichId )).GetValue() ))
+            if( lcl_isAutoMajor(rItemSet) )
             {
                 aScale.IncrementData.Distance.clear();
+                aScale.TimeIncrement.MajorTimeInterval.clear();
                 bSetScale = true;
             }
             // else SCHATTR_AXIS_STEP_MAIN must have some value
             break;
 
+        case SCHATTR_AXIS_MAIN_TIME_UNIT:
+            if( !lcl_isAutoMajor(rItemSet) )
+            {
+                if( rItemSet.Get( nWhichId ).QueryValue( aValue ) )
+                {
+                    TimeInterval aTimeInterval;
+                    aScale.TimeIncrement.MajorTimeInterval >>= aTimeInterval;
+                    aValue >>= aTimeInterval.TimeUnit;
+                    aScale.TimeIncrement.MajorTimeInterval = uno::makeAny( aTimeInterval );
+                    bSetScale = true;
+                }
+            }
+            break;
+
         case SCHATTR_AXIS_STEP_MAIN:
             // only if auto if false
-            if( ! (static_cast< const SfxBoolItem & >(
-                       rItemSet.Get( SCHATTR_AXIS_AUTO_STEP_MAIN )).GetValue() ))
+            if( !lcl_isAutoMajor(rItemSet) )
             {
                 rItemSet.Get( nWhichId ).QueryValue( aValue );
-
-                if( aScale.IncrementData.Distance != aValue )
+                if( lcl_isDateAxis(rItemSet) )
+                {
+                    double fValue = 1.0;
+                    if( aValue >>= fValue )
+                    {
+                        TimeInterval aTimeInterval;
+                        aScale.TimeIncrement.MajorTimeInterval >>= aTimeInterval;
+                        aTimeInterval.Number = static_cast<double>(fValue);
+                        aScale.TimeIncrement.MajorTimeInterval = uno::makeAny( aTimeInterval );
+                        bSetScale = true;
+                    }
+                }
+                else if( aScale.IncrementData.Distance != aValue )
                 {
                     aScale.IncrementData.Distance = aValue;
                     bSetScale = true;
@@ -528,35 +633,85 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI
 
         // SubIncrement
         case SCHATTR_AXIS_AUTO_STEP_HELP:
-            if( (static_cast< const SfxBoolItem & >(
-                     rItemSet.Get( nWhichId )).GetValue() ) &&
-                aScale.IncrementData.SubIncrements.getLength() > 0 &&
-                aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() )
+            if( lcl_isAutoMinor(rItemSet) )
             {
-                    aScale.IncrementData.SubIncrements[0].IntervalCount.clear();
+                if( aScale.IncrementData.SubIncrements.getLength() > 0 &&
+                    aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() )
+                {
+                        aScale.IncrementData.SubIncrements[0].IntervalCount.clear();
+                        bSetScale = true;
+                }
+                if( aScale.TimeIncrement.MinorTimeInterval.hasValue() )
+                {
+                    aScale.TimeIncrement.MinorTimeInterval.clear();
                     bSetScale = true;
+                }
             }
             // else SCHATTR_AXIS_STEP_MAIN must have some value
             break;
 
+        case SCHATTR_AXIS_HELP_TIME_UNIT:
+            if( !lcl_isAutoMinor(rItemSet) )
+            {
+                if( rItemSet.Get( nWhichId ).QueryValue( aValue ) )
+                {
+                    TimeInterval aTimeInterval;
+                    aScale.TimeIncrement.MinorTimeInterval >>= aTimeInterval;
+                    aValue >>= aTimeInterval.TimeUnit;
+                    aScale.TimeIncrement.MinorTimeInterval = uno::makeAny( aTimeInterval );
+                    bSetScale = true;
+                }
+            }
+            break;
+
         case SCHATTR_AXIS_STEP_HELP:
-            // only if auto if false
-            if( ! (static_cast< const SfxBoolItem & >(
-                       rItemSet.Get( SCHATTR_AXIS_AUTO_STEP_HELP )).GetValue() ) &&
-                aScale.IncrementData.SubIncrements.getLength() > 0 )
+            // only if auto is false
+            if( !lcl_isAutoMinor(rItemSet) )
+            {
+                rItemSet.Get( nWhichId ).QueryValue( aValue );
+                if( lcl_isDateAxis(rItemSet) )
+                {
+                    TimeInterval aTimeInterval;
+                    aScale.TimeIncrement.MinorTimeInterval >>= aTimeInterval;
+                    aValue >>= aTimeInterval.Number;
+                    aScale.TimeIncrement.MinorTimeInterval = uno::makeAny(aTimeInterval);
+                    bSetScale = true;
+                }
+                else if( aScale.IncrementData.SubIncrements.getLength() > 0 )
+                {
+                    if( ! aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() ||
+                        aScale.IncrementData.SubIncrements[0].IntervalCount != aValue )
+                    {
+                        OSL_ASSERT( aValue.getValueTypeClass() == uno::TypeClass_LONG );
+                        aScale.IncrementData.SubIncrements[0].IntervalCount = aValue;
+                        bSetScale = true;
+                    }
+                }
+            }
+            break;
+
+        case SCHATTR_AXIS_AUTO_TIME_RESOLUTION:
+            if( (static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue() ))
+            {
+                aScale.TimeIncrement.TimeResolution.clear();
+                bSetScale = true;
+            }
+            break;
+        case SCHATTR_AXIS_TIME_RESOLUTION:
+            // only if auto is false
+            if( ! (static_cast< const SfxBoolItem & >( rItemSet.Get( SCHATTR_AXIS_AUTO_TIME_RESOLUTION )).GetValue() ))
             {
                 rItemSet.Get( nWhichId ).QueryValue( aValue );
 
-                if( ! aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() ||
-                    aScale.IncrementData.SubIncrements[0].IntervalCount != aValue )
+                if( aScale.TimeIncrement.TimeResolution != aValue )
                 {
-                    OSL_ASSERT( aValue.getValueTypeClass() == uno::TypeClass_LONG );
-                    aScale.IncrementData.SubIncrements[0].IntervalCount = aValue;
+                    aScale.TimeIncrement.TimeResolution = aValue;
                     bSetScale = true;
                 }
             }
             break;
 
+
         case SCHATTR_AXIS_AUTO_ORIGIN:
         {
             if( (static_cast< const SfxBoolItem & >(
@@ -757,7 +912,6 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI
         break;
 
         case SID_ATTR_NUMBERFORMAT_VALUE:
-//         case SCHATTR_AXIS_NUMFMT:
         {
             if( m_pExplicitScale )
             {
@@ -821,7 +975,23 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI
         break;
 
         case SCHATTR_AXISTYPE:
-        //don't allow to change the axis type so far
+        {
+            sal_Int32 nNewAxisType = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();//::com::sun::star::chart2::AxisType
+            aScale.AxisType = nNewAxisType;
+            bSetScale = true;
+        }
+        break;
+
+        case SCHATTR_AXIS_AUTO_DATEAXIS:
+        {
+            bool bNewValue = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue();
+            bool bOldValue = aScale.AutoDateAxis;
+            if( bOldValue != bNewValue )
+            {
+                aScale.AutoDateAxis = bNewValue;
+                bSetScale = true;
+            }
+        }
         break;
     }
 
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 6183703cc..5eda45b44 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -111,7 +111,7 @@ CharacterPropertyItemConverter::CharacterPropertyItemConverter(
 CharacterPropertyItemConverter::~CharacterPropertyItemConverter()
 {}
 
-const USHORT * CharacterPropertyItemConverter::GetWhichPairs() const
+const sal_uInt16 * CharacterPropertyItemConverter::GetWhichPairs() const
 {
     return nCharacterPropertyWhichPairs;
 }
@@ -129,7 +129,7 @@ bool CharacterPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tPr
 }
 
 void CharacterPropertyItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     switch( nWhichId )
@@ -297,7 +297,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
 }
 
 bool CharacterPropertyItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 5cd14a472..4697945d5 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -108,13 +108,13 @@ sal_Int32 lcl_getSymbolStyleForSymbol( const chart2::Symbol & rSymbol )
     return nStyle;
 }
 
-bool lcl_NumberFormatFromItemToPropertySet( USHORT nWhichId, const SfxItemSet & rItemSet, const uno::Reference< beans::XPropertySet > & xPropertySet, bool bOverwriteAttributedDataPointsAlso  )
+bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxItemSet & rItemSet, const uno::Reference< beans::XPropertySet > & xPropertySet, bool bOverwriteAttributedDataPointsAlso  )
 {
     bool bChanged = false;
     if( !xPropertySet.is() )
         return bChanged;
     rtl::OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? C2U( "NumberFormat" ) : C2U( "PercentageNumberFormat" );
-    USHORT nSourceWhich = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE;
+    sal_uInt16 nSourceWhich = (SID_ATTR_NUMBERFORMAT_VALUE==nWhichId) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE;
 
     if( SFX_ITEM_SET != rItemSet.GetItemState( nSourceWhich ) )
         return bChanged;
@@ -155,13 +155,13 @@ bool lcl_NumberFormatFromItemToPropertySet( USHORT nWhichId, const SfxItemSet &
     return bChanged;
 }
 
-bool lcl_UseSourceFormatFromItemToPropertySet( USHORT nWhichId, const SfxItemSet & rItemSet, const uno::Reference< beans::XPropertySet > & xPropertySet, bool bOverwriteAttributedDataPointsAlso  )
+bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxItemSet & rItemSet, const uno::Reference< beans::XPropertySet > & xPropertySet, bool bOverwriteAttributedDataPointsAlso  )
 {
     bool bChanged = false;
     if( !xPropertySet.is() )
         return bChanged;
     rtl::OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? C2U( "NumberFormat" ) : C2U( "PercentageNumberFormat" );
-    USHORT nFormatWhich = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE;
+    sal_uInt16 nFormatWhich = (SID_ATTR_NUMBERFORMAT_SOURCE==nWhichId) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE;
 
     if( SFX_ITEM_SET != rItemSet.GetItemState( nWhichId ) )
         return bChanged;
@@ -291,7 +291,7 @@ bool DataPointItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
     return ItemConverter::ApplyItemSet( rItemSet ) || bResult;
 }
 
-const USHORT * DataPointItemConverter::GetWhichPairs() const
+const sal_uInt16 * DataPointItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     if( m_bDataSeries )
@@ -313,7 +313,7 @@ bool DataPointItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa
 
 
 bool DataPointItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
@@ -545,7 +545,7 @@ bool DataPointItemConverter::ApplySpecialItem(
 }
 
 void DataPointItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     switch( nWhichId )
@@ -643,7 +643,7 @@ void DataPointItemConverter::FillSpecialItem(
         {
             SvULongs aList;
             for ( sal_Int32 nN=0; nN<m_aAvailableLabelPlacements.getLength(); nN++ )
-                aList.Insert( m_aAvailableLabelPlacements[nN], sal::static_int_cast< USHORT >(nN) );
+                aList.Insert( m_aAvailableLabelPlacements[nN], sal::static_int_cast< sal_uInt16 >(nN) );
             rOutItemSet.Put( SfxIntegerListItem( nWhichId, aList ) );
         }
         break;
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 3a69b6c3e..3adbc1684 100755
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -133,7 +133,7 @@ bool ErrorBarItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
     return ItemConverter::ApplyItemSet( rItemSet ) || bResult;
 }
 
-const USHORT * ErrorBarItemConverter::GetWhichPairs() const
+const sal_uInt16 * ErrorBarItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nErrorBarWhichPairs;
@@ -147,7 +147,7 @@ bool ErrorBarItemConverter::GetItemProperty(
 }
 
 bool ErrorBarItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
@@ -342,7 +342,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
 }
 
 void ErrorBarItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     switch( nWhichId )
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 837b7504f..3f57bdbeb 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -152,7 +152,7 @@ bool lcl_supportsLineProperties( ::chart::wrapper::GraphicPropertyItemConverter:
 bool lcl_SetContentForNamedProperty(
     const uno::Reference< lang::XMultiServiceFactory > & xFactory,
     const ::rtl::OUString & rTableName,
-    NameOrIndex & rItem, BYTE nMemberId )
+    NameOrIndex & rItem, sal_uInt8 nMemberId )
 {
     bool bResult = false;
     if( xFactory.is())
@@ -196,9 +196,9 @@ GraphicPropertyItemConverter::GraphicPropertyItemConverter(
 GraphicPropertyItemConverter::~GraphicPropertyItemConverter()
 {}
 
-const USHORT * GraphicPropertyItemConverter::GetWhichPairs() const
+const sal_uInt16 * GraphicPropertyItemConverter::GetWhichPairs() const
 {
-    const USHORT * pResult = NULL;
+    const sal_uInt16 * pResult = NULL;
 
     switch( m_eGraphicObjectType )
     {
@@ -263,7 +263,7 @@ bool GraphicPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tProp
 }
 
 void GraphicPropertyItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
 //     if( m_eGraphicObjectType == LINE_DATA_POINT ||
@@ -310,7 +310,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
                         if( (aValue >>= aName) &&
                             aName.getLength())
                         {
-                            aItem.SetEnabled( TRUE );
+                            aItem.SetEnabled( sal_True );
                             rOutItemSet.Put( aItem );
                         }
                     }
@@ -470,7 +470,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 }
 
 bool GraphicPropertyItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 8bda4ef11..e18fdf9b8 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -100,7 +100,7 @@ void ItemConverter::_disposing( const lang::EventObject& rSource )
 
 void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
 {
-    const USHORT * pRanges = rOutItemSet.GetRanges();
+    const sal_uInt16 * pRanges = rOutItemSet.GetRanges();
     tPropertyNameWithMemberId aProperty;
     SfxItemPool & rPool = GetItemPool();
 
@@ -110,13 +110,13 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
 
     while( (*pRanges) != 0)
     {
-        USHORT nBeg = (*pRanges);
+        sal_uInt16 nBeg = (*pRanges);
         ++pRanges;
-        USHORT nEnd = (*pRanges);
+        sal_uInt16 nEnd = (*pRanges);
         ++pRanges;
 
         OSL_ASSERT( nBeg <= nEnd );
-        for( USHORT nWhich = nBeg; nWhich <= nEnd; ++nWhich )
+        for( sal_uInt16 nWhich = nBeg; nWhich <= nEnd; ++nWhich )
         {
             if( GetItemProperty( nWhich, aProperty ))
             {
@@ -171,14 +171,14 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
 }
 
 void ItemConverter::FillSpecialItem(
-    USHORT /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const
+    sal_uInt16 /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const
     throw( uno::Exception )
 {
     OSL_ENSURE( false, "ItemConverter: Unhandled special item found!" );
 }
 
 bool ItemConverter::ApplySpecialItem(
-    USHORT /*nWhichId*/, const SfxItemSet & /*rItemSet*/ )
+    sal_uInt16 /*nWhichId*/, const SfxItemSet & /*rItemSet*/ )
     throw( uno::Exception )
 {
     OSL_ENSURE( false, "ItemConverter: Unhandled special item found!" );
@@ -197,7 +197,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
 
     while( pItem )
     {
-        if( rItemSet.GetItemState( pItem->Which(), FALSE ) == SFX_ITEM_SET )
+        if( rItemSet.GetItemState( pItem->Which(), sal_False ) == SFX_ITEM_SET )
         {
             if( GetItemProperty( pItem->Which(), aProperty ))
             {
@@ -242,13 +242,13 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
 void ItemConverter::InvalidateUnequalItems( SfxItemSet  &rDestSet, const SfxItemSet &rSourceSet )
 {
     SfxWhichIter      aIter (rSourceSet);
-    USHORT            nWhich     = aIter.FirstWhich ();
+    sal_uInt16            nWhich     = aIter.FirstWhich ();
     const SfxPoolItem *pPoolItem = NULL;
 
     while (nWhich)
     {
-        if ((rSourceSet.GetItemState(nWhich, TRUE, &pPoolItem) == SFX_ITEM_SET) &&
-            (rDestSet.GetItemState(nWhich, TRUE, &pPoolItem) == SFX_ITEM_SET))
+        if ((rSourceSet.GetItemState(nWhich, sal_True, &pPoolItem) == SFX_ITEM_SET) &&
+            (rDestSet.GetItemState(nWhich, sal_True, &pPoolItem) == SFX_ITEM_SET))
         {
             if (rSourceSet.Get(nWhich) != rDestSet.Get(nWhich))
             {
@@ -258,7 +258,7 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet  &rDestSet, const SfxItem
                 }
             }
         }
-        else if( rSourceSet.GetItemState(nWhich, TRUE, &pPoolItem) == SFX_ITEM_DONTCARE )
+        else if( rSourceSet.GetItemState(nWhich, sal_True, &pPoolItem) == SFX_ITEM_DONTCARE )
             rDestSet.InvalidateItem(nWhich);
 
         nWhich = aIter.NextWhich ();
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 60ac4c9b8..736c53503 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -91,7 +91,7 @@ bool LegendItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
     return ItemConverter::ApplyItemSet( rItemSet ) || bResult;
 }
 
-const USHORT * LegendItemConverter::GetWhichPairs() const
+const sal_uInt16 * LegendItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nLegendWhichPairs;
@@ -105,7 +105,7 @@ bool LegendItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropertyN
 
 
 bool LegendItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
@@ -185,7 +185,7 @@ bool LegendItemConverter::ApplySpecialItem(
 }
 
 void LegendItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     switch( nWhichId )
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 2516fa18d..fbf525979 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -83,7 +83,7 @@ AllAxisItemConverter::~AllAxisItemConverter()
 {
 }
 
-const USHORT * AllAxisItemConverter::GetWhichPairs() const
+const sal_uInt16 * AllAxisItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nAllAxisWhichPairs;
@@ -113,7 +113,7 @@ AllGridItemConverter::~AllGridItemConverter()
 {
 }
 
-const USHORT * AllGridItemConverter::GetWhichPairs() const
+const sal_uInt16 * AllGridItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nGridWhichPairs;
@@ -161,7 +161,7 @@ AllDataLabelItemConverter::~AllDataLabelItemConverter()
 {
 }
 
-const USHORT * AllDataLabelItemConverter::GetWhichPairs() const
+const sal_uInt16 * AllDataLabelItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nDataLabelWhichPairs;
@@ -195,7 +195,7 @@ AllTitleItemConverter::~AllTitleItemConverter()
 {
 }
 
-const USHORT * AllTitleItemConverter::GetWhichPairs() const
+const sal_uInt16 * AllTitleItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nTitleWhichPairs;
@@ -223,7 +223,7 @@ AllSeriesStatisticsConverter::AllSeriesStatisticsConverter(
 AllSeriesStatisticsConverter::~AllSeriesStatisticsConverter()
 {}
 
-const USHORT * AllSeriesStatisticsConverter::GetWhichPairs() const
+const sal_uInt16 * AllSeriesStatisticsConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nStatWhichPairs;
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 18e045ce5..3124a70dc 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -111,7 +111,7 @@ bool RegressionCurveItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
     return ItemConverter::ApplyItemSet( rItemSet ) || bResult;
 }
 
-const USHORT * RegressionCurveItemConverter::GetWhichPairs() const
+const sal_uInt16 * RegressionCurveItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nRegressionCurveWhichPairs;
@@ -126,7 +126,7 @@ bool RegressionCurveItemConverter::GetItemProperty(
 
 
 bool RegressionCurveItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     uno::Reference< chart2::XRegressionCurve > xCurve( GetPropertySet(), uno::UNO_QUERY );
@@ -171,7 +171,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
             OSL_ASSERT( xCurve.is());
             if( xCurve.is())
             {
-                bool bNewShow = static_cast< BOOL >(
+                bool bNewShow = static_cast< sal_Bool >(
                     static_cast< const SfxBoolItem & >(
                         rItemSet.Get( nWhichId )).GetValue());
 
@@ -194,7 +194,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
             OSL_ASSERT( xCurve.is());
             if( xCurve.is())
             {
-                bool bNewShow = static_cast< BOOL >(
+                bool bNewShow = static_cast< sal_Bool >(
                     static_cast< const SfxBoolItem & >(
                         rItemSet.Get( nWhichId )).GetValue());
 
@@ -217,7 +217,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
 }
 
 void RegressionCurveItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     uno::Reference< chart2::XRegressionCurve > xCurve( GetPropertySet(), uno::UNO_QUERY );
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 6ba4be5f2..15ccf17ae 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -116,7 +116,7 @@ bool RegressionEquationItemConverter::ApplyItemSet( const SfxItemSet & rItemSet
     return ItemConverter::ApplyItemSet( rItemSet ) || bResult;
 }
 
-const USHORT * RegressionEquationItemConverter::GetWhichPairs() const
+const sal_uInt16 * RegressionEquationItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nRegEquationWhichPairs;
@@ -135,7 +135,7 @@ bool RegressionEquationItemConverter::GetItemProperty( tWhichIdType nWhichId, tP
 }
 
 bool RegressionEquationItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
@@ -166,7 +166,7 @@ bool RegressionEquationItemConverter::ApplySpecialItem(
 }
 
 void RegressionEquationItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     switch( nWhichId )
diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
index 63bb9c015..4ef646407 100644
--- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
+++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
@@ -43,10 +43,9 @@ namespace
     EE_ITEMS_START, EE_ITEMS_END,  \
     SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING
 
-const USHORT nTitleWhichPairs[] =
+const sal_uInt16 nTitleWhichPairs[] =
 {
-    SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED,       //     4          sch/schattr.hxx
-    SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES,      //    53          sch/schattr.hxx
+    SCHATTR_TEXT_START, SCHATTR_TEXT_END,
     XATTR_LINE_FIRST, XATTR_LINE_LAST,              //  1000 -  1016  svx/xdef.hxx
     XATTR_FILL_FIRST, XATTR_FILL_LAST,              //  1018 -  1046  svx/xdef.hxx
     SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,      //  1067 -  1078  svx/svddef.hxx
@@ -54,40 +53,33 @@ const USHORT nTitleWhichPairs[] =
     0
 };
 
-const USHORT nAxisWhichPairs[] =
+const sal_uInt16 nAxisWhichPairs[] =
 {
     XATTR_LINE_FIRST, XATTR_LINE_LAST,							//  1000 -  1016  svx/xdef.hxx
     CHARACTER_WHICHPAIRS,
     SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE,	// 10585 - 10585  svx/svxids.hrc
     SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, // 11432          svx/svxids.hrc
-    SCHATTR_AXISTYPE, SCHATTR_AXISTYPE,							//    39          sch/schattr.hxx
-    SCHATTR_TEXT_START, SCHATTR_TEXT_END,						//     4 -     6  sch/schattr.hxx
-    SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES,      			//    53          sch/schattr.hxx
-    SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP,					//    54          sch/schattr.hxx
-    SCHATTR_AXIS_START, SCHATTR_AXIS_END,						//    70 -    95  sch/schattr.hxx
-    SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK,						// 30587          sch/schattr.hxx
+    SCHATTR_AXIS_START, SCHATTR_AXIS_END,
+    SCHATTR_TEXT_START, SCHATTR_TEXT_END,
     0
 };
 
-const USHORT nAllAxisWhichPairs[] =
+const sal_uInt16 nAllAxisWhichPairs[] =
 {
-    XATTR_LINE_FIRST, XATTR_LINE_LAST,				//  1000 -  1016  svx/xdef.hxx
+    XATTR_LINE_FIRST, XATTR_LINE_LAST,
     CHARACTER_WHICHPAIRS,
-    SCHATTR_TEXT_START, SCHATTR_TEXT_END,			//     4 -     6  sch/schattr.hxx
-    SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES,		//    53          sch/schattr.hxx
-    SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP,		//    54          sch/schattr.hxx
-    SCHATTR_AXIS_SHOWDESCR, SCHATTR_AXIS_SHOWDESCR,	//    85          sch/schattr.hxx
-    SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK,			// 30587          sch/schattr.hxx
+    SCHATTR_AXIS_LABEL_START, SCHATTR_AXIS_LABEL_END,
+    SCHATTR_TEXT_START, SCHATTR_TEXT_END,
     0
 };
 
-const USHORT nGridWhichPairs[] =
+const sal_uInt16 nGridWhichPairs[] =
 {
     XATTR_LINE_FIRST, XATTR_LINE_LAST,				//  1000 -  1016  svx/xdef.hxx
     0
 };
 
-const USHORT nLegendWhichPairs[] =
+const sal_uInt16 nLegendWhichPairs[] =
 {
     XATTR_LINE_FIRST, XATTR_LINE_LAST,				//  1000 -  1016  svx/xdef.hxx
     XATTR_FILL_FIRST, XATTR_FILL_LAST,				//  1018 -  1046  svx/xdef.hxx
@@ -97,13 +89,11 @@ const USHORT nLegendWhichPairs[] =
     0
 };
 
-const USHORT nDataLabelWhichPairs[] =
+const sal_uInt16 nDataLabelWhichPairs[] =
 {
     SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END,
     SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO,	/* 10585 - 10585  svx/svxids.hrc */ \
     SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432          svx/svxids.hrc */ \
-    SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE,   /*	  40          sch/schattr.hxx*/	\
-    SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /*	  41          sch/schattr.hxx*/	\
     SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES,
     EE_PARA_WRITINGDIR,EE_PARA_WRITINGDIR,
     0
@@ -117,15 +107,13 @@ const USHORT nDataLabelWhichPairs[] =
     SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END,	/*     1 -     2  sch/schattr.hxx*/	\
     SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO,	/* 10585 - 10585  svx/svxids.hrc */ \
     SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432          svx/svxids.hrc */ \
-    SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_VALUE,   /*	  40          sch/schattr.hxx*/	\
-    SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, /*	  41          sch/schattr.hxx*/	\
     SCHATTR_TEXT_DEGREES, SCHATTR_TEXT_DEGREES, \
     SCHATTR_STYLE_START,SCHATTR_STYLE_END,			/*    59 -    68  sch/schattr.hxx*/	\
     SCHATTR_SYMBOL_BRUSH,SCHATTR_SYMBOL_BRUSH,		/*    94          sch/schattr.hxx*/	\
     SCHATTR_SYMBOL_SIZE,SCHATTR_SYMBOL_SIZE,        /*    97          sch/schattr.hxx*/	\
     SDRATTR_3D_FIRST, SDRATTR_3D_LAST				/*  1244 -  1334  svx/svddef.hxx */
 
-const USHORT nDataPointWhichPairs[] =
+const sal_uInt16 nDataPointWhichPairs[] =
 {
     CHART_POINT_WHICHPAIRS,
     0
@@ -141,20 +129,20 @@ const USHORT nDataPointWhichPairs[] =
     SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, \
     SCHATTR_INCLUDE_HIDDEN_CELLS,SCHATTR_INCLUDE_HIDDEN_CELLS
 
-const USHORT nSeriesOptionsWhichPairs[] =
+const sal_uInt16 nSeriesOptionsWhichPairs[] =
 {
     CHART_SERIES_OPTIONS_WHICHPAIRS,
     0
 };
 
-const USHORT nRowWhichPairs[] =
+const sal_uInt16 nRowWhichPairs[] =
 {
     CHART_POINT_WHICHPAIRS,
     CHART_SERIES_OPTIONS_WHICHPAIRS,
     0
 };
 
-const USHORT nAreaWhichPairs[] =
+const sal_uInt16 nAreaWhichPairs[] =
 {
     XATTR_LINE_FIRST, XATTR_LINE_LAST,				//  1000 -  1016  svx/xdef.hxx
     XATTR_FILL_FIRST, XATTR_FILL_LAST,				//  1000 -  1016  svx/xdef.hxx
@@ -162,30 +150,28 @@ const USHORT nAreaWhichPairs[] =
     0
 };
 
-const USHORT nTextWhichPairs[] =
+const sal_uInt16 nTextWhichPairs[] =
 {
     CHARACTER_WHICHPAIRS,
-    SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED,       //     4          sch/schattr.hxx
-    SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES,		//    53          sch/schattr.hxx
+    SCHATTR_TEXT_START, SCHATTR_TEXT_END,
     0
 };
 
-const USHORT nTextOrientWhichPairs[] =
+const sal_uInt16 nTextOrientWhichPairs[] =
 {
     CHARACTER_WHICHPAIRS,
-    SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED,       //     4          sch/schattr.hxx
-    SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES,		//    53          sch/schattr.hxx
+    SCHATTR_TEXT_START, SCHATTR_TEXT_END,
     0
 };
 
-const USHORT nStatWhichPairs[]=
+const sal_uInt16 nStatWhichPairs[]=
 {
     SCHATTR_STAT_START, SCHATTR_STAT_END,			//    45 -    52  sch/schattr.hxx
     SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END, // 108 -   109
     0
 };
 
-const USHORT nErrorBarWhichPairs[]=
+const sal_uInt16 nErrorBarWhichPairs[]=
 {
     SCHATTR_STAT_START, SCHATTR_STAT_END,			//    45 -    52  sch/schattr.hxx
     XATTR_LINE_FIRST, XATTR_LINE_LAST,				//  1000 -  1016  svx/xdef.hxx
@@ -194,26 +180,26 @@ const USHORT nErrorBarWhichPairs[]=
 
 // for CharacterProperties
 
-const USHORT nCharacterPropertyWhichPairs[] =
+const sal_uInt16 nCharacterPropertyWhichPairs[] =
 {
     CHARACTER_WHICHPAIRS,
     0
 };
 
-const USHORT nLinePropertyWhichPairs[] =
+const sal_uInt16 nLinePropertyWhichPairs[] =
 {
     XATTR_LINE_FIRST, XATTR_LINE_LAST,				//  1000 -  1016  svx/xdef.hxx
     0
 };
 
-const USHORT nFillPropertyWhichPairs[] =
+const sal_uInt16 nFillPropertyWhichPairs[] =
 {
     XATTR_FILL_FIRST, XATTR_FILL_LAST,				//  1000 -  1016  svx/xdef.hxx
     SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,		//  1067 -  1078  svx/svddef.hxx
     0
 };
 
-const USHORT nLineAndFillPropertyWhichPairs[] =
+const sal_uInt16 nLineAndFillPropertyWhichPairs[] =
 {
     XATTR_LINE_FIRST, XATTR_LINE_LAST,				//  1000 -  1016  svx/xdef.hxx
     XATTR_FILL_FIRST, XATTR_FILL_LAST,				//  1000 -  1016  svx/xdef.hxx
@@ -221,7 +207,7 @@ const USHORT nLineAndFillPropertyWhichPairs[] =
     0
 };
 
-const USHORT nChartStyleWhichPairs[] =
+const sal_uInt16 nChartStyleWhichPairs[] =
 {
     SCHATTR_DIAGRAM_STYLE,                SCHATTR_DIAGRAM_STYLE,
     SCHATTR_STYLE_SHAPE,                  SCHATTR_STYLE_SHAPE,
@@ -231,14 +217,14 @@ const USHORT nChartStyleWhichPairs[] =
     0
 };
 
-const USHORT nRegressionCurveWhichPairs[] =
+const sal_uInt16 nRegressionCurveWhichPairs[] =
 {
     SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END, // 108 -   109
     XATTR_LINE_FIRST, XATTR_LINE_LAST,				//  1000 -  1016  svx/xdef.hxx
     0
 };
 
-const USHORT nRegEquationWhichPairs[] =
+const sal_uInt16 nRegEquationWhichPairs[] =
 {
     XATTR_LINE_FIRST, XATTR_LINE_LAST,              //  1000 -  1016  svx/xdef.hxx
     XATTR_FILL_FIRST, XATTR_FILL_LAST,              //  1018 -  1046  svx/xdef.hxx
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index db5ceda4a..dc3110c03 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -186,7 +186,7 @@ SeriesOptionsItemConverter::~SeriesOptionsItemConverter()
 {
 }
 
-const USHORT * SeriesOptionsItemConverter::GetWhichPairs() const
+const sal_uInt16 * SeriesOptionsItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nSeriesOptionsWhichPairs;
@@ -197,7 +197,7 @@ bool SeriesOptionsItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPr
     return false;
 }
 
-bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
+bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
@@ -372,7 +372,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxIte
 }
 
 void SeriesOptionsItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     switch( nWhichId )
@@ -434,7 +434,7 @@ void SeriesOptionsItemConverter::FillSpecialItem(
         {
             SvULongs aList;
             for ( sal_Int32 nN=0; nN<m_aSupportedMissingValueTreatments.getLength(); nN++ )
-                aList.Insert( m_aSupportedMissingValueTreatments[nN], sal::static_int_cast< USHORT >(nN) );
+                aList.Insert( m_aSupportedMissingValueTreatments[nN], sal::static_int_cast< sal_uInt16 >(nN) );
             rOutItemSet.Put( SfxIntegerListItem( nWhichId, aList ) );
             break;
         }
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 11a6db4c7..31ea46047 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -153,7 +153,7 @@ uno::Reference< beans::XPropertySet > lcl_getEquationProperties(
     {
         SvxChartRegress eRegress = CHREGRESS_NONE;
         const SfxPoolItem *pPoolItem = NULL;
-        if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+        if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, sal_True, &pPoolItem ) == SFX_ITEM_SET )
         {
             eRegress = static_cast< const SvxChartRegressItem * >( pPoolItem )->GetValue();
             bEquationExists = ( eRegress != CHREGRESS_NONE );
@@ -203,7 +203,7 @@ StatisticsItemConverter::StatisticsItemConverter(
 StatisticsItemConverter::~StatisticsItemConverter()
 {}
 
-const USHORT * StatisticsItemConverter::GetWhichPairs() const
+const sal_uInt16 * StatisticsItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nStatWhichPairs;
@@ -217,7 +217,7 @@ bool StatisticsItemConverter::GetItemProperty(
 }
 
 bool StatisticsItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
@@ -521,7 +521,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
 }
 
 void StatisticsItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     switch( nWhichId )
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index fa3e71dd9..97b6bb04c 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -75,7 +75,7 @@ public:
     virtual ~FormattedStringsConverter();
 
 protected:
-    virtual const USHORT * GetWhichPairs() const;
+    virtual const sal_uInt16 * GetWhichPairs() const;
 };
 
 // ----------------------------------------
@@ -109,7 +109,7 @@ FormattedStringsConverter::~FormattedStringsConverter()
 {
 }
 
-const USHORT * FormattedStringsConverter::GetWhichPairs() const
+const sal_uInt16 * FormattedStringsConverter::GetWhichPairs() const
 {
     return nCharacterPropertyWhichPairs;
 }
@@ -170,7 +170,7 @@ bool TitleItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
     return ItemConverter::ApplyItemSet( rItemSet ) || bResult;
 }
 
-const USHORT * TitleItemConverter::GetWhichPairs() const
+const sal_uInt16 * TitleItemConverter::GetWhichPairs() const
 {
     // must span all used items!
     return nTitleWhichPairs;
@@ -190,7 +190,7 @@ bool TitleItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWi
 
 
 bool TitleItemConverter::ApplySpecialItem(
-    USHORT nWhichId, const SfxItemSet & rItemSet )
+    sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
     throw( uno::Exception )
 {
     bool bChanged = false;
@@ -221,7 +221,7 @@ bool TitleItemConverter::ApplySpecialItem(
 }
 
 void TitleItemConverter::FillSpecialItem(
-    USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+    sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
     switch( nWhichId )
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index e4a2d01bd..b9b8059da 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -49,17 +49,15 @@
 #include "macros.hxx"
 #include "dlg_CreationWizard.hxx"
 #include "dlg_ChartType.hxx"
-//#include "svx/ActionDescriptionProvider.hxx"
 #include "AccessibleChartView.hxx"
 #include "DrawCommandDispatch.hxx"
 #include "ShapeController.hxx"
-#include "UndoManager.hxx"
+#include "UndoActions.hxx"
 
 #include <comphelper/InlineContainer.hxx>
 
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XUndoSupplier.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
@@ -67,6 +65,8 @@
 #include <com/sun/star/util/XModeChangeBroadcaster.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/frame/LayoutManagerEvents.hpp>
+#include <com/sun/star/document/XUndoManagerSupplier.hpp>
+#include <com/sun/star/document/XUndoAction.hpp>
 
 //-------
 // header for define RET_OK
@@ -86,6 +86,7 @@
 // object in the DTOR
 #include <svtools/acceleratorexecute.hxx>
 #include <svx/ActionDescriptionProvider.hxx>
+#include <tools/diagnose_ex.h>
 
 // enable the following define to let the controller listen to model changes and
 // react on this by rebuilding the view
@@ -133,7 +134,6 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const &
     , m_eDrawMode( CHARTDRAW_SELECT )
 {
     DBG_CTOR(ChartController,NULL);
-//     m_aDispatchContainer.setUndoManager( m_xUndoManager );
     m_aDoubleClickTimer.SetTimeoutHdl( LINK( this, ChartController, DoubleClickWaitingHdl ) );
 }
 
@@ -622,9 +622,8 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
             m_pChartWindow->Invalidate();
     }
 
-    uno::Reference< chart2::XUndoSupplier > xUndoSupplier( getModel(), uno::UNO_QUERY );
-    if( xUndoSupplier.is())
-        m_xUndoManager.set( xUndoSupplier->getUndoManager());
+    uno::Reference< document::XUndoManagerSupplier > xSuppUndo( getModel(), uno::UNO_QUERY_THROW );
+    m_xUndoManager.set( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW );
 
     return sal_True;
 }
@@ -1335,7 +1334,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
 {
     // using assignment for broken gcc 3.3
     UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
-        ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_CHARTTYPE ))), m_xUndoManager, getModel() );
+        String( SchResId( STR_ACTION_EDIT_CHARTTYPE )), m_xUndoManager );
 
     // /--
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
@@ -1344,7 +1343,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
     if( aDlg.Execute() == RET_OK )
     {
         impl_adaptDataSeriesAutoResize();
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
     // \--
 }
@@ -1360,7 +1359,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
 
     // using assignment for broken gcc 3.3
     UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
-        ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_DATA_RANGES ))), m_xUndoManager, getModel() );
+        String( SchResId( STR_ACTION_EDIT_DATA_RANGES )), m_xUndoManager );
     if( xChartDoc.is())
     {
         // /--
@@ -1369,7 +1368,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
         if( aDlg.Execute() == RET_OK )
         {
             impl_adaptDataSeriesAutoResize();
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
         // \--
     }
@@ -1387,14 +1386,14 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward )
     UndoGuardWithSelection aUndoGuard(
         ActionDescriptionProvider::createDescription(
             (bForward ? ActionDescriptionProvider::MOVE_TOTOP : ActionDescriptionProvider::MOVE_TOBOTTOM),
-            ::rtl::OUString( String( SchResId( STR_OBJECT_DATASERIES )))),
-        m_xUndoManager, getModel());
+            String( SchResId( STR_OBJECT_DATASERIES ))),
+        m_xUndoManager );
 
     bool bChanged = DiagramHelper::moveSeries( ChartModelHelper::findDiagram( getModel() ), xGivenDataSeries, bForward );
     if( bChanged )
     {
         m_aSelection.setSelection( ObjectIdentifier::getMovedSeriesCID( aObjectCID, bForward ) );
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
@@ -1454,13 +1453,21 @@ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ )
 
 IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction )
 {
+    ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L );
+
     ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID();
     if ( aObjectCID.getLength() == 0 )
     {
-        UndoManager* pUndoManager = UndoManager::getImplementation( m_xUndoManager );
-        if ( pUndoManager )
+        try
+        {
+            const Reference< document::XUndoManagerSupplier > xSuppUndo( getModel(), uno::UNO_QUERY_THROW );
+            const Reference< document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW );
+            const Reference< document::XUndoAction > xAction( new impl::ShapeUndoElement( *pUndoAction ) );
+            xUndoManager->addUndoAction( xAction );
+        }
+        catch( const uno::Exception& )
         {
-            pUndoManager->addShapeUndoAction( pUndoAction );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
     return 0L;
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index c679714d2..e44b436a0 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -42,7 +42,7 @@
 #include <cppuhelper/implbase12.hxx>
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/chart2/XUndoManager.hpp>
+#include <com/sun/star/document/XUndoManager.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -89,6 +89,8 @@ namespace chart
 {
 //.............................................................................
 
+class UndoGuard;
+
 enum ChartDrawMode { CHARTDRAW_INSERT, CHARTDRAW_SELECT };
 
 class WindowController
@@ -124,7 +126,7 @@ public:
         @param rOutEqualRect is filled with a rectangle that denotes the region
                              in which the quick help does not change.
 
-        @return </TRUE>, if a quick help should be shown.
+        @return </sal_True>, if a quick help should be shown.
      */
     virtual bool requestQuickHelp(
         ::Point aAtLogicPosition, bool bIsBalloonHelp,
@@ -578,7 +580,8 @@ private:
 
     bool volatile       m_bConnectingToView;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XUndoManager > m_xUndoManager;
+    ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager >    m_xUndoManager;
+    ::std::auto_ptr< UndoGuard >                                                    m_pTextActionUndoGuard;
     /// needed for dispatching URLs in FeatureStateEvents
     mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
 
@@ -700,7 +703,7 @@ private:
         MOVE_OBJECT,
         CENTERED_RESIZE_OBJECT
     };
-    /// @return </TRUE>, if resize/move was successful
+    /// @return </sal_True>, if resize/move was successful
     bool impl_moveOrResizeObject(
         const ::rtl::OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY );
     bool impl_DragDataPoint( const ::rtl::OUString & rCID, double fOffset );
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index 602634508..144ea72b3 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -66,12 +66,12 @@ void ChartController::executeDispatch_EditData()
             ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
             // using assignment for broken gcc 3.3
             UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData(
-                ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_CHART_DATA ))),
-                m_xUndoManager, getModel() );
+                String( SchResId( STR_ACTION_EDIT_CHART_DATA )),
+                m_xUndoManager );
             DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC );
             // the dialog has no OK/Cancel
             aDataEditorDialog.Execute();
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
             // \--
         }
     }
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index b5e3cc04b..b023bb2e6 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -44,7 +44,7 @@
 #include "DiagramHelper.hxx"
 #include "macros.hxx"
 #include "chartview/DrawModelWrapper.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "ViewElementListProvider.hxx"
 #include "MultipleChartConverters.hxx"
 #include "ControllerLockGuard.hxx"
@@ -121,8 +121,8 @@ void ChartController::executeDispatch_InsertAxes()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_AXES )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXES ))),
+        m_xUndoManager );
 
     try
     {
@@ -146,7 +146,7 @@ void ChartController::executeDispatch_InsertAxes()
                 , aDialogInput.aExistenceList, aDialogOutput.aExistenceList, m_xCC
                 , mpRefSizeProvider.get() );
             if( bChanged )
-                aUndoGuard.commitAction();
+                aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -159,8 +159,8 @@ void ChartController::executeDispatch_InsertGrid()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_GRIDS )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRIDS ))),
+        m_xUndoManager );
 
     try
     {
@@ -180,7 +180,7 @@ void ChartController::executeDispatch_InsertGrid()
             bool bChanged = AxisHelper::changeVisibilityOfGrids( xDiagram
                 , aDialogInput.aExistenceList, aDialogOutput.aExistenceList, m_xCC );
             if( bChanged )
-                aUndoGuard.commitAction();
+                aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -196,8 +196,8 @@ void ChartController::executeDispatch_InsertTitles()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_TITLES )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLES ))),
+        m_xUndoManager );
 
     try
     {
@@ -214,7 +214,7 @@ void ChartController::executeDispatch_InsertTitles()
             aDlg.getResult( aDialogOutput );
             bool bChanged = aDialogOutput.writeDifferenceToModel( getModel(), m_xCC, &aDialogInput );
             if( bChanged )
-                aUndoGuard.commitAction();
+                aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -227,30 +227,30 @@ void ChartController::executeDispatch_DeleteLegend()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_LEGEND )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))),
+        m_xUndoManager );
 
     LegendHelper::hideLegend( getModel() );
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_InsertLegend()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_LEGEND )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))),
+        m_xUndoManager );
 
     Reference< chart2::XLegend > xLegend = LegendHelper::showLegend( getModel(), m_xCC );
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_OpenLegendDialog()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_LEGEND )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_LEGEND ))),
+        m_xUndoManager );
 
     try
     {
@@ -264,7 +264,7 @@ void ChartController::executeDispatch_OpenLegendDialog()
             ControllerLockGuard aCLGuard( getModel() );
             bool bChanged = aDlg.writeToModel( getModel() );
             if( bChanged )
-                aUndoGuard.commitAction();
+                aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -280,8 +280,8 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_DATALABELS )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_DATALABELS ))),
+        m_xUndoManager );
 
     //if a series is selected insert labels for that series only:
     uno::Reference< chart2::XDataSeries > xSeries(
@@ -298,7 +298,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
 
         bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, true );
         if( bSuccess ) 
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         return;
     }
 
@@ -330,7 +330,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
             ControllerLockGuard aCLGuard( getModel() );
             bool bChanged = aItemConverter.ApplyItemSet( aOutItemSet );//model should be changed now
             if( bChanged )
-                aUndoGuard.commitAction();
+                aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -354,7 +354,7 @@ void ChartController::executeDispatch_InsertMenu_YErrorBars()
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
             ActionDescriptionProvider::INSERT, ObjectNameProvider::getName_ObjectForAllSeries( OBJECTTYPE_DATA_ERRORS ) ),
-        m_xUndoManager, getModel() );
+        m_xUndoManager );
 
     try
     {
@@ -380,7 +380,7 @@ void ChartController::executeDispatch_InsertMenu_YErrorBars()
             ControllerLockGuard aCLGuard( getModel() );
             bool bChanged = aItemConverter.ApplyItemSet( aOutItemSet );//model should be changed now
             if( bChanged )
-                aUndoGuard.commitAction();
+                aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -393,19 +393,19 @@ void ChartController::executeDispatch_InsertMeanValue()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_AVERAGE_LINE )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+        m_xUndoManager );
     lcl_InsertMeanValueLine( m_xCC ).operator()(
         ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ));
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_InsertMenu_MeanValues()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_AVERAGE_LINE )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+        m_xUndoManager );
 
     uno::Reference< chart2::XDataSeries > xSeries(
         ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
@@ -420,7 +420,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues()
             DiagramHelper::getDataSeriesFromDiagram( ChartModelHelper::findDiagram( getModel() )));
         ::std::for_each( aSeries.begin(), aSeries.end(), lcl_InsertMeanValueLine( m_xCC ));
     }
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_InsertMenu_Trendlines()
@@ -437,7 +437,7 @@ void ChartController::executeDispatch_InsertMenu_Trendlines()
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
             ActionDescriptionProvider::INSERT, ObjectNameProvider::getName_ObjectForAllSeries( OBJECTTYPE_DATA_CURVE ) ),
-        m_xUndoManager, getModel() );
+        m_xUndoManager );
 
     try
     {
@@ -460,7 +460,7 @@ void ChartController::executeDispatch_InsertMenu_Trendlines()
             ControllerLockGuard aCLGuard( getModel() );
             bool bChanged = aItemConverter.ApplyItemSet( aOutItemSet );//model should be changed now
             if( bChanged )
-                aUndoGuard.commitAction();
+                aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -477,8 +477,8 @@ void ChartController::executeDispatch_InsertTrendline()
     {
         UndoLiveUpdateGuard aUndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_CURVE )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE ))),
+            m_xUndoManager );
 
         // add a linear curve
         RegressionCurveHelper::addRegressionCurve(
@@ -518,7 +518,7 @@ void ChartController::executeDispatch_InsertTrendline()
                 ControllerLockGuard aCLGuard( getModel() );
                 aItemConverter.ApplyItemSet( *pOutItemSet );
             }
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
 }
@@ -531,8 +531,8 @@ void ChartController::executeDispatch_InsertYErrorBars()
     {
         UndoLiveUpdateGuard aUndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_ERROR_BARS )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_ERROR_BARS ))),
+            m_xUndoManager );
 
         // add error bars with standard deviation
         uno::Reference< beans::XPropertySet > xErrorBarProp(
@@ -568,7 +568,7 @@ void ChartController::executeDispatch_InsertYErrorBars()
                 ControllerLockGuard aCLGuard( getModel() );
                 aItemConverter.ApplyItemSet( *pOutItemSet );
             }
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
 }
@@ -591,11 +591,11 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 )
             // using assignment for broken gcc 3.3
             UndoGuard aUndoGuard = UndoGuard(
                 ActionDescriptionProvider::createDescription(
-                    ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_CURVE_EQUATION )))),
-                m_xUndoManager, getModel() );
+                    ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+                m_xUndoManager );
             xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( true ));
             xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( bInsertR2 ));
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
 }
@@ -608,10 +608,10 @@ void ChartController::executeDispatch_InsertR2Value()
     {
         UndoGuard aUndoGuard = UndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_CURVE_EQUATION )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+            m_xUndoManager );
         xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( true ));
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
@@ -623,10 +623,10 @@ void ChartController::executeDispatch_DeleteR2Value()
     {
         UndoGuard aUndoGuard = UndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_CURVE_EQUATION )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+            m_xUndoManager );
         xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( false ));
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
@@ -638,10 +638,10 @@ void ChartController::executeDispatch_DeleteMeanValue()
     {
         UndoGuard aUndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_AVERAGE_LINE )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+            m_xUndoManager );
         RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
@@ -653,10 +653,10 @@ void ChartController::executeDispatch_DeleteTrendline()
     {
         UndoGuard aUndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_CURVE )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))),
+            m_xUndoManager );
         RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt );
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
@@ -668,10 +668,10 @@ void ChartController::executeDispatch_DeleteTrendlineEquation()
     {
         UndoGuard aUndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_CURVE_EQUATION )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+            m_xUndoManager );
         RegressionCurveHelper::removeEquations( xRegCurveCnt );
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
@@ -683,10 +683,10 @@ void ChartController::executeDispatch_DeleteYErrorBars()
     {
         UndoGuard aUndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_CURVE )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE ))),
+            m_xUndoManager );
         StatisticsHelper::removeErrorBars( xDataSeries );
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
@@ -697,20 +697,20 @@ void ChartController::executeDispatch_InsertDataLabels()
     if( xSeries.is() )
     {
         UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT,
-            ::rtl::OUString( String( SchResId( STR_OBJECT_DATALABELS )))),
-            m_xUndoManager, getModel() );
+            String( SchResId( STR_OBJECT_DATALABELS ))),
+            m_xUndoManager );
         DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries );
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
 void ChartController::executeDispatch_InsertDataLabel()
 {
     UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, 
-        ::rtl::OUString( String( SchResId( STR_OBJECT_LABEL )))),
-        m_xUndoManager, getModel() );
+        String( SchResId( STR_OBJECT_LABEL ))),
+        m_xUndoManager );
     DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) );
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_DeleteDataLabels()
@@ -720,44 +720,44 @@ void ChartController::executeDispatch_DeleteDataLabels()
     if( xSeries.is() )
     {
         UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE,
-            ::rtl::OUString( String( SchResId( STR_OBJECT_DATALABELS )))),
-            m_xUndoManager, getModel() );
+            String( SchResId( STR_OBJECT_DATALABELS ))),
+            m_xUndoManager );
         DataSeriesHelper::deleteDataLabelsFromSeriesAndAllPoints( xSeries );
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
 void ChartController::executeDispatch_DeleteDataLabel()
 {
     UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE,
-        ::rtl::OUString( String( SchResId( STR_OBJECT_LABEL )))),
-        m_xUndoManager, getModel() );
+        String( SchResId( STR_OBJECT_LABEL ))),
+        m_xUndoManager );
     DataSeriesHelper::deleteDataLabelsFromPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) );
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_ResetAllDataPoints()
 {
     UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT,
-        ::rtl::OUString( String( SchResId( STR_OBJECT_DATAPOINTS )))),
-        m_xUndoManager, getModel() );
+        String( SchResId( STR_OBJECT_DATAPOINTS ))),
+        m_xUndoManager );
     uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
     if( xSeries.is() )
         xSeries->resetAllDataPoints();
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 void ChartController::executeDispatch_ResetDataPoint()
 {
     UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::FORMAT,
-        ::rtl::OUString( String( SchResId( STR_OBJECT_DATAPOINT )))),
-        m_xUndoManager, getModel() );
+        String( SchResId( STR_OBJECT_DATAPOINT ))),
+        m_xUndoManager );
     uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY );
     if( xSeries.is() )
     {
         sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( m_aSelection.getSelectedCID() );
         xSeries->resetDataPoint( nPointIndex );
     }    
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_InsertAxisTitle()
@@ -768,8 +768,8 @@ void ChartController::executeDispatch_InsertAxisTitle()
         {
             UndoGuard aUndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_TITLE )))),
-            m_xUndoManager, getModel() );
+                ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_TITLE ))),
+            m_xUndoManager );
 
             Reference< XAxis > xAxis = ObjectIdentifier::getAxisForCID( m_aSelection.getSelectedCID(), getModel() );
             sal_Int32 nDimensionIndex = -1;
@@ -787,7 +787,7 @@ void ChartController::executeDispatch_InsertAxisTitle()
 
             ::std::auto_ptr< ReferenceSizeProvider > apRefSizeProvider( impl_createReferenceSizeProvider());
             xTitle = TitleHelper::createTitle( eTitleType, ObjectNameProvider::getTitleNameByType(eTitleType), getModel(), m_xCC, apRefSizeProvider.get() );
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
 
         /*
@@ -809,8 +809,8 @@ void ChartController::executeDispatch_InsertAxis()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_AXIS )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_AXIS ))),
+        m_xUndoManager );
 
     try
     {
@@ -818,7 +818,7 @@ void ChartController::executeDispatch_InsertAxis()
         if( xAxis.is() )
         {
             AxisHelper::makeAxisVisible( xAxis );
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -831,8 +831,8 @@ void ChartController::executeDispatch_DeleteAxis()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_AXIS )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AXIS ))),
+        m_xUndoManager );
 
     try
     {
@@ -840,7 +840,7 @@ void ChartController::executeDispatch_DeleteAxis()
         if( xAxis.is() )
         {
             AxisHelper::makeAxisInvisible( xAxis );
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -853,8 +853,8 @@ void ChartController::executeDispatch_InsertMajorGrid()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_GRID )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))),
+        m_xUndoManager );
 
     try
     {
@@ -862,7 +862,7 @@ void ChartController::executeDispatch_InsertMajorGrid()
         if( xAxis.is() )
         {
             AxisHelper::makeGridVisible( xAxis->getGridProperties() );
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -875,8 +875,8 @@ void ChartController::executeDispatch_DeleteMajorGrid()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_GRID )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))),
+        m_xUndoManager );
 
     try
     {
@@ -884,7 +884,7 @@ void ChartController::executeDispatch_DeleteMajorGrid()
         if( xAxis.is() )
         {
             AxisHelper::makeGridInvisible( xAxis->getGridProperties() );
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -897,8 +897,8 @@ void ChartController::executeDispatch_InsertMinorGrid()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::INSERT, ::rtl::OUString( String( SchResId( STR_OBJECT_GRID )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_GRID ))),
+        m_xUndoManager );
 
     try
     {
@@ -908,7 +908,7 @@ void ChartController::executeDispatch_InsertMinorGrid()
             Sequence< Reference< beans::XPropertySet > > aSubGrids( xAxis->getSubGridProperties() );
             for( sal_Int32 nN=0; nN<aSubGrids.getLength(); nN++)
                 AxisHelper::makeGridVisible( aSubGrids[nN] );
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
@@ -921,8 +921,8 @@ void ChartController::executeDispatch_DeleteMinorGrid()
 {
     UndoGuard aUndoGuard(
         ActionDescriptionProvider::createDescription(
-            ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_GRID )))),
-        m_xUndoManager, getModel() );
+            ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_GRID ))),
+        m_xUndoManager );
 
     try
     {
@@ -932,7 +932,7 @@ void ChartController::executeDispatch_DeleteMinorGrid()
             Sequence< Reference< beans::XPropertySet > > aSubGrids( xAxis->getSubGridProperties() );
             for( sal_Int32 nN=0; nN<aSubGrids.getLength(); nN++)
                 AxisHelper::makeGridInvisible( aSubGrids[nN] );
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException& e)
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 077930683..6f88dcb1d 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -72,16 +72,16 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, Rectangle& r
 
     const SfxPoolItem* pPoolItem=NULL;
     //read position
-    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_POS_X,TRUE,&pPoolItem))
+    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_POS_X,sal_True,&pPoolItem))
         nPosX=((const SfxInt32Item*)pPoolItem)->GetValue();
-    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_POS_Y,TRUE,&pPoolItem))
+    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_POS_Y,sal_True,&pPoolItem))
         nPosY=((const SfxInt32Item*)pPoolItem)->GetValue();
     //read size
-    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_WIDTH,TRUE,&pPoolItem))
+    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_WIDTH,sal_True,&pPoolItem))
         nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue();
-    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,TRUE,&pPoolItem))
+    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem))
         nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue();
-    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_SIZE_POINT,TRUE,&pPoolItem))
+    if (SFX_ITEM_SET==rItemSet.GetItemState(SID_ATTR_TRANSFORM_SIZE_POINT,sal_True,&pPoolItem))
         eRP=(RECT_POINT)((const SfxAllEnumItem*)pPoolItem)->GetValue();
 
     switch( eRP )
@@ -139,7 +139,7 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize()
         ActionDescriptionProvider::createDescription(
             ActionDescriptionProvider::POS_SIZE,
             ObjectNameProvider::getName( ObjectIdentifier::getObjectType( aCID ))),
-        m_xUndoManager, getModel() );
+        m_xUndoManager );
 
     SfxAbstractTabDialog * pDlg = NULL;
     try
@@ -174,7 +174,7 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize()
                             , awt::Rectangle(aObjectRect.getX(),aObjectRect.getY(),aObjectRect.getWidth(),aObjectRect.getHeight())
                             , awt::Rectangle(aPageRect.getX(),aPageRect.getY(),aPageRect.getWidth(),aPageRect.getHeight()) );
                 if( bChanged )
-                    aUndoGuard.commitAction();
+                    aUndoGuard.commit();
             }
         }
         delete pDlg;
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 227946cd2..e2865afd9 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -720,11 +720,11 @@ void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUStrin
     UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
                 ActionDescriptionProvider::FORMAT,
                 ObjectNameProvider::getName( ObjectIdentifier::getObjectType( aObjectCID ))),
-            m_xUndoManager, getModel() );
+            m_xUndoManager );
 
     bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, false );
     if( bSuccess ) 
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
 }
 
 bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl::OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso )
@@ -838,15 +838,15 @@ void SAL_CALL ChartController::executeDispatch_View3D()
     {
         // using assignment for broken gcc 3.3
         UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
-            ::rtl::OUString( String( SchResId( STR_ACTION_EDIT_3D_VIEW ))),
-            m_xUndoManager, getModel());
+            String( SchResId( STR_ACTION_EDIT_3D_VIEW )),
+            m_xUndoManager );
 
         // /--
         //open dialog
         ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
         View3DDialog aDlg( m_pChartWindow, getModel(), m_pDrawModelWrapper->GetColorTable() );
         if( aDlg.Execute() == RET_OK )
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         // \--
     }
     catch( uno::RuntimeException& e)
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index be1ecd616..5739652ad 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -29,6 +29,8 @@
 #include "precompiled_chart2.hxx"
 #include "ChartController.hxx"
 
+#include "ResId.hxx"
+#include "UndoGuard.hxx"
 #include "DrawViewWrapper.hxx"
 #include "ChartWindow.hxx"
 #include "TitleHelper.hxx"
@@ -36,6 +38,7 @@
 #include "macros.hxx"
 #include "ControllerLockGuard.hxx"
 #include "AccessibleTextHelper.hxx"
+#include "Strings.hrc"
 #include "chartview/DrawModelWrapper.hxx"
 
 #include <svx/svdotext.hxx>
@@ -81,7 +84,9 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
     if(!pTextObj)
         return;
 
-    m_xUndoManager->preAction( getModel());
+    OSL_PRECOND( !m_pTextActionUndoGuard.get(), "ChartController::StartTextEdit: already have a TextUndoGuard!?" );
+    m_pTextActionUndoGuard.reset( new UndoGuard( 
+        String( SchResId( STR_ACTION_EDIT_TEXT ) ), m_xUndoManager ) );
     SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner();
     //pOutliner->SetRefDevice(m_pChartWindow);
     //pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)pStyleSheetPool);
@@ -165,26 +170,11 @@ bool ChartController::EndTextEdit()
             TitleHelper::setCompleteString( aString, uno::Reference<
                 ::com::sun::star::chart2::XTitle >::query( xPropSet ), m_xCC );
 
-            try
-            {
-                m_xUndoManager->postAction( C2U("Edit Text") );
-            }
-            catch( uno::RuntimeException& e)
-            {
-                ASSERT_EXCEPTION( e );
-            }
-        }
-        else
-        {
-            try
-            {
-                m_xUndoManager->cancelAction();
-            }
-            catch ( uno::RuntimeException& e )
-            {
-                ASSERT_EXCEPTION( e );
-            }
+            OSL_ENSURE( m_pTextActionUndoGuard.get(), "ChartController::EndTextEdit: no TextUndoGuard!" );
+            if ( m_pTextActionUndoGuard.get() )
+                m_pTextActionUndoGuard->commit();
         }
+        m_pTextActionUndoGuard.reset();
     }
     return true;
 }
@@ -203,10 +193,10 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
     DBG_ASSERT( pFact, "No dialog factory" );
 
     SfxAllItemSet aSet( m_pDrawModelWrapper->GetItemPool() );
-    aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
+    aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
 
     //set fixed current font
-    aSet.Put( SfxBoolItem( FN_PARAM_2, TRUE ) ); //maybe not necessary in future
+    aSet.Put( SfxBoolItem( FN_PARAM_2, sal_True ) ); //maybe not necessary in future
     
     Font aCurFont = m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
     aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) );
@@ -218,7 +208,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
         const SfxItemSet* pSet = pDlg->GetOutputItemSet();
         const SfxPoolItem* pItem=0;
         String aString;
-        if ( pSet && pSet->GetItemState( SID_CHARMAP, TRUE, &pItem) == SFX_ITEM_SET &&
+        if ( pSet && pSet->GetItemState( SID_CHARMAP, sal_True, &pItem) == SFX_ITEM_SET &&
              pItem->ISA(SfxStringItem) )
                 aString = dynamic_cast<const SfxStringItem*>(pItem)->GetValue();
 
@@ -232,7 +222,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
 
         // prevent flicker
         pOutlinerView->HideCursor();
-        pOutliner->SetUpdateMode(FALSE);
+        pOutliner->SetUpdateMode(sal_False);
 
         // delete current selection by inserting empty String, so current
         // attributes become unique (sel. has to be erased anyway)
@@ -240,7 +230,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
 
         //SfxUndoManager& rUndoMgr =  pOutliner->GetUndoManager();
         //rUndoMgr.EnterListAction( String( SchResId( STR_UNDO_INSERT_SPECCHAR )), String( SchResId( STR_UNDO_INSERT_SPECCHAR )));
-        pOutlinerView->InsertText(aString, TRUE);
+        pOutlinerView->InsertText(aString, sal_True);
 
         ESelection aSel = pOutlinerView->GetSelection();
         aSel.nStartPara = aSel.nEndPara;
@@ -250,7 +240,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
         //rUndoMgr.LeaveListAction();
 
         // show changes
-        pOutliner->SetUpdateMode(TRUE);
+        pOutliner->SetUpdateMode(sal_True);
         pOutlinerView->ShowCursor();
     }
 
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index c6c4b33a7..e58756de8 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -102,7 +102,7 @@ namespace
 bool lcl_deleteDataSeries(
     const OUString & rCID,
     const Reference< frame::XModel > & xModel,
-    const Reference< chart2::XUndoManager > & xUndoManager )
+    const Reference< document::XUndoManager > & xUndoManager )
 {
     bool bResult = false;
     uno::Reference< chart2::XDataSeries > xSeries( ::chart::ObjectIdentifier::getDataSeriesForCID( rCID, xModel ));
@@ -115,8 +115,8 @@ bool lcl_deleteDataSeries(
         {
             ::chart::UndoGuard aUndoGuard(
                 ActionDescriptionProvider::createDescription(
-                    ActionDescriptionProvider::DELETE, ::rtl::OUString( String( ::chart::SchResId( STR_OBJECT_DATASERIES )))),
-                xUndoManager, xModel );
+                    ActionDescriptionProvider::DELETE, String( ::chart::SchResId( STR_OBJECT_DATASERIES ))),
+                xUndoManager );
 
             Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( xModel ) );
             uno::Reference< chart2::XAxis > xAxis( ::chart::DiagramHelper::getAttachedAxis( xSeries, xDiagram ) );
@@ -126,7 +126,7 @@ bool lcl_deleteDataSeries(
             ::chart::AxisHelper::hideAxisIfNoDataIsAttached( xAxis, xDiagram );
                         
             bResult = true;
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     return bResult;
@@ -135,7 +135,7 @@ bool lcl_deleteDataSeries(
 bool lcl_deleteDataCurve(
     const OUString & rCID,
     const Reference< frame::XModel > & xModel,
-    const Reference< chart2::XUndoManager > & xUndoManager )
+    const Reference< document::XUndoManager > & xUndoManager )
 {
     bool bResult = false;
     uno::Reference< chart2::XRegressionCurveContainer > xRegCurveCnt(
@@ -145,11 +145,11 @@ bool lcl_deleteDataCurve(
     {
         ::chart::UndoGuard aUndoGuard(
             ActionDescriptionProvider::createDescription(
-                ActionDescriptionProvider::DELETE, ::rtl::OUString( String( ::chart::SchResId( STR_OBJECT_CURVE )))),
-            xUndoManager, xModel );
+                ActionDescriptionProvider::DELETE, String( ::chart::SchResId( STR_OBJECT_CURVE ))),
+            xUndoManager );
         ::chart::RegressionCurveHelper::removeAllExceptMeanValueLine( xRegCurveCnt );
         bResult = true;
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
     return bResult;
 }
@@ -235,8 +235,8 @@ void ChartController::executeDispatch_NewArrangement()
         {
             // using assignment for broken gcc 3.3
             UndoGuard aUndoGuard = UndoGuard(
-                ::rtl::OUString( String( SchResId( STR_ACTION_REARRANGE_CHART ))),
-                m_xUndoManager, xModel );
+                String( SchResId( STR_ACTION_REARRANGE_CHART )),
+                m_xUndoManager );
             ControllerLockGuard aCtlLockGuard( xModel );
 
             // diagram
@@ -271,7 +271,7 @@ void ChartController::executeDispatch_NewArrangement()
             ::std::for_each( aRegressionCurves.begin(), aRegressionCurves.end(),
                       RegressionCurveHelper::resetEquationPosition );
 
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     catch( uno::RuntimeException & ex )
@@ -285,14 +285,14 @@ void ChartController::executeDispatch_ScaleText()
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
     // using assignment for broken gcc 3.3
     UndoGuard aUndoGuard = UndoGuard(
-        ::rtl::OUString( String( SchResId( STR_ACTION_SCALE_TEXT ))),
-        m_xUndoManager, getModel() );
+        String( SchResId( STR_ACTION_SCALE_TEXT )),
+        m_xUndoManager );
     ControllerLockGuard aCtlLockGuard( getModel() );
     ::std::auto_ptr< ReferenceSizeProvider > apRefSizeProv( impl_createReferenceSizeProvider());
     OSL_ASSERT( apRefSizeProv.get());
     if( apRefSizeProv.get())
         apRefSizeProv->toggleAutoResizeState();
-    aUndoGuard.commitAction();
+    aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_Paste()
@@ -655,12 +655,12 @@ bool ChartController::executeDispatch_Delete()
                 // using assignment for broken gcc 3.3
                 UndoGuard aUndoGuard = UndoGuard(
                     ActionDescriptionProvider::createDescription(
-                        ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_TITLE )))),
-                    m_xUndoManager, getModel());
+                        ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_TITLE ))),
+                    m_xUndoManager );
                 TitleHelper::removeTitle(
                     ObjectIdentifier::getTitleTypeForCID( aCID ), getModel() );
                 bReturn = true;
-                aUndoGuard.commitAction();
+                aUndoGuard.commit();
                 break;
             }
             case OBJECTTYPE_LEGEND:
@@ -674,11 +674,11 @@ bool ChartController::executeDispatch_Delete()
                         // using assignment for broken gcc 3.3
                         UndoGuard aUndoGuard = UndoGuard(
                             ActionDescriptionProvider::createDescription(
-                                ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_LEGEND )))),
-                            m_xUndoManager, getModel() );
+                                ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))),
+                            m_xUndoManager );
                         xLegendProp->setPropertyValue( C2U("Show"), uno::makeAny( false ));
                         bReturn = true;
-                        aUndoGuard.commitAction();
+                        aUndoGuard.commit();
                     }
                 }
                 break;
@@ -709,11 +709,11 @@ bool ChartController::executeDispatch_Delete()
                     // using assignment for broken gcc 3.3
                     UndoGuard aUndoGuard = UndoGuard(
                         ActionDescriptionProvider::createDescription(
-                            ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_AVERAGE_LINE )))),
-                        m_xUndoManager, getModel() );
+                            ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_AVERAGE_LINE ))),
+                        m_xUndoManager );
                     RegressionCurveHelper::removeMeanValueLine( xRegCurveCnt );
                     bReturn = true;
-                    aUndoGuard.commitAction();
+                    aUndoGuard.commit();
                 }
                 break;
             }
@@ -732,15 +732,15 @@ bool ChartController::executeDispatch_Delete()
                     // using assignment for broken gcc 3.3
                     UndoGuard aUndoGuard = UndoGuard(
                         ActionDescriptionProvider::createDescription(
-                            ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_CURVE_EQUATION )))),
-                        m_xUndoManager, xModel );
+                            ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
+                        m_xUndoManager );
                     {
                         ControllerLockGuard aCtlLockGuard( xModel );
                         xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( false ));
                         xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( false ));
                     }
                     bReturn = true;
-                    aUndoGuard.commitAction();
+                    aUndoGuard.commit();
                 }
                 break;
             }
@@ -755,8 +755,8 @@ bool ChartController::executeDispatch_Delete()
                     // using assignment for broken gcc 3.3
                     UndoGuard aUndoGuard = UndoGuard(
                         ActionDescriptionProvider::createDescription(
-                            ActionDescriptionProvider::DELETE, ::rtl::OUString( String( SchResId( STR_OBJECT_ERROR_BARS )))),
-                        m_xUndoManager, xModel );
+                            ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_ERROR_BARS ))),
+                        m_xUndoManager );
                     {
                         ControllerLockGuard aCtlLockGuard( xModel );
                         xErrorBarProp->setPropertyValue(
@@ -764,7 +764,7 @@ bool ChartController::executeDispatch_Delete()
                             uno::makeAny( ::com::sun::star::chart::ErrorBarStyle::NONE ));
                     }
                     bReturn = true;
-                    aUndoGuard.commitAction();
+                    aUndoGuard.commit();
                 }
                 break;
             }
@@ -780,7 +780,7 @@ bool ChartController::executeDispatch_Delete()
                         ActionDescriptionProvider::createDescription(
                         ActionDescriptionProvider::DELETE, ::rtl::OUString( String(
                             SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))),
-                                m_xUndoManager, getModel() );
+                                m_xUndoManager );
                     chart2::DataPointLabel aLabel;
                     xObjectProperties->getPropertyValue( C2U( "Label" ) ) >>= aLabel;
                     aLabel.ShowNumber = false;
@@ -795,7 +795,7 @@ bool ChartController::executeDispatch_Delete()
                     else
                         xObjectProperties->setPropertyValue( C2U( "Label" ), uno::makeAny(aLabel) );
                     bReturn = true;
-                    aUndoGuard.commitAction();
+                    aUndoGuard.commit();
                 }
                 break;
             }
@@ -844,7 +844,7 @@ void ChartController::executeDispatch_ToggleLegend()
 {
     Reference< frame::XModel > xModel( getModel() );
     UndoGuard aUndoGuard = UndoGuard(
-        ::rtl::OUString( String( SchResId( STR_ACTION_TOGGLE_LEGEND ))), m_xUndoManager, xModel );
+        String( SchResId( STR_ACTION_TOGGLE_LEGEND )), m_xUndoManager );
     Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend( xModel ), uno::UNO_QUERY );
     bool bChanged = false;
     if( xLegendProp.is())
@@ -871,14 +871,14 @@ void ChartController::executeDispatch_ToggleLegend()
     }
 
     if( bChanged )
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
 }
 
 void ChartController::executeDispatch_ToggleGridHorizontal()
 {
     Reference< frame::XModel > xModel( getModel() );
     UndoGuard aUndoGuard = UndoGuard(
-        ::rtl::OUString( String( SchResId( STR_ACTION_TOGGLE_GRID_HORZ ))), m_xUndoManager, xModel );
+        String( SchResId( STR_ACTION_TOGGLE_GRID_HORZ )), m_xUndoManager );
     Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() ));
     if( xDiagram.is())
     {
@@ -893,7 +893,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal()
         else
             AxisHelper::showGrid( nDimensionIndex, nCooSysIndex, bIsMainGrid, xDiagram, m_xCC );
 
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
     }
 }
 
@@ -911,9 +911,9 @@ void ChartController::impl_switchDiagramPositioningToExcludingPositioning()
     UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
         ActionDescriptionProvider::POS_SIZE,
         ObjectNameProvider::getName( OBJECTTYPE_DIAGRAM)),
-        m_xUndoManager, m_aModel->getModel() );
+        m_xUndoManager );
     if( DiagramHelper::switchDiagramPositioningToExcludingPositioning( m_aModel->getModel(), true, true ) )
-        aUndoGuard.commitAction();
+        aUndoGuard.commit();
 }
 
 } //  namespace chart
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 3fc4796ab..40aae5e4e 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -565,7 +565,7 @@ void ChartController::startDoubleClickWaiting()
 
     m_bWaitingForDoubleClick = true;
 
-    ULONG nDblClkTime = 500;
+    sal_uLong nDblClkTime = 500;
     if( m_pChartWindow )
     {
         const MouseSettings& rMSettings = m_pChartWindow->GetSettings().GetMouseSettings();
@@ -593,7 +593,7 @@ IMPL_LINK( ChartController, DoubleClickWaitingHdl, void*, EMPTYARG )
         {
             Window::PointerState aPointerState( m_pChartWindow->GetPointerState() );
             MouseEvent aMouseEvent( aPointerState.maPos,1/*nClicks*/,
-                                    0/*nMode*/, static_cast< USHORT >( aPointerState.mnState )/*nButtons*/,
+                                    0/*nMode*/, static_cast< sal_uInt16 >( aPointerState.mnState )/*nButtons*/,
                                     0/*nModifier*/ );
             impl_SetMousePointer( aMouseEvent );
         }
@@ -711,7 +711,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
          && !rMEvt.IsRight() )
     {
         //start drag
-        USHORT  nDrgLog = (USHORT)m_pChartWindow->PixelToLogic(Size(DRGPIX,0)).Width();
+        sal_uInt16  nDrgLog = (sal_uInt16)m_pChartWindow->PixelToLogic(Size(DRGPIX,0)).Width();
         SdrDragMethod* pDragMethod = NULL;
 
         //change selection to 3D scene if rotate mode
@@ -801,7 +801,11 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
         if ( m_eDrawMode == CHARTDRAW_INSERT && pDrawViewWrapper->IsCreateObj() )
         {
             pDrawViewWrapper->EndCreateObj( SDRCREATE_FORCEEND );
-            impl_switchDiagramPositioningToExcludingPositioning();
+            {
+                HiddenUndoContext aUndoContext( m_xUndoManager );
+                    // don't want the positioning Undo action to appear in the UI
+                impl_switchDiagramPositioningToExcludingPositioning();
+            }
             if ( pDrawViewWrapper->AreObjectsMarked() )
             {
                 if ( pDrawViewWrapper->GetCurrentObjIdentifier() == OBJ_TEXT )
@@ -838,12 +842,12 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
             if( pChartDragMethod )
             {
                 UndoGuard aUndoGuard( pChartDragMethod->getUndoDescription(),
-                        m_xUndoManager, getModel() );
+                        m_xUndoManager );
 
                 if( pDrawViewWrapper->EndDragObj(false) )
                 {
                     bDraggingDone = true;
-                    aUndoGuard.commitAction();
+                    aUndoGuard.commit();
                 }
             }
 
@@ -871,7 +875,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
                             ActionDescriptionProvider::createDescription(
                                 eActionType,
                                 ObjectNameProvider::getName( ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() ))),
-                            m_xUndoManager, getModel() );
+                            m_xUndoManager );
                         bool bChanged = PositionAndSizeHelper::moveObject( m_aSelection.getSelectedCID()
                                         , getModel()
                                         , awt::Rectangle(aObjectRect.getX(),aObjectRect.getY(),aObjectRect.getWidth(),aObjectRect.getHeight())
@@ -879,7 +883,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
                         if( bChanged )
                         {
                             bDraggingDone = true;
-                            aUndoGuard.commitAction();
+                            aUndoGuard.commit();
                         }
                     }
                 }
@@ -974,12 +978,12 @@ void ChartController::execute_Resize()
 }
 void ChartController::execute_Activate()
 {
-    ///// pDrawViewWrapper->SetEditMode(TRUE);
+    ///// pDrawViewWrapper->SetEditMode(sal_True);
 }
 void ChartController::execute_Deactivate()
 {
     /*
-    pDrawViewWrapper->SetEditMode(FALSE);
+    pDrawViewWrapper->SetEditMode(sal_False);
     this->ReleaseMouse();
     */
 }
@@ -1593,7 +1597,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
         {
                 // 3D-Kontext wieder zerstoeren
             GetWindow()->Invalidate();
-            bReturn = TRUE;
+            bReturn = sal_True;
         }
     }
     */
@@ -1832,7 +1836,7 @@ bool ChartController::impl_moveOrResizeObject(
 
             ObjectType eObjectType = ObjectIdentifier::getObjectType( rCID );
             UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
-                    eActionType, ObjectNameProvider::getName( eObjectType )), m_xUndoManager, xChartModel );
+                    eActionType, ObjectNameProvider::getName( eObjectType )), m_xUndoManager );
             {
                 ControllerLockGuard aCLGuard( xChartModel );
                 if( bNeedShift )
@@ -1840,7 +1844,7 @@ bool ChartController::impl_moveOrResizeObject(
                 if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also set an explicat size at the diagram when an explicit position is set
                     xObjProp->setPropertyValue( C2U("RelativeSize"), uno::makeAny( aRelSize ));
             }
-            aUndoGuard.commitAction();
+            aUndoGuard.commit();
         }
     }
     return bResult;
@@ -1890,7 +1894,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
     {
         Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel()));
         sal_uInt16 nModifier = rEvent.GetModifier();
-        BOOL bLeftDown = rEvent.IsLeft();
+        sal_Bool bLeftDown = rEvent.IsLeft();
 
         if ( m_pDrawViewWrapper->IsTextEdit() )
         {
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index d000b3071..dcc223e19 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -137,58 +137,47 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
                             // parent)
                             if( bDataComesFromParent )
                             {
+                                Reference< chart2::XDiagram > xDiagram( m_xChartDocument->getFirstDiagram() );
                                 Reference< chart2::data::XDataProvider > xDataProvider( m_xChartDocument->getDataProvider());
-                                if( xDataProvider.is() &&
+                                if( xDataProvider.is() && xDiagram.is() &&
                                     DataSourceHelper::allArgumentsForRectRangeDetected( m_xChartDocument ))
                                 {
-                                    DiagramHelper::tTemplateWithServiceName aTempWithServ(
-                                        DiagramHelper::getTemplateForDiagram(
-                                            m_xChartDocument->getFirstDiagram(),
-                                            Reference< lang::XMultiServiceFactory >(
-                                                m_xChartDocument->getChartTypeManager(), uno::UNO_QUERY )));
-                                    if( aTempWithServ.first.is())
+                                    Reference< chart2::data::XDataSource > xDataSource(
+                                        DataSourceHelper::pressUsedDataIntoRectangularFormat( m_xChartDocument ));
+                                    Sequence< beans::PropertyValue > aArguments(
+                                        xDataProvider->detectArguments( xDataSource ));
+
+                                    OUString aOldRange;
+                                    beans::PropertyValue * pCellRange = 0;
+                                    for( sal_Int32 i=0; i<aArguments.getLength(); ++i )
                                     {
-                                        Reference< chart2::data::XDataSource > xDataSource(
-                                            DataSourceHelper::pressUsedDataIntoRectangularFormat( m_xChartDocument ));
-                                        Sequence< beans::PropertyValue > aArguments(
-                                            xDataProvider->detectArguments( xDataSource ));
-
-                                        OUString aOldRange;
-                                        beans::PropertyValue * pCellRange = 0;
-                                        for( sal_Int32 i=0; i<aArguments.getLength(); ++i )
+                                        if( aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
                                         {
-                                            if( aArguments[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("CellRangeRepresentation")))
-                                            {
-                                                pCellRange = (aArguments.getArray() + i);
-                                                aArguments[i].Value >>= aOldRange;
-                                                break;
-                                            }
+                                            pCellRange = (aArguments.getArray() + i);
+                                            aArguments[i].Value >>= aOldRange;
+                                            break;
                                         }
-                                        if( pCellRange )
+                                    }
+                                    if( pCellRange )
+                                    {
+                                        // copy means add ranges, move means replace
+                                        if( rEvt.mnAction == DND_ACTION_COPY )
+                                        {
+                                            // @todo: using implcit knowledge that ranges can be
+                                            // merged with ";". This should be done more general
+                                            pCellRange->Value <<= (aOldRange + OUString( sal_Unicode(';')) + aRangeString );
+                                        }
+                                        // move means replace range
+                                        else
                                         {
-                                            // copy means add ranges, move means replace
-                                            if( rEvt.mnAction == DND_ACTION_COPY )
-                                            {
-                                                // @todo: using implcit knowledge that ranges can be
-                                                // merged with ";". This should be done more general
-                                                pCellRange->Value <<= (aOldRange + OUString( sal_Unicode(';')) + aRangeString );
-                                            }
-                                            // move means replace range
-                                            else
-                                            {
-                                                pCellRange->Value <<= aRangeString;
-                                            }
-
-                                            xDataSource.set( xDataProvider->createDataSource( aArguments ));
-                                            aTempWithServ.first->changeDiagramData(
-                                                m_xChartDocument->getFirstDiagram(),
-                                                xDataSource,
-                                                aArguments );
-
-                                            // always return copy state to avoid deletion of the
-                                            // dragged range
-                                            nResult = DND_ACTION_COPY;
+                                            pCellRange->Value <<= aRangeString;
                                         }
+
+                                        xDataSource.set( xDataProvider->createDataSource( aArguments ));
+                                        xDiagram->setDiagramData( xDataSource, aArguments );
+
+                                        // always return copy state to avoid deletion of the dragged range
+                                        nResult = DND_ACTION_COPY;
                                     }
                                 }
                             }
diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx
new file mode 100755
index 000000000..69991eb08
--- /dev/null
+++ b/chart2/source/controller/main/ChartModelClone.cxx
@@ -0,0 +1,280 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#include "precompiled_chart2.hxx"
+
+#include "ChartModelClone.hxx"
+#include "ChartModelHelper.hxx"
+#include "ControllerLockGuard.hxx"
+#include "DataSourceHelper.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/chart2/XTitled.hpp>
+#include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/chart2/data/XDataSource.hpp>
+#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/property.hxx>
+#include <tools/diagnose_ex.h>
+
+//......................................................................................................................
+namespace chart
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::frame::XModel;
+    using ::com::sun::star::util::XCloneable;
+    using ::com::sun::star::chart2::XChartDocument;
+    using ::com::sun::star::chart2::XInternalDataProvider;
+    using ::com::sun::star::chart2::XAnyDescriptionAccess;
+    using ::com::sun::star::view::XSelectionSupplier;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::chart2::XTitled;
+    using ::com::sun::star::util::XModifiable;
+    using ::com::sun::star::chart2::data::XDataSource;
+    using ::com::sun::star::chart2::data::XLabeledDataSequence;
+    /** === end UNO using === **/
+
+    // =================================================================================================================
+    // = helper
+    // =================================================================================================================
+    namespace
+    {
+        Reference< XModel > lcl_cloneModel( const Reference< XModel > & xModel )
+        {
+            Reference< XModel > xResult;
+            try
+            {
+                const Reference< XCloneable > xCloneable( xModel, UNO_QUERY_THROW );
+                xResult.set( xCloneable->createClone(), UNO_QUERY_THROW );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+            return xResult;
+        }
+
+    }
+
+    // =================================================================================================================
+    // = ChartModelClone
+    // =================================================================================================================
+    // -----------------------------------------------------------------------------------------------------------------
+    ChartModelClone::ChartModelClone( const Reference< XModel >& i_model, const ModelFacet i_facet )
+    {
+        m_xModelClone.set( lcl_cloneModel( i_model ) );
+
+        try
+        {
+            if ( i_facet == E_MODEL_WITH_DATA )
+            {
+                const Reference< XChartDocument > xChartDoc( m_xModelClone, UNO_QUERY_THROW );
+                ENSURE_OR_THROW( xChartDoc->hasInternalDataProvider(), "invalid chart model" );
+
+                const Reference< XCloneable > xCloneable( xChartDoc->getDataProvider(), UNO_QUERY_THROW );
+                m_xDataClone.set( xCloneable->createClone(), UNO_QUERY_THROW );
+            }
+
+            if ( i_facet == E_MODEL_WITH_SELECTION )
+            {
+                const Reference< XSelectionSupplier > xSelSupp( m_xModelClone->getCurrentController(), UNO_QUERY_THROW );
+                m_aSelection = xSelSupp->getSelection();
+            }
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+
+    // -----------------------------------------------------------------------------------------------------------------
+    ChartModelClone::~ChartModelClone()
+    {
+        if ( !impl_isDisposed() )
+            dispose();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    void ChartModelClone::dispose()
+    {
+        if ( impl_isDisposed() )
+            return;
+
+        try
+        {
+            Reference< XComponent > xComp( m_xModelClone, UNO_QUERY_THROW );
+            xComp->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        m_xModelClone.clear();
+        m_xDataClone.clear();
+        m_aSelection.clear();
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    ModelFacet ChartModelClone::getFacet() const
+    {
+        if ( m_aSelection.hasValue() )
+            return E_MODEL_WITH_SELECTION;
+        if ( m_xDataClone.is() )
+            return E_MODEL_WITH_DATA;
+        return E_MODEL;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    void ChartModelClone::applyToModel( const Reference< XModel >& i_model ) const
+    {
+        applyModelContentToModel( i_model, m_xModelClone, m_xDataClone );
+
+        if ( m_aSelection.hasValue() )
+        {
+            try
+            {
+                Reference< XSelectionSupplier > xCurrentSelectionSuppl( i_model->getCurrentController(), UNO_QUERY_THROW );
+                xCurrentSelectionSuppl->select( m_aSelection );
+            }
+            catch( const Exception& )
+            {
+                DBG_UNHANDLED_EXCEPTION();
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        void ImplApplyDataToModel( const Reference< XModel >& i_model, const Reference< XInternalDataProvider > & i_data )
+        {
+            Reference< XChartDocument > xDoc( i_model, UNO_QUERY );
+            OSL_ASSERT( xDoc.is() && xDoc->hasInternalDataProvider() );
+
+            // copy data from stored internal data provider
+            if( xDoc.is() && xDoc->hasInternalDataProvider())
+            {
+                Reference< XAnyDescriptionAccess > xCurrentData( xDoc->getDataProvider(), UNO_QUERY );
+                Reference< XAnyDescriptionAccess > xSavedData( i_data, UNO_QUERY );
+                if ( xCurrentData.is() && xSavedData.is() )
+                {
+                    xCurrentData->setData( xSavedData->getData() );
+                    xCurrentData->setAnyRowDescriptions( xSavedData->getAnyRowDescriptions());
+                    xCurrentData->setAnyColumnDescriptions( xSavedData->getAnyColumnDescriptions());
+                }
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    void ChartModelClone::applyModelContentToModel( const Reference< XModel >& i_model,
+        const Reference< XModel >& i_modelToCopyFrom, const Reference< XInternalDataProvider >& i_data )
+    {
+        ENSURE_OR_RETURN_VOID( i_model.is(), "ChartModelElement::applyModelContentToModel: invalid source model!" );
+        ENSURE_OR_RETURN_VOID( i_modelToCopyFrom.is(), "ChartModelElement::applyModelContentToModel: invalid source model!" );
+        try
+        {
+            // /-- loccked controllers of destination
+            ControllerLockGuard aLockedControllers( i_model );
+            Reference< XChartDocument > xSource( i_modelToCopyFrom, UNO_QUERY_THROW );
+            Reference< XChartDocument > xDestination( i_model, UNO_QUERY_THROW );
+
+            // propagate the correct flag for plotting of hidden values to the data provider and all used sequences
+            ChartModelHelper::setIncludeHiddenCells( ChartModelHelper::isIncludeHiddenCells( i_modelToCopyFrom ) , i_model );
+
+            // diagram
+            xDestination->setFirstDiagram( xSource->getFirstDiagram() );
+
+            // main title
+            Reference< XTitled > xDestinationTitled( xDestination, UNO_QUERY_THROW );
+            Reference< XTitled > xSourceTitled( xSource, UNO_QUERY_THROW );
+            xDestinationTitled->setTitleObject( xSourceTitled->getTitleObject() );
+
+            // page background
+            ::comphelper::copyProperties(
+                xSource->getPageBackground(),
+                xDestination->getPageBackground() );
+
+            // apply data (not applied in standard Undo)
+            if ( i_data.is() )
+                ImplApplyDataToModel( i_model, i_data );
+
+            // register all sequences at the internal data provider to get adapted
+            // indexes when columns are added/removed
+            if ( xDestination->hasInternalDataProvider() )
+            {
+                Reference< XInternalDataProvider > xNewDataProvider( xDestination->getDataProvider(), UNO_QUERY );
+                Reference< XDataSource > xUsedData( DataSourceHelper::getUsedData( i_model ) );
+                if ( xUsedData.is() && xNewDataProvider.is() )
+                {
+                    Sequence< Reference< XLabeledDataSequence > > aData( xUsedData->getDataSequences() );
+                    for( sal_Int32 i=0; i<aData.getLength(); ++i )
+                    {
+                        xNewDataProvider->registerDataSequenceForChanges( aData[i]->getValues() );
+                        xNewDataProvider->registerDataSequenceForChanges( aData[i]->getLabel() );
+                    }
+                }
+            }
+
+            // restore modify status
+            Reference< XModifiable > xSourceMod( xSource, UNO_QUERY );
+            Reference< XModifiable > xDestMod( xDestination, UNO_QUERY );
+            if ( xSourceMod.is() && xDestMod.is() && !xSourceMod->isModified() )
+            {
+                xDestMod->setModified( sal_False );
+            }
+            // \-- loccked controllers of destination
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+
+//......................................................................................................................
+} // namespace chart
+//......................................................................................................................
diff --git a/chart2/source/controller/main/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx
new file mode 100755
index 000000000..d5653b8e1
--- /dev/null
+++ b/chart2/source/controller/main/ChartModelClone.hxx
@@ -0,0 +1,89 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef CHART2_CHARTMODELCLONE_HXX
+#define CHART2_CHARTMODELCLONE_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/chart2/XInternalDataProvider.hpp>
+/** === end UNO includes === **/
+
+#include <boost/noncopyable.hpp>
+
+//......................................................................................................................
+namespace chart
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= ModelFacet
+    //==================================================================================================================
+    enum ModelFacet
+    {
+        E_MODEL,
+        E_MODEL_WITH_DATA,
+        E_MODEL_WITH_SELECTION
+    };
+
+    //==================================================================================================================
+    //= ChartModelClone
+    //==================================================================================================================
+    class ChartModelClone : public ::boost::noncopyable
+    {
+    public:
+        ChartModelClone(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_model,
+            const ModelFacet i_facet
+        );
+
+        ~ChartModelClone();
+
+        ModelFacet getFacet() const;
+
+        void applyToModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_model ) const;
+
+        static void applyModelContentToModel(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & i_model,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & i_modelToCopyFrom,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > & i_data );
+
+        void dispose();
+
+    private:
+        bool    impl_isDisposed() const { return !m_xModelClone.is(); }
+
+    private:
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >                 m_xModelClone;
+        ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > m_xDataClone;
+        ::com::sun::star::uno::Any                                                          m_aSelection;
+    };
+
+//......................................................................................................................
+} // namespace chart
+//......................................................................................................................
+
+#endif // CHART2_CHARTMODELCLONE_HXX
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index 1ab1bc299..4f781f9bd 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -64,7 +64,7 @@ ChartTransferable::ChartTransferable( SdrModel* pDrawModel, SdrObject* pSelected
         pExchgView->MarkObj( pSelectedObj, pPv );
     else
         pExchgView->MarkAllObj( pPv );
-    Graphic aGraphic( pExchgView->GetMarkedObjMetaFile( TRUE ));
+    Graphic aGraphic( pExchgView->GetMarkedObjMetaFile( sal_True ));
     m_xMetaFileGraphic.set( aGraphic.GetXGraphic());
     if ( m_bDrawing )
     {
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 6efc02f38..3a30be468 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -64,9 +64,9 @@ ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent,
     adjustHighContrastMode();
     // chart does not depend on exact pixel painting => enable antialiased drawing
     SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | GetAntialiasing() );
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
     if( pParent )
-        pParent->EnableRTL( FALSE );// #i96215# necessary for a correct position of the context menu in rtl mode
+        pParent->EnableRTL( sal_False );// #i96215# necessary for a correct position of the context menu in rtl mode
 }
 
 ChartWindow::~ChartWindow()
@@ -247,19 +247,19 @@ void ChartWindow::ForceInvalidate()
 {
     ::Window::Invalidate();
 }
-void ChartWindow::Invalidate( USHORT nFlags )
+void ChartWindow::Invalidate( sal_uInt16 nFlags )
 {
     if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
         return;
     ::Window::Invalidate( nFlags );
 }
-void ChartWindow::Invalidate( const Rectangle& rRect, USHORT nFlags )
+void ChartWindow::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
 {
     if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
         return;
     ::Window::Invalidate( rRect, nFlags );
 }
-void ChartWindow::Invalidate( const Region& rRegion, USHORT nFlags )
+void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
 {
     if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
         return;
diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx
index 812dc2438..9b42cba83 100644
--- a/chart2/source/controller/main/ChartWindow.hxx
+++ b/chart2/source/controller/main/ChartWindow.hxx
@@ -68,9 +68,9 @@ public:
     virtual void RequestHelp( const HelpEvent& rHEvt );
 
     void ForceInvalidate();
-    virtual void Invalidate( USHORT nFlags = 0 );
-    virtual void Invalidate( const Rectangle& rRect, USHORT nFlags = 0 );
-    virtual void Invalidate( const Region& rRegion, USHORT nFlags = 0 );
+    virtual void Invalidate( sal_uInt16 nFlags = 0 );
+    virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 );
+    virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 019d6b839..4b35237fa 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -75,12 +75,6 @@ void CommandDispatchContainer::setModel(
     m_xModel = xModel;
 }
 
-// void CommandDispatchContainer::setUndoManager(
-//     const Reference< chart2::XUndoManager > & xUndoManager )
-// {
-//     m_xUndoManager = xUndoManager;
-// }
-
 void CommandDispatchContainer::setChartDispatch(
     const Reference< frame::XDispatch > xChartDispatch,
     const ::std::set< OUString > & rChartCommands )
diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx
index 32b136cd8..e45f9e29f 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.hxx
@@ -28,7 +28,6 @@
 #define CHART2_COMMANDDISPATCHCONTAINER_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/chart2/XUndoManager.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
@@ -86,9 +85,6 @@ public:
     void setModel(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > & xModel );
-//     void setUndoManager(
-//         const ::com::sun::star::uno::Reference<
-//             ::com::sun::star::chart2::XUndoManager > & xUndoManager );
 
     /** Set a chart dispatcher that is used for all commands contained in
         rChartCommands
@@ -140,9 +136,8 @@ private:
     mutable tDispatchMap m_aCachedDispatches;
     mutable tDisposeVector m_aToBeDisposedDispatches;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel >    m_xModel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XUndoManager > m_xUndoManager;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
+    ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel >         m_xModel;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xChartDispatcher;
     ::std::set< ::rtl::OUString >                                          m_aChartCommands;
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index cd893672a..8214e1699 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -386,7 +386,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
             {
                 ::vos::OGuard aGuard( Application::GetSolarMutex() );
                 m_pChartController->setDrawMode( eDrawMode );
-                setInsertObj( sal::static_int_cast< USHORT >( eKind ) );
+                setInsertObj( sal::static_int_cast< sal_uInt16 >( eKind ) );
                 if ( bCreate )
                 {
                     pDrawViewWrapper->SetCreateMode();
@@ -443,7 +443,7 @@ void DrawCommandDispatch::describeSupportedFeatures()
     implDescribeSupportedFeature( ".uno:StarShapes",        COMMAND_ID_DRAWTBX_CS_STAR,         CommandGroup::INSERT );
 }
 
-void DrawCommandDispatch::setInsertObj( USHORT eObj )
+void DrawCommandDispatch::setInsertObj( sal_uInt16 eObj )
 {
     DrawViewWrapper* pDrawViewWrapper = ( m_pChartController ? m_pChartController->GetDrawViewWrapper() : NULL );
     if ( pDrawViewWrapper )
@@ -527,13 +527,13 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                                 if ( pTextObj )
                                 {
                                     pTextObj->SetLogicRect( aRect );
-                                    BOOL bVertical = ( nID == SID_DRAW_TEXT_VERTICAL );
+                                    sal_Bool bVertical = ( nID == SID_DRAW_TEXT_VERTICAL );
                                     pTextObj->SetVerticalWriting( bVertical );
                                     if ( bVertical )
                                     {
                                         SfxItemSet aSet( pDrawModelWrapper->GetItemPool() );
-                                        aSet.Put( SdrTextAutoGrowWidthItem( TRUE ) );
-                                        aSet.Put( SdrTextAutoGrowHeightItem( FALSE ) );
+                                        aSet.Put( SdrTextAutoGrowWidthItem( sal_True ) );
+                                        aSet.Put( SdrTextAutoGrowHeightItem( sal_False ) );
                                         aSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_TOP ) );
                                         aSet.Put( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_RIGHT ) );
                                         pTextObj->SetMergedItemSet( aSet );
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx
index a1e54f01b..764fa4e88 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.hxx
@@ -76,7 +76,7 @@ protected:
     virtual void describeSupportedFeatures();
 
 private:
-    void setInsertObj( USHORT eObj );
+    void setInsertObj( sal_uInt16 eObj );
     SdrObject* createDefaultObject( const sal_uInt16 nID );
 
     bool parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId, ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType );
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 210a26294..82001a759 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -162,9 +162,9 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
             }
         }
 
-        USHORT nEntryPosToSelect = 0; bool bSelectionFound = false;
+        sal_uInt16 nEntryPosToSelect = 0; bool bSelectionFound = false;
         aIt = m_aEntries.begin();
-        for( USHORT nN=0; aIt != m_aEntries.end(); ++aIt, ++nN )
+        for( sal_uInt16 nN=0; aIt != m_aEntries.end(); ++aIt, ++nN )
         {
             InsertEntry( aIt->UIName );
             if ( !bSelectionFound && aSelectedOID == aIt->OID )
@@ -177,7 +177,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
         if( bSelectionFound )
             SelectEntryPos(nEntryPosToSelect);
 
-        USHORT nEntryCount = GetEntryCount();
+        sal_uInt16 nEntryCount = GetEntryCount();
         if( nEntryCount > 100 )
             nEntryCount = 100;
         SetDropDownLineCount( nEntryCount );
@@ -205,7 +205,7 @@ void SelectorListBox::Select()
 
     if ( !IsTravelSelect() )
     {
-        USHORT nPos = GetSelectEntryPos();
+        sal_uInt16 nPos = GetSelectEntryPos();
         if( nPos < m_aEntries.size() )
         {
             ObjectHierarchy::tOID aOID = m_aEntries[nPos].OID;
@@ -223,7 +223,7 @@ long SelectorListBox::Notify( NotifyEvent& rNEvt )
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
-        USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+        sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
 
         switch ( nCode )
         {
diff --git a/chart2/source/controller/main/ImplUndoManager.cxx b/chart2/source/controller/main/ImplUndoManager.cxx
deleted file mode 100644
index 6cfabb079..000000000
--- a/chart2/source/controller/main/ImplUndoManager.cxx
+++ /dev/null
@@ -1,503 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include "ImplUndoManager.hxx"
-#include "DisposeHelper.hxx"
-#include "CommonFunctors.hxx"
-#include "ControllerLockGuard.hxx"
-#include "PropertyHelper.hxx"
-#include "DataSourceHelper.hxx"
-#include "ChartModelHelper.hxx"
-
-#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XInternalDataProvider.hpp>
-#include <com/sun/star/chart2/XTitled.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
-
-#include <boost/bind.hpp>
-#include <algorithm>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::com::sun::star::chart::XComplexDescriptionAccess;
-
-namespace chart
-{
-namespace impl
-{
-
-void ImplApplyDataToModel(
-    Reference< frame::XModel > & xInOutModelToChange,
-    const Reference< chart2::XInternalDataProvider > & xData )
-{
-    Reference< chart2::XChartDocument > xDoc( xInOutModelToChange, uno::UNO_QUERY );
-    OSL_ASSERT( xDoc.is() && xDoc->hasInternalDataProvider());
-
-    // copy data from stored internal data provider
-    if( xDoc.is() && xDoc->hasInternalDataProvider())
-    {
-        Reference< XComplexDescriptionAccess > xCurrentData( xDoc->getDataProvider(), uno::UNO_QUERY );
-        Reference< XComplexDescriptionAccess > xSavedData( xData, uno::UNO_QUERY );
-        if( xCurrentData.is() && xSavedData.is())
-        {
-            xCurrentData->setData( xSavedData->getData());
-            xCurrentData->setComplexRowDescriptions( xSavedData->getComplexRowDescriptions());
-            xCurrentData->setComplexColumnDescriptions( xSavedData->getComplexColumnDescriptions());
-        }
-    }
-}
-
-// ----------------------------------------
-
-UndoElement::UndoElement(
-    const OUString & rActionString,
-    const Reference< frame::XModel > & xModel ) :
-        m_aActionString( rActionString )
-{
-    initialize( xModel );
-}
-
-UndoElement::UndoElement(
-    const Reference< frame::XModel > & xModel )
-{
-    initialize( xModel );
-}
-
-UndoElement::UndoElement( const UndoElement & rOther ) :
-        m_aActionString( rOther.m_aActionString )
-{
-    initialize( rOther.m_xModel );
-}
-
-UndoElement::~UndoElement()
-{}
-
-void UndoElement::initialize( const Reference< frame::XModel > & xModel )
-{
-    if ( xModel.is() )
-    {
-        m_xModel.set( UndoElement::cloneModel( xModel ) );
-    }
-}
-
-void UndoElement::dispose()
-{
-    Reference< lang::XComponent > xComp( m_xModel, uno::UNO_QUERY );
-    if( xComp.is())
-        xComp->dispose();
-    m_xModel.set( 0 );
-}
-
-void UndoElement::applyToModel(
-    Reference< frame::XModel > & xInOutModelToChange )
-{
-    UndoElement::applyModelContentToModel( xInOutModelToChange, m_xModel );
-}
-
-UndoElement * UndoElement::createFromModel(
-    const Reference< frame::XModel > & xModel )
-{
-    return new UndoElement( getActionString(), xModel );
-}
-
-void UndoElement::setActionString( const ::rtl::OUString & rActionString )
-{
-    m_aActionString = rActionString;
-}
-
-OUString UndoElement::getActionString() const
-{
-    return m_aActionString;
-}
-
-Reference< frame::XModel > UndoElement::cloneModel( const Reference< frame::XModel > & xModel )
-{
-    Reference< frame::XModel > xResult;
-    uno::Reference< util::XCloneable > xCloneable( xModel, uno::UNO_QUERY );
-    OSL_ENSURE( xCloneable.is(), "Cannot clone model" );
-    if( xCloneable.is())
-        xResult.set( xCloneable->createClone(), uno::UNO_QUERY );
-
-    return xResult;
-}
-
-void UndoElement::applyModelContentToModel(
-    Reference< frame::XModel > & xInOutModelToChange,
-    const Reference< frame::XModel > & xModelToCopyFrom,
-    const Reference< chart2::XInternalDataProvider > & xData /* = 0 */ )
-{
-
-    if( xModelToCopyFrom.is() && xInOutModelToChange.is())
-    {
-        try
-        {
-            // /-- loccked controllers of destination
-            ControllerLockGuard aLockedControllers( xInOutModelToChange );
-            Reference< chart2::XChartDocument > xSource( xModelToCopyFrom, uno::UNO_QUERY_THROW );
-            Reference< chart2::XChartDocument > xDestination( xInOutModelToChange, uno::UNO_QUERY_THROW );
-
-            // propagate the correct flag for plotting of hidden values to the data provider and all used sequences
-            ChartModelHelper::setIncludeHiddenCells( ChartModelHelper::isIncludeHiddenCells( xModelToCopyFrom ) , xInOutModelToChange );
-
-            // diagram
-            xDestination->setFirstDiagram( xSource->getFirstDiagram());
-
-            // main title
-            Reference< chart2::XTitled > xDestinationTitled( xDestination, uno::UNO_QUERY_THROW );
-            Reference< chart2::XTitled > xSourceTitled( xSource, uno::UNO_QUERY_THROW );
-            xDestinationTitled->setTitleObject( xSourceTitled->getTitleObject());
-
-            // page background
-            comphelper::copyProperties(
-                xSource->getPageBackground(),
-                xDestination->getPageBackground() );
-
-            // apply data (not applied in standard Undo)
-            if( xData.is())
-                ImplApplyDataToModel( xInOutModelToChange, xData );
-
-            // register all sequences at the internal data provider to get adapted
-            // indexes when columns are added/removed
-            if( xDestination->hasInternalDataProvider())
-            {
-                Reference< chart2::XInternalDataProvider > xNewDataProvider( xDestination->getDataProvider(), uno::UNO_QUERY );
-                Reference< chart2::data::XDataSource > xUsedData( DataSourceHelper::getUsedData( xInOutModelToChange ));
-                if( xUsedData.is() && xNewDataProvider.is())
-                {
-                    Sequence< Reference< chart2::data::XLabeledDataSequence > > aData( xUsedData->getDataSequences());
-                    for( sal_Int32 i=0; i<aData.getLength(); ++i )
-                    {
-                        xNewDataProvider->registerDataSequenceForChanges( aData[i]->getValues());
-                        xNewDataProvider->registerDataSequenceForChanges( aData[i]->getLabel());
-                    }
-                }
-            }
-
-            // restore modify status
-            Reference< util::XModifiable > xSourceMod( xSource, uno::UNO_QUERY );
-            Reference< util::XModifiable > xDestMod( xDestination, uno::UNO_QUERY );
-            if( xSourceMod.is() && xDestMod.is() &&
-                ! xSourceMod->isModified() )
-            {
-                xDestMod->setModified( sal_False );
-            }
-            // \-- loccked controllers of destination
-        }
-        catch( uno::Exception & )
-        {
-        }
-    }
-}
-
-// ----------------------------------------
-
-UndoElementWithData::UndoElementWithData(
-    const OUString & rActionString,
-    const Reference< frame::XModel > & xModel ) :
-        UndoElement( rActionString, xModel )
-{
-    initializeData();
-}
-
-UndoElementWithData::UndoElementWithData(
-    const Reference< frame::XModel > & xModel ) :
-        UndoElement( xModel )
-{
-    initializeData();
-}
-
-
-UndoElementWithData::UndoElementWithData(
-    const UndoElementWithData & rOther ) :
-        UndoElement( rOther )
-{
-    initializeData();
-}
-
-UndoElementWithData::~UndoElementWithData()
-{}
-
-void UndoElementWithData::initializeData()
-{
-    try
-    {
-        Reference< chart2::XChartDocument > xChartDoc( m_xModel, uno::UNO_QUERY_THROW );
-        OSL_ASSERT( xChartDoc->hasInternalDataProvider());
-        if( xChartDoc->hasInternalDataProvider())
-        {
-            Reference< util::XCloneable > xCloneable( xChartDoc->getDataProvider(), uno::UNO_QUERY );
-            OSL_ENSURE( xCloneable.is(), "Cannot clone data" );
-            if( xCloneable.is())
-                m_xData.set( xCloneable->createClone(), uno::UNO_QUERY );
-        }
-    }
-    catch( uno::Exception & )
-    {
-    }
-}
-
-void UndoElementWithData::dispose()
-{
-    UndoElement::dispose();
-    m_xData.set( 0 );
-}
-
-void UndoElementWithData::applyToModel(
-    Reference< frame::XModel > & xInOutModelToChange )
-{
-    UndoElement::applyModelContentToModel( xInOutModelToChange, m_xModel, m_xData );
-}
-
-UndoElement * UndoElementWithData::createFromModel(
-    const Reference< frame::XModel > & xModel )
-{
-    return new UndoElementWithData( getActionString(), xModel );
-}
-
-// ========================================
-
-// ----------------------------------------
-
-UndoElementWithSelection::UndoElementWithSelection(
-    const OUString & rActionString,
-    const Reference< frame::XModel > & xModel ) :
-        UndoElement( rActionString, xModel )
-{
-    initialize( xModel );
-}
-
-UndoElementWithSelection::UndoElementWithSelection(
-    const Reference< frame::XModel > & xModel ) :
-        UndoElement( xModel )
-{
-    initialize( xModel );
-}
-
-UndoElementWithSelection::UndoElementWithSelection(
-    const UndoElementWithSelection & rOther ) :
-        UndoElement( rOther )
-{
-    initialize( rOther.m_xModel );
-}
-
-UndoElementWithSelection::~UndoElementWithSelection()
-{}
-
-void UndoElementWithSelection::initialize( const Reference< frame::XModel > & xModel )
-{
-    try
-    {
-        uno::Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), uno::UNO_QUERY );
-        OSL_ASSERT( xSelSupp.is() );
-
-        if( xSelSupp.is() )
-            m_aSelection = xSelSupp->getSelection();
-    }
-    catch( const uno::Exception & )
-    {
-    }
-}
-
-void UndoElementWithSelection::dispose()
-{
-    UndoElement::dispose();
-    m_aSelection.clear();
-}
-
-void UndoElementWithSelection::applyToModel(
-    Reference< frame::XModel > & xInOutModelToChange )
-{
-    UndoElement::applyModelContentToModel( xInOutModelToChange, m_xModel );
-    Reference< view::XSelectionSupplier > xCurrentSelectionSuppl( xInOutModelToChange->getCurrentController(), uno::UNO_QUERY );
-    OSL_ASSERT( xCurrentSelectionSuppl.is() );
-
-    if( xCurrentSelectionSuppl.is())
-        xCurrentSelectionSuppl->select( m_aSelection );
-}
-
-UndoElement * UndoElementWithSelection::createFromModel(
-        const Reference< frame::XModel > & xModel )
-{
-    return new UndoElementWithSelection( getActionString(), xModel );
-}
-
-// ----------------------------------------
-
-ShapeUndoElement::ShapeUndoElement( const OUString& rActionString, SdrUndoAction* pAction )
-    :UndoElement( rActionString, Reference< frame::XModel >() )
-    ,m_pAction( pAction )
-{
-}
-
-ShapeUndoElement::ShapeUndoElement( const ShapeUndoElement& rOther )
-    :UndoElement( rOther )
-    ,m_pAction( rOther.m_pAction )
-{
-}
-
-ShapeUndoElement::~ShapeUndoElement()
-{
-}
-
-SdrUndoAction* ShapeUndoElement::getSdrUndoAction()
-{
-    return m_pAction;
-}
-
-// ========================================
-
-UndoStack::UndoStack() :
-        m_nSizeLimit( 1000 )
-{
-}
-
-UndoStack::~UndoStack()
-{
-    disposeAndClear();
-}
-
-void UndoStack::pop()
-{
-    if( ! empty())
-    {
-        top()->dispose();
-        delete top();
-        m_aStack.pop_back();
-    }
-}
-
-void UndoStack::push( UndoElement * pElement )
-{
-    m_aStack.push_back( pElement );
-    applyLimitation();
-}
-
-UndoElement * UndoStack::top() const
-{
-    return m_aStack.back();
-}
-
-OUString UndoStack::topUndoString() const
-{
-    if( ! empty())
-        return top()->getActionString();
-    return OUString();
-}
-
-Sequence< OUString > UndoStack::getUndoStrings() const
-{
-    sal_Int32 nSize( static_cast< sal_Int32 >( m_aStack.size()));
-    Sequence< OUString > aResult( nSize );
-    for( sal_Int32 i=0; i<nSize; ++i )
-        aResult[i] = m_aStack[i]->getActionString();
-    return aResult;
-}
-
-bool UndoStack::empty() const
-{
-    return m_aStack.empty();
-}
-
-void UndoStack::disposeAndClear()
-{
-    ::std::for_each( m_aStack.begin(), m_aStack.end(), ::boost::mem_fn( & UndoElement::dispose ));
-    ::std::for_each( m_aStack.begin(), m_aStack.end(), CommonFunctors::DeletePtr< UndoElement >() );
-    m_aStack.clear();
-}
-
-void UndoStack::limitSize( sal_Int32 nMaxSize )
-{
-    m_nSizeLimit = nMaxSize;
-    applyLimitation();
-}
-
-void UndoStack::applyLimitation()
-{
-    if( m_aStack.size() > static_cast< sal_uInt32 >( m_nSizeLimit ))
-    {
-        tUndoStackType::iterator aBegin( m_aStack.begin());
-        tUndoStackType::iterator aEnd( aBegin + (m_aStack.size() - m_nSizeLimit));
-        // dispose and remove all undo elements that are over the limit
-        ::std::for_each( aBegin, aEnd, ::boost::mem_fn( & UndoElement::dispose ));
-        ::std::for_each( aBegin, aEnd, CommonFunctors::DeletePtr< UndoElement >() );
-        m_aStack.erase( aBegin, aEnd );
-    }
-}
-
-// ================================================================================
-
-namespace
-{
-static const OUString aUndoStepsPropName( RTL_CONSTASCII_USTRINGPARAM("Steps"));
-} // anonymous namespace
-
-UndoStepsConfigItem::UndoStepsConfigItem( ConfigItemListener & rListener ) :
-        ::utl::ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Undo"))),
-    m_rListener( rListener )
-{
-    EnableNotification( Sequence< OUString >( & aUndoStepsPropName, 1 ));
-}
-
-UndoStepsConfigItem::~UndoStepsConfigItem()
-{
-}
-
-void UndoStepsConfigItem::Notify( const Sequence< OUString > & aPropertyNames )
-{
-    for( sal_Int32 nIdx=0; nIdx<aPropertyNames.getLength(); ++nIdx )
-    {
-        if( aPropertyNames[nIdx].equals( aUndoStepsPropName ))
-            m_rListener.notify( aPropertyNames[nIdx] );
-    }
-}
-
-void UndoStepsConfigItem::Commit()
-{
-}
-
-// mtehod is not const, because GetProperties is not const
-sal_Int32 UndoStepsConfigItem::getUndoSteps()
-{
-    sal_Int32 nSteps = -1;
-    Sequence< uno::Any > aValues(
-        GetProperties( Sequence< OUString >( & aUndoStepsPropName, 1 )));
-    if( aValues.getLength())
-        aValues[0] >>= nSteps;
-    return nSteps;
-}
-
-} // namespace impl
-} //  namespace chart
diff --git a/chart2/source/controller/main/ImplUndoManager.hxx b/chart2/source/controller/main/ImplUndoManager.hxx
deleted file mode 100644
index ad40bf87a..000000000
--- a/chart2/source/controller/main/ImplUndoManager.hxx
+++ /dev/null
@@ -1,227 +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.
- *
- ************************************************************************/
-#ifndef CHART2_IMPLUNDOMANAGER_HXX
-#define CHART2_IMPLUNDOMANAGER_HXX
-
-#include "ConfigItemListener.hxx"
-
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <rtl/ustring.hxx>
-#include <unotools/configitem.hxx>
-
-#include <utility>
-#include <deque>
-
-
-class SdrUndoAction;
-
-namespace com { namespace sun { namespace star {
-namespace chart2 {
-    class XInternalDataProvider;
-}
-}}}
-
-
-namespace chart
-{
-namespace impl
-{
-
-class UndoElement
-{
-public:
-    UndoElement( const ::rtl::OUString & rActionString,
-                 const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::frame::XModel > & xModel );
-    UndoElement( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::frame::XModel > & xModel );
-    UndoElement( const UndoElement & rOther );
-    virtual ~UndoElement();
-
-    virtual void dispose();
-    virtual UndoElement * createFromModel(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-
-    virtual void applyToModel(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xInOutModelToChange );
-
-    void setActionString( const ::rtl::OUString & rActionString );
-    ::rtl::OUString getActionString() const;
-
-    static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > cloneModel(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel );
-
-    static void applyModelContentToModel(
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xInOutModelToChange,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModelToCopyFrom,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > & xData = 0 );
-
-protected:
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > m_xModel;
-
-private:
-    void initialize( const ::com::sun::star::uno::Reference<
-                         ::com::sun::star::frame::XModel > & xModel );
-
-    ::rtl::OUString                           m_aActionString;
-};
-
-class UndoElementWithData : public UndoElement
-{
-public:
-    UndoElementWithData( const ::rtl::OUString & rActionString,
-                         const ::com::sun::star::uno::Reference<
-                             ::com::sun::star::frame::XModel > & xModel );
-    UndoElementWithData( const ::com::sun::star::uno::Reference<
-                             ::com::sun::star::frame::XModel > & xModel );
-    UndoElementWithData( const UndoElementWithData & rOther );
-    virtual ~UndoElementWithData();
-
-    virtual void dispose();
-    virtual UndoElement * createFromModel(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-
-    virtual void applyToModel(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xInOutModelToChange );
-
-private:
-    void initializeData();
-
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XInternalDataProvider > m_xData;
-};
-
-class UndoElementWithSelection : public UndoElement
-{
-public:
-    UndoElementWithSelection( const ::rtl::OUString & rActionString,
-                              const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::frame::XModel > & xModel );
-    UndoElementWithSelection( const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::frame::XModel > & xModel );
-    UndoElementWithSelection( const UndoElementWithSelection & rOther );
-    virtual ~UndoElementWithSelection();
-
-    virtual void dispose();
-    virtual UndoElement * createFromModel(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-
-    virtual void applyToModel(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xInOutModelToChange );
-
-private:
-    void initialize( const ::com::sun::star::uno::Reference<
-                         ::com::sun::star::frame::XModel > & xModel );
-
-    ::com::sun::star::uno::Any m_aSelection;
-};
-
-class ShapeUndoElement : public UndoElement
-{
-public:
-    ShapeUndoElement( const ::rtl::OUString& rActionString, SdrUndoAction* pAction );
-    ShapeUndoElement( const ShapeUndoElement& rOther );
-    virtual ~ShapeUndoElement();
-
-    SdrUndoAction* getSdrUndoAction();
-
-private:
-    SdrUndoAction* m_pAction;
-};
-
-/** Note that all models that are put into this container are at some point
-    disposed of inside this class.  (At least in the destructor).  That means
-    the models retrieved here should never be used, but instead their content
-    should be copied to a living model.
- */
-class UndoStack
-{
-public:
-    UndoStack();
-    // disposes of all models left in the stack
-    ~UndoStack();
-
-    // removes he last undo action and disposes of the model
-    void pop();
-    void push( UndoElement * rElement );
-
-    // precondition: !empty()
-    UndoElement * top() const;
-    ::rtl::OUString topUndoString() const;
-
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > getUndoStrings() const;
-
-    bool empty() const;
-    void disposeAndClear();
-
-    // removes all actions that have been inserted more than nMaxSize steps ago.
-    // The models of those actions are disposed of
-    void limitSize( sal_Int32 nMaxSize );
-
-private:
-    void applyLimitation();
-
-    typedef ::std::deque< UndoElement * > tUndoStackType;
-
-    tUndoStackType  m_aStack;
-    sal_Int32       m_nSizeLimit;
-};
-
-// ----------------------------------------
-
-class UndoStepsConfigItem : public ::utl::ConfigItem
-{
-public:
-    explicit UndoStepsConfigItem( ConfigItemListener & rListener );
-    virtual ~UndoStepsConfigItem();
-
-    sal_Int32 getUndoSteps();
-
-protected:
-    // ____ ::utl::ConfigItem ____
-    virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & aPropertyNames );
-    virtual void Commit();
-
-private:
-    ConfigItemListener &    m_rListener;
-};
-
-
-} // namespace impl
-} //  namespace chart
-
-// CHART2_IMPLUNDOMANAGER_HXX
-#endif
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 848b3d09a..f7a137590 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -272,10 +272,10 @@ void ShapeController::executeDispatch_FormatLine()
         {
             SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject();
             SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
-            BOOL bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+            sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
             if ( bHasMarked )
             {
-                pDrawViewWrapper->MergeAttrFromMarked( aAttr, FALSE );
+                pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
             }
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if ( pFact )
@@ -288,11 +288,11 @@ void ShapeController::executeDispatch_FormatLine()
                     const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
                     if ( bHasMarked )
                     {
-                        pDrawViewWrapper->SetAttrToMarked( *pOutAttr, FALSE );
+                        pDrawViewWrapper->SetAttrToMarked( *pOutAttr, sal_False );
                     }
                     else
                     {
-                        pDrawViewWrapper->SetDefaultAttr( *pOutAttr, FALSE );
+                        pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
                     }
                 }
             }
@@ -311,10 +311,10 @@ void ShapeController::executeDispatch_FormatArea()
         if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
         {
             SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
-            BOOL bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+            sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
             if ( bHasMarked )
             {
-                pDrawViewWrapper->MergeAttrFromMarked( aAttr, FALSE );
+                pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
             }
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if ( pFact )
@@ -336,11 +336,11 @@ void ShapeController::executeDispatch_FormatArea()
                         const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
                         if ( bHasMarked )
                         {
-                            pDrawViewWrapper->SetAttrToMarked( *pOutAttr, FALSE );
+                            pDrawViewWrapper->SetAttrToMarked( *pOutAttr, sal_False );
                         }
                         else
                         {
-                            pDrawViewWrapper->SetDefaultAttr( *pOutAttr, FALSE );
+                            pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
                         }
                     }
                 }
@@ -359,10 +359,10 @@ void ShapeController::executeDispatch_TextAttributes()
         if ( pParent && pDrawViewWrapper )
         {
             SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
-            BOOL bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+            sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
             if ( bHasMarked )
             {
-                pDrawViewWrapper->MergeAttrFromMarked( aAttr, FALSE );
+                pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
             }
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             if ( pFact )
@@ -378,7 +378,7 @@ void ShapeController::executeDispatch_TextAttributes()
                     }
                     else
                     {
-                        pDrawViewWrapper->SetDefaultAttr( *pOutAttr, FALSE );
+                        pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
                     }
                 }
             }
@@ -410,7 +410,7 @@ void ShapeController::executeDispatch_TransformDialog()
                         pFact->CreateCaptionDialog( pParent, pDrawViewWrapper ) );
                     if ( pDlg.get() )
                     {
-                        const USHORT* pRange = pDlg->GetInputRanges( *aAttr.GetPool() );
+                        const sal_uInt16* pRange = pDlg->GetInputRanges( *aAttr.GetPool() );
                         SfxItemSet aCombAttr( *aAttr.GetPool(), pRange );
                         aCombAttr.Put( aAttr );
                         aCombAttr.Put( aGeoAttr );
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index 913c1bf6d..f466c0771 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -126,10 +126,10 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments
     ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) );
     if ( pToolBox )
     {
-        const USHORT nCount = pToolBox->GetItemCount();
-        for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+        const sal_uInt16 nCount = pToolBox->GetItemCount();
+        for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         {
-            const USHORT nItemId = pToolBox->GetItemId( nPos );
+            const sal_uInt16 nItemId = pToolBox->GetItemId( nPos );
             if ( pToolBox->GetItemCommand( nItemId ) == String( m_aCommandURL ) )
             {
                 m_nToolBoxId = nItemId;
@@ -201,9 +201,9 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even
             sal_Bool bCheckmark = sal_False;
             ToolBox& rTb = m_pToolbarController->GetToolBox();
 
-            for ( USHORT i = 0; i < rTb.GetItemCount(); ++i )
+            for ( sal_uInt16 i = 0; i < rTb.GetItemCount(); ++i )
             {
-                USHORT nId = rTb.GetItemId( i );
+                sal_uInt16 nId = rTb.GetItemId( i );
                 if ( nId == 0 )
                 {
                     continue;
diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx
new file mode 100644
index 000000000..097a6679d
--- /dev/null
+++ b/chart2/source/controller/main/UndoActions.cxx
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_chart2.hxx"
+
+#include "UndoActions.hxx"
+#include "DisposeHelper.hxx"
+#include "CommonFunctors.hxx"
+#include "PropertyHelper.hxx"
+#include "ChartModelClone.hxx"
+
+#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+
+#include <tools/diagnose_ex.h>
+#include <svx/svdundo.hxx>
+
+#include <boost/bind.hpp>
+#include <algorithm>
+
+using namespace ::com::sun::star;
+
+using ::rtl::OUString;
+
+namespace chart
+{
+namespace impl
+{
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::frame::XModel;
+    using ::com::sun::star::util::XCloneable;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::lang::DisposedException;
+    using ::com::sun::star::view::XSelectionSupplier;
+    using ::com::sun::star::chart2::XChartDocument;
+    using ::com::sun::star::document::UndoFailedException;
+    /** === end UNO using === **/
+
+// ---------------------------------------------------------------------------------------------------------------------
+UndoElement::UndoElement( const OUString& i_actionString, const Reference< XModel >& i_documentModel, const ::boost::shared_ptr< ChartModelClone >& i_modelClone )
+    :UndoElement_MBase()
+    ,UndoElement_TBase( m_aMutex )
+    ,m_sActionString( i_actionString )
+    ,m_xDocumentModel( i_documentModel )
+    ,m_pModelClone( i_modelClone )
+{
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+UndoElement::~UndoElement()
+{
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UndoElement::disposing()
+{
+    if ( !!m_pModelClone )
+        m_pModelClone->dispose();
+    m_pModelClone.reset();
+    m_xDocumentModel.clear();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+::rtl::OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException)
+{
+    return m_sActionString;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void UndoElement::impl_toggleModelState()
+{
+    // get a snapshot of the current state of our model
+    ::boost::shared_ptr< ChartModelClone > pNewClone( new ChartModelClone( m_xDocumentModel, m_pModelClone->getFacet() ) );
+    // apply the previous snapshot to our model
+    m_pModelClone->applyToModel( m_xDocumentModel );
+    // remember the new snapshot, for the next toggle
+    m_pModelClone = pNewClone;
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UndoElement::undo(  ) throw (UndoFailedException, RuntimeException)
+{
+    impl_toggleModelState();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UndoElement::redo(  ) throw (UndoFailedException, RuntimeException)
+{
+    impl_toggleModelState();
+}
+
+// =====================================================================================================================
+// = ShapeUndoElement
+// =====================================================================================================================
+
+// ---------------------------------------------------------------------------------------------------------------------
+ShapeUndoElement::ShapeUndoElement( SdrUndoAction& i_sdrUndoAction )
+    :ShapeUndoElement_MBase()
+    ,ShapeUndoElement_TBase( m_aMutex )
+    ,m_pAction( &i_sdrUndoAction )
+{
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+ShapeUndoElement::~ShapeUndoElement()
+{
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+::rtl::OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException)
+{
+    if ( !m_pAction )
+        throw DisposedException( ::rtl::OUString(), *this );
+    return m_pAction->GetComment();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SAL_CALL ShapeUndoElement::undo(  ) throw (UndoFailedException, RuntimeException)
+{
+    if ( !m_pAction )
+        throw DisposedException( ::rtl::OUString(), *this );
+    m_pAction->Undo();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SAL_CALL ShapeUndoElement::redo(  ) throw (UndoFailedException, RuntimeException)
+{
+    if ( !m_pAction )
+        throw DisposedException( ::rtl::OUString(), *this );
+    m_pAction->Redo();
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+void SAL_CALL ShapeUndoElement::disposing()
+{
+}
+
+} // namespace impl
+} //  namespace chart
diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx
new file mode 100644
index 000000000..9358c2570
--- /dev/null
+++ b/chart2/source/controller/main/UndoActions.hxx
@@ -0,0 +1,134 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef CHART2_IMPLUNDOMANAGER_HXX
+#define CHART2_IMPLUNDOMANAGER_HXX
+
+#include "ConfigItemListener.hxx"
+
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/document/XUndoAction.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+
+#include <rtl/ustring.hxx>
+#include <unotools/configitem.hxx>
+#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+
+#include <utility>
+#include <deque>
+
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
+
+class SdrUndoAction;
+
+namespace com { namespace sun { namespace star {
+namespace chart2 {
+    class XInternalDataProvider;
+}
+}}}
+
+
+namespace chart
+{
+class ChartModelClone;
+
+namespace impl
+{
+
+typedef ::cppu::BaseMutex                                                           UndoElement_MBase;
+typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::document::XUndoAction > UndoElement_TBase;
+
+class UndoElement   :public UndoElement_MBase
+                    ,public UndoElement_TBase
+                    ,public ::boost::noncopyable
+{
+public:
+    /** creates a new undo action
+
+        @param i_actionString
+            is the title of the Undo action
+        @param i_documentModel
+            is the actual document model which the undo actions operates on
+        @param i_modelClone
+            is the cloned model from before the changes, which the Undo action represents, have been applied.
+            Upon <member>invoking</member>, the clone model is applied to the document model.
+    */
+    UndoElement( const ::rtl::OUString & i_actionString,
+                 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_documentModel,
+                 const ::boost::shared_ptr< ChartModelClone >& i_modelClone
+               );
+
+    // XUndoAction
+    virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL undo(  ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL redo(  ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+
+    // OComponentHelper
+    virtual void SAL_CALL disposing();
+
+protected:
+    virtual ~UndoElement();
+
+private:
+    void    impl_toggleModelState();
+
+private:
+    ::rtl::OUString                                                     m_sActionString;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocumentModel;
+    ::boost::shared_ptr< ChartModelClone >                              m_pModelClone;
+};
+
+
+typedef ::cppu::BaseMutex                                                           ShapeUndoElement_MBase;
+typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::document::XUndoAction > ShapeUndoElement_TBase;
+class ShapeUndoElement  :public ShapeUndoElement_MBase
+                        ,public ShapeUndoElement_TBase
+{
+public:
+    ShapeUndoElement( SdrUndoAction& i_sdrUndoAction );
+
+    // XUndoAction
+    virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL undo(  ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL redo(  ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+
+    // OComponentHelper
+    virtual void SAL_CALL disposing();
+
+protected:
+    virtual ~ShapeUndoElement();
+
+private:
+    SdrUndoAction*  m_pAction;
+};
+
+} // namespace impl
+} //  namespace chart
+
+// CHART2_IMPLUNDOMANAGER_HXX
+#endif
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index b64d00884..233cd4c91 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -29,13 +29,15 @@
 #include "precompiled_chart2.hxx"
 
 #include "UndoCommandDispatch.hxx"
+#include "ResId.hxx"
 #include "macros.hxx"
 
-#include <com/sun/star/chart2/XUndoSupplier.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <com/sun/star/document/XUndoManagerSupplier.hpp>
 
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/diagnose_ex.h>
 
 // for ressource strings STR_UNDO and STR_REDO
 #include <svtools/svtools.hrc>
@@ -56,10 +58,8 @@ UndoCommandDispatch::UndoCommandDispatch(
         CommandDispatch( xContext ),
         m_xModel( xModel )
 {
-    Reference< chart2::XUndoSupplier > xUndoSupplier( xModel, uno::UNO_QUERY );
-    OSL_ASSERT( xUndoSupplier.is());
-    if( xUndoSupplier.is())
-        m_xUndoManager.set( xUndoSupplier->getUndoManager());
+    uno::Reference< document::XUndoManagerSupplier > xSuppUndo( m_xModel, uno::UNO_QUERY_THROW );
+    m_xUndoManager.set( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW );
 }
 
 UndoCommandDispatch::~UndoCommandDispatch()
@@ -68,10 +68,8 @@ UndoCommandDispatch::~UndoCommandDispatch()
 void UndoCommandDispatch::initialize()
 {
     Reference< util::XModifyBroadcaster > xBroadcaster( m_xUndoManager, uno::UNO_QUERY );
-    if( xBroadcaster.is() )
-    {
-        xBroadcaster->addModifyListener( this );
-    }
+    ENSURE_OR_RETURN_VOID( xBroadcaster.is(), "UndoCommandDispatch::initialize: missing modification broadcaster interface!" );
+    xBroadcaster->addModifyListener( this );
 }
 
 void UndoCommandDispatch::fireStatusEvent(
@@ -82,23 +80,23 @@ void UndoCommandDispatch::fireStatusEvent(
     {
         bool bFireAll = (rURL.getLength() == 0);
         uno::Any aUndoState, aRedoState;
-        if( m_xUndoManager->undoPossible())
+        if( m_xUndoManager->isUndoPossible())
         {
             // using assignment for broken gcc 3.3
             OUString aUndo = OUString( String( SvtResId( STR_UNDO )));
-            aUndoState <<= ( aUndo + m_xUndoManager->getCurrentUndoString());
+            aUndoState <<= ( aUndo + m_xUndoManager->getCurrentUndoActionTitle());
         }
-        if( m_xUndoManager->redoPossible())
+        if( m_xUndoManager->isRedoPossible())
         {
             // using assignment for broken gcc 3.3
             OUString aRedo = OUString( String( SvtResId( STR_REDO )));
-            aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoString());
+            aRedoState <<= ( aRedo + m_xUndoManager->getCurrentRedoActionTitle());
         }
 
         if( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Undo")))
-            fireStatusEventForURL( C2U(".uno:Undo"), aUndoState, m_xUndoManager->undoPossible(), xSingleListener );
+            fireStatusEventForURL( C2U(".uno:Undo"), aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener );
         if( bFireAll || rURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(".uno:Redo")))
-            fireStatusEventForURL( C2U(".uno:Redo"), aRedoState, m_xUndoManager->redoPossible(), xSingleListener );
+            fireStatusEventForURL( C2U(".uno:Redo"), aRedoState, m_xUndoManager->isRedoPossible(), xSingleListener );
     }
 }
 
@@ -113,10 +111,21 @@ void SAL_CALL UndoCommandDispatch::dispatch(
         // why is it necessary to lock the solar mutex here?
         // /--
         ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
-        if( URL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" )))
-            m_xUndoManager->undo( m_xModel );
-        else
-            m_xUndoManager->redo( m_xModel );
+        try
+        {
+            if( URL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" )))
+                m_xUndoManager->undo();
+            else
+                m_xUndoManager->redo();
+        }
+        catch( const document::UndoFailedException& )
+        {
+            // silently ignore
+        }
+        catch( const uno::Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
         // \--
     }
 }
@@ -126,6 +135,7 @@ void SAL_CALL UndoCommandDispatch::dispatch(
 void SAL_CALL UndoCommandDispatch::disposing()
 {
     Reference< util::XModifyBroadcaster > xBroadcaster( m_xUndoManager, uno::UNO_QUERY );
+    OSL_ENSURE( xBroadcaster.is(), "UndoCommandDispatch::initialize: missing modification broadcaster interface!" );
     if( xBroadcaster.is() )
     {
         xBroadcaster->removeModifyListener( this );
diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx
index 680be0462..2607adbd1 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.hxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.hxx
@@ -30,15 +30,12 @@
 #include "CommandDispatch.hxx"
 
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/chart2/XUndoManager.hpp>
+#include <com/sun/star/document/XUndoManager.hpp>
 
 namespace chart
 {
 
 /** This is a CommandDispatch implementation for Undo and Redo.
-
-    You need to pass an UndoManager to this class that is then used for Undo and
-    Redo.  The changes are applied to the given XModel.
  */
 class UndoCommandDispatch : public CommandDispatch
 {
@@ -77,7 +74,7 @@ private:
     ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > m_xModel;
     ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XUndoManager > m_xUndoManager;
+            ::com::sun::star::document::XUndoManager > m_xUndoManager;
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx
index d26e9adb6..b5bdf908a 100644
--- a/chart2/source/controller/main/UndoGuard.cxx
+++ b/chart2/source/controller/main/UndoGuard.cxx
@@ -29,6 +29,12 @@
 #include "precompiled_chart2.hxx"
 
 #include "UndoGuard.hxx"
+#include "ChartModelClone.hxx"
+#include "UndoActions.hxx"
+
+#include <com/sun/star/container/XChild.hpp>
+
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -39,105 +45,154 @@ using ::rtl::OUString;
 namespace chart
 {
 
-UndoGuard_Base::UndoGuard_Base( const OUString& rUndoString
-        , const uno::Reference< chart2::XUndoManager > & xUndoManager
-        , const uno::Reference< frame::XModel > & xModel )
-        : m_xModel( xModel )
-        , m_xUndoManager( xUndoManager )
-        , m_aUndoString( rUndoString )
-        , m_bActionPosted( false )
+//-----------------------------------------------------------------------------
+
+UndoGuard::UndoGuard( const OUString& i_undoString, const uno::Reference< document::XUndoManager > & i_undoManager,
+                               const ModelFacet i_facet )
+    :m_xChartModel( i_undoManager->getParent(), uno::UNO_QUERY_THROW )
+    ,m_xUndoManager( i_undoManager )
+    ,m_pDocumentSnapshot()
+    ,m_aUndoString( i_undoString )
+    ,m_bActionPosted( false )
 {
+    m_pDocumentSnapshot.reset( new ChartModelClone( m_xChartModel, i_facet ) );
 }
 
-UndoGuard_Base::~UndoGuard_Base()
+//-----------------------------------------------------------------------------
+
+UndoGuard::~UndoGuard()
 {
+    if ( !!m_pDocumentSnapshot )
+        discardSnapshot();
 }
 
-void UndoGuard_Base::commitAction()
+//-----------------------------------------------------------------------------
+
+void UndoGuard::commit()
 {
-    if( !m_bActionPosted && m_xUndoManager.is() )
-        m_xUndoManager->postAction( m_aUndoString );
+    if ( !m_bActionPosted && !!m_pDocumentSnapshot )
+    {
+        try
+        {
+            const Reference< document::XUndoAction > xAction( new impl::UndoElement( m_aUndoString, m_xChartModel, m_pDocumentSnapshot ) );
+            m_pDocumentSnapshot.reset();    // don't dispose, it's data went over to the UndoElement
+            m_xUndoManager->addUndoAction( xAction );
+        }
+        catch( const uno::Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
     m_bActionPosted = true;
 }
 
 //-----------------------------------------------------------------------------
 
-UndoGuard::UndoGuard( const OUString& rUndoString
-        , const uno::Reference< chart2::XUndoManager > & xUndoManager
-        , const uno::Reference< frame::XModel > & xModel )
-        : UndoGuard_Base( rUndoString, xUndoManager, xModel )
+void UndoGuard::rollback()
 {
-    if( m_xUndoManager.is() )
-        m_xUndoManager->preAction( m_xModel );
+    ENSURE_OR_RETURN_VOID( !!m_pDocumentSnapshot, "no snapshot!" );
+    m_pDocumentSnapshot->applyToModel( m_xChartModel );
+    discardSnapshot();
 }
 
-UndoGuard::~UndoGuard()
+//-----------------------------------------------------------------------------
+void UndoGuard::discardSnapshot()
 {
-    if( !m_bActionPosted && m_xUndoManager.is() )
-        m_xUndoManager->cancelAction();
+    ENSURE_OR_RETURN_VOID( !!m_pDocumentSnapshot, "no snapshot!" );
+    m_pDocumentSnapshot->dispose();
+    m_pDocumentSnapshot.reset();
 }
 
 //-----------------------------------------------------------------------------
 
-UndoLiveUpdateGuard::UndoLiveUpdateGuard( const OUString& rUndoString
-        , const uno::Reference< chart2::XUndoManager > & xUndoManager
-        , const uno::Reference< frame::XModel > & xModel )
-        : UndoGuard_Base( rUndoString, xUndoManager, xModel )
+UndoLiveUpdateGuard::UndoLiveUpdateGuard( const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager )
+    :UndoGuard( i_undoString, i_undoManager, E_MODEL )
 {
-    if( m_xUndoManager.is() )
-        m_xUndoManager->preAction( m_xModel );
 }
 
 UndoLiveUpdateGuard::~UndoLiveUpdateGuard()
 {
-    if( !m_bActionPosted && m_xUndoManager.is() )
-        m_xUndoManager->cancelActionWithUndo( m_xModel );
+    if ( !isActionPosted() )
+        rollback();
 }
 
 //-----------------------------------------------------------------------------
 
-UndoLiveUpdateGuardWithData::UndoLiveUpdateGuardWithData( const OUString& rUndoString
-        , const uno::Reference< chart2::XUndoManager > & xUndoManager
-        , const uno::Reference< frame::XModel > & xModel )
-        : UndoGuard_Base( rUndoString, xUndoManager, xModel )
+UndoLiveUpdateGuardWithData::UndoLiveUpdateGuardWithData(
+        const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager )
+    :UndoGuard( i_undoString, i_undoManager, E_MODEL_WITH_DATA )
 {
-    if( m_xUndoManager.is() )
-    {
-        Sequence< beans::PropertyValue > aArgs(1);
-        aArgs[0] = beans::PropertyValue(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("WithData")), -1, uno::Any(),
-            beans::PropertyState_DIRECT_VALUE );
-        m_xUndoManager->preActionWithArguments( m_xModel, aArgs );
-    }
 }
 
 UndoLiveUpdateGuardWithData::~UndoLiveUpdateGuardWithData()
 {
-    if( !m_bActionPosted && m_xUndoManager.is() )
-        m_xUndoManager->cancelActionWithUndo( m_xModel );
+    if ( !isActionPosted() )
+        rollback();
 }
 
 //-----------------------------------------------------------------------------
 
-UndoGuardWithSelection::UndoGuardWithSelection( const rtl::OUString& rUndoString
-        , const uno::Reference< chart2::XUndoManager > & xUndoManager
-        , const uno::Reference< frame::XModel > & xModel )
-        : UndoGuard_Base( rUndoString, xUndoManager, xModel )
+UndoGuardWithSelection::UndoGuardWithSelection(
+        const OUString& i_undoString, const uno::Reference< document::XUndoManager >& i_undoManager )
+    :UndoGuard( i_undoString, i_undoManager, E_MODEL_WITH_SELECTION )
 {
-    if( m_xUndoManager.is() )
+}
+
+//-----------------------------------------------------------------------------
+
+UndoGuardWithSelection::~UndoGuardWithSelection()
+{
+    if ( !isActionPosted() )
+        rollback();
+}
+
+//-----------------------------------------------------------------------------
+
+UndoContext::UndoContext( const Reference< document::XUndoManager > & i_undoManager, const ::rtl::OUString& i_undoTitle )
+    :m_xUndoManager( i_undoManager )
+{
+    ENSURE_OR_THROW( m_xUndoManager.is(), "invalid undo manager!" );
+    m_xUndoManager->enterUndoContext( i_undoTitle );
+}
+
+//-----------------------------------------------------------------------------
+
+UndoContext::~UndoContext()
+{
+    m_xUndoManager->leaveUndoContext();
+}
+
+//-----------------------------------------------------------------------------
+
+HiddenUndoContext::HiddenUndoContext( const Reference< document::XUndoManager > & i_undoManager )
+    :m_xUndoManager( i_undoManager )
+{
+    ENSURE_OR_THROW( m_xUndoManager.is(), "invalid undo manager!" );
+    try
+    {
+        m_xUndoManager->enterHiddenUndoContext();
+    }
+    catch( const uno::Exception& )
     {
-        Sequence< beans::PropertyValue > aArgs(1);
-        aArgs[0] = beans::PropertyValue(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("WithSelection")), -1, uno::Any(),
-            beans::PropertyState_DIRECT_VALUE );
-        m_xUndoManager->preActionWithArguments( m_xModel, aArgs );
+        DBG_UNHANDLED_EXCEPTION();
+        m_xUndoManager.clear();
+            // prevents the leaveUndoContext in the dtor
     }
 }
 
-UndoGuardWithSelection::~UndoGuardWithSelection()
+//-----------------------------------------------------------------------------
+
+HiddenUndoContext::~HiddenUndoContext()
 {
-    if( !m_bActionPosted && m_xUndoManager.is() )
-        m_xUndoManager->cancelAction();
+    try
+    {
+        if ( m_xUndoManager.is() )
+            m_xUndoManager->leaveUndoContext();
+    }
+    catch( const uno::Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 }
 
 } //  namespace chart
diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx
new file mode 100644
index 000000000..1503ff38a
--- /dev/null
+++ b/chart2/source/controller/main/UndoGuard.hxx
@@ -0,0 +1,137 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef CHART2_UNDOGUARD_HXX
+#define CHART2_UNDOGUARD_HXX
+
+#include "ChartModelClone.hxx"
+
+#include <com/sun/star/document/XUndoManager.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+
+#include <rtl/ustring.hxx>
+
+#include <boost/shared_ptr.hpp>
+
+namespace chart
+{
+
+/** A guard which which does nothing, unless you explicitly call commitAction. In particular, in its destructor, it
+    does neither auto-commit nor auto-rollback the model changes.
+ */
+class UndoGuard
+{
+public:
+    explicit UndoGuard(
+        const ::rtl::OUString& i_undoMessage,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager,
+        const ModelFacet i_facet = E_MODEL
+    );
+    ~UndoGuard();
+
+    void    commit();
+    void    rollback();
+
+protected:
+    bool    isActionPosted() const { return m_bActionPosted; }
+
+private:
+    void    discardSnapshot();
+
+private:
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >           m_xChartModel;
+    const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager >  m_xUndoManager;
+
+    ::boost::shared_ptr< ChartModelClone >  m_pDocumentSnapshot;
+    rtl::OUString                           m_aUndoString;
+    bool                                    m_bActionPosted;
+};
+
+/** A guard which, in its destructor, restores the model state it found in the constructor. If
+    <member>commitAction</member> is called inbetween, the restouration is not performed.
+ */
+class UndoLiveUpdateGuard : public UndoGuard
+{
+public:
+    explicit UndoLiveUpdateGuard(
+        const ::rtl::OUString& i_undoMessage,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
+    );
+    ~UndoLiveUpdateGuard();
+};
+
+/** Same as UndoLiveUpdateGuard but with additional storage of the chart's data.
+    Only use this if the data has internal data.
+ */
+class UndoLiveUpdateGuardWithData :
+        public UndoGuard
+{
+public:
+    explicit UndoLiveUpdateGuardWithData(
+        const ::rtl::OUString& i_undoMessage,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
+    );
+    ~UndoLiveUpdateGuardWithData();
+};
+
+class UndoGuardWithSelection : public UndoGuard
+{
+public:
+    explicit UndoGuardWithSelection(
+        const ::rtl::OUString& i_undoMessage,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
+    );
+    virtual ~UndoGuardWithSelection();
+};
+
+class UndoContext
+{
+public:
+    UndoContext(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager,
+        const ::rtl::OUString& i_undoTitle
+    );
+    ~UndoContext();
+
+private:
+    const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager >  m_xUndoManager;
+};
+
+class HiddenUndoContext
+{
+public:
+    HiddenUndoContext(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
+    );
+    ~HiddenUndoContext();
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager >    m_xUndoManager;
+};
+
+}
+// CHART2_UNDOGUARD_HXX
+#endif
diff --git a/chart2/source/controller/main/UndoManager.cxx b/chart2/source/controller/main/UndoManager.cxx
deleted file mode 100644
index daab89462..000000000
--- a/chart2/source/controller/main/UndoManager.cxx
+++ /dev/null
@@ -1,438 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include "UndoManager.hxx"
-#include "ImplUndoManager.hxx"
-#include "DisposeHelper.hxx"
-#include "MutexContainer.hxx"
-#include "macros.hxx"
-#include "ChartViewHelper.hxx"
-
-#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-
-#include <unotools/configitem.hxx>
-#include <cppuhelper/compbase1.hxx>
-#include <rtl/uuid.h>
-#include <svx/svdundo.hxx>
-
-#include <functional>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-
-
-// --------------------------------------------------------------------------------
-
-namespace chart
-{
-
-namespace impl
-{
-typedef ::cppu::WeakComponentImplHelper1<
-        util::XModifyBroadcaster >
-    ModifyBroadcaster_Base;
-
-class ModifyBroadcaster :
-        public ::chart::MutexContainer,
-        public ModifyBroadcaster_Base
-{
-public:
-    ModifyBroadcaster();
-
-    void fireEvent();
-
-protected:
-    // ____ XModifyBroadcaster ____
-    virtual void SAL_CALL addModifyListener( const Reference< util::XModifyListener >& xListener )
-        throw (uno::RuntimeException);
-    virtual void SAL_CALL removeModifyListener( const Reference< util::XModifyListener >& xListener )
-        throw (uno::RuntimeException);
-};
-
-ModifyBroadcaster::ModifyBroadcaster() :
-        ModifyBroadcaster_Base( m_aMutex )
-{}
-
-void SAL_CALL ModifyBroadcaster::addModifyListener(
-    const Reference< util::XModifyListener >& xListener )
-    throw (uno::RuntimeException)
-{
-    rBHelper.addListener( ::getCppuType( & xListener ), xListener);
-}
-
-void SAL_CALL ModifyBroadcaster::removeModifyListener(
-    const Reference< util::XModifyListener >& xListener )
-    throw (uno::RuntimeException)
-{
-    rBHelper.removeListener( ::getCppuType( & xListener ), xListener );
-}
-
-void ModifyBroadcaster::fireEvent()
-{
-    ::cppu::OInterfaceContainerHelper* pIC = rBHelper.getContainer(
-        ::getCppuType((const uno::Reference< util::XModifyListener >*)0) );
-    if( pIC )
-    {
-        lang::EventObject aEvent( static_cast< lang::XComponent* >( this ) );
-        ::cppu::OInterfaceIteratorHelper aIt( *pIC );
-        while( aIt.hasMoreElements() )
-        {
-            uno::Reference< util::XModifyListener > xListener( aIt.next(), uno::UNO_QUERY );
-            if( xListener.is() )
-                xListener->modified( aEvent );
-        }
-    }
-}
-
-} // namespace impl
-
-UndoManager::UndoManager() :
-        impl::UndoManager_Base( m_aMutex ),
-    m_apUndoStack( new impl::UndoStack()),
-    m_apRedoStack( new impl::UndoStack()),
-    m_pLastRemeberedUndoElement( 0 ),
-    m_nMaxNumberOfUndos( 100 ),
-    m_pModifyBroadcaster( 0 )
-{}
-
-UndoManager::~UndoManager()
-{
-    DisposeHelper::Dispose( m_xModifyBroadcaster );
-    m_apUndoStack->disposeAndClear();
-    m_apRedoStack->disposeAndClear();
-
-    delete m_pLastRemeberedUndoElement;
-    m_pLastRemeberedUndoElement = 0;
-}
-
-void UndoManager::addShapeUndoAction( SdrUndoAction* pAction )
-{
-    if ( !pAction )
-    {
-        return;
-    }
-
-    impl::ShapeUndoElement* pShapeUndoElement = new impl::ShapeUndoElement( pAction->GetComment(), pAction );
-    if ( pShapeUndoElement )
-    {
-        m_apUndoStack->push( pShapeUndoElement );
-        m_apRedoStack->disposeAndClear();
-        if ( !m_apUndoStepsConfigItem.get() )
-        {
-            retrieveConfigUndoSteps();
-        }
-        fireModifyEvent();
-    }
-}
-
-void UndoManager::impl_undoRedo(
-    Reference< frame::XModel > & xCurrentModel,
-    impl::UndoStack * pStackToRemoveFrom,
-    impl::UndoStack * pStackToAddTo,
-    bool bUndo )
-{
-    if( pStackToRemoveFrom && ! pStackToRemoveFrom->empty() )
-    {
-        // get model from undo/redo
-        impl::UndoElement * pTop( pStackToRemoveFrom->top());
-        if( pTop )
-        {
-            impl::ShapeUndoElement* pShapeUndoElement = dynamic_cast< impl::ShapeUndoElement* >( pTop );
-            if ( pShapeUndoElement )
-            {
-                impl::ShapeUndoElement* pNewShapeUndoElement = new impl::ShapeUndoElement( *pShapeUndoElement );
-                pStackToAddTo->push( pNewShapeUndoElement );
-                SdrUndoAction* pAction = pNewShapeUndoElement->getSdrUndoAction();
-                if ( pAction )
-                {
-                    if ( bUndo )
-                    {
-                        pAction->Undo();
-                    }
-                    else
-                    {
-                        pAction->Redo();
-                    }
-                }
-            }
-            else
-            {
-                // put a clone of current model into redo/undo stack with the same
-                // action string as the undo/redo
-                pStackToAddTo->push( pTop->createFromModel( xCurrentModel ));
-                // change current model by properties of the model from undo
-                pTop->applyToModel( xCurrentModel );
-            }
-            // remove the top undo element
-            pStackToRemoveFrom->pop(), pTop = 0;
-            ChartViewHelper::setViewToDirtyState( xCurrentModel );
-            fireModifyEvent();
-        }
-    }
-    else
-    {
-        OSL_ENSURE( false, "Can't Undo/Redo" );
-    }
-}
-
-void UndoManager::fireModifyEvent()
-{
-    if( m_xModifyBroadcaster.is())
-        m_pModifyBroadcaster->fireEvent();
-}
-
-
-// ____ ConfigItemListener ____
-void UndoManager::notify( const ::rtl::OUString & rPropertyName )
-{
-    OSL_ENSURE( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Steps" )),
-                "Unwanted config property change Notified" );
-    if( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Steps" )))
-        retrieveConfigUndoSteps();
-}
-
-void UndoManager::retrieveConfigUndoSteps()
-{
-    if( ! m_apUndoStepsConfigItem.get())
-        m_apUndoStepsConfigItem.reset( new impl::UndoStepsConfigItem( *this ));
-    m_nMaxNumberOfUndos = m_apUndoStepsConfigItem->getUndoSteps();
-    m_apUndoStack->limitSize( m_nMaxNumberOfUndos );
-    m_apRedoStack->limitSize( m_nMaxNumberOfUndos );
-
-    // a list of available undo steps could shrink here
-    fireModifyEvent();
-}
-
-// ____ XModifyBroadcaster ____
-void SAL_CALL UndoManager::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException)
-{
-    if( ! m_xModifyBroadcaster.is())
-    {
-        m_pModifyBroadcaster = new impl::ModifyBroadcaster();
-        m_xModifyBroadcaster.set( static_cast< cppu::OWeakObject* >( m_pModifyBroadcaster ), uno::UNO_QUERY );
-    }
-    m_xModifyBroadcaster->addModifyListener( aListener );
-}
-
-void SAL_CALL UndoManager::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException)
-{
-    if( ! m_xModifyBroadcaster.is())
-    {
-        m_pModifyBroadcaster = new impl::ModifyBroadcaster();
-        m_xModifyBroadcaster.set( static_cast< cppu::OWeakObject* >( m_pModifyBroadcaster ), uno::UNO_QUERY );
-    }
-    m_xModifyBroadcaster->removeModifyListener( aListener );
-}
-
-// ____ chart2::XUndoManager ____
-void SAL_CALL UndoManager::preAction( const Reference< frame::XModel >& xModelBeforeChange )
-    throw (uno::RuntimeException)
-{
-    OSL_ENSURE( ! m_pLastRemeberedUndoElement, "Looks like postAction or cancelAction call was missing" );
-    m_pLastRemeberedUndoElement = new impl::UndoElement( xModelBeforeChange );
-}
-
-void SAL_CALL UndoManager::preActionWithArguments(
-    const Reference< frame::XModel >& xModelBeforeChange,
-    const Sequence< beans::PropertyValue >& aArguments )
-    throw (uno::RuntimeException)
-{
-    bool bActionHandled( false );
-    OSL_ENSURE( ! m_pLastRemeberedUndoElement, "Looks like postAction or cancelAction call was missing" );
-    if( aArguments.getLength() > 0 )
-    {
-        OSL_ENSURE( aArguments.getLength() == 1, "More than one argument is not supported yet" );
-        if( aArguments[0].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("WithData")))
-        {
-            m_pLastRemeberedUndoElement = new impl::UndoElementWithData( xModelBeforeChange );
-            bActionHandled = true;
-        }
-        else if( aArguments[0].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("WithSelection")))
-        {
-            m_pLastRemeberedUndoElement = new impl::UndoElementWithSelection( xModelBeforeChange );
-            bActionHandled = true;
-        }
-    }
-
-    if( !bActionHandled )
-        preAction( xModelBeforeChange );
-}
-
-void SAL_CALL UndoManager::postAction( const OUString& aUndoText )
-    throw (uno::RuntimeException)
-{
-    OSL_ENSURE( m_pLastRemeberedUndoElement, "Looks like preAction call was missing" );
-    if( m_pLastRemeberedUndoElement )
-    {
-        m_pLastRemeberedUndoElement->setActionString( aUndoText );
-        m_apUndoStack->push( m_pLastRemeberedUndoElement );
-        m_pLastRemeberedUndoElement = 0;
-
-        // redo no longer possible
-        m_apRedoStack->disposeAndClear();
-
-        // it suffices to get the number of undo steps from config after the
-        // first time postAction has been called
-        if( ! m_apUndoStepsConfigItem.get())
-            retrieveConfigUndoSteps();
-
-        fireModifyEvent();
-    }
-}
-
-void SAL_CALL UndoManager::cancelAction()
-    throw (uno::RuntimeException)
-{
-    delete m_pLastRemeberedUndoElement;
-    m_pLastRemeberedUndoElement = 0;
-}
-
-void SAL_CALL UndoManager::cancelActionWithUndo( Reference< frame::XModel >& xModelToRestore )
-    throw (uno::RuntimeException)
-{
-    if( m_pLastRemeberedUndoElement )
-    {
-        m_pLastRemeberedUndoElement->applyToModel( xModelToRestore );
-        cancelAction();
-    }
-}
-
-void SAL_CALL UndoManager::undo( Reference< frame::XModel >& xCurrentModel )
-    throw (uno::RuntimeException)
-{
-    OSL_ASSERT( m_apUndoStack.get() && m_apRedoStack.get());
-    impl_undoRedo( xCurrentModel, m_apUndoStack.get(), m_apRedoStack.get(), true );
-}
-
-void SAL_CALL UndoManager::redo( Reference< frame::XModel >& xCurrentModel )
-    throw (uno::RuntimeException)
-{
-    OSL_ASSERT( m_apUndoStack.get() && m_apRedoStack.get());
-    impl_undoRedo( xCurrentModel, m_apRedoStack.get(), m_apUndoStack.get(), false );
-}
-
-::sal_Bool SAL_CALL UndoManager::undoPossible()
-    throw (uno::RuntimeException)
-{
-    return ! m_apUndoStack->empty();
-}
-
-::sal_Bool SAL_CALL UndoManager::redoPossible()
-    throw (uno::RuntimeException)
-{
-    return ! m_apRedoStack->empty();
-}
-
-OUString SAL_CALL UndoManager::getCurrentUndoString()
-    throw (uno::RuntimeException)
-{
-    return m_apUndoStack->topUndoString();
-}
-
-OUString SAL_CALL UndoManager::getCurrentRedoString()
-    throw (uno::RuntimeException)
-{
-    return m_apRedoStack->topUndoString();
-}
-
-Sequence< OUString > SAL_CALL UndoManager::getAllUndoStrings()
-    throw (uno::RuntimeException)
-{
-    return m_apUndoStack->getUndoStrings();
-}
-
-Sequence< OUString > SAL_CALL UndoManager::getAllRedoStrings()
-    throw (uno::RuntimeException)
-{
-    return m_apRedoStack->getUndoStrings();
-}
-
-// ____ XUndoHelper ____
-Reference< frame::XModel > SAL_CALL UndoManager::getModelCloneForUndo(
-    const Reference< frame::XModel >& xModelBeforeChange )
-    throw (uno::RuntimeException)
-{
-    return impl::UndoElement::cloneModel( xModelBeforeChange );
-}
-
-void SAL_CALL UndoManager::applyModelContent(
-    Reference< frame::XModel >& xModelToChange,
-    const Reference< frame::XModel >& xModelToCopyFrom )
-    throw (uno::RuntimeException)
-{
-    impl::UndoElement::applyModelContentToModel( xModelToChange, xModelToCopyFrom );
-}
-
-// ____ XUnoTunnel ____
-sal_Int64 UndoManager::getSomething( const Sequence< sal_Int8 >& rId )
-    throw (uno::RuntimeException)
-{
-    if ( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
-    {
-        return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ) );
-    }
-    return 0;
-}
-
-const Sequence< sal_Int8 >& UndoManager::getUnoTunnelId()
-{
-    static Sequence< sal_Int8 >* pSeq = 0;
-    if( !pSeq )
-    {
-        osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-        if( !pSeq )
-        {
-            static Sequence< sal_Int8 > aSeq( 16 );
-            rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
-            pSeq = &aSeq;
-        }
-    }
-    return *pSeq;
-}
-
-UndoManager* UndoManager::getImplementation( const Reference< uno::XInterface > xObj )
-{
-    UndoManager* pRet = NULL;
-    Reference< lang::XUnoTunnel > xUT( xObj, uno::UNO_QUERY );
-    if ( xUT.is() )
-    {
-        pRet = reinterpret_cast< UndoManager* >( sal::static_int_cast< sal_IntPtr >( xUT->getSomething( getUnoTunnelId() ) ) );
-    }
-    return pRet;
-}
-
-} //  namespace chart
diff --git a/chart2/source/controller/main/makefile.mk b/chart2/source/controller/main/makefile.mk
index 729276d5b..557d6cf62 100644
--- a/chart2/source/controller/main/makefile.mk
+++ b/chart2/source/controller/main/makefile.mk
@@ -72,12 +72,9 @@ SLOFILES =  \
             $(SLO)$/DrawCommandDispatch.obj \
             $(SLO)$/ShapeController.obj \
             $(SLO)$/ShapeToolbarController.obj \
-            $(SLO)$/ImplUndoManager.obj \
-            $(SLO)$/UndoManager.obj \
-            $(SLO)$/UndoGuard.obj
-
-#			$(SLO)$/CommonConverters.obj \
-#			$(SLO)$/Scaling.obj	\
+            $(SLO)$/UndoActions.obj \
+            $(SLO)$/UndoGuard.obj \
+            $(SLO)$/ChartModelClone.obj \
 
 # --- Targets -----------------------------------------------------------------
 
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index aeabb9dae..811c46106 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -29,10 +29,12 @@
 
 #include "charttoolsdllapi.hxx"
 #include "ReferenceSizeProvider.hxx"
+#include "ExplicitCategoriesProvider.hxx"
 #include <com/sun/star/chart2/XChartType.hpp>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
 #include <vector>
 
@@ -58,6 +60,15 @@ public:
     static bool isLogarithmic( const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XScaling >& xScaling );
 
+    static void checkDateAxis( ::com::sun::star::chart2::ScaleData& rScale, ExplicitCategoriesProvider* pExplicitCategoriesProvider, bool bChartTypeAllowsDateAxis );
+    static ::com::sun::star::chart2::ScaleData getDateCheckedScale( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
+
+    static sal_Int32 getExplicitNumberFormatKeyForAxis(
+                  const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis
+                , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& xCorrespondingCoordinateSystem
+                , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier
+                , bool bSearchForParallelAxisIfNothingIsFound );
+
     static ::com::sun::star::uno::Reference<
            ::com::sun::star::chart2::XAxis >
         createAxis( sal_Int32 nDimensionIndex, bool bMainAxis
@@ -178,7 +189,7 @@ public:
             , sal_Int32& rOutCooSysIndex, sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex );
 
     /** @param bOnlyVisible if </TRUE>, only axes with property "Show" set to
-               </TRUE> are returned
+               </sal_True> are returned
      */
     static ::com::sun::star::uno::Sequence<
                 ::com::sun::star::uno::Reference<
@@ -188,7 +199,7 @@ public:
             , bool bOnlyVisible = false );
 
     /** @param bOnlyVisible if </TRUE>, only axes with property "Show" set to
-               </TRUE> are returned
+               </sal_True> are returned
      */
     SAL_DLLPRIVATE static std::vector<
                 ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx
index 758b4c683..b245a1184 100644
--- a/chart2/source/inc/ChartModelHelper.hxx
+++ b/chart2/source/inc/ChartModelHelper.hxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XUndoManager.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XRangeHighlighter.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx
index 2a435b811..4ad7aa06f 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -61,8 +61,9 @@ public:
     static bool     isSupportingStartingAngle(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
     //starting value for bars or baseline for areas for example
     static bool     isSupportingBaseValue(           const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
-    static bool     shiftTicksAtXAxisPerDefault(     const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+    static bool     shiftCategoryPosAtXAxisPerDefault(     const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
     static bool     isSupportingAxisPositioning(     const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+    static bool     isSupportingDateAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
 
     //returns sequence of ::com::sun::star::chart::DataLabelPlacement
     static ::com::sun::star::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index 1d0f8cf93..cd1f03049 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -67,18 +67,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::co
         ::rtl::math::setNan( & fResult );
 
         ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() );
-        if( eClass == ::com::sun::star::uno::TypeClass_STRING )
-        {
-            rtl_math_ConversionStatus eConversionStatus;
-            fResult = ::rtl::math::stringToDouble(
-                * reinterpret_cast< const ::rtl::OUString * >( rAny.getValue() ),
-                sal_Char( '.' ), sal_Char( ',' ),
-                & eConversionStatus, NULL );
-
-            if( eConversionStatus != rtl_math_ConversionStatus_Ok )
-                ::rtl::math::setNan( & fResult );
-        }
-        else if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE )
+        if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE )
         {
             fResult = * reinterpret_cast< const double * >( rAny.getValue() );
         }
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index b65797a95..5bf0b70d9 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -38,6 +38,8 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/util/XNumberFormats.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
 #include <utility>
 #include <vector>
@@ -108,7 +110,7 @@ public:
         );
 
     /** @param bOnlyAtFirstChartType
-            If </TRUE>, the stacking mode is only set at the series found inside
+            If </sal_True>, the stacking mode is only set at the series found inside
             the first chart type.  This is the standard for all current
             templates (the only template that has more than one chart-type and
             allows stacking is bar/line combi, and for this the stacking only
@@ -240,6 +242,21 @@ public:
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XCoordinateSystem > & xCooSys );
 
+    static void switchToDateCategories(
+        const ::com::sun::star::uno::Reference<
+                ::com::sun::star::chart2::XChartDocument > & xChartDoc );
+
+    static void switchToTextCategories(
+        const ::com::sun::star::uno::Reference<
+                ::com::sun::star::chart2::XChartDocument > & xChartDoc );
+
+    static bool isSupportingDateAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
+    static bool isDateNumberFormat( sal_Int32 nNumberFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& xNumberFormats );
+    static sal_Int32 getDateNumberFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
+    
+    static sal_Int32 getPercentNumberFormat( const ::com::sun::star::uno::Reference<
+                ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
+
     static ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartType >
         getChartTypeByIndex( const ::com::sun::star::uno::Reference<
@@ -270,7 +287,7 @@ public:
         * @param bForward
         *  Direction of the move to be checked.
         *
-        * @returns </TRUE> if the series can be moved.
+        * @returns </sal_True> if the series can be moved.
         *
         */
     static bool isSeriesMoveable(
@@ -292,7 +309,7 @@ public:
         * @param bForward
         *  Direction in which the series should be moved.
         *
-        * @returns </TRUE> if the series was moved successfully.
+        * @returns </sal_True> if the series was moved successfully.
         *
         */
     static bool moveSeries(
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 4601c1a41..0113d2eef 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -58,6 +58,24 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
 };
 
+struct DatePlusIndex
+{
+    DatePlusIndex()
+        : fValue(1.0)
+        , nIndex( -1 )
+    {
+    }
+
+    DatePlusIndex( const double& _fValue, sal_Int32 _nIndex )
+        : fValue(_fValue)
+        , nIndex( _nIndex )
+    {
+    }
+
+    double fValue;
+    sal_Int32 nIndex;
+};
+
 class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider
 {
 public:
@@ -70,6 +88,9 @@ public:
 
     void init();
 
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::chart2::data::XDataSequence > getOriginalCategories();
+
     ::com::sun::star::uno::Sequence< ::rtl::OUString > getSimpleCategories();
     ::std::vector< ComplexCategory > getCategoriesByLevel( sal_Int32 nLevel );
 
@@ -83,23 +104,37 @@ public:
     static ::com::sun::star::uno::Sequence< ::rtl::OUString > getExplicitSimpleCategories(
             const SplitCategoriesProvider& rSplitCategoriesProvider );
 
+    static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< rtl::OUString >& rOutTexts
+        , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rInAnys
+        , ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xChartModel );
+
     bool hasComplexCategories() const;
     sal_Int32 getCategoryLevelCount() const;
 
     const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList();
 
+    bool isDateAxis();
+    const std::vector< DatePlusIndex >&  getDateCategories();
+
 private: //member
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  m_aExplicitCategories;
-    ::std::vector< ::std::vector< ComplexCategory > >   m_aComplexCats;
     bool volatile m_bDirty;
-
     ::com::sun::star::uno::WeakReference<
-        ::com::sun::star::chart2::XCoordinateSystem > m_xCooSysModel;
+        ::com::sun::star::chart2::XCoordinateSystem >   m_xCooSysModel;
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::frame::XModel >               m_xChartModel;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XLabeledDataSequence> m_xOriginalCategories;
+
+    bool m_bIsExplicitCategoriesInited;
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >  m_aExplicitCategories;
+    ::std::vector< ::std::vector< ComplexCategory > >   m_aComplexCats;
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList;
+
+    bool m_bIsDateAxis;
+    bool m_bIsAutoDate;
+    std::vector< DatePlusIndex >  m_aDateCategories;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx
index 314bb2e18..542e24cfc 100755
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -53,11 +53,11 @@ public:
     void setColumnValues( sal_Int32 nColumnIndex, const ::std::vector< double > & rNewData );
     void setRowValues( sal_Int32 nRowIndex, const ::std::vector< double > & rNewData );
 
-    void setComplexColumnLabel( sal_Int32 nColumnIndex, const ::std::vector< ::rtl::OUString >& rComplexLabel );
-    void setComplexRowLabel( sal_Int32 nRowIndex, const ::std::vector< ::rtl::OUString >& rComplexLabel );
+    void setComplexColumnLabel( sal_Int32 nColumnIndex, const ::std::vector< ::com::sun::star::uno::Any >& rComplexLabel );
+    void setComplexRowLabel( sal_Int32 nRowIndex, const ::std::vector< ::com::sun::star::uno::Any >& rComplexLabel );
 
-    ::std::vector< ::rtl::OUString > getComplexColumnLabel( sal_Int32 nColumnIndex ) const;
-    ::std::vector< ::rtl::OUString > getComplexRowLabel( sal_Int32 nRowIndex ) const;
+    ::std::vector< ::com::sun::star::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const;
+    ::std::vector< ::com::sun::star::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const;
     
     void swapRowWithNext( sal_Int32 nRowIndex );
     void swapColumnWithNext( sal_Int32 nColumnIndex );
@@ -76,12 +76,12 @@ public:
     sal_Int32 getColumnCount() const;
 
     typedef ::std::valarray< double > tDataType;
-    typedef ::std::vector< ::std::vector< ::rtl::OUString > > tVecVecString; //inner index is hierarchical level
+    typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Any > > tVecVecAny; //inner index is hierarchical level
 
-    void setComplexRowLabels( const tVecVecString& rNewRowLabels );
-    tVecVecString getComplexRowLabels() const;
-    void setComplexColumnLabels( const tVecVecString& rNewColumnLabels );
-    tVecVecString getComplexColumnLabels() const;
+    void setComplexRowLabels( const tVecVecAny& rNewRowLabels );
+    tVecVecAny getComplexRowLabels() const;
+    void setComplexColumnLabels( const tVecVecAny& rNewColumnLabels );
+    tVecVecAny getComplexColumnLabels() const;
 
 #if OSL_DEBUG_LEVEL > 2
     void traceData() const;
@@ -91,7 +91,7 @@ private: //methods
     /** resizes the data if at least one of the given dimensions is larger than
         before.  The data is never becoming smaller only larger.
 
-        @return </TRUE>, if the data was enlarged
+        @return </sal_True>, if the data was enlarged
     */
     bool enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount );
 
@@ -99,9 +99,9 @@ private:
     sal_Int32   m_nColumnCount;
     sal_Int32   m_nRowCount;
 
-    tDataType       m_aData;
-    tVecVecString   m_aRowLabels;//outer index is row index, inner index is category level
-    tVecVecString   m_aColumnLabels;//outer index is column index
+    tDataType    m_aData;
+    tVecVecAny   m_aRowLabels;//outer index is row index, inner index is category level
+    tVecVecAny   m_aColumnLabels;//outer index is column index
 };
 
 #endif
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index ccc35d734..92c0c335a 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -30,7 +30,8 @@
 #include "InternalData.hxx"
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
+#include <com/sun/star/chart/XDateCategories.hpp>
+#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
@@ -38,7 +39,7 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase7.hxx>
 #include "ServiceMacros.hxx"
 
 #include "CachedDataSequence.hxx"
@@ -52,10 +53,11 @@ namespace chart
 namespace impl
 {
 
-typedef ::cppu::WeakImplHelper6<
+typedef ::cppu::WeakImplHelper7<
         ::com::sun::star::chart2::XInternalDataProvider,
         ::com::sun::star::chart2::data::XRangeXMLConversion,
-        ::com::sun::star::chart::XComplexDescriptionAccess,
+        ::com::sun::star::chart2::XAnyDescriptionAccess,
+        ::com::sun::star::chart::XDateCategories,
         ::com::sun::star::util::XCloneable,
         ::com::sun::star::lang::XInitialization,
         ::com::sun::star::lang::XServiceInfo >
@@ -148,8 +150,26 @@ public:
         const ::rtl::OUString& aXMLRange )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
+
+    // ____ XDateCategories ____
+    virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException);
     
-    // ____ XComplexDescriptionAccess ____
+    // ____ XAnyDescriptionAccess ____
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL
+        getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setAnyRowDescriptions(
+        const ::com::sun::star::uno::Sequence<
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions )
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL
+        getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setAnyColumnDescriptions( 
+        const ::com::sun::star::uno::Sequence<
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
         getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setComplexRowDescriptions(
diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx
index f65b10903..bab44cd74 100644..100755
--- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
@@ -24,12 +24,12 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX
-#define _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX
+#ifndef _CHART2_TOOLS_NUMBERFORMATTERWRAPPER_HXX
+#define _CHART2_TOOLS_NUMBERFORMATTERWRAPPER_HXX
 
+#include "charttoolsdllapi.hxx"
 #include <svl/zforlist.hxx>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include "chartviewdllapi.hxx"
 
 //.............................................................................
 namespace chart
@@ -41,7 +41,7 @@ namespace chart
 */
 class FixedNumberFormatter;
 
-class OOO_DLLPUBLIC_CHARTVIEW NumberFormatterWrapper
+class OOO_DLLPUBLIC_CHARTTOOLS NumberFormatterWrapper
 {
 public:
     NumberFormatterWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier );
@@ -52,6 +52,7 @@ public:
                 getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; };
 
     rtl::OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
+    Date    getNullDate() const;
 
 private: //private member
     ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
@@ -62,7 +63,7 @@ private: //private member
 };
 
 
-class FixedNumberFormatter
+class OOO_DLLPUBLIC_CHARTTOOLS FixedNumberFormatter
 {
 public:
     FixedNumberFormatter( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier
@@ -73,7 +74,7 @@ public:
 
 private:
     NumberFormatterWrapper      m_aNumberFormatterWrapper;
-    ULONG                       m_nNumberFormatKey;
+    sal_uLong                       m_nNumberFormatKey;
 };
 
 //.............................................................................
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index da8fe058f..a0a09c152 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -102,7 +102,7 @@ protected:
 
         Overload this method to take influence in modification of properties.
 
-        If the conversion changed , </TRUE> is returned and the converted value
+        If the conversion changed , </sal_True> is returned and the converted value
         is in <code>rConvertedValue</code>.  The former value is contained in
         <code>rOldValue</code>.
 
diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx
index e22ef8200..a53a27368 100644
--- a/chart2/source/inc/ReferenceSizeProvider.hxx
+++ b/chart2/source/inc/ReferenceSizeProvider.hxx
@@ -84,7 +84,7 @@ public:
 
     /** Sets the ReferencePageSize according to the internal settings of this
         class at the XPropertySet, and the adapted font sizes if bAdaptFontSizes
-        is </TRUE>.
+        is </sal_True>.
      */
     SAL_DLLPRIVATE void setValuesAtPropertySet(
         const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/RelativePositionHelper.hxx b/chart2/source/inc/RelativePositionHelper.hxx
index 574c36bf0..f39d3d85c 100644
--- a/chart2/source/inc/RelativePositionHelper.hxx
+++ b/chart2/source/inc/RelativePositionHelper.hxx
@@ -84,10 +84,10 @@ public:
         position such that the resize is relative to the former rectangle's
         center.
 
-        @param bCheck If </TRUE>, the resize is only done, if after
+        @param bCheck If </sal_True>, the resize is only done, if after
                transformation, the position and size are within the bounds [0,1].
 
-        @return </TRUE>, if changes were applied.
+        @return </sal_True>, if changes were applied.
 
         <p>That means, if the position's alignment is center, the position will
         not change at all.</p>
@@ -100,12 +100,12 @@ public:
 
     /** shifts a relative position about the given amount
 
-        @param bCheck If </TRUE>, the shift is only done, if after
+        @param bCheck If </sal_True>, the shift is only done, if after
                transformation, the object represented by the position
                rInOutPosition and its size rObjectSize the position and size are
                within the bounds [0,1].
 
-        @return </TRUE>, if changes were applied.
+        @return </sal_True>, if changes were applied.
      */
     static bool moveObject(
         ::com::sun::star::chart2::RelativePosition & rInOutPosition,
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index 88c3f403e..547675702 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -30,8 +30,8 @@
 // this includes no link dependency
 #include <svl/solar.hrc>
 
-//next free is 291
-//single free is: 134
+//next free is 293
+//single free: 139
 
 //#define RID_APP_START 30000
 ////#define STR_NULL                            (RID_APP_START +  1)
@@ -165,6 +165,8 @@
 #define STR_STEP_GT_ZERO		 			(RID_APP_START + 102)
 #define STR_BAD_LOGARITHM                   (RID_APP_START + 111)
 #define STR_MIN_GREATER_MAX                 (RID_APP_START + 101)
+#define STR_INVALID_INTERVALS               (RID_APP_START + 291)
+#define STR_INVALID_TIME_UNIT               (RID_APP_START + 292)
 
 //-----------------------------------------------------------------------------
 //for range didalog
@@ -310,6 +312,7 @@
 #define STR_ACTION_TOGGLE_GRID_HORZ         (RID_APP_START + 86)
 #define STR_ACTION_SCALE_TEXT               (RID_APP_START + 93)
 #define STR_ACTION_REARRANGE_CHART          (RID_APP_START + 94)
+#define STR_ACTION_EDIT_TEXT                (RID_APP_START + 95)
 
 #define STR_TIP_CHOOSECOLOR                 (RID_APP_START + 233)
 #define STR_TIP_LIGHTSOURCE_X               (RID_APP_START + 234)
@@ -324,7 +327,6 @@
 #define STR_TIP_DATAPOINT			        (RID_APP_START + 140)
 #define STR_TIP_DATAPOINT_INDEX			    (RID_APP_START + 141)
 #define STR_TIP_DATAPOINT_VALUES		    (RID_APP_START + 142)
-#define STR_TIP_CATEGORY_VALUE	            (RID_APP_START + 139)
 
 //-----------------------------------------------------------------------------
 //warning and info boxes
diff --git a/chart2/source/inc/UndoGuard.hxx b/chart2/source/inc/UndoGuard.hxx
deleted file mode 100644
index 6eb7dcae1..000000000
--- a/chart2/source/inc/UndoGuard.hxx
+++ /dev/null
@@ -1,120 +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.
- *
- ************************************************************************/
-#ifndef CHART2_UNDOGUARD_HXX
-#define CHART2_UNDOGUARD_HXX
-
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/chart2/XUndoManager.hpp>
-
-// header for class OUString
-#include <rtl/ustring.hxx>
-
-namespace chart
-{
-/** Base Class for UndoGuard and UndoLiveUpdateGuard
-*/
-class UndoGuard_Base
-{
-public:
-    explicit UndoGuard_Base( const rtl::OUString & rUndoMessage
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XUndoManager > & xUndoManager
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-    virtual ~UndoGuard_Base();
-
-    void commitAction();
-
-protected:
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > m_xModel;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XUndoManager > m_xUndoManager;
-
-    rtl::OUString   m_aUndoString;
-    bool            m_bActionPosted;
-};
-
-/** This guard calls preAction at the given Model in the CTOR and
-    cancelAction in the DTOR if no other method is called.
-    If commitAction is called the destructor does nothin anymore.
- */
-class UndoGuard : public UndoGuard_Base
-{
-public:
-    explicit UndoGuard( const rtl::OUString& rUndoMessage
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XUndoManager > & xUndoManager
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-    virtual ~UndoGuard();
-};
-
-/** This guard calls preAction at the given Model in the CTOR and
-    cancelActionUndo in the DTOR if no other method is called.
-    If commitAction is called the destructor does nothin anymore.
- */
-class UndoLiveUpdateGuard : public UndoGuard_Base
-{
-public:
-    explicit UndoLiveUpdateGuard( const rtl::OUString& rUndoMessage
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XUndoManager > & xUndoManager
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-    virtual ~UndoLiveUpdateGuard();
-};
-
-/** Same as UndoLiveUpdateGuard but with additional storage of the chart's data.
-    Only use this if the data has internal data.
- */
-class UndoLiveUpdateGuardWithData :
-        public UndoGuard_Base
-{
-public:
-    explicit UndoLiveUpdateGuardWithData( const rtl::OUString& rUndoMessage
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XUndoManager > & xUndoManager
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-    virtual ~UndoLiveUpdateGuardWithData();
-};
-
-class UndoGuardWithSelection : public UndoGuard_Base
-{
-public:
-    explicit UndoGuardWithSelection( const rtl::OUString& rUndoMessage
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XUndoManager > & xUndoManager
-        , const ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xModel );
-    virtual ~UndoGuardWithSelection();
-};
-
-}
-// CHART2_UNDOGUARD_HXX
-#endif
diff --git a/chart2/source/inc/UndoManager.hxx b/chart2/source/inc/UndoManager.hxx
deleted file mode 100644
index b97817fa5..000000000
--- a/chart2/source/inc/UndoManager.hxx
+++ /dev/null
@@ -1,180 +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.
- *
- ************************************************************************/
-#ifndef CHART2_UNDOMANAGER_HXX
-#define CHART2_UNDOMANAGER_HXX
-
-#include "ConfigItemListener.hxx"
-#include "MutexContainer.hxx"
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
-#include <com/sun/star/chart2/XUndoManager.hpp>
-#include <com/sun/star/chart2/XUndoHelper.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-
-#include <cppuhelper/compbase4.hxx>
-#include <rtl/ustring.hxx>
-
-// for pair
-#include <utility>
-// for auto_ptr
-#include <memory>
-
-class SdrUndoAction;
-
-namespace com { namespace sun { namespace star {
-namespace frame {
-    class XModel;
-}
-}}}
-
-namespace chart
-{
-// ----------------------------------------
-namespace impl
-{
-
-class  UndoStepsConfigItem;
-class UndoElement;
-class  UndoStack;
-class  ModifyBroadcaster;
-
-typedef ::cppu::WeakComponentImplHelper4<
-            ::com::sun::star::util::XModifyBroadcaster,
-            ::com::sun::star::chart2::XUndoManager,
-            ::com::sun::star::chart2::XUndoHelper,
-            ::com::sun::star::lang::XUnoTunnel >
-    UndoManager_Base;
-
-} // namespace impl
-// ----------------------------------------
-
-/** Manages undo by storing the entire XModel in the undo- and redo-buffers.
-    Note, that therefore this should not be used for "big" XModels.
-
-    A prerequisite for this to work is that the XModels added to the undo-
-    redo-stacks support the css::util::XCloneable interface, which is
-    implemented such that the entire model is cloned.
- */
-class UndoManager :
-        public MutexContainer,
-        public ConfigItemListener,
-        public impl::UndoManager_Base
-{
-public:
-    explicit UndoManager();
-    virtual ~UndoManager();
-
-    void addShapeUndoAction( SdrUndoAction* pAction );
-
-    // ____ XUnoTunnel ____
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId )
-        throw (::com::sun::star::uno::RuntimeException);
-
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
-    static UndoManager* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xObj );
-
-protected:
-    // ____ ConfigItemListener ____
-    virtual void notify( const ::rtl::OUString & rPropertyName );
-
-    // ____ util::XModifyBroadcaster ____
-    virtual void SAL_CALL addModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // ____ chart2::XUndoManager ____
-    virtual void SAL_CALL preAction( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModelBeforeChange )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL preActionWithArguments(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModelBeforeChange,
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL postAction( const ::rtl::OUString& aUndoText )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL cancelAction()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL cancelActionWithUndo( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModelToRestore )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL undo( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xCurrentModel )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL redo( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xCurrentModel )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL undoPossible()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL redoPossible()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getCurrentUndoString()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getCurrentRedoString()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoStrings()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoStrings()
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // ____ XUndoHelper ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModelCloneForUndo(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModelBeforeChange )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL applyModelContent(
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModelToChange,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModelToCopyFrom )
-        throw (::com::sun::star::uno::RuntimeException);
-
-private:
-    void retrieveConfigUndoSteps();
-    void fireModifyEvent();
-    void impl_undoRedo(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::frame::XModel > & xCurrentModel,
-        impl::UndoStack * pStackToRemoveFrom,
-        impl::UndoStack * pStackToAddTo,
-        bool bUndo = true );
-
-    ::std::auto_ptr< impl::UndoStack > m_apUndoStack;
-    ::std::auto_ptr< impl::UndoStack > m_apRedoStack;
-
-    impl::UndoElement *  m_pLastRemeberedUndoElement;
-
-    ::std::auto_ptr< impl::UndoStepsConfigItem > m_apUndoStepsConfigItem;
-    sal_Int32   m_nMaxNumberOfUndos;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::util::XModifyBroadcaster > m_xModifyBroadcaster;
-    // pointer is valid as long as m_xModifyBroadcaster.is()
-    impl::ModifyBroadcaster * m_pModifyBroadcaster;
-};
-
-} //  namespace chart
-
-// CHART2_UNDOMANAGER_HXX
-#endif
diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
index 86871a5f2..31e5a2091 100644
--- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx
+++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx
@@ -27,13 +27,6 @@
 #ifndef CHARTSFXITEMIDS_HXX
 #define CHARTSFXITEMIDS_HXX
 
-#include <sfx2/sfxdefs.hxx>
-
-/*
-// header for SID_OBJ1_START
-#include <sfx2/sfxsids.hrc>
-*/
-
 // ============================================================
 // SCHATTR
 // ============================================================
@@ -49,68 +42,23 @@
 #define SCHATTR_DATADESCR_PLACEMENT         (SCHATTR_DATADESCR_START + 5)
 #define SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS   (SCHATTR_DATADESCR_START + 6)
 #define SCHATTR_DATADESCR_NO_PERCENTVALUE   (SCHATTR_DATADESCR_START + 7) //percentage values should not be offered
-#define SCHATTR_DATADESCR_END               SCHATTR_DATADESCR_NO_PERCENTVALUE
+#define SCHATTR_PERCENT_NUMBERFORMAT_VALUE  (SCHATTR_DATADESCR_START + 8)
+#define SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_DATADESCR_START + 9)
+#define SCHATTR_DATADESCR_END               SCHATTR_PERCENT_NUMBERFORMAT_SOURCE
 
+//legend
 #define SCHATTR_LEGEND_START	   			(SCHATTR_DATADESCR_END + 1)
 #define SCHATTR_LEGEND_POS		   			SCHATTR_LEGEND_START
 #define SCHATTR_LEGEND_END		 			SCHATTR_LEGEND_POS
 
-#define SCHATTR_TEXT_START					(SCHATTR_LEGEND_END + 1)
-// #define SCHATTR_TEXT_ORIENT					SCHATTR_TEXT_START
-// name changed:
-#define SCHATTR_TEXT_STACKED				SCHATTR_TEXT_START
-#define SCHATTR_TEXT_ORDER					(SCHATTR_TEXT_START + 1)
-#define SCHATTR_TEXT_END					SCHATTR_TEXT_ORDER
-
-#define SCHATTR_Y_AXIS_START				(SCHATTR_TEXT_END + 1)
-#define SCHATTR_Y_AXIS_AUTO_MIN				SCHATTR_Y_AXIS_START
-#define SCHATTR_Y_AXIS_MIN					(SCHATTR_Y_AXIS_START + 1)
-#define SCHATTR_Y_AXIS_AUTO_MAX	  			(SCHATTR_Y_AXIS_START + 2)
-#define SCHATTR_Y_AXIS_MAX					(SCHATTR_Y_AXIS_START + 3)
-#define SCHATTR_Y_AXIS_AUTO_STEP_MAIN		(SCHATTR_Y_AXIS_START + 4)
-#define SCHATTR_Y_AXIS_STEP_MAIN			(SCHATTR_Y_AXIS_START + 5)
-#define SCHATTR_Y_AXIS_AUTO_STEP_HELP		(SCHATTR_Y_AXIS_START + 6)
-#define SCHATTR_Y_AXIS_STEP_HELP			(SCHATTR_Y_AXIS_START + 7)
-#define SCHATTR_Y_AXIS_LOGARITHM			(SCHATTR_Y_AXIS_START + 8)
-#define SCHATTR_Y_AXIS_AUTO_ORIGIN			(SCHATTR_Y_AXIS_START + 9)
-#define SCHATTR_Y_AXIS_ORIGIN				(SCHATTR_Y_AXIS_START + 10)
-#define SCHATTR_Y_AXIS_END					SCHATTR_Y_AXIS_ORIGIN
-
-#define SCHATTR_X_AXIS_START				(SCHATTR_Y_AXIS_END + 1)
-#define SCHATTR_X_AXIS_AUTO_MIN				SCHATTR_X_AXIS_START
-#define SCHATTR_X_AXIS_MIN					(SCHATTR_X_AXIS_START + 1)
-#define SCHATTR_X_AXIS_AUTO_MAX	  			(SCHATTR_X_AXIS_START + 2)
-#define SCHATTR_X_AXIS_MAX					(SCHATTR_X_AXIS_START + 3)
-#define SCHATTR_X_AXIS_AUTO_STEP_MAIN		(SCHATTR_X_AXIS_START + 4)
-#define SCHATTR_X_AXIS_STEP_MAIN			(SCHATTR_X_AXIS_START + 5)
-#define SCHATTR_X_AXIS_AUTO_STEP_HELP		(SCHATTR_X_AXIS_START + 6)
-#define SCHATTR_X_AXIS_STEP_HELP			(SCHATTR_X_AXIS_START + 7)
-#define SCHATTR_X_AXIS_LOGARITHM			(SCHATTR_X_AXIS_START + 8)
-#define SCHATTR_X_AXIS_AUTO_ORIGIN			(SCHATTR_X_AXIS_START + 9)
-#define SCHATTR_X_AXIS_ORIGIN				(SCHATTR_X_AXIS_START + 10)
-#define SCHATTR_X_AXIS_END					SCHATTR_X_AXIS_ORIGIN
+//text
+#define SCHATTR_TEXT_START                  (SCHATTR_LEGEND_END + 1)
+#define SCHATTR_TEXT_DEGREES                SCHATTR_TEXT_START
+#define SCHATTR_TEXT_STACKED				(SCHATTR_TEXT_START + 1)
+#define SCHATTR_TEXT_END                    SCHATTR_TEXT_STACKED
 
-#define SCHATTR_Z_AXIS_START				(SCHATTR_X_AXIS_END + 1)
-#define SCHATTR_Z_AXIS_AUTO_MIN				SCHATTR_Z_AXIS_START
-#define SCHATTR_Z_AXIS_MIN					(SCHATTR_Z_AXIS_START + 1)
-#define SCHATTR_Z_AXIS_AUTO_MAX	  			(SCHATTR_Z_AXIS_START + 2)
-#define SCHATTR_Z_AXIS_MAX					(SCHATTR_Z_AXIS_START + 3)
-#define SCHATTR_Z_AXIS_AUTO_STEP_MAIN		(SCHATTR_Z_AXIS_START + 4)
-#define SCHATTR_Z_AXIS_STEP_MAIN			(SCHATTR_Z_AXIS_START + 5)
-#define SCHATTR_Z_AXIS_AUTO_STEP_HELP		(SCHATTR_Z_AXIS_START + 6)
-#define SCHATTR_Z_AXIS_STEP_HELP			(SCHATTR_Z_AXIS_START + 7)
-#define SCHATTR_Z_AXIS_LOGARITHM			(SCHATTR_Z_AXIS_START + 8)
-#define SCHATTR_Z_AXIS_AUTO_ORIGIN			(SCHATTR_Z_AXIS_START + 9)
-#define SCHATTR_Z_AXIS_ORIGIN				(SCHATTR_Z_AXIS_START + 10)
-#define SCHATTR_Z_AXIS_END					SCHATTR_Z_AXIS_ORIGIN
-
-// miscellaneous
-
-#define SCHATTR_AXISTYPE				    (SCHATTR_Z_AXIS_END + 1)
-#define SCHATTR_PERCENT_NUMBERFORMAT_VALUE  (SCHATTR_Z_AXIS_END + 2)
-#define SCHATTR_PERCENT_NUMBERFORMAT_SOURCE (SCHATTR_Z_AXIS_END + 3)
-
-#define SCHATTR_STAT_START                  (SCHATTR_PERCENT_NUMBERFORMAT_SOURCE + 1)
+// statistic
+#define SCHATTR_STAT_START                  (SCHATTR_TEXT_END + 1)
 #define SCHATTR_STAT_AVERAGE                SCHATTR_STAT_START
 #define SCHATTR_STAT_KIND_ERROR             (SCHATTR_STAT_START + 1)
 #define SCHATTR_STAT_PERCENT                (SCHATTR_STAT_START + 2)
@@ -122,16 +70,11 @@
 #define SCHATTR_STAT_RANGE_NEG              (SCHATTR_STAT_START + 8)
 #define SCHATTR_STAT_END                    SCHATTR_STAT_RANGE_NEG
 
-#define SCHATTR_TEXT2_START                 ( SCHATTR_STAT_END + 1)
-#define SCHATTR_TEXT_DEGREES                ( SCHATTR_TEXT2_START   )
-#define SCHATTR_TEXT_OVERLAP                (SCHATTR_TEXT2_START +1)
-#define SCHATTR_TEXT2_END                   ( SCHATTR_TEXT_OVERLAP )
-
 // --------------------------------------------------------
 // these attributes are for replacement of enum eChartStyle
 // --------------------------------------------------------
 
-#define SCHATTR_STYLE_START             ( SCHATTR_TEXT2_END +1 )
+#define SCHATTR_STYLE_START             ( SCHATTR_STAT_END +1 )
 
 // for whole chart
 #define SCHATTR_STYLE_DEEP              ( SCHATTR_STYLE_START     )
@@ -155,35 +98,44 @@
 #define SCHATTR_AXIS					(SCHATTR_STYLE_END + 1)// see chtmodel.hxx defines CHART_AXIS_PRIMARY_X, etc.
 //Ummappen:
 #define SCHATTR_AXIS_START				(SCHATTR_AXIS + 1)
-#define SCHATTR_AXIS_AUTO_MIN			 SCHATTR_AXIS_START
-#define SCHATTR_AXIS_MIN				(SCHATTR_AXIS_START + 1)
-#define SCHATTR_AXIS_AUTO_MAX	  		(SCHATTR_AXIS_START + 2)
-#define SCHATTR_AXIS_MAX				(SCHATTR_AXIS_START + 3)
-#define SCHATTR_AXIS_AUTO_STEP_MAIN		(SCHATTR_AXIS_START + 4)
-#define SCHATTR_AXIS_STEP_MAIN			(SCHATTR_AXIS_START + 5)
-#define SCHATTR_AXIS_AUTO_STEP_HELP		(SCHATTR_AXIS_START + 6)
-// SCHATTR_AXIS_STEP_HELP: type changed from double to sal_Int32 !
-#define SCHATTR_AXIS_STEP_HELP			(SCHATTR_AXIS_START + 7)
-#define SCHATTR_AXIS_LOGARITHM			(SCHATTR_AXIS_START + 8)
-#define SCHATTR_AXIS_AUTO_ORIGIN		(SCHATTR_AXIS_START + 9)
-#define SCHATTR_AXIS_ORIGIN				(SCHATTR_AXIS_START + 10)
-//Neu:
-#define SCHATTR_AXIS_TICKS				(SCHATTR_AXIS_START + 11)
-#define SCHATTR_AXIS_NUMFMT				(SCHATTR_AXIS_START + 12)
-#define SCHATTR_AXIS_NUMFMTPERCENT		(SCHATTR_AXIS_START + 13)
-#define SCHATTR_AXIS_SHOWAXIS			(SCHATTR_AXIS_START + 14)
-#define SCHATTR_AXIS_SHOWDESCR			(SCHATTR_AXIS_START + 15)
-#define SCHATTR_AXIS_SHOWMAINGRID		(SCHATTR_AXIS_START + 16)
-#define SCHATTR_AXIS_SHOWHELPGRID		(SCHATTR_AXIS_START + 17)
-#define SCHATTR_AXIS_TOPDOWN			(SCHATTR_AXIS_START + 18)
-#define SCHATTR_AXIS_HELPTICKS			(SCHATTR_AXIS_START + 19)
-#define SCHATTR_AXIS_REVERSE            (SCHATTR_AXIS_START + 20)
-#define SCHATTR_AXIS_POSITION           (SCHATTR_AXIS_START + 21)
-#define SCHATTR_AXIS_POSITION_VALUE     (SCHATTR_AXIS_START + 22)
-#define SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT    (SCHATTR_AXIS_START + 23)
-#define SCHATTR_AXIS_LABEL_POSITION     (SCHATTR_AXIS_START + 24)
-#define SCHATTR_AXIS_MARK_POSITION      (SCHATTR_AXIS_START + 25)
-#define SCHATTR_AXIS_END                SCHATTR_AXIS_MARK_POSITION
+//axis scale
+#define SCHATTR_AXISTYPE				 SCHATTR_AXIS_START
+#define SCHATTR_AXIS_REVERSE            (SCHATTR_AXIS_START + 1)
+#define SCHATTR_AXIS_AUTO_MIN			(SCHATTR_AXIS_START + 2) 
+#define SCHATTR_AXIS_MIN				(SCHATTR_AXIS_START + 3)
+#define SCHATTR_AXIS_AUTO_MAX	  		(SCHATTR_AXIS_START + 4)
+#define SCHATTR_AXIS_MAX				(SCHATTR_AXIS_START + 5)
+#define SCHATTR_AXIS_AUTO_STEP_MAIN		(SCHATTR_AXIS_START + 6)
+#define SCHATTR_AXIS_STEP_MAIN			(SCHATTR_AXIS_START + 7)
+#define SCHATTR_AXIS_MAIN_TIME_UNIT		(SCHATTR_AXIS_START + 8)
+#define SCHATTR_AXIS_AUTO_STEP_HELP		(SCHATTR_AXIS_START + 9)
+#define SCHATTR_AXIS_STEP_HELP			(SCHATTR_AXIS_START + 10)
+#define SCHATTR_AXIS_HELP_TIME_UNIT 	(SCHATTR_AXIS_START + 11)
+#define SCHATTR_AXIS_AUTO_TIME_RESOLUTION   (SCHATTR_AXIS_START + 12)
+#define SCHATTR_AXIS_TIME_RESOLUTION	(SCHATTR_AXIS_START + 13)
+#define SCHATTR_AXIS_LOGARITHM			(SCHATTR_AXIS_START + 14)
+#define SCHATTR_AXIS_AUTO_DATEAXIS		(SCHATTR_AXIS_START + 15)
+#define SCHATTR_AXIS_ALLOW_DATEAXIS		(SCHATTR_AXIS_START + 16)
+#define SCHATTR_AXIS_AUTO_ORIGIN		(SCHATTR_AXIS_START + 17)
+#define SCHATTR_AXIS_ORIGIN				(SCHATTR_AXIS_START + 18)
+//axis position
+#define SCHATTR_AXIS_POSITION_START     (SCHATTR_AXIS_ORIGIN +1)
+#define SCHATTR_AXIS_TICKS				SCHATTR_AXIS_POSITION_START
+#define SCHATTR_AXIS_HELPTICKS			(SCHATTR_AXIS_POSITION_START + 1)
+#define SCHATTR_AXIS_POSITION           (SCHATTR_AXIS_POSITION_START + 2)
+#define SCHATTR_AXIS_POSITION_VALUE     (SCHATTR_AXIS_POSITION_START + 3)
+#define SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT    (SCHATTR_AXIS_POSITION_START + 4)
+#define SCHATTR_AXIS_LABEL_POSITION     (SCHATTR_AXIS_POSITION_START + 5)
+#define SCHATTR_AXIS_MARK_POSITION      (SCHATTR_AXIS_POSITION_START + 6)
+//axis label
+#define SCHATTR_AXIS_LABEL_START        (SCHATTR_AXIS_MARK_POSITION +1)
+#define SCHATTR_AXIS_SHOWDESCR			SCHATTR_AXIS_LABEL_START
+#define SCHATTR_AXIS_LABEL_ORDER		(SCHATTR_AXIS_LABEL_START + 1)
+#define SCHATTR_AXIS_LABEL_OVERLAP      (SCHATTR_AXIS_LABEL_START + 2)
+#define SCHATTR_AXIS_LABEL_BREAK        (SCHATTR_AXIS_LABEL_START + 3)
+#define SCHATTR_AXIS_LABEL_END          SCHATTR_AXIS_LABEL_BREAK
+
+#define SCHATTR_AXIS_END                SCHATTR_AXIS_LABEL_END
 
 #define SCHATTR_SYMBOL_BRUSH			(SCHATTR_AXIS_END + 1)
 #define SCHATTR_STOCK_VOLUME			(SCHATTR_AXIS_END + 2)
@@ -201,13 +153,12 @@
 #define SCHATTR_SPLINE_ORDER            (SCHATTR_CHARTTYPE_START + 4)
 #define SCHATTR_SPLINE_RESOLUTION       (SCHATTR_CHARTTYPE_START + 5)
 #define SCHATTR_DIAGRAM_STYLE           (SCHATTR_CHARTTYPE_START + 6)
-#define SCHATTR_TEXTBREAK               (SCHATTR_CHARTTYPE_START + 7)
-#define SCHATTR_GROUP_BARS_PER_AXIS     (SCHATTR_CHARTTYPE_START + 8)
-#define SCHATTR_STARTING_ANGLE          (SCHATTR_CHARTTYPE_START + 9)
-#define SCHATTR_CLOCKWISE               (SCHATTR_CHARTTYPE_START + 10)
-#define SCHATTR_MISSING_VALUE_TREATMENT     (SCHATTR_CHARTTYPE_START + 11)
-#define SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 12)
-#define SCHATTR_INCLUDE_HIDDEN_CELLS    (SCHATTR_CHARTTYPE_START + 13)
+#define SCHATTR_GROUP_BARS_PER_AXIS     (SCHATTR_CHARTTYPE_START + 7)
+#define SCHATTR_STARTING_ANGLE          (SCHATTR_CHARTTYPE_START + 8)
+#define SCHATTR_CLOCKWISE               (SCHATTR_CHARTTYPE_START + 9)
+#define SCHATTR_MISSING_VALUE_TREATMENT     (SCHATTR_CHARTTYPE_START + 10)
+#define SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS (SCHATTR_CHARTTYPE_START + 11)
+#define SCHATTR_INCLUDE_HIDDEN_CELLS    (SCHATTR_CHARTTYPE_START + 12)
 
 #define SCHATTR_CHARTTYPE_END           SCHATTR_INCLUDE_HIDDEN_CELLS
 
@@ -236,9 +187,11 @@
 #define CHAXIS_MARK_NONE   0
 
 // values for SCHATTR_AXISTYPE items
-#define CHART_AXIS_X    0
-#define CHART_AXIS_Y    1
-#define CHART_AXIS_Z    2
+#define CHART_AXIS_REALNUMBER   0
+#define CHART_AXIS_PERCENT      1
+#define CHART_AXIS_CATEGORY     2
+#define CHART_AXIS_SERIES       3
+#define CHART_AXIS_DATE         4
 
 // values for SCHATTR_STYLE_SHAPE items
 #define CHART_SHAPE3D_IGNORE  -2 //intern! (GetChartShapeStyle()!)
diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
new file mode 100644
index 000000000..15f6af1be
--- /dev/null
+++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
@@ -0,0 +1,165 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _CHART2_EXPLICITSCALEVALUES_HXX
+#define _CHART2_EXPLICITSCALEVALUES_HXX
+
+#include "chartviewdllapi.hxx"
+#include <com/sun/star/chart/TimeInterval.hpp>
+#include <com/sun/star/chart/TimeUnit.hpp>
+#include <com/sun/star/chart2/AxisOrientation.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
+#include <com/sun/star/chart2/XScaling.hpp>
+#include <tools/date.hxx>
+#include <vector>
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+
+//-----------------------------------------------------------------------------
+/** This structure contains the explicit values for a scale like Minimum and Maximum.
+    See also ::com::sun::star::chart2::ScaleData.
+*/
+
+struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData
+{
+    ExplicitScaleData();
+
+    double Minimum;
+    double Maximum;
+    double Origin;
+
+    ::com::sun::star::chart2::AxisOrientation     Orientation;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > Scaling;
+
+    sal_Int32   AxisType;//see ::com::sun::star::chart2::AxisType
+    bool        ShiftedCategoryPosition;
+    sal_Int32   TimeResolution; //constant of type <type>::com::sun::star::chart::TimeUnit</type> 
+    Date        NullDate;
+};
+
+struct OOO_DLLPUBLIC_CHARTVIEW ExplicitSubIncrement
+{
+    ExplicitSubIncrement();
+
+    /** Numbers of intervals between two superior ticks.  For an axis
+        this usually means, that <code>IntervalCount - 1</code>
+        sub-tick-marks are displayed between two superior ticks.
+
+     */
+    sal_Int32 IntervalCount;
+
+    /** If <TRUE/>, the distance between two sub-tick-marks on the
+        screen is always the same.  If <FALSE/>, the distances may
+        differ depending on the <type>XScaling</type>.
+     */
+    bool PostEquidistant;
+};
+
+/** describes how tickmarks are positioned on the scale of an axis.
+*/
+struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData
+{
+    ExplicitIncrementData();
+
+    /** the following two members are only for date-time axis
+    */
+    ::com::sun::star::chart::TimeInterval   MajorTimeInterval;
+    ::com::sun::star::chart::TimeInterval   MinorTimeInterval;
+    
+    /** the other members are for *not* date-time axis
+    */
+
+    /** <member>Distance</member> describes the distance between two
+    neighboring main tickmarks on a <type>Scale</type> of an axis.
+    All neighboring main tickmarks have the same constant distance.
+
+    <p>If the Scale has a <type>XScaling</type> the <member>Distance</member>
+    may be measured in two different ways - that is - before or after the
+    scaling is applied.</p>
+
+    <p>On a logarithmic scale for example the distance between two main
+    tickmarks is typically measured after the scaling is applied:
+    Distance = log(tick2)-log(tick1)
+    ( log(1000)-log(100)==log(100)-log(10)==log(10)-log(1)==1==Distance ).
+    The resulting tickmarks will always look equidistant on the screen.
+    The other possibility is to have a Distance = tick2-tick1 measured constant
+    before a scaling is applied, which may lead to non equidistant tickmarks
+    on the screen.</p>
+
+    <p><member>PostEquidistant</member> rules wether the <member>Distance</member>
+    is meant to be a value before or after scaling.</p>
+    */
+    double		Distance;
+
+    /**
+    <member>PostEquidistant</member> rules wether the member <member>Distance</member>
+    describes a distance before or after the scaling is applied.
+
+    <p>If <member>PostEquidistant</member> equals <TRUE/> <member>Distance</member>
+    is given in values after <type>XScaling</type> is applied, thus resulting
+    main tickmarks will always look equidistant on the screen.
+    If <member>PostEquidistant</member> equals <FALSE/> <member>Distance</member>
+    is given in values before <type>XScaling</type> is applied.</p>
+    */
+    bool		PostEquidistant;
+
+    /** The <member>BaseValue</member> gives a starting point on the scale
+    to which all further main tickmarks are relatively positioned.
+
+    <p>The <member>BaseValue</member> is always a value on the scale before
+    a possible scaling is applied. If the given value is not valid in the
+    associated scaling the minimum of the scaling is assumed,
+    if there is no minimum any other obvious value will be assumed.</p>
+
+    <p>E.g.: assume a scale from 0 to 6 with identical scaling.
+    Further assume this Increment to have Distance==2 and PostEquidistant==false.
+    Setting BaseValue=0 would lead to main tickmarks 0; 2; 4; 6;
+    Setting BaseValue=1,3 would lead to main tickmarks 1,3; 3,3; 5,3;
+    Setting BaseValue=-0,7 would also lead to main tickmarks 1,3; 3,3; 5,3;
+    And setting BaseValue to 2, -2, 4, -4 etc. in this example
+    leads to the same result as BaseValue=0.</p>
+    */
+    double		BaseValue;
+
+    /** <member>SubIncrements</member> describes the positioning of further
+    sub tickmarks on the scale of an axis.
+
+    <p>The first SubIncrement in this sequence determines how the
+    distance between two neighboring main tickmarks is divided for positioning
+    of further sub tickmarks. Every following SubIncrement determines the
+    positions of subsequent tickmarks in relation to their parent tickmarks
+    iven by the preceding SubIncrement.</p>
+    */
+    ::std::vector< ExplicitSubIncrement > SubIncrements;
+};
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
+#endif
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 5e22c4832..06307b33f 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -27,9 +27,9 @@
 #ifndef _CHART2_EXPLICITVALUEPROVIDER_HXX
 #define _CHART2_EXPLICITVALUEPROVIDER_HXX
 
+#include "ExplicitScaleValues.hxx"
+
 #include <boost/shared_ptr.hpp>
-#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <com/sun/star/chart2/XDataSeries.hpp>
@@ -59,8 +59,8 @@ public:
      */
     virtual sal_Bool getExplicitValuesForAxis(
         ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > xAxis
-        , ::com::sun::star::chart2::ExplicitScaleData&  rExplicitScale
-        , ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement )=0;
+        , ExplicitScaleData&  rExplicitScale
+        , ExplicitIncrementData& rExplicitIncrement )=0;
 
     /** for rotated objects the shape size and position differs from the visible rectangle
         if bSnapRect is set to true you get the resulting visible position (left-top) and size
@@ -99,9 +99,6 @@ public:
             , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem
             , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
 
-    SAL_DLLPRIVATE static sal_Int32 getPercentNumberFormat( const ::com::sun::star::uno::Reference<
-                ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
-
     static sal_Int32 getExplicitNumberFormatKeyForDataLabel(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesOrPointProp
             , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index ce2e310b7..bf0348640 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -62,8 +62,6 @@ namespace chart
 
 #define CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartRenderer")
 
-#define CHART_UNDOMANAGER_SERVICE_NAME ::rtl::OUString::createFromAscii( "com.sun.star.chart2.UndoManager" )
-
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 364f76e36..88544db95 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -31,11 +31,13 @@
 #include "MutexContainer.hxx"
 #include <cppuhelper/implbase8.hxx>
 #include <comphelper/uno3.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart/X3DDefaultSetter.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
@@ -117,8 +119,6 @@ protected:
 // 		throw (::com::sun::star::lang::IllegalArgumentException);
 
     // ____ XDiagram ____
-//     virtual ::rtl::OUString SAL_CALL getChartTypeTemplateServiceName()
-//         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet > SAL_CALL getWall()
         throw (::com::sun::star::uno::RuntimeException);
@@ -136,7 +136,10 @@ protected:
     virtual void SAL_CALL setDefaultColorScheme(
         const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme >& xColorScheme )
         throw (::com::sun::star::uno::RuntimeException);
-    
+    virtual void SAL_CALL setDiagramData(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments )
+            throw (::com::sun::star::uno::RuntimeException);
     
     // ____ XCoordinateSystemContainer ____
     virtual void SAL_CALL addCoordinateSystem(
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index a5b1511ac..226c17d94 100755
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -42,6 +42,7 @@
 #include "PageBackground.hxx"
 #include "CloneHelper.hxx"
 #include "NameContainer.hxx"
+#include "UndoManager.hxx"
 
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 
@@ -73,6 +74,7 @@
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Any;
 using ::rtl::OUString;
 using ::osl::MutexGuard;
@@ -103,6 +105,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
     , m_bModified( sal_False )
     , m_nInLoad(0)
     , m_bUpdateNotificationsPending(false)
+    , m_pUndoManager( NULL )
     , m_aControllers( m_aModelMutex )
     , m_nControllerLockCount(0)
     , m_xContext( xContext )
@@ -114,14 +117,21 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
                 C2U( "com.sun.star.xml.NamespaceMap" ), C2U( "com.sun.star.comp.chart.XMLNameSpaceMap" ) ), uno::UNO_QUERY)
 {
     OSL_TRACE( "ChartModel: CTOR called" );
-    osl_incrementInterlockedCount(&m_refCount);
 
-    ModifyListenerHelper::addListener( m_xPageBackground, this );
-    m_xChartTypeManager.set( xContext->getServiceManager()->createInstanceWithContext(
-            C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY );
-    m_xUndoManager = Reference< chart2::XUndoManager >(
-        this->createInstance( CHART_UNDOMANAGER_SERVICE_NAME ), uno::UNO_QUERY );
+    osl_incrementInterlockedCount(&m_refCount);
+    {
+        m_xOldModelAgg.set(
+            m_xContext->getServiceManager()->createInstanceWithContext(
+            CHART_CHARTAPIWRAPPER_SERVICE_NAME,
+            m_xContext ), uno::UNO_QUERY_THROW );
+        m_xOldModelAgg->setDelegator( *this );
+    }
 
+    {
+        ModifyListenerHelper::addListener( m_xPageBackground, this );
+        m_xChartTypeManager.set( xContext->getServiceManager()->createInstanceWithContext(
+                C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY );
+    }
     osl_decrementInterlockedCount(&m_refCount);
 }
 
@@ -145,33 +155,39 @@ ChartModel::ChartModel( const ChartModel & rOther )
     , m_aGraphicObjectVector( rOther.m_aGraphicObjectVector )
     , m_xDataProvider( rOther.m_xDataProvider )
     , m_xInternalDataProvider( rOther.m_xInternalDataProvider )
-    , m_xUndoManager( rOther.m_xUndoManager )
 {
     OSL_TRACE( "ChartModel: Copy-CTOR called" );
-    osl_incrementInterlockedCount(&m_refCount);
 
-    Reference< util::XModifyListener > xListener;
-    Reference< chart2::XTitle > xNewTitle = CreateRefClone< Reference< chart2::XTitle > >()( rOther.m_xTitle );
-    Reference< chart2::XDiagram > xNewDiagram = CreateRefClone< Reference< chart2::XDiagram > >()( rOther.m_xDiagram );
-    Reference< beans::XPropertySet > xNewPageBackground = CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xPageBackground );
-    Reference< chart2::XChartTypeManager > xChartTypeManager = CreateRefClone< Reference< chart2::XChartTypeManager > >()( rOther.m_xChartTypeManager );
-    Reference< container::XNameAccess > xXMLNamespaceMap = CreateRefClone< Reference< container::XNameAccess > >()( rOther.m_xXMLNamespaceMap );
-    
+    osl_incrementInterlockedCount(&m_refCount);
     {
-        MutexGuard aGuard( m_aModelMutex );
-        xListener = this;
-        m_xTitle = xNewTitle;
-        m_xDiagram = xNewDiagram;
-        m_xPageBackground = xNewPageBackground;
-        m_xChartTypeManager = xChartTypeManager;
-        m_xXMLNamespaceMap = xXMLNamespaceMap;
+        m_xOldModelAgg.set(
+            m_xContext->getServiceManager()->createInstanceWithContext(
+            CHART_CHARTAPIWRAPPER_SERVICE_NAME,
+            m_xContext ), uno::UNO_QUERY_THROW );
+        m_xOldModelAgg->setDelegator( *this );
+
+        Reference< util::XModifyListener > xListener;
+        Reference< chart2::XTitle > xNewTitle = CreateRefClone< Reference< chart2::XTitle > >()( rOther.m_xTitle );
+        Reference< chart2::XDiagram > xNewDiagram = CreateRefClone< Reference< chart2::XDiagram > >()( rOther.m_xDiagram );
+        Reference< beans::XPropertySet > xNewPageBackground = CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xPageBackground );
+        Reference< chart2::XChartTypeManager > xChartTypeManager = CreateRefClone< Reference< chart2::XChartTypeManager > >()( rOther.m_xChartTypeManager );
+        Reference< container::XNameAccess > xXMLNamespaceMap = CreateRefClone< Reference< container::XNameAccess > >()( rOther.m_xXMLNamespaceMap );
+        
+        {
+            MutexGuard aGuard( m_aModelMutex );
+            xListener = this;
+            m_xTitle = xNewTitle;
+            m_xDiagram = xNewDiagram;
+            m_xPageBackground = xNewPageBackground;
+            m_xChartTypeManager = xChartTypeManager;
+            m_xXMLNamespaceMap = xXMLNamespaceMap;
+        }
+        
+        ModifyListenerHelper::addListener( xNewTitle, xListener );
+        ModifyListenerHelper::addListener( xNewDiagram, xListener );
+        ModifyListenerHelper::addListener( xNewPageBackground, xListener );
+        xListener.clear();
     }
-    
-    ModifyListenerHelper::addListener( xNewTitle, xListener );
-    ModifyListenerHelper::addListener( xNewDiagram, xListener );
-    ModifyListenerHelper::addListener( xNewPageBackground, xListener );
-    xListener.clear();
-    
     osl_decrementInterlockedCount(&m_refCount);
 }
 
@@ -179,7 +195,7 @@ ChartModel::~ChartModel()
 {
     OSL_TRACE( "ChartModel: DTOR called" );
     if( m_xOldModelAgg.is())
-        m_xOldModelAgg->setDelegator( 0 );
+        m_xOldModelAgg->setDelegator( NULL );
 }
 
 void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ )
@@ -518,6 +534,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr
 //-----------------------------------------------------------------
 void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException)
 {
+    Reference< XInterface > xKeepAlive( *this );
+
     //This object should release all resources and references in the
     //easiest possible manner
     //This object must notify all registered listeners using the method
@@ -530,6 +548,9 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException)
     //--release all resources and references
     //// @todo
 
+    if ( m_xDiagram.is() )
+        ModifyListenerHelper::removeListener( m_xDiagram, this );
+
     m_xDataProvider.clear();
     m_xInternalDataProvider.clear();
     m_xNumberFormatsSupplier.clear();
@@ -540,26 +561,17 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException)
     DisposeHelper::DisposeAndClear( m_xPageBackground );
     DisposeHelper::DisposeAndClear( m_xXMLNamespaceMap );
 
-    // not owner of storage
-//     if( m_xStorage.is())
-//     {
-//         Reference< lang::XComponent > xComp( m_xStorage, uno::UNO_QUERY );
-//         if( xComp.is())
-//             xComp->dispose();
-//     }
     m_xStorage.clear();
+        // just clear, don't dispose - we're not the owner
 
-    if( m_xOldModelAgg.is())
-    {
-        m_xOldModelAgg->setDelegator( 0 );
-        m_xOldModelAgg.clear();
-    }
+    if ( m_pUndoManager.is() )
+        m_pUndoManager->disposing();
+    m_pUndoManager.clear();
+        // that's important, since the UndoManager implementation delegates its ref counting to ourself.
 
     m_aControllers.disposeAndClear( lang::EventObject( static_cast< cppu::OWeakObject * >( this )));
     m_xCurrentController.clear();
 
-    m_xStorage.clear();
-    m_xParent.clear();
     DisposeHelper::DisposeAndClear( m_xRangeHighlighter );
     OSL_TRACE( "ChartModel: dispose() called" );
 }
@@ -689,6 +701,7 @@ uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes()
 uno::Reference< document::XDocumentProperties > SAL_CALL
         ChartModel::getDocumentProperties() throw (uno::RuntimeException)
 {
+    ::osl::MutexGuard aGuard( m_aModelMutex );
     if ( !m_xDocumentProperties.is() )
     {
         uno::Reference< document::XDocumentProperties > xDocProps(
@@ -700,6 +713,17 @@ uno::Reference< document::XDocumentProperties > SAL_CALL
 }
 
 //-----------------------------------------------------------------
+// document::XDocumentPropertiesSupplier
+//-----------------------------------------------------------------
+Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager(  ) throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aModelMutex );
+    if ( !m_pUndoManager.is() )
+        m_pUndoManager.set( new UndoManager( *this, m_aModelMutex ) );
+    return m_pUndoManager.get();
+}
+
+//-----------------------------------------------------------------
 // chart2::XChartDocument
 //-----------------------------------------------------------------
 
@@ -875,28 +899,15 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
             Reference< chart2::data::XDataSource > xDataSource( m_xDataProvider->createDataSource( aArguments ) );
             if( xDataSource.is() )
             {
-                // set new data
-                Reference< chart2::XChartTypeTemplate > xTemplate;
                 Reference< chart2::XDiagram > xDia( getFirstDiagram() );
-                if( xDia.is())
-                {
-                    // apply new data
-                    DiagramHelper::tTemplateWithServiceName aTemplateAndService =
-                        DiagramHelper::getTemplateForDiagram(
-                            xDia, Reference< lang::XMultiServiceFactory >( m_xChartTypeManager, uno::UNO_QUERY ));
-                    xTemplate.set( aTemplateAndService.first );
-                }
-
-                if( !xTemplate.is())
-                    xTemplate.set( impl_createDefaultChartTypeTemplate() );
-
-                if( xTemplate.is())
+                if( !xDia.is() )
                 {
-                    if( xDia.is())
-                        xTemplate->changeDiagramData( xDia, xDataSource, aArguments );
-                    else
+                    Reference< chart2::XChartTypeTemplate > xTemplate( impl_createDefaultChartTypeTemplate() );
+                    if( xTemplate.is())
                         setFirstDiagram( xTemplate->createDiagramByDataSource( xDataSource, aArguments ) );
                 }
+                else
+                    xDia->setDiagramData( xDataSource, aArguments );
             }
         }
         catch( lang::IllegalArgumentException & )
@@ -1001,18 +1012,6 @@ void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >
     setModified( sal_True );
 }
 
-void ChartModel::impl_createOldModelAgg()
-{
-    if( ! m_xOldModelAgg.is())
-    {
-        m_xOldModelAgg.set(
-            m_xContext->getServiceManager()->createInstanceWithContext(
-            CHART_CHARTAPIWRAPPER_SERVICE_NAME,
-            m_xContext ), uno::UNO_QUERY_THROW );
-        m_xOldModelAgg->setDelegator( static_cast< ::cppu::OWeakObject* >( this ));
-    }
-}
-
 // ____ XInterface (for old API wrapper) ____
 uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType )
     throw (uno::RuntimeException)
@@ -1024,7 +1023,6 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType )
         // try old API wrapper
         try
         {
-            impl_createOldModelAgg();
             if( m_xOldModelAgg.is())
                 aResult = m_xOldModelAgg->queryAggregation( aType );
         }
@@ -1263,7 +1261,6 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString
     }
     else
     {
-        impl_createOldModelAgg();
         if( m_xOldModelAgg.is() )
         {
             Any aAny = m_xOldModelAgg->queryAggregation( ::getCppuType((const uno::Reference< lang::XMultiServiceFactory >*)0) );
@@ -1291,7 +1288,6 @@ Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aResult;
 
-    impl_createOldModelAgg();
     if( m_xOldModelAgg.is())
     {
         Any aAny = m_xOldModelAgg->queryAggregation( ::getCppuType((const uno::Reference< lang::XMultiServiceFactory >*)0) );
@@ -1368,13 +1364,6 @@ void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent
         m_xParent.set( Parent, uno::UNO_QUERY );
 }
 
-// ____ XUndoManager ____
-Reference< chart2::XUndoManager > SAL_CALL ChartModel::getUndoManager()
-    throw (uno::RuntimeException)
-{
-    return m_xUndoManager;
-}
-
 // ____ XDataSource ____
 uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartModel::getDataSequences()
     throw (uno::RuntimeException)
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index b5828a0bd..c4a42da44 100755
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/document/XUndoManagerSupplier.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -46,7 +47,6 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/chart2/XUndoSupplier.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -69,6 +69,7 @@
 #include "comphelper/implbase_var.hxx"
 #endif
 #include <osl/mutex.hxx>
+#include <rtl/ref.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <svtools/grfmgr.hxx>
 
@@ -78,8 +79,6 @@
 class SvNumberFormatter;
 
 //=============================================================================
-/** this is an example implementation for the service ::com::sun::star::document::OfficeDocument
-*/
 
 namespace chart
 {
@@ -112,13 +111,15 @@ typedef ::comphelper::WeakImplHelper21<
         ,::com::sun::star::container::XChild
         ,::com::sun::star::util::XModifyListener
         ,::com::sun::star::datatransfer::XTransferable
-        ,::com::sun::star::chart2::XUndoSupplier
         ,::com::sun::star::document::XDocumentPropertiesSupplier
         ,::com::sun::star::chart2::data::XDataSource
+        ,::com::sun::star::document::XUndoManagerSupplier
         >
     ChartModel_Base;
 }
 
+class UndoManager;
+
 class ChartModel : public impl::ChartModel_Base
 {
 
@@ -134,6 +135,7 @@ private:
     ::rtl::OUString																m_aResource;
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >	m_aMediaDescriptor;
     ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocumentProperties;
+    ::rtl::Reference< UndoManager >                                             m_pUndoManager;
 
     ::cppu::OInterfaceContainerHelper                                           m_aControllers;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >	m_xCurrentController;
@@ -176,8 +178,6 @@ private:
     bool                                  m_bIsDisposed;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                                           m_xPageBackground;
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XUndoManager >
-                                          m_xUndoManager;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>     m_xXMLNamespaceMap;
 
@@ -208,7 +208,6 @@ private:
 
     void impl_killInternalData() throw( com::sun::star::util::CloseVetoException );
 
-    void impl_createOldModelAgg();
     void impl_store(
         const ::com::sun::star::uno::Sequence<
             ::com::sun::star::beans::PropertyValue >& rMediaDescriptor,
@@ -439,6 +438,10 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL
         getDocumentProperties(  ) throw (::com::sun::star::uno::RuntimeException);
 
+    // ____ document::XUndoManagerSupplier ____
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL
+        getUndoManager(  ) throw (::com::sun::star::uno::RuntimeException);
+
     //-----------------------------------------------------------------
     // ::com::sun::star::chart2::XChartDocument
     //-----------------------------------------------------------------
@@ -606,10 +609,6 @@ public:
         throw (::com::sun::star::lang::NoSupportException,
                ::com::sun::star::uno::RuntimeException);
 
-    // ____ XUndoSupplier ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XUndoManager > SAL_CALL getUndoManager()
-        throw (::com::sun::star::uno::RuntimeException);
-
     // ____ XDataSource ____ allows access to the curently used data and data ranges
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
         throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index ad8daabdc..f4946cb09 100755
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -33,6 +33,7 @@
 #include "Wall.hxx"
 #include "UserDefinedProperties.hxx"
 #include "ConfigColorScheme.hxx"
+#include "DiagramHelper.hxx"
 #include "ContainerHelper.hxx"
 #include "ThreeDHelper.hxx"
 #include "CloneHelper.hxx"
@@ -427,6 +428,22 @@ void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorSch
     fireModifyEvent();
 }
 
+void SAL_CALL Diagram::setDiagramData(
+    const Reference< chart2::data::XDataSource >& xDataSource,
+    const Sequence< beans::PropertyValue >& aArguments )
+        throw (uno::RuntimeException)
+{
+    uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( m_xContext->getServiceManager()->createInstanceWithContext(
+            C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY );
+    DiagramHelper::tTemplateWithServiceName aTemplateAndService = DiagramHelper::getTemplateForDiagram( this, xChartTypeManager );
+    uno::Reference< chart2::XChartTypeTemplate > xTemplate( aTemplateAndService.first );
+    if( !xTemplate.is() )
+        xTemplate.set( xChartTypeManager->createInstance( C2U("com.sun.star.chart2.template.Column") ), uno::UNO_QUERY );
+    if(!xTemplate.is())
+        return;
+    xTemplate->changeDiagramData( this, xDataSource, aArguments );
+}
+
 // ____ XTitled ____
 uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject()
     throw (uno::RuntimeException)
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
new file mode 100755
index 000000000..44056b118
--- /dev/null
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -0,0 +1,427 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#include "precompiled_chart2.hxx"
+
+#include "UndoManager.hxx"
+#include "ChartViewHelper.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/DisposedException.hpp>
+/** === end UNO includes === **/
+
+#include <framework/undomanagerhelper.hxx>
+#include <svl/undo.hxx>
+#include <unotools/undoopt.hxx>
+
+//......................................................................................................................
+namespace chart
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::DisposedException;
+    using ::com::sun::star::document::XUndoManager;
+    using ::com::sun::star::document::EmptyUndoStackException;
+    using ::com::sun::star::document::UndoContextNotClosedException;
+    using ::com::sun::star::document::UndoFailedException;
+    using ::com::sun::star::util::InvalidStateException;
+    using ::com::sun::star::document::XUndoAction;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::document::XUndoManagerListener;
+    using ::com::sun::star::util::NotLockedException;
+    using ::com::sun::star::lang::NoSupportException;
+    using ::com::sun::star::util::XModifyListener;
+    using ::com::sun::star::frame::XModel;
+    /** === end UNO using === **/
+
+    namespace impl
+    {
+        //==============================================================================================================
+        //= UndoManager_Impl
+        //==============================================================================================================
+        class UndoManager_Impl : public ::framework::IUndoManagerImplementation
+        {
+        public:
+            UndoManager_Impl( UndoManager& i_antiImpl, ::cppu::OWeakObject& i_parent, ::osl::Mutex& i_mutex )
+                :m_rAntiImpl( i_antiImpl )
+                ,m_rParent( i_parent )
+                ,m_rMutex( i_mutex )
+                ,m_bDisposed( false )
+                ,m_aUndoManager()
+                ,m_aUndoHelper( *this )
+            {
+                m_aUndoManager.SetMaxUndoActionCount( (sal_uInt16)SvtUndoOptions().GetUndoCount() );
+            }
+
+            virtual ~UndoManager_Impl()
+            {
+            }
+
+            // .........................................................................................................
+            // IUndoManagerImplementation
+            virtual ::osl::Mutex&               getMutex();
+            virtual ::svl::IUndoManager&        getImplUndoManager();
+            virtual Reference< XUndoManager >   getThis();
+
+            // .........................................................................................................
+            // attribute access
+            ::cppu::OWeakObject&                getParent() { return m_rParent; }
+            ::framework::UndoManagerHelper&     getUndoHelper() { return m_aUndoHelper; }
+
+            // .........................................................................................................
+            // public interface
+
+            /// is called when the owner of the UndoManager is being disposed
+            void    disposing();
+
+            /// checks whether we're already disposed, throws a DisposedException if so
+            void    checkDisposed_lck();
+
+        private:
+            UndoManager&                        m_rAntiImpl;
+            ::cppu::OWeakObject&                m_rParent;
+            ::osl::Mutex&                       m_rMutex;
+            bool                                m_bDisposed;
+
+            SfxUndoManager                      m_aUndoManager;
+            ::framework::UndoManagerHelper      m_aUndoHelper;
+        };
+
+        //--------------------------------------------------------------------------------------------------------------
+        ::osl::Mutex& UndoManager_Impl::getMutex()
+        {
+            return m_rMutex;
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        ::svl::IUndoManager& UndoManager_Impl::getImplUndoManager()
+        {
+            return m_aUndoManager;
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        Reference< XUndoManager > UndoManager_Impl::getThis()
+        {
+            return &m_rAntiImpl;
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        void UndoManager_Impl::disposing()
+        {
+            {
+                ::osl::MutexGuard aGuard( m_rMutex );
+                m_bDisposed = true;
+            }
+            m_aUndoHelper.disposing();
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        void UndoManager_Impl::checkDisposed_lck()
+        {
+            if ( m_bDisposed )
+                throw DisposedException( ::rtl::OUString(), getThis() );
+        }
+
+        //==============================================================================================================
+        //= UndoManagerMethodGuard
+        //==============================================================================================================
+        /** guard for public UNO methods of the UndoManager
+
+            The only purpose of this guard is to check for the instance being disposed already. Everything else,
+            in particular the IMutexGuard functionality required by the UndoManagerHelper class, is a dummy only,
+            as all involved classes (means we ourselves, the UndoManagerHelper, the SfxUndoManager, and the Undo actions
+            we create) are inherently thread-safe, thus need no external lock (in particular no SolarMutex!).
+        */
+        class UndoManagerMethodGuard : public ::framework::IMutexGuard
+        {
+        public:
+            UndoManagerMethodGuard( UndoManager_Impl& i_impl )
+            {
+                ::osl::MutexGuard aGuard( i_impl.getMutex() );
+                // throw if the instance is already disposed
+                i_impl.checkDisposed_lck();
+            }
+            virtual ~UndoManagerMethodGuard()
+            {
+            }
+
+            // IMutexGuard
+            virtual ::framework::IMutex& getGuardedMutex();
+
+            // IGuard
+            virtual void clear();
+            virtual void reset();
+        };
+
+        class DummyMutex : public ::framework::IMutex
+        {
+        public:
+            virtual void acquire() { }
+            virtual void release() { }
+        };
+
+        //--------------------------------------------------------------------------------------------------------------
+        ::framework::IMutex& UndoManagerMethodGuard::getGuardedMutex()
+        {
+            static DummyMutex s_aDummyMutex;
+            return s_aDummyMutex;
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        void UndoManagerMethodGuard::clear()
+        {
+            // nothing to do. This interface implementation is a dummy.
+        }
+
+        //--------------------------------------------------------------------------------------------------------------
+        void UndoManagerMethodGuard::reset()
+        {
+            // nothing to do. This interface implementation is a dummy.
+        }
+    }
+
+    //==================================================================================================================
+    //= UndoManager
+    //==================================================================================================================
+    using impl::UndoManagerMethodGuard;
+
+    //------------------------------------------------------------------------------------------------------------------
+    UndoManager::UndoManager( ::cppu::OWeakObject& i_parent, ::osl::Mutex& i_mutex )
+        :m_pImpl( new impl::UndoManager_Impl( *this, i_parent, i_mutex ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    UndoManager::~UndoManager()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::acquire() throw ()
+    {
+        m_pImpl->getParent().acquire();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::release() throw ()
+    {
+        m_pImpl->getParent().release();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void UndoManager::disposing()
+    {
+        m_pImpl->disposing();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::enterHiddenUndoContext(  ) throw (EmptyUndoStackException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().enterHiddenUndoContext( aGuard );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::leaveUndoContext(  ) throw (InvalidStateException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().leaveUndoContext( aGuard );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().addUndoAction( i_action, aGuard );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::undo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().undo( aGuard );
+
+        ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::redo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().redo( aGuard );
+
+        ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL UndoManager::isUndoPossible(  ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getUndoHelper().isUndoPossible();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL UndoManager::isRedoPossible(  ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getUndoHelper().isRedoPossible();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL UndoManager::getCurrentUndoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getUndoHelper().getCurrentUndoActionTitle();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL UndoManager::getCurrentRedoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getUndoHelper().getCurrentRedoActionTitle();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllUndoActionTitles(  ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getUndoHelper().getAllUndoActionTitles();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllRedoActionTitles(  ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getUndoHelper().getAllRedoActionTitles();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::clear(  ) throw (UndoContextNotClosedException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().clear( aGuard );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::clearRedo(  ) throw (UndoContextNotClosedException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().clearRedo( aGuard );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::reset(  ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().reset( aGuard );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().addUndoManagerListener( i_listener );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().removeUndoManagerListener( i_listener );
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::lock(  ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().lock();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::unlock(  ) throw (NotLockedException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().unlock();
+    }
+    
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL UndoManager::isLocked(  ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getUndoHelper().isLocked();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XInterface > SAL_CALL UndoManager::getParent(  ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        return *&m_pImpl->getParent();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        (void)i_parent;
+        throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().addModifyListener( i_listener );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException)
+    {
+        UndoManagerMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getUndoHelper().removeModifyListener( i_listener );
+    }
+
+//......................................................................................................................
+} // namespace chart
+//......................................................................................................................
diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx
new file mode 100755
index 000000000..07091207e
--- /dev/null
+++ b/chart2/source/model/main/UndoManager.hxx
@@ -0,0 +1,109 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef CHART2_UNDOMANAGER_HXX
+#define CHART2_UNDOMANAGER_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/document/XUndoManager.hpp>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <com/sun/star/container/XChild.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase2.hxx>
+
+#include <boost/scoped_ptr.hpp>
+
+//......................................................................................................................
+namespace chart
+{
+//......................................................................................................................
+
+    namespace impl
+    {
+        class UndoManager_Impl;
+        typedef ::cppu::ImplHelper2 <   ::com::sun::star::document::XUndoManager
+                                    ,   ::com::sun::star::util::XModifyBroadcaster
+                                    >   UndoManager_Base;
+    }
+
+    //==================================================================================================================
+    //= UndoManager
+    //==================================================================================================================
+    class UndoManager : public impl::UndoManager_Base
+    {
+    public:
+        UndoManager( ::cppu::OWeakObject& i_parent, ::osl::Mutex& i_mutex );
+        virtual ~UndoManager();
+
+        // XInterface
+        virtual void SAL_CALL acquire(  ) throw ();
+        virtual void SAL_CALL release(  ) throw ();
+
+        // XComponent equivalents
+        void disposing();
+
+        // XUndoManager
+        virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL enterHiddenUndoContext(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL leaveUndoContext(  ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL undo(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL redo(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isUndoPossible(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isRedoPossible(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL clear(  ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL clearRedo(  ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL reset(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XLockable (base of XUndoManager)
+        virtual void SAL_CALL lock(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL unlock(  ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isLocked(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XChild (base of XUndoManager)
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+
+        // XModifyBroadcaster
+        virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    private:
+        ::boost::scoped_ptr< impl::UndoManager_Impl >   m_pImpl;
+    };
+
+//......................................................................................................................
+} // namespace chart
+//......................................................................................................................
+
+#endif // CHART2_UNDOMANAGER_HXX
diff --git a/chart2/source/model/main/makefile.mk b/chart2/source/model/main/makefile.mk
index 8e963dfa0..5ca78bbde 100644
--- a/chart2/source/model/main/makefile.mk
+++ b/chart2/source/model/main/makefile.mk
@@ -60,6 +60,7 @@ SLOFILES=	\
     $(SLO)$/StockBar.obj \
     $(SLO)$/Title.obj \
     $(SLO)$/Wall.obj \
+    $(SLO)$/UndoManager.obj \
     $(SLO)$/_serviceregistration_model.obj
 
 # --- Targets -----------------------------------------------------------------
diff --git a/chart2/source/model/makefile.mk b/chart2/source/model/makefile.mk
index 52cc85c10..25d4b1b29 100644
--- a/chart2/source/model/makefile.mk
+++ b/chart2/source/model/makefile.mk
@@ -79,7 +79,8 @@ SHL1STDLIBS=	$(CHARTTOOLS) 		\
                 $(SVLLIB)			\
                 $(SVTOOLLIB)		\
                 $(SALLIB)			\
-                $(UCBHELPERLIB)
+                $(UCBHELPERLIB)     \
+                $(FWELIB)           \
 
 #--------exports
 
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index bc256590f..631273774 100644..100755
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -77,16 +77,17 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
 
     Reference< data::XLabeledDataSequence > xCategories;
     bool bHasCategories = HasCategories( aArguments, aData );
+    bool bUseCategoriesAsX = UseCategoriesAsX( aArguments );
     
-    bool bHasXValues = false;
+    bool bSetXValues = false;
     sal_Int32 nDataSeqCount = aData.getLength();
 
-    bHasXValues = bHasCategories ? ( (nDataSeqCount-1) > 2 && (nDataSeqCount-1) % 2 != 0 )
+    bSetXValues = bHasCategories ? ( (nDataSeqCount-1) > 2 && (nDataSeqCount-1) % 2 != 0 )
                                  :( nDataSeqCount > 2 && nDataSeqCount % 2 != 0 );
 
     bool bCategoriesUsed = false;  
     bool bNextIsYValues = bHasCategories ? nDataSeqCount>2 : nDataSeqCount>1;
-    for( sal_Int32 nDataIdx = 0; nDataIdx < aData.getLength(); ++nDataIdx )
+    for( sal_Int32 nDataIdx = 0; nDataIdx < nDataSeqCount; ++nDataIdx )
     {
         try
         {
@@ -94,10 +95,17 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
             {
                 xCategories.set( aData[nDataIdx] );
                 if( xCategories.is())
+                {
                     SetRole( xCategories->getValues(), C2U("categories"));
+                    if( bUseCategoriesAsX )
+                    {
+                        bSetXValues = false;
+                        bNextIsYValues = nDataSeqCount > 2;
+                    }
+                }
                 bCategoriesUsed = true;
             }
-            else if( !xValuesX.is() && bHasXValues )
+            else if( !xValuesX.is() && bSetXValues )
             {
                 xValuesX.set( aData[nDataIdx] );
                 if( xValuesX.is())
@@ -115,7 +123,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
                 aSizeValuesVector.push_back( aData[nDataIdx] );
                 if( aData[nDataIdx].is())
                     SetRole( aData[nDataIdx]->getValues(), C2U("values-size"));
-                bNextIsYValues = true;
+                bNextIsYValues = (nDataSeqCount-(nDataIdx+1)) >= 2;//two or more left
             }
         }
         catch( uno::Exception & ex )
@@ -132,26 +140,19 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
     Reference< data::XLabeledDataSequence > xClonedXValues = xValuesX;
     Reference< util::XCloneable > xCloneableX( xValuesX, uno::UNO_QUERY );
 
-    for( size_t nCount = 0; nCount < aSizeValuesVector.size(); ++nCount, ++nSeriesIndex )
+    for( size_t nN = 0; nN < aSizeValuesVector.size(); ++nN, ++nSeriesIndex )
     {
-        sal_Int32 nDataSequenceCount = 2;
-        if( xValuesX.is() )
-            nDataSequenceCount = 3;
-        else if( aYValuesVector.empty() )
-            nDataSequenceCount = 1;
-
-        Sequence< Reference< data::XLabeledDataSequence > > aNewData( nDataSequenceCount );
-        sal_Int32 nDataIndex = 0;
+        vector< Reference< data::XLabeledDataSequence > > aNewData;
         if( xValuesX.is() )
         {
-            if( nCount > 0 && xCloneableX.is() )
+            if( nN > 0 && xCloneableX.is() )
                 xClonedXValues.set( xCloneableX->createClone(), uno::UNO_QUERY );
-            aNewData[nDataIndex++] = xClonedXValues;
+            aNewData.push_back( xClonedXValues );
         }
-        if( aYValuesVector.size() > nCount )
-            aNewData[nDataIndex++] = aYValuesVector[nCount];
-        if( aSizeValuesVector.size() > nCount )
-            aNewData[nDataIndex++] = aSizeValuesVector[nCount];
+        if( aYValuesVector.size() > nN )
+            aNewData.push_back( aYValuesVector[nN] ); 
+        if( aSizeValuesVector.size() > nN )
+            aNewData.push_back( aSizeValuesVector[nN] );
 
         Reference< XDataSeries > xSeries;
         if( nSeriesIndex < aSeriesToReUse.getLength())
@@ -161,7 +162,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
         OSL_ASSERT( xSeries.is() );
         Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
         OSL_ASSERT( xSink.is() );
-        xSink->setData( aNewData );
+        xSink->setData( ContainerHelper::ContainerToSequence( aNewData ) );
 
         aSeriesVec.push_back( xSeries );
     }
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index e25e71abc..8671145d8 100755
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -643,17 +643,30 @@ void ChartTypeTemplate::adaptScales(
             sal_Int32 nDim( xCooSys->getDimension());
             if( nDim > 0 )
             {
-                const sal_Int32 nMaxIndex = xCooSys->getMaximumAxisIndexByDimension(0);
+                const sal_Int32 nDimensionX = 0;
+                const sal_Int32 nMaxIndex = xCooSys->getMaximumAxisIndexByDimension(nDimensionX);
                 for(sal_Int32 nI=0; nI<=nMaxIndex; ++nI)
                 {
-                    Reference< XAxis > xAxis( xCooSys->getAxisByDimension(0,nI) );
+                    Reference< XAxis > xAxis( xCooSys->getAxisByDimension(nDimensionX,nI) );
                     if( xAxis.is())
                     {
                         ScaleData aData( xAxis->getScaleData() );
                         aData.Categories = xCategories;
-                        aData.AxisType = bSupportsCategories ? AxisType::CATEGORY : AxisType::REALNUMBER;
-                        if( bSupportsCategories )
-                            AxisHelper::removeExplicitScaling( aData );
+                        if(bSupportsCategories)
+                        {
+                            
+                            Reference< XChartType > xChartType( getChartTypeForNewSeries(Sequence< Reference< XChartType > >() ));
+                            bool bSupportsDates = ::chart::ChartTypeHelper::isSupportingDateAxis( xChartType, 2, nDimensionX );
+                            if( aData.AxisType != AxisType::CATEGORY && ( aData.AxisType != AxisType::DATE || !bSupportsDates) )
+                            {
+                                aData.AxisType = AxisType::CATEGORY;
+                                aData.AutoDateAxis = true;
+                                AxisHelper::removeExplicitScaling( aData );
+                            }
+                        }
+                        else
+                            aData.AxisType = AxisType::REALNUMBER;
+
                         xAxis->setScaleData( aData );
                     }
                 }
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 866c74615..d361058b1 100755
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -390,6 +390,14 @@ bool DataInterpreter::HasCategories(
     return bHasCategories;
 }
 
+bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & rArguments )
+{
+    bool bUseCategoriesAsX = true;
+    if( rArguments.getLength() > 0 )
+        GetProperty( rArguments, C2U(("UseCategoriesAsX"))) >>= bUseCategoriesAsX;
+    return bUseCategoriesAsX;
+}
+
 // ------------------------------------------------------------
 
 Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index 70f5fd65d..765cb40f6 100644..100755
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -73,6 +73,10 @@ public:
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XLabeledDataSequence > > & rData );
 
+    static bool UseCategoriesAsX(
+        const ::com::sun::star::uno::Sequence<
+            ::com::sun::star::beans::PropertyValue > & rArguments );
+
 protected:
     // ____ XDataInterpreter ____
     virtual ::com::sun::star::chart2::InterpretedData SAL_CALL interpretDataSource(
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 19f24a0cf..f25bad0af 100644..100755
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -75,11 +75,12 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
     vector< Reference< data::XLabeledDataSequence > > aSequencesVec;
 
     Reference< data::XLabeledDataSequence > xCategories;
-    // check for categories. If true, the the categories bet parked in the axis scale, but not used via setting the Axistype to Not CATEGORY
     bool bHasCategories = HasCategories( aArguments, aData );
+    bool bUseCategoriesAsX = UseCategoriesAsX( aArguments );
     
     // parse data
     bool bCategoriesUsed = false;
+    bool bSetXValues = aData.getLength()>(bCategoriesUsed?2:1);
     for( sal_Int32 nDataIdx= 0; nDataIdx < aData.getLength(); ++nDataIdx )
     {
         try
@@ -88,10 +89,14 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
             {
                 xCategories.set( aData[nDataIdx] );
                 if( xCategories.is())
+                {
                     SetRole( xCategories->getValues(), C2U("categories"));
+                    if( bUseCategoriesAsX )
+                        bSetXValues = false;
+                }
                 bCategoriesUsed = true;
             }
-            else if( !xValuesX.is() && (aData.getLength()>(bCategoriesUsed?2:1)) )
+            else if( !xValuesX.is() && bSetXValues )
             {
                 xValuesX.set( aData[nDataIdx] );
                 if( xValuesX.is())
@@ -123,23 +128,15 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
 
     for( ;aSequencesVecIt != aSequencesVec.end(); ++aSequencesVecIt, ++nSeriesIndex )
     {
-        Sequence< Reference< data::XLabeledDataSequence > > aNewData(xValuesX.is()?2:1);
-        if( aSequencesVecIt != aSequencesVec.begin() &&
-            xCloneable.is() )
-        {
-            xClonedXValues.set( xCloneable->createClone(), uno::UNO_QUERY );
-        }
+        vector< Reference< data::XLabeledDataSequence > > aNewData;
 
+        if( aSequencesVecIt != aSequencesVec.begin() && xCloneable.is() )
+            xClonedXValues.set( xCloneable->createClone(), uno::UNO_QUERY );
         if( xValuesX.is() )
-        {
-            aNewData[0] = xClonedXValues;
-            aNewData[1] = (*aSequencesVecIt);
-        }
-        else
-        {
-            aNewData[0] = (*aSequencesVecIt);
-        }
+            aNewData.push_back( xClonedXValues );
 
+        aNewData.push_back( *aSequencesVecIt );
+        
         Reference< XDataSeries > xSeries;
         if( nSeriesIndex < aSeriesToReUse.getLength())
             xSeries.set( aSeriesToReUse[nSeriesIndex] );
@@ -148,7 +145,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
         OSL_ASSERT( xSeries.is() );
         Reference< data::XDataSink > xSink( xSeries, uno::UNO_QUERY );
         OSL_ASSERT( xSink.is() );
-        xSink->setData( aNewData );
+        xSink->setData( ContainerHelper::ContainerToSequence( aNewData ) );
 
         aSeriesVec.push_back( xSeries );
     }
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index ebd4ebe0f..4484619ad 100755
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -38,7 +38,10 @@
 #include "servicenames_coosystems.hxx"
 #include "DataSeriesHelper.hxx"
 #include "Scaling.hxx"
+#include "ChartModelHelper.hxx"
+#include "DataSourceHelper.hxx"
 
+#include <tools/debug.hxx>
 #include <unotools/saveopt.hxx>
 
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
@@ -50,6 +53,8 @@
 
 // header for class OUStringBuffer
 #include <rtl/ustrbuf.hxx>
+#include <rtl/math.hxx>
+
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 
@@ -78,6 +83,8 @@ ScaleData AxisHelper::createDefaultScale()
 {
     ScaleData aScaleData;
     aScaleData.AxisType = chart2::AxisType::REALNUMBER;
+    aScaleData.AutoDateAxis = true;
+    aScaleData.ShiftedCategoryPosition = false;//this is adapted in the view code currently
     Sequence< SubIncrement > aSubIncrements(1);
     aSubIncrements[0] = SubIncrement();
     aScaleData.IncrementData.SubIncrements = aSubIncrements;
@@ -89,6 +96,9 @@ void AxisHelper::removeExplicitScaling( ScaleData& rScaleData )
     uno::Any aEmpty;
     rScaleData.Minimum = rScaleData.Maximum = rScaleData.Origin = aEmpty;
     rScaleData.Scaling = 0;
+    ScaleData aDefaultScale( createDefaultScale() );
+    rScaleData.IncrementData = aDefaultScale.IncrementData;
+    rScaleData.TimeIncrement = aDefaultScale.TimeIncrement;
 }
 
 bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
@@ -100,6 +110,227 @@ bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
     return bReturn;
 }
 
+chart2::ScaleData AxisHelper::getDateCheckedScale( const Reference< chart2::XAxis >& xAxis, const Reference< frame::XModel >& xChartModel )
+{
+    DBG_ASSERT(xChartModel.is(),"missing chart model");
+    ScaleData aScale = xAxis->getScaleData();
+    Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) );
+    if( aScale.AutoDateAxis && aScale.AxisType == AxisType::CATEGORY )
+    {
+        sal_Int32 nDimensionIndex=0; sal_Int32 nAxisIndex=0;
+        AxisHelper::getIndicesForAxis(xAxis, xCooSys, nDimensionIndex, nAxisIndex );
+        bool bChartTypeAllowsDateAxis = ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( xCooSys, 0 ), 2, nDimensionIndex );
+        if( bChartTypeAllowsDateAxis )
+            aScale.AxisType = AxisType::DATE;
+    }
+    if( aScale.AxisType == AxisType::DATE )
+    {
+        ExplicitCategoriesProvider aExplicitCategoriesProvider( xCooSys,xChartModel );
+        if( !aExplicitCategoriesProvider.isDateAxis() )
+            aScale.AxisType = AxisType::CATEGORY;
+    }
+    return aScale;
+}
+
+void AxisHelper::checkDateAxis( chart2::ScaleData& rScale, ExplicitCategoriesProvider* pExplicitCategoriesProvider, bool bChartTypeAllowsDateAxis )
+{
+    if( rScale.AutoDateAxis && rScale.AxisType == AxisType::CATEGORY && bChartTypeAllowsDateAxis )
+    {
+        rScale.AxisType = AxisType::DATE;
+        removeExplicitScaling( rScale );
+    }
+    if( rScale.AxisType == AxisType::DATE && (!pExplicitCategoriesProvider || !pExplicitCategoriesProvider->isDateAxis()) )
+    {
+        rScale.AxisType = AxisType::CATEGORY;
+        removeExplicitScaling( rScale );
+    }
+}
+
+sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
+                  const Reference< chart2::XAxis >& xAxis
+                , const Reference< chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem
+                , const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier
+                , bool bSearchForParallelAxisIfNothingIsFound )
+{
+    sal_Int32 nNumberFormatKey(0);
+    bool bNumberFormatKeyFoundViaAttachedData = false;
+    sal_Int32 nAxisIndex = 0;
+    sal_Int32 nDimensionIndex = 1;
+    AxisHelper::getIndicesForAxis( xAxis, xCorrespondingCoordinateSystem, nDimensionIndex, nAxisIndex );
+    Reference< chart2::XChartDocument > xChartDoc( xNumberFormatsSupplier, uno::UNO_QUERY );
+
+    Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
+    if( xProp.is() && !( xProp->getPropertyValue( C2U( "NumberFormat" ) ) >>= nNumberFormatKey ) )
+    {
+        bool bFormatSet = false;
+        //check wether we have a percent scale -> use percent format
+        if( xNumberFormatsSupplier.is() )
+        {
+            ScaleData aData = AxisHelper::getDateCheckedScale( xAxis, Reference< frame::XModel >( xNumberFormatsSupplier, uno::UNO_QUERY ) );
+            if( aData.AxisType==AxisType::PERCENT )
+            {
+                sal_Int32 nPercentFormat = DiagramHelper::getPercentNumberFormat( xNumberFormatsSupplier );
+                if( nPercentFormat != -1 )
+                {
+                    nNumberFormatKey = nPercentFormat;
+                    bFormatSet = true;
+                }
+            }
+            else if( aData.AxisType==AxisType::DATE )
+            {
+                if( aData.Categories.is() )
+                {
+                    Reference< data::XDataSequence > xSeq( aData.Categories->getValues());
+                    if( xSeq.is() && !( xChartDoc.is() && xChartDoc->hasInternalDataProvider()) )
+                        nNumberFormatKey = xSeq->getNumberFormatKeyByIndex( -1 );
+                    else
+                        nNumberFormatKey = DiagramHelper::getDateNumberFormat( xNumberFormatsSupplier );
+                    bFormatSet = true;
+                }
+            }
+            else if( xChartDoc.is() && xChartDoc->hasInternalDataProvider() && nDimensionIndex == 0 ) //maybe date axis
+            {
+                Reference< chart2::XDiagram > xDiagram( xChartDoc->getFirstDiagram() );
+                if( DiagramHelper::isSupportingDateAxis( xDiagram ) )
+                {
+                    nNumberFormatKey = DiagramHelper::getDateNumberFormat( xNumberFormatsSupplier );
+                }
+                else
+                {
+                    Reference< data::XDataSource > xSource( DataSourceHelper::getUsedData( xChartDoc ) );
+                    if( xSource.is() )
+                    {
+                        ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues(
+                            DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), C2U("values-x"), true ) );
+                        if( aXValues.empty() )
+                        {
+                            Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) );
+                            if( xCategories.is() )
+                            {
+                                Reference< data::XDataSequence > xSeq( xCategories->getValues());
+                                if( xSeq.is() )
+                                {
+                                    bool bHasValidDoubles = false;
+                                    double fTest=0.0;
+                                    Sequence< uno::Any > aCats( xSeq->getData() );
+                                    sal_Int32 nCount = aCats.getLength();
+                                    for( sal_Int32 i = 0; i < nCount; ++i )
+                                    {
+                                        if( (aCats[i]>>=fTest) && !::rtl::math::isNan(fTest) )
+                                        {
+                                            bHasValidDoubles=true;
+                                            break;
+                                        }
+                                    }
+                                    if( bHasValidDoubles )
+                                        nNumberFormatKey = DiagramHelper::getDateNumberFormat( xNumberFormatsSupplier );
+                                }
+                            }
+                        }
+                    }
+                }
+                bFormatSet = true;
+            }
+        }
+
+        if( !bFormatSet )
+        {
+            typedef ::std::map< sal_Int32, sal_Int32 > tNumberformatFrequency;
+            tNumberformatFrequency aKeyMap;
+
+            try
+            {
+                Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW );
+                if( xCTCnt.is() )
+                {
+                    ::rtl::OUString aRoleToMatch;
+                    if( nDimensionIndex == 0 )
+                        aRoleToMatch = C2U("values-x");
+                    Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes());
+                    for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx )
+                    {
+                        if( nDimensionIndex != 0 )
+                            aRoleToMatch = ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( aChartTypes[nCTIdx] );
+                        Reference< XDataSeriesContainer > xDSCnt( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
+                        Sequence< Reference< XDataSeries > > aDataSeriesSeq( xDSCnt->getDataSeries());
+                        for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aDataSeriesSeq.getLength(); ++nSeriesIdx )
+                        {
+                            Reference< chart2::XDataSeries > xDataSeries(aDataSeriesSeq[nSeriesIdx]);
+                            Reference< data::XDataSource > xSource( xDataSeries, uno::UNO_QUERY_THROW );
+
+                            if( nDimensionIndex == 1 )
+                            {
+                                //only take those series into accoutn that are attached to this axis
+                                sal_Int32 nAttachedAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
+                                if( nAttachedAxisIndex != nAxisIndex )
+                                    continue;
+                            }
+
+                            Reference< data::XLabeledDataSequence > xLabeledSeq(
+                                DataSeriesHelper::getDataSequenceByRole( xSource, aRoleToMatch ) );
+
+                            if( !xLabeledSeq.is() && nDimensionIndex==0 )
+                            {
+                                ScaleData aData = xAxis->getScaleData();
+                                xLabeledSeq = aData.Categories;
+                            }
+                            
+                            if( xLabeledSeq.is() )
+                            {
+                                Reference< data::XDataSequence > xSeq( xLabeledSeq->getValues());
+                                if( xSeq.is() )
+                                {
+                                    sal_Int32 nKey = xSeq->getNumberFormatKeyByIndex( -1 );
+                                    // initialize the value
+                                    if( aKeyMap.find( nKey ) == aKeyMap.end())
+                                        aKeyMap[ nKey ] = 0;
+                                    // increase frequency
+                                    aKeyMap[ nKey ] = (aKeyMap[ nKey ] + 1);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch( const uno::Exception & ex )
+            {
+                ASSERT_EXCEPTION( ex );
+            }
+
+            if( ! aKeyMap.empty())
+            {
+                sal_Int32 nMaxFreq = 0;
+                // find most frequent key
+                for( tNumberformatFrequency::const_iterator aIt = aKeyMap.begin();
+                    aIt != aKeyMap.end(); ++aIt )
+                {
+                    OSL_TRACE( "NumberFormatKey %d appears %d times", (*aIt).first, (*aIt).second );
+                    // all values must at least be 1
+                    if( (*aIt).second > nMaxFreq )
+                    {
+                        nNumberFormatKey = (*aIt).first;
+                        bNumberFormatKeyFoundViaAttachedData = true;
+                        nMaxFreq = (*aIt).second;
+                    }
+                }
+            }
+
+            if( bSearchForParallelAxisIfNothingIsFound )
+            {
+                //no format is set to this axis and no data is set to this axis
+                //--> try to obtain the format from the parallel y-axis
+                if( !bNumberFormatKeyFoundViaAttachedData && nDimensionIndex == 1 )
+                {
+                    sal_Int32 nParallelAxisIndex = (nAxisIndex==1) ?0 :1;
+                    Reference< XAxis > xParallelAxis( AxisHelper::getAxis( 1, nParallelAxisIndex, xCorrespondingCoordinateSystem ) );
+                    nNumberFormatKey = AxisHelper::getExplicitNumberFormatKeyForAxis( xParallelAxis, xCorrespondingCoordinateSystem, xNumberFormatsSupplier, false );
+                }
+            }
+        }
+    }
+    return nNumberFormatKey;
+}
+
 Reference< XAxis > AxisHelper::createAxis(
           sal_Int32 nDimensionIndex
         , sal_Int32 nAxisIndex // 0==main or 1==secondary axis
@@ -131,6 +362,7 @@ Reference< XAxis > AxisHelper::createAxis(
                 ScaleData aMainScale = xMainAxis->getScaleData();
 
                 aScale.AxisType = aMainScale.AxisType;
+                aScale.AutoDateAxis = aMainScale.AutoDateAxis;
                 aScale.Categories = aMainScale.Categories;
                 aScale.Orientation = aMainScale.Orientation;
 
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index f30fb1b38..27598d76e 100755
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -415,13 +415,34 @@ bool ChartTypeHelper::isSupportingAxisPositioning( const uno::Reference< chart2:
     return true;
 }
 
-bool ChartTypeHelper::shiftTicksAtXAxisPerDefault( const uno::Reference< chart2::XChartType >& xChartType )
+bool ChartTypeHelper::isSupportingDateAxis( const uno::Reference< chart2::XChartType >& xChartType, sal_Int32 /*nDimensionCount*/, sal_Int32 nDimensionIndex )
+{
+    if( nDimensionIndex!=0 )
+        return false;
+    if( xChartType.is() )
+    {
+        sal_Int32 nType = ChartTypeHelper::getAxisType( xChartType, nDimensionIndex );
+        if( nType != AxisType::CATEGORY )
+            return false;
+        rtl::OUString aChartTypeName = xChartType->getChartType();
+        if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
+            return false;
+        if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
+            return false;
+        if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) )
+            return false;
+    }
+    return true;
+}
+
+bool ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( const uno::Reference< chart2::XChartType >& xChartType )
 {
     if(xChartType.is())
     {
         rtl::OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
-            || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
+            || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR)
+            || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
             return true;
     }
     return false;
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 0f7aed78a..ecf89f237 100644..100755
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -461,25 +461,8 @@ void DataSourceHelper::setRangeSegmentation(
     if( !xDataSource.is() )
         return;
 
-    DiagramHelper::tTemplateWithServiceName aTemplateAndService =
-        DiagramHelper::getTemplateForDiagram( xDiagram, xTemplateFactory );
-
-    rtl::OUString aServiceName( aTemplateAndService.second );
-    uno::Reference< chart2::XChartTypeTemplate > xTemplate = aTemplateAndService.first;
-
-    if( !xTemplate.is() )
-    {
-        if( aServiceName.getLength() == 0 )
-            aServiceName = C2U("com.sun.star.chart2.template.Column");
-        xTemplate.set( xTemplateFactory->createInstance( aServiceName ), uno::UNO_QUERY );
-    }
-    if( !xTemplate.is() )
-        return;
-
-    // /-- locked controllers
     ControllerLockGuard aCtrlLockGuard( xChartModel );
-    xTemplate->changeDiagramData( xDiagram, xDataSource, aArguments );
-    // \-- locked controllers
+    xDiagram->setDiagramData( xDataSource, aArguments );
 }
 
 Sequence< OUString > DataSourceHelper::getRangesFromLabeledDataSequence(
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 2cbe470d4..07fe10278 100755
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -42,10 +42,12 @@
 #include "ChartModelHelper.hxx"
 #include "RelativePositionHelper.hxx"
 #include "ControllerLockGuard.hxx"
+#include "NumberFormatterWrapper.hxx"
 
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/XDiagramPositioning.hpp>
+#include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
@@ -57,10 +59,15 @@
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart2/RelativeSize.hpp>
 
+#include <com/sun/star/util/NumberFormat.hpp>
+#include <com/sun/star/util/XModifiable.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+
 #include <unotools/saveopt.hxx>
 #include <rtl/math.hxx>
-
-#include <com/sun/star/util/XModifiable.hpp>
+#include <svl/zformat.hxx>
+// header for class Application
+#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -68,7 +75,9 @@ using namespace ::std;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
 using ::rtl::OUString;
+using ::com::sun::star::chart2::XAnyDescriptionAccess;
 
 namespace chart
 {
@@ -864,7 +873,7 @@ bool DiagramHelper::isCategoryDiagram(
                     if( xAxis.is())
                     {
                         ScaleData aScaleData = xAxis->getScaleData();
-                        if( aScaleData.AxisType == AxisType::CATEGORY )
+                        if( aScaleData.AxisType == AxisType::CATEGORY || aScaleData.AxisType == AxisType::DATE )
                             return true;
                     }
                 }
@@ -902,7 +911,7 @@ void DiagramHelper::setCategoriesToDiagram(
             {
                 if( bCategoryAxis )
                     aScaleData.AxisType = AxisType::CATEGORY;
-                else if( aScaleData.AxisType == AxisType::CATEGORY )
+                else if( aScaleData.AxisType == AxisType::CATEGORY || aScaleData.AxisType == AxisType::DATE )
                     aScaleData.AxisType = AxisType::REALNUMBER;
             }
             xCatAxis->setScaleData( aScaleData );
@@ -1018,6 +1027,203 @@ Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
     return aRet;
 }
 
+namespace
+{
+void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, const Reference< XAxis >& xAxis )
+{
+    if( !xAxis.is() )
+        return;
+    if( !xChartDoc.is() )
+        return;
+
+    ScaleData aScale( xAxis->getScaleData() );
+    if( xChartDoc->hasInternalDataProvider() )
+    {
+        //remove all content the is not of type double and remove multiple level
+        Reference< XAnyDescriptionAccess > xDataAccess( xChartDoc->getDataProvider(), uno::UNO_QUERY );
+        if( xDataAccess.is() )
+        {
+            Sequence< Sequence< Any > > aAnyCategories( xDataAccess->getAnyRowDescriptions() );
+            double fTest = 0.0;
+            double fNan = 0.0;
+            ::rtl::math::setNan( & fNan );
+            sal_Int32 nN = aAnyCategories.getLength();
+            for( ; nN--; )
+            {
+                Sequence< Any >& rCat = aAnyCategories[nN];
+                if( rCat.getLength() > 1 )
+                    rCat.realloc(1);
+                if( rCat.getLength() == 1 )
+                {
+                    Any& rAny = rCat[0];
+                    if( !(rAny>>=fTest) )
+                    {
+                        rAny = uno::makeAny(fNan);
+                    }
+                }
+            }
+            xDataAccess->setAnyRowDescriptions( aAnyCategories );
+        }
+        //check the numberformat at the axis
+        Reference< beans::XPropertySet > xAxisProps( xAxis, uno::UNO_QUERY );
+        Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( xChartDoc, uno::UNO_QUERY );
+        if( xAxisProps.is() && xNumberFormatsSupplier.is() )
+        {
+            sal_Int32 nNumberFormat = -1;
+            xAxisProps->getPropertyValue( C2U("NumberFormat") ) >>= nNumberFormat;
+
+            Reference< util::XNumberFormats > xNumberFormats = Reference< util::XNumberFormats >( xNumberFormatsSupplier->getNumberFormats() );
+            if( xNumberFormats.is() )
+            {
+                Reference< beans::XPropertySet > xKeyProps;
+                try
+                {
+                    xKeyProps = xNumberFormats->getByKey( nNumberFormat );
+                }
+                catch( uno::Exception & ex )
+                {
+                    ASSERT_EXCEPTION( ex );
+                }
+                sal_Int32 nType = util::NumberFormat::UNDEFINED;
+                if( xKeyProps.is() )
+                    xKeyProps->getPropertyValue( C2U("Type") ) >>= nType;
+                if( !( nType & util::NumberFormat::DATE ) )
+                {
+                    //set a date format to the axis
+                    sal_Bool bCreate = sal_True;
+                    const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
+                    Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::DATE,  rLocaleDataWrapper.getLocale(), bCreate );
+                    if( aKeySeq.getLength() )
+                    {
+                        xAxisProps->setPropertyValue( C2U("NumberFormat"), uno::makeAny(aKeySeq[0]) );
+                    }
+                }
+            }
+        }
+    }
+    if( aScale.AxisType != chart2::AxisType::DATE )
+        AxisHelper::removeExplicitScaling( aScale );
+    aScale.AxisType = chart2::AxisType::DATE;
+    xAxis->setScaleData( aScale );
+}
+
+void lcl_switchToTextCategories( const Reference< XChartDocument >& xChartDoc, const Reference< XAxis >& xAxis )
+{
+    if( !xAxis.is() )
+        return;
+    if( !xChartDoc.is() )
+        return;
+    ScaleData aScale( xAxis->getScaleData() );
+    if( aScale.AxisType != chart2::AxisType::CATEGORY )
+        AxisHelper::removeExplicitScaling( aScale );
+    //todo migrate dates to text?
+    aScale.AxisType = chart2::AxisType::CATEGORY;
+    aScale.AutoDateAxis = false;
+    xAxis->setScaleData( aScale );
+}
+
+}
+
+void DiagramHelper::switchToDateCategories( const Reference< XChartDocument >& xChartDoc )
+{
+    Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY );
+    if(xChartModel.is())
+    {
+        ControllerLockGuard aCtrlLockGuard( xChartModel );
+
+        Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) );
+        if( xCooSys.is() )
+        {
+            Reference< XAxis > xAxis( xCooSys->getAxisByDimension(0,0) );
+            lcl_switchToDateCategories( xChartDoc, xAxis );
+        }
+    }
+}
+
+void DiagramHelper::switchToTextCategories( const Reference< XChartDocument >& xChartDoc )
+{
+    Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY );
+    if(xChartModel.is())
+    {
+        ControllerLockGuard aCtrlLockGuard( xChartModel );
+
+        Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) );
+        if( xCooSys.is() )
+        {
+            Reference< XAxis > xAxis( xCooSys->getAxisByDimension(0,0) );
+            lcl_switchToTextCategories( xChartDoc, xAxis );
+        }
+    }
+}
+
+bool DiagramHelper::isSupportingDateAxis( const Reference< chart2::XDiagram >& xDiagram )
+{
+    return ::chart::ChartTypeHelper::isSupportingDateAxis(
+            DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), DiagramHelper::getDimension( xDiagram ), 0 );
+}
+
+bool DiagramHelper::isDateNumberFormat( sal_Int32 nNumberFormat, const Reference< util::XNumberFormats >& xNumberFormats )
+{
+    bool bIsDate = false;
+    if( !xNumberFormats.is() )
+        return bIsDate;
+
+    Reference< beans::XPropertySet > xKeyProps = xNumberFormats->getByKey( nNumberFormat );
+    if( xKeyProps.is() )
+    {
+        sal_Int32 nType = util::NumberFormat::UNDEFINED;
+        xKeyProps->getPropertyValue( C2U("Type") ) >>= nType;
+        bIsDate = nType & util::NumberFormat::DATE;
+    }
+    return bIsDate;
+}
+
+sal_Int32 DiagramHelper::getDateNumberFormat( const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier )
+{
+    sal_Int32 nRet=-1;
+    Reference< util::XNumberFormats > xNumberFormats( xNumberFormatsSupplier->getNumberFormats() );
+    if( xNumberFormats.is() )
+    {
+        sal_Bool bCreate = sal_True;
+        const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
+        Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::DATE, 
+            rLocaleDataWrapper.getLocale(), bCreate );
+        if( aKeySeq.getLength() )
+        {
+            nRet = aKeySeq[0];
+        }
+    }
+
+    //try to get a date format with full year display
+    NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier );
+    SvNumberFormatter* pNumFormatter = aNumberFormatterWrapper.getSvNumberFormatter();
+    if( pNumFormatter )
+    {
+        const SvNumberformat* pFormat = pNumFormatter->GetEntry( nRet );
+        if( pFormat )
+            nRet = pNumFormatter->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, pFormat->GetLanguage() );
+    }
+    return nRet;
+}
+
+sal_Int32 DiagramHelper::getPercentNumberFormat( const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier )
+{
+    sal_Int32 nRet=-1;
+    Reference< util::XNumberFormats > xNumberFormats( xNumberFormatsSupplier->getNumberFormats() );
+    if( xNumberFormats.is() )
+    {
+        sal_Bool bCreate = sal_True;
+        const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
+        Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT, 
+            rLocaleDataWrapper.getLocale(), bCreate );
+        if( aKeySeq.getLength() )
+        {
+            nRet = aKeySeq[0];
+        }
+    }
+    return nRet;
+}
+
 Sequence< Reference< XChartType > >
     DiagramHelper::getChartTypesFromDiagram(
         const Reference< XDiagram > & xDiagram )
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 3aff015ce..12108614c 100755
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -30,11 +30,18 @@
 
 #include "ExplicitCategoriesProvider.hxx"
 #include "DiagramHelper.hxx"
+#include "ChartTypeHelper.hxx"
+#include "AxisHelper.hxx"
 #include "CommonConverters.hxx"
 #include "DataSourceHelper.hxx"
 #include "ChartModelHelper.hxx"
 #include "ContainerHelper.hxx"
 #include "macros.hxx"
+#include "NumberFormatterWrapper.hxx"
+
+#include <com/sun/star/chart2/AxisType.hpp>
+#include <com/sun/star/util/NumberFormat.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
 //.............................................................................
 namespace chart
@@ -53,7 +60,11 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
                                                        , const uno::Reference< frame::XModel >& xChartModel )
     : m_bDirty(true)
     , m_xCooSysModel( xCooSysModel )
+    , m_xChartModel( xChartModel )
     , m_xOriginalCategories()
+    , m_bIsExplicitCategoriesInited(false)
+    , m_bIsDateAxis(false)
+    , m_bIsAutoDate(false)
 {
     try
     {
@@ -61,7 +72,12 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
         {
             uno::Reference< XAxis > xAxis( xCooSysModel->getAxisByDimension(0,0) );
             if( xAxis.is() )
-                m_xOriginalCategories = xAxis->getScaleData().Categories;
+            {
+                ScaleData aScale( xAxis->getScaleData() );
+                m_xOriginalCategories = aScale.Categories;
+                m_bIsAutoDate = (aScale.AutoDateAxis && aScale.AxisType==chart2::AxisType::CATEGORY);
+                m_bIsDateAxis = (aScale.AxisType == chart2::AxisType::DATE || m_bIsAutoDate);
+            }
         }
 
         if( m_xOriginalCategories.is() )
@@ -134,6 +150,13 @@ ExplicitCategoriesProvider::~ExplicitCategoriesProvider()
 {
 }
 
+Reference< chart2::data::XDataSequence > ExplicitCategoriesProvider::getOriginalCategories()
+{
+    if( m_xOriginalCategories.is() )
+        return m_xOriginalCategories->getValues();
+    return 0;
+}
+
 const Sequence< Reference< data::XLabeledDataSequence> >& ExplicitCategoriesProvider::getSplitCategoriesList()
 {
     return m_aSplitCategoriesList;
@@ -167,30 +190,51 @@ std::vector<sal_Int32> lcl_getLimitingBorders( const std::vector< ComplexCategor
     return aLimitingBorders;
 }
 
-uno::Sequence< rtl::OUString > lcl_DataToStringSequence( const uno::Reference< data::XDataSequence >& xDataSequence )
+void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl::OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel )
 {
-    uno::Sequence< rtl::OUString > aStrings;
+    sal_Int32 nCount = rInAnys.getLength();
+    if(!nCount)
+        return;
+    rOutTexts.realloc(nCount);
+    Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( xChartModel, uno::UNO_QUERY );
+    Reference< util::XNumberFormats > xNumberFormats;
+    if( xNumberFormatsSupplier.is() )
+         xNumberFormats = Reference< util::XNumberFormats >( xNumberFormatsSupplier->getNumberFormats() );
+
+    sal_Int32 nAxisNumberFormat = 0;
+    Reference< XCoordinateSystem > xCooSysModel( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) );
+    if( xCooSysModel.is() )
+    {
+        Reference< chart2::XAxis > xAxis( xCooSysModel->getAxisByDimension(0,0) );
+        nAxisNumberFormat = AxisHelper::getExplicitNumberFormatKeyForAxis(
+                  xAxis, xCooSysModel, xNumberFormatsSupplier, false );
+    }
 
-    OSL_ASSERT( xDataSequence.is());
-    if( !xDataSequence.is() )
-        return aStrings;
+    sal_Int32 nLabelColor;
+    bool bColorChanged = false;
 
+    NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier );
     
-    uno::Reference< data::XTextualDataSequence > xTextualDataSequence( xDataSequence, uno::UNO_QUERY );
-    if( xTextualDataSequence.is() )
+    for(sal_Int32 nN=0;nN<nCount;nN++)
     {
-        aStrings = xTextualDataSequence->getTextualData();
-    }
-    else
-    {
-        uno::Sequence< uno::Any > aValues = xDataSequence->getData();
-        aStrings.realloc(aValues.getLength());
-
-        for(sal_Int32 nN=aValues.getLength();nN--;)
-            aValues[nN] >>= aStrings[nN];
+        rtl::OUString aText;
+        uno::Any aAny = rInAnys[nN];
+        if( aAny.hasValue() )
+        {
+            double fDouble = 0;
+            if( aAny>>=fDouble )
+            {
+                if( !::rtl::math::isNan(fDouble) )
+                    aText = aNumberFormatterWrapper.getFormattedString(
+                        nAxisNumberFormat, fDouble, nLabelColor, bColorChanged );
+            }
+            else
+            {
+                aAny>>=aText;
+            }
+        }
+        rOutTexts[nN] = aText;
     }
-
-    return aStrings;
 }
 
 SplitCategoriesProvider::~SplitCategoriesProvider()
@@ -201,9 +245,13 @@ class SplitCategoriesProvider_ForLabeledDataSequences : public SplitCategoriesPr
 {
 public:
 
-    explicit SplitCategoriesProvider_ForLabeledDataSequences( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::data::XLabeledDataSequence> >& rSplitCategoriesList )
+    explicit SplitCategoriesProvider_ForLabeledDataSequences(
+        const ::com::sun::star::uno::Sequence<
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::chart2::data::XLabeledDataSequence> >& rSplitCategoriesList
+        , const Reference< frame::XModel >& xChartModel )
         : m_rSplitCategoriesList( rSplitCategoriesList )
+        , m_xChartModel( xChartModel )
     {}
     virtual ~SplitCategoriesProvider_ForLabeledDataSequences()
     {}
@@ -214,6 +262,8 @@ public:
 private:
     const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XLabeledDataSequence> >& m_rSplitCategoriesList;
+
+    Reference< frame::XModel > m_xChartModel;
 };
 
 sal_Int32 SplitCategoriesProvider_ForLabeledDataSequences::getLevelCount() const
@@ -225,7 +275,11 @@ uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences::
     uno::Sequence< rtl::OUString > aRet;
     Reference< data::XLabeledDataSequence > xLabeledDataSequence( m_rSplitCategoriesList[nLevel] );
     if( xLabeledDataSequence.is() )
-        aRet = lcl_DataToStringSequence( xLabeledDataSequence->getValues() );
+    {
+        uno::Reference< data::XDataSequence > xDataSequence( xLabeledDataSequence->getValues() );
+        if( xDataSequence.is() )
+            ExplicitCategoriesProvider::convertCategoryAnysToText( aRet, xDataSequence->getData(), m_xChartModel );
+    }
     return aRet;
 }
 
@@ -362,23 +416,120 @@ Sequence< OUString > ExplicitCategoriesProvider::getExplicitSimpleCategories(
     return lcl_getExplicitSimpleCategories( rSplitCategoriesProvider, aComplexCats );
 }
 
+struct DatePlusIndexComparator
+{
+    inline bool operator() ( const DatePlusIndex& aFirst,
+                             const DatePlusIndex& aSecond )
+    {
+        return ( aFirst.fValue < aSecond.fValue );
+    }
+};
+
+bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataSequence, std::vector< DatePlusIndex >& rDateCategories, bool bIsAutoDate, Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier )
+{
+    bool bOnlyDatesFound = true;
+    bool bAnyDataFound = false;
+    
+    if( xDataSequence.is() )
+    {
+        uno::Sequence< uno::Any > aValues = xDataSequence->getData();
+        sal_Int32 nCount = aValues.getLength();
+        rDateCategories.reserve(nCount);
+        Reference< util::XNumberFormats > xNumberFormats;
+        if( xNumberFormatsSupplier.is() )
+             xNumberFormats = Reference< util::XNumberFormats >( xNumberFormatsSupplier->getNumberFormats() );
+
+        bool bOwnData = false;
+        bool bOwnDataAnddAxisHasAnyFormat = false;
+        bool bOwnDataAnddAxisHasDateFormat = false;
+        Reference< chart2::XChartDocument > xChartDoc( xNumberFormatsSupplier, uno::UNO_QUERY );
+        Reference< XCoordinateSystem > xCooSysModel( ChartModelHelper::getFirstCoordinateSystem( Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ) ) );
+        if( xChartDoc.is() && xCooSysModel.is() )
+        {
+            if( xChartDoc->hasInternalDataProvider() )
+            {
+                bOwnData = true;               
+                Reference< beans::XPropertySet > xAxisProps( xCooSysModel->getAxisByDimension(0,0), uno::UNO_QUERY );
+                sal_Int32 nAxisNumberFormat = 0;
+                if( xAxisProps.is() && (xAxisProps->getPropertyValue( C2U("NumberFormat") ) >>= nAxisNumberFormat) )
+                {
+                    bOwnDataAnddAxisHasAnyFormat = true;
+                    bOwnDataAnddAxisHasDateFormat = DiagramHelper::isDateNumberFormat( nAxisNumberFormat, xNumberFormats );
+                }
+            }
+        }
+
+        for(sal_Int32 nN=0;nN<nCount;nN++)
+        {
+            bool bIsDate = false;
+            if( bIsAutoDate )
+            {
+                if( bOwnData )
+                    bIsDate = bOwnDataAnddAxisHasAnyFormat ? bOwnDataAnddAxisHasDateFormat : true;
+                else
+                    bIsDate = DiagramHelper::isDateNumberFormat( xDataSequence->getNumberFormatKeyByIndex( nN ), xNumberFormats );
+            }
+            else
+                bIsDate = true;
+            
+            bool bContainsEmptyString = false;
+            bool bContainsNan = false;
+            uno::Any aAny = aValues[nN];
+            if( aAny.hasValue() )
+            {
+                OUString aTest;
+                double fTest = 0;
+                if( (aAny>>=aTest) && !aTest.getLength() ) //empty String
+                    bContainsEmptyString = true;
+                else if( (aAny>>=fTest) &&  ::rtl::math::isNan(fTest) )
+                    bContainsNan = true;
+
+                if( !bContainsEmptyString && !bContainsNan )
+                    bAnyDataFound = true;
+            }
+            DatePlusIndex aDatePlusIndex( 1.0, nN );
+            if( bIsDate && (aAny >>= aDatePlusIndex.fValue) )
+                rDateCategories.push_back( aDatePlusIndex );
+            else
+            {
+                if( aAny.hasValue() && !bContainsEmptyString )//empty string does not count as non date value!
+                    bOnlyDatesFound=false;
+                ::rtl::math::setNan( &aDatePlusIndex.fValue );
+                rDateCategories.push_back( aDatePlusIndex );
+            }
+        }
+        ::std::sort( rDateCategories.begin(), rDateCategories.end(), DatePlusIndexComparator() );
+    }
+
+    return bAnyDataFound && bOnlyDatesFound;
+}
+
 void ExplicitCategoriesProvider::init()
 {
     if( m_bDirty )
     {
-        m_aExplicitCategories.realloc(0);
         m_aComplexCats.clear();//not one per index
+        m_aDateCategories.clear();
         
         if( m_xOriginalCategories.is() )
         {
             if( !hasComplexCategories() )
-                m_aExplicitCategories = DataSequenceToStringSequence(m_xOriginalCategories->getValues());
+            {
+                if(m_bIsDateAxis)
+                {
+                    if( ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( m_xCooSysModel, 0 ), 2, 0 ) )
+                        m_bIsDateAxis = lcl_fillDateCategories( m_xOriginalCategories->getValues(), m_aDateCategories, m_bIsAutoDate, Reference< util::XNumberFormatsSupplier >( m_xChartModel.get(), uno::UNO_QUERY ) );
+                    else
+                        m_bIsDateAxis = false;
+                }
+            }
             else
-                m_aExplicitCategories = lcl_getExplicitSimpleCategories(
-                    SplitCategoriesProvider_ForLabeledDataSequences( m_aSplitCategoriesList ), m_aComplexCats );
+            {
+                m_bIsDateAxis = false;
+            }
         }
-        if(!m_aExplicitCategories.getLength())
-            m_aExplicitCategories = DiagramHelper::generateAutomaticCategoriesFromCooSys( m_xCooSysModel );
+        else
+            m_bIsDateAxis=false;
         m_bDirty = false;
     }
 }
@@ -386,7 +537,28 @@ void ExplicitCategoriesProvider::init()
 
 Sequence< ::rtl::OUString > ExplicitCategoriesProvider::getSimpleCategories()
 {
-    init();
+    if( !m_bIsExplicitCategoriesInited )
+    {
+        init();
+        m_aExplicitCategories.realloc(0);
+        if( m_xOriginalCategories.is() )
+        {
+            if( !hasComplexCategories() )
+            {
+                uno::Reference< data::XDataSequence > xDataSequence( m_xOriginalCategories->getValues() );
+                if( xDataSequence.is() )
+                    ExplicitCategoriesProvider::convertCategoryAnysToText( m_aExplicitCategories, xDataSequence->getData(), m_xChartModel );
+            }
+            else
+            {
+                m_aExplicitCategories = lcl_getExplicitSimpleCategories(
+                    SplitCategoriesProvider_ForLabeledDataSequences( m_aSplitCategoriesList, m_xChartModel ), m_aComplexCats );
+            }
+        }
+        if(!m_aExplicitCategories.getLength())
+            m_aExplicitCategories = DiagramHelper::generateAutomaticCategoriesFromCooSys( m_xCooSysModel );
+        m_bIsExplicitCategoriesInited = true;
+    }
     return m_aExplicitCategories;
 }
 
@@ -415,6 +587,18 @@ OUString ExplicitCategoriesProvider::getCategoryByIndex(
     return OUString();
 }
 
+bool ExplicitCategoriesProvider::isDateAxis()
+{
+    init();
+    return m_bIsDateAxis;
+}
+
+const std::vector< DatePlusIndex >&  ExplicitCategoriesProvider::getDateCategories()
+{
+    init();
+    return m_aDateCategories;
+}
+
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 28dbd0c58..60fd531aa 100755
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -38,6 +38,7 @@
 using ::com::sun::star::uno::Sequence;
 using ::rtl::OUString;
 
+using namespace ::com::sun::star;
 using namespace ::std;
 
 namespace chart
@@ -55,10 +56,10 @@ struct lcl_NumberedStringGenerator
             m_nWildcardLength( rWildcard.getLength())
     {
     }
-    vector< OUString > operator()()
+    vector< uno::Any > operator()()
     {
-        vector< OUString > aRet(1);
-        aRet[0] = m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::valueOf( ++m_nCounter ));
+        vector< uno::Any > aRet(1);
+        aRet[0] = uno::makeAny( m_aStub.replaceAt( m_nStubStartIndex, m_nWildcardLength, OUString::valueOf( ++m_nCounter )) );
         return aRet;
     }
 private:
@@ -113,12 +114,12 @@ void InternalData::createDefaultData()
     m_aRowLabels.clear();
     m_aRowLabels.reserve( m_nRowCount );
     generate_n( back_inserter( m_aRowLabels ), m_nRowCount,
-                lcl_NumberedStringGenerator( aRowName, C2U("%ROWNUMBER") ));
+        lcl_NumberedStringGenerator( aRowName, C2U("%ROWNUMBER") ));
 
     m_aColumnLabels.clear();
     m_aColumnLabels.reserve( m_nColumnCount );
     generate_n( back_inserter( m_aColumnLabels ), m_nColumnCount,
-                lcl_NumberedStringGenerator( aColName, C2U("%COLUMNNUMBER") ));
+        lcl_NumberedStringGenerator( aColName, C2U("%COLUMNNUMBER") ));
 }
 
 void InternalData::setData( const Sequence< Sequence< double > >& rDataInRows )
@@ -199,7 +200,7 @@ void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > & r
     m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]= aSlice;
 }
 
-void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, const vector< OUString >& rComplexLabel )
+void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, const vector< uno::Any >& rComplexLabel )
 {
     if( nColumnIndex < 0 )
         return;
@@ -208,10 +209,10 @@ void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, const vector<
         m_aColumnLabels.resize(nColumnIndex+1);
         enlargeData( nColumnIndex+1, 0 );
     }
-
     m_aColumnLabels[nColumnIndex]=rComplexLabel;
 }
-void InternalData::setComplexRowLabel( sal_Int32 nRowIndex, const vector< OUString >& rComplexLabel )
+
+void InternalData::setComplexRowLabel( sal_Int32 nRowIndex, const vector< uno::Any >& rComplexLabel )
 {
     if( nRowIndex < 0 )
         return;
@@ -220,23 +221,22 @@ void InternalData::setComplexRowLabel( sal_Int32 nRowIndex, const vector< OUStri
         m_aRowLabels.resize(nRowIndex+1);
         enlargeData( 0, nRowIndex+1 );
     }
-
     m_aRowLabels[nRowIndex] = rComplexLabel;
 }
 
-vector< OUString > InternalData::getComplexColumnLabel( sal_Int32 nColumnIndex ) const
+vector< uno::Any > InternalData::getComplexColumnLabel( sal_Int32 nColumnIndex ) const
 {
     if( nColumnIndex < static_cast< sal_Int32 >( m_aColumnLabels.size() ) )
         return m_aColumnLabels[nColumnIndex];
     else
-        return vector< OUString >();
+        return vector< uno::Any >();
 }
-vector< OUString > InternalData::getComplexRowLabel( sal_Int32 nRowIndex ) const
+vector< uno::Any > InternalData::getComplexRowLabel( sal_Int32 nRowIndex ) const
 {
     if( nRowIndex < static_cast< sal_Int32 >( m_aRowLabels.size() ) )
         return m_aRowLabels[nRowIndex];
     else
-        return vector< OUString >();
+        return vector< uno::Any >();
 }
 
 void InternalData::swapRowWithNext( sal_Int32 nRowIndex )
@@ -253,7 +253,7 @@ void InternalData::swapRowWithNext( sal_Int32 nRowIndex )
             m_aData[nIndex2] = fTemp;
         }
 
-        vector< OUString > aTemp( m_aRowLabels[nRowIndex] );
+        vector< uno::Any > aTemp( m_aRowLabels[nRowIndex] );
         m_aRowLabels[nRowIndex] = m_aRowLabels[nRowIndex + 1];
         m_aRowLabels[nRowIndex + 1] = aTemp;
     }
@@ -273,7 +273,7 @@ void InternalData::swapColumnWithNext( sal_Int32 nColumnIndex )
             m_aData[nIndex2] = fTemp;
         }
         
-        vector< OUString > aTemp( m_aColumnLabels[nColumnIndex] );
+        vector< uno::Any > aTemp( m_aColumnLabels[nColumnIndex] );
         m_aColumnLabels[nColumnIndex] = m_aColumnLabels[nColumnIndex + 1];
         m_aColumnLabels[nColumnIndex + 1] = aTemp;
     }
@@ -336,7 +336,7 @@ void InternalData::insertColumn( sal_Int32 nAfterIndex )
 
     // labels
     if( nAfterIndex < static_cast< sal_Int32 >( m_aColumnLabels.size()))
-        m_aColumnLabels.insert( m_aColumnLabels.begin() + (nAfterIndex + 1), vector< OUString >(1) );
+        m_aColumnLabels.insert( m_aColumnLabels.begin() + (nAfterIndex + 1), vector< uno::Any >(1) );
 
 #if OSL_DEBUG_LEVEL > 2
     traceData();
@@ -388,7 +388,7 @@ void InternalData::insertRow( sal_Int32 nAfterIndex )
 
     // labels
     if( nAfterIndex < static_cast< sal_Int32 >( m_aRowLabels.size()))
-        m_aRowLabels.insert( m_aRowLabels.begin() + nIndex, vector< OUString> (1));
+        m_aRowLabels.insert( m_aRowLabels.begin() + nIndex, vector< uno::Any > (1));
     
 #if OSL_DEBUG_LEVEL > 2
     traceData();
@@ -481,7 +481,7 @@ sal_Int32 InternalData::getColumnCount() const
     return m_nColumnCount;
 }
 
-void InternalData::setComplexRowLabels( const vector< vector< OUString > >& rNewRowLabels )
+void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNewRowLabels )
 {
     m_aRowLabels = rNewRowLabels;
     sal_Int32 nNewRowCount = static_cast< sal_Int32 >( m_aRowLabels.size() );
@@ -491,12 +491,12 @@ void InternalData::setComplexRowLabels( const vector< vector< OUString > >& rNew
         enlargeData( 0, nNewRowCount );
 }
 
-vector< vector< OUString > > InternalData::getComplexRowLabels() const
+vector< vector< uno::Any > > InternalData::getComplexRowLabels() const
 {
     return m_aRowLabels;
 }
 
-void InternalData::setComplexColumnLabels( const vector< vector< OUString > >& rNewColumnLabels )
+void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& rNewColumnLabels )
 {
     m_aColumnLabels = rNewColumnLabels;
     sal_Int32 nNewColumnCount = static_cast< sal_Int32 >( m_aColumnLabels.size() );
@@ -506,7 +506,7 @@ void InternalData::setComplexColumnLabels( const vector< vector< OUString > >& r
         enlargeData( nNewColumnCount, 0 );
 }
 
-vector< vector< OUString > > InternalData::getComplexColumnLabels() const
+vector< vector< uno::Any > > InternalData::getComplexColumnLabels() const
 {
     return m_aColumnLabels;
 }
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 7847d1eeb..13c592830 100755
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -93,6 +93,24 @@ static const ::rtl::OUString lcl_aCompleteRange(
 typedef ::std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > >
     lcl_tSequenceMap;
 
+Sequence< OUString > lcl_AnyToStringSequence( const Sequence< uno::Any >& aAnySeq )
+{
+    Sequence< OUString > aResult;
+    aResult.realloc( aAnySeq.getLength() );
+    transform( aAnySeq.getConstArray(), aAnySeq.getConstArray() + aAnySeq.getLength(),
+               aResult.getArray(), CommonFunctors::AnyToString() );
+    return aResult;
+}
+
+Sequence< uno::Any > lcl_StringToAnySequence( const Sequence< OUString >& aStringSeq )
+{
+    Sequence< uno::Any > aResult;
+    aResult.realloc( aStringSeq.getLength() );
+    transform( aStringSeq.getConstArray(), aStringSeq.getConstArray() + aStringSeq.getLength(),
+               aResult.getArray(), CommonFunctors::makeAny< OUString >() );
+    return aResult;
+}
+
 struct lcl_setModified : public ::std::unary_function< lcl_tSequenceMap, void >
 {
     void operator() ( const lcl_tSequenceMap::value_type & rMapEntry )
@@ -154,9 +172,9 @@ struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2::
                 if( xLabel.is() )
                 {
                     if( m_bDataInColumns )
-                        m_rInternalData.setComplexColumnLabel( nNewIndex, ContainerHelper::SequenceToVector( xLabel->getTextualData() ) );
+                        m_rInternalData.setComplexColumnLabel( nNewIndex, ContainerHelper::SequenceToVector( lcl_StringToAnySequence( xLabel->getTextualData() ) ) );
                     else
-                        m_rInternalData.setComplexRowLabel( nNewIndex, ContainerHelper::SequenceToVector( xLabel->getTextualData() ) );
+                        m_rInternalData.setComplexRowLabel( nNewIndex, ContainerHelper::SequenceToVector( lcl_StringToAnySequence( xLabel->getTextualData() ) ) );
                     if( m_bConnectToModel )
                     {
                         Reference< chart2::data::XDataSequence > xNewLabel(
@@ -187,37 +205,37 @@ private:
     bool                    m_bDataInColumns;
 };
 
-struct lcl_makeAnyFromLevelVector : public ::std::unary_function< vector< OUString >, uno::Any >
+struct lcl_copyFromLevel : public ::std::unary_function< vector< uno::Any >, uno::Any >
 {
 public:
 
-    explicit lcl_makeAnyFromLevelVector( sal_Int32 nLevel ) : m_nLevel( nLevel )
+    explicit lcl_copyFromLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
     {}
 
-    uno::Any operator() ( const vector< OUString >& rVector )
+    uno::Any operator() ( const vector< uno::Any >& rVector )
     {
-        OUString aString;
+        uno::Any aRet;
         if( m_nLevel <  static_cast< sal_Int32 >(rVector.size()) )
-            aString = rVector[m_nLevel];
-        return uno::makeAny( aString );
+            aRet = rVector[m_nLevel];
+        return aRet;
     }
 
 private:
     sal_Int32 m_nLevel;
 };
 
-struct lcl_getStringFromLevelVector : public ::std::unary_function< vector< OUString >, OUString >
+struct lcl_getStringFromLevelVector : public ::std::unary_function< vector< uno::Any >, OUString >
 {
 public:
 
     explicit lcl_getStringFromLevelVector( sal_Int32 nLevel ) : m_nLevel( nLevel )
     {}
 
-    OUString operator() ( const vector< OUString >& rVector )
+    OUString operator() ( const vector< uno::Any >& rVector )
     {
         OUString aString;
         if( m_nLevel < static_cast< sal_Int32 >(rVector.size()) )
-            aString = rVector[m_nLevel];
+            aString = CommonFunctors::AnyToString()(rVector[m_nLevel]);
         return aString;
     }
 
@@ -226,19 +244,19 @@ private:
 };
 
 
-struct lcl_setStringAtLevel : public ::std::binary_function< vector< OUString >, OUString, vector< OUString > >
+struct lcl_setAnyAtLevel : public ::std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > >
 {
 public:
 
-    explicit lcl_setStringAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
+    explicit lcl_setAnyAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
     {}
 
-    vector< OUString > operator() ( const vector< OUString >& rVector, const OUString& rNewText )
+    vector< uno::Any > operator() ( const vector< uno::Any >& rVector, const uno::Any& rNewValue )
     {
-        vector< OUString > aRet( rVector );
+        vector< uno::Any > aRet( rVector );
         if( m_nLevel >= static_cast< sal_Int32 >(aRet.size()) )
             aRet.resize( m_nLevel+1 );
-        aRet[ m_nLevel ]=rNewText;
+        aRet[ m_nLevel ]=rNewValue;
         return aRet;
     }
 
@@ -246,41 +264,61 @@ private:
     sal_Int32 m_nLevel;
 };
 
-struct lcl_insertStringAtLevel : public ::std::unary_function< vector< OUString >, void >
+struct lcl_setAnyAtLevelFromStringSequence : public ::std::binary_function< vector< uno::Any >, OUString, vector< uno::Any > >
 {
 public:
 
-    explicit lcl_insertStringAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
+    explicit lcl_setAnyAtLevelFromStringSequence( sal_Int32 nLevel ) : m_nLevel( nLevel )
     {}
 
-    void operator() ( vector< OUString >& rVector )
+    vector< uno::Any > operator() ( const vector< uno::Any >& rVector, const OUString& rNewValue )
+    {
+        vector< uno::Any > aRet( rVector );
+        if( m_nLevel >= static_cast< sal_Int32 >(aRet.size()) )
+            aRet.resize( m_nLevel+1 );
+        aRet[ m_nLevel ]=uno::makeAny(rNewValue);
+        return aRet;
+    }
+
+private:
+    sal_Int32 m_nLevel;
+};
+
+struct lcl_insertAnyAtLevel : public ::std::unary_function< vector< uno::Any >, void >
+{
+public:
+
+    explicit lcl_insertAnyAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
+    {}
+
+    void operator() ( vector< uno::Any >& rVector )
     {
         if( m_nLevel > static_cast< sal_Int32 >(rVector.size()) )
             rVector.resize( m_nLevel );
 
-        vector< OUString >::iterator aIt( rVector.begin() );
+        vector< uno::Any >::iterator aIt( rVector.begin() );
         for( sal_Int32 nN=0; aIt<rVector.end(); aIt++, nN++)
         {
             if( nN==m_nLevel )
                 break;
         }
-        rVector.insert( aIt, OUString() );
+        rVector.insert( aIt, uno::Any() );
     }
 
 private:
     sal_Int32 m_nLevel;
 };
 
-struct lcl_removeStringAtLevel : public ::std::unary_function< vector< OUString >, void >
+struct lcl_removeAnyAtLevel : public ::std::unary_function< vector< uno::Any >, void >
 {
 public:
 
-    explicit lcl_removeStringAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
+    explicit lcl_removeAnyAtLevel( sal_Int32 nLevel ) : m_nLevel( nLevel )
     {}
 
-    void operator() ( vector< OUString >& rVector )
+    void operator() ( vector< uno::Any >& rVector )
     {
-        vector< OUString >::iterator aIt( rVector.begin() );
+        vector< uno::Any >::iterator aIt( rVector.begin() );
         for( sal_Int32 nN=0; aIt<rVector.end(); aIt++, nN++)
         {
             if( nN==m_nLevel )
@@ -295,23 +333,6 @@ private:
     sal_Int32 m_nLevel;
 };
 
-vector< OUString > lcl_AnyToStringVector( const Sequence< uno::Any >& aAnySeq )
-{
-    vector< OUString > aStringVec;
-    transform( aAnySeq.getConstArray(), aAnySeq.getConstArray() + aAnySeq.getLength(),
-               back_inserter( aStringVec ), CommonFunctors::AnyToString() );
-    return aStringVec;
-}
-
-Sequence< OUString > lcl_AnyToStringSequence( const Sequence< uno::Any >& aAnySeq )
-{
-    Sequence< OUString > aResult;
-    aResult.realloc( aAnySeq.getLength() );
-    transform( aAnySeq.getConstArray(), aAnySeq.getConstArray() + aAnySeq.getLength(),
-               aResult.getArray(), CommonFunctors::AnyToString() );
-    return aResult;
-}
-
 } // anonymous namespace
 
 // ================================================================================
@@ -341,9 +362,10 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
 
             // categories
             {
-                vector< vector< OUString > > aNewCategories;//inner count is level
+                vector< vector< uno::Any > > aNewCategories;//inner count is level
                 {
                     ExplicitCategoriesProvider aExplicitCategoriesProvider( ChartModelHelper::getFirstCoordinateSystem(xChartModel), xChartModel );
+                    
                     const Sequence< Reference< chart2::data::XLabeledDataSequence> >& rSplitCategoriesList( aExplicitCategoriesProvider.getSplitCategoriesList() );
                     sal_Int32 nLevelCount = rSplitCategoriesList.getLength();
                     for( sal_Int32 nL = 0; nL<nLevelCount; nL++ )
@@ -351,18 +373,18 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
                         Reference< chart2::data::XLabeledDataSequence > xLDS( rSplitCategoriesList[nL] );
                         if( !xLDS.is() )
                             continue;
-                        Reference< chart2::data::XTextualDataSequence > xSeq( xLDS->getValues(), uno::UNO_QUERY );
-                        Sequence< OUString > aStringSeq;
+                        Sequence< uno::Any > aDataSeq;
+                        Reference< chart2::data::XDataSequence > xSeq( xLDS->getValues() );
                         if( xSeq.is() )
-                            aStringSeq = xSeq->getTextualData(); // @todo: be able to deal with XDataSequence, too
-                        sal_Int32 nLength = aStringSeq.getLength();
+                            aDataSeq = xSeq->getData();
+                        sal_Int32 nLength = aDataSeq.getLength();
                         sal_Int32 nCatLength = static_cast< sal_Int32 >(aNewCategories.size());
                         if( nCatLength < nLength )
                             aNewCategories.resize( nLength );
                         else if( nLength < nCatLength )
-                            aStringSeq.realloc( nCatLength );
-                        transform( aNewCategories.begin(), aNewCategories.end(), aStringSeq.getConstArray(),
-                            aNewCategories.begin(), lcl_setStringAtLevel(nL) );
+                            aDataSeq.realloc( nCatLength );
+                        transform( aNewCategories.begin(), aNewCategories.end(), aDataSeq.getConstArray(),
+                            aNewCategories.begin(), lcl_setAnyAtLevel(nL) );
                     }
                     if( !nLevelCount )
                     {
@@ -371,9 +393,9 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
                         aNewCategories.reserve( nLength );
                         for( sal_Int32 nN=0; nN<nLength; nN++)
                         {
-                            vector< OUString > aStringVector(1);
-                            aStringVector[0] = aSimplecategories[nN];
-                            aNewCategories.push_back( aStringVector );
+                            vector< uno::Any > aVector(1);
+                            aVector[0] = uno::makeAny( aSimplecategories[nN] );
+                            aNewCategories.push_back( aVector );
                         }
                     }
                 }
@@ -520,14 +542,14 @@ void InternalDataProvider::createDefaultData()
 namespace
 {
 
-sal_Int32 lcl_getInnerLevelCount( const vector< vector< OUString > >& rLabels )
+sal_Int32 lcl_getInnerLevelCount( const vector< vector< uno::Any > >& rLabels )
 {
     sal_Int32 nCount = 1;//minimum is 1!
-    vector< vector< OUString > >::const_iterator aLevelIt( rLabels.begin() );
-    vector< vector< OUString > >::const_iterator aLevelEnd( rLabels.end() );
+    vector< vector< uno::Any > >::const_iterator aLevelIt( rLabels.begin() );
+    vector< vector< uno::Any > >::const_iterator aLevelEnd( rLabels.end() );
     for( ;aLevelIt!=aLevelEnd; ++aLevelIt )
     {
-        const vector< ::rtl::OUString >& rCurrentLevelLabels = *aLevelIt;
+        const vector< uno::Any >& rCurrentLevelLabels = *aLevelIt;
         nCount = std::max<sal_Int32>( rCurrentLevelLabels.size(), nCount );
     }
     return nCount;
@@ -551,7 +573,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
     {
         //return split complex categories if we have any:
         ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aComplexCategories;
-        vector< vector< OUString > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
+        vector< vector< uno::Any > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
         if( bUseColumns==m_bDataInColumns )
         {
             sal_Int32 nLevelCount = lcl_getInnerLevelCount( aCategories );
@@ -733,46 +755,48 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
     if( aRange.match( lcl_aLabelRangePrefix ) )
     {
         sal_Int32 nIndex = aRange.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
-        vector< OUString > aComplexLabel = m_bDataInColumns
+        vector< uno::Any > aComplexLabel = m_bDataInColumns
             ? m_aInternalData.getComplexColumnLabel( nIndex )
             : m_aInternalData.getComplexRowLabel( nIndex );
         if( !aComplexLabel.empty() )
-        {
-            aResult.realloc( aComplexLabel.size() );
-            transform( aComplexLabel.begin(), aComplexLabel.end(),
-                       aResult.getArray(), CommonFunctors::makeAny< OUString >());
-        }
+            aResult = ContainerHelper::ContainerToSequence(aComplexLabel);
     }
     else if( aRange.match( lcl_aCategoriesPointRangeNamePrefix ) )
     {
         sal_Int32 nPointIndex = aRange.copy( lcl_aCategoriesPointRangeNamePrefix.getLength() ).toInt32();
-        vector< OUString > aComplexCategory = m_bDataInColumns
+        vector< uno::Any > aComplexCategory = m_bDataInColumns
             ? m_aInternalData.getComplexRowLabel( nPointIndex )
             : m_aInternalData.getComplexColumnLabel( nPointIndex );
         if( !aComplexCategory.empty() )
-        {
-            aResult.realloc( aComplexCategory.size() );
-            transform( aComplexCategory.begin(), aComplexCategory.end(),
-                       aResult.getArray(), CommonFunctors::makeAny< OUString >());
-        }
+            aResult = ContainerHelper::ContainerToSequence(aComplexCategory);
     }
     else if( aRange.match( lcl_aCategoriesLevelRangeNamePrefix ) )
     {
         sal_Int32 nLevel = aRange.copy( lcl_aCategoriesLevelRangeNamePrefix.getLength() ).toInt32();
-        vector< vector< OUString > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
+        vector< vector< uno::Any > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
         if( nLevel < lcl_getInnerLevelCount( aCategories ) )
         {
             aResult.realloc( aCategories.size() );
             transform( aCategories.begin(), aCategories.end(),
-                       aResult.getArray(), lcl_makeAnyFromLevelVector(nLevel) );
+                       aResult.getArray(), lcl_copyFromLevel(nLevel) );
         }
     }
     else if( aRange.equals( lcl_aCategoriesRangeName ) )
     {
-        Sequence< OUString > aLabels = m_bDataInColumns ? this->getRowDescriptions() : this->getColumnDescriptions();
-        aResult.realloc( aLabels.getLength() );
-        transform( aLabels.getConstArray(), aLabels.getConstArray() + aLabels.getLength(),
-                   aResult.getArray(), CommonFunctors::makeAny< OUString >() );
+        vector< vector< uno::Any > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
+        sal_Int32 nLevelCount = lcl_getInnerLevelCount( aCategories );
+        if( nLevelCount == 1 )
+        {
+            sal_Int32 nL=0;
+            aResult = this->getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::valueOf( nL ) );
+        }
+        else
+        {
+            Sequence< OUString > aLabels = m_bDataInColumns ? this->getRowDescriptions() : this->getColumnDescriptions();
+            aResult.realloc( aLabels.getLength() );
+            transform( aLabels.getConstArray(), aLabels.getConstArray() + aLabels.getLength(),
+                       aResult.getArray(), CommonFunctors::makeAny< OUString >() );
+        }
     }
     else
     {
@@ -800,38 +824,36 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
     const OUString& aRange, const Sequence< uno::Any >& aNewData )
     throw (uno::RuntimeException)
 {
+    vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) );
     if( aRange.match( lcl_aLabelRangePrefix ) )
     {
-        vector< OUString > aNewStrings( lcl_AnyToStringVector( aNewData ) );
         sal_uInt32 nIndex = aRange.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
         if( m_bDataInColumns )
-            m_aInternalData.setComplexColumnLabel( nIndex, aNewStrings );
+            m_aInternalData.setComplexColumnLabel( nIndex, aNewVector );
         else
-            m_aInternalData.setComplexRowLabel( nIndex, aNewStrings );
+            m_aInternalData.setComplexRowLabel( nIndex, aNewVector );
     }
     else if( aRange.match( lcl_aCategoriesPointRangeNamePrefix ) )
     {
-        vector< OUString > aNewStrings( lcl_AnyToStringVector( aNewData ) );
         sal_Int32 nPointIndex = aRange.copy( lcl_aCategoriesLevelRangeNamePrefix.getLength()).toInt32();
         if( m_bDataInColumns )
-            m_aInternalData.setComplexRowLabel( nPointIndex, aNewStrings );
+            m_aInternalData.setComplexRowLabel( nPointIndex, aNewVector );
         else
-            m_aInternalData.setComplexColumnLabel( nPointIndex, aNewStrings );
+            m_aInternalData.setComplexColumnLabel( nPointIndex, aNewVector );
     }
     else if( aRange.match( lcl_aCategoriesLevelRangeNamePrefix ) )
     {
-        vector< OUString > aNewStrings( lcl_AnyToStringVector( aNewData ) );
         sal_Int32 nLevel = aRange.copy( lcl_aCategoriesLevelRangeNamePrefix.getLength()).toInt32();
-        vector< vector< OUString > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
+        vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
 
         //ensure equal length
-        if( aNewStrings.size() > aComplexCategories.size() )
-            aComplexCategories.resize( aNewStrings.size() );
-        else if( aNewStrings.size() < aComplexCategories.size() )
-            aNewStrings.resize( aComplexCategories.size() );
+        if( aNewVector.size() > aComplexCategories.size() )
+            aComplexCategories.resize( aNewVector.size() );
+        else if( aNewVector.size() < aComplexCategories.size() )
+            aNewVector.resize( aComplexCategories.size() );
 
-        transform( aComplexCategories.begin(), aComplexCategories.end(), aNewStrings.begin(),
-                   aComplexCategories.begin(), lcl_setStringAtLevel(nLevel) );
+        transform( aComplexCategories.begin(), aComplexCategories.end(), aNewVector.begin(),
+                   aComplexCategories.begin(), lcl_setAnyAtLevel(nLevel) );
         
         if( m_bDataInColumns )
             m_aInternalData.setComplexRowLabels( aComplexCategories );
@@ -840,10 +862,14 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
     }
     else if( aRange.equals( lcl_aCategoriesRangeName ) )
     {
+        vector< vector< uno::Any > > aComplexCategories;
+        aComplexCategories.resize( aNewVector.size() );
+        transform( aComplexCategories.begin(), aComplexCategories.end(), aNewVector.begin(),
+                            aComplexCategories.begin(), lcl_setAnyAtLevel(0) );
         if( m_bDataInColumns )
-            this->setRowDescriptions( lcl_AnyToStringSequence(aNewData) );
+            m_aInternalData.setComplexRowLabels( aComplexCategories );
         else
-            this->setColumnDescriptions( lcl_AnyToStringSequence(aNewData) );
+            m_aInternalData.setComplexColumnLabels( aComplexCategories );
     }
     else
     {
@@ -908,8 +934,8 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel
     OSL_ENSURE( nLevel> 0, "you can only insert category levels > 0" );//the first categories level cannot be deleted, check the calling code for error
     if( nLevel>0 )
     {
-        vector< vector< OUString > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
-        ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertStringAtLevel(nLevel) );
+        vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
+        ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertAnyAtLevel(nLevel) );
         if( m_bDataInColumns )
             m_aInternalData.setComplexRowLabels( aComplexCategories );
         else
@@ -925,8 +951,8 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel
     OSL_ENSURE( nLevel>0, "you can only delete category levels > 0" );//the first categories level cannot be deleted, check the calling code for error
     if( nLevel>0 )
     {
-        vector< vector< OUString > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
-        ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeStringAtLevel(nLevel) );
+        vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
+        ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeAnyAtLevel(nLevel) );
         if( m_bDataInColumns )
             m_aInternalData.setComplexRowLabels( aComplexCategories );
         else
@@ -1136,7 +1162,36 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
 
 namespace
 {
-Sequence< Sequence< OUString > > lcl_convertComplexVectorToSequence( const vector< vector< OUString > >& rIn )
+
+template< class Type >
+Sequence< Sequence< Type > > lcl_convertVectorVectorToSequenceSequence( const vector< vector< Type > >& rIn )
+{
+    Sequence< Sequence< Type > > aRet;
+    sal_Int32 nOuterCount = rIn.size();
+    if( nOuterCount )
+    {
+        aRet.realloc(nOuterCount);
+        for( sal_Int32 nN=0; nN<nOuterCount; nN++)
+            aRet[nN]= ContainerHelper::ContainerToSequence( rIn[nN] );
+    }
+    return aRet;
+}
+
+template< class Type >
+vector< vector< Type > > lcl_convertSequenceSequenceToVectorVector( const Sequence< Sequence< Type > >& rIn )
+{
+    vector< vector< Type > > aRet;
+    sal_Int32 nOuterCount = rIn.getLength();
+    if( nOuterCount )
+    {
+        aRet.resize(nOuterCount);
+        for( sal_Int32 nN=0; nN<nOuterCount; nN++)
+            aRet[nN]= ContainerHelper::SequenceToVector( rIn[nN] );
+    }
+    return aRet;
+}
+
+Sequence< Sequence< OUString > > lcl_convertComplexAnyVectorToStringSequence( const vector< vector< uno::Any > >& rIn )
 {
     Sequence< Sequence< OUString > > aRet;
     sal_Int32 nOuterCount = rIn.size();
@@ -1144,17 +1199,17 @@ Sequence< Sequence< OUString > > lcl_convertComplexVectorToSequence( const vecto
     {
         aRet.realloc(nOuterCount);
         for( sal_Int32 nN=0; nN<nOuterCount; nN++)
-            aRet[nN]=ContainerHelper::ContainerToSequence( rIn[nN] );
+            aRet[nN]= lcl_AnyToStringSequence( ContainerHelper::ContainerToSequence( rIn[nN] ) );
     }
     return aRet;
 }
 
-vector< vector< OUString > > lcl_convertComplexSequenceToVector( const Sequence< Sequence< OUString > >& rIn )
+vector< vector< uno::Any > > lcl_convertComplexStringSequenceToAnyVector( const Sequence< Sequence< OUString > >& rIn )
 {
-    vector< vector< OUString > > aRet;
+    vector< vector< uno::Any > > aRet;
     sal_Int32 nOuterCount = rIn.getLength();
     for( sal_Int32 nN=0; nN<nOuterCount; nN++)
-        aRet.push_back( ContainerHelper::SequenceToVector( rIn[nN] ) );
+        aRet.push_back( ContainerHelper::SequenceToVector( lcl_StringToAnySequence( rIn[nN] ) ) );
     return aRet;
 }
 
@@ -1162,7 +1217,7 @@ class SplitCategoriesProvider_ForComplexDescriptions : public SplitCategoriesPro
 {
 public:
 
-    explicit SplitCategoriesProvider_ForComplexDescriptions( const ::std::vector< ::std::vector< ::rtl::OUString > >& rComplexDescriptions )
+    explicit SplitCategoriesProvider_ForComplexDescriptions( const ::std::vector< ::std::vector< uno::Any > >& rComplexDescriptions )
         : m_rComplexDescriptions( rComplexDescriptions )
     {}
     virtual ~SplitCategoriesProvider_ForComplexDescriptions()
@@ -1172,7 +1227,7 @@ public:
     virtual uno::Sequence< rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const;
 
 private:
-    const ::std::vector< ::std::vector< ::rtl::OUString > >& m_rComplexDescriptions;
+    const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions;
 };
 
 sal_Int32 SplitCategoriesProvider_ForComplexDescriptions::getLevelCount() const
@@ -1193,22 +1248,78 @@ uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForComplexDescriptions::g
 
 }//anonymous namespace
 
+// ____ XDateCategories ____
+Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException)
+{
+    double fNan = InternalDataProvider::getNotANumber();
+    double fValue = fNan;
+    vector< vector< uno::Any > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
+    sal_Int32 nCount = aCategories.size();
+    Sequence< double > aDoubles( nCount );
+    vector< vector< uno::Any > >::iterator aIt( aCategories.begin() );
+    vector< vector< uno::Any > >::const_iterator aEnd( aCategories.end() );
+    for(sal_Int32 nN=0; nN<nCount && aIt!=aEnd; ++nN, ++aIt )
+    {
+        if( !( !aIt->empty() && ((*aIt)[0]>>=fValue) ) )
+            fValue = fNan;
+        aDoubles[nN]=fValue;
+    }
+    return aDoubles;
+}
+
+void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException)
+{
+    sal_Int32 nCount = rDates.getLength();
+    vector< vector< uno::Any > > aNewCategories;
+    aNewCategories.reserve(nCount);
+    vector< uno::Any > aSingleLabel(1);
+    
+    for(sal_Int32 nN=0; nN<nCount; ++nN )
+    {
+        aSingleLabel[0]=uno::makeAny(rDates[nN]);
+        aNewCategories.push_back(aSingleLabel);
+    }
+
+    if( m_bDataInColumns )
+        m_aInternalData.setComplexRowLabels( aNewCategories );
+    else
+        m_aInternalData.setComplexColumnLabels( aNewCategories );
+}
+
+// ____ XAnyDescriptionAccess ____
+Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException)
+{
+    return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexRowLabels() );
+}
+void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException)
+{
+    m_aInternalData.setComplexRowLabels( lcl_convertSequenceSequenceToVectorVector( aRowDescriptions ) );
+}
+Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException)
+{
+    return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexColumnLabels() );
+}
+void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException)
+{
+    m_aInternalData.setComplexColumnLabels( lcl_convertSequenceSequenceToVectorVector( aColumnDescriptions ) );
+}
+
 // ____ XComplexDescriptionAccess ____
 Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException)
 {
-    return lcl_convertComplexVectorToSequence( m_aInternalData.getComplexRowLabels() );
+    return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() );
 }
 void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException)
 {
-    m_aInternalData.setComplexRowLabels( lcl_convertComplexSequenceToVector(aRowDescriptions) );
+    m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) );
 }
 Sequence< Sequence< ::rtl::OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException)
 {
-    return lcl_convertComplexVectorToSequence( m_aInternalData.getComplexColumnLabels() );
+    return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() );
 }
 void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException)
 {
-    m_aInternalData.setComplexColumnLabels( lcl_convertComplexSequenceToVector(aColumnDescriptions) );
+    m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) );
 }
 
 // ____ XChartDataArray ____
@@ -1227,25 +1338,25 @@ void SAL_CALL InternalDataProvider::setData( const Sequence< Sequence< double >
 void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString >& aRowDescriptions )
     throw (uno::RuntimeException)
 {
-    vector< vector< OUString > > aComplexDescriptions( aRowDescriptions.getLength() );
+    vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() );
     transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(),
-               aComplexDescriptions.begin(), lcl_setStringAtLevel(0) );
+               aComplexDescriptions.begin(), lcl_setAnyAtLevelFromStringSequence(0) );
     m_aInternalData.setComplexRowLabels( aComplexDescriptions );
 }
 
 void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions )
     throw (uno::RuntimeException)
 {
-    vector< vector< OUString > > aComplexDescriptions( aColumnDescriptions.getLength() );
+    vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() );
     transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(),
-               aComplexDescriptions.begin(), lcl_setStringAtLevel(0) );
+               aComplexDescriptions.begin(), lcl_setAnyAtLevelFromStringSequence(0) );
     m_aInternalData.setComplexColumnLabels( aComplexDescriptions );
 }
 
 Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions()
     throw (uno::RuntimeException)
 {
-    vector< vector< OUString > > aComplexLabels( m_aInternalData.getComplexRowLabels() );
+    vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexRowLabels() );
     SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels );
     return ExplicitCategoriesProvider::getExplicitSimpleCategories( aProvider );
 }
@@ -1253,7 +1364,7 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions()
 Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions()
     throw (uno::RuntimeException)
 {
-    vector< vector< OUString > > aComplexLabels( m_aInternalData.getComplexColumnLabels() );
+    vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexColumnLabels() );
     SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels );
     return ExplicitCategoriesProvider::getExplicitSimpleCategories( aProvider );
 }
diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index 6b4092907..19b317a58 100644..100755
--- a/chart2/source/view/main/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_chart2.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "macros.hxx"
 #include <comphelper/processfactory.hxx>
 // header for class SvNumberFormatsSupplierObj
@@ -100,6 +100,25 @@ SvNumberFormatter* NumberFormatterWrapper::getSvNumberFormatter() const
     return m_pNumberFormatter;
 }
 
+Date NumberFormatterWrapper::getNullDate() const
+{
+    sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12;
+    Date aRet(nDay,nMonth,nYear);
+
+    util::DateTime aUtilDate;
+    if( m_aNullDate.hasValue() && (m_aNullDate >>= aUtilDate) )
+    {
+        aRet = Date(aUtilDate.Day,aUtilDate.Month,aUtilDate.Year);
+    }
+    else if( m_pNumberFormatter )
+    {
+        Date* pDate = m_pNumberFormatter->GetNullDate();
+        if( pDate )
+            aRet = *pDate;
+    }
+    return aRet;
+}
+
 rtl::OUString NumberFormatterWrapper::getFormattedString(
     sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
 {
@@ -111,7 +130,7 @@ rtl::OUString NumberFormatterWrapper::getFormattedString(
         return aText;
     }
     // i99104 handle null date correctly
-    USHORT nYear = 1899,nDay = 30,nMonth = 12;
+    sal_uInt16 nYear = 1899,nDay = 30,nMonth = 12;
     if ( m_aNullDate.hasValue() )
     {
         Date* pDate = m_pNumberFormatter->GetNullDate();
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index fe222c771..33fec44bc 100644..100755
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -41,7 +41,7 @@ SchResId::SchResId( sal_Int16 nId )
 
 ::rtl::OUString SchResId::getResString( sal_Int16 nId )
 {
-    return ::rtl::OUString( String( SchResId( nId )));
+    return String( SchResId( nId ));
 }
 
 } //  namespace chart
diff --git a/chart2/source/tools/makefile.mk b/chart2/source/tools/makefile.mk
index fd92b894b..7554bd19c 100644
--- a/chart2/source/tools/makefile.mk
+++ b/chart2/source/tools/makefile.mk
@@ -70,6 +70,7 @@ SLOFILES=	\
     $(SLO)$/LinearRegressionCurveCalculator.obj \
     $(SLO)$/LogarithmicRegressionCurveCalculator.obj \
     $(SLO)$/MeanValueRegressionCurveCalculator.obj \
+    $(SLO)$/NumberFormatterWrapper.obj \
     $(SLO)$/OPropertySet.obj \
     $(SLO)$/WrappedPropertySet.obj \
     $(SLO)$/WrappedProperty.obj \
diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx
new file mode 100644
index 000000000..ef9227574
--- /dev/null
+++ b/chart2/source/view/axes/DateHelper.cxx
@@ -0,0 +1,132 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_chart2.hxx"
+#include "DateHelper.hxx"
+#include "DateScaling.hxx"
+#include <rtl/math.hxx>
+#include <com/sun/star/chart/TimeUnit.hpp>
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+using namespace ::com::sun::star;
+
+bool DateHelper::IsInSameYear( const Date& rD1, const Date& rD2 )
+{
+    return rD1.GetYear() == rD2.GetYear();
+}
+bool DateHelper::IsInSameMonth( const Date& rD1, const Date& rD2 )
+{
+    return (rD1.GetYear() == rD2.GetYear())
+        && (rD1.GetMonth() == rD2.GetMonth());
+}
+long DateHelper::GetMonthsBetweenDates( Date aD1, Date aD2 )
+{
+    Date aHelp = aD1;
+    long nSign = 1;
+    if( aD1 < aD2 )
+    {
+        aD1 = aD2;
+        aD2 = aHelp;
+        nSign = -1;
+    }
+
+    return nSign*( ( aD1.GetMonth() - aD2.GetMonth() )
+        + ( aD1.GetYear() - aD2.GetYear() )*12 );
+}
+
+Date DateHelper::GetDateSomeMonthsAway( const Date& rD, long nMonthDistance )
+{
+    Date aRet(rD);
+    long nMonth = rD.GetMonth()+nMonthDistance;
+    long nNewMonth = nMonth%12;
+    long nNewYear = rD.GetYear() + nMonth/12;
+    if( nMonth <= 0 || !nNewMonth )
+        nNewYear--;
+    if( nNewMonth <= 0 )
+        nNewMonth += 12;
+    aRet.SetMonth( sal_uInt16(nNewMonth) );
+    aRet.SetYear( sal_uInt16(nNewYear) );
+    while(!aRet.IsValid())
+        aRet--;
+    return aRet;
+}
+
+Date DateHelper::GetDateSomeYearsAway( const Date& rD, long nYearDistance )
+{
+    Date aRet(rD);
+    aRet.SetYear( static_cast<sal_uInt16>(rD.GetYear()+nYearDistance) );
+    while(!aRet.IsValid())
+        aRet--;
+    return aRet;
+}
+
+bool DateHelper::IsLessThanOneMonthAway( const Date& rD1, const Date& rD2 )
+{
+    Date aDMin( DateHelper::GetDateSomeMonthsAway( rD1, -1 ) );
+    Date aDMax( DateHelper::GetDateSomeMonthsAway( rD1, 1 ) );
+
+    if( rD2 > aDMin && rD2 < aDMax )
+        return true;
+    return false;
+}
+
+bool DateHelper::IsLessThanOneYearAway( const Date& rD1, const Date& rD2 )
+{
+    Date aDMin( DateHelper::GetDateSomeYearsAway( rD1, -1 ) );
+    Date aDMax( DateHelper::GetDateSomeYearsAway( rD1, 1 ) );
+
+    if( rD2 > aDMin && rD2 < aDMax )
+        return true;
+    return false;
+}
+
+double DateHelper::RasterizeDateValue( double fValue, const Date& rNullDate, long TimeResolution )
+{
+    Date aDate(rNullDate); aDate += static_cast<long>(::rtl::math::approxFloor(fValue));
+    switch(TimeResolution)
+    {
+        case ::com::sun::star::chart::TimeUnit::DAY:
+            break;
+        case ::com::sun::star::chart::TimeUnit::YEAR:
+            aDate.SetMonth(1);
+            aDate.SetDay(1);
+            break;
+        case ::com::sun::star::chart::TimeUnit::MONTH:
+        default:
+            aDate.SetDay(1);
+            break;
+    }
+    return aDate - rNullDate;
+}
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
new file mode 100644
index 000000000..64db37105
--- /dev/null
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -0,0 +1,216 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_chart2.hxx"
+#include "DateScaling.hxx"
+#include <com/sun/star/chart/TimeUnit.hpp>
+#include <rtl/math.hxx>
+#include "com/sun/star/uno/RuntimeException.hpp"
+
+namespace
+{
+
+static const ::rtl::OUString lcl_aServiceName_DateScaling(
+    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DateScaling" ));
+static const ::rtl::OUString lcl_aServiceName_InverseDateScaling(
+    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.InverseDateScaling" ));
+
+static const ::rtl::OUString lcl_aImplementationName_DateScaling(
+    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DateScaling" ));
+static const ::rtl::OUString lcl_aImplementationName_InverseDateScaling(
+    RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.InverseDateScaling" ));
+
+static const double lcl_fNumberOfMonths = 12.0;//todo: this needs to be offered by basic tools Date class if it should be more generic
+}
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::chart2;
+using ::com::sun::star::chart::TimeUnit::DAY;
+using ::com::sun::star::chart::TimeUnit::MONTH;
+using ::com::sun::star::chart::TimeUnit::YEAR;
+
+DateScaling::DateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted )
+        : m_aNullDate( rNullDate )
+        , m_nTimeUnit( nTimeUnit )
+        , m_bShifted( bShifted )
+{
+}
+
+DateScaling::~DateScaling()
+{
+}
+
+double SAL_CALL DateScaling::doScaling( double value )
+    throw (uno::RuntimeException)
+{
+    double fResult(value);
+    if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
+        ::rtl::math::setNan( & fResult );
+    else
+    {
+        Date aDate(m_aNullDate);
+        aDate += static_cast<long>(::rtl::math::approxFloor(value));
+        switch( m_nTimeUnit )
+        {
+            case DAY:
+                fResult = value;
+                if(m_bShifted)
+                    fResult+=0.5;
+                break;
+            case YEAR:
+            case MONTH:
+            default:
+                fResult = aDate.GetYear();
+                fResult *= lcl_fNumberOfMonths;//asssuming equal count of months in each year
+                fResult += aDate.GetMonth();
+
+                double fDayOfMonth = aDate.GetDay();
+                fDayOfMonth -= 1.0;
+                double fDaysInMonth = aDate.GetDaysInMonth();
+                fResult += fDayOfMonth/fDaysInMonth;
+                if(m_bShifted)
+                {
+                    if( YEAR==m_nTimeUnit )
+                        fResult += 0.5*lcl_fNumberOfMonths;
+                    else
+                        fResult += 0.5;
+                }
+                break;
+        }
+    }
+    return fResult;
+}
+
+uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling()
+    throw (uno::RuntimeException)
+{
+    return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted );
+}
+
+::rtl::OUString SAL_CALL DateScaling::getServiceName()
+    throw (uno::RuntimeException)
+{
+    return lcl_aServiceName_DateScaling;
+}
+
+uno::Sequence< ::rtl::OUString > DateScaling::getSupportedServiceNames_Static()
+{
+    return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_DateScaling, 1 );
+}
+
+// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
+APPHELPER_XSERVICEINFO_IMPL( DateScaling, lcl_aServiceName_DateScaling )
+
+// ----------------------------------------
+
+InverseDateScaling::InverseDateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted )
+        : m_aNullDate( rNullDate )
+        , m_nTimeUnit( nTimeUnit )
+        , m_bShifted( bShifted )
+{
+}
+
+InverseDateScaling::~InverseDateScaling()
+{
+}
+
+double SAL_CALL InverseDateScaling::doScaling( double value )
+    throw (uno::RuntimeException)
+{
+    double fResult(value);
+    if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
+        ::rtl::math::setNan( & fResult );
+    else
+    {
+        switch( m_nTimeUnit )
+        {
+            case DAY:
+                if(m_bShifted)
+                    value -= 0.5;
+                fResult = value;
+                break;
+            case YEAR:
+            case MONTH:
+            default:
+                //Date aDate(m_aNullDate);
+                if(m_bShifted)
+                {
+                    if( YEAR==m_nTimeUnit )
+                        value -= 0.5*lcl_fNumberOfMonths;
+                    else
+                        value -= 0.5;
+                }
+                Date aDate;
+                double fYear = ::rtl::math::approxFloor(value/lcl_fNumberOfMonths);
+                double fMonth = ::rtl::math::approxFloor(value-(fYear*lcl_fNumberOfMonths));
+                if( fMonth==0.0 )
+                {
+                    fYear--;
+                    fMonth=12.0;
+                }
+                aDate.SetYear( static_cast<sal_uInt16>(fYear) );
+                aDate.SetMonth( static_cast<sal_uInt16>(fMonth) );
+                aDate.SetDay( 1 );
+                double fMonthCount = (fYear*lcl_fNumberOfMonths)+fMonth;
+                double fDay = (value-fMonthCount)*aDate.GetDaysInMonth();
+                fDay += 1.0;
+                aDate.SetDay( static_cast<sal_uInt16>(::rtl::math::round(fDay)) );
+                fResult = aDate - m_aNullDate;
+                break;
+        }
+    }
+    return fResult;
+}
+
+uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling()
+    throw (uno::RuntimeException)
+{
+    return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted );
+}
+
+::rtl::OUString SAL_CALL InverseDateScaling::getServiceName()
+    throw (uno::RuntimeException)
+{
+    return lcl_aServiceName_InverseDateScaling;
+}
+
+uno::Sequence< ::rtl::OUString > InverseDateScaling::getSupportedServiceNames_Static()
+{
+    return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_InverseDateScaling, 1 );
+}
+
+// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
+APPHELPER_XSERVICEINFO_IMPL( InverseDateScaling, lcl_aServiceName_InverseDateScaling )
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx
new file mode 100644
index 000000000..6c93d24d3
--- /dev/null
+++ b/chart2/source/view/axes/DateScaling.hxx
@@ -0,0 +1,114 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _CHART2_DATESCALING_HXX
+#define _CHART2_DATESCALING_HXX
+#include "ServiceMacros.hxx"
+#include <com/sun/star/chart2/XScaling.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <cppuhelper/implbase3.hxx>
+#include <tools/date.hxx>
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+
+//-----------------------------------------------------------------------------
+/**
+*/
+
+class DateScaling :
+        public ::cppu::WeakImplHelper3 <
+        ::com::sun::star::chart2::XScaling,
+        ::com::sun::star::lang::XServiceName,
+        ::com::sun::star::lang::XServiceInfo
+        >
+{
+public:
+    DateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted );
+    virtual ~DateScaling();
+
+    /// declare XServiceInfo methods
+    APPHELPER_XSERVICEINFO_DECL()
+
+    // ____ XScaling ____
+    virtual double SAL_CALL doScaling( double value )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::chart2::XScaling > SAL_CALL
+        getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
+
+    // ____ XServiceName ____
+    virtual ::rtl::OUString SAL_CALL getServiceName()
+        throw (::com::sun::star::uno::RuntimeException);
+
+private:
+    const Date m_aNullDate;
+    const sal_Int32 m_nTimeUnit;
+    const bool m_bShifted;
+};
+
+class InverseDateScaling :
+        public ::cppu::WeakImplHelper3 <
+        ::com::sun::star::chart2::XScaling,
+        ::com::sun::star::lang::XServiceName,
+        ::com::sun::star::lang::XServiceInfo
+        >
+{
+public:
+    InverseDateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted );
+    virtual ~InverseDateScaling();
+
+    /// declare XServiceInfo methods
+    APPHELPER_XSERVICEINFO_DECL()
+
+    // ____ XScaling ____
+    virtual double SAL_CALL doScaling( double value )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::chart2::XScaling > SAL_CALL
+        getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
+
+    // ____ XServiceName ____
+    virtual ::rtl::OUString SAL_CALL getServiceName()
+        throw (::com::sun::star::uno::RuntimeException);
+
+private:
+    const Date m_aNullDate;
+    const sal_Int32 m_nTimeUnit;
+    const bool m_bShifted;
+};
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
+#endif
+
diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
index 2d12e46da..b99d6a772 100644
--- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
+++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
@@ -29,6 +29,9 @@
 #include "precompiled_chart2.hxx"
 
 #include "MinimumAndMaximumSupplier.hxx"
+
+#include <com/sun/star/chart/TimeUnit.hpp>
+
 #include <rtl/math.hxx>
 #include <com/sun/star/awt/Size.hpp>
 
@@ -196,6 +199,24 @@ void MergedMinimumAndMaximumSupplier::clearMinimumAndMaximumSupplierList()
     m_aMinimumAndMaximumSupplierList.clear();
 }
 
+long MergedMinimumAndMaximumSupplier::calculateTimeResolutionOnXAxis()
+{
+    long nRet = ::com::sun::star::chart::TimeUnit::YEAR;
+    for( MinimumAndMaximumSupplierSet::iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt )
+    {
+        long nCurrent = (*aIt)->calculateTimeResolutionOnXAxis();
+        if(nRet>nCurrent)
+            nRet=nCurrent;
+    }
+    return nRet;
+}
+
+void MergedMinimumAndMaximumSupplier::setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate )
+{
+    for( MinimumAndMaximumSupplierSet::iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt )
+        (*aIt)->setTimeResolutionOnXAxis( nTimeResolution, rNullDate );
+}
+
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 54d0eefa0..d4fa3c193 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -29,8 +29,12 @@
 #include "precompiled_chart2.hxx"
 #include "ScaleAutomatism.hxx"
 #include "macros.hxx"
-#include "TickmarkHelper.hxx"
+#include "Tickmarks_Equidistant.hxx"
+#include "DateHelper.hxx"
+#include "DateScaling.hxx"
 #include "AxisHelper.hxx"
+#include <com/sun/star/chart/TimeUnit.hpp>
+
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
 
@@ -40,6 +44,9 @@ namespace chart
 //.............................................................................
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
+using ::com::sun::star::chart::TimeUnit::DAY;
+using ::com::sun::star::chart::TimeUnit::MONTH;
+using ::com::sun::star::chart::TimeUnit::YEAR;
 
 const sal_Int32 MAXIMUM_MANUAL_INCREMENT_COUNT = 500;
 const sal_Int32 MAXIMUM_AUTO_INCREMENT_COUNT = 10;
@@ -56,7 +63,42 @@ void lcl_ensureMaximumSubIncrementCount( sal_Int32& rnSubIntervalCount )
 
 }//end anonymous namespace
 
-ScaleAutomatism::ScaleAutomatism( const ScaleData& rSourceScale )
+
+//.............................................................................
+
+ExplicitScaleData::ExplicitScaleData()
+    : Minimum(0.0)
+    , Maximum(10.0)
+    , Origin(0.0)
+    , Orientation(::com::sun::star::chart2::AxisOrientation_MATHEMATICAL)
+    , Scaling()
+    , AxisType(::com::sun::star::chart2::AxisType::REALNUMBER)
+    , ShiftedCategoryPosition(false)
+    , TimeResolution(::com::sun::star::chart::TimeUnit::DAY)
+    , NullDate(30,12,1899)
+{
+}
+
+ExplicitSubIncrement::ExplicitSubIncrement()
+    : IntervalCount(2)
+    , PostEquidistant(true)
+{
+}
+
+
+ExplicitIncrementData::ExplicitIncrementData()
+    : MajorTimeInterval(1,::com::sun::star::chart::TimeUnit::DAY)
+    , MinorTimeInterval(1,::com::sun::star::chart::TimeUnit::DAY)
+    , Distance(1.0)
+    , PostEquidistant(true)
+    , BaseValue(0.0)
+    , SubIncrements()
+{
+}
+
+//.............................................................................
+
+ScaleAutomatism::ScaleAutomatism( const ScaleData& rSourceScale, const Date& rNullDate )
                     : m_aSourceScale( rSourceScale )
                     , m_fValueMinimum( 0.0 )
                     , m_fValueMaximum( 0.0 )
@@ -65,6 +107,8 @@ ScaleAutomatism::ScaleAutomatism( const ScaleData& rSourceScale )
                     , m_bExpandIfValuesCloseToBorder( false )
                     , m_bExpandWideValuesToZero( false )
                     , m_bExpandNarrowValuesTowardZero( false )
+                    , m_nTimeResolution(::com::sun::star::chart::TimeUnit::DAY)
+                    , m_aNullDate(rNullDate)
 {
     ::rtl::math::setNan( &m_fValueMinimum );
     ::rtl::math::setNan( &m_fValueMaximum );
@@ -111,14 +155,19 @@ void ScaleAutomatism::setMaximumAutoMainIncrementCount( sal_Int32 nMaximumAutoMa
         m_nMaximumAutoMainIncrementCount = nMaximumAutoMainIncrementCount;
 }
 
+void ScaleAutomatism::setAutomaticTimeResolution( sal_Int32 nTimeResolution )
+{
+    m_nTimeResolution = nTimeResolution;
+}
+
 void ScaleAutomatism::calculateExplicitScaleAndIncrement(
         ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement ) const
 {
     // fill explicit scale
     rExplicitScale.Orientation = m_aSourceScale.Orientation;
     rExplicitScale.Scaling = m_aSourceScale.Scaling;
-    rExplicitScale.Breaks = m_aSourceScale.Breaks;
     rExplicitScale.AxisType = m_aSourceScale.AxisType;
+    rExplicitScale.NullDate = m_aNullDate;
 
     bool bAutoMinimum  = !(m_aSourceScale.Minimum >>= rExplicitScale.Minimum);
     bool bAutoMaximum = !(m_aSourceScale.Maximum >>= rExplicitScale.Maximum);
@@ -130,7 +179,12 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
         if( m_aSourceScale.AxisType==AxisType::PERCENT )
             rExplicitScale.Minimum = 0.0;
         else if( ::rtl::math::isNan( m_fValueMinimum ) )
-            rExplicitScale.Minimum = 0.0;   //@todo get Minimum from scaling or from plotter????
+        {
+            if( m_aSourceScale.AxisType==AxisType::DATE )
+                rExplicitScale.Minimum = 36526.0; //1.1.2000
+            else
+                rExplicitScale.Minimum = 0.0;   //@todo get Minimum from scaling or from plotter????
+        }
         else
             rExplicitScale.Minimum = m_fValueMinimum;
     }
@@ -141,7 +195,12 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
         if( m_aSourceScale.AxisType==AxisType::PERCENT )
             rExplicitScale.Maximum = 1.0;
         else if( ::rtl::math::isNan( m_fValueMaximum ) )
-            rExplicitScale.Maximum = 10.0;  //@todo get Maximum from scaling or from plotter????
+        {
+            if( m_aSourceScale.AxisType==AxisType::DATE )
+                rExplicitScale.Maximum = 40179.0; //1.1.2010
+            else
+                rExplicitScale.Maximum = 10.0;  //@todo get Maximum from scaling or from plotter????
+        }
         else
             rExplicitScale.Maximum = m_fValueMaximum;
     }
@@ -149,14 +208,14 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
     //---------------------------------------------------------------
     //fill explicit increment
 
-    rExplicitIncrement.ShiftedPosition = (m_aSourceScale.AxisType==AxisType::SERIES) ? true : false;
+    rExplicitScale.ShiftedCategoryPosition = m_aSourceScale.ShiftedCategoryPosition;
     bool bIsLogarithm = false;
 
     //minimum and maximum of the ExplicitScaleData may be changed if allowed
-    if( m_aSourceScale.AxisType==AxisType::CATEGORY || m_aSourceScale.AxisType==AxisType::SERIES )
-    {
+    if( m_aSourceScale.AxisType==AxisType::DATE )
+        calculateExplicitIncrementAndScaleForDateTimeAxis( rExplicitScale, rExplicitIncrement, bAutoMinimum, bAutoMaximum );
+    else if( m_aSourceScale.AxisType==AxisType::CATEGORY || m_aSourceScale.AxisType==AxisType::SERIES )
         calculateExplicitIncrementAndScaleForCategory( rExplicitScale, rExplicitIncrement, bAutoMinimum, bAutoMaximum );
-    }
     else
     {
         bIsLogarithm = AxisHelper::isLogarithmic( rExplicitScale.Scaling );
@@ -185,6 +244,11 @@ ScaleData ScaleAutomatism::getScale() const
 {
     return m_aSourceScale;
 }
+
+Date ScaleAutomatism::getNullDate() const
+{
+    return m_aNullDate;
+}
  
 // private --------------------------------------------------------------------
 
@@ -196,6 +260,9 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
     // no scaling for categories
     rExplicitScale.Scaling.clear();
 
+    if( rExplicitScale.ShiftedCategoryPosition )
+        rExplicitScale.Maximum += 1.0;
+
     // ensure that at least one category is visible
     if( rExplicitScale.Maximum <= rExplicitScale.Minimum )
         rExplicitScale.Maximum = rExplicitScale.Minimum + 1.0;
@@ -207,9 +274,9 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
 
     // automatic minimum and maximum
     if( bAutoMinimum && m_bExpandBorderToIncrementRhythm )
-        rExplicitScale.Minimum = TickmarkHelper::getMinimumAtIncrement( rExplicitScale.Minimum, rExplicitIncrement );
+        rExplicitScale.Minimum = EquidistantTickFactory::getMinimumAtIncrement( rExplicitScale.Minimum, rExplicitIncrement );
     if( bAutoMaximum && m_bExpandBorderToIncrementRhythm )
-        rExplicitScale.Maximum = TickmarkHelper::getMaximumAtIncrement( rExplicitScale.Maximum, rExplicitIncrement );
+        rExplicitScale.Maximum = EquidistantTickFactory::getMaximumAtIncrement( rExplicitScale.Maximum, rExplicitIncrement );
 
     //prevent performace killover
     double fDistanceCount = ::rtl::math::approxFloor( (rExplicitScale.Maximum-rExplicitScale.Minimum) / rExplicitIncrement.Distance );
@@ -223,29 +290,28 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
     //---------------------------------------------------------------
     //fill explicit sub increment
     sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength();
-    rExplicitIncrement.SubIncrements.realloc(nSubCount);
     for( sal_Int32 nN=0; nN<nSubCount; nN++ )
     {
-        const SubIncrement&     rSubIncrement         = m_aSourceScale.IncrementData.SubIncrements[nN];
-        ExplicitSubIncrement&   rExplicitSubIncrement = rExplicitIncrement.SubIncrements[nN];
-
-        if(!(rSubIncrement.IntervalCount>>=rExplicitSubIncrement.IntervalCount))
+        ExplicitSubIncrement aExplicitSubIncrement;
+        const SubIncrement& rSubIncrement= m_aSourceScale.IncrementData.SubIncrements[nN];
+        if(!(rSubIncrement.IntervalCount>>=aExplicitSubIncrement.IntervalCount))
         {
             //scaling dependent
             //@todo autocalculate IntervalCount dependent on MainIncrement and scaling
-            rExplicitSubIncrement.IntervalCount = 2;
+            aExplicitSubIncrement.IntervalCount = 2;
         }
-        lcl_ensureMaximumSubIncrementCount( rExplicitSubIncrement.IntervalCount );
-        if(!(rSubIncrement.PostEquidistant>>=rExplicitSubIncrement.PostEquidistant))
+        lcl_ensureMaximumSubIncrementCount( aExplicitSubIncrement.IntervalCount );
+        if(!(rSubIncrement.PostEquidistant>>=aExplicitSubIncrement.PostEquidistant))
         {
             //scaling dependent
-            rExplicitSubIncrement.PostEquidistant = sal_False;
+            aExplicitSubIncrement.PostEquidistant = sal_False;
         }
+        rExplicitIncrement.SubIncrements.push_back(aExplicitSubIncrement);
     }
 }
 
-//@todo these method should become part of the scaling interface and implementation somehow
-//@todo problem with outparamters at api
+//-----------------------------------------------------------------------------------------
+
 void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
         ExplicitScaleData& rExplicitScale,
         ExplicitIncrementData& rExplicitIncrement,
@@ -412,7 +478,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
         // round to entire multiples of the distance and add additional space
         if( bAutoMinimum && m_bExpandBorderToIncrementRhythm )
         {
-            fAxisMinimum = TickmarkHelper::getMinimumAtIncrement( fAxisMinimum, rExplicitIncrement );
+            fAxisMinimum = EquidistantTickFactory::getMinimumAtIncrement( fAxisMinimum, rExplicitIncrement );
 
             //ensure valid values after scaling #i100995#
             if( !bAutoDistance )
@@ -428,7 +494,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
         }
         if( bAutoMaximum && m_bExpandBorderToIncrementRhythm )
         {
-            fAxisMaximum = TickmarkHelper::getMaximumAtIncrement( fAxisMaximum, rExplicitIncrement );
+            fAxisMaximum = EquidistantTickFactory::getMaximumAtIncrement( fAxisMaximum, rExplicitIncrement );
 
             //ensure valid values after scaling #i100995#
             if( !bAutoDistance )
@@ -488,27 +554,210 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
     //---------------------------------------------------------------
     //fill explicit sub increment
     sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength();
-    rExplicitIncrement.SubIncrements.realloc(nSubCount);
     for( sal_Int32 nN=0; nN<nSubCount; nN++ )
     {
-        const SubIncrement&     rSubIncrement         = m_aSourceScale.IncrementData.SubIncrements[nN];
-        ExplicitSubIncrement&   rExplicitSubIncrement = rExplicitIncrement.SubIncrements[nN];
-
-        if(!(rSubIncrement.IntervalCount>>=rExplicitSubIncrement.IntervalCount))
+        ExplicitSubIncrement aExplicitSubIncrement;
+        const SubIncrement& rSubIncrement = m_aSourceScale.IncrementData.SubIncrements[nN];
+        if(!(rSubIncrement.IntervalCount>>=aExplicitSubIncrement.IntervalCount))
         {
             //scaling dependent
             //@todo autocalculate IntervalCount dependent on MainIncrement and scaling
-            rExplicitSubIncrement.IntervalCount = 9;
+            aExplicitSubIncrement.IntervalCount = 9;
         }
-        lcl_ensureMaximumSubIncrementCount( rExplicitSubIncrement.IntervalCount );
-        if(!(rSubIncrement.PostEquidistant>>=rExplicitSubIncrement.PostEquidistant))
+        lcl_ensureMaximumSubIncrementCount( aExplicitSubIncrement.IntervalCount );
+        if(!(rSubIncrement.PostEquidistant>>=aExplicitSubIncrement.PostEquidistant))
         {
             //scaling dependent
-            rExplicitSubIncrement.PostEquidistant = sal_False;
+            aExplicitSubIncrement.PostEquidistant = sal_False;
         }
+        rExplicitIncrement.SubIncrements.push_back(aExplicitSubIncrement);
     }
 }
 
+//-----------------------------------------------------------------------------------------
+
+void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
+        ExplicitScaleData& rExplicitScale,
+        ExplicitIncrementData& rExplicitIncrement,
+        bool bAutoMinimum, bool bAutoMaximum ) const
+{
+    Date aMinDate(m_aNullDate); aMinDate += static_cast<long>(::rtl::math::approxFloor(rExplicitScale.Minimum));
+    Date aMaxDate(m_aNullDate); aMaxDate += static_cast<long>(::rtl::math::approxFloor(rExplicitScale.Maximum));
+    rExplicitIncrement.PostEquidistant = sal_False;
+
+    if( aMinDate > aMaxDate )
+    {
+        std::swap(aMinDate,aMaxDate);
+    }
+
+    if( !(m_aSourceScale.TimeIncrement.TimeResolution >>= rExplicitScale.TimeResolution) )
+        rExplicitScale.TimeResolution = m_nTimeResolution;
+
+    rExplicitScale.Scaling = new DateScaling(m_aNullDate,rExplicitScale.TimeResolution,false);
+
+    // choose min and max suitable to time resolution
+    switch( rExplicitScale.TimeResolution )
+    {
+    case DAY:
+        if( rExplicitScale.ShiftedCategoryPosition )
+            aMaxDate++;//for explicit scales we need one interval more (maximum excluded)
+        break;
+    case MONTH:
+        aMinDate.SetDay(1);
+        aMaxDate.SetDay(1);
+        if( rExplicitScale.ShiftedCategoryPosition )
+            aMaxDate = DateHelper::GetDateSomeMonthsAway(aMaxDate,1);//for explicit scales we need one interval more (maximum excluded)
+        if( DateHelper::IsLessThanOneMonthAway( aMinDate, aMaxDate ) )
+        {
+            if( bAutoMaximum || !bAutoMinimum )
+                aMaxDate = DateHelper::GetDateSomeMonthsAway(aMinDate,1);
+            else
+                aMinDate = DateHelper::GetDateSomeMonthsAway(aMaxDate,-1);
+        }
+        break;
+    case YEAR:
+        aMinDate.SetDay(1);
+        aMinDate.SetMonth(1);
+        aMaxDate.SetDay(1);
+        aMaxDate.SetMonth(1);
+        if( rExplicitScale.ShiftedCategoryPosition )
+            aMaxDate = DateHelper::GetDateSomeYearsAway(aMaxDate,1);//for explicit scales we need one interval more (maximum excluded)
+        if( DateHelper::IsLessThanOneYearAway( aMinDate, aMaxDate ) )
+        {
+            if( bAutoMaximum || !bAutoMinimum )
+                aMaxDate = DateHelper::GetDateSomeYearsAway(aMinDate,1);
+            else
+                aMinDate = DateHelper::GetDateSomeYearsAway(aMaxDate,-1);
+        }
+        break;
+    }
+    
+    // set the resulting limits (swap back to negative range if needed)
+    rExplicitScale.Minimum = aMinDate - m_aNullDate;
+    rExplicitScale.Maximum = aMaxDate - m_aNullDate;
+
+    bool bAutoMajor = !(m_aSourceScale.TimeIncrement.MajorTimeInterval >>= rExplicitIncrement.MajorTimeInterval);
+    bool bAutoMinor = !(m_aSourceScale.TimeIncrement.MinorTimeInterval >>= rExplicitIncrement.MinorTimeInterval);
+
+    sal_Int32 nMaxMainIncrementCount = bAutoMajor ?
+        m_nMaximumAutoMainIncrementCount : MAXIMUM_MANUAL_INCREMENT_COUNT;
+    if( nMaxMainIncrementCount > 1 )
+        nMaxMainIncrementCount--;
+
+        
+    //choose major time interval:
+    long nDayCount = (aMaxDate-aMinDate);
+    long nMainIncrementCount = 1;
+    if( !bAutoMajor )
+    {
+        long nIntervalDayCount = rExplicitIncrement.MajorTimeInterval.Number;
+        if( rExplicitIncrement.MajorTimeInterval.TimeUnit < rExplicitScale.TimeResolution )
+            rExplicitIncrement.MajorTimeInterval.TimeUnit = rExplicitScale.TimeResolution;
+        switch( rExplicitIncrement.MajorTimeInterval.TimeUnit )
+        {
+        case DAY:
+            break;
+        case MONTH:
+            nIntervalDayCount*=31;//todo: maybe different for other calendars... get localized calendar according to set number format at axis ...
+            break;
+        case YEAR:
+            nIntervalDayCount*=365;//todo: maybe different for other calendars... get localized calendar according to set number format at axis ...
+            break;
+        }
+        nMainIncrementCount = nDayCount/nIntervalDayCount;
+        if( nMainIncrementCount > nMaxMainIncrementCount )
+            bAutoMajor = true;
+    }
+    if( bAutoMajor )
+    {
+        long nNumer = 1;
+        long nIntervalDays =  nDayCount / nMaxMainIncrementCount;
+        double nDaysPerInterval = 1.0;
+        if( nIntervalDays>365 || YEAR==rExplicitScale.TimeResolution )
+        {
+            rExplicitIncrement.MajorTimeInterval.TimeUnit = YEAR;
+            nDaysPerInterval = 365.0;//todo: maybe different for other calendars... get localized calendar according to set number format at axis ...
+        }
+        else if( nIntervalDays>31 || MONTH==rExplicitScale.TimeResolution )
+        {
+            rExplicitIncrement.MajorTimeInterval.TimeUnit = MONTH;
+            nDaysPerInterval = 31.0;//todo: maybe different for other calendars... get localized calendar according to set number format at axis ...
+        }
+        else
+        {
+            rExplicitIncrement.MajorTimeInterval.TimeUnit = DAY;
+            nDaysPerInterval = 1.0;
+        }
+
+        nNumer = static_cast<sal_Int32>( rtl::math::approxCeil( nIntervalDays/nDaysPerInterval ) );
+        if(nNumer<=0)
+            nNumer=1;
+        rExplicitIncrement.MajorTimeInterval.Number = nNumer;
+        nMainIncrementCount = nDayCount/(nNumer*nDaysPerInterval);
+    }
+
+    //choose minor time interval:
+    if( !bAutoMinor )
+    {
+        if( rExplicitIncrement.MinorTimeInterval.TimeUnit > rExplicitIncrement.MajorTimeInterval.TimeUnit )
+            rExplicitIncrement.MinorTimeInterval.TimeUnit = rExplicitIncrement.MajorTimeInterval.TimeUnit;
+        long nIntervalDayCount = rExplicitIncrement.MinorTimeInterval.Number;
+        switch( rExplicitIncrement.MinorTimeInterval.TimeUnit )
+        {
+        case DAY:
+            break;
+        case MONTH:
+            nIntervalDayCount*=31;//todo: maybe different for other calendars... get localized calendar according to set number format at axis ...
+            break;
+        case YEAR:
+            nIntervalDayCount*=365;//todo: maybe different for other calendars... get localized calendar according to set number format at axis ...
+            break;
+        }
+        if( nDayCount/nIntervalDayCount > nMaxMainIncrementCount )
+            bAutoMinor = true;
+    }
+    if( bAutoMinor )
+    {
+        rExplicitIncrement.MinorTimeInterval.TimeUnit = rExplicitIncrement.MajorTimeInterval.TimeUnit; 
+        rExplicitIncrement.MinorTimeInterval.Number = 1;
+        if( nMainIncrementCount > 100 )
+            rExplicitIncrement.MinorTimeInterval.Number = rExplicitIncrement.MajorTimeInterval.Number;
+        else
+        {
+            if( rExplicitIncrement.MajorTimeInterval.Number >= 2 )
+            {
+                if( !(rExplicitIncrement.MajorTimeInterval.Number%2) )
+                    rExplicitIncrement.MinorTimeInterval.Number = rExplicitIncrement.MajorTimeInterval.Number/2;
+                else if( !(rExplicitIncrement.MajorTimeInterval.Number%3) )
+                    rExplicitIncrement.MinorTimeInterval.Number = rExplicitIncrement.MajorTimeInterval.Number/3;
+                else if( !(rExplicitIncrement.MajorTimeInterval.Number%5) )
+                    rExplicitIncrement.MinorTimeInterval.Number = rExplicitIncrement.MajorTimeInterval.Number/5;
+                else if( rExplicitIncrement.MajorTimeInterval.Number > 50 )
+                    rExplicitIncrement.MinorTimeInterval.Number = rExplicitIncrement.MajorTimeInterval.Number;
+            }
+            else
+            {
+                switch( rExplicitIncrement.MajorTimeInterval.TimeUnit )
+                {
+                    case DAY:
+                        break;
+                    case MONTH:
+                        if( rExplicitScale.TimeResolution == DAY )
+                            rExplicitIncrement.MinorTimeInterval.TimeUnit = DAY;
+                        break;
+                    case YEAR:
+                        if( rExplicitScale.TimeResolution <= MONTH )
+                            rExplicitIncrement.MinorTimeInterval.TimeUnit = MONTH;
+                        break;
+                }
+            }
+        }
+    }
+    
+}
+
+//-----------------------------------------------------------------------------------------
+
 void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
         ExplicitScaleData& rExplicitScale,
         ExplicitIncrementData& rExplicitIncrement,
@@ -692,7 +941,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
         {
             // round to entire multiples of the distance, based on the base value
             if( m_bExpandBorderToIncrementRhythm )
-                fAxisMinimum = TickmarkHelper::getMinimumAtIncrement( fAxisMinimum, rExplicitIncrement );
+                fAxisMinimum = EquidistantTickFactory::getMinimumAtIncrement( fAxisMinimum, rExplicitIncrement );
             // additional space, if source minimum is to near at axis minimum
             if( m_bExpandIfValuesCloseToBorder )
                 if( (fAxisMinimum != 0.0) && ((fAxisMaximum - fSourceMinimum) / (fAxisMaximum - fAxisMinimum) > 20.0 / 21.0) )
@@ -702,7 +951,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
         {
             // round to entire multiples of the distance, based on the base value
             if( m_bExpandBorderToIncrementRhythm )
-                fAxisMaximum = TickmarkHelper::getMaximumAtIncrement( fAxisMaximum, rExplicitIncrement );
+                fAxisMaximum = EquidistantTickFactory::getMaximumAtIncrement( fAxisMaximum, rExplicitIncrement );
             // additional space, if source maximum is to near at axis maximum
             if( m_bExpandIfValuesCloseToBorder )
                 if( (fAxisMaximum != 0.0) && ((fSourceMaximum - fAxisMinimum) / (fAxisMaximum - fAxisMinimum) > 20.0 / 21.0) )
@@ -734,24 +983,23 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
     //---------------------------------------------------------------
     //fill explicit sub increment
     sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength();
-    rExplicitIncrement.SubIncrements.realloc(nSubCount);
     for( sal_Int32 nN=0; nN<nSubCount; nN++ )
     {
-        const SubIncrement&     rSubIncrement         = m_aSourceScale.IncrementData.SubIncrements[nN];
-        ExplicitSubIncrement&   rExplicitSubIncrement = rExplicitIncrement.SubIncrements[nN];
-
-        if(!(rSubIncrement.IntervalCount>>=rExplicitSubIncrement.IntervalCount))
+        ExplicitSubIncrement aExplicitSubIncrement;
+        const SubIncrement& rSubIncrement= m_aSourceScale.IncrementData.SubIncrements[nN];
+        if(!(rSubIncrement.IntervalCount>>=aExplicitSubIncrement.IntervalCount))
         {
             //scaling dependent
             //@todo autocalculate IntervalCount dependent on MainIncrement and scaling
-            rExplicitSubIncrement.IntervalCount = 2;
+            aExplicitSubIncrement.IntervalCount = 2;
         }
-        lcl_ensureMaximumSubIncrementCount( rExplicitSubIncrement.IntervalCount );
-        if(!(rSubIncrement.PostEquidistant>>=rExplicitSubIncrement.PostEquidistant))
+        lcl_ensureMaximumSubIncrementCount( aExplicitSubIncrement.IntervalCount );
+        if(!(rSubIncrement.PostEquidistant>>=aExplicitSubIncrement.PostEquidistant))
         {
             //scaling dependent
-            rExplicitSubIncrement.PostEquidistant = sal_False;
+            aExplicitSubIncrement.PostEquidistant = sal_False;
         }
+        rExplicitIncrement.SubIncrements.push_back(aExplicitSubIncrement);
     }
 }
 
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
new file mode 100644
index 000000000..27d42f55f
--- /dev/null
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -0,0 +1,333 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_chart2.hxx"
+#include "Tickmarks.hxx"
+#include "Tickmarks_Equidistant.hxx"
+#include "Tickmarks_Dates.hxx"
+#include "ViewDefines.hxx"
+#include <rtl/math.hxx>
+#include <tools/debug.hxx>
+#include <memory>
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::chart2;
+using namespace ::rtl::math;
+using ::basegfx::B2DVector;
+
+TickInfo::TickInfo( const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::chart2::XScaling >& xInverse )
+: fScaledTickValue( 0.0 )
+, xInverseScaling( xInverse )
+, aTickScreenPosition(0.0,0.0)
+, bPaintIt( true )
+, xTextShape( NULL )
+, nFactorForLimitedTextWidth(1)
+{
+}
+
+double TickInfo::getUnscaledTickValue() const
+{
+    if( xInverseScaling.is() )
+        return xInverseScaling->doScaling( fScaledTickValue );
+    else
+        return fScaledTickValue;
+}
+
+sal_Int32 TickInfo::getScreenDistanceBetweenTicks( const TickInfo& rOherTickInfo ) const
+{
+    //return the positive distance between the two first tickmarks in screen values
+
+    B2DVector aDistance = rOherTickInfo.aTickScreenPosition - aTickScreenPosition;
+    sal_Int32 nRet = static_cast<sal_Int32>(aDistance.getLength());
+    if(nRet<0)
+        nRet *= -1;
+    return nRet;
+}
+
+PureTickIter::PureTickIter( ::std::vector< TickInfo >& rTickInfoVector )
+            : m_rTickVector(rTickInfoVector)
+            , m_aTickIter(m_rTickVector.begin())
+{
+}
+PureTickIter::~PureTickIter()
+{
+}
+TickInfo* PureTickIter::firstInfo()
+{
+    m_aTickIter = m_rTickVector.begin();
+    if(m_aTickIter!=m_rTickVector.end())
+        return &*m_aTickIter;
+    return 0;
+}
+TickInfo* PureTickIter::nextInfo()
+{
+    if(m_aTickIter!=m_rTickVector.end())
+    {
+        m_aTickIter++;
+        if(m_aTickIter!=m_rTickVector.end())
+            return &*m_aTickIter;
+    }
+    return 0;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+TickFactory::TickFactory(
+          const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
+            : m_rScale( rScale )
+            , m_rIncrement( rIncrement )
+            , m_xInverseScaling(NULL)
+{
+    //@todo: make sure that the scale is valid for the scaling
+
+    if( m_rScale.Scaling.is() )
+    {
+        m_xInverseScaling = m_rScale.Scaling->getInverseScaling();
+        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+    }
+    
+    m_fScaledVisibleMin = m_rScale.Minimum;
+    if( m_xInverseScaling.is() )
+        m_fScaledVisibleMin = m_rScale.Scaling->doScaling(m_fScaledVisibleMin);
+
+    m_fScaledVisibleMax = m_rScale.Maximum;
+    if( m_xInverseScaling.is() )
+        m_fScaledVisibleMax = m_rScale.Scaling->doScaling(m_fScaledVisibleMax);
+}
+
+TickFactory::~TickFactory()
+{
+}
+
+bool TickFactory::isDateAxis() const
+{
+    return m_rScale.AxisType == AxisType::DATE;
+}
+
+void TickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
+{
+    if( isDateAxis() )
+        DateTickFactory( m_rScale, m_rIncrement ).getAllTicks( rAllTickInfos );
+    else
+        EquidistantTickFactory( m_rScale, m_rIncrement ).getAllTicks( rAllTickInfos );
+}
+
+void TickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
+{
+    if( isDateAxis() )
+        DateTickFactory( m_rScale, m_rIncrement ).getAllTicksShifted( rAllTickInfos );
+    else
+        EquidistantTickFactory( m_rScale, m_rIncrement ).getAllTicksShifted( rAllTickInfos );
+}
+
+//-----------------------------------------------------------------------------
+// ___TickFactory_2D___
+//-----------------------------------------------------------------------------
+TickFactory_2D::TickFactory_2D(
+          const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement
+          //, double fStrech_SceneToScreen, double fOffset_SceneToScreen )
+          , const B2DVector& rStartScreenPos, const B2DVector& rEndScreenPos
+          , const B2DVector& rAxisLineToLabelLineShift )
+          : TickFactory( rScale, rIncrement )
+          , m_aAxisStartScreenPosition2D(rStartScreenPos)
+          , m_aAxisEndScreenPosition2D(rEndScreenPos)
+          , m_aAxisLineToLabelLineShift(rAxisLineToLabelLineShift)
+          , m_fStrech_LogicToScreen(1.0)
+          , m_fOffset_LogicToScreen(0.0)
+{
+    double fWidthY = m_fScaledVisibleMax - m_fScaledVisibleMin;
+    if( AxisOrientation_MATHEMATICAL==m_rScale.Orientation )
+    {
+        m_fStrech_LogicToScreen = 1.0/fWidthY;
+        m_fOffset_LogicToScreen = -m_fScaledVisibleMin;
+    }
+    else
+    {
+        B2DVector aSwap(m_aAxisStartScreenPosition2D);
+        m_aAxisStartScreenPosition2D = m_aAxisEndScreenPosition2D;
+        m_aAxisEndScreenPosition2D = aSwap;
+
+        m_fStrech_LogicToScreen = -1.0/fWidthY;
+        m_fOffset_LogicToScreen = -m_fScaledVisibleMax;
+    }
+}
+
+TickFactory_2D::~TickFactory_2D()
+{
+}
+
+bool TickFactory_2D::isHorizontalAxis() const
+{
+    return ( m_aAxisStartScreenPosition2D.getY() == m_aAxisEndScreenPosition2D.getY() );
+}
+bool TickFactory_2D::isVerticalAxis() const
+{
+    return ( m_aAxisStartScreenPosition2D.getX() == m_aAxisEndScreenPosition2D.getX() );
+}
+
+//static
+sal_Int32 TickFactory_2D::getTickScreenDistance( TickIter& rIter )
+{
+    //return the positive distance between the two first tickmarks in screen values
+    //if there are less than two tickmarks -1 is returned
+
+    const TickInfo* pFirstTickInfo = rIter.firstInfo();
+    const TickInfo* pSecondTickInfo = rIter.nextInfo();
+    if(!pSecondTickInfo  || !pFirstTickInfo)
+        return -1;
+
+    return pFirstTickInfo->getScreenDistanceBetweenTicks( *pSecondTickInfo );
+}
+
+B2DVector TickFactory_2D::getTickScreenPosition2D( double fScaledLogicTickValue ) const
+{
+    B2DVector aRet(m_aAxisStartScreenPosition2D);
+    aRet += (m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D)
+                *((fScaledLogicTickValue+m_fOffset_LogicToScreen)*m_fStrech_LogicToScreen);
+    return aRet;
+}
+
+void TickFactory_2D::addPointSequenceForTickLine( drawing::PointSequenceSequence& rPoints
+                                , sal_Int32 nSequenceIndex
+                                , double fScaledLogicTickValue, double fInnerDirectionSign
+                                , const TickmarkProperties& rTickmarkProperties
+                                , bool bPlaceAtLabels ) const
+{
+    if( fInnerDirectionSign==0.0 )
+        fInnerDirectionSign = 1.0;
+
+    B2DVector aTickScreenPosition = this->getTickScreenPosition2D(fScaledLogicTickValue);
+    if( bPlaceAtLabels )
+        aTickScreenPosition += m_aAxisLineToLabelLineShift;
+
+    B2DVector aMainDirection = m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D;
+    aMainDirection.normalize();
+    B2DVector aOrthoDirection(-aMainDirection.getY(),aMainDirection.getX());
+    aOrthoDirection *= fInnerDirectionSign;
+    aOrthoDirection.normalize();
+
+    B2DVector aStart = aTickScreenPosition + aOrthoDirection*rTickmarkProperties.RelativePos;
+    B2DVector aEnd = aStart - aOrthoDirection*rTickmarkProperties.Length;
+
+    rPoints[nSequenceIndex].realloc(2);
+    rPoints[nSequenceIndex][0].X = static_cast<sal_Int32>(aStart.getX());
+    rPoints[nSequenceIndex][0].Y = static_cast<sal_Int32>(aStart.getY());
+    rPoints[nSequenceIndex][1].X = static_cast<sal_Int32>(aEnd.getX());
+    rPoints[nSequenceIndex][1].Y = static_cast<sal_Int32>(aEnd.getY());
+}
+
+B2DVector TickFactory_2D::getDistanceAxisTickToText( const AxisProperties& rAxisProperties, bool bIncludeFarAwayDistanceIfSo, bool bIncludeSpaceBetweenTickAndText ) const
+{
+    bool bFarAwayLabels = false;
+    if( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START == rAxisProperties.m_eLabelPos
+        || ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == rAxisProperties.m_eLabelPos )
+        bFarAwayLabels = true;
+
+    double fInnerDirectionSign = rAxisProperties.m_fInnerDirectionSign;
+    if( fInnerDirectionSign==0.0 )
+        fInnerDirectionSign = 1.0;
+
+    B2DVector aMainDirection = m_aAxisEndScreenPosition2D-m_aAxisStartScreenPosition2D;
+    aMainDirection.normalize();
+    B2DVector aOrthoDirection(-aMainDirection.getY(),aMainDirection.getX());
+    aOrthoDirection *= fInnerDirectionSign;
+    aOrthoDirection.normalize();
+
+    B2DVector aStart(0,0), aEnd(0,0);
+    if( bFarAwayLabels )
+    {
+        TickmarkProperties aProps( AxisProperties::getBiggestTickmarkProperties() );
+        aStart = aOrthoDirection*aProps.RelativePos;
+        aEnd = aStart - aOrthoDirection*aProps.Length;
+    }
+    else
+    {
+        for( sal_Int32 nN=rAxisProperties.m_aTickmarkPropertiesList.size();nN--;)
+        {
+            const TickmarkProperties& rProps = rAxisProperties.m_aTickmarkPropertiesList[nN];
+            B2DVector aNewStart = aOrthoDirection*rProps.RelativePos;
+            B2DVector aNewEnd = aNewStart - aOrthoDirection*rProps.Length;
+            if(aNewStart.getLength()>aStart.getLength())
+                aStart=aNewStart;
+            if(aNewEnd.getLength()>aEnd.getLength())
+                aEnd=aNewEnd;
+        }
+    }
+
+    B2DVector aLabelDirection(aStart);
+    if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign )
+        aLabelDirection = aEnd;
+
+    B2DVector aOrthoLabelDirection(aOrthoDirection);
+    if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign )
+        aOrthoLabelDirection*=-1.0;
+    aOrthoLabelDirection.normalize();
+    if( bIncludeSpaceBetweenTickAndText )
+        aLabelDirection += aOrthoLabelDirection*AXIS2D_TICKLABELSPACING;
+    if( bFarAwayLabels && bIncludeFarAwayDistanceIfSo )
+        aLabelDirection += m_aAxisLineToLabelLineShift;
+    return aLabelDirection;
+}
+
+void TickFactory_2D::createPointSequenceForAxisMainLine( drawing::PointSequenceSequence& rPoints ) const
+{
+    rPoints[0].realloc(2);
+    rPoints[0][0].X = static_cast<sal_Int32>(m_aAxisStartScreenPosition2D.getX());
+    rPoints[0][0].Y = static_cast<sal_Int32>(m_aAxisStartScreenPosition2D.getY());
+    rPoints[0][1].X = static_cast<sal_Int32>(m_aAxisEndScreenPosition2D.getX());
+    rPoints[0][1].Y = static_cast<sal_Int32>(m_aAxisEndScreenPosition2D.getY());
+}
+
+void TickFactory_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
+{
+    //get the transformed screen values for all tickmarks in rAllTickInfos
+    ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter       = rAllTickInfos.begin();
+    const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd  = rAllTickInfos.end();
+    for( ; aDepthIter != aDepthEnd; aDepthIter++ )
+    {
+        ::std::vector< TickInfo >::iterator       aTickIter = (*aDepthIter).begin();
+        const ::std::vector< TickInfo >::const_iterator aTickEnd  = (*aDepthIter).end();
+        for( ; aTickIter != aTickEnd; aTickIter++ )
+        {
+            TickInfo& rTickInfo = (*aTickIter);
+            rTickInfo.aTickScreenPosition =
+                this->getTickScreenPosition2D( rTickInfo.fScaledTickValue );
+        }
+    }
+}
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx
new file mode 100644
index 000000000..4fea37523
--- /dev/null
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -0,0 +1,166 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _CHART2_TICKMARKS_HXX
+#define _CHART2_TICKMARKS_HXX
+
+#include "TickmarkProperties.hxx"
+#include "VAxisProperties.hxx"
+#include "chartview/ExplicitScaleValues.hxx"
+#include <basegfx/vector/b2dvector.hxx>
+#include <com/sun/star/drawing/PointSequenceSequence.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/uno/Sequence.h>
+
+#include <vector>
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+
+using ::basegfx::B2DVector;
+//-----------------------------------------------------------------------------
+/**
+*/
+
+struct TickInfo
+{
+    double      fScaledTickValue;
+    ::com::sun::star::uno::Reference<
+                    ::com::sun::star::chart2::XScaling > xInverseScaling;
+    
+    ::basegfx::B2DVector  aTickScreenPosition;
+    bool        bPaintIt;
+
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::drawing::XShape > xTextShape;
+
+    rtl::OUString aText;//used only for complex categories so far
+    sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category
+
+//methods:
+    TickInfo( const ::com::sun::star::uno::Reference<
+                    ::com::sun::star::chart2::XScaling >& xInverseScaling );
+
+    double getUnscaledTickValue() const;
+    sal_Int32 getScreenDistanceBetweenTicks( const TickInfo& rOherTickInfo ) const;
+private:
+    TickInfo();
+};
+class TickIter
+{
+public:
+    virtual ~TickIter(){};
+    virtual TickInfo* firstInfo()=0;
+    virtual TickInfo* nextInfo()=0;
+};
+
+class PureTickIter : public TickIter
+{
+public:
+    PureTickIter( ::std::vector< TickInfo >& rTickInfoVector );
+    virtual ~PureTickIter();
+    virtual TickInfo* firstInfo();
+    virtual TickInfo* nextInfo();
+
+private:
+    ::std::vector< TickInfo >& m_rTickVector;
+    ::std::vector< TickInfo >::iterator m_aTickIter;
+};
+
+class TickFactory
+{
+public:
+    TickFactory(
+         const ExplicitScaleData& rScale
+        , const ExplicitIncrementData& rIncrement );
+    virtual ~TickFactory();
+
+    void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
+    void getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
+    virtual void updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& /*rAllTickInfos*/ ) const {}
+
+private: //methods
+    bool        isDateAxis() const;
+    
+protected: //member
+    ExplicitScaleData     m_rScale;
+    ExplicitIncrementData m_rIncrement;
+    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling >
+                                                m_xInverseScaling;
+
+    //minimum and maximum of the visible range after scaling
+    double    m_fScaledVisibleMin;
+    double    m_fScaledVisibleMax;
+};
+
+class TickFactory_2D : public TickFactory
+{
+public:
+    TickFactory_2D(
+        const ExplicitScaleData& rScale
+        , const ExplicitIncrementData& rIncrement
+        , const ::basegfx::B2DVector& rStartScreenPos, const ::basegfx::B2DVector& rEndScreenPos
+        , const ::basegfx::B2DVector& rAxisLineToLabelLineShift );
+        //, double fStrech_SceneToScreen, double fOffset_SceneToScreen );
+    virtual ~TickFactory_2D();
+
+    static sal_Int32    getTickScreenDistance( TickIter& rIter );
+
+    void createPointSequenceForAxisMainLine( ::com::sun::star::drawing::PointSequenceSequence& rPoints ) const;
+    void addPointSequenceForTickLine( ::com::sun::star::drawing::PointSequenceSequence& rPoints
+                            , sal_Int32 nSequenceIndex
+                            , double fScaledLogicTickValue, double fInnerDirectionSign
+                            , const TickmarkProperties& rTickmarkProperties, bool bPlaceAtLabels ) const;
+    ::basegfx::B2DVector  getDistanceAxisTickToText( const AxisProperties& rAxisProperties
+        , bool bIncludeFarAwayDistanceIfSo = false
+        , bool bIncludeSpaceBetweenTickAndText = true ) const;
+
+    virtual void        updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
+
+    bool  isHorizontalAxis() const;
+    bool  isVerticalAxis() const;
+
+protected: //methods
+    ::basegfx::B2DVector     getTickScreenPosition2D( double fScaledLogicTickValue ) const;
+
+private: //member
+    ::basegfx::B2DVector    m_aAxisStartScreenPosition2D;
+    ::basegfx::B2DVector    m_aAxisEndScreenPosition2D;
+
+    //labels might be posioned high or low on the border of the diagram far away from the axis
+    //add this vector to go from the axis line to the label line (border of the diagram)
+    ::basegfx::B2DVector    m_aAxisLineToLabelLineShift;
+    
+    double      m_fStrech_LogicToScreen;
+    double      m_fOffset_LogicToScreen;
+};
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
+#endif
diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx
new file mode 100644
index 000000000..9a9cc85ef
--- /dev/null
+++ b/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -0,0 +1,171 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_chart2.hxx"
+#include "Tickmarks_Dates.hxx"
+#include "DateScaling.hxx"
+#include <rtl/math.hxx>
+#include <tools/debug.hxx>
+#include "DateHelper.hxx"
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::chart2;
+using namespace ::rtl::math;
+using ::basegfx::B2DVector;
+using ::com::sun::star::chart::TimeUnit::DAY;
+using ::com::sun::star::chart::TimeUnit::MONTH;
+using ::com::sun::star::chart::TimeUnit::YEAR;
+
+DateTickFactory::DateTickFactory(
+          const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
+            : m_aScale( rScale )
+            , m_aIncrement( rIncrement )
+            , m_xInverseScaling(NULL)
+{
+    //@todo: make sure that the scale is valid for the scaling
+
+    if( m_aScale.Scaling.is() )
+    {
+        m_xInverseScaling = m_aScale.Scaling->getInverseScaling();
+        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+    }
+    
+    m_fScaledVisibleMin = m_aScale.Minimum;
+    if( m_xInverseScaling.is() )
+        m_fScaledVisibleMin = m_aScale.Scaling->doScaling(m_fScaledVisibleMin);
+    
+    m_fScaledVisibleMax = m_aScale.Maximum;
+    if( m_xInverseScaling.is() )
+        m_fScaledVisibleMax = m_aScale.Scaling->doScaling(m_fScaledVisibleMax);
+}
+
+DateTickFactory::~DateTickFactory()
+{
+}
+
+void DateTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos, bool bShifted ) const
+{
+    rAllTickInfos.resize(2);
+    ::std::vector< TickInfo >& rMajorTicks = rAllTickInfos[0];
+    ::std::vector< TickInfo >& rMinorTicks = rAllTickInfos[1];
+    rMajorTicks.clear();
+    rMinorTicks.clear();
+    
+    Date aNull(m_aScale.NullDate);
+
+    Date aDate = aNull + ::rtl::math::approxFloor(m_aScale.Minimum);
+    Date aMaxDate = aNull + ::rtl::math::approxFloor(m_aScale.Maximum);
+
+    uno::Reference< chart2::XScaling > xScaling(m_aScale.Scaling);
+    uno::Reference< chart2::XScaling > xInverseScaling(m_xInverseScaling);
+    if( bShifted )
+    {
+        xScaling = new DateScaling(aNull,m_aScale.TimeResolution,true/*bShifted*/);
+        xInverseScaling = xScaling->getInverseScaling();
+    }
+
+    //create major date tickinfos
+    while( aDate<= aMaxDate )
+    {
+        if( bShifted && aDate==aMaxDate )
+            break;
+
+        TickInfo aNewTick(xInverseScaling); aNewTick.fScaledTickValue = aDate - aNull;
+
+        if( xInverseScaling.is() )
+            aNewTick.fScaledTickValue = xScaling->doScaling(aNewTick.fScaledTickValue);
+        rMajorTicks.push_back( aNewTick );
+
+        if(m_aIncrement.MajorTimeInterval.Number<=0)
+            break;
+
+        //find next major date
+        switch( m_aIncrement.MajorTimeInterval.TimeUnit )
+        {
+        case DAY:
+            aDate += m_aIncrement.MajorTimeInterval.Number;
+            break;
+        case YEAR:
+            aDate = DateHelper::GetDateSomeYearsAway( aDate, m_aIncrement.MajorTimeInterval.Number );
+            break;
+        case MONTH:
+        default:
+            aDate = DateHelper::GetDateSomeMonthsAway( aDate, m_aIncrement.MajorTimeInterval.Number );
+            break;
+        }
+    }
+
+    //create minor date tickinfos
+    aDate = aNull + ::rtl::math::approxFloor(m_aScale.Minimum);
+    while( aDate<= aMaxDate )
+    {
+        if( bShifted && aDate==aMaxDate )
+            break;
+
+        TickInfo aNewTick(xInverseScaling); aNewTick.fScaledTickValue = aDate - aNull;
+        if( xInverseScaling.is() )
+            aNewTick.fScaledTickValue = xScaling->doScaling(aNewTick.fScaledTickValue);
+        rMinorTicks.push_back( aNewTick );
+
+        if(m_aIncrement.MinorTimeInterval.Number<=0)
+            break;
+
+        //find next minor date
+        switch( m_aIncrement.MinorTimeInterval.TimeUnit )
+        {
+        case DAY:
+            aDate += m_aIncrement.MinorTimeInterval.Number;
+            break;
+        case YEAR:
+            aDate = DateHelper::GetDateSomeYearsAway( aDate, m_aIncrement.MinorTimeInterval.Number );
+            break;
+        case MONTH:
+        default:
+            aDate = DateHelper::GetDateSomeMonthsAway( aDate, m_aIncrement.MinorTimeInterval.Number );
+            break;
+        }
+    }
+}
+
+void DateTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
+{
+    getAllTicks( rAllTickInfos, false );
+}
+
+void DateTickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
+{
+    getAllTicks( rAllTickInfos, true );
+}
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/view/axes/Tickmarks_Dates.hxx b/chart2/source/view/axes/Tickmarks_Dates.hxx
new file mode 100644
index 000000000..807ba2a5e
--- /dev/null
+++ b/chart2/source/view/axes/Tickmarks_Dates.hxx
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _CHART2_TICKMARKS_DATES_HXX
+#define _CHART2_TICKMARKS_DATES_HXX
+
+#include "Tickmarks.hxx"
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+
+class DateTickFactory
+{
+public:
+    DateTickFactory(
+         const ExplicitScaleData& rScale
+        , const ExplicitIncrementData& rIncrement );
+    ~DateTickFactory();
+
+    void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
+    void getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
+
+private: //methods
+    void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos, bool bShifted ) const;
+
+private: //member
+    ExplicitScaleData     m_aScale;
+    ExplicitIncrementData m_aIncrement;
+    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling >
+                                                m_xInverseScaling;
+
+    //minimum and maximum of the visible range after scaling
+    double    m_fScaledVisibleMin;
+    double    m_fScaledVisibleMax;
+};
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
+#endif
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
new file mode 100644
index 000000000..99a17b40f
--- /dev/null
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -0,0 +1,671 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_chart2.hxx"
+#include "Tickmarks_Equidistant.hxx"
+#include "ViewDefines.hxx"
+#include <rtl/math.hxx>
+#include <tools/debug.hxx>
+#include <memory>
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::chart2;
+using namespace ::rtl::math;
+using ::basegfx::B2DVector;
+
+//static
+double EquidistantTickFactory::getMinimumAtIncrement( double fMin, const ExplicitIncrementData& rIncrement )
+{
+    //the returned value will be <= fMin and on a Major Tick given by rIncrement
+    if(rIncrement.Distance<=0.0)
+        return fMin;
+
+    double fRet = rIncrement.BaseValue +
+        floor( approxSub( fMin, rIncrement.BaseValue )
+                    / rIncrement.Distance)
+            *rIncrement.Distance;
+
+    if( fRet > fMin )
+    {
+        if( !approxEqual(fRet, fMin) )
+            fRet -= rIncrement.Distance;
+    }
+    return fRet;
+}
+//static
+double EquidistantTickFactory::getMaximumAtIncrement( double fMax, const ExplicitIncrementData& rIncrement )
+{
+    //the returned value will be >= fMax and on a Major Tick given by rIncrement
+    if(rIncrement.Distance<=0.0)
+        return fMax;
+
+    double fRet = rIncrement.BaseValue +
+        floor( approxSub( fMax, rIncrement.BaseValue )
+                    / rIncrement.Distance)
+            *rIncrement.Distance;
+
+    if( fRet < fMax )
+    {
+        if( !approxEqual(fRet, fMax) )
+            fRet += rIncrement.Distance;
+    }
+    return fRet;
+}
+
+EquidistantTickFactory::EquidistantTickFactory(
+          const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
+            : m_rScale( rScale )
+            , m_rIncrement( rIncrement )
+            , m_xInverseScaling(NULL)
+            , m_pfCurrentValues(NULL)
+{
+    //@todo: make sure that the scale is valid for the scaling
+
+    m_pfCurrentValues = new double[getTickDepth()];
+
+    if( m_rScale.Scaling.is() )
+    {
+        m_xInverseScaling = m_rScale.Scaling->getInverseScaling();
+        DBG_ASSERT( m_xInverseScaling.is(), "each Scaling needs to return a inverse Scaling" );
+    }
+
+    double fMin = m_fScaledVisibleMin = m_rScale.Minimum;
+    if( m_xInverseScaling.is() )
+    {
+        m_fScaledVisibleMin = m_rScale.Scaling->doScaling(m_fScaledVisibleMin);
+        if(m_rIncrement.PostEquidistant )
+            fMin = m_fScaledVisibleMin;
+    }
+
+    double fMax = m_fScaledVisibleMax = m_rScale.Maximum;
+    if( m_xInverseScaling.is() )
+    {
+        m_fScaledVisibleMax = m_rScale.Scaling->doScaling(m_fScaledVisibleMax);
+        if(m_rIncrement.PostEquidistant )
+            fMax = m_fScaledVisibleMax;
+    }
+
+    //--
+    m_fOuterMajorTickBorderMin = EquidistantTickFactory::getMinimumAtIncrement( fMin, m_rIncrement );
+    m_fOuterMajorTickBorderMax = EquidistantTickFactory::getMaximumAtIncrement( fMax, m_rIncrement );
+    //--
+
+    m_fOuterMajorTickBorderMin_Scaled = m_fOuterMajorTickBorderMin;
+    m_fOuterMajorTickBorderMax_Scaled = m_fOuterMajorTickBorderMax;
+    if(!m_rIncrement.PostEquidistant && m_xInverseScaling.is() )
+    {
+        m_fOuterMajorTickBorderMin_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMin);
+        m_fOuterMajorTickBorderMax_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMax);
+
+        //check validity of new range: m_fOuterMajorTickBorderMin <-> m_fOuterMajorTickBorderMax
+        //it is assumed here, that the original range in the given Scale is valid
+        if( !rtl::math::isFinite(m_fOuterMajorTickBorderMin_Scaled) )
+        {
+            m_fOuterMajorTickBorderMin += m_rIncrement.Distance;
+            m_fOuterMajorTickBorderMin_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMin);
+        }
+        if( !rtl::math::isFinite(m_fOuterMajorTickBorderMax_Scaled) )
+        {
+            m_fOuterMajorTickBorderMax -= m_rIncrement.Distance;
+            m_fOuterMajorTickBorderMax_Scaled = m_rScale.Scaling->doScaling(m_fOuterMajorTickBorderMax);
+        }
+    }
+}
+
+EquidistantTickFactory::~EquidistantTickFactory()
+{
+    delete[] m_pfCurrentValues;
+}
+
+sal_Int32 EquidistantTickFactory::getTickDepth() const
+{
+    return static_cast<sal_Int32>(m_rIncrement.SubIncrements.size()) + 1;
+}
+
+void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno::Sequence< double > >& rParentTicks ) const
+{
+    EquidistantTickIter aIter( rParentTicks, m_rIncrement, 0, nDepth-1 );
+    double* pfNextParentTick = aIter.firstValue();
+    if(!pfNextParentTick)
+        return;
+    double fLastParentTick = *pfNextParentTick;
+    pfNextParentTick = aIter.nextValue();
+    if(!pfNextParentTick)
+        return;
+
+    sal_Int32 nMaxSubTickCount = this->getMaxTickCount( nDepth );
+    if(!nMaxSubTickCount)
+        return;
+
+    uno::Sequence< double > aSubTicks(nMaxSubTickCount);
+    sal_Int32 nRealSubTickCount = 0;
+    sal_Int32 nIntervalCount = m_rIncrement.SubIncrements[nDepth-1].IntervalCount;
+
+    double* pValue = NULL;
+    for(; pfNextParentTick; fLastParentTick=*pfNextParentTick, pfNextParentTick = aIter.nextValue())
+    {
+        for( sal_Int32 nPartTick = 1; nPartTick<nIntervalCount; nPartTick++ )
+        {
+            pValue = this->getMinorTick( nPartTick, nDepth
+                        , fLastParentTick, *pfNextParentTick );
+            if(!pValue)
+                continue;
+
+            aSubTicks[nRealSubTickCount] = *pValue;
+            nRealSubTickCount++;
+        }
+    }
+
+    aSubTicks.realloc(nRealSubTickCount);
+    rParentTicks[nDepth] = aSubTicks;
+    if(static_cast<sal_Int32>(m_rIncrement.SubIncrements.size())>nDepth)
+        addSubTicks( nDepth+1, rParentTicks );
+}
+
+
+sal_Int32 EquidistantTickFactory::getMaxTickCount( sal_Int32 nDepth ) const
+{
+    //return the maximum amount of ticks
+    //possibly open intervals at the two ends of the region are handled as if they were completely visible
+    //(this is necessary for calculating the sub ticks at the borders correctly)
+
+    if( nDepth >= getTickDepth() )
+        return 0;
+    if( m_fOuterMajorTickBorderMax < m_fOuterMajorTickBorderMin )
+        return 0;
+    if( m_rIncrement.Distance<=0.0)
+        return 0;
+
+    double fSub;
+    if(m_rIncrement.PostEquidistant  )
+        fSub = approxSub( m_fScaledVisibleMax, m_fScaledVisibleMin );
+    else
+        fSub = approxSub( m_rScale.Maximum, m_rScale.Minimum );
+
+    if (!isFinite(fSub))
+        return 0;
+
+    sal_Int32 nIntervalCount = static_cast<sal_Int32>( fSub / m_rIncrement.Distance );
+
+    nIntervalCount+=3;
+    for(sal_Int32 nN=0; nN<nDepth-1; nN++)
+    {
+        if( m_rIncrement.SubIncrements[nN].IntervalCount>1 )
+            nIntervalCount *= m_rIncrement.SubIncrements[nN].IntervalCount;
+    }
+
+    sal_Int32 nTickCount = nIntervalCount;
+    if(nDepth>0 && m_rIncrement.SubIncrements[nDepth-1].IntervalCount>1)
+        nTickCount = nIntervalCount * (m_rIncrement.SubIncrements[nDepth-1].IntervalCount-1);
+
+    return nTickCount;
+}
+
+double* EquidistantTickFactory::getMajorTick( sal_Int32 nTick ) const
+{
+    m_pfCurrentValues[0] = m_fOuterMajorTickBorderMin + nTick*m_rIncrement.Distance;
+
+    if(m_pfCurrentValues[0]>m_fOuterMajorTickBorderMax)
+    {
+        if( !approxEqual(m_pfCurrentValues[0],m_fOuterMajorTickBorderMax) )
+            return NULL;
+    }
+    if(m_pfCurrentValues[0]<m_fOuterMajorTickBorderMin)
+    {
+        if( !approxEqual(m_pfCurrentValues[0],m_fOuterMajorTickBorderMin) )
+            return NULL;
+    }
+
+    //return always the value after scaling
+    if(!m_rIncrement.PostEquidistant && m_xInverseScaling.is() )
+        m_pfCurrentValues[0] = m_rScale.Scaling->doScaling( m_pfCurrentValues[0] );
+
+    return &m_pfCurrentValues[0];
+}
+
+double* EquidistantTickFactory::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth
+                            , double fStartParentTick, double fNextParentTick ) const
+{
+    //check validity of arguments
+    {
+        //DBG_ASSERT( fStartParentTick < fNextParentTick, "fStartParentTick >= fNextParentTick");
+        if(fStartParentTick >= fNextParentTick)
+            return NULL;
+        if(nDepth>static_cast<sal_Int32>(m_rIncrement.SubIncrements.size()) || nDepth<=0)
+            return NULL;
+
+        //subticks are only calculated if they are laying between parent ticks:
+        if(nTick<=0)
+            return NULL;
+        if(nTick>=m_rIncrement.SubIncrements[nDepth-1].IntervalCount)
+            return NULL;
+    }
+
+    bool    bPostEquidistant = m_rIncrement.SubIncrements[nDepth-1].PostEquidistant;
+
+    double fAdaptedStartParent = fStartParentTick;
+    double fAdaptedNextParent  = fNextParentTick;
+
+    if( !bPostEquidistant && m_xInverseScaling.is() )
+    {
+        fAdaptedStartParent = m_xInverseScaling->doScaling(fStartParentTick);
+        fAdaptedNextParent  = m_xInverseScaling->doScaling(fNextParentTick);
+    }
+
+    double fDistance = (fAdaptedNextParent - fAdaptedStartParent)/m_rIncrement.SubIncrements[nDepth-1].IntervalCount;
+
+    m_pfCurrentValues[nDepth] = fAdaptedStartParent + nTick*fDistance;
+    
+    //return always the value after scaling
+    if(!bPostEquidistant && m_xInverseScaling.is() )
+        m_pfCurrentValues[nDepth] = m_rScale.Scaling->doScaling( m_pfCurrentValues[nDepth] );
+
+    if( !isWithinOuterBorder( m_pfCurrentValues[nDepth] ) )
+        return NULL;
+
+    return &m_pfCurrentValues[nDepth];
+}
+
+bool EquidistantTickFactory::isWithinOuterBorder( double fScaledValue ) const
+{
+    if(fScaledValue>m_fOuterMajorTickBorderMax_Scaled)
+        return false;
+    if(fScaledValue<m_fOuterMajorTickBorderMin_Scaled)
+        return false;
+
+    return true;
+}
+
+bool EquidistantTickFactory::isVisible( double fScaledValue ) const
+{
+    if(fScaledValue>m_fScaledVisibleMax)
+    {
+        if( !approxEqual(fScaledValue,m_fScaledVisibleMax) )
+            return false;
+    }
+    if(fScaledValue<m_fScaledVisibleMin)
+    {
+        if( !approxEqual(fScaledValue,m_fScaledVisibleMin) )
+            return false;
+    }
+    return true;
+}
+
+void EquidistantTickFactory::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
+{
+    uno::Sequence< uno::Sequence< double > > aAllTicks;
+
+    //create point sequences for each tick depth
+    sal_Int32 nDepthCount = this->getTickDepth();
+    sal_Int32 nMaxMajorTickCount = this->getMaxTickCount( 0 );
+
+    aAllTicks.realloc(nDepthCount);
+    aAllTicks[0].realloc(nMaxMajorTickCount);
+
+    sal_Int32 nRealMajorTickCount = 0;
+    double* pValue = NULL;
+    for( sal_Int32 nMajorTick=0; nMajorTick<nMaxMajorTickCount; nMajorTick++ )
+    {
+        pValue = this->getMajorTick( nMajorTick );
+        if(!pValue)
+            continue;
+        aAllTicks[0][nRealMajorTickCount] = *pValue;
+        nRealMajorTickCount++;
+    }
+    if(!nRealMajorTickCount)
+        return;
+    aAllTicks[0].realloc(nRealMajorTickCount);
+
+    if(nDepthCount>0)
+        this->addSubTicks( 1, aAllTicks );
+
+    //so far we have added all ticks between the outer major tick marks
+    //this was necessary to create sub ticks correctly
+    //now we reduce all ticks to the visible ones that lie between the real borders
+    sal_Int32 nDepth = 0;
+    sal_Int32 nTick = 0;
+    for( nDepth = 0; nDepth < nDepthCount; nDepth++)
+    {
+        sal_Int32 nInvisibleAtLowerBorder = 0;
+        sal_Int32 nInvisibleAtUpperBorder = 0;
+        //we need only to check all ticks within the first major interval at each border
+        sal_Int32 nCheckCount = 1;
+        for(sal_Int32 nN=0; nN<nDepth; nN++)
+        {
+            if( m_rIncrement.SubIncrements[nN].IntervalCount>1 )
+                nCheckCount *= m_rIncrement.SubIncrements[nN].IntervalCount;
+        }
+        uno::Sequence< double >& rTicks = aAllTicks[nDepth];
+        sal_Int32 nCount = rTicks.getLength();
+        //check lower border
+        for( nTick=0; nTick<nCheckCount && nTick<nCount; nTick++)
+        {
+            if( !isVisible( rTicks[nTick] ) )
+                nInvisibleAtLowerBorder++;
+        }
+        //check upper border
+        for( nTick=nCount-1; nTick>nCount-1-nCheckCount && nTick>=0; nTick--)
+        {
+            if( !isVisible( rTicks[nTick] ) )
+                nInvisibleAtUpperBorder++;
+        }
+        //resize sequence
+        if( !nInvisibleAtLowerBorder && !nInvisibleAtUpperBorder)
+            continue;
+        if( !nInvisibleAtLowerBorder )
+            rTicks.realloc(nCount-nInvisibleAtUpperBorder);
+        else
+        {
+            sal_Int32 nNewCount = nCount-nInvisibleAtUpperBorder-nInvisibleAtLowerBorder;
+            if(nNewCount<0)
+                nNewCount=0;
+
+            uno::Sequence< double > aOldTicks(rTicks);
+            rTicks.realloc(nNewCount);
+            for(nTick = 0; nTick<nNewCount; nTick++)
+                rTicks[nTick] = aOldTicks[nInvisibleAtLowerBorder+nTick];
+        }
+    }
+
+    //fill return value
+    rAllTickInfos.resize(aAllTicks.getLength());
+    for( nDepth=0 ;nDepth<aAllTicks.getLength(); nDepth++ )
+    {
+        sal_Int32 nCount = aAllTicks[nDepth].getLength();
+
+        ::std::vector< TickInfo >& rTickInfoVector = rAllTickInfos[nDepth];
+        rTickInfoVector.clear();
+        rTickInfoVector.reserve( nCount );
+        for(sal_Int32 nN = 0; nN<nCount; nN++)
+        {
+            TickInfo aTickInfo(m_xInverseScaling);
+            aTickInfo.fScaledTickValue = aAllTicks[nDepth][nN];
+            rTickInfoVector.push_back(aTickInfo);
+        }
+    }
+}
+
+void EquidistantTickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
+{
+    ExplicitIncrementData aShiftedIncrement( m_rIncrement );
+    aShiftedIncrement.BaseValue = m_rIncrement.BaseValue-m_rIncrement.Distance/2.0;
+    EquidistantTickFactory( m_rScale, aShiftedIncrement ).getAllTicks(rAllTickInfos);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< double > >& rTicks
+                   , const ExplicitIncrementData& rIncrement
+                   , sal_Int32 nMinDepth, sal_Int32 nMaxDepth )
+                : m_pSimpleTicks(&rTicks)
+                , m_pInfoTicks(0)
+                , m_rIncrement(rIncrement)
+                , m_nMinDepth(0), m_nMaxDepth(0)
+                , m_nTickCount(0), m_pnPositions(NULL)
+                , m_pnPreParentCount(NULL), m_pbIntervalFinished(NULL)
+                , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 )
+{
+    initIter( nMinDepth, nMaxDepth );
+}
+
+EquidistantTickIter::EquidistantTickIter( ::std::vector< ::std::vector< TickInfo > >& rTicks
+                   , const ExplicitIncrementData& rIncrement
+                   , sal_Int32 nMinDepth, sal_Int32 nMaxDepth )
+                : m_pSimpleTicks(NULL)
+                , m_pInfoTicks(&rTicks)
+                , m_rIncrement(rIncrement)
+                , m_nMinDepth(0), m_nMaxDepth(0)
+                , m_nTickCount(0), m_pnPositions(NULL)
+                , m_pnPreParentCount(NULL), m_pbIntervalFinished(NULL)
+                , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 )
+{
+    initIter( nMinDepth, nMaxDepth );
+}
+
+void EquidistantTickIter::initIter( sal_Int32 /*nMinDepth*/, sal_Int32 nMaxDepth )
+{
+    m_nMaxDepth = nMaxDepth;
+    if(nMaxDepth<0 || m_nMaxDepth>getMaxDepth())
+        m_nMaxDepth=getMaxDepth();
+
+    sal_Int32 nDepth = 0;
+    for( nDepth = 0; nDepth<=m_nMaxDepth ;nDepth++ )
+        m_nTickCount += getTickCount(nDepth);
+
+    if(!m_nTickCount)
+        return;
+
+    m_pnPositions      = new sal_Int32[m_nMaxDepth+1];
+
+    m_pnPreParentCount = new sal_Int32[m_nMaxDepth+1];
+    m_pbIntervalFinished = new bool[m_nMaxDepth+1];
+    m_pnPreParentCount[0] = 0;
+    m_pbIntervalFinished[0] = false;
+    double fParentValue = getTickValue(0,0);
+    for( nDepth = 1; nDepth<=m_nMaxDepth ;nDepth++ )
+    {
+        m_pbIntervalFinished[nDepth] = false;
+
+        sal_Int32 nPreParentCount = 0;
+        sal_Int32 nCount = getTickCount(nDepth);
+        for(sal_Int32 nN = 0; nN<nCount; nN++)
+        {
+            if(getTickValue(nDepth,nN) < fParentValue)
+                nPreParentCount++;
+            else
+                break;
+        }
+        m_pnPreParentCount[nDepth] = nPreParentCount;
+        if(nCount)
+        {
+            double fNextParentValue = getTickValue(nDepth,0);
+            if( fNextParentValue < fParentValue )
+                fParentValue = fNextParentValue;
+        }
+    }
+}
+
+EquidistantTickIter::~EquidistantTickIter()
+{
+    delete[] m_pnPositions;
+    delete[] m_pnPreParentCount;
+    delete[] m_pbIntervalFinished;
+}
+
+sal_Int32 EquidistantTickIter::getStartDepth() const
+{
+    //find the depth of the first visible tickmark:
+    //it is the depth of the smallest value
+    sal_Int32 nReturnDepth=0;
+    double fMinValue = DBL_MAX;
+    for(sal_Int32 nDepth = 0; nDepth<=m_nMaxDepth ;nDepth++ )
+    {
+        sal_Int32 nCount = getTickCount(nDepth);
+        if( !nCount )
+            continue;
+        double fThisValue = getTickValue(nDepth,0);
+        if(fThisValue<fMinValue)
+        {
+            nReturnDepth = nDepth;
+            fMinValue = fThisValue;
+        }
+    }
+    return nReturnDepth;
+}
+
+double* EquidistantTickIter::firstValue()
+{
+    if( gotoFirst() )
+    {
+        m_fCurrentValue = getTickValue(m_nCurrentDepth, m_pnPositions[m_nCurrentDepth]);
+        return &m_fCurrentValue;
+    }
+    return NULL;
+}
+
+TickInfo* EquidistantTickIter::firstInfo()
+{
+    if( m_pInfoTicks && gotoFirst() )
+        return &(*m_pInfoTicks)[m_nCurrentDepth][m_pnPositions[m_nCurrentDepth]];
+    return NULL;
+}
+
+sal_Int32 EquidistantTickIter::getIntervalCount( sal_Int32 nDepth )
+{
+    if(nDepth>static_cast<sal_Int32>(m_rIncrement.SubIncrements.size()) || nDepth<0)
+        return 0;
+
+    if(!nDepth)
+        return m_nTickCount;
+
+    return m_rIncrement.SubIncrements[nDepth-1].IntervalCount;
+}
+
+bool EquidistantTickIter::isAtLastPartTick()
+{
+    if(!m_nCurrentDepth)
+        return false;
+    sal_Int32 nIntervalCount = getIntervalCount( m_nCurrentDepth );
+    if(!nIntervalCount || nIntervalCount == 1)
+        return true;
+    if( m_pbIntervalFinished[m_nCurrentDepth] )
+        return false;
+    sal_Int32 nPos = m_pnPositions[m_nCurrentDepth]+1;
+    if(m_pnPreParentCount[m_nCurrentDepth])
+        nPos += nIntervalCount-1 - m_pnPreParentCount[m_nCurrentDepth];
+    bool bRet = nPos && nPos % (nIntervalCount-1) == 0;
+    if(!nPos && !m_pnPreParentCount[m_nCurrentDepth]
+             && m_pnPositions[m_nCurrentDepth-1]==-1 )
+         bRet = true;
+    return bRet;
+}
+
+bool EquidistantTickIter::gotoFirst()
+{
+    if( m_nMaxDepth<0 )
+        return false;
+    if( !m_nTickCount )
+        return false;
+
+    for(sal_Int32 nDepth = 0; nDepth<=m_nMaxDepth ;nDepth++ )
+        m_pnPositions[nDepth] = -1;
+
+    m_nCurrentPos   = 0;
+    m_nCurrentDepth = getStartDepth();
+    m_pnPositions[m_nCurrentDepth] = 0;
+    return true;
+}
+
+bool EquidistantTickIter::gotoNext()
+{
+    if( m_nCurrentPos < 0 )
+        return false;
+    m_nCurrentPos++;
+
+    if( m_nCurrentPos >= m_nTickCount )
+        return false;
+
+    if( m_nCurrentDepth==m_nMaxDepth && isAtLastPartTick() )
+    {
+        do
+        {
+            m_pbIntervalFinished[m_nCurrentDepth] = true;
+            m_nCurrentDepth--;
+        }
+        while( m_nCurrentDepth && isAtLastPartTick() );
+    }
+    else if( m_nCurrentDepth<m_nMaxDepth )
+    {
+        do
+        {
+            m_nCurrentDepth++;
+        }
+        while( m_nCurrentDepth<m_nMaxDepth );
+    }
+    m_pbIntervalFinished[m_nCurrentDepth] = false;
+    m_pnPositions[m_nCurrentDepth] = m_pnPositions[m_nCurrentDepth]+1;
+    return true;
+}
+
+bool EquidistantTickIter::gotoIndex( sal_Int32 nTickIndex )
+{
+    if( nTickIndex < 0 )
+        return false;
+    if( nTickIndex >= m_nTickCount )
+        return false;
+
+    if( nTickIndex < m_nCurrentPos )
+        if( !gotoFirst() )
+            return false;
+    
+    while( nTickIndex > m_nCurrentPos )
+        if( !gotoNext() )
+            return false;
+
+    return true;
+}
+
+sal_Int32 EquidistantTickIter::getCurrentIndex() const
+{
+    return m_nCurrentPos;
+}
+sal_Int32 EquidistantTickIter::getMaxIndex() const
+{
+    return m_nTickCount-1;
+}
+
+double* EquidistantTickIter::nextValue()
+{
+    if( gotoNext() )
+    {
+        m_fCurrentValue = getTickValue(m_nCurrentDepth, m_pnPositions[m_nCurrentDepth]);
+        return &m_fCurrentValue;
+    }
+    return NULL;
+}
+
+TickInfo* EquidistantTickIter::nextInfo()
+{
+    if( m_pInfoTicks && gotoNext() &&
+        static_cast< sal_Int32 >(
+            (*m_pInfoTicks)[m_nCurrentDepth].size()) > m_pnPositions[m_nCurrentDepth] )
+    {
+        return &(*m_pInfoTicks)[m_nCurrentDepth][m_pnPositions[m_nCurrentDepth]];
+    }
+    return NULL;
+}
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/view/axes/TickmarkHelper.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
index 6cb1c587d..6c3d771f5 100644
--- a/chart2/source/view/axes/TickmarkHelper.hxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
@@ -24,19 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _CHART2_TICKMARKHELPER_HXX
-#define _CHART2_TICKMARKHELPER_HXX
+#ifndef _CHART2_TICKMARKS_EQUIDISTANT_HXX
+#define _CHART2_TICKMARKS_EQUIDISTANT_HXX
 
-#include "TickmarkProperties.hxx"
-#include "VAxisProperties.hxx"
-#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
-#include <basegfx/vector/b2dvector.hxx>
-#include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/uno/Sequence.h>
-
-#include <vector>
+#include "Tickmarks.hxx"
 
 //.............................................................................
 namespace chart
@@ -48,57 +39,15 @@ using ::basegfx::B2DVector;
 /**
 */
 
-struct TickInfo
-{
-    double      fScaledTickValue;
-    double      fUnscaledTickValue;
-
-    ::basegfx::B2DVector  aTickScreenPosition;
-    bool        bPaintIt;
-
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShape > xTextShape;
-
-    rtl::OUString aText;//used only for complex categories so far
-    sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category
-
-//methods:
-    TickInfo();
-    void        updateUnscaledValue( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::chart2::XScaling >& xInverseScaling );
-
-    sal_Int32 getScreenDistanceBetweenTicks( const TickInfo& rOherTickInfo ) const;
-};
-class TickIter
-{
-public:
-    virtual ~TickIter(){};
-    virtual TickInfo* firstInfo()=0;
-    virtual TickInfo* nextInfo()=0;
-};
-
-class PureTickIter : public TickIter
-{
-public:
-    PureTickIter( ::std::vector< TickInfo >& rTickInfoVector );
-    virtual ~PureTickIter();
-    virtual TickInfo* firstInfo();
-    virtual TickInfo* nextInfo();
-
-private:
-    ::std::vector< TickInfo >& m_rTickVector;
-    ::std::vector< TickInfo >::iterator m_aTickIter;
-};
-
 class EquidistantTickIter : public TickIter
 {
 public:
     EquidistantTickIter( const ::com::sun::star::uno::Sequence<
                 ::com::sun::star::uno::Sequence< double > >& rTicks
-                , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement
+                , const ExplicitIncrementData& rIncrement
             , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 );
     EquidistantTickIter( ::std::vector< ::std::vector< TickInfo > >& rTickInfos
-            , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement
+            , const ExplicitIncrementData& rIncrement
             , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 );
     virtual ~EquidistantTickIter();
 
@@ -152,7 +101,7 @@ private: //member
     const ::com::sun::star::uno::Sequence<
         ::com::sun::star::uno::Sequence< double > >*  m_pSimpleTicks;
     ::std::vector< ::std::vector< TickInfo > >*       m_pInfoTicks;
-    const ::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement;
+    const ExplicitIncrementData& m_rIncrement;
     //iteration from m_nMinDepth to m_nMaxDepth
     sal_Int32   m_nMinDepth;
     sal_Int32   m_nMaxDepth;
@@ -166,24 +115,21 @@ private: //member
     double      m_fCurrentValue;
 };
 
-class TickmarkHelper
+class EquidistantTickFactory
 {
 public:
-    TickmarkHelper(
-         const ::com::sun::star::chart2::ExplicitScaleData& rScale
-        , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement );
-    virtual ~TickmarkHelper();
+    EquidistantTickFactory(
+         const ExplicitScaleData& rScale
+        , const ExplicitIncrementData& rIncrement );
+    ~EquidistantTickFactory();
 
-    virtual TickmarkHelper* createShiftedTickmarkHelper() const;
+    void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
+    void getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
 
-    void          getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
-    void          getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
+    static double getMinimumAtIncrement( double fMin, const ExplicitIncrementData& rIncrement );
+    static double getMaximumAtIncrement( double fMax, const ExplicitIncrementData& rIncrement );
 
-    //
-    static double getMinimumAtIncrement( double fMin, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement );
-    static double getMaximumAtIncrement( double fMax, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement );
-
-protected: //methods
+private: //methods
     void        addSubTicks( sal_Int32 nDepth,
                         ::com::sun::star::uno::Sequence<
                             ::com::sun::star::uno::Sequence< double > >& rParentTicks ) const;
@@ -192,82 +138,26 @@ protected: //methods
                     , double fStartParentTick, double fNextParentTick ) const;
     sal_Int32   getMaxTickCount( sal_Int32 nDepth = 0 ) const;
     sal_Int32   getTickDepth() const;
+
     bool        isVisible( double fValue ) const;
     bool        isWithinOuterBorder( double fScaledValue ) const; //all within the outer major tick marks
 
-    virtual void updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& /*rAllTickInfos*/ ) const {}
-
-protected: //member
-    ::com::sun::star::chart2::ExplicitScaleData     m_rScale;
-    ::com::sun::star::chart2::ExplicitIncrementData m_rIncrement;
-
+private: //member
+    ExplicitScaleData     m_rScale;
+    ExplicitIncrementData m_rIncrement;
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling >
                                                 m_xInverseScaling;
+
+    //minimum and maximum of the visible range after scaling
+    double    m_fScaledVisibleMin;
+    double    m_fScaledVisibleMax;
+    
     double*   m_pfCurrentValues;
     //major-tick positions that may lay outside the visible range but complete partly visible intervals at the borders
     double    m_fOuterMajorTickBorderMin;
     double    m_fOuterMajorTickBorderMax;
     double    m_fOuterMajorTickBorderMin_Scaled;
     double    m_fOuterMajorTickBorderMax_Scaled;
-
-    //minimum and maximum of the visible range after scaling
-    double    m_fScaledVisibleMin;
-    double    m_fScaledVisibleMax;
-};
-
-class TickmarkHelper_2D : public TickmarkHelper
-{
-public:
-    TickmarkHelper_2D(
-        const ::com::sun::star::chart2::ExplicitScaleData& rScale
-        , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement
-        , const ::basegfx::B2DVector& rStartScreenPos, const ::basegfx::B2DVector& rEndScreenPos
-        , const ::basegfx::B2DVector& rAxisLineToLabelLineShift );
-        //, double fStrech_SceneToScreen, double fOffset_SceneToScreen );
-    virtual ~TickmarkHelper_2D();
-
-    virtual TickmarkHelper* createShiftedTickmarkHelper() const;
-
-    static sal_Int32    getTickScreenDistance( TickIter& rIter );
-
-    void createPointSequenceForAxisMainLine( ::com::sun::star::drawing::PointSequenceSequence& rPoints ) const;
-    void addPointSequenceForTickLine( ::com::sun::star::drawing::PointSequenceSequence& rPoints
-                            , sal_Int32 nSequenceIndex
-                            , double fScaledLogicTickValue, double fInnerDirectionSign
-                            , const TickmarkProperties& rTickmarkProperties, bool bPlaceAtLabels ) const;
-    ::basegfx::B2DVector  getDistanceAxisTickToText( const AxisProperties& rAxisProperties
-        , bool bIncludeFarAwayDistanceIfSo = false
-        , bool bIncludeSpaceBetweenTickAndText = true ) const;
-
-    virtual void        updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
-
-    bool  isHorizontalAxis() const;
-    bool  isVerticalAxis() const;
-
-protected: //methods
-    ::basegfx::B2DVector     getTickScreenPosition2D( double fScaledLogicTickValue ) const;
-
-private: //member
-    ::basegfx::B2DVector    m_aAxisStartScreenPosition2D;
-    ::basegfx::B2DVector    m_aAxisEndScreenPosition2D;
-
-    //labels might be posioned high or low on the border of the diagram far away from the axis
-    //add this vector to go from the axis line to the label line (border of the diagram)
-    ::basegfx::B2DVector    m_aAxisLineToLabelLineShift;
-    
-    double      m_fStrech_LogicToScreen;
-    double      m_fOffset_LogicToScreen;
-};
-
-class TickmarkHelper_3D : public TickmarkHelper
-{
-public:
-    TickmarkHelper_3D(
-         const ::com::sun::star::chart2::ExplicitScaleData& rScale
-        , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement );
-    virtual ~TickmarkHelper_3D();
-
-    virtual TickmarkHelper* createShiftedTickmarkHelper() const;
 };
 
 //.............................................................................
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 759b5a74e..aa77704c7 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -31,7 +31,7 @@
 #include "VAxisBase.hxx"
 #include "ShapeFactory.hxx"
 #include "CommonConverters.hxx"
-#include "TickmarkHelper.hxx"
+#include "Tickmarks.hxx"
 #include "macros.hxx"
 
 // header for define DBG_ASSERT
@@ -70,7 +70,7 @@ sal_Int32 VAxisBase::getDimensionCount()
     return m_nDimension;
 }
 
-void SAL_CALL VAxisBase::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize
+void VAxisBase::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize
                   , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels )
 {
     m_aAxisLabelProperties.m_aFontReferenceSize = rFontReferenceSize;
@@ -106,6 +106,15 @@ void SAL_CALL VAxisBase::initAxisLabelProperties( const ::com::sun::star::awt::S
         m_aAxisLabelProperties.eStaggering = SIDE_BY_SIDE;
 }
 
+bool VAxisBase::isDateAxis() const
+{
+    return AxisType::DATE == m_aScale.AxisType;
+}
+bool VAxisBase::isComplexCategoryAxis() const
+{
+    return m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels;
+}
+
 void VAxisBase::recordMaximumTextSize( const Reference< drawing::XShape >& xShape, double fRotationAngleDegree )
 {
     if( m_bRecordMaximumTextSize && xShape.is() )
@@ -130,7 +139,7 @@ void VAxisBase::setExrtaLinePositionAtOtherAxis( const double& fCrossingAt )
     m_aAxisProperties.m_pfExrtaLinePositionAtOtherAxis = new double(fCrossingAt);
 }
 
-sal_Bool SAL_CALL VAxisBase::isAnythingToDraw()
+sal_Bool VAxisBase::isAnythingToDraw()
 {
     if( !m_aAxisProperties.m_xAxisModel.is() )
         return false;
@@ -150,7 +159,7 @@ sal_Bool SAL_CALL VAxisBase::isAnythingToDraw()
     return true;
 }
 
-void SAL_CALL VAxisBase::setExplicitScaleAndIncrement(
+void VAxisBase::setExplicitScaleAndIncrement(
               const ExplicitScaleData& rScale
             , const ExplicitIncrementData& rIncrement )
             throw (uno::RuntimeException)
@@ -162,8 +171,11 @@ void SAL_CALL VAxisBase::setExplicitScaleAndIncrement(
 
 void VAxisBase::createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos )
 {
-    std::auto_ptr< TickmarkHelper > apTickmarkHelper( this->createTickmarkHelper() );
-    apTickmarkHelper->getAllTicks( rAllTickInfos );
+    std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+    if( m_aScale.ShiftedCategoryPosition )
+        apTickFactory->getAllTicksShifted( rAllTickInfos );
+    else
+        apTickFactory->getAllTicks( rAllTickInfos );
 }
 
 bool VAxisBase::prepareShapeCreation()
@@ -244,7 +256,7 @@ void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter )
     for( TickInfo* pTickInfo = rIter.firstInfo()
         ; pTickInfo; pTickInfo = rIter.nextInfo() )
     {
-        pTickInfo->updateUnscaledValue( xInverseScaling );
+        //xxxxx pTickInfo->updateUnscaledValue( xInverseScaling );
     }
 }
 
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index 6d37493f7..730a2c7ba 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -29,7 +29,7 @@
 
 #include "VAxisOrGridBase.hxx"
 #include "VAxisProperties.hxx"
-#include "TickmarkHelper.hxx"
+#include "Tickmarks.hxx"
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
 //.............................................................................
@@ -52,18 +52,18 @@ public:
 
     sal_Int32 getDimensionCount();
 
-    virtual void SAL_CALL createMaximumLabels()=0;
-    virtual void SAL_CALL createLabels()=0;
-    virtual void SAL_CALL updatePositions()=0;
+    virtual void createMaximumLabels()=0;
+    virtual void createLabels()=0;
+    virtual void updatePositions()=0;
 
-    virtual sal_Bool SAL_CALL isAnythingToDraw();
-    virtual void SAL_CALL initAxisLabelProperties(
+    virtual sal_Bool isAnythingToDraw();
+    virtual void initAxisLabelProperties(
                     const ::com::sun::star::awt::Size& rFontReferenceSize
                   , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels );
 
-    virtual void SAL_CALL setExplicitScaleAndIncrement(
-            const ::com::sun::star::chart2::ExplicitScaleData& rScale
-          , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement )
+    virtual void setExplicitScaleAndIncrement(
+            const ExplicitScaleData& rScale
+          , const ExplicitIncrementData& rIncrement )
                 throw (::com::sun::star::uno::RuntimeException);
 
     virtual sal_Int32 estimateMaximumAutoMainIncrementCount();
@@ -83,6 +83,9 @@ protected: //methods
                     ::com::sun::star::drawing::XShape >& xShape
                     , double fRotationAngleDegree );
 
+    bool isDateAxis() const;
+    bool isComplexCategoryAxis() const;
+
 protected: //member
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >  m_xNumberFormatsSupplier;
     AxisProperties                                                                      m_aAxisProperties;
diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx
index 753df8d78..8b3e1a714 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.cxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.cxx
@@ -31,7 +31,7 @@
 #include "VAxisOrGridBase.hxx"
 #include "ShapeFactory.hxx"
 #include "CommonConverters.hxx"
-#include "TickmarkHelper.hxx"
+#include "Tickmarks.hxx"
 
 // header for define DBG_ASSERT
 #include <tools/debug.hxx>
@@ -57,7 +57,7 @@ VAxisOrGridBase::~VAxisOrGridBase()
 {
 }
 
-void SAL_CALL VAxisOrGridBase::setExplicitScaleAndIncrement(
+void VAxisOrGridBase::setExplicitScaleAndIncrement(
               const ExplicitScaleData& rScale
             , const ExplicitIncrementData& rIncrement )
             throw (uno::RuntimeException)
@@ -79,18 +79,9 @@ void VAxisOrGridBase::set3DWallPositions( CuboidPlanePosition eLeftWallPos, Cubo
     m_eBottomPos = eBottomPos;
 }
 
-TickmarkHelper* VAxisOrGridBase::createTickmarkHelper()
+TickFactory* VAxisOrGridBase::createTickFactory()
 {
-    TickmarkHelper* pRet=NULL;
-    if( 2==m_nDimension )
-    {
-        pRet = new TickmarkHelper( m_aScale, m_aIncrement );
-    }
-    else
-    {
-        pRet = new TickmarkHelper_3D( m_aScale, m_aIncrement );
-    }
-    return pRet;
+    return new TickFactory( m_aScale, m_aIncrement );
 }
 
 //.............................................................................
diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx
index 5a1af2df1..6fc00157b 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.hxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.hxx
@@ -29,9 +29,8 @@
 
 #include "PlotterBase.hxx"
 #include "ThreeDHelper.hxx"
+#include "chartview/ExplicitScaleValues.hxx"
 
-#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -46,7 +45,7 @@ namespace chart
 /**
 */
 class ShapeFactory;
-class TickmarkHelper;
+class TickFactory;
 
 class VAxisOrGridBase : public PlotterBase
 {
@@ -55,22 +54,22 @@ public:
     virtual ~VAxisOrGridBase();
 
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
-    virtual void SAL_CALL setExplicitScaleAndIncrement(
-            const ::com::sun::star::chart2::ExplicitScaleData& rScale
-          , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement )
+    virtual void setExplicitScaleAndIncrement(
+            const ExplicitScaleData& rScale
+          , const ExplicitIncrementData& rIncrement )
                 throw (::com::sun::star::uno::RuntimeException);
     void set3DWallPositions( CuboidPlanePosition eLeftWallPos, CuboidPlanePosition eBackWallPos, CuboidPlanePosition eBottomPos );
 
-    virtual TickmarkHelper* createTickmarkHelper();
+    virtual TickFactory* createTickFactory();
 
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
 protected: //member
-    ::com::sun::star::chart2::ExplicitScaleData     m_aScale;
-    ::com::sun::star::chart2::ExplicitIncrementData m_aIncrement;
-    sal_Int32                                       m_nDimensionIndex;
+    ExplicitScaleData       m_aScale;
+    ExplicitIncrementData   m_aIncrement;
+    sal_Int32               m_nDimensionIndex;
 
-    ::basegfx::B3DHomMatrix                         m_aMatrixScreenToScene;
+    ::basegfx::B3DHomMatrix m_aMatrixScreenToScene;
 
     CuboidPlanePosition m_eLeftWallPos;
     CuboidPlanePosition m_eBackWallPos;
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 770dc914d..88b525fca 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -182,7 +182,6 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel
     , m_pfExrtaLinePositionAtOtherAxis(NULL)
     , m_bCrossingAxisHasReverseDirection(false)
     , m_bCrossingAxisIsCategoryAxes(false)
-    , m_bAxisBetweenCategories(false)
     , m_fLabelDirectionSign(1.0)
     , m_fInnerDirectionSign(1.0)
     , m_aLabelAlignment(LABEL_ALIGN_RIGHT_TOP)
@@ -212,7 +211,6 @@ AxisProperties::AxisProperties( const AxisProperties& rAxisProperties )
     , m_pfExrtaLinePositionAtOtherAxis( NULL )
     , m_bCrossingAxisHasReverseDirection( rAxisProperties.m_bCrossingAxisHasReverseDirection )
     , m_bCrossingAxisIsCategoryAxes( rAxisProperties.m_bCrossingAxisIsCategoryAxes )
-    , m_bAxisBetweenCategories( rAxisProperties.m_bAxisBetweenCategories )
     , m_fLabelDirectionSign( rAxisProperties.m_fLabelDirectionSign )
     , m_fInnerDirectionSign( rAxisProperties.m_fInnerDirectionSign )
     , m_aLabelAlignment( rAxisProperties.m_aLabelAlignment )
@@ -279,11 +277,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty
                 xAxisProp->getPropertyValue(C2U( "CrossoverValue" )) >>= fValue;
 
                 if( m_bCrossingAxisIsCategoryAxes )
-                {
                     fValue = ::rtl::math::round(fValue);
-                    if( m_bAxisBetweenCategories )
-                        fValue-=0.5;
-                }
                 m_pfMainLinePositionAtOtherAxis = new double(fValue);
             }
             else if( ::com::sun::star::chart::ChartAxisPosition_ZERO == m_eCrossoverType )
@@ -317,8 +311,17 @@ void AxisProperties::init( bool bCartesian )
     if( m_nDimensionIndex<2 )
         initAxisPositioning( xProp );
 
+    ScaleData aScaleData = m_xAxisModel->getScaleData();
+    if( m_nDimensionIndex==0 )
+        AxisHelper::checkDateAxis( aScaleData, m_pExplicitCategoriesProvider, bCartesian );
+    m_nAxisType = aScaleData.AxisType;
+
     if( bCartesian )
     {
+        if( m_nDimensionIndex == 0 && m_nAxisType == AxisType::CATEGORY
+                && m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() )
+            m_bComplexCategories = true;
+
         if( ::com::sun::star::chart::ChartAxisPosition_END == m_eCrossoverType )
             m_fInnerDirectionSign = m_bCrossingAxisHasReverseDirection ? 1 : -1;
         else
@@ -360,10 +363,6 @@ void AxisProperties::init( bool bCartesian )
         //init display labels    
         xProp->getPropertyValue( C2U( "DisplayLabels" ) ) >>= m_bDisplayLabels;
 
-        //init categories
-        ScaleData aScaleData = m_xAxisModel->getScaleData();
-        m_nAxisType = aScaleData.AxisType;
-                
         //init TickmarkProperties
         xProp->getPropertyValue( C2U( "MajorTickmarks" ) ) >>= m_nMajorTickmarks;
         xProp->getPropertyValue( C2U( "MinorTickmarks" ) ) >>= m_nMinorTickmarks;
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 1c5714bb6..9dcda584c 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -111,7 +111,6 @@ struct AxisProperties
 
     bool        m_bCrossingAxisHasReverseDirection;
     bool        m_bCrossingAxisIsCategoryAxes;
-    bool        m_bAxisBetweenCategories;
 
     //this direction is used to indicate in which direction the labels are to be drawn
     double          m_fLabelDirectionSign;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index a8d2ab25a..b54786619 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -36,11 +36,12 @@
 #include "macros.hxx"
 #include "ViewDefines.hxx"
 #include "PropertyMapper.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "LabelPositionHelper.hxx"
 #include "TrueGuard.hxx"
 #include "BaseGFXHelper.hxx"
 #include "AxisHelper.hxx"
+#include "Tickmarks_Equidistant.hxx"
 
 #include <rtl/math.hxx>
 #include <tools/color.hxx>
@@ -178,7 +179,7 @@ void removeShapesAtWrongRhythm( TickIter& rIter
     }
 }
 
-class EquidistantLabelIterator : public EquidistantTickIter
+class LabelIterator : public TickIter
 {
     //this Iterator iterates over existing text labels
 
@@ -192,39 +193,36 @@ class EquidistantLabelIterator : public EquidistantTickIter
     //we iterate through all labels
 
 public:
-    EquidistantLabelIterator( ::std::vector< ::std::vector< TickInfo > >& rTickInfos
-            , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement
+    LabelIterator( ::std::vector< TickInfo >& rTickInfoVector
             , const AxisLabelStaggering eAxisLabelStaggering
-            , bool bInnerLine
-            , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 );
+            , bool bInnerLine );
 
     virtual TickInfo*   firstInfo();
     virtual TickInfo*   nextInfo();
 
 private: //methods
-    EquidistantLabelIterator();
+    LabelIterator();
 
 private: //member
+    PureTickIter m_aPureTickIter;
     const AxisLabelStaggering   m_eAxisLabelStaggering;
-    bool        m_bInnerLine;
+    bool m_bInnerLine;
 };
 
-EquidistantLabelIterator::EquidistantLabelIterator( ::std::vector< ::std::vector< TickInfo > >& rTickInfos
-            , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement
+LabelIterator::LabelIterator( ::std::vector< TickInfo >& rTickInfoVector
             , const AxisLabelStaggering eAxisLabelStaggering
-            , bool bInnerLine
-            , sal_Int32 nMinDepth, sal_Int32 nMaxDepth )
-            : EquidistantTickIter( rTickInfos, rIncrement, nMinDepth, nMaxDepth )
+            , bool bInnerLine )
+            : m_aPureTickIter( rTickInfoVector )
             , m_eAxisLabelStaggering(eAxisLabelStaggering)
             , m_bInnerLine(bInnerLine)
 {
 }
 
-TickInfo* EquidistantLabelIterator::firstInfo()
+TickInfo* LabelIterator::firstInfo()
 {
-    TickInfo* pTickInfo = EquidistantTickIter::firstInfo();
+    TickInfo* pTickInfo = m_aPureTickIter.firstInfo();
     while( pTickInfo && !pTickInfo->xTextShape.is() )
-        pTickInfo = EquidistantTickIter::nextInfo();
+        pTickInfo = m_aPureTickIter.nextInfo();
     if(!pTickInfo)
         return NULL;
     if( (STAGGER_EVEN==m_eAxisLabelStaggering && m_bInnerLine)
@@ -234,7 +232,7 @@ TickInfo* EquidistantLabelIterator::firstInfo()
     {
         //skip first label
         do
-            pTickInfo = EquidistantTickIter::nextInfo();
+            pTickInfo = m_aPureTickIter.nextInfo();
         while( pTickInfo && !pTickInfo->xTextShape.is() );
     }
     if(!pTickInfo)
@@ -242,12 +240,12 @@ TickInfo* EquidistantLabelIterator::firstInfo()
     return pTickInfo;
 }
 
-TickInfo* EquidistantLabelIterator::nextInfo()
+TickInfo* LabelIterator::nextInfo()
 {
     TickInfo* pTickInfo = NULL;
     //get next label
     do
-        pTickInfo = EquidistantTickIter::nextInfo();
+        pTickInfo = m_aPureTickIter.nextInfo();
     while( pTickInfo && !pTickInfo->xTextShape.is() );
 
     if(  STAGGER_EVEN==m_eAxisLabelStaggering
@@ -255,7 +253,7 @@ TickInfo* EquidistantLabelIterator::nextInfo()
     {
         //skip one label
         do
-            pTickInfo = EquidistantTickIter::nextInfo();
+            pTickInfo = m_aPureTickIter.nextInfo();
         while( pTickInfo && !pTickInfo->xTextShape.is() );
     }
     return pTickInfo;
@@ -336,17 +334,17 @@ bool lcl_hasWordBreak( const Reference< drawing::XShape >& rxShape )
                 SvxTextForwarder* pTextForwarder = pTextEditSource->GetTextForwarder();
                 if ( pTextForwarder )
                 {
-                    USHORT nParaCount = pTextForwarder->GetParagraphCount();
-                    for ( USHORT nPara = 0; nPara < nParaCount; ++nPara )
+                    sal_uInt16 nParaCount = pTextForwarder->GetParagraphCount();
+                    for ( sal_uInt16 nPara = 0; nPara < nParaCount; ++nPara )
                     {
-                        USHORT nLineCount = pTextForwarder->GetLineCount( nPara );
-                        for ( USHORT nLine = 0; nLine < nLineCount; ++nLine )
+                        sal_uInt16 nLineCount = pTextForwarder->GetLineCount( nPara );
+                        for ( sal_uInt16 nLine = 0; nLine < nLineCount; ++nLine )
                         {
-                            USHORT nLineStart = 0;
-                            USHORT nLineEnd = 0;
+                            sal_uInt16 nLineStart = 0;
+                            sal_uInt16 nLineEnd = 0;
                             pTextForwarder->GetLineBoundaries( nLineStart, nLineEnd, nPara, nLine );
-                            USHORT nWordStart = 0;
-                            USHORT nWordEnd = 0;
+                            sal_uInt16 nWordStart = 0;
+                            sal_uInt16 nWordEnd = 0;
                             if ( pTextForwarder->GetWordIndices( nPara, nLineStart, nWordStart, nWordEnd ) &&
                                  ( nWordStart != nLineStart ) )
                             {
@@ -362,64 +360,61 @@ bool lcl_hasWordBreak( const Reference< drawing::XShape >& rxShape )
     return false;
 }
 
-class MaxLabelEquidistantTickIter : public EquidistantTickIter
+class MaxLabelTickIter : public TickIter
 {
     //iterate over first two and last two labels and the longest label
 public:
-    MaxLabelEquidistantTickIter( ::std::vector< ::std::vector< TickInfo > >& rTickInfos
-            , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement
+    MaxLabelTickIter( ::std::vector< TickInfo >& rTickInfoVector
             , sal_Int32 nLongestLabelIndex );
-    virtual ~MaxLabelEquidistantTickIter();
+    virtual ~MaxLabelTickIter();
 
-    virtual TickInfo*   nextInfo();
+    virtual TickInfo* firstInfo();
+    virtual TickInfo* nextInfo();
 
 private:
-    sal_Int32 m_nLongestLabelIndex;
+    ::std::vector< TickInfo >& m_rTickInfoVector;
+    ::std::vector< sal_Int32 > m_aValidIndices;
+    sal_Int32 m_nCurrentIndex;
 };
 
-MaxLabelEquidistantTickIter::MaxLabelEquidistantTickIter( ::std::vector< ::std::vector< TickInfo > >& rTickInfos
-            , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement
+MaxLabelTickIter::MaxLabelTickIter( ::std::vector< TickInfo >& rTickInfoVector
             , sal_Int32 nLongestLabelIndex )
-            : EquidistantTickIter( rTickInfos, rIncrement, 0//nMinDepth
-                                                , 0//nMaxDepth
-                                                )
-            , m_nLongestLabelIndex( nLongestLabelIndex )
+            : m_rTickInfoVector(rTickInfoVector)
+            , m_nCurrentIndex(0)
 {
-    sal_Int32 nMaxIndex = getMaxIndex();
-
-    //ensure correct value:
-    if( m_nLongestLabelIndex<0 || m_nLongestLabelIndex>nMaxIndex)
-        m_nLongestLabelIndex = 0;
-
-    //last label is checked anyhow
-    if( m_nLongestLabelIndex==nMaxIndex )
-        m_nLongestLabelIndex = 0;
-    //label before last is checked anyhow
-    if( m_nLongestLabelIndex+1==nMaxIndex )
-        m_nLongestLabelIndex = 0;
+    sal_Int32 nMaxIndex = m_rTickInfoVector.size()-1;
+    if( nLongestLabelIndex<0 || nLongestLabelIndex>=nMaxIndex-1 )
+        nLongestLabelIndex = 0;
+
+    if( nMaxIndex>=0 )
+        m_aValidIndices.push_back(0);
+    if( nMaxIndex>=1 )
+        m_aValidIndices.push_back(1);
+    if( nLongestLabelIndex>1 )
+        m_aValidIndices.push_back(nLongestLabelIndex);
+    if( nMaxIndex > 2 )
+        m_aValidIndices.push_back(nMaxIndex-1);
+    if( nMaxIndex > 1 )
+        m_aValidIndices.push_back(nMaxIndex);
 }
-MaxLabelEquidistantTickIter::~MaxLabelEquidistantTickIter()
+MaxLabelTickIter::~MaxLabelTickIter()
 {
 }
 
-TickInfo* MaxLabelEquidistantTickIter::nextInfo()
+TickInfo* MaxLabelTickIter::firstInfo()
 {
-    sal_Int32 nCurrentPos = getCurrentIndex();
-    sal_Int32 nMaxIndex = getMaxIndex();
-    if( nCurrentPos>0 )
-    {
-        if( m_nLongestLabelIndex>1 && nCurrentPos<m_nLongestLabelIndex  )
-            gotoIndex( m_nLongestLabelIndex-1 ) ;
-        else
-        {
-            if( nMaxIndex>3 && nCurrentPos<nMaxIndex-1 )
-                gotoIndex( nMaxIndex-2 );
-            else if( nMaxIndex>2 && nCurrentPos<nMaxIndex )
-                gotoIndex( nMaxIndex-1 );
-        }
-    }
-    
-    return EquidistantTickIter::nextInfo();
+    m_nCurrentIndex = 0;
+    if( m_nCurrentIndex < static_cast<sal_Int32>(m_aValidIndices.size()) )
+        return &m_rTickInfoVector[m_aValidIndices[m_nCurrentIndex]];
+    return 0;
+}
+
+TickInfo* MaxLabelTickIter::nextInfo()
+{
+    m_nCurrentIndex++;
+    if( m_nCurrentIndex>=0 && m_nCurrentIndex<static_cast<sal_Int32>(m_aValidIndices.size()) )
+        return &m_rTickInfoVector[m_aValidIndices[m_nCurrentIndex]];
+    return 0;
 }
 
 bool VCartesianAxis::isBreakOfLabelsAllowed( const AxisLabelProperties& rAxisLabelProperties
@@ -489,27 +484,27 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s
             std::vector< ComplexCategory >::const_iterator aEnd(aComplexCategories.end());
             for(;aIt!=aEnd;++aIt)
             {
-                TickInfo aTickInfo;
+                TickInfo aTickInfo(0);
                 ComplexCategory aCat(*aIt);
                 sal_Int32 nCount = aCat.Count;
-                if( nCatIndex + 0.5 + nCount >= m_aScale.Maximum )
+                if( nCatIndex + 1.0 + nCount >= m_aScale.Maximum )
                 {
-                    nCount = static_cast<sal_Int32>(m_aScale.Maximum - 0.5 - nCatIndex);
+                    nCount = static_cast<sal_Int32>(m_aScale.Maximum - 1.0 - nCatIndex);
                     if( nCount <= 0 )
                         nCount = 1;
                 }
-                aTickInfo.fScaledTickValue = nCatIndex + 0.5 + nCount/2.0;
+                aTickInfo.fScaledTickValue = nCatIndex + 1.0 + nCount/2.0;
                 aTickInfo.nFactorForLimitedTextWidth = nCount;
                 aTickInfo.aText = aCat.Text;
                 aTickInfoVector.push_back(aTickInfo);
                 nCatIndex += nCount;
-                if( nCatIndex + 0.5 >= m_aScale.Maximum )
+                if( nCatIndex + 1.0 >= m_aScale.Maximum )
                     break;
             }
             rAllTickInfos.push_back(aTickInfoVector);
         }
     }
-    else //bShiftedPosition==true
+    else //bShiftedPosition==false
     {
         rAllTickInfos.clear();
         sal_Int32 nLevel=0;
@@ -523,19 +518,19 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s
             std::vector< ComplexCategory >::const_iterator aEnd(aComplexCategories.end());
             for(;aIt!=aEnd;++aIt)
             {
-                TickInfo aTickInfo;
+                TickInfo aTickInfo(0);
                 ComplexCategory aCat(*aIt);
-                aTickInfo.fScaledTickValue = nCatIndex + 0.5;
+                aTickInfo.fScaledTickValue = nCatIndex + 1.0;
                 aTickInfoVector.push_back(aTickInfo);
                 nCatIndex += aCat.Count;
-                if( nCatIndex + 0.5 > m_aScale.Maximum )
+                if( nCatIndex + 1.0 > m_aScale.Maximum )
                     break;
             }
             //fill up with single ticks until maximum scale
-            while( nCatIndex + 0.5 < m_aScale.Maximum )
+            while( nCatIndex + 1.0 < m_aScale.Maximum )
             {
-                TickInfo aTickInfo;
-                aTickInfo.fScaledTickValue = nCatIndex + 0.5;
+                TickInfo aTickInfo(0);
+                aTickInfo.fScaledTickValue = nCatIndex + 1.0;
                 aTickInfoVector.push_back(aTickInfo);
                 nCatIndex ++;
                 if( nLevel>0 )
@@ -543,7 +538,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s
             }
             //add an additional tick at the end
             {
-                TickInfo aTickInfo;
+                TickInfo aTickInfo(0);
                 aTickInfo.fScaledTickValue = m_aScale.Maximum;
                 aTickInfoVector.push_back(aTickInfo);
             }
@@ -554,7 +549,7 @@ void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector< ::s
 
 void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos )
 {
-    if( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels )
+    if( isComplexCategoryAxis() )
         createAllTickInfosFromComplexCategories( rAllTickInfos, false );
     else
         VAxisBase::createAllTickInfos(rAllTickInfos);
@@ -562,21 +557,13 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
 
 ::std::auto_ptr< TickIter > VCartesianAxis::createLabelTickIterator( sal_Int32 nTextLevel )
 {
-    if( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels )
-    {
-        if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 >(m_aAllTickInfos.size()) )
-            return ::std::auto_ptr< TickIter >( new PureTickIter( m_aAllTickInfos[nTextLevel] ) );
-    }
-    else
-    {
-        if(nTextLevel==0)
-            return ::std::auto_ptr< TickIter >( new EquidistantTickIter( m_aAllTickInfos, m_aIncrement, 0, 0 ) );
-    }
+    if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 >(m_aAllTickInfos.size()) )
+        return ::std::auto_ptr< TickIter >( new PureTickIter( m_aAllTickInfos[nTextLevel] ) );
     return ::std::auto_ptr< TickIter >();
 }
 ::std::auto_ptr< TickIter > VCartesianAxis::createMaximumLabelTickIterator( sal_Int32 nTextLevel )
 {
-    if( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels )
+    if( isComplexCategoryAxis() || isDateAxis() )
     {
         return createLabelTickIterator( nTextLevel ); //mmmm maybe todo: create less than all texts here
     }
@@ -584,8 +571,11 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
     {
         if(nTextLevel==0)
         {
-            sal_Int32 nLongestLabelIndex = m_bUseTextLabels ? this->getIndexOfLongestLabel( m_aTextLabels ) : 0;
-            return ::std::auto_ptr< TickIter >( new MaxLabelEquidistantTickIter( m_aAllTickInfos, m_aIncrement, nLongestLabelIndex ) );
+            if( !m_aAllTickInfos.empty() )
+            {
+                sal_Int32 nLongestLabelIndex = m_bUseTextLabels ? this->getIndexOfLongestLabel( m_aTextLabels ) : 0;
+                return ::std::auto_ptr< TickIter >( new MaxLabelTickIter( m_aAllTickInfos[0], nLongestLabelIndex ) );
+            }
         }
     }
     return ::std::auto_ptr< TickIter >();
@@ -594,7 +584,7 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
 sal_Int32 VCartesianAxis::getTextLevelCount() const
 {
     sal_Int32 nTextLevelCount = 1;
-    if( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels )
+    if( isComplexCategoryAxis() )
         nTextLevelCount = m_aAxisProperties.m_pExplicitCategoriesProvider->getCategoryLevelCount();
     return nTextLevelCount;
 }
@@ -603,7 +593,7 @@ bool VCartesianAxis::createTextShapes(
                        const Reference< drawing::XShapes >& xTarget
                      , TickIter& rTickIter
                      , AxisLabelProperties& rAxisLabelProperties
-                     , TickmarkHelper_2D* pTickmarkHelper
+                     , TickFactory_2D* pTickFactory
                      , sal_Int32 nScreenDistanceBetweenTicks )
 {
     //returns true if the text shapes have been created succesfully
@@ -617,10 +607,10 @@ bool VCartesianAxis::createTextShapes(
     FixedNumberFormatter aFixedNumberFormatter(
                 m_xNumberFormatsSupplier, rAxisLabelProperties.nNumberFormatKey );
 
-    const bool bIsHorizontalAxis = pTickmarkHelper->isHorizontalAxis();
-    const bool bIsVerticalAxis = pTickmarkHelper->isVerticalAxis();
+    const bool bIsHorizontalAxis = pTickFactory->isHorizontalAxis();
+    const bool bIsVerticalAxis = pTickFactory->isVerticalAxis();
     bool bIsStaggered = rAxisLabelProperties.getIsStaggered();
-    B2DVector aTextToTickDistance( pTickmarkHelper->getDistanceAxisTickToText( m_aAxisProperties, true ) );
+    B2DVector aTextToTickDistance( pTickFactory->getDistanceAxisTickToText( m_aAxisProperties, true ) );
     sal_Int32 nLimitedSpaceForText = -1;
     if( isBreakOfLabelsAllowed( rAxisLabelProperties, bIsHorizontalAxis ) )
     {
@@ -716,7 +706,7 @@ bool VCartesianAxis::createTextShapes(
             }
         }
 
-        pTickInfo->updateUnscaledValue( xInverseScaling );
+        //xxxxx pTickInfo->updateUnscaledValue( xInverseScaling );
 
         bool bHasExtraColor=false;
         sal_Int32 nExtraColor=0;
@@ -724,7 +714,7 @@ bool VCartesianAxis::createTextShapes(
         rtl::OUString aLabel;
         if(pCategories)
         {
-            sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->fUnscaledTickValue) - 1; //first category (index 0) matches with real number 1.0
+            sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0
             if( nIndex>=0 && nIndex<pCategories->getLength() )
                 aLabel = (*pCategories)[nIndex];
         }
@@ -733,7 +723,7 @@ bool VCartesianAxis::createTextShapes(
             aLabel = pTickInfo->aText;
         }
         else
-            aLabel = aFixedNumberFormatter.getFormattedString( pTickInfo->fUnscaledTickValue, nExtraColor, bHasExtraColor );
+            aLabel = aFixedNumberFormatter.getFormattedString( pTickInfo->getUnscaledTickValue(), nExtraColor, bHasExtraColor );
 
         if(pColorAny)
             *pColorAny = uno::makeAny(bHasExtraColor?nExtraColor:nColor);
@@ -1245,12 +1235,12 @@ void VCartesianAxis::get2DAxisMainLine( B2DVector& rStart, B2DVector& rEnd, doub
     }
 }
 
-TickmarkHelper* VCartesianAxis::createTickmarkHelper()
+TickFactory* VCartesianAxis::createTickFactory()
 {
-    return createTickmarkHelper2D();
+    return createTickFactory2D();
 }
 
-TickmarkHelper_2D* VCartesianAxis::createTickmarkHelper2D()
+TickFactory_2D* VCartesianAxis::createTickFactory2D()
 {
     B2DVector aStart, aEnd;
     this->get2DAxisMainLine( aStart, aEnd, this->getLogicValueWhereMainLineCrossesOtherAxis() );
@@ -1258,7 +1248,7 @@ TickmarkHelper_2D* VCartesianAxis::createTickmarkHelper2D()
     B2DVector aLabelLineStart, aLabelLineEnd;
     this->get2DAxisMainLine( aLabelLineStart, aLabelLineEnd, this->getLogicValueWhereLabelLineCrossesOtherAxis() );
     
-    return new TickmarkHelper_2D( m_aScale, m_aIncrement, aStart, aEnd, aLabelLineStart-aStart );
+    return new TickFactory_2D( m_aScale, m_aIncrement, aStart, aEnd, aLabelLineStart-aStart );
 }
 
 void lcl_hideIdenticalScreenValues( TickIter& rTickIter )
@@ -1282,7 +1272,7 @@ void lcl_hideIdenticalScreenValues( TickIter& rTickIter )
 //'hide' tickmarks with identical screen values in aAllTickInfos
 void VCartesianAxis::hideIdenticalScreenValues( ::std::vector< ::std::vector< TickInfo > >& rTickInfos ) const
 {
-    if( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels )
+    if( isComplexCategoryAxis() || isDateAxis() )
     {
         sal_Int32 nCount = rTickInfos.size();
         for( sal_Int32 nN=0; nN<nCount; nN++ )
@@ -1328,12 +1318,12 @@ sal_Int32 VCartesianAxis::estimateMaximumAutoMainIncrementCount()
     return nRet;
 }
 
-void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabelProperties, TickmarkHelper_2D* pTickmarkHelper2D )
+void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabelProperties, TickFactory_2D* pTickFactory2D )
 {
-    if( !pTickmarkHelper2D )
+    if( !pTickFactory2D )
         return;
 
-    if( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels )
+    if( isComplexCategoryAxis() )
     {
         sal_Int32 nTextLevelCount = getTextLevelCount();
         B2DVector aCummulatedLabelsDistance(0,0);
@@ -1349,25 +1339,26 @@ void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabel
                     fRotationAngleDegree = 0.0;
                 }
                 aCummulatedLabelsDistance += lcl_getLabelsDistance( *apTickIter.get()
-                    , pTickmarkHelper2D->getDistanceAxisTickToText( m_aAxisProperties )
+                    , pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties )
                     , fRotationAngleDegree );
             }
         }
     }
     else if( rAxisLabelProperties.getIsStaggered() )
     {
-        EquidistantLabelIterator aInnerIter( m_aAllTickInfos, m_aIncrement
-            , rAxisLabelProperties.eStaggering, true, 0, 0 );
-        EquidistantLabelIterator aOuterIter( m_aAllTickInfos, m_aIncrement
-            , rAxisLabelProperties.eStaggering, false, 0, 0 );
-
-        lcl_shiftLables( aOuterIter
-            , lcl_getLabelsDistance( aInnerIter
-                , pTickmarkHelper2D->getDistanceAxisTickToText( m_aAxisProperties ), 0.0 ) );
+        if( !m_aAllTickInfos.empty() )
+        {
+            LabelIterator aInnerIter( m_aAllTickInfos[0], rAxisLabelProperties.eStaggering, true );
+            LabelIterator aOuterIter( m_aAllTickInfos[0], rAxisLabelProperties.eStaggering, false );
+
+            lcl_shiftLables( aOuterIter
+                , lcl_getLabelsDistance( aInnerIter
+                    , pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties ), 0.0 ) );
+        }
     }
 }
 
-void SAL_CALL VCartesianAxis::createLabels()
+void VCartesianAxis::createLabels()
 {
     if( !prepareShapeCreation() )
         return;
@@ -1376,14 +1367,14 @@ void SAL_CALL VCartesianAxis::createLabels()
     //create labels
     if( m_aAxisProperties.m_bDisplayLabels )
     {
-        std::auto_ptr< TickmarkHelper_2D > apTickmarkHelper2D( this->createTickmarkHelper2D() );
-        TickmarkHelper_2D* pTickmarkHelper2D = apTickmarkHelper2D.get();
-        if( !pTickmarkHelper2D )
+        std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+        TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
+        if( !pTickFactory2D )
             return;
 
         //-----------------------------------------
         //get the transformed screen values for all tickmarks in aAllTickInfos
-        pTickmarkHelper2D->updateScreenValues( m_aAllTickInfos );
+        pTickFactory2D->updateScreenValues( m_aAllTickInfos );
         //-----------------------------------------
         //'hide' tickmarks with identical screen values in aAllTickInfos
         hideIdenticalScreenValues( m_aAllTickInfos );
@@ -1400,7 +1391,7 @@ void SAL_CALL VCartesianAxis::createLabels()
             {
                 if(nTextLevel==0)
                 {
-                    nScreenDistanceBetweenTicks = TickmarkHelper_2D::getTickScreenDistance( *apTickIter.get() );
+                    nScreenDistanceBetweenTicks = TickFactory_2D::getTickScreenDistance( *apTickIter.get() );
                     if( nTextLevelCount>1 )
                         nScreenDistanceBetweenTicks*=2; //the above used tick iter does contain also the sub ticks -> thus the given distance is only the half
                 }
@@ -1422,16 +1413,16 @@ void SAL_CALL VCartesianAxis::createLabels()
                     }
                 }
                 AxisLabelProperties& rAxisLabelProperties =  m_aAxisProperties.m_bComplexCategories ? aComplexProps : m_aAxisLabelProperties;
-                while( !createTextShapes( m_xTextTarget, *apTickIter.get(), rAxisLabelProperties, pTickmarkHelper2D, nScreenDistanceBetweenTicks ) )
+                while( !createTextShapes( m_xTextTarget, *apTickIter.get(), rAxisLabelProperties, pTickFactory2D, nScreenDistanceBetweenTicks ) )
                 {
                 };
             }
         }
-        doStaggeringOfLabels( m_aAxisLabelProperties, pTickmarkHelper2D );
+        doStaggeringOfLabels( m_aAxisLabelProperties, pTickFactory2D );
     }
 }
 
-void SAL_CALL VCartesianAxis::createMaximumLabels()
+void VCartesianAxis::createMaximumLabels()
 {
     TrueGuard aRecordMaximumTextSize(m_bRecordMaximumTextSize);
 
@@ -1442,20 +1433,20 @@ void SAL_CALL VCartesianAxis::createMaximumLabels()
     //create labels
     if( m_aAxisProperties.m_bDisplayLabels )
     {
-        std::auto_ptr< TickmarkHelper_2D > apTickmarkHelper2D( this->createTickmarkHelper2D() );
-        TickmarkHelper_2D* pTickmarkHelper2D = apTickmarkHelper2D.get();
-        if( !pTickmarkHelper2D )
+        std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+        TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
+        if( !pTickFactory2D )
             return;
 
         //-----------------------------------------
         //get the transformed screen values for all tickmarks in aAllTickInfos
-        pTickmarkHelper2D->updateScreenValues( m_aAllTickInfos );
+        pTickFactory2D->updateScreenValues( m_aAllTickInfos );
 
         //create tick mark text shapes
         //@todo: iterate through all tick depth wich should be labeled
 
         AxisLabelProperties aAxisLabelProperties( m_aAxisLabelProperties );
-        if( isAutoStaggeringOfLabelsAllowed( aAxisLabelProperties, pTickmarkHelper2D->isHorizontalAxis(), pTickmarkHelper2D->isVerticalAxis() ) )
+        if( isAutoStaggeringOfLabelsAllowed( aAxisLabelProperties, pTickFactory2D->isHorizontalAxis(), pTickFactory2D->isVerticalAxis() ) )
             aAxisLabelProperties.eStaggering = STAGGER_EVEN;
         aAxisLabelProperties.bOverlapAllowed = true;
         aAxisLabelProperties.bLineBreakAllowed = false;
@@ -1465,29 +1456,29 @@ void SAL_CALL VCartesianAxis::createMaximumLabels()
             ::std::auto_ptr< TickIter > apTickIter = createMaximumLabelTickIterator( nTextLevel );
             if(apTickIter.get())
             {
-                while( !createTextShapes( m_xTextTarget, *apTickIter.get(), aAxisLabelProperties, pTickmarkHelper2D, -1 ) )
+                while( !createTextShapes( m_xTextTarget, *apTickIter.get(), aAxisLabelProperties, pTickFactory2D, -1 ) )
                 {
                 };
             }
         }
-        doStaggeringOfLabels( aAxisLabelProperties, pTickmarkHelper2D );
+        doStaggeringOfLabels( aAxisLabelProperties, pTickFactory2D );
     }
 }
 
-void SAL_CALL VCartesianAxis::updatePositions()
+void VCartesianAxis::updatePositions()
 {
     //-----------------------------------------
     //update positions of labels
     if( m_aAxisProperties.m_bDisplayLabels )
     {
-        std::auto_ptr< TickmarkHelper_2D > apTickmarkHelper2D( this->createTickmarkHelper2D() );
-        TickmarkHelper_2D* pTickmarkHelper2D = apTickmarkHelper2D.get();
-        if( !pTickmarkHelper2D )
+        std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+        TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
+        if( !pTickFactory2D )
             return;
 
         //-----------------------------------------
         //update positions of all existing text shapes
-        pTickmarkHelper2D->updateScreenValues( m_aAllTickInfos );
+        pTickFactory2D->updateScreenValues( m_aAllTickInfos );
 
         ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin();
         const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd  = m_aAllTickInfos.end();
@@ -1501,7 +1492,7 @@ void SAL_CALL VCartesianAxis::updatePositions()
                 Reference< drawing::XShape > xShape2DText( rTickInfo.xTextShape );
                 if( xShape2DText.is() )
                 {
-                    B2DVector aTextToTickDistance( pTickmarkHelper2D->getDistanceAxisTickToText( m_aAxisProperties, true ) );
+                    B2DVector aTextToTickDistance( pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties, true ) );
                     B2DVector aTickScreenPos2D( rTickInfo.aTickScreenPosition );
                     aTickScreenPos2D += aTextToTickDistance;
                     awt::Point aAnchorScreenPosition2D(
@@ -1537,11 +1528,11 @@ void SAL_CALL VCartesianAxis::updatePositions()
             }
         }
 
-        doStaggeringOfLabels( m_aAxisLabelProperties, pTickmarkHelper2D );
+        doStaggeringOfLabels( m_aAxisLabelProperties, pTickFactory2D );
     }
 }
 
-void VCartesianAxis::createTickMarkLineShapes( ::std::vector< TickInfo >& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickmarkHelper_2D& rTickmarkHelper2D, bool bOnlyAtLabels )
+void VCartesianAxis::createTickMarkLineShapes( ::std::vector< TickInfo >& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickFactory_2D& rTickFactory2D, bool bOnlyAtLabels )
 {
     sal_Int32 nPointCount = rTickInfos.size();
     drawing::PointSequenceSequence aPoints(2*nPointCount);
@@ -1560,11 +1551,11 @@ void VCartesianAxis::createTickMarkLineShapes( ::std::vector< TickInfo >& rTickI
             fInnerDirectionSign *= -1.0;
         bTicksAtLabels = bTicksAtLabels || bOnlyAtLabels;
         //add ticks at labels:
-        rTickmarkHelper2D.addPointSequenceForTickLine( aPoints, nN++, (*aTickIter).fScaledTickValue
+        rTickFactory2D.addPointSequenceForTickLine( aPoints, nN++, (*aTickIter).fScaledTickValue
             , fInnerDirectionSign , rTickmarkProperties, bTicksAtLabels );
         //add ticks at axis (without lables):
         if( !bOnlyAtLabels && m_aAxisProperties.m_eTickmarkPos == ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS )
-            rTickmarkHelper2D.addPointSequenceForTickLine( aPoints, nN++, (*aTickIter).fScaledTickValue
+            rTickFactory2D.addPointSequenceForTickLine( aPoints, nN++, (*aTickIter).fScaledTickValue
                 , m_aAxisProperties.m_fInnerDirectionSign, rTickmarkProperties, !bTicksAtLabels );
     }
     aPoints.realloc(nN);
@@ -1572,14 +1563,14 @@ void VCartesianAxis::createTickMarkLineShapes( ::std::vector< TickInfo >& rTickI
                                 , &rTickmarkProperties.aLineProperties );
 }
 
-void SAL_CALL VCartesianAxis::createShapes()
+void VCartesianAxis::createShapes()
 {
     if( !prepareShapeCreation() )
         return;
     
-    std::auto_ptr< TickmarkHelper_2D > apTickmarkHelper2D( this->createTickmarkHelper2D() );
-    TickmarkHelper_2D* pTickmarkHelper2D = apTickmarkHelper2D.get();
-    if( !pTickmarkHelper2D )
+    std::auto_ptr< TickFactory_2D > apTickFactory2D( this->createTickFactory2D() );
+    TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
+    if( !pTickFactory2D )
         return;
 
     //-----------------------------------------
@@ -1588,16 +1579,16 @@ void SAL_CALL VCartesianAxis::createShapes()
     {
         //-----------------------------------------
         //create extra long ticks to separate complex categories (create them only there where the labels are)
-        if( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels )
+        if( isComplexCategoryAxis() )
         {
             ::std::vector< ::std::vector< TickInfo > > aComplexTickInfos;
             createAllTickInfosFromComplexCategories( aComplexTickInfos, true );
-            pTickmarkHelper2D->updateScreenValues( aComplexTickInfos );
+            pTickFactory2D->updateScreenValues( aComplexTickInfos );
             hideIdenticalScreenValues( aComplexTickInfos );
 
             ::std::vector<TickmarkProperties> aTickmarkPropertiesList;
             static bool bIncludeSpaceBetweenTickAndText = false;
-            sal_Int32 nOffset = static_cast<sal_Int32>(pTickmarkHelper2D->getDistanceAxisTickToText( m_aAxisProperties, false, bIncludeSpaceBetweenTickAndText ).getLength());
+            sal_Int32 nOffset = static_cast<sal_Int32>(pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties, false, bIncludeSpaceBetweenTickAndText ).getLength());
             sal_Int32 nTextLevelCount = getTextLevelCount();
             for( sal_Int32 nTextLevel=0; nTextLevel<nTextLevelCount; nTextLevel++ )
             {
@@ -1607,7 +1598,7 @@ void SAL_CALL VCartesianAxis::createShapes()
                     double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
                     if( nTextLevel>0 )
                         fRotationAngleDegree = 0.0;
-                    B2DVector aLabelsDistance( lcl_getLabelsDistance( *apTickIter.get(), pTickmarkHelper2D->getDistanceAxisTickToText( m_aAxisProperties, false ), fRotationAngleDegree ) );
+                    B2DVector aLabelsDistance( lcl_getLabelsDistance( *apTickIter.get(), pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties, false ), fRotationAngleDegree ) );
                     sal_Int32 nCurrentLength = static_cast<sal_Int32>(aLabelsDistance.getLength());
                     aTickmarkPropertiesList.push_back( m_aAxisProperties.makeTickmarkPropertiesForComplexCategories( nOffset + nCurrentLength, 0, nTextLevel ) );
                     nOffset += nCurrentLength;
@@ -1621,20 +1612,20 @@ void SAL_CALL VCartesianAxis::createShapes()
             {
                 if(nDepth==0 && !m_aAxisProperties.m_nMajorTickmarks)
                     continue;
-                createTickMarkLineShapes( *aDepthIter, aTickmarkPropertiesList[nDepth], *pTickmarkHelper2D, true /*bOnlyAtLabels*/ );
+                createTickMarkLineShapes( *aDepthIter, aTickmarkPropertiesList[nDepth], *pTickFactory2D, true /*bOnlyAtLabels*/ );
             }
         }
         //-----------------------------------------
         //create normal ticks for major and minor intervals
         {
-            ::std::vector< ::std::vector< TickInfo > > aAllShiftedTickInfos;
-            if( m_aIncrement.ShiftedPosition || ( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels ) )
+            ::std::vector< ::std::vector< TickInfo > > aUnshiftedTickInfos;
+            if( m_aScale.ShiftedCategoryPosition )// if ShiftedCategoryPosition==true the tickmarks in m_aAllTickInfos are shifted
             {
-                pTickmarkHelper2D->getAllTicksShifted( aAllShiftedTickInfos );
-                pTickmarkHelper2D->updateScreenValues( aAllShiftedTickInfos );
-                hideIdenticalScreenValues( aAllShiftedTickInfos );
+                pTickFactory2D->getAllTicks( aUnshiftedTickInfos );
+                pTickFactory2D->updateScreenValues( aUnshiftedTickInfos );
+                hideIdenticalScreenValues( aUnshiftedTickInfos );
             }
-            ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos = m_aIncrement.ShiftedPosition ? aAllShiftedTickInfos : m_aAllTickInfos;
+            ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos = m_aScale.ShiftedCategoryPosition ? aUnshiftedTickInfos : m_aAllTickInfos;
 
             ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter             = rAllTickInfos.begin();
             const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd  = rAllTickInfos.end();
@@ -1643,14 +1634,14 @@ void SAL_CALL VCartesianAxis::createShapes()
         
             sal_Int32 nTickmarkPropertiesCount = m_aAxisProperties.m_aTickmarkPropertiesList.size();
             for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; aDepthIter++, nDepth++ )
-                createTickMarkLineShapes( *aDepthIter, m_aAxisProperties.m_aTickmarkPropertiesList[nDepth], *pTickmarkHelper2D, false /*bOnlyAtLabels*/ );
+                createTickMarkLineShapes( *aDepthIter, m_aAxisProperties.m_aTickmarkPropertiesList[nDepth], *pTickFactory2D, false /*bOnlyAtLabels*/ );
         }
         //-----------------------------------------
         //create axis main lines
         //it serves also as the handle shape for the axis selection
         {
             drawing::PointSequenceSequence aPoints(1);
-            apTickmarkHelper2D->createPointSequenceForAxisMainLine( aPoints );
+            apTickFactory2D->createPointSequenceForAxisMainLine( aPoints );
             Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D(
                     m_xGroupShape_Shapes, aPoints
                     , &m_aAxisProperties.m_aLineProperties );
diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx
index db4e42281..d1d96d690 100644
--- a/chart2/source/view/axes/VCartesianAxis.hxx
+++ b/chart2/source/view/axes/VCartesianAxis.hxx
@@ -55,20 +55,11 @@ public:
 
     virtual ~VCartesianAxis();
 
-    //-------------------------------------------------------------------------
-    // partly chart2::XPlotter
-    //-------------------------------------------------------------------------
-
-    /*
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
-    */
-
-    virtual void SAL_CALL createMaximumLabels();
-    virtual void SAL_CALL createLabels();
-    virtual void SAL_CALL updatePositions();
+    virtual void createMaximumLabels();
+    virtual void createLabels();
+    virtual void updatePositions();
 
-    virtual void SAL_CALL createShapes();
+    virtual void createShapes();
 
     virtual sal_Int32 estimateMaximumAutoMainIncrementCount();
     virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos );
@@ -79,7 +70,7 @@ public:
     sal_Int32 getTextLevelCount() const;
 
     //-------------------------------------------------------------------------
-    virtual TickmarkHelper* createTickmarkHelper();
+    virtual TickFactory* createTickFactory();
     
     //-------------------------------------------------------------------------
     double      getLogicValueWhereMainLineCrossesOtherAxis() const;
@@ -122,16 +113,16 @@ protected: //methods
                        ::com::sun::star::drawing::XShapes >& xTarget
                      , TickIter& rTickIter
                      , AxisLabelProperties& rAxisLabelProperties
-                     , TickmarkHelper_2D* pTickmarkHelper
+                     , TickFactory_2D* pTickFactory
                      , sal_Int32 nScreenDistanceBetweenTicks );
 
-    void    createTickMarkLineShapes( ::std::vector< TickInfo >& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickmarkHelper_2D& rTickmarkHelper2D, bool bOnlyAtLabels );
+    void    createTickMarkLineShapes( ::std::vector< TickInfo >& rTickInfos, const TickmarkProperties& rTickmarkProperties, TickFactory_2D& rTickFactory2D, bool bOnlyAtLabels );
 
-    TickmarkHelper_2D* createTickmarkHelper2D();
+    TickFactory_2D* createTickFactory2D();
     void    hideIdenticalScreenValues(  ::std::vector< ::std::vector< TickInfo > >& rTickInfos ) const;
 
     void    doStaggeringOfLabels( const AxisLabelProperties& rAxisLabelProperties
-                            , TickmarkHelper_2D* pTickmarkHelper2D );
+                            , TickFactory_2D* pTickFactory2D );
     bool    isAutoStaggeringOfLabelsAllowed( const AxisLabelProperties& rAxisLabelProperties
                             , bool bIsHorizontalAxis, bool bIsVerticalAxis );
     bool    isBreakOfLabelsAllowed( const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis );
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index ead4efffa..481d6d98e 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -151,11 +151,7 @@ void VCartesianCoordinateSystem::createVAxisList(
                 aAxisProperties.m_bCrossingAxisHasReverseDirection = (AxisOrientation_REVERSE==aCrossingScale.Orientation);
 
                 if( aCrossingScale.AxisType == AxisType::CATEGORY )
-                {
                     aAxisProperties.m_bCrossingAxisIsCategoryAxes = true;
-                    aAxisProperties.m_bAxisBetweenCategories = ChartTypeHelper::shiftTicksAtXAxisPerDefault( AxisHelper::getChartTypeByIndex( m_xCooSysModel, 0 ) )
-                        || ( aAxisProperties.m_pExplicitCategoriesProvider && aAxisProperties.m_pExplicitCategoriesProvider->hasComplexCategories() );
-                }
             }
         
             if( nDimensionIndex == 2 )
@@ -169,25 +165,12 @@ void VCartesianCoordinateSystem::createVAxisList(
             aAxisProperties.init(true);
             if(aAxisProperties.m_bDisplayLabels)
                 aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis( xAxis, xNumberFormatsSupplier );
-
-            if( nDimensionIndex == 0 && aAxisProperties.m_nAxisType == AxisType::CATEGORY
-                && aAxisProperties.m_pExplicitCategoriesProvider )
-            {
-                if( aAxisProperties.m_pExplicitCategoriesProvider->hasComplexCategories() )
-                    aAxisProperties.m_bComplexCategories = true;
-            }
             //-------------------
             ::boost::shared_ptr< VAxisBase > apVAxis( new VCartesianAxis(aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
             tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
             m_aAxisMap[aFullAxisIndex] = apVAxis;
             apVAxis->set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos );
 
-            //apVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
-            //apVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
-            //    , this->createCIDForAxis( xAxis, nDimensionIndex, nAxisIndex ) );
-            //if(2==nDimensionCount)
-            //    apVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
-            //apVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
             apVAxis->initAxisLabelProperties(rFontReferenceSize,rMaximumSpaceForLabels);
         }
     }
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 24fee0cb7..435b9d328 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_chart2.hxx"
 #include "VCartesianGrid.hxx"
-#include "TickmarkHelper.hxx"
+#include "Tickmarks.hxx"
 #include "PlottingPositionHelper.hxx"
 #include "ShapeFactory.hxx"
 #include "ObjectIdentifier.hxx"
@@ -210,7 +210,7 @@ void VCartesianGrid::fillLinePropertiesFromGridModel( ::std::vector<VLinePropert
     }
 };
 
-void SAL_CALL VCartesianGrid::createShapes()
+void VCartesianGrid::createShapes()
 {
     if(!m_aGridPropertiesList.getLength())
         return;
@@ -230,14 +230,11 @@ void SAL_CALL VCartesianGrid::createShapes()
 
     //-----------------------------------------
     //create all scaled tickmark values
-    std::auto_ptr< TickmarkHelper > apTickmarkHelper( this->createTickmarkHelper() );
-    TickmarkHelper& aTickmarkHelper = *apTickmarkHelper.get();
+    std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+    TickFactory& aTickFactory = *apTickFactory.get();
     ::std::vector< ::std::vector< TickInfo > > aAllTickInfos;
-    if( m_aIncrement.ShiftedPosition )
-        aTickmarkHelper.getAllTicksShifted( aAllTickInfos );
-    else
-        aTickmarkHelper.getAllTicks( aAllTickInfos );
-
+    aTickFactory.getAllTicks( aAllTickInfos );
+    
     //-----------------------------------------
     //create tick mark line shapes
     ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter             = aAllTickInfos.begin();
diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx
index cb130c0ad..4c5a4981e 100644
--- a/chart2/source/view/axes/VCartesianGrid.hxx
+++ b/chart2/source/view/axes/VCartesianGrid.hxx
@@ -52,7 +52,7 @@ public:
         );
     virtual ~VCartesianGrid();
 
-    virtual void SAL_CALL createShapes();
+    virtual void createShapes();
 
     static void fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList
                     , const ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 808d05d2d..23585d0c9 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -97,8 +97,8 @@ VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCoo
 {
     if( !m_xCooSysModel.is() || m_xCooSysModel->getDimension()<3 )
     {
-        m_aExplicitScales[2].Minimum = -0.5;
-        m_aExplicitScales[2].Maximum = 0.5;
+        m_aExplicitScales[2].Minimum = 1.0;
+        m_aExplicitScales[2].Maximum = 2.0;
         m_aExplicitScales[2].Orientation = AxisOrientation_MATHEMATICAL;
     }
 }
@@ -106,7 +106,7 @@ VCoordinateSystem::~VCoordinateSystem()
 {
 }
 
-void SAL_CALL VCoordinateSystem::initPlottingTargets(  const Reference< drawing::XShapes >& xLogicTarget
+void VCoordinateSystem::initPlottingTargets(  const Reference< drawing::XShapes >& xLogicTarget
        , const Reference< drawing::XShapes >& xFinalTarget
        , const Reference< lang::XMultiServiceFactory >& xShapeFactory
        , Reference< drawing::XShapes >& xLogicTargetForSeriesBehindAxis )
@@ -270,9 +270,9 @@ ExplicitCategoriesProvider* VCoordinateSystem::getExplicitCategoriesProvider()
     return m_apExplicitCategoriesProvider.get();
 }
 
-Sequence< ExplicitScaleData > VCoordinateSystem::getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const
+std::vector< ExplicitScaleData > VCoordinateSystem::getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const
 {
-    Sequence< ExplicitScaleData > aRet(m_aExplicitScales);
+    std::vector< ExplicitScaleData > aRet(m_aExplicitScales);
 
     impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex );
     aRet[nDimensionIndex]=this->getExplicitScale( nDimensionIndex, nAxisIndex );
@@ -280,9 +280,9 @@ Sequence< ExplicitScaleData > VCoordinateSystem::getExplicitScales( sal_Int32 nD
     return aRet;
 }
 
-Sequence< ExplicitIncrementData > VCoordinateSystem::getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const
+std::vector< ExplicitIncrementData > VCoordinateSystem::getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const
 {
-    Sequence< ExplicitIncrementData > aRet(m_aExplicitIncrements);
+    std::vector< ExplicitIncrementData > aRet(m_aExplicitIncrements);
 
     impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex );
     aRet[nDimensionIndex]=this->getExplicitIncrement( nDimensionIndex, nAxisIndex );
@@ -381,6 +381,17 @@ void VCoordinateSystem::updateScalesAndIncrementsOnAxes()
 
 void VCoordinateSystem::prepareScaleAutomatismForDimensionAndIndex( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex )
 {
+    if( rScaleAutomatism.getScale().AxisType==AxisType::DATE && nDimIndex==0 )
+    {
+        sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::MONTH;
+        if( !(rScaleAutomatism.getScale().TimeIncrement.TimeResolution >>= nTimeResolution) )
+        {
+            nTimeResolution = m_aMergedMinimumAndMaximumSupplier.calculateTimeResolutionOnXAxis();
+            rScaleAutomatism.setAutomaticTimeResolution( nTimeResolution );
+        }
+        m_aMergedMinimumAndMaximumSupplier.setTimeResolutionOnXAxis( nTimeResolution, rScaleAutomatism.getNullDate() );
+    }
+
     double fMin = 0.0;
     double fMax = 0.0;
     ::rtl::math::setInf(&fMin, false);
@@ -402,11 +413,6 @@ void VCoordinateSystem::prepareScaleAutomatismForDimensionAndIndex( ScaleAutomat
         fMax = m_aMergedMinimumAndMaximumSupplier.getMaximumZ();
     }
 
-    this->prepareScaleAutomatism( rScaleAutomatism, fMin, fMax, nDimIndex, nAxisIndex );
-}
-
-void VCoordinateSystem::prepareScaleAutomatism( ScaleAutomatism& rScaleAutomatism, double fMin, double fMax, sal_Int32 nDimIndex, sal_Int32 nAxisIndex )
-{
     //merge our values with those already contained in rScaleAutomatism
     rScaleAutomatism.expandValueRange( fMin, fMax );
 
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index d38a4bfc0..ebd2cf0c0 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -33,7 +33,7 @@
 #include "VPolarGrid.hxx"
 #include "ShapeFactory.hxx"
 #include "macros.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "PolarLabelPositionHelper.hxx"
 #include <tools/color.hxx>
 
@@ -120,17 +120,17 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
             rtl::OUString aLabel;
             if(pLabels)
             {
-                sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->fUnscaledTickValue) - 1; //first category (index 0) matches with real number 1.0
+                sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0
                 if( nIndex>=0 && nIndex<pLabels->getLength() )
                     aLabel = (*pLabels)[nIndex];
             }
             else
-                aLabel = aFixedNumberFormatter.getFormattedString( pTickInfo->fUnscaledTickValue, nExtraColor, bHasExtraColor );
+                aLabel = aFixedNumberFormatter.getFormattedString( pTickInfo->getUnscaledTickValue(), nExtraColor, bHasExtraColor );
 
             if(pColorAny)
                 *pColorAny = uno::makeAny(bHasExtraColor?nExtraColor:nColor);
 
-            double fLogicAngle = pTickInfo->fUnscaledTickValue;
+            double fLogicAngle = pTickInfo->getUnscaledTickValue();
         
             LabelAlignment eLabelAlignment(LABEL_ALIGN_CENTER);
             PolarLabelPositionHelper aPolarLabelPositionHelper(m_pPosHelper,nDimensionCount,xTarget,&aShapeFactory);
@@ -154,7 +154,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
     return true;
 }
 
-void SAL_CALL VPolarAngleAxis::createMaximumLabels()
+void VPolarAngleAxis::createMaximumLabels()
 {
     if( !prepareShapeCreation() )
         return;
@@ -162,7 +162,7 @@ void SAL_CALL VPolarAngleAxis::createMaximumLabels()
     createLabels();
 }
 
-void SAL_CALL VPolarAngleAxis::updatePositions()
+void VPolarAngleAxis::updatePositions()
 {
     //todo: really only update the positions
 
@@ -172,19 +172,19 @@ void SAL_CALL VPolarAngleAxis::updatePositions()
     createLabels();
 }
 
-void SAL_CALL VPolarAngleAxis::createLabels()
+void VPolarAngleAxis::createLabels()
 {
     if( !prepareShapeCreation() )
         return;
 
     double fLogicRadius = m_pPosHelper->getOuterLogicRadius();
-    double fLogicZ      = -0.5;//as defined
+    double fLogicZ      = 1.0;//as defined
 
     if( m_aAxisProperties.m_bDisplayLabels )
     {
         //-----------------------------------------
         //get the transformed screen values for all tickmarks in aAllTickInfos
-        std::auto_ptr< TickmarkHelper > apTickmarkHelper( this->createTickmarkHelper() );
+        std::auto_ptr< TickFactory > apTickFactory( this->createTickFactory() );
 
         //create tick mark text shapes
         //@todo: iterate through all tick depth wich should be labeled
@@ -207,13 +207,13 @@ void SAL_CALL VPolarAngleAxis::createLabels()
     }
 }
 
-void SAL_CALL VPolarAngleAxis::createShapes()
+void VPolarAngleAxis::createShapes()
 {
     if( !prepareShapeCreation() )
         return;
     
     double fLogicRadius = m_pPosHelper->getOuterLogicRadius();
-    double fLogicZ      = -0.5;//as defined
+    double fLogicZ      = 1.0;//as defined
 
     //-----------------------------------------
     //create axis main lines
diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx
index 5f84521e3..607cc45af 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.hxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.hxx
@@ -28,6 +28,7 @@
 #define _CHART2_VPOLARANGLEAXIS_HXX
 
 #include "VPolarAxis.hxx"
+#include "Tickmarks_Equidistant.hxx"
 
 //.............................................................................
 namespace chart
@@ -46,11 +47,11 @@ public:
            , sal_Int32 nDimensionCount );
     virtual ~VPolarAngleAxis();
 
-    virtual void SAL_CALL createMaximumLabels();
-    virtual void SAL_CALL createLabels();
-    virtual void SAL_CALL updatePositions();
+    virtual void createMaximumLabels();
+    virtual void createLabels();
+    virtual void updatePositions();
 
-    virtual void SAL_CALL createShapes();
+    virtual void createShapes();
 
 private: //methods
     bool createTextShapes_ForAngleAxis(
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index 8730a3abf..d0f12f239 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -31,7 +31,7 @@
 #include "VPolarAngleAxis.hxx"
 #include "VPolarRadiusAxis.hxx"
 #include "macros.hxx"
-#include "TickmarkHelper.hxx"
+#include "Tickmarks.hxx"
 #include "ShapeFactory.hxx"
 
 #include <memory>
@@ -68,12 +68,12 @@ VPolarAxis::~VPolarAxis()
     m_pPosHelper = NULL;
 }
 
-void VPolarAxis::setIncrements( const uno::Sequence< ExplicitIncrementData >& rIncrements )
+void VPolarAxis::setIncrements( const std::vector< ExplicitIncrementData >& rIncrements )
 {
     m_aIncrements = rIncrements;
 }
 
-sal_Bool SAL_CALL VPolarAxis::isAnythingToDraw()
+sal_Bool VPolarAxis::isAnythingToDraw()
 {
     return ( 2==m_nDimension && VAxisBase::isAnythingToDraw() );
 }
diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx
index 9bc1b0d3c..8f437ef28 100644
--- a/chart2/source/view/axes/VPolarAxis.hxx
+++ b/chart2/source/view/axes/VPolarAxis.hxx
@@ -47,10 +47,9 @@ public:
            , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier
            , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount );
 
-    void setIncrements( const ::com::sun::star::uno::Sequence<
-                        ::com::sun::star::chart2::ExplicitIncrementData >& rIncrements );
+    void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements );
 
-    virtual sal_Bool SAL_CALL isAnythingToDraw();
+    virtual sal_Bool isAnythingToDraw();
 
     virtual ~VPolarAxis();
 
@@ -61,8 +60,7 @@ protected:
 
 protected: //member
     PolarPlottingPositionHelper* m_pPosHelper;
-    ::com::sun::star::uno::Sequence<
-        ::com::sun::star::chart2::ExplicitIncrementData >   m_aIncrements;
+    ::std::vector< ExplicitIncrementData >   m_aIncrements;
 };
 
 //.............................................................................
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index cde46609a..377094170 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -107,15 +107,6 @@ void VPolarCoordinateSystem::createVAxisList(
             tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
             m_aAxisMap[aFullAxisIndex] = apVAxis;
 
-            //apVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) );
-            //apVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
-            //    , this->createCIDForAxis( xAxis, nDimensionIndex, nAxisIndex ) );
-            //VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( apVAxis.get() );
-            //if( pVPolarAxis )
-            //    pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
-            //if(2==nDimensionCount)
-            //    apVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
-            //apVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
             apVAxis->initAxisLabelProperties(rFontReferenceSize,rMaximumSpaceForLabels);
         }
     }
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 1a96dd407..1a2363117 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -29,12 +29,13 @@
 #include "precompiled_chart2.hxx"
 #include "VPolarGrid.hxx"
 #include "VCartesianGrid.hxx"
-#include "TickmarkHelper.hxx"
+#include "Tickmarks.hxx"
 #include "PlottingPositionHelper.hxx"
 #include "ShapeFactory.hxx"
 #include "ObjectIdentifier.hxx"
 #include "macros.hxx"
 #include "CommonConverters.hxx"
+#include "Tickmarks_Equidistant.hxx"
 #include <com/sun/star/drawing/LineStyle.hpp>
 
 #include <vector>
@@ -64,16 +65,16 @@ VPolarGrid::~VPolarGrid()
     m_pPosHelper = NULL;
 }
 
-void VPolarGrid::setIncrements( const uno::Sequence< ExplicitIncrementData >& rIncrements )
+void VPolarGrid::setIncrements( const std::vector< ExplicitIncrementData >& rIncrements )
 {
     m_aIncrements = rIncrements;
 }
 
 void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
 {
-    TickmarkHelper aTickmarkHelper( 
+    TickFactory aTickFactory( 
             m_pPosHelper->getScales()[nDimensionIndex], m_aIncrements[nDimensionIndex] );
-    aTickmarkHelper.getAllTicks( rAllTickInfos );
+    aTickFactory.getAllTicks( rAllTickInfos );
 }
 
 void VPolarGrid::createLinePointSequence_ForAngleAxis(
@@ -97,8 +98,8 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis(
         if(nTick>=rPoints[0].getLength())
             rPoints[0].realloc(rPoints[0].getLength()+30);
 
-        pTickInfo->updateUnscaledValue( xInverseScaling );
-        double fLogicAngle = pTickInfo->fUnscaledTickValue;
+        //xxxxx pTickInfo->updateUnscaledValue( xInverseScaling );
+        double fLogicAngle = pTickInfo->getUnscaledTickValue();
 
         drawing::Position3D aScenePosition3D( pPosHelper->transformAngleRadiusToScene( fLogicAngle, fLogicRadius, fLogicZ ) );
         rPoints[0][nTick].X = static_cast<sal_Int32>(aScenePosition3D.PositionX);
@@ -129,7 +130,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
 
     double fLogicInnerRadius = m_pPosHelper->getInnerLogicRadius();
     double fLogicOuterRadius = m_pPosHelper->getOuterLogicRadius();
-    double fLogicZ      = -0.5;//as defined
+    double fLogicZ      = 1.0;//as defined
 
     sal_Int32 nLinePropertiesCount = rLinePropertiesList.size();
     ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter             = rAngleTickInfos.begin();
@@ -152,8 +153,8 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
             if( !rTickInfo.bPaintIt )
                 continue;
 
-            rTickInfo.updateUnscaledValue( xInverseScaling );
-            double fLogicAngle = rTickInfo.fUnscaledTickValue;
+            //xxxxx rTickInfo.updateUnscaledValue( xInverseScaling );
+            double fLogicAngle = rTickInfo.getUnscaledTickValue();
 
             drawing::PointSequenceSequence aPoints(1);
             aPoints[0].realloc(2);
@@ -219,9 +220,9 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
             if( !rTickInfo.bPaintIt )
                 continue;
 
-            rTickInfo.updateUnscaledValue( xInverseRadiusScaling );
-            double fLogicRadius = rTickInfo.fUnscaledTickValue;
-            double fLogicZ      = -0.5;//as defined
+            //xxxxx rTickInfo.updateUnscaledValue( xInverseRadiusScaling );
+            double fLogicRadius = rTickInfo.getUnscaledTickValue();
+            double fLogicZ      = 1.0;//as defined
 
             drawing::PointSequenceSequence aPoints(1);
             VPolarGrid::createLinePointSequence_ForAngleAxis( aPoints, rAngleTickInfos
@@ -237,7 +238,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
     }
 }
     
-void SAL_CALL VPolarGrid::createShapes()
+void VPolarGrid::createShapes()
 {
     DBG_ASSERT(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper initialized");
     if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()))
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index c24e0727a..b65995465 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -28,7 +28,7 @@
 #define _CHART2_VPOLARGRID_HXX
 
 #include "VAxisOrGridBase.hxx"
-#include "TickmarkHelper.hxx"
+#include "Tickmarks.hxx"
 #include "VLineProperties.hxx"
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 
@@ -55,16 +55,15 @@ public:
         );
     virtual ~VPolarGrid();
 
-    virtual void SAL_CALL createShapes();
+    virtual void createShapes();
 
-    void setIncrements( const ::com::sun::star::uno::Sequence<
-                    ::com::sun::star::chart2::ExplicitIncrementData >& rIncrements );
+    void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements );
 
     static void createLinePointSequence_ForAngleAxis(
                     ::com::sun::star::drawing::PointSequenceSequence& rPoints
                     , ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos
-                    , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement
-                    , const ::com::sun::star::chart2::ExplicitScaleData& rScale
+                    , const ExplicitIncrementData& rIncrement
+                    , const ExplicitScaleData& rScale
                     , PolarPlottingPositionHelper* pPosHelper
                     , double fLogicRadius, double fLogicZ );
 
@@ -73,8 +72,7 @@ private: //member
         ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > > m_aGridPropertiesList;//main grid, subgrid, subsubgrid etc
     PolarPlottingPositionHelper* m_pPosHelper;
-    ::com::sun::star::uno::Sequence<
-            ::com::sun::star::chart2::ExplicitIncrementData >   m_aIncrements;
+    ::std::vector< ExplicitIncrementData >   m_aIncrements;
 
     void    getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
 
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 3bad7a8c5..ca7583c4c 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -32,6 +32,7 @@
 #include "VCartesianAxis.hxx"
 #include "PlottingPositionHelper.hxx"
 #include "CommonConverters.hxx"
+#include "Tickmarks_Equidistant.hxx"
 #include <rtl/math.hxx>
 
 //.............................................................................
@@ -70,7 +71,7 @@ void VPolarRadiusAxis::setTransformationSceneToScreen( const drawing::HomogenMat
     m_apAxisWithLabels->setTransformationSceneToScreen( rMatrix );
 }
 
-void SAL_CALL VPolarRadiusAxis::setExplicitScaleAndIncrement(
+void VPolarRadiusAxis::setExplicitScaleAndIncrement(
               const ExplicitScaleData& rScale
             , const ExplicitIncrementData& rIncrement )
             throw (uno::RuntimeException)
@@ -79,7 +80,7 @@ void SAL_CALL VPolarRadiusAxis::setExplicitScaleAndIncrement(
     m_apAxisWithLabels->setExplicitScaleAndIncrement( rScale, rIncrement );
 }
 
-void SAL_CALL VPolarRadiusAxis::initPlotter(  const uno::Reference< drawing::XShapes >& xLogicTarget
+void VPolarRadiusAxis::initPlotter(  const uno::Reference< drawing::XShapes >& xLogicTarget
        , const uno::Reference< drawing::XShapes >& xFinalTarget
        , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
        , const rtl::OUString& rCID )
@@ -89,15 +90,13 @@ void SAL_CALL VPolarRadiusAxis::initPlotter(  const uno::Reference< drawing::XSh
     m_apAxisWithLabels->initPlotter(  xLogicTarget, xFinalTarget, xShapeFactory, rCID );
 }
 
-void SAL_CALL VPolarRadiusAxis::setScales( const uno::Sequence< ExplicitScaleData >& rScales
-                                     , sal_Bool bSwapXAndYAxis )
-                            throw (uno::RuntimeException)
+void VPolarRadiusAxis::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis )
 {
     VPolarAxis::setScales( rScales, bSwapXAndYAxis );
     m_apAxisWithLabels->setScales( rScales, bSwapXAndYAxis );
 }
 
-void SAL_CALL VPolarRadiusAxis::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize
+void VPolarRadiusAxis::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize
                   , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels )
 {
     VPolarAxis::initAxisLabelProperties( rFontReferenceSize, rMaximumSpaceForLabels );
@@ -121,22 +120,22 @@ bool VPolarRadiusAxis::prepareShapeCreation()
     return true;
 }
 
-void SAL_CALL VPolarRadiusAxis::createMaximumLabels()
+void VPolarRadiusAxis::createMaximumLabels()
 {
     m_apAxisWithLabels->createMaximumLabels();
 }
 
-void SAL_CALL VPolarRadiusAxis::updatePositions()
+void VPolarRadiusAxis::updatePositions()
 {
     m_apAxisWithLabels->updatePositions();
 }
 
-void SAL_CALL VPolarRadiusAxis::createLabels()
+void VPolarRadiusAxis::createLabels()
 {
     m_apAxisWithLabels->createLabels();
 }
 
-void SAL_CALL VPolarRadiusAxis::createShapes()
+void VPolarRadiusAxis::createShapes()
 {
     if( !prepareShapeCreation() )
         return;
@@ -145,8 +144,8 @@ void SAL_CALL VPolarRadiusAxis::createShapes()
     const ExplicitIncrementData& rAngleIncrement = m_aIncrements[0];
 
     ::std::vector< ::std::vector< TickInfo > > aAngleTickInfos;
-    TickmarkHelper aAngleTickmarkHelper( rAngleScale, rAngleIncrement );
-    aAngleTickmarkHelper.getAllTicks( aAngleTickInfos );
+    TickFactory aAngleTickFactory( rAngleScale, rAngleIncrement );
+    aAngleTickFactory.getAllTicks( aAngleTickInfos );
 
     uno::Reference< XScaling > xInverseScaling( NULL );
     if( rAngleScale.Scaling.is() )
@@ -165,8 +164,8 @@ void SAL_CALL VPolarRadiusAxis::createShapes()
             continue;
         }
 
-        pTickInfo->updateUnscaledValue( xInverseScaling );
-        aAxisProperties.m_pfMainLinePositionAtOtherAxis = new double( pTickInfo->fUnscaledTickValue );
+        //xxxxx pTickInfo->updateUnscaledValue( xInverseScaling );
+        aAxisProperties.m_pfMainLinePositionAtOtherAxis = new double( pTickInfo->getUnscaledTickValue() );
         aAxisProperties.m_bDisplayLabels=false;
 
         //-------------------
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index 6c1ec85cc..ad517e6e1 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -50,7 +50,7 @@ public:
            , sal_Int32 nDimensionCount );
     virtual ~VPolarRadiusAxis();
 
-    virtual void SAL_CALL initPlotter(
+    virtual void initPlotter(
           const ::com::sun::star::uno::Reference<
                 ::com::sun::star::drawing::XShapes >& xLogicTarget
         , const ::com::sun::star::uno::Reference<
@@ -62,28 +62,24 @@ public:
 
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
 
-    virtual void SAL_CALL setScales(
-          const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::chart2::ExplicitScaleData >& rScales
-            , sal_Bool bSwapXAndYAxis )
-                throw (::com::sun::star::uno::RuntimeException);
+    virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
 
-    virtual void SAL_CALL setExplicitScaleAndIncrement(
-            const ::com::sun::star::chart2::ExplicitScaleData& rScale
-          , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement )
+    virtual void setExplicitScaleAndIncrement(
+            const ExplicitScaleData& rScale
+          , const ExplicitIncrementData& rIncrement )
                 throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL initAxisLabelProperties(
+    virtual void initAxisLabelProperties(
                     const ::com::sun::star::awt::Size& rFontReferenceSize
                   , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels );
 
     virtual sal_Int32 estimateMaximumAutoMainIncrementCount();
 
-    virtual void SAL_CALL createMaximumLabels();
-    virtual void SAL_CALL createLabels();
-    virtual void SAL_CALL updatePositions();
+    virtual void createMaximumLabels();
+    virtual void createLabels();
+    virtual void updatePositions();
 
-    virtual void SAL_CALL createShapes();
+    virtual void createShapes();
 
 protected: //methods
     virtual bool prepareShapeCreation();
diff --git a/chart2/source/view/axes/makefile.mk b/chart2/source/view/axes/makefile.mk
index 96191a3a3..af88a61b6 100644
--- a/chart2/source/view/axes/makefile.mk
+++ b/chart2/source/view/axes/makefile.mk
@@ -47,7 +47,11 @@ ENABLE_EXCEPTIONS=	TRUE
 SLOFILES = \
     $(SLO)$/VAxisOrGridBase.obj \
     $(SLO)$/VAxisBase.obj \
-    $(SLO)$/TickmarkHelper.obj \
+    $(SLO)$/DateHelper.obj \
+    $(SLO)$/DateScaling.obj \
+    $(SLO)$/Tickmarks.obj \
+    $(SLO)$/Tickmarks_Equidistant.obj \
+    $(SLO)$/Tickmarks_Dates.obj \
     $(SLO)$/MinimumAndMaximumSupplier.obj \
     $(SLO)$/ScaleAutomatism.obj \
     $(SLO)$/VAxisProperties.obj \
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 8313188b6..56aac321b 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -43,6 +43,7 @@
 #include "Clipping.hxx"
 #include "Stripe.hxx"
 #include "PolarLabelPositionHelper.hxx"
+#include "DateHelper.hxx"
 
 #include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
@@ -96,6 +97,11 @@ AreaChart::AreaChart( const uno::Reference<XChartType>& xChartTypeModel
 {
     if( !m_pMainPosHelper )
         m_pMainPosHelper = new PlottingPositionHelper();
+    if( m_pMainPosHelper )
+    {
+        m_pMainPosHelper->AllowShiftXAxisPos(true);
+        m_pMainPosHelper->AllowShiftZAxisPos(true);
+    }
     PlotterBase::m_pPosHelper = m_pMainPosHelper;
     VSeriesPlotter::m_pMainPosHelper = m_pMainPosHelper;
 
@@ -121,18 +127,12 @@ AreaChart::~AreaChart()
     delete m_pMainPosHelper;
 }
 
-double AreaChart::getMinimumX()
-{
-    if( m_bCategoryXAxis && m_bIsPolarCooSys )//the angle axis in net charts needs a different autoscaling
-        return 1.0;//first category (index 0) matches with real number 1.0
-    return VSeriesPlotter::getMinimumX();
-}
-
 double AreaChart::getMaximumX()
 {
+    double fMax = VSeriesPlotter::getMaximumX();
     if( m_bCategoryXAxis && m_bIsPolarCooSys )//the angle axis in net charts needs a different autoscaling
-        return getPointCount()+1;
-    return VSeriesPlotter::getMaximumX();
+        fMax += 1.0;
+    return fMax;
 }
 
 bool AreaChart::isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex )
@@ -183,18 +183,6 @@ APPHELPER_XSERVICEINFO_IMPL(AreaChart,CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATI
     return aSNS;
 }
 */
-/*
-//-----------------------------------------------------------------
-// chart2::XPlotter
-//-----------------------------------------------------------------
-
-    ::rtl::OUString SAL_CALL AreaChart
-::getCoordinateSystemTypeID()
-    throw (uno::RuntimeException)
-{
-    return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
-}
-*/
 drawing::Direction3D AreaChart::getPreferredDiagramAspectRatio() const
 {
     if( m_nKeepAspectRatio == 1 )
@@ -628,7 +616,7 @@ void AreaChart::createShapes()
     //check necessary here that different Y axis can not be stacked in the same group? ... hm?
 
     //update/create information for current group
-    double fLogicZ        = 0.5;//as defined
+    double fLogicZ        = 1.0;//as defined
 
     sal_Int32 nStartIndex = 0; // inclusive       ;..todo get somehow from x scale
     sal_Int32 nEndIndex = VSeriesPlotter::getPointCount();
@@ -729,6 +717,8 @@ void AreaChart::createShapes()
 
                     //collect data point information (logic coordinates, style ):
                     double fLogicX = (*aSeriesIter)->getXValue(nIndex);
+                    if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) 
+                        fLogicX = DateHelper::RasterizeDateValue( fLogicX, m_aNullDate, m_nTimeResolution );
                     double fLogicY = (*aSeriesIter)->getYValue(nIndex);
 
                     if( m_bIsPolarCooSys && m_bArea &&
@@ -796,7 +786,7 @@ void AreaChart::createShapes()
                     drawing::Position3D aUnscaledLogicPosition( fLogicX, fLogicY, fLogicZ );
                     drawing::Position3D aScaledLogicPosition(aUnscaledLogicPosition);
                     pPosHelper->doLogicScaling( aScaledLogicPosition );
-
+                    
                     //transformation 3) -> 4)
                     drawing::Position3D aScenePosition( pPosHelper->transformLogicToScene( fLogicX,fLogicY,fLogicZ, false ) );
 
diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx
index 5f5b282cb..12bbfca73 100644
--- a/chart2/source/view/charttypes/AreaChart.hxx
+++ b/chart2/source/view/charttypes/AreaChart.hxx
@@ -55,17 +55,7 @@ public:
              );
     virtual ~AreaChart();
 
-    //-------------------------------------------------------------------------
-    // chart2::XPlotter
-    //-------------------------------------------------------------------------
-
-    virtual void SAL_CALL createShapes();
-    /*
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
-    */
-
+    virtual void createShapes();
     virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 );
 
     //-------------------
@@ -75,7 +65,6 @@ public:
     //-------------------------------------------------------------------------
     // MinimumAndMaximumSupplier
     //-------------------------------------------------------------------------
-    virtual double getMinimumX();
     virtual double getMaximumX();
     virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex );
     virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 3130609fc..d743cd8ad 100755..100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -40,6 +40,7 @@
 #include "macros.hxx"
 #include "AxisIndexDefines.hxx"
 #include "Clipping.hxx"
+#include "DateHelper.hxx"
 
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 
@@ -91,7 +92,6 @@ BarChart::~BarChart()
 PlottingPositionHelper& BarChart::getPlottingPositionHelper( sal_Int32 nAxisIndex ) const
 {
     PlottingPositionHelper& rPosHelper = VSeriesPlotter::getPlottingPositionHelper( nAxisIndex );
-
     BarPositionHelper* pBarPosHelper = dynamic_cast<BarPositionHelper*>(&rPosHelper);
     if( pBarPosHelper && nAxisIndex >= 0 )
     {
@@ -100,7 +100,6 @@ PlottingPositionHelper& BarChart::getPlottingPositionHelper( sal_Int32 nAxisInde
         if( nAxisIndex < m_aGapwidthSequence.getLength() )
             pBarPosHelper->setOuterDistance( m_aGapwidthSequence[nAxisIndex]/100.0 );
     }
-
     return rPosHelper;
 }
 
@@ -118,7 +117,7 @@ drawing::Direction3D BarChart::getPreferredDiagramAspectRatio() const
             if(!m_aZSlots.empty())
                 fXSlotCount = m_aZSlots.begin()->size();
             
-            aRet.DirectionZ = aScale.DirectionZ/(aScale.DirectionX + aScale.DirectionX*(fXSlotCount-1.0)*pPosHelper->getSlotWidth());
+            aRet.DirectionZ = aScale.DirectionZ/(aScale.DirectionX + aScale.DirectionX*(fXSlotCount-1.0)*pPosHelper->getScaledSlotWidth());
         }
         else
             return VSeriesPlotter::getPreferredDiagramAspectRatio();
@@ -146,54 +145,6 @@ bool BarChart::keepAspectRatio() const
     return true;
 }
 
-//-------------------------------------------------------------------------
-// MinimumAndMaximumSupplier
-//-------------------------------------------------------------------------
-
-double BarChart::getMinimumX()
-{
-    if( m_bCategoryXAxis )
-        return 0.5;//first category (index 0) matches with real number 1.0
-    return VSeriesPlotter::getMinimumX();
-}
-double BarChart::getMaximumX()
-{
-    if( m_bCategoryXAxis )
-    {
-        //return category count
-        sal_Int32 nPointCount = getPointCount();
-        return nPointCount+0.5;//first category (index 0) matches with real number 1.0
-    }
-    return VSeriesPlotter::getMaximumX();
-}
-
-//-----------------------------------------------------------------
-// lang::XServiceInfo
-//-----------------------------------------------------------------
-/*
-APPHELPER_XSERVICEINFO_IMPL(BarChart,CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME)
-
-    uno::Sequence< rtl::OUString > BarChart
-::getSupportedServiceNames_Static()
-{
-    uno::Sequence< rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = CHART2_VIEW_BARCHART_SERVICE_NAME;
-    return aSNS;
-}
-*/
-/*
-//-----------------------------------------------------------------
-// chart2::XPlotter
-//-----------------------------------------------------------------
-
-    ::rtl::OUString SAL_CALL BarChart
-::getCoordinateSystemTypeID()
-    throw (uno::RuntimeException)
-{
-    return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
-}
-*/
-
 awt::Point BarChart::getLabelScreenPositionAndAlignment(
                      LabelAlignment& rAlignment, sal_Int32 nLabelPlacement
                      , double fScaledX, double fScaledLowerYValue, double fScaledUpperYValue, double fScaledZ
@@ -499,7 +450,7 @@ void BarChart::createShapes()
         m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
     //check necessary here that different Y axis can not be stacked in the same group? ... hm?
 
-    double fLogicZ        = 0.0;//as defined
+    double fLogicZ        = 1.0;//as defined
 
     bool bDrawConnectionLines = false;
     bool bDrawConnectionLinesInited = false;
@@ -514,12 +465,11 @@ void BarChart::createShapes()
     sal_Int32 nCreatedPoints = 0;
     //
 
-    //(@todo maybe different iteration for breaks in axis ?)
-    sal_Int32 nStartCategoryIndex = m_pMainPosHelper->getStartCategoryIndex(); // inclusive
-    sal_Int32 nEndCategoryIndex   = m_pMainPosHelper->getEndCategoryIndex(); //inclusive
+    sal_Int32 nStartIndex = 0;
+    sal_Int32 nEndIndex = VSeriesPlotter::getPointCount();
 //=============================================================================
-    //iterate through all shown categories
-    for( sal_Int32 nCatIndex = nStartCategoryIndex; nCatIndex < nEndCategoryIndex; nCatIndex++ )
+    //iterate through all x values per indices
+    for( sal_Int32 nPointIndex = nStartIndex; nPointIndex < nEndIndex; nPointIndex++ )
     {
         ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator             aZSlotIter = m_aZSlots.begin();
         const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator  aZSlotEnd = m_aZSlots.end();
@@ -538,7 +488,7 @@ void BarChart::createShapes()
                     aLogicYSumMap[nAttachedAxisIndex]=0.0;
 
                 double fMinimumY = 0.0, fMaximumY = 0.0;
-                aXSlotIter->calculateYMinAndMaxForCategory( nCatIndex
+                aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex
                     , isSeperateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex );
 
                 if( !::rtl::math::isNan( fMaximumY ) && fMaximumY > 0)
@@ -574,14 +524,14 @@ void BarChart::createShapes()
 
                 //update/create information for current group
                 pPosHelper->updateSeriesCount( aZSlotIter->size() );
-                double fLogicBaseWidth = pPosHelper->getSlotWidth();
+                double fLogicBaseWidth = pPosHelper->getScaledSlotWidth();
 
                 ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
 
                 // get distance from base value to maximum and minimum
 
                 double fMinimumY = 0.0, fMaximumY = 0.0;
-                aXSlotIter->calculateYMinAndMaxForCategory( nCatIndex
+                aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex
                     , isSeperateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex );
 
                 double fLogicPositiveYSum = 0.0;
@@ -633,7 +583,7 @@ void BarChart::createShapes()
 
                     bOnlyConnectionLinesForThisPoint = false;
 
-                    if(nCatIndex==nStartCategoryIndex)//do not create a regression line for each point
+                    if(nPointIndex==nStartIndex)//do not create a regression line for each point
                         createRegressionCurvesShapes( **aSeriesIter, xRegressionCurveTarget, xRegressionCurveEquationTarget,
                                                       m_pPosHelper->maySkipPointsInRegressionCalculation());
 
@@ -658,8 +608,17 @@ void BarChart::createShapes()
                         getSeriesGroupShape(*aSeriesIter, xSeriesTarget) );
 
                     //collect data point information (logic coordinates, style ):
-                    double fLogicX = pPosHelper->getSlotPos( (*aSeriesIter)->getXValue( nCatIndex ), fSlotX );
-                    double fLogicBarHeight = (*aSeriesIter)->getYValue( nCatIndex );
+                    double fUnscaledLogicX = (*aSeriesIter)->getXValue( nPointIndex );
+                    fUnscaledLogicX = DateHelper::RasterizeDateValue( fUnscaledLogicX, m_aNullDate, m_nTimeResolution );
+                    if(fUnscaledLogicX<pPosHelper->getLogicMinX())
+                        continue;//point not visible
+                    if(fUnscaledLogicX>pPosHelper->getLogicMaxX())
+                        continue;//point not visible
+                    if(pPosHelper->isStrongLowerRequested(0) && fUnscaledLogicX==pPosHelper->getLogicMaxX())
+                        continue;//point not visible
+                    double fLogicX = pPosHelper->getScaledSlotPos( fUnscaledLogicX, fSlotX );
+                    
+                    double fLogicBarHeight = (*aSeriesIter)->getYValue( nPointIndex );
                     if( ::rtl::math::isNan( fLogicBarHeight )) //no value at this category
                         continue;
 
@@ -684,9 +643,9 @@ void BarChart::createShapes()
                         fNegativeLogicYForNextSeries += fLogicBarHeight;
 
                     if(m_nDimension==3)
-                        fLogicZ = nZ;
+                        fLogicZ = nZ+0.5;
 
-                    drawing::Position3D aUnscaledLogicPosition( fLogicX, fUpperYValue, fLogicZ );
+                    drawing::Position3D aUnscaledLogicPosition( fUnscaledLogicX, fUpperYValue, fLogicZ );
 
                     //@todo ... start an iteration over the different breaks of the axis
                     //each subsystem may add an additional shape to form the whole point
@@ -696,7 +655,7 @@ void BarChart::createShapes()
     //				        uno::Reference<drawing::XShape>( xPointGroupShape_Shapes, uno::UNO_QUERY );
                     //as long as we do not iterate we do not need to create an additional group for each point
                     uno::Reference< drawing::XShapes > xPointGroupShape_Shapes = xSeriesGroupShape_Shapes;
-                    uno::Reference< beans::XPropertySet > xDataPointProperties( (*aSeriesIter)->getPropertiesOfPoint( nCatIndex ) );
+                    uno::Reference< beans::XPropertySet > xDataPointProperties( (*aSeriesIter)->getPropertiesOfPoint( nPointIndex ) );
                     sal_Int32 nGeometry3D = DataPointGeometry3D::CUBOID;
                     if(m_nDimension==3) try
                     {
@@ -763,7 +722,7 @@ void BarChart::createShapes()
                         //better performance for big data
                         FormerBarPoint aFormerPoint( aSeriesFormerPointMap[pSeries] );
                         pPosHelper->setCoordinateSystemResolution( m_aCoordinateSystemResolution );
-                        if( !pSeries->isAttributedDataPoint(nCatIndex)
+                        if( !pSeries->isAttributedDataPoint(nPointIndex)
                             &&
                             pPosHelper->isSameForGivenResolution( aFormerPoint.m_fX, aFormerPoint.m_fUpperY, aFormerPoint.m_fZ
                                                             , fLogicX, fUpperYValue, fLogicZ )
@@ -883,20 +842,20 @@ void BarChart::createShapes()
                             //set name/classified ObjectID (CID)
                             ShapeFactory::setShapeName(xShape
                                 , ObjectIdentifier::createPointCID(
-                                    (*aSeriesIter)->getPointCID_Stub(),nCatIndex) );
+                                    (*aSeriesIter)->getPointCID_Stub(),nPointIndex) );
                         }
 
                         //create error bar
-                        createErrorBar_Y( aUnscaledLogicPosition, **aSeriesIter, nCatIndex, m_xLogicTarget );
+                        createErrorBar_Y( aUnscaledLogicPosition, **aSeriesIter, nPointIndex, m_xLogicTarget, &fLogicX );
 
                         //------------
                         //create data point label
-                        if( (**aSeriesIter).getDataPointLabelIfLabel(nCatIndex) )
+                        if( (**aSeriesIter).getDataPointLabelIfLabel(nPointIndex) )
                         {
                             double fLogicSum = aLogicYSumMap[nAttachedAxisIndex];
 
                             LabelAlignment eAlignment(LABEL_ALIGN_CENTER);
-                            sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nCatIndex, m_xChartTypeModel, m_nDimension, pPosHelper->isSwapXAndY() );
+                            sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nPointIndex, m_xChartTypeModel, m_nDimension, pPosHelper->isSwapXAndY() );
                             
                             double fLowerBarDepth = fLogicBarDepth;
                             double fUpperBarDepth = fLogicBarDepth;
@@ -921,7 +880,7 @@ void BarChart::createShapes()
                                 if( m_nDimension == 3 )
                                     nOffset = 260;
                             }
-                            this->createDataLabel( xTextTarget, **aSeriesIter, nCatIndex
+                            this->createDataLabel( xTextTarget, **aSeriesIter, nPointIndex
                                             , fLogicValueForLabeDisplay, fLogicSum, aScreenPosition2D, eAlignment, nOffset );
                         }
 
diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx
index 68c3cf0db..637a83066 100644
--- a/chart2/source/view/charttypes/BarChart.hxx
+++ b/chart2/source/view/charttypes/BarChart.hxx
@@ -47,17 +47,7 @@ public:
             , sal_Int32 nDimensionCount );
     virtual ~BarChart();
 
-    //-------------------------------------------------------------------------
-    // chart2::XPlotter
-    //-------------------------------------------------------------------------
-
-    virtual void SAL_CALL createShapes();
-    /*
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
-    */
-
+    virtual void createShapes();
     virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 );
 
     //-------------------
@@ -65,12 +55,6 @@ public:
     virtual bool keepAspectRatio() const;
 
     //-------------------------------------------------------------------------
-    // MinimumAndMaximumSupplier
-    //-------------------------------------------------------------------------
-    virtual double getMinimumX();
-    virtual double getMaximumX();
-
-    //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
 
diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx
index f8526f58a..8e508a84f 100644
--- a/chart2/source/view/charttypes/BarPositionHelper.cxx
+++ b/chart2/source/view/charttypes/BarPositionHelper.cxx
@@ -32,6 +32,8 @@
 #include "Linear3DTransformation.hxx"
 #include "ViewDefines.hxx"
 #include "CommonConverters.hxx"
+#include "DateHelper.hxx"
+#include <com/sun/star/chart/TimeUnit.hpp>
 
 //.............................................................................
 namespace chart
@@ -43,6 +45,8 @@ using namespace ::com::sun::star::chart2;
 BarPositionHelper::BarPositionHelper( bool /* bSwapXAndY */ )
         : CategoryPositionHelper( 1 )
 {
+    AllowShiftXAxisPos(true);
+    AllowShiftZAxisPos(true);
 }
 
 BarPositionHelper::BarPositionHelper( const BarPositionHelper& rSource )
@@ -66,73 +70,22 @@ void BarPositionHelper::updateSeriesCount( double fSeriesCount )
     m_fSeriesCount = fSeriesCount;
 }
 
-uno::Reference< XTransformation > BarPositionHelper::getTransformationScaledLogicToScene() const
+double BarPositionHelper::getScaledSlotPos( double fUnscaledLogicX, double fSeriesNumber ) const
 {
-    //transformation from 2) to 4) //@todo 2) and 4) need a link to a document
+    if( m_bDateAxis )
+        fUnscaledLogicX = DateHelper::RasterizeDateValue( fUnscaledLogicX, m_aNullDate, m_nTimeResolution );
+    double fScaledLogicX(fUnscaledLogicX);
+    doLogicScaling(&fScaledLogicX,NULL,NULL);
+    fScaledLogicX = CategoryPositionHelper::getScaledSlotPos( fScaledLogicX, fSeriesNumber );
+    return fScaledLogicX;
 
-    //we need to apply this transformation to each geometric object because of a bug/problem
-    //of the old drawing layer (the UNO_NAME_3D_EXTRUDE_DEPTH is an integer value instead of an double )
-
-    if( !m_xTransformationLogicToScene.is() )
-    {
-        ::basegfx::B3DHomMatrix aMatrix;
-
-        double MinX = getLogicMinX();
-        double MinY = getLogicMinY();
-        double MinZ = getLogicMinZ();
-        double MaxX = getLogicMaxX();
-        double MaxY = getLogicMaxY();
-        double MaxZ = getLogicMaxZ();
-
-        AxisOrientation nXAxisOrientation = m_aScales[0].Orientation;
-        AxisOrientation nYAxisOrientation = m_aScales[1].Orientation;
-        AxisOrientation nZAxisOrientation = m_aScales[2].Orientation;
-
-        //apply scaling
-        //scaling of x axis is refused/ignored
-        doLogicScaling( NULL, &MinY, &MinZ );
-        doLogicScaling( NULL, &MaxY, &MaxZ);
-
-        if(m_bSwapXAndY)
-        {
-            std::swap(MinX,MinY);
-            std::swap(MaxX,MaxY);
-            std::swap(nXAxisOrientation,nYAxisOrientation);
-        }
-
-        if( AxisOrientation_MATHEMATICAL==nXAxisOrientation )
-            aMatrix.translate(-MinX,0.0,0.0);
-        else
-            aMatrix.translate(-MaxX,0.0,0.0);
-        if( AxisOrientation_MATHEMATICAL==nYAxisOrientation )
-            aMatrix.translate(0.0,-MinY,0.0);
-        else
-            aMatrix.translate(0.0,-MaxY,0.0);
-        if( AxisOrientation_MATHEMATICAL==nZAxisOrientation )
-            aMatrix.translate(0.0,0.0,-MaxZ);//z direction in draw is reverse mathematical direction
-        else
-            aMatrix.translate(0.0,0.0,-MinZ);
-
-        double fWidthX = MaxX - MinX;
-        double fWidthY = MaxY - MinY;
-        double fWidthZ = MaxZ - MinZ;
-
-        double fScaleDirectionX = AxisOrientation_MATHEMATICAL==nXAxisOrientation ? 1.0 : -1.0;
-        double fScaleDirectionY = AxisOrientation_MATHEMATICAL==nYAxisOrientation ? 1.0 : -1.0;
-        double fScaleDirectionZ = AxisOrientation_MATHEMATICAL==nZAxisOrientation ? -1.0 : 1.0;
-
-        aMatrix.scale(fScaleDirectionX*FIXED_SIZE_FOR_3D_CHART_VOLUME/fWidthX
-                , fScaleDirectionY*FIXED_SIZE_FOR_3D_CHART_VOLUME/fWidthY
-                , fScaleDirectionZ*FIXED_SIZE_FOR_3D_CHART_VOLUME/fWidthZ);
-
-        //if(nDim==2)
-            aMatrix = m_aMatrixScreenToScene*aMatrix;
-
-        m_xTransformationLogicToScene = new Linear3DTransformation(B3DHomMatrixToHomogenMatrix( aMatrix ),m_bSwapXAndY);
-    }
-    return m_xTransformationLogicToScene;
 }
 
+void BarPositionHelper::setScaledCategoryWidth( double fScaledCategoryWidth )
+{
+    m_fScaledCategoryWidth = fScaledCategoryWidth;
+    CategoryPositionHelper::setCategoryWidth( m_fScaledCategoryWidth );
+}
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx
index 9b940f546..1a82cb265 100644
--- a/chart2/source/view/charttypes/BarPositionHelper.hxx
+++ b/chart2/source/view/charttypes/BarPositionHelper.hxx
@@ -49,25 +49,10 @@ public:
 
     virtual PlottingPositionHelper* clone() const;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >
-                        getTransformationScaledLogicToScene() const;
-
     void                updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/
 
-    sal_Int32           getStartCategoryIndex() const {
-                            //first category (index 0) matches with real number 1.0
-                            sal_Int32 nStart = static_cast<sal_Int32>(getLogicMinX() - 0.5);
-                            if( nStart < 0 )
-                                nStart = 0;
-                            return nStart;
-                        }
-    sal_Int32           getEndCategoryIndex() const  {
-                            //first category (index 0) matches with real number 1.0
-                            sal_Int32 nEnd = static_cast<sal_Int32>(getLogicMaxX() - 0.5);
-                            if( nEnd < 0 )
-                                nEnd = 0;
-                            return nEnd;
-                        }
+    virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const;
+    virtual void setScaledCategoryWidth( double fScaledCategoryWidth );
 };
 
 //.............................................................................
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 1adb7f87a..b5956e573 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -121,7 +121,7 @@ void BubbleChart::calculateMaximumLogicBubbleSize()
 
 void BubbleChart::calculateBubbleSizeScalingFactor()
 {
-    double fLogicZ=0.5;
+    double fLogicZ=1.0;
     drawing::Position3D aSceneMinPos( m_pMainPosHelper->transformLogicToScene( m_pMainPosHelper->getLogicMinX(),m_pMainPosHelper->getLogicMinY(),fLogicZ, false ) );
     drawing::Position3D aSceneMaxPos( m_pMainPosHelper->transformLogicToScene( m_pMainPosHelper->getLogicMaxX(),m_pMainPosHelper->getLogicMaxY(),fLogicZ, false ) );
 
@@ -223,7 +223,7 @@ void BubbleChart::createShapes()
         m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
 
     //update/create information for current group
-    double fLogicZ        = 0.5;//as defined
+    double fLogicZ        = 1.0;//as defined
 
     sal_Int32 nStartIndex = 0; // inclusive       ;..todo get somehow from x scale
     sal_Int32 nEndIndex = VSeriesPlotter::getPointCount();
diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx
index 0e68841d5..8801b162f 100644
--- a/chart2/source/view/charttypes/BubbleChart.hxx
+++ b/chart2/source/view/charttypes/BubbleChart.hxx
@@ -46,11 +46,7 @@ public:
              , sal_Int32 nDimensionCount );
     virtual ~BubbleChart();
 
-    //-------------------------------------------------------------------------
-    // chart2::XPlotter
-    //-------------------------------------------------------------------------
-
-    virtual void SAL_CALL createShapes();
+    virtual void createShapes();
 
     virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 );
 
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 777384aa2..abf48cbb4 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -30,8 +30,6 @@
 
 #include "CandleStickChart.hxx"
 #include "ShapeFactory.hxx"
-//#include "chartview/servicenames_charttypes.hxx"
-//#include "servicenames_coosystems.hxx"
 #include "CommonConverters.hxx"
 #include "ObjectIdentifier.hxx"
 #include "LabelPositionHelper.hxx"
@@ -40,6 +38,7 @@
 #include "VLegendSymbolFactory.hxx"
 #include "FormattedStringHelper.hxx"
 #include "DataSeriesHelper.hxx"
+#include "DateHelper.hxx"
 #include <tools/debug.hxx>
 #include <rtl/math.hxx>
 #include <editeng/unoprnms.hxx>
@@ -76,22 +75,6 @@ CandleStickChart::~CandleStickChart()
 // MinimumAndMaximumSupplier
 //-------------------------------------------------------------------------
 
-double CandleStickChart::getMinimumX()
-{
-    if( m_bCategoryXAxis )
-        return 0.5;//first category (index 0) matches with real number 1.0
-    return VSeriesPlotter::getMinimumX();
-}
-double CandleStickChart::getMaximumX()
-{
-    if( m_bCategoryXAxis )
-    {
-        //return category count
-        sal_Int32 nPointCount = getPointCount();
-        return nPointCount+0.5;//first category (index 0) matches with real number 1.0
-    }
-    return VSeriesPlotter::getMaximumX();
-}
 bool CandleStickChart::isSeperateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ )
 {
     return false;
@@ -120,18 +103,6 @@ APPHELPER_XSERVICEINFO_IMPL(CandleStickChart,CHART2_VIEW_CANDLESTICKCHART_SERVIC
     return aSNS;
 }
 */
-/*
-//-----------------------------------------------------------------
-// chart2::XPlotter
-//-----------------------------------------------------------------
-
-    ::rtl::OUString SAL_CALL CandleStickChart
-::getCoordinateSystemTypeID()
-    throw (uno::RuntimeException)
-{
-    return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
-}
-*/
 
 drawing::Direction3D CandleStickChart::getPreferredDiagramAspectRatio() const
 {
@@ -205,11 +176,12 @@ void CandleStickChart::createShapes()
     }
 
     //(@todo maybe different iteration for breaks in axis ?)
-    sal_Int32 nStartCategoryIndex = m_pMainPosHelper->getStartCategoryIndex(); // inclusive
-    sal_Int32 nEndCategoryIndex   = m_pMainPosHelper->getEndCategoryIndex(); //inclusive
+    sal_Int32 nStartIndex = 0;
+    sal_Int32 nEndIndex = VSeriesPlotter::getPointCount();
+    double fLogicZ = 1.5;//as defined
 //=============================================================================
-    //iterate through all shown categories
-    for( sal_Int32 nIndex = nStartCategoryIndex; nIndex < nEndCategoryIndex; nIndex++ )
+    //iterate through all x values per indices
+    for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
     {
         ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator             aZSlotIter = m_aZSlots.begin();
         const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator  aZSlotEnd = m_aZSlots.end();
@@ -247,28 +219,48 @@ void CandleStickChart::createShapes()
                 for( ; aSeriesIter != aSeriesEnd; aSeriesIter++ )
                 {
                     //collect data point information (logic coordinates, style ):
-                    double fLogicX = pPosHelper->getSlotPos( (*aSeriesIter)->getXValue( nIndex ), fSlotX );
-                    double fY_First = (*aSeriesIter)->getY_First( nIndex );
-                    double fY_Last = (*aSeriesIter)->getY_Last( nIndex );
-                    double fY_Min = (*aSeriesIter)->getY_Min( nIndex );
-                    double fY_Max = (*aSeriesIter)->getY_Max( nIndex );
+                    double fUnscaledX = (*aSeriesIter)->getXValue( nIndex );
+                    if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) 
+                        fUnscaledX = DateHelper::RasterizeDateValue( fUnscaledX, m_aNullDate, m_nTimeResolution );
+                    if(fUnscaledX<pPosHelper->getLogicMinX() || fUnscaledX>pPosHelper->getLogicMaxX())
+                        continue;//point not visible
+                    double fScaledX = pPosHelper->getScaledSlotPos( fUnscaledX, fSlotX );
+
+                    double fUnscaledY_First = (*aSeriesIter)->getY_First( nIndex );
+                    double fUnscaledY_Last = (*aSeriesIter)->getY_Last( nIndex );
+                    double fUnscaledY_Min = (*aSeriesIter)->getY_Min( nIndex );
+                    double fUnscaledY_Max = (*aSeriesIter)->getY_Max( nIndex );
 
                     bool bBlack=false;
-                    if(fY_Last<=fY_First)
+                    if(fUnscaledY_Last<=fUnscaledY_First)
                     {
-                        std::swap(fY_First,fY_Last);
+                        std::swap(fUnscaledY_First,fUnscaledY_Last);
                         bBlack=true;
                     }
-                    if(fY_Max<fY_Min)
-                        std::swap(fY_Min,fY_Max);
+                    if(fUnscaledY_Max<fUnscaledY_Min)
+                        std::swap(fUnscaledY_Min,fUnscaledY_Max);
                     //transformation 3) -> 4)
-                    double fHalfWidth = pPosHelper->getSlotWidth()/2.0;
-                    drawing::Position3D aPosLeftFirst( pPosHelper->transformLogicToScene( fLogicX-fHalfWidth, fY_First ,0 ,true ) );
-                    drawing::Position3D aPosRightLast( pPosHelper->transformLogicToScene( fLogicX+fHalfWidth, fY_Last  ,0 ,true ) );
-                    drawing::Position3D aPosMiddleFirst( pPosHelper->transformLogicToScene( fLogicX, fY_First ,0 ,true ) );
-                    drawing::Position3D aPosMiddleLast( pPosHelper->transformLogicToScene( fLogicX, fY_Last  ,0 ,true ) );
-                    drawing::Position3D aPosMiddleMinimum( pPosHelper->transformLogicToScene( fLogicX, fY_Min ,0 ,true ) );
-                    drawing::Position3D aPosMiddleMaximum( pPosHelper->transformLogicToScene( fLogicX, fY_Max ,0 ,true ) );
+                    double fHalfScaledWidth = pPosHelper->getScaledSlotWidth()/2.0;
+                    
+                    double fScaledY_First(fUnscaledY_First);
+                    double fScaledY_Last(fUnscaledY_Last);
+                    double fScaledY_Min(fUnscaledY_Min);
+                    double fScaledY_Max(fUnscaledY_Max);
+                    pPosHelper->clipLogicValues( 0,&fScaledY_First,0 );
+                    pPosHelper->clipLogicValues( 0,&fScaledY_Last,0 );
+                    pPosHelper->clipLogicValues( 0,&fScaledY_Min,0 );
+                    pPosHelper->clipLogicValues( 0,&fScaledY_Max,0 );
+                    pPosHelper->doLogicScaling( 0,&fScaledY_First,0 );
+                    pPosHelper->doLogicScaling( 0,&fScaledY_Last,0 );
+                    pPosHelper->doLogicScaling( 0,&fScaledY_Min,0 );
+                    pPosHelper->doLogicScaling( 0,&fScaledY_Max,0 );
+
+                    drawing::Position3D aPosLeftFirst( pPosHelper->transformScaledLogicToScene( fScaledX-fHalfScaledWidth, fScaledY_First ,0 ,true ) );
+                    drawing::Position3D aPosRightLast( pPosHelper->transformScaledLogicToScene( fScaledX+fHalfScaledWidth, fScaledY_Last  ,0 ,true ) );
+                    drawing::Position3D aPosMiddleFirst( pPosHelper->transformScaledLogicToScene( fScaledX, fScaledY_First ,0 ,true ) );
+                    drawing::Position3D aPosMiddleLast( pPosHelper->transformScaledLogicToScene( fScaledX, fScaledY_Last  ,0 ,true ) );
+                    drawing::Position3D aPosMiddleMinimum( pPosHelper->transformScaledLogicToScene( fScaledX, fScaledY_Min ,0 ,true ) );
+                    drawing::Position3D aPosMiddleMaximum( pPosHelper->transformScaledLogicToScene( fScaledX, fScaledY_Max ,0 ,true ) );
                     
                     uno::Reference< drawing::XShapes > xLossGainTarget( xGainTarget );
                     if(bBlack)
@@ -329,13 +321,13 @@ void CandleStickChart::createShapes()
                         drawing::PolyPolygonShape3D aPoly;
                         
                         sal_Int32 nLineIndex = 0;
-                        if( bShowFirst &&  pPosHelper->isLogicVisible( fLogicX, fY_First ,0 )
+                        if( bShowFirst &&  pPosHelper->isLogicVisible( fUnscaledX, fUnscaledY_First ,fLogicZ )
                             && isValidPosition(aPosLeftFirst) && isValidPosition(aPosMiddleFirst) )
                         {
                             AddPointToPoly( aPoly, aPosLeftFirst, nLineIndex );
                             AddPointToPoly( aPoly, aPosMiddleFirst, nLineIndex++ );
                         }
-                        if( pPosHelper->isLogicVisible( fLogicX, fY_Last ,0 ) 
+                        if( pPosHelper->isLogicVisible( fUnscaledX, fUnscaledY_Last ,fLogicZ ) 
                             && isValidPosition(aPosMiddleLast) && isValidPosition(aPosRightLast) )
                         {
                             AddPointToPoly( aPoly, aPosMiddleLast, nLineIndex );
@@ -361,16 +353,16 @@ void CandleStickChart::createShapes()
                     {
                         if(isValidPosition(aPosMiddleFirst))
                             this->createDataLabel( xTextTarget, **aSeriesIter, nIndex
-                                        , fY_First, 1.0, Position3DToAWTPoint(aPosMiddleFirst), LABEL_ALIGN_LEFT_BOTTOM );
+                                        , fUnscaledY_First, 1.0, Position3DToAWTPoint(aPosMiddleFirst), LABEL_ALIGN_LEFT_BOTTOM );
                         if(isValidPosition(aPosMiddleLast))
                             this->createDataLabel( xTextTarget, **aSeriesIter, nIndex
-                                        , fY_Last, 1.0, Position3DToAWTPoint(aPosMiddleLast), LABEL_ALIGN_RIGHT_TOP );
+                                        , fUnscaledY_Last, 1.0, Position3DToAWTPoint(aPosMiddleLast), LABEL_ALIGN_RIGHT_TOP );
                         if(isValidPosition(aPosMiddleMinimum))
                             this->createDataLabel( xTextTarget, **aSeriesIter, nIndex
-                                        , fY_Min, 1.0, Position3DToAWTPoint(aPosMiddleMinimum), LABEL_ALIGN_BOTTOM );
+                                        , fUnscaledY_Min, 1.0, Position3DToAWTPoint(aPosMiddleMinimum), LABEL_ALIGN_BOTTOM );
                         if(isValidPosition(aPosMiddleMaximum))
                             this->createDataLabel( xTextTarget, **aSeriesIter, nIndex
-                                        , fY_Max, 1.0, Position3DToAWTPoint(aPosMiddleMaximum), LABEL_ALIGN_TOP );
+                                        , fUnscaledY_Max, 1.0, Position3DToAWTPoint(aPosMiddleMaximum), LABEL_ALIGN_TOP );
                     }
                 }//next series in x slot (next y slot)
             }//next x slot
diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx
index ff9487c52..3a19e7186 100644
--- a/chart2/source/view/charttypes/CandleStickChart.hxx
+++ b/chart2/source/view/charttypes/CandleStickChart.hxx
@@ -47,16 +47,7 @@ public:
                       , sal_Int32 nDimensionCount );
     virtual ~CandleStickChart();
 
-    //-------------------------------------------------------------------------
-    // chart2::XPlotter
-    //-------------------------------------------------------------------------
-
-    virtual void SAL_CALL createShapes();
-    /*
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
-    */
+    virtual void createShapes();
     virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 );
 
     virtual ::com::sun::star::drawing::Direction3D  getPreferredDiagramAspectRatio() const;
@@ -64,8 +55,6 @@ public:
     //-------------------------------------------------------------------------
     // MinimumAndMaximumSupplier
     //-------------------------------------------------------------------------
-    virtual double getMinimumX();
-    virtual double getMaximumX();
     virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
 
     //-------------------------------------------------------------------------
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index f32b123f3..ebbdb586f 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -57,7 +57,7 @@ CategoryPositionHelper::~CategoryPositionHelper()
 {
 }
 
-double CategoryPositionHelper::getSlotWidth() const
+double CategoryPositionHelper::getScaledSlotWidth() const
 {
     double fWidth = m_fCategoryWidth /
                 (  m_fSeriesCount
@@ -66,14 +66,14 @@ double CategoryPositionHelper::getSlotWidth() const
     return fWidth;
 }
 
-double CategoryPositionHelper::getSlotPos( double fCategoryX, double fSeriesNumber ) const
+double CategoryPositionHelper::getScaledSlotPos( double fScaledXPos, double fSeriesNumber ) const
 {
     //the returned position is in the middle of the rect
     //fSeriesNumber 0...n-1
-    double fPos = fCategoryX - (m_fCategoryWidth/2.0)
-           + (m_fOuterDistance/2.0 + fSeriesNumber*(1.0+m_fInnerDistance)) * getSlotWidth()
-           + getSlotWidth()/2.0;
-
+    double fPos = fScaledXPos
+           - (m_fCategoryWidth/2.0)
+           + (m_fOuterDistance/2.0 + fSeriesNumber*(1.0+m_fInnerDistance)) * getScaledSlotWidth()
+           + getScaledSlotWidth()/2.0;
     return fPos;
 }
 
@@ -95,6 +95,11 @@ void CategoryPositionHelper::setOuterDistance( double fOuterDistance )
     m_fOuterDistance = fOuterDistance;
 }
 
+void CategoryPositionHelper::setCategoryWidth( double fCategoryWidth )
+{
+    m_fCategoryWidth = fCategoryWidth;
+}
+
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
index 7a420b58c..0b22aa754 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
@@ -44,15 +44,16 @@ public:
     CategoryPositionHelper( const CategoryPositionHelper& rSource );
     virtual ~CategoryPositionHelper();
 
-    double getSlotWidth() const;
-    double getSlotPos( double fCategoryX, double fSeriesNumber ) const;
+    double getScaledSlotWidth() const;
+    virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const;
+    virtual void setCategoryWidth( double fCategoryWidth );
 
     //Distance between two neighboring bars in same category, seen relative to width of the bar
     void setInnerDistance( double fInnerDistance );
 
     //Distance between two neighboring bars in different category, seen relative to width of the bar:
     void setOuterDistance( double fOuterDistance );
-
+    
 protected:
     double m_fSeriesCount;
     double m_fCategoryWidth;
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index f4c76806c..3c3fc7159 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -159,11 +159,9 @@ PieChart::~PieChart()
 
 //-----------------------------------------------------------------
 
-void SAL_CALL PieChart::setScales( const uno::Sequence< ExplicitScaleData >& rScales
-                                     , sal_Bool /* bSwapXAndYAxis */ )
-                            throw (uno::RuntimeException)
+void PieChart::setScales( const std::vector< ExplicitScaleData >& rScales, bool /* bSwapXAndYAxis */ )
 {
-    DBG_ASSERT(m_nDimension<=rScales.getLength(),"Dimension of Plotter does not fit two dimension of given scale sequence");
+    DBG_ASSERT(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence");
     m_pPosHelper->setScales( rScales, true );
 }
 
@@ -411,7 +409,7 @@ void PieChart::createShapes()
             if( !bIsVisible )
                 continue;
 
-            double fLogicZ = -0.5;//as defined
+            double fLogicZ = -1.0;//as defined
             double fDepth  = this->getTransformedDepth();
 //=============================================================================
 
@@ -495,11 +493,11 @@ void PieChart::createShapes()
                     awt::Point aScreenPosition2D(
                         aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment, nLabelPlacement
                         , fUnitCircleStartAngleDegree, fUnitCircleWidthAngleDegree
-                        , fUnitCircleInnerRadius, fUnitCircleOuterRadius, 0.0, 0 ));
+                        , fUnitCircleInnerRadius, fUnitCircleOuterRadius, fLogicZ+0.5, 0 ));
 
                     PieLabelInfo aPieLabelInfo;
                     aPieLabelInfo.aFirstPosition = basegfx::B2IVector( aScreenPosition2D.X, aScreenPosition2D.Y );
-                    awt::Point aOrigin( aPolarPosHelper.transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( 0.0, 0.0, 0.5 ) ) );
+                    awt::Point aOrigin( aPolarPosHelper.transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( 0.0, 0.0, fLogicZ+1.0 ) ) );
                     aPieLabelInfo.aOrigin = basegfx::B2IVector( aOrigin.X, aOrigin.Y );
 
                     //add a scaling independent Offset if requested
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index 958037e06..939903dd1 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -49,24 +49,10 @@ public:
             , sal_Int32 nDimensionCount, bool bExcludingPositioning );
     virtual ~PieChart();
 
-    //-------------------------------------------------------------------------
-    // chart2::XPlotter
-    //-------------------------------------------------------------------------
-
-    virtual void SAL_CALL createShapes();
+    virtual void createShapes();
     virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize );
-    
-    virtual void SAL_CALL setScales(
-          const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::chart2::ExplicitScaleData >& rScales
-            , sal_Bool bSwapXAndYAxis )
-                throw (::com::sun::star::uno::RuntimeException);
-    /*
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
-    */
 
+    virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
     virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 );
 
     //-------------------
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index da370f98a..93d4634f3 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -43,7 +43,7 @@
 #include "ChartTypeHelper.hxx"
 #include "Clipping.hxx"
 #include "servicenames_charttypes.hxx"
-#include "chartview/NumberFormatterWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "ContainerHelper.hxx"
 #include "DataSeriesHelper.hxx"
 #include "RegressionCurveHelper.hxx"
@@ -52,6 +52,8 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "RelativePositionHelper.hxx"
+#include "DateHelper.hxx"
+#include "DiagramHelper.hxx"
 
 //only for creation: @todo remove if all plotter are uno components and instanciated via servicefactory
 #include "BarChart.hxx"
@@ -62,6 +64,7 @@
 //
 
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
+#include <com/sun/star/chart/TimeUnit.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
@@ -155,6 +158,8 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode
         , m_xChartTypeModelProps( uno::Reference< beans::XPropertySet >::query( xChartTypeModel ))
         , m_aZSlots()
         , m_bCategoryXAxis(bCategoryXAxis)
+        , m_nTimeResolution(::com::sun::star::chart::TimeUnit::DAY)
+        , m_aNullDate(30,12,1899)
         , m_xColorScheme()
         , m_pExplicitCategoriesProvider(0)
         , m_bPointsWereSkipped(false)
@@ -201,7 +206,17 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
         return;
 
     if(m_bCategoryXAxis)
-        pSeries->setCategoryXAxis();
+    {
+        if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() )
+            pSeries->setXValues( m_pExplicitCategoriesProvider->getOriginalCategories() );
+        else
+            pSeries->setCategoryXAxis();
+    }
+    else
+    {
+        if( m_pExplicitCategoriesProvider )
+            pSeries->setXValuesIfNone( m_pExplicitCategoriesProvider->getOriginalCategories() );
+    }
 
     if(zSlot<0 || zSlot>=static_cast<sal_Int32>(m_aZSlots.size()))
     {
@@ -381,7 +396,7 @@ OUString VSeriesPlotter::getLabelTextForValue( VDataSeries& rDataSeries
             nNumberFormatKey = rDataSeries.getExplicitNumberFormat(nPointIndex,bAsPercentage);
         else if( bAsPercentage )
         {
-            sal_Int32 nPercentFormat = ExplicitValueProvider::getPercentNumberFormat( m_apNumberFormatterWrapper->getNumberFormatsSupplier() );
+            sal_Int32 nPercentFormat = DiagramHelper::getPercentNumberFormat( m_apNumberFormatterWrapper->getNumberFormatsSupplier() );
             if( nPercentFormat != -1 )
                 nNumberFormatKey = nPercentFormat;
         }
@@ -758,6 +773,17 @@ void lcl_AddErrorBottomLine( const drawing::Position3D& rPosition, ::basegfx::B2
     return aMainDirection;
 }
 
+drawing::Position3D lcl_transformMixedToScene( PlottingPositionHelper* pPosHelper
+    , double fX /*scaled*/, double fY /*unscaled*/, double fZ /*unscaled*/, bool bClip )
+{
+    if(!pPosHelper)
+        return drawing::Position3D(0,0,0);
+    pPosHelper->doLogicScaling( 0,&fY,&fZ );
+    if(bClip)
+        pPosHelper->clipScaledLogicValues( &fX,&fY,&fZ );
+    return pPosHelper->transformScaledLogicToScene( fX, fY, fZ, false );
+}
+
 } // anonymous namespace
 
 // virtual
@@ -768,6 +794,7 @@ void VSeriesPlotter::createErrorBar(
     , const VDataSeries& rVDataSeries
     , sal_Int32 nIndex
     , bool bYError /* = true */
+    , double* pfScaledLogicX
     )
 {
     if( !ChartTypeHelper::isSupportingStatisticProperties( m_xChartTypeModel, m_nDimension ) )
@@ -802,8 +829,14 @@ void VSeriesPlotter::createErrorBar(
         const double fX = aUnscaledLogicPosition.PositionX;
         const double fY = aUnscaledLogicPosition.PositionY;
         const double fZ = aUnscaledLogicPosition.PositionZ;
-        aMiddle = m_pPosHelper->transformLogicToScene( fX, fY, fZ, true );
-
+        double fScaledX = fX;
+        if( pfScaledLogicX )
+            fScaledX = *pfScaledLogicX;
+        else
+            m_pPosHelper->doLogicScaling( &fScaledX, 0, 0 );
+        
+        aMiddle = lcl_transformMixedToScene( m_pPosHelper, fScaledX, fY, fZ, true );
+        
         drawing::Position3D aNegative(aMiddle);
         drawing::Position3D aPositive(aMiddle);
 
@@ -817,11 +850,16 @@ void VSeriesPlotter::createErrorBar(
                 double fLocalX = fX;
                 double fLocalY = fY;
                 if( bYError )
+                {
                     fLocalY+=fLength;
+                    aPositive = lcl_transformMixedToScene( m_pPosHelper, fScaledX, fLocalY, fZ, true );
+                }
                 else
+                {
                     fLocalX+=fLength;
+                    aPositive = m_pPosHelper->transformLogicToScene( fLocalX, fLocalY, fZ, true );
+                }
                 bCreatePositiveBorder = m_pPosHelper->isLogicVisible(fLocalX, fLocalY, fZ);
-                aPositive = m_pPosHelper->transformLogicToScene( fLocalX, fLocalY, fZ, true );
             }
             else
                 bShowPositive = false;
@@ -835,12 +873,16 @@ void VSeriesPlotter::createErrorBar(
                 double fLocalX = fX;
                 double fLocalY = fY;
                 if( bYError )
+                {
                     fLocalY-=fLength;
+                    aNegative = lcl_transformMixedToScene( m_pPosHelper, fScaledX, fLocalY, fZ, true );
+                }
                 else
+                {
                     fLocalX-=fLength;
-
+                    aNegative = m_pPosHelper->transformLogicToScene( fLocalX, fLocalY, fZ, true );
+                }
                 bCreateNegativeBorder = m_pPosHelper->isLogicVisible( fLocalX, fLocalY, fZ);
-                aNegative = m_pPosHelper->transformLogicToScene( fLocalX, fLocalY, fZ, true );
             }
             else
                 bShowNegative = false;
@@ -884,7 +926,8 @@ void VSeriesPlotter::createErrorBar(
 // virtual
 void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogicPosition
                             , VDataSeries& rVDataSeries, sal_Int32 nPointIndex
-                            , const uno::Reference< drawing::XShapes >& xTarget )
+                            , const uno::Reference< drawing::XShapes >& xTarget
+                            , double* pfScaledLogicX )
 {
     if(m_nDimension!=2)
         return;
@@ -898,7 +941,8 @@ void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogic
         createErrorBar( xErrorBarsGroup_Shapes
             , rUnscaledLogicPosition, xErrorBarProp
             , rVDataSeries, nPointIndex
-            , true /* bYError */ );
+            , true /* bYError */
+            , pfScaledLogicX );
     }
 }
 
@@ -936,13 +980,13 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries
         aRegressionPoly.SequenceZ[0].realloc(nRegressionPointCount);
         sal_Int32 nRealPointCount=0;
 
-        uno::Sequence< chart2::ExplicitScaleData > aScaleDataSeq( m_pPosHelper->getScales());
+        std::vector< ExplicitScaleData > aScales( m_pPosHelper->getScales());
         uno::Reference< chart2::XScaling > xScalingX;
         uno::Reference< chart2::XScaling > xScalingY;
-        if( aScaleDataSeq.getLength() >= 2 )
+        if( aScales.size() >= 2 )
         {
-            xScalingX.set( aScaleDataSeq[0].Scaling );
-            xScalingY.set( aScaleDataSeq[1].Scaling );
+            xScalingX.set( aScales[0].Scaling );
+            xScalingY.set( aScales[1].Scaling );
         }
 
         uno::Sequence< geometry::RealPoint2D > aCalculatedPoints(
@@ -1126,35 +1170,58 @@ void VSeriesPlotter::setMappedProperties(
     PropertyMapper::setMappedProperties(xTargetProp,xSource,rMap,pOverwriteMap);
 }
 
+void VSeriesPlotter::setTimeResolutionOnXAxis( long TimeResolution, const Date& rNullDate )
+{
+    m_nTimeResolution = TimeResolution;
+    m_aNullDate = rNullDate;
+}
+
 //-------------------------------------------------------------------------
 // MinimumAndMaximumSupplier
 //-------------------------------------------------------------------------
-
-double VSeriesPlotter::getMinimumX()
+long VSeriesPlotter::calculateTimeResolutionOnXAxis()
 {
-    if( m_bCategoryXAxis )
+    long nRet = ::com::sun::star::chart::TimeUnit::YEAR;
+    if( m_pExplicitCategoriesProvider )
     {
-        double fRet = 1.0;//first category (index 0) matches with real number 1.0
-        if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) 
-            fRet -= 0.5;
-        return fRet;
+        const std::vector< DatePlusIndex >&  rDateCategories = m_pExplicitCategoriesProvider->getDateCategories();
+        std::vector< DatePlusIndex >::const_iterator aIt = rDateCategories.begin(), aEnd = rDateCategories.end();
+        Date aNullDate(30,12,1899);
+        if( m_apNumberFormatterWrapper.get() )
+            aNullDate = m_apNumberFormatterWrapper->getNullDate();
+        if( aIt!=aEnd )
+        {
+            Date aPrevious(aNullDate); aPrevious+=rtl::math::approxFloor(aIt->fValue);
+            ++aIt;
+            for(;aIt!=aEnd;++aIt)
+            {
+                Date aCurrent(aNullDate); aCurrent+=rtl::math::approxFloor(aIt->fValue);
+                if( ::com::sun::star::chart::TimeUnit::YEAR == nRet )
+                {
+                    if( DateHelper::IsInSameYear( aPrevious, aCurrent ) )
+                        nRet = ::com::sun::star::chart::TimeUnit::MONTH; 
+                }
+                if( ::com::sun::star::chart::TimeUnit::MONTH == nRet )
+                {
+                    if( DateHelper::IsInSameMonth( aPrevious, aCurrent ) )
+                        nRet = ::com::sun::star::chart::TimeUnit::DAY;
+                }
+                if( ::com::sun::star::chart::TimeUnit::DAY == nRet )
+                    break;
+                aPrevious=aCurrent;
+            }
+        }
     }
-
+    return nRet;
+}
+double VSeriesPlotter::getMinimumX()
+{
     double fMinimum, fMaximum;
     this->getMinimumAndMaximiumX( fMinimum, fMaximum );
     return fMinimum;
 }
 double VSeriesPlotter::getMaximumX()
 {
-    if( m_bCategoryXAxis )
-    {
-        //return category count
-        double fRet = getPointCount();//first category (index 0) matches with real number 1.0
-        if( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->hasComplexCategories() ) 
-            fRet += 0.5;
-        return fRet;
-    }
-
     double fMinimum, fMaximum;
     this->getMinimumAndMaximiumX( fMinimum, fMaximum );
     return fMaximum;
@@ -1162,7 +1229,7 @@ double VSeriesPlotter::getMaximumX()
 
 double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
 {
-    if( !m_bCategoryXAxis )
+    if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) )
     {
         double fMinY, fMaxY;
         this->getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
@@ -1196,7 +1263,7 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
 
 double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex )
 {
-    if( !m_bCategoryXAxis )
+    if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) )
     {
         double fMinY, fMaxY;
         this->getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
@@ -1231,13 +1298,13 @@ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, s
 double VSeriesPlotter::getMinimumZ()
 {
     //this is the default for all charts without a meaningfull z axis
-    return 0.5;
+    return 1.0;
 }
 double VSeriesPlotter::getMaximumZ()
 {
-    if( 3!=m_nDimension )
-        return 0.5;
-    return m_aZSlots.size()+0.5;
+    if( 3!=m_nDimension || !m_aZSlots.size() )
+        return getMinimumZ()+1;
+    return m_aZSlots.size();
 }
 
 namespace
@@ -1603,7 +1670,7 @@ double VSeriesPlotter::getTransformedDepth() const
     return FIXED_SIZE_FOR_3D_CHART_VOLUME/(MaxZ-MinZ);
 }
 
-void SAL_CALL VSeriesPlotter::addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex )
+void VSeriesPlotter::addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex )
                 throw (uno::RuntimeException)
 {
     if( nAxisIndex<1 )
@@ -1633,9 +1700,9 @@ PlottingPositionHelper& VSeriesPlotter::getPlottingPositionHelper( sal_Int32 nAx
         }
     }
     if( !pRet )
-    {
         pRet = m_pMainPosHelper;
-    }
+    if(pRet)
+        pRet->setTimeResolution( m_nTimeResolution, m_aNullDate );
     return *pRet;
 }
 
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 7382be6aa..42e25293c 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -49,11 +49,8 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 // header for class SvxShape
 #include <svx/unoshape.hxx>
-// header for GetSdrObjectFromXShape
-#include <svx/unoapi.hxx>
 // header for class E3dScene
 #include <svx/scene3d.hxx>
-#include <rtl/math.hxx>
 #include <svx/e3dsceneupdater.hxx>
 
 //.............................................................................
@@ -107,7 +104,7 @@ VDiagram::~VDiagram()
     delete m_pShapeFactory;
 }
 
-void SAL_CALL VDiagram::init(
+void VDiagram::init(
                 const uno::Reference< drawing::XShapes >& xLogicTarget
               , const uno::Reference< drawing::XShapes >& xFinalTarget
               , const uno::Reference< lang::XMultiServiceFactory >& xFactory )
diff --git a/chart2/source/view/inc/DateHelper.hxx b/chart2/source/view/inc/DateHelper.hxx
new file mode 100644
index 000000000..b7d78f4a5
--- /dev/null
+++ b/chart2/source/view/inc/DateHelper.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _CHART2_DATEHELPER_HXX
+#define _CHART2_DATEHELPER_HXX
+
+#include <com/sun/star/chart2/XScaling.hpp>
+#include <tools/date.hxx>
+
+//.............................................................................
+namespace chart
+{
+//.............................................................................
+
+//-----------------------------------------------------------------------------
+/**
+*/
+
+class DateHelper
+{
+public:
+    static bool IsInSameYear( const Date& rD1, const Date& rD2 );
+    static bool IsInSameMonth( const Date& rD1, const Date& rD2 );
+
+    static long GetMonthsBetweenDates( Date aD1, Date aD2 );
+    static Date GetDateSomeMonthsAway( const Date& rD, long nMonthDistance );
+    static Date GetDateSomeYearsAway( const Date& rD, long nYearDistance );
+    static bool IsLessThanOneMonthAway( const Date& rD1, const Date& rD2 );
+    static bool IsLessThanOneYearAway( const Date& rD1, const Date& rD2 );
+
+    static double RasterizeDateValue( double fValue, const Date& rNullDate, long TimeResolution );
+};
+
+//.............................................................................
+} //namespace chart
+//.............................................................................
+#endif
diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
index 772eca027..a08ff332e 100644
--- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
+++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
@@ -29,7 +29,7 @@
 #define _CHART2_MINIMUMANDMAXIMUMSUPPLIER_HXX
 
 #include <sal/types.h>
-
+#include <tools/date.hxx>
 #include <set>
 
 //.............................................................................
@@ -60,6 +60,10 @@ public:
     virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) = 0;
     virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) = 0;
     virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) = 0;
+
+    //return a constant out of ::com::sun::star::chart::TimeUnit that allows to display the smallest distance between occuring dates
+    virtual long calculateTimeResolutionOnXAxis() = 0;
+    virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) = 0;
 };
 
 class MergedMinimumAndMaximumSupplier : public MinimumAndMaximumSupplier
@@ -86,6 +90,9 @@ public:
     virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex );
     virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
 
+    virtual long calculateTimeResolutionOnXAxis();
+    virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate );
+
 private:
     typedef ::std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet;
     MinimumAndMaximumSupplierSet m_aMinimumAndMaximumSupplierList;
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index db1ba090b..186bd4c31 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -27,28 +27,18 @@
 #ifndef _CHART2_PLOTTERBASE_HXX
 #define _CHART2_PLOTTERBASE_HXX
 
+#include "chartview/ExplicitScaleValues.hxx"
+
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-/*
-#include <com/sun/star/lang/XComponent.hpp>
-*/
-
-//----
-#include <vector>
-
-//---- chart2
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
 #include <com/sun/star/chart2/XTransformation.hpp>
-/*
-#include <com/sun/star/chart2/XPlotter.hpp>
-*/
 
-//----
 #include <cppuhelper/implbase1.hxx>
+#include <vector>
 
 //.............................................................................
 namespace chart
@@ -64,8 +54,7 @@ public:
     PlotterBase( sal_Int32 nDimension );
     virtual ~PlotterBase();
 
-    // ___chart2::XPlotter___
-    virtual void SAL_CALL initPlotter(
+    virtual void initPlotter(
           const ::com::sun::star::uno::Reference<
                 ::com::sun::star::drawing::XShapes >& xLogicTarget
         , const ::com::sun::star::uno::Reference<
@@ -75,22 +64,14 @@ public:
         , const rtl::OUString& rCID 
                 ) throw (::com::sun::star::uno::RuntimeException );
 
-    virtual void SAL_CALL setScales(
-          const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::chart2::ExplicitScaleData >& rScales
-            , sal_Bool bSwapXAndYAxis )
-                throw (::com::sun::star::uno::RuntimeException);
+    virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
 
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
 
-    virtual void SAL_CALL createShapes() = 0;
+    virtual void createShapes() = 0;
 
     static bool isValidPosition( const ::com::sun::star::drawing::Position3D& rPos );
-    /*
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
-    */
-
+    
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index d06753349..46c3dc169 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -28,9 +28,10 @@
 #define _CHART2_PLOTTINGPOSITIONHELPER_HXX
 
 #include "LabelAlignment.hxx"
+#include "chartview/ExplicitScaleValues.hxx"
+
 #include <basegfx/range/b2drectangle.hxx>
 #include <rtl/math.hxx>
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
 #include <com/sun/star/chart2/XTransformation.hpp>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
@@ -62,23 +63,22 @@ public:
     virtual ~PlottingPositionHelper();
     
     virtual PlottingPositionHelper* clone() const;
-    virtual PlottingPositionHelper* createSecondaryPosHelper( const ::com::sun::star::chart2::ExplicitScaleData& rSecondaryScale );
+    virtual PlottingPositionHelper* createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale );
 
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix);
 
-    virtual void setScales( const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::chart2::ExplicitScaleData >& rScales
-            , sal_Bool bSwapXAndYAxis );
-    const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::chart2::ExplicitScaleData >& getScales() const;
+    virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
+    const ::std::vector< ExplicitScaleData >& getScales() const;
 
     //better performance for big data
     inline void   setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution );
     inline bool   isSameForGivenResolution( double fX, double fY, double fZ
                                 , double fX2, double fY2, double fZ2 );
 
+    inline bool   isStrongLowerRequested( sal_Int32 nDimensionIndex ) const;
     inline bool   isLogicVisible( double fX, double fY, double fZ ) const;
     inline void   doLogicScaling( double* pX, double* pY, double* pZ, bool bClip=false ) const;
+    inline void   doUnshiftedLogicScaling( double* pX, double* pY, double* pZ, bool bClip=false ) const;
     inline void   clipLogicValues( double* pX, double* pY, double* pZ ) const;
            void   clipScaledLogicValues( double* pX, double* pY, double* pZ ) const;
     inline bool   clipYRange( double& rMin, double& rMax ) const;
@@ -123,10 +123,14 @@ public:
 
     inline bool maySkipPointsInRegressionCalculation() const;
 
+    void setTimeResolution( long nTimeResolution, const Date& rNullDate );
+    virtual void setScaledCategoryWidth( double fScaledCategoryWidth );
+    void AllowShiftXAxisPos( bool bAllowShift );
+    void AllowShiftZAxisPos( bool bAllowShift );
+
 protected: //member
-    ::com::sun::star::uno::Sequence<
-            ::com::sun::star::chart2::ExplicitScaleData >	m_aScales;
-    ::basegfx::B3DHomMatrix									m_aMatrixScreenToScene;
+    ::std::vector< ExplicitScaleData >  m_aScales;
+    ::basegfx::B3DHomMatrix             m_aMatrixScreenToScene;
 
     //this is calculated based on m_aScales and m_aMatrixScreenToScene
     mutable ::com::sun::star::uno::Reference<
@@ -139,6 +143,14 @@ protected: //member
     sal_Int32 m_nZResolution;
 
     bool m_bMaySkipPointsInRegressionCalculation;
+
+    bool m_bDateAxis;
+    long m_nTimeResolution;
+    Date m_aNullDate;
+
+    double m_fScaledCategoryWidth;
+    bool   m_bAllowShiftXAxisPos;
+    bool   m_bAllowShiftZAxisPos;
 };
 
 //describes wich axis of the drawinglayer scene or sreen axis are the normal axis
@@ -163,9 +175,7 @@ public:
     virtual PlottingPositionHelper* clone() const;
 
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix);
-    virtual void setScales( const ::com::sun::star::uno::Sequence<
-            ::com::sun::star::chart2::ExplicitScaleData >& rScales
-            , sal_Bool bSwapXAndYAxis );
+    virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
 
     ::basegfx::B3DHomMatrix getUnitCartesianToScene() const;
 
@@ -227,14 +237,14 @@ private:
 
 bool PolarPlottingPositionHelper::isMathematicalOrientationAngle() const
 {
-    const ::com::sun::star::chart2::ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[1] : m_aScales[2];
+    const ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[1] : m_aScales[2];
     if( ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL==rScale.Orientation )
         return true;
     return false;
 }
 bool PolarPlottingPositionHelper::isMathematicalOrientationRadius() const
 {
-    const ::com::sun::star::chart2::ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[0] : m_aScales[1];
+    const ExplicitScaleData& rScale = m_bSwapXAndY ? m_aScales[0] : m_aScales[1];
     if( ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL==rScale.Orientation )
         return true;
     return false;
@@ -283,12 +293,23 @@ bool PlottingPositionHelper::isSameForGivenResolution( double fX, double fY, dou
     return (bSameX && bSameY && bSameZ);
 }
 
+bool PlottingPositionHelper::isStrongLowerRequested( sal_Int32 nDimensionIndex ) const
+{
+    if( m_aScales.empty() )
+        return false;
+    if( 0==nDimensionIndex )
+        return m_bAllowShiftXAxisPos && m_aScales[nDimensionIndex].ShiftedCategoryPosition;
+    else if( 2==nDimensionIndex )
+        return m_bAllowShiftZAxisPos && m_aScales[nDimensionIndex].ShiftedCategoryPosition;
+    return false;
+}
+
 bool PlottingPositionHelper::isLogicVisible(
     double fX, double fY, double fZ ) const
 {
-    return fX >= m_aScales[0].Minimum && fX <= m_aScales[0].Maximum
+    return fX >= m_aScales[0].Minimum && ( isStrongLowerRequested(0) ? fX < m_aScales[0].Maximum : fX <= m_aScales[0].Maximum )
         && fY >= m_aScales[1].Minimum && fY <= m_aScales[1].Maximum
-        && fZ >= m_aScales[2].Minimum && fZ <= m_aScales[2].Maximum;
+        && fZ >= m_aScales[2].Minimum && ( isStrongLowerRequested(2) ? fZ < m_aScales[2].Maximum : fZ <= m_aScales[2].Maximum );
 }
 
 void PlottingPositionHelper::doLogicScaling( double* pX, double* pY, double* pZ, bool bClip ) const
@@ -296,6 +317,29 @@ void PlottingPositionHelper::doLogicScaling( double* pX, double* pY, double* pZ,
     if(bClip)
         this->clipLogicValues( pX,pY,pZ );
 
+    if(pX)
+    {
+        if( m_aScales[0].Scaling.is())
+            *pX = m_aScales[0].Scaling->doScaling(*pX);
+        if( m_bAllowShiftXAxisPos && m_aScales[0].ShiftedCategoryPosition )
+            (*pX) += m_fScaledCategoryWidth/2.0;
+    }
+    if(pY && m_aScales[1].Scaling.is())
+        *pY = m_aScales[1].Scaling->doScaling(*pY);
+    if(pZ)
+    {
+        if( m_aScales[2].Scaling.is())
+            *pZ = m_aScales[2].Scaling->doScaling(*pZ);
+        if( m_bAllowShiftZAxisPos && m_aScales[2].ShiftedCategoryPosition)
+            (*pZ) += 0.5;
+    }
+}
+
+void PlottingPositionHelper::doUnshiftedLogicScaling( double* pX, double* pY, double* pZ, bool bClip ) const
+{
+    if(bClip)
+        this->clipLogicValues( pX,pY,pZ );
+
     if(pX && m_aScales[0].Scaling.is())
         *pX = m_aScales[0].Scaling->doScaling(*pX);
     if(pY && m_aScales[1].Scaling.is())
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx
index 95ed67928..e9edd1225 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -27,10 +27,11 @@
 #ifndef _CHART2_SCALEAUTOMATISM_HXX
 #define _CHART2_SCALEAUTOMATISM_HXX
 
-#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
+#include "chartview/ExplicitScaleValues.hxx"
 #include <com/sun/star/chart2/ScaleData.hpp>
 
+#include <tools/date.hxx>
+
 //.............................................................................
 namespace chart
 {
@@ -44,7 +45,7 @@ class ScaleAutomatism
 {
 public:
     explicit            ScaleAutomatism(
-                            const ::com::sun::star::chart2::ScaleData& rSourceScale );
+                            const ::com::sun::star::chart2::ScaleData& rSourceScale, const Date& rNullDate );
     virtual             ~ScaleAutomatism();
 
     /** Expands own value range with the passed minimum and maximum. */
@@ -75,30 +76,41 @@ public:
                 of the axis and the font size of the axis caption text. */
     void                setMaximumAutoMainIncrementCount( sal_Int32 nMaximumAutoMainIncrementCount );
 
+    /** Sets the time resolution to be used in case it is not set explicitly within the scale
+    */
+    void setAutomaticTimeResolution( sal_Int32 nTimeResolution );
+
     /** Fills the passed scale data and increment data according to the own settings. */
     void                calculateExplicitScaleAndIncrement(
-                            ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale,
-                            ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ) const;
+                            ExplicitScaleData& rExplicitScale,
+                            ExplicitIncrementData& rExplicitIncrement ) const;
 
     ::com::sun::star::chart2::ScaleData getScale() const;
+    Date getNullDate() const;
     
 private:
     /** Fills the passed scale data and increment data for category scaling. */
     void                calculateExplicitIncrementAndScaleForCategory(
-                            ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale,
-                            ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement,
+                            ExplicitScaleData& rExplicitScale,
+                            ExplicitIncrementData& rExplicitIncrement,
                             bool bAutoMinimum, bool bAutoMaximum ) const;
 
     /** Fills the passed scale data and increment data for logarithmic scaling. */
     void                calculateExplicitIncrementAndScaleForLogarithmic(
-                            ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale,
-                            ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement,
+                            ExplicitScaleData& rExplicitScale,
+                            ExplicitIncrementData& rExplicitIncrement,
                             bool bAutoMinimum, bool bAutoMaximum ) const;
 
     /** Fills the passed scale data and increment data for linear scaling. */
     void                calculateExplicitIncrementAndScaleForLinear(
-                            ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale,
-                            ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement,
+                            ExplicitScaleData& rExplicitScale,
+                            ExplicitIncrementData& rExplicitIncrement,
+                            bool bAutoMinimum, bool bAutoMaximum ) const;
+
+    /** Fills the passed scale data and increment data for date-time axis. */
+    void                calculateExplicitIncrementAndScaleForDateTimeAxis(
+                            ExplicitScaleData& rExplicitScale,
+                            ExplicitIncrementData& rExplicitIncrement,
                             bool bAutoMinimum, bool bAutoMaximum ) const;
 
 private:
@@ -111,6 +123,9 @@ private:
     bool                m_bExpandIfValuesCloseToBorder;     /// true = Expand if values are too close to the borders.
     bool                m_bExpandWideValuesToZero;          /// true = Expand wide spread values to zero.
     bool                m_bExpandNarrowValuesTowardZero;    /// true = Expand narrow range toward zero (add half of range).
+    sal_Int32           m_nTimeResolution;// a constant out of ::com::sun::star::chart::TimeUnit
+
+    Date                m_aNullDate;
 };
 
 //.............................................................................
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index c38010c09..4d69a3474 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -31,9 +31,8 @@
 #include "ScaleAutomatism.hxx"
 #include "ThreeDHelper.hxx"
 #include "ExplicitCategoriesProvider.hxx"
+#include "chartview/ExplicitScaleValues.hxx"
 
-#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
-#include <com/sun/star/chart2/ExplicitScaleData.hpp>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include "comphelper/implementationreference.hxx"
 #include <com/sun/star/awt/Rectangle.hpp>
@@ -63,7 +62,7 @@ public:
     static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel );
 
-    virtual void SAL_CALL initPlottingTargets(
+    virtual void initPlottingTargets(
                   const ::com::sun::star::uno::Reference<
                         ::com::sun::star::drawing::XShapes >& xLogicTarget
                 , const ::com::sun::star::uno::Reference<
@@ -83,16 +82,16 @@ public:
     virtual ::com::sun::star::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const ::com::sun::star::awt::Size& rPageSize
                                     , const ::com::sun::star::awt::Size& rPageResolution );
 
-    ::com::sun::star::chart2::ExplicitScaleData getExplicitScale( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
-    ::com::sun::star::chart2::ExplicitIncrementData getExplicitIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
+    ExplicitScaleData getExplicitScale( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
+    ExplicitIncrementData getExplicitIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
 
     void setExplicitCategoriesProvider( ExplicitCategoriesProvider* /*takes ownership*/ );
     ExplicitCategoriesProvider* getExplicitCategoriesProvider();
 
     // returns a coplete scale set for a given dimension and index; for example if nDimensionIndex==1 and nAxisIndex==2 you get returned the secondary x axis, main y axis and main z axis
-    ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData > getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
+    ::std::vector< ExplicitScaleData > getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
     // returns a coplete increment set for a given dimension and index; for example if nDimensionIndex==1 and nAxisIndex==2 you get returned the secondary x axis, main y axis and main z axis
-    ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitIncrementData > getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
+    ::std::vector< ExplicitIncrementData > getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
     
     void addMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier );
     bool hasMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier );
@@ -101,8 +100,8 @@ public:
     void prepareScaleAutomatismForDimensionAndIndex( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
     
     void setExplicitScaleAndIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
-        , const ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale
-        , const ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement );
+        , const ExplicitScaleData& rExplicitScale
+        , const ExplicitIncrementData& rExplicitIncrement );
 
     void set3DWallPositions( CuboidPlanePosition eLeftWallPos, CuboidPlanePosition eBackWallPos, CuboidPlanePosition eBottomPos );
 
@@ -143,8 +142,6 @@ protected: //methods
 
     VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
 
-    void prepareScaleAutomatism( ScaleAutomatism& rScaleAutomatism, double fMin, double fMax, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
-
     rtl::OUString createCIDForAxis( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XAxis >& xAxis
                     , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
@@ -194,11 +191,11 @@ protected: //member
     tVAxisMap m_aAxisMap;
 
 private:
-    ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >     m_aExplicitScales;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitIncrementData > m_aExplicitIncrements;
+    std::vector< ExplicitScaleData >     m_aExplicitScales;
+    std::vector< ExplicitIncrementData > m_aExplicitIncrements;
 
-    typedef std::map< tFullAxisIndex, ::com::sun::star::chart2::ExplicitScaleData > tFullExplicitScaleMap;
-    typedef std::map< tFullAxisIndex, ::com::sun::star::chart2::ExplicitIncrementData > tFullExplicitIncrementMap;
+    typedef std::map< tFullAxisIndex, ExplicitScaleData > tFullExplicitScaleMap;
+    typedef std::map< tFullAxisIndex, ExplicitIncrementData > tFullExplicitIncrementMap;
 
     tFullExplicitScaleMap       m_aSecondaryExplicitScales;
     tFullExplicitIncrementMap   m_aSecondaryExplicitIncrements;
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 7d2c0b134..90e434017 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -81,6 +81,10 @@ public:
         getModel() const;
 
     void setCategoryXAxis();
+    void setXValues( const ::com::sun::star::uno::Reference<
+        ::com::sun::star::chart2::data::XDataSequence >& xValues );
+    void setXValuesIfNone( const ::com::sun::star::uno::Reference<
+        ::com::sun::star::chart2::data::XDataSequence >& xValues );
     void setParticle( const rtl::OUString& rSeriesParticle );
     void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex );
     void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx
index 194a7e41a..42bb07f96 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -56,7 +56,7 @@ public: //methods
                 , sal_Int32 nDimension=3, sal_Bool bPolar=sal_False );
     virtual ~VDiagram();
 
-    void SAL_CALL init( const ::com::sun::star::uno::Reference<
+    void init( const ::com::sun::star::uno::Reference<
                      ::com::sun::star::drawing::XShapes >& xLogicTarget
              , const ::com::sun::star::uno::Reference<
                      ::com::sun::star::drawing::XShapes >& xFinalTarget
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 3101ee77d..d62c125d6 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -174,8 +174,7 @@ public:
     )
     */
     
-    virtual void SAL_CALL addSecondaryValueScale( const 
-            ::com::sun::star::chart2::ExplicitScaleData& rScale, sal_Int32 nAxisIndex )
+    virtual void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex )
                 throw (::com::sun::star::uno::RuntimeException);
     
     //-------------------------------------------------------------------------
@@ -197,6 +196,9 @@ public:
     virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex );
     virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex );
 
+    virtual long calculateTimeResolutionOnXAxis();
+    virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate );
+
     //------
 
     void getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const;
@@ -379,12 +381,14 @@ protected: //methods
         , const VDataSeries& rVDataSeries
         , sal_Int32 nIndex
         , bool bVertical
+        , double* pfScaledLogicX
         );
 
     virtual void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition
         , VDataSeries& rVDataSeries, sal_Int32 nPointIndex
         , const ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShapes >& xTarget );
+                ::com::sun::star::drawing::XShapes >& xTarget
+        , double* pfScaledLogicX=0 );
 
     virtual void createRegressionCurvesShapes( VDataSeries& rVDataSeries
         , const ::com::sun::star::uno::Reference<
@@ -425,6 +429,8 @@ protected: //member
     ::std::vector< ::std::vector< VDataSeriesGroup > >  m_aZSlots;
 
     bool								m_bCategoryXAxis;//true->xvalues are indices (this would not be necessary if series for category chart wouldn't have x-values)
+    long m_nTimeResolution;
+    Date m_aNullDate;
 
     ::std::auto_ptr< NumberFormatterWrapper > m_apNumberFormatterWrapper;
     AxesNumberFormats                         m_aAxesNumberFormats;//direct numberformats on axes, if empty ask the data series instead
@@ -439,7 +445,7 @@ protected: //member
     bool m_bPointsWereSkipped;
 
 private: //member
-    typedef std::map< sal_Int32 , ::com::sun::star::chart2::ExplicitScaleData > tSecondaryValueScales;
+    typedef std::map< sal_Int32 , ExplicitScaleData > tSecondaryValueScales;
     tSecondaryValueScales   m_aSecondaryValueScales;
 
     typedef std::map< sal_Int32 , PlottingPositionHelper* > tSecondaryPosHelperMap;
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 674424e17..8b35ab6e3 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -65,52 +65,17 @@ ChartItemPool::ChartItemPool():
     SvULongs aTmp;
     ppPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS,aTmp);
     ppPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE    - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE);
+    ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE  - SCHATTR_START] = new SfxUInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0);
+    ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE);
 
+    //legend
     ppPoolDefaults[SCHATTR_LEGEND_POS               - SCHATTR_START] = new SvxChartLegendPosItem( CHLEGEND_RIGHT, SCHATTR_LEGEND_POS );
-//  ppPoolDefaults[SCHATTR_TEXT_ORIENT              - SCHATTR_START] = new SvxChartTextOrientItem;
-    ppPoolDefaults[SCHATTR_TEXT_STACKED             - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_STACKED,FALSE);
-    ppPoolDefaults[SCHATTR_TEXT_ORDER               - SCHATTR_START] = new SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE, SCHATTR_TEXT_ORDER);
-
-    ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MIN			- SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MIN);
-    ppPoolDefaults[SCHATTR_Y_AXIS_MIN				- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MIN);
-    ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_MAX	  		- SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_MAX);
-    ppPoolDefaults[SCHATTR_Y_AXIS_MAX				- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_MAX);
-    ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_MAIN	- SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_MAIN);
-    ppPoolDefaults[SCHATTR_Y_AXIS_STEP_MAIN			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_MAIN);
-    ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_STEP_HELP	- SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_STEP_HELP);
-    ppPoolDefaults[SCHATTR_Y_AXIS_STEP_HELP			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_STEP_HELP);
-    ppPoolDefaults[SCHATTR_Y_AXIS_LOGARITHM			- SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_LOGARITHM);
-    ppPoolDefaults[SCHATTR_Y_AXIS_AUTO_ORIGIN		- SCHATTR_START] = new SfxBoolItem(SCHATTR_Y_AXIS_AUTO_ORIGIN);
-    ppPoolDefaults[SCHATTR_Y_AXIS_ORIGIN			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Y_AXIS_ORIGIN);
-
-    ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MIN			- SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MIN);
-    ppPoolDefaults[SCHATTR_X_AXIS_MIN				- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MIN);
-    ppPoolDefaults[SCHATTR_X_AXIS_AUTO_MAX	  		- SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_MAX);
-    ppPoolDefaults[SCHATTR_X_AXIS_MAX				- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_MAX);
-    ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_MAIN	- SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_MAIN);
-    ppPoolDefaults[SCHATTR_X_AXIS_STEP_MAIN			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_MAIN);
-    ppPoolDefaults[SCHATTR_X_AXIS_AUTO_STEP_HELP	- SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_STEP_HELP);
-    ppPoolDefaults[SCHATTR_X_AXIS_STEP_HELP			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_STEP_HELP);
-    ppPoolDefaults[SCHATTR_X_AXIS_LOGARITHM			- SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_LOGARITHM);
-    ppPoolDefaults[SCHATTR_X_AXIS_AUTO_ORIGIN		- SCHATTR_START] = new SfxBoolItem(SCHATTR_X_AXIS_AUTO_ORIGIN);
-    ppPoolDefaults[SCHATTR_X_AXIS_ORIGIN			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_X_AXIS_ORIGIN);
-
-    ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MIN			- SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MIN);
-    ppPoolDefaults[SCHATTR_Z_AXIS_MIN				- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MIN);
-    ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_MAX	  		- SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_MAX);
-    ppPoolDefaults[SCHATTR_Z_AXIS_MAX				- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_MAX);
-    ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_MAIN	- SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_MAIN);
-    ppPoolDefaults[SCHATTR_Z_AXIS_STEP_MAIN			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_MAIN);
-    ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_STEP_HELP	- SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_STEP_HELP);
-    ppPoolDefaults[SCHATTR_Z_AXIS_STEP_HELP			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_STEP_HELP);
-    ppPoolDefaults[SCHATTR_Z_AXIS_LOGARITHM			- SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_LOGARITHM);
-    ppPoolDefaults[SCHATTR_Z_AXIS_AUTO_ORIGIN		- SCHATTR_START] = new SfxBoolItem(SCHATTR_Z_AXIS_AUTO_ORIGIN);
-    ppPoolDefaults[SCHATTR_Z_AXIS_ORIGIN			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_Z_AXIS_ORIGIN);
 
-    ppPoolDefaults[SCHATTR_AXISTYPE      			- SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_X);
-    ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE  - SCHATTR_START] = new SfxUInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0);
-    ppPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE);
+    //text
+    ppPoolDefaults[SCHATTR_TEXT_DEGREES				- SCHATTR_START] = new SfxInt32Item(SCHATTR_TEXT_DEGREES, 0);
+    ppPoolDefaults[SCHATTR_TEXT_STACKED             - SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_STACKED,sal_False);
 
+    //statistic
     ppPoolDefaults[SCHATTR_STAT_AVERAGE             - SCHATTR_START] = new SfxBoolItem (SCHATTR_STAT_AVERAGE);
     ppPoolDefaults[SCHATTR_STAT_KIND_ERROR          - SCHATTR_START] = new SvxChartKindErrorItem (CHERROR_NONE, SCHATTR_STAT_KIND_ERROR);
     ppPoolDefaults[SCHATTR_STAT_PERCENT             - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_PERCENT);
@@ -120,10 +85,7 @@ ChartItemPool::ChartItemPool():
     ppPoolDefaults[SCHATTR_STAT_INDICATE            - SCHATTR_START] = new SvxChartIndicateItem (CHINDICATE_NONE, SCHATTR_STAT_INDICATE);
     ppPoolDefaults[SCHATTR_STAT_RANGE_POS           - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, String());
     ppPoolDefaults[SCHATTR_STAT_RANGE_NEG           - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, String());
-
-    ppPoolDefaults[SCHATTR_TEXT_DEGREES				- SCHATTR_START] = new SfxInt32Item(SCHATTR_TEXT_DEGREES, 0);
-    ppPoolDefaults[SCHATTR_TEXT_OVERLAP	        	- SCHATTR_START] = new SfxBoolItem(SCHATTR_TEXT_OVERLAP,FALSE);
-
+    
     ppPoolDefaults[SCHATTR_STYLE_DEEP     - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0);
     ppPoolDefaults[SCHATTR_STYLE_3D       - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_3D, 0);
     ppPoolDefaults[SCHATTR_STYLE_VERTICAL - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_VERTICAL, 0);
@@ -137,37 +99,43 @@ ChartItemPool::ChartItemPool():
 
     ppPoolDefaults[SCHATTR_AXIS					- SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS,2); //2 = Y-Achse!!!
 
+    //axis scale
+    ppPoolDefaults[SCHATTR_AXISTYPE      		- SCHATTR_START] = new SfxInt32Item(SCHATTR_AXISTYPE, CHART_AXIS_REALNUMBER);
+    ppPoolDefaults[SCHATTR_AXIS_REVERSE			- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_REVERSE,0);
     ppPoolDefaults[SCHATTR_AXIS_AUTO_MIN		- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MIN);
     ppPoolDefaults[SCHATTR_AXIS_MIN				- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MIN);
     ppPoolDefaults[SCHATTR_AXIS_AUTO_MAX	  	- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_MAX);
     ppPoolDefaults[SCHATTR_AXIS_MAX				- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_MAX);
     ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_MAIN	- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN);
     ppPoolDefaults[SCHATTR_AXIS_STEP_MAIN		- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_MAIN);
+    ppPoolDefaults[SCHATTR_AXIS_MAIN_TIME_UNIT	- SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,2);
     ppPoolDefaults[SCHATTR_AXIS_AUTO_STEP_HELP	- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP);
-// 	ppPoolDefaults[SCHATTR_AXIS_STEP_HELP		- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_STEP_HELP);
-    // type changed from double to sal_Int32
     ppPoolDefaults[SCHATTR_AXIS_STEP_HELP		- SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_STEP_HELP,0);
+    ppPoolDefaults[SCHATTR_AXIS_HELP_TIME_UNIT  - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,2);
+    ppPoolDefaults[SCHATTR_AXIS_AUTO_TIME_RESOLUTION	- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_TIME_RESOLUTION);
+    ppPoolDefaults[SCHATTR_AXIS_TIME_RESOLUTION	- SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_TIME_RESOLUTION,2);
     ppPoolDefaults[SCHATTR_AXIS_LOGARITHM		- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LOGARITHM);
+    ppPoolDefaults[SCHATTR_AXIS_AUTO_DATEAXIS		- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS);
+    ppPoolDefaults[SCHATTR_AXIS_ALLOW_DATEAXIS		- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_ALLOW_DATEAXIS);
     ppPoolDefaults[SCHATTR_AXIS_AUTO_ORIGIN		- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN);
     ppPoolDefaults[SCHATTR_AXIS_ORIGIN			- SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_ORIGIN);
 
+    //axis position
     ppPoolDefaults[SCHATTR_AXIS_TICKS			- SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_TICKS,CHAXIS_MARK_OUTER);
-    ppPoolDefaults[SCHATTR_AXIS_NUMFMT			- SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMT,0);
-    ppPoolDefaults[SCHATTR_AXIS_NUMFMTPERCENT	- SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_NUMFMTPERCENT,11);
-    ppPoolDefaults[SCHATTR_AXIS_SHOWAXIS		- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWAXIS,0);
-    ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR		- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,0);
-    ppPoolDefaults[SCHATTR_AXIS_SHOWMAINGRID	- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWMAINGRID,0);
-    ppPoolDefaults[SCHATTR_AXIS_SHOWHELPGRID	- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWHELPGRID,0);
-    ppPoolDefaults[SCHATTR_AXIS_TOPDOWN			- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_TOPDOWN,0);
     ppPoolDefaults[SCHATTR_AXIS_HELPTICKS		- SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_HELPTICKS,0);
-    ppPoolDefaults[SCHATTR_AXIS_REVERSE			- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_REVERSE,0);
-
     ppPoolDefaults[SCHATTR_AXIS_POSITION        - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_POSITION,0);
     ppPoolDefaults[SCHATTR_AXIS_POSITION_VALUE  - SCHATTR_START] = new SvxDoubleItem(0.0, SCHATTR_AXIS_POSITION_VALUE);
     ppPoolDefaults[SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT	- SCHATTR_START] = new SfxUInt32Item(SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT,0);
     ppPoolDefaults[SCHATTR_AXIS_LABEL_POSITION  - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_LABEL_POSITION,0);
     ppPoolDefaults[SCHATTR_AXIS_MARK_POSITION   - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_MARK_POSITION,0);
 
+    //axis label
+    ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR		- SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,0);
+    ppPoolDefaults[SCHATTR_AXIS_LABEL_ORDER     - SCHATTR_START] = new SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE, SCHATTR_AXIS_LABEL_ORDER);
+    ppPoolDefaults[SCHATTR_AXIS_LABEL_OVERLAP   - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_OVERLAP,sal_False);
+    ppPoolDefaults[SCHATTR_AXIS_LABEL_BREAK     - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_BREAK, sal_False );
+    
+    //--
     ppPoolDefaults[SCHATTR_SYMBOL_BRUSH			- SCHATTR_START] = new SvxBrushItem(SCHATTR_SYMBOL_BRUSH);
     ppPoolDefaults[SCHATTR_STOCK_VOLUME 		- SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_VOLUME,0);
     ppPoolDefaults[SCHATTR_STOCK_UPDOWN			- SCHATTR_START] = new SfxBoolItem(SCHATTR_STOCK_UPDOWN,0);
@@ -176,21 +144,21 @@ ChartItemPool::ChartItemPool():
     // new for New Chart
     ppPoolDefaults[SCHATTR_BAR_OVERLAP			- SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_OVERLAP,0);
     ppPoolDefaults[SCHATTR_BAR_GAPWIDTH			- SCHATTR_START] = new SfxInt32Item(SCHATTR_BAR_GAPWIDTH,0);
-    ppPoolDefaults[SCHATTR_BAR_CONNECT			- SCHATTR_START] = new SfxBoolItem(SCHATTR_BAR_CONNECT, FALSE);
+    ppPoolDefaults[SCHATTR_BAR_CONNECT			- SCHATTR_START] = new SfxBoolItem(SCHATTR_BAR_CONNECT, sal_False);
     ppPoolDefaults[SCHATTR_NUM_OF_LINES_FOR_BAR - SCHATTR_START] = new SfxInt32Item( SCHATTR_NUM_OF_LINES_FOR_BAR, 0 );
     ppPoolDefaults[SCHATTR_SPLINE_ORDER         - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_ORDER, 3 );
     ppPoolDefaults[SCHATTR_SPLINE_RESOLUTION    - SCHATTR_START] = new SfxInt32Item( SCHATTR_SPLINE_RESOLUTION, 20 );
     ppPoolDefaults[SCHATTR_DIAGRAM_STYLE        - SCHATTR_START] = new SvxChartStyleItem( CHSTYLE_2D_COLUMN, SCHATTR_DIAGRAM_STYLE );
-    ppPoolDefaults[SCHATTR_TEXTBREAK            - SCHATTR_START] = new SfxBoolItem( SCHATTR_TEXTBREAK, FALSE );
-    ppPoolDefaults[SCHATTR_GROUP_BARS_PER_AXIS  - SCHATTR_START] = new SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, FALSE);
-    ppPoolDefaults[SCHATTR_INCLUDE_HIDDEN_CELLS - SCHATTR_START] = new SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, TRUE);
+    ppPoolDefaults[SCHATTR_GROUP_BARS_PER_AXIS  - SCHATTR_START] = new SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, sal_False);
     ppPoolDefaults[SCHATTR_STARTING_ANGLE       - SCHATTR_START] = new SfxInt32Item( SCHATTR_STARTING_ANGLE, 90 );
-    ppPoolDefaults[SCHATTR_CLOCKWISE            - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, FALSE );
+    ppPoolDefaults[SCHATTR_CLOCKWISE            - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, sal_False );
 
     ppPoolDefaults[SCHATTR_MISSING_VALUE_TREATMENT    - SCHATTR_START] = new SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT, 0);
     ppPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,aTmp);
+    ppPoolDefaults[SCHATTR_INCLUDE_HIDDEN_CELLS - SCHATTR_START] = new SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True);
 
     ppPoolDefaults[SCHATTR_AXIS_FOR_ALL_SERIES  - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_FOR_ALL_SERIES, 0);
+
     ppPoolDefaults[SCHATTR_REGRESSION_TYPE          - SCHATTR_START] = new SvxChartRegressItem  (CHREGRESS_NONE, SCHATTR_REGRESSION_TYPE);
     ppPoolDefaults[SCHATTR_REGRESSION_SHOW_EQUATION - SCHATTR_START] = new SfxBoolItem(SCHATTR_REGRESSION_SHOW_EQUATION, 0);
     ppPoolDefaults[SCHATTR_REGRESSION_SHOW_COEFF - SCHATTR_START] = new SfxBoolItem(SCHATTR_REGRESSION_SHOW_COEFF, 0);
@@ -200,7 +168,7 @@ ChartItemPool::ChartItemPool():
     **************************************************************************/
     pItemInfos = new SfxItemInfo[SCHATTR_END - SCHATTR_START + 1];
 
-    USHORT i;
+    sal_uInt16 i;
     for( i = SCHATTR_START; i <= SCHATTR_END; i++ )
     {
         pItemInfos[i - SCHATTR_START]._nSID = 0;
@@ -229,8 +197,8 @@ ChartItemPool::~ChartItemPool()
 
     delete[] pItemInfos;
 
-    const USHORT nMax = SCHATTR_END - SCHATTR_START + 1;
-    for( USHORT i=0; i<nMax; ++i )
+    const sal_uInt16 nMax = SCHATTR_END - SCHATTR_START + 1;
+    for( sal_uInt16 i=0; i<nMax; ++i )
     {
         SetRefCount(*ppPoolDefaults[i], 0);
         delete ppPoolDefaults[i];
@@ -244,7 +212,7 @@ SfxItemPool* ChartItemPool::Clone() const
     return new ChartItemPool(*this);
 }
 
-SfxMapUnit ChartItemPool::GetMetric(USHORT /* nWhich */) const
+SfxMapUnit ChartItemPool::GetMetric(sal_uInt16 /* nWhich */) const
 {
     return SFX_MAPUNIT_100TH_MM;
 }
diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx
index 920b33435..99d00eabb 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -46,7 +46,7 @@ protected:
 public:
 
     virtual SfxItemPool* Clone() const;
-    SfxMapUnit GetMetric( USHORT nWhich ) const;
+    SfxMapUnit GetMetric( sal_uInt16 nWhich ) const;
 
     /// creates a pure chart item pool
     static SfxItemPool* CreateChartItemPool();
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 1ecf569d0..79d489e12 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -31,6 +31,7 @@
 
 #include "ChartView.hxx"
 #include "chartview/DrawModelWrapper.hxx"
+#include "NumberFormatterWrapper.hxx"
 #include "ViewDefines.hxx"
 #include "VDiagram.hxx"
 #include "VTitle.hxx"
@@ -56,6 +57,7 @@
 #include "ControllerLockGuard.hxx"
 #include "BaseGFXHelper.hxx"
 #include "DataSeriesHelper.hxx"
+#include "DateHelper.hxx"
 
 #include <comphelper/scopeguard.hxx>
 #include <boost/bind.hpp>
@@ -78,7 +80,6 @@
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
-#include <com/sun/star/chart2/ExplicitSubIncrement.hpp>
 #include <com/sun/star/chart2/StackingDirection.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
@@ -201,7 +202,7 @@ void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& aArguments
         m_pDrawModelWrapper = ::boost::shared_ptr< DrawModelWrapper >( new DrawModelWrapper( m_xCC ) );
         m_xShapeFactory = m_pDrawModelWrapper->getShapeFactory();
         m_xDrawPage = m_pDrawModelWrapper->getMainDrawPage();
-        StartListening( m_pDrawModelWrapper->getSdrModel(), FALSE /*bPreventDups*/ );
+        StartListening( m_pDrawModelWrapper->getSdrModel(), sal_False /*bPreventDups*/ );
         // \--
     }
 }
@@ -210,7 +211,7 @@ ChartView::~ChartView()
 {
     if( m_pDrawModelWrapper.get() )
     {
-        EndListening( m_pDrawModelWrapper->getSdrModel(), FALSE /*bAllDups*/ );
+        EndListening( m_pDrawModelWrapper->getSdrModel(), sal_False /*bAllDups*/ );
         ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
         m_pDrawModelWrapper.reset();
     }
@@ -472,7 +473,7 @@ private:
 };
 
 AxisUsage::AxisUsage()
-    : aScaleAutomatism(AxisHelper::createDefaultScale())
+    : aScaleAutomatism(AxisHelper::createDefaultScale(),Date())
 {
 }
 
@@ -563,7 +564,7 @@ public:
     ~SeriesPlotterContainer();
 
     void initializeCooSysAndSeriesPlotter( const uno::Reference< frame::XModel >& xChartModel );
-    void initAxisUsageList();
+    void initAxisUsageList(const Date& rNullDate);
     void doAutoScaling( const uno::Reference< frame::XModel >& xChartModel );
     void updateScalesAndIncrementsOnAxes();
     void setScalesFromCooSysToPlotter();
@@ -581,13 +582,15 @@ private:
     std::vector< VCoordinateSystem* >& m_rVCooSysList;
     ::std::map< uno::Reference< XAxis >, AxisUsage > m_aAxisUsageList;
     sal_Int32 m_nMaxAxisIndex;
-    bool m_bChartTypeUsesShiftedXAxisTicksPerDefault;
+    bool m_bChartTypeUsesShiftedCategoryPositionPerDefault;
+    sal_Int32 m_nDefaultDateNumberFormat;
 };
 
 SeriesPlotterContainer::SeriesPlotterContainer( std::vector< VCoordinateSystem* >& rVCooSysList )
         : m_rVCooSysList( rVCooSysList )
         , m_nMaxAxisIndex(0)
-        , m_bChartTypeUsesShiftedXAxisTicksPerDefault(false)
+        , m_bChartTypeUsesShiftedCategoryPositionPerDefault(false)
+        , m_nDefaultDateNumberFormat(0)
 {
 }
 
@@ -625,6 +628,10 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
         return;
 
     uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( xChartModel, uno::UNO_QUERY );
+    uno::Reference< chart2::XChartDocument > xChartDoc( xChartModel, uno::UNO_QUERY );
+    if( xChartDoc.is() && xChartDoc->hasInternalDataProvider()
+        && DiagramHelper::isSupportingDateAxis( xDiagram ) )
+            m_nDefaultDateNumberFormat=DiagramHelper::getDateNumberFormat( xNumberFormatsSupplier );
 
     sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram );
     if(!nDimensionCount)
@@ -682,7 +689,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
             uno::Reference< XChartType > xChartType( aChartTypeList[nT] );
 
             if(nT==0)
-                m_bChartTypeUsesShiftedXAxisTicksPerDefault = ChartTypeHelper::shiftTicksAtXAxisPerDefault( xChartType );
+                m_bChartTypeUsesShiftedCategoryPositionPerDefault = ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( xChartType );
 
             bool bExcludingPositioning = DiagramPositioningMode_EXCLUDING == DiagramHelper::getDiagramPositioningMode( xDiagram );
             VSeriesPlotter* pPlotter = VSeriesPlotter::createSeriesPlotter( xChartType, nDimensionCount, bExcludingPositioning );
@@ -793,7 +800,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
     }
 }
 
-void SeriesPlotterContainer::initAxisUsageList()
+void SeriesPlotterContainer::initAxisUsageList(const Date& rNullDate)
 {
     m_aAxisUsageList.clear();
     size_t nC;
@@ -803,8 +810,10 @@ void SeriesPlotterContainer::initAxisUsageList()
         for(sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++)
         {
             uno::Reference< XCoordinateSystem > xCooSys = pVCooSys->getModel();
-            if( nDimensionIndex >= xCooSys->getDimension() )
+            sal_Int32 nDimensionCount = xCooSys->getDimension();
+            if( nDimensionIndex >= nDimensionCount )
                 continue;
+            bool bChartTypeAllowsDateAxis = ChartTypeHelper::isSupportingDateAxis(  AxisHelper::getChartTypeByIndex( xCooSys, 0 ), nDimensionCount, nDimensionIndex );
             const sal_Int32 nMaximumAxisIndex = xCooSys->getMaximumAxisIndexByDimension(nDimensionIndex);
             for(sal_Int32 nAxisIndex=0; nAxisIndex<=nMaximumAxisIndex; ++nAxisIndex)
             {
@@ -813,7 +822,20 @@ void SeriesPlotterContainer::initAxisUsageList()
                 if( xAxis.is())
                 {
                     if(m_aAxisUsageList.find(xAxis)==m_aAxisUsageList.end())
-                        m_aAxisUsageList[xAxis].aScaleAutomatism = ScaleAutomatism(xAxis->getScaleData());
+                    {
+                        chart2::ScaleData aSourceScale = xAxis->getScaleData();
+                        ExplicitCategoriesProvider* pExplicitCategoriesProvider = pVCooSys->getExplicitCategoriesProvider();
+                        if( nDimensionIndex==0 )
+                            AxisHelper::checkDateAxis( aSourceScale, pExplicitCategoriesProvider, bChartTypeAllowsDateAxis );
+                        if( (aSourceScale.AxisType == AxisType::CATEGORY && m_bChartTypeUsesShiftedCategoryPositionPerDefault)
+                            || (aSourceScale.AxisType==AxisType::CATEGORY && pExplicitCategoriesProvider && pExplicitCategoriesProvider->hasComplexCategories() )
+                            || aSourceScale.AxisType == AxisType::DATE
+                            || aSourceScale.AxisType == AxisType::SERIES )
+                            aSourceScale.ShiftedCategoryPosition = true;
+                        else
+                            aSourceScale.ShiftedCategoryPosition = false;
+                        m_aAxisUsageList[xAxis].aScaleAutomatism = ScaleAutomatism(aSourceScale,rNullDate);
+                    }
                     AxisUsage& rAxisUsage = m_aAxisUsageList[xAxis];
                     rAxisUsage.addCoordinateSystem(pVCooSys,nDimensionIndex,nAxisIndex);
                 }
@@ -886,6 +908,11 @@ void SeriesPlotterContainer::setNumberFormatsFromAxes()
                             {
                                 aAxesNumberFormats.setFormat( nNumberFormatKey, nDimensionIndex, nAxisIndex );
                             }
+                            else if( nDimensionIndex==0 )
+                            {
+                                //provide a default date format for date axis with own data
+                                aAxesNumberFormats.setFormat( m_nDefaultDateNumberFormat, nDimensionIndex, nAxisIndex );
+                            }
                         }
                     }
                     catch( lang::IndexOutOfBoundsException& e )
@@ -936,13 +963,7 @@ void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel
             rAxisUsage.aScaleAutomatism.calculateExplicitScaleAndIncrement( aExplicitScale, aExplicitIncrement );
 
             for( nC=0; nC < aVCooSysList_X.size(); nC++)
-            {
-                ExplicitCategoriesProvider* pExplicitCategoriesProvider = aVCooSysList_X[nC]->getExplicitCategoriesProvider();
-
-                if( m_bChartTypeUsesShiftedXAxisTicksPerDefault || (aExplicitScale.AxisType==AxisType::CATEGORY && pExplicitCategoriesProvider && pExplicitCategoriesProvider->hasComplexCategories() ) )
-                    aExplicitIncrement.ShiftedPosition = true;
                 aVCooSysList_X[nC]->setExplicitScaleAndIncrement( 0, nAxisIndex, aExplicitScale, aExplicitIncrement );
-            }
             for( nC=0; nC < aVCooSysList_Z.size(); nC++)
                 aVCooSysList_Z[nC]->setExplicitScaleAndIncrement( 2, nAxisIndex, aExplicitScale, aExplicitIncrement );
         }
@@ -1027,7 +1048,6 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
 
                         aExplicitScaleDest.Orientation = aExplicitScaleSource.Orientation;
                         aExplicitScaleDest.Scaling = aExplicitScaleSource.Scaling;
-                        aExplicitScaleDest.Breaks = aExplicitScaleSource.Breaks;
                         aExplicitScaleDest.AxisType = aExplicitScaleSource.AxisType;
 
                         aExplicitIncrementDest.BaseValue = aExplicitIncrementSource.BaseValue;
@@ -1065,7 +1085,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::
                             bAutoMinorInterval = !( aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() );
                         if( bAutoMinorInterval )
                         {
-                            if( aExplicitIncrementDest.SubIncrements.getLength() && aExplicitIncrementSource.SubIncrements.getLength() )
+                            if( !aExplicitIncrementDest.SubIncrements.empty() && !aExplicitIncrementSource.SubIncrements.empty() )
                                 aExplicitIncrementDest.SubIncrements[0].IntervalCount = 
                                     aExplicitIncrementSource.SubIncrements[0].IntervalCount;
                         }
@@ -1380,7 +1400,8 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
 
     
     // - prepare list of all axis and how they are used
-    rSeriesPlotterContainer.initAxisUsageList();    
+    Date aNullDate = NumberFormatterWrapper( uno::Reference< util::XNumberFormatsSupplier >( m_xChartModel, uno::UNO_QUERY ) ).getNullDate();
+    rSeriesPlotterContainer.initAxisUsageList(aNullDate);    
     rSeriesPlotterContainer.doAutoScaling( m_xChartModel );
     rSeriesPlotterContainer.setScalesFromCooSysToPlotter();
     rSeriesPlotterContainer.setNumberFormatsFromAxes();
@@ -1663,6 +1684,31 @@ sal_Bool ChartView::getExplicitValuesForAxis(
     {
         rExplicitScale = pVCooSys->getExplicitScale(nDimensionIndex,nAxisIndex);
         rExplicitIncrement = pVCooSys->getExplicitIncrement(nDimensionIndex,nAxisIndex);
+        if( rExplicitScale.ShiftedCategoryPosition )
+        {
+            //remove 'one' from max
+            if( rExplicitScale.AxisType == ::com::sun::star::chart2::AxisType::DATE )
+            {
+                Date aMaxDate(rExplicitScale.NullDate); aMaxDate += static_cast<long>(::rtl::math::approxFloor(rExplicitScale.Maximum));
+                //for explicit scales with shifted categories we need one interval more
+                switch( rExplicitScale.TimeResolution )
+                {
+                case ::com::sun::star::chart::TimeUnit::DAY:
+                    aMaxDate--;break;
+                case ::com::sun::star::chart::TimeUnit::MONTH:
+                    aMaxDate = DateHelper::GetDateSomeMonthsAway(aMaxDate,-1);
+                    break;
+                case ::com::sun::star::chart::TimeUnit::YEAR:
+                    aMaxDate = DateHelper::GetDateSomeYearsAway(aMaxDate,-1);
+                    break;
+                }
+                rExplicitScale.Maximum = aMaxDate - rExplicitScale.NullDate;
+            }
+            else if( rExplicitScale.AxisType == ::com::sun::star::chart2::AxisType::CATEGORY )
+                rExplicitScale.Maximum -= 1.0;
+            else if( rExplicitScale.AxisType == ::com::sun::star::chart2::AxisType::SERIES )
+                rExplicitScale.Maximum -= 1.0;
+        }
         return sal_True;
     }
     return sal_False;
@@ -1791,166 +1837,15 @@ bool lcl_getPropertySwapXAndYAxis( const uno::Reference< XDiagram >& xDiagram )
 
 }
 
-sal_Int32 lcl_getExplicitNumberFormatKeyForAxis(
-                  const Reference< chart2::XAxis >& xAxis
-                , const Reference< chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem
-                , const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier
-                , bool bSearchForParallelAxisIfNothingIsFound )
-{
-    sal_Int32 nNumberFormatKey(0);
-    Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
-    if( xProp.is() && !( xProp->getPropertyValue( C2U( "NumberFormat" ) ) >>= nNumberFormatKey ) )
-    {
-        bool bPercentFormatSet = false;
-        //check wether we have a percent scale -> use percent format
-        if( xNumberFormatsSupplier.is() )
-        {
-            ScaleData aData = xAxis->getScaleData();
-            if( aData.AxisType==AxisType::PERCENT )
-            {
-                sal_Int32 nPercentFormat = ExplicitValueProvider::getPercentNumberFormat( xNumberFormatsSupplier );
-                if( nPercentFormat != -1 )
-                {
-                    nNumberFormatKey = nPercentFormat;
-                    bPercentFormatSet = true;
-                }
-            }
-        }
-
-        if( !bPercentFormatSet )
-        {
-            typedef ::std::map< sal_Int32, sal_Int32 > tNumberformatFrequency;
-            tNumberformatFrequency aKeyMap;
-
-            bool bNumberFormatKeyFoundViaAttachedData = false;
-            sal_Int32 nAxisIndex = 0;
-            sal_Int32 nDimensionIndex = 1;
-            
-            try
-            {
-                Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW );
-                if( xCTCnt.is() )
-                {
-                    AxisHelper::getIndicesForAxis( xAxis, xCorrespondingCoordinateSystem, nDimensionIndex, nAxisIndex );
-                    ::rtl::OUString aRoleToMatch;
-                    if( nDimensionIndex == 0 )
-                        aRoleToMatch = C2U("values-x");
-                    Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes());
-                    for( sal_Int32 nCTIdx=0; nCTIdx<aChartTypes.getLength(); ++nCTIdx )
-                    {
-                        if( nDimensionIndex != 0 )
-                            aRoleToMatch = ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( aChartTypes[nCTIdx] );
-                        Reference< XDataSeriesContainer > xDSCnt( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
-                        Sequence< Reference< XDataSeries > > aDataSeriesSeq( xDSCnt->getDataSeries());
-                        for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aDataSeriesSeq.getLength(); ++nSeriesIdx )
-                        {
-                            Reference< chart2::XDataSeries > xDataSeries(aDataSeriesSeq[nSeriesIdx]);
-                            Reference< data::XDataSource > xSource( xDataSeries, uno::UNO_QUERY_THROW );
-
-                            if( nDimensionIndex == 1 )
-                            {
-                                //only take those series into accoutn that are attached to this axis
-                                sal_Int32 nAttachedAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries);
-                                if( nAttachedAxisIndex != nAxisIndex )
-                                    continue;
-                            }
-
-                            Sequence< Reference< data::XLabeledDataSequence > > aLabeledSeq( xSource->getDataSequences());
-                            for( sal_Int32 nLSeqIdx=0; nLSeqIdx<aLabeledSeq.getLength(); ++nLSeqIdx )
-                            {
-                                if(!aLabeledSeq[nLSeqIdx].is())
-                                    continue;
-                                Reference< data::XDataSequence > xSeq( aLabeledSeq[nLSeqIdx]->getValues());
-                                if(!xSeq.is())
-                                    continue;
-                                Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY );
-                                ::rtl::OUString aRole;
-                                bool bTakeIntoAccount =
-                                    ( xSeqProp.is() && (aRoleToMatch.getLength() > 0) &&
-                                    (xSeqProp->getPropertyValue(C2U("Role")) >>= aRole ) &&
-                                    aRole.equals( aRoleToMatch ));
-
-                                if( bTakeIntoAccount )
-                                {
-                                    sal_Int32 nKey = xSeq->getNumberFormatKeyByIndex( -1 );
-                                    // initialize the value
-                                    if( aKeyMap.find( nKey ) == aKeyMap.end())
-                                        aKeyMap[ nKey ] = 0;
-                                    // increase frequency
-                                    aKeyMap[ nKey ] = (aKeyMap[ nKey ] + 1);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch( const uno::Exception & ex )
-            {
-                ASSERT_EXCEPTION( ex );
-            }
-
-            if( ! aKeyMap.empty())
-            {
-                sal_Int32 nMaxFreq = 0;
-                // find most frequent key
-                for( tNumberformatFrequency::const_iterator aIt = aKeyMap.begin();
-                    aIt != aKeyMap.end(); ++aIt )
-                {
-                    OSL_TRACE( "NumberFormatKey %d appears %d times", (*aIt).first, (*aIt).second );
-                    // all values must at least be 1
-                    if( (*aIt).second > nMaxFreq )
-                    {
-                        nNumberFormatKey = (*aIt).first;
-                        bNumberFormatKeyFoundViaAttachedData = true;
-                        nMaxFreq = (*aIt).second;
-                    }
-                }
-            }
-
-            if( bSearchForParallelAxisIfNothingIsFound )
-            {
-                //no format is set to this axis and no data is set to this axis
-                //--> try to obtain the format from the parallel y-axis
-                if( !bNumberFormatKeyFoundViaAttachedData && nDimensionIndex == 1 )
-                {
-                    sal_Int32 nParallelAxisIndex = (nAxisIndex==1) ?0 :1;
-                    Reference< XAxis > xParallelAxis( AxisHelper::getAxis( 1, nParallelAxisIndex, xCorrespondingCoordinateSystem ) );
-                    nNumberFormatKey = lcl_getExplicitNumberFormatKeyForAxis( xParallelAxis, xCorrespondingCoordinateSystem, xNumberFormatsSupplier, false );
-                }
-            }
-        }
-    }
-    return nNumberFormatKey;
-}
-
 sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
                   const Reference< chart2::XAxis >& xAxis
                 , const Reference< chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem
                 , const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier )
 {
-    return lcl_getExplicitNumberFormatKeyForAxis( xAxis, xCorrespondingCoordinateSystem, xNumberFormatsSupplier
+    return AxisHelper::getExplicitNumberFormatKeyForAxis( xAxis, xCorrespondingCoordinateSystem, xNumberFormatsSupplier
         , true /*bSearchForParallelAxisIfNothingIsFound*/ );
 }
 
-sal_Int32 ExplicitValueProvider::getPercentNumberFormat( const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier )
-{
-    sal_Int32 nRet=-1;
-    Reference< util::XNumberFormats > xNumberFormats( xNumberFormatsSupplier->getNumberFormats() );
-    if( xNumberFormats.is() )
-    {
-        sal_Bool bCreate = sal_True;
-        const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
-        Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT, 
-            rLocaleDataWrapper.getLocale(), bCreate );
-        if( aKeySeq.getLength() )
-        {
-            nRet = aKeySeq[0];
-        }
-    }
-    return nRet;
-}
-
-
 sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
         const uno::Reference< beans::XPropertySet >& xSeriesOrPointProp,
         const uno::Reference< XDataSeries >& xSeries,
@@ -2003,7 +1898,7 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe
         return nFormat; 
     if( !(xSeriesOrPointProp->getPropertyValue(C2U( "PercentageNumberFormat" )) >>= nFormat) )
     {
-        nFormat = ExplicitValueProvider::getPercentNumberFormat( xNumberFormatsSupplier );
+        nFormat = DiagramHelper::getPercentNumberFormat( xNumberFormatsSupplier );
     }
     if(nFormat<0)
         nFormat=0;
@@ -2599,7 +2494,7 @@ void ChartView::createShapes()
         // /--
         ::vos::OGuard aSolarGuard( Application::GetSolarMutex());
         // #i12587# support for shapes in chart
-        m_pDrawModelWrapper->getSdrModel().EnableUndo( FALSE );
+        m_pDrawModelWrapper->getSdrModel().EnableUndo( sal_False );
         m_pDrawModelWrapper->clearMainDrawPage();
         // \--
     }
@@ -2763,7 +2658,7 @@ void ChartView::createShapes()
     if ( m_pDrawModelWrapper )
     {
         ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-        m_pDrawModelWrapper->getSdrModel().EnableUndo( TRUE );
+        m_pDrawModelWrapper->getSdrModel().EnableUndo( sal_True );
     }
 
 #if OSL_DEBUG_LEVEL > 0
diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx
index 1a37be330..5fcf24a7d 100644
--- a/chart2/source/view/main/ChartView.hxx
+++ b/chart2/source/view/main/ChartView.hxx
@@ -103,8 +103,8 @@ public:
     // ___ExplicitValueProvider___
     virtual sal_Bool getExplicitValuesForAxis(
         ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > xAxis
-        , ::com::sun::star::chart2::ExplicitScaleData&  rExplicitScale
-        , ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement );
+        , ExplicitScaleData&  rExplicitScale
+        , ExplicitIncrementData& rExplicitIncrement );
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
         getShapeForCID( const rtl::OUString& rObjectCID );
 
diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx
index 6621969d1..9489df5a1 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -86,7 +86,7 @@ bool lcl_CLIPt(double fDenom,double fNum, double & fTE, double & fTL)
 }
 
 /**	@descr	The line given by it's two endpoints rP0 and rP1 is clipped at the rectangle
-            rRectangle.  If there is at least a part of it visible then TRUE is returned and
+            rRectangle.  If there is at least a part of it visible then sal_True is returned and
             the endpoints of that part are stored in rP0 and rP1.  The points rP0 and rP1
             may have the same coordinates.
         @param	rP0 Start point of the line to clip.  Modified to contain a start point inside
@@ -95,7 +95,7 @@ bool lcl_CLIPt(double fDenom,double fNum, double & fTE, double & fTL)
             the clipping area if possible.
         @param	rRectangle Clipping area.
         @return	If the line lies completely or partly inside the clipping area then TRUE
-            is returned.  If the line lies completely outside then FALSE is returned and rP0 and
+            is returned.  If the line lies completely outside then sal_False is returned and rP0 and
             rP1 are left unmodified.
 */
 bool lcl_clip2d(B2DTuple& rPoint0, B2DTuple& rPoint1, const B2DRectangle& rRectangle)
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 8d24fcab5..211ad6d0f 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -135,7 +135,7 @@ DrawModelWrapper::DrawModelWrapper(
 
     SfxItemPool* pMasterPool = &GetItemPool();
     pMasterPool->SetDefaultMetric(SFX_MAPUNIT_100TH_MM);
-    pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE, TRUE) );
+    pMasterPool->SetPoolDefaultItem(SfxBoolItem(EE_PARA_HYPHENATE, sal_True) );
     pMasterPool->SetPoolDefaultItem(Svx3DPercentDiagonalItem (5));
 
     SfxItemPool* pPool = pMasterPool;
@@ -374,8 +374,8 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const String& rObjectCID, SdrObj
 {
     if(!pSearchList || rObjectCID.Len()==0)
         return 0;
-    ULONG nCount = pSearchList->GetObjCount();
-    for( ULONG nN=0; nN<nCount; nN++  )
+    sal_uLong nCount = pSearchList->GetObjCount();
+    for( sal_uLong nN=0; nN<nCount; nN++  )
     {
         SdrObject* pObj = pSearchList->GetObj(nN);
         if(!pObj)
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 7a715010c..603089373 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -56,8 +56,7 @@ PlotterBase::PlotterBase( sal_Int32 nDimensionCount )
 {
 }
 
-    void SAL_CALL PlotterBase
-::initPlotter(  const uno::Reference< drawing::XShapes >& xLogicTarget
+void PlotterBase::initPlotter(  const uno::Reference< drawing::XShapes >& xLogicTarget
        , const uno::Reference< drawing::XShapes >& xFinalTarget
        , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
        , const rtl::OUString& rCID )
@@ -77,11 +76,9 @@ PlotterBase::~PlotterBase()
     delete m_pShapeFactory;
 }
 
-void SAL_CALL PlotterBase::setScales( const uno::Sequence< ExplicitScaleData >& rScales
-                                     , sal_Bool bSwapXAndYAxis )
-                            throw (uno::RuntimeException)
+void PlotterBase::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis )
 {
-    DBG_ASSERT(m_nDimension<=rScales.getLength(),"Dimension of Plotter does not fit two dimension of given scale sequence");
+    DBG_ASSERT(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence");
     m_pPosHelper->setScales( rScales, bSwapXAndYAxis );
 }
 
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index 8b481c0c2..6c5a28857 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -32,12 +32,14 @@
 #include "ViewDefines.hxx"
 #include "Linear3DTransformation.hxx"
 #include "VPolarTransformation.hxx"
-
 #include "ShapeFactory.hxx"
 #include "PropertyMapper.hxx"
+#include "DateHelper.hxx"
+
+#include <com/sun/star/chart/TimeUnit.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
-#include <com/sun/star/chart2/AxisType.hpp>
 
 #include <rtl/math.hxx>
 
@@ -57,6 +59,12 @@ PlottingPositionHelper::PlottingPositionHelper()
         , m_nYResolution( 1000 )
         , m_nZResolution( 1000 )
         , m_bMaySkipPointsInRegressionCalculation( true )
+        , m_bDateAxis(false)
+        , m_nTimeResolution( ::com::sun::star::chart::TimeUnit::DAY )
+        , m_aNullDate(30,12,1899)
+        , m_fScaledCategoryWidth(1.0)
+        , m_bAllowShiftXAxisPos(false)
+        , m_bAllowShiftZAxisPos(false)
 {
 }
 PlottingPositionHelper::PlottingPositionHelper( const PlottingPositionHelper& rSource )
@@ -68,6 +76,12 @@ PlottingPositionHelper::PlottingPositionHelper( const PlottingPositionHelper& rS
         , m_nYResolution( rSource.m_nYResolution )
         , m_nZResolution( rSource.m_nZResolution )
         , m_bMaySkipPointsInRegressionCalculation( rSource.m_bMaySkipPointsInRegressionCalculation )
+        , m_bDateAxis( rSource.m_bDateAxis )
+        , m_nTimeResolution( rSource.m_nTimeResolution )
+        , m_aNullDate( rSource.m_aNullDate )
+        , m_fScaledCategoryWidth( rSource.m_fScaledCategoryWidth )
+        , m_bAllowShiftXAxisPos( rSource.m_bAllowShiftXAxisPos )
+        , m_bAllowShiftZAxisPos( rSource.m_bAllowShiftZAxisPos )
 {
 }
 
@@ -95,13 +109,13 @@ void PlottingPositionHelper::setTransformationSceneToScreen( const drawing::Homo
     m_xTransformationLogicToScene = NULL;
 }
 
-void PlottingPositionHelper::setScales( const uno::Sequence< ExplicitScaleData >& rScales, sal_Bool bSwapXAndYAxis )
+void PlottingPositionHelper::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis )
 {
     m_aScales = rScales;
     m_bSwapXAndY = bSwapXAndYAxis;
     m_xTransformationLogicToScene = NULL;
 }
-const uno::Sequence< ExplicitScaleData >& PlottingPositionHelper::getScales() const
+const std::vector< ExplicitScaleData >& PlottingPositionHelper::getScales() const
 {
     return m_aScales;
 }
@@ -129,8 +143,8 @@ uno::Reference< XTransformation > PlottingPositionHelper::getTransformationScale
         AxisOrientation nZAxisOrientation = m_aScales[2].Orientation;
 
         //apply scaling
-        doLogicScaling( &MinX, &MinY, &MinZ );
-        doLogicScaling( &MaxX, &MaxY, &MaxZ);
+        doUnshiftedLogicScaling( &MinX, &MinY, &MinZ );
+        doUnshiftedLogicScaling( &MaxX, &MaxY, &MaxZ);
 
         if(m_bSwapXAndY)
         {
@@ -176,9 +190,9 @@ uno::Reference< XTransformation > PlottingPositionHelper::getTransformationScale
 drawing::Position3D PlottingPositionHelper::transformLogicToScene(
     double fX, double fY, double fZ, bool bClip ) const
 {
-    if(bClip)
-        this->clipLogicValues( &fX,&fY,&fZ );
     this->doLogicScaling( &fX,&fY,&fZ );
+    if(bClip)
+        this->clipScaledLogicValues( &fX,&fY,&fZ );
 
     return this->transformScaledLogicToScene( fX, fY, fZ, false );
 }
@@ -254,8 +268,8 @@ void PlottingPositionHelper::clipScaledLogicValues( double* pX, double* pY, doub
     double MaxZ = getLogicMaxZ();
 
     //apply scaling
-    doLogicScaling( &MinX, &MinY, &MinZ );
-    doLogicScaling( &MaxX, &MaxY, &MaxZ);
+    doUnshiftedLogicScaling( &MinX, &MinY, &MinZ );
+    doUnshiftedLogicScaling( &MaxX, &MaxY, &MaxZ);
 
     if(pX)
     {
@@ -291,8 +305,8 @@ basegfx::B2DRectangle PlottingPositionHelper::getScaledLogicClipDoubleRect() con
     double MaxZ = getLogicMaxZ();
 
     //apply scaling
-    doLogicScaling( &MinX, &MinY, &MinZ );
-    doLogicScaling( &MaxX, &MaxY, &MaxZ);
+    doUnshiftedLogicScaling( &MinX, &MinY, &MinZ );
+    doUnshiftedLogicScaling( &MaxX, &MaxY, &MaxZ);
 
     basegfx::B2DRectangle aRet( MinX, MaxY, MaxX, MinY );
     return aRet;
@@ -355,7 +369,7 @@ void PolarPlottingPositionHelper::setTransformationSceneToScreen( const drawing:
     PlottingPositionHelper::setTransformationSceneToScreen( rMatrix);
     m_aUnitCartesianToScene =impl_calculateMatrixUnitCartesianToScene( m_aMatrixScreenToScene );
 }
-void PolarPlottingPositionHelper::setScales( const uno::Sequence< ExplicitScaleData >& rScales, sal_Bool bSwapXAndYAxis )
+void PolarPlottingPositionHelper::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis )
 {
     PlottingPositionHelper::setScales( rScales, bSwapXAndYAxis );
     m_aUnitCartesianToScene =impl_calculateMatrixUnitCartesianToScene( m_aMatrixScreenToScene );
@@ -365,7 +379,7 @@ void PolarPlottingPositionHelper::setScales( const uno::Sequence< ExplicitScaleD
 {
     ::basegfx::B3DHomMatrix aRet;
 
-    if( !m_aScales.getLength() )
+    if( m_aScales.empty() )
         return aRet;
 
     double fTranslate =1.0;
@@ -640,6 +654,41 @@ double PlottingPositionHelper::getBaseValueY() const
     return m_aScales[1].Origin;
 }
 
+void PlottingPositionHelper::setTimeResolution( long nTimeResolution, const Date& rNullDate )
+{
+    m_nTimeResolution = nTimeResolution;
+    m_aNullDate = rNullDate;
+        
+    //adapt category width
+    double fCategoryWidth = 1.0;
+    if( !m_aScales.empty() )
+    {
+        if( m_aScales[0].AxisType == ::com::sun::star::chart2::AxisType::DATE )
+        {
+            m_bDateAxis = true;
+            if( nTimeResolution == ::com::sun::star::chart::TimeUnit::YEAR )
+            {
+                const double fMonthCount = 12.0;//todo: this depends on the DateScaling and must be adjusted in case we use more generic calendars in future
+                fCategoryWidth = fMonthCount;
+            }
+        }
+    }
+    setScaledCategoryWidth(fCategoryWidth);
+}
+
+void PlottingPositionHelper::setScaledCategoryWidth( double fScaledCategoryWidth )
+{
+    m_fScaledCategoryWidth = fScaledCategoryWidth;
+}
+void PlottingPositionHelper::AllowShiftXAxisPos( bool bAllowShift )
+{
+    m_bAllowShiftXAxisPos = bAllowShift;
+}
+void PlottingPositionHelper::AllowShiftZAxisPos( bool bAllowShift )
+{
+    m_bAllowShiftZAxisPos = bAllowShift;
+}
+
 /*
 // ____ XTransformation ____
 uno::Sequence< double > SAL_CALL PolarPlottingPositionHelper::transform(
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 44523c05a..59a6adca5 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -352,6 +352,22 @@ void VDataSeries::setCategoryXAxis()
     m_bAllowPercentValueInDataLabel = true;
 }
 
+void VDataSeries::setXValues( const Reference< chart2::data::XDataSequence >& xValues )
+{
+    m_aValues_X.clear();
+    m_aValues_X.init( xValues );
+    m_bAllowPercentValueInDataLabel = true;
+}
+
+void VDataSeries::setXValuesIfNone( const Reference< chart2::data::XDataSequence >& xValues )
+{
+    if( m_aValues_X.is() )
+        return;
+
+    m_aValues_X.init( xValues );
+    lcl_clearIfNoValuesButTextIsContained( m_aValues_X, xValues );
+}
+
 void VDataSeries::setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex )
 {
     m_nGlobalSeriesIndex = nGlobalSeriesIndex;
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 4cc9d40e0..0654c5cee 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -632,7 +632,7 @@ VLegend::VLegend(
 
 // ----------------------------------------
 
-void SAL_CALL VLegend::init(
+void VLegend::init(
     const Reference< drawing::XShapes >& xTargetPage,
     const Reference< lang::XMultiServiceFactory >& xFactory,
     const Reference< frame::XModel >& xModel )
diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx
index 08c79404b..2fb1e8bb6 100644
--- a/chart2/source/view/main/VLegend.hxx
+++ b/chart2/source/view/main/VLegend.hxx
@@ -56,7 +56,7 @@ public:
                  ::com::sun::star::uno::XComponentContext > & xContext,
              const std::vector< LegendEntryProvider* >& rLegendEntryProviderList );
 
-    void SAL_CALL init( const ::com::sun::star::uno::Reference<
+    void init( const ::com::sun::star::uno::Reference<
                             ::com::sun::star::drawing::XShapes >& xTargetPage,
                         const ::com::sun::star::uno::Reference<
                             ::com::sun::star::lang::XMultiServiceFactory >& xFactory,
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index 854b78503..a14bb7732 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -65,7 +65,7 @@ VTitle::~VTitle()
 {
 }
 
-void SAL_CALL VTitle::init(
+void VTitle::init(
               const uno::Reference< drawing::XShapes >& xTargetPage
             , const uno::Reference< lang::XMultiServiceFactory >& xFactory
             , const rtl::OUString& rCID )
diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx
index f4047e671..f22177a7d 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -47,7 +47,7 @@ public:
                   ::com::sun::star::chart2::XTitle > & xTitle );
     virtual ~VTitle();
 
-    void SAL_CALL init( const ::com::sun::star::uno::Reference<
+    void    init( const ::com::sun::star::uno::Reference<
                      ::com::sun::star::drawing::XShapes >& xTargetPage
              , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory
              , const rtl::OUString& rCID );
diff --git a/chart2/source/view/main/makefile.mk b/chart2/source/view/main/makefile.mk
index ec9c99f2a..8675930aa 100644
--- a/chart2/source/view/main/makefile.mk
+++ b/chart2/source/view/main/makefile.mk
@@ -43,7 +43,6 @@ ENABLE_EXCEPTIONS=	TRUE
 SLOFILES =  \
             $(SLO)$/ChartItemPool.obj \
             $(SLO)$/DrawModelWrapper.obj \
-            $(SLO)$/NumberFormatterWrapper.obj \
             $(SLO)$/PropertyMapper.obj \
             $(SLO)$/Stripe.obj \
             $(SLO)$/VLineProperties.obj \
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 50b4dda3b..1aaeee5b4 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -83,7 +83,7 @@ struct ScAddInArgDesc
     String              aName;
     String              aDescription;
     ScAddInArgumentType eType;
-    BOOL                bOptional;
+    sal_Bool                bOptional;
 };
 
 class ScUnoAddInFuncData
@@ -99,15 +99,15 @@ private:
     long                nArgCount;
     ScAddInArgDesc*     pArgDescs;
     long                nCallerPos;
-    USHORT              nCategory;
+    sal_uInt16              nCategory;
     rtl::OString        sHelpId;
     mutable com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName> aCompNames;
-    mutable BOOL        bCompInitialized;
+    mutable sal_Bool        bCompInitialized;
 
 public:
                 ScUnoAddInFuncData( const String& rNam, const String& rLoc,
                                     const String& rDesc,
-                                    USHORT nCat, const rtl::OString&,
+                                    sal_uInt16 nCat, const rtl::OString&,
                                     const com::sun::star::uno::Reference<
                                         com::sun::star::reflection::XIdlMethod>& rFunc,
                                     const com::sun::star::uno::Any& rO,
@@ -126,11 +126,11 @@ public:
     const ScAddInArgDesc*   GetArguments() const        { return pArgDescs; }
     long                    GetCallerPos() const        { return nCallerPos; }
     const String&           GetDescription() const      { return aDescription; }
-    USHORT                  GetCategory() const         { return nCategory; }
+    sal_uInt16                  GetCategory() const         { return nCategory; }
     const rtl::OString      GetHelpId() const           { return sHelpId; }
 
     const com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName>&  GetCompNames() const;
-    BOOL                    GetExcelName( LanguageType eDestLang, String& rRetExcelName ) const;
+    sal_Bool                    GetExcelName( LanguageType eDestLang, String& rRetExcelName ) const;
 
     void    SetFunction( const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& rNewFunc,
                          const com::sun::star::uno::Any& rNewObj );
@@ -149,7 +149,7 @@ private:
     ScAddInHashMap*         pExactHashMap;      // exact internal name
     ScAddInHashMap*         pNameHashMap;       // internal name upper
     ScAddInHashMap*         pLocalHashMap;      // localized name upper
-    BOOL					bInitialized;
+    sal_Bool					bInitialized;
 
     void		Initialize();
     void        ReadConfiguration();
@@ -165,7 +165,7 @@ public:
                 ~ScUnoAddInCollection();
 
                         /// User enetered name. rUpperName MUST already be upper case!
-    String				FindFunction( const String& rUpperName, BOOL bLocalFirst );
+    String				FindFunction( const String& rUpperName, sal_Bool bLocalFirst );
 
                         // rName is the exact Name.
                         // Only if bComplete is set, the function reference and argument types
@@ -183,12 +183,12 @@ public:
     void				LocalizeString( String& rName );	// modify rName - input: exact name
 
     long				GetFuncCount();
-    BOOL				FillFunctionDesc( long nFunc, ScFuncDesc& rDesc );
+    sal_Bool				FillFunctionDesc( long nFunc, ScFuncDesc& rDesc );
 
-    static BOOL         FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc );
+    static sal_Bool         FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc );
 
-    BOOL				GetExcelName( const String& rCalcName, LanguageType eDestLang, String& rRetExcelName );
-    BOOL				GetCalcName( const String& rExcelName, String& rRetCalcName );
+    sal_Bool				GetExcelName( const String& rCalcName, LanguageType eDestLang, String& rRetExcelName );
+    sal_Bool				GetCalcName( const String& rExcelName, String& rRetCalcName );
                                 // both leave rRet... unchanged, if no matching name is found
 };
 
@@ -200,10 +200,10 @@ private:
     com::sun::star::uno::Sequence<com::sun::star::uno::Any>			aArgs;
     com::sun::star::uno::Sequence<com::sun::star::uno::Any>			aVarArg;
     com::sun::star::uno::Reference<com::sun::star::uno::XInterface>	xCaller;
-    BOOL						bValidCount;
+    sal_Bool						bValidCount;
     // result:
-    USHORT						nErrCode;
-    BOOL						bHasString;
+    sal_uInt16						nErrCode;
+    sal_Bool						bHasString;
     double						fValue;
     String						aString;
     ScMatrixRef			        xMatrix;
@@ -218,12 +218,12 @@ public:
                                     long nParamCount );
                     ~ScUnoAddInCall();
 
-    BOOL				NeedsCaller() const;
+    sal_Bool				NeedsCaller() const;
     void				SetCaller( const com::sun::star::uno::Reference<
                                     com::sun::star::uno::XInterface>& rInterface );
     void				SetCallerFromObjectShell( SfxObjectShell* pSh );
 
-    BOOL				ValidParamCount();
+    sal_Bool				ValidParamCount();
     ScAddInArgumentType	GetArgType( long nPos );
     void				SetParam( long nPos, const com::sun::star::uno::Any& rValue );
 
@@ -231,10 +231,10 @@ public:
 
     void				SetResult( const com::sun::star::uno::Any& rNewRes );
 
-    USHORT				GetErrCode() const		{ return nErrCode; }
-    BOOL				HasString() const		{ return bHasString; }
-    BOOL				HasMatrix() const		{ return ( xMatrix.Is() ); }
-    BOOL				HasVarRes() const		{ return ( xVarRes.is() ); }
+    sal_uInt16				GetErrCode() const		{ return nErrCode; }
+    sal_Bool				HasString() const		{ return bHasString; }
+    sal_Bool				HasMatrix() const		{ return ( xMatrix.Is() ); }
+    sal_Bool				HasVarRes() const		{ return ( xVarRes.is() ); }
     double				GetValue() const		{ return fValue; }
     const String&		GetString() const		{ return aString; }
     ScMatrixRef	        GetMatrix() const		{ return xMatrix; }
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 545ec192d..279f1e1fb 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -315,13 +315,13 @@ public:
     inline void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const
     { nColP = nCol; nRowP = nRow; nTabP = nTab; }
 
-    SC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL, 
+    SC_DLLPUBLIC sal_uInt16 Parse( const String&, ScDocument* = NULL, 
                   const Details& rDetails = detailsOOOa1,
                   ExternalInfo* pExtInfo = NULL,
                   const ::com::sun::star::uno::Sequence<
                     const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL );
 
-    SC_DLLPUBLIC void Format( String&, USHORT = 0, ScDocument* = NULL,
+    SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, ScDocument* = NULL,
                  const Details& rDetails = detailsOOOa1) const;
 
     // The document for the maximum defined sheet number
@@ -336,7 +336,7 @@ public:
     inline size_t hash() const;
 
     /// "A1" or "$A$1" or R1C1 or R[1]C[1]
-    String GetColRowString( bool bAbsolute = FALSE,
+    String GetColRowString( bool bAbsolute = sal_False,
                             const Details& rDetails = detailsOOOa1) const;
 };
 
@@ -389,7 +389,7 @@ inline bool ScAddress::operator!=( const ScAddress& r ) const
 
 inline bool ScAddress::operator<( const ScAddress& r ) const
 {
-    // Same behavior as the old UINT32 nAddress < r.nAddress with encoded
+    // Same behavior as the old sal_uInt32 nAddress < r.nAddress with encoded
     // tab|col|row bit fields.
     if (nTab == r.nTab)
     {
@@ -477,17 +477,17 @@ public:
     inline bool In( const ScAddress& ) const;   // is Address& in Range?
     inline bool In( const ScRange& ) const;     // is Range& in Range?
 
-    USHORT Parse( const String&, ScDocument* = NULL,
+    sal_uInt16 Parse( const String&, ScDocument* = NULL,
                   const ScAddress::Details& rDetails = ScAddress::detailsOOOa1,
                   ScAddress::ExternalInfo* pExtInfo = NULL,
                   const ::com::sun::star::uno::Sequence<
                     const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL );
 
-    USHORT ParseAny( const String&, ScDocument* = NULL,
+    sal_uInt16 ParseAny( const String&, ScDocument* = NULL,
                      const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
-    SC_DLLPUBLIC USHORT ParseCols( const String&, ScDocument* = NULL,
+    SC_DLLPUBLIC sal_uInt16 ParseCols( const String&, ScDocument* = NULL,
                      const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
-    SC_DLLPUBLIC USHORT ParseRows( const String&, ScDocument* = NULL,
+    SC_DLLPUBLIC sal_uInt16 ParseRows( const String&, ScDocument* = NULL,
                      const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
 
     /** Parse an Excel style reference up to and including the sheet name 
@@ -511,12 +511,12 @@ public:
             bOnlyAcceptSingle==true was given.
      */
     const sal_Unicode* Parse_XL_Header( const sal_Unicode* pString, const ScDocument* pDoc,
-            String& rExternDocName, String& rStartTabName, String& rEndTabName, USHORT& nFlags,
+            String& rExternDocName, String& rStartTabName, String& rEndTabName, sal_uInt16& nFlags,
             bool bOnlyAcceptSingle,
             const ::com::sun::star::uno::Sequence<
                 const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL );
 
-    SC_DLLPUBLIC void Format( String&, USHORT = 0, ScDocument* = NULL,
+    SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, ScDocument* = NULL,
                  const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ) const;
 
     inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1,
@@ -655,8 +655,8 @@ public:
         {  aRange[0] = r1; aRange[1] = r2; }
 
     inline ScRangePair& operator= ( const ScRangePair& r );
-    const ScRange&      GetRange( USHORT n ) const { return aRange[n]; }
-    ScRange&            GetRange( USHORT n ) { return aRange[n]; }
+    const ScRange&      GetRange( sal_uInt16 n ) const { return aRange[n]; }
+    ScRange&            GetRange( sal_uInt16 n ) { return aRange[n]; }
     inline int operator==( const ScRangePair& ) const;
     inline int operator!=( const ScRangePair& ) const;
 };
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index a5f41642a..d88913e9c 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -67,7 +67,7 @@ class ScAutoFormatsObj : public ::cppu::WeakImplHelper4<
                             ::com::sun::star::lang::XServiceInfo >
 {
 private:
-    ScAutoFormatObj*		GetObjectByIndex_Impl(USHORT nIndex);
+    ScAutoFormatObj*		GetObjectByIndex_Impl(sal_uInt16 nIndex);
     ScAutoFormatObj*		GetObjectByName_Impl(const ::rtl::OUString& aName);
 
 public:
@@ -144,19 +144,19 @@ class ScAutoFormatObj : public ::cppu::WeakImplHelper6<
 {
 private:
     SfxItemPropertySet		aPropSet;
-    USHORT					nFormatIndex;
+    sal_uInt16					nFormatIndex;
 
-    ScAutoFormatFieldObj*	GetObjectByIndex_Impl(USHORT nIndex);
+    ScAutoFormatFieldObj*	GetObjectByIndex_Impl(sal_uInt16 nIndex);
 
 public:
-                            ScAutoFormatObj(USHORT nIndex);
+                            ScAutoFormatObj(sal_uInt16 nIndex);
     virtual					~ScAutoFormatObj();
 
     virtual void			Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
                             // per getImplementation gerufen:
     sal_Bool				IsInserted() const		{ return nFormatIndex != SC_AFMTOBJ_INVALID; }
-    void					InitFormat( USHORT nNewIndex );
+    void					InitFormat( sal_uInt16 nNewIndex );
 
                             // XIndexAccess
     virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException);
@@ -246,11 +246,11 @@ class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper2<
 {
 private:
     SfxItemPropertySet		aPropSet;
-    USHORT					nFormatIndex;
-    USHORT					nFieldIndex;
+    sal_uInt16					nFormatIndex;
+    sal_uInt16					nFieldIndex;
 
 public:
-                            ScAutoFormatFieldObj(USHORT nFormat, USHORT nField);
+                            ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField);
     virtual					~ScAutoFormatFieldObj();
 
     virtual void			Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 4056b3c39..7615ce84b 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -46,22 +46,22 @@ public:
 
     void		SetAppMetric( FieldUnit eUnit )	{ eMetric = eUnit;		}
     FieldUnit	GetAppMetric() const			{ return eMetric;		}
-    void		SetZoom( USHORT nNew )			{ nZoom = nNew;			}
-    USHORT		GetZoom() const					{ return nZoom;			}
+    void		SetZoom( sal_uInt16 nNew )			{ nZoom = nNew;			}
+    sal_uInt16		GetZoom() const					{ return nZoom;			}
     void		SetZoomType( SvxZoomType eNew ) { eZoomType = eNew;		}
     SvxZoomType	GetZoomType() const				{ return eZoomType;		}
-    void        SetSynchronizeZoom( BOOL bNew ) { bSynchronizeZoom = bNew; }
-    BOOL        GetSynchronizeZoom() const      { return bSynchronizeZoom; }
-    USHORT		GetLRUFuncListCount() const		{ return nLRUFuncCount;	}
-    USHORT*		GetLRUFuncList() const			{ return pLRUList;		}
-    void		SetLRUFuncList( const USHORT* pList,
-                                const USHORT  nCount );
-    void		SetStatusFunc( USHORT nNew )	{ nStatusFunc = nNew;	}
-    USHORT		GetStatusFunc() const			{ return nStatusFunc;	}
-    void		SetAutoComplete( BOOL bNew )	{ bAutoComplete = bNew; }
-    BOOL		GetAutoComplete() const			{ return bAutoComplete;	}
-    void		SetDetectiveAuto( BOOL bNew )	{ bDetectiveAuto = bNew; }
-    BOOL		GetDetectiveAuto() const		{ return bDetectiveAuto; }
+    void        SetSynchronizeZoom( sal_Bool bNew ) { bSynchronizeZoom = bNew; }
+    sal_Bool        GetSynchronizeZoom() const      { return bSynchronizeZoom; }
+    sal_uInt16		GetLRUFuncListCount() const		{ return nLRUFuncCount;	}
+    sal_uInt16*		GetLRUFuncList() const			{ return pLRUList;		}
+    void		SetLRUFuncList( const sal_uInt16* pList,
+                                const sal_uInt16  nCount );
+    void		SetStatusFunc( sal_uInt16 nNew )	{ nStatusFunc = nNew;	}
+    sal_uInt16		GetStatusFunc() const			{ return nStatusFunc;	}
+    void		SetAutoComplete( sal_Bool bNew )	{ bAutoComplete = bNew; }
+    sal_Bool		GetAutoComplete() const			{ return bAutoComplete;	}
+    void		SetDetectiveAuto( sal_Bool bNew )	{ bDetectiveAuto = bNew; }
+    sal_Bool		GetDetectiveAuto() const		{ return bDetectiveAuto; }
 
     void		SetTrackContentColor(sal_uInt32 nNew) { nTrackContentColor = nNew; }
     sal_uInt32	GetTrackContentColor() const	 { return nTrackContentColor; }
@@ -75,35 +75,35 @@ public:
     ScLkUpdMode GetLinkMode() const				{ return eLinkMode ;}
     void		SetLinkMode( ScLkUpdMode nSet )	{ 	eLinkMode  = nSet;}
 
-    void		SetDefaultObjectSizeWidth(INT32 nNew)	{ nDefaultObjectSizeWidth = nNew; }
-    INT32		GetDefaultObjectSizeWidth() const		{ return nDefaultObjectSizeWidth; }
-    void		SetDefaultObjectSizeHeight(INT32 nNew)	{ nDefaultObjectSizeHeight = nNew; }
-    INT32		GetDefaultObjectSizeHeight() const		{ return nDefaultObjectSizeHeight; }
+    void		SetDefaultObjectSizeWidth(sal_Int32 nNew)	{ nDefaultObjectSizeWidth = nNew; }
+    sal_Int32		GetDefaultObjectSizeWidth() const		{ return nDefaultObjectSizeWidth; }
+    void		SetDefaultObjectSizeHeight(sal_Int32 nNew)	{ nDefaultObjectSizeHeight = nNew; }
+    sal_Int32		GetDefaultObjectSizeHeight() const		{ return nDefaultObjectSizeHeight; }
 
-    void        SetShowSharedDocumentWarning( BOOL bNew )   { mbShowSharedDocumentWarning = bNew; }
-    BOOL        GetShowSharedDocumentWarning() const        { return mbShowSharedDocumentWarning; }
+    void        SetShowSharedDocumentWarning( sal_Bool bNew )   { mbShowSharedDocumentWarning = bNew; }
+    sal_Bool        GetShowSharedDocumentWarning() const        { return mbShowSharedDocumentWarning; }
 
 
     const ScAppOptions&	operator=	( const ScAppOptions& rOpt );
 
 private:
     FieldUnit	eMetric;
-    USHORT		nLRUFuncCount;
-    USHORT*		pLRUList;
+    sal_uInt16		nLRUFuncCount;
+    sal_uInt16*		pLRUList;
     SvxZoomType eZoomType;
-    USHORT		nZoom;
-    BOOL        bSynchronizeZoom;
-    USHORT		nStatusFunc;
-    BOOL		bAutoComplete;
-    BOOL		bDetectiveAuto;
+    sal_uInt16		nZoom;
+    sal_Bool        bSynchronizeZoom;
+    sal_uInt16		nStatusFunc;
+    sal_Bool		bAutoComplete;
+    sal_Bool		bDetectiveAuto;
     sal_uInt32	nTrackContentColor;
     sal_uInt32	nTrackInsertColor;
     sal_uInt32	nTrackDeleteColor;
     sal_uInt32	nTrackMoveColor;
     ScLkUpdMode eLinkMode;
-    INT32		nDefaultObjectSizeWidth;
-    INT32		nDefaultObjectSizeHeight;
-    BOOL        mbShowSharedDocumentWarning;
+    sal_Int32		nDefaultObjectSizeWidth;
+    sal_Int32		nDefaultObjectSizeHeight;
+    sal_Bool        mbShowSharedDocumentWarning;
 };
 
 
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 51b9c549e..5adbbb563 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -48,17 +48,17 @@ private:
     String          aOptions;
     String          aSourceArea;
     ScRange         aDestArea;
-    BOOL            bAddUndo;
-    BOOL            bInCreate;
-    BOOL            bDoInsert;      // wird fuer das erste Update auf FALSE gesetzt
+    sal_Bool            bAddUndo;
+    sal_Bool            bInCreate;
+    sal_Bool            bDoInsert;      // wird fuer das erste Update auf sal_False gesetzt
 
-    BOOL		FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName );
+    sal_Bool		FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName );
 
 public:
     TYPEINFO();
     ScAreaLink( SfxObjectShell* pShell, const String& rFile,
                     const String& rFilter, const String& rOpt,
-                    const String& rArea, const ScRange& rDest, ULONG nRefresh );
+                    const String& rArea, const ScRange& rDest, sal_uLong nRefresh );
     virtual ~ScAreaLink();
 
     virtual void Closed();
@@ -67,16 +67,16 @@ public:
 
     virtual void    Edit( Window*, const Link& rEndEditHdl );
 
-    BOOL	Refresh( const String& rNewFile, const String& rNewFilter,
-                    const String& rNewArea, ULONG nNewRefresh );
+    sal_Bool	Refresh( const String& rNewFile, const String& rNewFilter,
+                    const String& rNewArea, sal_uLong nNewRefresh );
 
-    void	SetInCreate(BOOL bSet)					{ bInCreate = bSet; }
-    void	SetDoInsert(BOOL bSet)					{ bDoInsert = bSet; }
+    void	SetInCreate(sal_Bool bSet)					{ bInCreate = bSet; }
+    void	SetDoInsert(sal_Bool bSet)					{ bDoInsert = bSet; }
     void	SetDestArea(const ScRange& rNew);
     void	SetSource(const String& rDoc, const String& rFlt, const String& rOpt,
                         const String& rArea);
 
-    BOOL	IsEqual( const String& rFile, const String& rFilter, const String& rOpt,
+    sal_Bool	IsEqual( const String& rFile, const String& rFilter, const String& rOpt,
                         const String& rSource, const ScRange& rDest ) const;
 
     const String&	GetFile() const			{ return aFileName;		}
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 2ce3729cc..a9dbe13e7 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -52,12 +52,12 @@ class SvxBoxInfoItem;
 
 struct ScLineFlags
 {
-    BYTE	nLeft;
-    BYTE	nRight;
-    BYTE	nTop;
-    BYTE	nBottom;
-    BYTE	nHori;
-    BYTE	nVert;
+    sal_uInt8	nLeft;
+    sal_uInt8	nRight;
+    sal_uInt8	nTop;
+    sal_uInt8	nBottom;
+    sal_uInt8	nHori;
+    sal_uInt8	nVert;
 
     ScLineFlags() : nLeft(SC_LINE_EMPTY),nRight(SC_LINE_EMPTY),nTop(SC_LINE_EMPTY),
                     nBottom(SC_LINE_EMPTY),nHori(SC_LINE_EMPTY),nVert(SC_LINE_EMPTY) {}
@@ -94,13 +94,13 @@ friend class ScDocument;				// fuer FillInfo
 friend class ScDocumentIterator;
 friend class ScAttrIterator;
 friend class ScHorizontalAttrIterator;
-friend void lcl_IterGetNumberFormat( ULONG& nFormat,
+friend void lcl_IterGetNumberFormat( sal_uLong& nFormat,
         const ScAttrArray*& rpArr, SCROW& nAttrEndRow,
         const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc );
 
-    BOOL	ApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
+    sal_Bool	ApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
                             SCROW nStartRow, SCROW nEndRow,
-                            BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom );
+                            sal_Bool bLeft, SCCOL nDistRight, sal_Bool bTop, SCROW nDistBottom );
 
 public:
             ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc );
@@ -111,79 +111,79 @@ public:
 #ifdef DBG_UTIL
     void	TestData() const;
 #endif
-    void	Reset( const ScPatternAttr* pPattern, BOOL bAlloc = TRUE );
-    BOOL	Concat(SCSIZE nPos);
+    void	Reset( const ScPatternAttr* pPattern, sal_Bool bAlloc = sal_True );
+    sal_Bool	Concat(SCSIZE nPos);
 
     const ScPatternAttr* GetPattern( SCROW nRow ) const;
     const ScPatternAttr* GetPatternRange( SCROW& rStartRow, SCROW& rEndRow, SCROW nRow ) const;
-    void	MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, BOOL bDeep ) const;
+    void	MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, sal_Bool bDeep ) const;
 
     void	MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags,
-                            SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const;
+                            SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight ) const;
     void	ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
-                            SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight );
+                            SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight );
 
-    void	SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE );
-    void	SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE);
+    void	SetPattern( SCROW nRow, const ScPatternAttr* pPattern, sal_Bool bPutToPool = sal_False );
+    void	SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, sal_Bool bPutToPool = sal_False);
     void	ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle );
     void	ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache );
     void	ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
-                                const SvxBorderLine* pLine, BOOL bColorOnly );
+                                const SvxBorderLine* pLine, sal_Bool bColorOnly );
 
-    void	ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich );
-    void	ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement );
+    void	ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich );
+    void	ChangeIndent( SCROW nStartRow, SCROW nEndRow, sal_Bool bIncrement );
 
             /// Including current, may return -1
-    SCsROW	GetNextUnprotected( SCsROW nRow, BOOL bUp ) const;
+    SCsROW	GetNextUnprotected( SCsROW nRow, sal_Bool bUp ) const;
 
             /// May return -1 if not found
     SCsROW	SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
-                            BOOL bUp, ScMarkArray* pMarkArray = NULL );
-    BOOL	SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
-                            BOOL bUp, ScMarkArray* pMarkArray = NULL );
+                            sal_Bool bUp, ScMarkArray* pMarkArray = NULL );
+    sal_Bool	SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
+                            sal_Bool bUp, ScMarkArray* pMarkArray = NULL );
 
-    BOOL	ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags );
-    BOOL	RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags );
+    sal_Bool	ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
+    sal_Bool	RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
 
-    BOOL 	Search( SCROW nRow, SCSIZE& nIndex ) const;
+    sal_Bool 	Search( SCROW nRow, SCSIZE& nIndex ) const;
 
-    BOOL	HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
-                        BOOL bLeft, BOOL bRight ) const;
-    bool    HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const;
-    BOOL	ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
+    sal_Bool	HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
+                        sal_Bool bLeft, sal_Bool bRight ) const;
+    bool    HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
+    sal_Bool	ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
                                 SCCOL& rPaintCol, SCROW& rPaintRow,
-                                BOOL bRefresh, BOOL bAttrs );
-    BOOL	RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow );
+                                sal_Bool bRefresh, sal_Bool bAttrs );
+    sal_Bool	RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow );
 
     void	FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
-    BOOL	IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
+    sal_Bool	IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const;
 
     void	DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow);
     void	SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
-                                    const ScPatternAttr* pWantedPattern, BOOL bDefault );
+                                    const ScPatternAttr* pWantedPattern, sal_Bool bDefault );
     void	CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray );
 
-    BOOL	IsEmpty() const;
+    sal_Bool	IsEmpty() const;
 
 //UNUSED2008-05  SCROW	GetFirstEntryPos() const;
-//UNUSED2008-05  SCROW	GetLastEntryPos( BOOL bIncludeBottom ) const;
+//UNUSED2008-05  SCROW	GetLastEntryPos( sal_Bool bIncludeBottom ) const;
 
-    BOOL    GetFirstVisibleAttr( SCROW& rFirstRow ) const;
-    BOOL    GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const;
-    BOOL	HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
-    BOOL	IsVisibleEqual( const ScAttrArray& rOther,
+    sal_Bool    GetFirstVisibleAttr( SCROW& rFirstRow ) const;
+    sal_Bool    GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const;
+    sal_Bool	HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
+    sal_Bool	IsVisibleEqual( const ScAttrArray& rOther,
                             SCROW nStartRow, SCROW nEndRow ) const;
-    BOOL	IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const;
+    sal_Bool	IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const;
 
-    BOOL	TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
-    BOOL	TestInsertRow( SCSIZE nSize ) const;
+    sal_Bool	TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
+    sal_Bool	TestInsertRow( SCSIZE nSize ) const;
     void	InsertRow( SCROW nStartRow, SCSIZE nSize );
     void	DeleteRow( SCROW nStartRow, SCSIZE nSize );
     void	DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex );
     void	DeleteArea( SCROW nStartRow, SCROW nEndRow );
     void	MoveTo( SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray );
     void	CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray,
-                        INT16 nStripFlags = 0 );
+                        sal_Int16 nStripFlags = 0 );
 
     void	DeleteHardAttr( SCROW nStartRow, SCROW nEndRow );
 
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index c42d31bef..5fcfde5fb 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -54,7 +54,7 @@
 class EditTextObject;
 class SvxBorderLine;
 
-BOOL SC_DLLPUBLIC ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther );
+sal_Bool SC_DLLPUBLIC ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther );
 
 //------------------------------------------------------------------------
 
@@ -73,12 +73,12 @@ public:
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVer ) const;
 
             SCsCOL          GetColMerge() const {return nColMerge; }
             SCsROW          GetRowMerge() const {return nRowMerge; }
 
-            BOOL			IsMerged() const { return nColMerge>1 || nRowMerge>1; }
+            sal_Bool			IsMerged() const { return nColMerge>1 || nRowMerge>1; }
 
     inline  ScMergeAttr& operator=(const ScMergeAttr& rMerge)
             {
@@ -94,34 +94,34 @@ class SC_DLLPUBLIC ScMergeFlagAttr: public SfxInt16Item
 {
 public:
             ScMergeFlagAttr();
-            ScMergeFlagAttr(INT16 nFlags);
+            ScMergeFlagAttr(sal_Int16 nFlags);
             ~ScMergeFlagAttr();
 
-    BOOL	IsHorOverlapped() const		{ return ( GetValue() & SC_MF_HOR ) != 0;  }
-    BOOL	IsVerOverlapped() const		{ return ( GetValue() & SC_MF_VER ) != 0;  }
-    BOOL	IsOverlapped() const		{ return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; }
+    sal_Bool	IsHorOverlapped() const		{ return ( GetValue() & SC_MF_HOR ) != 0;  }
+    sal_Bool	IsVerOverlapped() const		{ return ( GetValue() & SC_MF_VER ) != 0;  }
+    sal_Bool	IsOverlapped() const		{ return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; }
 
-    BOOL	HasAutoFilter() const		{ return ( GetValue() & SC_MF_AUTO ) != 0; }
-    BOOL	HasButton() const			{ return ( GetValue() & SC_MF_BUTTON ) != 0; }
+    sal_Bool	HasAutoFilter() const		{ return ( GetValue() & SC_MF_AUTO ) != 0; }
+    sal_Bool	HasButton() const			{ return ( GetValue() & SC_MF_BUTTON ) != 0; }
     bool    HasDPTable() const          { return ( GetValue() & SC_MF_DP_TABLE ) != 0; }
 
-    BOOL	IsScenario() const			{ return ( GetValue() & SC_MF_SCENARIO ) != 0; }
+    sal_Bool	IsScenario() const			{ return ( GetValue() & SC_MF_SCENARIO ) != 0; }
 };
 
 //------------------------------------------------------------------------
 class SC_DLLPUBLIC ScProtectionAttr: public SfxPoolItem
 {
-    BOOL        bProtection;    // Zelle schuetzen
-    BOOL        bHideFormula;   // Formel nicht Anzeigen
-    BOOL        bHideCell;      // Zelle nicht Anzeigen
-    BOOL        bHidePrint;     // Zelle nicht Ausdrucken
+    sal_Bool        bProtection;    // Zelle schuetzen
+    sal_Bool        bHideFormula;   // Formel nicht Anzeigen
+    sal_Bool        bHideCell;      // Zelle nicht Anzeigen
+    sal_Bool        bHidePrint;     // Zelle nicht Ausdrucken
 public:
                             TYPEINFO();
                             ScProtectionAttr();
-                            ScProtectionAttr(   BOOL bProtect,
-                                                BOOL bHFormula = FALSE,
-                                                BOOL bHCell = FALSE,
-                                                BOOL bHPrint = FALSE);
+                            ScProtectionAttr(   sal_Bool bProtect,
+                                                sal_Bool bHFormula = sal_False,
+                                                sal_Bool bHCell = sal_False,
+                                                sal_Bool bHPrint = sal_False);
                             ScProtectionAttr( const ScProtectionAttr& );
                             ~ScProtectionAttr();
 
@@ -135,19 +135,19 @@ public:
 
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
-
-    virtual	BOOL			QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	BOOL			PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
-            BOOL            GetProtection() const { return bProtection; }
-            BOOL            SetProtection( BOOL bProtect);
-            BOOL            GetHideFormula() const { return bHideFormula; }
-            BOOL            SetHideFormula( BOOL bHFormula);
-            BOOL            GetHideCell() const { return bHideCell; }
-            BOOL            SetHideCell( BOOL bHCell);
-            BOOL            GetHidePrint() const { return bHidePrint; }
-            BOOL            SetHidePrint( BOOL bHPrint);
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVer ) const;
+
+    virtual	sal_Bool			QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	sal_Bool			PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+            sal_Bool            GetProtection() const { return bProtection; }
+            sal_Bool            SetProtection( sal_Bool bProtect);
+            sal_Bool            GetHideFormula() const { return bHideFormula; }
+            sal_Bool            SetHideFormula( sal_Bool bHFormula);
+            sal_Bool            GetHideCell() const { return bHideCell; }
+            sal_Bool            SetHideCell( sal_Bool bHCell);
+            sal_Bool            GetHidePrint() const { return bHidePrint; }
+            sal_Bool            SetHidePrint( sal_Bool bHPrint);
     inline  ScProtectionAttr& operator=(const ScProtectionAttr& rProtection)
             {
                 bProtection = rProtection.bProtection;
@@ -171,10 +171,10 @@ class ScRangeItem : public SfxPoolItem
 public:
             TYPEINFO();
 
-            inline	ScRangeItem( const USHORT nWhich );
-            inline	ScRangeItem( const USHORT   nWhich,
+            inline	ScRangeItem( const sal_uInt16 nWhich );
+            inline	ScRangeItem( const sal_uInt16   nWhich,
                                  const ScRange& rRange,
-                                 const USHORT 	nNewFlags = 0 );
+                                 const sal_uInt16 	nNewFlags = 0 );
             inline	ScRangeItem( const ScRangeItem& rCpy );
 
     inline ScRangeItem& operator=( const ScRangeItem &rCpy );
@@ -191,22 +191,22 @@ public:
     const ScRange&	GetRange() const 				{ return aRange;  }
     void			SetRange( const ScRange& rNew )	{ aRange = rNew; }
 
-    USHORT			GetFlags() const 				{ return nFlags;  }
-    void			SetFlags( USHORT nNew )	 		{ nFlags = nNew; }
+    sal_uInt16			GetFlags() const 				{ return nFlags;  }
+    void			SetFlags( sal_uInt16 nNew )	 		{ nFlags = nNew; }
 
 private:
     ScRange aRange;
-    USHORT	nFlags;
+    sal_uInt16	nFlags;
 };
 
-inline ScRangeItem::ScRangeItem( const USHORT nWhichP )
+inline ScRangeItem::ScRangeItem( const sal_uInt16 nWhichP )
     :   SfxPoolItem( nWhichP ), nFlags( SCR_INVALID ) // == ungueltige Area
 {
 }
 
-inline ScRangeItem::ScRangeItem( const USHORT   nWhichP,
+inline ScRangeItem::ScRangeItem( const sal_uInt16   nWhichP,
                                  const ScRange& rRange,
-                                 const USHORT	nNew )
+                                 const sal_uInt16	nNew )
     : SfxPoolItem( nWhichP ), aRange( rRange ), nFlags( nNew )
 {
 }
@@ -229,9 +229,9 @@ class ScTableListItem : public SfxPoolItem
 public:
     TYPEINFO();
 
-    inline	ScTableListItem( const USHORT nWhich );
+    inline	ScTableListItem( const sal_uInt16 nWhich );
             ScTableListItem( const ScTableListItem& rCpy );
-//UNUSED2008-05  ScTableListItem( const USHORT nWhich, const List& rList );
+//UNUSED2008-05  ScTableListItem( const sal_uInt16 nWhich, const List& rList );
             ~ScTableListItem();
 
     ScTableListItem& operator=( const ScTableListItem &rCpy );
@@ -245,15 +245,15 @@ public:
                                                  const IntlWrapper* pIntl = 0 ) const;
     virtual SfxPoolItem*		Clone( SfxItemPool *pPool = 0 ) const;
 
-//UNUSED2009-05 BOOL	GetTableList( List& aList ) const;
+//UNUSED2009-05 sal_Bool	GetTableList( List& aList ) const;
 //UNUSED2009-05 void	SetTableList( const List& aList );
 
 public:
-    USHORT  nCount;
+    sal_uInt16  nCount;
     SCTAB*  pTabArr;
 };
 
-inline ScTableListItem::ScTableListItem( const USHORT nWhichP )
+inline ScTableListItem::ScTableListItem( const sal_uInt16 nWhichP )
     : SfxPoolItem(nWhichP), nCount(0), pTabArr(NULL)
 {}
 
@@ -272,7 +272,7 @@ class SC_DLLPUBLIC ScPageHFItem : public SfxPoolItem
 
 public:
                 TYPEINFO();
-                ScPageHFItem( USHORT nWhich );
+                ScPageHFItem( sal_uInt16 nWhich );
                 ScPageHFItem( const ScPageHFItem& rItem );
                 ~ScPageHFItem();
 
@@ -280,10 +280,10 @@ public:
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVer ) const;
 
-    virtual	BOOL			QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-    virtual	BOOL			PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual	sal_Bool			QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual	sal_Bool			PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 
     const EditTextObject* GetLeftArea() const		{ return pLeftArea; }
     const EditTextObject* GetCenterArea() const		{ return pCenterArea; }
@@ -306,15 +306,15 @@ class SC_DLLPUBLIC ScViewObjectModeItem: public SfxEnumItem
 public:
                 TYPEINFO();
 
-                ScViewObjectModeItem( USHORT nWhich );
-                ScViewObjectModeItem( USHORT nWhich, ScVObjMode eMode );
+                ScViewObjectModeItem( sal_uInt16 nWhich );
+                ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode );
                 ~ScViewObjectModeItem();
 
-    virtual USHORT				GetValueCount() const;
-    virtual String				GetValueText( USHORT nVal ) const;
+    virtual sal_uInt16				GetValueCount() const;
+    virtual String				GetValueText( sal_uInt16 nVal ) const;
     virtual SfxPoolItem*		Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*		Create(SvStream &, USHORT) const;
-    virtual USHORT				GetVersion( USHORT nFileVersion ) const;
+    virtual SfxPoolItem*		Create(SvStream &, sal_uInt16) const;
+    virtual sal_uInt16				GetVersion( sal_uInt16 nFileVersion ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                                  SfxMapUnit eCoreMetric,
                                                  SfxMapUnit ePresMetric,
@@ -329,7 +329,7 @@ class ScDoubleItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScDoubleItem( USHORT nWhich, double nVal=0 );
+                ScDoubleItem( sal_uInt16 nWhich, double nVal=0 );
                 ScDoubleItem( const ScDoubleItem& rItem );
                 ~ScDoubleItem();
 
@@ -337,7 +337,7 @@ public:
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual SfxPoolItem*    Create( SvStream& rStream, USHORT nVer ) const;
+    virtual SfxPoolItem*    Create( SvStream& rStream, sal_uInt16 nVer ) const;
 
     double GetValue() const		{ return nValue; }
 
@@ -351,9 +351,9 @@ private:
 // ============================================================================
 
 /** Member ID for "page scale to width" value in QueryValue() and PutValue(). */
-const BYTE SC_MID_PAGE_SCALETO_WIDTH    = 1;
+const sal_uInt8 SC_MID_PAGE_SCALETO_WIDTH    = 1;
 /** Member ID for "page scale to height" value in QueryValue() and PutValue(). */
-const BYTE SC_MID_PAGE_SCALETO_HEIGHT   = 2;
+const sal_uInt8 SC_MID_PAGE_SCALETO_HEIGHT   = 2;
 
 
 /** Contains the "scale to width/height" attribute in page styles. */
@@ -388,8 +388,8 @@ public:
                                     XubString& rText,
                                     const IntlWrapper* = 0 ) const;
 
-    virtual BOOL                QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 ) const;
-    virtual BOOL                PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 );
+    virtual sal_Bool                QueryValue( ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const;
+    virtual sal_Bool                PutValue( const ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 );
 
 private:
     sal_uInt16                  mnWidth;
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 1fce4cbe3..bc17112e1 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -187,11 +187,11 @@ public:
     void    SetRotateAngle( const SfxInt32Item& rRotateAngle )      { aRotateAngle.SetValue( rRotateAngle.GetValue() ); }
     void    SetRotateMode( const SvxRotateModeItem& rRotateMode )   { aRotateMode.SetValue( rRotateMode.GetValue() ); }
 
-    BOOL                        Load( SvStream& rStream, const ScAfVersions& rVersions, USHORT nVer );
-    BOOL                        Save( SvStream& rStream );
+    sal_Bool                        Load( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 nVer );
+    sal_Bool                        Save( SvStream& rStream );
 
 #ifdef READ_OLDVERS
-    BOOL                        LoadOld( SvStream& rStream, const ScAfVersions& rVersions );
+    sal_Bool                        LoadOld( SvStream& rStream, const ScAfVersions& rVersions );
 #endif
 };
 
@@ -200,21 +200,21 @@ class SC_DLLPUBLIC ScAutoFormatData : public ScDataObject
 {
 private:
     String                      aName;
-    USHORT                      nStrResId;
+    sal_uInt16                      nStrResId;
     // common flags of Calc and Writer
-    BOOL                        bIncludeFont : 1;
-    BOOL                        bIncludeJustify : 1;
-    BOOL                        bIncludeFrame : 1;
-    BOOL                        bIncludeBackground : 1;
+    sal_Bool                        bIncludeFont : 1;
+    sal_Bool                        bIncludeJustify : 1;
+    sal_Bool                        bIncludeFrame : 1;
+    sal_Bool                        bIncludeBackground : 1;
 
     // Calc specific flags
-    BOOL                        bIncludeValueFormat : 1;
-    BOOL                        bIncludeWidthHeight : 1;
+    sal_Bool                        bIncludeValueFormat : 1;
+    sal_Bool                        bIncludeWidthHeight : 1;
 
     ScAutoFormatDataField**     ppDataField;
 
-    SC_DLLPRIVATE ScAutoFormatDataField&       GetField( USHORT nIndex );
-    SC_DLLPRIVATE const ScAutoFormatDataField& GetField( USHORT nIndex ) const;
+    SC_DLLPRIVATE ScAutoFormatDataField&       GetField( sal_uInt16 nIndex );
+    SC_DLLPRIVATE const ScAutoFormatDataField& GetField( sal_uInt16 nIndex ) const;
 
 public:
                     ScAutoFormatData();
@@ -226,56 +226,56 @@ public:
     void            SetName( const String& rName )              { aName = rName; nStrResId = USHRT_MAX; }
     void            GetName( String& rName ) const              { rName = aName; }
 
-    BOOL            GetIncludeValueFormat() const               { return bIncludeValueFormat; }
-    BOOL            GetIncludeFont() const                      { return bIncludeFont; }
-    BOOL            GetIncludeJustify() const                   { return bIncludeJustify; }
-    BOOL            GetIncludeFrame() const                     { return bIncludeFrame; }
-    BOOL            GetIncludeBackground() const                { return bIncludeBackground; }
-    BOOL            GetIncludeWidthHeight() const               { return bIncludeWidthHeight; }
+    sal_Bool            GetIncludeValueFormat() const               { return bIncludeValueFormat; }
+    sal_Bool            GetIncludeFont() const                      { return bIncludeFont; }
+    sal_Bool            GetIncludeJustify() const                   { return bIncludeJustify; }
+    sal_Bool            GetIncludeFrame() const                     { return bIncludeFrame; }
+    sal_Bool            GetIncludeBackground() const                { return bIncludeBackground; }
+    sal_Bool            GetIncludeWidthHeight() const               { return bIncludeWidthHeight; }
 
-    void            SetIncludeValueFormat( BOOL bValueFormat )  { bIncludeValueFormat = bValueFormat; }
-    void            SetIncludeFont( BOOL bFont )                { bIncludeFont = bFont; }
-    void            SetIncludeJustify( BOOL bJustify )          { bIncludeJustify = bJustify; }
-    void            SetIncludeFrame( BOOL bFrame )              { bIncludeFrame = bFrame; }
-    void            SetIncludeBackground( BOOL bBackground )    { bIncludeBackground = bBackground; }
-    void            SetIncludeWidthHeight( BOOL bWidthHeight )  { bIncludeWidthHeight = bWidthHeight; }
+    void            SetIncludeValueFormat( sal_Bool bValueFormat )  { bIncludeValueFormat = bValueFormat; }
+    void            SetIncludeFont( sal_Bool bFont )                { bIncludeFont = bFont; }
+    void            SetIncludeJustify( sal_Bool bJustify )          { bIncludeJustify = bJustify; }
+    void            SetIncludeFrame( sal_Bool bFrame )              { bIncludeFrame = bFrame; }
+    void            SetIncludeBackground( sal_Bool bBackground )    { bIncludeBackground = bBackground; }
+    void            SetIncludeWidthHeight( sal_Bool bWidthHeight )  { bIncludeWidthHeight = bWidthHeight; }
 
-    const SfxPoolItem*          GetItem( USHORT nIndex, USHORT nWhich ) const;
-    void                        PutItem( USHORT nIndex, const SfxPoolItem& rItem );
-    void                        CopyItem( USHORT nToIndex, USHORT nFromIndex, USHORT nWhich );
+    const SfxPoolItem*          GetItem( sal_uInt16 nIndex, sal_uInt16 nWhich ) const;
+    void                        PutItem( sal_uInt16 nIndex, const SfxPoolItem& rItem );
+    void                        CopyItem( sal_uInt16 nToIndex, sal_uInt16 nFromIndex, sal_uInt16 nWhich );
 
-    const ScNumFormatAbbrev&    GetNumFormat( USHORT nIndex ) const;
+    const ScNumFormatAbbrev&    GetNumFormat( sal_uInt16 nIndex ) const;
 
-    BOOL                        IsEqualData( USHORT nIndex1, USHORT nIndex2 ) const;
+    sal_Bool                        IsEqualData( sal_uInt16 nIndex1, sal_uInt16 nIndex2 ) const;
 
-    void                        FillToItemSet( USHORT nIndex, SfxItemSet& rItemSet, ScDocument& rDoc ) const;
-    void                        GetFromItemSet( USHORT nIndex, const SfxItemSet& rItemSet, const ScNumFormatAbbrev& rNumFormat );
+    void                        FillToItemSet( sal_uInt16 nIndex, SfxItemSet& rItemSet, ScDocument& rDoc ) const;
+    void                        GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rItemSet, const ScNumFormatAbbrev& rNumFormat );
 
-    BOOL                        Load( SvStream& rStream, const ScAfVersions& rVersions );
-    BOOL                        Save( SvStream& rStream );
+    sal_Bool                        Load( SvStream& rStream, const ScAfVersions& rVersions );
+    sal_Bool                        Save( SvStream& rStream );
 
 #ifdef READ_OLDVERS
-    BOOL                        LoadOld( SvStream& rStream, const ScAfVersions& rVersions );
+    sal_Bool                        LoadOld( SvStream& rStream, const ScAfVersions& rVersions );
 #endif
 };
 
 class SC_DLLPUBLIC ScAutoFormat : public ScSortedCollection
 {
 private:
-    BOOL                        bSaveLater;
+    sal_Bool                        bSaveLater;
 
 public:
-                                ScAutoFormat( USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE );
+                                ScAutoFormat( sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False );
                                 ScAutoFormat( const ScAutoFormat& AutoFormat );
     virtual                     ~ScAutoFormat();
     virtual                     ScDataObject*         Clone() const { return new ScAutoFormat( *this ); }
-                                ScAutoFormatData*   operator[]( const USHORT nIndex ) const {return (ScAutoFormatData*)At( nIndex );}
+                                ScAutoFormatData*   operator[]( const sal_uInt16 nIndex ) const {return (ScAutoFormatData*)At( nIndex );}
     virtual short               Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const;
-    BOOL                        Load();
-    BOOL                        Save();
-    USHORT                      FindIndexPerName( const String& rName ) const;
-    void                        SetSaveLater( BOOL bSet );
-    BOOL                        IsSaveLater() const         { return bSaveLater; }
+    sal_Bool                        Load();
+    sal_Bool                        Save();
+    sal_uInt16                      FindIndexPerName( const String& rName ) const;
+    void                        SetSaveLater( sal_Bool bSet );
+    sal_Bool                        IsSaveLater() const         { return bSaveLater; }
 };
 
 
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index d45840723..ffe14b9ec 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -33,43 +33,43 @@
 #include "document.hxx"
 
 
-static const INT32 nInt32Min = 0x80000000;
-static const INT32 nInt32Max = 0x7fffffff;
+static const sal_Int32 nInt32Min = 0x80000000;
+static const sal_Int32 nInt32Max = 0x7fffffff;
 
 
 class ScBigAddress
 {
-    INT32	nRow;
-    INT32	nCol;
-    INT32	nTab;
+    sal_Int32	nRow;
+    sal_Int32	nCol;
+    sal_Int32	nTab;
 
 public:
             ScBigAddress() : nRow(0), nCol(0), nTab(0) {}
-            ScBigAddress( INT32 nColP, INT32 nRowP, INT32 nTabP )
+            ScBigAddress( sal_Int32 nColP, sal_Int32 nRowP, sal_Int32 nTabP )
                 : nRow( nRowP ), nCol( nColP ), nTab( nTabP ) {}
             ScBigAddress( const ScBigAddress& r )
                 : nRow( r.nRow ), nCol( r.nCol ), nTab( r.nTab ) {}
             ScBigAddress( const ScAddress& r )
                 : nRow( r.Row() ), nCol( r.Col() ), nTab( r.Tab() ) {}
 
-    INT32	Col() const { return nCol; }
-    INT32	Row() const { return nRow; }
-    INT32	Tab() const { return nTab; }
+    sal_Int32	Col() const { return nCol; }
+    sal_Int32	Row() const { return nRow; }
+    sal_Int32	Tab() const { return nTab; }
 
-    void	Set( INT32 nColP, INT32 nRowP, INT32 nTabP )
+    void	Set( sal_Int32 nColP, sal_Int32 nRowP, sal_Int32 nTabP )
                 { nCol = nColP; nRow = nRowP; nTab = nTabP; }
-    void	SetCol( INT32 nColP ) { nCol = nColP; }
-    void	SetRow( INT32 nRowP ) { nRow = nRowP; }
-    void	SetTab( INT32 nTabP ) { nTab = nTabP; }
-    void	IncCol( INT32 n = 1 ) { nCol += n; }
-    void	IncRow( INT32 n = 1 ) { nRow += n; }
-    void	IncTab( INT32 n = 1 ) { nTab += n; }
-
-    void	GetVars( INT32& nColP, INT32& nRowP, INT32& nTabP ) const
+    void	SetCol( sal_Int32 nColP ) { nCol = nColP; }
+    void	SetRow( sal_Int32 nRowP ) { nRow = nRowP; }
+    void	SetTab( sal_Int32 nTabP ) { nTab = nTabP; }
+    void	IncCol( sal_Int32 n = 1 ) { nCol += n; }
+    void	IncRow( sal_Int32 n = 1 ) { nRow += n; }
+    void	IncTab( sal_Int32 n = 1 ) { nTab += n; }
+
+    void	GetVars( sal_Int32& nColP, sal_Int32& nRowP, sal_Int32& nTabP ) const
                 { nColP = nCol; nRowP = nRow; nTabP = nTab; }
 
     inline void		PutInOrder( ScBigAddress& r );
-    inline BOOL		IsValid( const ScDocument* ) const;
+    inline sal_Bool		IsValid( const ScDocument* ) const;
     inline ScAddress	MakeAddress() const;
 
     ScBigAddress&	operator=( const ScBigAddress& r )
@@ -88,7 +88,7 @@ public:
 
 inline void ScBigAddress::PutInOrder( ScBigAddress& r )
 {
-    INT32 nTmp;
+    sal_Int32 nTmp;
     if ( r.nCol < nCol )
     {
         nTmp = r.nCol;
@@ -110,7 +110,7 @@ inline void ScBigAddress::PutInOrder( ScBigAddress& r )
 }
 
 
-inline BOOL ScBigAddress::IsValid( const ScDocument* pDoc ) const
+inline sal_Bool ScBigAddress::IsValid( const ScDocument* pDoc ) const
 {	//! Min/Max sind ok, kennzeichnen ganze Col/Row/Tab
     return
         ((0 <= nCol && nCol <= MAXCOL)
@@ -186,32 +186,32 @@ public:
                         : aStart( r ), aEnd( r ) {}
                     ScBigRange( const ScAddress& r )
                         : aStart( r ), aEnd( r ) {}
-                    ScBigRange( INT32 nCol, INT32 nRow, INT32 nTab )
+                    ScBigRange( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nTab )
                         : aStart( nCol, nRow, nTab ), aEnd( aStart ) {}
-                    ScBigRange( INT32 nCol1, INT32 nRow1, INT32 nTab1,
-                            INT32 nCol2, INT32 nRow2, INT32 nTab2 )
+                    ScBigRange( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nTab1,
+                            sal_Int32 nCol2, sal_Int32 nRow2, sal_Int32 nTab2 )
                         : aStart( nCol1, nRow1, nTab1 ),
                         aEnd( nCol2, nRow2, nTab2 ) {}
 
-    void	Set( INT32 nCol1, INT32 nRow1, INT32 nTab1,
-                     INT32 nCol2, INT32 nRow2, INT32 nTab2 )
+    void	Set( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nTab1,
+                     sal_Int32 nCol2, sal_Int32 nRow2, sal_Int32 nTab2 )
                 { aStart.Set( nCol1, nRow1, nTab1 );
                     aEnd.Set( nCol2, nRow2, nTab2 ); }
 
-    void	GetVars( INT32& nCol1, INT32& nRow1, INT32& nTab1,
-                     INT32& nCol2, INT32& nRow2, INT32& nTab2 ) const
+    void	GetVars( sal_Int32& nCol1, sal_Int32& nRow1, sal_Int32& nTab1,
+                     sal_Int32& nCol2, sal_Int32& nRow2, sal_Int32& nTab2 ) const
                 { aStart.GetVars( nCol1, nRow1, nTab1 );
                     aEnd.GetVars( nCol2, nRow2, nTab2 ); }
 
-    BOOL 	IsValid( const ScDocument* pDoc ) const
+    sal_Bool 	IsValid( const ScDocument* pDoc ) const
                 { return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); }
     inline ScRange	MakeRange() const
                     { return ScRange( aStart.MakeAddress(),
                         aEnd.MakeAddress() ); }
 
-    inline BOOL In( const ScBigAddress& ) const;	// ist Address& in Range?
-    inline BOOL In( const ScBigRange& ) const;		// ist Range& in Range?
-    inline BOOL Intersects( const ScBigRange& ) const;	// ueberschneiden sich zwei Ranges?
+    inline sal_Bool In( const ScBigAddress& ) const;	// ist Address& in Range?
+    inline sal_Bool In( const ScBigRange& ) const;		// ist Range& in Range?
+    inline sal_Bool Intersects( const ScBigRange& ) const;	// ueberschneiden sich zwei Ranges?
 
     ScBigRange&		operator=( const ScBigRange& r )
                         { aStart = r.aStart; aEnd = r.aEnd; return *this; }
@@ -225,7 +225,7 @@ public:
 };
 
 
-inline BOOL ScBigRange::In( const ScBigAddress& rAddr ) const
+inline sal_Bool ScBigRange::In( const ScBigAddress& rAddr ) const
 {
     return
         aStart.Col() <= rAddr.Col() && rAddr.Col() <= aEnd.Col() &&
@@ -234,7 +234,7 @@ inline BOOL ScBigRange::In( const ScBigAddress& rAddr ) const
 }
 
 
-inline BOOL ScBigRange::In( const ScBigRange& r ) const
+inline sal_Bool ScBigRange::In( const ScBigRange& r ) const
 {
     return
         aStart.Col() <= r.aStart.Col() && r.aEnd.Col() <= aEnd.Col() &&
@@ -243,7 +243,7 @@ inline BOOL ScBigRange::In( const ScBigRange& r ) const
 }
 
 
-inline BOOL ScBigRange::Intersects( const ScBigRange& r ) const
+inline sal_Bool ScBigRange::Intersects( const ScBigRange& r ) const
 {
     return !(
         Min( aEnd.Col(), r.aEnd.Col() ) < Max( aStart.Col(), r.aStart.Col() )
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index 4c49f52b7..0475a8594 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -47,7 +47,7 @@ private:
 
 public:
     TYPEINFO();
-                        ScHint( ULONG n, const ScAddress& a, ScBaseCell* p )
+                        ScHint( sal_uLong n, const ScAddress& a, ScBaseCell* p )
                             : SfxSimpleHint( n ), aAddress( a ), pCell( p ) {}
     ScBaseCell*			GetCell() const { return pCell; }
     void                SetCell( ScBaseCell* p )    { pCell = p; }
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index 6b1dcb69d..3af76fe84 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -64,8 +64,8 @@ friend class FuncCollection;
     const ModuleData* pModuleData;
     String		aInternalName;
     String		aFuncName;
-    USHORT      nNumber;
-    USHORT		nParamCount;
+    sal_uInt16      nNumber;
+    sal_uInt16		nParamCount;
     ParamType	eAsyncType;
     ParamType	eParamType[MAXFUNCPARAM];
 private:
@@ -74,8 +74,8 @@ public:
     FuncData(const ModuleData*pModule,
              const String&    rIName,
              const String&    rFName,
-                   USHORT     nNo,
-                   USHORT     nCount,
+                   sal_uInt16     nNo,
+                   sal_uInt16     nCount,
              const ParamType* peType,
                    ParamType  eType);
     FuncData(const FuncData& rData);
@@ -84,17 +84,17 @@ public:
     const	String&		GetModuleName() const;
     const	String&		GetInternalName() const { return aInternalName; }
     const	String&		GetFuncName() const { return aFuncName; }
-            USHORT		GetParamCount() const { return nParamCount; }
-            ParamType	GetParamType(USHORT nIndex) const { return eParamType[nIndex]; }
+            sal_uInt16		GetParamCount() const { return nParamCount; }
+            ParamType	GetParamType(sal_uInt16 nIndex) const { return eParamType[nIndex]; }
             ParamType	GetReturnType() const { return eParamType[0]; }
             ParamType	GetAsyncType() const { return eAsyncType; }
-            BOOL        Call(void** ppParam);
-            BOOL 		Unadvice(double nHandle);
+            sal_Bool        Call(void** ppParam);
+            sal_Bool 		Unadvice(double nHandle);
 
                         // Name und Beschreibung des Parameters nParam.
                         // nParam==0 => Desc := Funktions-Beschreibung,
                         // Name := n/a
-            BOOL		GetParamDesc( String& aName, String& aDesc, USHORT nParam );
+            sal_Bool		GetParamDesc( String& aName, String& aDesc, sal_uInt16 nParam );
 };
 
 
@@ -102,17 +102,17 @@ public:
 class FuncCollection : public ScSortedCollection
 {
 public:
-    FuncCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : ScSortedCollection ( nLim, nDel, bDup ) {}
+    FuncCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False) : ScSortedCollection ( nLim, nDel, bDup ) {}
     FuncCollection(const FuncCollection& rFuncCollection) : ScSortedCollection ( rFuncCollection ) {}
 
     virtual	ScDataObject*	Clone() const { return new FuncCollection(*this); }
-            FuncData*	operator[]( const USHORT nIndex) const {return (FuncData*)At(nIndex);}
+            FuncData*	operator[]( const sal_uInt16 nIndex) const {return (FuncData*)At(nIndex);}
     virtual	short		Compare(ScDataObject* pKey1, ScDataObject* pKey2) const;
-            BOOL 		SearchFunc( const String& rName, USHORT& rIndex ) const;
+            sal_Bool 		SearchFunc( const String& rName, sal_uInt16& rIndex ) const;
 };
 
 
-BOOL InitExternalFunc(const rtl::OUString& rModuleName);
+sal_Bool InitExternalFunc(const rtl::OUString& rModuleName);
 void ExitExternalFunc();
 
 #endif
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index ac9e84bc8..4ea16ecf3 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -110,11 +110,11 @@ public:
     bool            IsBlank( bool bIgnoreNotes = false ) const;
 
 // fuer Idle-Berechnung
-    inline USHORT   GetTextWidth() const { return nTextWidth; }
-    inline void     SetTextWidth( USHORT nNew ) { nTextWidth = nNew; }
+    inline sal_uInt16   GetTextWidth() const { return nTextWidth; }
+    inline void     SetTextWidth( sal_uInt16 nNew ) { nTextWidth = nNew; }
 
-    inline BYTE     GetScriptType() const { return nScriptType; }
-    inline void     SetScriptType( BYTE nNew ) { nScriptType = nNew; }
+    inline sal_uInt8     GetScriptType() const { return nScriptType; }
+    inline void     SetScriptType( sal_uInt8 nNew ) { nScriptType = nNew; }
 
     /** Returns true, if the cell contains a note. */
     inline bool     HasNote() const { return mpNote != 0; }
@@ -150,15 +150,15 @@ public:
                                     ScAddress aPos = ScAddress() );
 
     /** Error code if ScFormulaCell, else 0. */
-    USHORT          GetErrorCode() const;
+    sal_uInt16          GetErrorCode() const;
     /** ScFormulaCell with formula::svEmptyCell result, or ScNoteCell (may have been
         created due to reference to empty cell). */
-    BOOL			HasEmptyData() const;
-    BOOL			HasValueData() const;
-    BOOL			HasStringData() const;
+    sal_Bool			HasEmptyData() const;
+    sal_Bool			HasValueData() const;
+    sal_Bool			HasStringData() const;
     String			GetStringData() const;			// nur echte Strings
 
-    static BOOL		CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 );
+    static sal_Bool		CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 );
 
 private:
     ScBaseCell&     operator=( const ScBaseCell& );
@@ -168,9 +168,9 @@ private:
     SvtBroadcaster* mpBroadcaster;  /// Broadcaster for changed values. Cell takes ownership!
 
 protected:
-    USHORT          nTextWidth;
-    BYTE            eCellType;      // enum CellType - BYTE spart Speicher
-    BYTE            nScriptType;
+    sal_uInt16          nTextWidth;
+    sal_uInt8            eCellType;      // enum CellType - sal_uInt8 spart Speicher
+    sal_uInt8            nScriptType;
 };
 
 // ============================================================================
@@ -298,19 +298,19 @@ private:
     ScFormulaCell*  pNext;
     ScFormulaCell*  pPreviousTrack;
     ScFormulaCell*  pNextTrack;
-    ULONG           nFormatIndex;       // Number format set by calculation
+    sal_uLong           nFormatIndex;       // Number format set by calculation
     short           nFormatType;        // Number format type set by calculation
-    USHORT          nSeenInIteration;   // Iteration cycle in which the cell was last encountered
-    BYTE            cMatrixFlag;        // One of ScMatrixMode
-    BOOL            bDirty         : 1; // Must be (re)calculated
-    BOOL            bChanged       : 1; // Whether something changed regarding display/representation
-    BOOL            bRunning       : 1; // Already interpreting right now
-    BOOL            bCompile       : 1; // Must be (re)compiled
-    BOOL            bSubTotal      : 1; // Cell is part of or contains a SubTotal
-    BOOL            bIsIterCell    : 1; // Cell is part of a circular reference
-    BOOL            bInChangeTrack : 1; // Cell is in ChangeTrack
-    BOOL            bTableOpDirty  : 1; // Dirty flag for TableOp
-    BOOL            bNeedListening : 1; // Listeners need to be re-established after UpdateReference
+    sal_uInt16          nSeenInIteration;   // Iteration cycle in which the cell was last encountered
+    sal_uInt8            cMatrixFlag;        // One of ScMatrixMode
+    sal_Bool            bDirty         : 1; // Must be (re)calculated
+    sal_Bool            bChanged       : 1; // Whether something changed regarding display/representation
+    sal_Bool            bRunning       : 1; // Already interpreting right now
+    sal_Bool            bCompile       : 1; // Must be (re)compiled
+    sal_Bool            bSubTotal      : 1; // Cell is part of or contains a SubTotal
+    sal_Bool            bIsIterCell    : 1; // Cell is part of a circular reference
+    sal_Bool            bInChangeTrack : 1; // Cell is in ChangeTrack
+    sal_Bool            bTableOpDirty  : 1; // Dirty flag for TableOp
+    sal_Bool            bNeedListening : 1; // Listeners need to be re-established after UpdateReference
 
                     enum ScInterpretTailParameter
                     {
@@ -336,7 +336,7 @@ public:
     /** Empty formula cell, or with a preconstructed token array. */
     ScFormulaCell( ScDocument*, const ScAddress&, const ScTokenArray* = NULL,
                     const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT,
-                    BYTE = MM_NONE );
+                    sal_uInt8 = MM_NONE );
 
     /** With formula string and grammar to compile with.
        formula::FormulaGrammar::GRAM_DEFAULT effectively isformula::FormulaGrammar::GRAM_NATIVE_UI that
@@ -345,7 +345,7 @@ public:
     ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
                     const String& rFormula,
                     const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT,
-                    BYTE cMatInd = MM_NONE );
+                    sal_uInt8 cMatInd = MM_NONE );
 
     ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, const ScAddress& rPos, int nCloneFlags = SC_CLONECELL_DEFAULT );
 
@@ -355,27 +355,27 @@ public:
                                 const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
 
     void			SetDirty();
-    inline void		SetDirtyVar() { bDirty = TRUE; }
+    inline void		SetDirtyVar() { bDirty = sal_True; }
     // If setting entire document dirty after load, no broadcasts but still append to FormulaTree.
     void            SetDirtyAfterLoad();
-    inline void		ResetTableOpDirtyVar() { bTableOpDirty = FALSE; }
+    inline void		ResetTableOpDirtyVar() { bTableOpDirty = sal_False; }
     void			SetTableOpDirty();
-    BOOL			IsDirtyOrInTableOpDirty() const;
-    BOOL			GetDirty() const { return bDirty; }
-    BOOL            NeedsListening() const { return bNeedListening; }
-    void            SetNeedsListening( BOOL bVar ) { bNeedListening = bVar; }
+    sal_Bool			IsDirtyOrInTableOpDirty() const;
+    sal_Bool			GetDirty() const { return bDirty; }
+    sal_Bool            NeedsListening() const { return bNeedListening; }
+    void            SetNeedsListening( sal_Bool bVar ) { bNeedListening = bVar; }
     void			Compile(const String& rFormula,
-                            BOOL bNoListening = FALSE,
+                            sal_Bool bNoListening = sal_False,
                             const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT );
-    void			CompileTokenArray( BOOL bNoListening = FALSE );
+    void			CompileTokenArray( sal_Bool bNoListening = sal_False );
     void			CompileXML( ScProgress& rProgress );		// compile temporary string tokens
     void			CalcAfterLoad();
     bool            MarkUsedExternalReferences();
     void			Interpret();
-    inline BOOL     IsIterCell() const { return bIsIterCell; }
-    inline USHORT   GetSeenInIteration() const { return nSeenInIteration; }
+    inline sal_Bool     IsIterCell() const { return bIsIterCell; }
+    inline sal_uInt16   GetSeenInIteration() const { return nSeenInIteration; }
 
-    BOOL			HasOneReference( ScRange& r ) const;
+    sal_Bool			HasOneReference( ScRange& r ) const;
     /* Checks if the formula contains reference list that can be
        expressed by one reference (like A1;A2;A3:A5 -> A1:A5). The
        reference list is not required to be sorted (i.e. A3;A1;A2 is
@@ -385,8 +385,8 @@ public:
        It is similar to HasOneReference(), but more general.
      */
     bool HasRefListExpressibleAsOneReference(ScRange& rRange) const;
-    BOOL			HasRelNameReference() const;
-    BOOL			HasColRowName() const;
+    sal_Bool			HasRelNameReference() const;
+    sal_Bool			HasColRowName() const;
 
     void			UpdateReference(UpdateRefMode eUpdateRefMode,
                                     const ScRange& r,
@@ -402,42 +402,42 @@ public:
 
     void			UpdateInsertTab(SCTAB nTable);
     void 			UpdateInsertTabAbs(SCTAB nTable);
-    BOOL			UpdateDeleteTab(SCTAB nTable, BOOL bIsMove = FALSE);
+    sal_Bool			UpdateDeleteTab(SCTAB nTable, sal_Bool bIsMove = sal_False);
     void			UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
     void			UpdateRenameTab(SCTAB nTable, const String& rName);
-    BOOL 			TestTabRefAbs(SCTAB nTable);
-    void			UpdateCompile( BOOL bForceIfNameInUse = FALSE );
-    BOOL			IsRangeNameInUse(USHORT nIndex) const;
-    void            FindRangeNamesInUse(std::set<USHORT>& rIndexes) const;
+    sal_Bool 			TestTabRefAbs(SCTAB nTable);
+    void			UpdateCompile( sal_Bool bForceIfNameInUse = sal_False );
+    sal_Bool			IsRangeNameInUse(sal_uInt16 nIndex) const;
+    void            FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const;
     void 			ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap );
-    BOOL			IsSubTotal() const 						{ return bSubTotal; }
-    BOOL			IsChanged() const  						{ return bChanged; }
-    void			ResetChanged()							{ bChanged = FALSE; }
-    BOOL			IsEmpty();      // formula::svEmptyCell result
+    sal_Bool			IsSubTotal() const 						{ return bSubTotal; }
+    sal_Bool			IsChanged() const  						{ return bChanged; }
+    void			ResetChanged()							{ bChanged = sal_False; }
+    sal_Bool			IsEmpty();      // formula::svEmptyCell result
                     // display as empty string if formula::svEmptyCell result
-    BOOL			IsEmptyDisplayedAsString();
-    BOOL			IsValue();      // also TRUE if formula::svEmptyCell
+    sal_Bool			IsEmptyDisplayedAsString();
+    sal_Bool			IsValue();      // also sal_True if formula::svEmptyCell
     double			GetValue();
     double			GetValueAlways();	// ignore errors
     void			GetString( String& rString );
     const ScMatrix* GetMatrix();
-    BOOL			GetMatrixOrigin( ScAddress& rPos ) const;
+    sal_Bool			GetMatrixOrigin( ScAddress& rPos ) const;
     void			GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows );
-    USHORT 			GetMatrixEdge( ScAddress& rOrgPos );
-    USHORT			GetErrCode();   // interpret first if necessary
-    USHORT			GetRawError();  // don't interpret, just return code or result error
+    sal_uInt16 			GetMatrixEdge( ScAddress& rOrgPos );
+    sal_uInt16			GetErrCode();   // interpret first if necessary
+    sal_uInt16			GetRawError();  // don't interpret, just return code or result error
     short			GetFormatType() const   				{ return nFormatType; }
-    ULONG			GetFormatIndex() const					{ return nFormatIndex; }
-    void			GetFormatInfo( short& nType, ULONG& nIndex ) const
+    sal_uLong			GetFormatIndex() const					{ return nFormatIndex; }
+    void			GetFormatInfo( short& nType, sal_uLong& nIndex ) const
                         { nType = nFormatType; nIndex = nFormatIndex; }
-    BYTE			GetMatrixFlag() const   				{ return cMatrixFlag; }
+    sal_uInt8			GetMatrixFlag() const   				{ return cMatrixFlag; }
     ScTokenArray*   GetCode() const                         { return pCode; }
 
-    BOOL			IsRunning() const						{ return bRunning; }
-    void			SetRunning( BOOL bVal )					{ bRunning = bVal; }
+    sal_Bool			IsRunning() const						{ return bRunning; }
+    void			SetRunning( sal_Bool bVal )					{ bRunning = bVal; }
     void 			CompileDBFormula();
-    void 			CompileDBFormula( BOOL bCreateFormulaString );
-    void 			CompileNameFormula( BOOL bCreateFormulaString );
+    void 			CompileDBFormula( sal_Bool bCreateFormulaString );
+    void 			CompileNameFormula( sal_Bool bCreateFormulaString );
     void 			CompileColRowNameFormula();
     ScFormulaCell*	GetPrevious() const					{ return pPrevious; }
     ScFormulaCell*	GetNext() const						{ return pNext; }
@@ -449,19 +449,19 @@ public:
     void			SetNextTrack( ScFormulaCell* pF )		{ pNextTrack = pF; }
 
     virtual void    Notify( SvtBroadcaster& rBC, const SfxHint& rHint);
-    void			SetCompile( BOOL bVal ) { bCompile = bVal; }
+    void			SetCompile( sal_Bool bVal ) { bCompile = bVal; }
     ScDocument*		GetDocument() const		{ return pDocument; }
     void			SetMatColsRows( SCCOL nCols, SCROW nRows );
     void			GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const;
 
                     // ob Zelle im ChangeTrack und nicht im echten Dokument ist
-    void			SetInChangeTrack( BOOL bVal ) { bInChangeTrack = bVal; }
-    BOOL			IsInChangeTrack() const { return bInChangeTrack; }
+    void			SetInChangeTrack( sal_Bool bVal ) { bInChangeTrack = bVal; }
+    sal_Bool			IsInChangeTrack() const { return bInChangeTrack; }
 
                     // Zu Typ und Format das entsprechende Standardformat.
                     // Bei Format "Standard" evtl. das in die Formelzelle
                     // uebernommene Format.
-    ULONG			GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFormat ) const;
+    sal_uLong			GetStandardFormat( SvNumberFormatter& rFormatter, sal_uLong nFormat ) const;
 
     // For import filters!
     void 			AddRecalcMode( formula::ScRecalcMode );
@@ -480,8 +480,8 @@ public:
     void            SetHybridFormula( const String& r,
                                     const formula::FormulaGrammar::Grammar eGrammar )
                         { aResult.SetHybridFormula( r); eTempGrammar = eGrammar; }
-    void			SetErrCode( USHORT n );
-    inline BOOL		IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); }
+    void			SetErrCode( sal_uInt16 n );
+    inline sal_Bool		IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); }
     EditTextObject*		CreateURLObject() ;
     void            GetURLResult( String& rURL, String& rCellText );
 
@@ -497,7 +497,7 @@ private:
     ScAddress aPos;
 public:
                 ScDetectiveRefIter( ScFormulaCell* pCell );
-    BOOL		GetNextRef( ScRange& rRange );
+    sal_Bool		GetNextRef( ScRange& rRange );
 };
 
 // ============================================================================
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index 00da1e91f..94e3010a6 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -48,13 +48,13 @@ enum ScForceTextFmt {
 class SC_DLLPUBLIC ScCellFormat
 {
 public:
-    static void		GetString( ScBaseCell* pCell, ULONG nFormat, String& rString,
+    static void		GetString( ScBaseCell* pCell, sal_uLong nFormat, String& rString,
                                Color** ppColor, SvNumberFormatter& rFormatter,
-                               BOOL bNullVals = TRUE,
-                               BOOL bFormula  = FALSE,
+                               sal_Bool bNullVals = sal_True,
+                               sal_Bool bFormula  = sal_False,
                                ScForceTextFmt eForceTextFmt = ftDontForce );
 
-    static void		GetInputString( ScBaseCell* pCell, ULONG nFormat, String& rString,
+    static void		GetInputString( ScBaseCell* pCell, sal_uLong nFormat, String& rString,
                                       SvNumberFormatter& rFormatter );
 };
 
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 8fbb1179d..bea17dd10 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -188,16 +188,16 @@ private:
     ScMarkData*				pMarkData;
     ScRangeList				aRanges;
     sal_Int64               nObjectId;
-    BOOL					bChartColAsHdr;
-    BOOL					bChartRowAsHdr;
-    BOOL					bCursorOnly;
-    BOOL					bGotDataChangedHint;
+    sal_Bool					bChartColAsHdr;
+    sal_Bool					bChartRowAsHdr;
+    sal_Bool					bCursorOnly;
+    sal_Bool					bGotDataChangedHint;
     XModifyListenerArr_Impl aValueListeners;
 
     DECL_LINK( ValueListenerHdl, SfxHint* );
 
 private:
-    void			PaintRanges_Impl( USHORT nPart );
+    void			PaintRanges_Impl( sal_uInt16 nPart );
     ScRangeListRef	GetLimitedChartRanges_Impl( long nDataColumns, long nDataRows ) const;
     void			ForceChartListener_Impl();
     ScMemChart*     CreateMemChart_Impl() const;
@@ -210,7 +210,7 @@ private:
 
     com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges>
                             QueryDifferences_Impl(const com::sun::star::table::CellAddress& aCompare,
-                                                    BOOL bColumnDiff);
+                                                    sal_Bool bColumnDiff);
     com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
                             Find_Impl(const com::sun::star::uno::Reference<
                                         com::sun::star::util::XSearchDescriptor>& xDesc,
@@ -222,7 +222,7 @@ protected:
     // GetItemPropertyMap for derived classes must contain all entries, including base class
     virtual const SfxItemPropertyMap* GetItemPropertyMap();
     virtual ::com::sun::star::beans::PropertyState GetOnePropertyState(
-                                USHORT nItemWhich, const SfxItemPropertySimpleEntry* pEntry );
+                                sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry );
     virtual void            GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
                                 ::com::sun::star::uno::Any& )
                                 throw(::com::sun::star::uno::RuntimeException);
@@ -258,8 +258,8 @@ public:
     void					SetNewRange(const ScRange& rNew);	// fuer Cursor
     void					SetNewRanges(const ScRangeList& rNew);
 
-    void					SetCursorOnly(BOOL bSet);
-    BOOL					IsCursorOnly() const			{ return bCursorOnly; }
+    void					SetCursorOnly(sal_Bool bSet);
+    sal_Bool					IsCursorOnly() const			{ return bCursorOnly; }
 
                             // XSheetOperation
     virtual double SAL_CALL	computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction )
@@ -833,9 +833,9 @@ private:
     sal_Int16				nActionLockCount;
 
 private:
-    String		GetInputString_Impl(BOOL bEnglish) const;
+    String		GetInputString_Impl(sal_Bool bEnglish) const;
     String		GetOutputString_Impl() const;
-    void		SetString_Impl(const String& rString, BOOL bInterpret, BOOL bEnglish);
+    void		SetString_Impl(const String& rString, sal_Bool bInterpret, sal_Bool bEnglish);
     double		GetValue_Impl() const;
     void		SetValue_Impl(double fValue);
     com::sun::star::table::CellContentType GetResultType_Impl();
@@ -1376,7 +1376,7 @@ private:
     ScRangeList				aRanges;
     ScAddress				aPos;
     ScMarkData*				pMark;
-    BOOL					bAtEnd;
+    sal_Bool					bAtEnd;
 
 private:
     void					Advance_Impl();
@@ -1459,8 +1459,8 @@ private:
     SCTAB					nTab;
     ScAttrRectIterator*		pIter;
     ScRange					aNext;
-    BOOL					bAtEnd;
-    BOOL					bDirty;
+    sal_Bool					bAtEnd;
+    sal_Bool					bDirty;
 
 private:
     void					Advance_Impl();
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index 9eebf18b7..a8d564c13 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -73,7 +73,7 @@ class SC_DLLPUBLIC ScChartArray : public ScDataObject				// nur noch Parameter-S
     String		aName;
     ScDocument*	pDocument;
     ScChartPositioner aPositioner;
-    BOOL		bValid;				// fuer Erzeugung aus SchMemChart
+    sal_Bool		bValid;				// fuer Erzeugung aus SchMemChart
 
 private:
     ScMemChart* CreateMemChartSingle();
@@ -95,14 +95,14 @@ public:
     void	SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); }
     const   ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); }
 
-    void	SetHeaders(BOOL bCol, BOOL bRow) { aPositioner.SetHeaders(bCol, bRow); }
-    BOOL	HasColHeaders() const			 { return aPositioner.HasColHeaders(); }
-    BOOL	HasRowHeaders() const			 { return aPositioner.HasRowHeaders(); }
-    BOOL	IsValid() const					 { return bValid; }
+    void	SetHeaders(sal_Bool bCol, sal_Bool bRow) { aPositioner.SetHeaders(bCol, bRow); }
+    sal_Bool	HasColHeaders() const			 { return aPositioner.HasColHeaders(); }
+    sal_Bool	HasRowHeaders() const			 { return aPositioner.HasRowHeaders(); }
+    sal_Bool	IsValid() const					 { return bValid; }
     void	SetName(const String& rNew)		 { aName = rNew; }
     const String& GetName() const			 { return aName; }
 
-    BOOL	operator==(const ScChartArray& rCmp) const;
+    sal_Bool	operator==(const ScChartArray& rCmp) const;
 
     ScMemChart* CreateMemChart();
 };
@@ -115,10 +115,10 @@ public:
             ScCollection( rColl ) {}
 
     virtual	ScDataObject*	Clone() const;
-    ScChartArray*		operator[](USHORT nIndex) const
+    ScChartArray*		operator[](sal_uInt16 nIndex) const
                         { return (ScChartArray*)At(nIndex); }
 
-    BOOL	operator==(const ScChartCollection& rCmp) const;
+    sal_Bool	operator==(const ScChartCollection& rCmp) const;
 };
 
 
diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx
index d0d45fe97..843eb7d65 100644
--- a/sc/inc/charthelper.hxx
+++ b/sc/inc/charthelper.hxx
@@ -46,8 +46,8 @@ typedef ::std::vector< ScRangeList > ScRangeListVector;
 class ScChartHelper
 {
 public:
-    static USHORT DoUpdateAllCharts( ScDocument* pDoc );
-    static USHORT DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc ); //use this to replace ScDBFunc::DoUpdateCharts in future
+    static sal_uInt16 DoUpdateAllCharts( ScDocument* pDoc );
+    static sal_uInt16 DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc ); //use this to replace ScDBFunc::DoUpdateCharts in future
     static void AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc, ScDocument* pDestDoc, const SCTAB nSrcTab, const SCTAB nDestTab );
     static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartFromSdrObject( SdrObject* pObject );
     static void GetChartRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc,
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index f41321fea..71f3d7453 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -75,9 +75,9 @@ private:
 
     ScChartUnoData*	pUnoData;
     ScDocument* 	pDoc;
-    BOOL			bUsed;	// fuer ScChartListenerCollection::FreeUnused
-    BOOL			bDirty;
-    BOOL			bSeriesRangesScheduled;
+    sal_Bool			bUsed;	// fuer ScChartListenerCollection::FreeUnused
+    sal_Bool			bDirty;
+    sal_Bool			bSeriesRangesScheduled;
 
                     // not implemented
     ScChartListener& operator=( const ScChartListener& );
@@ -98,34 +98,34 @@ public:
     com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >	GetUnoListener() const;
     com::sun::star::uno::Reference< com::sun::star::chart::XChartData >						GetUnoSource() const;
 
-    BOOL			IsUno() const	{ return (pUnoData != NULL); }
+    sal_Bool			IsUno() const	{ return (pUnoData != NULL); }
 
     virtual void 	Notify( SvtBroadcaster& rBC, const SfxHint& rHint );
     void			StartListeningTo();
     void			EndListeningTo();
     void			ChangeListening( const ScRangeListRef& rRangeListRef,
-                                    BOOL bDirty = FALSE );
+                                    sal_Bool bDirty = sal_False );
     void			Update();
     ScRangeListRef	GetRangeList() const;
     void			SetRangeList( const ScRangeListRef& rNew );
     void			SetRangeList( const ScRange& rNew );
-    BOOL			IsUsed() const { return bUsed; }
-    void			SetUsed( BOOL bFlg ) { bUsed = bFlg; }
-    BOOL			IsDirty() const { return bDirty; }
-    void			SetDirty( BOOL bFlg ) { bDirty = bFlg; }
+    sal_Bool			IsUsed() const { return bUsed; }
+    void			SetUsed( sal_Bool bFlg ) { bUsed = bFlg; }
+    sal_Bool			IsDirty() const { return bDirty; }
+    void			SetDirty( sal_Bool bFlg ) { bDirty = bFlg; }
 
     void            UpdateChartIntersecting( const ScRange& rRange );
 
     // if chart series ranges are to be updated later on (e.g. DeleteTab, InsertTab)
-    void			ScheduleSeriesRanges()		{ bSeriesRangesScheduled = TRUE; }
+    void			ScheduleSeriesRanges()		{ bSeriesRangesScheduled = sal_True; }
     void			UpdateScheduledSeriesRanges();
     void			UpdateSeriesRanges();
 
     ExternalRefListener* GetExtRefListener();
     void            SetUpdateQueue();
 
-    BOOL			operator==( const ScChartListener& );
-    BOOL			operator!=( const ScChartListener& r )
+    sal_Bool			operator==( const ScChartListener& );
+    sal_Bool			operator!=( const ScChartListener& r )
                         { return !operator==( r ); }
 };
 
@@ -176,7 +176,7 @@ public:
 
     void			ChangeListening( const String& rName,
                                     const ScRangeListRef& rRangeListRef,
-                                    BOOL bDirty = FALSE );
+                                    sal_Bool bDirty = sal_False );
     // FreeUnused nur wie in ScDocument::UpdateChartListenerCollection verwenden!
     void			FreeUnused();
     void			FreeUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener,
@@ -185,14 +185,14 @@ public:
     void			UpdateDirtyCharts();
     void SC_DLLPUBLIC SetDirty();
     void			SetDiffDirty( const ScChartListenerCollection&,
-                        BOOL bSetChartRangeLists = FALSE );
+                        sal_Bool bSetChartRangeLists = sal_False );
 
     void			SetRangeDirty( const ScRange& rRange );		// z.B. Zeilen/Spalten
 
     void			UpdateScheduledSeriesRanges();
     void            UpdateChartsContainingTab( SCTAB nTab );
 
-    BOOL			operator==( const ScChartListenerCollection& );
+    sal_Bool			operator==( const ScChartListenerCollection& );
 
     /** 
      * Start listening on hide/show change within specified cell range.  A 
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index 44c92a09e..e73252c22 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -44,7 +44,7 @@ class ScChartPositionMap
             ScAddress**			ppData;
             ScAddress**			ppColHeader;
             ScAddress**			ppRowHeader;
-            ULONG				nCount;
+            sal_uLong				nCount;
             SCCOL				nColCount;
             SCROW				nRowCount;
 
@@ -61,17 +61,17 @@ class ScChartPositionMap
 
 public:
 
-            ULONG				GetCount() const { return nCount; }
+            sal_uLong				GetCount() const { return nCount; }
             SCCOL				GetColCount() const { return nColCount; }
             SCROW				GetRowCount() const { return nRowCount; }
 
-            BOOL				IsValid( SCCOL nCol, SCROW nRow ) const
+            sal_Bool				IsValid( SCCOL nCol, SCROW nRow ) const
                                     { return nCol < nColCount && nRow < nRowCount; }
                                 // Daten spaltenweise
-            ULONG				GetIndex( SCCOL nCol, SCROW nRow ) const
-                                    { return (ULONG) nCol * nRowCount + nRow; }
+            sal_uLong				GetIndex( SCCOL nCol, SCROW nRow ) const
+                                    { return (sal_uLong) nCol * nRowCount + nRow; }
 
-            const ScAddress*	GetPosition( ULONG nIndex ) const
+            const ScAddress*	GetPosition( sal_uLong nIndex ) const
                                     {
                                         if ( nIndex < nCount )
                                             return ppData[ nIndex ];
@@ -120,9 +120,9 @@ class ScChartPositioner				// nur noch Parameter-Struct
     ScChartGlue	eGlue;
     SCCOL		nStartCol;
     SCROW		nStartRow;
-    BOOL		bColHeaders;
-    BOOL		bRowHeaders;
-    BOOL		bDummyUpperLeft;
+    sal_Bool		bColHeaders;
+    sal_Bool		bRowHeaders;
+    sal_Bool		bDummyUpperLeft;
 
 private:
     void		CheckColRowHeaders();
@@ -143,15 +143,15 @@ public:
     void	SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; }
     void	SetRangeList( const ScRange& rNew );
 
-    void	SetHeaders(BOOL bCol, BOOL bRow) { bColHeaders=bCol; bRowHeaders=bRow; }
-    BOOL	HasColHeaders() const			 { return bColHeaders; }
-    BOOL	HasRowHeaders() const			 { return bRowHeaders; }
-    void    SetDummyUpperLeft(BOOL bNew) { bDummyUpperLeft = bNew; }
+    void	SetHeaders(sal_Bool bCol, sal_Bool bRow) { bColHeaders=bCol; bRowHeaders=bRow; }
+    sal_Bool	HasColHeaders() const			 { return bColHeaders; }
+    sal_Bool	HasRowHeaders() const			 { return bRowHeaders; }
+    void    SetDummyUpperLeft(sal_Bool bNew) { bDummyUpperLeft = bNew; }
     void    SeteGlue(ScChartGlue eNew) { eGlue = eNew; }
     void    SetStartCol(SCCOL nNew) { nStartCol = nNew; }
     void    SetStartRow(SCROW nNew) { nStartRow = nNew; }
 
-    BOOL	operator==(const ScChartPositioner& rCmp) const;
+    sal_Bool	operator==(const ScChartPositioner& rCmp) const;
 
     void					InvalidateGlue()
                                 {
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 511ff382a..3ec3ecd58 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -250,8 +250,8 @@ protected:
                                                     // Bereichen
             ScChangeActionLinkEntry*	pLinkDeleted;	// Links zu geloeschten
             ScChangeActionLinkEntry*	pLinkDependent;	// Links zu abhaengigen
-            ULONG				nAction;
-            ULONG				nRejectAction;
+            sal_uLong				nAction;
+            sal_uLong				nRejectAction;
             ScChangeActionType	eType;
             ScChangeActionState	eState;
 
@@ -262,8 +262,8 @@ protected:
                                 // only to be used in the XML import
                                 ScChangeAction( ScChangeActionType,
                                                 const ScBigRange&,
-                                                const ULONG nAction,
-                                                const ULONG nRejectAction,
+                                                const sal_uLong nAction,
+                                                const sal_uLong nRejectAction,
                                                 const ScChangeActionState eState,
                                                 const DateTime& aDateTime,
                                                 const String& aUser,
@@ -271,15 +271,15 @@ protected:
                                 // only to be used in the XML import
                                 ScChangeAction( ScChangeActionType,
                                                 const ScBigRange&,
-                                                const ULONG nAction);
+                                                const sal_uLong nAction);
 
     virtual						~ScChangeAction();
 
             String				GetRefString( const ScBigRange&,
-                                    ScDocument*, BOOL bFlag3D = FALSE ) const;
+                                    ScDocument*, sal_Bool bFlag3D = sal_False ) const;
 
-            void				SetActionNumber( ULONG n ) { nAction = n; }
-            void				SetRejectAction( ULONG n ) { nRejectAction = n; }
+            void				SetActionNumber( sal_uLong n ) { nAction = n; }
+            void				SetRejectAction( sal_uLong n ) { nRejectAction = n; }
             void				SetUser( const String& r ) { aUser = r; }
             void				SetType( ScChangeActionType e ) { eType = e; }
             void				SetState( ScChangeActionState e ) { eState = e; }
@@ -307,7 +307,7 @@ protected:
                                         return new ScChangeActionLinkEntry(
                                             GetDeletedInAddress(), p );
                                     }
-            BOOL				RemoveDeletedIn( const ScChangeAction* );
+            sal_Bool				RemoveDeletedIn( const ScChangeAction* );
             void				SetDeletedIn( ScChangeAction* );
 
             ScChangeActionLinkEntry*	AddDeleted( ScChangeAction* p )
@@ -331,15 +331,15 @@ protected:
 
     virtual	void 				UpdateReference( const ScChangeTrack*,
                                     UpdateRefMode, const ScBigRange&,
-                                    INT32 nDx, INT32 nDy, INT32 nDz );
+                                    sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz );
 
             void				Accept();
-    virtual	BOOL				Reject( ScDocument* ) = 0;
+    virtual	sal_Bool				Reject( ScDocument* ) = 0;
             void				RejectRestoreContents( ScChangeTrack*,
                                     SCsCOL nDx, SCsROW nDy );
 
                                 // used in Reject() instead of IsRejectable()
-            BOOL				IsInternalRejectable() const;
+            sal_Bool				IsInternalRejectable() const;
 
                                 // Derived classes that hold a pointer to the
                                 // ChangeTrack must return that. Otherwise NULL.
@@ -347,51 +347,51 @@ protected:
 
 public:
 
-            BOOL				IsInsertType() const
+            sal_Bool				IsInsertType() const
                                     {
                                         return eType == SC_CAT_INSERT_COLS ||
                                             eType == SC_CAT_INSERT_ROWS ||
                                             eType == SC_CAT_INSERT_TABS;
                                     }
-            BOOL				IsDeleteType() const
+            sal_Bool				IsDeleteType() const
                                     {
                                         return eType == SC_CAT_DELETE_COLS ||
                                             eType == SC_CAT_DELETE_ROWS ||
                                             eType == SC_CAT_DELETE_TABS;
                                     }
-            BOOL				IsVirgin() const
+            sal_Bool				IsVirgin() const
                                     { return eState == SC_CAS_VIRGIN; }
-            BOOL				IsAccepted() const
+            sal_Bool				IsAccepted() const
                                     { return eState == SC_CAS_ACCEPTED; }
-            BOOL				IsRejected() const
+            sal_Bool				IsRejected() const
                                     { return eState == SC_CAS_REJECTED; }
 
                                 // Action rejects another Action
-            BOOL				IsRejecting() const
+            sal_Bool				IsRejecting() const
                                     { return nRejectAction != 0; }
 
                                 // ob Action im Dokument sichtbar ist
-            BOOL				IsVisible() const;
+            sal_Bool				IsVisible() const;
 
                                 // ob Action anfassbar ist
-            BOOL				IsTouchable() const;
+            sal_Bool				IsTouchable() const;
 
                                 // ob Action ein Eintrag in Dialog-Root ist
-            BOOL				IsDialogRoot() const;
+            sal_Bool				IsDialogRoot() const;
 
                                 // ob ein Eintrag im Dialog aufklappbar sein soll
-            BOOL				IsDialogParent() const;
+            sal_Bool				IsDialogParent() const;
 
                                 // ob Action ein Delete ist, unter dem
                                 // aufgeklappt mehrere einzelne Deletes sind
-            BOOL				IsMasterDelete() const;
+            sal_Bool				IsMasterDelete() const;
 
                                 // ob Action akzeptiert/selektiert/abgelehnt
                                 // werden kann
-            BOOL				IsClickable() const;
+            sal_Bool				IsClickable() const;
 
                                 // ob Action abgelehnt werden kann
-            BOOL				IsRejectable() const;
+            sal_Bool				IsRejectable() const;
 
             const ScBigRange& 	GetBigRange() const { return aBigRange; }
             SC_DLLPUBLIC DateTime			GetDateTime() const;		// local time
@@ -401,27 +401,27 @@ public:
             const String&		GetComment() const { return aComment; }
             ScChangeActionType	GetType() const { return eType; }
             ScChangeActionState	GetState() const { return eState; }
-            ULONG				GetActionNumber() const { return nAction; }
-            ULONG				GetRejectAction() const { return nRejectAction; }
+            sal_uLong				GetActionNumber() const { return nAction; }
+            sal_uLong				GetRejectAction() const { return nRejectAction; }
 
             ScChangeAction*		GetNext() const { return pNext; }
             ScChangeAction*		GetPrev() const { return pPrev; }
 
-            BOOL				IsDeletedIn() const
+            sal_Bool				IsDeletedIn() const
                                     { return GetDeletedIn() != NULL; }
-            BOOL				IsDeleted() const
+            sal_Bool				IsDeleted() const
                                     { return IsDeleteType() || IsDeletedIn(); }
-            BOOL				IsDeletedIn( const ScChangeAction* ) const;
-            BOOL				IsDeletedInDelType( ScChangeActionType ) const;
+            sal_Bool				IsDeletedIn( const ScChangeAction* ) const;
+            sal_Bool				IsDeletedInDelType( ScChangeActionType ) const;
             void                RemoveAllDeletedIn();
 
             const ScChangeActionLinkEntry* GetFirstDeletedEntry() const
                                     { return pLinkDeleted; }
             const ScChangeActionLinkEntry* GetFirstDependentEntry() const
                                     { return pLinkDependent; }
-            BOOL				HasDependent() const
+            sal_Bool				HasDependent() const
                                     { return pLinkDependent != NULL; }
-            BOOL				HasDeleted() const
+            sal_Bool				HasDeleted() const
                                     { return pLinkDeleted != NULL; }
 
                                 // Description wird an String angehaengt.
@@ -429,10 +429,10 @@ public:
                                 // eine Spalte/Zeile beruecksichtigt (fuer
                                 // Auflistung der einzelnen Eintraege).
     virtual	void				GetDescription( String&, ScDocument*,
-                                    BOOL bSplitRange = FALSE, bool bWarning = true ) const;
+                                    sal_Bool bSplitRange = sal_False, bool bWarning = true ) const;
 
     virtual void				GetRefString( String&, ScDocument*,
-                                    BOOL bFlag3D = FALSE ) const;
+                                    sal_Bool bFlag3D = sal_False ) const;
 
                                 // fuer DocumentMerge altes Datum einer anderen
                                 // Action setzen, mit GetDateTimeUTC geholt
@@ -444,10 +444,10 @@ public:
                                     { aComment = rStr; }
 
                                 // only to be used in the XML import
-            void				SetDeletedInThis( ULONG nActionNumber,
+            void				SetDeletedInThis( sal_uLong nActionNumber,
                                         const ScChangeTrack* pTrack );
                                 // only to be used in the XML import
-            void				AddDependent( ULONG nActionNumber,
+            void				AddDependent( sal_uLong nActionNumber,
                                         const ScChangeTrack* pTrack );
 #if DEBUG_CHANGETRACK
             String              ToString( ScDocument* pDoc ) const;
@@ -467,14 +467,14 @@ class ScChangeActionIns : public ScChangeAction
     virtual	void				AddContent( ScChangeActionContent* ) {}
     virtual	void				DeleteCellEntries() {}
 
-    virtual	BOOL				Reject( ScDocument* );
+    virtual	sal_Bool				Reject( ScDocument* );
 
     virtual const ScChangeTrack*    GetChangeTrack() const { return 0; }
 
 public:
-                                ScChangeActionIns(const ULONG nActionNumber,
+                                ScChangeActionIns(const sal_uLong nActionNumber,
                                         const ScChangeActionState eState,
-                                        const ULONG nRejectingNumber,
+                                        const sal_uLong nRejectingNumber,
                                         const ScBigRange& aBigRange,
                                         const String& aUser,
                                         const DateTime& aDateTime,
@@ -482,7 +482,7 @@ public:
                                         const ScChangeActionType eType); // only to use in the XML import
 
     virtual	void				GetDescription( String&, ScDocument*,
-                                    BOOL bSplitRange = FALSE, bool bWarning = true ) const;
+                                    sal_Bool bSplitRange = sal_False, bool bWarning = true ) const;
 };
 
 
@@ -565,16 +565,16 @@ class ScChangeActionDel : public ScChangeAction
 
     virtual	void 				UpdateReference( const ScChangeTrack*,
                                     UpdateRefMode, const ScBigRange&,
-                                    INT32 nDx, INT32 nDy, INT32 nDz );
+                                    sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz );
 
-    virtual	BOOL				Reject( ScDocument* );
+    virtual	sal_Bool				Reject( ScDocument* );
 
     virtual const ScChangeTrack*    GetChangeTrack() const { return pTrack; }
 
 public:
-                                ScChangeActionDel(const ULONG nActionNumber,
+                                ScChangeActionDel(const sal_uLong nActionNumber,
                                                 const ScChangeActionState eState,
-                                                const ULONG nRejectingNumber,
+                                                const sal_uLong nRejectingNumber,
                                                 const ScBigRange& aBigRange,
                                                 const String& aUser,
                                                 const DateTime& aDateTime,
@@ -586,17 +586,17 @@ public:
 
                                 // ob dieses das unterste einer Reihe (oder
                                 // auch einzeln) ist
-            BOOL				IsBaseDelete() const;
+            sal_Bool				IsBaseDelete() const;
 
                                 // ob dieses das oberste einer Reihe (oder
                                 // auch einzeln) ist
-            BOOL				IsTopDelete() const;
+            sal_Bool				IsTopDelete() const;
 
                                 // ob dieses ein Teil einer Reihe ist
-            BOOL				IsMultiDelete() const;
+            sal_Bool				IsMultiDelete() const;
 
                                 // ob es eine Col ist, die zu einem TabDelete gehoert
-            BOOL				IsTabDeleteCol() const;
+            sal_Bool				IsTabDeleteCol() const;
 
             SCsCOL				GetDx() const { return nDx; }
             SCsROW				GetDy() const { return nDy; }
@@ -610,7 +610,7 @@ public:
             short				GetCutOffCount() const { return nCutOff; }
 
     virtual	void				GetDescription( String&, ScDocument*,
-                                    BOOL bSplitRange = FALSE, bool bWarning = true ) const;
+                                    sal_Bool bSplitRange = sal_False, bool bWarning = true ) const;
             void				SetCutOffInsert( ScChangeActionIns* p, short n )
                                     { pCutOff = p; nCutOff = n; }	// only to use in the XML import
                                                                     // this should be protected, but for the XML import it is public
@@ -635,8 +635,8 @@ class ScChangeActionMove : public ScChangeAction
             ScBigRange			aFromRange;
             ScChangeTrack*		pTrack;
             ScChangeActionCellListEntry* pFirstCell;
-            ULONG				nStartLastCut;	// fuer PasteCut Undo
-            ULONG				nEndLastCut;
+            sal_uLong				nStartLastCut;	// fuer PasteCut Undo
+            sal_uLong				nEndLastCut;
 
                                 ScChangeActionMove( const ScRange& rFromRange,
                                     const ScRange& rToRange,
@@ -655,16 +655,16 @@ class ScChangeActionMove : public ScChangeAction
 
             ScBigRange&			GetFromRange() { return aFromRange; }
 
-            void				SetStartLastCut( ULONG nVal ) { nStartLastCut = nVal; }
-            ULONG				GetStartLastCut() const { return nStartLastCut; }
-            void				SetEndLastCut( ULONG nVal )	{ nEndLastCut = nVal; }
-            ULONG				GetEndLastCut() const { return nEndLastCut; }
+            void				SetStartLastCut( sal_uLong nVal ) { nStartLastCut = nVal; }
+            sal_uLong				GetStartLastCut() const { return nStartLastCut; }
+            void				SetEndLastCut( sal_uLong nVal )	{ nEndLastCut = nVal; }
+            sal_uLong				GetEndLastCut() const { return nEndLastCut; }
 
     virtual	void 				UpdateReference( const ScChangeTrack*,
                                     UpdateRefMode, const ScBigRange&,
-                                    INT32 nDx, INT32 nDy, INT32 nDz );
+                                    sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz );
 
-    virtual	BOOL				Reject( ScDocument* );
+    virtual	sal_Bool				Reject( ScDocument* );
 
     virtual const ScChangeTrack*    GetChangeTrack() const { return pTrack; }
 
@@ -672,9 +672,9 @@ protected:
     using ScChangeAction::GetRefString;
 
 public:
-                                ScChangeActionMove(const ULONG nActionNumber,
+                                ScChangeActionMove(const sal_uLong nActionNumber,
                                                 const ScChangeActionState eState,
-                                                const ULONG nRejectingNumber,
+                                                const sal_uLong nRejectingNumber,
                                                 const ScBigRange& aToBigRange,
                                                 const String& aUser,
                                                 const DateTime& aDateTime,
@@ -685,13 +685,13 @@ public:
                                     { return pFirstCell; } // only to use in the XML export
 
             const ScBigRange&	GetFromRange() const { return aFromRange; }
-    SC_DLLPUBLIC		void				GetDelta( INT32& nDx, INT32& nDy, INT32& nDz ) const;
+    SC_DLLPUBLIC		void				GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nDz ) const;
 
     virtual	void				GetDescription( String&, ScDocument*,
-                                    BOOL bSplitRange = FALSE, bool bWarning = true ) const;
+                                    sal_Bool bSplitRange = sal_False, bool bWarning = true ) const;
 
     virtual void				GetRefString( String&, ScDocument*,
-                                    BOOL bFlag3D = FALSE ) const;
+                                    sal_Bool bFlag3D = sal_False ) const;
 };
 
 
@@ -751,7 +751,7 @@ class ScChangeActionContent : public ScChangeAction
     static	void				GetStringOfCell( String& rStr,
                                     const ScBaseCell* pCell,
                                     const ScDocument* pDoc,
-                                    ULONG nFormat );
+                                    sal_uLong nFormat );
 
     static	void				SetValue( String& rStr, ScBaseCell*& pCell,
                                     const ScAddress& rPos,
@@ -760,15 +760,15 @@ class ScChangeActionContent : public ScChangeAction
                                     ScDocument* pToDoc );
 
     static	void				SetValue( String& rStr, ScBaseCell*& pCell,
-                                    ULONG nFormat,
+                                    sal_uLong nFormat,
                                     const ScBaseCell* pOrgCell,
                                     const ScDocument* pFromDoc,
                                     ScDocument* pToDoc );
 
     static	void				SetCell( String& rStr, ScBaseCell* pCell,
-                                    ULONG nFormat, const ScDocument* pDoc );
+                                    sal_uLong nFormat, const ScDocument* pDoc );
 
-    static	BOOL				NeedsNumberFormat( const ScBaseCell* );
+    static	sal_Bool				NeedsNumberFormat( const ScBaseCell* );
 
             void				SetValueString( String& rValue,
                                     ScBaseCell*& pCell,	const String& rStr,
@@ -786,16 +786,16 @@ class ScChangeActionContent : public ScChangeAction
 
     virtual	void 				UpdateReference( const ScChangeTrack*,
                                     UpdateRefMode, const ScBigRange&,
-                                    INT32 nDx, INT32 nDy, INT32 nDz );
+                                    sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz );
 
-    virtual	BOOL				Reject( ScDocument* );
+    virtual	sal_Bool				Reject( ScDocument* );
 
     virtual const ScChangeTrack*    GetChangeTrack() const { return 0; }
 
                                 // pRejectActions!=NULL: reject actions get
                                 // stacked, no SetNewValue, no Append
-            BOOL				Select( ScDocument*, ScChangeTrack*,
-                                    BOOL bOldest, Stack* pRejectActions );
+            sal_Bool				Select( ScDocument*, ScChangeTrack*,
+                                    sal_Bool bOldest, Stack* pRejectActions );
 
             void				PutValueToDoc( ScBaseCell*, const String&,
                                     ScDocument*, SCsCOL nDx, SCsROW nDy ) const;
@@ -816,9 +816,9 @@ public:
                                         pNextInSlot( NULL ),
                                         ppPrevInSlot( NULL )
                                     {}
-                                ScChangeActionContent(const ULONG nActionNumber,
+                                ScChangeActionContent(const sal_uLong nActionNumber,
                                                 const ScChangeActionState eState,
-                                                const ULONG nRejectingNumber,
+                                                const sal_uLong nRejectingNumber,
                                                 const ScBigRange& aBigRange,
                                                 const String& aUser,
                                                 const DateTime& aDateTime,
@@ -826,7 +826,7 @@ public:
                                                 ScBaseCell* pOldCell,
                                                 ScDocument* pDoc,
                                                 const String& sOldValue); // to use for XML Import
-                                ScChangeActionContent(const ULONG nActionNumber,
+                                ScChangeActionContent(const sal_uLong nActionNumber,
                                                 ScBaseCell* pNewCell,
                                                 const ScBigRange& aBigRange,
                                                 ScDocument* pDoc,
@@ -836,7 +836,7 @@ public:
         ScChangeActionContent*	GetNextContent() const { return pNextContent; }
         ScChangeActionContent*	GetPrevContent() const { return pPrevContent; }
         ScChangeActionContent*	GetTopContent() const;
-            BOOL				IsTopContent() const
+            sal_Bool				IsTopContent() const
                                     { return pNextContent == NULL; }
 
     virtual	ScChangeActionLinkEntry*  	GetDeletedIn() const;
@@ -850,7 +850,7 @@ public:
             void				SetOldValue( const ScBaseCell*,
                                     const ScDocument* pFromDoc,
                                     ScDocument* pToDoc,
-                                    ULONG nFormat );
+                                    sal_uLong nFormat );
             void				SetOldValue( const ScBaseCell*,
                                     const ScDocument* pFromDoc,
                                     ScDocument* pToDoc );
@@ -859,8 +859,8 @@ public:
                                 // Used in import filter AppendContentOnTheFly,
                                 // takes ownership of cells.
             void				SetOldNewCells( ScBaseCell* pOldCell,
-                                    ULONG nOldFormat, ScBaseCell* pNewCell,
-                                    ULONG nNewFormat, ScDocument* pDoc );
+                                    sal_uLong nOldFormat, ScBaseCell* pNewCell,
+                                    sal_uLong nNewFormat, ScDocument* pDoc );
 
                                 // Use this only in the XML import,
                                 // takes ownership of cell.
@@ -883,30 +883,30 @@ public:
             const ScBaseCell*	GetOldCell() const { return pOldCell; }
             const ScBaseCell*	GetNewCell() const { return pNewCell; }
     virtual	void				GetDescription( String&, ScDocument*,
-                                    BOOL bSplitRange = FALSE, bool bWarning = true ) const;
+                                    sal_Bool bSplitRange = sal_False, bool bWarning = true ) const;
     virtual void				GetRefString( String&, ScDocument*,
-                                    BOOL bFlag3D = FALSE ) const;
+                                    sal_Bool bFlag3D = sal_False ) const;
 
     static	ScChangeActionContentCellType	GetContentCellType( const ScBaseCell* );
 
                                 // NewCell
-            BOOL				IsMatrixOrigin() const
+            sal_Bool				IsMatrixOrigin() const
                                     {
                                         return GetContentCellType( GetNewCell() )
                                             == SC_CACCT_MATORG;
                                     }
-            BOOL				IsMatrixReference() const
+            sal_Bool				IsMatrixReference() const
                                     {
                                         return GetContentCellType( GetNewCell() )
                                             == SC_CACCT_MATREF;
                                     }
                                 // OldCell
-            BOOL				IsOldMatrixOrigin() const
+            sal_Bool				IsOldMatrixOrigin() const
                                     {
                                         return GetContentCellType( GetOldCell() )
                                             == SC_CACCT_MATORG;
                                     }
-            BOOL				IsOldMatrixReference() const
+            sal_Bool				IsOldMatrixReference() const
                                     {
                                         return GetContentCellType( GetOldCell() )
                                             == SC_CACCT_MATREF;
@@ -924,7 +924,7 @@ class ScChangeActionReject : public ScChangeAction
     friend class ScChangeTrack;
     friend class ScChangeActionContent;
 
-                                ScChangeActionReject( ULONG nReject )
+                                ScChangeActionReject( sal_uLong nReject )
                                     : ScChangeAction( SC_CAT_REJECT, ScRange() )
                                     {
                                         SetRejectAction( nReject );
@@ -934,14 +934,14 @@ class ScChangeActionReject : public ScChangeAction
     virtual	void				AddContent( ScChangeActionContent* ) {}
     virtual	void				DeleteCellEntries() {}
 
-    virtual	BOOL				Reject( ScDocument* ) { return FALSE; }
+    virtual	sal_Bool				Reject( ScDocument* ) { return sal_False; }
 
     virtual const ScChangeTrack*    GetChangeTrack() const { return 0; }
 
 public:
-                                ScChangeActionReject(const ULONG nActionNumber,
+                                ScChangeActionReject(const sal_uLong nActionNumber,
                                                 const ScChangeActionState eState,
-                                                const ULONG nRejectingNumber,
+                                                const sal_uLong nRejectingNumber,
                                                 const ScBigRange& aBigRange,
                                                 const String& aUser,
                                                 const DateTime& aDateTime,
@@ -965,8 +965,8 @@ struct ScChangeTrackMsgInfo
     DECL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo )
 
     ScChangeTrackMsgType	eMsgType;
-    ULONG					nStartAction;
-    ULONG					nEndAction;
+    sal_uLong					nStartAction;
+    sal_uLong					nEndAction;
 };
 
 // MsgQueue fuer Benachrichtigung via ModifiedLink
@@ -989,15 +989,15 @@ DECLARE_TABLE( ScChangeActionTable, ScChangeAction* )
 // Intern generierte Actions beginnen bei diesem Wert (fast alle Bits gesetzt)
 // und werden runtergezaehlt, um sich in einer Table wertemaessig nicht mit den
 // "normalen" Actions in die Quere zu kommen.
-#define SC_CHGTRACK_GENERATED_START	((UINT32) 0xfffffff0)
+#define SC_CHGTRACK_GENERATED_START	((sal_uInt32) 0xfffffff0)
 
 class ScChangeTrack : public utl::ConfigurationListener
 {
     friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCsCOL, SCsROW );
-    friend BOOL ScChangeActionDel::Reject( ScDocument* pDoc );
+    friend sal_Bool ScChangeActionDel::Reject( ScDocument* pDoc );
     friend void ScChangeActionDel::DeleteCellEntries();
     friend void ScChangeActionMove::DeleteCellEntries();
-    friend BOOL ScChangeActionMove::Reject( ScDocument* pDoc );
+    friend sal_Bool ScChangeActionMove::Reject( ScDocument* pDoc );
 
     static	const SCROW         nContentRowsPerSlot;
     static	const SCSIZE        nContentSlots;
@@ -1025,21 +1025,21 @@ class ScChangeTrack : public utl::ConfigurationListener
     ScChangeActionLinkEntry*	pLinkMove;
         ScChangeTrackMsgInfo*	pBlockModifyMsg;
             ScDocument*			pDoc;
-            ULONG				nActionMax;
-            ULONG				nGeneratedMin;
-            ULONG				nMarkLastSaved;
-            ULONG				nStartLastCut;
-            ULONG				nEndLastCut;
-            ULONG				nLastMerge;
+            sal_uLong				nActionMax;
+            sal_uLong				nGeneratedMin;
+            sal_uLong				nMarkLastSaved;
+            sal_uLong				nStartLastCut;
+            sal_uLong				nEndLastCut;
+            sal_uLong				nLastMerge;
         ScChangeTrackMergeState	eMergeState;
-            USHORT				nLoadedFileFormatVersion;
-            BOOL				bLoadSave;
-            BOOL				bInDelete;
-            BOOL				bInDeleteUndo;
-            BOOL				bInDeleteTop;
-            BOOL				bInPasteCut;
-            BOOL				bUseFixDateTime;
-            BOOL                bTime100thSeconds;
+            sal_uInt16				nLoadedFileFormatVersion;
+            sal_Bool				bLoadSave;
+            sal_Bool				bInDelete;
+            sal_Bool				bInDeleteUndo;
+            sal_Bool				bInDeleteTop;
+            sal_Bool				bInPasteCut;
+            sal_Bool				bUseFixDateTime;
+            sal_Bool                bTime100thSeconds;
 
                                 // not implemented, prevent usage
                                 ScChangeTrack( const ScChangeTrack& );
@@ -1048,53 +1048,53 @@ class ScChangeTrack : public utl::ConfigurationListener
 #ifdef SC_CHGTRACK_CXX
     static	SCROW				InitContentRowsPerSlot();
 
-                                // TRUE if one is MM_FORMULA and the other is
+                                // sal_True if one is MM_FORMULA and the other is
                                 // not, or if both are and range differs
-    static	BOOL				IsMatrixFormulaRangeDifferent(
+    static	sal_Bool				IsMatrixFormulaRangeDifferent(
                                     const ScBaseCell* pOldCell,
                                     const ScBaseCell* pNewCell );
 
             void				Init();
             void				DtorClear();
-            void				SetLoadSave( BOOL bVal ) { bLoadSave = bVal; }
+            void				SetLoadSave( sal_Bool bVal ) { bLoadSave = bVal; }
             void				SetInDeleteRange( const ScRange& rRange )
                                     { aInDeleteRange = rRange; }
-            void				SetInDelete( BOOL bVal )
+            void				SetInDelete( sal_Bool bVal )
                                     { bInDelete = bVal; }
-            void				SetInDeleteTop( BOOL bVal )
+            void				SetInDeleteTop( sal_Bool bVal )
                                     { bInDeleteTop = bVal; }
-            void				SetInDeleteUndo( BOOL bVal )
+            void				SetInDeleteUndo( sal_Bool bVal )
                                     { bInDeleteUndo = bVal; }
-            void				SetInPasteCut( BOOL bVal )
+            void				SetInPasteCut( sal_Bool bVal )
                                     { bInPasteCut = bVal; }
             void				SetMergeState( ScChangeTrackMergeState eState )
                                     { eMergeState = eState; }
         ScChangeTrackMergeState	GetMergeState() const { return eMergeState; }
-            void				SetLastMerge( ULONG nVal ) { nLastMerge = nVal; }
-            ULONG				GetLastMerge() const { return nLastMerge; }
+            void				SetLastMerge( sal_uLong nVal ) { nLastMerge = nVal; }
+            sal_uLong				GetLastMerge() const { return nLastMerge; }
 
             void				SetLastCutMoveRange( const ScRange&, ScDocument* );
 
                                 // ModifyMsg blockweise und nicht einzeln erzeugen
             void				StartBlockModify( ScChangeTrackMsgType,
-                                    ULONG nStartAction );
-            void				EndBlockModify( ULONG nEndAction );
+                                    sal_uLong nStartAction );
+            void				EndBlockModify( sal_uLong nEndAction );
 
             void				AddDependentWithNotify( ScChangeAction* pParent,
                                     ScChangeAction* pDependent );
 
             void				Dependencies( ScChangeAction* );
-            void				UpdateReference( ScChangeAction*, BOOL bUndo );
+            void				UpdateReference( ScChangeAction*, sal_Bool bUndo );
             void				UpdateReference( ScChangeAction** ppFirstAction,
-                                    ScChangeAction* pAct, BOOL bUndo );
-            void				Append( ScChangeAction* pAppend, ULONG nAction );
+                                    ScChangeAction* pAct, sal_Bool bUndo );
+            void				Append( ScChangeAction* pAppend, sal_uLong nAction );
     SC_DLLPUBLIC		void				AppendDeleteRange( const ScRange&,
                                     ScDocument* pRefDoc, SCsTAB nDz,
-                                    ULONG nRejectingInsert );
+                                    sal_uLong nRejectingInsert );
             void				AppendOneDeleteRange( const ScRange& rOrgRange,
                                     ScDocument* pRefDoc,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                    ULONG nRejectingInsert );
+                                    sal_uLong nRejectingInsert );
             void				LookUpContents( const ScRange& rOrgRange,
                                     ScDocument* pRefDoc,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
@@ -1118,8 +1118,8 @@ class ScChangeTrack : public utl::ConfigurationListener
                                 // ist nur bei Insert und Move (MasterType)
                                 // noetig, kann ansonsten NULL sein.
                                 // bRecursion == Aufruf aus Reject mit Table
-            BOOL				Reject( ScChangeAction*,
-                                    ScChangeActionTable*, BOOL bRecursion );
+            sal_Bool				Reject( ScChangeAction*,
+                                    ScChangeActionTable*, sal_Bool bRecursion );
 
 #endif	// SC_CHGTRACK_CXX
 
@@ -1128,7 +1128,7 @@ class ScChangeTrack : public utl::ConfigurationListener
 
 public:
 
-    static	SCSIZE				ComputeContentSlot( INT32 nRow )
+    static	SCSIZE				ComputeContentSlot( sal_Int32 nRow )
                                     {
                                         if ( nRow < 0 || nRow > MAXROW )
                                             return nContentSlots - 1;
@@ -1144,34 +1144,34 @@ public:
             ScChangeActionContent*	GetFirstGenerated() const { return pFirstGeneratedDelContent; }
             ScChangeAction*		GetFirst() const { return pFirst; }
             ScChangeAction*		GetLast() const	{ return pLast; }
-            ULONG				GetActionMax() const { return nActionMax; }
-            BOOL				IsGenerated( ULONG nAction ) const
+            sal_uLong				GetActionMax() const { return nActionMax; }
+            sal_Bool				IsGenerated( sal_uLong nAction ) const
                                     { return nAction >= nGeneratedMin; }
-            ScChangeAction*		GetAction( ULONG nAction ) const
+            ScChangeAction*		GetAction( sal_uLong nAction ) const
                                     { return aTable.Get( nAction ); }
-            ScChangeAction*		GetGenerated( ULONG nGenerated ) const
+            ScChangeAction*		GetGenerated( sal_uLong nGenerated ) const
                                     { return aGeneratedTable.Get( nGenerated ); }
-            ScChangeAction*		GetActionOrGenerated( ULONG nAction ) const
+            ScChangeAction*		GetActionOrGenerated( sal_uLong nAction ) const
                                     {
                                         return IsGenerated( nAction ) ?
                                             GetGenerated( nAction ) :
                                             GetAction( nAction );
                                     }
-            ULONG				GetLastSavedActionNumber() const
+            sal_uLong				GetLastSavedActionNumber() const
                                     { return nMarkLastSaved; }
-            void                SetLastSavedActionNumber(ULONG nNew)
+            void                SetLastSavedActionNumber(sal_uLong nNew)
                                     { nMarkLastSaved = nNew; }
             ScChangeAction*		GetLastSaved() const
                                     { return aTable.Get( nMarkLastSaved ); }
         ScChangeActionContent**	GetContentSlots() const { return ppContentSlots; }
 
-            BOOL				IsLoadSave() const { return bLoadSave; }
+            sal_Bool				IsLoadSave() const { return bLoadSave; }
             const ScRange&		GetInDeleteRange() const
                                     { return aInDeleteRange; }
-            BOOL				IsInDelete() const { return bInDelete; }
-            BOOL				IsInDeleteTop() const { return bInDeleteTop; }
-            BOOL				IsInDeleteUndo() const { return bInDeleteUndo; }
-            BOOL				IsInPasteCut() const { return bInPasteCut; }
+            sal_Bool				IsInDelete() const { return bInDelete; }
+            sal_Bool				IsInDeleteTop() const { return bInDeleteTop; }
+            sal_Bool				IsInDeleteUndo() const { return bInDeleteUndo; }
+            sal_Bool				IsInPasteCut() const { return bInPasteCut; }
     SC_DLLPUBLIC		void				SetUser( const String& );
             const String&		GetUser() const { return aUser; }
             const ScStrCollection&	GetUserCollection() const
@@ -1183,7 +1183,7 @@ public:
                                 // set this if the date/time set with
                                 // SetFixDateTime...() shall be applied to
                                 // appended actions
-            void				SetUseFixDateTime( BOOL bVal )
+            void				SetUseFixDateTime( sal_Bool bVal )
                                     { bUseFixDateTime = bVal; }
                                 // for MergeDocument, apply original date/time as UTC
             void				SetFixDateTimeUTC( const DateTime& rDT )
@@ -1198,7 +1198,7 @@ public:
                                 // => no generation of deleted contents
     SC_DLLPUBLIC		void				AppendDeleteRange( const ScRange&,
                                     ScDocument* pRefDoc,
-                                    ULONG& nStartAction, ULONG& nEndAction,
+                                    sal_uLong& nStartAction, sal_uLong& nEndAction,
                                     SCsTAB nDz = 0 );
                                     // nDz: Multi-TabDel, LookUpContent ist
                                     // um -nDz verschoben zu suchen
@@ -1211,14 +1211,14 @@ public:
                                 // alte Werte aus RefDoc/UndoDoc
             void				AppendContentRange( const ScRange& rRange,
                                     ScDocument* pRefDoc,
-                                    ULONG& nStartAction, ULONG& nEndAction,
+                                    sal_uLong& nStartAction, sal_uLong& nEndAction,
                                     ScChangeActionClipMode eMode = SC_CACM_NONE );
                                 // nachdem neuer Wert im Dokument gesetzt wurde,
                                 // alter Wert aus pOldCell, nOldFormat,
                                 // RefDoc==NULL => Doc
             void				AppendContent( const ScAddress& rPos,
                                     const ScBaseCell* pOldCell,
-                                    ULONG nOldFormat, ScDocument* pRefDoc = NULL );
+                                    sal_uLong nOldFormat, ScDocument* pRefDoc = NULL );
                                 // nachdem neuer Wert im Dokument gesetzt wurde,
                                 // alter Wert aus pOldCell, Format aus Doc
             void				AppendContent( const ScAddress& rPos,
@@ -1227,7 +1227,7 @@ public:
                                 // alte Werte aus RefDoc/UndoDoc.
                                 // Alle Contents, wo im RefDoc eine Zelle steht.
             void				AppendContentsIfInRefDoc( ScDocument* pRefDoc,
-                                    ULONG& nStartAction, ULONG& nEndAction );
+                                    sal_uLong& nStartAction, sal_uLong& nEndAction );
 
                                 // Meant for import filter, creates and inserts
                                 // an unconditional content action of the two
@@ -1240,8 +1240,8 @@ public:
     SC_DLLPUBLIC	ScChangeActionContent*	AppendContentOnTheFly( const ScAddress& rPos,
                                     ScBaseCell* pOldCell,
                                     ScBaseCell* pNewCell,
-                                    ULONG nOldFormat = 0,
-                                    ULONG nNewFormat = 0 );
+                                    sal_uLong nOldFormat = 0,
+                                    sal_uLong nNewFormat = 0 );
 
                                 // die folgenden beiden nur benutzen wenn's
                                 // nicht anders geht (setzen nur String fuer
@@ -1270,22 +1270,22 @@ public:
                                             pLastCutMove = NULL;
                                         }
                                     }
-            BOOL				HasLastCut() const
+            sal_Bool				HasLastCut() const
                                     {
                                         return nEndLastCut > 0 &&
                                             nStartLastCut <= nEndLastCut &&
                                             pLastCutMove;
                                     }
 
-    SC_DLLPUBLIC		void				Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge = false );
+    SC_DLLPUBLIC		void				Undo( sal_uLong nStartAction, sal_uLong nEndAction, bool bMerge = false );
 
                                 // fuer MergeDocument, Referenzen anpassen,
                                 //! darf nur in einem temporaer geoeffneten
                                 //! Dokument verwendet werden, der Track
                                 //! ist danach verhunzt
             void				MergePrepare( ScChangeAction* pFirstMerge, bool bShared = false );
-            void				MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared = false );
-    static	BOOL				MergeIgnore( const ScChangeAction&, ULONG nFirstMerge );
+            void				MergeOwn( ScChangeAction* pAct, sal_uLong nFirstMerge, bool bShared = false );
+    static	sal_Bool				MergeIgnore( const ScChangeAction&, sal_uLong nFirstMerge );
 
                                 // Abhaengige in Table einfuegen.
                                 // Bei Insert sind es echte Abhaengige,
@@ -1302,25 +1302,25 @@ public:
                                 // der Abhaengigen flach eingefuegt.
     SC_DLLPUBLIC		void				GetDependents( ScChangeAction*,
                                     ScChangeActionTable&,
-                                    BOOL bListMasterDelete = FALSE,
-                                    BOOL bAllFlat = FALSE ) const;
+                                    sal_Bool bListMasterDelete = sal_False,
+                                    sal_Bool bAllFlat = sal_False ) const;
 
                                 // Reject visible Action (und abhaengige)
-            BOOL                Reject( ScChangeAction*, bool bShared = false );
+            sal_Bool                Reject( ScChangeAction*, bool bShared = false );
 
                                 // Accept visible Action (und abhaengige)
-    SC_DLLPUBLIC		BOOL				Accept( ScChangeAction* );
+    SC_DLLPUBLIC		sal_Bool				Accept( ScChangeAction* );
 
             void				AcceptAll();	// alle Virgins
-            BOOL				RejectAll();	// alle Virgins
+            sal_Bool				RejectAll();	// alle Virgins
 
                                 // Selektiert einen Content von mehreren an
                                 // gleicher Position und akzeptiert diesen und
                                 // die aelteren, rejected die neueren.
-                                // Mit bOldest==TRUE wird der erste OldValue
+                                // Mit bOldest==sal_True wird der erste OldValue
                                 // einer Virgin-Content-Kette restauriert.
-            BOOL				SelectContent( ScChangeAction*,
-                                    BOOL bOldest = FALSE );
+            sal_Bool				SelectContent( ScChangeAction*,
+                                    sal_Bool bOldest = sal_False );
 
                                 // wenn ModifiedLink gesetzt, landen
                                 // Aenderungen in ScChangeTrackMsgQueue
@@ -1330,30 +1330,30 @@ public:
             ScChangeTrackMsgQueue& GetMsgQueue() { return aMsgQueue; }
 
             void				NotifyModified( ScChangeTrackMsgType eMsgType,
-                                    ULONG nStartAction, ULONG nEndAction );
+                                    sal_uLong nStartAction, sal_uLong nEndAction );
 
-            USHORT				GetLoadedFileFormatVersion() const
+            sal_uInt16				GetLoadedFileFormatVersion() const
                                     { return nLoadedFileFormatVersion; }
 
-            ULONG				AddLoadedGenerated(ScBaseCell* pOldCell,
+            sal_uLong				AddLoadedGenerated(ScBaseCell* pOldCell,
                                                 const ScBigRange& aBigRange, const String& sNewValue ); // only to use in the XML import
             void				AppendLoaded( ScChangeAction* pAppend ); // this is only for the XML import public, it should be protected
-            void				SetActionMax(ULONG nTempActionMax)
+            void				SetActionMax(sal_uLong nTempActionMax)
                                     { nActionMax = nTempActionMax; } // only to use in the XML import
 
             void                SetProtection( const com::sun::star::uno::Sequence< sal_Int8 >& rPass )
                                     { aProtectPass = rPass; }
     com::sun::star::uno::Sequence< sal_Int8 >   GetProtection() const
                                     { return aProtectPass; }
-            BOOL                IsProtected() const
+            sal_Bool                IsProtected() const
                                     { return aProtectPass.getLength() != 0; }
 
                                 // If time stamps of actions of this
                                 // ChangeTrack and a second one are to be
                                 // compared including 100th seconds.
-            void                SetTime100thSeconds( BOOL bVal )
+            void                SetTime100thSeconds( sal_Bool bVal )
                                     { bTime100thSeconds = bVal; }
-            BOOL                IsTime100thSeconds() const
+            sal_Bool                IsTime100thSeconds() const
                                     { return bTime100thSeconds; }
 
             void                AppendCloned( ScChangeAction* pAppend );
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index 05adba0b7..e2a3ea05a 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.hxx
@@ -53,32 +53,32 @@ private:
     String				aComment;
     ScRangeList			aRangeList;
     ScChgsDateMode 		eDateMode;
-    BOOL				bShowIt;
-    BOOL				bIsDate;
-    BOOL				bIsAuthor;
-    BOOL				bIsComment;
-    BOOL				bIsRange;
-    BOOL				bEveryoneButMe;
-    BOOL				bShowAccepted;
-    BOOL				bShowRejected;
+    sal_Bool				bShowIt;
+    sal_Bool				bIsDate;
+    sal_Bool				bIsAuthor;
+    sal_Bool				bIsComment;
+    sal_Bool				bIsRange;
+    sal_Bool				bEveryoneButMe;
+    sal_Bool				bShowAccepted;
+    sal_Bool				bShowRejected;
     bool                mbIsActionRange;
-    ULONG               mnFirstAction;
-    ULONG               mnLastAction;
+    sal_uLong               mnFirstAction;
+    sal_uLong               mnLastAction;
 
 public:
 
                         ScChangeViewSettings()
                         {
                             pCommentSearcher=NULL;
-                            bIsDate=FALSE;
-                            bIsAuthor=FALSE;
-                            bIsRange=FALSE;
-                            bIsComment=FALSE;
-                            bShowIt=FALSE;
+                            bIsDate=sal_False;
+                            bIsAuthor=sal_False;
+                            bIsRange=sal_False;
+                            bIsComment=sal_False;
+                            bShowIt=sal_False;
                             eDateMode=SCDM_DATE_BEFORE;
-                            bEveryoneButMe=FALSE;
-                            bShowAccepted=FALSE;
-                            bShowRejected=FALSE;
+                            bEveryoneButMe=sal_False;
+                            bShowAccepted=sal_False;
+                            bShowRejected=sal_False;
                             mbIsActionRange = false;
                         }
 
@@ -86,11 +86,11 @@ public:
 
                         ~ScChangeViewSettings();
 
-    BOOL				ShowChanges() const {return bShowIt;}
-    void				SetShowChanges(BOOL nFlag=TRUE){bShowIt=nFlag;}
+    sal_Bool				ShowChanges() const {return bShowIt;}
+    void				SetShowChanges(sal_Bool nFlag=sal_True){bShowIt=nFlag;}
 
-    BOOL				HasDate() const {return bIsDate;}
-    void				SetHasDate(BOOL nFlag=TRUE) {bIsDate=nFlag;}
+    sal_Bool				HasDate() const {return bIsDate;}
+    void				SetHasDate(sal_Bool nFlag=sal_True) {bIsDate=nFlag;}
 
     void				SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; }
     ScChgsDateMode		GetTheDateMode() const { return eDateMode; }
@@ -102,35 +102,35 @@ public:
     const DateTime&		GetTheLastDateTime()const {return aLastDateTime;}
 
 
-    BOOL				HasAuthor() const {return bIsAuthor;}
-    void				SetHasAuthor(BOOL nFlag=TRUE) {bIsAuthor=nFlag;}
+    sal_Bool				HasAuthor() const {return bIsAuthor;}
+    void				SetHasAuthor(sal_Bool nFlag=sal_True) {bIsAuthor=nFlag;}
 
     String				GetTheAuthorToShow()const {return aAuthorToShow;}
     void				SetTheAuthorToShow(const String& aString){aAuthorToShow=aString;}
 
-    BOOL				HasComment() const {return bIsComment;}
-    void				SetHasComment(BOOL nFlag=TRUE) {bIsComment=nFlag;}
+    sal_Bool				HasComment() const {return bIsComment;}
+    void				SetHasComment(sal_Bool nFlag=sal_True) {bIsComment=nFlag;}
 
     String				GetTheComment()const {return aComment;}
     void				SetTheComment(const String& aString);
 
-    BOOL				IsValidComment(const String* pCommentStr) const;
+    sal_Bool				IsValidComment(const String* pCommentStr) const;
 
-    BOOL				IsEveryoneButMe() const {return bEveryoneButMe;}
-    void				SetEveryoneButMe(BOOL nFlag=TRUE) {bEveryoneButMe=nFlag;}
+    sal_Bool				IsEveryoneButMe() const {return bEveryoneButMe;}
+    void				SetEveryoneButMe(sal_Bool nFlag=sal_True) {bEveryoneButMe=nFlag;}
 
 
-    BOOL				HasRange() const {return bIsRange;}
-    void				SetHasRange(BOOL nFlag=TRUE) {bIsRange=nFlag;}
+    sal_Bool				HasRange() const {return bIsRange;}
+    void				SetHasRange(sal_Bool nFlag=sal_True) {bIsRange=nFlag;}
 
     const ScRangeList&	GetTheRangeList()const {return aRangeList;}
     void 				SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;}
 
-    BOOL				IsShowAccepted() const { return bShowAccepted; }
-    void				SetShowAccepted( BOOL bVal ) { bShowAccepted = bVal; }
+    sal_Bool				IsShowAccepted() const { return bShowAccepted; }
+    void				SetShowAccepted( sal_Bool bVal ) { bShowAccepted = bVal; }
 
-    BOOL				IsShowRejected() const { return bShowRejected; }
-    void				SetShowRejected( BOOL bVal ) { bShowRejected = bVal; }
+    sal_Bool				IsShowRejected() const { return bShowRejected; }
+    void				SetShowRejected( sal_Bool bVal ) { bShowRejected = bVal; }
 
     ScChangeViewSettings&	operator=	( const ScChangeViewSettings& r );
 
@@ -139,8 +139,8 @@ public:
 
     bool                HasActionRange() const { return mbIsActionRange; }
     void                SetHasActionRange( bool nFlag = true ) { mbIsActionRange = nFlag; }
-    void                GetTheActionRange( ULONG& nFirst, ULONG& nLast ) const { nFirst = mnFirstAction; nLast = mnLastAction; }
-    void                SetTheActionRange( ULONG nFirst, ULONG nLast ) { mnFirstAction = nFirst; mnLastAction = nLast; }
+    void                GetTheActionRange( sal_uLong& nFirst, sal_uLong& nLast ) const { nFirst = mnFirstAction; nLast = mnLastAction; }
+    void                SetTheActionRange( sal_uLong nFirst, sal_uLong nLast ) { mnFirstAction = nFirst; mnLastAction = nLast; }
 };
 
 
diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx
index b38aeb24c..c989b5e51 100644
--- a/sc/inc/collect.hxx
+++ b/sc/inc/collect.hxx
@@ -57,29 +57,29 @@ public:
 class SC_DLLPUBLIC ScCollection : public ScDataObject
 {
 protected:
-    USHORT 			nCount;
-    USHORT 			nLimit;
-    USHORT			nDelta;
+    sal_uInt16 			nCount;
+    sal_uInt16 			nLimit;
+    sal_uInt16			nDelta;
     ScDataObject** 	pItems;
 public:
-    ScCollection(USHORT nLim = 4, USHORT nDel = 4);
+    ScCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4);
     ScCollection(const ScCollection& rCollection);
     virtual             ~ScCollection();
 
     virtual ScDataObject*   Clone() const;
 
-    void        AtFree(USHORT nIndex);
+    void        AtFree(sal_uInt16 nIndex);
     void        Free(ScDataObject* pScDataObject);
     void        FreeAll();
 
-    BOOL        AtInsert(USHORT nIndex, ScDataObject* pScDataObject);
-    virtual BOOL        Insert(ScDataObject* pScDataObject);
+    sal_Bool        AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject);
+    virtual sal_Bool        Insert(ScDataObject* pScDataObject);
 
-    ScDataObject*   At(USHORT nIndex) const;
-    virtual USHORT      IndexOf(ScDataObject* pScDataObject) const;
-    USHORT GetCount() const;
+    ScDataObject*   At(sal_uInt16 nIndex) const;
+    virtual sal_uInt16      IndexOf(ScDataObject* pScDataObject) const;
+    sal_uInt16 GetCount() const;
 
-            ScDataObject* operator[]( const USHORT nIndex) const {return At(nIndex);}
+            ScDataObject* operator[]( const sal_uInt16 nIndex) const {return At(nIndex);}
             ScCollection&   operator=( const ScCollection& rCol );
 };
 
@@ -87,25 +87,25 @@ public:
 class SC_DLLPUBLIC  ScSortedCollection : public ScCollection
 {
 private:
-    BOOL	bDuplicates;
+    sal_Bool	bDuplicates;
 protected:
                         // fuer ScStrCollection Load/Store
-            void		SetDups( BOOL bVal ) { bDuplicates = bVal; }
-            BOOL		IsDups() const { return bDuplicates; }
+            void		SetDups( sal_Bool bVal ) { bDuplicates = bVal; }
+            sal_Bool		IsDups() const { return bDuplicates; }
 public:
-    ScSortedCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE);
+    ScSortedCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False);
     ScSortedCollection(const ScSortedCollection& rScSortedCollection) :
                             ScCollection(rScSortedCollection),
                             bDuplicates(rScSortedCollection.bDuplicates) {}
 
-    virtual USHORT      IndexOf(ScDataObject* pScDataObject) const;
+    virtual sal_uInt16      IndexOf(ScDataObject* pScDataObject) const;
     virtual short       Compare(ScDataObject* pKey1, ScDataObject* pKey2) const = 0;
-    virtual BOOL        IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
-    BOOL        Search(ScDataObject* pScDataObject, USHORT& rIndex) const;
-    virtual BOOL        Insert(ScDataObject* pScDataObject);
-    virtual BOOL        InsertPos(ScDataObject* pScDataObject, USHORT& nIndex);
+    virtual sal_Bool        IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
+    sal_Bool        Search(ScDataObject* pScDataObject, sal_uInt16& rIndex) const;
+    virtual sal_Bool        Insert(ScDataObject* pScDataObject);
+    virtual sal_Bool        InsertPos(ScDataObject* pScDataObject, sal_uInt16& nIndex);
 
-    BOOL        operator==(const ScSortedCollection& rCmp) const;
+    sal_Bool        operator==(const ScSortedCollection& rCmp) const;
 };
 
 
@@ -132,13 +132,13 @@ class SvStream;
 class SC_DLLPUBLIC ScStrCollection : public ScSortedCollection
 {
 public:
-    ScStrCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) :
+    ScStrCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False) :
                         ScSortedCollection	( nLim, nDel, bDup ) {}
     ScStrCollection(const ScStrCollection& rScStrCollection) :
                         ScSortedCollection	( rScStrCollection ) {}
 
     virtual	ScDataObject*	Clone() const;
-            StrData*	operator[]( const USHORT nIndex) const {return (StrData*)At(nIndex);}
+            StrData*	operator[]( const sal_uInt16 nIndex) const {return (StrData*)At(nIndex);}
     virtual	short		Compare(ScDataObject* pKey1, ScDataObject* pKey2) const;
 };
 
@@ -150,13 +150,13 @@ class TypedStrData : public ScDataObject
 {
 public:
             TypedStrData( const String&	rStr, double nVal = 0.0,
-                          USHORT nType = SC_STRTYPE_STANDARD )
+                          sal_uInt16 nType = SC_STRTYPE_STANDARD )
                 : aStrValue(rStr),
                   nValue(nVal),
                   nStrType(nType) {}
 
 //UNUSED2008-05  TypedStrData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
-//UNUSED2008-05                  BOOL bAllStrings );
+//UNUSED2008-05                  sal_Bool bAllStrings );
 
             TypedStrData( const TypedStrData& rCpy )
                 : ScDataObject(),
@@ -166,7 +166,7 @@ public:
 
     virtual	ScDataObject*	Clone() const;
 
-    BOOL				IsStrData() const { return nStrType != 0; }
+    sal_Bool				IsStrData() const { return nStrType != 0; }
     const String&		GetString() const { return aStrValue; }
     double				GetValue () const { return nValue; }
 
@@ -175,16 +175,16 @@ private:
 
     String	aStrValue;
     double	nValue;
-    USHORT	nStrType;			// 0 = Value
+    sal_uInt16	nStrType;			// 0 = Value
 };
 
 class SC_DLLPUBLIC TypedScStrCollection : public ScSortedCollection
 {
 private:
-    BOOL	bCaseSensitive;
+    sal_Bool	bCaseSensitive;
 
 public:
-    TypedScStrCollection( USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE );
+    TypedScStrCollection( sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False );
 
     TypedScStrCollection( const TypedScStrCollection& rCpy )
         : ScSortedCollection( rCpy ) { bCaseSensitive = rCpy.bCaseSensitive; }
@@ -193,12 +193,12 @@ public:
     virtual ScDataObject*       Clone() const;
     virtual short           Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const;
 
-    TypedStrData*	operator[]( const USHORT nIndex) const;
+    TypedStrData*	operator[]( const sal_uInt16 nIndex) const;
 
-    void	SetCaseSensitive( BOOL bSet );
+    void	SetCaseSensitive( sal_Bool bSet );
 
-    BOOL    FindText( const String& rStart, String& rResult, USHORT& rPos, BOOL bBack ) const;
-    BOOL    GetExactMatch( String& rString ) const;
+    sal_Bool    FindText( const String& rStart, String& rResult, sal_uInt16& rPos, sal_Bool bBack ) const;
+    sal_Bool    GetExactMatch( String& rString ) const;
 };
 
 #endif
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 5c149cced..230223cd1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -72,18 +72,18 @@ class ScFlatBoolRowSegments;
 struct ScNeededSizeOptions
 {
     const ScPatternAttr*	pPattern;
-    BOOL					bFormula;
-    BOOL					bSkipMerged;
-    BOOL					bGetFont;
-    BOOL					bTotalSize;
+    sal_Bool					bFormula;
+    sal_Bool					bSkipMerged;
+    sal_Bool					bGetFont;
+    sal_Bool					bTotalSize;
 
     ScNeededSizeOptions()
     {
         pPattern = NULL;
-        bFormula = FALSE;
-        bSkipMerged = TRUE;
-        bGetFont = TRUE;
-        bTotalSize = FALSE;
+        bFormula = sal_False;
+        bSkipMerged = sal_True;
+        bGetFont = sal_True;
+        bTotalSize = sal_False;
     }
 };
 
@@ -119,7 +119,7 @@ friend class ScHorizontalCellIterator;
 friend class ScHorizontalAttrIterator;
 
 public:
-static BOOL bDoubleAlloc;			// fuer Import: Groesse beim Allozieren verdoppeln
+static sal_Bool bDoubleAlloc;			// fuer Import: Groesse beim Allozieren verdoppeln
 
 public:
                 ScColumn();
@@ -127,10 +127,10 @@ public:
 
     void		Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc);
 
-    BOOL 		Search( SCROW nRow, SCSIZE& nIndex ) const;
+    sal_Bool 		Search( SCROW nRow, SCSIZE& nIndex ) const;
     ScBaseCell*	GetCell( SCROW nRow ) const;
     void		Insert( SCROW nRow, ScBaseCell* pCell );
-    void		Insert( SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell );
+    void		Insert( SCROW nRow, sal_uLong nFormatIndex, ScBaseCell* pCell );
     void		Append( SCROW nRow, ScBaseCell* pCell );
     void 		Delete( SCROW nRow );
     void		DeleteAtIndex( SCSIZE nIndex );
@@ -139,67 +139,67 @@ public:
     void		SwapRow( SCROW nRow1, SCROW nRow2 );
     void		SwapCell( SCROW nRow, ScColumn& rCol);
 
-//UNUSED2009-05 BOOL		HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
-//UNUSED2009-05 			BOOL bLeft, BOOL bRight ) const;
-    bool        HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const;
-    BOOL		HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const;
-    BOOL		ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
+//UNUSED2009-05 sal_Bool		HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
+//UNUSED2009-05 			sal_Bool bLeft, sal_Bool bRight ) const;
+    bool        HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
+    sal_Bool		HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const;
+    sal_Bool		ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
                                 SCCOL& rPaintCol, SCROW& rPaintRow,
-                                BOOL bRefresh, BOOL bAttrs );
+                                sal_Bool bRefresh, sal_Bool bAttrs );
 
-    BOOL		IsEmptyVisData(BOOL bNotes) const;		// ohne Broadcaster
-    BOOL		IsEmptyData() const;
-    BOOL		IsEmptyAttr() const;
-    BOOL		IsEmpty() const;
+    sal_Bool		IsEmptyVisData(sal_Bool bNotes) const;		// ohne Broadcaster
+    sal_Bool		IsEmptyData() const;
+    sal_Bool		IsEmptyAttr() const;
+    sal_Bool		IsEmpty() const;
 
                 // nur Daten:
-    BOOL		IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const;
+    sal_Bool		IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const;
     SCSIZE	    GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const;
-    BOOL		HasDataAt(SCROW nRow) const;
-    BOOL		HasVisibleDataAt(SCROW nRow) const;
+    sal_Bool		HasDataAt(SCROW nRow) const;
+    sal_Bool		HasVisibleDataAt(SCROW nRow) const;
     SCROW		GetFirstDataPos() const;
     SCROW		GetLastDataPos() const;
-    SCROW		GetLastVisDataPos(BOOL bNotes) const;				// ohne Broadcaster
-    SCROW		GetFirstVisDataPos(BOOL bNotes) const;
-    BOOL 		GetPrevDataPos(SCROW& rRow) const;
-    BOOL 		GetNextDataPos(SCROW& rRow) const;
+    SCROW		GetLastVisDataPos(sal_Bool bNotes) const;				// ohne Broadcaster
+    SCROW		GetFirstVisDataPos(sal_Bool bNotes) const;
+    sal_Bool 		GetPrevDataPos(SCROW& rRow) const;
+    sal_Bool 		GetNextDataPos(SCROW& rRow) const;
     void		FindDataAreaPos(SCROW& rRow, long nMovY) const;	// (ohne Broadcaster)
-    void		FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const;
+    void		FindUsed( SCROW nStartRow, SCROW nEndRow, sal_Bool* pUsed ) const;
 
     SCSIZE		VisibleCount( SCROW nStartRow, SCROW nEndRow ) const;
 
-    USHORT		GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const;
-    BOOL		HasSelectionMatrixFragment(const ScMarkData& rMark) const;
+    sal_uInt16		GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
+    sal_Bool		HasSelectionMatrixFragment(const ScMarkData& rMark) const;
 
-    BOOL        GetFirstVisibleAttr( SCROW& rFirstRow ) const;
-    BOOL        GetLastVisibleAttr( SCROW& rLastRow ) const;
-    BOOL		HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
-    BOOL		IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,
+    sal_Bool        GetFirstVisibleAttr( SCROW& rFirstRow ) const;
+    sal_Bool        GetLastVisibleAttr( SCROW& rLastRow ) const;
+    sal_Bool		HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
+    sal_Bool		IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,
                                     SCROW nEndRow = MAXROW ) const;
-    BOOL		IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const;
+    sal_Bool		IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const;
 
-    BOOL		TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
-    BOOL		TestInsertRow( SCSIZE nSize ) const;
+    sal_Bool		TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
+    sal_Bool		TestInsertRow( SCSIZE nSize ) const;
     void		InsertRow( SCROW nStartRow, SCSIZE nSize );
     void		DeleteRow( SCROW nStartRow, SCSIZE nSize );
-    void        DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFlag );
-    void        DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag );
-    void        CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions);
+    void        DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDelFlag );
+    void        DeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag );
+    void        CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, sal_Bool bKeepScenarioFlags, sal_Bool bCloneNoteCaptions);
     void		CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
-                                USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScColumn& rColumn);
+                                sal_uInt16 nInsFlag, sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty, ScColumn& rColumn);
     void		StartListeningInArea( SCROW nRow1, SCROW nRow2 );
     void		BroadcastInArea( SCROW nRow1, SCROW nRow2 );
 
     void		RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
 
                 //	Markierung von diesem Dokument
-    void		MixMarked( const ScMarkData& rMark, USHORT nFunction,
-                            BOOL bSkipEmpty, ScColumn& rSrcCol );
-    void		MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty,
+    void		MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
+                            sal_Bool bSkipEmpty, ScColumn& rSrcCol );
+    void		MixData( SCROW nRow1, SCROW nRow2, sal_uInt16 nFunction, sal_Bool bSkipEmpty,
                             ScColumn& rSrcCol );
 
     ScFormulaCell*	CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos,
-                                    SCSIZE nIndex, USHORT nFlags ) const;
+                                    SCSIZE nIndex, sal_uInt16 nFlags ) const;
 
     ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const;
 
@@ -209,20 +209,20 @@ public:
     void		UpdateSelectionFunction( const ScMarkData& rMark,
                                     ScFunctionData& rData,
                                     ScFlatBoolRowSegments& rHiddenRows,
-                                    BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
+                                    sal_Bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
     void		UpdateAreaFunction( ScFunctionData& rData,
                                     ScFlatBoolRowSegments& rHiddenRows,
                                     SCROW nStartRow, SCROW nEndRow );
 
-    void		CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+    void		CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked,
                                 ScColumn& rColumn, const ScMarkData* pMarkData = NULL,
-                                BOOL bAsLink = FALSE );
-    void		UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+                                sal_Bool bAsLink = sal_False );
+    void		UndoToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked,
                                 ScColumn& rColumn, const ScMarkData* pMarkData = NULL );
 
     void		CopyScenarioFrom( const ScColumn& rSrcCol );
     void		CopyScenarioTo( ScColumn& rDestCol ) const;
-    BOOL		TestCopyScenarioTo( const ScColumn& rDestCol ) const;
+    sal_Bool		TestCopyScenarioTo( const ScColumn& rDestCol ) const;
     void		MarkScenarioIn( ScMarkData& rDestMark ) const;
 
     void		CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const;
@@ -230,31 +230,31 @@ public:
     void		SwapCol(ScColumn& rCol);
     void		MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol);
 
-    BOOL		HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const;
+    sal_Bool		HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const;
 
-                //	TRUE = Zahlformat gesetzt
-    BOOL		SetString( SCROW nRow, SCTAB nTab, const String& rString,
+                //	sal_True = Zahlformat gesetzt
+    sal_Bool		SetString( SCROW nRow, SCTAB nTab, const String& rString,
                            formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO,
                            SvNumberFormatter* pFormatter = NULL,
                            bool bDetectNumberFormat = true );
     void		SetValue( SCROW nRow, const double& rVal);
-    void		SetError( SCROW nRow, const USHORT nError);
+    void		SetError( SCROW nRow, const sal_uInt16 nError);
 
     void		GetString( SCROW nRow, String& rString ) const;
     void		GetInputString( SCROW nRow, String& rString ) const;
     double		GetValue( SCROW nRow ) const;
     void		GetFormula( SCROW nRow, String& rFormula,
-                            BOOL bAsciiExport = FALSE ) const;
+                            sal_Bool bAsciiExport = sal_False ) const;
     CellType	GetCellType( SCROW nRow ) const;
     SCSIZE		GetCellCount() const { return nCount; }
-    ULONG		GetWeightedCount() const;
-    ULONG		GetCodeCount() const;		// RPN-Code in Formeln
-    USHORT		GetErrCode( SCROW nRow ) const;
+    sal_uLong		GetWeightedCount() const;
+    sal_uLong		GetCodeCount() const;		// RPN-Code in Formeln
+    sal_uInt16		GetErrCode( SCROW nRow ) const;
 
-    BOOL		HasStringData( SCROW nRow ) const;
-    BOOL		HasValueData( SCROW nRow ) const;
-//UNUSED2009-05 USHORT		GetErrorData( SCROW nRow) const;
-    BOOL		HasStringCells( SCROW nStartRow, SCROW nEndRow ) const;
+    sal_Bool		HasStringData( SCROW nRow ) const;
+    sal_Bool		HasValueData( SCROW nRow ) const;
+//UNUSED2009-05 sal_uInt16		GetErrorData( SCROW nRow) const;
+    sal_Bool		HasStringCells( SCROW nStartRow, SCROW nEndRow ) const;
 
     /** Returns the pointer to a cell note object at the passed row. */
     ScPostIt*   GetNote( SCROW nRow );
@@ -283,38 +283,38 @@ public:
                                      ScDocument* pUndoDoc = NULL );
     void		UpdateInsertTab( SCTAB nTable);
     void		UpdateInsertTabOnlyCells( SCTAB nTable);
-    void		UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL );
+    void		UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScColumn* pRefUndo = NULL );
     void		UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
-    void		UpdateCompile( BOOL bForceIfNameInUse = FALSE );
+    void		UpdateCompile( sal_Bool bForceIfNameInUse = sal_False );
     void		UpdateTranspose( const ScRange& rSource, const ScAddress& rDest,
                                     ScDocument* pUndoDoc );
     void		UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY );
 
     void		SetTabNo(SCTAB nNewTab);
-    BOOL		IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const;
-    void        FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const;
+    sal_Bool		IsRangeNameInUse(SCROW nRow1, SCROW nRow2, sal_uInt16 nIndex) const;
+    void        FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes) const;
     void 		ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap );
 
-    const SfxPoolItem*		GetAttr( SCROW nRow, USHORT nWhich ) const;
+    const SfxPoolItem*		GetAttr( SCROW nRow, sal_uInt16 nWhich ) const;
     const ScPatternAttr*	GetPattern( SCROW nRow ) const;
     const ScPatternAttr*    GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const;
 
-    ULONG		GetNumberFormat( SCROW nRow ) const;
+    sal_uLong		GetNumberFormat( SCROW nRow ) const;
 
-    void		MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const;
-    void		MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const;
+    void		MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, sal_Bool bDeep ) const;
+    void		MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, sal_Bool bDeep ) const;
     void		MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
                             ScLineFlags& rFlags,
-                            SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const;
+                            SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight ) const;
     void		ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
-                            SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight );
+                            SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight );
 
     void		ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr );
     void		ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr );
     void		ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr );
-    void		SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE );
+    void		SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, sal_Bool bPutToPool = sal_False );
     void		SetPatternArea( SCROW nStartRow, SCROW nEndRow,
-                                const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE );
+                                const ScPatternAttr& rPatAttr, sal_Bool bPutToPool = sal_False );
     void		ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
                             const ScPatternAttr& rPattern, short nNewType );
 
@@ -322,63 +322,63 @@ public:
     void		ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle );
     void 		ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark);
     void		ApplySelectionLineStyle( const ScMarkData& rMark,
-                                    const SvxBorderLine* pLine, BOOL bColorOnly );
+                                    const SvxBorderLine* pLine, sal_Bool bColorOnly );
 
     const ScStyleSheet*	GetStyle( SCROW nRow ) const;
-    const ScStyleSheet*	GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const;
-    const ScStyleSheet*	GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const;
+    const ScStyleSheet*	GetSelectionStyle( const ScMarkData& rMark, sal_Bool& rFound ) const;
+    const ScStyleSheet*	GetAreaStyle( sal_Bool& rFound, SCROW nRow1, SCROW nRow2 ) const;
 
     void		FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
-    BOOL		IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
+    sal_Bool		IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const;
 
                 /// May return -1 if not found
     SCsROW		SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
-                                BOOL bUp, BOOL bInSelection, const ScMarkData& rMark );
-    BOOL		SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
-                                    BOOL bUp, BOOL bInSelection, const ScMarkData& rMark );
+                                sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark );
+    sal_Bool		SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
+                                    sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark );
 
-    BOOL		ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags );
-    BOOL		RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags );
-    void		ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich );
+    sal_Bool		ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
+    sal_Bool		RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
+    void		ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich );
 
     void		RemoveProtected( SCROW nStartRow, SCROW nEndRow );
 
     SCsROW		ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark );
-    void        DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
+    void        DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark );
 
-    void		ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
-    void		ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark );
+    void		ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
+    void		ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark );
 
     long		GetNeededSize( SCROW nRow, OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bWidth, const ScNeededSizeOptions& rOptions );
-    USHORT		GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
+                                    sal_Bool bWidth, const ScNeededSizeOptions& rOptions );
+    sal_uInt16		GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bFormula, USHORT nOldWidth,
+                                    sal_Bool bFormula, sal_uInt16 nOldWidth,
                                     const ScMarkData* pMarkData,
-                                    BOOL bSimpleTextImport );
-    void		GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight,
+                                    sal_Bool bSimpleTextImport );
+    void		GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bShrink, USHORT nMinHeight, SCROW nMinStart );
+                                    sal_Bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart );
 private:
     long		GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
-                                    BOOL bWidth );
+                                    sal_Bool bWidth );
 public:
 
                 /// Including current, may return -1
-    SCsROW		GetNextUnprotected( SCROW nRow, BOOL bUp ) const;
+    SCsROW		GetNextUnprotected( SCROW nRow, sal_Bool bUp ) const;
 
     void		GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates);
-    BOOL		GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
+    sal_Bool		GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, sal_Bool bLimit);
 
 //UNUSED2008-05  SCROW		NoteCount( SCROW nMaxRow = MAXROW ) const;
 
     void		UpdateInsertTabAbs(SCTAB nNewPos);
-    BOOL		TestTabRefAbs(SCTAB nTable);
-    BOOL 		GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const;
+    sal_Bool		TestTabRefAbs(SCTAB nTable);
+    sal_Bool 		GetNextSpellingCell(SCROW& nRow, sal_Bool bInSel, const ScMarkData& rData) const;
 
     void		RemoveAutoSpellObj();
 
@@ -390,8 +390,8 @@ public:
     void		SetRelNameDirty();
 
     void 		CompileDBFormula();
-    void 		CompileDBFormula( BOOL bCreateFormulaString );
-    void 		CompileNameFormula( BOOL bCreateFormulaString );
+    void 		CompileDBFormula( sal_Bool bCreateFormulaString );
+    void 		CompileNameFormula( sal_Bool bCreateFormulaString );
     void 		CompileColRowNameFormula();
 
     sal_Int32	GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const;
@@ -399,7 +399,7 @@ public:
                                        SCROW nRowStart, SCROW nRowEnd ) const;
 
 private:
-    ScBaseCell* CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos);
+    ScBaseCell* CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos);
 //UNUSED2008-05  void		CorrectSymbolCells( CharSet eStreamCharSet );
 };
 
@@ -414,7 +414,7 @@ public:
                 ScColumnIterator( const ScColumn* pCol, SCROW nStart=0, SCROW nEnd=MAXROW );
                 ~ScColumnIterator();
 
-    BOOL		Next( SCROW& rRow, ScBaseCell*& rpCell );
+    sal_Bool		Next( SCROW& rRow, ScBaseCell*& rpCell );
     SCSIZE		GetIndex() const;
 };
 
@@ -426,15 +426,15 @@ class ScMarkedDataIter					// Daten in selektierten Bereichen durchgehen
     ScMarkArrayIter*	pMarkIter;
     SCROW				nTop;
     SCROW				nBottom;
-    BOOL				bNext;
-    BOOL				bAll;
+    sal_Bool				bNext;
+    sal_Bool				bAll;
 
 public:
                 ScMarkedDataIter( const ScColumn* pCol, const ScMarkData* pMarkData,
-                                    BOOL bAllIfNone = FALSE );
+                                    sal_Bool bAllIfNone = sal_False );
                 ~ScMarkedDataIter();
 
-    BOOL		Next( SCSIZE& rIndex );
+    sal_Bool		Next( SCSIZE& rIndex );
 };
 
 
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index f13718206..aa167b1ee 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -106,16 +106,16 @@ class ScTokenArray;
 /*
     OpCode   eOp;           // OpCode
     formula::StackVar eType;         // type of data
-    USHORT   nRefCnt;       // reference count
-    BOOL     bRaw;          // not cloned yet and trimmed to real size
+    sal_uInt16   nRefCnt;       // reference count
+    sal_Bool     bRaw;          // not cloned yet and trimmed to real size
  */
 #endif
 
 #define SC_TOKEN_FIX_MEMBERS    \
     OpCode   eOp;               \
     formula::StackVar eType;    \
-    USHORT   nRefCnt;           \
-    BOOL     bRaw;
+    sal_uInt16   nRefCnt;           \
+    sal_Bool     bRaw;
 
 struct ScDoubleRawToken
 {
@@ -126,7 +126,7 @@ public:
     {   // union only to assure alignment identical to ScRawToken
         double      nValue;
         struct {
-            BYTE        cByte;
+            sal_uInt8        cByte;
             bool        bHasForceArray;
         } sbyte;
     };
@@ -139,14 +139,14 @@ struct ScRawToken
     // Friends that use a temporary ScRawToken on the stack (and therefor need
     // the private dtor) and know what they're doing..
     friend class ScTokenArray;
-    friend USHORT lcl_ScRawTokenOffset();
+    friend sal_uInt16 lcl_ScRawTokenOffset();
 private:
     SC_TOKEN_FIX_MEMBERS
 public:
     union {
         double       nValue;
         struct {
-            BYTE        cByte;
+            sal_uInt8        cByte;
             bool        bHasForceArray;
         } sbyte;
         ScComplexRefData aRef;
@@ -160,13 +160,13 @@ public:
             sal_Unicode cName[MAXSTRLEN+1];
         } extname;
         ScMatrix*    pMat;
-        USHORT       nIndex;                // index into name collection
+        sal_uInt16       nIndex;                // index into name collection
         sal_Unicode  cStr[ MAXSTRLEN+1 ];   // string (up to 255 characters + 0)
         short        nJump[MAXJUMPCOUNT+1]; // If/Chose token
     };
 
                 //! other members not initialized
-                ScRawToken() : bRaw( TRUE ) {}
+                ScRawToken() : bRaw( sal_True ) {}
 private:
                 ~ScRawToken() {}                //! only delete via Delete()
 public:
@@ -176,7 +176,7 @@ public:
     void        NewOpCode( OpCode e )   { eOp = e; }
     void        IncRef()                { nRefCnt++;       }
     void        DecRef()                { if( !--nRefCnt ) Delete(); }
-    USHORT      GetRef() const          { return nRefCnt; }
+    sal_uInt16      GetRef() const          { return nRefCnt; }
     SC_DLLPUBLIC void       Delete();
 
     // Use these methods only on tokens that are not part of a token array,
@@ -192,7 +192,7 @@ public:
     // These methods are ok to use, reference count not cleared.
 //UNUSED2008-05  ScComplexRefData& GetReference();
 //UNUSED2008-05  void SetReference( ScComplexRefData& rRef );
-    void SetName( USHORT n );
+    void SetName( sal_uInt16 n );
     void SetExternalSingleRef( sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef );
     void SetExternalDoubleRef( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef );
     void SetExternalName( sal_uInt16 nFileId, const String& rName );
@@ -201,7 +201,7 @@ public:
 
     ScRawToken* Clone() const;      // real copy!
     formula::FormulaToken* CreateToken() const;   // create typified token
-    void Load( SvStream&, USHORT nVer );
+    void Load( SvStream&, sal_uInt16 nVer );
 
     static xub_StrLen GetStrLen( const sal_Unicode* pStr ); // as long as a "string" is an array
     static size_t GetStrLenBytes( xub_StrLen nLen )
@@ -227,7 +227,7 @@ public:
     struct Convention
     {
         const formula::FormulaGrammar::AddressConvention meConv;
-        const ULONG*                mpCharTable;
+        const sal_uLong*                mpCharTable;
 
 
         Convention( formula::FormulaGrammar::AddressConvention eConvP );
@@ -236,7 +236,7 @@ public:
         virtual void MakeRefStr( rtl::OUStringBuffer&   rBuffer,
                                  const ScCompiler&      rCompiler,
                                  const ScComplexRefData&    rRef,
-                                 BOOL bSingleRef ) const = 0;
+                                 sal_Bool bSingleRef ) const = 0;
         virtual ::com::sun::star::i18n::ParseResult
                     parseAnyToken( const String& rFormula,
                                    xub_StrLen nSrcPos,
@@ -316,7 +316,7 @@ private:
     ScRawTokenRef   pRawToken;
 
     const CharClass*    pCharClass;         // which character classification is used for parseAnyToken
-    USHORT      mnPredetectedReference;     // reference when reading ODF, 0 (none), 1 (single) or 2 (double)
+    sal_uInt16      mnPredetectedReference;     // reference when reading ODF, 0 (none), 1 (single) or 2 (double)
     SCsTAB      nMaxTab;                    // last sheet in document
     sal_Int32   mnRangeOpPosInSymbol;       // if and where a range operator is in symbol
     const Convention *pConv;
@@ -325,24 +325,24 @@ private:
     bool        mbExtendedErrorDetection;
     bool        mbRewind;                   // whether symbol is to be rewound to some step during lexical analysis
 
-    BOOL   NextNewToken(bool bInArray = false);
+    sal_Bool   NextNewToken(bool bInArray = false);
 
-    virtual void SetError(USHORT nError);
+    virtual void SetError(sal_uInt16 nError);
     xub_StrLen NextSymbol(bool bInArray);
-    BOOL IsValue( const String& );
-    BOOL IsOpCode( const String&, bool bInArray );
-    BOOL IsOpCode2( const String& );
-    BOOL IsString();
-    BOOL IsReference( const String& );
-    BOOL IsSingleReference( const String& );
-    BOOL IsPredetectedReference( const String& );
-    BOOL IsDoubleReference( const String& );
-    BOOL IsMacro( const String& );
-    BOOL IsNamedRange( const String& );
+    sal_Bool IsValue( const String& );
+    sal_Bool IsOpCode( const String&, bool bInArray );
+    sal_Bool IsOpCode2( const String& );
+    sal_Bool IsString();
+    sal_Bool IsReference( const String& );
+    sal_Bool IsSingleReference( const String& );
+    sal_Bool IsPredetectedReference( const String& );
+    sal_Bool IsDoubleReference( const String& );
+    sal_Bool IsMacro( const String& );
+    sal_Bool IsNamedRange( const String& );
     bool IsExternalNamedRange( const String& rSymbol );
-    BOOL IsDBRange( const String& );
-    BOOL IsColRowName( const String& );
-    BOOL IsBoolean( const String& );
+    sal_Bool IsDBRange( const String& );
+    sal_Bool IsColRowName( const String& );
+    sal_Bool IsBoolean( const String& );
     void AutoCorrectParsedSymbol();
 
     void SetRelNameReference();
@@ -361,7 +361,7 @@ public:
     static void CheckTabQuotes( String& aTabName,
                                 const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO );
 
-    static BOOL EnQuote( String& rStr );
+    static sal_Bool EnQuote( String& rStr );
     sal_Unicode GetNativeAddressSymbol( Convention::SpecialSymbolType eType ) const;
 
 
@@ -370,7 +370,7 @@ public:
 
     //! _either_ CompileForFAP _or_ AutoCorrection, _not_ both
     // #i101512# SetCompileForFAP is in formula::FormulaCompiler
-    void            SetAutoCorrection( BOOL bVal )
+    void            SetAutoCorrection( sal_Bool bVal )
                         { bAutoCorrect = bVal; bIgnoreErrors = bVal; }
     void            SetCloseBrackets( bool bVal ) { mbCloseBrackets = bVal; }
     void            SetRefConvention( const Convention *pConvP );
@@ -410,7 +410,7 @@ public:
 
     void            SetExtendedErrorDetection( bool bVal ) { mbExtendedErrorDetection = bVal; }
 
-    BOOL            IsCorrected() { return bCorrected; }
+    sal_Bool            IsCorrected() { return bCorrected; }
     const String&   GetCorrectedFormula() { return aCorrectedFormula; }
 
     // Use convention from this->aPos by default
@@ -423,15 +423,15 @@ public:
     static void MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, 
                              SCCOL nMaxCol, SCROW nMaxRow );
 
-    BOOL UpdateNameReference( UpdateRefMode eUpdateRefMode,
+    sal_Bool UpdateNameReference( UpdateRefMode eUpdateRefMode,
                               const ScRange&,
                               SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                              BOOL& rChanged, BOOL bSharedFormula = FALSE);
+                              sal_Bool& rChanged, sal_Bool bSharedFormula = sal_False);
 
     ScRangeData* UpdateReference( UpdateRefMode eUpdateRefMode,
                                   const ScAddress& rOldPos, const ScRange&,
                                   SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                  BOOL& rChanged, BOOL& rRefSizeChanged );
+                                  sal_Bool& rChanged, sal_Bool& rRefSizeChanged );
 
     /// Only once for converted shared formulas,
     /// token array has to be compiled afterwards.
@@ -439,24 +439,24 @@ public:
                                   const ScAddress& rOldPos, const ScRange&,
                                   SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
 
-    ScRangeData* UpdateInsertTab(SCTAB nTable, BOOL bIsName );
-    ScRangeData* UpdateDeleteTab(SCTAB nTable, BOOL bIsMove, BOOL bIsName, BOOL& bCompile);
-    ScRangeData* UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, BOOL bIsName );
+    ScRangeData* UpdateInsertTab(SCTAB nTable, sal_Bool bIsName );
+    ScRangeData* UpdateDeleteTab(SCTAB nTable, sal_Bool bIsMove, sal_Bool bIsName, sal_Bool& bCompile);
+    ScRangeData* UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, sal_Bool bIsName );
 
-    BOOL HasModifiedRange();
+    sal_Bool HasModifiedRange();
 
     /** If the character is allowed as first character in sheet names or 
         references, includes '$' and '?'. */
-    static inline BOOL IsCharWordChar( String const & rStr,
+    static inline sal_Bool IsCharWordChar( String const & rStr,
                                        xub_StrLen nPos,
                                        const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO )
         {
             sal_Unicode c = rStr.GetChar( nPos );
             if (c < 128)
             {
-                return pConventions[eConv] ? static_cast<BOOL>(
-                        (pConventions[eConv]->mpCharTable[ UINT8(c) ] & SC_COMPILER_C_CHAR_WORD) == SC_COMPILER_C_CHAR_WORD) :
-                    FALSE;   // no convention => assume invalid
+                return pConventions[eConv] ? static_cast<sal_Bool>(
+                        (pConventions[eConv]->mpCharTable[ sal_uInt8(c) ] & SC_COMPILER_C_CHAR_WORD) == SC_COMPILER_C_CHAR_WORD) :
+                    sal_False;   // no convention => assume invalid
             }
             else
                 return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos );
@@ -464,16 +464,16 @@ public:
 
     /** If the character is allowed in sheet names, thus may be part of a 
         reference, includes '$' and '?' and such. */
-    static inline BOOL IsWordChar( String const & rStr,
+    static inline sal_Bool IsWordChar( String const & rStr,
                                    xub_StrLen nPos,
                                    const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO )
         {
             sal_Unicode c = rStr.GetChar( nPos );
             if (c < 128)
             {
-                return pConventions[eConv] ? static_cast<BOOL>(
-                        (pConventions[eConv]->mpCharTable[ UINT8(c) ] & SC_COMPILER_C_WORD) == SC_COMPILER_C_WORD) :
-                    FALSE;   // convention not known => assume invalid
+                return pConventions[eConv] ? static_cast<sal_Bool>(
+                        (pConventions[eConv]->mpCharTable[ sal_uInt8(c) ] & SC_COMPILER_C_WORD) == SC_COMPILER_C_WORD) :
+                    sal_False;   // convention not known => assume invalid
             }
             else
                 return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos );
@@ -481,11 +481,11 @@ public:
 
     /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... 
         bits) for all known address conventions. If more than one bit is given 
-        in nFlags, all bits must match. If bTestLetterNumeric is FALSE and 
-        char>=128, no LetterNumeric test is done and FALSE is returned. */
+        in nFlags, all bits must match. If bTestLetterNumeric is sal_False and 
+        char>=128, no LetterNumeric test is done and sal_False is returned. */
     static inline bool IsCharFlagAllConventions( String const & rStr, 
                                                  xub_StrLen nPos,
-                                                 ULONG nFlags,
+                                                 sal_uLong nFlags,
                                                  bool bTestLetterNumeric = true )
         {
             sal_Unicode c = rStr.GetChar( nPos );
@@ -495,7 +495,7 @@ public:
                         ++nConv < formula::FormulaGrammar::CONV_LAST; )
                 {
                     if (pConventions[nConv] && 
-                            ((pConventions[nConv]->mpCharTable[ UINT8(c) ] & nFlags) != nFlags))
+                            ((pConventions[nConv]->mpCharTable[ sal_uInt8(c) ] & nFlags) != nFlags))
                         return false;
                     // convention not known => assume valid
                 }
@@ -509,16 +509,16 @@ public:
 
 private:
     // FormulaCompiler
-    virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
+    virtual String FindAddInFunction( const String& rUpperName, sal_Bool bLocalFirst ) const;
     virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
     virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const;
     virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, formula::FormulaGrammar::Grammar _eGrammar ) const;
     virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const;
 
-    virtual BOOL HandleExternalReference(const formula::FormulaToken& _aToken);
-    virtual BOOL HandleRange();
-    virtual BOOL HandleSingleRef();
-    virtual BOOL HandleDbData();
+    virtual sal_Bool HandleExternalReference(const formula::FormulaToken& _aToken);
+    virtual sal_Bool HandleRange();
+    virtual sal_Bool HandleSingleRef();
+    virtual sal_Bool HandleDbData();
 
     virtual formula::FormulaTokenRef ExtendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, bool bReuseDoubleRef );
     virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, formula::FormulaToken* pTokenP);
@@ -527,11 +527,11 @@ private:
     virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP);
     virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP);
     virtual void LocalizeString( String& rName );	// modify rName - input: exact name
-    virtual BOOL IsImportingXML() const;
+    virtual sal_Bool IsImportingXML() const;
 
     /// Access the CharTable flags
-    inline ULONG GetCharTableFlags( sal_Unicode c )
-        { return c < 128 ? pConv->mpCharTable[ UINT8(c) ] : 0; }
+    inline sal_uLong GetCharTableFlags( sal_Unicode c )
+        { return c < 128 ? pConv->mpCharTable[ sal_uInt8(c) ] : 0; }
 };
 
 SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp ); //CHINA001
diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index d80e65dd0..933c658b1 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -51,7 +51,7 @@ template< typename A, typename D > class ScCompressedArrayIterator;
 
     typename A := access type, e.g. SCROW or SCCOL, must be a POD.
 
-    typename D := data type, e.g. USHORT or BYTE or whatever, may also be a
+    typename D := data type, e.g. sal_uInt16 or sal_uInt8 or whatever, may also be a
     struct or class.
 
     D::operator==() and D::operator=() must be implemented. Force template
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 575090bd0..c3cbcaf8f 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -74,7 +74,7 @@ class SC_DLLPUBLIC ScConditionEntry
 {
                                         // gespeicherte Daten:
     ScConditionMode		eOp;
-    USHORT				nOptions;
+    sal_uInt16				nOptions;
     double				nVal1;			// eingegeben oder berechnet
     double				nVal2;
     String				aStrVal1;		// eingegeben oder berechnet
@@ -83,8 +83,8 @@ class SC_DLLPUBLIC ScConditionEntry
     String              aStrNmsp2;      // namespace to be used on (re)compilation, e.g. in XML import
     formula::FormulaGrammar::Grammar eTempGrammar1;  // grammar to be used on (re)compilation, e.g. in XML import
     formula::FormulaGrammar::Grammar eTempGrammar2;  // grammar to be used on (re)compilation, e.g. in XML import
-    BOOL				bIsStr1;		// um auch leere Strings zu erkennen
-    BOOL				bIsStr2;
+    sal_Bool				bIsStr1;		// um auch leere Strings zu erkennen
+    sal_Bool				bIsStr2;
     ScTokenArray*		pFormula1;		// eingegebene Formel
     ScTokenArray*		pFormula2;
     ScAddress           aSrcPos;        // source position for formulas
@@ -93,20 +93,20 @@ class SC_DLLPUBLIC ScConditionEntry
     ScFormulaCell*		pFCell1;
     ScFormulaCell*		pFCell2;
     ScDocument*			pDoc;
-    BOOL				bRelRef1;
-    BOOL				bRelRef2;
-    BOOL				bFirstRun;
+    sal_Bool				bRelRef1;
+    sal_Bool				bRelRef2;
+    sal_Bool				bFirstRun;
 
     void	MakeCells( const ScAddress& rPos );
     void	Compile( const String& rExpr1, const String& rExpr2,
                         const String& rExprNmsp1, const String& rExprNmsp2,
                         formula::FormulaGrammar::Grammar eGrammar1,
                         formula::FormulaGrammar::Grammar eGrammar2,
-                        BOOL bTextToReal );
+                        sal_Bool bTextToReal );
     void	Interpret( const ScAddress& rPos );
 
-    BOOL	IsValid( double nArg ) const;
-    BOOL	IsValidStr( const String& rArg ) const;
+    sal_Bool	IsValid( double nArg ) const;
+    sal_Bool	IsValidStr( const String& rArg ) const;
 
 public:
             ScConditionEntry( ScConditionMode eOper,
@@ -125,11 +125,11 @@ public:
 
     int				operator== ( const ScConditionEntry& r ) const;
 
-    BOOL			IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const;
+    sal_Bool			IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const;
 
     ScConditionMode	GetOperation() const		{ return eOp; }
-    BOOL			IsIgnoreBlank() const		{ return ( nOptions & SC_COND_NOBLANKS ) == 0; }
-    void			SetIgnoreBlank(BOOL bSet);
+    sal_Bool			IsIgnoreBlank() const		{ return ( nOptions & SC_COND_NOBLANKS ) == 0; }
+    void			SetIgnoreBlank(sal_Bool bSet);
     ScAddress		GetSrcPos() const			{ return aSrcPos; }
 
     ScAddress       GetValidSrcPos() const;     // adjusted to allow textual representation of expressions
@@ -139,10 +139,10 @@ public:
     void            SetFormula1( const ScTokenArray& rArray );
     void            SetFormula2( const ScTokenArray& rArray );
 
-    String			GetExpression( const ScAddress& rCursor, USHORT nPos, ULONG nNumFmt = 0,
+    String			GetExpression( const ScAddress& rCursor, sal_uInt16 nPos, sal_uLong nNumFmt = 0,
                                     const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
 
-    ScTokenArray*	CreateTokenArry( USHORT nPos ) const;
+    ScTokenArray*	CreateTokenArry( sal_uInt16 nPos ) const;
 
     void			CompileAll();
     void			CompileXML();
@@ -210,8 +210,8 @@ class SC_DLLPUBLIC ScConditionalFormat
     ScRangeList*		pAreas;				// Bereiche fuer Paint
     sal_uInt32			nKey;				// Index in Attributen
     ScCondFormatEntry**	ppEntries;
-    USHORT				nEntryCount;
-    BOOL				bIsUsed;			// temporaer beim Speichern
+    sal_uInt16				nEntryCount;
+    sal_Bool				bIsUsed;			// temporaer beim Speichern
 
 public:
             ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument);
@@ -223,8 +223,8 @@ public:
 
     void			AddEntry( const ScCondFormatEntry& rNew );
 
-    BOOL			IsEmpty() const			{ return (nEntryCount == 0); }
-    USHORT			Count() const			{ return nEntryCount; }
+    sal_Bool			IsEmpty() const			{ return (nEntryCount == 0); }
+    sal_uInt16			Count() const			{ return nEntryCount; }
 
     void			CompileAll();
     void			CompileXML();
@@ -235,11 +235,11 @@ public:
 
     void			SourceChanged( const ScAddress& rAddr );
 
-    const ScCondFormatEntry* GetEntry( USHORT nPos ) const;
+    const ScCondFormatEntry* GetEntry( sal_uInt16 nPos ) const;
 
     const String&	GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const;
 
-    BOOL			EqualEntries( const ScConditionalFormat& r ) const;
+    sal_Bool			EqualEntries( const ScConditionalFormat& r ) const;
 
     void			DoRepaint( const ScRange* pModified );
     void			InvalidateArea();
@@ -247,15 +247,15 @@ public:
     sal_uInt32		GetKey() const			{ return nKey; }
     void			SetKey(sal_uInt32 nNew)	{ nKey = nNew; }	// nur wenn nicht eingefuegt!
 
-    void			SetUsed(BOOL bSet)		{ bIsUsed = bSet; }
-    BOOL			IsUsed() const			{ return bIsUsed; }
+    void			SetUsed(sal_Bool bSet)		{ bIsUsed = bSet; }
+    sal_Bool			IsUsed() const			{ return bIsUsed; }
 
     bool            MarkUsedExternalReferences() const;
 
     //	sortiert (per PTRARR) nach Index
     //	operator== nur fuer die Sortierung
-    BOOL operator ==( const ScConditionalFormat& r ) const	{ return nKey == r.nKey; }
-    BOOL operator < ( const ScConditionalFormat& r ) const	{ return nKey <  r.nKey; }
+    sal_Bool operator ==( const ScConditionalFormat& r ) const	{ return nKey == r.nKey; }
+    sal_Bool operator < ( const ScConditionalFormat& r ) const	{ return nKey <  r.nKey; }
 };
 
 //
@@ -293,7 +293,7 @@ public:
      *  references are marked now. */
     bool    MarkUsedExternalReferences() const;
 
-    BOOL	operator==( const ScConditionalFormatList& r ) const;		// fuer Ref-Undo
+    sal_Bool	operator==( const ScConditionalFormatList& r ) const;		// fuer Ref-Undo
 };
 
 #endif
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index a9074ec0e..2d115a43a 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -84,13 +84,13 @@ class ScConsData
 {
 private:
     ScSubTotalFunc		eFunction;
-    BOOL				bReference;
-    BOOL				bColByName;
-    BOOL				bRowByName;
-    BOOL				bSubTitles;
+    sal_Bool				bReference;
+    sal_Bool				bColByName;
+    sal_Bool				bRowByName;
+    sal_Bool				bSubTitles;
     SCSIZE				nColCount;
     SCSIZE				nRowCount;
-    BOOL**				ppUsed;
+    sal_Bool**				ppUsed;
     double**			ppSum;
     double**			ppCount;
     double**			ppSumSqr;
@@ -101,7 +101,7 @@ private:
     SCSIZE				nTitleCount;
     String**			ppTitles;
     SCSIZE**		    ppTitlePos;
-    BOOL				bCornerUsed;
+    sal_Bool				bCornerUsed;
     String				aCornerText;		// nur bei bColByName && bRowByName
 
 public:
@@ -109,9 +109,9 @@ public:
                 ~ScConsData();
 
     void		SetSize( SCCOL nCols, SCROW nRows );
-    void		SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef );
+    void		SetFlags( ScSubTotalFunc eFunc, sal_Bool bColName, sal_Bool bRowName, sal_Bool bRef );
 
-    void		InitData(BOOL bDelete=TRUE);
+    void		InitData(sal_Bool bDelete=sal_True);
     void		DeleteData();
 
     void		AddFields( ScDocument* pSrcDoc, SCTAB nTab,
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index f0d7bf45b..3e8d536ef 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -85,8 +85,8 @@ class ScDataPilotItemObj;
 class ScDataPilotConversion
 {
 public:
-    static com::sun::star::sheet::GeneralFunction	FirstFunc( USHORT nBits );
-    static USHORT			FunctionBit( com::sun::star::sheet::GeneralFunction eFunc );
+    static com::sun::star::sheet::GeneralFunction	FirstFunc( sal_uInt16 nBits );
+    static sal_uInt16			FunctionBit( com::sun::star::sheet::GeneralFunction eFunc );
 
     static void         FillGroupInfo(
                             ::com::sun::star::sheet::DataPilotFieldGroupInfo& rInfo,
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 03d0edc1c..213fbcb43 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -121,7 +121,7 @@ class ScSubTotalDescriptorBase : public cppu::WeakImplHelper6<
 private:
     SfxItemPropertySet		aPropSet;
 
-    ScSubTotalFieldObj*		GetObjectByIndex_Impl(USHORT nIndex);
+    ScSubTotalFieldObj*		GetObjectByIndex_Impl(sal_uInt16 nIndex);
 
 public:
                             ScSubTotalDescriptorBase();
@@ -260,10 +260,10 @@ class ScSubTotalFieldObj : public cppu::WeakImplHelper2<
 private:
     com::sun::star::uno::Reference<com::sun::star::sheet::XSubTotalDescriptor> xRef;
     ScSubTotalDescriptorBase&	rParent;
-    USHORT						nPos;
+    sal_uInt16						nPos;
 
 public:
-                            ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP );
+                            ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uInt16 nP );
     virtual					~ScSubTotalFieldObj();
 
                             // XSubTotalField
@@ -608,7 +608,7 @@ class ScDatabaseRangesObj : public cppu::WeakImplHelper4<
 private:
     ScDocShell*				pDocShell;
 
-    ScDatabaseRangeObj*		GetObjectByIndex_Impl(USHORT nIndex);
+    ScDatabaseRangeObj*		GetObjectByIndex_Impl(sal_uInt16 nIndex);
     ScDatabaseRangeObj*		GetObjectByName_Impl(const ::rtl::OUString& aName);
 
 public:
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx
index 840977b7d..40b49443d 100644
--- a/sc/inc/dbcolect.hxx
+++ b/sc/inc/dbcolect.hxx
@@ -53,70 +53,70 @@ private:
     SCROW			nStartRow;
     SCCOL			nEndCol;
     SCROW			nEndRow;
-    BOOL			bByRow;
-    BOOL			bHasHeader;
-    BOOL			bDoSize;
-    BOOL			bKeepFmt;
-    BOOL			bStripData;
+    sal_Bool			bByRow;
+    sal_Bool			bHasHeader;
+    sal_Bool			bDoSize;
+    sal_Bool			bKeepFmt;
+    sal_Bool			bStripData;
     // SortParam
-    BOOL			bSortCaseSens;
-    BOOL			bIncludePattern;
-    BOOL			bSortInplace;
-    BOOL			bSortUserDef;
-    USHORT			nSortUserIndex;
+    sal_Bool			bSortCaseSens;
+    sal_Bool			bIncludePattern;
+    sal_Bool			bSortInplace;
+    sal_Bool			bSortUserDef;
+    sal_uInt16			nSortUserIndex;
     SCTAB			nSortDestTab;
     SCCOL			nSortDestCol;
     SCROW			nSortDestRow;
-    BOOL			bDoSort[MAXSORT];
+    sal_Bool			bDoSort[MAXSORT];
     SCCOLROW		nSortField[MAXSORT];
-    BOOL			bAscending[MAXSORT];
+    sal_Bool			bAscending[MAXSORT];
     ::com::sun::star::lang::Locale aSortLocale;
     String			aSortAlgorithm;
     // QueryParam
-    BOOL			bQueryInplace;
-    BOOL			bQueryCaseSens;
-    BOOL			bQueryRegExp;
-    BOOL			bQueryDuplicate;
+    sal_Bool			bQueryInplace;
+    sal_Bool			bQueryCaseSens;
+    sal_Bool			bQueryRegExp;
+    sal_Bool			bQueryDuplicate;
     SCTAB			nQueryDestTab;
     SCCOL			nQueryDestCol;
     SCROW			nQueryDestRow;
-    BOOL			bDoQuery[MAXQUERY];
+    sal_Bool			bDoQuery[MAXQUERY];
     SCCOLROW		nQueryField[MAXQUERY];
     ScQueryOp		eQueryOp[MAXQUERY];
-    BOOL			bQueryByString[MAXQUERY];
+    sal_Bool			bQueryByString[MAXQUERY];
     bool            bQueryByDate[MAXQUERY];
     String*			pQueryStr[MAXQUERY];
     double			nQueryVal[MAXQUERY];
     ScQueryConnect  eQueryConnect[MAXQUERY];
-    BOOL			bIsAdvanced;		// TRUE if created by advanced filter
+    sal_Bool			bIsAdvanced;		// sal_True if created by advanced filter
     ScRange			aAdvSource;			// source range
     // SubTotalParam
-    BOOL			bSubRemoveOnly;
-    BOOL			bSubReplace;
-    BOOL			bSubPagebreak;
-    BOOL			bSubCaseSens;
-    BOOL			bSubDoSort;
-    BOOL			bSubAscending;
-    BOOL			bSubIncludePattern;
-    BOOL			bSubUserDef;
-    USHORT			nSubUserIndex;
-    BOOL			bDoSubTotal[MAXSUBTOTAL];
+    sal_Bool			bSubRemoveOnly;
+    sal_Bool			bSubReplace;
+    sal_Bool			bSubPagebreak;
+    sal_Bool			bSubCaseSens;
+    sal_Bool			bSubDoSort;
+    sal_Bool			bSubAscending;
+    sal_Bool			bSubIncludePattern;
+    sal_Bool			bSubUserDef;
+    sal_uInt16			nSubUserIndex;
+    sal_Bool			bDoSubTotal[MAXSUBTOTAL];
     SCCOL			nSubField[MAXSUBTOTAL];
     SCCOL			nSubTotals[MAXSUBTOTAL];
     SCCOL*			pSubTotals[MAXSUBTOTAL];
     ScSubTotalFunc*	pFunctions[MAXSUBTOTAL];
     // Datenbank-Import
-    BOOL			bDBImport;
+    sal_Bool			bDBImport;
     String			aDBName;
     String			aDBStatement;
-    BOOL			bDBNative;
-    BOOL			bDBSelection;		// nicht im Param: Wenn Selektion, Update sperren
-    BOOL			bDBSql;				// aDBStatement ist SQL und kein Name
-    BYTE			nDBType;			// enum DBObject (bisher nur dbTable, dbQuery)
+    sal_Bool			bDBNative;
+    sal_Bool			bDBSelection;		// nicht im Param: Wenn Selektion, Update sperren
+    sal_Bool			bDBSql;				// aDBStatement ist SQL und kein Name
+    sal_uInt8			nDBType;			// enum DBObject (bisher nur dbTable, dbQuery)
 
-    USHORT			nIndex; 			// eindeutiger Index fuer Formeln
-    BOOL			bAutoFilter;		// AutoFilter? (nicht gespeichert)
-    BOOL			bModified;			// wird bei UpdateReference gesetzt/geloescht
+    sal_uInt16			nIndex; 			// eindeutiger Index fuer Formeln
+    sal_Bool			bAutoFilter;		// AutoFilter? (nicht gespeichert)
+    sal_Bool			bModified;			// wird bei UpdateReference gesetzt/geloescht
 
     using ScRefreshTimer::operator==;
 
@@ -124,7 +124,7 @@ public:
             SC_DLLPUBLIC ScDBData(const String& rName,
                      SCTAB nTab,
                      SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                     BOOL bByR = TRUE, BOOL bHasH = TRUE);
+                     sal_Bool bByR = sal_True, sal_Bool bHasH = sal_True);
             ScDBData(const ScDBData& rData);
             ~ScDBData();
 
@@ -132,7 +132,7 @@ public:
 
             ScDBData&	operator= (const ScDBData& rData);
 
-            BOOL		operator== (const ScDBData& rData) const;
+            sal_Bool		operator== (const ScDBData& rData) const;
 
             const String& GetName() const				{ return aName; }
             void		GetName(String& rName) const	{ rName = aName; }
@@ -141,20 +141,20 @@ public:
             SC_DLLPUBLIC void		GetArea(ScRange& rRange) const;
             void		SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
             void		MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
-            BOOL		IsByRow() const 				{ return bByRow; }
-            void		SetByRow(BOOL bByR) 			{ bByRow = bByR; }
-            BOOL		HasHeader() const 				{ return bHasHeader; }
-            void		SetHeader(BOOL bHasH) 			{ bHasHeader = bHasH; }
-            void        SetIndex(USHORT nInd)           { nIndex = nInd; }
-            USHORT		GetIndex() const				{ return nIndex; }
-            BOOL		IsDoSize() const				{ return bDoSize; }
-            void		SetDoSize(BOOL bSet)			{ bDoSize = bSet; }
-            BOOL		IsKeepFmt() const				{ return bKeepFmt; }
-            void		SetKeepFmt(BOOL bSet)			{ bKeepFmt = bSet; }
-            BOOL		IsStripData() const				{ return bStripData; }
-            void		SetStripData(BOOL bSet)			{ bStripData = bSet; }
-
-//UNUSED2008-05  BOOL		IsBeyond(SCROW nMaxRow) const;
+            sal_Bool		IsByRow() const 				{ return bByRow; }
+            void		SetByRow(sal_Bool bByR) 			{ bByRow = bByR; }
+            sal_Bool		HasHeader() const 				{ return bHasHeader; }
+            void		SetHeader(sal_Bool bHasH) 			{ bHasHeader = bHasH; }
+            void        SetIndex(sal_uInt16 nInd)           { nIndex = nInd; }
+            sal_uInt16		GetIndex() const				{ return nIndex; }
+            sal_Bool		IsDoSize() const				{ return bDoSize; }
+            void		SetDoSize(sal_Bool bSet)			{ bDoSize = bSet; }
+            sal_Bool		IsKeepFmt() const				{ return bKeepFmt; }
+            void		SetKeepFmt(sal_Bool bSet)			{ bKeepFmt = bSet; }
+            sal_Bool		IsStripData() const				{ return bStripData; }
+            void		SetStripData(sal_Bool bSet)			{ bStripData = bSet; }
+
+//UNUSED2008-05  sal_Bool		IsBeyond(SCROW nMaxRow) const;
 
             String		GetSourceString() const;
             String		GetOperations() const;
@@ -164,7 +164,7 @@ public:
 
             SC_DLLPUBLIC void		GetQueryParam(ScQueryParam& rQueryParam) const;
             SC_DLLPUBLIC void		SetQueryParam(const ScQueryParam& rQueryParam);
-            SC_DLLPUBLIC BOOL		GetAdvancedQuerySource(ScRange& rSource) const;
+            SC_DLLPUBLIC sal_Bool		GetAdvancedQuerySource(ScRange& rSource) const;
             SC_DLLPUBLIC void		SetAdvancedQuerySource(const ScRange* pSource);
 
             void		GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const;
@@ -173,22 +173,22 @@ public:
             void		GetImportParam(ScImportParam& rImportParam) const;
             void		SetImportParam(const ScImportParam& rImportParam);
 
-            BOOL		IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const;
-            BOOL		IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
+            sal_Bool		IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const;
+            sal_Bool		IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
 
-            BOOL		HasImportParam() const	 { return bDBImport; }
-            BOOL		HasQueryParam() const	 { return bDoQuery[0]; }
-            BOOL		HasSortParam() const	 { return bDoSort[0]; }
-            BOOL		HasSubTotalParam() const { return bDoSubTotal[0]; }
+            sal_Bool		HasImportParam() const	 { return bDBImport; }
+            sal_Bool		HasQueryParam() const	 { return bDoQuery[0]; }
+            sal_Bool		HasSortParam() const	 { return bDoSort[0]; }
+            sal_Bool		HasSubTotalParam() const { return bDoSubTotal[0]; }
 
-            BOOL		HasImportSelection() const		{ return bDBSelection; }
-            void		SetImportSelection(BOOL bSet)	{ bDBSelection = bSet; }
+            sal_Bool		HasImportSelection() const		{ return bDBSelection; }
+            void		SetImportSelection(sal_Bool bSet)	{ bDBSelection = bSet; }
 
-            BOOL		HasAutoFilter() const 		{ return bAutoFilter; }
-            void		SetAutoFilter(BOOL bSet)	{ bAutoFilter = bSet; }
+            sal_Bool		HasAutoFilter() const 		{ return bAutoFilter; }
+            void		SetAutoFilter(sal_Bool bSet)	{ bAutoFilter = bSet; }
 
-            BOOL		IsModified() const			{ return bModified; }
-            void		SetModified(BOOL bMod)		{ bModified = bMod; }
+            sal_Bool		IsModified() const			{ return bModified; }
+            void		SetModified(sal_Bool bMod)		{ bModified = bMod; }
 };
 
 
@@ -199,10 +199,10 @@ class SC_DLLPUBLIC ScDBCollection : public ScSortedCollection
 private:
     Link		aRefreshHandler;
     ScDocument* pDoc;
-    USHORT nEntryIndex;			// Zaehler fuer die eindeutigen Indizes
+    sal_uInt16 nEntryIndex;			// Zaehler fuer die eindeutigen Indizes
 
 public:
-    ScDBCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, ScDocument* pDocument = NULL) :
+    ScDBCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False, ScDocument* pDocument = NULL) :
                     ScSortedCollection	( nLim, nDel, bDup ),
                     pDoc				( pDocument ),
                     nEntryIndex			( SC_START_INDEX_DB_COLL )	// oberhalb der Namen
@@ -214,13 +214,13 @@ public:
                     {}
 
     virtual	ScDataObject*	Clone() const { return new ScDBCollection(*this); }
-            ScDBData*	operator[]( const USHORT nIndex) const {return (ScDBData*)At(nIndex);}
+            ScDBData*	operator[]( const sal_uInt16 nIndex) const {return (ScDBData*)At(nIndex);}
     virtual	short		Compare(ScDataObject* pKey1, ScDataObject* pKey2) const;
-    virtual	BOOL		IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
-            ScDBData*	GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const;
+    virtual	sal_Bool		IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
+            ScDBData*	GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const;
             ScDBData*	GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
 
-    BOOL	SearchName( const String& rName, USHORT& rIndex ) const;
+    sal_Bool	SearchName( const String& rName, sal_uInt16& rIndex ) const;
 
     void    DeleteOnTab( SCTAB nTab );
     void	UpdateReference(UpdateRefMode eUpdateRefMode,
@@ -229,10 +229,10 @@ public:
                                 SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
     void	UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos );
 
-    ScDBData* FindIndex(USHORT nIndex);
-    USHORT 	GetEntryIndex()					{ return nEntryIndex; }
-    void 	SetEntryIndex(USHORT nInd)		{ nEntryIndex = nInd; }
-    virtual BOOL Insert(ScDataObject* pScDataObject);
+    ScDBData* FindIndex(sal_uInt16 nIndex);
+    sal_uInt16 	GetEntryIndex()					{ return nEntryIndex; }
+    void 	SetEntryIndex(sal_uInt16 nInd)		{ nEntryIndex = nInd; }
+    virtual sal_Bool Insert(ScDataObject* pScDataObject);
 
     void			SetRefreshHandler( const Link& rLink )
                         { aRefreshHandler = rLink; }
diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx
index 2ee1e37cf..95b2b6a67 100644
--- a/sc/inc/dbdocutl.hxx
+++ b/sc/inc/dbdocutl.hxx
@@ -45,7 +45,7 @@ public:
     static void PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
                         const ::com::sun::star::uno::Reference<
                             ::com::sun::star::sdbc::XRow>& xRow, long nRowPos,
-                        long nType, BOOL bCurrency, BOOL* pSimpleFlag = NULL );
+                        long nType, sal_Bool bCurrency, sal_Bool* pSimpleFlag = NULL );
 };
 
 #endif
diff --git a/sc/inc/dbtoken.hxx b/sc/inc/dbtoken.hxx
index 1fe6f192a..b2614be5a 100644
--- a/sc/inc/dbtoken.hxx
+++ b/sc/inc/dbtoken.hxx
@@ -37,17 +37,17 @@
 // aA - dump old/new token array
 // uU - dump old/new UPN array
 
-BOOL DbgToken( char );
+sal_Bool DbgToken( char );
 ScTokenArray* DbgMakeTokenArray
-    ( ScDocument* pDoc, SCTAB nTab, const String& r, USHORT& rErr );
-void DbgDumpTokenArray( const BYTE* pArr, USHORT nLen, const char* pMsg );
+    ( ScDocument* pDoc, SCTAB nTab, const String& r, sal_uInt16& rErr );
+void DbgDumpTokenArray( const sal_uInt8* pArr, sal_uInt16 nLen, const char* pMsg );
 void DbgDelTokenArray( ScTokenArray* );
 formula::StackVar DbgInterpret( ScDocument* pDok, const ScTokenArray* pToken,
                        SCCOL nCOL, SCROW nROW, SCTAB nTAB,
                                   formula::StackVar eformula::StackVar,
                                   char* &rStringErgPtr,
                                   double& rDoubleErg,
-                                  USHORT& rError,
+                                  sal_uInt16& rError,
                                   ScMatrix** ppMat);
 
 #endif
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index 89609d516..2482cf337 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -83,10 +83,10 @@ SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW, SC_DETOP_GROW
 
 class ScDetOpList : public ScDetOpArr_Impl
 {
-    BOOL	bHasAddError;		// updated in Append
+    sal_Bool	bHasAddError;		// updated in Append
 
 public:
-        ScDetOpList() : bHasAddError(FALSE) {}
+        ScDetOpList() : bHasAddError(sal_False) {}
         ScDetOpList(const ScDetOpList& rList);
         ~ScDetOpList() {}
 
@@ -94,11 +94,11 @@ public:
     void	UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
 
-    BOOL	operator==( const ScDetOpList& r ) const;		// fuer Ref-Undo
+    sal_Bool	operator==( const ScDetOpList& r ) const;		// fuer Ref-Undo
 
     void	Append( ScDetOpData* pData );
 
-    BOOL	HasAddError() const		{ return bHasAddError; }
+    sal_Bool	HasAddError() const		{ return bHasAddError; }
 };
 
 
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 4e72deafe..19b2e8fa4 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -62,7 +62,7 @@ class SC_DLLPUBLIC ScDetectiveFunc
     static ColorData nArrowColor;
     static ColorData nErrorColor;
     static ColorData nCommentColor;
-    static BOOL		 bColorsInitialized;
+    static sal_Bool		 bColorsInitialized;
 
     ScDocument*		pDoc;
     SCTAB			nTab;
@@ -85,80 +85,80 @@ class SC_DLLPUBLIC ScDetectiveFunc
     /** Returns the drawing layer rectangle for the passed cell address. */
     Rectangle   GetDrawRect( SCCOL nCol, SCROW nRow ) const;
 
-    BOOL		HasArrow( const ScAddress& rStart,
+    sal_Bool		HasArrow( const ScAddress& rStart,
                             SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
 
-    void		DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt );
+    void		DeleteArrowsAt( SCCOL nCol, SCROW nRow, sal_Bool bDestPnt );
     void		DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
 
-    BOOL		HasError( const ScRange& rRange, ScAddress& rErrPos );
+    sal_Bool		HasError( const ScRange& rRange, ScAddress& rErrPos );
 
     void		FillAttributes( ScDetectiveData& rData );
 
                 // called from DrawEntry/DrawAlienEntry and InsertObject
-    BOOL		InsertArrow( SCCOL nCol, SCROW nRow,
+    sal_Bool		InsertArrow( SCCOL nCol, SCROW nRow,
                                 SCCOL nRefStartCol, SCROW nRefStartRow,
                                 SCCOL nRefEndCol, SCROW nRefEndRow,
-                                BOOL bFromOtherTab, BOOL bRed,
+                                sal_Bool bFromOtherTab, sal_Bool bRed,
                                 ScDetectiveData& rData );
-    BOOL		InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
-                                SCCOL nEndCol, SCROW nEndRow, BOOL bRed,
+    sal_Bool		InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
+                                SCCOL nEndCol, SCROW nEndRow, sal_Bool bRed,
                                 ScDetectiveData& rData );
 
                 // DrawEntry / DrawAlienEntry check for existing arrows and errors
-    BOOL		DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef,
+    sal_Bool		DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef,
                                 ScDetectiveData& rData );
-    BOOL		DrawAlienEntry( const ScRange& rRef,
+    sal_Bool		DrawAlienEntry( const ScRange& rRef,
                                 ScDetectiveData& rData );
 
     void		DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData );
 
-    USHORT		InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel );
-    USHORT		InsertPredLevelArea( const ScRange& rRef,
-                                        ScDetectiveData& rData, USHORT nLevel );
-    USHORT		FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel );
-    USHORT		FindPredLevelArea( const ScRange& rRef,
-                                    USHORT nLevel, USHORT nDeleteLevel );
+    sal_uInt16		InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, sal_uInt16 nLevel );
+    sal_uInt16		InsertPredLevelArea( const ScRange& rRef,
+                                        ScDetectiveData& rData, sal_uInt16 nLevel );
+    sal_uInt16		FindPredLevel( SCCOL nCol, SCROW nRow, sal_uInt16 nLevel, sal_uInt16 nDeleteLevel );
+    sal_uInt16		FindPredLevelArea( const ScRange& rRef,
+                                    sal_uInt16 nLevel, sal_uInt16 nDeleteLevel );
 
-    USHORT		InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel );
+    sal_uInt16		InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, sal_uInt16 nLevel );
 
-    USHORT		InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                        ScDetectiveData& rData, USHORT nLevel );
-    USHORT		FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                USHORT nLevel, USHORT nDeleteLevel );
+    sal_uInt16		InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                                        ScDetectiveData& rData, sal_uInt16 nLevel );
+    sal_uInt16		FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                                sal_uInt16 nLevel, sal_uInt16 nDeleteLevel );
 
-    BOOL		FindFrameForObject( SdrObject* pObject, ScRange& rRange );
+    sal_Bool		FindFrameForObject( SdrObject* pObject, ScRange& rRange );
 
     void        Modified();
 
 public:
                 ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : pDoc(pDocument),nTab(nTable) {}
 
-    BOOL		ShowSucc( SCCOL nCol, SCROW nRow );
-    BOOL		ShowPred( SCCOL nCol, SCROW nRow );
-    BOOL		ShowError( SCCOL nCol, SCROW nRow );
+    sal_Bool		ShowSucc( SCCOL nCol, SCROW nRow );
+    sal_Bool		ShowPred( SCCOL nCol, SCROW nRow );
+    sal_Bool		ShowError( SCCOL nCol, SCROW nRow );
 
-    BOOL		DeleteSucc( SCCOL nCol, SCROW nRow );
-    BOOL		DeletePred( SCCOL nCol, SCROW nRow );
-    BOOL		DeleteAll( ScDetectiveDelete eWhat );
+    sal_Bool		DeleteSucc( SCCOL nCol, SCROW nRow );
+    sal_Bool		DeletePred( SCCOL nCol, SCROW nRow );
+    sal_Bool		DeleteAll( ScDetectiveDelete eWhat );
 
-    BOOL		MarkInvalid(BOOL& rOverflow);
+    sal_Bool		MarkInvalid(sal_Bool& rOverflow);
 
     static void UpdateAllComments( ScDocument& rDoc );        // on all tables
     void		UpdateAllArrowColors();		// on all tables
 
-    static BOOL	IsNonAlienArrow( SdrObject* pObject );
+    static sal_Bool	IsNonAlienArrow( SdrObject* pObject );
 
     ScDetectiveObjType GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab,
-                                ScAddress& rPosition, ScRange& rSource, BOOL& rRedLine );
+                                ScAddress& rPosition, ScRange& rSource, sal_Bool& rRedLine );
     void		InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition,
-                                const ScRange& rSource, BOOL bRedLine );
+                                const ScRange& rSource, sal_Bool bRedLine );
 
     static ColorData GetArrowColor();
     static ColorData GetErrorColor();
     static ColorData GetCommentColor();
     static void InitializeColors();
-    static BOOL	IsColorsInitialized();
+    static sal_Bool	IsColorsInitialized();
 };
 
 
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index d63a08a3d..1fd3cd813 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -64,15 +64,15 @@ private:
     SCSIZE					nColPos;
     SCSIZE					nAttrPos;
 
-    BOOL					GetThis();
-    BOOL					GetThisCol();
+    sal_Bool					GetThis();
+    sal_Bool					GetThisCol();
 
 public:
             ScDocumentIterator( ScDocument* pDocument, SCTAB nStartTable, SCTAB nEndTable );
             ~ScDocumentIterator();
 
-    BOOL					GetFirst();
-    BOOL					GetNext();
+    sal_Bool					GetFirst();
+    sal_Bool					GetNext();
 
     ScBaseCell*				GetCell();
     const ScPatternAttr*	GetPattern();
@@ -85,8 +85,8 @@ private:
     double			fNextValue;
     ScDocument*		pDoc;
     const ScAttrArray*	pAttrArray;
-    ULONG			nNumFormat;		// fuer CalcAsShown
-    ULONG			nNumFmtIndex;
+    sal_uLong			nNumFormat;		// fuer CalcAsShown
+    sal_uLong			nNumFmtIndex;
     SCCOL			nStartCol;
     SCROW			nStartRow;
     SCTAB			nStartTab;
@@ -100,31 +100,31 @@ private:
     SCROW			nNextRow;
     SCROW			nAttrEndRow;
     short			nNumFmtType;
-    BOOL			bNumValid;
-    BOOL			bSubTotal;
-    BOOL			bNextValid;
-    BOOL			bCalcAsShown;
-    BOOL			bTextAsZero;
+    sal_Bool			bNumValid;
+    sal_Bool			bSubTotal;
+    sal_Bool			bNextValid;
+    sal_Bool			bCalcAsShown;
+    sal_Bool			bTextAsZero;
 
-    BOOL			GetThis(double& rValue, USHORT& rErr);
+    sal_Bool			GetThis(double& rValue, sal_uInt16& rErr);
 public:
 //UNUSED2008-05  ScValueIterator(ScDocument* pDocument,
 //UNUSED2008-05                  SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
 //UNUSED2008-05                  SCCOL nECol, SCROW nERow, SCTAB nETab,
-//UNUSED2008-05                  BOOL bSTotal = FALSE, BOOL bTextAsZero = FALSE);
+//UNUSED2008-05                  sal_Bool bSTotal = sal_False, sal_Bool bTextAsZero = sal_False);
 
                     ScValueIterator(ScDocument* pDocument,
-                                    const ScRange& rRange, BOOL bSTotal = FALSE,
-                                    BOOL bTextAsZero = FALSE );
-    void			GetCurNumFmtInfo( short& nType, ULONG& nIndex );
+                                    const ScRange& rRange, sal_Bool bSTotal = sal_False,
+                                    sal_Bool bTextAsZero = sal_False );
+    void			GetCurNumFmtInfo( short& nType, sal_uLong& nIndex );
     /// Does NOT reset rValue if no value found!
-    BOOL			GetFirst(double& rValue, USHORT& rErr);
+    sal_Bool			GetFirst(double& rValue, sal_uInt16& rErr);
     /// Does NOT reset rValue if no value found!
-    BOOL			GetNext(double& rValue, USHORT& rErr)
+    sal_Bool			GetNext(double& rValue, sal_uInt16& rErr)
                     {
-                        return bNextValid ? ( bNextValid = FALSE, rValue = fNextValue,
+                        return bNextValid ? ( bNextValid = sal_False, rValue = fNextValue,
                                                 rErr = 0, nRow = nNextRow,
-                                                ++nColRow, bNumValid = FALSE, TRUE )
+                                                ++nColRow, bNumValid = sal_False, sal_True )
                                           : ( ++nRow, GetThis(rValue, rErr) );
                     }
 };
@@ -176,8 +176,8 @@ private:
         ScDBQueryParamInternal* mpParam;
         ScDocument*         mpDoc;
         const ScAttrArray*  pAttrArray;
-        ULONG               nNumFormat;     // for CalcAsShown
-        ULONG               nNumFmtIndex;
+        sal_uLong               nNumFormat;     // for CalcAsShown
+        sal_uLong               nNumFmtIndex;
         SCCOL               nCol;
         SCROW               nRow;
         SCSIZE              nColRow;
@@ -232,16 +232,16 @@ private:						// SubTotalZeilen
     SCROW			nRow;
     SCTAB			nTab;
     SCSIZE			nColRow;
-    BOOL			bSubTotal;
+    sal_Bool			bSubTotal;
 
     ScBaseCell*		GetThis();
 public:
                     ScCellIterator(ScDocument* pDocument,
                                    SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
                                    SCCOL nECol, SCROW nERow, SCTAB nETab,
-                                   BOOL bSTotal = FALSE);
+                                   sal_Bool bSTotal = sal_False);
                     ScCellIterator(ScDocument* pDocument,
-                                   const ScRange& rRange, BOOL bSTotal = FALSE);
+                                   const ScRange& rRange, sal_Bool bSTotal = sal_False);
     ScBaseCell*		GetFirst();
     ScBaseCell*		GetNext();
     SCCOL           GetCol() const { return nCol; }
@@ -272,16 +272,16 @@ private:
     ScQueryParam	aParam;
     ScDocument*		pDoc;
     const ScAttrArray*	pAttrArray;
-    ULONG			nNumFormat;
+    sal_uLong			nNumFormat;
     SCTAB			nTab;
     SCCOL 			nCol;
     SCROW			nRow;
     SCSIZE			nColRow;
     SCROW			nAttrEndRow;
-    BYTE            nStopOnMismatch;
-    BYTE            nTestEqualCondition;
-    BOOL			bAdvanceQuery;
-    BOOL            bIgnoreMismatchOnLeadingStrings;
+    sal_uInt8            nStopOnMismatch;
+    sal_uInt8            nTestEqualCondition;
+    sal_Bool			bAdvanceQuery;
+    sal_Bool            bIgnoreMismatchOnLeadingStrings;
 
     ScBaseCell*		GetThis();
 
@@ -298,8 +298,8 @@ private:
 
 public:
                     ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable,
-                                        const ScQueryParam& aParam, BOOL bMod = TRUE);
-                                        // fuer bMod = FALSE muss der QueryParam
+                                        const ScQueryParam& aParam, sal_Bool bMod = sal_True);
+                                        // fuer bMod = sal_False muss der QueryParam
                                         // weiter aufgefuellt sein (bIsString)
     ScBaseCell*		GetFirst();
     ScBaseCell*		GetNext();
@@ -308,7 +308,7 @@ public:
 
                     // setzt alle Entry.nField einen weiter, wenn Spalte
                     // wechselt, fuer ScInterpreter ScHLookup()
-    void			SetAdvanceQueryParamEntryField( BOOL bVal )
+    void			SetAdvanceQueryParamEntryField( sal_Bool bVal )
                         { bAdvanceQuery = bVal; }
     void			AdvanceQueryParamEntryField();
 
@@ -317,17 +317,17 @@ public:
                         cell range is assumed to be sorted; stops on first
                         value being greater than the queried value and
                         GetFirst()/GetNext() return NULL. StoppedOnMismatch()
-                        returns TRUE then.
+                        returns sal_True then.
                         However, the iterator's conditions are not set to end
                         all queries, GetCol() and GetRow() return values for
                         the non-matching cell, further GetNext() calls may be
                         executed. */
-    void            SetStopOnMismatch( BOOL bVal )
+    void            SetStopOnMismatch( sal_Bool bVal )
                         {
-                            nStopOnMismatch = sal::static_int_cast<BYTE>(bVal ? nStopOnMismatchEnabled :
+                            nStopOnMismatch = sal::static_int_cast<sal_uInt8>(bVal ? nStopOnMismatchEnabled :
                                 nStopOnMismatchDisabled);
                         }
-    BOOL            StoppedOnMismatch() const
+    sal_Bool            StoppedOnMismatch() const
                         { return nStopOnMismatch == nStopOnMismatchExecuted; }
 
                     /** If set, an additional test for SC_EQUAL condition is
@@ -335,13 +335,13 @@ public:
                         SC_GREATER_EQUAL conditions are to be tested. May be
                         used where a cell range is assumed to be sorted to stop
                         if an equal match is found. */
-    void            SetTestEqualCondition( BOOL bVal )
+    void            SetTestEqualCondition( sal_Bool bVal )
                         {
-                            nTestEqualCondition = sal::static_int_cast<BYTE>(bVal ?
+                            nTestEqualCondition = sal::static_int_cast<sal_uInt8>(bVal ?
                                 nTestEqualConditionEnabled :
                                 nTestEqualConditionDisabled);
                         }
-    BOOL            IsEqualConditionFulfilled() const
+    sal_Bool            IsEqualConditionFulfilled() const
                         { return nTestEqualCondition == nTestEqualConditionFulfilled; }
 
                     /** In a range assumed to be sorted find either the last of
@@ -359,7 +359,7 @@ public:
 
                         @param bIgnoreMismatchOnLeadingStrings
                             Normally strings are sorted behind numerical
-                            values. If this parameter is TRUE, the search does
+                            values. If this parameter is sal_True, the search does
                             not stop when encountering a string and does not
                             assume that no values follow anymore.
                             If querying for a string a mismatch on the first
@@ -371,9 +371,9 @@ public:
                         iterator is not usable anymore except for obtaining the
                         number format!
                       */
-    BOOL            FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
-                        SCROW& nFoundRow, BOOL bSearchForEqualAfterMismatch = FALSE,
-                        BOOL bIgnoreMismatchOnLeadingStrings = TRUE );
+    sal_Bool            FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
+                        SCROW& nFoundRow, sal_Bool bSearchForEqualAfterMismatch = sal_False,
+                        sal_Bool bIgnoreMismatchOnLeadingStrings = sal_True );
 };
 
 class ScDocAttrIterator				// alle Attribut-Bereiche
@@ -428,7 +428,7 @@ private:
     SCSIZE*			pNextIndices;
     SCCOL			nCol;
     SCROW			nRow;
-    BOOL			bMore;
+    sal_Bool			bMore;
 
 public:
                     ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable,
@@ -436,7 +436,7 @@ public:
                     ~ScHorizontalCellIterator();
 
     ScBaseCell*		GetNext( SCCOL& rCol, SCROW& rRow );
-    BOOL			ReturnNext( SCCOL& rCol, SCROW& rRow );
+    sal_Bool			ReturnNext( SCCOL& rCol, SCROW& rRow );
 
 private:
     void			Advance();
@@ -462,7 +462,7 @@ private:
     const ScPatternAttr**	ppPatterns;
     SCCOL					nCol;
     SCROW					nRow;
-    BOOL					bRowEmpty;
+    sal_Bool					bRowEmpty;
 
 public:
             ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable,
@@ -504,7 +504,7 @@ public:
                                 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
             ~ScUsedAreaIterator();
 
-    BOOL	GetNext();
+    sal_Bool	GetNext();
 
     SCCOL					GetStartCol() const		{ return nFoundStartCol; }
     SCCOL					GetEndCol() const		{ return nFoundEndCol; }
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index c64897898..ec4524ed5 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -37,47 +37,47 @@
 class SC_DLLPUBLIC ScDocOptions
 {
     double fIterEps;				// Epsilon-Wert dazu
-    USHORT nIterCount;				// Anzahl
+    sal_uInt16 nIterCount;				// Anzahl
     sal_uInt16 nPrecStandardFormat; // precision for standard format
-    USHORT nDay;					// Nulldatum:
-    USHORT nMonth;
-    USHORT nYear;
-    USHORT nYear2000;				// bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird
-    USHORT nTabDistance;			// Abstand Standardtabulatoren
-    BOOL   bIsIgnoreCase;			// Gross-/Kleinschr. bei Vergleichen
-    BOOL   bIsIter;					// Iteration bei cirk. Ref
-    BOOL   bCalcAsShown;			// berechnen wie angezeigt (Precision)
-    BOOL   bMatchWholeCell;			// Suchkriterien muessen ganze Zelle matchen
-    BOOL   bDoAutoSpell;			// Auto-Spelling
-    BOOL   bLookUpColRowNames;		// Spalten-/Zeilenbeschriftungen automagisch suchen
-    BOOL   bFormulaRegexEnabled;    // regular expressions in formulas enabled
+    sal_uInt16 nDay;					// Nulldatum:
+    sal_uInt16 nMonth;
+    sal_uInt16 nYear;
+    sal_uInt16 nYear2000;				// bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird
+    sal_uInt16 nTabDistance;			// Abstand Standardtabulatoren
+    sal_Bool   bIsIgnoreCase;			// Gross-/Kleinschr. bei Vergleichen
+    sal_Bool   bIsIter;					// Iteration bei cirk. Ref
+    sal_Bool   bCalcAsShown;			// berechnen wie angezeigt (Precision)
+    sal_Bool   bMatchWholeCell;			// Suchkriterien muessen ganze Zelle matchen
+    sal_Bool   bDoAutoSpell;			// Auto-Spelling
+    sal_Bool   bLookUpColRowNames;		// Spalten-/Zeilenbeschriftungen automagisch suchen
+    sal_Bool   bFormulaRegexEnabled;    // regular expressions in formulas enabled
 
 public:
                 ScDocOptions();
                 ScDocOptions( const ScDocOptions& rCpy );
                 ~ScDocOptions();
 
-    BOOL   IsLookUpColRowNames() const	{ return bLookUpColRowNames; }
-    void   SetLookUpColRowNames( BOOL bVal ) { bLookUpColRowNames = bVal; }
-    BOOL   IsAutoSpell() const			{ return bDoAutoSpell; }
-    void   SetAutoSpell( BOOL bVal )	{ bDoAutoSpell = bVal; }
-    BOOL   IsMatchWholeCell() const		{ return bMatchWholeCell; }
-    void   SetMatchWholeCell( BOOL bVal ){ bMatchWholeCell = bVal; }
-    BOOL   IsIgnoreCase() const			{ return bIsIgnoreCase; }
-    void   SetIgnoreCase( BOOL bVal )	{ bIsIgnoreCase = bVal; }
-    BOOL   IsIter() const				{ return bIsIter; }
-    void   SetIter( BOOL bVal )			{ bIsIter = bVal; }
-    USHORT GetIterCount() const			{ return nIterCount; }
-    void   SetIterCount( USHORT nCount) { nIterCount = nCount; }
+    sal_Bool   IsLookUpColRowNames() const	{ return bLookUpColRowNames; }
+    void   SetLookUpColRowNames( sal_Bool bVal ) { bLookUpColRowNames = bVal; }
+    sal_Bool   IsAutoSpell() const			{ return bDoAutoSpell; }
+    void   SetAutoSpell( sal_Bool bVal )	{ bDoAutoSpell = bVal; }
+    sal_Bool   IsMatchWholeCell() const		{ return bMatchWholeCell; }
+    void   SetMatchWholeCell( sal_Bool bVal ){ bMatchWholeCell = bVal; }
+    sal_Bool   IsIgnoreCase() const			{ return bIsIgnoreCase; }
+    void   SetIgnoreCase( sal_Bool bVal )	{ bIsIgnoreCase = bVal; }
+    sal_Bool   IsIter() const				{ return bIsIter; }
+    void   SetIter( sal_Bool bVal )			{ bIsIter = bVal; }
+    sal_uInt16 GetIterCount() const			{ return nIterCount; }
+    void   SetIterCount( sal_uInt16 nCount) { nIterCount = nCount; }
     double GetIterEps() const			{ return fIterEps; }
     void   SetIterEps( double fEps )	{ fIterEps = fEps; }
 
-    void   GetDate( USHORT& rD, USHORT& rM, USHORT& rY ) const
+    void   GetDate( sal_uInt16& rD, sal_uInt16& rM, sal_uInt16& rY ) const
                                         { rD = nDay; rM = nMonth; rY = nYear;}
-    void   SetDate (USHORT nD, USHORT nM, USHORT nY)
+    void   SetDate (sal_uInt16 nD, sal_uInt16 nM, sal_uInt16 nY)
                                         { nDay = nD; nMonth = nM; nYear = nY; }
-    USHORT GetTabDistance() const { return nTabDistance;}
-    void   SetTabDistance( USHORT nTabDist ) {nTabDistance = nTabDist;}
+    sal_uInt16 GetTabDistance() const { return nTabDistance;}
+    void   SetTabDistance( sal_uInt16 nTabDist ) {nTabDistance = nTabDist;}
 
     void		ResetDocOptions();
     inline void		CopyTo(ScDocOptions& rOpt);
@@ -89,14 +89,14 @@ public:
     sal_uInt16  GetStdPrecision() const { return nPrecStandardFormat; }
     void        SetStdPrecision( sal_uInt16 n ) { nPrecStandardFormat = n; }
 
-    BOOL	IsCalcAsShown() const		{ return bCalcAsShown; }
-    void	SetCalcAsShown( BOOL bVal )	{ bCalcAsShown = bVal; }
+    sal_Bool	IsCalcAsShown() const		{ return bCalcAsShown; }
+    void	SetCalcAsShown( sal_Bool bVal )	{ bCalcAsShown = bVal; }
 
-    void	SetYear2000( USHORT nVal )	{ nYear2000 = nVal; }
-    USHORT	GetYear2000() const			{ return nYear2000; }
+    void	SetYear2000( sal_uInt16 nVal )	{ nYear2000 = nVal; }
+    sal_uInt16	GetYear2000() const			{ return nYear2000; }
 
-    void    SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; }
-    BOOL    IsFormulaRegexEnabled() const       { return bFormulaRegexEnabled; }
+    void    SetFormulaRegexEnabled( sal_Bool bVal ) { bFormulaRegexEnabled = bVal; }
+    sal_Bool    IsFormulaRegexEnabled() const       { return bFormulaRegexEnabled; }
 };
 
 
@@ -174,8 +174,8 @@ class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-//UNUSED2008-05  ScTpCalcItem( USHORT nWhich );
-                ScTpCalcItem( USHORT nWhich,
+//UNUSED2008-05  ScTpCalcItem( sal_uInt16 nWhich );
+                ScTpCalcItem( sal_uInt16 nWhich,
                               const ScDocOptions& rOpt );
                 ScTpCalcItem( const ScTpCalcItem& rItem );
                 ~ScTpCalcItem();
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index 353dd4044..efbef394e 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -39,28 +39,28 @@ class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool
 {
     SfxPoolItem**	ppPoolDefaults;
     SfxItemPool*	pSecondary;
-    static USHORT*	pVersionMap1;
-    static USHORT*	pVersionMap2;
-    static USHORT*	pVersionMap3;
-    static USHORT*	pVersionMap4;
-    static USHORT*	pVersionMap5;
-    static USHORT*	pVersionMap6;
-    static USHORT*	pVersionMap7;
-    static USHORT*	pVersionMap8;
-    static USHORT*	pVersionMap9;
-    static USHORT*  pVersionMap10;
-    static USHORT*  pVersionMap11;
+    static sal_uInt16*	pVersionMap1;
+    static sal_uInt16*	pVersionMap2;
+    static sal_uInt16*	pVersionMap3;
+    static sal_uInt16*	pVersionMap4;
+    static sal_uInt16*	pVersionMap5;
+    static sal_uInt16*	pVersionMap6;
+    static sal_uInt16*	pVersionMap7;
+    static sal_uInt16*	pVersionMap8;
+    static sal_uInt16*	pVersionMap9;
+    static sal_uInt16*  pVersionMap10;
+    static sal_uInt16*  pVersionMap11;
 
 public:
-            ScDocumentPool( SfxItemPool* pSecPool = NULL, BOOL bLoadRefCounts = FALSE );
+            ScDocumentPool( SfxItemPool* pSecPool = NULL, sal_Bool bLoadRefCounts = sal_False );
 protected:
             virtual ~ScDocumentPool();
 public:
 
     virtual SfxItemPool*		Clone() const;
-    virtual SfxMapUnit 			GetMetric( USHORT nWhich ) const;
+    virtual SfxMapUnit 			GetMetric( sal_uInt16 nWhich ) const;
 
-    virtual const SfxPoolItem&	Put( const SfxPoolItem&, USHORT nWhich = 0 );
+    virtual const SfxPoolItem&	Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 );
     virtual void				Remove( const SfxPoolItem& );
     static void					CheckRef( const SfxPoolItem& );
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3e54db1b2..be31d875d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -201,8 +201,8 @@ struct ScDocStat
 {
     String	aDocName;
     SCTAB	nTableCount;
-    ULONG	nCellCount;
-    USHORT	nPageCount;
+    sal_uLong	nCellCount;
+    sal_uInt16	nPageCount;
 };
 
 // The constant parameters to CopyBlockFromClip
@@ -210,11 +210,11 @@ struct ScCopyBlockFromClipParams
 {
     ScDocument*	pRefUndoDoc;
     ScDocument*	pClipDoc;
-    USHORT		nInsFlag;
+    sal_uInt16		nInsFlag;
     SCTAB		nTabStart;
     SCTAB		nTabEnd;
-    BOOL		bAsLink;
-    BOOL		bSkipAttrForEmpty;
+    sal_Bool		bAsLink;
+    sal_Bool		bSkipAttrForEmpty;
 };
 
 
@@ -229,10 +229,10 @@ struct ScSymbolStringCellEntry
 // -----------------------------------------------------------------------
 
 // DDE link modes
-const BYTE SC_DDE_DEFAULT       = 0;
-const BYTE SC_DDE_ENGLISH       = 1;
-const BYTE SC_DDE_TEXT          = 2;
-const BYTE SC_DDE_IGNOREMODE    = 255;       /// For usage in FindDdeLink() only!
+const sal_uInt8 SC_DDE_DEFAULT       = 0;
+const sal_uInt8 SC_DDE_ENGLISH       = 1;
+const sal_uInt8 SC_DDE_TEXT          = 2;
+const sal_uInt8 SC_DDE_IGNOREMODE    = 255;       /// For usage in FindDdeLink() only!
 
 
 // -----------------------------------------------------------------------
@@ -359,77 +359,77 @@ private:
         importer. */
     formula::FormulaGrammar::Grammar  eXmlImportGrammar;
 
-    ULONG				nFormulaCodeInTree;				// FormelRPN im Formelbaum
-    ULONG               nXMLImportedFormulaCount;        // progress count during XML import
-    USHORT				nInterpretLevel;				// >0 wenn im Interpreter
-    USHORT				nMacroInterpretLevel; 			// >0 wenn Macro im Interpreter
-    USHORT				nInterpreterTableOpLevel;		// >0 if in Interpreter TableOp
+    sal_uLong				nFormulaCodeInTree;				// FormelRPN im Formelbaum
+    sal_uLong               nXMLImportedFormulaCount;        // progress count during XML import
+    sal_uInt16				nInterpretLevel;				// >0 wenn im Interpreter
+    sal_uInt16				nMacroInterpretLevel; 			// >0 wenn Macro im Interpreter
+    sal_uInt16				nInterpreterTableOpLevel;		// >0 if in Interpreter TableOp
     SCTAB				nMaxTableNumber;
-    USHORT				nSrcVer;						// Dateiversion (Laden/Speichern)
+    sal_uInt16				nSrcVer;						// Dateiversion (Laden/Speichern)
     SCROW				nSrcMaxRow;						// Zeilenzahl zum Laden/Speichern
-    USHORT				nFormulaTrackCount;
-    USHORT				nHardRecalcState;				// 0: soft, 1: hard-warn, 2: hard
+    sal_uInt16				nFormulaTrackCount;
+    sal_uInt16				nHardRecalcState;				// 0: soft, 1: hard-warn, 2: hard
     SCTAB				nVisibleTab;					// fuer OLE etc.
 
     ScLkUpdMode			eLinkMode;
 
-    BOOL				bAutoCalc;						// Automatisch Berechnen
-    BOOL				bAutoCalcShellDisabled;			// in/von/fuer ScDocShell disabled
+    sal_Bool				bAutoCalc;						// Automatisch Berechnen
+    sal_Bool				bAutoCalcShellDisabled;			// in/von/fuer ScDocShell disabled
     // ob noch ForcedFormulas berechnet werden muessen,
     // im Zusammenspiel mit ScDocShell SetDocumentModified,
     // AutoCalcShellDisabled und TrackFormulas
-    BOOL				bForcedFormulaPending;
-    BOOL				bCalculatingFormulaTree;
-    BOOL				bIsClip;
-    BOOL				bIsUndo;
-    BOOL				bIsVisible;						// set from view ctor
+    sal_Bool				bForcedFormulaPending;
+    sal_Bool				bCalculatingFormulaTree;
+    sal_Bool				bIsClip;
+    sal_Bool				bIsUndo;
+    sal_Bool				bIsVisible;						// set from view ctor
 
-    BOOL				bIsEmbedded;					// Embedded-Bereich anzeigen/anpassen ?
+    sal_Bool				bIsEmbedded;					// Embedded-Bereich anzeigen/anpassen ?
 
     // kein SetDirty bei ScFormulaCell::CompileTokenArray sondern am Ende
     // von ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip
-    BOOL				bNoSetDirty;
+    sal_Bool				bNoSetDirty;
     // kein Broadcast, keine Listener aufbauen waehrend aus einem anderen
     // Doc (per Filter o.ae.) inserted wird, erst bei CompileAll / CalcAfterLoad
-    BOOL				bInsertingFromOtherDoc;
+    sal_Bool				bInsertingFromOtherDoc;
     bool                bLoadingMedium;
     bool                bImportingXML;      // special handling of formula text
-    BOOL                bXMLFromWrapper;    // distinguish ScXMLImportWrapper from external component
-    BOOL				bCalcingAfterLoad;				// in CalcAfterLoad TRUE
+    sal_Bool                bXMLFromWrapper;    // distinguish ScXMLImportWrapper from external component
+    sal_Bool				bCalcingAfterLoad;				// in CalcAfterLoad TRUE
     // wenn temporaer keine Listener auf/abgebaut werden sollen
-    BOOL				bNoListening;
-    BOOL				bIdleDisabled;
-    BOOL				bInLinkUpdate;					// TableLink or AreaLink
-    BOOL				bChartListenerCollectionNeedsUpdate;
+    sal_Bool				bNoListening;
+    sal_Bool				bIdleDisabled;
+    sal_Bool				bInLinkUpdate;					// TableLink or AreaLink
+    sal_Bool				bChartListenerCollectionNeedsUpdate;
     // ob RC_FORCED Formelzellen im Dokument sind/waren (einmal an immer an)
-    BOOL				bHasForcedFormulas;
+    sal_Bool				bHasForcedFormulas;
     // ob das Doc gerade zerstoert wird (kein Notify-Tracking etc. mehr)
-    BOOL				bInDtorClear;
+    sal_Bool				bInDtorClear;
     // ob bei Spalte/Zeile einfuegen am Rand einer Referenz die Referenz
     // erweitert wird, wird in jedem UpdateReference aus InputOptions geholt,
     // gesetzt und am Ende von UpdateReference zurueckgesetzt
-    BOOL				bExpandRefs;
+    sal_Bool				bExpandRefs;
     // fuer Detektiv-Update, wird bei jeder Aenderung an Formeln gesetzt
-    BOOL				bDetectiveDirty;
+    sal_Bool				bDetectiveDirty;
 
-    BYTE				nMacroCallMode;		// Makros per Warnung-Dialog disabled?
-    BOOL				bHasMacroFunc;		// valid only after loading
+    sal_uInt8				nMacroCallMode;		// Makros per Warnung-Dialog disabled?
+    sal_Bool				bHasMacroFunc;		// valid only after loading
 
-    BYTE				nVisSpellState;
+    sal_uInt8				nVisSpellState;
 
-    BYTE				nAsianCompression;
-    BYTE				nAsianKerning;
-    BOOL                bSetDrawDefaults;
+    sal_uInt8				nAsianCompression;
+    sal_uInt8				nAsianKerning;
+    sal_Bool                bSetDrawDefaults;
 
-    BOOL                bPastingDrawFromOtherDoc;
+    sal_Bool                bPastingDrawFromOtherDoc;
 
-    BYTE                nInDdeLinkUpdate;   // originating DDE links (stacked bool)
+    sal_uInt8                nInDdeLinkUpdate;   // originating DDE links (stacked bool)
 
-    BOOL				bInUnoBroadcast;
-    BOOL				bInUnoListenerCall;
+    sal_Bool				bInUnoBroadcast;
+    sal_Bool				bInUnoListenerCall;
     formula::FormulaGrammar::Grammar  eGrammar;
 
-    mutable BOOL        bStyleSheetUsageInvalid;
+    mutable sal_Bool        bStyleSheetUsageInvalid;
 
     bool                mbUndoEnabled;
     bool                mbAdjustHeightEnabled;
@@ -440,11 +440,11 @@ private:
     sal_Int16           mnNamedRangesLockCount;
 
 public:
-    SC_DLLPUBLIC ULONG			GetCellCount() const;		// alle Zellen
+    SC_DLLPUBLIC sal_uLong			GetCellCount() const;		// alle Zellen
     SCSIZE          GetCellCount(SCTAB nTab, SCCOL nCol) const;
-    ULONG			GetWeightedCount() const;	// Formeln und Edit staerker gewichtet
-    ULONG			GetCodeCount() const;		// RPN-Code in Formeln
-    DECL_LINK( GetUserDefinedColor, USHORT * );
+    sal_uLong			GetWeightedCount() const;	// Formeln und Edit staerker gewichtet
+    sal_uLong			GetCodeCount() const;		// RPN-Code in Formeln
+    DECL_LINK( GetUserDefinedColor, sal_uInt16 * );
                                                                 // Numberformatter
 
 public:
@@ -501,13 +501,13 @@ public:
 
     SC_DLLPUBLIC ScDBCollection*	GetDBCollection() const;
     void			SetDBCollection( ScDBCollection* pNewDBCollection,
-                                        BOOL bRemoveAutoFilter = FALSE );
+                                        sal_Bool bRemoveAutoFilter = sal_False );
     ScDBData*		GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                        BOOL bStartOnly = FALSE) const;
+                                        sal_Bool bStartOnly = sal_False) const;
     ScDBData*		GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
 
 //UNUSED2008-05  ScRangeData*	GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab,
-//UNUSED2008-05                                      BOOL bStartOnly = FALSE) const;
+//UNUSED2008-05                                      sal_Bool bStartOnly = sal_False) const;
     SC_DLLPUBLIC ScRangeData*	GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const;
 
     SC_DLLPUBLIC ScDPCollection*		GetDPCollection();
@@ -531,19 +531,19 @@ public:
     void			EnsureGraphicNames();
 
     SdrObject*		GetObjectAtPoint( SCTAB nTab, const Point& rPos );
-    BOOL			HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName = NULL );
+    sal_Bool			HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName = NULL );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const String& rChartName );
     SC_DLLPUBLIC void            GetChartRanges( const String& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc );
     void            SetChartRanges( const String& rChartName, const ::std::vector< ScRangeList >& rRanges );
 
     void			UpdateChartArea( const String& rChartName, const ScRange& rNewArea,
-                                        BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd );
+                                        sal_Bool bColHeaders, sal_Bool bRowHeaders, sal_Bool bAdd );
     void			UpdateChartArea( const String& rChartName,
                                     const ScRangeListRef& rNewList,
-                                    BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd );
+                                    sal_Bool bColHeaders, sal_Bool bRowHeaders, sal_Bool bAdd );
     void            GetOldChartParameters( const String& rName,
-                                    ScRangeList& rRanges, BOOL& rColHeaders, BOOL& rRowHeaders );
+                                    ScRangeList& rRanges, sal_Bool& rColHeaders, sal_Bool& rRowHeaders );
     ::com::sun::star::uno::Reference<
             ::com::sun::star::embed::XEmbeddedObject >
                     FindOleObjectByName( const String& rName );
@@ -553,19 +553,19 @@ public:
     SCTAB			GetVisibleTab() const		{ return nVisibleTab; }
     SC_DLLPUBLIC void			SetVisibleTab(SCTAB nTab)	{ nVisibleTab = nTab; }
 
-    SC_DLLPUBLIC BOOL			HasTable( SCTAB nTab ) const;
-    SC_DLLPUBLIC BOOL			GetName( SCTAB nTab, String& rName ) const;
-    SC_DLLPUBLIC BOOL			GetCodeName( SCTAB nTab, String& rName ) const;
-    SC_DLLPUBLIC BOOL			SetCodeName( SCTAB nTab, const String& rName );
-    SC_DLLPUBLIC BOOL			GetTable( const String& rName, SCTAB& rTab ) const;
+    SC_DLLPUBLIC sal_Bool			HasTable( SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_Bool			GetName( SCTAB nTab, String& rName ) const;
+    SC_DLLPUBLIC sal_Bool			GetCodeName( SCTAB nTab, String& rName ) const;
+    SC_DLLPUBLIC sal_Bool			SetCodeName( SCTAB nTab, const String& rName );
+    SC_DLLPUBLIC sal_Bool			GetTable( const String& rName, SCTAB& rTab ) const;
     SC_DLLPUBLIC inline SCTAB	GetTableCount() const { return nMaxTableNumber; }
     SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
 
     SC_DLLPUBLIC ScDocProtection* GetDocProtection() const;
     SC_DLLPUBLIC void            SetDocProtection(const ScDocProtection* pProtect);
-    SC_DLLPUBLIC BOOL			IsDocProtected() const;
-    BOOL			IsDocEditable() const;
-    SC_DLLPUBLIC BOOL			IsTabProtected( SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_Bool			IsDocProtected() const;
+    sal_Bool			IsDocEditable() const;
+    SC_DLLPUBLIC sal_Bool			IsTabProtected( SCTAB nTab ) const;
     SC_DLLPUBLIC    ScTableProtection* GetTabProtection( SCTAB nTab ) const;
     SC_DLLPUBLIC void SetTabProtection(SCTAB nTab, const ScTableProtection* pProtect);
     void            CopyTabProtection(SCTAB nTabSrc, SCTAB nTabDest);
@@ -573,18 +573,18 @@ public:
     void			LockTable(SCTAB nTab);
     void			UnlockTable(SCTAB nTab);
 
-    BOOL			IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
+    sal_Bool			IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
                                         SCCOL nEndCol, SCROW nEndRow,
-                                        BOOL* pOnlyNotBecauseOfMatrix = NULL ) const;
-    BOOL			IsSelectionEditable( const ScMarkData& rMark,
-                                        BOOL* pOnlyNotBecauseOfMatrix = NULL ) const;
-    BOOL			HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow,
+                                        sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+    sal_Bool			IsSelectionEditable( const ScMarkData& rMark,
+                                        sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+    sal_Bool			HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow,
                                             SCCOL nEndCol, SCROW nEndRow,
                                             const ScMarkData& rMark ) const;
 
-    BOOL			GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix );
+    sal_Bool			GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix );
 
-    BOOL			IsEmbedded() const;
+    sal_Bool			IsEmbedded() const;
     void			GetEmbedded( ScRange& rRange ) const;
     void			SetEmbedded( const ScRange& rRange );
     void			ResetEmbedded();
@@ -592,61 +592,61 @@ public:
     void			SetEmbedded( const Rectangle& rRect );			// aus VisArea (1/100 mm)
     void			SnapVisArea( Rectangle& rRect ) const;			// 1/100 mm
 
-    SC_DLLPUBLIC BOOL			ValidTabName( const String& rName ) const;
-    SC_DLLPUBLIC BOOL			ValidNewTabName( const String& rName ) const;
+    SC_DLLPUBLIC sal_Bool			ValidTabName( const String& rName ) const;
+    SC_DLLPUBLIC sal_Bool			ValidNewTabName( const String& rName ) const;
     SC_DLLPUBLIC void			CreateValidTabName(String& rName) const;
-    SC_DLLPUBLIC BOOL			InsertTab( SCTAB nPos, const String& rName,
-                                BOOL bExternalDocument = FALSE );
-    SC_DLLPUBLIC BOOL            DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc = NULL );
-    SC_DLLPUBLIC BOOL			RenameTab( SCTAB nTab, const String& rName,
-                                BOOL bUpdateRef = TRUE,
-                                BOOL bExternalDocument = FALSE );
-    BOOL			MoveTab( SCTAB nOldPos, SCTAB nNewPos );
-    BOOL			CopyTab( SCTAB nOldPos, SCTAB nNewPos,
+    SC_DLLPUBLIC sal_Bool			InsertTab( SCTAB nPos, const String& rName,
+                                sal_Bool bExternalDocument = sal_False );
+    SC_DLLPUBLIC sal_Bool            DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc = NULL );
+    SC_DLLPUBLIC sal_Bool			RenameTab( SCTAB nTab, const String& rName,
+                                sal_Bool bUpdateRef = sal_True,
+                                sal_Bool bExternalDocument = sal_False );
+    sal_Bool			MoveTab( SCTAB nOldPos, SCTAB nNewPos );
+    sal_Bool			CopyTab( SCTAB nOldPos, SCTAB nNewPos,
                                 const ScMarkData* pOnlyMarked = NULL );
-    SC_DLLPUBLIC ULONG			TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos,
-                                    BOOL bInsertNew = TRUE,
-                                    BOOL bResultsOnly = FALSE );
+    SC_DLLPUBLIC sal_uLong			TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos,
+                                    sal_Bool bInsertNew = sal_True,
+                                    sal_Bool bResultsOnly = sal_False );
     SC_DLLPUBLIC void			TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos);
-    SC_DLLPUBLIC void			SetVisible( SCTAB nTab, BOOL bVisible );
-    SC_DLLPUBLIC BOOL			IsVisible( SCTAB nTab ) const;
-    BOOL            IsStreamValid( SCTAB nTab ) const;
-    void            SetStreamValid( SCTAB nTab, BOOL bSet, BOOL bIgnoreLock = FALSE );
+    SC_DLLPUBLIC void			SetVisible( SCTAB nTab, sal_Bool bVisible );
+    SC_DLLPUBLIC sal_Bool			IsVisible( SCTAB nTab ) const;
+    sal_Bool            IsStreamValid( SCTAB nTab ) const;
+    void            SetStreamValid( SCTAB nTab, sal_Bool bSet, sal_Bool bIgnoreLock = sal_False );
     void            LockStreamValid( bool bLock );
     bool            IsStreamValidLocked() const                         { return mbStreamValidLocked; }
-    BOOL            IsPendingRowHeights( SCTAB nTab ) const;
-    void            SetPendingRowHeights( SCTAB nTab, BOOL bSet );
-    SC_DLLPUBLIC void			SetLayoutRTL( SCTAB nTab, BOOL bRTL );
-    SC_DLLPUBLIC BOOL			IsLayoutRTL( SCTAB nTab ) const;
-    BOOL			IsNegativePage( SCTAB nTab ) const;
-    SC_DLLPUBLIC void			SetScenario( SCTAB nTab, BOOL bFlag );
-    SC_DLLPUBLIC BOOL			IsScenario( SCTAB nTab ) const;
+    sal_Bool            IsPendingRowHeights( SCTAB nTab ) const;
+    void            SetPendingRowHeights( SCTAB nTab, sal_Bool bSet );
+    SC_DLLPUBLIC void			SetLayoutRTL( SCTAB nTab, sal_Bool bRTL );
+    SC_DLLPUBLIC sal_Bool			IsLayoutRTL( SCTAB nTab ) const;
+    sal_Bool			IsNegativePage( SCTAB nTab ) const;
+    SC_DLLPUBLIC void			SetScenario( SCTAB nTab, sal_Bool bFlag );
+    SC_DLLPUBLIC sal_Bool			IsScenario( SCTAB nTab ) const;
     SC_DLLPUBLIC void			GetScenarioData( SCTAB nTab, String& rComment,
-                                        Color& rColor, USHORT& rFlags ) const;
+                                        Color& rColor, sal_uInt16& rFlags ) const;
     SC_DLLPUBLIC void			SetScenarioData( SCTAB nTab, const String& rComment,
-                                        const Color& rColor, USHORT nFlags );
+                                        const Color& rColor, sal_uInt16 nFlags );
     SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const;
     SC_DLLPUBLIC void SetTabBgColor( SCTAB nTab, const Color& rColor );
     SC_DLLPUBLIC bool IsDefaultTabBgColor( SCTAB nTab ) const;
-    void			GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const;
-    SC_DLLPUBLIC BOOL			IsActiveScenario( SCTAB nTab ) const;
-    SC_DLLPUBLIC void			SetActiveScenario( SCTAB nTab, BOOL bActive );		// nur fuer Undo etc.
+    void			GetScenarioFlags( SCTAB nTab, sal_uInt16& rFlags ) const;
+    SC_DLLPUBLIC sal_Bool			IsActiveScenario( SCTAB nTab ) const;
+    SC_DLLPUBLIC void			SetActiveScenario( SCTAB nTab, sal_Bool bActive );		// nur fuer Undo etc.
     SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const;
     SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const;
     void            SetGrammar( formula::FormulaGrammar::Grammar eGram );
-    SC_DLLPUBLIC BYTE			GetLinkMode( SCTAB nTab ) const;
-    BOOL			IsLinked( SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_uInt8			GetLinkMode( SCTAB nTab ) const;
+    sal_Bool			IsLinked( SCTAB nTab ) const;
     SC_DLLPUBLIC const String&	GetLinkDoc( SCTAB nTab ) const;
     const String&	GetLinkFlt( SCTAB nTab ) const;
     const String&	GetLinkOpt( SCTAB nTab ) const;
     SC_DLLPUBLIC const String&	GetLinkTab( SCTAB nTab ) const;
-    ULONG			GetLinkRefreshDelay( SCTAB nTab ) const;
-    void			SetLink( SCTAB nTab, BYTE nMode, const String& rDoc,
+    sal_uLong			GetLinkRefreshDelay( SCTAB nTab ) const;
+    void			SetLink( SCTAB nTab, sal_uInt8 nMode, const String& rDoc,
                             const String& rFilter, const String& rOptions,
-                            const String& rTabName, ULONG nRefreshDelay );
-    BOOL			HasLink( const String& rDoc,
+                            const String& rTabName, sal_uLong nRefreshDelay );
+    sal_Bool			HasLink( const String& rDoc,
                             const String& rFilter, const String& rOptions ) const;
-    SC_DLLPUBLIC BOOL			LinkExternalTab( SCTAB& nTab, const String& aDocTab,
+    SC_DLLPUBLIC sal_Bool			LinkExternalTab( SCTAB& nTab, const String& aDocTab,
                                     const String& aFileName,
                                     const String& aTabName );
 
@@ -660,8 +660,8 @@ public:
         on first call. */
     ScFormulaParserPool& GetFormulaParserPool() const;
 
-    BOOL			HasDdeLinks() const;
-    BOOL			HasAreaLinks() const;
+    sal_Bool			HasDdeLinks() const;
+    sal_Bool			HasAreaLinks() const;
     void            UpdateExternalRefLinks();
     void			UpdateDdeLinks();
     void			UpdateAreaLinks();
@@ -669,19 +669,19 @@ public:
                     // originating DDE links
     void            IncInDdeLinkUpdate() { if ( nInDdeLinkUpdate < 255 ) ++nInDdeLinkUpdate; }
     void            DecInDdeLinkUpdate() { if ( nInDdeLinkUpdate ) --nInDdeLinkUpdate; }
-    BOOL            IsInDdeLinkUpdate() const   { return nInDdeLinkUpdate != 0; }
+    sal_Bool            IsInDdeLinkUpdate() const   { return nInDdeLinkUpdate != 0; }
 
     SC_DLLPUBLIC void			CopyDdeLinks( ScDocument* pDestDoc ) const;
     void			DisconnectDdeLinks();
 
                     // Fuer StarOne Api:
-    USHORT			GetDdeLinkCount() const;
-    BOOL			UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem );
+    sal_uInt16			GetDdeLinkCount() const;
+    sal_Bool			UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem );
 
     /** Tries to find a DDE link with the specified connection data.
         @param rnDdePos  (out-param) Returns the index of the DDE link (does not include other links from link manager).
         @return  true = DDE link found, rnDdePos valid. */
-    SC_DLLPUBLIC bool            FindDdeLink( const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode, USHORT& rnDdePos );
+    SC_DLLPUBLIC bool            FindDdeLink( const String& rAppl, const String& rTopic, const String& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos );
 
     /** Returns the connection data of the specified DDE link.
         @param nDdePos  Index of the DDE link (does not include other links from link manager).
@@ -689,26 +689,26 @@ public:
         @param rTopic  (out-param) The DDE topic.
         @param rItem  (out-param) The DDE item.
         @return  true = DDE link found, out-parameters valid. */
-    bool            GetDdeLinkData( USHORT nDdePos, String& rAppl, String& rTopic, String& rItem ) const;
+    bool            GetDdeLinkData( sal_uInt16 nDdePos, String& rAppl, String& rTopic, String& rItem ) const;
     /** Returns the link mode of the specified DDE link.
         @param nDdePos  Index of the DDE link (does not include other links from link manager).
         @param rnMode  (out-param) The link mode of the specified DDE link.
         @return  true = DDE link found, rnMode valid. */
-    bool            GetDdeLinkMode( USHORT nDdePos, BYTE& rnMode ) const;
+    bool            GetDdeLinkMode( sal_uInt16 nDdePos, sal_uInt8& rnMode ) const;
     /** Returns the result matrix of the specified DDE link.
         @param nDdePos  Index of the DDE link (does not include other links from link manager).
         @return  The result matrix, if the DDE link has been found, 0 otherwise. */
-    SC_DLLPUBLIC const ScMatrix* GetDdeLinkResultMatrix( USHORT nDdePos ) const;
+    SC_DLLPUBLIC const ScMatrix* GetDdeLinkResultMatrix( sal_uInt16 nDdePos ) const;
 
     /** Tries to find a DDE link or creates a new, if not extant.
         @param pResults  If not 0, sets the matrix as as DDE link result matrix (also for existing links).
         @return  true = DDE link found; false = Unpredictable error occured, no DDE link created. */
-    SC_DLLPUBLIC bool            CreateDdeLink( const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode, ScMatrix* pResults = NULL );
+    SC_DLLPUBLIC bool            CreateDdeLink( const String& rAppl, const String& rTopic, const String& rItem, sal_uInt8 nMode, ScMatrix* pResults = NULL );
     /** Sets a result matrix for the specified DDE link.
         @param nDdePos  Index of the DDE link (does not include other links from link manager).
         @param pResults  The array containing all results of the DDE link (intrusive-ref-counted, do not delete).
         @return  true = DDE link found and matrix set. */
-    bool            SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults );
+    bool            SetDdeLinkResultMatrix( sal_uInt16 nDdePos, ScMatrix* pResults );
 
 
     SfxBindings*	GetViewBindings();
@@ -735,13 +735,13 @@ public:
     void			SetChartRangeList( const String& rChartName,
                         const ScRangeListRef& rNewRangeListRef );
 
-    BOOL			HasControl( SCTAB nTab, const Rectangle& rMMRect );
+    sal_Bool			HasControl( SCTAB nTab, const Rectangle& rMMRect );
     void			InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& rMMRect );
 
     void			StartAnimations( SCTAB nTab, Window* pWin );
 
-    BOOL			HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect );
-    BOOL			HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect );
+    sal_Bool			HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect );
+    sal_Bool			HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect );
 
     const ScSheetEvents* GetSheetEvents( SCTAB nTab ) const;
     void            SetSheetEvents( SCTAB nTab, const ScSheetEvents* pNew );
@@ -749,34 +749,34 @@ public:
     bool            HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents = false ) const;  // on any sheet
 
     bool            HasAnyCalcNotification() const;
-    BOOL            HasCalcNotification( SCTAB nTab ) const;
+    sal_Bool            HasCalcNotification( SCTAB nTab ) const;
     void            SetCalcNotification( SCTAB nTab );
     void            ResetCalcNotifications();
 
-    SC_DLLPUBLIC ScOutlineTable*	GetOutlineTable( SCTAB nTab, BOOL bCreate = FALSE );
-    BOOL			SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline );
+    SC_DLLPUBLIC ScOutlineTable*	GetOutlineTable( SCTAB nTab, sal_Bool bCreate = sal_False );
+    sal_Bool			SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline );
 
     void			DoAutoOutline( SCCOL nStartCol, SCROW nStartRow,
                                     SCCOL nEndCol, SCROW nEndRow, SCTAB nTab );
 
-    BOOL			DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam );
+    sal_Bool			DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam );
     void			RemoveSubTotals( SCTAB nTab, ScSubTotalParam& rParam );
-    BOOL			TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam );
-    BOOL			HasSubTotalCells( const ScRange& rRange );
+    sal_Bool			TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam );
+    sal_Bool			HasSubTotalCells( const ScRange& rRange );
 
-    SC_DLLPUBLIC void			PutCell( const ScAddress&, ScBaseCell* pCell, BOOL bForceTab = FALSE );
+    SC_DLLPUBLIC void			PutCell( const ScAddress&, ScBaseCell* pCell, sal_Bool bForceTab = sal_False );
 //UNUSED2009-05 SC_DLLPUBLIC void			PutCell( const ScAddress&, ScBaseCell* pCell,
-//UNUSED2009-05                         ULONG nFormatIndex, BOOL bForceTab = FALSE);
+//UNUSED2009-05                         sal_uLong nFormatIndex, sal_Bool bForceTab = sal_False);
     SC_DLLPUBLIC void			PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
-                            BOOL bForceTab = FALSE );
+                            sal_Bool bForceTab = sal_False );
     SC_DLLPUBLIC void			PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
-                            ULONG nFormatIndex, BOOL bForceTab = FALSE);
-                    //	return TRUE = Zahlformat gesetzt
-    SC_DLLPUBLIC BOOL           SetString(
+                            sal_uLong nFormatIndex, sal_Bool bForceTab = sal_False);
+                    //	return sal_True = Zahlformat gesetzt
+    SC_DLLPUBLIC sal_Bool           SetString(
         SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
         SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
     SC_DLLPUBLIC void           SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal );
-    void 			SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError);
+    void 			SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const sal_uInt16 nError);
 
     SC_DLLPUBLIC void 			InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
                                         SCCOL nCol2, SCROW nRow2,
@@ -792,7 +792,7 @@ public:
     SC_DLLPUBLIC void			GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString );
     SC_DLLPUBLIC double			GetValue( const ScAddress& );
     SC_DLLPUBLIC void			GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue );
-    SC_DLLPUBLIC double			RoundValueAsShown( double fVal, ULONG nFormat );
+    SC_DLLPUBLIC double			RoundValueAsShown( double fVal, sal_uLong nFormat );
     SC_DLLPUBLIC void			GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                      sal_uInt32& rFormat );
     SC_DLLPUBLIC sal_uInt32		GetNumberFormat( const ScAddress& ) const;
@@ -800,10 +800,10 @@ public:
                         pointer passed is of type formula cell, the calculated
                         number format of the formula cell is returned. pCell
                         may be NULL. */
-    SC_DLLPUBLIC void			GetNumberFormatInfo( short& nType, ULONG& nIndex,
+    SC_DLLPUBLIC void			GetNumberFormatInfo( short& nType, sal_uLong& nIndex,
                         const ScAddress& rPos, const ScBaseCell* pCell ) const;
     void			GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula,
-                                BOOL bAsciiExport = FALSE ) const;
+                                sal_Bool bAsciiExport = sal_False ) const;
     SC_DLLPUBLIC void			GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const;
     SC_DLLPUBLIC CellType		GetCellType( const ScAddress& rPos ) const;
     SC_DLLPUBLIC void			GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const;
@@ -811,13 +811,13 @@ public:
 
 //UNUSED2008-05  void			RefreshNoteFlags();
 
-    SC_DLLPUBLIC BOOL			HasData( SCCOL nCol, SCROW nRow, SCTAB nTab );
-    SC_DLLPUBLIC BOOL			HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
-    SC_DLLPUBLIC BOOL			HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
-    BOOL			HasStringCells( const ScRange& rRange ) const;
+    SC_DLLPUBLIC sal_Bool			HasData( SCCOL nCol, SCROW nRow, SCTAB nTab );
+    SC_DLLPUBLIC sal_Bool			HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_Bool			HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+    sal_Bool			HasStringCells( const ScRange& rRange ) const;
 
     /** Returns true, if there is any data to create a selection list for rPos. */
-    BOOL            HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+    sal_Bool            HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
 
     /** Returns the pointer to a cell note object at the passed cell address. */
     ScPostIt*       GetNote( const ScAddress& rPos );
@@ -836,19 +836,19 @@ public:
         @param bForced  True = always create all captions, false = skip when Undo is disabled. */
     void            InitializeAllNoteCaptions( bool bForced = false );
 
-    BOOL            ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
+    sal_Bool            ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
                                 SCCOL& rEndCol, SCROW& rEndRow, const ScMarkData& rMark,
-                                BOOL bRefresh = FALSE, BOOL bAttrs = FALSE );
-    BOOL			ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
+                                sal_Bool bRefresh = sal_False, sal_Bool bAttrs = sal_False );
+    sal_Bool			ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
                                 SCCOL& rEndCol, SCROW& rEndRow, SCTAB nTab,
-                                BOOL bRefresh = FALSE, BOOL bAttrs = FALSE );
-    BOOL			ExtendMerge( ScRange& rRange, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE );
-    BOOL			ExtendTotalMerge( ScRange& rRange );
-    SC_DLLPUBLIC BOOL			ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
+                                sal_Bool bRefresh = sal_False, sal_Bool bAttrs = sal_False );
+    sal_Bool			ExtendMerge( ScRange& rRange, sal_Bool bRefresh = sal_False, sal_Bool bAttrs = sal_False );
+    sal_Bool			ExtendTotalMerge( ScRange& rRange );
+    SC_DLLPUBLIC sal_Bool			ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
                                 SCCOL nEndCol, SCROW nEndRow, SCTAB nTab );
-    SC_DLLPUBLIC BOOL			ExtendOverlapped( ScRange& rRange );
+    SC_DLLPUBLIC sal_Bool			ExtendOverlapped( ScRange& rRange );
 
-    BOOL			RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
+    sal_Bool			RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
                                 SCCOL nEndCol, SCROW nEndRow, SCTAB nTab );
 
     SC_DLLPUBLIC void			DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
@@ -858,20 +858,20 @@ public:
                                     SCCOL nEndCol, SCROW nEndRow, bool bDeleteCaptions = true );
     void			RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab );
 
-    BOOL			IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
+    sal_Bool			IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
                                                 SCCOL nEndCol, SCROW nEndRow, bool bIgnoreNotes = false ) const;
-    BOOL			IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
+    sal_Bool			IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
                                                 SCCOL nEndCol, SCROW nEndRow,
-                                                BOOL bLeftIsEmpty = FALSE,
+                                                sal_Bool bLeftIsEmpty = sal_False,
                                                 ScRange* pLastRange = NULL,
                                                 Rectangle* pLastMM = NULL ) const;
 
-    BOOL			IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
-    BOOL			IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+    sal_Bool			IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+    sal_Bool			IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
 
     SC_DLLPUBLIC bool           HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
-                                           SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nMask );
-    SC_DLLPUBLIC bool           HasAttrib( const ScRange& rRange, USHORT nMask );
+                                           SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nMask );
+    SC_DLLPUBLIC bool           HasAttrib( const ScRange& rRange, sal_uInt16 nMask );
 
     void			GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                     const SvxBorderLine** ppLeft,
@@ -905,42 +905,58 @@ public:
     void            ClearLookupCaches();
 
                     // Automatisch Berechnen
-    void			SetAutoCalc( BOOL bNewAutoCalc );
-    BOOL			GetAutoCalc() const { return bAutoCalc; }
+    void			SetAutoCalc( sal_Bool bNewAutoCalc );
+    sal_Bool			GetAutoCalc() const { return bAutoCalc; }
                     // Automatisch Berechnen in/von/fuer ScDocShell disabled
-    void			SetAutoCalcShellDisabled( BOOL bNew ) { bAutoCalcShellDisabled = bNew; }
-    BOOL			IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; }
+    void			SetAutoCalcShellDisabled( sal_Bool bNew ) { bAutoCalcShellDisabled = bNew; }
+    sal_Bool			IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; }
                     // ForcedFormulas zu berechnen
-    void			SetForcedFormulaPending( BOOL bNew ) { bForcedFormulaPending = bNew; }
-    BOOL			IsForcedFormulaPending() const { return bForcedFormulaPending; }
+    void			SetForcedFormulaPending( sal_Bool bNew ) { bForcedFormulaPending = bNew; }
+    sal_Bool			IsForcedFormulaPending() const { return bForcedFormulaPending; }
                     // if CalcFormulaTree() is currently running
-    BOOL			IsCalculatingFormulaTree() { return bCalculatingFormulaTree; }
+    sal_Bool			IsCalculatingFormulaTree() { return bCalculatingFormulaTree; }
     
-    USHORT			GetErrCode( const ScAddress& ) const;
+    sal_uInt16			GetErrCode( const ScAddress& ) const;
 
                     /** Shrink a range to only include data area.
+
                         This is not the actually used area within the 
                         selection, but the bounds of the sheet's data area 
-                        instead. */
+                        instead.
+
+                        @returns sal_True if the area passed intersected the data 
+                                 area, sal_False if not, in which case the values 
+                                 obtained may be out of bounds, not in order or 
+                                 unmodified. sal_True does not mean that there 
+                                 actually is any data within the selection.
+                     */
     bool            ShrinkToDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) const;
 
-                    /** Shrink a range to only include used data area. */
-    bool            ShrinkToUsedDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const;
+                    /** Shrink a range to only include used data area.
+                        
+                        @param o_bShrunk
+                               Out parameter, sal_True if area was shrunk, sal_False if not.
+
+                        @returns sal_True if there is any data, sal_False if not.
+                     */
+    bool            ShrinkToUsedDataArea( bool& o_bShrunk,
+                                          SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
+                                          SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const;
 
     SC_DLLPUBLIC void           GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
-                                    SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const;
-    SC_DLLPUBLIC BOOL			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
-    SC_DLLPUBLIC BOOL			GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
-    SC_DLLPUBLIC BOOL			GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
-                                    BOOL bNotes = TRUE ) const;
-    SC_DLLPUBLIC BOOL			GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow,
-                                        SCCOL& rEndCol, BOOL bNotes = TRUE ) const;
-    SC_DLLPUBLIC BOOL			GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol,
-                                        SCROW& rEndRow, BOOL bNotes = TRUE ) const;
+                                    SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bIncludeOld, bool bOnlyDown ) const;
+    SC_DLLPUBLIC sal_Bool			GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
+    SC_DLLPUBLIC sal_Bool			GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
+    SC_DLLPUBLIC sal_Bool			GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
+                                    sal_Bool bNotes = sal_True ) const;
+    SC_DLLPUBLIC sal_Bool			GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow,
+                                        SCCOL& rEndCol, sal_Bool bNotes = sal_True ) const;
+    SC_DLLPUBLIC sal_Bool			GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol,
+                                        SCROW& rEndRow, sal_Bool bNotes = sal_True ) const;
     void			InvalidateTableArea();
 
 
-    SC_DLLPUBLIC BOOL			GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const;
+    SC_DLLPUBLIC sal_Bool			GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const;
 
     /** 
      * Find the maximum column position that contains printable data for the 
@@ -956,49 +972,49 @@ public:
 
     void			FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY );
     SC_DLLPUBLIC void			GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY,
-                                BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark );
+                                sal_Bool bMarked, sal_Bool bUnprotected, const ScMarkData& rMark );
 
-    BOOL			GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab,
+    sal_Bool			GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab,
                                         const ScMarkData& rMark );
 
     void			LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
                                                     SCCOL& rEndCol, SCROW& rEndRow );
     void			LimitChartIfAll( ScRangeListRef& rRangeList );
 
-    BOOL			InsertRow( SCCOL nStartCol, SCTAB nStartTab,
+    sal_Bool			InsertRow( SCCOL nStartCol, SCTAB nStartTab,
                                SCCOL nEndCol,   SCTAB nEndTab,
                                SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL,
                                const ScMarkData* pTabMark = NULL );
-    SC_DLLPUBLIC BOOL			InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL );
+    SC_DLLPUBLIC sal_Bool			InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL );
     void			DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
                                SCCOL nEndCol,   SCTAB nEndTab,
                                SCROW nStartRow, SCSIZE nSize,
-                               ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL,
+                               ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL,
                                const ScMarkData* pTabMark = NULL );
     void			DeleteRow( const ScRange& rRange,
-                               ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
-    BOOL			InsertCol( SCROW nStartRow, SCTAB nStartTab,
+                               ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL );
+    sal_Bool			InsertCol( SCROW nStartRow, SCTAB nStartTab,
                                SCROW nEndRow,   SCTAB nEndTab,
                                SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL,
                                const ScMarkData* pTabMark = NULL );
-    SC_DLLPUBLIC BOOL			InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL );
+    SC_DLLPUBLIC sal_Bool			InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL );
     void			DeleteCol( SCROW nStartRow, SCTAB nStartTab,
                                SCROW nEndRow, SCTAB nEndTab,
                                SCCOL nStartCol, SCSIZE nSize,
-                               ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL,
+                               ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL,
                                const ScMarkData* pTabMark = NULL );
     void			DeleteCol( const ScRange& rRange,
-                               ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
+                               ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL );
 
-    BOOL			CanInsertRow( const ScRange& rRange ) const;
-    BOOL			CanInsertCol( const ScRange& rRange ) const;
+    sal_Bool			CanInsertRow( const ScRange& rRange ) const;
+    sal_Bool			CanInsertCol( const ScRange& rRange ) const;
 
-    void			FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear = TRUE );
-    BOOL			CanFitBlock( const ScRange& rOld, const ScRange& rNew );
+    void			FitBlock( const ScRange& rOld, const ScRange& rNew, sal_Bool bClear = sal_True );
+    sal_Bool			CanFitBlock( const ScRange& rOld, const ScRange& rNew );
 
-    BOOL			IsClipOrUndo() const 						{ return bIsClip || bIsUndo; }
-    BOOL			IsUndo() const								{ return bIsUndo; }
-    BOOL			IsClipboard() const 						{ return bIsClip; }
+    sal_Bool			IsClipOrUndo() const 						{ return bIsClip || bIsUndo; }
+    sal_Bool			IsUndo() const								{ return bIsUndo; }
+    sal_Bool			IsClipboard() const 						{ return bIsClip; }
     bool			IsUndoEnabled() const						{ return mbUndoEnabled; }
     void            EnableUndo( bool bVal );
 
@@ -1012,24 +1028,24 @@ public:
     void            SetNamedRangesLockCount( sal_Int16 nCount ) { mnNamedRangesLockCount = nCount; }
     SC_DLLPUBLIC void			ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks );
     SC_DLLPUBLIC void			ResetClip( ScDocument* pSourceDoc, SCTAB nTab );
-    void			SetCutMode( BOOL bCut );
-    BOOL			IsCutMode();
-    void			SetClipArea( const ScRange& rArea, BOOL bCut = FALSE );
+    void			SetCutMode( sal_Bool bCut );
+    sal_Bool			IsCutMode();
+    void			SetClipArea( const ScRange& rArea, sal_Bool bCut = sal_False );
 
-    SC_DLLPUBLIC BOOL			IsDocVisible() const						{ return bIsVisible; }
-    void			SetDocVisible( BOOL bSet );
+    SC_DLLPUBLIC sal_Bool			IsDocVisible() const						{ return bIsVisible; }
+    void			SetDocVisible( sal_Bool bSet );
 
-    BOOL			HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL );
+    sal_Bool			HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL );
 
     void			DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                         const ScMarkData& rMark );
     void			DeleteObjectsInSelection( const ScMarkData& rMark );
 
     void			DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                            const ScMarkData& rMark, USHORT nDelFlag);
+                            const ScMarkData& rMark, sal_uInt16 nDelFlag);
     void			DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                SCTAB nTab, USHORT nDelFlag);
-    void			DeleteAreaTab(const ScRange& rRange, USHORT nDelFlag);
+                                SCTAB nTab, sal_uInt16 nDelFlag);
+    void			DeleteAreaTab(const ScRange& rRange, sal_uInt16 nDelFlag);
 
     void            CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, 
                                const ScMarkData* pMarks = NULL, bool bAllTabs = false, bool bKeepScenarioFlags = false,
@@ -1046,20 +1062,20 @@ public:
                                     SCROW & rClipStartRow );
     void 			StartListeningFromClip( SCCOL nCol1, SCROW nRow1,
                                         SCCOL nCol2, SCROW nRow2,
-                                        const ScMarkData& rMark, USHORT nInsFlag );
+                                        const ScMarkData& rMark, sal_uInt16 nInsFlag );
     void 			BroadcastFromClip( SCCOL nCol1, SCROW nRow1,
                                     SCCOL nCol2, SCROW nRow2,
-                                    const ScMarkData& rMark, USHORT nInsFlag );
+                                    const ScMarkData& rMark, sal_uInt16 nInsFlag );
     /** If pDestRanges is given it overrides rDestRange, rDestRange in this
         case is the overall encompassing range. */
     void			CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark,
-                                    USHORT nInsFlag,
+                                    sal_uInt16 nInsFlag,
                                     ScDocument* pRefUndoDoc = NULL,
                                     ScDocument* pClipDoc = NULL,
-                                    BOOL bResetCut = TRUE,
-                                    BOOL bAsLink = FALSE,
-                                    BOOL bIncludeFiltered = TRUE,
-                                    BOOL bSkipAttrForEmpty = FALSE,
+                                    sal_Bool bResetCut = sal_True,
+                                    sal_Bool bAsLink = sal_False,
+                                    sal_Bool bIncludeFiltered = sal_True,
+                                    sal_Bool bSkipAttrForEmpty = sal_False,
                                     const ScRangeList * pDestRanges = NULL );
 
     void            CopyMultiRangeFromClip(const ScAddress& rDestPos, const ScMarkData& rMark, 
@@ -1068,60 +1084,60 @@ public:
                                            bool bIncludeFiltered = true,
                                            bool bSkipAttrForEmpty = false);
 
-    void			GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered);
+    void			GetClipArea(SCCOL& nClipX, SCROW& nClipY, sal_Bool bIncludeFiltered);
     void			GetClipStart(SCCOL& nClipX, SCROW& nClipY);
 
-    BOOL			HasClipFilteredRows();
+    sal_Bool			HasClipFilteredRows();
 
-    BOOL			IsClipboardSource() const;
+    sal_Bool			IsClipboardSource() const;
 
-    SC_DLLPUBLIC void			TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsLink );
+    SC_DLLPUBLIC void			TransposeClip( ScDocument* pTransClip, sal_uInt16 nFlags, sal_Bool bAsLink );
 
     ScClipParam&    GetClipParam();
     void            SetClipParam(const ScClipParam& rParam);
 
-    void			MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSkipEmpty,
+    void			MixDocument( const ScRange& rRange, sal_uInt16 nFunction, sal_Bool bSkipEmpty,
                                     ScDocument* pSrcDoc );
 
     void			FillTab( const ScRange& rSrcArea, const ScMarkData& rMark,
-                                USHORT nFlags, USHORT nFunction,
-                                BOOL bSkipEmpty, BOOL bAsLink );
+                                sal_uInt16 nFlags, sal_uInt16 nFunction,
+                                sal_Bool bSkipEmpty, sal_Bool bAsLink );
     void			FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark,
-                                USHORT nFlags, USHORT nFunction,
-                                BOOL bSkipEmpty, BOOL bAsLink );
+                                sal_uInt16 nFlags, sal_uInt16 nFunction,
+                                sal_Bool bSkipEmpty, sal_Bool bAsLink );
 
     void			TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType );
 
     SC_DLLPUBLIC void			InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2,
-                                BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE );
+                                sal_Bool bColInfo = sal_False, sal_Bool bRowInfo = sal_False );
     void			AddUndoTab( SCTAB nTab1, SCTAB nTab2,
-                                BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE );
+                                sal_Bool bColInfo = sal_False, sal_Bool bRowInfo = sal_False );
     SC_DLLPUBLIC void			InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection,
-                                BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE );
+                                sal_Bool bColInfo = sal_False, sal_Bool bRowInfo = sal_False );
 
                     //	nicht mehr benutzen:
     void			CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                 SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
-                                USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc,
-                                const ScMarkData* pMarks = NULL, BOOL bColRowFlags = TRUE);
+                                sal_uInt16 nFlags, sal_Bool bMarked, ScDocument* pDestDoc,
+                                const ScMarkData* pMarks = NULL, sal_Bool bColRowFlags = sal_True);
     void			UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                 SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
-                                USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc,
+                                sal_uInt16 nFlags, sal_Bool bMarked, ScDocument* pDestDoc,
                                 const ScMarkData* pMarks = NULL);
 
     void			CopyToDocument(const ScRange& rRange,
-                                USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc,
-                                const ScMarkData* pMarks = NULL, BOOL bColRowFlags = TRUE);
+                                sal_uInt16 nFlags, sal_Bool bMarked, ScDocument* pDestDoc,
+                                const ScMarkData* pMarks = NULL, sal_Bool bColRowFlags = sal_True);
     void			UndoToDocument(const ScRange& rRange,
-                                USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc,
+                                sal_uInt16 nFlags, sal_Bool bMarked, ScDocument* pDestDoc,
                                 const ScMarkData* pMarks = NULL);
 
-    void			CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario = FALSE );
-    BOOL			TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const;
+    void			CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bNewScenario = sal_False );
+    sal_Bool			TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const;
     void			MarkScenario( SCTAB nSrcTab, SCTAB nDestTab,
-                                    ScMarkData& rDestMark, BOOL bResetMark = TRUE,
-                                    USHORT nNeededBits = 0 ) const;
-    BOOL			HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const;
+                                    ScMarkData& rDestMark, sal_Bool bResetMark = sal_True,
+                                    sal_uInt16 nNeededBits = 0 ) const;
+    sal_Bool			HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const;
     SC_DLLPUBLIC const ScRangeList* GetScenarioRanges( SCTAB nTab ) const;
 
     SC_DLLPUBLIC void			CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc );
@@ -1129,7 +1145,7 @@ public:
     void			UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                      SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
                                      SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                     ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE,
+                                     ScDocument* pUndoDoc = NULL, sal_Bool bIncludeDraw = sal_True,
                                      bool bUpdateNoteCaptionPos = true );
 
     SC_DLLPUBLIC void			UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDoc,
@@ -1139,38 +1155,38 @@ public:
 
     void			Fill(	SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                             const ScMarkData& rMark,
-                            ULONG nFillCount, FillDir eFillDir = FILL_TO_BOTTOM,
+                            sal_uLong nFillCount, FillDir eFillDir = FILL_TO_BOTTOM,
                             FillCmd eFillCmd = FILL_LINEAR, FillDateCmd eFillDateCmd = FILL_DAY,
                             double nStepValue = 1.0, double nMaxValue = 1E307);
     String			GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY );
 
-    BOOL			GetSelectionFunction( ScSubTotalFunc eFunc,
+    sal_Bool			GetSelectionFunction( ScSubTotalFunc eFunc,
                                             const ScAddress& rCursor, const ScMarkData& rMark,
                                             double& rResult );
 
-    SC_DLLPUBLIC const SfxPoolItem* 		GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const;
+    SC_DLLPUBLIC const SfxPoolItem* 		GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const;
     SC_DLLPUBLIC const ScPatternAttr*	GetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
     SC_DLLPUBLIC const ScPatternAttr*    GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const;
-    const ScPatternAttr*	GetSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE );
-    ScPatternAttr*			CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE );
+    const ScPatternAttr*	GetSelectionPattern( const ScMarkData& rMark, sal_Bool bDeep = sal_True );
+    ScPatternAttr*			CreateSelectionPattern( const ScMarkData& rMark, sal_Bool bDeep = sal_True );
 
     const ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
     SC_DLLPUBLIC const SfxItemSet*	GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
-    const SfxPoolItem*	GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const;
+    const SfxPoolItem*	GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const;
 
     SC_DLLPUBLIC const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator();
-    BOOL			HasStringWeakCharacters( const String& rString );
-    SC_DLLPUBLIC BYTE			GetStringScriptType( const String& rString );
-    SC_DLLPUBLIC BYTE			GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat );
-    SC_DLLPUBLIC BYTE			GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell = NULL );
+    sal_Bool			HasStringWeakCharacters( const String& rString );
+    SC_DLLPUBLIC sal_uInt8			GetStringScriptType( const String& rString );
+    SC_DLLPUBLIC sal_uInt8			GetCellScriptType( ScBaseCell* pCell, sal_uLong nNumberFormat );
+    SC_DLLPUBLIC sal_uInt8			GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell = NULL );
 
-    BOOL			HasDetectiveOperations() const;
+    sal_Bool			HasDetectiveOperations() const;
     void			AddDetectiveOperation( const ScDetOpData& rData );
     void			ClearDetectiveOperations();
     ScDetOpList*	GetDetOpList() const				{ return pDetOpList; }
     void			SetDetOpList(ScDetOpList* pNew);
 
-    BOOL			HasDetectiveObjects(SCTAB nTab) const;
+    sal_Bool			HasDetectiveObjects(SCTAB nTab) const;
 
     void			GetSelectionFrame( const ScMarkData& rMark,
                                        SvxBoxItem&		rLineOuter,
@@ -1182,17 +1198,17 @@ public:
                                          const SvxBoxItem* pLineOuter,
                                          const SvxBoxInfoItem* pLineInner );
 
-    void			ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
-    void			ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark );
+    void			ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
+    void			ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark );
 
-    SC_DLLPUBLIC ULONG			AddCondFormat( const ScConditionalFormat& rNew );
-    SC_DLLPUBLIC void			FindConditionalFormat( ULONG nKey, ScRangeList& rRanges );
-    SC_DLLPUBLIC void			FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB nTab );
-    void			ConditionalChanged( ULONG nKey );
+    SC_DLLPUBLIC sal_uLong			AddCondFormat( const ScConditionalFormat& rNew );
+    SC_DLLPUBLIC void			FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges );
+    SC_DLLPUBLIC void			FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab );
+    void			ConditionalChanged( sal_uLong nKey );
 
-    SC_DLLPUBLIC ULONG			AddValidationEntry( const ScValidationData& rNew );
+    SC_DLLPUBLIC sal_uLong			AddValidationEntry( const ScValidationData& rNew );
 
-    SC_DLLPUBLIC const ScValidationData*	GetValidationEntry( ULONG nIndex ) const;
+    SC_DLLPUBLIC const ScValidationData*	GetValidationEntry( sal_uLong nIndex ) const;
 
     ScConditionalFormatList* GetCondFormList() const		// Ref-Undo
                     { return pCondFormList; }
@@ -1226,36 +1242,36 @@ public:
 
     void			ApplySelectionStyle( const ScStyleSheet& rStyle, const ScMarkData& rMark );
     void			ApplySelectionLineStyle( const ScMarkData& rMark,
-                                            const SvxBorderLine* pLine, BOOL bColorOnly );
+                                            const SvxBorderLine* pLine, sal_Bool bColorOnly );
 
     const ScStyleSheet*	GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
     const ScStyleSheet*	GetSelectionStyle( const ScMarkData& rMark ) const;
 
-    void			StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved,
+    void			StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool bRemoved,
                                         OutputDevice* pDev,
                                         double nPPTX, double nPPTY,
                                         const Fraction& rZoomX, const Fraction& rZoomY );
 
-    BOOL			IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
+    sal_Bool			IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const;
 
-    SC_DLLPUBLIC BOOL			ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow,
+    SC_DLLPUBLIC sal_Bool			ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow,
                                             SCCOL nEndCol, SCROW nEndRow,
-                                            SCTAB nTab, INT16 nFlags );
-    BOOL			RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow,
+                                            SCTAB nTab, sal_Int16 nFlags );
+    sal_Bool			RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow,
                                             SCCOL nEndCol, SCROW nEndRow,
-                                            SCTAB nTab, INT16 nFlags );
+                                            SCTAB nTab, sal_Int16 nFlags );
 
     SC_DLLPUBLIC void			SetPattern( const ScAddress&, const ScPatternAttr& rAttr,
-                                    BOOL bPutToPool = FALSE );
+                                    sal_Bool bPutToPool = sal_False );
     SC_DLLPUBLIC void			SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr,
-                                    BOOL bPutToPool = FALSE );
+                                    sal_Bool bPutToPool = sal_False );
     void            DeleteNumberFormat( const sal_uInt32* pDelKeys, sal_uInt32 nCount );
 
     void			AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                    USHORT nFormatNo, const ScMarkData& rMark );
+                                    sal_uInt16 nFormatNo, const ScMarkData& rMark );
     void			GetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                                         ScAutoFormatData& rData );
-    BOOL			SearchAndReplace( const SvxSearchItem& rSearchItem,
+    sal_Bool			SearchAndReplace( const SvxSearchItem& rSearchItem,
                                         SCCOL& rCol, SCROW& rRow, SCTAB& rTab,
                                         ScMarkData& rMark,
                                         String& rUndoStr, ScDocument* pUndoDoc = NULL );
@@ -1265,50 +1281,50 @@ public:
     static void		GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
                         SCCOL& rCol, SCROW& rRow );
 
-    BOOL			Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab,
+    sal_Bool			Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab,
                             SCCOL nVCol, SCROW nVRow, SCTAB nVTab,
                             const String& sValStr, double& nX);
 
     void			ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark );
-    void            DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
-    void			DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark );
+    void            DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark );
+    void			DeleteSelectionTab( SCTAB nTab, sal_uInt16 nDelFlag, const ScMarkData& rMark );
 
-    SC_DLLPUBLIC void           SetColWidth( SCCOL nCol, SCTAB nTab, USHORT nNewWidth );
-    SC_DLLPUBLIC void           SetRowHeight( SCROW nRow, SCTAB nTab, USHORT nNewHeight );
+    SC_DLLPUBLIC void           SetColWidth( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth );
+    SC_DLLPUBLIC void           SetRowHeight( SCROW nRow, SCTAB nTab, sal_uInt16 nNewHeight );
     SC_DLLPUBLIC void           SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, SCTAB nTab,
-                                            USHORT nNewHeight );
+                                            sal_uInt16 nNewHeight );
 
     SC_DLLPUBLIC void           SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, SCTAB nTab,
-                                                  USHORT nNewHeight );
-    void                        SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bManual );
+                                                  sal_uInt16 nNewHeight );
+    void                        SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_Bool bManual );
 
-    SC_DLLPUBLIC USHORT         GetColWidth( SCCOL nCol, SCTAB nTab ) const;
-    SC_DLLPUBLIC USHORT         GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero = true ) const;
-    SC_DLLPUBLIC USHORT         GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const;
-    SC_DLLPUBLIC ULONG          GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const;
-    SCROW                       GetRowForHeight( SCTAB nTab, ULONG nHeight ) const;
-    ULONG                       GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, double fScale ) const;
-    SC_DLLPUBLIC ULONG          GetColOffset( SCCOL nCol, SCTAB nTab ) const;
-    SC_DLLPUBLIC ULONG          GetRowOffset( SCROW nRow, SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_uInt16         GetColWidth( SCCOL nCol, SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_uInt16         GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero = true ) const;
+    SC_DLLPUBLIC sal_uInt16         GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero = true ) const;
+    SC_DLLPUBLIC sal_uLong          GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const;
+    SCROW                       GetRowForHeight( SCTAB nTab, sal_uLong nHeight ) const;
+    sal_uLong                       GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, double fScale ) const;
+    SC_DLLPUBLIC sal_uLong          GetColOffset( SCCOL nCol, SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_uLong          GetRowOffset( SCROW nRow, SCTAB nTab ) const;
 
-    SC_DLLPUBLIC USHORT         GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const;
-    SC_DLLPUBLIC USHORT         GetOriginalHeight( SCROW nRow, SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_uInt16         GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_uInt16         GetOriginalHeight( SCROW nRow, SCTAB nTab ) const;
 
-    USHORT			GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const;
+    sal_uInt16			GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const;
 
     SCROW			GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const;
 
-    USHORT			GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev,
+    sal_uInt16			GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev,
                                         double nPPTX, double nPPTY,
                                         const Fraction& rZoomX, const Fraction& rZoomY,
-                                        BOOL bFormula,
+                                        sal_Bool bFormula,
                                         const ScMarkData* pMarkData = NULL,
-                                        BOOL bSimpleTextImport = FALSE );
-    SC_DLLPUBLIC BOOL			SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nExtra,
+                                        sal_Bool bSimpleTextImport = sal_False );
+    SC_DLLPUBLIC sal_Bool			SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt16 nExtra,
                                         OutputDevice* pDev,
                                         double nPPTX, double nPPTY,
                                         const Fraction& rZoomX, const Fraction& rZoomY,
-                                        BOOL bShrink );
+                                        sal_Bool bShrink );
     void            UpdateAllRowHeights( OutputDevice* pDev,
                                         double nPPTX, double nPPTY,
                                         const Fraction& rZoomX, const Fraction& rZoomY,
@@ -1317,20 +1333,20 @@ public:
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bWidth, BOOL bTotalSize = FALSE );
+                                    sal_Bool bWidth, sal_Bool bTotalSize = sal_False );
 
-    SC_DLLPUBLIC void			ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow);
-    SC_DLLPUBLIC void			ShowRow(SCROW nRow, SCTAB nTab, BOOL bShow);
-    SC_DLLPUBLIC void			ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, BOOL bShow);
-    SC_DLLPUBLIC void			SetColFlags( SCCOL nCol, SCTAB nTab, BYTE nNewFlags );
-    SC_DLLPUBLIC void			SetRowFlags( SCROW nRow, SCTAB nTab, BYTE nNewFlags );
-    SC_DLLPUBLIC void			SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BYTE nNewFlags );
+    SC_DLLPUBLIC void			ShowCol(SCCOL nCol, SCTAB nTab, sal_Bool bShow);
+    SC_DLLPUBLIC void			ShowRow(SCROW nRow, SCTAB nTab, sal_Bool bShow);
+    SC_DLLPUBLIC void			ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, sal_Bool bShow);
+    SC_DLLPUBLIC void			SetColFlags( SCCOL nCol, SCTAB nTab, sal_uInt8 nNewFlags );
+    SC_DLLPUBLIC void			SetRowFlags( SCROW nRow, SCTAB nTab, sal_uInt8 nNewFlags );
+    SC_DLLPUBLIC void			SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt8 nNewFlags );
 
-    SC_DLLPUBLIC BYTE			GetColFlags( SCCOL nCol, SCTAB nTab ) const;
-    SC_DLLPUBLIC BYTE			GetRowFlags( SCROW nRow, SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_uInt8			GetColFlags( SCCOL nCol, SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_uInt8			GetRowFlags( SCROW nRow, SCTAB nTab ) const;
 
-    SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArray( SCTAB nTab ) const;
-    SC_DLLPUBLIC       ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArrayModifiable( SCTAB nTab );
+    SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, sal_uInt8> & GetRowFlagsArray( SCTAB nTab ) const;
+    SC_DLLPUBLIC       ScBitMaskCompressedArray< SCROW, sal_uInt8> & GetRowFlagsArrayModifiable( SCTAB nTab );
 
     SC_DLLPUBLIC void           GetAllRowBreaks(::std::set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
     SC_DLLPUBLIC void           GetAllColBreaks(::std::set<SCCOL>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const;
@@ -1388,11 +1404,11 @@ public:
 
     // returns whether to export a Default style for this col/row or not
     // nDefault is setted to one possition in the current row/col where the Default style is
-    BOOL			GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault);
-    BOOL			GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault);
+    sal_Bool			GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault);
+    sal_Bool			GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault);
 
-    BOOL			UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow );
-    BOOL			UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow );
+    sal_Bool			UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, sal_Bool bShow );
+    sal_Bool			UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_Bool bShow );
 
     void			StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab );
     void			ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab );
@@ -1410,26 +1426,26 @@ public:
     void            InvalidatePageBreaks(SCTAB nTab);
     void			UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL );
     void			RemoveManualBreaks( SCTAB nTab );
-    BOOL			HasManualBreaks( SCTAB nTab ) const;
+    sal_Bool			HasManualBreaks( SCTAB nTab ) const;
 
-    BOOL			IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab = NULL );
-    BOOL			RemovePageStyleInUse( const String& rStrPageStyle );
-    BOOL			RenamePageStyleInUse( const String& rOld, const String& rNew );
+    sal_Bool			IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab = NULL );
+    sal_Bool			RemovePageStyleInUse( const String& rStrPageStyle );
+    sal_Bool			RenamePageStyleInUse( const String& rOld, const String& rNew );
     void			ModifyStyleSheet( SfxStyleSheetBase& rPageStyle,
                                       const SfxItemSet&	 rChanges );
 
     void			PageStyleModified( SCTAB nTab, const String& rNewName );
 
-    SC_DLLPUBLIC BOOL			NeedPageResetAfterTab( SCTAB nTab ) const;
+    SC_DLLPUBLIC sal_Bool			NeedPageResetAfterTab( SCTAB nTab ) const;
 
     // war vorher im PageStyle untergracht. Jetzt an jeder Tabelle:
-    SC_DLLPUBLIC BOOL			HasPrintRange();
-    SC_DLLPUBLIC USHORT			GetPrintRangeCount( SCTAB nTab );
-    SC_DLLPUBLIC const ScRange*	GetPrintRange( SCTAB nTab, USHORT nPos );
+    SC_DLLPUBLIC sal_Bool			HasPrintRange();
+    SC_DLLPUBLIC sal_uInt16			GetPrintRangeCount( SCTAB nTab );
+    SC_DLLPUBLIC const ScRange*	GetPrintRange( SCTAB nTab, sal_uInt16 nPos );
     SC_DLLPUBLIC const ScRange*	GetRepeatColRange( SCTAB nTab );
     SC_DLLPUBLIC const ScRange*	GetRepeatRowRange( SCTAB nTab );
     /** Returns true, if the specified sheet is always printed. */
-    BOOL            IsPrintEntireSheet( SCTAB nTab ) const;
+    sal_Bool            IsPrintEntireSheet( SCTAB nTab ) const;
 
     /** Removes all print ranges. */
     SC_DLLPUBLIC void            ClearPrintRanges( SCTAB nTab );
@@ -1454,7 +1470,7 @@ public:
     SC_DLLPUBLIC void			CopyStdStylesFrom( ScDocument* pSrcDoc );
 
     CharSet			GetSrcCharSet() const	{ return eSrcSet; }
-    ULONG			GetSrcVersion() const	{ return nSrcVer; }
+    sal_uLong			GetSrcVersion() const	{ return nSrcVer; }
     SCROW			GetSrcMaxRow() const	{ return nSrcMaxRow; }
 
     void			SetSrcCharSet( CharSet eNew )	{ eSrcSet = eNew; }
@@ -1462,107 +1478,107 @@ public:
 
     void            FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                         SCTAB nTab, double nScaleX, double nScaleY,
-                        BOOL bPageMode, BOOL bFormulaMode,
+                        sal_Bool bPageMode, sal_Bool bFormulaMode,
                         const ScMarkData* pMarkData = NULL );
 
     SC_DLLPUBLIC SvNumberFormatter*	GetFormatTable() const;
 
-    void			Sort( SCTAB nTab, const ScSortParam& rSortParam, BOOL bKeepQuery );
-    SCSIZE			Query( SCTAB nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub );
-    BOOL			ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL );
-    SC_DLLPUBLIC BOOL			CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+    void			Sort( SCTAB nTab, const ScSortParam& rSortParam, sal_Bool bKeepQuery );
+    SCSIZE			Query( SCTAB nTab, const ScQueryParam& rQueryParam, sal_Bool bKeepSub );
+    sal_Bool			ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, sal_Bool* pSpecial = NULL );
+    SC_DLLPUBLIC sal_Bool			CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                         SCTAB nTab, ScQueryParam& rQueryParam );
     void 			GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr);
 
-    BOOL			GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
+    sal_Bool			GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                 bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates);
-    SC_DLLPUBLIC BOOL			GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
+    SC_DLLPUBLIC sal_Bool			GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
                                 SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates );
-    BOOL			GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                TypedScStrCollection& rStrings, BOOL bLimit = FALSE );
-    BOOL			GetFormulaEntries( TypedScStrCollection& rStrings );
+    sal_Bool			GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
+                                TypedScStrCollection& rStrings, sal_Bool bLimit = sal_False );
+    sal_Bool			GetFormulaEntries( TypedScStrCollection& rStrings );
 
-    BOOL			HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab );
+    sal_Bool			HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab );
 
-    SC_DLLPUBLIC BOOL			HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
+    SC_DLLPUBLIC sal_Bool			HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                                     SCTAB nTab );
-    SC_DLLPUBLIC BOOL			HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
+    SC_DLLPUBLIC sal_Bool			HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                                     SCTAB nTab );
 
-    SfxPrinter*		GetPrinter( BOOL bCreateIfNotExist = TRUE );
+    SfxPrinter*		GetPrinter( sal_Bool bCreateIfNotExist = sal_True );
     void			SetPrinter( SfxPrinter* pNewPrinter );
     VirtualDevice*	GetVirtualDevice_100th_mm();
     SC_DLLPUBLIC OutputDevice*	GetRefDevice();	// WYSIWYG: Printer, otherwise VirtualDevice...
 
-    void 			EraseNonUsedSharedNames(USHORT nLevel);
-    BOOL			GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab,
-                                        BOOL bInSel, const ScMarkData& rMark) const;
+    void 			EraseNonUsedSharedNames(sal_uInt16 nLevel);
+    sal_Bool			GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab,
+                                        sal_Bool bInSel, const ScMarkData& rMark) const;
 
-    BOOL			ReplaceStyle(const SvxSearchItem& rSearchItem,
+    sal_Bool			ReplaceStyle(const SvxSearchItem& rSearchItem,
                                  SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                 ScMarkData& rMark, BOOL bIsUndo);
+                                 ScMarkData& rMark, sal_Bool bIsUndo);
 
     void			DoColResize( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd );
 
     void			InvalidateTextWidth( const String& rStyleName );
     void			InvalidateTextWidth( SCTAB nTab );
-    void            InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, BOOL bNumFormatChanged );
+    void            InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, sal_Bool bNumFormatChanged );
 
-    BOOL			IdleCalcTextWidth();
-    BOOL			IdleCheckLinks();
+    sal_Bool			IdleCalcTextWidth();
+    sal_Bool			IdleCheckLinks();
 
-    BOOL			ContinueOnlineSpelling();	// TRUE = etwas gefunden
+    sal_Bool			ContinueOnlineSpelling();	// sal_True = etwas gefunden
 
     void            RepaintRange( const ScRange& rRange );
 
-    BOOL			IsIdleDisabled() const		{ return bIdleDisabled; }
-    void			DisableIdle(BOOL bDo)		{ bIdleDisabled = bDo; }
+    sal_Bool		IsIdleDisabled() const		{ return bIdleDisabled; }
+    void			DisableIdle(sal_Bool bDo)	{ bIdleDisabled = bDo; }
 
-    BOOL			IsDetectiveDirty() const	 { return bDetectiveDirty; }
-    void			SetDetectiveDirty(BOOL bSet) { bDetectiveDirty = bSet; }
+    sal_Bool			IsDetectiveDirty() const	 { return bDetectiveDirty; }
+    void			SetDetectiveDirty(sal_Bool bSet) { bDetectiveDirty = bSet; }
 
     void			RemoveAutoSpellObj();
     void			SetOnlineSpellPos( const ScAddress& rPos );
-    SC_DLLPUBLIC BOOL			SetVisibleSpellRange( const ScRange& rRange );	// TRUE = changed
+    SC_DLLPUBLIC sal_Bool			SetVisibleSpellRange( const ScRange& rRange );	// sal_True = changed
 
-    BYTE			GetMacroCallMode() const	 { return nMacroCallMode; }
-    void			SetMacroCallMode(BYTE nNew)	 { nMacroCallMode = nNew; }
+    sal_uInt8			GetMacroCallMode() const	 { return nMacroCallMode; }
+    void			SetMacroCallMode(sal_uInt8 nNew)	 { nMacroCallMode = nNew; }
 
-    BOOL			GetHasMacroFunc() const		 { return bHasMacroFunc; }
-    void			SetHasMacroFunc(BOOL bSet)	 { bHasMacroFunc = bSet; }
+    sal_Bool			GetHasMacroFunc() const		 { return bHasMacroFunc; }
+    void			SetHasMacroFunc(sal_Bool bSet)	 { bHasMacroFunc = bSet; }
 
-    BOOL			CheckMacroWarn();
+    sal_Bool			CheckMacroWarn();
 
     void            SetRangeOverflowType(sal_uInt32 nType)  { nRangeOverflowType = nType; }
     sal_Bool        HasRangeOverflow() const                { return nRangeOverflowType != 0; }
     SC_DLLPUBLIC sal_uInt32      GetRangeOverflowType() const            { return nRangeOverflowType; }
 
     // fuer Broadcasting/Listening
-    void			SetNoSetDirty( BOOL bVal ) { bNoSetDirty = bVal; }
-    BOOL			GetNoSetDirty() const { return bNoSetDirty; }
-    void			SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; }
-    BOOL			IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; }
+    void			SetNoSetDirty( sal_Bool bVal ) { bNoSetDirty = bVal; }
+    sal_Bool			GetNoSetDirty() const { return bNoSetDirty; }
+    void			SetInsertingFromOtherDoc( sal_Bool bVal ) { bInsertingFromOtherDoc = bVal; }
+    sal_Bool			IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; }
     void            SetLoadingMedium( bool bVal );
     void            SetImportingXML( bool bVal );
     bool            IsImportingXML() const { return bImportingXML; }
-    void			SetXMLFromWrapper( BOOL bVal );
-    BOOL			IsXMLFromWrapper() const { return bXMLFromWrapper; }
-    void			SetCalcingAfterLoad( BOOL bVal ) { bCalcingAfterLoad = bVal; }
-    BOOL			IsCalcingAfterLoad() const { return bCalcingAfterLoad; }
-    void			SetNoListening( BOOL bVal ) { bNoListening = bVal; }
-    BOOL			GetNoListening() const { return bNoListening; }
+    void			SetXMLFromWrapper( sal_Bool bVal );
+    sal_Bool			IsXMLFromWrapper() const { return bXMLFromWrapper; }
+    void			SetCalcingAfterLoad( sal_Bool bVal ) { bCalcingAfterLoad = bVal; }
+    sal_Bool			IsCalcingAfterLoad() const { return bCalcingAfterLoad; }
+    void			SetNoListening( sal_Bool bVal ) { bNoListening = bVal; }
+    sal_Bool			GetNoListening() const { return bNoListening; }
     ScBroadcastAreaSlotMachine*	GetBASM() const { return pBASM; }
 
     ScChartListenerCollection* GetChartListenerCollection() const
                         { return pChartListenerCollection; }
     void			SetChartListenerCollection( ScChartListenerCollection*,
-                        BOOL bSetChartRangeLists = FALSE );
+                        sal_Bool bSetChartRangeLists = sal_False );
     void			UpdateChart( const String& rName );
     void            RestoreChartListener( const String& rName );
     SC_DLLPUBLIC void			UpdateChartListenerCollection();
-    BOOL			IsChartListenerCollectionNeedsUpdate() const
+    sal_Bool			IsChartListenerCollectionNeedsUpdate() const
                         { return bChartListenerCollectionNeedsUpdate; }
-    void			SetChartListenerCollectionNeedsUpdate( BOOL bFlg )
+    void			SetChartListenerCollectionNeedsUpdate( sal_Bool bFlg )
                         { bChartListenerCollectionNeedsUpdate = bFlg; }
     void			AddOLEObjectToCollection(const String& rName);
 
@@ -1572,15 +1588,15 @@ public:
     vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharacters();
     void			SetForbiddenCharacters( const vos::ORef<SvxForbiddenCharactersTable> xNew );
 
-    BYTE			GetAsianCompression() const;		// CharacterCompressionType values
-    BOOL			IsValidAsianCompression() const;
-    void			SetAsianCompression(BYTE nNew);
+    sal_uInt8			GetAsianCompression() const;		// CharacterCompressionType values
+    sal_Bool			IsValidAsianCompression() const;
+    void			SetAsianCompression(sal_uInt8 nNew);
 
-    BOOL			GetAsianKerning() const;
-    BOOL			IsValidAsianKerning() const;
-    void			SetAsianKerning(BOOL bNew);
+    sal_Bool			GetAsianKerning() const;
+    sal_Bool			IsValidAsianKerning() const;
+    void			SetAsianKerning(sal_Bool bNew);
 
-    BYTE			GetEditTextDirection(SCTAB nTab) const;	// EEHorizontalTextDirection values
+    sal_uInt8			GetEditTextDirection(SCTAB nTab) const;	// EEHorizontalTextDirection values
 
     SC_DLLPUBLIC ScLkUpdMode		GetLinkMode() const				{ return eLinkMode ;}
     void			SetLinkMode( ScLkUpdMode nSet )	{ 	eLinkMode  = nSet;}
@@ -1592,21 +1608,21 @@ private:
     void				FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount,
                                         SCCOL nX1, SCCOL nX2 ) const;
 
-    USHORT				RowDifferences( SCROW nThisRow, SCTAB nThisTab,
+    sal_uInt16				RowDifferences( SCROW nThisRow, SCTAB nThisTab,
                                         ScDocument& rOtherDoc,
                                         SCROW nOtherRow, SCTAB nOtherTab,
                                         SCCOL nMaxCol, SCCOLROW* pOtherCols );
-    USHORT				ColDifferences( SCCOL nThisCol, SCTAB nThisTab,
+    sal_uInt16				ColDifferences( SCCOL nThisCol, SCTAB nThisTab,
                                         ScDocument& rOtherDoc,
                                         SCCOL nOtherCol, SCTAB nOtherTab,
                                         SCROW nMaxRow, SCCOLROW* pOtherRows );
     void				FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW nOtherEndRow,
-                                        BOOL bColumns,
+                                        sal_Bool bColumns,
                                         ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab,
                                         SCCOLROW nEndCol, SCCOLROW* pTranslate,
-                                        ScProgress* pProgress, ULONG nProAdd );
-    BOOL				OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos,
-                                        USHORT nMaxTest );
+                                        ScProgress* pProgress, sal_uLong nProAdd );
+    sal_Bool				OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos,
+                                        sal_uInt16 nMaxTest );
 
     DECL_LINK( TrackTimeHdl, Timer* );
 
@@ -1625,7 +1641,7 @@ public:
                          */
     void                Broadcast( const ScHint& rHint );
                         /// deprecated
-    void				Broadcast( ULONG nHint, const ScAddress& rAddr,
+    void				Broadcast( sal_uLong nHint, const ScAddress& rAddr,
                                     ScBaseCell* pCell );
                         /// only area, no cell broadcast
     void                AreaBroadcast( const ScHint& rHint );
@@ -1644,24 +1660,24 @@ public:
                                             SvtListener* pListener );
     void				PutInFormulaTree( ScFormulaCell* pCell );
     void				RemoveFromFormulaTree( ScFormulaCell* pCell );
-    void				CalcFormulaTree( BOOL bOnlyForced = FALSE,
-                                        BOOL bNoProgressBar = FALSE );
+    void				CalcFormulaTree( sal_Bool bOnlyForced = sal_False,
+                                        sal_Bool bNoProgressBar = sal_False );
     void				ClearFormulaTree();
     void				AppendToFormulaTrack( ScFormulaCell* pCell );
     void				RemoveFromFormulaTrack( ScFormulaCell* pCell );
-    void				TrackFormulas( ULONG nHintId = SC_HINT_DATACHANGED );
-    USHORT				GetFormulaTrackCount() const { return nFormulaTrackCount; }
-    BOOL				IsInFormulaTree( ScFormulaCell* pCell ) const;
-    BOOL				IsInFormulaTrack( ScFormulaCell* pCell ) const;
-    USHORT				GetHardRecalcState() { return nHardRecalcState; }
-    void				SetHardRecalcState( USHORT nVal ) { nHardRecalcState = nVal; }
+    void				TrackFormulas( sal_uLong nHintId = SC_HINT_DATACHANGED );
+    sal_uInt16				GetFormulaTrackCount() const { return nFormulaTrackCount; }
+    sal_Bool				IsInFormulaTree( ScFormulaCell* pCell ) const;
+    sal_Bool				IsInFormulaTrack( ScFormulaCell* pCell ) const;
+    sal_uInt16				GetHardRecalcState() { return nHardRecalcState; }
+    void				SetHardRecalcState( sal_uInt16 nVal ) { nHardRecalcState = nVal; }
     void				StartAllListeners();
     const ScFormulaCell*	GetFormulaTree() const { return pFormulaTree; }
-    BOOL				HasForcedFormulas() const { return bHasForcedFormulas; }
-    void				SetForcedFormulas( BOOL bVal ) { bHasForcedFormulas = bVal; }
-    ULONG				GetFormulaCodeInTree() const { return nFormulaCodeInTree; }
-    BOOL				IsInInterpreter() const { return nInterpretLevel != 0; }
-    USHORT				GetInterpretLevel() { return nInterpretLevel; }
+    sal_Bool				HasForcedFormulas() const { return bHasForcedFormulas; }
+    void				SetForcedFormulas( sal_Bool bVal ) { bHasForcedFormulas = bVal; }
+    sal_uLong				GetFormulaCodeInTree() const { return nFormulaCodeInTree; }
+    sal_Bool				IsInInterpreter() const { return nInterpretLevel != 0; }
+    sal_uInt16				GetInterpretLevel() { return nInterpretLevel; }
     void				IncInterpretLevel()
                             {
                                 if ( nInterpretLevel < USHRT_MAX )
@@ -1672,8 +1688,8 @@ public:
                                 if ( nInterpretLevel )
                                     nInterpretLevel--;
                             }
-    BOOL				IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; }
-    USHORT				GetMacroInterpretLevel() { return nMacroInterpretLevel; }
+    sal_Bool				IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; }
+    sal_uInt16				GetMacroInterpretLevel() { return nMacroInterpretLevel; }
     void				IncMacroInterpretLevel()
                             {
                                 if ( nMacroInterpretLevel < USHRT_MAX )
@@ -1684,8 +1700,8 @@ public:
                                 if ( nMacroInterpretLevel )
                                     nMacroInterpretLevel--;
                             }
-    BOOL				IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; }
-    USHORT				GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; }
+    sal_Bool				IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; }
+    sal_uInt16				GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; }
     void				IncInterpreterTableOpLevel()
                             {
                                 if ( nInterpreterTableOpLevel < USHRT_MAX )
@@ -1698,27 +1714,27 @@ public:
                             }
                         // add a formula to be remembered for TableOp broadcasts
     void                AddTableOpFormulaCell( ScFormulaCell* );
-    void                InvalidateLastTableOpParams() { aLastTableOpParams.bValid = FALSE; }
+    void                InvalidateLastTableOpParams() { aLastTableOpParams.bValid = sal_False; }
     ScRecursionHelper&  GetRecursionHelper()
                             {
                                 if (!pRecursionHelper)
                                     pRecursionHelper = CreateRecursionHelperInstance();
                                 return *pRecursionHelper;
                             }
-    BOOL				IsInDtorClear() const { return bInDtorClear; }
-    void				SetExpandRefs( BOOL bVal ) { bExpandRefs = bVal; }
-    BOOL				IsExpandRefs() { return bExpandRefs; }
+    sal_Bool				IsInDtorClear() const { return bInDtorClear; }
+    void				SetExpandRefs( sal_Bool bVal ) { bExpandRefs = bVal; }
+    sal_Bool				IsExpandRefs() { return bExpandRefs; }
 
     SC_DLLPUBLIC void				IncSizeRecalcLevel( SCTAB nTab );
     SC_DLLPUBLIC void				DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos = true );
 
-    ULONG               GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; }
-    void                IncXMLImportedFormulaCount( ULONG nVal )
+    sal_uLong               GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; }
+    void                IncXMLImportedFormulaCount( sal_uLong nVal )
                             {
                                 if ( nXMLImportedFormulaCount + nVal > nXMLImportedFormulaCount )
                                     nXMLImportedFormulaCount += nVal;
                             }
-    void                DecXMLImportedFormulaCount( ULONG nVal )
+    void                DecXMLImportedFormulaCount( sal_uLong nVal )
                             {
                                 if ( nVal <= nXMLImportedFormulaCount )
                                     nXMLImportedFormulaCount -= nVal;
@@ -1729,8 +1745,8 @@ public:
     void				StartTrackTimer();
 
     void 			CompileDBFormula();
-    void 			CompileDBFormula( BOOL bCreateFormulaString );
-    void 			CompileNameFormula( BOOL bCreateFormulaString );
+    void 			CompileDBFormula( sal_Bool bCreateFormulaString );
+    void 			CompileNameFormula( sal_Bool bCreateFormulaString );
     void 			CompileColRowNameFormula();
 
     /** Maximum string length of a column, e.g. for dBase export.
@@ -1767,8 +1783,8 @@ public:
                                             ::com::sun::star::util::XModifyListener >& rListener,
                                         const ::com::sun::star::lang::EventObject& rEvent );
 
-    void			SetInLinkUpdate(BOOL bSet);				// TableLink or AreaLink
-    BOOL			IsInLinkUpdate() const;					// including DdeLink
+    void			SetInLinkUpdate(sal_Bool bSet);				// TableLink or AreaLink
+    sal_Bool			IsInLinkUpdate() const;					// including DdeLink
 
     SC_DLLPUBLIC SfxItemPool*		GetEditPool() const;
     SC_DLLPUBLIC SfxItemPool*		GetEnginePool() const;
@@ -1781,16 +1797,16 @@ public:
     ScRefreshTimerControl * const * GetRefreshTimerControlAddress() const
         { return &pRefreshTimerControl; }
 
-    void            SetPastingDrawFromOtherDoc( BOOL bVal )
+    void            SetPastingDrawFromOtherDoc( sal_Bool bVal )
                         { bPastingDrawFromOtherDoc = bVal; }
-    BOOL            PastingDrawFromOtherDoc() const
+    sal_Bool            PastingDrawFromOtherDoc() const
                         { return bPastingDrawFromOtherDoc; }
 
                     /// an ID unique to each document instance
     sal_uInt32      GetDocumentID() const;
 
     void            InvalidateStyleSheetUsage()
-                        { bStyleSheetUsageInvalid = TRUE; }
+                        { bStyleSheetUsageInvalid = sal_True; }
     void GetSortParam( ScSortParam& rParam, SCTAB nTab );
     void SetSortParam( ScSortParam& rParam, SCTAB nTab );
 
@@ -1832,9 +1848,9 @@ private: // CLOOK-Impl-Methoden
 
     void	DeleteDrawLayer();
     void	DeleteColorTable();
-    SC_DLLPUBLIC BOOL	DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const;
-    void	DrawMovePage( USHORT nOldPos, USHORT nNewPos );
-    void	DrawCopyPage( USHORT nOldPos, USHORT nNewPos );
+    SC_DLLPUBLIC sal_Bool	DrawGetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const;
+    void	DrawMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos );
+    void	DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos );
 
     void	UpdateDrawPrinter();
     void	UpdateDrawLanguages();
@@ -1854,7 +1870,7 @@ private: // CLOOK-Impl-Methoden
         ScClipRangeNameData& rRangeNames, const ScRangeList& rDestRanges, const ScMarkData& rMark,
         SCCOL nXw, SCROW nYw);
 
-    BOOL	HasPartOfMerged( const ScRange& rRange );
+    sal_Bool	HasPartOfMerged( const ScRange& rRange );
 
     std::map< SCTAB, ScSortParam > mSheetSortParams;
 
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 45c20c78e..4b0683957 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -109,7 +109,7 @@ private:
 
     ::cppu::OInterfaceContainerHelper maChangesListeners;
 
-    BOOL					FillRenderMarkData( const com::sun::star::uno::Any& aSelection,
+    sal_Bool					FillRenderMarkData( const com::sun::star::uno::Any& aSelection,
                                                 const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptions,
                                                 ScMarkData& rMark, ScPrintSelectionStatus& rStatus, String& rPagesStr ) const;
     com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter();
@@ -335,7 +335,7 @@ private:
     ScDocShell*				pDocShell;
 
 ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
-                            GetObjectByIndex_Impl(INT32 nIndex) const;
+                            GetObjectByIndex_Impl(sal_Int32 nIndex) const;
 
 public:
                             ScDrawPagesObj(ScDocShell* pDocSh);
@@ -802,7 +802,7 @@ private:
     ScDocShell*				pDocShell;
     SCTAB					nTab;
 
-    BOOL					GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex );
+    sal_Bool					GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex );
     ScTableSheetObj*		GetObjectByIndex_Impl(sal_Int32 nIndex);
     ScTableSheetObj*		GetObjectByName_Impl(const ::rtl::OUString& aName);
 
diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index a892cbaef..db7e0e06e 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -168,7 +168,7 @@ public:
     ScDPTableDataCache* GetCache() const;
     /** Fill the internal table from the cell range provided.  This function
     assumes that the first row is the column header. */
-    void fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, 
+    void fillTable( const ScQueryParam& rQuery, sal_Bool* pSpecial, 
         bool bIgnoreEmptyRows, bool bRepeatIfEmpty );
     /** Fill the internal table from database connection object.  This function
         assumes that the first row is the column header. */
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 320f292bb..bede091e5 100755..100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -114,32 +114,32 @@ public:
 private:
     union
     {
-        ULONG	nNumFormat;
+        sal_uLong	nNumFormat;
         sal_Int32 mnDatePart;
     };
 
     String	aString;
     double	fValue;
-    BYTE	mbFlag;
-    //BOOL	bHasValue: 1 ;
-    //BOOL	bHasData: 1;
-    //BOOL	bErr: 1;
+    sal_uInt8	mbFlag;
+    //sal_Bool	bHasValue: 1 ;
+    //sal_Bool	bHasData: 1;
+    //sal_Bool	bErr: 1;
 
     friend class ScDPTableDataCache;
 public:
     ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){}
-    ScDPItemData( ULONG nNF, const String & rS, double fV, BYTE bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){}
-    ScDPItemData( const String& rS, double fV = 0.0, BOOL bHV = FALSE, const ULONG nNumFormat = 0 , BOOL bData = TRUE) ;				
-    ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab );
+    ScDPItemData( sal_uLong nNF, const String & rS, double fV, sal_uInt8 bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){}
+    ScDPItemData( const String& rS, double fV = 0.0, sal_Bool bHV = sal_False, const sal_uLong nNumFormat = 0 , sal_Bool bData = sal_True) ;				
+    ScDPItemData( ScDocument* pDoc, SCROW nRow, sal_uInt16 nCol, sal_uInt16 nDocTab );
 
     void		SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; }
-//	void		SetValue ( double value , ULONG nNumFormat = 0 ) { bHasValue = TRUE; nNumFormat = 0;bHasData = TRUE; bDate = FALSE; fValue = value ;}
-    BOOL		IsCaseInsEqual( const ScDPItemData& r ) const;
+//	void		SetValue ( double value , sal_uLong nNumFormat = 0 ) { bHasValue = sal_True; nNumFormat = 0;bHasData = sal_True; bDate = sal_False; fValue = value ;}
+    sal_Bool		IsCaseInsEqual( const ScDPItemData& r ) const;
 
     size_t		Hash() const;
     
     // exact equality
-    BOOL		operator==( const ScDPItemData& r ) const;
+    sal_Bool		operator==( const ScDPItemData& r ) const;
     // case insensitive equality
     static sal_Int32	Compare( const ScDPItemData& rA, const ScDPItemData& rB );
 
@@ -148,21 +148,21 @@ public:
 #endif
 
 public:
-    BOOL IsHasData() const ;
-    BOOL IsHasErr() const ;
-    BOOL IsValue() const;
+    sal_Bool IsHasData() const ;
+    sal_Bool IsHasErr() const ;
+    sal_Bool IsValue() const;
     String	GetString() const ;
     double	GetValue() const ;
-    ULONG    GetNumFormat() const ;
-    BOOL HasStringData() const ;
-    BOOL IsDate() const;
-    BOOL HasDatePart() const;
-    void SetDate( BOOL b ) ;
+    sal_uLong    GetNumFormat() const ;
+    sal_Bool HasStringData() const ;
+    sal_Bool IsDate() const;
+    sal_Bool HasDatePart() const;
+    void SetDate( sal_Bool b ) ;
     
     TypedStrData*  CreateTypeString( );
     sal_uInt8	 GetType() const;
-    BYTE & GetFlag() throw() { return mbFlag; }
-    const BYTE & GetFlag() const throw() { return const_cast<ScDPItemData*>(this)->GetFlag(); }
+    sal_uInt8 & GetFlag() throw() { return mbFlag; }
+    const sal_uInt8 & GetFlag() const throw() { return const_cast<ScDPItemData*>(this)->GetFlag(); }
 };
 
 class SC_DLLPUBLIC ScDPItemDataPool
@@ -194,8 +194,8 @@ class ScTabViewShell;
 namespace ScDPGlobal
 {
 // used for core data
-    String GetFieldFuncString( const String& rSourceName, USHORT &rFuncMask, BOOL bIsValue );	
-    String GetFuncString( const String &rString, const USHORT nIndex );
+    String GetFieldFuncString( const String& rSourceName, sal_uInt16 &rFuncMask, sal_Bool bIsValue );	
+    String GetFuncString( const String &rString, const sal_uInt16 nIndex );
     com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> DP_GetMembers( const com::sun::star::uno::Reference<
                                                                                       com::sun::star::sheet::XDimensionsSupplier>&rSrc, long nField );
 // common operation
@@ -203,7 +203,7 @@ namespace ScDPGlobal
     Rectangle operator *( const Rectangle &rLeft, const std::pair<double,double> & rRight );
 // used for  DataPilot Panel 
     ScDPInfoWnd* GetDPInfoWnd( ScTabViewShell *pViewShell );
-   bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip = FALSE );
+   bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, sal_uInt16 nEndTab, sal_Bool bExcludeClip = sal_False );
 
 }
 #endif 
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 6e6dc6f49..179585eb8 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -235,11 +235,11 @@ public:
 
 // End Comments
     virtual String                  getDimensionName(long nColumn);
-    virtual BOOL                    getIsDataLayoutDimension(long nColumn);
-    virtual BOOL                    IsDateDimension(long nDim);
-    virtual ULONG                  GetNumberFormat(long nDim);
+    virtual sal_Bool                    getIsDataLayoutDimension(long nColumn);
+    virtual sal_Bool                    IsDateDimension(long nDim);
+    virtual sal_uLong                  GetNumberFormat(long nDim);
     virtual void                    DisposeData();
-    virtual void                    SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty );
+    virtual void                    SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
 
     virtual bool                    IsRepeatIfEmpty();
 
@@ -251,12 +251,12 @@ public:
     virtual void                    CalcResults(CalcInfo& rInfo, bool bAutoShow);
     virtual const ScDPCacheTable&   GetCacheTable() const;
 
-    virtual BOOL                    IsBaseForGroup(long nDim) const;
+    virtual sal_Bool                    IsBaseForGroup(long nDim) const;
     virtual long                    GetGroupBase(long nGroupDim) const;
-    virtual BOOL                    IsNumOrDateGroup(long nDim) const;
-    virtual BOOL                    IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+    virtual sal_Bool                    IsNumOrDateGroup(long nDim) const;
+    virtual sal_Bool                    IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
                                                const ScDPItemData& rBaseData, long nBaseIndex ) const;
-    virtual BOOL                    HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+    virtual sal_Bool                    HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
                                                       const ScDPItemData& rSecondData, long nSecondIndex ) const;
 };
 
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 9edc8f191..d07da5293 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -79,7 +79,7 @@ struct ScDPServiceDesc
         aServiceName( rServ ), aParSource( rSrc ), aParName( rNam ),
         aParUser( rUser ), aParPass( rPass ) {	}
 
-    BOOL operator==	( const ScDPServiceDesc& rOther ) const
+    sal_Bool operator==	( const ScDPServiceDesc& rOther ) const
         { return aServiceName == rOther.aServiceName &&
                  aParSource   == rOther.aParSource &&
                  aParName     == rOther.aParName &&
@@ -104,28 +104,28 @@ private:
                                             // cached data
     com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource;
     ScDPOutput*				pOutput;
-    BOOL					bSettingsChanged;
-    BOOL					bAlive;			// FALSE if only used to hold settings
+    sal_Bool					bSettingsChanged;
+    sal_Bool					bAlive;			// sal_False if only used to hold settings
     sal_uInt16              mnAutoFormatIndex;
-    BOOL					bAllowMove;
+    sal_Bool					bAllowMove;
     long					nHeaderRows;	// page fields plus filter button
-    bool                    mbHeaderLayout;  // TRUE : grid, FALSE : standard
+    bool                    mbHeaderLayout;  // sal_True : grid, sal_False : standard
 
 
     SC_DLLPRIVATE ScDPTableData*    GetTableData();
     SC_DLLPRIVATE void				CreateObjects();
     SC_DLLPRIVATE void				CreateOutput();
-    BOOL					bRefresh;
+    sal_Bool					bRefresh;
     long						mnCacheId;
 
 public:
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
-    inline void SetRefresh() { bRefresh = TRUE; }
+    inline void SetRefresh() { bRefresh = sal_True; }
     const        ScDPTableDataCache* GetCache() const;
     long          GetCacheId() const;
     void          SetCacheId( long nCacheId );
-    ULONG RefreshCache();
+    sal_uLong RefreshCache();
     // End Comments
                 ScDPObject( ScDocument* pD );
                 ScDPObject(const ScDPObject& r);
@@ -133,15 +133,15 @@ public:
 
     virtual	ScDataObject*	Clone() const;
 
-    void				SetAlive(BOOL bSet);
-    void				SetAllowMove(BOOL bSet);
+    void				SetAlive(sal_Bool bSet);
+    void				SetAllowMove(sal_Bool bSet);
 
     void				InvalidateData();
     void				InvalidateSource();
 
 
     void				Output( const ScAddress& rPos );
-    ScRange				GetNewOutputRange( BOOL& rOverflow );
+    ScRange				GetNewOutputRange( sal_Bool& rOverflow );
     const ScRange       GetOutputRangeByType( sal_Int32 nType );
 
     void				SetSaveData(const ScDPSaveData& rData);
@@ -169,9 +169,9 @@ public:
 
     com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> GetSource();
 
-    BOOL				IsSheetData() const;
-    BOOL				IsImportData() const { return(pImpDesc != NULL); }
-    BOOL				IsServiceData() const { return(pServDesc != NULL); }
+    sal_Bool				IsSheetData() const;
+    sal_Bool				IsImportData() const { return(pImpDesc != NULL); }
+    sal_Bool				IsServiceData() const { return(pServDesc != NULL); }
 
     void				SetName(const String& rNew);
     const String&		GetName() const					{ return aTableName; }
@@ -186,19 +186,19 @@ public:
     bool                IsDataDescriptionCell(const ScAddress& rPos);
 
     bool                IsDimNameInUse(const ::rtl::OUString& rName) const;
-    String              GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags = NULL );
-    BOOL                IsDuplicated( long nDim );
+    String              GetDimName( long nDim, sal_Bool& rIsDataLayout, sal_Int32* pFlags = NULL );
+    sal_Bool                IsDuplicated( long nDim );
     long                GetDimCount();
     void                GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData);
-    long				GetHeaderDim( const ScAddress& rPos, USHORT& rOrient );
-    BOOL				GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop,
+    long				GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient );
+    sal_Bool				GetHeaderDrag( const ScAddress& rPos, sal_Bool bMouseLeft, sal_Bool bMouseTop,
                                         long nDragDim,
-                                        Rectangle& rPosRect, USHORT& rOrient, long& rDimPos );
-    BOOL				IsFilterButton( const ScAddress& rPos );
+                                        Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos );
+    sal_Bool				IsFilterButton( const ScAddress& rPos );
 
-    BOOL                GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */
+    sal_Bool                GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */
                                       const std::vector< ScDPGetPivotDataField >& rFilters );
-    BOOL                ParseFilters( ScDPGetPivotDataField& rTarget,
+    sal_Bool                ParseFilters( ScDPGetPivotDataField& rTarget,
                                       std::vector< ScDPGetPivotDataField >& rFilters,
                                       const String& rFilterList );
 
@@ -208,24 +208,24 @@ public:
 
     void                ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj);
 
-    BOOL				FillOldParam(ScPivotParam& rParam, BOOL bForFile) const;
-    BOOL				FillLabelData(ScPivotParam& rParam);
-    void				InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource);
+    sal_Bool				FillOldParam(ScPivotParam& rParam, sal_Bool bForFile) const;
+    sal_Bool				FillLabelData(ScPivotParam& rParam);
+    void				InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, sal_Bool bSetSource);
 
-    BOOL                GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers );
-    BOOL                GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers );
+    sal_Bool                GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers );
+    sal_Bool                GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers );
 
     sal_Int32           GetUsedHierarchy( sal_Int32 nDim );
 
-    BOOL                GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
-    BOOL                GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
+    sal_Bool                GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
+    sal_Bool                GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
 
     bool                GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames );
     bool                GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers );
 
     void				UpdateReference( UpdateRefMode eUpdateRefMode,
                                          const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
-    BOOL				RefsEqual( const ScDPObject& r ) const;
+    sal_Bool				RefsEqual( const ScDPObject& r ) const;
     void				WriteRefsTo( ScDPObject& r ) const;
 
     void                GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData);
@@ -245,22 +245,22 @@ public:
 
     void                BuildAllDimensionMembers();
 
-    static BOOL			HasRegisteredSources();
+    static sal_Bool			HasRegisteredSources();
     static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources();
     static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier>
                         CreateSource( const ScDPServiceDesc& rDesc );
 
     static void			ConvertOrientation( ScDPSaveData& rSaveData,
-                            PivotField* pFields, SCSIZE nCount, USHORT nOrient,
+                            PivotField* pFields, SCSIZE nCount, sal_uInt16 nOrient,
                             ScDocument* pDoc, SCROW nRow, SCTAB nTab,
                             const com::sun::star::uno::Reference<
                                 com::sun::star::sheet::XDimensionsSupplier>& xSource,
-                            BOOL bOldDefaults,
+                            sal_Bool bOldDefaults,
                             PivotField* pRefColFields = NULL, SCSIZE nRefColCount = 0,
                             PivotField* pRefRowFields = NULL, SCSIZE nRefRowCount = 0,
                             PivotField* pRefPageFields = NULL, SCSIZE nRefPageCount = 0 );
 
-    static bool         IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags );
+    static bool         IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags );
 };
 
 
@@ -277,17 +277,17 @@ public:
 
     virtual	ScDataObject*	Clone() const;
 
-    ScDPObject*	operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);}
+    ScDPObject*	operator[](sal_uInt16 nIndex) const {return (ScDPObject*)At(nIndex);}
     ScDPObject*	GetByName(const String& rName) const;
 
     void        DeleteOnTab( SCTAB nTab );
     void		UpdateReference( UpdateRefMode eUpdateRefMode,
                                  const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
 
-    BOOL		RefsEqual( const ScDPCollection& r ) const;
+    sal_Bool		RefsEqual( const ScDPCollection& r ) const;
     void		WriteRefsTo( ScDPCollection& r ) const;
 
-    String 		CreateNewName( USHORT nMin = 1 ) const;
+    String 		CreateNewName( sal_uInt16 nMin = 1 ) const;
 
     void FreeTable(ScDPObject* pDPObj);
     SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj);
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index c35cd149a..2829be674 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -80,7 +80,7 @@ private:
     com::sun::star::uno::Reference<
         com::sun::star::sheet::XDimensionsSupplier> xSource;
     ScAddress				aStartPos;
-    BOOL					bDoFilter;
+    sal_Bool					bDoFilter;
     ScDPOutLevelData*		pColFields;
     ScDPOutLevelData*		pRowFields;
     ScDPOutLevelData*		pPageFields;
@@ -90,24 +90,24 @@ private:
     com::sun::star::uno::Sequence<
         com::sun::star::uno::Sequence<
             com::sun::star::sheet::DataResult> > aData;
-    BOOL					bResultsError;
+    sal_Bool					bResultsError;
     bool                    mbHasDataLayout;
     String					aDataDescription;
 
     // Number format related parameters
-    UINT32*					pColNumFmt;
-    UINT32*					pRowNumFmt;
+    sal_uInt32*					pColNumFmt;
+    sal_uInt32*					pRowNumFmt;
     long					nColFmtCount;
     long					nRowFmtCount;
-    UINT32                  nSingleNumFmt;
+    sal_uInt32                  nSingleNumFmt;
 
     // Output geometry related parameters
-    BOOL					bSizesValid;
-    BOOL					bSizeOverflow;
+    sal_Bool					bSizesValid;
+    sal_Bool					bSizeOverflow;
     long					nColCount;
     long					nRowCount;
     long					nHeaderSize;
-    bool                    mbHeaderLayout;  // TRUE : grid, FALSE : standard
+    bool                    mbHeaderLayout;  // sal_True : grid, sal_False : standard
     SCCOL					nTabStartCol;
     SCROW					nTabStartRow;
     SCCOL					nMemberStartCol;
@@ -121,7 +121,7 @@ private:
                                 const com::sun::star::sheet::DataResult& rData );
     void			HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                 const com::sun::star::sheet::MemberResult& rData,
-                                BOOL bColHeader, long nLevel );
+                                sal_Bool bColHeader, long nLevel );
     void            FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, 
                                bool bInTable, bool bPopup, bool bHasHiddenMember );
     void			CalcSizes();
@@ -135,7 +135,7 @@ public:
                     ScDPOutput( ScDocument* pD,
                                 const com::sun::star::uno::Reference<
                                     com::sun::star::sheet::XDimensionsSupplier>& xSrc,
-                                const ScAddress& rPos, BOOL bFilter );
+                                const ScAddress& rPos, sal_Bool bFilter );
                     ~ScDPOutput();
 
     void			SetPosition( const ScAddress& rPos );
@@ -143,7 +143,7 @@ public:
     void			Output();			//! Refresh?
     ScRange			GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE );
     long			GetHeaderRows();
-    BOOL			HasError();			// range overflow or exception from source
+    sal_Bool			HasError();			// range overflow or exception from source
 
     void            GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData);
 
@@ -151,13 +151,13 @@ public:
         field region. */
     bool            GetDataResultPositionData(::std::vector< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters, const ScAddress& rPos);
 
-    BOOL            GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */
+    sal_Bool            GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */
                                   const std::vector< ScDPGetPivotDataField >& rFilters );
-    long			GetHeaderDim( const ScAddress& rPos, USHORT& rOrient );
-    BOOL			GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop,
+    long			GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient );
+    sal_Bool			GetHeaderDrag( const ScAddress& rPos, sal_Bool bMouseLeft, sal_Bool bMouseTop,
                                     long nDragDim,
-                                    Rectangle& rPosRect, USHORT& rOrient, long& rDimPos );
-    BOOL			IsFilterButton( const ScAddress& rPos );
+                                    Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos );
+    sal_Bool			IsFilterButton( const ScAddress& rPos );
 
     void            GetMemberResultNames( ScStrCollection& rNames, long nDimension );
 
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 6e7d2b4e2..b5bfc08f1 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -58,23 +58,23 @@ class ScDPSaveMember
 private:
     String		aName;
     ::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table.
-    USHORT		nVisibleMode;
-    USHORT		nShowDetailsMode;
+    sal_uInt16		nVisibleMode;
+    sal_uInt16		nShowDetailsMode;
 
 public:
                             ScDPSaveMember(const String& rName);
                             ScDPSaveMember(const ScDPSaveMember& r);
                             ~ScDPSaveMember();
 
-    BOOL		 			operator== ( const ScDPSaveMember& r ) const;
+    sal_Bool		 			operator== ( const ScDPSaveMember& r ) const;
 
     const String&           GetName() const { return aName; }
-    BOOL                    HasIsVisible() const;
-    SC_DLLPUBLIC void					SetIsVisible(BOOL bSet);
-    BOOL                    GetIsVisible() const { return BOOL(nVisibleMode); }
-    BOOL                    HasShowDetails() const;
-    SC_DLLPUBLIC void					SetShowDetails(BOOL bSet);
-    BOOL                    GetShowDetails() const { return BOOL(nShowDetailsMode); }
+    sal_Bool                    HasIsVisible() const;
+    SC_DLLPUBLIC void					SetIsVisible(sal_Bool bSet);
+    sal_Bool                    GetIsVisible() const { return sal_Bool(nVisibleMode); }
+    sal_Bool                    HasShowDetails() const;
+    SC_DLLPUBLIC void					SetShowDetails(sal_Bool bSet);
+    sal_Bool                    GetShowDetails() const { return sal_Bool(nShowDetailsMode); }
 
     void                    SetName( const String& rNew );  // used if the source member was renamed (groups)
 
@@ -98,15 +98,15 @@ private:
     String*		pSelectedPage;
     ::std::auto_ptr<rtl::OUString> mpLayoutName;
     ::std::auto_ptr<rtl::OUString> mpSubtotalName;
-    BOOL		bIsDataLayout;
-    BOOL		bDupFlag;
-    USHORT		nOrientation;
-    USHORT		nFunction;			// enum GeneralFunction, for data dimensions
+    sal_Bool		bIsDataLayout;
+    sal_Bool		bDupFlag;
+    sal_uInt16		nOrientation;
+    sal_uInt16		nFunction;			// enum GeneralFunction, for data dimensions
     long		nUsedHierarchy;
-    USHORT		nShowEmptyMode;		//!	at level
-    BOOL		bSubTotalDefault;	//!	at level
+    sal_uInt16		nShowEmptyMode;		//!	at level
+    sal_Bool		bSubTotalDefault;	//!	at level
     long		nSubTotalCount;
-    USHORT*		pSubTotalFuncs;		// enum GeneralFunction
+    sal_uInt16*		pSubTotalFuncs;		// enum GeneralFunction
     ::com::sun::star::sheet::DataPilotFieldReference* pReferenceValue;
     ::com::sun::star::sheet::DataPilotFieldSortInfo*  pSortInfo;            // (level)
     ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pAutoShowInfo;     // (level)
@@ -119,32 +119,32 @@ private:
     MemberHash maMemberHash;
     MemberList maMemberList;
 public:
-                            ScDPSaveDimension(const String& rName, BOOL bDataLayout);
+                            ScDPSaveDimension(const String& rName, sal_Bool bDataLayout);
                             ScDPSaveDimension(const ScDPSaveDimension& r);
                             ~ScDPSaveDimension();
 
-    BOOL		 			operator== ( const ScDPSaveDimension& r ) const;
+    sal_Bool		 			operator== ( const ScDPSaveDimension& r ) const;
 
     const MemberList&       GetMembers() const { return maMemberList; }
     void					AddMember(ScDPSaveMember* pMember);
 
-    void					SetDupFlag(BOOL bSet)	{ bDupFlag = bSet; }
-    BOOL					GetDupFlag() const		{ return bDupFlag; }
+    void					SetDupFlag(sal_Bool bSet)	{ bDupFlag = bSet; }
+    sal_Bool					GetDupFlag() const		{ return bDupFlag; }
 
     const String&			GetName() const			{ return aName; }
-    BOOL					IsDataLayout() const	{ return bIsDataLayout; }
+    sal_Bool					IsDataLayout() const	{ return bIsDataLayout; }
 
     void                    SetName( const String& rNew );  // used if the source dim was renamed (groups)
 
-    void					SetOrientation(USHORT nNew);
-    void					SetSubTotals(long nCount, const USHORT* pFuncs);
+    void					SetOrientation(sal_uInt16 nNew);
+    void					SetSubTotals(long nCount, const sal_uInt16* pFuncs);
     long                    GetSubTotalsCount() const { return nSubTotalCount; }
-    USHORT                  GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; }
+    sal_uInt16                  GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; }
     bool                    HasShowEmpty() const;
-    void					SetShowEmpty(BOOL bSet);
-    BOOL                    GetShowEmpty() const { return BOOL(nShowEmptyMode); }
-    void					SetFunction(USHORT nNew);		// enum GeneralFunction
-    USHORT                  GetFunction() const { return nFunction; }
+    void					SetShowEmpty(sal_Bool bSet);
+    sal_Bool                    GetShowEmpty() const { return sal_Bool(nShowEmptyMode); }
+    void					SetFunction(sal_uInt16 nNew);		// enum GeneralFunction
+    sal_uInt16                  GetFunction() const { return nFunction; }
     void					SetUsedHierarchy(long nNew);
     long                    GetUsedHierarchy() const { return nUsedHierarchy; }
 
@@ -167,10 +167,10 @@ public:
     void                    SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew);
 
     void					SetCurrentPage( const String* pPage );		// NULL = no selection (all)
-    BOOL					HasCurrentPage() const;
+    sal_Bool					HasCurrentPage() const;
     const String&			GetCurrentPage() const;
 
-    USHORT					GetOrientation() const	{ return nOrientation; }
+    sal_uInt16					GetOrientation() const	{ return nOrientation; }
 
     ScDPSaveMember* 		GetExistingMemberByName(const String& rName);
     ScDPSaveMember*			GetMemberByName(const String& rName);
@@ -194,12 +194,12 @@ class ScDPSaveData
 private:
     List		aDimList;
     ScDPDimensionSaveData* pDimensionData;      // settings that create new dimensions
-    USHORT		nColumnGrandMode;
-    USHORT		nRowGrandMode;
-    USHORT		nIgnoreEmptyMode;
-    USHORT		nRepeatEmptyMode;
-    BOOL        bFilterButton;      // not passed to DataPilotSource
-    BOOL        bDrillDown;         // not passed to DataPilotSource
+    sal_uInt16		nColumnGrandMode;
+    sal_uInt16		nRowGrandMode;
+    sal_uInt16		nIgnoreEmptyMode;
+    sal_uInt16		nRepeatEmptyMode;
+    sal_Bool        bFilterButton;      // not passed to DataPilotSource
+    sal_Bool        bDrillDown;         // not passed to DataPilotSource
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
     long      mnCacheId;
@@ -218,7 +218,7 @@ public:
 
     ScDPSaveData& 			operator= ( const ScDPSaveData& r );
 
-    BOOL		 			operator== ( const ScDPSaveData& r ) const;
+    sal_Bool		 			operator== ( const ScDPSaveData& r ) const;
 
     SC_DLLPUBLIC void                    SetGrandTotalName(const ::rtl::OUString& rName);
     SC_DLLPUBLIC const ::rtl::OUString*  GetGrandTotalName() const;
@@ -238,25 +238,25 @@ public:
 
     void                    RemoveDimensionByName(const String& rName);
 
-    ScDPSaveDimension*      GetInnermostDimension(USHORT nOrientation);
+    ScDPSaveDimension*      GetInnermostDimension(sal_uInt16 nOrientation);
     ScDPSaveDimension*      GetFirstDimension(::com::sun::star::sheet::DataPilotFieldOrientation eOrientation);
     long                    GetDataDimensionCount() const;
 
 
     void					SetPosition( ScDPSaveDimension* pDim, long nNew );
-    SC_DLLPUBLIC void					SetColumnGrand( BOOL bSet );
-    BOOL					GetColumnGrand() const { return BOOL(nColumnGrandMode); }
-    SC_DLLPUBLIC void					SetRowGrand( BOOL bSet );
-    BOOL					GetRowGrand() const { return BOOL(nRowGrandMode); }
-    void					SetIgnoreEmptyRows( BOOL bSet );
-    BOOL					GetIgnoreEmptyRows() const { return BOOL(nIgnoreEmptyMode); }
-    void					SetRepeatIfEmpty( BOOL bSet );
-    BOOL					GetRepeatIfEmpty() const { return BOOL(nRepeatEmptyMode); }
-
-    SC_DLLPUBLIC void                    SetFilterButton( BOOL bSet );
-    BOOL                    GetFilterButton() const { return bFilterButton; }
-    SC_DLLPUBLIC void                    SetDrillDown( BOOL bSet );
-    BOOL                    GetDrillDown() const { return bDrillDown; }
+    SC_DLLPUBLIC void					SetColumnGrand( sal_Bool bSet );
+    sal_Bool					GetColumnGrand() const { return sal_Bool(nColumnGrandMode); }
+    SC_DLLPUBLIC void					SetRowGrand( sal_Bool bSet );
+    sal_Bool					GetRowGrand() const { return sal_Bool(nRowGrandMode); }
+    void					SetIgnoreEmptyRows( sal_Bool bSet );
+    sal_Bool					GetIgnoreEmptyRows() const { return sal_Bool(nIgnoreEmptyMode); }
+    void					SetRepeatIfEmpty( sal_Bool bSet );
+    sal_Bool					GetRepeatIfEmpty() const { return sal_Bool(nRepeatEmptyMode); }
+
+    SC_DLLPUBLIC void                    SetFilterButton( sal_Bool bSet );
+    sal_Bool                    GetFilterButton() const { return bFilterButton; }
+    SC_DLLPUBLIC void                    SetDrillDown( sal_Bool bSet );
+    sal_Bool                    GetDrillDown() const { return bDrillDown; }
 
     void					WriteToSource( const com::sun::star::uno::Reference<
         com::sun::star::sheet::XDimensionsSupplier>& xSource );
@@ -264,7 +264,7 @@ public:
     // DataPilot Migration - Cache&&Performance
     void					Refresh( const com::sun::star::uno::Reference<
                                             com::sun::star::sheet::XDimensionsSupplier>& xSource );
-    BOOL					IsEmpty() const;
+    sal_Bool					IsEmpty() const;
     inline long GetCacheId() const{ return mnCacheId; }
     inline void SetCacheId( long nCacheId ){ mnCacheId = nCacheId; }
     // End Comments
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index b17574eac..5996b8883 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -47,12 +47,12 @@ struct ScImportSourceDesc
 {
     String	aDBName;
     String	aObject;
-    USHORT	nType;			// enum DataImportMode
-    BOOL	bNative;
+    sal_uInt16	nType;			// enum DataImportMode
+    sal_Bool	bNative;
 
-    ScImportSourceDesc() : nType(0), bNative(FALSE) {}
+    ScImportSourceDesc() : nType(0), bNative(sal_False) {}
 
-    BOOL operator==	( const ScImportSourceDesc& rOther ) const
+    sal_Bool operator==	( const ScImportSourceDesc& rOther ) const
         { return aDBName == rOther.aDBName &&
                  aObject == rOther.aObject &&
                  nType   == rOther.nType &&
@@ -77,10 +77,10 @@ public:
 
     virtual long					GetColumnCount();
     virtual String					getDimensionName(long nColumn);
-    virtual BOOL					getIsDataLayoutDimension(long nColumn);
-    virtual BOOL					IsDateDimension(long nDim);
+    virtual sal_Bool					getIsDataLayoutDimension(long nColumn);
+    virtual sal_Bool					IsDateDimension(long nDim);
     virtual void					DisposeData();
-    virtual void					SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty );
+    virtual void					SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
 
     virtual void                    CreateCacheTable();
     virtual void                    FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rDataDims);
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index e312e13f2..d59259a6c 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -55,13 +55,13 @@ struct ScSheetSourceDesc
     ScRange			aSourceRange;
     ScQueryParam	aQueryParam;
 
-    BOOL operator==	( const ScSheetSourceDesc& rOther ) const
+    sal_Bool operator==	( const ScSheetSourceDesc& rOther ) const
         { return aSourceRange == rOther.aSourceRange &&
                  aQueryParam  == rOther.aQueryParam; }
 // Wang Xu Ming - DataPilot migration
 // Buffer&&Performance
     ScDPTableDataCache* CreateCache( ScDocument* pDoc, long nID = -1) const;
-    ULONG CheckValidate( ScDocument* pDoc  ) const;
+    sal_uLong CheckValidate( ScDocument* pDoc  ) const;
     ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const;
     ScDPTableDataCache*  GetExistDPObjectCache ( ScDocument* pDoc  ) const;
     long	GetCacheId( ScDocument* pDoc, long nID ) const;
@@ -73,9 +73,9 @@ class SC_DLLPUBLIC ScSheetDPData : public ScDPTableData
 {
 private:
     ScQueryParam	aQuery;
-    BOOL*          		 pSpecial;          						
-    BOOL			bIgnoreEmptyRows;
-    BOOL			bRepeatIfEmpty;
+    sal_Bool*          		 pSpecial;          						
+    sal_Bool			bIgnoreEmptyRows;
+    sal_Bool			bRepeatIfEmpty;
 
        ScDPCacheTable  aCacheTable;	
 
@@ -87,11 +87,11 @@ public:
     // End Comments
     virtual long					GetColumnCount();
     virtual String					getDimensionName(long nColumn);
-    virtual BOOL					getIsDataLayoutDimension(long nColumn);
-    virtual BOOL					IsDateDimension(long nDim);
-    virtual ULONG					GetNumberFormat(long nDim);
+    virtual sal_Bool					getIsDataLayoutDimension(long nColumn);
+    virtual sal_Bool					IsDateDimension(long nDim);
+    virtual sal_uLong					GetNumberFormat(long nDim);
     virtual void					DisposeData();
-    virtual void					SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty );
+    virtual void					SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty );
 
     virtual bool                    IsRepeatIfEmpty();
 
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index fc427e313..a50f3c5aa 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -80,9 +80,9 @@ namespace com { namespace sun { namespace star { namespace sheet {
 struct ScDPValueData
 {
     double	fValue;
-    BYTE	nType;
+    sal_uInt8	nType;
 
-    void	Set( double fV, BYTE nT ) { fValue = fV; nType = nT; }
+    void	Set( double fV, sal_uInt8 nT ) { fValue = fV; nType = nT; }
 };
 
 class ScDPResultMember;
@@ -147,12 +147,12 @@ public:
     long                                                     GetCacheId() const;
     // End Comments
     virtual String					getDimensionName(long nColumn) = 0;
-    virtual BOOL					getIsDataLayoutDimension(long nColumn) = 0;
-    virtual BOOL					IsDateDimension(long nDim) = 0;
-    virtual ULONG					GetNumberFormat(long nDim);
-    virtual UINT32					GetNumberFormatByIdx( NfIndexTableOffset );
+    virtual sal_Bool					getIsDataLayoutDimension(long nColumn) = 0;
+    virtual sal_Bool					IsDateDimension(long nDim) = 0;
+    virtual sal_uLong					GetNumberFormat(long nDim);
+    virtual sal_uInt32					GetNumberFormatByIdx( NfIndexTableOffset );
     virtual void					DisposeData() = 0;
-    virtual void					SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0;
+    virtual void					SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ) = 0;
 
     virtual bool                    IsRepeatIfEmpty();
 
@@ -165,12 +165,12 @@ public:
     virtual const ScDPCacheTable&   GetCacheTable() const = 0;
 
                                     // overloaded in ScDPGroupTableData:
-    virtual BOOL                    IsBaseForGroup(long nDim) const;
+    virtual sal_Bool                    IsBaseForGroup(long nDim) const;
     virtual long                      GetGroupBase(long nGroupDim) const;
-    virtual BOOL                    IsNumOrDateGroup(long nDim) const;
-    virtual BOOL                    IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+    virtual sal_Bool                    IsNumOrDateGroup(long nDim) const;
+    virtual sal_Bool                    IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
                                                const ScDPItemData& rBaseData, long nBaseIndex ) const;
-    virtual BOOL                    HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+    virtual sal_Bool                    HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
                                                       const ScDPItemData& rSecondData, long nSecondIndex ) const;
 
     // Wang Xu Ming -- 2009-8-17
diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index 202ab64f0..37216c4d1 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -67,7 +67,7 @@ class SC_DLLPUBLIC ScDPTableDataCache
     std::vector<SCROW>*			 mpGlobalOrder;		//Sorted members index	
     std::vector<SCROW>*			 mpIndexOrder;		//Index the sorted number
     std::vector<ScDPItemData*>	 mrLabelNames;		//Source Label data
-    std::vector<BOOL>			 mbEmptyRow;		//If empty row?	
+    std::vector<sal_Bool>			 mbEmptyRow;		//If empty row?	
     mutable ScDPItemDataPool	  			 maAdditionalDatas;
 public:
     SCROW GetOrder( long nDim, SCROW nIndex ) const;
@@ -79,26 +79,26 @@ public:
         
     SCCOL GetDimensionIndex( String sName) const;
     const ScDPItemData* GetSortedItemData( SCCOL nDim, SCROW nOrder ) const;
-    ULONG GetNumType ( ULONG nFormat ) const;
-    ULONG GetNumberFormat( long nDim ) const;
-    BOOL  IsDateDimension( long nDim ) const ;
-    ULONG GetDimNumType( SCCOL nDim) const;
+    sal_uLong GetNumType ( sal_uLong nFormat ) const;
+    sal_uLong GetNumberFormat( long nDim ) const;
+    sal_Bool  IsDateDimension( long nDim ) const ;
+    sal_uLong GetDimNumType( SCCOL nDim) const;
     SCROW GetDimMemberCount( SCCOL nDim ) const;
 
     SCROW GetSortedItemDataId( SCCOL nDim, SCROW nOrder ) const;
     const std::vector<ScDPItemData*>& GetDimMemberValues( SCCOL nDim )const;
     void	SetId( long nId ){ mnID = nId;}
-    void	AddRow( ScDPItemData* pRow, USHORT nCount );
+    void	AddRow( ScDPItemData* pRow, sal_uInt16 nCount );
     bool	InitFromDoc(  ScDocument* pDoc, const ScRange& rRange );
     bool InitFromDataBase (const  ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& xRowSet, const Date& rNullDate);
 
     SCROW	GetRowCount() const;
-    SCROW	GetItemDataId( USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty ) const;
-    String	GetDimensionName( USHORT nColumn ) const;
-    bool	IsEmptyMember( SCROW nRow, USHORT nColumn ) const;
+    SCROW	GetItemDataId( sal_uInt16 nDim, SCROW nRow, sal_Bool bRepeatIfEmpty ) const;
+    String	GetDimensionName( sal_uInt16 nColumn ) const;
+    bool	IsEmptyMember( SCROW nRow, sal_uInt16 nColumn ) const;
     bool	IsRowEmpty( SCROW nRow ) const;
     bool	IsValid() const;
-    bool	ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial );
+    bool	ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, sal_Bool* pSpecial );
 
     ScDocument* GetDoc() const;//ms-cache-core
     long GetColumnCount() const;
@@ -106,7 +106,7 @@ public:
 
     const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const;
 
-    BOOL operator== ( const ScDPTableDataCache& r ) const;
+    sal_Bool operator== ( const ScDPTableDataCache& r ) const;
 
 //construction
     ScDPTableDataCache( ScDocument* pDoc );
@@ -116,7 +116,7 @@ public:
 protected:
 private:
     void		AddLabel( ScDPItemData* pData);
-    BOOL	AddData( long nDim, ScDPItemData* itemData );
+    sal_Bool	AddData( long nDim, ScDPItemData* itemData );
 };
 
 #endif //DPTABLECACHE_HXX
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 591d3835d..0ef30b5c2 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -184,14 +184,14 @@ public:
 
     void	Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState );
     void	Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState );
-    BOOL	IsCalculated() const;
+    sal_Bool	IsCalculated() const;
 
     double	GetResult() const;
-    BOOL	HasError() const;
-    BOOL	HasData() const;
+    sal_Bool	HasError() const;
+    sal_Bool	HasData() const;
 
     void	SetResult( double fNew );
-    void	SetEmpty( BOOL bSet );
+    void	SetEmpty( sal_Bool bSet );
     void	SetError();
 
     double	GetAuxiliary() const;
@@ -211,7 +211,7 @@ class ScDPRowTotals
 {
     ScDPAggData aRowTotal;
     ScDPAggData aGrandTotal;
-    BOOL        bIsInColRoot;
+    sal_Bool        bIsInColRoot;
 
 public:
             ScDPRowTotals();
@@ -220,8 +220,8 @@ public:
     ScDPAggData*    GetRowTotal( long nMeasure );
     ScDPAggData*    GetGrandTotal( long nMeasure );
 
-    BOOL            IsInColRoot() const     { return bIsInColRoot; }
-    void            SetInColRoot(BOOL bSet) { bIsInColRoot = bSet; }
+    sal_Bool            IsInColRoot() const     { return bIsInColRoot; }
+    void            SetInColRoot(sal_Bool bSet) { bIsInColRoot = bSet; }
 };
 
 // --------------------------------------------------------------------
@@ -263,12 +263,12 @@ typedef std::hash_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc>  DimMem
 class ResultMembers
 {
     DimMemberHash      maMemberHash;
-    BOOL 				mbHasHideDetailsMember;
+    sal_Bool 				mbHasHideDetailsMember;
 public:
     ScDPParentDimData* FindMember( const SCROW& nIndex ) const;
     void                             InsertMember(  ScDPParentDimData* pNew );
-    BOOL			IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; }
-    void			SetHasHideDetailsMembers( BOOL b ) { mbHasHideDetailsMember=b; }
+    sal_Bool			IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; }
+    void			SetHasHideDetailsMembers( sal_Bool b ) { mbHasHideDetailsMember=b; }
     ResultMembers();
     virtual ~ResultMembers();
 };
@@ -279,24 +279,24 @@ private:
     const ::std::vector<ScDPDimension*>& mppDim;
     const ::std::vector<ScDPLevel*>& mppLev;
 
-    BOOL      mbRow;
-    BOOL      mbInitChild;
-    BOOL      mbAllChildren;
+    sal_Bool      mbRow;
+    sal_Bool      mbInitChild;
+    sal_Bool      mbAllChildren;
 public:
     LateInitParams( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev,  
-        BOOL bRow, BOOL bInitChild = TRUE , BOOL bAllChildren = FALSE);
+        sal_Bool bRow, sal_Bool bInitChild = sal_True , sal_Bool bAllChildren = sal_False);
     ~LateInitParams();
 
-    void  SetInitChild( BOOL b ) { mbInitChild = b; }
-    void  SetInitAllChildren( BOOL b ) { mbAllChildren = b; }
+    void  SetInitChild( sal_Bool b ) { mbInitChild = b; }
+    void  SetInitAllChildren( sal_Bool b ) { mbAllChildren = b; }
 
     inline ScDPDimension* GetDim( size_t nPos ) const { return mppDim[nPos];}
     inline ScDPLevel*         GetLevel( size_t nPos ) const { return mppLev[nPos];}
 
-    inline BOOL  GetInitChild() const {return mbInitChild; }
-    inline BOOL  GetInitAllChild() const { return mbAllChildren; }
-    inline BOOL  IsRow() const { return mbRow; }
-    BOOL  IsEnd( size_t nPos ) const ;
+    inline sal_Bool  GetInitChild() const {return mbInitChild; }
+    inline sal_Bool  GetInitAllChild() const { return mbAllChildren; }
+    inline sal_Bool  IsRow() const { return mbRow; }
+    sal_Bool  IsEnd( size_t nPos ) const ;
 };
 // End Comments
 
@@ -309,11 +309,11 @@ private:
     long					nMeasCount;
     ScSubTotalFunc*			pMeasFuncs;
     ::com::sun::star::sheet::DataPilotFieldReference* pMeasRefs;
-    USHORT*					pMeasRefOrient;
+    sal_uInt16*					pMeasRefOrient;
     String*					pMeasNames;
-    BOOL					bLateInit;
-    BOOL					bDataAtCol;
-    BOOL					bDataAtRow;
+    sal_Bool					bLateInit;
+    sal_Bool					bDataAtCol;
+    sal_Bool					bDataAtRow;
 
     //! add "displayed values" settings
         mutable std::vector< ResultMembers* > mpDimMembers;
@@ -323,20 +323,20 @@ public:
 
     void				SetMeasureData( long nCount, const ScSubTotalFunc* pFunctions,
                                         const ::com::sun::star::sheet::DataPilotFieldReference* pRefs,
-                                        const USHORT* pRefOrient, const String* pNames );
-    void				SetDataLayoutOrientation( USHORT nOrient );
-    void				SetLateInit( BOOL bSet );
+                                        const sal_uInt16* pRefOrient, const String* pNames );
+    void				SetDataLayoutOrientation( sal_uInt16 nOrient );
+    void				SetLateInit( sal_Bool bSet );
 
     long				GetMeasureCount() const		{ return nMeasCount; }
     ScSubTotalFunc		GetMeasureFunction(long nMeasure) const;
-    String              GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
+    String              GetMeasureString(long nMeasure, sal_Bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
     String				GetMeasureDimensionName(long nMeasure) const;
     const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const;
-    USHORT				GetMeasureRefOrient(long nMeasure) const;
+    sal_uInt16				GetMeasureRefOrient(long nMeasure) const;
 
-    BOOL				IsDataAtCol() const				{ return bDataAtCol; }
-    BOOL				IsDataAtRow() const				{ return bDataAtRow; }
-    BOOL				IsLateInit() const				{ return bLateInit; }
+    sal_Bool				IsDataAtCol() const				{ return bDataAtCol; }
+    sal_Bool				IsDataAtRow() const				{ return bDataAtRow; }
+    sal_Bool				IsLateInit() const				{ return bLateInit; }
 
     long				GetColStartMeasure() const;
     long				GetRowStartMeasure() const;
@@ -344,16 +344,16 @@ public:
     long				GetCountForMeasure( long nMeas ) const
                                 { return ( nMeas == SC_DPMEASURE_ALL ) ? nMeasCount : 1; }
 
-    BOOL                IsBaseForGroup( long nDim ) const;              // any group
+    sal_Bool                IsBaseForGroup( long nDim ) const;              // any group
     long                GetGroupBase( long nGroupDim ) const;
-    BOOL                IsNumOrDateGroup( long nDim ) const;
+    sal_Bool                IsNumOrDateGroup( long nDim ) const;
  // Wang Xu Ming -- 2009-8-17
 // DataPilot Migration - Cache&&Performance
-    BOOL                IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+    sal_Bool                IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
                                                long nBaseDataId, long nBaseIndex ) const;
-    BOOL                IsInGroup( SCROW nGroupDataId, long nGroupIndex,
+    sal_Bool                IsInGroup( SCROW nGroupDataId, long nGroupIndex,
                                               const ScDPItemData& rBaseData, long nBaseIndex ) const;
-    BOOL                HasCommonElement( SCROW nFirstDataId, long nFirstIndex,
+    sal_Bool                HasCommonElement( SCROW nFirstDataId, long nFirstIndex,
                                           const ScDPItemData& rSecondData, long nSecondIndex ) const;
 
     ResultMembers* GetDimResultMembers( long nDim , ScDPDimension* pDim , ScDPLevel*   pLevel) const ;
@@ -373,20 +373,20 @@ private:
     // End Comments
     ScDPResultDimension*	pChildDimension;
     ScDPDataMember*			pDataRoot;
-    BOOL					bHasElements;
-    BOOL					bForceSubTotal;
-    BOOL					bHasHiddenDetails;
-    BOOL					bInitialized;
-    BOOL                    bAutoHidden;
+    sal_Bool					bHasElements;
+    sal_Bool					bForceSubTotal;
+    sal_Bool					bHasHiddenDetails;
+    sal_Bool					bInitialized;
+    sal_Bool                    bAutoHidden;
     ScDPAggData				aColTotal;				// to store column totals
 
-    USHORT					nMemberStep;			// step to show details
+    sal_uInt16					nMemberStep;			// step to show details
 public:
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
     ScDPResultMember(  const ScDPResultData* pData,  const ScDPParentDimData& rParentDimData,
-        BOOL bForceSub );  //! Ref
-    ScDPResultMember(  const ScDPResultData* pData, BOOL bForceSub );
+        sal_Bool bForceSub );  //! Ref
+    ScDPResultMember(  const ScDPResultData* pData, sal_Bool bForceSub );
     // End Comments
     ~ScDPResultMember();
 
@@ -396,33 +396,33 @@ public:
                                         const ::std::vector<ScDPLevel*>& ppLev,
                                         size_t nPos, 
                                         ScDPInitState& rInitState, 
-                                        BOOL bInitChild = TRUE );
+                                        sal_Bool bInitChild = sal_True );
     void               LateInitFrom( 
                                         LateInitParams& rParams, 
                                         const ::std::vector< SCROW >& pItemData,
                                         size_t nPos,
                                         ScDPInitState& rInitState);
-    void              CheckShowEmpty( BOOL bShow = FALSE );
+    void              CheckShowEmpty( sal_Bool bShow = sal_False );
     // End Comments
     String				GetName() const;
     void                FillItemData( ScDPItemData& rData ) const;
-    BOOL				IsValid() const;
-    BOOL				IsVisible() const;
+    sal_Bool				IsValid() const;
+    sal_Bool				IsVisible() const;
     long				GetSize(long nMeasure) const;
-    BOOL				HasHiddenDetails() const;
-    BOOL                IsSubTotalInTitle(long nMeasure) const;
+    sal_Bool				HasHiddenDetails() const;
+    sal_Bool                IsSubTotalInTitle(long nMeasure) const;
 
-//	BOOL				SubTotalEnabled() const;
+//	sal_Bool				SubTotalEnabled() const;
     long				GetSubTotalCount( long* pUserSubStart = NULL ) const;
 
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
-    BOOL              IsNamedItem( SCROW nIndex ) const;
+    sal_Bool              IsNamedItem( SCROW nIndex ) const;
     bool IsValidEntry( const ::std::vector< SCROW >& aMembers ) const;
     // End Comments
 
-    void				SetHasElements()	{ bHasElements = TRUE; }
-    void                SetAutoHidden()     { bAutoHidden = TRUE; }
+    void				SetHasElements()	{ bHasElements = sal_True; }
+    void                SetAutoHidden()     { bAutoHidden = sal_True; }
 
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
@@ -433,7 +433,7 @@ public:
     // End Comments
     void				FillMemberResults( com::sun::star::uno::Sequence<
                                                 com::sun::star::sheet::MemberResult>* pSequences,
-                                            long& rPos, long nMeasure, BOOL bRoot,
+                                            long& rPos, long nMeasure, sal_Bool bRoot,
                                             const String* pMemberName,
                                             const String* pMemberCaption );
 
@@ -450,7 +450,7 @@ public:
     void                SortMembers( ScDPResultMember* pRefMember );
     void                DoAutoShow( ScDPResultMember* pRefMember );
 
-    void                ResetResults( BOOL bRoot );
+    void                ResetResults( sal_Bool bRoot );
 
     void				DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const;
 
@@ -466,7 +466,7 @@ public:
     const ScDPLevel*         GetParentLevel() const         { return aParentDimData.mpParentLevel; }   //! Ref
     const ScDPMember*     GetDPMember()const              { return aParentDimData.mpMemberDesc; }    //! Ref
     inline SCROW               GetOrder() const                           { return aParentDimData.mnOrder; }         //! Ref
-    inline BOOL                  IsRoot() const                       { return GetParentLevel() == NULL; }
+    inline sal_Bool                  IsRoot() const                       { return GetParentLevel() == NULL; }
     SCROW                       GetDataId( ) const ;
     // End Comments
     ScDPAggData*		GetColTotal( long nMeasure ) const;
@@ -491,33 +491,33 @@ public:
     void				InitFrom( const ScDPResultDimension* pDim );
 
     String				GetName() const;
-    BOOL				IsVisible() const;
-    BOOL				HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const;
+    sal_Bool				IsVisible() const;
+    sal_Bool				HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const;
 
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
-    BOOL              IsNamedItem(   SCROW r ) const;
+    sal_Bool              IsNamedItem(   SCROW r ) const;
     // End Comments
-    BOOL				HasHiddenDetails() const;
+    sal_Bool				HasHiddenDetails() const;
 
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
     void                ProcessData( const ::std::vector< SCROW >& aChildMembers, const ::std::vector<ScDPValueData>& aValues,
                                        const ScDPSubTotalState& rSubState );
     // End Comments
-    BOOL				HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const;
+    sal_Bool				HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const;
     double				GetAggregate( long nMeasure, const ScDPSubTotalState& rSubState ) const;
     const ScDPAggData*	GetConstAggData( long nMeasure, const ScDPSubTotalState& rSubState ) const;
     ScDPAggData*		GetAggData( long nMeasure, const ScDPSubTotalState& rSubState );
 
     void				FillDataRow( const ScDPResultMember* pRefMember,
                                     com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence,
-                                    long& rCol, long nMeasure, BOOL bIsSubTotalRow,
+                                    long& rCol, long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState ) const;
 
-    void				UpdateDataRow( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow,
+    void				UpdateDataRow( const ScDPResultMember* pRefMember, long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState );
-    void				UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow,
+    void				UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning,
                                     ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent );
 
@@ -553,15 +553,15 @@ private:
         const ScDPResultData*   pResultData;
     MemberArray				maMemberArray;
     MemberHash				maMemberHash;
-    BOOL                    bInitialized;
+    sal_Bool                    bInitialized;
     String					aDimensionName;		//! or ptr to IntDimension?
-    BOOL					bIsDataLayout;		//! or ptr to IntDimension?
-    BOOL                    bSortByData;
-    BOOL                    bSortAscending;
+    sal_Bool					bIsDataLayout;		//! or ptr to IntDimension?
+    sal_Bool                    bSortByData;
+    sal_Bool                    bSortAscending;
     long                    nSortMeasure;
     ScMemberSortOrder       aMemberOrder;       // used when sorted by measure
-    BOOL                    bAutoShow;
-    BOOL                    bAutoTopItems;
+    sal_Bool                    bAutoShow;
+    sal_Bool                    bAutoTopItems;
     long                    nAutoMeasure;
     long                    nAutoCount;
 
@@ -586,12 +586,12 @@ public:
     void                InitFrom( const ::std::vector<ScDPDimension*>& ppDim, 
                                         const ::std::vector<ScDPLevel*>& ppLev,
                                         size_t nPos,
-                                        ScDPInitState& rInitState ,  BOOL bInitChild = TRUE );
+                                        ScDPInitState& rInitState ,  sal_Bool bInitChild = sal_True );
     void                LateInitFrom(  LateInitParams& rParams, 
                                         const ::std::vector< SCROW >& pItemData,
                                         size_t nPos,
                                         ScDPInitState& rInitState );
-    void               CheckShowEmpty( BOOL bShow = FALSE );
+    void               CheckShowEmpty( sal_Bool bShow = sal_False );
 
     // End Comments
     long				GetSize(long nMeasure) const;
@@ -645,15 +645,15 @@ public:
     const ScMemberSortOrder& GetMemberOrder() const     { return aMemberOrder; }
     ScMemberSortOrder&  GetMemberOrder()                { return aMemberOrder; }
 
-    BOOL				IsDataLayout() const	{ return bIsDataLayout; }
+    sal_Bool				IsDataLayout() const	{ return bIsDataLayout; }
     String				GetName() const			{ return aDimensionName; }
 
-    BOOL                IsSortByData() const    { return bSortByData; }
-    BOOL                IsSortAscending() const { return bSortAscending; }
+    sal_Bool                IsSortByData() const    { return bSortByData; }
+    sal_Bool                IsSortAscending() const { return bSortAscending; }
     long                GetSortMeasure() const  { return nSortMeasure; }
 
-    BOOL                IsAutoShow() const      { return bAutoShow; }
-    BOOL                IsAutoTopItems() const  { return bAutoTopItems; }
+    sal_Bool                IsAutoShow() const      { return bAutoShow; }
+    sal_Bool                IsAutoTopItems() const  { return bAutoTopItems; }
     long                GetAutoMeasure() const  { return nAutoMeasure; }
     long                GetAutoCount() const    { return nAutoCount; }
 
@@ -668,7 +668,7 @@ private:
     const ScDPResultData*		pResultData;
     const ScDPResultDimension* pResultDimension;  // column
     ScDPDataMembers		aMembers;
-    BOOL				bIsDataLayout;		//! or ptr to IntDimension?
+    sal_Bool				bIsDataLayout;		//! or ptr to IntDimension?
 
 public:
                         ScDPDataDimension( const ScDPResultData* pData );
@@ -682,12 +682,12 @@ public:
     // End Comments
     void				FillDataRow( const ScDPResultDimension* pRefDim,
                                     com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence,
-                                    long nCol, long nMeasure, BOOL bIsSubTotalRow,
+                                    long nCol, long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState ) const;
 
-    void				UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow,
+    void				UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState ) const;
-    void				UpdateRunningTotals( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow,
+    void				UpdateRunningTotals( const ScDPResultDimension* pRefDim, long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning,
                                     ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent ) const;
 
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index a6bd64779..87e4509c3 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -127,10 +127,10 @@ private:
     long					nRowDimCount;
     long					nDataDimCount;
     long					nPageDimCount;
-    BOOL					bColumnGrand;
-    BOOL					bRowGrand;
-    BOOL					bIgnoreEmptyRows;
-    BOOL					bRepeatIfEmpty;
+    sal_Bool					bColumnGrand;
+    sal_Bool					bRowGrand;
+    sal_Bool					bIgnoreEmptyRows;
+    sal_Bool					bRepeatIfEmpty;
 
     long					nDupCount;
 
@@ -142,13 +142,13 @@ private:
     com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* pRowResults;
     List					aColLevelList;
     List					aRowLevelList;
-    BOOL					bResultOverflow;
+    sal_Bool					bResultOverflow;
 
     ::std::auto_ptr<rtl::OUString> mpGrandTotalName;
 
     void					CreateRes_Impl();
     void					FillMemberResults();
-    void					FillLevelList( USHORT nOrientation, List& rList );
+    void					FillLevelList( sal_uInt16 nOrientation, List& rList );
     void                    FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool &bHasAutoShow);
 
     /** 
@@ -175,8 +175,8 @@ public:
     void                    SetGrandTotalName(const ::rtl::OUString& rName);
     const ::rtl::OUString*  GetGrandTotalName() const;
 
-    USHORT					GetOrientation(long nColumn);
-    void					SetOrientation(long nColumn, USHORT nNew);
+    sal_uInt16					GetOrientation(long nColumn);
+    void					SetOrientation(long nColumn, sal_uInt16 nNew);
     long					GetPosition(long nColumn);
 
     long					GetDataDimensionCount();
@@ -189,13 +189,13 @@ public:
     long                                       GetDataLayoutDim(){ return pData->GetColumnCount(); }
     SCROW                                GetMemberId(  long  nDim, const ScDPItemData& rData );
     // End Comments
-    BOOL					IsDataLayoutDimension(long nDim);
-    USHORT					GetDataLayoutOrientation();
+    sal_Bool					IsDataLayoutDimension(long nDim);
+    sal_uInt16					GetDataLayoutOrientation();
 
-    BOOL					IsDateDimension(long nDim);
-    UINT32					GetNumberFormat(long nDim);
+    sal_Bool					IsDateDimension(long nDim);
+    sal_uInt32					GetNumberFormat(long nDim);
 
-    BOOL					SubTotalAllowed(long nColumn);		//! move to ScDPResultData
+    sal_Bool					SubTotalAllowed(long nColumn);		//! move to ScDPResultData
 
     ScDPDimension*			AddDuplicated(long nSource, const String& rNewName);
     long					GetDupCount() const	{ return nDupCount; }
@@ -285,15 +285,15 @@ public:
 
     virtual String				getDataDescription();		//! ???
 
-    virtual BOOL				getColumnGrand() const;
-    virtual void				setColumnGrand(BOOL bSet);
-    virtual BOOL				getRowGrand() const;
-    virtual void				setRowGrand(BOOL bSet);
+    virtual sal_Bool				getColumnGrand() const;
+    virtual void				setColumnGrand(sal_Bool bSet);
+    virtual sal_Bool				getRowGrand() const;
+    virtual void				setRowGrand(sal_Bool bSet);
 
-    virtual BOOL				getIgnoreEmptyRows() const;
-    virtual void				setIgnoreEmptyRows(BOOL bSet);
-    virtual BOOL				getRepeatIfEmpty() const;
-    virtual void				setRepeatIfEmpty(BOOL bSet);
+    virtual sal_Bool				getIgnoreEmptyRows() const;
+    virtual void				setIgnoreEmptyRows(sal_Bool bSet);
+    virtual sal_Bool				getRepeatIfEmpty() const;
+    virtual void				setRepeatIfEmpty(sal_Bool bSet);
 
     virtual void				validate();		//! ???
     virtual void				disposeData();
@@ -353,14 +353,14 @@ private:
     long				nDim;               // dimension index (== column ID)
     ScDPHierarchies*	pHierarchies;
     long				nUsedHier;
-    USHORT				nFunction;			// enum GeneralFunction
+    sal_uInt16				nFunction;			// enum GeneralFunction
     String				aName;				// if empty, take from source
     ::std::auto_ptr<rtl::OUString> mpLayoutName;
     ::std::auto_ptr<rtl::OUString> mpSubtotalName;
     long				nSourceDim;			// >=0 if dup'ed
     ::com::sun::star::sheet::DataPilotFieldReference
                         aReferenceValue;    // settings for "show data as" / "displayed value"
-    BOOL				bHasSelectedPage;
+    sal_Bool				bHasSelectedPage;
     String				aSelectedPage;
     ScDPItemData*		pSelectedData;		// internal, temporary, created from aSelectedPage
     sal_Bool            mbHasHiddenMember;
@@ -440,26 +440,26 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
                                 throw(::com::sun::star::uno::RuntimeException);
 
-    virtual USHORT				getOrientation() const;
-    virtual void				setOrientation(USHORT nNew);
+    virtual sal_uInt16				getOrientation() const;
+    virtual void				setOrientation(sal_uInt16 nNew);
     virtual long				getPosition() const;
     virtual void				setPosition(long nNew);
-    virtual	BOOL				getIsDataLayoutDimension() const;
-    virtual USHORT				getFunction() const;
-    virtual void				setFunction(USHORT nNew);		// for data dimension
+    virtual	sal_Bool				getIsDataLayoutDimension() const;
+    virtual sal_uInt16				getFunction() const;
+    virtual void				setFunction(sal_uInt16 nNew);		// for data dimension
     virtual long				getUsedHierarchy() const;
     virtual void				setUsedHierarchy(long nNew);
-    virtual BOOL				isDuplicated() const;
+    virtual sal_Bool				isDuplicated() const;
 
-    BOOL                        HasSelectedPage() const     { return bHasSelectedPage; }
+    sal_Bool                        HasSelectedPage() const     { return bHasSelectedPage; }
     const ScDPItemData&         GetSelectedData();
 
     const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const;
 
-//UNUSED2009-05 BOOL						IsValidPage( const ScDPItemData& rData );
+//UNUSED2009-05 sal_Bool						IsValidPage( const ScDPItemData& rData );
 // Wang Xu Ming -- 2009-8-17
 // DataPilot Migration - Cache&&Performance
-    BOOL                      IsVisible( const ScDPItemData& rData );
+    sal_Bool                      IsVisible( const ScDPItemData& rData );
 // End Comments
 };
 
@@ -595,7 +595,7 @@ private:
     long						nLev;
     ScDPMembers*				pMembers;
     com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> aSubTotals;
-    BOOL						bShowEmpty;
+    sal_Bool						bShowEmpty;
     ::com::sun::star::sheet::DataPilotFieldSortInfo     aSortInfo;      // stored user settings
     ::com::sun::star::sheet::DataPilotFieldAutoShowInfo aAutoShowInfo;  // stored user settings
     ::com::sun::star::sheet::DataPilotFieldLayoutInfo   aLayoutInfo;    // stored user settings
@@ -603,7 +603,7 @@ private:
     ::std::vector<sal_Int32>    aGlobalOrder;       // result of sorting by name or position
     long                        nSortMeasure;       // measure (index of data dimension) to sort by
     long                        nAutoMeasure;       // measure (index of data dimension) for AutoShow
-    BOOL                        bEnableLayout;      // enabled only for row fields, not for the innermost one
+    sal_Bool                        bEnableLayout;      // enabled only for row fields, not for the innermost one
 
 public:
                             ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL );
@@ -676,31 +676,31 @@ public:
     virtual com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> getSubTotals() const;
     virtual void			setSubTotals(const com::sun::star::uno::Sequence<
                                             com::sun::star::sheet::GeneralFunction>& rNew);
-    virtual BOOL			getShowEmpty() const;
-    virtual void			setShowEmpty(BOOL bSet);
+    virtual sal_Bool			getShowEmpty() const;
+    virtual void			setShowEmpty(sal_Bool bSet);
 
     const ::com::sun::star::sheet::DataPilotFieldSortInfo& GetSortInfo() const      { return aSortInfo; }
     const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo& GetAutoShow() const  { return aAutoShowInfo; }
 
     void                    EvaluateSortOrder();
-    void                    SetEnableLayout( BOOL bSet );
+    void                    SetEnableLayout( sal_Bool bSet );
 
     const ::std::vector<sal_Int32>& GetGlobalOrder() const      { return aGlobalOrder; }
     ::std::vector<sal_Int32>&  GetGlobalOrder()                 { return aGlobalOrder; }
     long                    GetSortMeasure() const              { return nSortMeasure; }
     long                    GetAutoMeasure() const              { return nAutoMeasure; }
 
-    BOOL                    IsOutlineLayout() const
+    sal_Bool                    IsOutlineLayout() const
                             { return bEnableLayout &&
                                aLayoutInfo.LayoutMode !=
                                 ::com::sun::star::sheet::DataPilotFieldLayoutMode::TABULAR_LAYOUT; }
 
-    BOOL                    IsSubtotalsAtTop() const
+    sal_Bool                    IsSubtotalsAtTop() const
                             { return bEnableLayout &&
                                aLayoutInfo.LayoutMode ==
                                 ::com::sun::star::sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_TOP; }
 
-    BOOL                    IsAddEmpty() const          { return bEnableLayout && aLayoutInfo.AddEmptyLines; }
+    sal_Bool                    IsAddEmpty() const          { return bEnableLayout && aLayoutInfo.AddEmptyLines; }
 
     //!	number format (for data fields and date fields)
 };
@@ -781,18 +781,18 @@ private:
     ::std::auto_ptr<rtl::OUString> mpLayoutName;
 
     sal_Int32       nPosition;          // manual sorting
-    BOOL			bVisible;
-    BOOL			bShowDet;
+    sal_Bool			bVisible;
+    sal_Bool			bShowDet;
 
 public:
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
     ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
-        SCROW nIndex /*const String& rN, double fV, BOOL bHV */);
+        SCROW nIndex /*const String& rN, double fV, sal_Bool bHV */);
     // End Comments
     virtual 				~ScDPMember();
 
-    BOOL					IsNamedItem( const ScDPItemData& r ) const;
+    sal_Bool					IsNamedItem( const ScDPItemData& r ) const;
     String					GetNameStr() const;
     void					FillItemData( ScDPItemData& rData ) const;
     // Wang Xu Ming -- 2009-8-17
@@ -800,7 +800,7 @@ public:
     //  const ScDPItemData&  GetItemData() const{ return maData; }
     const ScDPItemData&  GetItemData() const;
     inline SCROW               GetItemDataId() const { return mnDataId; }
-    BOOL                           IsNamedItem( SCROW    nIndex  ) const;
+    sal_Bool                           IsNamedItem( SCROW    nIndex  ) const;
     // End Comments
 
     SC_DLLPUBLIC const ::rtl::OUString*  GetLayoutName() const;
@@ -861,10 +861,10 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
                                 throw(::com::sun::star::uno::RuntimeException);
 
-    virtual BOOL			getIsVisible() const;
-    virtual void			setIsVisible(BOOL bSet);
-    virtual BOOL			getShowDetails() const;
-    virtual void			setShowDetails(BOOL bSet);
+    virtual sal_Bool			getIsVisible() const;
+    virtual void			setIsVisible(sal_Bool bSet);
+    virtual sal_Bool			getShowDetails() const;
+    virtual void			setShowDetails(sal_Bool bSet);
 
     sal_Int32               getPosition() const;
     void                    setPosition(sal_Int32 nNew);
diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx
index fefc32caf..0377c27c4 100644
--- a/sc/inc/drawattr.hxx
+++ b/sc/inc/drawattr.hxx
@@ -38,19 +38,19 @@ public:
         SvxDrawToolItem( const SvxDrawToolItem& rDrawToolItem ) :
                                 SfxEnumItem( rDrawToolItem ){}
 
-        SvxDrawToolItem(USHORT nWhichP) : SfxEnumItem(nWhichP){}
+        SvxDrawToolItem(sal_uInt16 nWhichP) : SfxEnumItem(nWhichP){}
 
 
     virtual String      		GetValueText() const;
 
 
-    virtual String				GetValueText(USHORT nVal) const;
-    virtual USHORT 				GetValueCount() const
-                                    {return((USHORT)SVX_SNAP_DRAW_TEXT);}
+    virtual String				GetValueText(sal_uInt16 nVal) const;
+    virtual sal_uInt16 				GetValueCount() const
+                                    {return((sal_uInt16)SVX_SNAP_DRAW_TEXT);}
 
     virtual SfxPoolItem*    	Clone( SfxItemPool *pPool = 0 ) const;
 
-    virtual SfxPoolItem*    	Create( SvStream& rStream, USHORT nVer ) const;
+    virtual SfxPoolItem*    	Create( SvStream& rStream, sal_uInt16 nVer ) const;
 
     inline SvxDrawToolItem& operator=(const  SvxDrawToolItem&
                                                         rDrawTool)
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index a2c1da06a..033277b44 100644
--- a/sc/inc/drawpage.hxx
+++ b/sc/inc/drawpage.hxx
@@ -40,7 +40,7 @@ class ScDrawLayer;
 class ScDrawPage: public FmFormPage
 {
 public:
-    ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, BOOL bMasterPage=FALSE);
+    ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, sal_Bool bMasterPage=sal_False);
     ~ScDrawPage();
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 0d76cfa3d..c5d4cad23 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -83,7 +83,7 @@ private:
     ScAddress   aOldEnd;
     ScAddress   aNewStt;
     ScAddress   aNewEnd;
-    BOOL        bHasNew;
+    sal_Bool        bHasNew;
 public:
                 ScUndoObjData( SdrObject* pObj, const ScAddress& rOS, const ScAddress& rOE,
                                                 const ScAddress& rNS, const ScAddress& rNE );
@@ -102,9 +102,9 @@ private:
     String			aName;
     ScDocument*		pDoc;
     SdrUndoGroup*	pUndoGroup;
-    BOOL			bRecording;
-    BOOL			bAdjustEnabled;
-    BOOL			bHyphenatorSet;
+    sal_Bool			bRecording;
+    sal_Bool			bAdjustEnabled;
+    sal_Bool			bHyphenatorSet;
 
 private:
     void			MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove,
@@ -129,37 +129,37 @@ public:
 
 //REMOVE		void			ReleasePictureStorage();
 
-    BOOL			HasObjects() const;
+    sal_Bool			HasObjects() const;
 
-    BOOL            ScAddPage( SCTAB nTab );
+    sal_Bool            ScAddPage( SCTAB nTab );
     void			ScRemovePage( SCTAB nTab );
     void			ScRenamePage( SCTAB nTab, const String& rNewName );
-    void			ScMovePage( USHORT nOldPos, USHORT nNewPos );
-                    // inkl. Inhalt, bAlloc=FALSE -> nur Inhalt
-    void			ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc );
+    void			ScMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos );
+                    // inkl. Inhalt, bAlloc=sal_False -> nur Inhalt
+    void			ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool bAlloc );
 
     ScDocument*		GetDocument() const { return pDoc; }
 
     void			UpdateBasic();				// DocShell-Basic in DrawPages setzen
     void			UseHyphenator();
 
-    BOOL			GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const;
+    sal_Bool			GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const;
 
                     //		automatische Anpassungen
 
-    void			EnableAdjust( BOOL bSet = TRUE )	{ bAdjustEnabled = bSet; }
+    void			EnableAdjust( sal_Bool bSet = sal_True )	{ bAdjustEnabled = bSet; }
 
     void			BeginCalcUndo();
     SdrUndoGroup*	GetCalcUndo();
-    BOOL			IsRecording() const			{ return bRecording; }
+    sal_Bool			IsRecording() const			{ return bRecording; }
     void			AddCalcUndo( SdrUndoAction* pUndo );
 
     void			MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
-                                SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos = true );
+                                SCsCOL nDx,SCsROW nDy, sal_Bool bInsDel, bool bUpdateNoteCaptionPos = true );
     void			WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips );
     void			HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips );
 
-    BOOL			HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow );
+        sal_Bool            HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes = true );
 
     void			DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
                                             SCCOL nCol2,SCROW nRow2 );
@@ -173,7 +173,7 @@ public:
                                     SCTAB nSourceTab, const Rectangle& rSourceRange,
                                     const ScAddress& rDestPos, const Rectangle& rDestRange );
 
-    void			SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true );
+    void			SetPageSize( sal_uInt16 nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true );
 
                     //	mirror or move between positive and negative positions for RTL
     void			MirrorRTL( SdrObject* pObj );
@@ -187,7 +187,7 @@ public:
                     //	(ChartListenerCollection etc. must use GetPersistName directly)
     static String	GetVisibleName( SdrObject* pObj );
 
-    SdrObject*		GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const;
+    SdrObject*		GetNamedObject( const String& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const;
                     // if pnCounter != NULL, the search for a name starts with this index + 1,
                     // and the index really used is returned.
     String          GetNewGraphicName( long* pnCounter = NULL ) const;
@@ -198,7 +198,7 @@ public:
     static ScAnchorType	GetAnchor( const SdrObject* );
 
     // Positionen fuer Detektivlinien
-    static ScDrawObjData* GetObjData( SdrObject* pObj, BOOL bCreate=FALSE );
+    static ScDrawObjData* GetObjData( SdrObject* pObj, sal_Bool bCreate=sal_False );
 
     // The sheet information in ScDrawObjData isn't updated when sheets are inserted/deleted.
     // Use this method to get an object with positions on the specified sheet (should be the
@@ -217,7 +217,7 @@ public:
     static IMapObject* GetHitIMapObject( SdrObject* pObject,
                             const Point& rWinPoint, const Window& rCmpWnd );
 
-    static ScMacroInfo* GetMacroInfo( SdrObject* pObj, BOOL bCreate = FALSE );
+    static ScMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate = sal_False );
 
 private:
     static SfxObjectShell* pGlobalDrawPersist;			// fuer AllocModel
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 32756a41a..4c1f9b856 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -47,14 +47,14 @@ class SdrObject;
 
 class ScHeaderFooterChangedHint : public SfxHint
 {
-    USHORT nPart;
+    sal_uInt16 nPart;
 
 public:
                     TYPEINFO();
-                    ScHeaderFooterChangedHint(USHORT nP);
+                    ScHeaderFooterChangedHint(sal_uInt16 nP);
                     ~ScHeaderFooterChangedHint();
 
-    USHORT			GetPart() const			{ return nPart; }
+    sal_uInt16			GetPart() const			{ return nPart; }
 };
 
 
@@ -87,8 +87,8 @@ public:
 class ScHeaderFooterEditSource : public ScSharedHeaderFooterEditSource
 {
 public:
-                                ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent, USHORT nP );
-                                ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent, USHORT nP );
+                                ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent, sal_uInt16 nP );
+                                ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent, sal_uInt16 nP );
     virtual						~ScHeaderFooterEditSource();
 
     virtual SvxEditSource*		Clone() const;
@@ -140,7 +140,7 @@ private:
     ScAddress				aCellPos;
     ScEditEngineDefaulter*  pEditEngine;
     SvxEditEngineForwarder*	pForwarder;
-    BOOL					bDataValid;
+    sal_Bool					bDataValid;
 
     SdrObject*                  GetCaptionObj();
 public:
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 974ceef28..3a952dc33 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -76,7 +76,7 @@ public:
                     aScrPos(rScrPosPixel),pDev(pDevice),
                     nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {}
 
-    Rectangle	GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToTop );
+    Rectangle	GetEditArea( const ScPatternAttr* pPattern, sal_Bool bForceToTop );
 };
 
 
@@ -84,15 +84,15 @@ class ScEditAttrTester
 {
     ScEditEngineDefaulter* pEngine;
     SfxItemSet*	pEditAttrs;
-    BOOL		bNeedsObject;
-    BOOL		bNeedsCellAttr;
+    sal_Bool		bNeedsObject;
+    sal_Bool		bNeedsCellAttr;
 
 public:
                 ScEditAttrTester( ScEditEngineDefaulter* pEng );
                 ~ScEditAttrTester();
 
-    BOOL				NeedsObject() const		{ return bNeedsObject; }
-    BOOL				NeedsCellAttr() const	{ return bNeedsCellAttr; }
+    sal_Bool				NeedsObject() const		{ return bNeedsObject; }
+    sal_Bool				NeedsCellAttr() const	{ return bNeedsCellAttr; }
     const SfxItemSet&	GetAttribs() const		{ return *pEditAttrs; }
 };
 
@@ -103,11 +103,11 @@ class ScEnginePoolHelper
 protected:
     SfxItemPool*	pEnginePool;
     SfxItemSet*		pDefaults;
-    BOOL			bDeleteEnginePool;
-    BOOL			bDeleteDefaults;
+    sal_Bool			bDeleteEnginePool;
+    sal_Bool			bDeleteDefaults;
 
                     ScEnginePoolHelper( SfxItemPool* pEnginePool,
-                        BOOL bDeleteEnginePool = FALSE );
+                        sal_Bool bDeleteEnginePool = sal_False );
                     ScEnginePoolHelper( const ScEnginePoolHelper& rOrg );
     virtual			~ScEnginePoolHelper();
 };
@@ -122,17 +122,17 @@ public:
                     /// bDeleteEnginePool: Engine becomes the owner of the pool
                     /// and deletes it on destruction
                     ScEditEngineDefaulter( SfxItemPool* pEnginePool,
-                        BOOL bDeleteEnginePool = FALSE );
+                        sal_Bool bDeleteEnginePool = sal_False );
                     /// If rOrg.bDeleteEnginePool: pool gets cloned and will be
                     /// deleted on destruction. Defaults are not set.
                     ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg );
     virtual			~ScEditEngineDefaulter();
 
                     /// Creates a copy of SfxItemSet if bRememberCopy set
-    void			SetDefaults( const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE );
+    void			SetDefaults( const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True );
 
                     /// Becomes the owner of the SfxItemSet if bTakeOwnership set
-    void			SetDefaults( SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE );
+    void			SetDefaults( SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True );
 
                     /// Set the item in the default ItemSet which is created
                     /// if it doesn't exist yet.
@@ -146,19 +146,19 @@ public:
     void			SetText( const EditTextObject& rTextObject );
                     /// Current defaults are not applied, new defaults are applied
     void			SetTextNewDefaults( const EditTextObject& rTextObject,
-                        const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE );
+                        const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True );
                     /// Current defaults are not applied, new defaults are applied
     void			SetTextNewDefaults( const EditTextObject& rTextObject,
-                        SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE );
+                        SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True );
 
                     /// Overwritten method to be able to apply defaults already set
     void			SetText( const String& rText );
                     /// Current defaults are not applied, new defaults are applied
     void			SetTextNewDefaults( const String& rText,
-                        const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE );
+                        const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True );
                     /// Current defaults are not applied, new defaults are applied
     void			SetTextNewDefaults( const String& rText,
-                        SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE );
+                        SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True );
 
                     /// Paragraph attributes that are not defaults are copied to
                     /// character attributes and all paragraph attributes reset
@@ -205,19 +205,19 @@ struct ScHeaderFieldData
 class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter
 {
 private:
-    BOOL	bExecuteURL;
+    sal_Bool	bExecuteURL;
 
 public:
     // pEnginePool = ScDocument.GetEnginePool()
     // pTextObjectPool = ScDocument.GetEditPool()
     ScFieldEditEngine( SfxItemPool* pEnginePool,
                         SfxItemPool* pTextObjectPool = NULL,
-                        BOOL bDeleteEnginePool = FALSE );
+                        sal_Bool bDeleteEnginePool = sal_False );
 
-    void	SetExecuteURL(BOOL bSet)	{ bExecuteURL = bSet; }
+    void	SetExecuteURL(sal_Bool bSet)	{ bExecuteURL = bSet; }
 
-    virtual void	FieldClicked( const SvxFieldItem& rField, USHORT, USHORT );
-    virtual String	CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor );
+    virtual void	FieldClicked( const SvxFieldItem& rField, sal_uInt16, sal_uInt16 );
+    virtual String	CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor );
 };
 
 
@@ -228,8 +228,8 @@ private:
     ScHeaderFieldData	aData;
 
 public:
-    ScHeaderEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool = FALSE );
-    virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor );
+    ScHeaderEditEngine( SfxItemPool* pEnginePool, sal_Bool bDeleteEnginePool = sal_False );
+    virtual String CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor );
 
     void SetTitle(const String& rNew)				{ aData.aTitle = rNew; }
     void SetLongDocName(const String& rNew)			{ aData.aLongDocName = rNew; }
@@ -252,7 +252,7 @@ public:
     // pTextObjectPool = ScDocument.GetEditPool()
     ScNoteEditEngine( SfxItemPool* pEnginePool,
                 SfxItemPool* pTextObjectPool = NULL,
-                BOOL bDeleteEnginePool = FALSE );
+                sal_Bool bDeleteEnginePool = sal_False );
 
 };
 
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 6f57383ed..41a8209f7 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -74,7 +74,7 @@ private:
     /// mutex to lock the InterfaceContainerHelper
     osl::Mutex              aMutex;
 
-    ScCellFieldObj*			GetObjectByIndex_Impl(INT32 Index) const;
+    ScCellFieldObj*			GetObjectByIndex_Impl(sal_Int32 Index) const;
 
 public:
                             ScCellFieldsObj(ScDocShell* pDocSh, const ScAddress& rPos);
@@ -155,7 +155,7 @@ public:
 
                             // per getImplementation gerufen:
     void					DeleteField();
-    BOOL					IsInserted() const		{ return pEditSource != NULL; }
+    sal_Bool					IsInserted() const		{ return pEditSource != NULL; }
     SvxFieldItem			CreateFieldItem();
     void					InitDoc( ScDocShell* pDocSh, const ScAddress& rPos,
                                         const ESelection& rSel );
@@ -266,8 +266,8 @@ class ScHeaderFieldsObj : public cppu::WeakImplHelper5<
 {
 private:
     ScHeaderFooterContentObj*	pContentObj;
-    USHORT						nPart;
-    UINT16						nType;
+    sal_uInt16						nPart;
+    sal_uInt16						nType;
     SvxEditSource*				pEditSource;
 
     ///	List of refresh listeners.
@@ -275,11 +275,11 @@ private:
     /// mutex to lock the InterfaceContainerHelper
     osl::Mutex                  aMutex;
 
-    ScHeaderFieldObj*		GetObjectByIndex_Impl(INT32 Index) const;
+    ScHeaderFieldObj*		GetObjectByIndex_Impl(sal_Int32 Index) const;
 
 public:
                             ScHeaderFieldsObj(ScHeaderFooterContentObj* pContent,
-                                                USHORT nP, USHORT nT);
+                                                sal_uInt16 nP, sal_uInt16 nT);
     virtual					~ScHeaderFieldsObj();
 
                             // XIndexAccess
@@ -336,23 +336,23 @@ class ScHeaderFieldObj : public ScMutexHelper,
 private:
     const SfxItemPropertySet*   pPropSet;
     ScHeaderFooterContentObj*	pContentObj;
-    USHORT						nPart;
-    UINT16						nType;
+    sal_uInt16						nPart;
+    sal_uInt16						nType;
     SvxEditSource*				pEditSource;
     ESelection					aSelection;
     sal_Int16					nFileFormat;		// enum SvxFileFormat, valid if not inserted
 
     ScHeaderFieldObj(); // disabled 
 public:
-                            ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP,
-                                            USHORT nT, const ESelection& rSel);
+                            ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, sal_uInt16 nP,
+                                            sal_uInt16 nT, const ESelection& rSel);
     virtual					~ScHeaderFieldObj();
 
                             // per getImplementation gerufen:
     void					DeleteField();
-    BOOL					IsInserted() const		{ return pEditSource != NULL; }
+    sal_Bool					IsInserted() const		{ return pEditSource != NULL; }
     SvxFieldItem			CreateFieldItem();
-    void					InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP,
+    void					InitDoc( ScHeaderFooterContentObj* pContent, sal_uInt16 nP,
                                         const ESelection& rSel );
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index b5eb3f563..3b487b219 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -42,16 +42,16 @@ class ScPatternAttr;
 
 // ============================================================================
 
-const BYTE SC_ROTDIR_NONE       = 0;
-const BYTE SC_ROTDIR_STANDARD   = 1;
-const BYTE SC_ROTDIR_LEFT       = 2;
-const BYTE SC_ROTDIR_RIGHT      = 3;
-const BYTE SC_ROTDIR_CENTER     = 4;
+const sal_uInt8 SC_ROTDIR_NONE       = 0;
+const sal_uInt8 SC_ROTDIR_STANDARD   = 1;
+const sal_uInt8 SC_ROTDIR_LEFT       = 2;
+const sal_uInt8 SC_ROTDIR_RIGHT      = 3;
+const sal_uInt8 SC_ROTDIR_CENTER     = 4;
 
-const BYTE SC_CLIPMARK_NONE     = 0;
-const BYTE SC_CLIPMARK_LEFT     = 1;
-const BYTE SC_CLIPMARK_RIGHT    = 2;
-const BYTE SC_CLIPMARK_SIZE     = 64;
+const sal_uInt8 SC_CLIPMARK_NONE     = 0;
+const sal_uInt8 SC_CLIPMARK_LEFT     = 1;
+const sal_uInt8 SC_CLIPMARK_RIGHT    = 2;
+const sal_uInt8 SC_CLIPMARK_SIZE     = 64;
 
 enum ScShadowPart
 {
@@ -84,25 +84,25 @@ struct CellInfo
 
     ScShadowPart                eHShadowPart : 4;           // Schatten effektiv zum Zeichnen
     ScShadowPart                eVShadowPart : 4;
-    BYTE                        nClipMark;
-    USHORT                      nWidth;
-    BYTE                        nRotateDir;
-
-    BOOL                        bMarked : 1;
-    BOOL                        bEmptyCellText : 1;
-
-    BOOL                        bMerged : 1;
-    BOOL                        bHOverlapped : 1;
-    BOOL                        bVOverlapped : 1;
-    BOOL                        bAutoFilter : 1;
-    BOOL                        bPushButton : 1;
+    sal_uInt8                        nClipMark;
+    sal_uInt16                      nWidth;
+    sal_uInt8                        nRotateDir;
+
+    sal_Bool                        bMarked : 1;
+    sal_Bool                        bEmptyCellText : 1;
+
+    sal_Bool                        bMerged : 1;
+    sal_Bool                        bHOverlapped : 1;
+    sal_Bool                        bVOverlapped : 1;
+    sal_Bool                        bAutoFilter : 1;
+    sal_Bool                        bPushButton : 1;
     bool                        bPopupButton: 1;
     bool                        bFilterActive:1;
 
-    BOOL                        bPrinted : 1;               // bei Bedarf (Pagebreak-Modus)
+    sal_Bool                        bPrinted : 1;               // bei Bedarf (Pagebreak-Modus)
 
-    BOOL                        bHideGrid : 1;              // output-intern
-    BOOL                        bEditEngine : 1;            // output-intern
+    sal_Bool                        bHideGrid : 1;              // output-intern
+    sal_Bool                        bEditEngine : 1;            // output-intern
 };
 
 const SCCOL SC_ROTMAX_NONE = SCCOL_MAX;
@@ -113,15 +113,15 @@ struct RowInfo
 {
     CellInfo*           pCellInfo;
 
-    USHORT              nHeight;
+    sal_uInt16              nHeight;
     SCROW               nRowNo;
     SCCOL               nRotMaxCol;         // SC_ROTMAX_NONE, wenn nichts
 
-    BOOL                bEmptyBack;
-    BOOL                bEmptyText;
-    BOOL                bAutoFilter;
-    BOOL                bPushButton;
-    BOOL                bChanged;           // TRUE, wenn nicht getestet
+    sal_Bool                bEmptyBack;
+    sal_Bool                bEmptyText;
+    sal_Bool                bAutoFilter;
+    sal_Bool                bPushButton;
+    sal_Bool                bChanged;           // sal_True, wenn nicht getestet
 
     inline explicit     RowInfo() : pCellInfo( 0 ) {}
 
@@ -136,7 +136,7 @@ struct ScTableInfo
 {
     svx::frame::Array   maArray;
     RowInfo*            mpRowInfo;
-    USHORT              mnArrCount;
+    sal_uInt16              mnArrCount;
     bool                mbPageMode;
 
     explicit            ScTableInfo();
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index c3021adf3..e4752015f 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -41,9 +41,9 @@ class ScDocument;
 class ScRange;
 class SvNumberFormatter;
 
-// Return-Werte Im-/Exportfilter	(ULONG)
+// Return-Werte Im-/Exportfilter	(sal_uLong)
 
-typedef ULONG FltError;
+typedef sal_uLong FltError;
 //enum FltError {
 
 #define eERR_OK  		ERRCODE_NONE				// kein Fehler, alles OK
@@ -88,10 +88,10 @@ class ScHTMLImport;
 class ScEEAbsImport {
   public:
     virtual ~ScEEAbsImport() {}
-    virtual ULONG   Read( SvStream& rStream, const String& rBaseURL ) = 0;
+    virtual sal_uLong   Read( SvStream& rStream, const String& rBaseURL ) = 0;
     virtual ScRange GetRange() = 0;
     virtual void    WriteToDocument( 
-        BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, 
+        sal_Bool bSizeColsRows = sal_False, double nOutputFactor = 1.0, 
         SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
 };
 
@@ -107,14 +107,14 @@ class ScFormatFilterPlugin {
         // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren
     virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) = 0;
     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
-                 const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
+                 const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
     virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ) = 0;
     virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, 
-                                   BOOL bCalcWidthHeight = TRUE, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
+                                   sal_Bool bCalcWidthHeight = sal_True, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
 
     // various import helpers
     virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) = 0;
-    virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight ) = 0;
+    virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, sal_Bool bCalcWidthHeight ) = 0;
     virtual String         GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName ) = 0;
 
     // various export filters
@@ -123,10 +123,10 @@ class ScFormatFilterPlugin {
 #endif
     virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, CharSet eDest ) = 0;
     virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const CharSet eDest,
-                                 UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
+                                 sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
     virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest,
-                 UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
-    virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, BOOL bAll,
+                 sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
+    virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, sal_Bool bAll,
                   const String& rStreamPath, String& rNonConvertibleChars ) = 0;
     virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest ) = 0;
 };
diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx
index e15ffb412..4b9773f67 100644
--- a/sc/inc/filtopt.hxx
+++ b/sc/inc/filtopt.hxx
@@ -38,7 +38,7 @@
 
 class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem
 {
-    BOOL		bWK3Flag;
+    sal_Bool		bWK3Flag;
     double		fExcelColScale;
     double		fExcelRowScale;
 
@@ -50,7 +50,7 @@ public:
     virtual void	Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames );
     virtual void	Commit();
 
-    BOOL		GetWK3Flag() const			{ return bWK3Flag; }
+    sal_Bool		GetWK3Flag() const			{ return bWK3Flag; }
     double		GetExcelColScale() const	{ return fExcelColScale; }
     double		GetExcelRowScale() const	{ return fExcelRowScale; }
 
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 31ec6dde2..cd2be59a4 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -84,12 +84,12 @@ class ScTableConditionalFormat : public cppu::WeakImplHelper5<
 private:
     List	aEntries;
 
-    ScTableConditionalEntry*	GetObjectByIndex_Impl(USHORT nIndex) const;
+    ScTableConditionalEntry*	GetObjectByIndex_Impl(sal_uInt16 nIndex) const;
     void                        AddEntry_Impl(const ScCondFormatEntryItem& aEntry);
 
     ScTableConditionalFormat(); // disable
 public:
-                            ScTableConditionalFormat(ScDocument* pDoc, ULONG nKey,
+                            ScTableConditionalFormat(ScDocument* pDoc, sal_uLong nKey,
                                 formula::FormulaGrammar::Grammar eGrammar);
     virtual					~ScTableConditionalFormat();
 
@@ -206,7 +206,7 @@ class ScTableValidationObj : public cppu::WeakImplHelper5<
 {
 private:
     SfxItemPropertySet	aPropSet;
-    USHORT				nMode;			// enum ScConditionMode
+    sal_uInt16				nMode;			// enum ScConditionMode
     String				aExpr1;
     String				aExpr2;
     String              maExprNmsp1;
@@ -217,14 +217,14 @@ private:
     ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2;
     ScAddress			aSrcPos;
     String              aPosString;     // formula position as text
-    USHORT				nValMode;		// enum ScValidationMode
-    BOOL				bIgnoreBlank;
+    sal_uInt16				nValMode;		// enum ScValidationMode
+    sal_Bool				bIgnoreBlank;
     sal_Int16           nShowList;
-    BOOL				bShowInput;
+    sal_Bool				bShowInput;
     String				aInputTitle;
     String				aInputMessage;
-    BOOL				bShowError;
-    USHORT				nErrorStyle;	// enum ScValidErrorStyle
+    sal_Bool				bShowError;
+    sal_uInt16				nErrorStyle;	// enum ScValidErrorStyle
     String				aErrorTitle;
     String				aErrorMessage;
 
@@ -232,7 +232,7 @@ private:
 
     ScTableValidationObj(); // disabled
 public:
-                            ScTableValidationObj(ScDocument* pDoc, ULONG nKey,
+                            ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey,
                                                 const formula::FormulaGrammar::Grammar eGrammar);
     virtual					~ScTableValidationObj();
 
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 59a44a6bb..809755bed 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -45,7 +45,7 @@ class ScFormulaResult
         double          mfValue;    // double result direct for performance and memory consumption
         const formula::FormulaToken*  mpToken;    // if not, result token obtained from interpreter
     };
-    USHORT              mnError;    // error code
+    sal_uInt16              mnError;    // error code
     bool                mbToken :1; // whether content of union is a token
     bool                mbEmpty :1; // empty cell result
     bool                mbEmptyDisplayedAsString :1;    // only if mbEmpty
@@ -165,10 +165,10 @@ public:
 
     /** Get error code if set or GetCellResultType() is formula::svError or svUnknown,
         else 0. */
-    inline  USHORT              GetResultError() const;
+    inline  sal_uInt16              GetResultError() const;
 
     /** Set error code, don't touch token or double. */
-    inline  void                SetResultError( USHORT nErr );
+    inline  void                SetResultError( sal_uInt16 nErr );
 
     /** Set direct double. Shouldn't be used externally except in
         ScFormulaCell for rounded CalcAsShown or SetErrCode(). If
@@ -434,7 +434,7 @@ inline bool ScFormulaResult::IsMultiline() const
 }
 
 
-inline USHORT ScFormulaResult::GetResultError() const
+inline sal_uInt16 ScFormulaResult::GetResultError() const
 {
     if (mnError)
         return mnError;
@@ -452,7 +452,7 @@ inline USHORT ScFormulaResult::GetResultError() const
 }
 
 
-inline void ScFormulaResult::SetResultError( USHORT nErr )
+inline void ScFormulaResult::SetResultError( sal_uInt16 nErr )
 {
     mnError = nErr;
 }
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index a81dee858..1c5f63998 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -54,7 +54,7 @@ public:
     /** Returns mapping from visible arguments to real arguments, e.g. if of 4
         parameters the second one is suppressed {0,2,3}. For VAR_ARGS
         parameters only one element is added to the end of the sequence. */
-    virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const ;
+    virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ;
     virtual void initArgumentInfo()  const;
     virtual ::rtl::OUString getSignature() const ;
     virtual rtl::OString getHelpId() const ;
@@ -90,16 +90,16 @@ public:
         variable arguments the number of fixed non-suppressed arguments plus
         VAR_ARGS, same as for nArgCount (variable arguments can't be
         suppressed). */
-    USHORT  GetSuppressedArgCount() const;
+    sal_uInt16  GetSuppressedArgCount() const;
 
     String          *pFuncName;              // Function name
     String          *pFuncDesc;              // Description of function
     String         **ppDefArgNames;          // Parameter name(s)
     String         **ppDefArgDescs;          // Description(s) of parameter(s)
     ParameterFlags  *pDefArgFlags;           // Flags for each parameter
-    USHORT           nFIndex;                // Unique function index
-    USHORT           nCategory;              // Function category
-    USHORT           nArgCount;              // All parameter count, suppressed and unsuppressed
+    sal_uInt16           nFIndex;                // Unique function index
+    sal_uInt16           nCategory;              // Function category
+    sal_uInt16           nArgCount;              // All parameter count, suppressed and unsuppressed
     rtl::OString     sHelpId;                // HelpID of function
     bool             bIncomplete         :1; // Incomplete argument info (set for add-in info from configuration)
     bool             bHasSuppressedArgs  :1; // Whether there is any suppressed parameter.
@@ -113,7 +113,7 @@ public:
     ScFunctionList();
     ~ScFunctionList();
 
-    ULONG           GetCount() const
+    sal_uLong           GetCount() const
                     { return aFunctionList.Count(); }
 
     const ScFuncDesc*   First()
@@ -122,7 +122,7 @@ public:
     const ScFuncDesc*   Next()
                         { return (const ScFuncDesc*) aFunctionList.Next(); }
 
-    const ScFuncDesc*   GetFunction( ULONG nIndex ) const
+    const ScFuncDesc*   GetFunction( sal_uLong nIndex ) const
                     { return (const ScFuncDesc*) aFunctionList.GetObject( nIndex ); }
 
     xub_StrLen      GetMaxFuncNameLen() const
@@ -160,8 +160,8 @@ public:
     static String       GetCategoryName(sal_uInt32 _nCategoryNumber );
 
     const ScFuncDesc*   Get( const String& rFName ) const;
-    const ScFuncDesc*   Get( USHORT nFIndex ) const;
-    const ScFuncDesc*   First( USHORT nCategory = 0 ) const;
+    const ScFuncDesc*   Get( sal_uInt16 nFIndex ) const;
+    const ScFuncDesc*   First( sal_uInt16 nCategory = 0 ) const;
     const ScFuncDesc*   Next() const;
 
     // formula::IFunctionManager
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index b140d695e..b2dd58305 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -48,15 +48,15 @@ class ScTempDocCache
 {
 private:
     ScDocument*		pDoc;
-    BOOL			bInUse;
+    sal_Bool			bInUse;
 
 public:
                 ScTempDocCache();
                 ~ScTempDocCache();
 
     ScDocument*	GetDocument() const		{ return pDoc; }
-    BOOL		IsInUse() const			{ return bInUse; }
-    void		SetInUse( BOOL bSet )	{ bInUse = bSet; }
+    sal_Bool		IsInUse() const			{ return bInUse; }
+    void		SetInUse( sal_Bool bSet )	{ bInUse = bSet; }
 
     void		SetDocument( ScDocument* pNew );
     void		Clear();
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index e456fed7d..9bcd7db86 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -201,38 +201,38 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10;
                                     // Flags fuer Spalten / Zeilen
                                     // FILTERED immer zusammen mit HIDDEN
                                     // FILTERED und MANUALSIZE nur fuer Zeilen moeglich
-const BYTE   CR_HIDDEN      = 1;
-//const BYTE CR_MARKED      = 2;
-//const BYTE CR_PAGEBREAK   = 4;
-const BYTE   CR_MANUALBREAK = 8;
-const BYTE   CR_FILTERED    = 16;
-const BYTE   CR_MANUALSIZE  = 32;
-const BYTE   CR_ALL         = (CR_HIDDEN | CR_MANUALBREAK | CR_FILTERED | CR_MANUALSIZE);
-
-typedef BYTE ScBreakType;
+const sal_uInt8   CR_HIDDEN      = 1;
+//const sal_uInt8 CR_MARKED      = 2;
+//const sal_uInt8 CR_PAGEBREAK   = 4;
+const sal_uInt8   CR_MANUALBREAK = 8;
+const sal_uInt8   CR_FILTERED    = 16;
+const sal_uInt8   CR_MANUALSIZE  = 32;
+const sal_uInt8   CR_ALL         = (CR_HIDDEN | CR_MANUALBREAK | CR_FILTERED | CR_MANUALSIZE);
+
+typedef sal_uInt8 ScBreakType;
 const ScBreakType BREAK_NONE   = 0;
 const ScBreakType BREAK_PAGE   = 1;
 const ScBreakType BREAK_MANUAL = 2;
 
 // Insert-/Delete-Flags
-const USHORT IDF_NONE       = 0x0000;
-const USHORT IDF_VALUE      = 0x0001;   /// Numeric values (and numeric results if IDF_FORMULA is not set).
-const USHORT IDF_DATETIME   = 0x0002;   /// Dates, times, datetime values.
-const USHORT IDF_STRING     = 0x0004;   /// Strings (and string results if IDF_FORMULA is not set).
-const USHORT IDF_NOTE       = 0x0008;   /// Cell notes.
-const USHORT IDF_FORMULA    = 0x0010;   /// Formula cells.
-const USHORT IDF_HARDATTR   = 0x0020;   /// Hard cell attributes.
-const USHORT IDF_STYLES     = 0x0040;   /// Cell styles.
-const USHORT IDF_OBJECTS    = 0x0080;   /// Drawing objects.
-const USHORT IDF_EDITATTR   = 0x0100;   /// Rich-text attributes.
-const USHORT IDF_ATTRIB     = IDF_HARDATTR | IDF_STYLES;
-const USHORT IDF_CONTENTS   = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA;
-const USHORT IDF_ALL        = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
-const USHORT IDF_NOCAPTIONS = 0x0200;   /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes.
-const USHORT IDF_ADDNOTES   = 0x0400;   /// Internal use only (copy from clip): do not delete existing cell contents when pasting notes.
+const sal_uInt16 IDF_NONE       = 0x0000;
+const sal_uInt16 IDF_VALUE      = 0x0001;   /// Numeric values (and numeric results if IDF_FORMULA is not set).
+const sal_uInt16 IDF_DATETIME   = 0x0002;   /// Dates, times, datetime values.
+const sal_uInt16 IDF_STRING     = 0x0004;   /// Strings (and string results if IDF_FORMULA is not set).
+const sal_uInt16 IDF_NOTE       = 0x0008;   /// Cell notes.
+const sal_uInt16 IDF_FORMULA    = 0x0010;   /// Formula cells.
+const sal_uInt16 IDF_HARDATTR   = 0x0020;   /// Hard cell attributes.
+const sal_uInt16 IDF_STYLES     = 0x0040;   /// Cell styles.
+const sal_uInt16 IDF_OBJECTS    = 0x0080;   /// Drawing objects.
+const sal_uInt16 IDF_EDITATTR   = 0x0100;   /// Rich-text attributes.
+const sal_uInt16 IDF_ATTRIB     = IDF_HARDATTR | IDF_STYLES;
+const sal_uInt16 IDF_CONTENTS   = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA;
+const sal_uInt16 IDF_ALL        = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
+const sal_uInt16 IDF_NOCAPTIONS = 0x0200;   /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes.
+const sal_uInt16 IDF_ADDNOTES   = 0x0400;   /// Internal use only (copy from clip): do not delete existing cell contents when pasting notes.
 
 /// Copy flags for auto/series fill functions: do not touch notes and drawing objects.
-const USHORT IDF_AUTOFILL   = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
+const sal_uInt16 IDF_AUTOFILL   = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
 
 #define PASTE_NOFUNC		0
 #define PASTE_ADD			1
@@ -468,19 +468,19 @@ struct ScImportParam
     SCROW			nRow1;
     SCCOL			nCol2;
     SCROW			nRow2;
-    BOOL			bImport;
+    sal_Bool			bImport;
     String			aDBName;					// Alias der Datenbank
     String			aStatement;
-    BOOL			bNative;
-    BOOL			bSql;						// Statement oder Name?
-    BYTE			nType;						// enum DBObject
+    sal_Bool			bNative;
+    sal_Bool			bSql;						// Statement oder Name?
+    sal_uInt8			nType;						// enum DBObject
 
     ScImportParam();
     ScImportParam( const ScImportParam& r );
     ~ScImportParam();
 
     ScImportParam&	operator=	( const ScImportParam& r );
-    BOOL			operator==	( const ScImportParam& r ) const;
+    sal_Bool			operator==	( const ScImportParam& r ) const;
 //UNUSED2009-05 void			Clear		();
 };
 
@@ -600,24 +600,24 @@ public:
     SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
     SC_DLLPUBLIC static ScUserList*			GetUserList();
     static void					SetUserList( const ScUserList* pNewList );
-    SC_DLLPUBLIC static const String&		GetRscString( USHORT nIndex );
+    SC_DLLPUBLIC static const String&		GetRscString( sal_uInt16 nIndex );
     static void					OpenURL( const String& rURL, const String& rTarget );
     SC_DLLPUBLIC static String				GetAbsDocName( const String& rFileName,
                                                 SfxObjectShell* pShell );
     SC_DLLPUBLIC static String				GetDocTabName( const String& rFileName,
                                                 const String& rTabName );
-    SC_DLLPUBLIC static ULONG				GetStandardFormat( SvNumberFormatter&,
-                                    ULONG nFormat, short nType );
-    SC_DLLPUBLIC static ULONG				GetStandardFormat( double, SvNumberFormatter&,
-                                    ULONG nFormat, short nType );
+    SC_DLLPUBLIC static sal_uLong				GetStandardFormat( SvNumberFormatter&,
+                                    sal_uLong nFormat, short nType );
+    SC_DLLPUBLIC static sal_uLong				GetStandardFormat( double, SvNumberFormatter&,
+                                    sal_uLong nFormat, short nType );
 
     SC_DLLPUBLIC static double				nScreenPPTX;
     SC_DLLPUBLIC static double				nScreenPPTY;
 
     static ScDocShellRef*	pDrawClipDocShellRef;
 
-    static USHORT			nDefFontHeight;
-    static USHORT			nStdRowHeight;
+    static sal_uInt16			nDefFontHeight;
+    static sal_uInt16			nStdRowHeight;
 
     SC_DLLPUBLIC static long				nLastRowHeightExtra;
     static long				nLastColWidthExtra;
@@ -648,16 +648,16 @@ public:
     static ScFunctionMgr*	GetStarCalcFunctionMgr();
     static void             ResetFunctionList();
 
-    static String			GetErrorString(USHORT nErrNumber);
-    static String			GetLongErrorString(USHORT nErrNumber);
-    static BOOL				EETextObjEqual( const EditTextObject* pObj1,
+    static String			GetErrorString(sal_uInt16 nErrNumber);
+    static String			GetLongErrorString(sal_uInt16 nErrNumber);
+    static sal_Bool				EETextObjEqual( const EditTextObject* pObj1,
                                             const EditTextObject* pObj2 );
-    static BOOL				CheckWidthInvalidate( BOOL& bNumFormatChanged,
+    static sal_Bool				CheckWidthInvalidate( sal_Bool& bNumFormatChanged,
                                                   const SfxItemSet& rNewAttrs,
                                                   const SfxItemSet& rOldAttrs );
-    static BOOL				HasAttrChanged( const SfxItemSet& rNewAttrs,
+    static sal_Bool				HasAttrChanged( const SfxItemSet& rNewAttrs,
                                             const SfxItemSet& rOldAttrs,
-                                            const USHORT	  nWhich );
+                                            const sal_uInt16	  nWhich );
 
     static ScUnitConverter*	GetUnitConverter();
 
@@ -717,13 +717,13 @@ SC_DLLPUBLIC    static const sal_Unicode* FindUnquoted( const sal_Unicode* pStri
     /// a "ReadOnly" formatter for UNO/XML export
     static  SvNumberFormatter*  GetEnglishFormatter();
 
-    static BOOL IsSystemRTL();						// depending on system language
+    static sal_Bool IsSystemRTL();						// depending on system language
     static LanguageType GetEditDefaultLanguage();	// for EditEngine::SetDefaultLanguage
-    SC_DLLPUBLIC static BYTE	GetDefaultScriptType();				// for all WEAK characters
+    SC_DLLPUBLIC static sal_uInt8	GetDefaultScriptType();				// for all WEAK characters
     /** Map ATTR_((CJK|CTL)_)?FONT_... to proper WhichIDs.
         If more than one SCRIPTTYPE_... values are or'ed together, prefers
         first COMPLEX, then ASIAN */
-    SC_DLLPUBLIC static USHORT GetScriptedWhichID( BYTE nScriptType, USHORT nWhich );
+    SC_DLLPUBLIC static sal_uInt16 GetScriptedWhichID( sal_uInt8 nScriptType, sal_uInt16 nWhich );
 
     /** Adds a language item to the item set, if the number format item contains
         a language that differs from its parent's language. */
@@ -803,8 +803,8 @@ namespace utl
 
 struct ScQueryEntry
 {
-    BOOL			bDoQuery;
-    BOOL			bQueryByString;
+    sal_Bool			bDoQuery;
+    sal_Bool			bQueryByString;
     bool            bQueryByDate;
     SCCOLROW		nField;
     ScQueryOp		eOp;
@@ -819,11 +819,11 @@ struct ScQueryEntry
     ~ScQueryEntry();
 
     // legt ggbf. pSearchParam und pSearchText an, immer RegExp!
-    utl::TextSearch*	GetSearchTextPtr( BOOL bCaseSens );
+    utl::TextSearch*	GetSearchTextPtr( sal_Bool bCaseSens );
 
     void			Clear();
     ScQueryEntry&	operator=( const ScQueryEntry& r );
-    BOOL			operator==( const ScQueryEntry& r ) const;
+    sal_Bool			operator==( const ScQueryEntry& r ) const;
 };
 
 // -----------------------------------------------------------------------
@@ -834,16 +834,16 @@ struct SC_DLLPUBLIC ScSubTotalParam
     SCROW			nRow1;
     SCCOL			nCol2;
     SCROW			nRow2;
-    BOOL			bRemoveOnly;
-    BOOL			bReplace;					// vorhandene Ergebnisse ersetzen
-    BOOL			bPagebreak;					// Seitenumbruch bei Gruppenwechsel
-    BOOL			bCaseSens;					// Gross-/Kleinschreibung
-    BOOL			bDoSort;					// vorher sortieren
-    BOOL			bAscending;					// aufsteigend sortieren
-    BOOL			bUserDef;					// Benutzer-def. Sort.Reihenfolge
-    USHORT			nUserIndex;                 // Index auf Liste
-    BOOL			bIncludePattern;			// Formate mit sortieren
-    BOOL			bGroupActive[MAXSUBTOTAL];	// aktive Gruppen
+    sal_Bool			bRemoveOnly;
+    sal_Bool			bReplace;					// vorhandene Ergebnisse ersetzen
+    sal_Bool			bPagebreak;					// Seitenumbruch bei Gruppenwechsel
+    sal_Bool			bCaseSens;					// Gross-/Kleinschreibung
+    sal_Bool			bDoSort;					// vorher sortieren
+    sal_Bool			bAscending;					// aufsteigend sortieren
+    sal_Bool			bUserDef;					// Benutzer-def. Sort.Reihenfolge
+    sal_uInt16			nUserIndex;                 // Index auf Liste
+    sal_Bool			bIncludePattern;			// Formate mit sortieren
+    sal_Bool			bGroupActive[MAXSUBTOTAL];	// aktive Gruppen
     SCCOL			nField[MAXSUBTOTAL];		// zugehoeriges Feld
     SCCOL			nSubTotals[MAXSUBTOTAL];	// Anzahl der SubTotals
     SCCOL*			pSubTotals[MAXSUBTOTAL];	// Array der zu berechnenden Spalten
@@ -853,12 +853,12 @@ struct SC_DLLPUBLIC ScSubTotalParam
     ScSubTotalParam( const ScSubTotalParam& r );
 
     ScSubTotalParam&	operator=		( const ScSubTotalParam& r );
-    BOOL				operator==		( const ScSubTotalParam& r ) const;
+    sal_Bool				operator==		( const ScSubTotalParam& r ) const;
     void				Clear			();
-    void 				SetSubTotals	( USHORT				nGroup,
+    void 				SetSubTotals	( sal_uInt16				nGroup,
                                           const SCCOL*			ptrSubTotals,
                                           const ScSubTotalFunc*	ptrFuncions,
-                                          USHORT				nCount );
+                                          sal_uInt16				nCount );
 };
 
 // -----------------------------------------------------------------------
@@ -870,21 +870,21 @@ struct ScConsolidateParam
     SCROW			nRow;					// bzw. Anfang des Zielbereiches
     SCTAB			nTab;
     ScSubTotalFunc	eFunction;				// Berechnungsvorschrift
-    USHORT			nDataAreaCount;			// Anzahl der Datenbereiche
+    sal_uInt16			nDataAreaCount;			// Anzahl der Datenbereiche
     ScArea**		ppDataAreas;			// Zeiger-Array auf Datenbereiche
-    BOOL			bByCol;					// nach Spalten
-    BOOL			bByRow;					// nach Zeilen
-    BOOL			bReferenceData;			// Quelldaten referenzieren
+    sal_Bool			bByCol;					// nach Spalten
+    sal_Bool			bByRow;					// nach Zeilen
+    sal_Bool			bReferenceData;			// Quelldaten referenzieren
 
     ScConsolidateParam();
     ScConsolidateParam( const ScConsolidateParam& r );
     ~ScConsolidateParam();
 
     ScConsolidateParam&	operator=		( const ScConsolidateParam& r );
-    BOOL				operator==		( const ScConsolidateParam& r ) const;
+    sal_Bool				operator==		( const ScConsolidateParam& r ) const;
     void				Clear			(); // = ClearDataAreas()+Members
     void				ClearDataAreas	();
-    void				SetAreas		( ScArea* const* ppAreas, USHORT nCount );
+    void				SetAreas		( ScArea* const* ppAreas, sal_uInt16 nCount );
 };
 
 // -----------------------------------------------------------------------
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 5ff21e891..0be11c14e 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -37,17 +37,17 @@
 class ScPaintHint : public SfxHint
 {
     ScRange		aRange;
-    USHORT		nParts;
-    BOOL		bPrint;		//	Flag, ob auch Druck/Vorschau betroffen ist
+    sal_uInt16		nParts;
+    sal_Bool		bPrint;		//	Flag, ob auch Druck/Vorschau betroffen ist
 
     ScPaintHint(); // disabled
 
 public:
                     TYPEINFO();
-                    ScPaintHint( const ScRange& rRng, USHORT nPaint = PAINT_ALL );
+                    ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint = PAINT_ALL );
                     ~ScPaintHint();
 
-    void			SetPrintFlag(BOOL bSet)	{ bPrint = bSet; }
+    void			SetPrintFlag(sal_Bool bSet)	{ bPrint = bSet; }
 
     const ScRange&	GetRange() const		{ return aRange; }
     SCCOL           GetStartCol() const     { return aRange.aStart.Col(); }
@@ -56,8 +56,8 @@ public:
     SCCOL           GetEndCol() const       { return aRange.aEnd.Col(); }
     SCROW           GetEndRow() const       { return aRange.aEnd.Row(); }
     SCTAB           GetEndTab() const       { return aRange.aEnd.Tab(); }
-    USHORT          GetParts() const        { return nParts; }
-    BOOL			GetPrintFlag() const	{ return bPrint; }
+    sal_uInt16          GetParts() const        { return nParts; }
+    sal_Bool			GetPrintFlag() const	{ return bPrint; }
 };
 
 
@@ -88,15 +88,15 @@ public:
 
 class ScPointerChangedHint : public SfxHint
 {
-    USHORT			nFlags;
+    sal_uInt16			nFlags;
 
 public:
                     TYPEINFO();
 
-//UNUSED2008-05     ScPointerChangedHint( USHORT nF );
+//UNUSED2008-05     ScPointerChangedHint( sal_uInt16 nF );
                     ~ScPointerChangedHint();
 
-    USHORT			GetFlags() const			{ return nFlags; }
+    sal_uInt16			GetFlags() const			{ return nFlags; }
 };
 
 
@@ -109,12 +109,12 @@ public:
 
 class ScLinkRefreshedHint : public SfxHint
 {
-    USHORT		nLinkType;	// SC_LINKREFTYPE_...
+    sal_uInt16		nLinkType;	// SC_LINKREFTYPE_...
     String		aUrl;		// used for sheet links
     String		aDdeAppl;	// used for dde links:
     String		aDdeTopic;
     String		aDdeItem;
-    BYTE		nDdeMode;
+    sal_uInt8		nDdeMode;
     ScAddress	aDestPos;	// used to identify area links
                             //!	also use source data for area links?
 
@@ -124,15 +124,15 @@ public:
                     ~ScLinkRefreshedHint();
 
     void			SetSheetLink( const String& rSourceUrl );
-    void			SetDdeLink( const String& rA, const String& rT, const String& rI, BYTE nM );
+    void			SetDdeLink( const String& rA, const String& rT, const String& rI, sal_uInt8 nM );
     void			SetAreaLink( const ScAddress& rPos );
 
-    USHORT				GetLinkType() const	{ return nLinkType; }
+    sal_uInt16				GetLinkType() const	{ return nLinkType; }
     const String&		GetUrl() const		{ return aUrl; }
     const String&		GetDdeAppl() const	{ return aDdeAppl; }
     const String&		GetDdeTopic() const	{ return aDdeTopic; }
     const String&		GetDdeItem() const	{ return aDdeItem; }
-    BYTE				GetDdeMode() const	{ return nDdeMode; }
+    sal_uInt8				GetDdeMode() const	{ return nDdeMode; }
     const ScAddress&	GetDestPos() const	{ return aDestPos; }
 };
 
@@ -144,17 +144,17 @@ class ScAutoStyleHint : public SfxHint
     ScRange		aRange;
     String		aStyle1;
     String		aStyle2;
-    ULONG		nTimeout;
+    sal_uLong		nTimeout;
 
 public:
                     TYPEINFO();
                     ScAutoStyleHint( const ScRange& rR, const String& rSt1,
-                                        ULONG nT, const String& rSt2 );
+                                        sal_uLong nT, const String& rSt2 );
                     ~ScAutoStyleHint();
 
     const ScRange&	GetRange() const	{ return aRange; }
     const String&	GetStyle1() const	{ return aStyle1; }
-    UINT32			GetTimeout() const	{ return nTimeout; }
+    sal_uInt32			GetTimeout() const	{ return nTimeout; }
     const String&	GetStyle2() const	{ return aStyle2; }
 };
 
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index afd25a9fa..8b477ec10 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -38,16 +38,16 @@ class SvStream;
 class ScInputOptions
 {
 private:
-    USHORT		nMoveDir;			// enum ScDirection
-    BOOL		bMoveSelection;
-    BOOL		bEnterEdit;
-    BOOL		bExtendFormat;
-    BOOL		bRangeFinder;
-    BOOL		bExpandRefs;
-    BOOL		bMarkHeader;
-    BOOL		bUseTabCol;
-    BOOL		bTextWysiwyg;
-    BOOL        bReplCellsWarn;
+    sal_uInt16		nMoveDir;			// enum ScDirection
+    sal_Bool		bMoveSelection;
+    sal_Bool		bEnterEdit;
+    sal_Bool		bExtendFormat;
+    sal_Bool		bRangeFinder;
+    sal_Bool		bExpandRefs;
+    sal_Bool		bMarkHeader;
+    sal_Bool		bUseTabCol;
+    sal_Bool		bTextWysiwyg;
+    sal_Bool        bReplCellsWarn;
 
 public:
                 ScInputOptions();
@@ -56,26 +56,26 @@ public:
 
     void		SetDefaults();
 
-    void        SetMoveDir(USHORT nNew)         { nMoveDir = nNew;       }
-    USHORT      GetMoveDir() const              { return nMoveDir;       }
-    void        SetMoveSelection(BOOL bSet)     { bMoveSelection = bSet; }
-    BOOL        GetMoveSelection() const        { return bMoveSelection; }
-    void        SetEnterEdit(BOOL bSet)         { bEnterEdit = bSet;     }
-    BOOL        GetEnterEdit() const            { return bEnterEdit;     }
-    void        SetExtendFormat(BOOL bSet)      { bExtendFormat = bSet;  }
-    BOOL        GetExtendFormat() const         { return bExtendFormat;  }
-    void        SetRangeFinder(BOOL bSet)       { bRangeFinder = bSet;   }
-    BOOL        GetRangeFinder() const          { return bRangeFinder;   }
-    void        SetExpandRefs(BOOL bSet)        { bExpandRefs = bSet;    }
-    BOOL        GetExpandRefs() const           { return bExpandRefs;    }
-    void        SetMarkHeader(BOOL bSet)        { bMarkHeader = bSet;    }
-    BOOL        GetMarkHeader() const           { return bMarkHeader;    }
-    void        SetUseTabCol(BOOL bSet)         { bUseTabCol = bSet;     }
-    BOOL        GetUseTabCol() const            { return bUseTabCol;     }
-    void        SetTextWysiwyg(BOOL bSet)       { bTextWysiwyg = bSet;   }
-    BOOL        GetTextWysiwyg() const          { return bTextWysiwyg;   }
-    void        SetReplaceCellsWarn(BOOL bSet)  { bReplCellsWarn = bSet; }
-    BOOL        GetReplaceCellsWarn() const     { return bReplCellsWarn; }
+    void        SetMoveDir(sal_uInt16 nNew)         { nMoveDir = nNew;       }
+    sal_uInt16      GetMoveDir() const              { return nMoveDir;       }
+    void        SetMoveSelection(sal_Bool bSet)     { bMoveSelection = bSet; }
+    sal_Bool        GetMoveSelection() const        { return bMoveSelection; }
+    void        SetEnterEdit(sal_Bool bSet)         { bEnterEdit = bSet;     }
+    sal_Bool        GetEnterEdit() const            { return bEnterEdit;     }
+    void        SetExtendFormat(sal_Bool bSet)      { bExtendFormat = bSet;  }
+    sal_Bool        GetExtendFormat() const         { return bExtendFormat;  }
+    void        SetRangeFinder(sal_Bool bSet)       { bRangeFinder = bSet;   }
+    sal_Bool        GetRangeFinder() const          { return bRangeFinder;   }
+    void        SetExpandRefs(sal_Bool bSet)        { bExpandRefs = bSet;    }
+    sal_Bool        GetExpandRefs() const           { return bExpandRefs;    }
+    void        SetMarkHeader(sal_Bool bSet)        { bMarkHeader = bSet;    }
+    sal_Bool        GetMarkHeader() const           { return bMarkHeader;    }
+    void        SetUseTabCol(sal_Bool bSet)         { bUseTabCol = bSet;     }
+    sal_Bool        GetUseTabCol() const            { return bUseTabCol;     }
+    void        SetTextWysiwyg(sal_Bool bSet)       { bTextWysiwyg = bSet;   }
+    sal_Bool        GetTextWysiwyg() const          { return bTextWysiwyg;   }
+    void        SetReplaceCellsWarn(sal_Bool bSet)  { bReplCellsWarn = bSet; }
+    sal_Bool        GetReplaceCellsWarn() const     { return bReplCellsWarn; }
 
     const ScInputOptions&	operator=	( const ScInputOptions& rOpt );
 };
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index e329c3788..66ba4b695 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -173,7 +173,7 @@ class ScSheetLinksObj : public cppu::WeakImplHelper4<
 private:
     ScDocShell*				pDocShell;
 
-    ScSheetLinkObj*			GetObjectByIndex_Impl(INT32 nIndex);
+    ScSheetLinkObj*			GetObjectByIndex_Impl(sal_Int32 nIndex);
     ScSheetLinkObj*			GetObjectByName_Impl(const ::rtl::OUString& aName);
 
 public:
@@ -228,7 +228,7 @@ class ScAreaLinkObj : public cppu::WeakImplHelper4<
 private:
     SfxItemPropertySet		aPropSet;
     ScDocShell*				pDocShell;
-    USHORT					nPos;
+    sal_uInt16					nPos;
     XRefreshListenerArr_Impl aRefreshListeners;
 
     void	Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::OUString* pNewFilter,
@@ -238,7 +238,7 @@ private:
     void	Refreshed_Impl();
 
 public:
-                            ScAreaLinkObj(ScDocShell* pDocSh, USHORT nP);
+                            ScAreaLinkObj(ScDocShell* pDocSh, sal_uInt16 nP);
     virtual					~ScAreaLinkObj();
 
     virtual void			Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -331,7 +331,7 @@ class ScAreaLinksObj : public cppu::WeakImplHelper3<
 private:
     ScDocShell*				pDocShell;
 
-    ScAreaLinkObj*			GetObjectByIndex_Impl(INT32 nIndex);
+    ScAreaLinkObj*			GetObjectByIndex_Impl(sal_Int32 nIndex);
 
 public:
                             ScAreaLinksObj(ScDocShell* pDocSh);
@@ -448,7 +448,7 @@ class ScDDELinksObj : public cppu::WeakImplHelper4<
 private:
     ScDocShell*				pDocShell;
 
-    ScDDELinkObj*			GetObjectByIndex_Impl(INT32 nIndex);
+    ScDDELinkObj*			GetObjectByIndex_Impl(sal_Int32 nIndex);
     ScDDELinkObj*			GetObjectByName_Impl(const ::rtl::OUString& aName);
 
 public:
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 7028c9f38..85bf465c3 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -174,7 +174,7 @@ public:
 
     /** Insert query and result.
         @param bAvailable
-            Pass FALSE if the search didn't deliver a result. A subsequent
+            Pass sal_False if the search didn't deliver a result. A subsequent
             lookup() then will return Result::NOT_AVAILABLE.
         @returns successful insertion.
       */
diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx
index d21d79434..f9f8bd2eb 100644
--- a/sc/inc/markarr.hxx
+++ b/sc/inc/markarr.hxx
@@ -36,7 +36,7 @@
 struct ScMarkEntry
 {
     SCROW			nRow;
-    BOOL			bMarked;
+    sal_Bool			bMarked;
 };
 
 class ScMarkArray
@@ -51,22 +51,22 @@ friend class ScDocument;				// fuer FillInfo
 public:
             ScMarkArray();
             ~ScMarkArray();
-    void	Reset( BOOL bMarked = FALSE );
-    BOOL	GetMark( SCROW nRow ) const;
-    void	SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked );
-    BOOL	IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const;
-    BOOL	HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const;
+    void	Reset( sal_Bool bMarked = sal_False );
+    sal_Bool	GetMark( SCROW nRow ) const;
+    void	SetMarkArea( SCROW nStartRow, SCROW nEndRow, sal_Bool bMarked );
+    sal_Bool	IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const;
+    sal_Bool	HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const;
 
-    BOOL	HasMarks() const    { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); }
+    sal_Bool	HasMarks() const    { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); }
 
     void	CopyMarksTo( ScMarkArray& rDestMarkArray ) const;
 
-    BOOL 	Search( SCROW nRow, SCSIZE& nIndex ) const;
+    sal_Bool 	Search( SCROW nRow, SCSIZE& nIndex ) const;
 //UNUSED2009-05 void	DeleteArea(SCROW nStartRow, SCROW nEndRow);
 
     /// Including current row, may return -1 if bUp and not found
-    SCsROW	GetNextMarked( SCsROW nRow, BOOL bUp ) const;
-    SCROW	GetMarkEnd( SCROW nRow, BOOL bUp ) const;
+    SCsROW	GetNextMarked( SCsROW nRow, sal_Bool bUp ) const;
+    SCROW	GetMarkEnd( SCROW nRow, sal_Bool bUp ) const;
 };
 
 
@@ -78,7 +78,7 @@ public:
                 ScMarkArrayIter( const ScMarkArray* pNewArray );
                 ~ScMarkArrayIter();
 
-    BOOL		Next( SCROW& rTop, SCROW& rBottom );
+    sal_Bool		Next( SCROW& rTop, SCROW& rBottom );
 };
 
 
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 984d9d527..c40d3ad04 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -46,12 +46,12 @@ private:
     ScRange			aMarkRange;				// Bereich
     ScRange			aMultiRange;			// maximaler Bereich insgesamt
     ScMarkArray*	pMultiSel;				// Mehrfachselektion
-    BOOL			bTabMarked[MAXTABCOUNT];// Tabelle selektiert
-    BOOL			bMarked;				// Rechteck markiert
-    BOOL			bMultiMarked;			// mehrfach markiert
+    sal_Bool			bTabMarked[MAXTABCOUNT];// Tabelle selektiert
+    sal_Bool			bMarked;				// Rechteck markiert
+    sal_Bool			bMultiMarked;			// mehrfach markiert
 
-    BOOL			bMarking;				// Bereich wird aufgezogen -> kein MarkToMulti
-    BOOL			bMarkIsNeg;				// Aufheben bei Mehrfachselektion
+    sal_Bool			bMarking;				// Bereich wird aufgezogen -> kein MarkToMulti
+    sal_Bool			bMarkIsNeg;				// Aufheben bei Mehrfachselektion
 
 public:
                 ScMarkData();
@@ -63,51 +63,51 @@ public:
     void		ResetMark();
     void		SetMarkArea( const ScRange& rRange );
 
-    void		SetMultiMarkArea( const ScRange& rRange, BOOL bMark = TRUE );
+    void		SetMultiMarkArea( const ScRange& rRange, sal_Bool bMark = sal_True );
 
     void		MarkToMulti();
     void		MarkToSimple();
 
-    BOOL		IsMarked() const				{ return bMarked; }
-    BOOL		IsMultiMarked() const			{ return bMultiMarked; }
+    sal_Bool		IsMarked() const				{ return bMarked; }
+    sal_Bool		IsMultiMarked() const			{ return bMultiMarked; }
 
     void		GetMarkArea( ScRange& rRange ) const;
     void		GetMultiMarkArea( ScRange& rRange ) const;
 
     void		SetAreaTab( SCTAB nTab );
 
-    void		SelectTable( SCTAB nTab, BOOL bNew )		{ bTabMarked[nTab] = bNew; }
-    BOOL		GetTableSelect( SCTAB nTab ) const			{ return bTabMarked[nTab]; }
+    void		SelectTable( SCTAB nTab, sal_Bool bNew )		{ bTabMarked[nTab] = bNew; }
+    sal_Bool		GetTableSelect( SCTAB nTab ) const			{ return bTabMarked[nTab]; }
 
     void		SelectOneTable( SCTAB nTab );
     SCTAB		GetSelectCount() const;
     SCTAB		GetFirstSelected() const;
 
-    void		SetMarkNegative( BOOL bFlag )	{ bMarkIsNeg = bFlag; }
-    BOOL		IsMarkNegative() const			{ return bMarkIsNeg;  }
-    void		SetMarking( BOOL bFlag )		{ bMarking = bFlag;   }
-    BOOL		GetMarkingFlag() const			{ return bMarking;	  }
+    void		SetMarkNegative( sal_Bool bFlag )	{ bMarkIsNeg = bFlag; }
+    sal_Bool		IsMarkNegative() const			{ return bMarkIsNeg;  }
+    void		SetMarking( sal_Bool bFlag )		{ bMarking = bFlag;   }
+    sal_Bool		GetMarkingFlag() const			{ return bMarking;	  }
 
     //	fuer FillInfo / Document etc.
     const ScMarkArray* GetArray() const			{ return pMultiSel; }
 
-    BOOL		IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple = FALSE ) const;
-    void		FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const;
+    sal_Bool		IsCellMarked( SCCOL nCol, SCROW nRow, sal_Bool bNoSimple = sal_False ) const;
+    void		FillRangeListWithMarks( ScRangeList* pList, sal_Bool bClear ) const;
     void		ExtendRangeListTables( ScRangeList* pList ) const;
 
-    void		MarkFromRangeList( const ScRangeList& rList, BOOL bReset );
+    void		MarkFromRangeList( const ScRangeList& rList, sal_Bool bReset );
 
     SCCOLROW	GetMarkColumnRanges( SCCOLROW* pRanges );
     SCCOLROW	GetMarkRowRanges( SCCOLROW* pRanges );
 
-    BOOL		IsColumnMarked( SCCOL nCol ) const;
-    BOOL		IsRowMarked( SCROW nRow ) const;
-    BOOL		IsAllMarked( const ScRange& rRange ) const;		// Multi
+    sal_Bool		IsColumnMarked( SCCOL nCol ) const;
+    sal_Bool		IsRowMarked( SCROW nRow ) const;
+    sal_Bool		IsAllMarked( const ScRange& rRange ) const;		// Multi
 
                 /// May return -1
-    SCsROW		GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const;
-    BOOL		HasMultiMarks( SCCOL nCol ) const;
-    BOOL		HasAnyMultiMarks() const;
+    SCsROW		GetNextMarked( SCCOL nCol, SCsROW nRow, sal_Bool bUp ) const;
+    sal_Bool		HasMultiMarks( SCCOL nCol ) const;
+    sal_Bool		HasAnyMultiMarks() const;
 
     //	Tabellen-Markierungen anpassen:
     void		InsertTab( SCTAB nTab );
diff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxx
index 78a0f3d68..94442ddce 100644
--- a/sc/inc/navicfg.hxx
+++ b/sc/inc/navicfg.hxx
@@ -38,19 +38,19 @@
 class ScNavipiCfg
 {
 private:
-    USHORT 	nListMode;
-    USHORT	nDragMode;
-    USHORT	nRootType;
+    sal_uInt16 	nListMode;
+    sal_uInt16	nDragMode;
+    sal_uInt16	nRootType;
 
 public:
             ScNavipiCfg();
 
-    void	SetListMode(USHORT nNew);
-    USHORT	GetListMode() const			{ return nListMode; }
-    void	SetDragMode(USHORT nNew);
-    USHORT	GetDragMode() const			{ return nDragMode; }
-    void	SetRootType(USHORT nNew);
-    USHORT	GetRootType() const			{ return nRootType; }
+    void	SetListMode(sal_uInt16 nNew);
+    sal_uInt16	GetListMode() const			{ return nListMode; }
+    void	SetDragMode(sal_uInt16 nNew);
+    sal_uInt16	GetDragMode() const			{ return nDragMode; }
+    void	SetRootType(sal_uInt16 nNew);
+    sal_uInt16	GetRootType() const			{ return nRootType; }
 };
 
 
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index bf21b739f..1c4d5951c 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -47,7 +47,7 @@ class ScOutlineEntry : public ScDataObject
 
 public:
                             ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize,
-                                                bool bNewHidden = FALSE );
+                                                bool bNewHidden = sal_False );
                             ScOutlineEntry( const ScOutlineEntry& rEntry );
 
     virtual ScDataObject*       Clone() const;
@@ -73,7 +73,7 @@ public:
 
     virtual short           Compare(ScDataObject* pKey1, ScDataObject* pKey2) const;
 
-    USHORT                  FindStart( SCCOLROW nMinStart );
+    sal_uInt16                  FindStart( SCCOLROW nMinStart );
 };
 
 
@@ -82,46 +82,46 @@ class SC_DLLPUBLIC ScOutlineArray
 friend class ScSubOutlineIterator;
 
 private:
-    USHORT                  nDepth;
+    sal_uInt16                  nDepth;
     ScOutlineCollection     aCollections[SC_OL_MAXDEPTH];
 
-    BOOL                    DecDepth();
-    void                    FindEntry( SCCOLROW nSearchPos, USHORT& rFindLevel, USHORT& rFindIndex,
-                                        USHORT nMaxLevel = SC_OL_MAXDEPTH );
-    void                    RemoveSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nLevel );
-    void                    PromoteSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nStartLevel );
+    sal_Bool                    DecDepth();
+    void                    FindEntry( SCCOLROW nSearchPos, sal_uInt16& rFindLevel, sal_uInt16& rFindIndex,
+                                        sal_uInt16 nMaxLevel = SC_OL_MAXDEPTH );
+    void                    RemoveSub( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_uInt16 nLevel );
+    void                    PromoteSub( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_uInt16 nStartLevel );
 
 public:
                             ScOutlineArray();
                             ScOutlineArray( const ScOutlineArray& rArray );
 
-    USHORT                  GetDepth() const         { return nDepth; }
+    sal_uInt16                  GetDepth() const         { return nDepth; }
 
-    BOOL                    FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd,
-                                                USHORT& rFindLevel ) const;
+    sal_Bool                    FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd,
+                                                sal_uInt16& rFindLevel ) const;
 
-    BOOL                    Insert( SCCOLROW nStartPos, SCCOLROW nEndPos, BOOL& rSizeChanged,
-                                    BOOL bHidden = FALSE, BOOL bVisible = TRUE );
-    BOOL                    Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, BOOL& rSizeChanged );
+    sal_Bool                    Insert( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_Bool& rSizeChanged,
+                                    sal_Bool bHidden = sal_False, sal_Bool bVisible = sal_True );
+    sal_Bool                    Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, sal_Bool& rSizeChanged );
 
-    ScOutlineEntry*         GetEntry( USHORT nLevel, USHORT nIndex ) const;
-    USHORT                  GetCount( USHORT nLevel ) const;
-    ScOutlineEntry*         GetEntryByPos( USHORT nLevel, SCCOLROW nPos ) const;
+    ScOutlineEntry*         GetEntry( sal_uInt16 nLevel, sal_uInt16 nIndex ) const;
+    sal_uInt16                  GetCount( sal_uInt16 nLevel ) const;
+    ScOutlineEntry*         GetEntryByPos( sal_uInt16 nLevel, SCCOLROW nPos ) const;
 
-    BOOL                    GetEntryIndex( USHORT nLevel, SCCOLROW nPos, USHORT& rnIndex ) const;
-    BOOL                    GetEntryIndexInRange(
-                                USHORT nLevel, SCCOLROW nBlockStart, SCCOLROW nBlockEnd,
-                                USHORT& rnIndex ) const;
+    sal_Bool                    GetEntryIndex( sal_uInt16 nLevel, SCCOLROW nPos, sal_uInt16& rnIndex ) const;
+    sal_Bool                    GetEntryIndexInRange(
+                                sal_uInt16 nLevel, SCCOLROW nBlockStart, SCCOLROW nBlockEnd,
+                                sal_uInt16& rnIndex ) const;
 
-    void                    SetVisibleBelow( USHORT nLevel, USHORT nEntry, BOOL bValue,
-                                                BOOL bSkipHidden = FALSE );
+    void                    SetVisibleBelow( sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bValue,
+                                                sal_Bool bSkipHidden = sal_False );
 
     void                    GetRange( SCCOLROW& rStart, SCCOLROW& rEnd ) const;
-    void                    ExtendBlock( USHORT nLevel, SCCOLROW& rBlkStart, SCCOLROW& rBlkEnd );
+    void                    ExtendBlock( sal_uInt16 nLevel, SCCOLROW& rBlkStart, SCCOLROW& rBlkEnd );
 
-    BOOL                    TestInsertSpace( SCSIZE nSize, SCCOLROW nMaxVal ) const;
+    sal_Bool                    TestInsertSpace( SCSIZE nSize, SCCOLROW nMaxVal ) const;
     void                    InsertSpace( SCCOLROW nStartPos, SCSIZE nSize );
-    BOOL                    DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize );
+    sal_Bool                    DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize );
 
     bool                    ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos, bool bShow, ScTable& rTable, bool bCol );
 
@@ -144,12 +144,12 @@ public:
     const ScOutlineArray*   GetRowArray() const     { return &aRowOutline; }
     ScOutlineArray*         GetRowArray()           { return &aRowOutline; }
 
-    BOOL                    TestInsertCol( SCSIZE nSize );
+    sal_Bool                    TestInsertCol( SCSIZE nSize );
     void                    InsertCol( SCCOL nStartCol, SCSIZE nSize );
-    BOOL                    DeleteCol( SCCOL nStartCol, SCSIZE nSize ); // TRUE: Undo nur ueber Original
-    BOOL                    TestInsertRow( SCSIZE nSize );
+    sal_Bool                    DeleteCol( SCCOL nStartCol, SCSIZE nSize ); // TRUE: Undo nur ueber Original
+    sal_Bool                    TestInsertRow( SCSIZE nSize );
     void                    InsertRow( SCROW nStartRow, SCSIZE nSize );
-    BOOL                    DeleteRow( SCROW nStartRow, SCSIZE nSize );
+    sal_Bool                    DeleteRow( SCROW nStartRow, SCSIZE nSize );
 };
 
 
@@ -159,18 +159,18 @@ private:
     ScOutlineArray*         pArray;
     SCCOLROW                nStart;
     SCCOLROW                nEnd;
-    USHORT                  nSubLevel;
-    USHORT                  nSubEntry;
-    USHORT                  nCount;
-    USHORT                  nDepth;
+    sal_uInt16                  nSubLevel;
+    sal_uInt16                  nSubEntry;
+    sal_uInt16                  nCount;
+    sal_uInt16                  nDepth;
 
 public:
                             ScSubOutlineIterator( ScOutlineArray* pOutlineArray );
                             ScSubOutlineIterator( ScOutlineArray* pOutlineArray,
-                                                    USHORT nLevel, USHORT nEntry );
+                                                    sal_uInt16 nLevel, sal_uInt16 nEntry );
     ScOutlineEntry*         GetNext();
-    USHORT                  LastLevel() const;
-    USHORT                  LastEntry() const;
+    sal_uInt16                  LastLevel() const;
+    sal_uInt16                  LastEntry() const;
     void                    DeleteLast();
 };
 
diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx
index 708db82ba..f1f96d622 100644
--- a/sc/inc/optutil.hxx
+++ b/sc/inc/optutil.hxx
@@ -36,7 +36,7 @@
 class ScOptionsUtil
 {
 public:
-    static BOOL		IsMetricSystem();
+    static sal_Bool		IsMetricSystem();
 };
 
 
diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx
index 1b094cdc0..6e12b53ea 100644
--- a/sc/inc/pagepar.hxx
+++ b/sc/inc/pagepar.hxx
@@ -35,40 +35,40 @@
 
 struct ScPageTableParam
 {
-    BOOL	bCellContent;
-    BOOL	bNotes;
-    BOOL	bGrid;
-    BOOL	bHeaders;
-    BOOL	bCharts;
-    BOOL	bObjects;
-    BOOL	bDrawings;
-    BOOL	bFormulas;
-    BOOL	bNullVals;
-    BOOL	bTopDown;
-    BOOL	bLeftRight;
-    BOOL	bSkipEmpty;
-    BOOL	bScaleNone;
-    BOOL	bScaleAll;
-    BOOL    bScaleTo;
-    BOOL	bScalePageNum;
-    USHORT	nScaleAll;
-    USHORT  nScaleWidth;
-    USHORT  nScaleHeight;
-    USHORT	nScalePageNum;
-    USHORT	nFirstPageNo;
+    sal_Bool	bCellContent;
+    sal_Bool	bNotes;
+    sal_Bool	bGrid;
+    sal_Bool	bHeaders;
+    sal_Bool	bCharts;
+    sal_Bool	bObjects;
+    sal_Bool	bDrawings;
+    sal_Bool	bFormulas;
+    sal_Bool	bNullVals;
+    sal_Bool	bTopDown;
+    sal_Bool	bLeftRight;
+    sal_Bool	bSkipEmpty;
+    sal_Bool	bScaleNone;
+    sal_Bool	bScaleAll;
+    sal_Bool    bScaleTo;
+    sal_Bool	bScalePageNum;
+    sal_uInt16	nScaleAll;
+    sal_uInt16  nScaleWidth;
+    sal_uInt16  nScaleHeight;
+    sal_uInt16	nScalePageNum;
+    sal_uInt16	nFirstPageNo;
 
     ScPageTableParam();
     ~ScPageTableParam();
 
-    BOOL				operator==	( const ScPageTableParam& r ) const;
+    sal_Bool				operator==	( const ScPageTableParam& r ) const;
     void				Reset		();
 };
 
 struct ScPageAreaParam
 {
-    BOOL	bPrintArea;
-    BOOL	bRepeatRow;
-    BOOL	bRepeatCol;
+    sal_Bool	bPrintArea;
+    sal_Bool	bRepeatRow;
+    sal_Bool	bRepeatCol;
     ScRange	aPrintArea;
     ScRange	aRepeatRow;
     ScRange	aRepeatCol;
@@ -76,7 +76,7 @@ struct ScPageAreaParam
     ScPageAreaParam();
     ~ScPageAreaParam();
 
-    BOOL				operator==	( const ScPageAreaParam& r ) const;
+    sal_Bool				operator==	( const ScPageAreaParam& r ) const;
     void				Reset		();
 };
 
diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx
index a2340087c..fef2ec392 100644
--- a/sc/inc/paramisc.hxx
+++ b/sc/inc/paramisc.hxx
@@ -47,7 +47,7 @@ struct ScSolveParam
     ~ScSolveParam();
 
     ScSolveParam&	operator=	( const ScSolveParam& r );
-    BOOL			operator==	( const ScSolveParam& r ) const;
+    sal_Bool			operator==	( const ScSolveParam& r ) const;
 };
 
 //-----------------------------------------------------------------------
@@ -58,7 +58,7 @@ struct ScTabOpParam
     ScRefAddress	aRefFormulaEnd;
     ScRefAddress	aRefRowCell;
     ScRefAddress	aRefColCell;
-    BYTE			nMode;
+    sal_uInt8			nMode;
 
     ScTabOpParam() {};
     ScTabOpParam( const ScTabOpParam& r );
@@ -66,11 +66,11 @@ struct ScTabOpParam
                   const ScRefAddress& rFormulaEnd,
                   const ScRefAddress& rRowCell,
                   const ScRefAddress& rColCell,
-                        BYTE		 nMd);
+                        sal_uInt8		 nMd);
     ~ScTabOpParam() {};
 
     ScTabOpParam&	operator=		( const ScTabOpParam& r );
-    BOOL			operator==		( const ScTabOpParam& r ) const;
+    sal_Bool			operator==		( const ScTabOpParam& r ) const;
 };
 
 #endif // SC_PARAMISC_HXX
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index 84bb51d58..512949cea 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -70,20 +70,20 @@ public:
                             ~ScPatternAttr();
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream& rStream, USHORT nVersion) const;
-    virtual SvStream&       Store(SvStream& rStream, USHORT nItemVersion) const;
+    virtual SfxPoolItem*    Create(SvStream& rStream, sal_uInt16 nVersion) const;
+    virtual SvStream&       Store(SvStream& rStream, sal_uInt16 nItemVersion) const;
 
     virtual int 			operator==(const SfxPoolItem& rCmp) const;
 
-    const SfxPoolItem&      GetItem( USHORT nWhichP ) const
+    const SfxPoolItem&      GetItem( sal_uInt16 nWhichP ) const
                                         { return GetItemSet().Get(nWhichP); }
 
-    static const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet );
-    const SfxPoolItem&		GetItem( USHORT nWhich, const SfxItemSet* pCondSet ) const;
+    static const SfxPoolItem& GetItem( sal_uInt16 nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet );
+    const SfxPoolItem&		GetItem( sal_uInt16 nWhich, const SfxItemSet* pCondSet ) const;
 
                             // pWhich sind keine Ranges, sondern einzelne IDs, 0-terminiert
-    BOOL					HasItemsSet( const USHORT* pWhich ) const;
-    void					ClearItems( const USHORT* pWhich );
+    sal_Bool					HasItemsSet( const sal_uInt16* pWhich ) const;
+    void					ClearItems( const sal_uInt16* pWhich );
 
     void                    DeleteUnchanged( const ScPatternAttr* pOldAttrs );
 
@@ -96,14 +96,14 @@ public:
                                         OutputDevice* pOutDev = NULL,
                                         const Fraction* pScale = NULL,
                                         const SfxItemSet* pCondSet = NULL,
-                                        BYTE nScript = 0, const Color* pBackConfigColor = NULL,
+                                        sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL,
                                         const Color* pTextConfigColor = NULL );
     /** Fills a font object from the own item set. */
     void                    GetFont( Font& rFont, ScAutoFontColorMode eAutoMode,
                                         OutputDevice* pOutDev = NULL,
                                         const Fraction* pScale = NULL,
                                         const SfxItemSet* pCondSet = NULL,
-                                        BYTE nScript = 0, const Color* pBackConfigColor = NULL,
+                                        sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL,
                                         const Color* pTextConfigColor = NULL ) const;
 
     /** Converts all Calc items contained in rSrcSet to edit engine items and puts them into rEditSet. */
@@ -126,12 +126,12 @@ public:
     void					UpdateStyleSheet();
     void					StyleToName();
 
-    BOOL					IsVisible() const;
-    BOOL					IsVisibleEqual( const ScPatternAttr& rOther ) const;
+    sal_Bool					IsVisible() const;
+    sal_Bool					IsVisibleEqual( const ScPatternAttr& rOther ) const;
 
                             /** If font is an old symbol font StarBats/StarMath
                                 with text encoding RTL_TEXTENC_SYMBOL */
-    BOOL					IsSymbolFont() const;
+    sal_Bool					IsSymbolFont() const;
 
 //UNUSED2008-05                          /** Create a FontToSubsFontConverter if needed for
 //UNUSED2008-05                              this pattern, else return 0.
@@ -144,14 +144,14 @@ public:
 //UNUSED2008-05                              should be accomplished using the
 //UNUSED2008-05                              ScFontToSubsFontConverter_AutoPtr
 //UNUSED2008-05                           */
-//UNUSED2008-05  FontToSubsFontConverter GetSubsFontConverter( ULONG nFlags ) const;
+//UNUSED2008-05  FontToSubsFontConverter GetSubsFontConverter( sal_uLong nFlags ) const;
 
-    ULONG					GetNumberFormat( SvNumberFormatter* ) const;
-    ULONG					GetNumberFormat( SvNumberFormatter* pFormatter,
+    sal_uLong					GetNumberFormat( SvNumberFormatter* ) const;
+    sal_uLong					GetNumberFormat( SvNumberFormatter* pFormatter,
                                                 const SfxItemSet* pCondSet ) const;
 
     long					GetRotateVal( const SfxItemSet* pCondSet ) const;
-    BYTE					GetRotateDir( const SfxItemSet* pCondSet ) const;
+    sal_uInt8					GetRotateDir( const SfxItemSet* pCondSet ) const;
 };
 
 
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index f2271e1aa..80c189f37 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -77,11 +77,11 @@ typedef ::boost::shared_ptr<ScDPLabelData> ScDPLabelDataRef;
 struct PivotField
 {
     SCsCOL               nCol;
-    USHORT              nFuncMask;
-    USHORT              nFuncCount;
+    sal_uInt16              nFuncMask;
+    sal_uInt16              nFuncCount;
     ::com::sun::star::sheet::DataPilotFieldReference maFieldRef;
 
-    explicit            PivotField( SCsCOL nNewCol = 0, USHORT nNewFuncMask = PIVOT_FUNC_NONE );
+    explicit            PivotField( SCsCOL nNewCol = 0, sal_uInt16 nNewFuncMask = PIVOT_FUNC_NONE );
 
     bool                operator==( const PivotField& r ) const;
 };
@@ -103,17 +103,17 @@ struct ScPivotParam
     SCSIZE          nColCount;
     SCSIZE          nRowCount;
     SCSIZE          nDataCount;
-    BOOL            bIgnoreEmptyRows;
-    BOOL            bDetectCategories;
-    BOOL            bMakeTotalCol;
-    BOOL            bMakeTotalRow;
+    sal_Bool            bIgnoreEmptyRows;
+    sal_Bool            bDetectCategories;
+    sal_Bool            bMakeTotalCol;
+    sal_Bool            bMakeTotalRow;
 
     ScPivotParam();
     ScPivotParam( const ScPivotParam& r );
     ~ScPivotParam();
 
     ScPivotParam&   operator=       ( const ScPivotParam& r );
-    BOOL            operator==      ( const ScPivotParam& r ) const;
+    sal_Bool            operator==      ( const ScPivotParam& r ) const;
 //UNUSED2009-05 void            Clear           ();
     void            ClearPivotArrays();
     void            SetLabelData    (const ::std::vector<ScDPLabelDataRef>& r);
@@ -139,7 +139,7 @@ struct ScDPLabelData
     ::rtl::OUString     maName;         /// Original name of the dimension.
     ::rtl::OUString     maLayoutName;   /// Layout name (display name)
     SCsCOL              mnCol;
-    USHORT              mnFuncMask;     /// Page/Column/Row subtotal function.
+    sal_uInt16              mnFuncMask;     /// Page/Column/Row subtotal function.
     sal_Int32           mnUsedHier;     /// Used hierarchy.
     sal_Int32           mnFlags;        /// Flags from the DataPilotSource dimension
     bool                mbShowAll;      /// true = Show all (also empty) results.
@@ -181,11 +181,11 @@ struct ScDPLabelData
 struct ScDPFuncData
 {
     short               mnCol;
-    USHORT              mnFuncMask;
+    sal_uInt16              mnFuncMask;
     ::com::sun::star::sheet::DataPilotFieldReference maFieldRef;
 
-    explicit            ScDPFuncData( short nNewCol, USHORT nNewFuncMask );
-    explicit            ScDPFuncData( short nNewCol, USHORT nNewFuncMask,
+    explicit            ScDPFuncData( short nNewCol, sal_uInt16 nNewFuncMask );
+    explicit            ScDPFuncData( short nNewCol, sal_uInt16 nNewFuncMask,
                             const ::com::sun::star::sheet::DataPilotFieldReference& rFieldRef );
 };
 
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 158312640..504930b3f 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -79,9 +79,9 @@ public:
         @param bAlwaysCreateCaption  Instead of a pointer to an existing
             caption object, the passed note data structure may contain a
             reference to an ScCaptionInitData structure containing information
-            about how to construct a missing caption object. If TRUE is passed,
+            about how to construct a missing caption object. If sal_True is passed,
             the caption drawing object will be created immediately from that
-            data. If FALSE is passed and the note is not visible, it will
+            data. If sal_False is passed and the note is not visible, it will
             continue to cache that data until the caption object is requested.
      */
     explicit            ScPostIt(
@@ -93,9 +93,9 @@ public:
 
     /** Clones this note and its caption object, if specified.
 
-        @param bCloneCaption  If TRUE is passed, clones the caption object and
+        @param bCloneCaption  If sal_True is passed, clones the caption object and
             inserts it into the drawing layer of the destination document. If
-            FALSE is passed, the cloned note will refer to the old caption
+            sal_False is passed, the cloned note will refer to the old caption
             object (used e.g. in Undo documents to restore the pointer to the
             existing caption object).
      */
@@ -220,11 +220,11 @@ public:
             object. The rectangle may be empty, in this case the default
             position and size is used.
 
-        @param bAlwaysCreateCaption  If TRUE is passed, the caption drawing
-            object will be created immediately. If FALSE is passed, the caption
+        @param bAlwaysCreateCaption  If sal_True is passed, the caption drawing
+            object will be created immediately. If sal_False is passed, the caption
             drawing object will not be created if the note is not visible
-            (bShown = FALSE), but the cell note will cache the passed data.
-            MUST be set to FALSE outside of import filter implementations!
+            (bShown = sal_False), but the cell note will cache the passed data.
+            MUST be set to sal_False outside of import filter implementations!
 
         @return  Pointer to the new cell note object if insertion was
             successful (i.e. the passed cell position was valid), null
@@ -242,11 +242,11 @@ public:
         @param rNoteText  The text used to create the note caption object. Must
             not be empty.
 
-        @param bAlwaysCreateCaption  If TRUE is passed, the caption drawing
-            object will be created immediately. If FALSE is passed, the caption
+        @param bAlwaysCreateCaption  If sal_True is passed, the caption drawing
+            object will be created immediately. If sal_False is passed, the caption
             drawing object will not be created if the note is not visible
-            (bShown = FALSE), but the cell note will cache the passed data.
-            MUST be set to FALSE outside of import filter implementations!
+            (bShown = sal_False), but the cell note will cache the passed data.
+            MUST be set to sal_False outside of import filter implementations!
 
         @return  Pointer to the new cell note object if insertion was
             successful (i.e. the passed cell position was valid), null
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index d7358f8c3..ee20f4705 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -35,18 +35,18 @@
 class SC_DLLPUBLIC ScPrintOptions
 {
 private:
-    BOOL	bSkipEmpty;
-    BOOL	bAllSheets;
+    sal_Bool	bSkipEmpty;
+    sal_Bool	bAllSheets;
 
 public:
                 ScPrintOptions();
                 ScPrintOptions( const ScPrintOptions& rCpy );
                 ~ScPrintOptions();
 
-    BOOL	GetSkipEmpty() const			{ return bSkipEmpty; }
-    void	SetSkipEmpty( BOOL bVal )		{ bSkipEmpty = bVal; }
-    BOOL	GetAllSheets() const			{ return bAllSheets; }
-    void	SetAllSheets( BOOL bVal )		{ bAllSheets = bVal; }
+    sal_Bool	GetSkipEmpty() const			{ return bSkipEmpty; }
+    void	SetSkipEmpty( sal_Bool bVal )		{ bSkipEmpty = bVal; }
+    sal_Bool	GetAllSheets() const			{ return bAllSheets; }
+    void	SetAllSheets( sal_Bool bVal )		{ bAllSheets = bVal; }
 
     void	SetDefaults();
 
@@ -63,8 +63,8 @@ class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-//UNUSED2008-05  ScTpPrintItem( USHORT nWhich );
-                ScTpPrintItem( USHORT nWhich,
+//UNUSED2008-05  ScTpPrintItem( sal_uInt16 nWhich );
+                ScTpPrintItem( sal_uInt16 nWhich,
                                const ScPrintOptions& rOpt );
                 ScTpPrintItem( const ScTpPrintItem& rItem );
                 ~ScTpPrintItem();
diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx
index 9640b4261..bb645d6cc 100644
--- a/sc/inc/prnsave.hxx
+++ b/sc/inc/prnsave.hxx
@@ -42,21 +42,21 @@ class ScPrintSaverTab
     ScRangeVec  maPrintRanges;      // Array
     ScRange*    mpRepeatCol;        // einzeln
     ScRange*    mpRepeatRow;        // einzeln
-    BOOL        mbEntireSheet;
+    sal_Bool        mbEntireSheet;
 
 public:
             ScPrintSaverTab();
             ~ScPrintSaverTab();
 
-    void            SetAreas( const ScRangeVec& rRanges, BOOL bEntireSheet );
+    void            SetAreas( const ScRangeVec& rRanges, sal_Bool bEntireSheet );
     void            SetRepeat( const ScRange* pCol, const ScRange* pRow );
 
     const ScRangeVec&   GetPrintRanges() const  { return maPrintRanges; }
-    BOOL                IsEntireSheet() const   { return mbEntireSheet; }
+    sal_Bool                IsEntireSheet() const   { return mbEntireSheet; }
     const ScRange*      GetRepeatCol() const    { return mpRepeatCol; }
     const ScRange*      GetRepeatRow() const    { return mpRepeatRow; }
 
-    BOOL	operator==( const ScPrintSaverTab& rCmp ) const;
+    sal_Bool	operator==( const ScPrintSaverTab& rCmp ) const;
 };
 
 class ScPrintRangeSaver
@@ -72,7 +72,7 @@ public:
     ScPrintSaverTab&		GetTabData(SCTAB nTab);
     const ScPrintSaverTab&	GetTabData(SCTAB nTab) const;
 
-    BOOL	operator==( const ScPrintRangeSaver& rCmp ) const;
+    sal_Bool	operator==( const ScPrintRangeSaver& rCmp ) const;
 };
 
 
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index f724583c6..43f8d035e 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -48,15 +48,15 @@ class SC_DLLPUBLIC ScProgress
 {
 private:
     static	SfxProgress*	pGlobalProgress;
-    static	ULONG			nGlobalRange;
-    static	ULONG			nGlobalPercent;
-    static	BOOL			bGlobalNoUserBreak;
+    static	sal_uLong			nGlobalRange;
+    static	sal_uLong			nGlobalPercent;
+    static	sal_Bool			bGlobalNoUserBreak;
     static	ScProgress*		pInterpretProgress;
     static	ScProgress*		pOldInterpretProgress;
-    static	ULONG			nInterpretProgress;
-    static	BOOL			bAllowInterpretProgress;
+    static	sal_uLong			nInterpretProgress;
+    static	sal_Bool			bAllowInterpretProgress;
     static	ScDocument*		pInterpretDoc;
-    static	BOOL			bIdleWasDisabled;
+    static	sal_Bool			bIdleWasDisabled;
 
             SfxProgress*	pProgress;
 
@@ -64,7 +64,7 @@ private:
                             ScProgress( const ScProgress& );
             ScProgress&		operator=( const ScProgress& );
 
-    static	void			CalcGlobalPercent( ULONG nVal )
+    static	void			CalcGlobalPercent( sal_uLong nVal )
                                 {
                                     nGlobalPercent = nGlobalRange ?
                                         nVal * 100 / nGlobalRange : 0;
@@ -72,19 +72,19 @@ private:
 
 public:
     static	SfxProgress*	GetGlobalSfxProgress() { return pGlobalProgress; }
-    static	BOOL			IsUserBreak() { return !bGlobalNoUserBreak; }
+    static	sal_Bool			IsUserBreak() { return !bGlobalNoUserBreak; }
     static	void			CreateInterpretProgress( ScDocument* pDoc,
-                                                    BOOL bWait = TRUE );
+                                                    sal_Bool bWait = sal_True );
     static	ScProgress*		GetInterpretProgress() { return pInterpretProgress; }
     static	void			DeleteInterpretProgress();
-    static	ULONG			GetInterpretCount() { return nInterpretProgress; }
-    static	ULONG			GetGlobalRange()	{ return nGlobalRange; }
-    static	ULONG			GetGlobalPercent()	{ return nGlobalPercent; }
+    static	sal_uLong			GetInterpretCount() { return nInterpretProgress; }
+    static	sal_uLong			GetGlobalRange()	{ return nGlobalRange; }
+    static	sal_uLong			GetGlobalPercent()	{ return nGlobalPercent; }
 
                             ScProgress( SfxObjectShell* pObjSh,
                                          const String& rText,
-                                         ULONG nRange, BOOL bAllDocs = FALSE,
-                                         BOOL bWait = TRUE );
+                                         sal_uLong nRange, sal_Bool bAllDocs = sal_False,
+                                         sal_Bool bWait = sal_True );
                             ~ScProgress();
 
 #ifdef SC_PROGRESS_CXX
@@ -94,7 +94,7 @@ public:
                             // kann NULL sein!
             SfxProgress*	GetSfxProgress() const { return pProgress; }
 
-            BOOL			SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 )
+            sal_Bool			SetStateText( sal_uLong nVal, const String &rVal, sal_uLong nNewRange = 0 )
                                 {
                                     if ( pProgress )
                                     {
@@ -102,12 +102,12 @@ public:
                                             nGlobalRange = nNewRange;
                                         CalcGlobalPercent( nVal );
                                         if ( !pProgress->SetStateText( nVal, rVal, nNewRange ) )
-                                            bGlobalNoUserBreak = FALSE;
+                                            bGlobalNoUserBreak = sal_False;
                                         return bGlobalNoUserBreak;
                                     }
-                                    return TRUE;
+                                    return sal_True;
                                 }
-            BOOL			SetState( ULONG nVal, ULONG nNewRange = 0 )
+            sal_Bool			SetState( sal_uLong nVal, sal_uLong nNewRange = 0 )
                                 {
                                     if ( pProgress )
                                     {
@@ -115,38 +115,38 @@ public:
                                             nGlobalRange = nNewRange;
                                         CalcGlobalPercent( nVal );
                                         if ( !pProgress->SetState( nVal, nNewRange ) )
-                                            bGlobalNoUserBreak = FALSE;
+                                            bGlobalNoUserBreak = sal_False;
                                         return bGlobalNoUserBreak;
                                     }
-                                    return TRUE;
+                                    return sal_True;
                                 }
-            BOOL			SetStateCountDown( ULONG nVal )
+            sal_Bool			SetStateCountDown( sal_uLong nVal )
                                 {
                                     if ( pProgress )
                                     {
                                         CalcGlobalPercent( nGlobalRange - nVal );
                                         if ( !pProgress->SetState( nGlobalRange - nVal ) )
-                                            bGlobalNoUserBreak = FALSE;
+                                            bGlobalNoUserBreak = sal_False;
                                         return bGlobalNoUserBreak;
                                     }
-                                    return TRUE;
+                                    return sal_True;
                                 }
-            BOOL			SetStateOnPercent( ULONG nVal )
+            sal_Bool			SetStateOnPercent( sal_uLong nVal )
                                 {	// nur wenn Prozent mehr als vorher
                                     if ( nGlobalRange && (nVal * 100 /
                                             nGlobalRange) > nGlobalPercent )
                                         return SetState( nVal );
-                                    return TRUE;
+                                    return sal_True;
                                 }
-            BOOL			SetStateCountDownOnPercent( ULONG nVal )
+            sal_Bool			SetStateCountDownOnPercent( sal_uLong nVal )
                                 {	// nur wenn Prozent mehr als vorher
                                     if ( nGlobalRange &&
                                             ((nGlobalRange - nVal) * 100 /
                                             nGlobalRange) > nGlobalPercent )
                                         return SetStateCountDown( nVal );
-                                    return TRUE;
+                                    return sal_True;
                                 }
-            ULONG			GetState()
+            sal_uLong			GetState()
                                 {
                                     if ( pProgress )
                                         return pProgress->GetState();
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index bc5023728..1cf3c51ed 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -82,7 +82,7 @@ struct ScQueryParamTable
 
 struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable
 {
-    BOOL            bDestPers;          // nicht gespeichert
+    sal_Bool            bDestPers;          // nicht gespeichert
     SCTAB           nDestTab;
     SCCOL           nDestCol;
     SCROW           nDestRow;
@@ -93,7 +93,7 @@ struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamT
     virtual ~ScQueryParam();
 
     ScQueryParam&   operator=   ( const ScQueryParam& r );
-    BOOL            operator==  ( const ScQueryParam& rOther ) const;
+    sal_Bool            operator==  ( const ScQueryParam& rOther ) const;
     void            Clear();
     void            ClearDestParams();
     void            MoveToDest();
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 7b764f39f..7f598086a 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -53,23 +53,23 @@ public:
                         ScRangePtr pR = new ScRange( rRange );
                         Insert( pR, LIST_APPEND );
                     }
-    USHORT			Parse( const String&, ScDocument* = NULL,
-                           USHORT nMask = SCA_VALID,
+    sal_uInt16			Parse( const String&, ScDocument* = NULL,
+                           sal_uInt16 nMask = SCA_VALID,
                            formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
                            sal_Unicode cDelimiter = 0 );
-    void 			Format( String&, USHORT nFlags = 0, ScDocument* = NULL,
+    void 			Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL,
                             formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
                             sal_Unicode cDelimiter = 0 ) const;
-    void			Join( const ScRange&, BOOL bIsInList = FALSE );
-    BOOL 			UpdateReference( UpdateRefMode, ScDocument*,
+    void			Join( const ScRange&, sal_Bool bIsInList = sal_False );
+    sal_Bool 			UpdateReference( UpdateRefMode, ScDocument*,
                                     const ScRange& rWhere,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
     ScRange*		Find( const ScAddress& ) const;
-    BOOL			operator==( const ScRangeList& ) const;
-    BOOL            operator!=( const ScRangeList& r ) const;
-    BOOL			Intersects( const ScRange& ) const;
-    BOOL			In( const ScRange& ) const;
-    ULONG			GetCellCount() const;
+    sal_Bool			operator==( const ScRangeList& ) const;
+    sal_Bool            operator!=( const ScRangeList& r ) const;
+    sal_Bool			Intersects( const ScRange& ) const;
+    sal_Bool			In( const ScRange& ) const;
+    sal_uLong			GetCellCount() const;
 };
 SV_DECL_IMPL_REF( ScRangeList );
 
@@ -90,15 +90,15 @@ public:
                         ScRangePair* pR = new ScRangePair( rRangePair );
                         Insert( pR, LIST_APPEND );
                     }
-    void			Join( const ScRangePair&, BOOL bIsInList = FALSE );
-    BOOL 			UpdateReference( UpdateRefMode, ScDocument*,
+    void			Join( const ScRangePair&, sal_Bool bIsInList = sal_False );
+    sal_Bool 			UpdateReference( UpdateRefMode, ScDocument*,
                                     const ScRange& rWhere,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
     void            DeleteOnTab( SCTAB nTab );
     ScRangePair*	Find( const ScAddress& ) const;
     ScRangePair*	Find( const ScRange& ) const;
-    ScRangePair**	CreateNameSortedArray( ULONG& nCount, ScDocument* ) const;
-    BOOL			operator==( const ScRangePairList& ) const;
+    ScRangePair**	CreateNameSortedArray( sal_uLong& nCount, ScDocument* ) const;
+    sal_Bool			operator==( const ScRangePairList& ) const;
 };
 SV_DECL_IMPL_REF( ScRangePairList );
 
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 7f3e1232d..57c421e7f 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -47,7 +47,7 @@ namespace rtl {
 
 //------------------------------------------------------------------------
 
-typedef USHORT RangeType;
+typedef sal_uInt16 RangeType;
 
 #define RT_NAME				((RangeType)0x0000)
 #define RT_DATABASE			((RangeType)0x0001)
@@ -74,8 +74,8 @@ private:
     ScAddress   	aPos;
     RangeType		eType;
     ScDocument* 	pDoc;
-    USHORT			nIndex;
-    BOOL			bModified;			// wird bei UpdateReference gesetzt/geloescht
+    sal_uInt16			nIndex;
+    sal_Bool			bModified;			// wird bei UpdateReference gesetzt/geloescht
 
     // max row and column to use for wrapping of references.  If -1 use the 
     // application's default.
@@ -83,7 +83,7 @@ private:
     SCCOL           mnMaxCol;
 
     friend class ScRangeName;
-    ScRangeData( USHORT nIndex );
+    ScRangeData( sal_uInt16 nIndex );
 public:
     typedef ::std::map<sal_uInt16, sal_uInt16> IndexMap;
 
@@ -109,45 +109,45 @@ public:
 
     virtual	ScDataObject* Clone() const;
 
-    BOOL			operator== (const ScRangeData& rData) const;
+    sal_Bool			operator== (const ScRangeData& rData) const;
 
     void			GetName( String& rName ) const	{ rName = aName; }
     const String&	GetName( void ) const			{ return aName; }
     const String&   GetUpperName( void ) const      { return aUpperName; }
     ScAddress 		GetPos() const					{ return aPos; }
     // Der Index muss eindeutig sein. Ist er 0, wird ein neuer Index vergeben
-    void            SetIndex( USHORT nInd )         { nIndex = nInd; }
-    USHORT    GetIndex() const                { return nIndex; }
+    void            SetIndex( sal_uInt16 nInd )         { nIndex = nInd; }
+    sal_uInt16    GetIndex() const                { return nIndex; }
     ScTokenArray*	GetCode()						{ return pCode; }
-    USHORT			GetErrCode();
-    BOOL			HasReferences() const;
+    sal_uInt16			GetErrCode();
+    sal_Bool			HasReferences() const;
     void			SetDocument( ScDocument* pDocument){ pDoc = pDocument; }
     ScDocument*		GetDocument() const				{ return pDoc; }
     void			SetType( RangeType nType )		{ eType = nType; }
     void			AddType( RangeType nType )		{ eType = eType|nType; }
     RangeType		GetType() const					{ return eType; }
-    BOOL			HasType( RangeType nType ) const;
+    sal_Bool			HasType( RangeType nType ) const;
     SC_DLLPUBLIC void 			GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
     void 			UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&,
                                     const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT );
     void 			UpdateReference( UpdateRefMode eUpdateRefMode,
                              const ScRange& r,
                              SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
-    BOOL			IsModified() const				{ return bModified; }
+    sal_Bool			IsModified() const				{ return bModified; }
 
     SC_DLLPUBLIC void			GuessPosition();
 
     void			UpdateTranspose( const ScRange& rSource, const ScAddress& rDest );
     void			UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY );
 
-    SC_DLLPUBLIC BOOL			IsReference( ScRange& rRef ) const;
-    BOOL			IsReference( ScRange& rRef, const ScAddress& rPos ) const;
-    BOOL			IsValidReference( ScRange& rRef ) const;
+    SC_DLLPUBLIC sal_Bool			IsReference( ScRange& rRef ) const;
+    sal_Bool			IsReference( ScRange& rRef, const ScAddress& rPos ) const;
+    sal_Bool			IsValidReference( ScRange& rRef ) const;
 
-//UNUSED2009-05 BOOL			IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const;
-    BOOL			IsRangeAtBlock( const ScRange& ) const;
+//UNUSED2009-05 sal_Bool			IsRangeAtCursor( const ScAddress&, sal_Bool bStartOnly ) const;
+    sal_Bool			IsRangeAtBlock( const ScRange& ) const;
 
-    void 			UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable);
+    void 			UpdateTabRef(SCTAB nOldTable, sal_uInt16 nFlag, SCTAB nNewTable);
     void			TransferTabRef( SCTAB nOldTab, SCTAB nNewTab );
 
     void			ValidateTabRefs();
@@ -155,7 +155,7 @@ public:
     void            ReplaceRangeNamesInUse( const IndexMap& rMap );
 
     static void		MakeValidName( String& rName );
-    SC_DLLPUBLIC static BOOL		IsNameValid( const String& rName, ScDocument* pDoc );
+    SC_DLLPUBLIC static sal_Bool		IsNameValid( const String& rName, ScDocument* pDoc );
 
     SC_DLLPUBLIC void SetMaxRow(SCROW nRow);
     SCROW GetMaxRow() const;
@@ -163,7 +163,7 @@ public:
     SCCOL GetMaxCol() const;
 };
 
-inline BOOL ScRangeData::HasType( RangeType nType ) const
+inline sal_Bool ScRangeData::HasType( RangeType nType ) const
 {
     return ( ( eType & nType ) == nType );
 }
@@ -181,12 +181,12 @@ class ScRangeName : public ScSortedCollection
 {
 private:
     ScDocument* pDoc;
-    USHORT nSharedMaxIndex;
+    sal_uInt16 nSharedMaxIndex;
 
     using ScSortedCollection::Clone;    // calcwarnings: shouldn't be used
 
 public:
-    ScRangeName(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE,
+    ScRangeName(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False,
                 ScDocument* pDocument = NULL) :
         ScSortedCollection	( nLim, nDel, bDup ),
         pDoc				( pDocument ),
@@ -196,28 +196,28 @@ public:
 
     virtual	ScDataObject*     Clone(ScDocument* pDocP) const
                              { return new ScRangeName(*this, pDocP); }
-    ScRangeData*			operator[]( const USHORT nIndex) const
+    ScRangeData*			operator[]( const sal_uInt16 nIndex) const
                              { return (ScRangeData*)At(nIndex); }
     virtual	short			Compare(ScDataObject* pKey1, ScDataObject* pKey2) const;
-    virtual	BOOL			IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
+    virtual	sal_Bool			IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
 
-//UNUSED2009-05 ScRangeData*			GetRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const;
+//UNUSED2009-05 ScRangeData*			GetRangeAtCursor( const ScAddress&, sal_Bool bStartOnly ) const;
     SC_DLLPUBLIC ScRangeData*			GetRangeAtBlock( const ScRange& ) const;
 
-    SC_DLLPUBLIC BOOL					SearchName( const String& rName, USHORT& rPos ) const;
+    SC_DLLPUBLIC sal_Bool					SearchName( const String& rName, sal_uInt16& rPos ) const;
                             // SearchNameUpper must be called with an upper-case search string
-    BOOL					SearchNameUpper( const String& rUpperName, USHORT& rPos ) const;
+    sal_Bool					SearchNameUpper( const String& rUpperName, sal_uInt16& rPos ) const;
     void					UpdateReference(UpdateRefMode eUpdateRefMode,
                                 const ScRange& rRange,
                                 SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
-    void 					UpdateTabRef(SCTAB nTable, USHORT nFlag, SCTAB nNewTable = 0);
+    void 					UpdateTabRef(SCTAB nTable, sal_uInt16 nFlag, SCTAB nNewTable = 0);
     void					UpdateTranspose( const ScRange& rSource, const ScAddress& rDest );
     void					UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY );
-    virtual	BOOL			Insert(ScDataObject* pScDataObject);
-    SC_DLLPUBLIC ScRangeData* 			FindIndex(USHORT nIndex);
-    USHORT 					GetSharedMaxIndex()				{ return nSharedMaxIndex; }
-    void 					SetSharedMaxIndex(USHORT nInd)	{ nSharedMaxIndex = nInd; }
-    USHORT 					GetEntryIndex();
+    virtual	sal_Bool			Insert(ScDataObject* pScDataObject);
+    SC_DLLPUBLIC ScRangeData* 			FindIndex(sal_uInt16 nIndex);
+    sal_uInt16 					GetSharedMaxIndex()				{ return nSharedMaxIndex; }
+    void 					SetSharedMaxIndex(sal_uInt16 nInd)	{ nSharedMaxIndex = nInd; }
+    sal_uInt16 					GetEntryIndex();
 };
 
 #endif
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index e0b22aeb5..9dcad7b5c 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -39,21 +39,21 @@ class ScRange;
 class ScRangeToSequence
 {
 public:
-    static BOOL	FillLongArray( com::sun::star::uno::Any& rAny,
+    static sal_Bool	FillLongArray( com::sun::star::uno::Any& rAny,
                                 ScDocument* pDoc, const ScRange& rRange );
-    static BOOL	FillLongArray( com::sun::star::uno::Any& rAny,
+    static sal_Bool	FillLongArray( com::sun::star::uno::Any& rAny,
                                 const ScMatrix* pMatrix );
-    static BOOL	FillDoubleArray( com::sun::star::uno::Any& rAny,
+    static sal_Bool	FillDoubleArray( com::sun::star::uno::Any& rAny,
                                 ScDocument* pDoc, const ScRange& rRange );
-    static BOOL	FillDoubleArray( com::sun::star::uno::Any& rAny,
+    static sal_Bool	FillDoubleArray( com::sun::star::uno::Any& rAny,
                                 const ScMatrix* pMatrix );
-    static BOOL	FillStringArray( com::sun::star::uno::Any& rAny,
+    static sal_Bool	FillStringArray( com::sun::star::uno::Any& rAny,
                                 ScDocument* pDoc, const ScRange& rRange );
-    static BOOL	FillStringArray( com::sun::star::uno::Any& rAny,
+    static sal_Bool	FillStringArray( com::sun::star::uno::Any& rAny,
                                 const ScMatrix* pMatrix, SvNumberFormatter* pFormatter );
-    static BOOL	FillMixedArray( com::sun::star::uno::Any& rAny,
+    static sal_Bool	FillMixedArray( com::sun::star::uno::Any& rAny,
                                 ScDocument* pDoc, const ScRange& rRange,
-                                BOOL bAllowNV = FALSE );
+                                sal_Bool bAllowNV = sal_False );
 
     /** @param bDataTypes
             Additionally to the differentiation between string and double allow
@@ -61,7 +61,7 @@ public:
             implementation of XFormulaParser. If <FALSE/>, boolean values are
             treated as ordinary double values 1 (true) and 0 (false).
      */
-    static BOOL	FillMixedArray( com::sun::star::uno::Any& rAny,
+    static sal_Bool	FillMixedArray( com::sun::star::uno::Any& rAny,
                                 const ScMatrix* pMatrix, bool bDataTypes = false );
 };
 
@@ -106,7 +106,7 @@ class ScByteSequenceToString
 public:
     //	rAny must contain Sequence<sal_Int8>,
     //	may or may not contain 0-bytes at the end
-    static BOOL GetString( String& rString, const com::sun::star::uno::Any& rAny,
+    static sal_Bool GetString( String& rString, const com::sun::star::uno::Any& rAny,
                             sal_uInt16 nEncoding );
 };
 
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index b8af2f2d4..495e3fec3 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -56,7 +56,7 @@ public:
                 ScRangeUtil()  {}
                 ~ScRangeUtil() {}
 
-    BOOL	MakeArea			( const String&		rAreaStr,
+    sal_Bool	MakeArea			( const String&		rAreaStr,
                                   ScArea&			rArea,
                                   ScDocument*		pDoc,
                                   SCTAB			nTab,
@@ -65,14 +65,14 @@ public:
     void	CutPosString		( const String&		theAreaStr,
                                   String&			thePosStr ) const;
 
-    BOOL 	IsAbsTabArea		( const String& 	rAreaStr,
+    sal_Bool 	IsAbsTabArea		( const String& 	rAreaStr,
                                   ScDocument*		pDoc,
                                   ScArea***			pppAreas 	= 0,
-                                  USHORT*			pAreaCount	= 0,
-                                  BOOL				bAcceptCellRef = FALSE,
+                                  sal_uInt16*			pAreaCount	= 0,
+                                  sal_Bool				bAcceptCellRef = sal_False,
                                   ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
 
-    BOOL	IsAbsArea			( const String& rAreaStr,
+    sal_Bool	IsAbsArea			( const String& rAreaStr,
                                   ScDocument*	pDoc,
                                   SCTAB		nTab,
                                   String*		pCompleteStr = 0,
@@ -80,21 +80,21 @@ public:
                                   ScRefAddress*	pEndPos		 = 0,
                                   ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
 
-    BOOL    IsRefArea           ( const String&,
+    sal_Bool    IsRefArea           ( const String&,
                                   ScDocument*,
                                   SCTAB,
                                   String* = 0,
                                   ScRefAddress* = 0 ) const
-                                      { return FALSE; }
+                                      { return sal_False; }
 
-    BOOL	IsAbsPos			( const String&	rPosStr,
+    sal_Bool	IsAbsPos			( const String&	rPosStr,
                                   ScDocument*	pDoc,
                                   SCTAB		nTab,
                                   String*		pCompleteStr = 0,
                                   ScRefAddress*	pPosTripel	 = 0,
                                   ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
 
-    BOOL	MakeRangeFromName	( const String&	rName,
+    sal_Bool	MakeRangeFromName	( const String&	rName,
                                     ScDocument*		pDoc,
                                     SCTAB			nCurTab,
                                     ScRange&		rRange,
@@ -282,8 +282,8 @@ public:
             ScArea( const ScArea& r );
 
     ScArea&	operator=	( const ScArea& r );
-    BOOL	operator==	( const ScArea& r ) const;
-    BOOL	operator!=	( const ScArea& r ) const  { return !( operator==(r) ); }
+    sal_Bool	operator==	( const ScArea& r ) const;
+    sal_Bool	operator!=	( const ScArea& r ) const  { return !( operator==(r) ); }
 
 public:
     SCTAB nTab;
@@ -304,16 +304,16 @@ class SC_DLLPUBLIC ScAreaNameIterator
 private:
     ScRangeName*	pRangeName;
     ScDBCollection*	pDBCollection;
-    BOOL			bFirstPass;
-    USHORT			nPos;
+    sal_Bool			bFirstPass;
+    sal_uInt16			nPos;
     String			aStrNoName;
 
 public:
             ScAreaNameIterator( ScDocument* pDoc );
             ~ScAreaNameIterator() {}
 
-    BOOL	Next( String& rName, ScRange& rRange );
-    BOOL	WasDBName() const	{ return !bFirstPass; }
+    sal_Bool	Next( String& rName, ScRange& rRange );
+    sal_Bool	WasDBName() const	{ return !bFirstPass; }
 };
 
 
diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx
index 00581f504..a84f8b3d4 100644
--- a/sc/inc/rechead.hxx
+++ b/sc/inc/rechead.hxx
@@ -133,11 +133,11 @@ class ScMultipleReadHeader
 {
 private:
     SvStream&		rStream;
-    BYTE*			pBuf;
+    sal_uInt8*			pBuf;
     SvMemoryStream*	pMemStream;
-    ULONG			nEndPos;
-    ULONG			nEntryEnd;
-    ULONG			nTotalEnd;
+    sal_uLong			nEndPos;
+    sal_uLong			nEntryEnd;
+    sal_uLong			nTotalEnd;
 
 public:
     ScMultipleReadHeader(SvStream& rNewStream);
@@ -145,7 +145,7 @@ public:
 
     void	StartEntry();
     void	EndEntry();
-    ULONG	BytesLeft() const;
+    sal_uLong	BytesLeft() const;
 };
 
 class ScMultipleWriteHeader
@@ -153,9 +153,9 @@ class ScMultipleWriteHeader
 private:
     SvStream&		rStream;
     SvMemoryStream	aMemStream;
-    ULONG			nDataPos;
+    sal_uLong			nDataPos;
     sal_uInt32		nDataSize;
-    ULONG			nEntryStart;
+    sal_uLong			nEntryStart;
 
 public:
     ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0);
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 48226e022..ab039bfe8 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -39,9 +39,9 @@ class ScFormulaCell;
 struct ScFormulaRecursionEntry
 {
     ScFormulaCell*  pCell;
-    BOOL            bOldRunning;
+    sal_Bool            bOldRunning;
     ScFormulaResult aPreviousResult;
-    ScFormulaRecursionEntry( ScFormulaCell* p, BOOL bR,
+    ScFormulaRecursionEntry( ScFormulaCell* p, sal_Bool bR,
             const ScFormulaResult & rRes ) :
         pCell(p), bOldRunning(bR), aPreviousResult( rRes)
     {
@@ -57,8 +57,8 @@ class ScRecursionHelper
     ScFormulaRecursionList::iterator    aInsertPos;
     ScFormulaRecursionList::iterator    aLastIterationStart;
     ScRecursionInIterationStack         aRecursionInIterationStack;
-    USHORT                              nRecursionCount;
-    USHORT                              nIteration;
+    sal_uInt16                              nRecursionCount;
+    sal_uInt16                              nIteration;
     bool                                bInRecursionReturn;
     bool                                bDoingRecursion;
     bool                                bInIterationReturn;
@@ -81,7 +81,7 @@ class ScRecursionHelper
     public:
 
     ScRecursionHelper() { Init(); }
-    USHORT  GetRecursionCount() const       { return nRecursionCount; }
+    sal_uInt16  GetRecursionCount() const       { return nRecursionCount; }
     void    IncRecursionCount()             { ++nRecursionCount; }
     void    DecRecursionCount()             { --nRecursionCount; }
     /// A pure recursion return, no iteration.
@@ -96,7 +96,7 @@ class ScRecursionHelper
     }
     bool    IsDoingRecursion() const        { return bDoingRecursion; }
     void    SetDoingRecursion( bool b )     { bDoingRecursion = b; }
-    void    Insert( ScFormulaCell* p, BOOL bOldRunning,
+    void    Insert( ScFormulaCell* p, sal_Bool bOldRunning,
                     const ScFormulaResult & rRes )
     {
         aRecursionFormulas.insert( aInsertPos, ScFormulaRecursionEntry( p,
@@ -118,7 +118,7 @@ class ScRecursionHelper
         bInIterationReturn = b;
     }
     bool    IsDoingIteration() const        { return nIteration > 0; }
-    USHORT  GetIteration() const            { return nIteration; }
+    sal_uInt16  GetIteration() const            { return nIteration; }
     bool &  GetConvergingReference()        { return bConverging; }
     void    StartIteration()
     {
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index c60ab3f6d..b20f5adaf 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -37,10 +37,10 @@
 
 struct OldSingleRefBools
 {
-    BYTE    bRelCol;    // Flag values (see further down), 2 bits each in file format
-    BYTE    bRelRow;
-    BYTE    bRelTab;
-    BYTE    bOldFlag3D; // two BOOL flags (see further down)
+    sal_uInt8    bRelCol;    // Flag values (see further down), 2 bits each in file format
+    sal_uInt8    bRelRow;
+    sal_uInt8    bRelTab;
+    sal_uInt8    bOldFlag3D; // two sal_Bool flags (see further down)
 };
 
 #define SR_ABSOLUTE 0       // Absolute value
@@ -48,7 +48,7 @@ struct OldSingleRefBools
 #define SR_RELATIVE 2       // Relative value as delta value (after release 3.1)
 #define SR_DELETED  3       // Deleted col/row/tab
 
-#define SRF_3D      0x01    // 3D reference, was the BOOL (before build 304a)
+#define SRF_3D      0x01    // 3D reference, was the sal_Bool (before build 304a)
 #define SRF_RELNAME 0x02    // Reference derived from RangeName with relative values
 #define SRF_BITS    0x03    // Mask of possible bits
 
@@ -64,17 +64,17 @@ struct SC_DLLPUBLIC ScSingleRefData        // Single reference (one address) int
 
     union
     {
-        BOOL bFlags;
+        sal_Bool bFlags;
         struct
         {
-            BOOL    bColRel     :1;
-            BOOL    bColDeleted :1;
-            BOOL    bRowRel     :1;
-            BOOL    bRowDeleted :1;
-            BOOL    bTabRel     :1;
-            BOOL    bTabDeleted :1;
-            BOOL    bFlag3D     :1;     // 3D-Ref
-            BOOL    bRelName    :1;     // Reference derived from RangeName with relative values
+            sal_Bool    bColRel     :1;
+            sal_Bool    bColDeleted :1;
+            sal_Bool    bRowRel     :1;
+            sal_Bool    bRowDeleted :1;
+            sal_Bool    bTabRel     :1;
+            sal_Bool    bTabDeleted :1;
+            sal_Bool    bFlag3D     :1;     // 3D-Ref
+            sal_Bool    bRelName    :1;     // Reference derived from RangeName with relative values
         }Flags;
     };
 
@@ -85,34 +85,34 @@ struct SC_DLLPUBLIC ScSingleRefData        // Single reference (one address) int
     inline  void InitAddress( SCCOL nCol, SCROW nRow, SCTAB nTab );
     // InitAddressRel: InitFlags and set address, everything relative to rPos
     inline  void InitAddressRel( const ScAddress& rAdr, const ScAddress& rPos );
-    inline  void SetColRel( BOOL bVal ) { Flags.bColRel = (bVal ? TRUE : FALSE ); }
-    inline  BOOL IsColRel() const       { return Flags.bColRel; }
-    inline  void SetRowRel( BOOL bVal ) { Flags.bRowRel = (bVal ? TRUE : FALSE ); }
-    inline  BOOL IsRowRel() const       { return Flags.bRowRel; }
-    inline  void SetTabRel( BOOL bVal ) { Flags.bTabRel = (bVal ? TRUE : FALSE ); }
-    inline  BOOL IsTabRel() const       { return Flags.bTabRel; }
-
-    inline  void SetColDeleted( BOOL bVal ) { Flags.bColDeleted = (bVal ? TRUE : FALSE ); }
-    inline  BOOL IsColDeleted() const       { return Flags.bColDeleted; }
-    inline  void SetRowDeleted( BOOL bVal ) { Flags.bRowDeleted = (bVal ? TRUE : FALSE ); }
-    inline  BOOL IsRowDeleted() const       { return Flags.bRowDeleted; }
-    inline  void SetTabDeleted( BOOL bVal ) { Flags.bTabDeleted = (bVal ? TRUE : FALSE ); }
-    inline  BOOL IsTabDeleted() const       { return Flags.bTabDeleted; }
-    inline  BOOL IsDeleted() const          { return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); }
-
-    inline  void SetFlag3D( BOOL bVal ) { Flags.bFlag3D = (bVal ? TRUE : FALSE ); }
-    inline  BOOL IsFlag3D() const       { return Flags.bFlag3D; }
-    inline  void SetRelName( BOOL bVal )    { Flags.bRelName = (bVal ? TRUE : FALSE ); }
-    inline  BOOL IsRelName() const          { return Flags.bRelName; }
-
-    inline  BOOL Valid() const;
+    inline  void SetColRel( sal_Bool bVal ) { Flags.bColRel = (bVal ? sal_True : sal_False ); }
+    inline  sal_Bool IsColRel() const       { return Flags.bColRel; }
+    inline  void SetRowRel( sal_Bool bVal ) { Flags.bRowRel = (bVal ? sal_True : sal_False ); }
+    inline  sal_Bool IsRowRel() const       { return Flags.bRowRel; }
+    inline  void SetTabRel( sal_Bool bVal ) { Flags.bTabRel = (bVal ? sal_True : sal_False ); }
+    inline  sal_Bool IsTabRel() const       { return Flags.bTabRel; }
+
+    inline  void SetColDeleted( sal_Bool bVal ) { Flags.bColDeleted = (bVal ? sal_True : sal_False ); }
+    inline  sal_Bool IsColDeleted() const       { return Flags.bColDeleted; }
+    inline  void SetRowDeleted( sal_Bool bVal ) { Flags.bRowDeleted = (bVal ? sal_True : sal_False ); }
+    inline  sal_Bool IsRowDeleted() const       { return Flags.bRowDeleted; }
+    inline  void SetTabDeleted( sal_Bool bVal ) { Flags.bTabDeleted = (bVal ? sal_True : sal_False ); }
+    inline  sal_Bool IsTabDeleted() const       { return Flags.bTabDeleted; }
+    inline  sal_Bool IsDeleted() const          { return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); }
+
+    inline  void SetFlag3D( sal_Bool bVal ) { Flags.bFlag3D = (bVal ? sal_True : sal_False ); }
+    inline  sal_Bool IsFlag3D() const       { return Flags.bFlag3D; }
+    inline  void SetRelName( sal_Bool bVal )    { Flags.bRelName = (bVal ? sal_True : sal_False ); }
+    inline  sal_Bool IsRelName() const          { return Flags.bRelName; }
+
+    inline  sal_Bool Valid() const;
     /// In external references nTab is -1
     inline  bool ValidExternal() const;
 
             void SmartRelAbs( const ScAddress& rPos );
             void CalcRelFromAbs( const ScAddress& rPos );
             void CalcAbsIfRel( const ScAddress& rPos );
-            BOOL operator==( const ScSingleRefData& ) const;
+            sal_Bool operator==( const ScSingleRefData& ) const;
             bool operator!=( const ScSingleRefData& ) const;
 };
 
@@ -133,13 +133,13 @@ inline void ScSingleRefData::InitAddressRel( const ScAddress& rAdr,
                                             const ScAddress& rPos )
 {
     InitAddress( rAdr.Col(), rAdr.Row(), rAdr.Tab());
-    SetColRel( TRUE );
-    SetRowRel( TRUE );
-    SetTabRel( TRUE );
+    SetColRel( sal_True );
+    SetRowRel( sal_True );
+    SetTabRel( sal_True );
     CalcRelFromAbs( rPos );
 }
 
-inline BOOL ScSingleRefData::Valid() const
+inline sal_Bool ScSingleRefData::Valid() const
 {
     return  nCol >= 0 && nCol <= MAXCOL &&
             nRow >= 0 && nRow <= MAXROW &&
@@ -183,9 +183,9 @@ struct ScComplexRefData         // Complex reference (a range) into the sheet
         { Ref1.CalcRelFromAbs( rPos ); Ref2.CalcRelFromAbs( rPos ); }
     inline  void CalcAbsIfRel( const ScAddress& rPos )
         { Ref1.CalcAbsIfRel( rPos ); Ref2.CalcAbsIfRel( rPos ); }
-    inline  BOOL IsDeleted() const
+    inline  sal_Bool IsDeleted() const
         { return Ref1.IsDeleted() || Ref2.IsDeleted(); }
-    inline  BOOL Valid() const
+    inline  sal_Bool Valid() const
         { return Ref1.Valid() && Ref2.Valid(); }
     /** In external references nTab is -1 for the start tab and -1 for the end 
         tab if one sheet, or >=0 if more than one sheets. */
@@ -193,7 +193,7 @@ struct ScComplexRefData         // Complex reference (a range) into the sheet
 
     /// Absolute references have to be up-to-date when calling this!
     void PutInOrder();
-    inline  BOOL operator==( const ScComplexRefData& r ) const
+    inline  sal_Bool operator==( const ScComplexRefData& r ) const
         { return Ref1 == r.Ref1 && Ref2 == r.Ref2; }
     /** Enlarge range if reference passed is not within existing range.
         ScAddress position is used to calculate absolute references from
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index 51a7e520e..9494c8d20 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -43,7 +43,7 @@ class ScRefreshTimerControl
 {
 private:
             ::vos::OMutex		aMutex;
-            USHORT				nBlockRefresh;
+            sal_uInt16				nBlockRefresh;
 
 public:
 #if SC_REFRESHTIMER_CONTROL_LIST
@@ -52,14 +52,14 @@ public:
 
                                 ScRefreshTimerControl() : nBlockRefresh(0) {}
 
-            void				SetAllowRefresh( BOOL b )
+            void				SetAllowRefresh( sal_Bool b )
                                     {
                                         if ( b && nBlockRefresh )
                                             --nBlockRefresh;
-                                        else if ( !b && nBlockRefresh < (USHORT)(~0) )
+                                        else if ( !b && nBlockRefresh < (sal_uInt16)(~0) )
                                             ++nBlockRefresh;
                                     }
-            BOOL				IsRefreshAllowed() const	{ return !nBlockRefresh; }
+            sal_Bool				IsRefreshAllowed() const	{ return !nBlockRefresh; }
             ::vos::OMutex&		GetMutex()					{ return aMutex; }
 };
 
@@ -73,7 +73,7 @@ public:
                                 ~ScRefreshTimerProtector()
                                     {
                                         if ( ppControl && *ppControl )
-                                            (*ppControl)->SetAllowRefresh( TRUE );
+                                            (*ppControl)->SetAllowRefresh( sal_True );
                                     }
 };
 
@@ -107,7 +107,7 @@ private:
 public:
                                 ScRefreshTimer() : ppControl(0)
                                     { SetTimeout( 0 ); }
-                                ScRefreshTimer( ULONG nSeconds ) : ppControl(0)
+                                ScRefreshTimer( sal_uLong nSeconds ) : ppControl(0)
                                     {
                                         SetTimeout( nSeconds * 1000 );
                                         Start();
@@ -124,10 +124,10 @@ public:
                                         return *this;
                                     }
 
-            BOOL				operator==( const ScRefreshTimer& r ) const
+            sal_Bool				operator==( const ScRefreshTimer& r ) const
                                     { return GetTimeout() == r.GetTimeout(); }
 
-            BOOL				operator!=( const ScRefreshTimer& r ) const
+            sal_Bool				operator!=( const ScRefreshTimer& r ) const
                                     { return !ScRefreshTimer::operator==( r ); }
 
             void				StartRefreshTimer()
@@ -143,13 +143,13 @@ public:
             void				SetRefreshHandler( const Link& rLink )
                                     { SetTimeoutHdl( rLink ); }
 
-            ULONG				GetRefreshDelay() const
+            sal_uLong				GetRefreshDelay() const
                                     { return GetTimeout() / 1000; }
 
             void				StopRefreshTimer()
                                     { Stop(); }
 
-    SC_DLLPUBLIC virtual	void				SetRefreshDelay( ULONG nSeconds );
+    SC_DLLPUBLIC virtual	void				SetRefreshDelay( sal_uLong nSeconds );
     SC_DLLPUBLIC virtual	void				Timeout();
 };
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 663bdd7c6..08bf4610b 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -73,15 +73,15 @@ public:
 class AbstractScAutoFormatDlg : public VclAbstractDialog  //add for ScAutoFormatDlg
 {
 public:
-    virtual USHORT GetIndex() const = 0 ;
+    virtual sal_uInt16 GetIndex() const = 0 ;
     virtual String GetCurrFormatName() = 0;
 };
 
 class AbstractScColRowLabelDlg : public VclAbstractDialog  //add for ScColRowLabelDlg
 {
 public:
-    virtual BOOL IsCol() = 0;
-    virtual BOOL IsRow() = 0;
+    virtual sal_Bool IsCol() = 0;
+    virtual sal_Bool IsRow() = 0;
 };
 
 class AbstractScDataPilotDatabaseDlg  :public VclAbstractDialog  //add for ScDataPilotDatabaseDlg
@@ -93,8 +93,8 @@ public:
 class AbstractScDataPilotSourceTypeDlg  : public VclAbstractDialog  //add for ScDataPilotSourceTypeDlg
 {
 public:
-    virtual BOOL	IsDatabase() const = 0;
-    virtual BOOL	IsExternal() const = 0;
+    virtual sal_Bool	IsDatabase() const = 0;
+    virtual sal_Bool	IsExternal() const = 0;
 };
 
 class AbstractScDataPilotServiceDlg : public VclAbstractDialog  //add for ScDataPilotServiceDlg
@@ -117,7 +117,7 @@ class AbstractScDeleteContentsDlg: public VclAbstractDialog  //add for ScDeleteC
 {
 public:
     virtual void	DisableObjects() = 0 ;
-    virtual USHORT	GetDelContentsCmdBits() const = 0;
+    virtual sal_uInt16	GetDelContentsCmdBits() const = 0;
 };
 
 class AbstractScFillSeriesDlg: public VclAbstractDialog  //add for ScFillSeriesDlg
@@ -130,13 +130,13 @@ public:
     virtual double		GetStep() const	= 0;
     virtual double		GetMax() const = 0;
     virtual String		GetStartStr() const = 0;
-    virtual void		SetEdStartValEnabled(BOOL bFlag=FALSE) = 0;
+    virtual void		SetEdStartValEnabled(sal_Bool bFlag=sal_False) = 0;
 };
 
 class AbstractScGroupDlg :  public VclAbstractDialog  //add for ScGroupDlg
 {
 public:
-    virtual BOOL GetColsChecked() const = 0;
+    virtual sal_Bool GetColsChecked() const = 0;
 };
 
 class AbstractScInsertCellDlg : public VclAbstractDialog  //add for ScInsertCellDlg
@@ -148,14 +148,14 @@ public:
 class AbstractScInsertContentsDlg : public VclAbstractDialog  //add for ScInsertContentsDlg
 {
 public:
-    virtual USHORT		GetInsContentsCmdBits() const = 0;
-    virtual USHORT		GetFormulaCmdBits() const = 0 ;
-    virtual BOOL		IsSkipEmptyCells() const = 0;
-    virtual BOOL 		IsLink() const = 0;
-    virtual void	SetFillMode( BOOL bSet ) = 0;
-    virtual void	SetOtherDoc( BOOL bSet ) = 0;
-    virtual BOOL 		IsTranspose() const = 0;
-    virtual void	SetChangeTrack( BOOL bSet ) = 0;
+    virtual sal_uInt16		GetInsContentsCmdBits() const = 0;
+    virtual sal_uInt16		GetFormulaCmdBits() const = 0 ;
+    virtual sal_Bool		IsSkipEmptyCells() const = 0;
+    virtual sal_Bool 		IsLink() const = 0;
+    virtual void	SetFillMode( sal_Bool bSet ) = 0;
+    virtual void	SetOtherDoc( sal_Bool bSet ) = 0;
+    virtual sal_Bool 		IsTranspose() const = 0;
+    virtual void	SetChangeTrack( sal_Bool bSet ) = 0;
     virtual void	SetCellShiftDisabled( int nDisable ) = 0;
     virtual InsCellCmd	GetMoveMode() = 0;
 };
@@ -163,13 +163,13 @@ public:
 class AbstractScInsertTableDlg : public VclAbstractDialog  //add for ScInsertTableDlg
 {
 public:
-    virtual BOOL			GetTablesFromFile()	= 0;
-    virtual BOOL			GetTablesAsLink()	= 0;
-    virtual const String*	GetFirstTable( USHORT* pN = NULL ) = 0;
+    virtual sal_Bool			GetTablesFromFile()	= 0;
+    virtual sal_Bool			GetTablesAsLink()	= 0;
+    virtual const String*	GetFirstTable( sal_uInt16* pN = NULL ) = 0;
     virtual ScDocShell*		GetDocShellTables()	= 0;
-    virtual BOOL			IsTableBefore() = 0;
-    virtual USHORT			GetTableCount() = 0;
-    virtual const String*	GetNextTable( USHORT* pN = NULL ) = 0;
+    virtual sal_Bool			IsTableBefore() = 0;
+    virtual sal_uInt16			GetTableCount() = 0;
+    virtual const String*	GetNextTable( sal_uInt16* pN = NULL ) = 0;
 
 };
 
@@ -184,12 +184,12 @@ class AbstractScLinkedAreaDlg : public VclAbstractDialog2  //add for ScLinkedAre
 public:
     virtual void			InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
-                                        ULONG nRefresh ) = 0;
+                                        sal_uLong nRefresh ) = 0;
     virtual String			GetURL() = 0;
     virtual String			GetFilter() = 0;		// may be empty
     virtual String			GetOptions() = 0;		// filter options
     virtual String			GetSource() = 0;		// separated by ";"
-    virtual ULONG			GetRefresh() = 0;		// 0 if disabled
+    virtual sal_uLong			GetRefresh() = 0;		// 0 if disabled
 };
 
 class AbstractScMetricInputDlg : public VclAbstractDialog  //add for ScMetricInputDlg
@@ -201,17 +201,17 @@ public:
 class AbstractScMoveTableDlg : public VclAbstractDialog  //add for ScMoveTableDlg
 {
 public:
-    virtual USHORT	GetSelectedDocument		() const = 0;
-    virtual USHORT	GetSelectedTable		() const = 0;
-    virtual BOOL	GetCopyTable			() const = 0;
-    virtual void	SetCopyTable			(BOOL bFlag=TRUE) = 0;
-    virtual void	EnableCopyTable			(BOOL bFlag=TRUE) = 0;
+    virtual sal_uInt16	GetSelectedDocument		() const = 0;
+    virtual sal_uInt16	GetSelectedTable		() const = 0;
+    virtual sal_Bool	GetCopyTable			() const = 0;
+    virtual void	SetCopyTable			(sal_Bool bFlag=sal_True) = 0;
+    virtual void	EnableCopyTable			(sal_Bool bFlag=sal_True) = 0;
 };
 
 class AbstractScNameCreateDlg : public VclAbstractDialog  //add for ScNameCreateDlg
 {
 public:
-    virtual USHORT			GetFlags() const = 0;
+    virtual sal_uInt16			GetFlags() const = 0;
 };
 
 class AbstractScNamePasteDlg : public VclAbstractDialog  //add for ScNamePasteDlg
@@ -229,14 +229,14 @@ public:
 class AbstractScDPFunctionDlg : public VclAbstractDialog  //add for ScDPFunctionDlg
 {
 public:
-    virtual USHORT  GetFuncMask() const = 0;
+    virtual sal_uInt16  GetFuncMask() const = 0;
     virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const = 0;
 };
 
 class AbstractScDPSubtotalDlg : public VclAbstractDialog  //add for ScDPSubtotalDlg
 {
 public:
-    virtual USHORT  GetFuncMask() const = 0;
+    virtual sal_uInt16  GetFuncMask() const = 0;
     virtual void    FillLabelData( ScDPLabelData& rLabelData ) const = 0;
 };
 
@@ -264,20 +264,20 @@ class AbstractScNewScenarioDlg : public VclAbstractDialog  //add for ScNewScenar
 public:
 
     virtual void SetScenarioData( const String& rName, const String& rComment,
-                            const Color& rColor, USHORT nFlags ) = 0;
+                            const Color& rColor, sal_uInt16 nFlags ) = 0;
 
     virtual void GetScenarioData( String& rName, String& rComment,
-                            Color& rColor, USHORT& rFlags ) const = 0;
+                            Color& rColor, sal_uInt16& rFlags ) const = 0;
 };
 
 class AbstractScShowTabDlg : public VclAbstractDialog  //add for ScShowTabDlg
 {
 public:
-    virtual void    Insert( const String& rString, BOOL bSelected ) = 0;
-    virtual USHORT	GetSelectEntryCount() const = 0;
+    virtual void    Insert( const String& rString, sal_Bool bSelected ) = 0;
+    virtual sal_uInt16	GetSelectEntryCount() const = 0;
     virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ) = 0;
-    virtual String	GetSelectEntry(USHORT nPos) const = 0;
-    virtual USHORT  GetSelectEntryPos(USHORT nPos) const = 0;
+    virtual String	GetSelectEntry(sal_uInt16 nPos) const = 0;
+    virtual sal_uInt16  GetSelectEntryPos(sal_uInt16 nPos) const = 0;
 };
 
 class AbstractScStringInputDlg :  public VclAbstractDialog  //add for ScStringInputDlg
@@ -324,27 +324,27 @@ public:
                                                                 int nId) = 0;
     virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, //add for ScColRowLabelDlg
                                                                 int nId,
-                                                                BOOL bCol = FALSE,
-                                                                BOOL bRow = FALSE) = 0;
+                                                                sal_Bool bCol = sal_False,
+                                                                sal_Bool bRow = sal_False) = 0;
 
     virtual VclAbstractDialog * CreateScColOrRowDlg( Window*			pParent, //add for ScColOrRowDlg
                                                     const String&	rStrTitle,
                                                     const String&	rStrLabel,
                                                     int nId,
-                                                    BOOL				bColDefault = TRUE ) = 0;
+                                                    sal_Bool				bColDefault = sal_True ) = 0;
     virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0;  //add for ScSortWarningDlg
     virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg
 
-    virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, BOOL bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg
+    virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg
 
     virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
                                                                         const com::sun::star::uno::Sequence<rtl::OUString>& rServices,
                                                                         int nId ) = 0;
 
-    virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, BOOL bDisallowCellMove = FALSE ) = 0 ; //add for ScDeleteCellDlg
+    virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, sal_Bool bDisallowCellMove = sal_False ) = 0 ; //add for ScDeleteCellDlg
 
     virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
-                                                                 USHORT  nCheckDefaults = 0 ) = 0;
+                                                                 sal_uInt16  nCheckDefaults = 0 ) = 0;
     virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*		pParent, //add for ScFillSeriesDlg
                                                             ScDocument&	rDocument,
                                                             FillDir		eFillDir,
@@ -353,29 +353,29 @@ public:
                                                             String			aStartStr,
                                                             double			fStep,
                                                             double			fMax,
-                                                            USHORT			nPossDir,
+                                                            sal_uInt16			nPossDir,
                                                             int nId) = 0;
 
     virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                             int nId,
-                                                            BOOL	bUnGroup = FALSE,
-                                                            BOOL	bRows    = TRUE  ) = 0;
+                                                            sal_Bool	bUnGroup = sal_False,
+                                                            sal_Bool	bRows    = sal_True  ) = 0;
 
     virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
                                                                 int nId,
-                                                            BOOL bDisallowCellMove = FALSE ) = 0;
+                                                            sal_Bool bDisallowCellMove = sal_False ) = 0;
 
     virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*		pParent, //add for ScInsertContentsDlg
                                                                     int nId,
-                                                                    USHORT  		nCheckDefaults = 0,
+                                                                    sal_uInt16  		nCheckDefaults = 0,
                                                                     const String*	pStrTitle = NULL ) = 0;
 
     virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData,  //add for ScInsertTableDlg
                                                                 SCTAB nTabCount, bool bFromFile, int nId) = 0;
 
     virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                         const String& aTitle,
                                                         const String& aLbTitle,
                                                                 List& 	aEntryList,
@@ -383,12 +383,12 @@ public:
     virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg (  Window* pParent, int nId) = 0; //add for ScLinkedAreaDlg
 
     virtual AbstractScMetricInputDlg * CreateScMetricInputDlg (  Window*		pParent, //add for ScMetricInputDlg
-                                                                USHORT		nResId,		// Ableitung fuer jeden Dialog!
+                                                                sal_uInt16		nResId,		// Ableitung fuer jeden Dialog!
                                                                 long			nCurrent,
                                                                 long			nDefault,
                                                                 int nId ,
                                                                 FieldUnit		eFUnit	  = FUNIT_MM,
-                                                                USHORT		nDecimals = 2,
+                                                                sal_uInt16		nDecimals = 2,
                                                                 long			nMaximum  = 1000,
                                                                 long			nMinimum  = 0,
                                                                 long			nFirst	  = 1,
@@ -396,13 +396,13 @@ public:
 
     virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(  Window* pParent, int nId ) = 0; //add for ScMoveTableDlg
 
-    virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, USHORT nFlags, int nId ) = 0; //add for ScNameCreateDlg
+    virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, sal_uInt16 nFlags, int nId ) = 0; //add for ScNameCreateDlg
 
     virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, const ScRangeName* pList, //add for ScNamePasteDlg
-                                                            int nId , BOOL bInsList=TRUE ) = 0;
+                                                            int nId , sal_Bool bInsList=sal_True ) = 0;
 
     virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg
-                                                                const SfxItemSet&	rArgSet, USHORT nSourceTab , int nId ) = 0;
+                                                                const SfxItemSet&	rArgSet, sal_uInt16 nSourceTab , int nId ) = 0;
 
     virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId,
                                                                 const ScDPLabelDataVec& rLabelVec,
@@ -428,11 +428,11 @@ public:
 
     virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId,
                                                                 ScDPObject& rDPObj,
-                                                                USHORT nOrient ) = 0;
+                                                                sal_uInt16 nOrient ) = 0;
 
     virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, //add for ScNewScenarioDlg
                                                                 int nId,
-                                                                BOOL bEdit = FALSE, BOOL bSheetProtected = FALSE ) = 0;
+                                                                sal_Bool bEdit = sal_False, sal_Bool bSheetProtected = sal_False ) = 0;
     virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ) = 0; //add for ScShowTabDlg
 
     virtual AbstractScStringInputDlg * CreateScStringInputDlg (  Window* pParent, //add for ScStringInputDlg
@@ -451,12 +451,12 @@ public:
 
     virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* 				pParent, //add for ScImportOptionsDlg
                                                                     int nId,
-                                                                    BOOL                    bAscii = TRUE,
+                                                                    sal_Bool                    bAscii = sal_True,
                                                                     const ScImportOptions*	pOptions = NULL,
                                                                     const String*			pStrTitle = NULL,
-                                                                    BOOL                    bMultiByte = FALSE,
-                                                                    BOOL                    bOnlyDbtoolsEncodings = FALSE,
-                                                                    BOOL                    bImport = TRUE ) = 0;
+                                                                    sal_Bool                    bMultiByte = sal_False,
+                                                                    sal_Bool                    bOnlyDbtoolsEncodings = sal_False,
+                                                                    sal_Bool                    bImport = sal_True ) = 0;
 
     virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame*	 pFrame, //add for ScAttrDlg
                                                     Window*			 pParent,
@@ -468,11 +468,11 @@ public:
                                                     const SfxItemSet&	rCoreSet,
                                                     const String&		rPageStyle,
                                                     int nId,
-                                                    USHORT				nResId = RID_SCDLG_HFEDIT ) = 0;
+                                                    sal_uInt16				nResId = RID_SCDLG_HFEDIT ) = 0;
 
     virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*				pParent,//add for ScStyleDlg
                                                     SfxStyleSheetBase&	rStyleBase,
-                                                    USHORT				nRscId,
+                                                    sal_uInt16				nRscId,
                                                     int nId) = 0;
 
     virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window*				pParent, //add for ScSubTotalDlg
@@ -495,8 +495,8 @@ public:
     virtual SfxAbstractTabDialog * CreateScSortDlg( Window*			 pParent, //add for ScSortDlg
                                                     const SfxItemSet* pArgSet,int nId ) = 0;
     // for tabpage
-    virtual CreateTabPage				GetTabPageCreatorFunc( USHORT nId ) = 0;
-    virtual GetTabPageRanges			GetTabPageRangesFunc( USHORT nId ) = 0;
+    virtual CreateTabPage				GetTabPageCreatorFunc( sal_uInt16 nId ) = 0;
+    virtual GetTabPageRanges			GetTabPageRangesFunc( sal_uInt16 nId ) = 0;
 };
 #endif
 
diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx
index 4070566ab..c0712ebf5 100644
--- a/sc/inc/scdll.hxx
+++ b/sc/inc/scdll.hxx
@@ -67,7 +67,7 @@ public:
     static void 	Init(); 	// called directly after loading the DLL
     static void 	Exit(); 	// called directly befor unloading the DLL
 
-    static ULONG	DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter,
+    static sal_uLong	DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter,
                                     SfxFilterFlags nMust, SfxFilterFlags nDont );
 };
 
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 9163d6ad3..8a76781f9 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -38,7 +38,7 @@ class SvStream;
 class ScInterpreter;
 class SvNumberFormatter;
 
-typedef BYTE ScMatValType;
+typedef sal_uInt8 ScMatValType;
 const ScMatValType SC_MATVAL_VALUE     = 0x00;
 const ScMatValType SC_MATVAL_BOOLEAN   = 0x01;
 const ScMatValType SC_MATVAL_STRING    = 0x02;
@@ -55,7 +55,7 @@ union ScMatrixValue
     const String& GetString() const     { return pS ? *pS : EMPTY_STRING; }
 
     /// Only valid if ScMatrix methods indicate that this is no string!
-    USHORT GetError() const         { return GetDoubleErrorValue( fVal); }
+    sal_uInt16 GetError() const         { return GetDoubleErrorValue( fVal); }
 
     /// Only valid if ScMatrix methods indicate that this is a boolean
     bool GetBoolean() const         { return fVal != 0.; }
@@ -94,9 +94,9 @@ class SC_DLLPUBLIC ScMatrix
 {
     ScMatrixValue*  pMat;
     ScMatValType*   mnValType;
-    ULONG           mnNonValue; // how many strings and empties
+    sal_uLong           mnNonValue; // how many strings and empties
     ScInterpreter*  pErrorInterpreter;
-    mutable ULONG   nRefCnt;    // reference count
+    mutable sal_uLong   nRefCnt;    // reference count
     SCSIZE          nColCount;
     SCSIZE          nRowCount;
     bool            mbCloneIfConst;     // Whether the matrix is cloned with a CloneIfConst() call.
@@ -107,7 +107,7 @@ class SC_DLLPUBLIC ScMatrix
     void Clear();
 
     // pStr may be NULL, bFlag MUST NOT be 0
-    void PutStringEntry( const String* pStr, BYTE bFlag, SCSIZE nIndex );
+    void PutStringEntry( const String* pStr, sal_uInt8 bFlag, SCSIZE nIndex );
 
     // only delete via Delete()
     ~ScMatrix();
@@ -116,7 +116,7 @@ class SC_DLLPUBLIC ScMatrix
     ScMatrix( const ScMatrix& );
     ScMatrix& operator=( const ScMatrix&);
 
-    void SetErrorAtInterpreter( USHORT nError) const;
+    void SetErrorAtInterpreter( sal_uInt16 nError) const;
 
 public:
 
@@ -278,12 +278,12 @@ public:
     void PutString( const String& rStr, SCSIZE nIndex);
     void PutEmpty( SCSIZE nC, SCSIZE nR);
     void PutEmpty( SCSIZE nIndex);
-    /// Jump FALSE without path
+    /// Jump sal_False without path
     void PutEmptyPath( SCSIZE nC, SCSIZE nR);
     void PutEmptyPath( SCSIZE nIndex);
-    void PutError( USHORT nErrorCode, SCSIZE nC, SCSIZE nR )
+    void PutError( sal_uInt16 nErrorCode, SCSIZE nC, SCSIZE nR )
         { PutDouble( CreateDoubleError( nErrorCode ), nC, nR ); }
-    void PutError( USHORT nErrorCode, SCSIZE nIndex )
+    void PutError( sal_uInt16 nErrorCode, SCSIZE nIndex )
         { PutDouble( CreateDoubleError( nErrorCode ), nIndex ); }
     void PutBoolean( bool bVal, SCSIZE nC, SCSIZE nR);
     void PutBoolean( bool bVal, SCSIZE nIndex);
@@ -296,15 +296,15 @@ public:
         @ATTENTION: MUST NOT be used if the element is a string!
                     Use GetErrorIfNotString() instead if not sure.
         @returns 0 if no error, else one of err... constants */
-    USHORT GetError( SCSIZE nC, SCSIZE nR) const;
-    USHORT GetError( SCSIZE nIndex) const
+    sal_uInt16 GetError( SCSIZE nC, SCSIZE nR) const;
+    sal_uInt16 GetError( SCSIZE nIndex) const
         { return pMat[nIndex].GetError(); }
 
     /** Use in ScInterpreter to obtain the error code, if any.
         @returns 0 if no error or string element, else one of err... constants */
-    USHORT GetErrorIfNotString( SCSIZE nC, SCSIZE nR) const
+    sal_uInt16 GetErrorIfNotString( SCSIZE nC, SCSIZE nR) const
         { return IsValue( nC, nR) ? GetError( nC, nR) : 0; }
-    USHORT GetErrorIfNotString( SCSIZE nIndex) const
+    sal_uInt16 GetErrorIfNotString( SCSIZE nIndex) const
         { return IsValue( nIndex) ? GetError( nIndex) : 0; }
 
     /// @return 0.0 if empty or empty path, else value or DoubleError.
@@ -314,7 +314,7 @@ public:
     {
         if ( pErrorInterpreter )
         {
-            USHORT nError = GetDoubleErrorValue( pMat[nIndex].fVal);
+            sal_uInt16 nError = GetDoubleErrorValue( pMat[nIndex].fVal);
             if ( nError )
                 SetErrorAtInterpreter( nError);
         }
@@ -339,56 +339,56 @@ public:
     const ScMatrixValue* Get( SCSIZE nC, SCSIZE nR, ScMatValType& nType) const;
 
     /// @return <TRUE/> if string or empty or empty path, in fact non-value.
-    BOOL IsString( SCSIZE nIndex ) const
+    sal_Bool IsString( SCSIZE nIndex ) const
         { return mnValType && IsNonValueType( mnValType[nIndex]); }
 
     /// @return <TRUE/> if string or empty or empty path, in fact non-value.
-    BOOL IsString( SCSIZE nC, SCSIZE nR ) const
+    sal_Bool IsString( SCSIZE nC, SCSIZE nR ) const
     { 
         ValidColRowReplicated( nC, nR );
         return mnValType && IsNonValueType( mnValType[ nC * nRowCount + nR ]);
     }
 
     /// @return <TRUE/> if empty or empty path.
-    BOOL IsEmpty( SCSIZE nIndex ) const
+    sal_Bool IsEmpty( SCSIZE nIndex ) const
         { return mnValType && ((mnValType[nIndex] & SC_MATVAL_EMPTY) == SC_MATVAL_EMPTY); }
 
     /// @return <TRUE/> if empty or empty path.
-    BOOL IsEmpty( SCSIZE nC, SCSIZE nR ) const
+    sal_Bool IsEmpty( SCSIZE nC, SCSIZE nR ) const
     {
         ValidColRowReplicated( nC, nR );
         return mnValType && ((mnValType[ nC * nRowCount + nR ] & SC_MATVAL_EMPTY) == SC_MATVAL_EMPTY);
     }
 
     /// @return <TRUE/> if empty path.
-    BOOL IsEmptyPath( SCSIZE nC, SCSIZE nR ) const
+    sal_Bool IsEmptyPath( SCSIZE nC, SCSIZE nR ) const
     {
         ValidColRowReplicated( nC, nR );
         return mnValType && ((mnValType[ nC * nRowCount + nR ] & SC_MATVAL_EMPTYPATH) == SC_MATVAL_EMPTYPATH);
     }
 
     /// @return <TRUE/> if empty path.
-    BOOL IsEmptyPath( SCSIZE nIndex ) const
+    sal_Bool IsEmptyPath( SCSIZE nIndex ) const
         { return mnValType && ((mnValType[nIndex] & SC_MATVAL_EMPTYPATH) == SC_MATVAL_EMPTYPATH); }
 
     /// @return <TRUE/> if value or boolean.
-    BOOL IsValue( SCSIZE nIndex ) const
+    sal_Bool IsValue( SCSIZE nIndex ) const
         { return !mnValType || IsValueType( mnValType[nIndex]); }
 
     /// @return <TRUE/> if value or boolean.
-    BOOL IsValue( SCSIZE nC, SCSIZE nR ) const
+    sal_Bool IsValue( SCSIZE nC, SCSIZE nR ) const
     {
         ValidColRowReplicated( nC, nR );
         return !mnValType || IsValueType( mnValType[ nC * nRowCount + nR ]);
     }
 
     /// @return <TRUE/> if value or boolean or empty or empty path.
-    BOOL IsValueOrEmpty( SCSIZE nIndex ) const
+    sal_Bool IsValueOrEmpty( SCSIZE nIndex ) const
         { return !mnValType || IsValueType( mnValType[nIndex] ) ||
             ((mnValType[nIndex] & SC_MATVAL_EMPTY) == SC_MATVAL_EMPTY); }
 
     /// @return <TRUE/> if value or boolean or empty or empty path.
-    BOOL IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const
+    sal_Bool IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const
     {
         ValidColRowReplicated( nC, nR );
         return !mnValType || IsValueType( mnValType[ nC * nRowCount + nR ]) ||
@@ -397,18 +397,18 @@ public:
     }
 
     /// @return <TRUE/> if boolean.
-    BOOL IsBoolean( SCSIZE nIndex ) const
+    sal_Bool IsBoolean( SCSIZE nIndex ) const
         { return mnValType && IsBooleanType( mnValType[nIndex]); }
 
     /// @return <TRUE/> if boolean.
-    BOOL IsBoolean( SCSIZE nC, SCSIZE nR ) const
+    sal_Bool IsBoolean( SCSIZE nC, SCSIZE nR ) const
     {
         ValidColRowReplicated( nC, nR );
         return mnValType && IsBooleanType( mnValType[ nC * nRowCount + nR ]);
     }
 
     /// @return <TRUE/> if entire matrix is numeric, including booleans, with no strings or empties
-    BOOL IsNumeric() const
+    sal_Bool IsNumeric() const
         { return 0 == mnNonValue; }
 
     void MatTrans( ScMatrix& mRes) const;
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 072b452fc..3efea2b55 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -139,15 +139,15 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
     SfxErrorHandler*	pErrorHdl;
     SvxErrorHandler* 	pSvxErrorHdl;
     ScFormEditData*		pFormEditData;
-    USHORT				nCurRefDlgId;
-    BOOL				bIsWaterCan;
-    BOOL				bIsInEditCommand;
-    BOOL                bIsInExecuteDrop;
+    sal_uInt16				nCurRefDlgId;
+    sal_Bool				bIsWaterCan;
+    sal_Bool				bIsInEditCommand;
+    sal_Bool                bIsInExecuteDrop;
     bool                mbIsInSharedDocLoading;
     bool                mbIsInSharedDocSaving;
 
     //<!--Added by PengYunQuan for Validity Cell Range Picker
-    std::map<USHORT, std::list<Window*> > m_mapRefWindow;
+    std::map<sal_uInt16, std::list<Window*> > m_mapRefWindow;
     //-->Added by PengYunQuan for Validity Cell Range Picker
 public:
                     SFX_DECL_INTERFACE(SCID_APP)
@@ -189,14 +189,14 @@ public:
     ScSelectionTransferObj*	GetSelectionTransfer() const	{ return pSelTransfer; }
     void				SetSelectionTransfer( ScSelectionTransferObj* pNew );
 
-    void				SetWaterCan( BOOL bNew )	{ bIsWaterCan = bNew; }
-    BOOL				GetIsWaterCan() const 		{ return bIsWaterCan; }
+    void				SetWaterCan( sal_Bool bNew )	{ bIsWaterCan = bNew; }
+    sal_Bool				GetIsWaterCan() const 		{ return bIsWaterCan; }
 
-    void				SetInEditCommand( BOOL bNew )	{ bIsInEditCommand = bNew; }
-    BOOL				IsInEditCommand() const 		{ return bIsInEditCommand; }
+    void				SetInEditCommand( sal_Bool bNew )	{ bIsInEditCommand = bNew; }
+    sal_Bool				IsInEditCommand() const 		{ return bIsInEditCommand; }
 
-    void                SetInExecuteDrop( BOOL bNew )   { bIsInExecuteDrop = bNew; }
-    BOOL                IsInExecuteDrop() const         { return bIsInExecuteDrop; }
+    void                SetInExecuteDrop( sal_Bool bNew )   { bIsInExecuteDrop = bNew; }
+    sal_Bool                IsInExecuteDrop() const         { return bIsInExecuteDrop; }
 
     // Options:
     const ScViewOptions&	GetViewOptions	();
@@ -209,15 +209,15 @@ SC_DLLPUBLIC	const ScPrintOptions&	GetPrintOptions	();
 SC_DLLPUBLIC	void					SetAppOptions	( const ScAppOptions& rOpt );
     void					SetInputOptions	( const ScInputOptions& rOpt );
     void					SetPrintOptions	( const ScPrintOptions& rOpt );
-    void					InsertEntryToLRUList(USHORT nFIndex);
+    void					InsertEntryToLRUList(sal_uInt16 nFIndex);
     void					RecentFunctionsChanged();
 
-    static void			GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang,
-                                        BOOL& rAutoSpell );
-    static void			SetAutoSpellProperty( BOOL bSet );
-    static BOOL			HasThesaurusLanguage( USHORT nLang );
+    static void			GetSpellSettings( sal_uInt16& rDefLang, sal_uInt16& rCjkLang, sal_uInt16& rCtlLang,
+                                        sal_Bool& rAutoSpell );
+    static void			SetAutoSpellProperty( sal_Bool bSet );
+    static sal_Bool			HasThesaurusLanguage( sal_uInt16 nLang );
 
-    USHORT				GetOptDigitLanguage();		// from CTL options
+    sal_uInt16				GetOptDigitLanguage();		// from CTL options
 
     ScNavipiCfg&		GetNavipiCfg();
     ScAddInCfg&         GetAddInCfg();
@@ -229,15 +229,15 @@ SC_DLLPUBLIC	void					SetAppOptions	( const ScAppOptions& rOpt );
     void				ModifyOptions( const SfxItemSet& rOptSet );
 
     //	InputHandler:
-    BOOL                IsEditMode();	// nicht bei SC_INPUT_TYPE
-    BOOL                IsInputMode();	// auch bei SC_INPUT_TYPE
+    sal_Bool                IsEditMode();	// nicht bei SC_INPUT_TYPE
+    sal_Bool                IsInputMode();	// auch bei SC_INPUT_TYPE
     void                SetInputMode( ScInputMode eMode );
-    BOOL                InputKeyEvent( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE );
-    SC_DLLPUBLIC void                InputEnterHandler( BYTE nBlockMode = 0 );
+    sal_Bool                InputKeyEvent( const KeyEvent& rKEvt, sal_Bool bStartEdit = sal_False );
+    SC_DLLPUBLIC void                InputEnterHandler( sal_uInt8 nBlockMode = 0 );
     void                InputCancelHandler();
     void                InputSelection( EditView* pView );
     void                InputChanged( EditView* pView );
-    ScInputHandler*		GetInputHdl( ScTabViewShell* pViewSh = NULL, BOOL bUseRef = TRUE );
+    ScInputHandler*		GetInputHdl( ScTabViewShell* pViewSh = NULL, sal_Bool bUseRef = sal_True );
 
     void				SetRefInputHdl( ScInputHandler* pNew );
     ScInputHandler*		GetRefInputHdl();
@@ -250,7 +250,7 @@ SC_DLLPUBLIC	void					SetAppOptions	( const ScAppOptions& rOpt );
     void			 	InputReplaceSelection( const String& rStr );
     String				InputGetFormulaStr();
     void				ActivateInputWindow( const String* pStr = NULL,
-                                                BOOL bMatrix = FALSE );
+                                                sal_Bool bMatrix = sal_False );
 
     void				InitFormEditData();
     void				ClearFormEditData();
@@ -258,33 +258,33 @@ SC_DLLPUBLIC	void					SetAppOptions	( const ScAppOptions& rOpt );
 
     //	Referenzeingabe:
     //<!--Added by PengYunQuan for Validity Cell Range Picker
-    //void				SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
-    SC_DLLPUBLIC void				SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
+    //void				SetRefDialog( sal_uInt16 nId, sal_Bool bVis, SfxViewFrame* pViewFrm = NULL );
+    SC_DLLPUBLIC void				SetRefDialog( sal_uInt16 nId, sal_Bool bVis, SfxViewFrame* pViewFrm = NULL );
     //-->Added by PengYunQuan for Validity Cell Range Picker
-    BOOL                IsModalMode(SfxObjectShell* pDocSh = NULL);
-    BOOL                IsFormulaMode();
-    BOOL                IsRefDialogOpen();
-    BOOL				IsTableLocked();
+    sal_Bool                IsModalMode(SfxObjectShell* pDocSh = NULL);
+    sal_Bool                IsFormulaMode();
+    sal_Bool                IsRefDialogOpen();
+    sal_Bool				IsTableLocked();
     void				SetReference( const ScRange& rRef, ScDocument* pDoc,
                                         const ScMarkData* pMarkData = NULL );
     void				AddRefEntry();
     void                EndReference();
-    USHORT				GetCurRefDlgId() const					{ return nCurRefDlgId; }
+    sal_uInt16				GetCurRefDlgId() const					{ return nCurRefDlgId; }
 
     //virtuelle Methoden fuer den Optionendialog
-    virtual SfxItemSet*	 CreateItemSet( USHORT nId );
-    virtual void		 ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
-    virtual	SfxTabPage*	 CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet );
+    virtual SfxItemSet*	 CreateItemSet( sal_uInt16 nId );
+    virtual void		 ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
+    virtual	SfxTabPage*	 CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
 
     void                SetInSharedDocLoading( bool bNew )  { mbIsInSharedDocLoading = bNew; }
     bool                IsInSharedDocLoading() const        { return mbIsInSharedDocLoading; }
     void                SetInSharedDocSaving( bool bNew )   { mbIsInSharedDocSaving = bNew; }
     bool                IsInSharedDocSaving() const         { return mbIsInSharedDocSaving; }
 
-    SC_DLLPUBLIC BOOL   RegisterRefWindow( USHORT nSlotId, Window *pWnd );
-    SC_DLLPUBLIC BOOL   UnregisterRefWindow( USHORT nSlotId, Window *pWnd );
-    SC_DLLPUBLIC BOOL   IsAliveRefDlg( USHORT nSlotId, Window *pWnd );
-    SC_DLLPUBLIC Window * Find1RefWindow( USHORT nSlotId, Window *pWndAncestor );
+    SC_DLLPUBLIC sal_Bool   RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd );
+    SC_DLLPUBLIC sal_Bool   UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd );
+    SC_DLLPUBLIC sal_Bool   IsAliveRefDlg( sal_uInt16 nSlotId, Window *pWnd );
+    SC_DLLPUBLIC Window * Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor );
     SC_DLLPUBLIC Window * Find1RefWindow( Window *pWndAncestor );
 };
 
diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx
index a8edf87a1..e2e63e5b6 100644
--- a/sc/inc/scresid.hxx
+++ b/sc/inc/scresid.hxx
@@ -36,7 +36,7 @@
 class SC_DLLPUBLIC ScResId : public ResId
 {
  public:
-    ScResId( USHORT nId );		// in scdll.cxx
+    ScResId( sal_uInt16 nId );		// in scdll.cxx
 };
 
 
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index a80ad3cd9..bcc2b980b 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -76,7 +76,7 @@ private:
     ::com::sun::star::beans::XPropertyState*                                pShapePropertyState;
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo;
     com::sun::star::uno::Sequence< sal_Int8 >*                              pImplementationId;
-    BOOL																	bIsTextShape;
+    sal_Bool																	bIsTextShape;
     bool                                                                    bInitializedNotifier;
 
     SdrObject* GetSdrObject() const throw();
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 5d7a0986e..7f17bd0a7 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -46,22 +46,22 @@ struct SC_DLLPUBLIC ScSortParam
     SCROW		nRow1;
     SCCOL		nCol2;
     SCROW		nRow2;
-    BOOL		bHasHeader;
-    BOOL		bByRow;
-    BOOL		bCaseSens;
-    BOOL		bUserDef;
-    USHORT		nUserIndex;
-    BOOL		bIncludePattern;
-    BOOL		bInplace;
+    sal_Bool		bHasHeader;
+    sal_Bool		bByRow;
+    sal_Bool		bCaseSens;
+    sal_Bool		bUserDef;
+    sal_uInt16		nUserIndex;
+    sal_Bool		bIncludePattern;
+    sal_Bool		bInplace;
     SCTAB		nDestTab;
     SCCOL		nDestCol;
     SCROW		nDestRow;
-    BOOL		bDoSort[MAXSORT];
+    sal_Bool		bDoSort[MAXSORT];
     SCCOLROW	nField[MAXSORT];
-    BOOL		bAscending[MAXSORT];
+    sal_Bool		bAscending[MAXSORT];
     ::com::sun::star::lang::Locale		aCollatorLocale;
     String		aCollatorAlgorithm;
-    USHORT		nCompatHeader;
+    sal_uInt16		nCompatHeader;
 
     ScSortParam();
     ScSortParam( const ScSortParam& r );
@@ -71,7 +71,7 @@ struct SC_DLLPUBLIC ScSortParam
     ScSortParam( const ScQueryParam&, SCCOL nCol );
 
     ScSortParam&	operator=	( const ScSortParam& r );
-    BOOL			operator==	( const ScSortParam& rOther ) const;
+    sal_Bool			operator==	( const ScSortParam& rOther ) const;
     void			Clear		();
 
     void			MoveToDest();
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index 3cd66e4a3..8ef39c8ba 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -64,7 +64,7 @@ public:
     const String*		GetForceStdName() const	{ return pForceStdName; }
 
     virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam,
-                                     USHORT nMask = 0xffff, USHORT nPos = 0xffff );
+                                     sal_uInt16 nMask = 0xffff, sal_uInt16 nPos = 0xffff );
 
 protected:
     virtual 			~ScStyleSheetPool();
@@ -73,7 +73,7 @@ protected:
 
     virtual SfxStyleSheetBase* Create( const String&	rName,
                                        SfxStyleFamily	eFamily,
-                                       USHORT			nMask);
+                                       sal_uInt16			nMask);
     virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle );
 
 private:
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index aabaeb61b..c34b3c7e4 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -59,17 +59,17 @@ public:
 
                         ScStyleSheet( const ScStyleSheet& rStyle );
 
-    virtual BOOL		SetParent 		 ( const String& rParentName );
+    virtual sal_Bool		SetParent 		 ( const String& rParentName );
     virtual SfxItemSet& GetItemSet		 ();
-    virtual BOOL		IsUsed			 () const;
-    virtual BOOL		HasFollowSupport () const;
-    virtual BOOL		HasParentSupport () const;
+    virtual sal_Bool		IsUsed			 () const;
+    virtual sal_Bool		HasFollowSupport () const;
+    virtual sal_Bool		HasParentSupport () const;
 
     virtual const String& GetName() const;
     virtual const String& GetParent() const;
     virtual const String& GetFollow() const;
 
-    virtual BOOL SetName( const String& );
+    virtual sal_Bool SetName( const String& );
 
             void                SetUsage( ScStyleSheet::Usage eUse ) const
                                     { eUsage = eUse; }
@@ -82,7 +82,7 @@ protected:
                 ScStyleSheet( const String&		rName,
                               ScStyleSheetPool&	rPool,
                               SfxStyleFamily	eFamily,
-                              USHORT			nMask );
+                              sal_uInt16			nMask );
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 };
diff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxx
index 403eb6f19..cd8ed529c 100644
--- a/sc/inc/strload.hxx
+++ b/sc/inc/strload.hxx
@@ -34,7 +34,7 @@
 class ScRscStrLoader : public Resource
 {
 public:
-    ScRscStrLoader( USHORT nRsc, USHORT nStrId ) :
+    ScRscStrLoader( sal_uInt16 nRsc, sal_uInt16 nStrId ) :
         Resource( ScResId( nRsc ) ), theStr( ScResId( nStrId ) )
     {
         FreeResource();
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index cfb3145f4..3423e930d 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -56,8 +56,8 @@ class ScStyleObj;
 class ScStyleNameConversion
 {
 public:
-    static String DisplayToProgrammaticName( const String& rDispName, UINT16 nType );
-    static String ProgrammaticToDisplayName( const String& rProgName, UINT16 nType );
+    static String DisplayToProgrammaticName( const String& rDispName, sal_uInt16 nType );
+    static String ProgrammaticToDisplayName( const String& rProgName, sal_uInt16 nType );
 };
 
 
@@ -71,8 +71,8 @@ class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4<
 private:
     ScDocShell*				pDocShell;
 
-    ScStyleFamilyObj*		GetObjectByType_Impl(UINT16 Type) const;
-    ScStyleFamilyObj*		GetObjectByIndex_Impl(UINT32 nIndex) const;
+    ScStyleFamilyObj*		GetObjectByType_Impl(sal_uInt16 Type) const;
+    ScStyleFamilyObj*		GetObjectByIndex_Impl(sal_uInt32 nIndex) const;
     ScStyleFamilyObj*		GetObjectByName_Impl(const rtl::OUString& aName) const;
 
 public:
@@ -133,7 +133,7 @@ private:
     ScDocShell*				pDocShell;
     SfxStyleFamily 			eFamily;		// Familie
 
-    ScStyleObj*				GetObjectByIndex_Impl(UINT32 nIndex);
+    ScStyleObj*				GetObjectByIndex_Impl(sal_uInt32 nIndex);
     ScStyleObj*				GetObjectByName_Impl(const rtl::OUString& Name);
 
 public:
diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 21b26f65d..91c2e5536 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -34,9 +34,9 @@ class SubTotal
 {
 public:
 
-    static  BOOL SafePlus( double& fVal1, double fVal2);
-    static  BOOL SafeMult( double& fVal1, double fVal2);
-    static  BOOL SafeDiv( double& fVal1, double fVal2);
+    static  sal_Bool SafePlus( double& fVal1, double fVal2);
+    static  sal_Bool SafeMult( double& fVal1, double fVal2);
+    static  sal_Bool SafeDiv( double& fVal1, double fVal2);
 };
 
 
@@ -45,10 +45,10 @@ struct ScFunctionData					// zum Berechnen von einzelnen Funktionen
     ScSubTotalFunc	eFunc;
     double			nVal;
     long			nCount;
-    BOOL			bError;
+    sal_Bool			bError;
 
     ScFunctionData( ScSubTotalFunc eFn ) :
-        eFunc(eFn), nVal(0.0), nCount(0), bError(FALSE) {}
+        eFunc(eFn), nVal(0.0), nCount(0), bError(sal_False) {}
 };
 
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index a40dfaff3..cc9d66e06 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -86,6 +86,17 @@ class ScFlatBoolRowSegments;
 class ScFlatBoolColSegments;
 
 
+struct ScShowRowsEntry
+{
+    SCROW   mnRow1;
+    SCROW   mnRow2;
+    bool    mbShow;
+
+    ScShowRowsEntry( SCROW nR1, SCROW nR2, bool bS ) :
+        mnRow1(nR1), mnRow2(nR2), mbShow(bS) {}
+};
+
+
 class ScTable
 {
 private:
@@ -100,20 +111,20 @@ private:
     String			aName;
     String			aCodeName;
     String			aComment;
-    BOOL			bScenario;
-    BOOL			bLayoutRTL;
-    BOOL            bLoadingRTL;
+    sal_Bool			bScenario;
+    sal_Bool			bLayoutRTL;
+    sal_Bool            bLoadingRTL;
 
     String			aLinkDoc;
     String			aLinkFlt;
     String			aLinkOpt;
     String			aLinkTab;
-    ULONG			nLinkRefreshDelay;
-    BYTE			nLinkMode;
+    sal_uLong			nLinkRefreshDelay;
+    sal_uInt8			nLinkMode;
 
     // Seitenformatvorlage
     String			aPageStyle;
-    BOOL			bPageSizeValid;
+    sal_Bool			bPageSizeValid;
     Size			aPageSizeTwips;					// Groesse der Druck-Seite
     SCCOL			nRepeatStartX;					// Wiederholungszeilen/Spalten
     SCCOL			nRepeatEndX;					// REPEAT_NONE, wenn nicht benutzt
@@ -122,11 +133,11 @@ private:
 
     ::std::auto_ptr<ScTableProtection> pTabProtection;
 
-    USHORT*			pColWidth;
+    sal_uInt16*			pColWidth;
     ::boost::shared_ptr<ScFlatUInt16RowSegments> mpRowHeights;
 
-    BYTE*			pColFlags;
-    ScBitMaskCompressedArray< SCROW, BYTE>*     pRowFlags;
+    sal_uInt8*			pColFlags;
+    ScBitMaskCompressedArray< SCROW, sal_uInt8>*     pRowFlags;
     ::boost::shared_ptr<ScFlatBoolColSegments>  mpHiddenCols;
     ::boost::shared_ptr<ScFlatBoolRowSegments>  mpHiddenRows;
     ::boost::shared_ptr<ScFlatBoolColSegments>  mpFilteredCols;
@@ -143,16 +154,16 @@ private:
 
     SCCOL			nTableAreaX;
     SCROW			nTableAreaY;
-    BOOL			bTableAreaValid;
+    sal_Bool			bTableAreaValid;
 
                                             //	interne Verwaltung	------------------
-    BOOL			bVisible;
-    BOOL            bStreamValid;
-    BOOL            bPendingRowHeights;
-    BOOL            bCalcNotification;
+    sal_Bool			bVisible;
+    sal_Bool            bStreamValid;
+    sal_Bool            bPendingRowHeights;
+    sal_Bool            bCalcNotification;
 
     SCTAB			nTab;
-    USHORT			nRecalcLvl;				// Rekursionslevel Size-Recalc
+    sal_uInt16			nRecalcLvl;				// Rekursionslevel Size-Recalc
     ScDocument*		pDocument;
     utl::SearchParam*	pSearchParam;
     utl::TextSearch*	pSearchText;
@@ -164,22 +175,22 @@ private:
     // SortierParameter um den Stackbedarf von Quicksort zu Minimieren
     ScSortParam		aSortParam;
     CollatorWrapper*	pSortCollator;
-    BOOL			bGlobalKeepQuery;
-    BOOL			bSharedNameInserted;
+    sal_Bool			bGlobalKeepQuery;
+    sal_Bool			bSharedNameInserted;
 
     ScRangeVec      aPrintRanges;
-    BOOL            bPrintEntireSheet;
+    sal_Bool            bPrintEntireSheet;
 
     ScRange*		pRepeatColRange;
     ScRange*		pRepeatRowRange;
 
-    USHORT			nLockCount;
+    sal_uInt16			nLockCount;
 
     ScRangeList*	pScenarioRanges;
     Color			aScenarioColor;
     Color           aTabBgColor;
-    USHORT			nScenarioFlags;
-    BOOL			bActiveScenario;
+    sal_uInt16			nScenarioFlags;
+    sal_Bool			bActiveScenario;
     bool            mbPageBreaksValid;
 
 friend class ScDocument;					// fuer FillInfo
@@ -196,68 +207,68 @@ friend class ScAttrRectIterator;
 
 public:
                 ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
-                            BOOL bColInfo = TRUE, BOOL bRowInfo = TRUE );
+                            sal_Bool bColInfo = sal_True, sal_Bool bRowInfo = sal_True );
                 ~ScTable();
 
     ScOutlineTable*	GetOutlineTable()				{ return pOutlineTable; }
 
     SCSIZE      GetCellCount(SCCOL nCol) const;
-    ULONG		GetCellCount() const;
-    ULONG		GetWeightedCount() const;
-    ULONG		GetCodeCount() const;		// RPN-Code in Formeln
+    sal_uLong		GetCellCount() const;
+    sal_uLong		GetWeightedCount() const;
+    sal_uLong		GetCodeCount() const;		// RPN-Code in Formeln
 
-    BOOL		SetOutlineTable( const ScOutlineTable* pNewOutline );
+    sal_Bool		SetOutlineTable( const ScOutlineTable* pNewOutline );
     void		StartOutlineTable();
 
     void		DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
 
-    BOOL		TestRemoveSubTotals( const ScSubTotalParam& rParam );
+    sal_Bool		TestRemoveSubTotals( const ScSubTotalParam& rParam );
     void		RemoveSubTotals( ScSubTotalParam& rParam );
-    BOOL		DoSubTotals( ScSubTotalParam& rParam );
+    sal_Bool		DoSubTotals( ScSubTotalParam& rParam );
 
     const ScSheetEvents* GetSheetEvents() const              { return pSheetEvents; }
     void        SetSheetEvents( const ScSheetEvents* pNew );
 
-    BOOL		IsVisible() const							 { return bVisible; }
-    void		SetVisible( BOOL bVis );
+    sal_Bool		IsVisible() const							 { return bVisible; }
+    void		SetVisible( sal_Bool bVis );
 
-    BOOL        IsStreamValid() const                        { return bStreamValid; }
-    void        SetStreamValid( BOOL bSet, BOOL bIgnoreLock = FALSE );
+    sal_Bool        IsStreamValid() const                        { return bStreamValid; }
+    void        SetStreamValid( sal_Bool bSet, sal_Bool bIgnoreLock = sal_False );
 
-    BOOL        IsPendingRowHeights() const                  { return bPendingRowHeights; }
-    void        SetPendingRowHeights( BOOL bSet );
+    sal_Bool        IsPendingRowHeights() const                  { return bPendingRowHeights; }
+    void        SetPendingRowHeights( sal_Bool bSet );
 
-    BOOL        GetCalcNotification() const                  { return bCalcNotification; }
-    void        SetCalcNotification( BOOL bSet );
+    sal_Bool        GetCalcNotification() const                  { return bCalcNotification; }
+    void        SetCalcNotification( sal_Bool bSet );
 
-    BOOL        IsLayoutRTL() const                          { return bLayoutRTL; }
-    BOOL        IsLoadingRTL() const                         { return bLoadingRTL; }
-    void        SetLayoutRTL( BOOL bSet );
-    void        SetLoadingRTL( BOOL bSet );
+    sal_Bool        IsLayoutRTL() const                          { return bLayoutRTL; }
+    sal_Bool        IsLoadingRTL() const                         { return bLoadingRTL; }
+    void        SetLayoutRTL( sal_Bool bSet );
+    void        SetLoadingRTL( sal_Bool bSet );
 
-    BOOL		IsScenario() const							 { return bScenario; }
-    void		SetScenario( BOOL bFlag );
+    sal_Bool		IsScenario() const							 { return bScenario; }
+    void		SetScenario( sal_Bool bFlag );
     void 		GetScenarioComment( String& rComment) const	 { rComment = aComment; }
     void		SetScenarioComment( const String& rComment ) { aComment = rComment; }
     const Color& GetScenarioColor() const					 { return aScenarioColor; }
     void		SetScenarioColor(const Color& rNew)			 { aScenarioColor = rNew; }
     const Color& GetTabBgColor() const;
     void         SetTabBgColor(const Color& rColor);
-    USHORT		GetScenarioFlags() const					 { return nScenarioFlags; }
-    void		SetScenarioFlags(USHORT nNew)				 { nScenarioFlags = nNew; }
-    void		SetActiveScenario(BOOL bSet)				 { bActiveScenario = bSet; }
-    BOOL		IsActiveScenario() const					 { return bActiveScenario; }
+    sal_uInt16		GetScenarioFlags() const					 { return nScenarioFlags; }
+    void		SetScenarioFlags(sal_uInt16 nNew)				 { nScenarioFlags = nNew; }
+    void		SetActiveScenario(sal_Bool bSet)				 { bActiveScenario = bSet; }
+    sal_Bool		IsActiveScenario() const					 { return bActiveScenario; }
 
-    BYTE		GetLinkMode() const							{ return nLinkMode; }
-    BOOL		IsLinked() const							{ return nLinkMode != SC_LINK_NONE; }
+    sal_uInt8		GetLinkMode() const							{ return nLinkMode; }
+    sal_Bool		IsLinked() const							{ return nLinkMode != SC_LINK_NONE; }
     const String& GetLinkDoc() const						{ return aLinkDoc; }
     const String& GetLinkFlt() const						{ return aLinkFlt; }
     const String& GetLinkOpt() const						{ return aLinkOpt; }
     const String& GetLinkTab() const						{ return aLinkTab; }
-    ULONG		GetLinkRefreshDelay() const					{ return nLinkRefreshDelay; }
+    sal_uLong		GetLinkRefreshDelay() const					{ return nLinkRefreshDelay; }
 
-    void		SetLink( BYTE nMode, const String& rDoc, const String& rFlt,
-                        const String& rOpt, const String& rTab, ULONG nRefreshDelay );
+    void		SetLink( sal_uInt8 nMode, const String& rDoc, const String& rFlt,
+                        const String& rOpt, const String& rTab, sal_uLong nRefreshDelay );
 
     void		GetName( String& rName ) const;
     void		SetName( const String& rNewName );
@@ -271,7 +282,7 @@ public:
     void			SetPageStyle( const String& rName );
     void			PageStyleModified( const String& rNewName );
 
-    BOOL            IsProtected() const;
+    sal_Bool            IsProtected() const;
     void            SetProtection(const ScTableProtection* pProtect);
     ScTableProtection* GetProtection();
 
@@ -284,25 +295,25 @@ public:
     void		LockTable();
     void		UnlockTable();
 
-    BOOL		IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
-                        SCROW nRow2, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const;
-    BOOL		IsSelectionEditable( const ScMarkData& rMark,
-                        BOOL* pOnlyNotBecauseOfMatrix = NULL ) const;
+    sal_Bool		IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
+                        SCROW nRow2, sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+    sal_Bool		IsSelectionEditable( const ScMarkData& rMark,
+                        sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const;
 
-    BOOL		HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const;
-    BOOL		HasSelectionMatrixFragment( const ScMarkData& rMark ) const;
+    sal_Bool		HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const;
+    sal_Bool		HasSelectionMatrixFragment( const ScMarkData& rMark ) const;
 
-    BOOL		IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const;
+    sal_Bool		IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const;
 
     void		PutCell( const ScAddress&, ScBaseCell* pCell );
-//UNUSED2009-05 void		PutCell( const ScAddress&, ULONG nFormatIndex, ScBaseCell* pCell);
+//UNUSED2009-05 void		PutCell( const ScAddress&, sal_uLong nFormatIndex, ScBaseCell* pCell);
     void		PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell );
-    void		PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell);
-                //	TRUE = Zahlformat gesetzt
-    BOOL		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
+    void		PutCell(SCCOL nCol, SCROW nRow, sal_uLong nFormatIndex, ScBaseCell* pCell);
+                //	sal_True = Zahlformat gesetzt
+    sal_Bool		SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
                            SvNumberFormatter* pFormatter = NULL, bool bDetectNumberFormat = true );
     void		SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
-    void 		SetError( SCCOL nCol, SCROW nRow, USHORT nError);
+    void 		SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError);
 
     void		GetString( SCCOL nCol, SCROW nRow, String& rString );
     void		GetInputString( SCCOL nCol, SCROW nRow, String& rString );
@@ -314,7 +325,7 @@ public:
                     }
     double		GetValue( SCCOL nCol, SCROW nRow );
     void		GetFormula( SCCOL nCol, SCROW nRow, String& rFormula,
-                            BOOL bAsciiExport = FALSE );
+                            sal_Bool bAsciiExport = sal_False );
 
     CellType	GetCellType( const ScAddress& rPos ) const
                     {
@@ -346,53 +357,53 @@ public:
         @param bForced  True = always create all captions, false = skip when Undo is disabled. */
     void        InitializeNoteCaptions( bool bForced = false );
 
-    BOOL		TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize );
+    sal_Bool		TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize );
     void		InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize );
     void		DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize,
-                            BOOL* pUndoOutline = NULL );
+                            sal_Bool* pUndoOutline = NULL );
 
-    BOOL		TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize );
+    sal_Bool		TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize );
     void		InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize );
     void		DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize,
-                            BOOL* pUndoOutline = NULL );
+                            sal_Bool* pUndoOutline = NULL );
 
-    void		DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag);
+    void		DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nDelFlag);
     void		CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable,
-                            BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions);
+                            sal_Bool bKeepScenarioFlags, sal_Bool bCloneNoteCaptions);
     void        CopyToClip(const ScRangeList& rRanges, ScTable* pTable, 
                            bool bKeepScenarioFlags, bool bCloneNoteCaptions);
     void		CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy,
-                                USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScTable* pTable);
+                                sal_uInt16 nInsFlag, sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty, ScTable* pTable);
     void		StartListeningInArea( SCCOL nCol1, SCROW nRow1,
                                         SCCOL nCol2, SCROW nRow2 );
     void		BroadcastInArea( SCCOL nCol1, SCROW nRow1,
                                     SCCOL nCol2, SCROW nRow2 );
 
     void		CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                            USHORT nFlags, BOOL bMarked, ScTable* pDestTab,
+                            sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab,
                             const ScMarkData* pMarkData = NULL,
-                            BOOL bAsLink = FALSE, BOOL bColRowFlags = TRUE);
+                            sal_Bool bAsLink = sal_False, sal_Bool bColRowFlags = sal_True);
     void		UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                            USHORT nFlags, BOOL bMarked, ScTable* pDestTab,
+                            sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab,
                             const ScMarkData* pMarkData = NULL);
 
     void		TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                ScTable* pTransClip, USHORT nFlags, BOOL bAsLink );
+                                ScTable* pTransClip, sal_uInt16 nFlags, sal_Bool bAsLink );
 
                 //	Markierung von diesem Dokument
-    void		MixMarked( const ScMarkData& rMark, USHORT nFunction,
-                            BOOL bSkipEmpty, ScTable* pSrcTab );
+    void		MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
+                            sal_Bool bSkipEmpty, ScTable* pSrcTab );
     void		MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                            USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab );
+                            sal_uInt16 nFunction, sal_Bool bSkipEmpty, ScTable* pSrcTab );
 
     void		CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                             SCCOL nDestCol, SCROW nDestRow, SCTAB nDestTab );
 
     void		CopyScenarioFrom( const ScTable* pSrcTab );
     void		CopyScenarioTo( ScTable* pDestTab ) const;
-    BOOL		TestCopyScenarioTo( const ScTable* pDestTab ) const;
-    void		MarkScenarioIn( ScMarkData& rMark, USHORT nNeededBits ) const;
-    BOOL		HasScenarioRange( const ScRange& rRange ) const;
+    sal_Bool		TestCopyScenarioTo( const ScTable* pDestTab ) const;
+    void		MarkScenarioIn( ScMarkData& rMark, sal_uInt16 nNeededBits ) const;
+    sal_Bool		HasScenarioRange( const ScRange& rRange ) const;
     void		InvalidateScenarioRanges();
     const ScRangeList* GetScenarioRanges() const;
 
@@ -401,47 +412,48 @@ public:
     void        InvalidateTableArea();
     void        InvalidatePageBreaks();
 
-    BOOL		GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const;			// FALSE = leer
-    BOOL		GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const;
-    BOOL		GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const;
-    BOOL		GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
-                                SCCOL& rEndCol, BOOL bNotes ) const;
-    BOOL		GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
-                                SCROW& rEndRow, BOOL bNotes ) const;
+    sal_Bool		GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const;			// sal_False = leer
+    sal_Bool		GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const;
+    sal_Bool		GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bNotes ) const;
+    sal_Bool		GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
+                                SCCOL& rEndCol, sal_Bool bNotes ) const;
+    sal_Bool		GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
+                                SCROW& rEndRow, sal_Bool bNotes ) const;
 
-    BOOL		GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const;
+    sal_Bool		GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const;
 
     void		ExtendPrintArea( OutputDevice* pDev,
                         SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow );
 
     void        GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
-                             BOOL bIncludeOld, bool bOnlyDown ) const;
+                             sal_Bool bIncludeOld, bool bOnlyDown ) const;
 
-    bool		ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const;
+    bool        ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rStartRow,
+                                      SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const;
 
     SCSIZE	    GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
                                         SCCOL nEndCol, SCROW nEndRow, ScDirection eDir );
 
     void		FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY );
     void		GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
-                                BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark );
+                                sal_Bool bMarked, sal_Bool bUnprotected, const ScMarkData& rMark );
 
     void		LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow );
 
-    BOOL		HasData( SCCOL nCol, SCROW nRow );
-    BOOL		HasStringData( SCCOL nCol, SCROW nRow );
-    BOOL		HasValueData( SCCOL nCol, SCROW nRow );
-//UNUSED2008-05  USHORT		GetErrorData(SCCOL nCol, SCROW nRow) const;
-    BOOL		HasStringCells( SCCOL nStartCol, SCROW nStartRow,
+    sal_Bool		HasData( SCCOL nCol, SCROW nRow );
+    sal_Bool		HasStringData( SCCOL nCol, SCROW nRow );
+    sal_Bool		HasValueData( SCCOL nCol, SCROW nRow );
+//UNUSED2008-05  sal_uInt16		GetErrorData(SCCOL nCol, SCROW nRow) const;
+    sal_Bool		HasStringCells( SCCOL nStartCol, SCROW nStartRow,
                                 SCCOL nEndCol, SCROW nEndRow ) const;
 
-    USHORT		GetErrCode( const ScAddress& rPos ) const
+    sal_uInt16		GetErrCode( const ScAddress& rPos ) const
                     {
                         return ValidColRow(rPos.Col(),rPos.Row()) ? 
                             aCol[rPos.Col()].GetErrCode( rPos.Row() ) :
                             0;
                     }
-//UNUSED2008-05  USHORT		GetErrCode( SCCOL nCol, SCROW nRow ) const;
+//UNUSED2008-05  sal_uInt16		GetErrCode( SCCOL nCol, SCROW nRow ) const;
 
     void		ResetChanged( const ScRange& rRange );
 
@@ -458,7 +470,7 @@ public:
     void		UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                    ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE, bool bUpdateNoteCaptionPos = true );
+                                    ScDocument* pUndoDoc = NULL, sal_Bool bIncludeDraw = sal_True, bool bUpdateNoteCaptionPos = true );
 
     void		UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
@@ -471,18 +483,18 @@ public:
 
     void		UpdateInsertTab(SCTAB nTable);
 //UNUSED2008-05  void        UpdateInsertTabOnlyCells(SCTAB nTable);
-    void 		UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo = NULL );
+    void 		UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScTable* pRefUndo = NULL );
     void		UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress& );
-    void		UpdateCompile( BOOL bForceIfNameInUse = FALSE );
+    void		UpdateCompile( sal_Bool bForceIfNameInUse = sal_False );
     void		SetTabNo(SCTAB nNewTab);
-    BOOL		IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                 USHORT nIndex) const;
+    sal_Bool		IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                                 sal_uInt16 nIndex) const;
     void        FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                 std::set<USHORT>& rIndexes) const;
+                                 std::set<sal_uInt16>& rIndexes) const;
     void 		ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                       const ScRangeData::IndexMap& rMap );
     void		Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                        ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
+                        sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
                         double nStepValue, double nMaxValue);
     String		GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY );
 
@@ -491,10 +503,10 @@ public:
                         const ScMarkData& rMark );
 
     void		AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                    USHORT nFormatNo );
+                                    sal_uInt16 nFormatNo );
     void		GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData);
     void 		ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // aus sw
-    BOOL		SearchAndReplace(const SvxSearchItem& rSearchItem,
+    sal_Bool		SearchAndReplace(const SvxSearchItem& rSearchItem,
                                 SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
                                 String& rUndoStr, ScDocument* pUndoDoc);
 
@@ -504,27 +516,27 @@ public:
                                 const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop,
                                 const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const;
 
-//UNUSED2009-05 BOOL		HasLines( const ScRange& rRange, Rectangle& rSizes ) const;
-    bool        HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nMask ) const;
-    BOOL		HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const;
-    BOOL		ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
+//UNUSED2009-05 sal_Bool		HasLines( const ScRange& rRange, Rectangle& rSizes ) const;
+    bool        HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nMask ) const;
+    sal_Bool		HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const;
+    sal_Bool		ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
                                 SCCOL& rEndCol, SCROW& rEndRow,
-                                BOOL bRefresh, BOOL bAttrs );
-    const SfxPoolItem*		GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const;
+                                sal_Bool bRefresh, sal_Bool bAttrs );
+    const SfxPoolItem*		GetAttr( SCCOL nCol, SCROW nRow, sal_uInt16 nWhich ) const;
     const ScPatternAttr*	GetPattern( SCCOL nCol, SCROW nRow ) const;
     const ScPatternAttr*    GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const;
 
-    ULONG					GetNumberFormat( const ScAddress& rPos ) const
+    sal_uLong					GetNumberFormat( const ScAddress& rPos ) const
                                 {
                                     return ValidColRow(rPos.Col(),rPos.Row()) ? 
                                         aCol[rPos.Col()].GetNumberFormat( rPos.Row() ) :
                                         0;
                                 }
-    ULONG					GetNumberFormat( SCCOL nCol, SCROW nRow ) const;
+    sal_uLong					GetNumberFormat( SCCOL nCol, SCROW nRow ) const;
     void					MergeSelectionPattern( ScMergePatternState& rState,
-                                                const ScMarkData& rMark, BOOL bDeep ) const;
+                                                const ScMarkData& rMark, sal_Bool bDeep ) const;
     void					MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1,
-                                                SCCOL nCol2, SCROW nRow2, BOOL bDeep ) const;
+                                                SCCOL nCol2, SCROW nRow2, sal_Bool bDeep ) const;
     void					MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
                                             ScLineFlags& rFlags,
                                             SCCOL nStartCol, SCROW nStartRow,
@@ -537,12 +549,12 @@ public:
     void		ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr );
     void		ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr );
     void		ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr );
-    void		SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE )
+    void		SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, sal_Bool bPutToPool = sal_False )
                     {
                         if (ValidColRow(rPos.Col(),rPos.Row()))
                             aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, bPutToPool );
                     }
-    void		SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE );
+    void		SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, sal_Bool bPutToPool = sal_False );
     void		ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
                             const ScPatternAttr& rPattern, short nNewType );
 
@@ -550,38 +562,38 @@ public:
     void		ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle );
     void		ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark);
     void		ApplySelectionLineStyle( const ScMarkData& rMark,
-                                    const SvxBorderLine* pLine, BOOL bColorOnly );
+                                    const SvxBorderLine* pLine, sal_Bool bColorOnly );
 
     const ScStyleSheet*	GetStyle( SCCOL nCol, SCROW nRow ) const;
-    const ScStyleSheet*	GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const;
-    const ScStyleSheet*	GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1,
+    const ScStyleSheet*	GetSelectionStyle( const ScMarkData& rMark, sal_Bool& rFound ) const;
+    const ScStyleSheet*	GetAreaStyle( sal_Bool& rFound, SCCOL nCol1, SCROW nRow1,
                                                     SCCOL nCol2, SCROW nRow2 ) const;
 
-    void		StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved,
+    void		StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool bRemoved,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY );
 
-    BOOL		IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
+    sal_Bool		IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const;
 
-    BOOL		ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags );
-    BOOL		RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags );
+    sal_Bool		ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags );
+    sal_Bool		RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags );
 
     void		ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark );
-    void        DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
+    void        DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark );
 
-    void		ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
-    void		ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark );
+    void		ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
+    void		ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark );
 
     const ScRange*	GetRepeatColRange() const	{ return pRepeatColRange; }
     const ScRange*	GetRepeatRowRange() const	{ return pRepeatRowRange; }
     void			SetRepeatColRange( const ScRange* pNew );
     void			SetRepeatRowRange( const ScRange* pNew );
 
-    USHORT          GetPrintRangeCount() const          { return static_cast< USHORT >( aPrintRanges.size() ); }
-    const ScRange*	GetPrintRange(USHORT nPos) const;
+    sal_uInt16          GetPrintRangeCount() const          { return static_cast< sal_uInt16 >( aPrintRanges.size() ); }
+    const ScRange*	GetPrintRange(sal_uInt16 nPos) const;
     /** Returns true, if the sheet is always printed. */
-    BOOL            IsPrintEntireSheet() const          { return bPrintEntireSheet; }
+    sal_Bool            IsPrintEntireSheet() const          { return bPrintEntireSheet; }
 
     /** Removes all print ranges. */
     void            ClearPrintRanges();
@@ -595,25 +607,25 @@ public:
     void			FillPrintSaver( ScPrintSaverTab& rSaveTab ) const;
     void			RestorePrintRanges( const ScPrintSaverTab& rSaveTab );
 
-    USHORT		GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
+    sal_uInt16		GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bFormula, const ScMarkData* pMarkData,
-                                    BOOL bSimpleTextImport );
-    BOOL		SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
+                                    sal_Bool bFormula, const ScMarkData* pMarkData,
+                                    sal_Bool bSimpleTextImport );
+    sal_Bool		SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtra,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bForce,
-                                    ScProgress* pOuterProgress = NULL, ULONG nProgressStart = 0 );
+                                    sal_Bool bForce,
+                                    ScProgress* pOuterProgress = NULL, sal_uLong nProgressStart = 0 );
     long		GetNeededSize( SCCOL nCol, SCROW nRow,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bWidth, BOOL bTotalSize );
-    void		SetColWidth( SCCOL nCol, USHORT nNewWidth );
-    void		SetRowHeight( SCROW nRow, USHORT nNewHeight );
-    BOOL		SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight,
+                                    sal_Bool bWidth, sal_Bool bTotalSize );
+    void		SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth );
+    void		SetRowHeight( SCROW nRow, sal_uInt16 nNewHeight );
+    sal_Bool		SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight,
                                     double nPPTX, double nPPTY );
 
     /** 
@@ -623,17 +635,17 @@ public:
      * Note that setting a new row height via this function will not 
      * invalidate page breaks. 
      */
-    void        SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight );
+    void        SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight );
 
                         // nPPT fuer Test auf Veraenderung
-    void		SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual );
+    void		SetManualHeight( SCROW nStartRow, SCROW nEndRow, sal_Bool bManual );
 
-    USHORT		GetColWidth( SCCOL nCol ) const;
-    SC_DLLPUBLIC USHORT GetRowHeight( SCROW nRow, SCROW* pStartRow = NULL, SCROW* pEndRow = NULL, bool bHiddenAsZero = true ) const;
-    ULONG		GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const;
-    ULONG		GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const;
-    ULONG		GetColOffset( SCCOL nCol ) const;
-    ULONG		GetRowOffset( SCROW nRow ) const;
+    sal_uInt16		GetColWidth( SCCOL nCol ) const;
+    SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow = NULL, SCROW* pEndRow = NULL, bool bHiddenAsZero = true ) const;
+    sal_uLong		GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const;
+    sal_uLong		GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const;
+    sal_uLong		GetColOffset( SCCOL nCol ) const;
+    sal_uLong		GetRowOffset( SCROW nRow ) const;
 
     /** 
      * Get the last row such that the height of row 0 to the end row is as 
@@ -643,12 +655,12 @@ public:
      * 
      * @return SCROW last row of the range within specified height.
      */
-    SCROW       GetRowForHeight(ULONG nHeight) const;
+    SCROW       GetRowForHeight(sal_uLong nHeight) const;
 
-    USHORT		GetOriginalWidth( SCCOL nCol ) const;
-    USHORT		GetOriginalHeight( SCROW nRow ) const;
+    sal_uInt16		GetOriginalWidth( SCCOL nCol ) const;
+    sal_uInt16		GetOriginalHeight( SCROW nRow ) const;
 
-    USHORT		GetCommonWidth( SCCOL nEndCol );
+    sal_uInt16		GetCommonWidth( SCCOL nEndCol );
 
     SCROW		GetHiddenRowCount( SCROW nRow );
 
@@ -657,11 +669,11 @@ public:
     void		DBShowRow(SCROW nRow, bool bShow);
 
     void		ShowRows(SCROW nRow1, SCROW nRow2, bool bShow);
-    void		DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow);
+    void        DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bSetFlags);   // if bSetFlags=false, no SetRowHidden/SetRowFiltered
 
-    void		SetColFlags( SCCOL nCol, BYTE nNewFlags );
-    void		SetRowFlags( SCROW nRow, BYTE nNewFlags );
-    void		SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags );
+    void		SetColFlags( SCCOL nCol, sal_uInt8 nNewFlags );
+    void		SetRowFlags( SCROW nRow, sal_uInt8 nNewFlags );
+    void		SetRowFlags( SCROW nStartRow, SCROW nEndRow, sal_uInt8 nNewFlags );
 
                 /// @return  the index of the last row with any set flags (auto-pagebreak is ignored).
     SCROW      GetLastFlaggedRow() const;
@@ -671,18 +683,18 @@ public:
                 /// @return  the index of the last changed row (flags and row height, auto pagebreak is ignored).
     SCROW      GetLastChangedRow() const;
 
-    BYTE		GetColFlags( SCCOL nCol ) const;
-    BYTE		GetRowFlags( SCROW nRow ) const;
+    sal_uInt8		GetColFlags( SCCOL nCol ) const;
+    sal_uInt8		GetRowFlags( SCROW nRow ) const;
 
-    const ScBitMaskCompressedArray< SCROW, BYTE> * GetRowFlagsArray() const
+    const ScBitMaskCompressedArray< SCROW, sal_uInt8> * GetRowFlagsArray() const
                     { return pRowFlags; }
 
-    BOOL		UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow );
-    BOOL		UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow );
+    sal_Bool		UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, sal_Bool bShow );
+    sal_Bool		UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, sal_Bool bShow );
 
     void		UpdatePageBreaks( const ScRange* pUserArea );
     void		RemoveManualBreaks();
-    BOOL		HasManualBreaks() const;
+    sal_Bool		HasManualBreaks() const;
     void        SetRowManualBreaks( const ::std::set<SCROW>& rBreaks );
     void        SetColManualBreaks( const ::std::set<SCCOL>& rBreaks );
 
@@ -746,20 +758,20 @@ public:
     void		StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
     void		ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
 
-    void		Sort(const ScSortParam& rSortParam, BOOL bKeepQuery);
-    BOOL        ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam,
-                    BOOL* pSpecial = NULL, ScBaseCell* pCell = NULL,
-                    BOOL* pbTestEqualCondition = NULL );
+    void		Sort(const ScSortParam& rSortParam, sal_Bool bKeepQuery);
+    sal_Bool        ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam,
+                    sal_Bool* pSpecial = NULL, ScBaseCell* pCell = NULL,
+                    sal_Bool* pbTestEqualCondition = NULL );
     void		TopTenQuery( ScQueryParam& );
-    SCSIZE		Query(ScQueryParam& rQueryParam, BOOL bKeepSub);
-    BOOL		CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
+    SCSIZE		Query(ScQueryParam& rQueryParam, sal_Bool bKeepSub);
+    sal_Bool		CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
 
     void        GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates);
     void        GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates );
-    BOOL		GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
+    sal_Bool		GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, sal_Bool bLimit);
 
-    BOOL		HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
-    BOOL		HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
+    sal_Bool		HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
+    sal_Bool		HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
 
     void		DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd );
 
@@ -770,60 +782,60 @@ public:
                                        SCCOL nCol,
                                        SCROW nRowStart, SCROW nRowEnd ) const;
 
-    void		FindConditionalFormat( ULONG nKey, ScRangeList& rRanges );
+    void		FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges );
 
     void		IncRecalcLevel() { ++nRecalcLvl; }
     void		DecRecalcLevel( bool bUpdateNoteCaptionPos = true ) { if (!--nRecalcLvl) SetDrawPageSize(true, bUpdateNoteCaptionPos); }
 
-    BOOL		IsSortCollatorGlobal() const;
+    sal_Bool		IsSortCollatorGlobal() const;
     void		InitSortCollator( const ScSortParam& rPar );
     void		DestroySortCollator();
 
 private:
     void		FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd,
+                                sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd,
                                 FillDateCmd eFillDateCmd,
-                                double nStepValue, double nMaxValue, USHORT nMinDigits,
-                                BOOL bAttribs, ScProgress& rProgress );
+                                double nStepValue, double nMaxValue, sal_uInt16 nMinDigits,
+                                sal_Bool bAttribs, ScProgress& rProgress );
     void		FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 FillCmd& rCmd, FillDateCmd& rDateCmd,
-                                double& rInc, USHORT& rMinDigits,
-                                ScUserListData*& rListData, USHORT& rListIndex);
+                                double& rInc, sal_uInt16& rMinDigits,
+                                ScUserListData*& rListData, sal_uInt16& rListIndex);
     void		FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                        ULONG nFillCount, FillDir eFillDir, ScProgress& rProgress );
+                        sal_uLong nFillCount, FillDir eFillDir, ScProgress& rProgress );
 
-    BOOL		ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
-                                BOOL bMarked, BOOL bUnprotected );
+    sal_Bool		ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
+                                sal_Bool bMarked, sal_Bool bUnprotected );
 
     void		AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                const ScPatternAttr& rAttr, USHORT nFormatNo);
-    void 		GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData);
-    void		GetAutoFormatFrame(SCCOL nCol, SCROW nRow, USHORT nFlags, USHORT nIndex, ScAutoFormatData& rData);
-    BOOL 		SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
+                                const ScPatternAttr& rAttr, sal_uInt16 nFormatNo);
+    void 		GetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, ScAutoFormatData& rData);
+    void		GetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, sal_uInt16 nIndex, ScAutoFormatData& rData);
+    sal_Bool 		SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
                             const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc);
-    BOOL		Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+    sal_Bool		Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                         const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc);
-    BOOL		SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+    sal_Bool		SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
                         String& rUndoStr, ScDocument* pUndoDoc);
-    BOOL		Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+    sal_Bool		Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                         const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc);
-    BOOL		ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+    sal_Bool		ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
                             String& rUndoStr, ScDocument* pUndoDoc);
 
-    BOOL		SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+    sal_Bool		SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                                 ScMarkData& rMark);
-    BOOL		ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
-                                ScMarkData& rMark, BOOL bIsUndo);
-    BOOL		SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark);
-    BOOL		ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+    sal_Bool		ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+                                ScMarkData& rMark, sal_Bool bIsUndo);
+    sal_Bool		SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark);
+    sal_Bool		ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
                                 ScDocument* pUndoDoc);
 
                                 // benutzen globalen SortParam:
-    BOOL		IsSorted(SCCOLROW nStart, SCCOLROW nEnd);
+    sal_Bool		IsSorted(SCCOLROW nStart, SCCOLROW nEnd);
     void		DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 );
     void		SwapCol(SCCOL nCol1, SCCOL nCol2);
     void		SwapRow(SCROW nRow1, SCROW nRow2);
-    short 		CompareCell( USHORT nSort,
+    short 		CompareCell( sal_uInt16 nSort,
                     ScBaseCell* pCell1, SCCOL nCell1Col, SCROW nCell1Row,
                     ScBaseCell* pCell2, SCCOL nCell2Col, SCROW nCell2Row );
     short		Compare(SCCOLROW nIndex1, SCCOLROW nIndex2);
@@ -832,26 +844,26 @@ private:
     void		QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
     void		SortReorder( ScSortInfoArray*, ScProgress& );
 
-    BOOL 		CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
-    BOOL 		CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
+    sal_Bool 		CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
+    sal_Bool 		CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
     void 		GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr);
 
-    BOOL		RefVisible(ScFormulaCell* pCell);
+    sal_Bool		RefVisible(ScFormulaCell* pCell);
 
-    BOOL		IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol);
+    sal_Bool		IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol);
 
-    void 		IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateCmd eCmd);
-    void		FillFormula(ULONG& nFormulaCounter, BOOL bFirst, ScFormulaCell* pSrcCell,
-                            SCCOL nDestCol, SCROW nDestRow, BOOL bLast );
+    void 		IncDate(double& rVal, sal_uInt16& nDayOfMonth, double nStep, FillDateCmd eCmd);
+    void		FillFormula(sal_uLong& nFormulaCounter, sal_Bool bFirst, ScFormulaCell* pSrcCell,
+                            SCCOL nDestCol, SCROW nDestRow, sal_Bool bLast );
     void		UpdateInsertTabAbs(SCTAB nNewPos);
-    BOOL 		GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel,
+    sal_Bool 		GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, sal_Bool bInSel,
                                     const ScMarkData& rMark) const;
-    BOOL		GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark );
+    sal_Bool		GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark );
     void        SetDrawPageSize( bool bResetStreamValid = true, bool bUpdateNoteCaptionPos = true );
-    BOOL		TestTabRefAbs(SCTAB nTable);
+    sal_Bool		TestTabRefAbs(SCTAB nTable);
     void 		CompileDBFormula();
-    void 		CompileDBFormula( BOOL bCreateFormulaString );
-    void 		CompileNameFormula( BOOL bCreateFormulaString );
+    void 		CompileDBFormula( sal_Bool bCreateFormulaString );
+    void 		CompileNameFormula( sal_Bool bCreateFormulaString );
     void 		CompileColRowNameFormula();
 
     void		StartListening( const ScAddress& rAddress, SvtListener* pListener );
@@ -869,7 +881,7 @@ private:
     // idle calculation of OutputDevice text width for cell
     // also invalidates script type, broadcasts for "calc as shown"
     void        InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
-                                     BOOL bNumFormatChanged, BOOL bBroadcast );
+                                     sal_Bool bNumFormatChanged, sal_Bool bBroadcast );
 
     /** 
      * In case the cell text goes beyond the column width, move the max column 
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 10762d551..aafb17d8b 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -48,17 +48,17 @@ private:
     String          aFileName;
     String          aFilterName;
     String          aOptions;
-    BOOL            bInCreate;
-    BOOL            bInEdit;
-    BOOL            bAddUndo;
-    BOOL            bDoPaint;
+    sal_Bool            bInCreate;
+    sal_Bool            bInEdit;
+    sal_Bool            bAddUndo;
+    sal_Bool            bDoPaint;
 
 public:
     TYPEINFO();
     ScTableLink( ScDocShell* pDocSh, const String& rFile,
-                    const String& rFilter, const String& rOpt, ULONG nRefresh );
+                    const String& rFilter, const String& rOpt, sal_uLong nRefresh );
     ScTableLink( SfxObjectShell* pShell, const String& rFile,
-                    const String& rFilter, const String& rOpt, ULONG nRefresh );
+                    const String& rFilter, const String& rOpt, sal_uLong nRefresh );
     virtual ~ScTableLink();
     virtual void Closed();
     virtual void DataChanged( const String& rMimeType,
@@ -66,17 +66,17 @@ public:
 
     virtual void    Edit( Window*, const Link& rEndEditHdl );
 
-    BOOL	Refresh(const String& rNewFile, const String& rNewFilter,
-                    const String* pNewOptions /* = NULL */, ULONG nNewRefresh );
-    void	SetInCreate(BOOL bSet)		{ bInCreate = bSet; }
-    void	SetAddUndo(BOOL bSet)		{ bAddUndo = bSet; }
-    void	SetPaint(BOOL bSet)			{ bDoPaint = bSet; }
+    sal_Bool	Refresh(const String& rNewFile, const String& rNewFilter,
+                    const String* pNewOptions /* = NULL */, sal_uLong nNewRefresh );
+    void	SetInCreate(sal_Bool bSet)		{ bInCreate = bSet; }
+    void	SetAddUndo(sal_Bool bSet)		{ bAddUndo = bSet; }
+    void	SetPaint(sal_Bool bSet)			{ bDoPaint = bSet; }
 
     const String& GetFileName() const	{ return aFileName; }
     const String& GetFilterName() const	{ return aFilterName; }
     const String& GetOptions() const	{ return aOptions; }
 
-    BOOL	IsUsed() const;
+    sal_Bool	IsUsed() const;
 
     DECL_LINK( RefreshHdl, ScTableLink* );
     DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* );
@@ -95,11 +95,11 @@ private:
 public:
                         ScDocumentLoader( const String& rFileName,
                                             String& rFilterName, String& rOptions,
-                                            UINT32 nRekCnt = 0, BOOL bWithInteraction = FALSE );
+                                            sal_uInt32 nRekCnt = 0, sal_Bool bWithInteraction = sal_False );
                         ~ScDocumentLoader();
     ScDocument*			GetDocument();
     ScDocShell*			GetDocShell()		{ return pDocShell; }
-    BOOL				IsError() const;
+    sal_Bool				IsError() const;
     String				GetTitle() const;
 
     void				ReleaseDocRef();	// without calling DoClose
@@ -110,10 +110,10 @@ public:
         @param bWithContent
             true = Tries to detect the filter by looking at the file contents.
             false = Detects filter by file name extension only (should be used in filter code only).
-        @return TRUE if a filter could be found, FALSE otherwise. */
-    static BOOL			GetFilterName( const String& rFileName,
+        @return sal_True if a filter could be found, sal_False otherwise. */
+    static sal_Bool			GetFilterName( const String& rFileName,
                                         String& rFilter, String& rOptions,
-                                        BOOL bWithContent, BOOL bWithInteraction );
+                                        sal_Bool bWithContent, sal_Bool bWithInteraction );
 
     static void			RemoveAppPrefix( String& rFilterName );
 };
diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx
index 6126abce1..76f1cf361 100644
--- a/sc/inc/tabopparams.hxx
+++ b/sc/inc/tabopparams.hxx
@@ -44,14 +44,14 @@ struct ScInterpreterTableOpParams
     ScAddress   aFormulaPos;
     ::std::vector< ScFormulaCell* > aNotifiedFormulaCells;
     ::std::vector< ScAddress >      aNotifiedFormulaPos;
-    BOOL        bValid;
-    BOOL        bRefresh;
-    BOOL        bCollectNotifications;
+    sal_Bool        bValid;
+    sal_Bool        bRefresh;
+    sal_Bool        bCollectNotifications;
 
     ScInterpreterTableOpParams()
-            : bValid( FALSE )
-            , bRefresh( FALSE )
-            , bCollectNotifications( TRUE )
+            : bValid( sal_False )
+            , bRefresh( sal_False )
+            , bCollectNotifications( sal_True )
     {
     }
 
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index d7a701e00..6666cee7c 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -90,7 +90,7 @@ public:
     void					AddListener( SfxListener& rListener );
     void					RemoveListener( SfxListener& rListener );
 
-    void					UpdateText( USHORT nPart, EditEngine& rSource );
+    void					UpdateText( sal_uInt16 nPart, EditEngine& rSource );
 
                             // XHeaderFooterContent
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL
@@ -125,15 +125,15 @@ class ScHeaderFooterTextData : public SfxListener
 {
 private:
     ScHeaderFooterContentObj&	rContentObj;
-    USHORT						nPart;
+    sal_uInt16						nPart;
     ScEditEngineDefaulter*		pEditEngine;
     SvxEditEngineForwarder*		pForwarder;
-    BOOL						bDataValid;
-    BOOL						bInUpdate;
+    sal_Bool						bDataValid;
+    sal_Bool						bInUpdate;
 
 public:
                             ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent,
-                                                    USHORT nP );
+                                                    sal_uInt16 nP );
                             ~ScHeaderFooterTextData();
 
     virtual void			Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -143,7 +143,7 @@ public:
     void					UpdateData();
     ScEditEngineDefaulter*	GetEditEngine() { GetTextForwarder(); return pEditEngine; }
 
-    USHORT					GetPart() const			{ return nPart; }
+    sal_uInt16					GetPart() const			{ return nPart; }
     ScHeaderFooterContentObj& GetContentObj() const	{ return rContentObj; }
 };
 
@@ -164,7 +164,7 @@ private:
 
 public:
                             ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent,
-                                                    USHORT nP );
+                                                    sal_uInt16 nP );
     virtual					~ScHeaderFooterTextObj();
 
     const SvxUnoText&		GetUnoText();
@@ -376,10 +376,10 @@ protected:
     ScFieldEditEngine*		pEditEngine;
     SvxEditEngineForwarder*	pForwarder;
     ScSharedCellEditSource*	pOriginalSource;
-    BOOL					bDataValid;
-    BOOL					bInUpdate;
-    BOOL					bDirty;
-    BOOL					bDoUpdate;
+    sal_Bool					bDataValid;
+    sal_Bool					bInUpdate;
+    sal_Bool					bDirty;
+    sal_Bool					bDoUpdate;
 
 protected:
     virtual void            GetCellText(const ScAddress& rCellPos, String& rText);
@@ -401,9 +401,9 @@ public:
     ScDocShell*				GetDocShell() const		{ return pDocShell; }
     const ScAddress&		GetCellPos() const		{ return aCellPos; }
 
-    void					SetDirty(BOOL bValue)	{ bDirty = bValue; }
-    BOOL					IsDirty() const			{ return bDirty; }
-    void					SetDoUpdate(BOOL bValue)	{ bDoUpdate = bValue; }
+    void					SetDirty(sal_Bool bValue)	{ bDirty = bValue; }
+    sal_Bool					IsDirty() const			{ return bDirty; }
+    void					SetDoUpdate(sal_Bool bValue)	{ bDoUpdate = bValue; }
 };
 
 class ScCellTextObj : public ScCellTextData, public SvxUnoText
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 8bb6ca02b..37af4f469 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -103,8 +103,8 @@ public:
     virtual const ScRefList*    GetRefList() const;
     virtual       ScRefList*    GetRefList();
 
-    virtual BOOL                TextEqual( const formula::FormulaToken& rToken ) const;
-    virtual BOOL                Is3DRef() const;    // reference with 3D flag set
+    virtual sal_Bool                TextEqual( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                Is3DRef() const;    // reference with 3D flag set
 
     /** If rTok1 and rTok2 both are SingleRef or DoubleRef tokens, extend/merge
         ranges as needed for ocRange.
@@ -112,7 +112,7 @@ public:
             The formula's position, used to calculate absolute positions from
             relative references.
         @param bReuseDoubleRef
-            If TRUE, a DoubleRef token is reused if passed as rTok1 or rTok2,
+            If sal_True, a DoubleRef token is reused if passed as rTok1 or rTok2,
             else a new DoubleRef token is created and returned.
         @return
             A reused or new'ed ScDoubleRefToken, or a NULL TokenRef if rTok1 or
@@ -134,7 +134,7 @@ public:
     virtual ScSingleRefData&      GetSingleRef();
     virtual void                CalcAbsIfRel( const ScAddress& );
     virtual void                CalcRelFromAbs( const ScAddress& );
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScSingleRefToken(*this); }
 
     DECL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken );
@@ -163,7 +163,7 @@ public:
     virtual ScSingleRefData&      GetSingleRef2();
     virtual void                CalcAbsIfRel( const ScAddress& );
     virtual void                CalcRelFromAbs( const ScAddress& );
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScDoubleRefToken(*this); }
 
     DECL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken );
@@ -180,7 +180,7 @@ public:
                                     ScToken( r ), pMatrix( r.pMatrix ) {}
     virtual const ScMatrix*     GetMatrix() const;
     virtual ScMatrix*           GetMatrix();
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScMatrixToken(*this); }
 };
 
@@ -198,13 +198,13 @@ public:
                                 ScExternalSingleRefToken( const ScExternalSingleRefToken& r );
     virtual                     ~ScExternalSingleRefToken();
 
-    virtual USHORT                  GetIndex() const;
+    virtual sal_uInt16                  GetIndex() const;
     virtual const String&           GetString() const;
     virtual const ScSingleRefData&  GetSingleRef() const;
     virtual ScSingleRefData&          GetSingleRef();
     virtual void                CalcAbsIfRel( const ScAddress& );
     virtual void                CalcRelFromAbs( const ScAddress& );
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScExternalSingleRefToken(*this); }
 };
 
@@ -222,7 +222,7 @@ public:
                                 ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r );
     virtual                     ~ScExternalDoubleRefToken();
 
-    virtual USHORT                 GetIndex() const;
+    virtual sal_uInt16                 GetIndex() const;
     virtual const String&          GetString() const;
     virtual const ScSingleRefData& GetSingleRef() const;
     virtual ScSingleRefData&       GetSingleRef();
@@ -232,7 +232,7 @@ public:
     virtual ScComplexRefData&      GetDoubleRef();
     virtual void                CalcAbsIfRel( const ScAddress& );
     virtual void                CalcRelFromAbs( const ScAddress& );
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScExternalDoubleRefToken(*this); }
 };
 
@@ -248,9 +248,9 @@ public:
                                 ScExternalNameToken( sal_uInt16 nFileId, const String& rName );
                                 ScExternalNameToken( const ScExternalNameToken& r );
     virtual                     ~ScExternalNameToken();
-    virtual USHORT              GetIndex() const;
+    virtual sal_uInt16              GetIndex() const;
     virtual const String&       GetString() const;
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScExternalNameToken(*this); }
 };
 
@@ -268,7 +268,7 @@ public:
                                     ScToken( r ), pJumpMatrix( r.pJumpMatrix ) {}
     virtual                     ~ScJumpMatrixToken();
     virtual ScJumpMatrix*       GetJumpMatrix() const;
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScJumpMatrixToken(*this); }
 };
 
@@ -288,7 +288,7 @@ public:
     virtual void                CalcRelFromAbs( const ScAddress& );
     virtual const ScRefList*    GetRefList() const;
     virtual       ScRefList*    GetRefList();
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScRefListToken(*this); }
 };
 
@@ -310,7 +310,7 @@ public:
             bool                IsDisplayedAsString() const { return bDisplayedAsString; }
     virtual double              GetDouble() const;
     virtual const String &      GetString() const;
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScEmptyCellToken(*this); }
 };
 
@@ -335,7 +335,7 @@ public:
     virtual double              GetDouble() const;
     virtual const String &      GetString() const;
     virtual const ScMatrix*     GetMatrix() const;
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScMatrixCellResultToken(*this); }
     formula::StackVar           GetUpperLeftType() const
                                     {
@@ -372,7 +372,7 @@ public:
                                         if (xUpperLeft)
                                             xUpperLeft = xUpperLeft->Clone();
                                     }
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScMatrixFormulaCellToken(*this); }
             void                SetMatColsRows( SCCOL nC, SCROW nR )
                                     {
@@ -436,7 +436,7 @@ public:
             const String &      GetFormula() const  { return aFormula; }
     virtual double              GetDouble() const;
     virtual const String &      GetString() const;
-    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
+    virtual sal_Bool                operator==( const formula::FormulaToken& rToken ) const;
     virtual FormulaToken*       Clone() const { return new ScHybridCellToken(*this); }
 };
 
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index da6031e04..53cccde6f 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -41,7 +41,7 @@ class ScMatrix;
 class SC_DLLPUBLIC ScTokenArray : public formula::FormulaTokenArray
 {
     friend class ScCompiler;
-    BOOL                    ImplGetReference( ScRange& rRange, BOOL bValidOnly ) const;
+    sal_Bool                    ImplGetReference( ScRange& rRange, sal_Bool bValidOnly ) const;
 
 public:
     ScTokenArray();
@@ -51,15 +51,15 @@ public:
     ScTokenArray* Clone() const;    /// True copy!
 
     /// Exactly and only one range (valid or deleted)
-    BOOL    IsReference( ScRange& rRange ) const;
+    sal_Bool    IsReference( ScRange& rRange ) const;
     /// Exactly and only one valid range (no #REF!s)
-    BOOL    IsValidReference( ScRange& rRange ) const;
+    sal_Bool    IsValidReference( ScRange& rRange ) const;
 
 
                             /** Determines the extent of direct adjacent
                                 references. Only use with real functions, e.g.
                                 GetOuterFuncOpCode() == ocSum ! */
-    BOOL                    GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, 
+    sal_Bool                    GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, 
                                 const ScAddress& rPos, ScDirection );
 
     formula::FormulaToken* AddRawToken( const ScRawToken& );
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index 26f7150b7..291360c38 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -61,10 +61,10 @@ class ScUnitConverter : public ScStrCollection
         ScUnitConverter&	operator=( const ScUnitConverter& );
 
 public:
-                            ScUnitConverter( USHORT nInit = 16, USHORT nDelta = 4 );
+                            ScUnitConverter( sal_uInt16 nInit = 16, sal_uInt16 nDelta = 4 );
     virtual					~ScUnitConverter() {};
 
-        BOOL				GetValue( double& fValue, const String& rFromUnit,
+        sal_Bool				GetValue( double& fValue, const String& rFromUnit,
                                 const String& rToUnit ) const;
 };
 
diff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxx
index 9c890894a..baf0b5913 100644
--- a/sc/inc/unowids.hxx
+++ b/sc/inc/unowids.hxx
@@ -82,12 +82,12 @@
 #define SC_WID_UNO_END              ( SC_WID_UNO_START + 41 )
 
 
-inline BOOL IsScUnoWid( USHORT nWid )
+inline sal_Bool IsScUnoWid( sal_uInt16 nWid )
 {
     return nWid >= SC_WID_UNO_START && nWid <= SC_WID_UNO_END;
 }
 
-inline BOOL IsScItemWid( USHORT nWid )
+inline sal_Bool IsScItemWid( sal_uInt16 nWid )
 {
     return nWid >= ATTR_STARTINDEX && nWid <= ATTR_ENDINDEX;	// incl. page
 }
diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx
index 36e1d3523..e3c756873 100644
--- a/sc/inc/userlist.hxx
+++ b/sc/inc/userlist.hxx
@@ -37,7 +37,7 @@ class SC_DLLPUBLIC ScUserListData : public ScDataObject
 {
 friend class ScUserList;
     String	aStr;
-    USHORT	nTokenCount;
+    sal_uInt16	nTokenCount;
     String* pSubStrings;
     String* pUpperSub;
 
@@ -52,9 +52,9 @@ public:
 
     const	String&			GetString() const { return aStr; }
             void			SetString( const String& rStr);
-            USHORT			GetSubCount() const;
-            BOOL			GetSubIndex(const String& rSubStr, USHORT& rIndex) const;
-            String			GetSubStr(USHORT nIndex) const;
+            sal_uInt16			GetSubCount() const;
+            sal_Bool			GetSubIndex(const String& rSubStr, sal_uInt16& rIndex) const;
+            String			GetSubStr(sal_uInt16 nIndex) const;
             StringCompare   Compare(const String& rSubStr1, const String& rSubStr2) const;
             StringCompare   ICompare(const String& rSubStr1, const String& rSubStr2) const;
 };
@@ -63,28 +63,28 @@ public:
 class SC_DLLPUBLIC ScUserList : public ScCollection
 {
 public:
-                    ScUserList( USHORT nLim = 4, USHORT nDel = 4);
+                    ScUserList( sal_uInt16 nLim = 4, sal_uInt16 nDel = 4);
                     ScUserList( const ScUserList& rUserList ) : ScCollection ( rUserList ) {}
 
     virtual	ScDataObject*		Clone() const;
 
             ScUserListData*	GetData( const String& rSubStr ) const;
             /// If the list in rStr is already inserted
-            BOOL            HasEntry( const String& rStr ) const;
+            sal_Bool            HasEntry( const String& rStr ) const;
 
-    inline	ScUserListData*	operator[]( const USHORT nIndex) const;
+    inline	ScUserListData*	operator[]( const sal_uInt16 nIndex) const;
     inline	ScUserList&		operator= ( const ScUserList& r );
-            BOOL			operator==( const ScUserList& r ) const;
-    inline  BOOL			operator!=( const ScUserList& r ) const;
+            sal_Bool			operator==( const ScUserList& r ) const;
+    inline  sal_Bool			operator!=( const ScUserList& r ) const;
 };
 
 inline	ScUserList& ScUserList::operator=( const ScUserList& r )
     { return (ScUserList&)ScCollection::operator=( r ); }
 
-inline ScUserListData* ScUserList::operator[]( const USHORT nIndex) const
+inline ScUserListData* ScUserList::operator[]( const sal_uInt16 nIndex) const
     { return (ScUserListData*)At(nIndex); }
 
-inline BOOL ScUserList::operator!=( const ScUserList& r ) const
+inline sal_Bool ScUserList::operator!=( const ScUserList& r ) const
     { return !operator==( r ); }
 
 #endif
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index fc454122d..4b6d2a141 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -67,8 +67,8 @@ class SC_DLLPUBLIC ScValidationData : public ScConditionEntry
     sal_uInt32			nKey;				// Index in Attributen
 
     ScValidationMode	eDataMode;
-    BOOL				bShowInput;
-    BOOL				bShowError;
+    sal_Bool				bShowInput;
+    sal_Bool				bShowError;
     ScValidErrorStyle	eErrorStyle;
     sal_Int16           mnListType;         // selection list type: none, unsorted, sorted.
     String				aInputTitle;
@@ -76,12 +76,12 @@ class SC_DLLPUBLIC ScValidationData : public ScConditionEntry
     String				aErrorTitle;
     String				aErrorMessage;
 
-    BOOL				bIsUsed;			// temporaer beim Speichern
+    sal_Bool				bIsUsed;			// temporaer beim Speichern
 
-    BOOL			DoMacro( const ScAddress& rPos, const String& rInput,
+    sal_Bool			DoMacro( const ScAddress& rPos, const String& rInput,
                                 ScFormulaCell* pCell, Window* pParent ) const;
 
-    BOOL			DoScript( const ScAddress& rPos, const String& rInput,
+    sal_Bool			DoScript( const ScAddress& rPos, const String& rInput,
                                 ScFormulaCell* pCell, Window* pParent ) const;
 
     using ScConditionEntry::operator==;
@@ -111,11 +111,11 @@ public:
     void			SetError( const String& rTitle, const String& rMsg,
                                 ScValidErrorStyle eStyle );
 
-    BOOL			GetInput( String& rTitle, String& rMsg ) const
+    sal_Bool			GetInput( String& rTitle, String& rMsg ) const
                         { rTitle = aInputTitle; rMsg = aInputMessage; return bShowInput; }
-    BOOL			GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const;
+    sal_Bool			GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const;
 
-    BOOL			HasErrMsg() const		{ return bShowError; }
+    sal_Bool			HasErrMsg() const		{ return bShowError; }
 
     ScValidationMode GetDataMode() const	{ return eDataMode; }
 
@@ -133,27 +133,27 @@ public:
     bool            FillSelectionList( TypedScStrCollection& rStrings, const ScAddress& rPos ) const;
 
                     //	mit String: bei Eingabe, mit Zelle: fuer Detektiv / RC_FORCED
-    BOOL			IsDataValid( const String& rTest, const ScPatternAttr& rPattern,
+    sal_Bool			IsDataValid( const String& rTest, const ScPatternAttr& rPattern,
                                     const ScAddress& rPos ) const;
-    BOOL			IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const;
+    sal_Bool			IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const;
 
-                    // TRUE -> Abbruch
-    BOOL			DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const;
+                    // sal_True -> Abbruch
+    sal_Bool			DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const;
     void			DoCalcError( ScFormulaCell* pCell ) const;
 
-    BOOL			IsEmpty() const;
+    sal_Bool			IsEmpty() const;
     sal_uInt32		GetKey() const			{ return nKey; }
     void			SetKey(sal_uInt32 nNew)	{ nKey = nNew; }	// nur wenn nicht eingefuegt!
 
-    void			SetUsed(BOOL bSet)		{ bIsUsed = bSet; }
-    BOOL			IsUsed() const			{ return bIsUsed; }
+    void			SetUsed(sal_Bool bSet)		{ bIsUsed = bSet; }
+    sal_Bool			IsUsed() const			{ return bIsUsed; }
 
-    BOOL			EqualEntries( const ScValidationData& r ) const;	// fuer Undo
+    sal_Bool			EqualEntries( const ScValidationData& r ) const;	// fuer Undo
 
     //	sortiert (per PTRARR) nach Index
     //	operator== nur fuer die Sortierung
-    BOOL operator ==( const ScValidationData& r ) const	{ return nKey == r.nKey; }
-    BOOL operator < ( const ScValidationData& r ) const	{ return nKey <  r.nKey; }
+    sal_Bool operator ==( const ScValidationData& r ) const	{ return nKey == r.nKey; }
+    sal_Bool operator < ( const ScValidationData& r ) const	{ return nKey <  r.nKey; }
 
 private:
     /** Tries to fill the passed collection with list validation entries.
@@ -206,7 +206,7 @@ public:
      *  references are marked now. */
     bool    MarkUsedExternalReferences() const;
 
-    BOOL	operator==( const ScValidationDataList& r ) const;		// fuer Ref-Undo
+    sal_Bool	operator==( const ScValidationDataList& r ) const;		// fuer Ref-Undo
 };
 
 #endif
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 460a5f5c0..2e21ea849 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -68,8 +68,8 @@ enum ScVObjType
     VOBJ_TYPE_DRAW
 };
 
-#define MAX_OPT				(USHORT)VOPT_BIGHANDLES+1
-#define MAX_TYPE			(USHORT)VOBJ_TYPE_DRAW+1
+#define MAX_OPT				(sal_uInt16)VOPT_BIGHANDLES+1
+#define MAX_TYPE			(sal_uInt16)VOBJ_TYPE_DRAW+1
 
 #define SC_STD_GRIDCOLOR	COL_LIGHTGRAY
 
@@ -102,8 +102,8 @@ public:
 
     void					SetDefaults();
 
-    void					SetOption( ScViewOption eOpt, BOOL bNew = TRUE )	{ aOptArr[eOpt] = bNew; }
-    BOOL					GetOption( ScViewOption eOpt ) const 				{ return aOptArr[eOpt]; }
+    void					SetOption( ScViewOption eOpt, sal_Bool bNew = sal_True )	{ aOptArr[eOpt] = bNew; }
+    sal_Bool					GetOption( ScViewOption eOpt ) const 				{ return aOptArr[eOpt]; }
 
     void					SetObjMode( ScVObjType eObj, ScVObjMode eMode )	{ aModeArr[eObj] = eMode; }
     ScVObjMode				GetObjMode( ScVObjType eObj ) const				{ return aModeArr[eObj]; }
@@ -113,14 +113,14 @@ public:
 
     const ScGridOptions&	GetGridOptions() const 						{ return aGridOpt; }
     void					SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; }
-    SvxGridItem*			CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const;
+    SvxGridItem*			CreateGridItem( sal_uInt16 nId = SID_ATTR_GRID_OPTIONS ) const;
 
     const ScViewOptions&	operator=  ( const ScViewOptions& rCpy );
     int						operator== ( const ScViewOptions& rOpt ) const;
     int						operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); }
 
 private:
-    BOOL			aOptArr		[MAX_OPT];
+    sal_Bool			aOptArr		[MAX_OPT];
     ScVObjMode		aModeArr	[MAX_TYPE];
     Color			aGridCol;
     String			aGridColName;
@@ -135,8 +135,8 @@ class SC_DLLPUBLIC ScTpViewItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-//UNUSED2008-05  ScTpViewItem( USHORT nWhich );
-                ScTpViewItem( USHORT nWhich, const ScViewOptions& rOpt );
+//UNUSED2008-05  ScTpViewItem( sal_uInt16 nWhich );
+                ScTpViewItem( sal_uInt16 nWhich, const ScViewOptions& rOpt );
                 ScTpViewItem( const ScTpViewItem&  rItem );
                 ~ScTpViewItem();
 
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 2da833ac1..28c1c929d 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -92,13 +92,13 @@ class ScViewPaneBase : public com::sun::star::sheet::XViewPane,
 {
 private:
     ScTabViewShell*			pViewShell;
-    USHORT					nPane;			// ScSplitPos oder SC_VIEWPANE_ACTIVE
+    sal_uInt16					nPane;			// ScSplitPos oder SC_VIEWPANE_ACTIVE
 
 protected:
     ::com::sun::star::awt::Rectangle GetVisArea() const;
 
 public:
-                            ScViewPaneBase(ScTabViewShell* pViewSh, USHORT nP);
+                            ScViewPaneBase(ScTabViewShell* pViewSh, sal_uInt16 nP);
     virtual					~ScViewPaneBase();
 
     ScTabViewShell*         GetViewShell() const    { return pViewShell; }
@@ -162,7 +162,7 @@ public:
 class ScViewPaneObj : public ScViewPaneBase, public cppu::OWeakObject
 {
 public:
-                            ScViewPaneObj(ScTabViewShell* pViewSh, USHORT nP);
+                            ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP);
     virtual					~ScViewPaneObj();
 
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
@@ -200,11 +200,11 @@ private:
     SCTAB                                   nPreviousTab;
     sal_Bool								bDrawSelModeSet;
 
-    ScViewPaneObj*			GetObjectByIndex_Impl(USHORT nIndex) const;
-    INT16                   GetZoom(void) const;
-    void                    SetZoom(INT16 Zoom);
-    INT16                   GetZoomType(void) const;
-    void                    SetZoomType(INT16 ZoomType);
+    ScViewPaneObj*			GetObjectByIndex_Impl(sal_uInt16 nIndex) const;
+    sal_Int16                   GetZoom(void) const;
+    void                    SetZoom(sal_Int16 Zoom);
+    sal_Int16                   GetZoomType(void) const;
+    void                    SetZoomType(sal_Int16 ZoomType);
 
     com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetClickedObject(const Point& rPoint) const;
     void                    StartMouseListening();
diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx
index dddd2b691..c968971f8 100644
--- a/sc/inc/waitoff.hxx
+++ b/sc/inc/waitoff.hxx
@@ -36,7 +36,7 @@ class ScWaitCursorOff
 {
 private:
     Window*				pWin;
-    ULONG				nWaiters;
+    sal_uLong				nWaiters;
 public:
                         ScWaitCursorOff( Window* pWin );
                         ~ScWaitCursorOff();
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index 33bc4e9d7..7ae9cf1af 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -77,8 +77,8 @@ class ScXMLImportWrapper
 
 public:
     ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >&);
-    BOOL Import(sal_Bool bStylesOnly, ErrCode& );
-    BOOL Export(sal_Bool bStylesOnly);
+    sal_Bool Import(sal_Bool bStylesOnly, ErrCode& );
+    sal_Bool Export(sal_Bool bStylesOnly);
 };
 
 #endif
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index a3c058ae1..14d5e7080 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -44,11 +44,11 @@ class ScNumFormatAbbrev
 public:
     ScNumFormatAbbrev();
     ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat);
-    ScNumFormatAbbrev(ULONG nFormat, SvNumberFormatter& rFormatter);
+    ScNumFormatAbbrev(sal_uLong nFormat, SvNumberFormatter& rFormatter);
     void Load( SvStream& rStream, CharSet eByteStrSet );            // Laden der Zahlenformate
     void Save( SvStream& rStream, CharSet eByteStrSet ) const;   // Speichern der Zahlenformate
-    void PutFormatIndex(ULONG nFormat, SvNumberFormatter& rFormatter);
-    ULONG GetFormatIndex( SvNumberFormatter& rFormatter);
+    void PutFormatIndex(sal_uLong nFormat, SvNumberFormatter& rFormatter);
+    sal_uLong GetFormatIndex( SvNumberFormatter& rFormatter);
     inline int operator==(const ScNumFormatAbbrev& rNumFormat) const
     {
         return ((sFormatstring == rNumFormat.sFormatstring)
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 79eb1be8d..c58064364 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -104,7 +104,7 @@ ScAttrArray::~ScAttrArray()
 void ScAttrArray::TestData() const
 {
 
-    USHORT nErr = 0;
+    sal_uInt16 nErr = 0;
     if (pData)
     {
         SCSIZE nPos;
@@ -131,7 +131,7 @@ void ScAttrArray::TestData() const
 
 //------------------------------------------------------------------------
 
-void ScAttrArray::Reset( const ScPatternAttr* pPattern, BOOL bAlloc )
+void ScAttrArray::Reset( const ScPatternAttr* pPattern, sal_Bool bAlloc )
 {
     if (pData)
     {
@@ -144,7 +144,7 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern, BOOL bAlloc )
         {
             // ueberpruefen, ob Attributierung die Textbreite der Zelle aendert
             pOldPattern = pData[i].pPattern;
-            BOOL bNumFormatChanged;
+            sal_Bool bNumFormatChanged;
             if ( ScGlobal::CheckWidthInvalidate( bNumFormatChanged,
                     pPattern->GetItemSet(), pOldPattern->GetItemSet() ) )
             {
@@ -168,7 +168,7 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern, BOOL bAlloc )
         delete[] pData;
 
         if (pDocument->IsStreamValid(nTab))
-            pDocument->SetStreamValid(nTab, FALSE);
+            pDocument->SetStreamValid(nTab, sal_False);
 
         if (bAlloc)
         {
@@ -190,9 +190,9 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern, BOOL bAlloc )
 }
 
 
-BOOL ScAttrArray::Concat(SCSIZE nPos)
+sal_Bool ScAttrArray::Concat(SCSIZE nPos)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if (pData && (nPos < nCount))
     {
         if (nPos > 0)
@@ -206,7 +206,7 @@ BOOL ScAttrArray::Concat(SCSIZE nPos)
                 pData[nCount - 1].nRow = 0;
                 nCount--;
                 nPos--;
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
         if (nPos + 1 < nCount)
@@ -219,7 +219,7 @@ BOOL ScAttrArray::Concat(SCSIZE nPos)
                 pData[nCount - 1].pPattern = NULL;
                 pData[nCount - 1].nRow = 0;
                 nCount--;
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -228,14 +228,14 @@ BOOL ScAttrArray::Concat(SCSIZE nPos)
 
 //------------------------------------------------------------------------
 
-BOOL ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const
+sal_Bool ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const
 {
     long	nLo 		= 0;
     long	nHi 		= static_cast<long>(nCount) - 1;
     long	nStartRow	= 0;
     long	nEndRow		= 0;
     long	i			= 0;
-    BOOL	bFound		= (nCount == 1);
+    sal_Bool	bFound		= (nCount == 1);
     if (pData)
     {
         while ( !bFound && nLo <= nHi )
@@ -252,11 +252,11 @@ BOOL ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const
                 if (nStartRow >= (long) nRow)
                     nHi = --i;
                 else
-                    bFound = TRUE;
+                    bFound = sal_True;
         }
     }
     else
-        bFound = FALSE;
+        bFound = sal_False;
 
     if (bFound)
         nIndex=(SCSIZE)i;
@@ -294,13 +294,13 @@ const ScPatternAttr* ScAttrArray::GetPatternRange( SCROW& rStartRow,
 
 //------------------------------------------------------------------------
 
-void ScAttrArray::SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool )
+void ScAttrArray::SetPattern( SCROW nRow, const ScPatternAttr* pPattern, sal_Bool bPutToPool )
 {
     SetPatternArea( nRow, nRow, pPattern, bPutToPool );
 }
 
 
-void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPatternAttr *pPattern, BOOL bPutToPool )
+void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPatternAttr *pPattern, sal_Bool bPutToPool )
 {
     if (ValidRow(nStartRow) && ValidRow(nEndRow))
     {
@@ -350,7 +350,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern
                 const SfxItemSet& rNewSet = pPattern->GetItemSet();
                 const SfxItemSet& rOldSet = pData[nx].pPattern->GetItemSet();
 
-                BOOL bNumFormatChanged;
+                sal_Bool bNumFormatChanged;
                 if ( ScGlobal::CheckWidthInvalidate( bNumFormatChanged,
                         rNewSet, rOldSet ) )
                 {
@@ -375,8 +375,8 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern
             // continue modifying data array
 
             SCSIZE nInsert;     // insert position (MAXROWCOUNT := no insert)
-            BOOL bCombined = FALSE;
-            BOOL bSplit = FALSE;
+            sal_Bool bCombined = sal_False;
+            sal_Bool bSplit = sal_False;
             if ( nStartRow > 0 )
             {
                 nInsert = MAXROWCOUNT;
@@ -386,7 +386,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern
                     {   // may be a split or a simple insert or just a shrink,
                         // row adjustment is done further down
                         if ( pData[ni].nRow > nEndRow )
-                            bSplit = TRUE;
+                            bSplit = sal_True;
                         ni++;
                         nInsert = ni;
                     }
@@ -397,7 +397,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern
                 {   // combine
                     pData[ni-1].nRow = nEndRow;
                     nInsert = MAXROWCOUNT;
-                    bCombined = TRUE;
+                    bCombined = sal_True;
                 }
             }
             else
@@ -421,7 +421,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern
                             pData[ni-1].nRow = nStartRow - 1;   // shrink
                     }
                     nInsert = MAXROWCOUNT;
-                    bCombined = TRUE;
+                    bCombined = sal_True;
                 }
                 else if ( ni > 0 && ni == nInsert )
                     pData[ni-1].nRow = nStartRow - 1;   // shrink
@@ -474,7 +474,7 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern
             }
 
             if (pDocument->IsStreamValid(nTab))
-                pDocument->SetStreamValid(nTab, FALSE);
+                pDocument->SetStreamValid(nTab, sal_False);
         }
     }
 //	InfoBox(0, String(nCount) + String(" Eintraege") ).Execute();
@@ -519,7 +519,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
             {
                 if (nY1 < nStartRow) nY1=nStartRow;
                 if (nY2 > nEndRow) nY2=nEndRow;
-                SetPatternArea( nY1, nY2, pNewPattern, TRUE );
+                SetPatternArea( nY1, nY2, pNewPattern, sal_True );
                 Search( nStart, nPos );
             }
             else
@@ -530,7 +530,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
                 const SfxItemSet& rNewSet = pNewPattern->GetItemSet();
                 const SfxItemSet& rOldSet = pOldPattern->GetItemSet();
 
-                BOOL bNumFormatChanged;
+                sal_Bool bNumFormatChanged;
                 if ( ScGlobal::CheckWidthInvalidate( bNumFormatChanged,
                         rNewSet, rOldSet ) )
                 {
@@ -555,7 +555,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
         while ((nStart <= nEndRow) && (nPos < nCount));
 
         if (pDocument->IsStreamValid(nTab))
-            pDocument->SetStreamValid(nTab, FALSE);
+            pDocument->SetStreamValid(nTab, sal_False);
     }
 
 #ifdef DBG_UTIL
@@ -582,7 +582,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
     }
 
 void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
-                                      const SvxBorderLine* pLine, BOOL bColorOnly )
+                                      const SvxBorderLine* pLine, sal_Bool bColorOnly )
 {
     if ( bColorOnly && !pLine )
         return;
@@ -602,11 +602,11 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
             const ScPatternAttr*	pOldPattern = pData[nPos].pPattern;
             const SfxItemSet&       rOldSet = pOldPattern->GetItemSet();
             const SfxPoolItem*      pBoxItem = 0;
-            SfxItemState            eState = rOldSet.GetItemState( ATTR_BORDER, TRUE, &pBoxItem );
+            SfxItemState            eState = rOldSet.GetItemState( ATTR_BORDER, sal_True, &pBoxItem );
             const SfxPoolItem*      pTLBRItem = 0;
-            SfxItemState            eTLBRState = rOldSet.GetItemState( ATTR_BORDER_TLBR, TRUE, &pTLBRItem );
+            SfxItemState            eTLBRState = rOldSet.GetItemState( ATTR_BORDER_TLBR, sal_True, &pTLBRItem );
             const SfxPoolItem*      pBLTRItem = 0;
-            SfxItemState            eBLTRState = rOldSet.GetItemState( ATTR_BORDER_BLTR, TRUE, &pBLTRItem );
+            SfxItemState            eBLTRState = rOldSet.GetItemState( ATTR_BORDER_BLTR, sal_True, &pBLTRItem );
 
             if ( (SFX_ITEM_SET == eState) || (SFX_ITEM_SET == eTLBRState) || (SFX_ITEM_SET == eBLTRState) )
             {
@@ -677,7 +677,7 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
                 {
                     if (nY1 < nStartRow) nY1=nStartRow;
                     if (nY2 > nEndRow) nY2=nEndRow;
-                    SetPatternArea( nY1, nY2, pNewPattern, TRUE );
+                    SetPatternArea( nY1, nY2, pNewPattern, sal_True );
                     Search( nStart, nPos );
                 }
                 else
@@ -733,7 +733,7 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac
         do
         {
             const ScPatternAttr* pOldPattern = pData[nPos].pPattern;
-            const ScPatternAttr* pNewPattern = (const ScPatternAttr*) &pCache->ApplyTo( *pOldPattern, TRUE );
+            const ScPatternAttr* pNewPattern = (const ScPatternAttr*) &pCache->ApplyTo( *pOldPattern, sal_True );
             ScDocumentPool::CheckRef( *pOldPattern );
             ScDocumentPool::CheckRef( *pNewPattern );
             if (pNewPattern != pOldPattern)
@@ -756,7 +756,7 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac
                     const SfxItemSet& rNewSet = pNewPattern->GetItemSet();
                     const SfxItemSet& rOldSet = pOldPattern->GetItemSet();
 
-                    BOOL bNumFormatChanged;
+                    sal_Bool bNumFormatChanged;
                     if ( ScGlobal::CheckWidthInvalidate( bNumFormatChanged,
                             rNewSet, rOldSet ) )
                     {
@@ -797,7 +797,7 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac
         while (nStart <= nEndRow);
 
         if (pDocument->IsStreamValid(nTab))
-            pDocument->SetStreamValid(nTab, FALSE);
+            pDocument->SetStreamValid(nTab, sal_False);
     }
 
 #ifdef DBG_UTIL
@@ -810,14 +810,14 @@ void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource )
 {
     const SfxPoolItem* pNewItem;
     const SfxPoolItem* pOldItem;
-    for (USHORT nId=ATTR_PATTERN_START; nId<=ATTR_PATTERN_END; nId++)
+    for (sal_uInt16 nId=ATTR_PATTERN_START; nId<=ATTR_PATTERN_END; nId++)
     {
         //	pMergeSet hat keinen Parent
-        SfxItemState eOldState = rMergeSet.GetItemState( nId, FALSE, &pOldItem );
+        SfxItemState eOldState = rMergeSet.GetItemState( nId, sal_False, &pOldItem );
 
         if ( eOldState == SFX_ITEM_DEFAULT )				// Default
         {
-            SfxItemState eNewState = rSource.GetItemState( nId, TRUE, &pNewItem );
+            SfxItemState eNewState = rSource.GetItemState( nId, sal_True, &pNewItem );
             if ( eNewState == SFX_ITEM_SET )
             {
                 if ( *pNewItem != rMergeSet.GetPool()->GetDefaultItem(nId) )
@@ -826,7 +826,7 @@ void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource )
         }
         else if ( eOldState == SFX_ITEM_SET )				// Item gesetzt
         {
-            SfxItemState eNewState = rSource.GetItemState( nId, TRUE, &pNewItem );
+            SfxItemState eNewState = rSource.GetItemState( nId, sal_True, &pNewItem );
             if ( eNewState == SFX_ITEM_SET )
             {
                 if ( pNewItem != pOldItem )					// beide gepuhlt
@@ -844,7 +844,7 @@ void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource )
 
 
 void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow,
-                                    ScMergePatternState& rState, BOOL bDeep ) const
+                                    ScMergePatternState& rState, sal_Bool bDeep ) const
 {
     if (ValidRow(nStartRow) && ValidRow(nEndRow))
     {
@@ -866,13 +866,13 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow,
                 const SfxItemSet& rThisSet = pPattern->GetItemSet();
                 if (rState.pItemSet)
                 {
-                    //	(*ppSet)->MergeValues( rThisSet, FALSE );
+                    //	(*ppSet)->MergeValues( rThisSet, sal_False );
                     //	geht nicht, weil die Vorlagen nicht beruecksichtigt werden
 
                     if (bDeep)
                         lcl_MergeDeep( *rState.pItemSet, rThisSet );
                     else
-                        rState.pItemSet->MergeValues( rThisSet, FALSE );
+                        rState.pItemSet->MergeValues( rThisSet, sal_False );
                 }
                 else
                 {
@@ -896,41 +896,41 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow,
 
 //			Umrandung zusammenbauen
 
-BOOL lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine,
-                            BYTE& rModified, const SvxBorderLine*& rpNew )
+sal_Bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine,
+                            sal_uInt8& rModified, const SvxBorderLine*& rpNew )
 {
     if (rModified == SC_LINE_DONTCARE)
-        return FALSE;						// weiter geht's nicht
+        return sal_False;						// weiter geht's nicht
 
     if (rModified == SC_LINE_EMPTY)
     {
         rModified = SC_LINE_SET;
         rpNew = pNewLine;
-        return TRUE;						// zum ersten mal gesetzt
+        return sal_True;						// zum ersten mal gesetzt
     }
 
     if (pOldLine == pNewLine)
     {
         rpNew = pOldLine;
-        return FALSE;
+        return sal_False;
     }
 
     if (pOldLine && pNewLine)
         if (*pOldLine == *pNewLine)
         {
             rpNew = pOldLine;
-            return FALSE;
+            return sal_False;
         }
 
     rModified = SC_LINE_DONTCARE;
     rpNew = NULL;
-    return TRUE;							// andere Linie -> dontcare
+    return sal_True;							// andere Linie -> dontcare
 }
 
 
 void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
                                 ScLineFlags& rFlags, const ScPatternAttr* pPattern,
-                                BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom )
+                                sal_Bool bLeft, SCCOL nDistRight, sal_Bool bTop, SCROW nDistBottom )
 {
     //	rechten/unteren Rahmen setzen, wenn Zelle bis zum Ende zusammengefasst:
     const ScMergeAttr& rMerge = (const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE);
@@ -994,19 +994,19 @@ void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
 
 void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
                     ScLineFlags& rFlags,
-                    SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const
+                    SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight ) const
 {
     const ScPatternAttr* pPattern;
 
     if (nStartRow == nEndRow)
     {
         pPattern = GetPattern( nStartRow );
-        lcl_MergeToFrame( pLineOuter, pLineInner, rFlags, pPattern, bLeft, nDistRight, TRUE, 0 );
+        lcl_MergeToFrame( pLineOuter, pLineInner, rFlags, pPattern, bLeft, nDistRight, sal_True, 0 );
     }
     else
     {
         pPattern = GetPattern( nStartRow );
-        lcl_MergeToFrame( pLineOuter, pLineInner, rFlags, pPattern, bLeft, nDistRight, TRUE,
+        lcl_MergeToFrame( pLineOuter, pLineInner, rFlags, pPattern, bLeft, nDistRight, sal_True,
                             nEndRow-nStartRow );
 
         SCSIZE nStartIndex;
@@ -1016,13 +1016,13 @@ void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLine
         for (SCSIZE i=nStartIndex; i<=nEndIndex; i++)
         {
             pPattern = (ScPatternAttr*) pData[i].pPattern;
-            lcl_MergeToFrame( pLineOuter, pLineInner, rFlags, pPattern, bLeft, nDistRight, FALSE,
+            lcl_MergeToFrame( pLineOuter, pLineInner, rFlags, pPattern, bLeft, nDistRight, sal_False,
                             nEndRow - Min( pData[i].nRow, (SCROW)(nEndRow-1) ) );
             // nDistBottom hier immer > 0
         }
 
         pPattern = GetPattern( nEndRow );
-        lcl_MergeToFrame( pLineOuter, pLineInner, rFlags, pPattern, bLeft, nDistRight, FALSE, 0 );
+        lcl_MergeToFrame( pLineOuter, pLineInner, rFlags, pPattern, bLeft, nDistRight, sal_False, 0 );
     }
 }
 
@@ -1033,10 +1033,10 @@ void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLine
 //	ApplyFrame - auf einen Eintrag im Array
 
 
-BOOL ScAttrArray::ApplyFrame( const SvxBoxItem*		pBoxItem,
+sal_Bool ScAttrArray::ApplyFrame( const SvxBoxItem*		pBoxItem,
                               const SvxBoxInfoItem* pBoxInfoItem,
                               SCROW nStartRow, SCROW nEndRow,
-                              BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom )
+                              sal_Bool bLeft, SCCOL nDistRight, sal_Bool bTop, SCROW nDistBottom )
 {
     DBG_ASSERT( pBoxItem && pBoxInfoItem, "Linienattribute fehlen!" );
 
@@ -1069,7 +1069,7 @@ BOOL ScAttrArray::ApplyFrame( const SvxBoxItem*		pBoxItem,
     if (aNewFrame == *pOldFrame)
     {
         // nothing to do
-        return FALSE;
+        return sal_False;
     }
     else
     {
@@ -1078,22 +1078,22 @@ BOOL ScAttrArray::ApplyFrame( const SvxBoxItem*		pBoxItem,
 
 /*		ScPatternAttr* pNewPattern = (ScPatternAttr*) pPattern->Clone();
         pNewPattern->GetItemSet().Put( aNewFrame );
-        SetPatternArea( nStartRow, nEndRow, pNewPattern, TRUE );
+        SetPatternArea( nStartRow, nEndRow, pNewPattern, sal_True );
 */
-        return TRUE;
+        return sal_True;
     }
 }
 
 
 void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
-                            SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight )
+                            SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight )
 {
     if (nStartRow == nEndRow)
-        ApplyFrame( pLineOuter, pLineInner, nStartRow, nEndRow, bLeft, nDistRight, TRUE, 0 );
+        ApplyFrame( pLineOuter, pLineInner, nStartRow, nEndRow, bLeft, nDistRight, sal_True, 0 );
     else
     {
         ApplyFrame( pLineOuter, pLineInner, nStartRow, nStartRow, bLeft, nDistRight,
-                        TRUE, nEndRow-nStartRow );
+                        sal_True, nEndRow-nStartRow );
 
         if ( nEndRow > nStartRow+1 )				// innerer Teil vorhanden?
         {
@@ -1106,8 +1106,8 @@ void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInf
             for (SCSIZE i=nStartIndex; i<=nEndIndex;)
             {
                 nTmpEnd = Min( (SCROW)(nEndRow-1), (SCROW)(pData[i].nRow) );
-                BOOL bChanged = ApplyFrame( pLineOuter, pLineInner, nTmpStart, nTmpEnd,
-                                            bLeft, nDistRight, FALSE, nEndRow-nTmpEnd );
+                sal_Bool bChanged = ApplyFrame( pLineOuter, pLineInner, nTmpStart, nTmpEnd,
+                                            bLeft, nDistRight, sal_False, nEndRow-nTmpEnd );
                 nTmpStart = nTmpEnd+1;
                 if (bChanged)
                 {
@@ -1119,7 +1119,7 @@ void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInf
             }
         }
 
-        ApplyFrame( pLineOuter, pLineInner, nEndRow, nEndRow, bLeft, nDistRight, FALSE, 0 );
+        ApplyFrame( pLineOuter, pLineInner, nEndRow, nEndRow, bLeft, nDistRight, sal_False, 0 );
     }
 }
 
@@ -1130,8 +1130,8 @@ long lcl_LineSize( const SvxBorderLine& rLine )
     //	doppelte Linie -> halber Abstand + eine Linie (je min. 20)
 
     long nTotal = 0;
-    USHORT nWidth = Max( rLine.GetOutWidth(), rLine.GetInWidth() );
-    USHORT nDist = rLine.GetDistance();
+    sal_uInt16 nWidth = Max( rLine.GetOutWidth(), rLine.GetInWidth() );
+    sal_uInt16 nDist = rLine.GetDistance();
     if (nDist)
     {
         DBG_ASSERT( rLine.GetOutWidth() && rLine.GetInWidth(),
@@ -1151,14 +1151,14 @@ long lcl_LineSize( const SvxBorderLine& rLine )
 }
 
 
-BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
-                                BOOL bLeft, BOOL bRight ) const
+sal_Bool ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
+                                sal_Bool bLeft, sal_Bool bRight ) const
 {
     SCSIZE nStartIndex;
     SCSIZE nEndIndex;
     Search( nRow1, nStartIndex );
     Search( nRow2, nEndIndex );
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     const SvxBoxItem* pItem = 0;
     const SvxBorderLine* pLine = 0;
@@ -1173,7 +1173,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
         nCmp = lcl_LineSize(*pLine);
         if ( nCmp > rSizes.Top() )
             rSizes.Top() = nCmp;
-        bFound = TRUE;
+        bFound = sal_True;
     }
 
     //	unten
@@ -1186,7 +1186,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
         nCmp = lcl_LineSize(*pLine);
         if ( nCmp > rSizes.Bottom() )
             rSizes.Bottom() = nCmp;
-        bFound = TRUE;
+        bFound = sal_True;
     }
 
     if ( bLeft || bRight )
@@ -1204,7 +1204,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
                     nCmp = lcl_LineSize(*pLine);
                     if ( nCmp > rSizes.Left() )
                         rSizes.Left() = nCmp;
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
             }
 
@@ -1218,7 +1218,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
                     nCmp = lcl_LineSize(*pLine);
                     if ( nCmp > rSizes.Right() )
                         rSizes.Right() = nCmp;
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
             }
         }
@@ -1228,7 +1228,7 @@ BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
 
 //	Testen, ob Bereich bestimmtes Attribut enthaelt
 
-bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const
+bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
 {
     SCSIZE nStartIndex;
     SCSIZE nEndIndex;
@@ -1291,7 +1291,7 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const
                     (const SfxInt32Item*) &pPattern->GetItem( ATTR_ROTATE_VALUE );
             // 90 or 270 degrees is former SvxOrientationItem - only look for other values
             // (see ScPatternAttr::GetCellOrientation)
-            INT32 nAngle = pRotate->GetValue();
+            sal_Int32 nAngle = pRotate->GetValue();
             if ( nAngle != 0 && nAngle != 9000 && nAngle != 27000 )
                 bFound = true;
         }
@@ -1344,9 +1344,9 @@ bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const
 //	Bereich um evtl. enthaltene Zusammenfassungen erweitern
 //	und evtl. MergeFlag anpassen (bRefresh)
 
-BOOL ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
+sal_Bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
                                 SCCOL& rPaintCol, SCROW& rPaintRow,
-                                BOOL bRefresh, BOOL bAttrs )
+                                sal_Bool bRefresh, sal_Bool bAttrs )
 {
     const ScPatternAttr* pPattern;
     const ScMergeAttr* pItem;
@@ -1354,7 +1354,7 @@ BOOL ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
     SCSIZE nEndIndex;
     Search( nStartRow, nStartIndex );
     Search( nEndRow, nEndIndex );
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     for (SCSIZE i=nStartIndex; i<=nEndIndex; i++)
     {
@@ -1371,7 +1371,7 @@ BOOL ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
                 rPaintCol = nMergeEndCol;
             if (nMergeEndRow > rPaintRow && nMergeEndRow <= MAXROW)
                 rPaintRow = nMergeEndRow;
-            bFound = TRUE;
+            bFound = sal_True;
 
             if (bAttrs)
             {
@@ -1409,9 +1409,9 @@ BOOL ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
 }
 
 
-BOOL ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
+sal_Bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     const ScPatternAttr* pPattern;
     const ScMergeAttr* pItem;
     SCSIZE nIndex;
@@ -1473,12 +1473,12 @@ BOOL ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
 
 void ScAttrArray::DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow)
 {
-    SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), TRUE );
+    SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), sal_True );
 }
 
 
 void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
-                        const ScPatternAttr* pWantedPattern, BOOL bDefault )
+                        const ScPatternAttr* pWantedPattern, sal_Bool bDefault )
 {
     const ScPatternAttr*	pOldPattern;
     const ScMergeFlagAttr*	pItem;
@@ -1486,7 +1486,7 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
     SCSIZE	nIndex;
     SCROW	nRow;
     SCROW	nThisRow;
-    BOOL	bFirstUse = TRUE;
+    sal_Bool	bFirstUse = sal_True;
 
     Search( nStartRow, nIndex );
     nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0;
@@ -1509,7 +1509,7 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
                 ScPatternAttr*	pNewPattern = new ScPatternAttr( *pWantedPattern );
                 SfxItemSet*		pSet = &pNewPattern->GetItemSet();
                 pSet->Put( *pItem );
-                SetPatternArea( nThisRow, nAttrRow, pNewPattern, TRUE );
+                SetPatternArea( nThisRow, nAttrRow, pNewPattern, sal_True );
                 delete pNewPattern;
             }
             else
@@ -1517,7 +1517,7 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
                 if ( !bDefault )
                 {
                     if (bFirstUse)
-                        bFirstUse = FALSE;
+                        bFirstUse = sal_False;
                     else
                         pDocument->GetPool()->Put( *pWantedPattern );		// im Pool ist es schon!
                 }
@@ -1533,15 +1533,15 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
 }
 
 
-BOOL ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
+sal_Bool ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags )
 {
     const ScPatternAttr* pOldPattern;
 
-    INT16	nOldValue;
+    sal_Int16	nOldValue;
     SCSIZE	nIndex;
     SCROW	nRow;
     SCROW	nThisRow;
-    BOOL	bChanged = FALSE;
+    sal_Bool	bChanged = sal_False;
 
     Search( nStartRow, nIndex );
     nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0;
@@ -1557,9 +1557,9 @@ BOOL ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
             SCROW nAttrRow = Min( (SCROW)nRow, (SCROW)nEndRow );
             ScPatternAttr aNewPattern(*pOldPattern);
             aNewPattern.GetItemSet().Put( ScMergeFlagAttr( nOldValue | nFlags ) );
-            SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE );
+            SetPatternArea( nThisRow, nAttrRow, &aNewPattern, sal_True );
             Search( nThisRow, nIndex );									// Daten wurden veraendert !!!
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
 
         ++nIndex;
@@ -1570,15 +1570,15 @@ BOOL ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
 }
 
 
-BOOL ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
+sal_Bool ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags )
 {
     const ScPatternAttr* pOldPattern;
 
-    INT16	nOldValue;
+    sal_Int16	nOldValue;
     SCSIZE	nIndex;
     SCROW	nRow;
     SCROW	nThisRow;
-    BOOL	bChanged = FALSE;
+    sal_Bool	bChanged = sal_False;
 
     Search( nStartRow, nIndex );
     nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0;
@@ -1594,9 +1594,9 @@ BOOL ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
             SCROW nAttrRow = Min( (SCROW)nRow, (SCROW)nEndRow );
             ScPatternAttr aNewPattern(*pOldPattern);
             aNewPattern.GetItemSet().Put( ScMergeFlagAttr( nOldValue & ~nFlags ) );
-            SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE );
+            SetPatternArea( nThisRow, nAttrRow, &aNewPattern, sal_True );
             Search( nThisRow, nIndex );									// Daten wurden veraendert !!!
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
 
         ++nIndex;
@@ -1607,7 +1607,7 @@ BOOL ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
 }
 
 
-void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich )
+void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich )
 {
     const ScPatternAttr* pOldPattern;
 
@@ -1629,7 +1629,7 @@ void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhi
 
             nRow = pData[nIndex].nRow;
             SCROW nAttrRow = Min( (SCROW)nRow, (SCROW)nEndRow );
-            SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE );
+            SetPatternArea( nThisRow, nAttrRow, &aNewPattern, sal_True );
             Search( nThisRow, nIndex );									// Daten wurden veraendert !!!
         }
 
@@ -1639,7 +1639,7 @@ void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhi
 }
 
 
-void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement )
+void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, sal_Bool bIncrement )
 {
     SCSIZE nIndex;
     Search( nStartRow, nIndex );
@@ -1652,10 +1652,10 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement
         const SfxItemSet& rOldSet = pOldPattern->GetItemSet();
         const SfxPoolItem* pItem;
 
-        BOOL bNeedJust = ( rOldSet.GetItemState( ATTR_HOR_JUSTIFY, FALSE, &pItem ) != SFX_ITEM_SET
+        sal_Bool bNeedJust = ( rOldSet.GetItemState( ATTR_HOR_JUSTIFY, sal_False, &pItem ) != SFX_ITEM_SET
                         || ((const SvxHorJustifyItem*)pItem)->GetValue() != SVX_HOR_JUSTIFY_LEFT );
-        USHORT nOldValue = ((const SfxUInt16Item&)rOldSet.Get( ATTR_INDENT )).GetValue();
-        USHORT nNewValue = nOldValue;
+        sal_uInt16 nOldValue = ((const SfxUInt16Item&)rOldSet.Get( ATTR_INDENT )).GetValue();
+        sal_uInt16 nNewValue = nOldValue;
         if ( bIncrement )
         {
             if ( nNewValue < SC_MAX_INDENT )
@@ -1684,7 +1684,7 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement
             if ( bNeedJust )
                 aNewPattern.GetItemSet().Put(
                                 SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, ATTR_HOR_JUSTIFY ) );
-            SetPatternArea( nThisStart, nAttrRow, &aNewPattern, TRUE );
+            SetPatternArea( nThisStart, nAttrRow, &aNewPattern, sal_True );
 
             nThisStart = nThisEnd + 1;
             Search( nThisStart, nIndex );				// Daten wurden veraendert !!!
@@ -1698,7 +1698,7 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement
 }
 
 
-SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, BOOL bUp ) const
+SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, sal_Bool bUp ) const
 {
     long nRet = nRow;
     if (VALIDROW(nRow))
@@ -1737,7 +1737,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo
         if (pData[nPos].pPattern->GetStyleSheet() == pStyleSheet)
         {
 //			for (SCROW nRow = nStart; nRow <= nEnd; nRow++)
-//				pUsed[nRow] = TRUE;
+//				pUsed[nRow] = sal_True;
 
             rUsedRows.setTrue(nStart, nEnd);
 
@@ -1767,10 +1767,10 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo
 }
 
 
-BOOL ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle,
-        BOOL bGatherAllStyles ) const
+sal_Bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle,
+        sal_Bool bGatherAllStyles ) const
 {
-    BOOL	bIsUsed	= FALSE;
+    sal_Bool	bIsUsed	= sal_False;
     SCSIZE	nPos	= 0;
 
     while ( nPos < nCount )
@@ -1782,8 +1782,8 @@ BOOL ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle,
             if ( pStyle == &rStyle )
             {
                 if ( !bGatherAllStyles )
-                    return TRUE;
-                bIsUsed = TRUE;
+                    return sal_True;
+                bIsUsed = sal_True;
             }
         }
         nPos++;
@@ -1793,17 +1793,17 @@ BOOL ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle,
 }
 
 
-BOOL ScAttrArray::IsEmpty() const
+sal_Bool ScAttrArray::IsEmpty() const
 {
     if (nCount == 1)
     {
         if ( pData[0].pPattern != pDocument->GetDefPattern() )
-            return FALSE;
+            return sal_False;
         else
-            return TRUE;
+            return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 
@@ -1823,7 +1823,7 @@ BOOL ScAttrArray::IsEmpty() const
 //UNUSED2008-05  }
 //UNUSED2008-05  
 //UNUSED2008-05  
-//UNUSED2008-05  SCROW ScAttrArray::GetLastEntryPos( BOOL bIncludeBottom ) const
+//UNUSED2008-05  SCROW ScAttrArray::GetLastEntryPos( sal_Bool bIncludeBottom ) const
 //UNUSED2008-05  {
 //UNUSED2008-05      DBG_ASSERT( nCount, "nCount == 0" );
 //UNUSED2008-05  
@@ -1842,11 +1842,11 @@ BOOL ScAttrArray::IsEmpty() const
 //UNUSED2008-05  }
 
 
-BOOL ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const
+sal_Bool ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const
 {
     DBG_ASSERT( nCount, "nCount == 0" );
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCSIZE nStart = 0;
 
     // Skip first entry if more than 1 row.
@@ -1863,7 +1863,7 @@ BOOL ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const
         if ( pData[nStart].pPattern->IsVisible() )
         {
             rFirstRow = nStart ? ( pData[nStart-1].nRow + 1 ) : 0;
-            bFound = TRUE;
+            bFound = sal_True;
         }
         else
             ++nStart;
@@ -1877,7 +1877,7 @@ BOOL ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const
 
 const SCROW SC_VISATTR_STOP = 84;
 
-BOOL ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const
+sal_Bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const
 {
     //  #i30830# changed behavior:
     //  ignore all attributes starting with the first run of SC_VISATTR_STOP equal rows
@@ -1886,10 +1886,10 @@ BOOL ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const
     if ( nLastData == MAXROW )
     {
         rLastRow = MAXROW;      // can't look for attributes below MAXROW
-        return TRUE;
+        return sal_True;
     }
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     //  loop backwards from the end instead of using Search, assuming that
     //  there usually aren't many attributes below the last cell
@@ -1910,12 +1910,12 @@ BOOL ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const
         SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow;
         if ( nAttrSize >= SC_VISATTR_STOP )
         {
-            bFound = FALSE;        // ignore this range and below
+            bFound = sal_False;        // ignore this range and below
         }
         else if ( !bFound && pData[nEndPos].pPattern->IsVisible() )
         {
             rLastRow = pData[nEndPos].nRow;
-            bFound = TRUE;
+            bFound = sal_True;
         }
 
         nPos = nStartPos;           // look further from the top of the range
@@ -1925,16 +1925,16 @@ BOOL ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const
 }
 
 
-BOOL ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
 {
     SCSIZE nIndex;
     Search( nStartRow, nIndex );
     SCROW nThisStart = nStartRow;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     while ( nIndex < nCount && nThisStart <= nEndRow && !bFound )
     {
         if ( pData[nIndex].pPattern->IsVisible() )
-            bFound = TRUE;
+            bFound = sal_True;
 
         nThisStart = pData[nIndex].nRow + 1;
         ++nIndex;
@@ -1944,10 +1944,10 @@ BOOL ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
 }
 
 
-BOOL ScAttrArray::IsVisibleEqual( const ScAttrArray& rOther,
+sal_Bool ScAttrArray::IsVisibleEqual( const ScAttrArray& rOther,
                                     SCROW nStartRow, SCROW nEndRow ) const
 {
-    BOOL bEqual = TRUE;
+    sal_Bool bEqual = sal_True;
     SCSIZE nThisPos = 0;
     SCSIZE nOtherPos = 0;
     if ( nStartRow > 0 )
@@ -1981,11 +1981,11 @@ BOOL ScAttrArray::IsVisibleEqual( const ScAttrArray& rOther,
 }
 
 
-BOOL ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const
 {
     //!	mit IsVisibleEqual zusammenfassen?
 
-    BOOL bEqual = TRUE;
+    sal_Bool bEqual = sal_True;
     SCSIZE nThisPos = 0;
     SCSIZE nOtherPos = 0;
     if ( nStartRow > 0 )
@@ -2018,12 +2018,12 @@ BOOL ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW
 }
 
 
-BOOL ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
+sal_Bool ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
 {
     //	horizontal zusammengefasste duerfen nicht herausgeschoben werden
     //	(ob die ganze Zusammenfassung betroffen ist, ist hier nicht zu erkennen)
 
-    BOOL bTest = TRUE;
+    sal_Bool bTest = sal_True;
     if (!IsEmpty())
     {
         SCSIZE nIndex = 0;
@@ -2035,7 +2035,7 @@ BOOL ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
             if ( ((const ScMergeFlagAttr&)pData[nIndex].pPattern->
                         GetItem(ATTR_MERGE_FLAG)).IsHorOverlapped() )
             {
-                bTest = FALSE;						// darf nicht herausgeschoben werden
+                bTest = sal_False;						// darf nicht herausgeschoben werden
                 break;
             }
             if ( pData[nIndex].nRow >= nEndRow )	// Ende des Bereichs
@@ -2046,7 +2046,7 @@ BOOL ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
 }
 
 
-BOOL ScAttrArray::TestInsertRow( SCSIZE nSize ) const
+sal_Bool ScAttrArray::TestInsertRow( SCSIZE nSize ) const
 {
     //	wenn die erste herausgeschobene Zeile vertikal ueberlappt ist,
     //	wuerde eine kaputte Zusammenfassung uebrigbleiben
@@ -2061,10 +2061,10 @@ BOOL ScAttrArray::TestInsertRow( SCSIZE nSize ) const
 
         if ( ((const ScMergeFlagAttr&)pData[nFirstLost].pPattern->
                             GetItem(ATTR_MERGE_FLAG)).IsVerOverlapped() )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -2080,7 +2080,7 @@ void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize )
     //	ein gesetztes ScMergeAttr darf nicht ausgedehnt werden
     //	(darum hinterher wieder loeschen)
 
-    BOOL bDoMerge = ((const ScMergeAttr&) pData[nIndex].pPattern->GetItem(ATTR_MERGE)).IsMerged();
+    sal_Bool bDoMerge = ((const ScMergeAttr&) pData[nIndex].pPattern->GetItem(ATTR_MERGE)).IsMerged();
 
     SCSIZE nRemove = 0;
     SCSIZE i;
@@ -2122,7 +2122,7 @@ void ScAttrArray::DeleteRow( SCROW nStartRow, SCSIZE nSize )
 {
     if (pData)
     {
-        BOOL bFirst=TRUE;
+        sal_Bool bFirst=sal_True;
         SCSIZE nStartIndex = 0;
         SCSIZE nEndIndex = 0;
         SCSIZE i;
@@ -2133,7 +2133,7 @@ void ScAttrArray::DeleteRow( SCROW nStartRow, SCSIZE nSize )
                 if (bFirst)
                 {
                     nStartIndex = i;
-                    bFirst = FALSE;
+                    bFirst = sal_False;
                 }
                 nEndIndex = i;
             }
@@ -2216,14 +2216,14 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow)
 
             ScPatternAttr aNewPattern(*pOldPattern);
             SfxItemSet& rSet = aNewPattern.GetItemSet();
-            for (USHORT nId = ATTR_PATTERN_START; nId <= ATTR_PATTERN_END; nId++)
+            for (sal_uInt16 nId = ATTR_PATTERN_START; nId <= ATTR_PATTERN_END; nId++)
                 if (nId != ATTR_MERGE && nId != ATTR_MERGE_FLAG)
                     rSet.ClearItem(nId);
 
             if ( aNewPattern == *pDefPattern )
-                SetPatternArea( nThisRow, nAttrRow, pDefPattern, FALSE );
+                SetPatternArea( nThisRow, nAttrRow, pDefPattern, sal_False );
             else
-                SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE );
+                SetPatternArea( nThisRow, nAttrRow, &aNewPattern, sal_True );
 
             Search( nThisRow, nIndex );									// Daten wurden veraendert !!!
         }
@@ -2240,11 +2240,11 @@ void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray
     SCROW nStart = nStartRow;
     for (SCSIZE i = 0; i < nCount; i++)
     {
-        if ((pData[i].nRow >= nStartRow) && ((i==0) ? TRUE : pData[i-1].nRow < nEndRow))
+        if ((pData[i].nRow >= nStartRow) && ((i==0) ? sal_True : pData[i-1].nRow < nEndRow))
         {
-            //	Kopieren (bPutToPool=TRUE)
+            //	Kopieren (bPutToPool=sal_True)
             rAttrArray.SetPatternArea( nStart, Min( (SCROW)pData[i].nRow, (SCROW)nEndRow ),
-                                        pData[i].pPattern, TRUE );
+                                        pData[i].pPattern, sal_True );
         }
         nStart = Max( (SCROW)nStart, (SCROW)(pData[i].nRow + 1) );
     }
@@ -2255,7 +2255,7 @@ void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray
         // Kopieren zwischen Dokumenten (Clipboard)
 
 void ScAttrArray::CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray,
-                                INT16 nStripFlags )
+                                sal_Int16 nStripFlags )
 {
     nStartRow -= nDy;		// Source
     nEndRow -= nDy;
@@ -2265,7 +2265,7 @@ void ScAttrArray::CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArra
 
     ScDocumentPool* pSourceDocPool = pDocument->GetPool();
     ScDocumentPool* pDestDocPool = rAttrArray.pDocument->GetPool();
-    BOOL bSamePool = (pSourceDocPool==pDestDocPool);
+    sal_Bool bSamePool = (pSourceDocPool==pDestDocPool);
 
     for (SCSIZE i = 0; (i < nCount) && (nDestStart <= nDestEnd); i++)
     {
@@ -2284,7 +2284,7 @@ void ScAttrArray::CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArra
             else if ( nStripFlags )
             {
                 ScPatternAttr* pTmpPattern = new ScPatternAttr( *pOldPattern );
-                INT16 nNewFlags = 0;
+                sal_Int16 nNewFlags = 0;
                 if ( nStripFlags != SC_MF_ALL )
                     nNewFlags = ((const ScMergeFlagAttr&)pTmpPattern->GetItem(ATTR_MERGE_FLAG)).
                                 GetValue() & ~nStripFlags;
@@ -2337,7 +2337,7 @@ void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttr
 
     ScDocumentPool* pSourceDocPool = pDocument->GetPool();
     ScDocumentPool* pDestDocPool = rAttrArray.pDocument->GetPool();
-    BOOL bSamePool = (pSourceDocPool==pDestDocPool);
+    sal_Bool bSamePool = (pSourceDocPool==pDestDocPool);
 
     for (SCSIZE i = 0; (i < nCount) && (nDestStart <= nDestEnd); i++)
     {
@@ -2352,7 +2352,7 @@ void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttr
                 pNewPattern = pOldPattern->PutInPool( rAttrArray.pDocument, pDocument );
 
             rAttrArray.SetPatternAreaSafe(nDestStart,
-                            Min((SCROW)(pData[i].nRow + nDy), nDestEnd), pNewPattern, FALSE);
+                            Min((SCROW)(pData[i].nRow + nDy), nDestEnd), pNewPattern, sal_False);
         }
 
         // when pasting from clipboard and skipping filtered rows, the adjusted end position
@@ -2363,9 +2363,9 @@ void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttr
 
 
 SCsROW ScAttrArray::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
-                                    BOOL bUp, ScMarkArray* pMarkArray )
+                                    sal_Bool bUp, ScMarkArray* pMarkArray )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     if (pMarkArray)
     {
@@ -2387,10 +2387,10 @@ SCsROW ScAttrArray::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
                 nRow = pMarkArray->GetNextMarked( nRow, bUp );
                 SCROW nStart = nIndex ? pData[nIndex-1].nRow+1 : 0;
                 if (nRow >= nStart && nRow <= pData[nIndex].nRow)
-                    bFound = TRUE;
+                    bFound = sal_True;
             }
             else
-                bFound = TRUE;
+                bFound = sal_True;
         }
 
         if (!bFound)
@@ -2425,8 +2425,8 @@ SCsROW ScAttrArray::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
 }
 
 
-BOOL ScAttrArray::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow,
-                        const ScStyleSheet* pSearchStyle, BOOL bUp, ScMarkArray* pMarkArray )
+sal_Bool ScAttrArray::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow,
+                        const ScStyleSheet* pSearchStyle, sal_Bool bUp, ScMarkArray* pMarkArray )
 {
     SCsROW nStartRow = SearchStyle( rRow, pSearchStyle, bUp, pMarkArray );
     if (VALIDROW(nStartRow))
@@ -2443,7 +2443,7 @@ BOOL ScAttrArray::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow,
                 rEndRow = 0;
             if (pMarkArray)
             {
-                SCROW nMarkEnd = pMarkArray->GetMarkEnd( nStartRow, TRUE );
+                SCROW nMarkEnd = pMarkArray->GetMarkEnd( nStartRow, sal_True );
                 if (nMarkEnd>rEndRow)
                     rEndRow = nMarkEnd;
             }
@@ -2453,16 +2453,16 @@ BOOL ScAttrArray::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow,
             rEndRow = pData[nIndex].nRow;
             if (pMarkArray)
             {
-                SCROW nMarkEnd = pMarkArray->GetMarkEnd( nStartRow, FALSE );
+                SCROW nMarkEnd = pMarkArray->GetMarkEnd( nStartRow, sal_False );
                 if (nMarkEnd<rEndRow)
                     rEndRow = nMarkEnd;
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -2480,7 +2480,7 @@ void ScAttrArray::Save( SvStream& /* rStream */ ) const
 
     ScDocumentPool* pDocPool = pDocument->GetPool();
 
-    USHORT nSaveCount = nCount;
+    sal_uInt16 nSaveCount = nCount;
     SCROW nSaveMaxRow = pDocument->GetSrcMaxRow();
     if ( nSaveMaxRow != MAXROW )
     {
@@ -2503,11 +2503,11 @@ void ScAttrArray::Save( SvStream& /* rStream */ ) const
         const ScPatternAttr* pPattern = pData[i].pPattern;
         pDocPool->StoreSurrogate( rStream, pPattern );
 
-        //	FALSE, weil ATTR_CONDITIONAL (noch) nicht in Vorlagen:
-        if (pPattern->GetItemSet().GetItemState(ATTR_CONDITIONAL,FALSE,&pItem) == SFX_ITEM_SET)
+        //	sal_False, weil ATTR_CONDITIONAL (noch) nicht in Vorlagen:
+        if (pPattern->GetItemSet().GetItemState(ATTR_CONDITIONAL,sal_False,&pItem) == SFX_ITEM_SET)
             pDocument->SetConditionalUsed( ((const SfxUInt32Item*)pItem)->GetValue() );
 
-        if (pPattern->GetItemSet().GetItemState(ATTR_VALIDDATA,FALSE,&pItem) == SFX_ITEM_SET)
+        if (pPattern->GetItemSet().GetItemState(ATTR_VALIDDATA,sal_False,&pItem) == SFX_ITEM_SET)
             pDocument->SetValidationUsed( ((const SfxUInt32Item*)pItem)->GetValue() );
     }
 #endif // SC_ROWLIMIT_STREAM_ACCESS
@@ -2522,7 +2522,7 @@ void ScAttrArray::Load( SvStream& /* rStream */ )
 
     ScReadHeader aHdr( rStream );
 
-    USHORT nNewCount;
+    sal_uInt16 nNewCount;
     rStream >> nNewCount;
     if ( nNewCount > MAXROW+1 )                     // wuerde das Array zu gross?
     {
@@ -2531,13 +2531,13 @@ void ScAttrArray::Load( SvStream& /* rStream */ )
         return;
     }
 
-    Reset( pDocument->GetDefPattern(), FALSE );     // loeschen
+    Reset( pDocument->GetDefPattern(), sal_False );     // loeschen
     pData = new ScAttrEntry[nNewCount];             // neu anlegen
     for (SCSIZE i=0; i<nNewCount; i++)
     {
         rStream >> pData[i].nRow;
 
-        USHORT nWhich = ATTR_PATTERN;
+        sal_uInt16 nWhich = ATTR_PATTERN;
         const ScPatternAttr* pNewPattern = (const ScPatternAttr*)
                                            pDocPool->LoadSurrogate( rStream, nWhich, ATTR_PATTERN );
         if (!pNewPattern)
@@ -2575,7 +2575,7 @@ void ScAttrArray::Load( SvStream& /* rStream */ )
 //UNUSED2008-05  void ScAttrArray::ConvertFontsAfterLoad()
 //UNUSED2008-05  {
 //UNUSED2008-05      ScFontToSubsFontConverter_AutoPtr xFontConverter;
-//UNUSED2008-05      const ULONG nFlags = FONTTOSUBSFONT_IMPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS;
+//UNUSED2008-05      const sal_uLong nFlags = FONTTOSUBSFONT_IMPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS;
 //UNUSED2008-05      SCSIZE   nIndex = 0;
 //UNUSED2008-05      SCROW  nThisRow = 0;
 //UNUSED2008-05  
@@ -2583,7 +2583,7 @@ void ScAttrArray::Load( SvStream& /* rStream */ )
 //UNUSED2008-05      {
 //UNUSED2008-05          const ScPatternAttr* pOldPattern = pData[nIndex].pPattern;
 //UNUSED2008-05          const SfxPoolItem* pItem;
-//UNUSED2008-05          if( pOldPattern->GetItemSet().GetItemState( ATTR_FONT, FALSE, &pItem ) == SFX_ITEM_SET )
+//UNUSED2008-05          if( pOldPattern->GetItemSet().GetItemState( ATTR_FONT, sal_False, &pItem ) == SFX_ITEM_SET )
 //UNUSED2008-05          {
 //UNUSED2008-05              const SvxFontItem* pFontItem = (const SvxFontItem*) pItem;
 //UNUSED2008-05              const String& rOldName = pFontItem->GetFamilyName();
@@ -2599,7 +2599,7 @@ void ScAttrArray::Load( SvStream& /* rStream */ )
 //UNUSED2008-05                          RTL_TEXTENCODING_DONTKNOW, ATTR_FONT );
 //UNUSED2008-05                      ScPatternAttr aNewPattern( *pOldPattern );
 //UNUSED2008-05                      aNewPattern.GetItemSet().Put( aNewItem );
-//UNUSED2008-05                      SetPatternArea( nThisRow, nAttrRow, &aNewPattern, TRUE );
+//UNUSED2008-05                      SetPatternArea( nThisRow, nAttrRow, &aNewPattern, sal_True );
 //UNUSED2008-05                      Search( nThisRow, nIndex );     //! data changed
 //UNUSED2008-05                  }
 //UNUSED2008-05              }
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 1b0662445..f6967d1b1 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -74,31 +74,31 @@ TYPEINIT1(ScPageScaleToItem,    SfxPoolItem);
 //		allgemeine Hilfsfunktionen
 //
 
-BOOL ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther )
+sal_Bool ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther )
 {
 //	  DBG_ASSERT( pThis || pOther, "LineAttr == 0" );
 
     if (!pThis)
-        return FALSE;
+        return sal_False;
     if (!pOther)
-        return TRUE;
+        return sal_True;
 
-    USHORT nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
-    USHORT nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
+    sal_uInt16 nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
+    sal_uInt16 nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
 
     if (nThisSize > nOtherSize)
-        return TRUE;
+        return sal_True;
     else if (nThisSize < nOtherSize)
-        return FALSE;
+        return sal_False;
     else
     {
         if ( pOther->GetInWidth() && !pThis->GetInWidth() )
-            return TRUE;
+            return sal_True;
         else if ( pThis->GetInWidth() && !pOther->GetInWidth() )
-            return FALSE;
+            return sal_False;
         else
         {
-            return TRUE;			//! ???
+            return sal_True;			//! ???
         }
     }
 }
@@ -170,10 +170,10 @@ SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, USHORT /* nVer */ ) const
+SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) const
 {
-    INT16	nCol;
-    INT16	nRow;
+    sal_Int16	nCol;
+    sal_Int16	nRow;
     rStream >> nCol;
     rStream >> nRow;
     return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow));
@@ -190,7 +190,7 @@ ScMergeFlagAttr::ScMergeFlagAttr():
 
 //------------------------------------------------------------------------
 
-ScMergeFlagAttr::ScMergeFlagAttr(INT16 nFlags):
+ScMergeFlagAttr::ScMergeFlagAttr(sal_Int16 nFlags):
     SfxInt16Item(ATTR_MERGE_FLAG, nFlags)
 {
 }
@@ -205,17 +205,17 @@ ScMergeFlagAttr::~ScMergeFlagAttr()
 
 ScProtectionAttr::ScProtectionAttr():
     SfxPoolItem(ATTR_PROTECTION),
-    bProtection(TRUE),
-    bHideFormula(FALSE),
-    bHideCell(FALSE),
-    bHidePrint(FALSE)
+    bProtection(sal_True),
+    bHideFormula(sal_False),
+    bHideCell(sal_False),
+    bHidePrint(sal_False)
 {
 }
 
 //------------------------------------------------------------------------
 
-ScProtectionAttr::ScProtectionAttr( BOOL bProtect, BOOL bHFormula,
-                                    BOOL bHCell, BOOL bHPrint):
+ScProtectionAttr::ScProtectionAttr( sal_Bool bProtect, sal_Bool bHFormula,
+                                    sal_Bool bHCell, sal_Bool bHPrint):
     SfxPoolItem(ATTR_PROTECTION),
     bProtection(bProtect),
     bHideFormula(bHFormula),
@@ -241,7 +241,7 @@ ScProtectionAttr::~ScProtectionAttr()
 
 //------------------------------------------------------------------------
 
-BOOL ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool ScProtectionAttr::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId  )
@@ -266,15 +266,15 @@ BOOL ScProtectionAttr::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
             rVal <<= (sal_Bool ) bHidePrint; break;
         default:
             DBG_ERROR("Wrong MemberID!");
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool ScProtectionAttr::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     sal_Bool bVal = sal_Bool();
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -288,7 +288,7 @@ BOOL ScProtectionAttr::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 bHideFormula = aProtection.IsFormulaHidden;
                 bHideCell    = aProtection.IsHidden;
                 bHidePrint   = aProtection.IsPrintHidden;
-                bRet = TRUE;
+                bRet = sal_True;
             }
             else
             {
@@ -395,12 +395,12 @@ SfxPoolItem* ScProtectionAttr::Clone( SfxItemPool * ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, USHORT /* n */ ) const
+SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) const
 {
-    BOOL bProtect;
-    BOOL bHFormula;
-    BOOL bHCell;
-    BOOL bHPrint;
+    sal_Bool bProtect;
+    sal_Bool bHFormula;
+    sal_Bool bHCell;
+    sal_Bool bHPrint;
 
     rStream >> bProtect;
     rStream >> bHFormula;
@@ -412,34 +412,34 @@ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, USHORT /* n */ ) const
 
 //------------------------------------------------------------------------
 
-BOOL ScProtectionAttr::SetProtection( BOOL bProtect)
+sal_Bool ScProtectionAttr::SetProtection( sal_Bool bProtect)
 {
     bProtection =  bProtect;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScProtectionAttr::SetHideFormula( BOOL bHFormula)
+sal_Bool ScProtectionAttr::SetHideFormula( sal_Bool bHFormula)
 {
     bHideFormula = bHFormula;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScProtectionAttr::SetHideCell( BOOL bHCell)
+sal_Bool ScProtectionAttr::SetHideCell( sal_Bool bHCell)
 {
     bHideCell = bHCell;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScProtectionAttr::SetHidePrint( BOOL bHPrint)
+sal_Bool ScProtectionAttr::SetHidePrint( sal_Bool bHPrint)
 {
     bHidePrint = bHPrint;
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -510,7 +510,7 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy )
     {
         pTabArr = new SCTAB [nCount];
 
-        for ( USHORT i=0; i<nCount; i++ )
+        for ( sal_uInt16 i=0; i<nCount; i++ )
             pTabArr[i] = rCpy.pTabArr[i];
     }
     else
@@ -519,7 +519,7 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy )
 
 // -----------------------------------------------------------------------
 
-//UNUSED2008-05  ScTableListItem::ScTableListItem( const USHORT nWhichP, const List& rList )
+//UNUSED2008-05  ScTableListItem::ScTableListItem( const sal_uInt16 nWhichP, const List& rList )
 //UNUSED2008-05      :   SfxPoolItem ( nWhichP ),
 //UNUSED2008-05          nCount      ( 0 ),
 //UNUSED2008-05          pTabArr     ( NULL )
@@ -543,7 +543,7 @@ ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy )
     if ( rCpy.nCount > 0 )
     {
         pTabArr = new SCTAB [rCpy.nCount];
-        for ( USHORT i=0; i<rCpy.nCount; i++ )
+        for ( sal_uInt16 i=0; i<rCpy.nCount; i++ )
             pTabArr[i] = rCpy.pTabArr[i];
     }
     else
@@ -561,11 +561,11 @@ int ScTableListItem::operator==( const SfxPoolItem& rAttr ) const
     DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
 
     ScTableListItem&	rCmp   = (ScTableListItem&)rAttr;
-    BOOL				bEqual = (nCount == rCmp.nCount);
+    sal_Bool				bEqual = (nCount == rCmp.nCount);
 
     if ( nCount > 0 )
     {
-        USHORT	i=0;
+        sal_uInt16	i=0;
 
         bEqual = ( pTabArr && rCmp.pTabArr );
 
@@ -608,7 +608,7 @@ SfxItemPresentation ScTableListItem::GetPresentation
             {
             rText  = '(';
             if ( nCount>0 && pTabArr )
-                for ( USHORT i=0; i<nCount; i++ )
+                for ( sal_uInt16 i=0; i<nCount; i++ )
                 {
                     rText += String::CreateFromInt32( pTabArr[i] );
                     if ( i<(nCount-1) )
@@ -633,9 +633,9 @@ SfxItemPresentation ScTableListItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-//UNUSED2009-05 BOOL ScTableListItem::GetTableList( List& aList ) const
+//UNUSED2009-05 sal_Bool ScTableListItem::GetTableList( List& aList ) const
 //UNUSED2009-05 {
-//UNUSED2009-05     for ( USHORT i=0; i<nCount; i++ )
+//UNUSED2009-05     for ( sal_uInt16 i=0; i<nCount; i++ )
 //UNUSED2009-05         aList.Insert( new SCTAB( pTabArr[i] ) );
 //UNUSED2009-05 
 //UNUSED2009-05     return ( nCount > 0 );
@@ -645,7 +645,7 @@ SfxItemPresentation ScTableListItem::GetPresentation
 
 //UNUSED2009-05 void ScTableListItem::SetTableList( const List& rList )
 //UNUSED2009-05 {
-//UNUSED2009-05     nCount = (USHORT)rList.Count();
+//UNUSED2009-05     nCount = (sal_uInt16)rList.Count();
 //UNUSED2009-05 
 //UNUSED2009-05     delete [] pTabArr;
 //UNUSED2009-05 
@@ -653,7 +653,7 @@ SfxItemPresentation ScTableListItem::GetPresentation
 //UNUSED2009-05     {
 //UNUSED2009-05         pTabArr = new SCTAB [nCount];
 //UNUSED2009-05 
-//UNUSED2009-05         for ( USHORT i=0; i<nCount; i++ )
+//UNUSED2009-05         for ( sal_uInt16 i=0; i<nCount; i++ )
 //UNUSED2009-05             pTabArr[i] = *( (SCTAB*)rList.GetObject( i ) );
 //UNUSED2009-05     }
 //UNUSED2009-05     else
@@ -665,7 +665,7 @@ SfxItemPresentation ScTableListItem::GetPresentation
 //      ScPageHFItem - Daten der Kopf-/Fusszeilen
 // -----------------------------------------------------------------------
 
-ScPageHFItem::ScPageHFItem( USHORT nWhichP )
+ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP )
     :   SfxPoolItem ( nWhichP ),
         pLeftArea	( NULL ),
         pCenterArea ( NULL ),
@@ -700,18 +700,18 @@ ScPageHFItem::~ScPageHFItem()
 
 //------------------------------------------------------------------------
 
-BOOL ScPageHFItem::QueryValue( uno::Any& rVal, BYTE /* nMemberId */ ) const
+sal_Bool ScPageHFItem::QueryValue( uno::Any& rVal, sal_uInt8 /* nMemberId */ ) const
 {
     uno::Reference<sheet::XHeaderFooterContent> xContent =
         new ScHeaderFooterContentObj( pLeftArea, pCenterArea, pRightArea );
 
     rVal <<= xContent;
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScPageHFItem::PutValue( const uno::Any& rVal, BYTE /* nMemberId */ )
+sal_Bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     uno::Reference<sheet::XHeaderFooterContent> xContent;
     if ( rVal >>= xContent )
     {
@@ -736,7 +736,7 @@ BOOL ScPageHFItem::PutValue( const uno::Any& rVal, BYTE /* nMemberId */ )
                 if ( !pLeftArea || !pCenterArea || !pRightArea )
                 {
                     // keine Texte auf NULL stehen lassen
-                    ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), TRUE );
+                    ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), sal_True );
                     if (!pLeftArea)
                         pLeftArea = aEngine.CreateTextObject();
                     if (!pCenterArea)
@@ -745,7 +745,7 @@ BOOL ScPageHFItem::PutValue( const uno::Any& rVal, BYTE /* nMemberId */ )
                         pRightArea = aEngine.CreateTextObject();
                 }
 
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -796,11 +796,11 @@ void lcl_SetSpace( String& rStr, const ESelection& rSel )
     rStr.SetChar( rSel.nStartPos, ' ' );
 }
 
-BOOL lcl_ConvertFields(EditEngine& rEng, const String* pCommands)
+sal_Bool lcl_ConvertFields(EditEngine& rEng, const String* pCommands)
 {
-    BOOL bChange = FALSE;
-    USHORT nParCnt = rEng.GetParagraphCount();
-    for (USHORT nPar = 0; nPar<nParCnt; nPar++)
+    sal_Bool bChange = sal_False;
+    sal_uInt16 nParCnt = rEng.GetParagraphCount();
+    for (sal_uInt16 nPar = 0; nPar<nParCnt; nPar++)
     {
         String aStr = rEng.GetText( nPar );
         xub_StrLen nPos;
@@ -809,37 +809,37 @@ BOOL lcl_ConvertFields(EditEngine& rEng, const String* pCommands)
         {
             ESelection aSel( nPar,nPos, nPar,nPos+pCommands[0].Len() );
             rEng.QuickInsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), aSel );
-            lcl_SetSpace(aStr, aSel ); bChange = TRUE;
+            lcl_SetSpace(aStr, aSel ); bChange = sal_True;
         }
         while ((nPos = aStr.Search(pCommands[1])) != STRING_NOTFOUND)
         {
             ESelection aSel( nPar,nPos, nPar,nPos+pCommands[1].Len() );
             rEng.QuickInsertField( SvxFieldItem(SvxPagesField(), EE_FEATURE_FIELD), aSel );
-            lcl_SetSpace(aStr, aSel ); bChange = TRUE;
+            lcl_SetSpace(aStr, aSel ); bChange = sal_True;
         }
         while ((nPos = aStr.Search(pCommands[2])) != STRING_NOTFOUND)
         {
             ESelection aSel( nPar,nPos, nPar,nPos+pCommands[2].Len() );
             rEng.QuickInsertField( SvxFieldItem(SvxDateField(Date(),SVXDATETYPE_VAR), EE_FEATURE_FIELD), aSel );
-            lcl_SetSpace(aStr, aSel ); bChange = TRUE;
+            lcl_SetSpace(aStr, aSel ); bChange = sal_True;
         }
         while ((nPos = aStr.Search(pCommands[3])) != STRING_NOTFOUND)
         {
             ESelection aSel( nPar,nPos, nPar,nPos+pCommands[3].Len() );
             rEng.QuickInsertField( SvxFieldItem(SvxTimeField(), EE_FEATURE_FIELD ), aSel );
-            lcl_SetSpace(aStr, aSel ); bChange = TRUE;
+            lcl_SetSpace(aStr, aSel ); bChange = sal_True;
         }
         while ((nPos = aStr.Search(pCommands[4])) != STRING_NOTFOUND)
         {
             ESelection aSel( nPar,nPos, nPar,nPos+pCommands[4].Len() );
             rEng.QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), aSel );
-            lcl_SetSpace(aStr, aSel ); bChange = TRUE;
+            lcl_SetSpace(aStr, aSel ); bChange = sal_True;
         }
         while ((nPos = aStr.Search(pCommands[5])) != STRING_NOTFOUND)
         {
             ESelection aSel( nPar,nPos, nPar,nPos+pCommands[5].Len() );
             rEng.QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), aSel );
-            lcl_SetSpace(aStr, aSel ); bChange = TRUE;
+            lcl_SetSpace(aStr, aSel ); bChange = sal_True;
         }
     }
     return bChange;
@@ -847,7 +847,7 @@ BOOL lcl_ConvertFields(EditEngine& rEng, const String* pCommands)
 
 #define SC_FIELD_COUNT	6
 
-SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const
+SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
 {
     EditTextObject* pLeft	= EditTextObject::Create(rStream);
     EditTextObject* pCenter = EditTextObject::Create(rStream);
@@ -863,7 +863,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const
         //	Excel import in 5.1 created broken TextObjects (#67442#) that are
         //	corrected here to avoid saving wrong files again (#90487#).
 
-        ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), TRUE );
+        ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), sal_True );
         if ( pLeft == NULL || pLeft->GetParagraphCount() == 0 )
         {
             delete pLeft;
@@ -883,7 +883,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const
 
     if ( nVer < 1 )				// alte Feldbefehle umsetzen
     {
-        USHORT i;
+        sal_uInt16 i;
         const String& rDel = ScGlobal::GetRscString( STR_HFCMD_DELIMITER );
         String aCommands[SC_FIELD_COUNT];
         for (i=0; i<SC_FIELD_COUNT; i++)
@@ -897,7 +897,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const
         for (i=0; i<SC_FIELD_COUNT; i++)
             aCommands[i] += rDel;
 
-        ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), TRUE );
+        ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), sal_True );
         aEngine.SetText(*pLeft);
         if (lcl_ConvertFields(aEngine,aCommands))
         {
@@ -934,56 +934,56 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const
 //UNUSED2009-05 class ScFieldChangerEditEngine : public ScEditEngineDefaulter
 //UNUSED2009-05 {
 //UNUSED2009-05     TypeId      aExtFileId;
-//UNUSED2009-05     USHORT      nConvPara;
+//UNUSED2009-05     sal_uInt16      nConvPara;
 //UNUSED2009-05     xub_StrLen  nConvPos;
-//UNUSED2009-05     BOOL        bConvert;
+//UNUSED2009-05     sal_Bool        bConvert;
 //UNUSED2009-05 
 //UNUSED2009-05 public:
-//UNUSED2009-05     ScFieldChangerEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool );
+//UNUSED2009-05     ScFieldChangerEditEngine( SfxItemPool* pEnginePool, sal_Bool bDeleteEnginePool );
 //UNUSED2009-05     virtual     ~ScFieldChangerEditEngine() {}
 //UNUSED2009-05 
-//UNUSED2009-05     virtual String  CalcFieldValue( const SvxFieldItem& rField, USHORT nPara,
-//UNUSED2009-05                                     USHORT nPos, Color*& rTxtColor,
+//UNUSED2009-05     virtual String  CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara,
+//UNUSED2009-05                                     sal_uInt16 nPos, Color*& rTxtColor,
 //UNUSED2009-05                                     Color*& rFldColor );
 //UNUSED2009-05 
-//UNUSED2009-05     BOOL            ConvertFields();
+//UNUSED2009-05     sal_Bool            ConvertFields();
 //UNUSED2009-05 };
 //UNUSED2009-05 
 //UNUSED2009-05 ScFieldChangerEditEngine::ScFieldChangerEditEngine( SfxItemPool* pEnginePoolP,
-//UNUSED2009-05             BOOL bDeleteEnginePoolP ) :
+//UNUSED2009-05             sal_Bool bDeleteEnginePoolP ) :
 //UNUSED2009-05         ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP ),
 //UNUSED2009-05         aExtFileId( TYPE( SvxExtFileField ) ),
 //UNUSED2009-05         nConvPara( 0 ),
 //UNUSED2009-05         nConvPos( 0 ),
-//UNUSED2009-05         bConvert( FALSE )
+//UNUSED2009-05         bConvert( sal_False )
 //UNUSED2009-05 {
 //UNUSED2009-05 }
 //UNUSED2009-05 
 //UNUSED2009-05 String ScFieldChangerEditEngine::CalcFieldValue( const SvxFieldItem& rField,
-//UNUSED2009-05             USHORT nPara, USHORT nPos, Color*& /* rTxtColor */, Color*& /* rFldColor */ )
+//UNUSED2009-05             sal_uInt16 nPara, sal_uInt16 nPos, Color*& /* rTxtColor */, Color*& /* rFldColor */ )
 //UNUSED2009-05 {
 //UNUSED2009-05     const SvxFieldData* pFieldData = rField.GetField();
 //UNUSED2009-05     if ( pFieldData && pFieldData->Type() == aExtFileId )
 //UNUSED2009-05     {
-//UNUSED2009-05         bConvert = TRUE;
+//UNUSED2009-05         bConvert = sal_True;
 //UNUSED2009-05         nConvPara = nPara;
 //UNUSED2009-05         nConvPos = nPos;
 //UNUSED2009-05     }
 //UNUSED2009-05     return EMPTY_STRING;
 //UNUSED2009-05 }
 //UNUSED2009-05 
-//UNUSED2009-05 BOOL ScFieldChangerEditEngine::ConvertFields()
+//UNUSED2009-05 sal_Bool ScFieldChangerEditEngine::ConvertFields()
 //UNUSED2009-05 {
-//UNUSED2009-05     BOOL bConverted = FALSE;
+//UNUSED2009-05     sal_Bool bConverted = sal_False;
 //UNUSED2009-05     do
 //UNUSED2009-05     {
-//UNUSED2009-05         bConvert = FALSE;
+//UNUSED2009-05         bConvert = sal_False;
 //UNUSED2009-05         UpdateFields();
 //UNUSED2009-05         if ( bConvert )
 //UNUSED2009-05         {
 //UNUSED2009-05             ESelection aSel( nConvPara, nConvPos, nConvPara, nConvPos+1 );
 //UNUSED2009-05             QuickInsertField( SvxFieldItem( SvxFileField(), EE_FEATURE_FIELD), aSel );
-//UNUSED2009-05             bConverted = TRUE;
+//UNUSED2009-05             bConverted = sal_True;
 //UNUSED2009-05         }
 //UNUSED2009-05     } while ( bConvert );
 //UNUSED2009-05     return bConverted;
@@ -1027,15 +1027,15 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea )
 //	ScViewObjectModeItem - Darstellungsmodus von ViewObjekten
 //-----------------------------------------------------------------------
 
-ScViewObjectModeItem::ScViewObjectModeItem( USHORT nWhichP )
+ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP )
     : SfxEnumItem( nWhichP, VOBJ_MODE_SHOW )
 {
 }
 
 //------------------------------------------------------------------------
 
-ScViewObjectModeItem::ScViewObjectModeItem( USHORT nWhichP, ScVObjMode eMode )
-    : SfxEnumItem( nWhichP, sal::static_int_cast<USHORT>(eMode) )
+ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP, ScVObjMode eMode )
+    : SfxEnumItem( nWhichP, sal::static_int_cast<sal_uInt16>(eMode) )
 {
 }
 
@@ -1100,7 +1100,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation
 
 //------------------------------------------------------------------------
 
-String ScViewObjectModeItem::GetValueText( USHORT nVal ) const
+String ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const
 {
     DBG_ASSERT( nVal <= VOBJ_MODE_HIDE, "enum overflow!" );
 
@@ -1109,7 +1109,7 @@ String ScViewObjectModeItem::GetValueText( USHORT nVal ) const
 
 //------------------------------------------------------------------------
 
-USHORT ScViewObjectModeItem::GetValueCount() const
+sal_uInt16 ScViewObjectModeItem::GetValueCount() const
 {
     return 2;
 }
@@ -1123,7 +1123,7 @@ SfxPoolItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-USHORT ScViewObjectModeItem::GetVersion( USHORT /* nFileVersion */ ) const
+sal_uInt16 ScViewObjectModeItem::GetVersion( sal_uInt16 /* nFileVersion */ ) const
 {
     return 1;
 }
@@ -1132,7 +1132,7 @@ USHORT ScViewObjectModeItem::GetVersion( USHORT /* nFileVersion */ ) const
 
 SfxPoolItem* ScViewObjectModeItem::Create(
                                     SvStream&	rStream,
-                                    USHORT		nVersion ) const
+                                    sal_uInt16		nVersion ) const
 {
     if ( nVersion == 0 )
     {
@@ -1141,11 +1141,11 @@ SfxPoolItem* ScViewObjectModeItem::Create(
     }
     else
     {
-        USHORT nVal;
+        sal_uInt16 nVal;
         rStream >> nVal;
 
         //#i80528# adapt to new range eventually
-        if((USHORT)VOBJ_MODE_HIDE < nVal) nVal = (USHORT)VOBJ_MODE_SHOW;
+        if((sal_uInt16)VOBJ_MODE_HIDE < nVal) nVal = (sal_uInt16)VOBJ_MODE_SHOW;
 
         return new ScViewObjectModeItem( Which(), (ScVObjMode)nVal);
     }
@@ -1155,7 +1155,7 @@ SfxPoolItem* ScViewObjectModeItem::Create(
 //		double
 // -----------------------------------------------------------------------
 
-ScDoubleItem::ScDoubleItem( USHORT nWhichP, double nVal )
+ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal )
     :   SfxPoolItem ( nWhichP ),
         nValue	( nVal )
 {
@@ -1195,7 +1195,7 @@ SfxPoolItem* ScDoubleItem::Clone( SfxItemPool* ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, USHORT /* nVer */ ) const
+SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) const
 {
     double nTmp=0;
     rStream >> nTmp;
@@ -1296,23 +1296,23 @@ SfxItemPresentation ScPageScaleToItem::GetPresentation(
     return ePres;
 }
 
-BOOL ScPageScaleToItem::QueryValue( uno::Any& rAny, BYTE nMemberId ) const
+sal_Bool ScPageScaleToItem::QueryValue( uno::Any& rAny, sal_uInt8 nMemberId ) const
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
     switch( nMemberId )
     {
         case SC_MID_PAGE_SCALETO_WIDTH:     rAny <<= mnWidth;   break;
         case SC_MID_PAGE_SCALETO_HEIGHT:    rAny <<= mnHeight;  break;
         default:
             DBG_ERRORFILE( "ScPageScaleToItem::QueryValue - unknown member ID" );
-            bRet = FALSE;
+            bRet = sal_False;
     }
     return bRet;
 }
 
-BOOL ScPageScaleToItem::PutValue( const uno::Any& rAny, BYTE nMemberId )
+sal_Bool ScPageScaleToItem::PutValue( const uno::Any& rAny, sal_uInt8 nMemberId )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     switch( nMemberId )
     {
         case SC_MID_PAGE_SCALETO_WIDTH:     bRet = rAny >>= mnWidth;    break;
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 7e7653ee5..3db03f8d0 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -166,7 +166,7 @@ bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const
             if ( pShell )
                 pShell->SetError( SCWARN_CORE_HARD_RECALC, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
 
-            pDoc->SetAutoCalc( FALSE );
+            pDoc->SetAutoCalc( sal_False );
             pDoc->SetHardRecalcState( 2 );
         }
         return true;
@@ -278,11 +278,11 @@ ScBroadcastAreas::iterator ScBroadcastAreaSlot::FindBroadcastArea(
 }
 
 
-BOOL ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) const
+sal_Bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) const
 {
     if (aBroadcastAreaTbl.empty())
-        return FALSE;
-    BOOL bIsBroadcasted = FALSE;
+        return sal_False;
+    sal_Bool bIsBroadcasted = sal_False;
     const ScAddress& rAddress = rHint.GetAddress();
     for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); 
             aIter != aBroadcastAreaTbl.end(); /* increment in body */ )
@@ -298,7 +298,7 @@ BOOL ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) const
             if (!pBASM->IsInBulkBroadcast() || pBASM->InsertBulkArea( pArea))
             {
                 pArea->GetBroadcaster().Broadcast( rHint);
-                bIsBroadcasted = TRUE;
+                bIsBroadcasted = sal_True;
             }
         }
     }
@@ -306,12 +306,12 @@ BOOL ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) const
 }
 
 
-BOOL ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange,
+sal_Bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange,
         const ScHint& rHint) const
 {
     if (aBroadcastAreaTbl.empty())
-        return FALSE;
-    BOOL bIsBroadcasted = FALSE;
+        return sal_False;
+    sal_Bool bIsBroadcasted = sal_False;
     for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); 
             aIter != aBroadcastAreaTbl.end(); /* increment in body */ )
     {
@@ -326,7 +326,7 @@ BOOL ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange,
             if (!pBASM->IsInBulkBroadcast() || pBASM->InsertBulkArea( pArea))
             {
                 pArea->GetBroadcaster().Broadcast( rHint);
-                bIsBroadcasted = TRUE;
+                bIsBroadcasted = sal_True;
             }
         }
     }
@@ -389,7 +389,7 @@ void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode eUpdateRefMode,
                 pArea->DecRef();
                 if (pBASM->IsInBulkBroadcast())
                     pBASM->RemoveBulkArea( pArea);
-                pArea->SetInUpdateChain( TRUE );
+                pArea->SetInUpdateChain( sal_True );
                 ScBroadcastArea* pUC = pBASM->GetEOUpdateChain();
                 if ( pUC )
                     pUC->SetUpdateChainNext( pArea );
@@ -643,7 +643,7 @@ void ScBroadcastAreaSlotMachine::EndListeningArea( const ScRange& rRange,
 }
 
 
-BOOL ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const
+sal_Bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const
 {
     const ScAddress& rAddress = rHint.GetAddress();
     if ( rAddress == BCA_BRDCST_ALWAYS )
@@ -651,30 +651,30 @@ BOOL ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const
         if ( pBCAlways )
         {
             pBCAlways->Broadcast( rHint );
-            return TRUE;
+            return sal_True;
         }
         else
-            return FALSE;
+            return sal_False;
     }
     else
     {
         TableSlotsMap::const_iterator iTab( aTableSlotsMap.find( rAddress.Tab()));
         if (iTab == aTableSlotsMap.end())
-            return FALSE;
+            return sal_False;
         ScBroadcastAreaSlot* pSlot = (*iTab).second->getAreaSlot( 
                 ComputeSlotOffset( rAddress));
         if ( pSlot )
             return pSlot->AreaBroadcast( rHint );
         else
-            return FALSE;
+            return sal_False;
     }
 }
 
 
-BOOL ScBroadcastAreaSlotMachine::AreaBroadcastInRange( const ScRange& rRange,
+sal_Bool ScBroadcastAreaSlotMachine::AreaBroadcastInRange( const ScRange& rRange,
         const ScHint& rHint ) const
 {
-    BOOL bBroadcasted = FALSE;
+    sal_Bool bBroadcasted = sal_False;
     SCTAB nEndTab = rRange.aEnd.Tab();
     for (TableSlotsMap::const_iterator iTab( aTableSlotsMap.lower_bound( rRange.aStart.Tab()));
             iTab != aTableSlotsMap.end() && (*iTab).first <= nEndTab; ++iTab)
@@ -898,7 +898,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas(
 
         // unchain
         pArea->SetUpdateChainNext( NULL );
-        pArea->SetInUpdateChain( FALSE );
+        pArea->SetInUpdateChain( sal_False );
 
         // Delete if not inserted to any slot. RemoveBulkArea(pArea) was 
         // already executed in UpdateRemove().
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 1ea4b2259..aab9ec233 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -64,16 +64,16 @@ using namespace formula;
 // hand, if the value fits all recursions, execution is quicker as no resumes
 // are necessary. Could be made a configurable option.
 // Allow for a year's calendar (366).
-const USHORT MAXRECURSION = 400;
+const sal_uInt16 MAXRECURSION = 400;
 
 // STATIC DATA -----------------------------------------------------------
 
 #ifdef USE_MEMPOOL
 // MemPools auf 4k Boundaries  - 64 Bytes ausrichten
-const USHORT nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
-const USHORT nMemPoolFormulaCell = (0x8000 - 64) / sizeof(ScFormulaCell);
-const USHORT nMemPoolStringCell = (0x4000 - 64) / sizeof(ScStringCell);
-const USHORT nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell);
+const sal_uInt16 nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
+const sal_uInt16 nMemPoolFormulaCell = (0x8000 - 64) / sizeof(ScFormulaCell);
+const sal_uInt16 nMemPoolStringCell = (0x4000 - 64) / sizeof(ScStringCell);
+const sal_uInt16 nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell,   nMemPoolValueCell, nMemPoolValueCell )
 IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, nMemPoolFormulaCell )
 IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell,  nMemPoolStringCell, nMemPoolStringCell )
@@ -86,7 +86,7 @@ ScBaseCell::ScBaseCell( CellType eNewType ) :
     mpNote( 0 ),
     mpBroadcaster( 0 ),
     nTextWidth( TEXTWIDTH_DIRTY ),
-    eCellType( sal::static_int_cast<BYTE>(eNewType) ),
+    eCellType( sal::static_int_cast<sal_uInt8>(eNewType) ),
     nScriptType( SC_SCRIPTTYPE_UNKNOWN )
 {
 }
@@ -240,7 +240,7 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc )
             && !((ScFormulaCell*)this)->IsInChangeTrack()
         )
     {
-        pDoc->SetDetectiveDirty(TRUE);	// es hat sich was geaendert...
+        pDoc->SetDetectiveDirty(sal_True);	// es hat sich was geaendert...
 
         ScFormulaCell* pFormCell = (ScFormulaCell*)this;
         ScTokenArray* pArr = pFormCell->GetCode();
@@ -312,7 +312,7 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc )
                 }
             }
         }
-        pFormCell->SetNeedsListening( FALSE);
+        pFormCell->SetNeedsListening( sal_False);
     }
 }
 
@@ -326,7 +326,7 @@ void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr,
             && !((ScFormulaCell*)this)->IsInChangeTrack()
         )
     {
-        pDoc->SetDetectiveDirty(TRUE);	// es hat sich was geaendert...
+        pDoc->SetDetectiveDirty(sal_True);	// es hat sich was geaendert...
 
         ScFormulaCell* pFormCell = (ScFormulaCell*)this;
         if( pFormCell->GetCode()->IsRecalcModeAlways() )
@@ -406,7 +406,7 @@ void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr,
 }
 
 
-USHORT ScBaseCell::GetErrorCode() const
+sal_uInt16 ScBaseCell::GetErrorCode() const
 {
     switch ( eCellType )
     {
@@ -418,45 +418,45 @@ USHORT ScBaseCell::GetErrorCode() const
 }
 
 
-BOOL ScBaseCell::HasEmptyData() const
+sal_Bool ScBaseCell::HasEmptyData() const
 {
     switch ( eCellType )
     {
         case CELLTYPE_NOTE :
-            return TRUE;
+            return sal_True;
         case CELLTYPE_FORMULA :
             return ((ScFormulaCell*)this)->IsEmpty();
         default:
-            return FALSE;
+            return sal_False;
     }
 }
 
 
-BOOL ScBaseCell::HasValueData() const
+sal_Bool ScBaseCell::HasValueData() const
 {
     switch ( eCellType )
     {
         case CELLTYPE_VALUE :
-            return TRUE;
+            return sal_True;
         case CELLTYPE_FORMULA :
             return ((ScFormulaCell*)this)->IsValue();
         default:
-            return FALSE;
+            return sal_False;
     }
 }
 
 
-BOOL ScBaseCell::HasStringData() const
+sal_Bool ScBaseCell::HasStringData() const
 {
     switch ( eCellType )
     {
         case CELLTYPE_STRING :
         case CELLTYPE_EDIT :
-            return TRUE;
+            return sal_True;
         case CELLTYPE_FORMULA :
             return !((ScFormulaCell*)this)->IsValue();
         default:
-            return FALSE;
+            return sal_False;
     }
 }
 
@@ -479,7 +479,7 @@ String ScBaseCell::GetStringData() const
 }
 
 //	static
-BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
+sal_Bool ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
 {
     CellType eType1 = CELLTYPE_NONE;
     CellType eType2 = CELLTYPE_NONE;
@@ -500,12 +500,12 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
             eType2 = CELLTYPE_NONE;
     }
     if ( eType1 != eType2 )
-        return FALSE;
+        return sal_False;
 
     switch ( eType1 )				// beide Typen gleich
     {
         case CELLTYPE_NONE:			// beide leer
-            return TRUE;
+            return sal_True;
         case CELLTYPE_VALUE:		// wirklich Value-Zellen
             return ( ((const ScValueCell*)pCell1)->GetValue() ==
                      ((const ScValueCell*)pCell2)->GetValue() );
@@ -534,27 +534,27 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
 
                 if (pCode1->GetLen() == pCode2->GetLen())		// nicht-UPN
                 {
-                    BOOL bEqual = TRUE;
-                    USHORT nLen = pCode1->GetLen();
+                    sal_Bool bEqual = sal_True;
+                    sal_uInt16 nLen = pCode1->GetLen();
                     FormulaToken** ppToken1 = pCode1->GetArray();
                     FormulaToken** ppToken2 = pCode2->GetArray();
-                    for (USHORT i=0; i<nLen; i++)
+                    for (sal_uInt16 i=0; i<nLen; i++)
                         if ( !ppToken1[i]->TextEqual(*(ppToken2[i])) )
                         {
-                            bEqual = FALSE;
+                            bEqual = sal_False;
                             break;
                         }
 
                     if (bEqual)
-                        return TRUE;
+                        return sal_True;
                 }
 
-                return FALSE;		// unterschiedlich lang oder unterschiedliche Tokens
+                return sal_False;		// unterschiedlich lang oder unterschiedliche Tokens
             }
         default:
             DBG_ERROR("huch, was fuer Zellen???");
     }
-    return FALSE;
+    return sal_False;
 }
 
 // ============================================================================
@@ -639,15 +639,15 @@ ScFormulaCell::ScFormulaCell() :
     nFormatType( NUMBERFORMAT_NUMBER ),
     nSeenInIteration(0),
     cMatrixFlag ( MM_NONE ),
-    bDirty( FALSE ),
-    bChanged( FALSE ),
-    bRunning( FALSE ),
-    bCompile( FALSE ),
-    bSubTotal( FALSE ),
-    bIsIterCell( FALSE ),
-    bInChangeTrack( FALSE ),
-    bTableOpDirty( FALSE ),
-    bNeedListening( FALSE ),
+    bDirty( sal_False ),
+    bChanged( sal_False ),
+    bRunning( sal_False ),
+    bCompile( sal_False ),
+    bSubTotal( sal_False ),
+    bIsIterCell( sal_False ),
+    bInChangeTrack( sal_False ),
+    bTableOpDirty( sal_False ),
+    bNeedListening( sal_False ),
     aPos(0,0,0)
 {
 }
@@ -655,7 +655,7 @@ ScFormulaCell::ScFormulaCell() :
 ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
                               const String& rFormula,
                               const FormulaGrammar::Grammar eGrammar,
-                              BYTE cMatInd ) :
+                              sal_uInt8 cMatInd ) :
     ScBaseCell( CELLTYPE_FORMULA ),
     eTempGrammar( eGrammar),
     pCode( NULL ),
@@ -668,25 +668,25 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
     nFormatType( NUMBERFORMAT_NUMBER ),
     nSeenInIteration(0),
     cMatrixFlag ( cMatInd ),
-    bDirty( TRUE ), // -> wg. Benutzung im Fkt.AutoPiloten, war: cMatInd != 0
-    bChanged( FALSE ),
-    bRunning( FALSE ),
-    bCompile( FALSE ),
-    bSubTotal( FALSE ),
-    bIsIterCell( FALSE ),
-    bInChangeTrack( FALSE ),
-    bTableOpDirty( FALSE ),
-    bNeedListening( FALSE ),
+    bDirty( sal_True ), // -> wg. Benutzung im Fkt.AutoPiloten, war: cMatInd != 0
+    bChanged( sal_False ),
+    bRunning( sal_False ),
+    bCompile( sal_False ),
+    bSubTotal( sal_False ),
+    bIsIterCell( sal_False ),
+    bInChangeTrack( sal_False ),
+    bTableOpDirty( sal_False ),
+    bNeedListening( sal_False ),
     aPos( rPos )
 {
-    Compile( rFormula, TRUE, eGrammar );    // bNoListening, Insert does that
+    Compile( rFormula, sal_True, eGrammar );    // bNoListening, Insert does that
 }
 
 // Wird von den Importfiltern verwendet
 
 ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
                               const ScTokenArray* pArr,
-                              const FormulaGrammar::Grammar eGrammar, BYTE cInd ) :
+                              const FormulaGrammar::Grammar eGrammar, sal_uInt8 cInd ) :
     ScBaseCell( CELLTYPE_FORMULA ),
     eTempGrammar( eGrammar),
     pCode( pArr ? new ScTokenArray( *pArr ) : new ScTokenArray ),
@@ -700,14 +700,14 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
     nSeenInIteration(0),
     cMatrixFlag ( cInd ),
     bDirty( NULL != pArr ), // -> wg. Benutzung im Fkt.AutoPiloten, war: cInd != 0
-    bChanged( FALSE ),
-    bRunning( FALSE ),
-    bCompile( FALSE ),
-    bSubTotal( FALSE ),
-    bIsIterCell( FALSE ),
-    bInChangeTrack( FALSE ),
-    bTableOpDirty( FALSE ),
-    bNeedListening( FALSE ),
+    bChanged( sal_False ),
+    bRunning( sal_False ),
+    bCompile( sal_False ),
+    bSubTotal( sal_False ),
+    bIsIterCell( sal_False ),
+    bInChangeTrack( sal_False ),
+    bTableOpDirty( sal_False ),
+    bNeedListening( sal_False ),
     aPos( rPos )
 {
     // UPN-Array erzeugen
@@ -722,7 +722,7 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
     {
         pCode->Reset();
         if ( pCode->GetNextOpCodeRPN( ocSubTotal ) )
-            bSubTotal = TRUE;
+            bSubTotal = sal_True;
     }
 }
 
@@ -742,13 +742,13 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons
     cMatrixFlag ( rCell.cMatrixFlag ),
     bDirty( rCell.bDirty ),
     bChanged( rCell.bChanged ),
-    bRunning( FALSE ),
+    bRunning( sal_False ),
     bCompile( rCell.bCompile ),
     bSubTotal( rCell.bSubTotal ),
-    bIsIterCell( FALSE ),
-    bInChangeTrack( FALSE ),
-    bTableOpDirty( FALSE ),
-    bNeedListening( FALSE ),
+    bIsIterCell( sal_False ),
+    bInChangeTrack( sal_False ),
+    bTableOpDirty( sal_False ),
+    bNeedListening( sal_False ),
     aPos( rPos )
 {
     pCode = rCell.pCode->Clone();
@@ -762,11 +762,11 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons
     if ( pCode->GetCodeError() && !pDocument->IsClipboard() && pCode->GetLen() )
     {
         pCode->SetCodeError( 0 );
-        bCompile = TRUE;
+        bCompile = sal_True;
     }
     //! Compile ColRowNames on URM_MOVE/URM_COPY _after_ UpdateReference
-    BOOL bCompileLater = FALSE;
-    BOOL bClipMode = rCell.pDocument->IsClipboard();
+    sal_Bool bCompileLater = sal_False;
+    sal_Bool bClipMode = rCell.pDocument->IsClipboard();
     if( !bCompile )
     {   // Name references with references and ColRowNames
         pCode->Reset();
@@ -784,14 +784,14 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons
                 if( pRangeData )
                 {
                     if( pRangeData->HasReferences() )
-                        bCompile = TRUE;
+                        bCompile = sal_True;
                 }
                 else
-                    bCompile = TRUE;    // invalid reference!
+                    bCompile = sal_True;    // invalid reference!
             }
             else if ( t->GetOpCode() == ocColRowName )
             {
-                bCompile = TRUE;        // new lookup needed
+                bCompile = sal_True;        // new lookup needed
                 bCompileLater = bClipMode;
             }
         }
@@ -808,7 +808,7 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons
         {
             // bNoListening, not at all if in Clipboard/Undo,
             // and not from Clipboard either, instead after Insert(Clone) and UpdateReference.
-            CompileTokenArray( TRUE );
+            CompileTokenArray( sal_True );
         }
     }
 
@@ -913,11 +913,11 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows )
     }
 }
 
-void ScFormulaCell::Compile( const String& rFormula, BOOL bNoListening,
+void ScFormulaCell::Compile( const String& rFormula, sal_Bool bNoListening,
                             const FormulaGrammar::Grammar eGrammar )
 {
     if ( pDocument->IsClipOrUndo() ) return;
-    BOOL bWasInFormulaTree = pDocument->IsInFormulaTree( this );
+    sal_Bool bWasInFormulaTree = pDocument->IsInFormulaTree( this );
     if ( bWasInFormulaTree )
         pDocument->RemoveFromFormulaTree( this );
     // pCode darf fuer Abfragen noch nicht geloescht, muss aber leer sein
@@ -938,12 +938,12 @@ void ScFormulaCell::Compile( const String& rFormula, BOOL bNoListening,
             else
                 pCode->AddBad( rFormula.GetBuffer() );
         }
-        bCompile = TRUE;
+        bCompile = sal_True;
         CompileTokenArray( bNoListening );
     }
     else
     {
-        bChanged = TRUE;
+        bChanged = sal_True;
         SetTextWidth( TEXTWIDTH_DIRTY );
         SetScriptType( SC_SCRIPTTYPE_UNKNOWN );
     }
@@ -952,7 +952,7 @@ void ScFormulaCell::Compile( const String& rFormula, BOOL bNoListening,
 }
 
 
-void ScFormulaCell::CompileTokenArray( BOOL bNoListening )
+void ScFormulaCell::CompileTokenArray( sal_Bool bNoListening )
 {
     // Not already compiled?
     if( !pCode->GetLen() && aResult.GetHybridFormula().Len() )
@@ -960,13 +960,13 @@ void ScFormulaCell::CompileTokenArray( BOOL bNoListening )
     else if( bCompile && !pDocument->IsClipOrUndo() && !pCode->GetCodeError() )
     {
         // RPN length may get changed
-        BOOL bWasInFormulaTree = pDocument->IsInFormulaTree( this );
+        sal_Bool bWasInFormulaTree = pDocument->IsInFormulaTree( this );
         if ( bWasInFormulaTree )
             pDocument->RemoveFromFormulaTree( this );
 
         // Loading from within filter? No listening yet!
         if( pDocument->IsInsertingFromOtherDoc() )
-            bNoListening = TRUE;
+            bNoListening = sal_True;
 
         if( !bNoListening && pCode->GetCodeLen() )
             EndListeningTo( pDocument );
@@ -977,9 +977,9 @@ void ScFormulaCell::CompileTokenArray( BOOL bNoListening )
         {
             nFormatType = aComp.GetNumFormatType();
             nFormatIndex = 0;
-            bChanged = TRUE;
+            bChanged = sal_True;
             aResult.SetToken( NULL);
-            bCompile = FALSE;
+            bCompile = sal_False;
             if ( !bNoListening )
                 StartListeningTo( pDocument );
         }
@@ -1024,14 +1024,14 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress )
         {
             nFormatType = aComp.GetNumFormatType();
             nFormatIndex = 0;
-            bChanged = TRUE;
-            bCompile = FALSE;
+            bChanged = sal_True;
+            bCompile = sal_False;
             StartListeningTo( pDocument );
         }
     }
     else
     {
-        bChanged = TRUE;
+        bChanged = sal_True;
         SetTextWidth( TEXTWIDTH_DIRTY );
         SetScriptType( SC_SCRIPTTYPE_UNKNOWN );
     }
@@ -1039,21 +1039,21 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress )
     //	Same as in Load: after loading, it must be known if ocMacro is in any formula
     //	(for macro warning, CompileXML is called at the end of loading XML file)
     if ( !pDocument->GetHasMacroFunc() && pCode->HasOpCodeRPN( ocMacro ) )
-        pDocument->SetHasMacroFunc( TRUE );
+        pDocument->SetHasMacroFunc( sal_True );
 }
 
 
 void ScFormulaCell::CalcAfterLoad()
 {
-    BOOL bNewCompiled = FALSE;
+    sal_Bool bNewCompiled = sal_False;
     // Falls ein Calc 1.0-Doc eingelesen wird, haben wir ein Ergebnis,
     // aber kein TokenArray
     if( !pCode->GetLen() && aResult.GetHybridFormula().Len() )
     {
-        Compile( aResult.GetHybridFormula(), TRUE, eTempGrammar);
+        Compile( aResult.GetHybridFormula(), sal_True, eTempGrammar);
         aResult.SetToken( NULL);
-        bDirty = TRUE;
-        bNewCompiled = TRUE;
+        bDirty = sal_True;
+        bNewCompiled = sal_True;
     }
     // Das UPN-Array wird nicht erzeugt, wenn ein Calc 3.0-Doc eingelesen
     // wurde, da die RangeNames erst jetzt existieren.
@@ -1064,9 +1064,9 @@ void ScFormulaCell::CalcAfterLoad()
         bSubTotal = aComp.CompileTokenArray();
         nFormatType = aComp.GetNumFormatType();
         nFormatIndex = 0;
-        bDirty = TRUE;
-        bCompile = FALSE;
-        bNewCompiled = TRUE;
+        bDirty = sal_True;
+        bCompile = sal_False;
+        bNewCompiled = sal_True;
     }
     // irgendwie koennen unter os/2 mit rotter FPU-Exception /0 ohne Err503
     // gespeichert werden, woraufhin spaeter im NumberFormatter die BLC Lib
@@ -1076,7 +1076,7 @@ void ScFormulaCell::CalcAfterLoad()
     {
         DBG_ERRORFILE("Formelzelle INFINITY !!! Woher kommt das Dokument?");
         aResult.SetResultError( errIllegalFPOperation );
-        bDirty = TRUE;
+        bDirty = sal_True;
     }
     // DoubleRefs bei binaeren Operatoren waren vor v5.0 immer Matrix,
     // jetzt nur noch wenn in Matrixformel, sonst implizite Schnittmenge
@@ -1093,12 +1093,12 @@ void ScFormulaCell::CalcAfterLoad()
     {
         StartListeningTo( pDocument );
         if( !pCode->IsRecalcModeNormal() )
-            bDirty = TRUE;
+            bDirty = sal_True;
     }
     if ( pCode->IsRecalcModeAlways() )
     {	// zufall(), heute(), jetzt() bleiben immer im FormulaTree, damit sie
         // auch bei jedem F9 berechnet werden.
-        bDirty = TRUE;
+        bDirty = sal_True;
     }
     // Noch kein SetDirty weil noch nicht alle Listener bekannt, erst in
     // SetDirtyAfterLoad.
@@ -1275,10 +1275,10 @@ void ScFormulaCell::Interpret()
     erDEBUGDOT_OUT( pDocument->GetRecursionHelper().GetIteration() ? "magenta" : "");
 
     ScRecursionHelper& rRecursionHelper = pDocument->GetRecursionHelper();
-    BOOL bOldRunning = bRunning;
+    sal_Bool bOldRunning = bRunning;
     if (rRecursionHelper.GetRecursionCount() > MAXRECURSION)
     {
-        bRunning = TRUE;
+        bRunning = sal_True;
         rRecursionHelper.SetInRecursionReturn( true);
     }
     else
@@ -1318,13 +1318,13 @@ void ScFormulaCell::Interpret()
                             aOldStart; ++aIter)
                     {
                         pIterCell = (*aIter).pCell;
-                        pIterCell->bIsIterCell = TRUE;
+                        pIterCell->bIsIterCell = sal_True;
                     }
                     // Mark older cells dirty again, in case they converted
                     // without accounting for all remaining cells in the circle
                     // that weren't touched so far, e.g. conditional. Restore
                     // backuped result.
-                    USHORT nIteration = rRecursionHelper.GetIteration();
+                    sal_uInt16 nIteration = rRecursionHelper.GetIteration();
                     for (ScFormulaRecursionList::const_iterator aIter(
                                 aOldStart); aIter !=
                             rRecursionHelper.GetIterationEnd(); ++aIter)
@@ -1338,7 +1338,7 @@ void ScFormulaCell::Interpret()
                             }
                             --pIterCell->nSeenInIteration;
                         }
-                        pIterCell->bDirty = TRUE;
+                        pIterCell->bDirty = sal_True;
                     }
                 }
                 else
@@ -1355,11 +1355,11 @@ void ScFormulaCell::Interpret()
                             rRecursionHelper.GetIterationEnd(); ++aIter)
                     {
                         pIterCell = (*aIter).pCell;
-                        pIterCell->bIsIterCell = TRUE;
+                        pIterCell->bIsIterCell = sal_True;
                     }
                 }
                 bIterationFromRecursion = false;
-                USHORT nIterMax = pDocument->GetDocOptions().GetIterCount();
+                sal_uInt16 nIterMax = pDocument->GetDocOptions().GetIterCount();
                 for ( ; rRecursionHelper.GetIteration() <= nIterMax && !rDone;
                         rRecursionHelper.IncIteration())
                 {
@@ -1396,7 +1396,7 @@ void ScFormulaCell::Interpret()
                                 ++aIter)
                         {
                             pIterCell = (*aIter).pCell;
-                            pIterCell->bIsIterCell = FALSE;
+                            pIterCell->bIsIterCell = sal_False;
                             pIterCell->nSeenInIteration = 0;
                             pIterCell->bRunning = (*aIter).bOldRunning;
                         }
@@ -1409,16 +1409,16 @@ void ScFormulaCell::Interpret()
                                 ++aIter)
                         {
                             pIterCell = (*aIter).pCell;
-                            pIterCell->bIsIterCell = FALSE;
+                            pIterCell->bIsIterCell = sal_False;
                             pIterCell->nSeenInIteration = 0;
                             pIterCell->bRunning = (*aIter).bOldRunning;
                             // If one cell didn't converge, all cells of this
                             // circular dependency don't, no matter whether
                             // single cells did.
-                            pIterCell->bDirty = FALSE;
-                            pIterCell->bTableOpDirty = FALSE;
+                            pIterCell->bDirty = sal_False;
+                            pIterCell->bTableOpDirty = sal_False;
                             pIterCell->aResult.SetResultError( errNoConvergence);
-                            pIterCell->bChanged = TRUE;
+                            pIterCell->bChanged = sal_True;
                             pIterCell->SetTextWidth( TEXTWIDTH_DIRTY);
                             pIterCell->SetScriptType( SC_SCRIPTTYPE_UNKNOWN);
                         }
@@ -1533,12 +1533,12 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
         pDocument->IncInterpretLevel();
         ScInterpreter* p = new ScInterpreter( this, pDocument, aPos, *pCode );
         StackCleaner aStackCleaner( pDocument, p);
-        USHORT nOldErrCode = aResult.GetResultError();
+        sal_uInt16 nOldErrCode = aResult.GetResultError();
         if ( nSeenInIteration == 0 )
         {   // Only the first time
-            // With bChanged=FALSE, if a newly compiled cell has a result of
+            // With bChanged=sal_False, if a newly compiled cell has a result of
             // 0.0, no change is detected and the cell will not be repainted.
-            // bChanged = FALSE;
+            // bChanged = sal_False;
             aResult.SetResultError( 0 );
         }
 
@@ -1549,8 +1549,8 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
             break;
         }
 
-        BOOL bOldRunning = bRunning;
-        bRunning = TRUE;
+        sal_Bool bOldRunning = bRunning;
+        bRunning = sal_True;
         p->Interpret();
         if (pDocument->GetRecursionHelper().IsInReturn() && eTailParam != SCITP_CLOSE_ITERATION_CIRCLE)
         {
@@ -1562,17 +1562,17 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
 
         // #i102616# For single-sheet saving consider only content changes, not format type,
         // because format type isn't set on loading (might be changed later)
-        BOOL bContentChanged = FALSE;
+        sal_Bool bContentChanged = sal_False;
 
         // Do not create a HyperLink() cell if the formula results in an error.
         if( p->GetError() && pCode->IsHyperLink())
-            pCode->SetHyperLink(FALSE);
+            pCode->SetHyperLink(sal_False);
 
         if( p->GetError() && p->GetError() != errCircularReference)
         {
-            bDirty = FALSE;
-            bTableOpDirty = FALSE;
-            bChanged = TRUE;
+            bDirty = sal_False;
+            bTableOpDirty = sal_False;
+            bChanged = sal_True;
         }
         if (eTailParam == SCITP_FROM_ITERATION && IsDirtyOrInTableOpDirty())
         {
@@ -1594,8 +1594,8 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
                 if (nSeenInIteration > 1 ||
                         pDocument->GetDocOptions().GetIterCount() == 1)
                 {
-                    bDirty = FALSE;
-                    bTableOpDirty = FALSE;
+                    bDirty = sal_False;
+                    bTableOpDirty = sal_False;
                 }
             }
         }
@@ -1603,21 +1603,21 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
         // New error code?
         if( p->GetError() != nOldErrCode )
         {
-            bChanged = TRUE;
+            bChanged = sal_True;
             // bContentChanged only has to be set if the file content would be changed
             if ( aResult.GetCellResultType() != svUnknown )
-                bContentChanged = TRUE;
+                bContentChanged = sal_True;
         }
         // Different number format?
         if( nFormatType != p->GetRetFormatType() )
         {
             nFormatType = p->GetRetFormatType();
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
         if( nFormatIndex != p->GetRetFormatIndex() )
         {
             nFormatIndex = p->GetRetFormatIndex();
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
 
         // In case of changes just obtain the result, no temporary and
@@ -1670,7 +1670,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
                     // no change, see above
                 }
                 else
-                    bContentChanged = TRUE;
+                    bContentChanged = sal_True;
             }
 
             aResult.Assign( aNewResult);
@@ -1683,7 +1683,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
           && nFormatType != NUMBERFORMAT_TIME
           && nFormatType != NUMBERFORMAT_DATETIME )
         {
-            ULONG nFormat = pDocument->GetNumberFormat( aPos );
+            sal_uLong nFormat = pDocument->GetNumberFormat( aPos );
             if ( nFormatIndex && (nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
                 nFormat = nFormatIndex;
             if ( (nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
@@ -1694,8 +1694,8 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
         }
         if (eTailParam == SCITP_NORMAL)
         {
-            bDirty = FALSE;
-            bTableOpDirty = FALSE;
+            bDirty = sal_False;
+            bTableOpDirty = sal_False;
         }
         if( aResult.GetMatrix().Is() )
         {
@@ -1707,7 +1707,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
         if ( aResult.IsValue() && !::rtl::math::isFinite( aResult.GetDouble() ) )
         {
             // Coded double error may occur via filter import.
-            USHORT nErr = GetDoubleErrorValue( aResult.GetDouble());
+            sal_uInt16 nErr = GetDoubleErrorValue( aResult.GetDouble());
             aResult.SetResultError( nErr);
             bChanged = bContentChanged = true;
         }
@@ -1718,9 +1718,9 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
         }
         if (bContentChanged && pDocument->IsStreamValid(aPos.Tab()))
         {
-            // pass bIgnoreLock=TRUE, because even if called from pending row height update,
+            // pass bIgnoreLock=sal_True, because even if called from pending row height update,
             // a changed result must still reset the stream flag
-            pDocument->SetStreamValid(aPos.Tab(), FALSE, TRUE);
+            pDocument->SetStreamValid(aPos.Tab(), sal_False, sal_True);
         }
         if ( !pCode->IsRecalcModeAlways() )
             pDocument->RemoveFromFormulaTree( this );
@@ -1729,7 +1729,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
 
         if ( pCode->IsRecalcModeForced() )
         {
-            ULONG nValidation = ((const SfxUInt32Item*) pDocument->GetAttr(
+            sal_uLong nValidation = ((const SfxUInt32Item*) pDocument->GetAttr(
                     aPos.Col(), aPos.Row(), aPos.Tab(), ATTR_VALIDDATA ))->GetValue();
             if ( nValidation )
             {
@@ -1747,8 +1747,8 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
     {
         //  Zelle bei Compiler-Fehlern nicht ewig auf dirty stehenlassen
         DBG_ASSERT( pCode->GetCodeError(), "kein UPN-Code und kein Fehler ?!?!" );
-        bDirty = FALSE;
-        bTableOpDirty = FALSE;
+        bDirty = sal_False;
+        bTableOpDirty = sal_False;
     }
 }
 
@@ -1776,7 +1776,7 @@ void ScFormulaCell::GetMatColsRows( SCCOL & nCols, SCROW & nRows ) const
 }
 
 
-ULONG ScFormulaCell::GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFormat ) const
+sal_uLong ScFormulaCell::GetStandardFormat( SvNumberFormatter& rFormatter, sal_uLong nFormat ) const
 {
     if ( nFormatIndex && (nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
         return nFormatIndex;
@@ -1793,23 +1793,23 @@ void __EXPORT ScFormulaCell::Notify( SvtBroadcaster&, const SfxHint& rHint)
     if ( !pDocument->IsInDtorClear() && !pDocument->GetHardRecalcState() )
     {
         const ScHint* p = PTR_CAST( ScHint, &rHint );
-        ULONG nHint = (p ? p->GetId() : 0);
+        sal_uLong nHint = (p ? p->GetId() : 0);
         if (nHint & (SC_HINT_DATACHANGED | SC_HINT_DYING | SC_HINT_TABLEOPDIRTY))
         {
-            BOOL bForceTrack = FALSE;
+            sal_Bool bForceTrack = sal_False;
             if ( nHint & SC_HINT_TABLEOPDIRTY )
             {
                 bForceTrack = !bTableOpDirty;
                 if ( !bTableOpDirty )
                 {
                     pDocument->AddTableOpFormulaCell( this );
-                    bTableOpDirty = TRUE;
+                    bTableOpDirty = sal_True;
                 }
             }
             else
             {
                 bForceTrack = !bDirty;
-                bDirty = TRUE;
+                bDirty = sal_True;
             }
             // #35962# Don't remove from FormulaTree to put in FormulaTrack to
             // put in FormulaTree again and again, only if necessary.
@@ -1832,29 +1832,29 @@ void ScFormulaCell::SetDirty()
     if ( !IsInChangeTrack() )
     {
         if ( pDocument->GetHardRecalcState() )
-            bDirty = TRUE;
+            bDirty = sal_True;
         else
         {
             // Mehrfach-FormulaTracking in Load und in CompileAll
             // nach CopyScenario und CopyBlockFromClip vermeiden.
-            // Wenn unbedingtes FormulaTracking noetig, vor SetDirty bDirty=FALSE
+            // Wenn unbedingtes FormulaTracking noetig, vor SetDirty bDirty=sal_False
             // setzen, z.B. in CompileTokenArray
             if ( !bDirty || !pDocument->IsInFormulaTree( this ) )
             {
-                bDirty = TRUE;
+                bDirty = sal_True;
                 pDocument->AppendToFormulaTrack( this );
                 pDocument->TrackFormulas();
             }
         }
 
         if (pDocument->IsStreamValid(aPos.Tab()))
-            pDocument->SetStreamValid(aPos.Tab(), FALSE);
+            pDocument->SetStreamValid(aPos.Tab(), sal_False);
     }
 }
 
 void ScFormulaCell::SetDirtyAfterLoad()
 {
-    bDirty = TRUE;
+    bDirty = sal_True;
     if ( !pDocument->GetHardRecalcState() )
         pDocument->PutInFormulaTree( this );
 }
@@ -1864,7 +1864,7 @@ void ScFormulaCell::SetTableOpDirty()
     if ( !IsInChangeTrack() )
     {
         if ( pDocument->GetHardRecalcState() )
-            bTableOpDirty = TRUE;
+            bTableOpDirty = sal_True;
         else
         {
             if ( !bTableOpDirty || !pDocument->IsInFormulaTree( this ) )
@@ -1872,7 +1872,7 @@ void ScFormulaCell::SetTableOpDirty()
                 if ( !bTableOpDirty )
                 {
                     pDocument->AddTableOpFormulaCell( this );
-                    bTableOpDirty = TRUE;
+                    bTableOpDirty = sal_True;
                 }
                 pDocument->AppendToFormulaTrack( this );
                 pDocument->TrackFormulas( SC_HINT_TABLEOPDIRTY );
@@ -1882,13 +1882,13 @@ void ScFormulaCell::SetTableOpDirty()
 }
 
 
-BOOL ScFormulaCell::IsDirtyOrInTableOpDirty() const
+sal_Bool ScFormulaCell::IsDirtyOrInTableOpDirty() const
 {
     return bDirty || (bTableOpDirty && pDocument->IsInInterpreterTableOp());
 }
 
 
-void ScFormulaCell::SetErrCode( USHORT n )
+void ScFormulaCell::SetErrCode( sal_uInt16 n )
 {
     /* FIXME: check the numerous places where ScTokenArray::GetCodeError() is
      * used whether it is solely for transport of a simple result error and get
@@ -1903,7 +1903,7 @@ void ScFormulaCell::SetErrCode( USHORT n )
 void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits )
 {
     if ( (nBits & RECALCMODE_EMASK) != RECALCMODE_NORMAL )
-        bDirty = TRUE;
+        bDirty = sal_True;
     if ( nBits & RECALCMODE_ONLOAD_ONCE )
     {	// OnLoadOnce nur zum Dirty setzen nach Filter-Import
         nBits = (nBits & ~RECALCMODE_EMASK) | RECALCMODE_NORMAL;
@@ -1920,13 +1920,13 @@ void ScFormulaCell::GetURLResult( String& rURL, String& rCellText )
 
     // Cell Text uses the Cell format while the URL uses
     // the default format for the type.
-    ULONG nCellFormat = pDocument->GetNumberFormat( aPos );
+    sal_uLong nCellFormat = pDocument->GetNumberFormat( aPos );
     SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
 
     if ( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
         nCellFormat = GetStandardFormat( *pFormatter,nCellFormat );
 
-   ULONG nURLFormat = ScGlobal::GetStandardFormat( *pFormatter,nCellFormat, NUMBERFORMAT_NUMBER);
+   sal_uLong nURLFormat = ScGlobal::GetStandardFormat( *pFormatter,nCellFormat, NUMBERFORMAT_NUMBER);
 
     if ( IsValue() )
     {
@@ -1992,25 +1992,25 @@ ScDetectiveRefIter::ScDetectiveRefIter( ScFormulaCell* pCell )
     aPos = pCell->aPos;
 }
 
-BOOL lcl_ScDetectiveRefIter_SkipRef( ScToken* p )
+sal_Bool lcl_ScDetectiveRefIter_SkipRef( ScToken* p )
 {
     ScSingleRefData& rRef1 = p->GetSingleRef();
     if ( rRef1.IsColDeleted() || rRef1.IsRowDeleted() || rRef1.IsTabDeleted()
             || !rRef1.Valid() )
-        return TRUE;
+        return sal_True;
     if ( p->GetType() == svDoubleRef )
     {
         ScSingleRefData& rRef2 = p->GetDoubleRef().Ref2;
         if ( rRef2.IsColDeleted() || rRef2.IsRowDeleted() || rRef2.IsTabDeleted()
                 || !rRef2.Valid() )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDetectiveRefIter::GetNextRef( ScRange& rRange )
+sal_Bool ScDetectiveRefIter::GetNextRef( ScRange& rRange )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     ScToken* p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());
     if (p)
@@ -2028,7 +2028,7 @@ BOOL ScDetectiveRefIter::GetNextRef( ScRange& rRange )
         SingleDoubleRefProvider aProv( *p );
         rRange.aStart.Set( aProv.Ref1.nCol, aProv.Ref1.nRow, aProv.Ref1.nTab );
         rRange.aEnd.Set( aProv.Ref2.nCol, aProv.Ref2.nRow, aProv.Ref2.nTab );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index c056c399e..54b180989 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -57,7 +57,7 @@ using namespace formula;
 // STATIC DATA -----------------------------------------------------------
 
 #ifdef USE_MEMPOOL
-const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
+const sal_uInt16 nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScEditCell, nMemPoolEditCell, nMemPoolEditCell )
 #endif
 
@@ -153,9 +153,9 @@ void ScEditCell::SetTextObject( const EditTextObject* pObject,
             EditEngine& rEngine = pDoc->GetEditEngine();
             if ( pObject->HasOnlineSpellErrors() )
             {
-                ULONG nControl = rEngine.GetControlWord();
-                const ULONG nSpellControl = EE_CNTRL_ONLINESPELLING | EE_CNTRL_ALLOWBIGOBJS;
-                BOOL bNewControl = ( (nControl & nSpellControl) != nSpellControl );
+                sal_uLong nControl = rEngine.GetControlWord();
+                const sal_uLong nSpellControl = EE_CNTRL_ONLINESPELLING | EE_CNTRL_ALLOWBIGOBJS;
+                sal_Bool bNewControl = ( (nControl & nSpellControl) != nSpellControl );
                 if ( bNewControl )
                     rEngine.SetControlWord( nControl | nSpellControl );
                 rEngine.SetText( *pObject );
@@ -393,21 +393,21 @@ bool lcl_isReference(const FormulaToken& rToken)
 
 }
 
-BOOL ScFormulaCell::IsEmpty()
+sal_Bool ScFormulaCell::IsEmpty()
 {
     if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
         Interpret();
     return aResult.GetCellResultType() == formula::svEmptyCell;
 }
 
-BOOL ScFormulaCell::IsEmptyDisplayedAsString()
+sal_Bool ScFormulaCell::IsEmptyDisplayedAsString()
 {
     if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
         Interpret();
     return aResult.IsEmptyDisplayedAsString();
 }
 
-BOOL ScFormulaCell::IsValue()
+sal_Bool ScFormulaCell::IsValue()
 {
     if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
         Interpret();
@@ -451,20 +451,20 @@ const ScMatrix* ScFormulaCell::GetMatrix()
         // Was stored !bDirty but an accompanying matrix cell was bDirty?
         // => we need to get the matrix.
         if (!bDirty && cMatrixFlag == MM_FORMULA && !aResult.GetMatrix().Is())
-            bDirty = TRUE;
+            bDirty = sal_True;
         if ( IsDirtyOrInTableOpDirty() )
             Interpret();
     }
     return aResult.GetMatrix();
 }
 
-BOOL ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const
+sal_Bool ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const
 {
     switch ( cMatrixFlag )
     {
         case MM_FORMULA :
             rPos = aPos;
-            return TRUE;
+            return sal_True;
 //        break;
         case MM_REFERENCE :
         {
@@ -477,13 +477,13 @@ BOOL ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const
                 if ( rRef.Valid() )
                 {
                     rPos.Set( rRef.nCol, rRef.nRow, rRef.nTab );
-                    return TRUE;
+                    return sal_True;
                 }
             }
         }
         break;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -499,7 +499,7 @@ BOOL ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const
  (reserviert: offen: 32)
  */
 
-USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
+sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
 {
     switch ( cMatrixFlag )
     {
@@ -532,7 +532,7 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
                         ScBaseCell* pCell;
                         ScAddress aAdr( aOrg );
                         aAdr.IncCol();
-                        BOOL bCont = TRUE;
+                        sal_Bool bCont = sal_True;
                         do
                         {
                             pCell = pDocument->GetCell( aAdr );
@@ -544,11 +544,11 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
                                 aAdr.IncCol();
                             }
                             else
-                                bCont = FALSE;
+                                bCont = sal_False;
                         } while ( bCont );
                         aAdr = aOrg;
                         aAdr.IncRow();
-                        bCont = TRUE;
+                        bCont = sal_True;
                         do
                         {
                             pCell = pDocument->GetCell( aAdr );
@@ -560,7 +560,7 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
                                 aAdr.IncRow();
                             }
                             else
-                                bCont = FALSE;
+                                bCont = sal_False;
                         } while ( bCont );
                         pFCell->SetMatColsRows( nC, nR );
                     }
@@ -583,7 +583,7 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
             // here we are, healthy and clean, somewhere in between
             SCsCOL dC = aPos.Col() - aOrg.Col();
             SCsROW dR = aPos.Row() - aOrg.Row();
-            USHORT nEdges = 0;
+            sal_uInt16 nEdges = 0;
             if ( dC >= 0 && dR >= 0 && dC < nC && dR < nR )
             {
                 if ( dC == 0 )
@@ -626,28 +626,28 @@ USHORT ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos )
     }
 }
 
-USHORT ScFormulaCell::GetErrCode()
+sal_uInt16 ScFormulaCell::GetErrCode()
 {
     if (IsDirtyOrInTableOpDirty() && pDocument->GetAutoCalc())
         Interpret();
     /* FIXME: If ScTokenArray::SetCodeError() was really only for code errors
      * and not also abused for signaling other error conditions we could bail
      * out even before attempting to interpret broken code. */
-    USHORT nErr =  pCode->GetCodeError();
+    sal_uInt16 nErr =  pCode->GetCodeError();
     if (nErr)
         return nErr;
     return aResult.GetResultError();
 }
 
-USHORT ScFormulaCell::GetRawError()
+sal_uInt16 ScFormulaCell::GetRawError()
 {
-    USHORT nErr =  pCode->GetCodeError();
+    sal_uInt16 nErr =  pCode->GetCodeError();
     if (nErr)
         return nErr;
     return aResult.GetResultError();
 }
 
-BOOL ScFormulaCell::HasOneReference( ScRange& r ) const
+sal_Bool ScFormulaCell::HasOneReference( ScRange& r ) const
 {
     pCode->Reset();
     ScToken* p = static_cast<ScToken*>(pCode->GetNextReferenceRPN());
@@ -661,10 +661,10 @@ BOOL ScFormulaCell::HasOneReference( ScRange& r ) const
         r.aEnd.Set( aProv.Ref2.nCol,
                     aProv.Ref2.nRow,
                     aProv.Ref2.nTab );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 bool
@@ -721,7 +721,7 @@ ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const
     return false;
 }
 
-BOOL ScFormulaCell::HasRelNameReference() const
+sal_Bool ScFormulaCell::HasRelNameReference() const
 {
     pCode->Reset();
     ScToken* t;
@@ -730,12 +730,12 @@ BOOL ScFormulaCell::HasRelNameReference() const
         if ( t->GetSingleRef().IsRelName() ||
                 (t->GetType() == formula::svDoubleRef &&
                 t->GetDoubleRef().Ref2.IsRelName()) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScFormulaCell::HasColRowName() const
+sal_Bool ScFormulaCell::HasColRowName() const
 {
     pCode->Reset();
     return (pCode->GetNextColRowName() != NULL);
@@ -759,8 +759,8 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
     if ( pUndoCellPos )
         aUndoPos = *pUndoCellPos;
     ScAddress aOldPos( aPos );
-//  BOOL bPosChanged = FALSE;           // ob diese Zelle bewegt wurde
-    BOOL bIsInsert = FALSE;
+//  sal_Bool bPosChanged = sal_False;           // ob diese Zelle bewegt wurde
+    sal_Bool bIsInsert = sal_False;
     if (eUpdateRefMode == URM_INSDEL)
     {
         bIsInsert = (nDx >= 0 && nDy >= 0 && nDz >= 0);
@@ -775,7 +775,7 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 else if ( nCol > MAXCOL )
                     nCol = MAXCOL;
                 aPos.SetCol( nCol );
-//              bPosChanged = TRUE;
+//              bPosChanged = sal_True;
             }
         }
         if ( nDy && nCol >= nCol1 && nCol <= nCol2 &&
@@ -789,7 +789,7 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 else if ( nRow > MAXROW )
                     nRow = MAXROW;
                 aPos.SetRow( nRow );
-//              bPosChanged = TRUE;
+//              bPosChanged = sal_True;
             }
         }
         if ( nDz && nCol >= nCol1 && nCol <= nCol2 &&
@@ -804,19 +804,19 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 else if ( nTab > nMaxTab )
                     nTab = nMaxTab;
                 aPos.SetTab( nTab );
-//              bPosChanged = TRUE;
+//              bPosChanged = sal_True;
             }
         }
     }
     else if ( r.In( aPos ) )
     {
         aOldPos.Set( nCol - nDx, nRow - nDy, nTab - nDz );
-//      bPosChanged = TRUE;
+//      bPosChanged = sal_True;
     }
 
-    BOOL bHasRefs = FALSE;
-    BOOL bHasColRowNames = FALSE;
-    BOOL bOnRefMove = FALSE;
+    sal_Bool bHasRefs = sal_False;
+    sal_Bool bHasColRowNames = sal_False;
+    sal_Bool bOnRefMove = sal_False;
     if ( !pDocument->IsClipOrUndo() )
     {
         pCode->Reset();
@@ -832,10 +832,10 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
     if( bHasRefs || bOnRefMove )
     {
         ScTokenArray* pOld = pUndoDoc ? pCode->Clone() : NULL;
-        BOOL bValChanged;
+        sal_Bool bValChanged;
         ScRangeData* pRangeData;
-        BOOL bRangeModified;            // any range, not only shared formula
-        BOOL bRefSizeChanged;
+        sal_Bool bRangeModified;            // any range, not only shared formula
+        sal_Bool bRefSizeChanged;
         if ( bHasRefs )
         {
             ScCompiler aComp(pDocument, aPos, *pCode);
@@ -847,16 +847,16 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
         }
         else
         {
-            bValChanged = FALSE;
+            bValChanged = sal_False;
             pRangeData = NULL;
-            bRangeModified = FALSE;
-            bRefSizeChanged = FALSE;
+            bRangeModified = sal_False;
+            bRefSizeChanged = sal_False;
         }
         if ( bOnRefMove )
             bOnRefMove = (bValChanged || (aPos != aOldPos));
             // Cell may reference itself, e.g. ocColumn, ocRow without parameter
 
-        BOOL bColRowNameCompile, bHasRelName, bNewListening, bInDeleteUndo;
+        sal_Bool bColRowNameCompile, bHasRelName, bNewListening, bInDeleteUndo;
         if ( bHasRefs )
         {
             // Upon Insert ColRowNames have to be recompiled in case the
@@ -865,7 +865,7 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 (eUpdateRefMode == URM_INSDEL && (nDx > 0 || nDy > 0));
             if ( bColRowNameCompile )
             {
-                bColRowNameCompile = FALSE;
+                bColRowNameCompile = sal_False;
                 ScToken* t;
                 ScRangePairList* pColList = pDocument->GetColNameRanges();
                 ScRangePairList* pRowList = pDocument->GetRowNameRanges();
@@ -881,12 +881,12 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                         if ( pR )
                         {   // definiert
                             if ( pR->GetRange(1).aStart.Row() == nRow1 )
-                                bColRowNameCompile = TRUE;
+                                bColRowNameCompile = sal_True;
                         }
                         else
                         {   // on the fly
                             if ( rRef.nRow + 1 == nRow1 )
-                                bColRowNameCompile = TRUE;
+                                bColRowNameCompile = sal_True;
                         }
                     }
                     if ( nDx > 0 && rRef.IsRowRel() )
@@ -897,12 +897,12 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                         if ( pR )
                         {   // definiert
                             if ( pR->GetRange(1).aStart.Col() == nCol1 )
-                                bColRowNameCompile = TRUE;
+                                bColRowNameCompile = sal_True;
                         }
                         else
                         {   // on the fly
                             if ( rRef.nCol + 1 == nCol1 )
-                                bColRowNameCompile = TRUE;
+                                bColRowNameCompile = sal_True;
                         }
                     }
                 }
@@ -913,11 +913,11 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 bColRowNameCompile = bCompile;      // evtl. aus Copy-ctor
                 if ( !bColRowNameCompile )
                 {
-                    BOOL bMoved = (aPos != aOldPos);
+                    sal_Bool bMoved = (aPos != aOldPos);
                     pCode->Reset();
                     ScToken* t = static_cast<ScToken*>(pCode->GetNextColRowName());
                     if ( t && bMoved )
-                        bColRowNameCompile = TRUE;
+                        bColRowNameCompile = sal_True;
                     while ( t && !bColRowNameCompile )
                     {
                         ScSingleRefData& rRef = t->GetSingleRef();
@@ -926,7 +926,7 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                         {
                             ScAddress aAdr( rRef.nCol, rRef.nRow, rRef.nTab );
                             if ( r.In( aAdr ) )
-                                bColRowNameCompile = TRUE;
+                                bColRowNameCompile = sal_True;
                         }
                         t = static_cast<ScToken*>(pCode->GetNextColRowName());
                     }
@@ -934,13 +934,13 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
             }
             else if ( eUpdateRefMode == URM_COPY && bHasColRowNames && bValChanged )
             {
-                bColRowNameCompile = TRUE;
+                bColRowNameCompile = sal_True;
             }
             ScChangeTrack* pChangeTrack = pDocument->GetChangeTrack();
             if ( pChangeTrack && pChangeTrack->IsInDeleteUndo() )
-                bInDeleteUndo = TRUE;
+                bInDeleteUndo = sal_True;
             else
-                bInDeleteUndo = FALSE;
+                bInDeleteUndo = sal_False;
             // RelNameRefs are always moved
             bHasRelName = HasRelNameReference();
             // Reference changed and new listening needed?
@@ -960,19 +960,19 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
         else
         {
             bColRowNameCompile = bHasRelName = bNewListening = bInDeleteUndo =
-                FALSE;
+                sal_False;
         }
 
-        BOOL bNeedDirty;
+        sal_Bool bNeedDirty;
         // NeedDirty bei Aenderungen ausser Copy und Move/Insert ohne RelNames
         if ( bRangeModified || pRangeData || bColRowNameCompile ||
                 (bValChanged && eUpdateRefMode != URM_COPY &&
                  (eUpdateRefMode != URM_MOVE || bHasRelName) &&
                  (!bIsInsert || bHasRelName || bInDeleteUndo ||
                   bRefSizeChanged)) || bOnRefMove)
-            bNeedDirty = TRUE;
+            bNeedDirty = sal_True;
         else
-            bNeedDirty = FALSE;
+            bNeedDirty = sal_False;
         if (pUndoDoc && (bValChanged || pRangeData || bOnRefMove))
         {
             //  Copy the cell to aUndoPos, which is its current position in the document,
@@ -990,7 +990,7 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 pUndoDoc->PutCell( aUndoPos, pFCell );
             }
         }
-        bValChanged = FALSE;
+        bValChanged = sal_False;
         if ( pRangeData )
         {   // Replace shared formula with own formula
             pDocument->RemoveFromFormulaTree( this );   // update formula count
@@ -1002,13 +1002,13 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
             aComp2.SetGrammar(pDocument->GetGrammar());
             aComp2.UpdateSharedFormulaReference( eUpdateRefMode, aOldPos, r,
                 nDx, nDy, nDz );
-            bValChanged = TRUE;
-            bNeedDirty = TRUE;
+            bValChanged = sal_True;
+            bNeedDirty = sal_True;
         }
         if ( ( bCompile = (bCompile || bValChanged || bRangeModified || bColRowNameCompile) ) != 0 )
         {
             CompileTokenArray( bNewListening ); // kein Listening
-            bNeedDirty = TRUE;
+            bNeedDirty = sal_True;
         }
         if ( !bInDeleteUndo )
         {   // In ChangeTrack Delete-Reject listeners are established in
@@ -1021,7 +1021,7 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                     // UpdateReference calls.
                     // All replaced shared formula listeners have to be
                     // established after an Insert or Delete. Do nothing here.
-                    SetNeedsListening( TRUE);
+                    SetNeedsListening( sal_True);
                 }
                 else
                     StartListeningTo( pDocument );
@@ -1029,9 +1029,9 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
         }
         if ( bNeedDirty && (!(eUpdateRefMode == URM_INSDEL && bHasRelName) || pRangeData) )
         {   // Referenzen abgeschnitten, ungueltig o.ae.?
-            BOOL bOldAutoCalc = pDocument->GetAutoCalc();
+            sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
             // kein Interpret in SubMinimalRecalc wegen evtl. falscher Referenzen
-            pDocument->SetAutoCalc( FALSE );
+            pDocument->SetAutoCalc( sal_False );
             SetDirty();
             pDocument->SetAutoCalc( bOldAutoCalc );
         }
@@ -1042,7 +1042,7 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
 
 void ScFormulaCell::UpdateInsertTab(SCTAB nTable)
 {
-    BOOL bPosChanged = ( aPos.Tab() >= nTable ? TRUE : FALSE );
+    sal_Bool bPosChanged = ( aPos.Tab() >= nTable ? sal_True : sal_False );
     pCode->Reset();
     if( pCode->GetNextReferenceRPN() && !pDocument->IsClipOrUndo() )
     {
@@ -1053,21 +1053,21 @@ void ScFormulaCell::UpdateInsertTab(SCTAB nTable)
         ScRangeData* pRangeData;
         ScCompiler aComp(pDocument, aPos, *pCode);
         aComp.SetGrammar(pDocument->GetGrammar());
-        pRangeData = aComp.UpdateInsertTab( nTable, FALSE );
+        pRangeData = aComp.UpdateInsertTab( nTable, sal_False );
         if (pRangeData)                     // Shared Formula gegen echte Formel
         {                                   // austauschen
-            BOOL bRefChanged;
+            sal_Bool bRefChanged;
             pDocument->RemoveFromFormulaTree( this );   // update formula count
             delete pCode;
             pCode = new ScTokenArray( *pRangeData->GetCode() );
             ScCompiler aComp2(pDocument, aPos, *pCode);
             aComp2.SetGrammar(pDocument->GetGrammar());
             aComp2.MoveRelWrap(pRangeData->GetMaxCol(), pRangeData->GetMaxRow());
-            aComp2.UpdateInsertTab( nTable, FALSE );
+            aComp2.UpdateInsertTab( nTable, sal_False );
             // If the shared formula contained a named range/formula containing
             // an absolute reference to a sheet, those have to be readjusted.
-            aComp2.UpdateDeleteTab( nTable, FALSE, TRUE, bRefChanged );
-            bCompile = TRUE;
+            aComp2.UpdateDeleteTab( nTable, sal_False, sal_True, bRefChanged );
+            bCompile = sal_True;
         }
         // kein StartListeningTo weil pTab[nTab] noch nicht existiert!
     }
@@ -1075,10 +1075,10 @@ void ScFormulaCell::UpdateInsertTab(SCTAB nTable)
         aPos.IncTab();
 }
 
-BOOL ScFormulaCell::UpdateDeleteTab(SCTAB nTable, BOOL bIsMove)
+sal_Bool ScFormulaCell::UpdateDeleteTab(SCTAB nTable, sal_Bool bIsMove)
 {
-    BOOL bRefChanged = FALSE;
-    BOOL bPosChanged = ( aPos.Tab() > nTable ? TRUE : FALSE );
+    sal_Bool bRefChanged = sal_False;
+    sal_Bool bPosChanged = ( aPos.Tab() > nTable ? sal_True : sal_False );
     pCode->Reset();
     if( pCode->GetNextReferenceRPN() && !pDocument->IsClipOrUndo() )
     {
@@ -1089,7 +1089,7 @@ BOOL ScFormulaCell::UpdateDeleteTab(SCTAB nTable, BOOL bIsMove)
         ScRangeData* pRangeData;
         ScCompiler aComp(pDocument, aPos, *pCode);
         aComp.SetGrammar(pDocument->GetGrammar());
-        pRangeData = aComp.UpdateDeleteTab(nTable, bIsMove, FALSE, bRefChanged);
+        pRangeData = aComp.UpdateDeleteTab(nTable, bIsMove, sal_False, bRefChanged);
         if (pRangeData)                     // Shared Formula gegen echte Formel
         {                                   // austauschen
             pDocument->RemoveFromFormulaTree( this );   // update formula count
@@ -1099,13 +1099,13 @@ BOOL ScFormulaCell::UpdateDeleteTab(SCTAB nTable, BOOL bIsMove)
             aComp2.SetGrammar(pDocument->GetGrammar());
             aComp2.CompileTokenArray();
             aComp2.MoveRelWrap(pRangeData->GetMaxCol(), pRangeData->GetMaxRow());
-            aComp2.UpdateDeleteTab( nTable, FALSE, FALSE, bRefChanged );
+            aComp2.UpdateDeleteTab( nTable, sal_False, sal_False, bRefChanged );
             // If the shared formula contained a named range/formula containing
             // an absolute reference to a sheet, those have to be readjusted.
-            aComp2.UpdateInsertTab( nTable,TRUE );
+            aComp2.UpdateInsertTab( nTable,sal_True );
             // bRefChanged kann beim letzten UpdateDeleteTab zurueckgesetzt worden sein
-            bRefChanged = TRUE;
-            bCompile = TRUE;
+            bRefChanged = sal_True;
+            bCompile = sal_True;
         }
         // kein StartListeningTo weil pTab[nTab] noch nicht korrekt!
     }
@@ -1126,7 +1126,7 @@ void ScFormulaCell::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo )
         ScRangeData* pRangeData;
         ScCompiler aComp(pDocument, aPos, *pCode);
         aComp.SetGrammar(pDocument->GetGrammar());
-        pRangeData = aComp.UpdateMoveTab( nOldPos, nNewPos, FALSE );
+        pRangeData = aComp.UpdateMoveTab( nOldPos, nNewPos, sal_False );
         if (pRangeData)                     // Shared Formula gegen echte Formel
         {                                   // austauschen
             pDocument->RemoveFromFormulaTree( this );   // update formula count
@@ -1136,8 +1136,8 @@ void ScFormulaCell::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo )
             aComp2.SetGrammar(pDocument->GetGrammar());
             aComp2.CompileTokenArray();
             aComp2.MoveRelWrap(pRangeData->GetMaxCol(), pRangeData->GetMaxRow());
-            aComp2.UpdateMoveTab( nOldPos, nNewPos, TRUE );
-            bCompile = TRUE;
+            aComp2.UpdateMoveTab( nOldPos, nNewPos, sal_True );
+            bCompile = sal_True;
         }
         // kein StartListeningTo weil pTab[nTab] noch nicht korrekt!
     }
@@ -1167,9 +1167,9 @@ void ScFormulaCell::UpdateInsertTabAbs(SCTAB nTable)
     }
 }
 
-BOOL ScFormulaCell::TestTabRefAbs(SCTAB nTable)
+sal_Bool ScFormulaCell::TestTabRefAbs(SCTAB nTable)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( !pDocument->IsClipOrUndo() )
     {
         pCode->Reset();
@@ -1180,7 +1180,7 @@ BOOL ScFormulaCell::TestTabRefAbs(SCTAB nTable)
             if( !rRef1.IsTabRel() )
             {
                 if( (SCsTAB) nTable != rRef1.nTab )
-                    bRet = TRUE;
+                    bRet = sal_True;
                 else if (nTable != aPos.Tab())
                     rRef1.nTab = aPos.Tab();
             }
@@ -1190,7 +1190,7 @@ BOOL ScFormulaCell::TestTabRefAbs(SCTAB nTable)
                 if( !rRef2.IsTabRel() )
                 {
                     if( (SCsTAB) nTable != rRef2.nTab )
-                        bRet = TRUE;
+                        bRet = sal_True;
                     else if (nTable != aPos.Tab())
                         rRef2.nTab = aPos.Tab();
                 }
@@ -1201,7 +1201,7 @@ BOOL ScFormulaCell::TestTabRefAbs(SCTAB nTable)
     return bRet;
 }
 
-void ScFormulaCell::UpdateCompile( BOOL bForceIfNameInUse )
+void ScFormulaCell::UpdateCompile( sal_Bool bForceIfNameInUse )
 {
     if ( bForceIfNameInUse && !bCompile )
         bCompile = pCode->HasNameOrColRowName();
@@ -1214,7 +1214,7 @@ void ScFormulaCell::UpdateCompile( BOOL bForceIfNameInUse )
 
 void ScFormulaCell::TransposeReference()
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     pCode->Reset();
     ScToken* t;
     while ( ( t = static_cast<ScToken*>(pCode->GetNextReference()) ) != NULL )
@@ -1222,11 +1222,11 @@ void ScFormulaCell::TransposeReference()
         ScSingleRefData& rRef1 = t->GetSingleRef();
         if ( rRef1.IsColRel() && rRef1.IsRowRel() )
         {
-            BOOL bDouble = (t->GetType() == formula::svDoubleRef);
+            sal_Bool bDouble = (t->GetType() == formula::svDoubleRef);
             ScSingleRefData& rRef2 = (bDouble ? t->GetDoubleRef().Ref2 : rRef1);
             if ( !bDouble || (rRef2.IsColRel() && rRef2.IsRowRel()) )
             {
-                INT16 nTemp;
+                sal_Int16 nTemp;
 
                 nTemp = rRef1.nRelCol;
                 rRef1.nRelCol = static_cast<SCCOL>(rRef1.nRelRow);
@@ -1239,13 +1239,13 @@ void ScFormulaCell::TransposeReference()
                     rRef2.nRelRow = static_cast<SCROW>(nTemp);
                 }
 
-                bFound = TRUE;
+                bFound = sal_True;
             }
         }
     }
 
     if (bFound)
-        bCompile = TRUE;
+        bCompile = sal_True;
 }
 
 void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rDest,
@@ -1254,7 +1254,7 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD
     EndListeningTo( pDocument );
 
     ScAddress aOldPos = aPos;
-    BOOL bPosChanged = FALSE;           // ob diese Zelle bewegt wurde
+    sal_Bool bPosChanged = sal_False;           // ob diese Zelle bewegt wurde
 
     ScRange aDestRange( rDest, ScAddress(
                 static_cast<SCCOL>(rDest.Col() + rSource.aEnd.Row() - rSource.aStart.Row()),
@@ -1268,11 +1268,11 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD
         SCsTAB nRelPosZ = aOldPos.Tab();
         ScRefUpdate::DoTranspose( nRelPosX, nRelPosY, nRelPosZ, pDocument, aDestRange, rSource.aStart );
         aOldPos.Set( nRelPosX, nRelPosY, nRelPosZ );
-        bPosChanged = TRUE;
+        bPosChanged = sal_True;
     }
 
     ScTokenArray* pOld = pUndoDoc ? pCode->Clone() : NULL;
-    BOOL bRefChanged = FALSE;
+    sal_Bool bRefChanged = sal_False;
     ScToken* t;
 
     ScRangeData* pShared = NULL;
@@ -1285,7 +1285,7 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD
             if (pName)
             {
                 if (pName->IsModified())
-                    bRefChanged = TRUE;
+                    bRefChanged = sal_True;
                 if (pName->HasType(RT_SHAREDMOD))
                     pShared = pName;
             }
@@ -1293,7 +1293,7 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD
         else if( t->GetType() != svIndex )
         {
             t->CalcAbsIfRel( aOldPos );
-            BOOL bMod;
+            sal_Bool bMod;
             {   // own scope for SingleDoubleRefModifier dtor if SingleRef
                 SingleDoubleRefModifier aMod( *t );
                 ScComplexRefData& rRef = aMod.Ref();
@@ -1303,7 +1303,7 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD
             if ( bMod )
             {
                 t->CalcRelFromAbs( aPos );
-                bRefChanged = TRUE;
+                bRefChanged = sal_True;
             }
         }
     }
@@ -1313,14 +1313,14 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD
         pDocument->RemoveFromFormulaTree( this );   // update formula count
         delete pCode;
         pCode = new ScTokenArray( *pShared->GetCode() );
-        bRefChanged = TRUE;
+        bRefChanged = sal_True;
         pCode->Reset();
         while( (t = static_cast<ScToken*>(pCode->GetNextReference())) != NULL )
         {
             if( t->GetType() != svIndex )
             {
                 t->CalcAbsIfRel( aOldPos );
-                BOOL bMod;
+                sal_Bool bMod;
                 {   // own scope for SingleDoubleRefModifier dtor if SingleRef
                     SingleDoubleRefModifier aMod( *t );
                     ScComplexRefData& rRef = aMod.Ref();
@@ -1343,7 +1343,7 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD
             pUndoDoc->PutCell( aPos.Col(), aPos.Row(), aPos.Tab(), pFCell );
         }
 
-        bCompile = TRUE;
+        bCompile = sal_True;
         CompileTokenArray();                // ruft auch StartListeningTo
         SetDirty();
     }
@@ -1357,7 +1357,7 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
 {
     EndListeningTo( pDocument );
 
-    BOOL bRefChanged = FALSE;
+    sal_Bool bRefChanged = sal_False;
     ScToken* t;
     ScRangeData* pShared = NULL;
 
@@ -1370,7 +1370,7 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
             if (pName)
             {
                 if (pName->IsModified())
-                    bRefChanged = TRUE;
+                    bRefChanged = sal_True;
                 if (pName->HasType(RT_SHAREDMOD))
                     pShared = pName;
             }
@@ -1378,7 +1378,7 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
         else if( t->GetType() != svIndex )
         {
             t->CalcAbsIfRel( aPos );
-            BOOL bMod;
+            sal_Bool bMod;
             {   // own scope for SingleDoubleRefModifier dtor if SingleRef
                 SingleDoubleRefModifier aMod( *t );
                 ScComplexRefData& rRef = aMod.Ref();
@@ -1388,7 +1388,7 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
             if ( bMod )
             {
                 t->CalcRelFromAbs( aPos );
-                bRefChanged = TRUE;
+                bRefChanged = sal_True;
             }
         }
     }
@@ -1398,14 +1398,14 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
         pDocument->RemoveFromFormulaTree( this );   // update formula count
         delete pCode;
         pCode = new ScTokenArray( *pShared->GetCode() );
-        bRefChanged = TRUE;
+        bRefChanged = sal_True;
         pCode->Reset();
         while( (t = static_cast<ScToken*>(pCode->GetNextReference())) != NULL )
         {
             if( t->GetType() != svIndex )
             {
                 t->CalcAbsIfRel( aPos );
-                BOOL bMod;
+                sal_Bool bMod;
                 {   // own scope for SingleDoubleRefModifier dtor if SingleRef
                     SingleDoubleRefModifier aMod( *t );
                     ScComplexRefData& rRef = aMod.Ref();
@@ -1420,7 +1420,7 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
 
     if (bRefChanged)
     {
-        bCompile = TRUE;
+        bCompile = sal_True;
         CompileTokenArray();                // ruft auch StartListeningTo
         SetDirty();
     }
@@ -1428,39 +1428,39 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY
         StartListeningTo( pDocument );      // Listener wie vorher
 }
 
-BOOL lcl_IsRangeNameInUse(USHORT nIndex, ScTokenArray* pCode, ScRangeName* pNames)
+sal_Bool lcl_IsRangeNameInUse(sal_uInt16 nIndex, ScTokenArray* pCode, ScRangeName* pNames)
 {
     for (FormulaToken* p = pCode->First(); p; p = pCode->Next())
     {
         if (p->GetOpCode() == ocName)
         {
             if (p->GetIndex() == nIndex)
-                return TRUE;
+                return sal_True;
             else
             {
                 //  RangeData kann Null sein in bestimmten Excel-Dateien (#31168#)
                 ScRangeData* pSubName = pNames->FindIndex(p->GetIndex());
                 if (pSubName && lcl_IsRangeNameInUse(nIndex,
                                     pSubName->GetCode(), pNames))
-                    return TRUE;
+                    return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScFormulaCell::IsRangeNameInUse(USHORT nIndex) const
+sal_Bool ScFormulaCell::IsRangeNameInUse(sal_uInt16 nIndex) const
 {
     return lcl_IsRangeNameInUse( nIndex, pCode, pDocument->GetRangeName() );
 }
 
-void lcl_FindRangeNamesInUse(std::set<USHORT>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames)
+void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames)
 {
     for (FormulaToken* p = pCode->First(); p; p = pCode->Next())
     {
         if (p->GetOpCode() == ocName)
         {
-            USHORT nTokenIndex = p->GetIndex();
+            sal_uInt16 nTokenIndex = p->GetIndex();
             rIndexes.insert( nTokenIndex );
 
             ScRangeData* pSubName = pNames->FindIndex(p->GetIndex());
@@ -1470,7 +1470,7 @@ void lcl_FindRangeNamesInUse(std::set<USHORT>& rIndexes, ScTokenArray* pCode, Sc
     }
 }
 
-void ScFormulaCell::FindRangeNamesInUse(std::set<USHORT>& rIndexes) const
+void ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const
 {
     lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() );
 }
@@ -1487,7 +1487,7 @@ void ScFormulaCell::ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap )
             if ( nIndex != nNewIndex )
             {
                 p->SetIndex( nNewIndex );
-                bCompile = TRUE;
+                bCompile = sal_True;
             }
         }
     }
@@ -1502,7 +1502,7 @@ void ScFormulaCell::CompileDBFormula()
         if ( p->GetOpCode() == ocDBArea
             || (p->GetOpCode() == ocName && p->GetIndex() >= SC_START_INDEX_DB_COLL) )
         {
-            bCompile = TRUE;
+            bCompile = sal_True;
             CompileTokenArray();
             SetDirty();
             break;
@@ -1510,14 +1510,14 @@ void ScFormulaCell::CompileDBFormula()
     }
 }
 
-void ScFormulaCell::CompileDBFormula( BOOL bCreateFormulaString )
+void ScFormulaCell::CompileDBFormula( sal_Bool bCreateFormulaString )
 {
     // zwei Phasen, muessen (!) nacheinander aufgerufen werden:
     // 1. FormelString mit alten Namen erzeugen
     // 2. FormelString mit neuen Namen kompilieren
     if ( bCreateFormulaString )
     {
-        BOOL bRecompile = FALSE;
+        sal_Bool bRecompile = sal_False;
         pCode->Reset();
         for ( FormulaToken* p = pCode->First(); p && !bRecompile; p = pCode->Next() )
         {
@@ -1526,11 +1526,11 @@ void ScFormulaCell::CompileDBFormula( BOOL bCreateFormulaString )
                 case ocBad:             // DB-Bereich evtl. zugefuegt
                 case ocColRowName:      // #36762# falls Namensgleichheit
                 case ocDBArea:          // DB-Bereich
-                    bRecompile = TRUE;
+                    bRecompile = sal_True;
                 break;
                 case ocName:
                     if ( p->GetIndex() >= SC_START_INDEX_DB_COLL )
-                        bRecompile = TRUE;  // DB-Bereich
+                        bRecompile = sal_True;  // DB-Bereich
                 break;
                 default:
                     ; // nothing
@@ -1555,20 +1555,20 @@ void ScFormulaCell::CompileDBFormula( BOOL bCreateFormulaString )
     }
     else if ( !pCode->GetLen() && aResult.GetHybridFormula().Len() )
     {
-        Compile( aResult.GetHybridFormula(), FALSE, eTempGrammar );
+        Compile( aResult.GetHybridFormula(), sal_False, eTempGrammar );
         aResult.SetToken( NULL);
         SetDirty();
     }
 }
 
-void ScFormulaCell::CompileNameFormula( BOOL bCreateFormulaString )
+void ScFormulaCell::CompileNameFormula( sal_Bool bCreateFormulaString )
 {
     // zwei Phasen, muessen (!) nacheinander aufgerufen werden:
     // 1. FormelString mit alten RangeNames erzeugen
     // 2. FormelString mit neuen RangeNames kompilieren
     if ( bCreateFormulaString )
     {
-        BOOL bRecompile = FALSE;
+        sal_Bool bRecompile = sal_False;
         pCode->Reset();
         for ( FormulaToken* p = pCode->First(); p && !bRecompile; p = pCode->Next() )
         {
@@ -1576,11 +1576,11 @@ void ScFormulaCell::CompileNameFormula( BOOL bCreateFormulaString )
             {
                 case ocBad:             // RangeName evtl. zugefuegt
                 case ocColRowName:      // #36762# falls Namensgleichheit
-                    bRecompile = TRUE;
+                    bRecompile = sal_True;
                 break;
                 default:
                     if ( p->GetType() == svIndex )
-                        bRecompile = TRUE;  // RangeName
+                        bRecompile = sal_True;  // RangeName
             }
         }
         if ( bRecompile )
@@ -1602,7 +1602,7 @@ void ScFormulaCell::CompileNameFormula( BOOL bCreateFormulaString )
     }
     else if ( !pCode->GetLen() && aResult.GetHybridFormula().Len() )
     {
-        Compile( aResult.GetHybridFormula(), FALSE, eTempGrammar );
+        Compile( aResult.GetHybridFormula(), sal_False, eTempGrammar );
         aResult.SetToken( NULL);
         SetDirty();
     }
@@ -1615,7 +1615,7 @@ void ScFormulaCell::CompileColRowNameFormula()
     {
         if ( p->GetOpCode() == ocColRowName )
         {
-            bCompile = TRUE;
+            bCompile = sal_True;
             CompileTokenArray();
             SetDirty();
             break;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 98f7b4c8b..21222d02b 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -58,7 +58,7 @@
 // STATIC DATA -----------------------------------------------------------
 using namespace formula;
 
-inline BOOL IsAmbiguousScriptNonZero( BYTE nScript )
+inline sal_Bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
 {
     //!	move to a header file
     return ( nScript != SCRIPTTYPE_LATIN &&
@@ -97,13 +97,13 @@ void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc)
 }
 
 
-SCsROW ScColumn::GetNextUnprotected( SCROW nRow, BOOL bUp ) const
+SCsROW ScColumn::GetNextUnprotected( SCROW nRow, sal_Bool bUp ) const
 {
     return pAttrArray->GetNextUnprotected(nRow, bUp);
 }
 
 
-USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const
+sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
 {
     // nix:0, mitte:1, unten:2, links:4, oben:8, rechts:16, offen:32
     if ( !pItems )
@@ -126,8 +126,8 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
     else
     {
         ScAddress aOrg( ScAddress::INITIALIZE_INVALID );
-        BOOL bOpen = FALSE;
-        USHORT nEdges = 0;
+        sal_Bool bOpen = sal_False;
+        sal_uInt16 nEdges = 0;
         SCSIZE nIndex;
         Search( nRow1, nIndex );
         while ( nIndex < nCount && pItems[nIndex].nRow <= nRow2 )
@@ -140,7 +140,7 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
                 if ( nEdges )
                 {
                     if ( nEdges & 8 )
-                        bOpen = TRUE;	// obere Kante oeffnet, weitersehen
+                        bOpen = sal_True;	// obere Kante oeffnet, weitersehen
                     else if ( !bOpen )
                         return nEdges | 32;	// es gibt was, was nicht geoeffnet wurde
                     else if ( nEdges & 1 )
@@ -151,7 +151,7 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
                         || ((nMask & 4)  && (nEdges & 16) && !(nEdges & 4)) )
                         return nEdges;	// nur linke/rechte Kante
                     if ( nEdges & 2 )
-                        bOpen = FALSE;	// untere Kante schliesst
+                        bOpen = sal_False;	// untere Kante schliesst
                 }
             }
             nIndex++;
@@ -163,11 +163,11 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
 }
 
 
-BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
+sal_Bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
 {
     if ( rMark.IsMultiMarked() )
     {
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
 
         ScAddress aOrg( ScAddress::INITIALIZE_INVALID );
         ScAddress aCurOrg( ScAddress::INITIALIZE_INVALID );
@@ -175,8 +175,8 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
         ScMarkArrayIter aMarkIter( rMark.GetArray()+nCol );
         while ( !bFound && aMarkIter.Next( nTop, nBottom ) )
         {
-            BOOL bOpen = FALSE;
-            USHORT nEdges;
+            sal_Bool bOpen = sal_False;
+            sal_uInt16 nEdges;
             SCSIZE nIndex;
             Search( nTop, nIndex );
             while ( !bFound && nIndex < nCount && pItems[nIndex].nRow <= nBottom )
@@ -189,16 +189,16 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
                     if ( nEdges )
                     {
                         if ( nEdges & 8 )
-                            bOpen = TRUE;	// obere Kante oeffnet, weitersehen
+                            bOpen = sal_True;	// obere Kante oeffnet, weitersehen
                         else if ( !bOpen )
-                            return TRUE;	// es gibt was, was nicht geoeffnet wurde
+                            return sal_True;	// es gibt was, was nicht geoeffnet wurde
                         else if ( nEdges & 1 )
-                            bFound = TRUE;	// mittendrin, alles selektiert?
+                            bFound = sal_True;	// mittendrin, alles selektiert?
                         // (4 und nicht 16) oder (16 und nicht 4)
                         if ( (((nEdges & 4) | 16) ^ ((nEdges & 16) | 4)) )
-                            bFound = TRUE;	// nur linke/rechte Kante, alles selektiert?
+                            bFound = sal_True;	// nur linke/rechte Kante, alles selektiert?
                         if ( nEdges & 2 )
-                            bOpen = FALSE;	// untere Kante schliesst
+                            bOpen = sal_False;	// untere Kante schliesst
 
                         if ( bFound )
                         {	// alles selektiert?
@@ -218,41 +218,41 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
                                     aOrg.Col() + nC - 1, aOrg.Row() + nR - 1,
                                     aOrg.Tab() ) );
                                 if ( rMark.IsAllMarked( aRange ) )
-                                    bFound = FALSE;
+                                    bFound = sal_False;
                             }
                             else
-                                bFound = FALSE;		// war schon
+                                bFound = sal_False;		// war schon
                         }
                     }
                 }
                 nIndex++;
             }
             if ( bOpen )
-                return TRUE;
+                return sal_True;
         }
         return bFound;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 
-//UNUSED2009-05 BOOL ScColumn::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
-//UNUSED2009-05                             BOOL bLeft, BOOL bRight ) const
+//UNUSED2009-05 sal_Bool ScColumn::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
+//UNUSED2009-05                             sal_Bool bLeft, sal_Bool bRight ) const
 //UNUSED2009-05 {
 //UNUSED2009-05     return pAttrArray->HasLines( nRow1, nRow2, rSizes, bLeft, bRight );
 //UNUSED2009-05 }
 
 
-bool ScColumn::HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const
+bool ScColumn::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
 {
     return pAttrArray->HasAttrib( nRow1, nRow2, nMask );
 }
 
 
-BOOL ScColumn::HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const
+sal_Bool ScColumn::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     SCROW nTop;
     SCROW nBottom;
@@ -263,7 +263,7 @@ BOOL ScColumn::HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const
         while (aMarkIter.Next( nTop, nBottom ) && !bFound)
         {
             if (pAttrArray->HasAttrib( nTop, nBottom, nMask ))
-                bFound = TRUE;
+                bFound = sal_True;
         }
     }
 
@@ -271,15 +271,15 @@ BOOL ScColumn::HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const
 }
 
 
-BOOL ScColumn::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
+sal_Bool ScColumn::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
                             SCCOL& rPaintCol, SCROW& rPaintRow,
-                            BOOL bRefresh, BOOL bAttrs )
+                            sal_Bool bRefresh, sal_Bool bAttrs )
 {
     return pAttrArray->ExtendMerge( nThisCol, nStartRow, nEndRow, rPaintCol, rPaintRow, bRefresh, bAttrs );
 }
 
 
-void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const
+void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, sal_Bool bDeep ) const
 {
     SCROW nTop;
     SCROW nBottom;
@@ -297,7 +297,7 @@ void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkD
 }
 
 
-void ScColumn::MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const
+void ScColumn::MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, sal_Bool bDeep ) const
 {
     pAttrArray->MergePatternArea( nRow1, nRow2, rState, bDeep );
 }
@@ -305,14 +305,14 @@ void ScColumn::MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW
 
 void ScColumn::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
                             ScLineFlags& rFlags,
-                            SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const
+                            SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight ) const
 {
     pAttrArray->MergeBlockFrame( pLineOuter, pLineInner, rFlags, nStartRow, nEndRow, bLeft, nDistRight );
 }
 
 
 void ScColumn::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
-                            SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight )
+                            SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight )
 {
     pAttrArray->ApplyBlockFrame( pLineOuter, pLineInner, nStartRow, nEndRow, bLeft, nDistRight );
 }
@@ -324,7 +324,7 @@ const ScPatternAttr* ScColumn::GetPattern( SCROW nRow ) const
 }
 
 
-const SfxPoolItem* ScColumn::GetAttr( SCROW nRow, USHORT nWhich ) const
+const SfxPoolItem* ScColumn::GetAttr( SCROW nRow, sal_uInt16 nWhich ) const
 {
     return &pAttrArray->GetPattern( nRow )->GetItemSet().Get(nWhich);
 }
@@ -355,7 +355,7 @@ const ScPatternAttr* ScColumn::GetMostUsedPattern( SCROW nStartRow, SCROW nEndRo
 }
 
 
-ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
+sal_uLong ScColumn::GetNumberFormat( SCROW nRow ) const
 {
     return pAttrArray->GetPattern( nRow )->GetNumberFormat( pDocument->GetFormatTable() );
 }
@@ -365,7 +365,7 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData
 {
     SCROW nTop = 0;
     SCROW nBottom = 0;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     if ( rMark.IsMultiMarked() )
     {
@@ -373,7 +373,7 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData
         while (aMarkIter.Next( nTop, nBottom ))
         {
             pAttrArray->ApplyCacheArea( nTop, nBottom, pCache );
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 
@@ -386,7 +386,7 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData
 }
 
 
-void ScColumn::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark )
+void ScColumn::ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark )
 {
     SCROW nTop;
     SCROW nBottom;
@@ -400,7 +400,7 @@ void ScColumn::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark )
 }
 
 
-void ScColumn::ClearSelectionItems( const USHORT* pWhich,const ScMarkData& rMark )
+void ScColumn::ClearSelectionItems( const sal_uInt16* pWhich,const ScMarkData& rMark )
 {
     SCROW nTop;
     SCROW nBottom;
@@ -414,7 +414,7 @@ void ScColumn::ClearSelectionItems( const USHORT* pWhich,const ScMarkData& rMark
 }
 
 
-void ScColumn::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
+void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
 {
     SCROW nTop;
     SCROW nBottom;
@@ -435,9 +435,9 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr )
 
     const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow );
 
-    //	TRUE = alten Eintrag behalten
+    //	sal_True = alten Eintrag behalten
 
-    ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, TRUE );
+    ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, sal_True );
     ScDocumentPool::CheckRef( *pPattern );
     ScDocumentPool::CheckRef( *pNewPattern );
 
@@ -466,7 +466,7 @@ void ScColumn::ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
         SCROW nRow1, nRow2;
         const ScPatternAttr* pPattern = pAttrArray->GetPatternRange(
             nRow1, nRow2, nRow );
-        ULONG nFormat = pPattern->GetNumberFormat( pFormatter );
+        sal_uLong nFormat = pPattern->GetNumberFormat( pFormatter );
         short nOldType = pFormatter->GetType( nFormat );
         if ( nOldType == nNewType || pFormatter->IsCompatible( nOldType, nNewType ) )
             nRow = nRow2;
@@ -488,7 +488,7 @@ void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle )
     if (pNewPattern)
     {
         pNewPattern->SetStyleSheet((ScStyleSheet*)&rStyle);
-        pAttrArray->SetPattern(nRow, pNewPattern, TRUE);
+        pAttrArray->SetPattern(nRow, pNewPattern, sal_True);
         delete pNewPattern;
     }
 }
@@ -515,7 +515,7 @@ void ScColumn::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData&
 
 
 void ScColumn::ApplySelectionLineStyle( const ScMarkData& rMark,
-                                    const SvxBorderLine* pLine, BOOL bColorOnly )
+                                    const SvxBorderLine* pLine, sal_Bool bColorOnly )
 {
     if ( bColorOnly && !pLine )
         return;
@@ -538,16 +538,16 @@ const ScStyleSheet* ScColumn::GetStyle( SCROW nRow ) const
 }
 
 
-const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const
+const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, sal_Bool& rFound ) const
 {
-    rFound = FALSE;
+    rFound = sal_False;
     if (!rMark.IsMultiMarked())
     {
         DBG_ERROR("ScColumn::GetSelectionStyle ohne Selektion");
         return NULL;
     }
 
-    BOOL bEqual = TRUE;
+    sal_Bool bEqual = sal_True;
 
     const ScStyleSheet* pStyle = NULL;
     const ScStyleSheet* pNewStyle;
@@ -564,9 +564,9 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL&
         while (bEqual && ( pPattern = aAttrIter.Next( nRow, nDummy ) ) != NULL)
         {
             pNewStyle = pPattern->GetStyleSheet();
-            rFound = TRUE;
+            rFound = sal_True;
             if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
-                bEqual = FALSE;												// unterschiedliche
+                bEqual = sal_False;												// unterschiedliche
             pStyle = pNewStyle;
         }
     }
@@ -575,11 +575,11 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL&
 }
 
 
-const ScStyleSheet*	ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const
+const ScStyleSheet*	ScColumn::GetAreaStyle( sal_Bool& rFound, SCROW nRow1, SCROW nRow2 ) const
 {
-    rFound = FALSE;
+    rFound = sal_False;
 
-    BOOL bEqual = TRUE;
+    sal_Bool bEqual = sal_True;
 
     const ScStyleSheet* pStyle = NULL;
     const ScStyleSheet* pNewStyle;
@@ -591,9 +591,9 @@ const ScStyleSheet*	ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRo
     while (bEqual && ( pPattern = aAttrIter.Next( nRow, nDummy ) ) != NULL)
     {
         pNewStyle = pPattern->GetStyleSheet();
-        rFound = TRUE;
+        rFound = sal_True;
         if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
-            bEqual = FALSE;												// unterschiedliche
+            bEqual = sal_False;												// unterschiedliche
         pStyle = pNewStyle;
     }
 
@@ -605,38 +605,38 @@ void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolR
     pAttrArray->FindStyleSheet( pStyleSheet, rUsedRows, bReset );
 }
 
-BOOL ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
+sal_Bool ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const
 {
     return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles );
 }
 
 
-BOOL ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
+sal_Bool ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags )
 {
     return pAttrArray->ApplyFlags( nStartRow, nEndRow, nFlags );
 }
 
 
-BOOL ScColumn::RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
+sal_Bool ScColumn::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags )
 {
     return pAttrArray->RemoveFlags( nStartRow, nEndRow, nFlags );
 }
 
 
-void ScColumn::ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich )
+void ScColumn::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich )
 {
     pAttrArray->ClearItems( nStartRow, nEndRow, pWhich );
 }
 
 
-void ScColumn::SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool )
+void ScColumn::SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, sal_Bool bPutToPool )
 {
     pAttrArray->SetPattern( nRow, &rPatAttr, bPutToPool );
 }
 
 
 void ScColumn::SetPatternArea( SCROW nStartRow, SCROW nEndRow,
-                                const ScPatternAttr& rPatAttr, BOOL bPutToPool )
+                                const ScPatternAttr& rPatAttr, sal_Bool bPutToPool )
 {
     pAttrArray->SetPatternArea( nStartRow, nEndRow, &rPatAttr, bPutToPool );
 }
@@ -667,9 +667,9 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr )
 
     const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow );
 
-    //	TRUE = alten Eintrag behalten
+    //	sal_True = alten Eintrag behalten
 
-    ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, TRUE );
+    ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, sal_True );
     ScDocumentPool::CheckRef( *pPattern );
     ScDocumentPool::CheckRef( *pNewPattern );
 
@@ -683,12 +683,12 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr )
 #endif
 
 
-BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
+sal_Bool ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
 {
     if ( !pItems || !nCount )
     {
         nIndex = 0;
-        return FALSE;
+        return sal_False;
     }
     SCROW nMinRow = pItems[0].nRow;
     if ( nRow <= nMinRow )
@@ -702,12 +702,12 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
         if ( nRow == nMaxRow )
         {
             nIndex = nCount - 1;
-            return TRUE;
+            return sal_True;
         }
         else
         {
             nIndex = nCount;
-            return FALSE;
+            return sal_False;
         }
     }
 
@@ -715,9 +715,9 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
     long	nLo 	= nOldLo = 0;
     long	nHi 	= nOldHi = Min(static_cast<long>(nCount)-1, static_cast<long>(nRow) );
     long	i		= 0;
-    BOOL	bFound	= FALSE;
+    sal_Bool	bFound	= sal_False;
     // quite continuous distribution? => interpolating search
-    BOOL	bInterpol = (static_cast<SCSIZE>(nMaxRow - nMinRow) < nCount * 2);
+    sal_Bool	bInterpol = (static_cast<SCSIZE>(nMaxRow - nMinRow) < nCount * 2);
     SCROW	nR;
 
     while ( !bFound && nLo <= nHi )
@@ -732,7 +732,7 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
             if ( i < 0 || static_cast<SCSIZE>(i) >= nCount )
             {	// oops ...
                 i = (nLo+nHi) / 2;
-                bInterpol = FALSE;
+                bInterpol = sal_False;
             }
         }
         nR = pItems[i].nRow;
@@ -742,7 +742,7 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
             if ( bInterpol )
             {
                 if ( nLo <= nOldLo )
-                    bInterpol = FALSE;
+                    bInterpol = sal_False;
                 else
                     nOldLo = nLo;
             }
@@ -755,13 +755,13 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
                 if ( bInterpol )
                 {
                     if ( nHi >= nOldHi )
-                        bInterpol = FALSE;
+                        bInterpol = sal_False;
                     else
                         nOldHi = nHi;
                 }
             }
             else
-                bFound = TRUE;
+                bFound = sal_True;
         }
     }
     if (bFound)
@@ -931,16 +931,16 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 
         if (pCode1->GetLen() == pCode2->GetLen())		// nicht-UPN
         {
-            BOOL bEqual = TRUE;
-            USHORT nLen = pCode1->GetLen();
+            sal_Bool bEqual = sal_True;
+            sal_uInt16 nLen = pCode1->GetLen();
             FormulaToken** ppToken1 = pCode1->GetArray();
             FormulaToken** ppToken2 = pCode2->GetArray();
-            for (USHORT i=0; i<nLen; i++)
+            for (sal_uInt16 i=0; i<nLen; i++)
             {
                 if ( !ppToken1[i]->TextEqual(*(ppToken2[i])) ||
                         ppToken1[i]->Is3DRef() || ppToken2[i]->Is3DRef() )
                 {
-                    bEqual = FALSE;
+                    bEqual = sal_False;
                     break;
                 }
             }
@@ -1063,11 +1063,11 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn& rCol)
 }
 
 
-BOOL ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
+sal_Bool ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
 {
     if (!IsEmpty())
     {
-        BOOL bTest = TRUE;
+        sal_Bool bTest = sal_True;
         if (pItems)
             for (SCSIZE i=0; (i<nCount) && bTest; i++)
                 bTest = (pItems[i].nRow < nStartRow) || (pItems[i].nRow > nEndRow)
@@ -1083,11 +1083,11 @@ BOOL ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
         return bTest;
     }
     else
-        return TRUE;
+        return sal_True;
 }
 
 
-BOOL ScColumn::TestInsertRow( SCSIZE nSize ) const
+sal_Bool ScColumn::TestInsertRow( SCSIZE nSize ) const
 {
     //  AttrArray only looks for merged cells
 
@@ -1101,7 +1101,7 @@ BOOL ScColumn::TestInsertRow( SCSIZE nSize ) const
     //!		rausgeschobene Attribute bei Undo beruecksichtigen
 
     if ( nSize > static_cast<SCSIZE>(MAXROW) )
-        return FALSE;
+        return sal_False;
 
     SCSIZE nVis = nCount;
     while ( nVis && pItems[nVis-1].pCell->IsBlank() )
@@ -1110,7 +1110,7 @@ BOOL ScColumn::TestInsertRow( SCSIZE nSize ) const
     if ( nVis )
         return ( pItems[nVis-1].nRow <= MAXROW-nSize );
     else
-        return TRUE;
+        return sal_True;
 #endif
 }
 
@@ -1129,16 +1129,16 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
     if ( i >= nCount )
         return ;
 
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
 
     SCSIZE nNewCount = nCount;
-    BOOL bCountChanged = FALSE;
+    sal_Bool bCountChanged = sal_False;
     ScAddress aAdr( nCol, 0, nTab );
     ScHint aHint( SC_HINT_DATACHANGED, aAdr, NULL );    // only areas (ScBaseCell* == NULL)
     ScAddress& rAddress = aHint.GetAddress();
     // for sparse occupation use single broadcasts, not ranges
-    BOOL bSingleBroadcasts = (((pItems[nCount-1].nRow - pItems[i].nRow) /
+    sal_Bool bSingleBroadcasts = (((pItems[nCount-1].nRow - pItems[i].nRow) /
                 (nCount - i)) > 1);
     if ( bSingleBroadcasts )
     {
@@ -1163,7 +1163,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
             if ( nNewRow > MAXROW && !bCountChanged )
             {
                 nNewCount = i;
-                bCountChanged = TRUE;
+                bCountChanged = sal_True;
             }
         }
     }
@@ -1180,7 +1180,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
             if ( nNewRow > MAXROW && !bCountChanged )
             {
                 nNewCount = i;
-                bCountChanged = TRUE;
+                bCountChanged = sal_True;
                 aRange.aEnd.SetRow( MAXROW );
             }
         }
@@ -1222,7 +1222,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
 }
 
 
-void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions)
+void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, sal_Bool bKeepScenarioFlags, sal_Bool bCloneNoteCaptions)
 {
     pAttrArray->CopyArea( nRow1, nRow2, 0, *rColumn.pAttrArray,
                             bKeepScenarioFlags ? (SC_MF_ALL & ~SC_MF_SCENARIO) : SC_MF_ALL );
@@ -1266,8 +1266,8 @@ void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKee
 }
 
 
-void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
-                                ScColumn& rColumn, const ScMarkData* pMarkData, BOOL bAsLink )
+void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked,
+                                ScColumn& rColumn, const ScMarkData* pMarkData, sal_Bool bAsLink )
 {
     if (bMarked)
     {
@@ -1280,7 +1280,7 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke
             {
                 if ( nEnd >= nRow1 )
                     CopyToColumn( Max(nRow1,nStart), Min(nRow2,nEnd),
-                                    nFlags, FALSE, rColumn, pMarkData, bAsLink );
+                                    nFlags, sal_False, rColumn, pMarkData, bAsLink );
             }
         }
         else
@@ -1302,7 +1302,7 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke
                 const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow );
                 ScPatternAttr* pNewPattern = new ScPatternAttr( *pPattern );
                 pNewPattern->SetStyleSheet( (ScStyleSheet*)pStyle );
-                rColumn.pAttrArray->SetPattern( nRow, pNewPattern, TRUE );
+                rColumn.pAttrArray->SetPattern( nRow, pNewPattern, sal_True );
                 delete pNewPattern;
             }
         }
@@ -1344,16 +1344,16 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke
 }
 
 
-void ScColumn::UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+void ScColumn::UndoToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked,
                                 ScColumn& rColumn, const ScMarkData* pMarkData )
 {
     if (nRow1 > 0)
-        CopyToColumn( 0, nRow1-1, IDF_FORMULA, FALSE, rColumn );
+        CopyToColumn( 0, nRow1-1, IDF_FORMULA, sal_False, rColumn );
 
     CopyToColumn( nRow1, nRow2, nFlags, bMarked, rColumn, pMarkData );		//! bMarked ????
 
     if (nRow2 < MAXROW)
-        CopyToColumn( nRow2+1, MAXROW, IDF_FORMULA, FALSE, rColumn );
+        CopyToColumn( nRow2+1, MAXROW, IDF_FORMULA, sal_False, rColumn );
 }
 
 
@@ -1377,7 +1377,7 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const
     }
 
     //	Dummy:
-    //	CopyToColumn( 0,MAXROW, IDF_FORMULA, FALSE, rDestCol, NULL, FALSE );
+    //	CopyToColumn( 0,MAXROW, IDF_FORMULA, sal_False, rDestCol, NULL, sal_False );
 }
 
 
@@ -1394,7 +1394,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol )
         {
             DeleteArea( nStart, nEnd, IDF_CONTENTS );
             ((ScColumn&)rSrcCol).
-                CopyToColumn( nStart, nEnd, IDF_CONTENTS, FALSE, *this );
+                CopyToColumn( nStart, nEnd, IDF_CONTENTS, sal_False, *this );
 
             //	UpdateUsed nicht noetig, schon in TestCopyScenario passiert
 
@@ -1425,7 +1425,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const
         {
             rDestCol.DeleteArea( nStart, nEnd, IDF_CONTENTS );
             ((ScColumn*)this)->
-                CopyToColumn( nStart, nEnd, IDF_CONTENTS, FALSE, rDestCol );
+                CopyToColumn( nStart, nEnd, IDF_CONTENTS, sal_False, rDestCol );
 
             //	UpdateUsed nicht noetig, schon in TestCopyScenario passiert
 
@@ -1443,9 +1443,9 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const
 }
 
 
-BOOL ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const
+sal_Bool ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW );
     SCROW nStart = 0, nEnd = 0;
     const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd );
@@ -1453,7 +1453,7 @@ BOOL ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const
     {
         if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() )
             if ( rDestCol.pAttrArray->HasAttrib( nStart, nEnd, HASATTR_PROTECTED ) )
-                bOk = FALSE;
+                bOk = sal_False;
 
         pPattern = aAttrIter.Next( nStart, nEnd );
     }
@@ -1474,7 +1474,7 @@ void ScColumn::MarkScenarioIn( ScMarkData& rDestMark ) const
         {
             aRange.aStart.SetRow( nStart );
             aRange.aEnd.SetRow( nEnd );
-            rDestMark.SetMultiMarkArea( aRange, TRUE );
+            rDestMark.SetMultiMarkArea( aRange, sal_True );
         }
 
         pPattern = aAttrIter.Next( nStart, nEnd );
@@ -1751,7 +1751,7 @@ void ScColumn::UpdateInsertTabAbs(SCTAB nTable)
 }
 
 
-void ScColumn::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo )
+void ScColumn::UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScColumn* pRefUndo )
 {
     if (nTab > nTable)
         pAttrArray->SetTab(--nTab);
@@ -1767,7 +1767,7 @@ void ScColumn::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo )
                     back the formula cell while keeping the original note. */
                 ScBaseCell* pSave = pRefUndo ? pOld->CloneWithoutNote( *pDocument ) : 0;
 
-                BOOL bChanged = pOld->UpdateDeleteTab(nTable, bIsMove);
+                sal_Bool bChanged = pOld->UpdateDeleteTab(nTable, bIsMove);
                 if ( nRow != pItems[i].nRow )
                     Search( nRow, i );		// Listener geloescht/eingefuegt?
 
@@ -1801,7 +1801,7 @@ void ScColumn::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo )
 }
 
 
-void ScColumn::UpdateCompile( BOOL bForceIfNameInUse )
+void ScColumn::UpdateCompile( sal_Bool bForceIfNameInUse )
 {
     if (pItems)
         for (SCSIZE i = 0; i < nCount; i++)
@@ -1832,9 +1832,9 @@ void ScColumn::SetTabNo(SCTAB nNewTab)
 }
 
 
-BOOL ScColumn::IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const
+sal_Bool ScColumn::IsRangeNameInUse(SCROW nRow1, SCROW nRow2, sal_uInt16 nIndex) const
 {
-    BOOL bInUse = FALSE;
+    sal_Bool bInUse = sal_False;
     if (pItems)
         for (SCSIZE i = 0; !bInUse && (i < nCount); i++)
             if ((pItems[i].nRow >= nRow1) &&
@@ -1844,7 +1844,7 @@ BOOL ScColumn::IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const
     return bInUse;
 }
 
-void ScColumn::FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const
+void ScColumn::FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes) const
 {
     if (pItems)
         for (SCSIZE i = 0; i < nCount; i++)
@@ -1886,8 +1886,8 @@ void ScColumn::SetDirtyVar()
 void ScColumn::SetDirty()
 {
     // wird nur dokumentweit verwendet, kein FormulaTrack
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for (SCSIZE i=0; i<nCount; i++)
     {
         ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -1906,8 +1906,8 @@ void ScColumn::SetDirty( const ScRange& rRange )
 {	// broadcastet alles innerhalb eines Range, mit FormulaTrack
     if ( !pItems || !nCount )
         return ;
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     SCROW nRow2 = rRange.aEnd.Row();
     ScAddress aPos( nCol, 0, nTab );
     ScHint aHint( SC_HINT_DATACHANGED, aPos, NULL );
@@ -1935,8 +1935,8 @@ void ScColumn::SetTableOpDirty( const ScRange& rRange )
 {
     if ( !pItems || !nCount )
         return ;
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// no multiple recalculation
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// no multiple recalculation
     SCROW nRow2 = rRange.aEnd.Row();
     ScAddress aPos( nCol, 0, nTab );
     ScHint aHint( SC_HINT_TABLEOPDIRTY, aPos, NULL );
@@ -1962,8 +1962,8 @@ void ScColumn::SetTableOpDirty( const ScRange& rRange )
 
 void ScColumn::SetDirtyAfterLoad()
 {
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for (SCSIZE i=0; i<nCount; i++)
     {
         ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -1995,8 +1995,8 @@ void ScColumn::SetDirtyAfterLoad()
 
 void ScColumn::SetRelNameDirty()
 {
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for (SCSIZE i=0; i<nCount; i++)
     {
         ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -2044,9 +2044,9 @@ void ScColumn::CompileAll()
             {
                 SCROW nRow = pItems[i].nRow;
                 // fuer unbedingtes kompilieren
-                // bCompile=TRUE und pCode->nError=0
+                // bCompile=sal_True und pCode->nError=0
                 ((ScFormulaCell*)pCell)->GetCode()->SetCodeError( 0 );
-                ((ScFormulaCell*)pCell)->SetCompile( TRUE );
+                ((ScFormulaCell*)pCell)->SetCompile( sal_True );
                 ((ScFormulaCell*)pCell)->CompileTokenArray();
                 if ( nRow != pItems[i].nRow )
                     Search( nRow, i );		// Listener geloescht/eingefuegt?
@@ -2101,14 +2101,14 @@ void ScColumn::ResetChanged( SCROW nStartRow, SCROW nEndRow )
 }
 
 
-BOOL ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const
+sal_Bool ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const
 {
     //	used in GetOptimalHeight - ambiguous script type counts as edit cell
 
     SCROW nRow = 0;
     SCSIZE nIndex;
     Search(nStartRow,nIndex);
-    while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : FALSE )
+    while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : sal_False )
     {
         ScBaseCell* pCell = pItems[nIndex].pCell;
         CellType eCellType = pCell->GetCellType();
@@ -2117,17 +2117,17 @@ BOOL ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const
              ((eCellType == CELLTYPE_FORMULA) && ((ScFormulaCell*)pCell)->IsMultilineResult()) )
         {
             rFirst = nRow;
-            return TRUE;
+            return sal_True;
         }
         ++nIndex;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
 SCsROW ScColumn::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
-                                BOOL bUp, BOOL bInSelection, const ScMarkData& rMark )
+                                sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark )
 {
     if (bInSelection)
     {
@@ -2142,8 +2142,8 @@ SCsROW ScColumn::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
 }
 
 
-BOOL ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
-                                    BOOL bUp, BOOL bInSelection, const ScMarkData& rMark )
+sal_Bool ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
+                                    sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark )
 {
     if (bInSelection)
     {
@@ -2151,7 +2151,7 @@ BOOL ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleShe
             return pAttrArray->SearchStyleRange( rRow, rEndRow, pSearchStyle, bUp,
                                     (ScMarkArray*) rMark.GetArray()+nCol );		//! const
         else
-            return FALSE;
+            return sal_False;
     }
     else
         return pAttrArray->SearchStyleRange( rRow, rEndRow, pSearchStyle, bUp, NULL );
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index f585e5612..3398b8d1f 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -77,7 +77,7 @@
 
 // -----------------------------------------------------------------------
 
-inline BOOL IsAmbiguousScript( BYTE nScript )
+inline sal_Bool IsAmbiguousScript( sal_uInt8 nScript )
 {
     //!	move to a header file
     return ( nScript != SCRIPTTYPE_LATIN &&
@@ -114,9 +114,9 @@ inline BOOL IsAmbiguousScript( BYTE nScript )
 //UNUSED2008-05      //  (because CELLTYPE_SYMBOLS wasn't written in the file)
 //UNUSED2008-05
 //UNUSED2008-05      ScFontToSubsFontConverter_AutoPtr xFontConverter;
-//UNUSED2008-05      const ULONG nFontConverterFlags = FONTTOSUBSFONT_EXPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS;
+//UNUSED2008-05      const sal_uLong nFontConverterFlags = FONTTOSUBSFONT_EXPORT | FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS;
 //UNUSED2008-05
-//UNUSED2008-05      BOOL bListInitialized = FALSE;
+//UNUSED2008-05      sal_Bool bListInitialized = sal_False;
 //UNUSED2008-05      ScSymbolStringCellEntry* pCurrentEntry = NULL;
 //UNUSED2008-05
 //UNUSED2008-05      ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW );
@@ -138,7 +138,7 @@ inline BOOL IsAmbiguousScript( BYTE nScript )
 //UNUSED2008-05                      if (!bListInitialized)
 //UNUSED2008-05                      {
 //UNUSED2008-05                          pCurrentEntry = (ScSymbolStringCellEntry*)rList.First();
-//UNUSED2008-05                          bListInitialized = TRUE;
+//UNUSED2008-05                          bListInitialized = sal_True;
 //UNUSED2008-05                      }
 //UNUSED2008-05
 //UNUSED2008-05                      while ( pCurrentEntry && pCurrentEntry->nRow < nRow )
@@ -187,7 +187,7 @@ inline BOOL IsAmbiguousScript( BYTE nScript )
 long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
                               double nPPTX, double nPPTY,
                               const Fraction& rZoomX, const Fraction& rZoomY,
-                              BOOL bWidth, const ScNeededSizeOptions& rOptions )
+                              sal_Bool bWidth, const ScNeededSizeOptions& rOptions )
 {
     long nValue=0;
     SCSIZE nIndex;
@@ -230,7 +230,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
         const SfxPoolItem* pCondItem;
         SvxCellHorJustify eHorJust;
         if (pCondSet &&
-                pCondSet->GetItemState(ATTR_HOR_JUSTIFY, TRUE, &pCondItem) == SFX_ITEM_SET)
+                pCondSet->GetItemState(ATTR_HOR_JUSTIFY, sal_True, &pCondItem) == SFX_ITEM_SET)
             eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem*)pCondItem)->GetValue();
         else
             eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
@@ -239,7 +239,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
         if ( eHorJust == SVX_HOR_JUSTIFY_BLOCK )
             bBreak = true;
         else if ( pCondSet &&
-                    pCondSet->GetItemState(ATTR_LINEBREAK, TRUE, &pCondItem) == SFX_ITEM_SET)
+                    pCondSet->GetItemState(ATTR_LINEBREAK, sal_True, &pCondItem) == SFX_ITEM_SET)
             bBreak = ((const SfxBoolItem*)pCondItem)->GetValue();
         else
             bBreak = ((const SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue();
@@ -251,7 +251,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
         //	get other attributes from pattern and conditional formatting
 
         SvxCellOrientation eOrient = pPattern->GetCellOrientation( pCondSet );
-        BOOL bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED &&
+        sal_Bool bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED &&
                 ((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN, pCondSet )).GetValue() );
         if ( bAsianVertical )
             bBreak = false;
@@ -264,14 +264,14 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
         if ( eOrient == SVX_ORIENTATION_STANDARD )
         {
             if (pCondSet &&
-                    pCondSet->GetItemState(ATTR_ROTATE_VALUE, TRUE, &pCondItem) == SFX_ITEM_SET)
+                    pCondSet->GetItemState(ATTR_ROTATE_VALUE, sal_True, &pCondItem) == SFX_ITEM_SET)
                 nRotate = ((const SfxInt32Item*)pCondItem)->GetValue();
             else
                 nRotate = ((const SfxInt32Item&)pPattern->GetItem(ATTR_ROTATE_VALUE)).GetValue();
             if ( nRotate )
             {
                 if (pCondSet &&
-                        pCondSet->GetItemState(ATTR_ROTATE_MODE, TRUE, &pCondItem) == SFX_ITEM_SET)
+                        pCondSet->GetItemState(ATTR_ROTATE_MODE, sal_True, &pCondItem) == SFX_ITEM_SET)
                     eRotMode = (SvxRotateMode)((const SvxRotateModeItem*)pCondItem)->GetValue();
                 else
                     eRotMode = (SvxRotateMode)((const SvxRotateModeItem&)
@@ -287,26 +287,26 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
             // ignore orientation/rotation if "repeat" is active
             eOrient = SVX_ORIENTATION_STANDARD;
             nRotate = 0;
-            bAsianVertical = FALSE;
+            bAsianVertical = sal_False;
         }
 
         const SvxMarginItem* pMargin;
         if (pCondSet &&
-                pCondSet->GetItemState(ATTR_MARGIN, TRUE, &pCondItem) == SFX_ITEM_SET)
+                pCondSet->GetItemState(ATTR_MARGIN, sal_True, &pCondItem) == SFX_ITEM_SET)
             pMargin = (const SvxMarginItem*) pCondItem;
         else
             pMargin = (const SvxMarginItem*) &pPattern->GetItem(ATTR_MARGIN);
-        USHORT nIndent = 0;
+        sal_uInt16 nIndent = 0;
         if ( eHorJust == SVX_HOR_JUSTIFY_LEFT )
         {
             if (pCondSet &&
-                    pCondSet->GetItemState(ATTR_INDENT, TRUE, &pCondItem) == SFX_ITEM_SET)
+                    pCondSet->GetItemState(ATTR_INDENT, sal_True, &pCondItem) == SFX_ITEM_SET)
                 nIndent = ((const SfxUInt16Item*)pCondItem)->GetValue();
             else
                 nIndent = ((const SfxUInt16Item&)pPattern->GetItem(ATTR_INDENT)).GetValue();
         }
 
-        BYTE nScript = pDocument->GetScriptType( nCol, nRow, nTab, pCell );
+        sal_uInt8 nScript = pDocument->GetScriptType( nCol, nRow, nTab, pCell );
         if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType();
 
         //	also call SetFont for edit cells, because bGetFont may be set only once
@@ -320,10 +320,10 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
             pDev->SetFont(aFont);
         }
 
-        BOOL bAddMargin = TRUE;
+        sal_Bool bAddMargin = sal_True;
         CellType eCellType = pCell->GetCellType();
 
-        BOOL bEditEngine = ( eCellType == CELLTYPE_EDIT ||
+        sal_Bool bEditEngine = ( eCellType == CELLTYPE_EDIT ||
                                 eOrient == SVX_ORIENTATION_STACKED ||
                                 IsAmbiguousScript( nScript ) ||
                                 ((eCellType == CELLTYPE_FORMULA) && ((ScFormulaCell*)pCell)->IsMultilineResult()) );
@@ -333,10 +333,10 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
             String aValStr;
             Color* pColor;
             SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
-            ULONG nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
+            sal_uLong nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
             ScCellFormat::GetString( pCell, nFormat, aValStr, &pColor,
                                         *pFormatter,
-                                        TRUE, rOptions.bFormula, ftCheck );
+                                        sal_True, rOptions.bFormula, ftCheck );
             if (aValStr.Len())
             {
                 //	SetFont ist nach oben verschoben
@@ -362,7 +362,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
                     else if ( rOptions.bTotalSize )
                     {
                         nWidth = (long) ( pDocument->GetColWidth( nCol,nTab ) * nPPT );
-                        bAddMargin = FALSE;
+                        bAddMargin = sal_False;
                         //	nur nach rechts:
                         //!	unterscheiden nach Ausrichtung oben/unten (nur Text/ganze Hoehe)
                         if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT )
@@ -411,7 +411,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
                                         * nPPT );
                     nDocPixel = (nDocPixel * 9) / 10;			// zur Sicherheit
                     if ( aSize.Width() > nDocPixel )
-                        bEditEngine = TRUE;
+                        bEditEngine = sal_True;
                 }
             }
         }
@@ -426,7 +426,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
             // am Dokument speichern ?
             ScFieldEditEngine* pEngine = pDocument->CreateFieldEditEngine();
 
-            pEngine->SetUpdateMode( FALSE );
+            pEngine->SetUpdateMode( sal_False );
             MapMode aOld = pDev->GetMapMode();
             pDev->SetMapMode( aHMMMode );
             pEngine->SetRefDevice( pDev );
@@ -451,7 +451,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
             else if (bBreak)
             {
                 double fWidthFactor = nPPTX;
-                BOOL bTextWysiwyg = ( pDev->GetOutDevType() == OUTDEV_PRINTER );
+                sal_Bool bTextWysiwyg = ( pDev->GetOutDevType() == OUTDEV_PRINTER );
                 if ( bTextWysiwyg )
                 {
                     //	#95593# if text is formatted for printer, don't use PixelToLogic,
@@ -494,22 +494,22 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
             {
                 Color* pColor;
                 SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
-                ULONG nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
+                sal_uLong nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
                 String aString;
                 ScCellFormat::GetString( pCell, nFormat, aString, &pColor,
                                             *pFormatter,
-                                            TRUE, rOptions.bFormula, ftCheck );
+                                            sal_True, rOptions.bFormula, ftCheck );
                 if (aString.Len())
                     pEngine->SetTextNewDefaults(aString, pSet);
                 else
                     pEngine->SetDefaults(pSet);
             }
 
-            BOOL bEngineVertical = pEngine->IsVertical();
+            sal_Bool bEngineVertical = pEngine->IsVertical();
             pEngine->SetVertical( bAsianVertical );
-            pEngine->SetUpdateMode( TRUE );
+            pEngine->SetUpdateMode( sal_True );
 
-            BOOL bEdWidth = bWidth;
+            sal_Bool bEdWidth = bWidth;
             if ( eOrient != SVX_ORIENTATION_STANDARD && eOrient != SVX_ORIENTATION_STACKED )
                 bEdWidth = !bEdWidth;
             if ( nRotate )
@@ -527,7 +527,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
                 else if ( rOptions.bTotalSize )
                 {
                     nWidth = (long) ( pDocument->GetColWidth( nCol,nTab ) * nPPT );
-                    bAddMargin = FALSE;
+                    bAddMargin = sal_False;
                     if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT )
                         nWidth += (long)( pDocument->GetRowHeight( nRow,nTab ) *
                                             nPPT * nCosAbs / nSinAbs );
@@ -603,7 +603,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
             //		20 * nZoom/100
             //		bedingte Formatierung hier nicht interessant
 
-            INT16 nFlags = ((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue();
+            sal_Int16 nFlags = ((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue();
             if (nFlags & SC_MF_AUTO)
                 nValue += (rZoomX.GetNumerator()*20)/rZoomX.GetDenominator();
         }
@@ -612,7 +612,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
 }
 
 long ScColumn::GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
-        BOOL bWidth )
+        sal_Bool bWidth )
 {
     long nValue=0;
     if ( nIndex < nCount )
@@ -623,9 +623,9 @@ long ScColumn::GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
         String aValStr;
         Color* pColor;
         SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
-        ULONG nFormat = pPattern->GetNumberFormat( pFormatter );
+        sal_uLong nFormat = pPattern->GetNumberFormat( pFormatter );
         ScCellFormat::GetString( pCell, nFormat, aValStr, &pColor,
-                                    *pFormatter, TRUE, FALSE, ftCheck );
+                                    *pFormatter, sal_True, sal_False, ftCheck );
         if ( aValStr.Len() )
         {
             if ( bWidth )
@@ -637,20 +637,20 @@ long ScColumn::GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
     return nValue;
 }
 
-USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
+sal_uInt16 ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
                                         const Fraction& rZoomX, const Fraction& rZoomY,
-                                        BOOL bFormula, USHORT nOldWidth,
+                                        sal_Bool bFormula, sal_uInt16 nOldWidth,
                                         const ScMarkData* pMarkData,
-                                        BOOL bSimpleTextImport )
+                                        sal_Bool bSimpleTextImport )
 {
     if (nCount == 0)
         return nOldWidth;
 
-    USHORT	nWidth = (USHORT) (nOldWidth * nPPTX);
-    BOOL	bFound = FALSE;
+    sal_uInt16	nWidth = (sal_uInt16) (nOldWidth * nPPTX);
+    sal_Bool	bFound = sal_False;
 
     SCSIZE nIndex;
-    ScMarkedDataIter aDataIter(this, pMarkData, TRUE);
+    ScMarkedDataIter aDataIter(this, pMarkData, sal_True);
     if ( bSimpleTextImport )
     {	// alles eins bis auf NumberFormate
         const ScPatternAttr* pPattern = GetPattern( 0 );
@@ -664,14 +664,14 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nP
 
         while (aDataIter.Next( nIndex ))
         {
-            USHORT nThis = (USHORT) (GetSimpleTextNeededSize( nIndex, pDev,
-                TRUE ) + nMargin);
+            sal_uInt16 nThis = (sal_uInt16) (GetSimpleTextNeededSize( nIndex, pDev,
+                sal_True ) + nMargin);
             if (nThis)
             {
                 if (nThis>nWidth || !bFound)
                 {
                     nWidth = nThis;
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
             }
         }
@@ -681,27 +681,27 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nP
         ScNeededSizeOptions aOptions;
         aOptions.bFormula = bFormula;
         const ScPatternAttr* pOldPattern = NULL;
-        BYTE nOldScript = 0;
+        sal_uInt8 nOldScript = 0;
 
         while (aDataIter.Next( nIndex ))
         {
             SCROW nRow = pItems[nIndex].nRow;
 
-            BYTE nScript = pDocument->GetScriptType( nCol, nRow, nTab, pItems[nIndex].pCell );
+            sal_uInt8 nScript = pDocument->GetScriptType( nCol, nRow, nTab, pItems[nIndex].pCell );
             if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType();
 
             const ScPatternAttr* pPattern = GetPattern( nRow );
             aOptions.pPattern = pPattern;
             aOptions.bGetFont = (pPattern != pOldPattern || nScript != nOldScript);
-            USHORT nThis = (USHORT) GetNeededSize( nRow, pDev, nPPTX, nPPTY,
-                rZoomX, rZoomY, TRUE, aOptions );
+            sal_uInt16 nThis = (sal_uInt16) GetNeededSize( nRow, pDev, nPPTX, nPPTY,
+                rZoomX, rZoomY, sal_True, aOptions );
             pOldPattern = pPattern;
             if (nThis)
             {
                 if (nThis>nWidth || !bFound)
                 {
                     nWidth = nThis;
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
             }
         }
@@ -710,16 +710,16 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nP
     if (bFound)
     {
         nWidth += 2;
-        USHORT nTwips = (USHORT) (nWidth / nPPTX);
+        sal_uInt16 nTwips = (sal_uInt16) (nWidth / nPPTX);
         return nTwips;
     }
     else
         return nOldWidth;
 }
 
-USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId )
+sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr& rPattern, sal_uInt16 nFontHeightId )
 {
-    USHORT nHeight = (USHORT) ((const SvxFontHeightItem&) rPattern.GetItem(nFontHeightId)).GetHeight();
+    sal_uInt16 nHeight = (sal_uInt16) ((const SvxFontHeightItem&) rPattern.GetItem(nFontHeightId)).GetHeight();
     const SvxMarginItem* pMargin = (const SvxMarginItem*) &rPattern.GetItem(ATTR_MARGIN);
     nHeight += nHeight / 5;
     //	gibt bei 10pt 240
@@ -734,7 +734,7 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId
 
     if ( nHeight + 240 > ScGlobal::nDefFontHeight )
     {
-        nHeight = sal::static_int_cast<USHORT>( nHeight + ScGlobal::nDefFontHeight );
+        nHeight = sal::static_int_cast<sal_uInt16>( nHeight + ScGlobal::nDefFontHeight );
         nHeight -= 240;
     }
 
@@ -753,11 +753,11 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId
 //	nMinHeight, nMinStart zur Optimierung: ab nRow >= nMinStart ist mindestens nMinHeight
 //	(wird nur bei bStdAllowed ausgewertet)
 
-void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight,
+void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight,
                                 OutputDevice* pDev,
                                 double nPPTX, double nPPTY,
                                 const Fraction& rZoomX, const Fraction& rZoomY,
-                                BOOL bShrink, USHORT nMinHeight, SCROW nMinStart )
+                                sal_Bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart )
 {
     ScAttrIterator aIter( pAttrArray, nStartRow, nEndRow );
 
@@ -782,11 +782,11 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
         else
         {
             SCROW nRow = 0;
-            BOOL bStdAllowed = (pPattern->GetCellOrientation() == SVX_ORIENTATION_STANDARD);
-            BOOL bStdOnly = FALSE;
+            sal_Bool bStdAllowed = (pPattern->GetCellOrientation() == SVX_ORIENTATION_STANDARD);
+            sal_Bool bStdOnly = sal_False;
             if (bStdAllowed)
             {
-                BOOL bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() ||
+                sal_Bool bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() ||
                                 ((SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern->
                                     GetItem( ATTR_HOR_JUSTIFY )).GetValue() ==
                                     SVX_HOR_JUSTIFY_BLOCK);
@@ -795,12 +795,12 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
                 // bedingte Formatierung: Zellen durchgehen
                 if ( bStdOnly && ((const SfxUInt32Item&)pPattern->
                                     GetItem(ATTR_CONDITIONAL)).GetValue() )
-                    bStdOnly = FALSE;
+                    bStdOnly = sal_False;
 
                 // gedrehter Text: Zellen durchgehen
                 if ( bStdOnly && ((const SfxInt32Item&)pPattern->
                                     GetItem(ATTR_ROTATE_VALUE)).GetValue() )
-                    bStdOnly = FALSE;
+                    bStdOnly = sal_False;
             }
 
             if (bStdOnly)
@@ -808,11 +808,11 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
                 {
                     if (nEditPos == nStart)
                     {
-                        bStdOnly = FALSE;
+                        bStdOnly = sal_False;
                         if (nEnd > nEditPos)
                             nNextEnd = nEnd;
                         nEnd = nEditPos;				// einzeln ausrechnen
-                        bStdAllowed = FALSE;			// wird auf jeden Fall per Zelle berechnet
+                        bStdAllowed = sal_False;			// wird auf jeden Fall per Zelle berechnet
                     }
                     else
                     {
@@ -823,11 +823,11 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
 
             if (bStdAllowed)
             {
-                USHORT nLatHeight = 0;
-                USHORT nCjkHeight = 0;
-                USHORT nCtlHeight = 0;
-                USHORT nDefHeight;
-                BYTE nDefScript = ScGlobal::GetDefaultScriptType();
+                sal_uInt16 nLatHeight = 0;
+                sal_uInt16 nCjkHeight = 0;
+                sal_uInt16 nCtlHeight = 0;
+                sal_uInt16 nDefHeight;
+                sal_uInt8 nDefScript = ScGlobal::GetDefaultScriptType();
                 if ( nDefScript == SCRIPTTYPE_ASIAN )
                     nDefHeight = nCjkHeight = lcl_GetAttribHeight( *pPattern, ATTR_CJK_FONT_HEIGHT );
                 else if ( nDefScript == SCRIPTTYPE_COMPLEX )
@@ -854,7 +854,7 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
                     Search(nStart,nIndex);
                     while ( nIndex < nCount && (nRow=pItems[nIndex].nRow) <= nEnd )
                     {
-                        BYTE nScript = pDocument->GetScriptType( nCol, nRow, nTab, pItems[nIndex].pCell );
+                        sal_uInt8 nScript = pDocument->GetScriptType( nCol, nRow, nTab, pItems[nIndex].pCell );
                         if ( nScript != nDefScript )
                         {
                             if ( nScript == SCRIPTTYPE_ASIAN )
@@ -890,16 +890,16 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
 
                 SCSIZE nIndex;
                 Search(nStart,nIndex);
-                while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEnd) : FALSE )
+                while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEnd) : sal_False )
                 {
                     //	Zellhoehe nur berechnen, wenn sie spaeter auch gebraucht wird (#37928#)
 
                     if ( bShrink || !(pDocument->GetRowFlags(nRow, nTab) & CR_MANUALSIZE) )
                     {
                         aOptions.pPattern = pPattern;
-                        USHORT nHeight = (USHORT)
+                        sal_uInt16 nHeight = (sal_uInt16)
                                 ( GetNeededSize( nRow, pDev, nPPTX, nPPTY,
-                                                    rZoomX, rZoomY, FALSE, aOptions ) / nPPTY );
+                                                    rZoomX, rZoomY, sal_False, aOptions ) / nPPTY );
                         if (nHeight > pHeight[nRow-nStartRow])
                             pHeight[nRow-nStartRow] = nHeight;
                     }
@@ -919,9 +919,9 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
     }
 }
 
-BOOL ScColumn::GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const
+sal_Bool ScColumn::GetNextSpellingCell(SCROW& nRow, sal_Bool bInSel, const ScMarkData& rData) const
 {
-    BOOL bStop = FALSE;
+    sal_Bool bStop = sal_False;
     CellType eCellType;
     SCSIZE nIndex;
     if (!bInSel && Search(nRow, nIndex))
@@ -930,17 +930,17 @@ BOOL ScColumn::GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& r
         if ( (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) &&
              !(HasAttrib( nRow, nRow, HASATTR_PROTECTED) &&
                pDocument->IsTabProtected(nTab)) )
-                return TRUE;
+                return sal_True;
     }
     while (!bStop)
     {
         if (bInSel)
         {
-            nRow = rData.GetNextMarked(nCol, nRow, FALSE);
+            nRow = rData.GetNextMarked(nCol, nRow, sal_False);
             if (!ValidRow(nRow))
             {
                 nRow = MAXROW+1;
-                bStop = TRUE;
+                bStop = sal_True;
             }
             else
             {
@@ -948,7 +948,7 @@ BOOL ScColumn::GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& r
                 if ( (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) &&
                      !(HasAttrib( nRow, nRow, HASATTR_PROTECTED) &&
                        pDocument->IsTabProtected(nTab)) )
-                        return TRUE;
+                        return sal_True;
                 else
                     nRow++;
             }
@@ -959,17 +959,17 @@ BOOL ScColumn::GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& r
             if ( (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) &&
                  !(HasAttrib( nRow, nRow, HASATTR_PROTECTED) &&
                    pDocument->IsTabProtected(nTab)) )
-                    return TRUE;
+                    return sal_True;
             else
                 nRow++;
         }
         else
         {
             nRow = MAXROW+1;
-            bStop = TRUE;
+            bStop = sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 // =========================================================================================
@@ -1047,8 +1047,8 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow )
                 pEngine->SetKernAsianPunctuation( pDocument->GetAsianKerning() );
             }
             pEngine->SetText( *pData );
-            USHORT nParCount = pEngine->GetParagraphCount();
-            for (USHORT nPar=0; nPar<nParCount; nPar++)
+            sal_uInt16 nParCount = pEngine->GetParagraphCount();
+            for (sal_uInt16 nPar=0; nPar<nParCount; nPar++)
             {
                 pEngine->QuickRemoveCharAttribs( nPar );
                 const SfxItemSet& rOld = pEngine->GetParaAttribs( nPar );
@@ -1059,16 +1059,16 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow )
                 }
             }
             //	URL-Felder in Text wandeln (andere gibt's nicht, darum pType=0)
-            pEngine->RemoveFields( TRUE );
+            pEngine->RemoveFields( sal_True );
 
-            BOOL bSpellErrors = pEngine->HasOnlineSpellErrors();
-            BOOL bNeedObject = bSpellErrors || nParCount>1;			// Errors/Absaetze behalten
+            sal_Bool bSpellErrors = pEngine->HasOnlineSpellErrors();
+            sal_Bool bNeedObject = bSpellErrors || nParCount>1;			// Errors/Absaetze behalten
             //	ScEditAttrTester nicht mehr noetig, Felder sind raus
 
             if ( bNeedObject )										// bleibt Edit-Zelle
             {
-                ULONG nCtrl = pEngine->GetControlWord();
-                ULONG nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
+                sal_uLong nCtrl = pEngine->GetControlWord();
+                sal_uLong nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
                 if ( ( nCtrl & EE_CNTRL_ALLOWBIGOBJS ) != nWantBig )
                     pEngine->SetControlWord( (nCtrl & ~EE_CNTRL_ALLOWBIGOBJS) | nWantBig );
                 EditTextObject* pNewData = pEngine->CreateTextObject();
@@ -1091,14 +1091,14 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow )
 
 // =========================================================================================
 
-BOOL ScColumn::TestTabRefAbs(SCTAB nTable)
+sal_Bool ScColumn::TestTabRefAbs(SCTAB nTable)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if (pItems)
         for (SCSIZE i = 0; i < nCount; i++)
             if ( pItems[i].pCell->GetCellType() == CELLTYPE_FORMULA )
                 if (((ScFormulaCell*)pItems[i].pCell)->TestTabRefAbs(nTable))
-                    bRet = TRUE;
+                    bRet = sal_True;
     return bRet;
 }
 
@@ -1116,7 +1116,7 @@ ScColumnIterator::~ScColumnIterator()
 {
 }
 
-BOOL ScColumnIterator::Next( SCROW& rRow, ScBaseCell*& rpCell )
+sal_Bool ScColumnIterator::Next( SCROW& rRow, ScBaseCell*& rpCell )
 {
     if ( nPos < pColumn->nCount )
     {
@@ -1125,13 +1125,13 @@ BOOL ScColumnIterator::Next( SCROW& rRow, ScBaseCell*& rpCell )
         {
             rpCell = pColumn->pItems[nPos].pCell;
             ++nPos;
-            return TRUE;
+            return sal_True;
         }
     }
 
     rRow = 0;
     rpCell = NULL;
-    return FALSE;
+    return sal_False;
 }
 
 SCSIZE ScColumnIterator::GetIndex() const			// Index zur letzen abgefragten Zelle
@@ -1142,10 +1142,10 @@ SCSIZE ScColumnIterator::GetIndex() const			// Index zur letzen abgefragten Zell
 // -----------------------------------------------------------------------------------------
 
 ScMarkedDataIter::ScMarkedDataIter( const ScColumn* pCol, const ScMarkData* pMarkData,
-                                    BOOL bAllIfNone ) :
+                                    sal_Bool bAllIfNone ) :
     pColumn( pCol ),
     pMarkIter( NULL ),
-    bNext( TRUE ),
+    bNext( sal_True ),
     bAll( bAllIfNone )
 {
     if (pMarkData && pMarkData->IsMultiMarked())
@@ -1157,9 +1157,9 @@ ScMarkedDataIter::~ScMarkedDataIter()
     delete pMarkIter;
 }
 
-BOOL ScMarkedDataIter::Next( SCSIZE& rIndex )
+sal_Bool ScMarkedDataIter::Next( SCSIZE& rIndex )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     do
     {
         if (bNext)
@@ -1172,28 +1172,28 @@ BOOL ScMarkedDataIter::Next( SCSIZE& rIndex )
                     nBottom	= MAXROW;
                 }
                 else
-                    return FALSE;
+                    return sal_False;
             }
             pColumn->Search( nTop, nPos );
-            bNext = FALSE;
-            bAll  = FALSE;					// nur beim ersten Versuch
+            bNext = sal_False;
+            bAll  = sal_False;					// nur beim ersten Versuch
         }
 
         if ( nPos >= pColumn->nCount )
-            return FALSE;
+            return sal_False;
 
         if ( pColumn->pItems[nPos].nRow <= nBottom )
-            bFound = TRUE;
+            bFound = sal_True;
         else
-            bNext = TRUE;
+            bNext = sal_True;
     }
     while (!bFound);
 
     rIndex = nPos++;
-    return TRUE;
+    return sal_True;
 }
 
-//UNUSED2009-05 USHORT ScColumn::GetErrorData( SCROW nRow ) const
+//UNUSED2009-05 sal_uInt16 ScColumn::GetErrorData( SCROW nRow ) const
 //UNUSED2009-05 {
 //UNUSED2009-05     SCSIZE  nIndex;
 //UNUSED2009-05     if (Search(nRow, nIndex))
@@ -1213,24 +1213,24 @@ BOOL ScMarkedDataIter::Next( SCSIZE& rIndex )
 
 //------------
 
-BOOL ScColumn::IsEmptyData() const
+sal_Bool ScColumn::IsEmptyData() const
 {
     return (nCount == 0);
 }
 
-BOOL ScColumn::IsEmptyVisData(BOOL bNotes) const
+sal_Bool ScColumn::IsEmptyVisData(sal_Bool bNotes) const
 {
     if (!pItems || nCount == 0)
-        return TRUE;
+        return sal_True;
     else
     {
-        BOOL bVisData = FALSE;
+        sal_Bool bVisData = sal_False;
         SCSIZE i;
         for (i=0; i<nCount && !bVisData; i++)
         {
             ScBaseCell* pCell = pItems[i].pCell;
             if ( pCell->GetCellType() != CELLTYPE_NOTE || (bNotes && pCell->HasNote()) )
-                bVisData = TRUE;
+                bVisData = sal_True;
         }
         return !bVisData;
     }
@@ -1255,20 +1255,20 @@ SCSIZE ScColumn::VisibleCount( SCROW nStartRow, SCROW nEndRow ) const
     return nVisCount;
 }
 
-SCROW ScColumn::GetLastVisDataPos(BOOL bNotes) const
+SCROW ScColumn::GetLastVisDataPos(sal_Bool bNotes) const
 {
     SCROW nRet = 0;
     if (pItems)
     {
         SCSIZE i;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         for (i=nCount; i>0 && !bFound; )
         {
             --i;
             ScBaseCell* pCell = pItems[i].pCell;
             if ( pCell->GetCellType() != CELLTYPE_NOTE || (bNotes && pCell->HasNote()) )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 nRet = pItems[i].nRow;
             }
         }
@@ -1276,19 +1276,19 @@ SCROW ScColumn::GetLastVisDataPos(BOOL bNotes) const
     return nRet;
 }
 
-SCROW ScColumn::GetFirstVisDataPos(BOOL bNotes) const
+SCROW ScColumn::GetFirstVisDataPos(sal_Bool bNotes) const
 {
     SCROW nRet = 0;
     if (pItems)
     {
         SCSIZE i;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         for (i=0; i<nCount && !bFound; i++)
         {
             ScBaseCell* pCell = pItems[i].pCell;
             if ( pCell->GetCellType() != CELLTYPE_NOTE || (bNotes && pCell->HasNote()) )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 nRet = pItems[i].nRow;
             }
         }
@@ -1296,49 +1296,49 @@ SCROW ScColumn::GetFirstVisDataPos(BOOL bNotes) const
     return nRet;
 }
 
-BOOL ScColumn::HasVisibleDataAt(SCROW nRow) const
+sal_Bool ScColumn::HasVisibleDataAt(SCROW nRow) const
 {
     SCSIZE nIndex;
     if (Search(nRow, nIndex))
         if (!pItems[nIndex].pCell->IsBlank())
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScColumn::IsEmptyAttr() const
+sal_Bool ScColumn::IsEmptyAttr() const
 {
     if (pAttrArray)
         return pAttrArray->IsEmpty();
     else
-        return TRUE;
+        return sal_True;
 }
 
-BOOL ScColumn::IsEmpty() const
+sal_Bool ScColumn::IsEmpty() const
 {
     return (IsEmptyData() && IsEmptyAttr());
 }
 
-BOOL ScColumn::IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes) const
+sal_Bool ScColumn::IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes) const
 {
     if ( nCount == 0 || !pItems )
-        return TRUE;
+        return sal_True;
 
     SCSIZE nIndex;
     Search( nStartRow, nIndex );
     while ( nIndex < nCount && pItems[nIndex].nRow <= nEndRow )
     {
         if ( !pItems[nIndex].pCell->IsBlank( bIgnoreNotes ) )   // found a cell
-            return FALSE;							// not empty
+            return sal_False;							// not empty
         ++nIndex;
     }
-    return TRUE;									// no cell found
+    return sal_True;									// no cell found
 }
 
 SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const
 {
     SCSIZE nLines = 0;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCSIZE i;
     if (pItems && (nCount > 0))
     {
@@ -1394,9 +1394,9 @@ SCROW ScColumn::GetLastDataPos() const
         return 0;
 }
 
-BOOL ScColumn::GetPrevDataPos(SCROW& rRow) const
+sal_Bool ScColumn::GetPrevDataPos(SCROW& rRow) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCSIZE i = nCount;
     while (!bFound && (i > 0))
     {
@@ -1408,13 +1408,13 @@ BOOL ScColumn::GetPrevDataPos(SCROW& rRow) const
     return bFound;
 }
 
-BOOL ScColumn::GetNextDataPos(SCROW& rRow) const		// greater than rRow
+sal_Bool ScColumn::GetNextDataPos(SCROW& rRow) const		// greater than rRow
 {
     SCSIZE nIndex;
     if (Search( rRow, nIndex ))
         ++nIndex;					// next cell
 
-    BOOL bMore = ( nIndex < nCount );
+    sal_Bool bMore = ( nIndex < nCount );
     if ( bMore )
         rRow = pItems[nIndex].nRow;
     return bMore;
@@ -1423,12 +1423,12 @@ BOOL ScColumn::GetNextDataPos(SCROW& rRow) const		// greater than rRow
 void ScColumn::FindDataAreaPos(SCROW& rRow, long nMovY) const
 {
     if (!nMovY) return;
-    BOOL bForward = (nMovY>0);
+    sal_Bool bForward = (nMovY>0);
 
     SCSIZE nIndex;
-    BOOL bThere = Search(rRow, nIndex);
+    sal_Bool bThere = Search(rRow, nIndex);
     if (bThere && pItems[nIndex].pCell->IsBlank())
-        bThere = FALSE;
+        bThere = sal_False;
 
     if (bThere)
     {
@@ -1468,7 +1468,7 @@ void ScColumn::FindDataAreaPos(SCROW& rRow, long nMovY) const
         }
         if (nLast==rRow)
         {
-            bThere = FALSE;
+            bThere = sal_False;
             nIndex = bForward ? nOldIndex+1 : nOldIndex;
         }
         else
@@ -1498,7 +1498,7 @@ void ScColumn::FindDataAreaPos(SCROW& rRow, long nMovY) const
     }
 }
 
-BOOL ScColumn::HasDataAt(SCROW nRow) const
+sal_Bool ScColumn::HasDataAt(SCROW nRow) const
 {
 /*	SCSIZE nIndex;
     return Search( nRow, nIndex );
@@ -1509,13 +1509,13 @@ BOOL ScColumn::HasDataAt(SCROW nRow) const
     SCSIZE nIndex;
     if (Search(nRow, nIndex))
         if (!pItems[nIndex].pCell->IsBlank())
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 
 }
 
-BOOL ScColumn::IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScColumn::IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const
 {
     if (pAttrArray && rCol.pAttrArray)
         return pAttrArray->IsAllEqual( *rCol.pAttrArray, nStartRow, nEndRow );
@@ -1523,7 +1523,7 @@ BOOL ScColumn::IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEnd
         return !pAttrArray && !rCol.pAttrArray;
 }
 
-BOOL ScColumn::IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScColumn::IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const
 {
     if (pAttrArray && rCol.pAttrArray)
         return pAttrArray->IsVisibleEqual( *rCol.pAttrArray, nStartRow, nEndRow );
@@ -1531,43 +1531,43 @@ BOOL ScColumn::IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW
         return !pAttrArray && !rCol.pAttrArray;
 }
 
-BOOL ScColumn::GetFirstVisibleAttr( SCROW& rFirstRow ) const
+sal_Bool ScColumn::GetFirstVisibleAttr( SCROW& rFirstRow ) const
 {
     if (pAttrArray)
         return pAttrArray->GetFirstVisibleAttr( rFirstRow );
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScColumn::GetLastVisibleAttr( SCROW& rLastRow ) const
+sal_Bool ScColumn::GetLastVisibleAttr( SCROW& rLastRow ) const
 {
     if (pAttrArray)
     {
         // row of last cell is needed
-        SCROW nLastData = GetLastVisDataPos( TRUE );    // always including notes, 0 if none
+        SCROW nLastData = GetLastVisDataPos( sal_True );    // always including notes, 0 if none
 
         return pAttrArray->GetLastVisibleAttr( rLastRow, nLastData );
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScColumn::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScColumn::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
 {
     if (pAttrArray)
         return pAttrArray->HasVisibleAttrIn( nStartRow, nEndRow );
     else
-        return FALSE;
+        return sal_False;
 }
 
-void ScColumn::FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const
+void ScColumn::FindUsed( SCROW nStartRow, SCROW nEndRow, sal_Bool* pUsed ) const
 {
     SCROW nRow = 0;
     SCSIZE nIndex;
     Search( nStartRow, nIndex );
-    while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : FALSE )
+    while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : sal_False )
     {
-        pUsed[nRow-nStartRow] = TRUE;
+        pUsed[nRow-nStartRow] = sal_True;
         ++nIndex;
     }
 }
@@ -1668,7 +1668,7 @@ void ScColumn::CompileDBFormula()
         }
 }
 
-void ScColumn::CompileDBFormula( BOOL bCreateFormulaString )
+void ScColumn::CompileDBFormula( sal_Bool bCreateFormulaString )
 {
     if (pItems)
         for (SCSIZE i = 0; i < nCount; i++)
@@ -1679,7 +1679,7 @@ void ScColumn::CompileDBFormula( BOOL bCreateFormulaString )
         }
 }
 
-void ScColumn::CompileNameFormula( BOOL bCreateFormulaString )
+void ScColumn::CompileNameFormula( sal_Bool bCreateFormulaString )
 {
     if (pItems)
         for (SCSIZE i = 0; i < nCount; i++)
@@ -1704,13 +1704,13 @@ void ScColumn::CompileColRowNameFormula()
 void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
 {
     double nValue = 0.0;
-    BOOL bVal = FALSE;
-    BOOL bCell = TRUE;
+    sal_Bool bVal = sal_False;
+    sal_Bool bCell = sal_True;
     switch (pCell->GetCellType())
     {
         case CELLTYPE_VALUE:
             nValue = ((ScValueCell*)pCell)->GetValue();
-            bVal = TRUE;
+            bVal = sal_True;
             break;
         case CELLTYPE_FORMULA:
             {
@@ -1720,19 +1720,19 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
                     if ( pFC->GetErrCode() )
                     {
                         if ( rData.eFunc != SUBTOTAL_FUNC_CNT )	// fuer Anzahl einfach weglassen
-                            rData.bError = TRUE;
+                            rData.bError = sal_True;
                     }
                     else if (pFC->IsValue())
                     {
                         nValue = pFC->GetValue();
-                        bVal = TRUE;
+                        bVal = sal_True;
                     }
                     // sonst Text
                 }
             }
             break;
         case CELLTYPE_NOTE:
-            bCell = FALSE;
+            bCell = sal_False;
             break;
         // bei Strings nichts
         default:
@@ -1751,7 +1751,7 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
                 {
                     ++rData.nCount;
                     if (!SubTotal::SafePlus( rData.nVal, nValue ))
-                        rData.bError = TRUE;
+                        rData.bError = sal_True;
                 }
                 break;
             case SUBTOTAL_FUNC_CNT:				// nur Werte
@@ -1784,10 +1784,10 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
 void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark,
                                         ScFunctionData& rData,
                                         ScFlatBoolRowSegments& rHiddenRows,
-                                        BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow )
+                                        sal_Bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow )
 {
     SCSIZE nIndex;
-    ScMarkedDataIter aDataIter(this, &rMark, FALSE);
+    ScMarkedDataIter aDataIter(this, &rMark, sal_False);
     while (aDataIter.Next( nIndex ))
     {
         SCROW nRow = pItems[nIndex].nRow;
@@ -1815,9 +1815,9 @@ void ScColumn::UpdateAreaFunction( ScFunctionData& rData,
     }
 }
 
-ULONG ScColumn::GetWeightedCount() const
+sal_uLong ScColumn::GetWeightedCount() const
 {
-    ULONG nTotal = 0;
+    sal_uLong nTotal = 0;
 
     //	Notizen werden nicht gezaehlt
 
@@ -1846,9 +1846,9 @@ ULONG ScColumn::GetWeightedCount() const
     return nTotal;
 }
 
-ULONG ScColumn::GetCodeCount() const
+sal_uLong ScColumn::GetCodeCount() const
 {
-    ULONG nCodeCount = 0;
+    sal_uLong nCodeCount = 0;
 
     for (SCSIZE i=0; i<nCount; i++)
     {
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e93fd9f37..6de88ce32 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -64,18 +64,18 @@ extern const ScFormulaCell* pLastFormulaTreeTop;	// in cellform.cxx
 using namespace formula;
 // STATIC DATA -----------------------------------------------------------
 
-BOOL ScColumn::bDoubleAlloc = FALSE;	// fuer Import: Groesse beim Allozieren verdoppeln
+sal_Bool ScColumn::bDoubleAlloc = sal_False;	// fuer Import: Groesse beim Allozieren verdoppeln
 
 
 void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
 {
-    BOOL bIsAppended = FALSE;
+    sal_Bool bIsAppended = sal_False;
     if (pItems && nCount>0)
     {
         if (pItems[nCount-1].nRow < nRow)
         {
             Append(nRow, pNewCell );
-            bIsAppended = TRUE;
+            bIsAppended = sal_True;
         }
     }
     if ( !bIsAppended )
@@ -156,16 +156,16 @@ void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
 }
 
 
-void ScColumn::Insert( SCROW nRow, ULONG nNumberFormat, ScBaseCell* pCell )
+void ScColumn::Insert( SCROW nRow, sal_uLong nNumberFormat, ScBaseCell* pCell )
 {
     Insert(nRow, pCell);
     short eOldType = pDocument->GetFormatTable()->
-                        GetType( (ULONG)
+                        GetType( (sal_uLong)
                             ((SfxUInt32Item*)GetAttr( nRow, ATTR_VALUE_FORMAT ))->
                                 GetValue() );
     short eNewType = pDocument->GetFormatTable()->GetType(nNumberFormat);
     if (!pDocument->GetFormatTable()->IsCompatible(eOldType, eNewType))
-        ApplyAttr( nRow, SfxUInt32Item( ATTR_VALUE_FORMAT, (UINT32) nNumberFormat) );
+        ApplyAttr( nRow, SfxUInt32Item( ATTR_VALUE_FORMAT, (sal_uInt32) nNumberFormat) );
 }
 
 
@@ -274,10 +274,10 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
     if ( nFirstIndex >= nCount )
         return ;
 
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
 
-    BOOL bFound=FALSE;
+    sal_Bool bFound=sal_False;
     SCROW nEndRow = nStartRow + nSize - 1;
     SCSIZE nStartIndex = 0;
     SCSIZE nEndIndex = 0;
@@ -288,7 +288,7 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
         if (!bFound)
         {
             nStartIndex = i;
-            bFound = TRUE;
+            bFound = sal_True;
         }
         nEndIndex = i;
 
@@ -319,7 +319,7 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
     ScHint aHint( SC_HINT_DATACHANGED, aAdr, NULL );    // only areas (ScBaseCell* == NULL)
     ScAddress& rAddress = aHint.GetAddress();
     // for sparse occupation use single broadcasts, not ranges
-    BOOL bSingleBroadcasts = (((pItems[nCount-1].nRow - pItems[i].nRow) /
+    sal_Bool bSingleBroadcasts = (((pItems[nCount-1].nRow - pItems[i].nRow) /
                 (nCount - i)) > 1);
     if ( bSingleBroadcasts )
     {
@@ -362,7 +362,7 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
 }
 
 
-void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFlag )
+void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDelFlag )
 {
     /*  If caller specifies to not remove the note caption objects, all cells
         have to forget the pointers to them. This is used e.g. while undoing a
@@ -431,13 +431,13 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFla
             {
                 case CELLTYPE_VALUE:
                 {
-                    USHORT nValFlags = nDelFlag & (IDF_DATETIME|IDF_VALUE);
+                    sal_uInt16 nValFlags = nDelFlag & (IDF_DATETIME|IDF_VALUE);
                     // delete values and dates?
                     bDelete = nValFlags == (IDF_DATETIME|IDF_VALUE);
                     // if not, decide according to cell number format
                     if( !bDelete && (nValFlags != 0) )
                     {
-                        ULONG nIndex = (ULONG)((SfxUInt32Item*)GetAttr( pItems[j].nRow, ATTR_VALUE_FORMAT ))->GetValue();
+                        sal_uLong nIndex = (sal_uLong)((SfxUInt32Item*)GetAttr( pItems[j].nRow, ATTR_VALUE_FORMAT ))->GetValue();
                         short nType = pDocument->GetFormatTable()->GetType(nIndex);
                         bool bIsDate = (nType == NUMBERFORMAT_DATE) || (nType == NUMBERFORMAT_TIME) || (nType == NUMBERFORMAT_DATETIME);
                         bDelete = nValFlags == (bIsDate ? IDF_DATETIME : IDF_VALUE);
@@ -547,18 +547,18 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFla
 }
 
 
-void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag)
+void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag)
 {
     //	FreeAll darf hier nicht gerufen werden wegen Broadcastern
 
     //	Attribute erst am Ende, damit vorher noch zwischen Zahlen und Datum
     //	unterschieden werden kann (#47901#)
 
-    USHORT nContMask = IDF_CONTENTS;
+    sal_uInt16 nContMask = IDF_CONTENTS;
     //  IDF_NOCAPTIONS needs to be passed too, if IDF_NOTE is set
     if( nDelFlag & IDF_NOTE )
         nContMask |= IDF_NOCAPTIONS;
-    USHORT nContFlag = nDelFlag & nContMask;
+    sal_uInt16 nContFlag = nDelFlag & nContMask;
 
     if (pItems && nCount>0 && nContFlag)
     {
@@ -566,7 +566,7 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag)
             DeleteRange( 0, nCount-1, nContFlag );
         else
         {
-            BOOL bFound=FALSE;
+            sal_Bool bFound=sal_False;
             SCSIZE nStartIndex = 0;
             SCSIZE nEndIndex = 0;
             for (SCSIZE i = 0; i < nCount; i++)
@@ -575,7 +575,7 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag)
                     if (!bFound)
                     {
                         nStartIndex = i;
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
                     nEndIndex = i;
                 }
@@ -597,29 +597,29 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag)
 
 
 ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos,
-                                            SCSIZE nIndex, USHORT nFlags ) const
+                                            SCSIZE nIndex, sal_uInt16 nFlags ) const
 {
-    USHORT nContFlags = nFlags & IDF_CONTENTS;
+    sal_uInt16 nContFlags = nFlags & IDF_CONTENTS;
     if (!nContFlags)
         return NULL;
 
     //	Testen, ob Zelle kopiert werden soll
     //	auch bei IDF_CONTENTS komplett, wegen Notes / Broadcastern
 
-    BOOL bMatch = FALSE;
+    sal_Bool bMatch = sal_False;
     ScBaseCell* pCell = pItems[nIndex].pCell;
     CellType eCellType = pCell->GetCellType();
     switch ( eCellType )
     {
         case CELLTYPE_VALUE:
             {
-                USHORT nValFlags = nFlags & (IDF_DATETIME|IDF_VALUE);
+                sal_uInt16 nValFlags = nFlags & (IDF_DATETIME|IDF_VALUE);
 
                 if ( nValFlags == (IDF_DATETIME|IDF_VALUE) )
-                    bMatch = TRUE;
+                    bMatch = sal_True;
                 else if ( nValFlags )
                 {
-                    ULONG nNumIndex = (ULONG)((SfxUInt32Item*)GetAttr(
+                    sal_uLong nNumIndex = (sal_uLong)((SfxUInt32Item*)GetAttr(
                                     pItems[nIndex].nRow, ATTR_VALUE_FORMAT ))->GetValue();
                     short nTyp = pDocument->GetFormatTable()->GetType(nNumIndex);
                     if ((nTyp == NUMBERFORMAT_DATE) || (nTyp == NUMBERFORMAT_TIME) || (nTyp == NUMBERFORMAT_DATETIME))
@@ -647,9 +647,9 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r
     aRef.nRow = pItems[nIndex].nRow;
     aRef.nTab = nTab;
     aRef.InitFlags();							// -> alles absolut
-    aRef.SetFlag3D(TRUE);
+    aRef.SetFlag3D(sal_True);
 
-    //!	3D(FALSE) und TabRel(TRUE), wenn die endgueltige Position auf der selben Tabelle ist?
+    //!	3D(sal_False) und TabRel(sal_True), wenn die endgueltige Position auf der selben Tabelle ist?
     //!	(bei TransposeClip ist die Zielposition noch nicht bekannt)
 
     aRef.CalcRelFromAbs( rDestPos );
@@ -665,7 +665,7 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r
 //	nRow1, nRow2 = Zielposition
 
 void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
-                                USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty,
+                                sal_uInt16 nInsFlag, sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty,
                                 ScColumn& rColumn)
 {
     if ((nInsFlag & IDF_ATTRIB) != 0)
@@ -723,7 +723,7 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
         //	nRow wird angepasst
         aRef.nTab = rColumn.nTab;
         aRef.InitFlags();							// -> alles absolut
-        aRef.SetFlag3D(TRUE);
+        aRef.SetFlag3D(sal_True);
 
         for (SCROW nDestRow = nRow1; nDestRow <= nRow2; nDestRow++)
         {
@@ -755,12 +755,12 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
     // IDF_ADDNOTES must be passed without other content flags than IDF_NOTE
     bool bAddNotes = (nInsFlag & (IDF_CONTENTS | IDF_ADDNOTES)) == (IDF_NOTE | IDF_ADDNOTES);
 
-    BOOL bAtEnd = FALSE;
+    sal_Bool bAtEnd = sal_False;
     for (SCSIZE i = 0; i < nColCount && !bAtEnd; i++)
     {
         SCsROW nDestRow = rColumn.pItems[i].nRow + nDy;
         if ( nDestRow > (SCsROW) nRow2 )
-            bAtEnd = TRUE;
+            bAtEnd = sal_True;
         else if ( nDestRow >= (SCsROW) nRow1 )
         {
             //	rows at the beginning may be skipped if filtered rows are left out,
@@ -814,7 +814,7 @@ bool lclCanCloneValue( ScDocument& rDoc, const ScColumn& rCol, SCROW nRow, bool
         return bCloneValue;
 
     // check number format of value cell
-    ULONG nNumIndex = (ULONG)((SfxUInt32Item*)rCol.GetAttr( nRow, ATTR_VALUE_FORMAT ))->GetValue();
+    sal_uLong nNumIndex = (sal_uLong)((SfxUInt32Item*)rCol.GetAttr( nRow, ATTR_VALUE_FORMAT ))->GetValue();
     short nTyp = rDoc.GetFormatTable()->GetType( nNumIndex );
     bool bIsDateTime = (nTyp == NUMBERFORMAT_DATE) || (nTyp == NUMBERFORMAT_TIME) || (nTyp == NUMBERFORMAT_DATETIME);
     return bIsDateTime ? bCloneDateTime : bCloneValue;
@@ -823,7 +823,7 @@ bool lclCanCloneValue( ScDocument& rDoc, const ScColumn& rCol, SCROW nRow, bool
 } // namespace
 
 
-ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos)
+ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rDestDoc, const ScAddress& rDestPos)
 {
     bool bCloneValue    = (nFlags & IDF_VALUE) != 0;
     bool bCloneDateTime = (nFlags & IDF_DATETIME) != 0;
@@ -863,7 +863,7 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestD
                 //  #48491# ins Undo-Dokument immer nur die Original-Zelle kopieren,
                 //  aus Formeln keine Value/String-Zellen erzeugen
                 ScFormulaCell& rForm = (ScFormulaCell&)rSource;
-                USHORT nErr = rForm.GetErrCode();
+                sal_uInt16 nErr = rForm.GetErrCode();
                 if ( nErr )
                 {
                     // error codes are cloned with values
@@ -925,8 +925,8 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestD
 }
 
 
-void ScColumn::MixMarked( const ScMarkData& rMark, USHORT nFunction,
-                            BOOL bSkipEmpty, ScColumn& rSrcCol )
+void ScColumn::MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
+                            sal_Bool bSkipEmpty, ScColumn& rSrcCol )
 {
     SCROW nRow1, nRow2;
 
@@ -941,9 +941,9 @@ void ScColumn::MixMarked( const ScMarkData& rMark, USHORT nFunction,
 
 //	Ergebnis in rVal1
 
-BOOL lcl_DoFunction( double& rVal1, double nVal2, USHORT nFunction )
+sal_Bool lcl_DoFunction( double& rVal1, double nVal2, sal_uInt16 nFunction )
 {
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     switch (nFunction)
     {
         case PASTE_ADD:
@@ -984,7 +984,7 @@ void lcl_AddCode( ScTokenArray& rArr, ScFormulaCell* pCell )
 
 
 void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
-                            USHORT nFunction, BOOL bSkipEmpty,
+                            sal_uInt16 nFunction, sal_Bool bSkipEmpty,
                             ScColumn& rSrcCol )
 {
     SCSIZE nSrcCount = rSrcCol.nCount;
@@ -1010,7 +1010,7 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
         ScBaseCell* pSrc = NULL;
         ScBaseCell* pDest = NULL;
         ScBaseCell* pNew = NULL;
-        BOOL bDelete = FALSE;
+        sal_Bool bDelete = sal_False;
 
         if ( nSrcIndex < nSrcCount && nNextSrc == nRow )
             pSrc = rSrcCol.pItems[nSrcIndex].pCell;
@@ -1023,8 +1023,8 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
         CellType eSrcType  = pSrc  ? pSrc->GetCellType()  : CELLTYPE_NONE;
         CellType eDestType = pDest ? pDest->GetCellType() : CELLTYPE_NONE;
 
-        BOOL bSrcEmpty = ( eSrcType == CELLTYPE_NONE || eSrcType == CELLTYPE_NOTE );
-        BOOL bDestEmpty = ( eDestType == CELLTYPE_NONE || eDestType == CELLTYPE_NOTE );
+        sal_Bool bSrcEmpty = ( eSrcType == CELLTYPE_NONE || eSrcType == CELLTYPE_NOTE );
+        sal_Bool bDestEmpty = ( eDestType == CELLTYPE_NONE || eDestType == CELLTYPE_NOTE );
 
         if ( bSkipEmpty && bDestEmpty )		// Originalzelle wiederherstellen
         {
@@ -1048,12 +1048,12 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
 
             //	leere Zellen werden als Werte behandelt
 
-            BOOL bSrcVal  = ( bSrcEmpty || eSrcType == CELLTYPE_VALUE );
-            BOOL bDestVal  = ( bDestEmpty || eDestType == CELLTYPE_VALUE );
+            sal_Bool bSrcVal  = ( bSrcEmpty || eSrcType == CELLTYPE_VALUE );
+            sal_Bool bDestVal  = ( bDestEmpty || eDestType == CELLTYPE_VALUE );
 
-            BOOL bSrcText = ( eSrcType == CELLTYPE_STRING ||
+            sal_Bool bSrcText = ( eSrcType == CELLTYPE_STRING ||
                                 eSrcType == CELLTYPE_EDIT );
-            BOOL bDestText = ( eDestType == CELLTYPE_STRING ||
+            sal_Bool bDestText = ( eDestType == CELLTYPE_STRING ||
                                 eDestType == CELLTYPE_EDIT );
 
             //	sonst bleibt nur Formel...
@@ -1066,7 +1066,7 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
             {
                 //	neuen Wert eintragen, oder Fehler bei Ueberlauf
 
-                BOOL bOk = lcl_DoFunction( nVal1, nVal2, nFunction );
+                sal_Bool bOk = lcl_DoFunction( nVal1, nVal2, nFunction );
 
                 if (bOk)
                     pNew = new ScValueCell( nVal1 );
@@ -1088,7 +1088,7 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2,
                 if (pSrc)
                     pNew = pSrc->CloneWithoutNote( *pDocument );
                 else if (pDest)
-                    bDelete = TRUE;
+                    bDelete = sal_True;
             }
             else
             {
@@ -1246,16 +1246,16 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 )
 }
 
 
-//	TRUE = Zahlformat gesetzt
-BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+//	sal_True = Zahlformat gesetzt
+sal_Bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                           formula::FormulaGrammar::AddressConvention eConv,
                           SvNumberFormatter* pLangFormatter, bool bDetectNumberFormat )
 {
-    BOOL bNumFmtSet = FALSE;
+    sal_Bool bNumFmtSet = sal_False;
     if (VALIDROW(nRow))
     {
         ScBaseCell* pNewCell = NULL;
-        BOOL bIsLoading = FALSE;
+        sal_Bool bIsLoading = sal_False;
         if (rString.Len() > 0)
         {
             double nVal;
@@ -1298,7 +1298,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                 pNewCell = new ScStringCell( rString.Copy(1) );
             else
             {
-                BOOL bIsText = FALSE;
+                sal_Bool bIsText = sal_False;
                 if ( bIsLoading )
                 {
                     if ( pItems && nCount )
@@ -1317,7 +1317,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                                 case CELLTYPE_STRING :
                                     ((ScStringCell*)pCell)->GetString( aStr );
                                     if ( rString == aStr )
-                                        bIsText = TRUE;
+                                        bIsText = sal_True;
                                 break;
                                 case CELLTYPE_NOTE :	// durch =Formel referenziert
                                 break;
@@ -1364,7 +1364,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                             // the old one was the default number, date, time or boolean format.
                             // Exception: If the new format is boolean, always apply it.
 
-                            BOOL bOverwrite = FALSE;
+                            sal_Bool bOverwrite = sal_False;
                             const SvNumberformat* pOldFormat = pFormatter->GetEntry( nOldIndex );
                             if ( pOldFormat )
                             {
@@ -1375,20 +1375,20 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
                                     if ( nOldIndex == pFormatter->GetStandardFormat(
                                                         nOldType, pOldFormat->GetLanguage() ) )
                                     {
-                                        bOverwrite = TRUE;      // default of these types can be overwritten
+                                        bOverwrite = sal_True;      // default of these types can be overwritten
                                     }
                                 }
                             }
                             if ( !bOverwrite && pFormatter->GetType( nIndex ) == NUMBERFORMAT_LOGICAL )
                             {
-                                bOverwrite = TRUE;              // overwrite anything if boolean was detected
+                                bOverwrite = sal_True;              // overwrite anything if boolean was detected
                             }
 
                             if ( bOverwrite )
                             {
                                 ApplyAttr( nRow, SfxUInt32Item( ATTR_VALUE_FORMAT,
-                                    (UINT32) nIndex) );
-                                bNumFmtSet = TRUE;
+                                    (sal_uInt32) nIndex) );
+                                bNumFmtSet = sal_True;
                             }
                         }
                     }
@@ -1495,11 +1495,11 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
 
     Search( nStartRow, nIndex );
 
-    while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : FALSE )
+    while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : sal_False )
     {
         ScBaseCell*			 pCell	  = pItems[nIndex].pCell;
         TypedStrData*		 pData;
-        ULONG				 nFormat  = GetNumberFormat( nRow );
+        sal_uLong				 nFormat  = GetNumberFormat( nRow );
 
         ScCellFormat::GetInputString( pCell, nFormat, aString, *pFormatter );
 
@@ -1567,13 +1567,13 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec
 #define DATENT_SEARCH	2000
 
 
-BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, BOOL bLimit)
+sal_Bool ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, sal_Bool bLimit)
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCSIZE nThisIndex;
-    BOOL bThisUsed = Search( nStartRow, nThisIndex );
+    sal_Bool bThisUsed = Search( nStartRow, nThisIndex );
     String aString;
-    USHORT nCells = 0;
+    sal_uInt16 nCells = 0;
 
     //	Die Beschraenkung auf angrenzende Zellen (ohne Luecken) ist nicht mehr gewollt
     //	(Featurekommission zur 5.1), stattdessen abwechselnd nach oben und unten suchen,
@@ -1603,7 +1603,7 @@ BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, B
                     delete pData;											// doppelt
                 else if ( bLimit && rStrings.GetCount() >= DATENT_MAX )
                     break;													// Maximum erreicht
-                bFound = TRUE;
+                bFound = sal_True;
 
                 if ( bLimit )
                     if (++nCells >= DATENT_SEARCH)
@@ -1628,7 +1628,7 @@ BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, B
                     delete pData;											// doppelt
                 else if ( bLimit && rStrings.GetCount() >= DATENT_MAX )
                     break;													// Maximum erreicht
-                bFound = TRUE;
+                bFound = sal_True;
 
                 if ( bLimit )
                     if (++nCells >= DATENT_SEARCH)
@@ -1687,7 +1687,7 @@ void ScColumn::RemoveProtected( SCROW nStartRow, SCROW nEndRow )
 }
 
 
-void ScColumn::SetError( SCROW nRow, const USHORT nError)
+void ScColumn::SetError( SCROW nRow, const sal_uInt16 nError)
 {
     if (VALIDROW(nRow))
     {
@@ -1718,7 +1718,7 @@ void ScColumn::GetString( SCROW nRow, String& rString ) const
         ScBaseCell* pCell = pItems[nIndex].pCell;
         if (pCell->GetCellType() != CELLTYPE_NOTE)
         {
-            ULONG nFormat = GetNumberFormat( nRow );
+            sal_uLong nFormat = GetNumberFormat( nRow );
             ScCellFormat::GetString( pCell, nFormat, rString, &pColor, *(pDocument->GetFormatTable()) );
         }
         else
@@ -1737,7 +1737,7 @@ void ScColumn::GetInputString( SCROW nRow, String& rString ) const
         ScBaseCell* pCell = pItems[nIndex].pCell;
         if (pCell->GetCellType() != CELLTYPE_NOTE)
         {
-            ULONG nFormat = GetNumberFormat( nRow );
+            sal_uLong nFormat = GetNumberFormat( nRow );
             ScCellFormat::GetInputString( pCell, nFormat, rString, *(pDocument->GetFormatTable()) );
         }
         else
@@ -1776,7 +1776,7 @@ double ScColumn::GetValue( SCROW nRow ) const
 }
 
 
-void ScColumn::GetFormula( SCROW nRow, String& rFormula, BOOL ) const
+void ScColumn::GetFormula( SCROW nRow, String& rFormula, sal_Bool ) const
 {
     SCSIZE	nIndex;
     if (Search(nRow, nIndex))
@@ -1801,7 +1801,7 @@ CellType ScColumn::GetCellType( SCROW nRow ) const
 }
 
 
-USHORT ScColumn::GetErrCode( SCROW nRow ) const
+sal_uInt16 ScColumn::GetErrCode( SCROW nRow ) const
 {
     SCSIZE	nIndex;
     if (Search(nRow, nIndex))
@@ -1814,26 +1814,26 @@ USHORT ScColumn::GetErrCode( SCROW nRow ) const
 }
 
 
-BOOL ScColumn::HasStringData( SCROW nRow ) const
+sal_Bool ScColumn::HasStringData( SCROW nRow ) const
 {
     SCSIZE	nIndex;
     if (Search(nRow, nIndex))
         return (pItems[nIndex].pCell)->HasStringData();
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScColumn::HasValueData( SCROW nRow ) const
+sal_Bool ScColumn::HasValueData( SCROW nRow ) const
 {
     SCSIZE	nIndex;
     if (Search(nRow, nIndex))
         return (pItems[nIndex].pCell)->HasValueData();
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScColumn::HasStringCells( SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScColumn::HasStringCells( SCROW nStartRow, SCROW nEndRow ) const
 {
-    //	TRUE, wenn String- oder Editzellen im Bereich
+    //	sal_True, wenn String- oder Editzellen im Bereich
 
     if ( pItems )
     {
@@ -1843,11 +1843,11 @@ BOOL ScColumn::HasStringCells( SCROW nStartRow, SCROW nEndRow ) const
         {
             CellType eType = pItems[nIndex].pCell->GetCellType();
             if ( eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT )
-                return TRUE;
+                return sal_True;
             ++nIndex;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1907,7 +1907,7 @@ sal_Int32 ScColumn::GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCh
             if ( pCell->GetCellType() != CELLTYPE_NOTE )
             {
                 Color* pColor;
-                ULONG nFormat = (ULONG) ((SfxUInt32Item*) GetAttr(
+                sal_uLong nFormat = (sal_uLong) ((SfxUInt32Item*) GetAttr(
                     nRow, ATTR_VALUE_FORMAT ))->GetValue();
                 ScCellFormat::GetString( pCell, nFormat, aString, &pColor,
                     *pNumFmt );
@@ -1961,7 +1961,7 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
             if ( eType == CELLTYPE_VALUE || (eType == CELLTYPE_FORMULA
                     && ((ScFormulaCell*)pCell)->IsValue()) )
             {
-                ULONG nFormat = (ULONG) ((SfxUInt32Item*) GetAttr(
+                sal_uLong nFormat = (sal_uLong) ((SfxUInt32Item*) GetAttr(
                     nRow, ATTR_VALUE_FORMAT ))->GetValue();
                 ScCellFormat::GetInputString( pCell, nFormat, aString, *pNumFmt );
                 xub_StrLen nLen = aString.Len();
diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx
index 00c4adf54..37683a039 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -888,19 +888,19 @@ void ScCoupledCompressedArrayIterator<A,D,S>::Resync( A nPos )
 
 // === Force instantiation of specializations ================================
 
-template class ScCompressedArray< SCROW, USHORT>;           // heights, base class
-template class ScSummableCompressedArray< SCROW, USHORT>;   // heights
-template class ScCompressedArray< SCROW, BYTE>;             // flags, base class
-template class ScBitMaskCompressedArray< SCROW, BYTE>;      // flags
+template class ScCompressedArray< SCROW, sal_uInt16>;           // heights, base class
+template class ScSummableCompressedArray< SCROW, sal_uInt16>;   // heights
+template class ScCompressedArray< SCROW, sal_uInt8>;             // flags, base class
+template class ScBitMaskCompressedArray< SCROW, sal_uInt8>;      // flags
 template unsigned long ScBitMaskCompressedArray< SCROW,
-    BYTE>::SumCoupledArrayForCondition( SCROW, SCROW, const BYTE&, const BYTE&,
-            const ScSummableCompressedArray< SCROW, USHORT>&) const;
+    sal_uInt8>::SumCoupledArrayForCondition( SCROW, SCROW, const sal_uInt8&, const sal_uInt8&,
+            const ScSummableCompressedArray< SCROW, sal_uInt16>&) const;
 template unsigned long ScBitMaskCompressedArray< SCROW,
-    BYTE>::SumScaledCoupledArrayForCondition( SCROW, SCROW, const BYTE&,
-            const BYTE&, const ScSummableCompressedArray< SCROW, USHORT>&,
+    sal_uInt8>::SumScaledCoupledArrayForCondition( SCROW, SCROW, const sal_uInt8&,
+            const sal_uInt8&, const ScSummableCompressedArray< SCROW, sal_uInt16>&,
             double) const;
-template void ScCompressedArrayIterator< SCROW, USHORT>::Follow(
-        const ScCompressedArrayIterator< SCROW, BYTE>&);
-template class ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT>;
+template void ScCompressedArrayIterator< SCROW, sal_uInt16>::Follow(
+        const ScCompressedArrayIterator< SCROW, sal_uInt8>&);
+template class ScCoupledCompressedArrayIterator< SCROW, sal_uInt8, sal_uInt16>;
 
 // === EOF ===================================================================
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index f96916555..e59b20748 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -56,7 +56,7 @@ SV_IMPL_OP_PTRARR_SORT( ScConditionalFormats_Impl, ScConditionalFormatPtr );
 
 //------------------------------------------------------------------------
 
-BOOL lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, USHORT nRecursion = 0 )
+sal_Bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 nRecursion = 0 )
 {
     if (pFormula)
     {
@@ -70,7 +70,7 @@ BOOL lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, USHORT nRecursion
                 {
                     ScSingleRefData& rRef2 = static_cast<ScToken*>(t)->GetDoubleRef().Ref2;
                     if ( rRef2.IsColRel() || rRef2.IsRowRel() || rRef2.IsTabRel() )
-                        return TRUE;
+                        return sal_True;
                 }
                 // fall through
 
@@ -78,7 +78,7 @@ BOOL lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, USHORT nRecursion
                 {
                     ScSingleRefData& rRef1 = static_cast<ScToken*>(t)->GetSingleRef();
                     if ( rRef1.IsColRel() || rRef1.IsRowRel() || rRef1.IsTabRel() )
-                        return TRUE;
+                        return sal_True;
                 }
                 break;
 
@@ -87,7 +87,7 @@ BOOL lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, USHORT nRecursion
                     if( t->GetOpCode() == ocName )      // DB areas always absolute
                         if( ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex( t->GetIndex() ) )
                             if( (nRecursion < 42) && lcl_HasRelRef( pDoc, pRangeData->GetCode(), nRecursion + 1 ) )
-                                return TRUE;
+                                return sal_True;
                 }
                 break;
 
@@ -100,7 +100,7 @@ BOOL lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, USHORT nRecursion
                         case ocColumn:  // COLUMN() returns own column index
                         case ocTable:   // SHEET() returns own sheet index
                         case ocCell:    // CELL() may return own cell address
-                            return TRUE;
+                            return sal_True;
 //                        break;
                         default:
                         {
@@ -117,7 +117,7 @@ BOOL lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, USHORT nRecursion
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 ScConditionEntry::ScConditionEntry( const ScConditionEntry& r ) :
@@ -142,7 +142,7 @@ ScConditionEntry::ScConditionEntry( const ScConditionEntry& r ) :
     pDoc(r.pDoc),
     bRelRef1(r.bRelRef1),
     bRelRef2(r.bRelRef2),
-    bFirstRun(TRUE)
+    bFirstRun(sal_True)
 {
     //	ScTokenArray copy ctor erzeugt flache Kopie
 
@@ -176,7 +176,7 @@ ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntr
     pDoc(pDocument),
     bRelRef1(r.bRelRef1),
     bRelRef2(r.bRelRef2),
-    bFirstRun(TRUE)
+    bFirstRun(sal_True)
 {
     // echte Kopie der Formeln (fuer Ref-Undo)
 
@@ -201,19 +201,19 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper,
     aStrNmsp2(rExprNmsp2),
     eTempGrammar1(eGrammar1),
     eTempGrammar2(eGrammar2),
-    bIsStr1(FALSE),
-    bIsStr2(FALSE),
+    bIsStr1(sal_False),
+    bIsStr2(sal_False),
     pFormula1(NULL),
     pFormula2(NULL),
     aSrcPos(rPos),
     pFCell1(NULL),
     pFCell2(NULL),
     pDoc(pDocument),
-    bRelRef1(FALSE),
-    bRelRef2(FALSE),
-    bFirstRun(TRUE)
+    bRelRef1(sal_False),
+    bRelRef2(sal_False),
+    bFirstRun(sal_True)
 {
-    Compile( rExpr1, rExpr2, rExprNmsp1, rExprNmsp2, eGrammar1, eGrammar2, FALSE );
+    Compile( rExpr1, rExpr2, rExprNmsp1, rExprNmsp2, eGrammar1, eGrammar2, sal_False );
 
     //	Formelzellen werden erst bei IsValid angelegt
 }
@@ -227,17 +227,17 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper,
     nVal2(0.0),
     eTempGrammar1(FormulaGrammar::GRAM_DEFAULT),
     eTempGrammar2(FormulaGrammar::GRAM_DEFAULT),
-    bIsStr1(FALSE),
-    bIsStr2(FALSE),
+    bIsStr1(sal_False),
+    bIsStr2(sal_False),
     pFormula1(NULL),
     pFormula2(NULL),
     aSrcPos(rPos),
     pFCell1(NULL),
     pFCell2(NULL),
     pDoc(pDocument),
-    bRelRef1(FALSE),
-    bRelRef2(FALSE),
-    bFirstRun(TRUE)
+    bRelRef1(sal_False),
+    bRelRef2(sal_False),
+    bFirstRun(sal_True)
 {
     if ( pArr1 )
     {
@@ -255,7 +255,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper,
                 }
                 else if ( pToken->GetType() == svString )
                 {
-                    bIsStr1 = TRUE;
+                    bIsStr1 = sal_True;
                     aStrVal1 = pToken->GetString();
                     DELETEZ(pFormula1);				// nicht als Formel merken
                 }
@@ -279,7 +279,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper,
                 }
                 else if ( pToken->GetType() == svString )
                 {
-                    bIsStr2 = TRUE;
+                    bIsStr2 = sal_True;
                     aStrVal2 = pToken->GetString();
                     DELETEZ(pFormula2);				// nicht als Formel merken
                 }
@@ -302,7 +302,7 @@ ScConditionEntry::~ScConditionEntry()
 
 void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2,
         const String& rExprNmsp1, const String& rExprNmsp2,
-        FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2, BOOL bTextToReal )
+        FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2, sal_Bool bTextToReal )
 {
     if ( rExpr1.Len() || rExpr2.Len() )
     {
@@ -335,7 +335,7 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2,
                         }
                         else if ( pToken->GetType() == svString )
                         {
-                            bIsStr1 = TRUE;
+                            bIsStr1 = sal_True;
                             aStrVal1 = pToken->GetString();
                             DELETEZ(pFormula1);				// nicht als Formel merken
                         }
@@ -372,7 +372,7 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2,
                         }
                         else if ( pToken->GetType() == svString )
                         {
-                            bIsStr2 = TRUE;
+                            bIsStr2 = sal_True;
                             aStrVal2 = pToken->GetString();
                             DELETEZ(pFormula2);				// nicht als Formel merken
                         }
@@ -402,7 +402,7 @@ void ScConditionEntry::MakeCells( const ScAddress& rPos )			// Formelzellen anle
     }
 }
 
-void ScConditionEntry::SetIgnoreBlank(BOOL bSet)
+void ScConditionEntry::SetIgnoreBlank(sal_Bool bSet)
 {
     //	Das Bit SC_COND_NOBLANKS wird gesetzt, wenn Blanks nicht ignoriert werden
     //	(nur bei Gueltigkeit)
@@ -440,7 +440,7 @@ void ScConditionEntry::CompileXML()
 
     Compile( GetExpression(aSrcPos, 0, 0, eTempGrammar1),
              GetExpression(aSrcPos, 1, 0, eTempGrammar2),
-             aStrNmsp1, aStrNmsp2, eTempGrammar1, eTempGrammar2, TRUE );
+             aStrNmsp1, aStrNmsp2, eTempGrammar1, eTempGrammar2, sal_True );
 }
 
 void ScConditionEntry::SetSrcString( const String& rNew )
@@ -471,10 +471,10 @@ void ScConditionEntry::SetFormula2( const ScTokenArray& rArray )
     }
 }
 
-void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab, BOOL& rChanged )
+void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab, sal_Bool& rChanged )
 {
     //  Insert table: only update absolute table references.
-    //  (Similar to ScCompiler::UpdateInsertTab with bIsName=TRUE, result is the same as for named ranges)
+    //  (Similar to ScCompiler::UpdateInsertTab with bIsName=sal_True, result is the same as for named ranges)
     //  For deleting, ScCompiler::UpdateDeleteTab is used because of the handling of invalid references.
 
     rCode.Reset();
@@ -486,7 +486,7 @@ void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab,
         {
             rRef1.nTab += 1;
             rRef1.nRelTab = rRef1.nTab - nPosTab;
-            rChanged = TRUE;
+            rChanged = sal_True;
         }
         if( p->GetType() == svDoubleRef )
         {
@@ -495,7 +495,7 @@ void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab,
             {
                 rRef2.nTab += 1;
                 rRef2.nRelTab = rRef2.nTab - nPosTab;
-                rChanged = TRUE;
+                rChanged = sal_True;
             }
         }
         p = static_cast<ScToken*>(rCode.GetNextReference());
@@ -505,11 +505,11 @@ void lcl_CondUpdateInsertTab( ScTokenArray& rCode, SCTAB nInsTab, SCTAB nPosTab,
 void ScConditionEntry::UpdateReference( UpdateRefMode eUpdateRefMode,
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    BOOL bInsertTab = ( eUpdateRefMode == URM_INSDEL && nDz == 1 );
-    BOOL bDeleteTab = ( eUpdateRefMode == URM_INSDEL && nDz == -1 );
+    sal_Bool bInsertTab = ( eUpdateRefMode == URM_INSDEL && nDz == 1 );
+    sal_Bool bDeleteTab = ( eUpdateRefMode == URM_INSDEL && nDz == -1 );
 
-    BOOL bChanged1 = FALSE;
-    BOOL bChanged2 = FALSE;
+    sal_Bool bChanged1 = sal_False;
+    sal_Bool bChanged2 = sal_False;
 
     if (pFormula1)
     {
@@ -520,7 +520,7 @@ void ScConditionEntry::UpdateReference( UpdateRefMode eUpdateRefMode,
             ScCompiler aComp( pDoc, aSrcPos, *pFormula1 );
             aComp.SetGrammar(pDoc->GetGrammar());
             if ( bDeleteTab )
-                aComp.UpdateDeleteTab( rRange.aStart.Tab(), FALSE, TRUE, bChanged1 );
+                aComp.UpdateDeleteTab( rRange.aStart.Tab(), sal_False, sal_True, bChanged1 );
             else
                 aComp.UpdateNameReference( eUpdateRefMode, rRange, nDx, nDy, nDz, bChanged1 );
         }
@@ -537,7 +537,7 @@ void ScConditionEntry::UpdateReference( UpdateRefMode eUpdateRefMode,
             ScCompiler aComp( pDoc, aSrcPos, *pFormula2);
             aComp.SetGrammar(pDoc->GetGrammar());
             if ( bDeleteTab )
-                aComp.UpdateDeleteTab( rRange.aStart.Tab(), FALSE, TRUE, bChanged2 );
+                aComp.UpdateDeleteTab( rRange.aStart.Tab(), sal_False, sal_True, bChanged2 );
             else
                 aComp.UpdateNameReference( eUpdateRefMode, rRange, nDx, nDy, nDz, bChanged2 );
         }
@@ -553,39 +553,39 @@ void ScConditionEntry::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
     {
         ScCompiler aComp( pDoc, aSrcPos, *pFormula1);
         aComp.SetGrammar(pDoc->GetGrammar());
-        aComp.UpdateMoveTab(nOldPos, nNewPos, TRUE );
+        aComp.UpdateMoveTab(nOldPos, nNewPos, sal_True );
         DELETEZ(pFCell1);
     }
     if (pFormula2)
     {
         ScCompiler aComp( pDoc, aSrcPos, *pFormula2);
         aComp.SetGrammar(pDoc->GetGrammar());
-        aComp.UpdateMoveTab(nOldPos, nNewPos, TRUE );
+        aComp.UpdateMoveTab(nOldPos, nNewPos, sal_True );
         DELETEZ(pFCell2);
     }
 }
 
 //!	als Vergleichsoperator ans TokenArray ???
 
-BOOL lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 )
+sal_Bool lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 )
 {
     //	verglichen wird nur das nicht-UPN Array
 
     if ( pArr1 && pArr2 )
     {
-        USHORT nLen = pArr1->GetLen();
+        sal_uInt16 nLen = pArr1->GetLen();
         if ( pArr2->GetLen() != nLen )
-            return FALSE;
+            return sal_False;
 
         FormulaToken** ppToken1 = pArr1->GetArray();
         FormulaToken** ppToken2 = pArr2->GetArray();
-        for (USHORT i=0; i<nLen; i++)
+        for (sal_uInt16 i=0; i<nLen; i++)
         {
             if ( ppToken1[i] != ppToken2[i] &&
                  !(*ppToken1[i] == *ppToken2[i]) )
-                return FALSE;						// Unterschied
+                return sal_False;						// Unterschied
         }
-        return TRUE;					// alle Eintraege gleich
+        return sal_True;					// alle Eintraege gleich
     }
     else
         return !pArr1 && !pArr2;		// beide 0 -> gleich
@@ -593,7 +593,7 @@ BOOL lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 )
 
 int ScConditionEntry::operator== ( const ScConditionEntry& r ) const
 {
-    BOOL bEq = (eOp == r.eOp && nOptions == r.nOptions &&
+    sal_Bool bEq = (eOp == r.eOp && nOptions == r.nOptions &&
                 lcl_IsEqual( pFormula1, r.pFormula1 ) &&
                 lcl_IsEqual( pFormula2, r.pFormula2 ));
     if (bEq)
@@ -601,13 +601,13 @@ int ScConditionEntry::operator== ( const ScConditionEntry& r ) const
         // for formulas, the reference positions must be compared, too
         // (including aSrcString, for inserting the entries during XML import)
         if ( ( pFormula1 || pFormula2 ) && ( aSrcPos != r.aSrcPos || aSrcString != r.aSrcString ) )
-            bEq = FALSE;
+            bEq = sal_False;
 
         //	wenn keine Formeln, Werte vergleichen
         if ( !pFormula1 && ( nVal1 != r.nVal1 || aStrVal1 != r.aStrVal1 || bIsStr1 != r.bIsStr1 ) )
-            bEq = FALSE;
+            bEq = sal_False;
         if ( !pFormula2 && ( nVal2 != r.nVal2 || aStrVal2 != r.aStrVal2 || bIsStr2 != r.bIsStr2 ) )
-            bEq = FALSE;
+            bEq = sal_False;
     }
 
     return bEq;
@@ -623,7 +623,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
 
     //	Formeln auswerten
 
-    BOOL bDirty = FALSE;		//! 1 und 2 getrennt ???
+    sal_Bool bDirty = sal_False;		//! 1 und 2 getrennt ???
 
     ScFormulaCell* pTemp1 = NULL;
     ScFormulaCell* pEff1 = pFCell1;
@@ -638,16 +638,16 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
         {
             //!	Changed statt Dirty abfragen !!!
             if (pEff1->GetDirty() && !bRelRef1)
-                bDirty = TRUE;
+                bDirty = sal_True;
             if (pEff1->IsValue())
             {
-                bIsStr1 = FALSE;
+                bIsStr1 = sal_False;
                 nVal1 = pEff1->GetValue();
                 aStrVal1.Erase();
             }
             else
             {
-                bIsStr1 = TRUE;
+                bIsStr1 = sal_True;
                 pEff1->GetString( aStrVal1 );
                 nVal1 = 0.0;
             }
@@ -667,16 +667,16 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
         if (!pEff2->IsRunning())		// keine 522 erzeugen
         {
             if (pEff2->GetDirty() && !bRelRef2)
-                bDirty = TRUE;
+                bDirty = sal_True;
             if (pEff2->IsValue())
             {
-                bIsStr2 = FALSE;
+                bIsStr2 = sal_False;
                 nVal2 = pEff2->GetValue();
                 aStrVal2.Erase();
             }
             else
             {
-                bIsStr2 = TRUE;
+                bIsStr2 = sal_True;
                 pEff2->GetString( aStrVal2 );
                 nVal2 = 0.0;
             }
@@ -693,23 +693,23 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
         DataChanged( NULL );	// alles
     }
 
-    bFirstRun = FALSE;
+    bFirstRun = sal_False;
 }
 
-BOOL ScConditionEntry::IsValid( double nArg ) const
+sal_Bool ScConditionEntry::IsValid( double nArg ) const
 {
     //	Interpret muss schon gerufen sein
 
     if ( bIsStr1 )
     {
-        // wenn auf String getestet wird, bei Zahlen immer FALSE, ausser bei "ungleich"
+        // wenn auf String getestet wird, bei Zahlen immer sal_False, ausser bei "ungleich"
 
         return ( eOp == SC_COND_NOTEQUAL );
     }
 
     if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN )
         if ( bIsStr2 )
-            return FALSE;
+            return sal_False;
 
     double nComp1 = nVal1;		// Kopie, damit vertauscht werden kann
     double nComp2 = nVal2;
@@ -723,11 +723,11 @@ BOOL ScConditionEntry::IsValid( double nArg ) const
 
     //	Alle Grenzfaelle muessen per ::rtl::math::approxEqual getestet werden!
 
-    BOOL bValid = FALSE;
+    sal_Bool bValid = sal_False;
     switch (eOp)
     {
         case SC_COND_NONE:
-            break;					// immer FALSE;
+            break;					// immer sal_False;
         case SC_COND_EQUAL:
             bValid = ::rtl::math::approxEqual( nArg, nComp1 );
             break;
@@ -764,20 +764,20 @@ BOOL ScConditionEntry::IsValid( double nArg ) const
     return bValid;
 }
 
-BOOL ScConditionEntry::IsValidStr( const String& rArg ) const
+sal_Bool ScConditionEntry::IsValidStr( const String& rArg ) const
 {
     //	Interpret muss schon gerufen sein
 
     if ( eOp == SC_COND_DIRECT )				// Formel ist unabhaengig vom Inhalt
         return !::rtl::math::approxEqual( nVal1, 0.0 );
 
-    //	Wenn Bedingung Zahl enthaelt, immer FALSE, ausser bei "ungleich"
+    //	Wenn Bedingung Zahl enthaelt, immer sal_False, ausser bei "ungleich"
 
     if ( !bIsStr1 )
         return ( eOp == SC_COND_NOTEQUAL );
     if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN )
         if ( !bIsStr2 )
-            return FALSE;
+            return sal_False;
 
     String aUpVal1( aStrVal1 );		//! als Member? (dann auch in Interpret setzen)
     String aUpVal2( aStrVal2 );
@@ -790,7 +790,7 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const
             String aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp;
         }
 
-    BOOL bValid;
+    sal_Bool bValid;
     switch ( eOp )
     {
         case SC_COND_EQUAL:
@@ -831,7 +831,7 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const
                 //	SC_COND_DIRECT schon oben abgefragt
                 default:
                     DBG_ERROR("unbekannte Operation bei ScConditionEntry");
-                    bValid = FALSE;
+                    bValid = sal_False;
                     break;
             }
         }
@@ -839,13 +839,13 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const
     return bValid;
 }
 
-BOOL ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const
+sal_Bool ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const
 {
     ((ScConditionEntry*)this)->Interpret(rPos);			// Formeln auswerten
 
     double nArg = 0.0;
     String aArgStr;
-    BOOL bVal = TRUE;
+    sal_Bool bVal = sal_True;
 
     if ( pCell )
     {
@@ -867,7 +867,7 @@ BOOL ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) c
                 break;
             case CELLTYPE_STRING:
             case CELLTYPE_EDIT:
-                bVal = FALSE;
+                bVal = sal_False;
                 if ( eType == CELLTYPE_STRING )
                     ((ScStringCell*)pCell)->GetString(aArgStr);
                 else
@@ -882,7 +882,7 @@ BOOL ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) c
 
     if (!pCell)
         if (bIsStr1)
-            bVal = FALSE;				// leere Zellen je nach Bedingung
+            bVal = sal_False;				// leere Zellen je nach Bedingung
 
     if (bVal)
         return IsValid( nArg );
@@ -890,8 +890,8 @@ BOOL ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) c
         return IsValidStr( aArgStr );
 }
 
-String ScConditionEntry::GetExpression( const ScAddress& rCursor, USHORT nIndex,
-                                        ULONG nNumFmt,
+String ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uInt16 nIndex,
+                                        sal_uLong nNumFmt,
                                         const FormulaGrammar::Grammar eGrammar ) const
 {
     String aRet;
@@ -941,7 +941,7 @@ String ScConditionEntry::GetExpression( const ScAddress& rCursor, USHORT nIndex,
     return aRet;
 }
 
-ScTokenArray* ScConditionEntry::CreateTokenArry( USHORT nIndex ) const
+ScTokenArray* ScConditionEntry::CreateTokenArry( sal_uInt16 nIndex ) const
 {
     ScTokenArray* pRet = NULL;
     ScAddress aAddr;
@@ -982,7 +982,7 @@ ScTokenArray* ScConditionEntry::CreateTokenArry( USHORT nIndex ) const
 
 void ScConditionEntry::SourceChanged( const ScAddress& rChanged )
 {
-    for (USHORT nPass = 0; nPass < 2; nPass++)
+    for (sal_uInt16 nPass = 0; nPass < 2; nPass++)
     {
         ScTokenArray* pFormula = nPass ? pFormula2 : pFormula1;
         if (pFormula)
@@ -997,7 +997,7 @@ void ScConditionEntry::SourceChanged( const ScAddress& rChanged )
                 {
                     //	absolut muss getroffen sein, relativ bestimmt Bereich
 
-                    BOOL bHit = TRUE;
+                    sal_Bool bHit = sal_True;
                     SCsCOL nCol1;
                     SCsROW nRow1;
                     SCsTAB nTab1;
@@ -1072,7 +1072,7 @@ ScAddress ScConditionEntry::GetValidSrcPos() const
     SCTAB nMinTab = aSrcPos.Tab();
     SCTAB nMaxTab = nMinTab;
 
-    for (USHORT nPass = 0; nPass < 2; nPass++)
+    for (sal_uInt16 nPass = 0; nPass < 2; nPass++)
     {
         ScTokenArray* pFormula = nPass ? pFormula2 : pFormula1;
         if (pFormula)
@@ -1123,7 +1123,7 @@ void ScConditionEntry::DataChanged( const ScRange* /* pModified */ ) const
 bool ScConditionEntry::MarkUsedExternalReferences() const
 {
     bool bAllMarked = false;
-    for (USHORT nPass = 0; !bAllMarked && nPass < 2; nPass++)
+    for (sal_uInt16 nPass = 0; !bAllMarked && nPass < 2; nPass++)
     {
         ScTokenArray* pFormula = nPass ? pFormula2 : pFormula1;
         if (pFormula)
@@ -1210,7 +1210,7 @@ ScConditionalFormat::ScConditionalFormat(const ScConditionalFormat& r) :
     if (nEntryCount)
     {
         ppEntries = new ScCondFormatEntry*[nEntryCount];
-        for (USHORT i=0; i<nEntryCount; i++)
+        for (sal_uInt16 i=0; i<nEntryCount; i++)
         {
             ppEntries[i] = new ScCondFormatEntry(*r.ppEntries[i]);
             ppEntries[i]->SetParent(this);
@@ -1231,7 +1231,7 @@ ScConditionalFormat* ScConditionalFormat::Clone(ScDocument* pNewDoc) const
     if (nEntryCount)
     {
         pNew->ppEntries = new ScCondFormatEntry*[nEntryCount];
-        for (USHORT i=0; i<nEntryCount; i++)
+        for (sal_uInt16 i=0; i<nEntryCount; i++)
         {
             pNew->ppEntries[i] = new ScCondFormatEntry( pNewDoc, *ppEntries[i] );
             pNew->ppEntries[i]->SetParent(pNew);
@@ -1242,24 +1242,24 @@ ScConditionalFormat* ScConditionalFormat::Clone(ScDocument* pNewDoc) const
     return pNew;
 }
 
-BOOL ScConditionalFormat::EqualEntries( const ScConditionalFormat& r ) const
+sal_Bool ScConditionalFormat::EqualEntries( const ScConditionalFormat& r ) const
 {
     if ( nEntryCount != r.nEntryCount )
-        return FALSE;
+        return sal_False;
 
     //!	auf gleiche Eintraege in anderer Reihenfolge testen ???
 
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         if ( ! (*ppEntries[i] == *r.ppEntries[i]) )
-            return FALSE;
+            return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScConditionalFormat::AddEntry( const ScCondFormatEntry& rNew )
 {
     ScCondFormatEntry** ppNew = new ScCondFormatEntry*[nEntryCount+1];
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         ppNew[i] = ppEntries[i];
     ppNew[nEntryCount] = new ScCondFormatEntry(rNew);
     ppNew[nEntryCount]->SetParent(this);
@@ -1270,14 +1270,14 @@ void ScConditionalFormat::AddEntry( const ScCondFormatEntry& rNew )
 
 ScConditionalFormat::~ScConditionalFormat()
 {
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         delete ppEntries[i];
     delete[] ppEntries;
 
     delete pAreas;
 }
 
-const ScCondFormatEntry* ScConditionalFormat::GetEntry( USHORT nPos ) const
+const ScCondFormatEntry* ScConditionalFormat::GetEntry( sal_uInt16 nPos ) const
 {
     if ( nPos < nEntryCount )
         return ppEntries[nPos];
@@ -1287,14 +1287,14 @@ const ScCondFormatEntry* ScConditionalFormat::GetEntry( USHORT nPos ) const
 
 const String& ScConditionalFormat::GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const
 {
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         if ( ppEntries[i]->IsCellValid( pCell, rPos ) )
             return ppEntries[i]->GetStyle();
 
     return EMPTY_STRING;
 }
 
-void lcl_Extend( ScRange& rRange, ScDocument* pDoc, BOOL bLines )
+void lcl_Extend( ScRange& rRange, ScDocument* pDoc, sal_Bool bLines )
 {
     SCTAB nTab = rRange.aStart.Tab();
     DBG_ASSERT(rRange.aEnd.Tab() == nTab, "lcl_Extend - mehrere Tabellen?");
@@ -1304,7 +1304,7 @@ void lcl_Extend( ScRange& rRange, ScDocument* pDoc, BOOL bLines )
     SCCOL nEndCol = rRange.aEnd.Col();
     SCROW nEndRow = rRange.aEnd.Row();
 
-    BOOL bEx = pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab );
+    sal_Bool bEx = pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab );
 
     if (bLines)
     {
@@ -1321,7 +1321,7 @@ void lcl_Extend( ScRange& rRange, ScDocument* pDoc, BOOL bLines )
     }
 }
 
-BOOL lcl_CutRange( ScRange& rRange, const ScRange& rOther )
+sal_Bool lcl_CutRange( ScRange& rRange, const ScRange& rOther )
 {
     rRange.Justify();
     ScRange aCmpRange = rOther;
@@ -1347,38 +1347,38 @@ BOOL lcl_CutRange( ScRange& rRange, const ScRange& rOther )
         if ( rRange.aEnd.Tab() > aCmpRange.aEnd.Tab() )
             rRange.aEnd.SetTab( aCmpRange.aEnd.Tab() );
 
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;		// ausserhalb
+    return sal_False;		// ausserhalb
 }
 
 void ScConditionalFormat::DoRepaint( const ScRange* pModified )
 {
-    USHORT i;
+    sal_uInt16 i;
     SfxObjectShell* pSh = pDoc->GetDocumentShell();
     if (pSh)
     {
         //	Rahmen/Schatten enthalten?
         //	(alle Bedingungen testen)
-        BOOL bExtend = FALSE;
-        BOOL bRotate = FALSE;
-        BOOL bAttrTested = FALSE;
+        sal_Bool bExtend = sal_False;
+        sal_Bool bRotate = sal_False;
+        sal_Bool bAttrTested = sal_False;
 
         if (!pAreas)		//	RangeList ggf. holen
         {
             pAreas = new ScRangeList;
             pDoc->FindConditionalFormat( nKey, *pAreas );
         }
-        USHORT nCount = (USHORT) pAreas->Count();
+        sal_uInt16 nCount = (sal_uInt16) pAreas->Count();
         for (i=0; i<nCount; i++)
         {
             ScRange aRange = *pAreas->GetObject(i);
-            BOOL bDo = TRUE;
+            sal_Bool bDo = sal_True;
             if ( pModified )
             {
                 if ( !lcl_CutRange( aRange, *pModified ) )
-                    bDo = FALSE;
+                    bDo = sal_False;
             }
             if (bDo)
             {
@@ -1387,7 +1387,7 @@ void ScConditionalFormat::DoRepaint( const ScRange* pModified )
                     // #116562# Look at the style's content only if the repaint is necessary
                     // for any condition, to avoid the time-consuming Find() if there are many
                     // conditional formats and styles.
-                    for (USHORT nEntry=0; nEntry<nEntryCount; nEntry++)
+                    for (sal_uInt16 nEntry=0; nEntry<nEntryCount; nEntry++)
                     {
                         String aStyle = ppEntries[nEntry]->GetStyle();
                         if (aStyle.Len())
@@ -1397,20 +1397,20 @@ void ScConditionalFormat::DoRepaint( const ScRange* pModified )
                             if ( pStyleSheet )
                             {
                                 const SfxItemSet& rSet = pStyleSheet->GetItemSet();
-                                if (rSet.GetItemState( ATTR_BORDER, TRUE ) == SFX_ITEM_SET ||
-                                    rSet.GetItemState( ATTR_SHADOW, TRUE ) == SFX_ITEM_SET)
+                                if (rSet.GetItemState( ATTR_BORDER, sal_True ) == SFX_ITEM_SET ||
+                                    rSet.GetItemState( ATTR_SHADOW, sal_True ) == SFX_ITEM_SET)
                                 {
-                                    bExtend = TRUE;
+                                    bExtend = sal_True;
                                 }
-                                if (rSet.GetItemState( ATTR_ROTATE_VALUE, TRUE ) == SFX_ITEM_SET ||
-                                    rSet.GetItemState( ATTR_ROTATE_MODE, TRUE ) == SFX_ITEM_SET)
+                                if (rSet.GetItemState( ATTR_ROTATE_VALUE, sal_True ) == SFX_ITEM_SET ||
+                                    rSet.GetItemState( ATTR_ROTATE_MODE, sal_True ) == SFX_ITEM_SET)
                                 {
-                                    bRotate = TRUE;
+                                    bRotate = sal_True;
                                 }
                             }
                         }
                     }
-                    bAttrTested = TRUE;
+                    bAttrTested = sal_True;
                 }
 
                 lcl_Extend( aRange, pDoc, bExtend );		// zusammengefasste und bExtend
@@ -1446,20 +1446,20 @@ void ScConditionalFormat::InvalidateArea()
 
 void ScConditionalFormat::CompileAll()
 {
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         ppEntries[i]->CompileAll();
 }
 
 void ScConditionalFormat::CompileXML()
 {
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         ppEntries[i]->CompileXML();
 }
 
 void ScConditionalFormat::UpdateReference( UpdateRefMode eUpdateRefMode,
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         ppEntries[i]->UpdateReference(eUpdateRefMode, rRange, nDx, nDy, nDz);
 
     delete pAreas;		// aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf
@@ -1468,14 +1468,14 @@ void ScConditionalFormat::UpdateReference( UpdateRefMode eUpdateRefMode,
 
 void ScConditionalFormat::RenameCellStyle(const String& rOld, const String& rNew)
 {
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         if ( ppEntries[i]->GetStyle() == rOld )
             ppEntries[i]->UpdateStyleName( rNew );
 }
 
 void ScConditionalFormat::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
 {
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         ppEntries[i]->UpdateMoveTab( nOldPos, nNewPos );
 
     delete pAreas;		// aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf
@@ -1484,14 +1484,14 @@ void ScConditionalFormat::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
 
 void ScConditionalFormat::SourceChanged( const ScAddress& rAddr )
 {
-    for (USHORT i=0; i<nEntryCount; i++)
+    for (sal_uInt16 i=0; i<nEntryCount; i++)
         ppEntries[i]->SourceChanged( rAddr );
 }
 
 bool ScConditionalFormat::MarkUsedExternalReferences() const
 {
     bool bAllMarked = false;
-    for (USHORT i=0; !bAllMarked && i<nEntryCount; i++)
+    for (sal_uInt16 i=0; !bAllMarked && i<nEntryCount; i++)
         bAllMarked = ppEntries[i]->MarkUsedExternalReferences();
     return bAllMarked;
 }
@@ -1503,9 +1503,9 @@ ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList&
 {
     //	fuer Ref-Undo - echte Kopie mit neuen Tokens!
 
-    USHORT nCount = rList.Count();
+    sal_uInt16 nCount = rList.Count();
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         InsertNew( rList[i]->Clone() );
 
     //!		sortierte Eintraege aus rList schneller einfuegen ???
@@ -1516,23 +1516,23 @@ ScConditionalFormatList::ScConditionalFormatList(ScDocument* pNewDoc,
 {
     //	fuer neues Dokument - echte Kopie mit neuen Tokens!
 
-    USHORT nCount = rList.Count();
+    sal_uInt16 nCount = rList.Count();
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         InsertNew( rList[i]->Clone(pNewDoc) );
 
     //!		sortierte Eintraege aus rList schneller einfuegen ???
 }
 
-BOOL ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) const
+sal_Bool ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) const
 {
     // fuer Ref-Undo - interne Variablen werden nicht verglichen
 
-    USHORT nCount = Count();
-    BOOL bEqual = ( nCount == r.Count() );
-    for (USHORT i=0; i<nCount && bEqual; i++)			// Eintraege sind sortiert
+    sal_uInt16 nCount = Count();
+    sal_Bool bEqual = ( nCount == r.Count() );
+    for (sal_uInt16 i=0; i<nCount && bEqual; i++)			// Eintraege sind sortiert
         if ( !(*this)[i]->EqualEntries(*r[i]) )			// Eintraege unterschiedlich ?
-            bEqual = FALSE;
+            bEqual = sal_False;
 
     return bEqual;
 }
@@ -1541,8 +1541,8 @@ ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey )
 {
     //!	binaer suchen
 
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         if ((*this)[i]->GetKey() == nKey)
             return (*this)[i];
 
@@ -1552,52 +1552,52 @@ ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey )
 
 void ScConditionalFormatList::CompileAll()
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->CompileAll();
 }
 
 void ScConditionalFormatList::CompileXML()
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->CompileXML();
 }
 
 void ScConditionalFormatList::UpdateReference( UpdateRefMode eUpdateRefMode,
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->UpdateReference( eUpdateRefMode, rRange, nDx, nDy, nDz );
 }
 
 void ScConditionalFormatList::RenameCellStyle( const String& rOld, const String& rNew )
 {
-    ULONG nCount=Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uLong nCount=Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->RenameCellStyle(rOld,rNew);
 }
 
 void ScConditionalFormatList::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->UpdateMoveTab( nOldPos, nNewPos );
 }
 
 void ScConditionalFormatList::SourceChanged( const ScAddress& rAddr )
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->SourceChanged( rAddr );
 }
 
 bool ScConditionalFormatList::MarkUsedExternalReferences() const
 {
     bool bAllMarked = false;
-    USHORT nCount = Count();
-    for (USHORT i=0; !bAllMarked && i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; !bAllMarked && i<nCount; i++)
         bAllMarked = (*this)[i]->MarkUsedExternalReferences();
     return bAllMarked;
 }
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 233bc4e73..b03d7c567 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -51,14 +51,14 @@ using namespace ::com::sun::star;
 // static
 void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
                                 const uno::Reference<sdbc::XRow>& xRow, long nRowPos,
-                                long nType, BOOL bCurrency, BOOL* pSimpleFlag )
+                                long nType, sal_Bool bCurrency, sal_Bool* pSimpleFlag )
 {
     String aString;
     double nVal = 0.0;
-    BOOL bValue = FALSE;
-    BOOL bEmptyFlag = FALSE;
-    BOOL bError = FALSE;
-    ULONG nFormatIndex = 0;
+    sal_Bool bValue = sal_False;
+    sal_Bool bEmptyFlag = sal_False;
+    sal_Bool bError = sal_False;
+    sal_uLong nFormatIndex = 0;
 
     //!	wasNull calls only if null value was found?
 
@@ -73,7 +73,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
                                     NUMBERFORMAT_LOGICAL, ScGlobal::eLnge );
                 nVal = (xRow->getBoolean(nRowPos) ? 1 : 0);
                 bEmptyFlag = ( nVal == 0.0 ) && xRow->wasNull();
-                bValue = TRUE;
+                bValue = sal_True;
                 break;
 
             case sdbc::DataType::TINYINT:
@@ -88,7 +88,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
                 //!	do the conversion here?
                 nVal = xRow->getDouble(nRowPos);
                 bEmptyFlag = ( nVal == 0.0 ) && xRow->wasNull();
-                bValue = TRUE;
+                bValue = sal_True;
                 break;
 
             case sdbc::DataType::CHAR:
@@ -108,7 +108,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
                     nVal = Date( aDate.Day, aDate.Month, aDate.Year ) -
                                                 *pFormTable->GetNullDate();
                     bEmptyFlag = xRow->wasNull();
-                    bValue = TRUE;
+                    bValue = sal_True;
                 }
                 break;
 
@@ -122,7 +122,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
                     nVal = ( aTime.Hours * 3600 + aTime.Minutes * 60 +
                              aTime.Seconds + aTime.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
                     bEmptyFlag = xRow->wasNull();
-                    bValue = TRUE;
+                    bValue = sal_True;
                 }
                 break;
 
@@ -138,24 +138,24 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
                            ( aStamp.Hours * 3600 + aStamp.Minutes * 60 +
                              aStamp.Seconds + aStamp.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
                     bEmptyFlag = xRow->wasNull();
-                    bValue = TRUE;
+                    bValue = sal_True;
                 }
                 break;
 
             case sdbc::DataType::SQLNULL:
-                bEmptyFlag = TRUE;
+                bEmptyFlag = sal_True;
                 break;
 
             case sdbc::DataType::BINARY:
             case sdbc::DataType::VARBINARY:
             case sdbc::DataType::LONGVARBINARY:
             default:
-                bError = TRUE;		// unknown type
+                bError = sal_True;		// unknown type
         }
     }
     catch ( uno::Exception& )
     {
-        bError = TRUE;
+        bError = sal_True;
     }
 
     if ( bValue && bCurrency )
@@ -186,7 +186,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
         {
             pCell = ScBaseCell::CreateTextCell( aString, pDoc );
             if ( pSimpleFlag && pCell->GetCellType() == CELLTYPE_EDIT )
-                *pSimpleFlag = FALSE;
+                *pSimpleFlag = sal_False;
         }
         else
             pCell = NULL;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 1da04e90b..cad06582d 100644..100755
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -57,7 +57,7 @@ namespace {
 
 void lcl_toUpper(OUString& rStr)
 {
-    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<USHORT>(rStr.getLength()));
+    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<sal_uInt16>(rStr.getLength()));
 }
 
 }
@@ -86,7 +86,7 @@ ScDocumentIterator::~ScDocumentIterator()
 {
 }
 
-BOOL ScDocumentIterator::GetThisCol()
+sal_Bool ScDocumentIterator::GetThisCol()
 {
     ScTable*		pTab;
     while ( (pTab = pDoc->pTab[nTab]) == NULL )
@@ -95,14 +95,14 @@ BOOL ScDocumentIterator::GetThisCol()
         {
             nCol = MAXCOL;
             nRow = MAXROW;
-            return FALSE;
+            return sal_False;
         }
         ++nTab;
     }
     ScColumn*		pCol = &pTab->aCol[nCol];
     ScAttrArray*	pAtt = pCol->pAttrArray;
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     do
     {
         SCROW nColRow;
@@ -126,13 +126,13 @@ BOOL ScDocumentIterator::GetThisCol()
 
         if (nColRow == nRow)
         {
-            bFound	 = TRUE;
+            bFound	 = sal_True;
             pCell	 = pCol->pItems[nColPos].pCell;
             pPattern = pAtt->pData[nAttrPos].pPattern;
         }
         else if ( pAtt->pData[nAttrPos].pPattern != pDefPattern )
         {
-            bFound = TRUE;
+            bFound = sal_True;
             pCell = NULL;
             pPattern = pAtt->pData[nAttrPos].pPattern;
         }
@@ -146,15 +146,15 @@ BOOL ScDocumentIterator::GetThisCol()
     return bFound;
 }
 
-BOOL ScDocumentIterator::GetThis()
+sal_Bool ScDocumentIterator::GetThis()
 {
-    BOOL bEnd = FALSE;
-    BOOL bSuccess = FALSE;
+    sal_Bool bEnd = sal_False;
+    sal_Bool bSuccess = sal_False;
 
     while ( !bSuccess && !bEnd )
     {
         if ( nRow > MAXROW )
-            bSuccess = FALSE;
+            bSuccess = sal_False;
         else
             bSuccess = GetThisCol();
 
@@ -166,7 +166,7 @@ BOOL ScDocumentIterator::GetThis()
                 nCol = 0;
                 ++nTab;
                 if (nTab > nEndTab)
-                    bEnd = TRUE;
+                    bEnd = sal_True;
             }
             nRow = 0;
             nColPos = 0;
@@ -177,7 +177,7 @@ BOOL ScDocumentIterator::GetThis()
     return !bEnd;
 }
 
-BOOL ScDocumentIterator::GetFirst()
+sal_Bool ScDocumentIterator::GetFirst()
 {
     nCol = 0;
     nTab = nStartTab;
@@ -189,7 +189,7 @@ BOOL ScDocumentIterator::GetFirst()
     return GetThis();
 }
 
-BOOL ScDocumentIterator::GetNext()
+sal_Bool ScDocumentIterator::GetNext()
 {
     ++nRow;
 
@@ -218,7 +218,7 @@ void ScDocumentIterator::GetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab )
 
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
-void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr,
+void lcl_IterGetNumberFormat( sal_uLong& nFormat, const ScAttrArray*& rpArr,
         SCROW& nAttrEndRow, const ScAttrArray* pNewArr, SCROW nRow,
         ScDocument* pDoc )
 {
@@ -236,7 +236,7 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr,
 //UNUSED2008-05  ScValueIterator::ScValueIterator( ScDocument* pDocument,
 //UNUSED2008-05                                    SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
 //UNUSED2008-05                                    SCCOL nECol, SCROW nERow, SCTAB nETab,
-//UNUSED2008-05                                    BOOL bSTotal, BOOL bTextZero ) :
+//UNUSED2008-05                                    sal_Bool bSTotal, sal_Bool bTextZero ) :
 //UNUSED2008-05  pDoc( pDocument ),
 //UNUSED2008-05  nNumFmtIndex(0),
 //UNUSED2008-05  nStartCol( nSCol),
@@ -246,9 +246,9 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr,
 //UNUSED2008-05  nEndRow( nERow),
 //UNUSED2008-05  nEndTab( nETab ),
 //UNUSED2008-05  nNumFmtType( NUMBERFORMAT_UNDEFINED ),
-//UNUSED2008-05  bNumValid( FALSE ),
+//UNUSED2008-05  bNumValid( sal_False ),
 //UNUSED2008-05  bSubTotal(bSTotal),
-//UNUSED2008-05  bNextValid( FALSE ),
+//UNUSED2008-05  bNextValid( sal_False ),
 //UNUSED2008-05  bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() ),
 //UNUSED2008-05  bTextAsZero( bTextZero )
 //UNUSED2008-05  {
@@ -275,7 +275,7 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr,
 //UNUSED2008-05  }
 
 ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange,
-            BOOL bSTotal, BOOL bTextZero ) :
+            sal_Bool bSTotal, sal_Bool bTextZero ) :
     pDoc( pDocument ),
     nNumFmtIndex(0),
     nStartCol( rRange.aStart.Col() ),
@@ -285,9 +285,9 @@ ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange,
     nEndRow( rRange.aEnd.Row() ),
     nEndTab( rRange.aEnd.Tab() ),
     nNumFmtType( NUMBERFORMAT_UNDEFINED ),
-    bNumValid( FALSE ),
+    bNumValid( sal_False ),
     bSubTotal(bSTotal),
-    bNextValid( FALSE ),
+    bNextValid( sal_False ),
     bCalcAsShown( pDocument->GetDocOptions().IsCalcAsShown() ),
     bTextAsZero( bTextZero )
 {
@@ -313,7 +313,7 @@ ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange,
     nAttrEndRow = 0;
 }
 
-BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
+sal_Bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr)
 {
     ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol];
     for (;;)
@@ -332,7 +332,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
                     {
                         // rValue = 0.0;    //! do not change caller's value!
                         rErr = 0;
-                        return FALSE;				// Ende und Aus
+                        return sal_False;				// Ende und Aus
                     }
                 }
                 pCol = &(pDoc->pTab[nTab])->aCol[nCol];
@@ -354,7 +354,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
                 {
                     case CELLTYPE_VALUE:
                     {
-                        bNumValid = FALSE;
+                        bNumValid = sal_False;
                         rValue = ((ScValueCell*)pCell)->GetValue();
                         rErr = 0;
                         --nRow;
@@ -375,7 +375,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
                         {
                             fNextValue = ((ScValueCell*)pCol->pItems[nColRow].pCell)->GetValue();
                             nNextRow = pCol->pItems[nColRow].nRow;
-                            bNextValid = TRUE;
+                            bNextValid = sal_True;
                             if ( bCalcAsShown )
                             {
                                 lcl_IterGetNumberFormat( nNumFormat, pAttrArray,
@@ -384,7 +384,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
                             }
                         }
 
-                        return TRUE;									// gefunden
+                        return sal_True;									// gefunden
                     }
 //                    break;
                     case CELLTYPE_FORMULA:
@@ -396,15 +396,15 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
                             {
                                 rValue = ((ScFormulaCell*)pCell)->GetValue();
                                 nRow--;
-                                bNumValid = FALSE;
-                                return TRUE;							// gefunden
+                                bNumValid = sal_False;
+                                return sal_True;							// gefunden
                             }
                             else if ( bTextAsZero )
                             {
                                 rValue = 0.0;
                                 nRow--;
-                                bNumValid = FALSE;
-                                return TRUE;
+                                bNumValid = sal_False;
+                                return sal_True;
                             }
                         }
                     }
@@ -418,9 +418,9 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
                             rValue = 0.0;
                             nNumFmtType = NUMBERFORMAT_NUMBER;
                             nNumFmtIndex = 0;
-                            bNumValid = TRUE;
+                            bNumValid = sal_True;
                             --nRow;
-                            return TRUE;
+                            return sal_True;
                         }
                     }
                     break;
@@ -436,7 +436,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr)
     }
 }
 
-void ScValueIterator::GetCurNumFmtInfo( short& nType, ULONG& nIndex )
+void ScValueIterator::GetCurNumFmtInfo( short& nType, sal_uLong& nIndex )
 {
     if (!bNumValid)
     {
@@ -463,13 +463,13 @@ void ScValueIterator::GetCurNumFmtInfo( short& nType, ULONG& nIndex )
         }
         else
             nNumFmtType = pDoc->GetFormatTable()->GetType( nNumFmtIndex );
-        bNumValid = TRUE;
+        bNumValid = sal_True;
     }
     nType = nNumFmtType;
     nIndex = nNumFmtIndex;
 }
 
-BOOL ScValueIterator::GetFirst(double& rValue, USHORT& rErr)
+sal_Bool ScValueIterator::GetFirst(double& rValue, sal_uInt16& rErr)
 {
     nCol = nStartCol;
     nRow = nStartRow;
@@ -487,7 +487,7 @@ BOOL ScValueIterator::GetFirst(double& rValue, USHORT& rErr)
 }
 
 /*	ist inline:
-BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr)
+sal_Bool ScValueIterator::GetNext(double& rValue, sal_uInt16& rErr)
 {
     ++nRow;
     return GetThis(rValue, rErr);
@@ -613,7 +613,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
                             nNumFmtType = NUMBERFORMAT_NUMBER;
                             nNumFmtIndex = 0;
                             rValue.mnError = 0;
-                            return TRUE;		// gefunden
+                            return sal_True;		// gefunden
                         }
 //                        break;
                     case CELLTYPE_FORMULA:
@@ -626,7 +626,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue)
                                     nNumFmtIndex, ScAddress( nCol, nRow, nTab ),
                                     pCell );
                                 rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode();
-                                return TRUE;	// gefunden
+                                return sal_True;	// gefunden
                             }
                             else
                                 nRow++;
@@ -955,7 +955,7 @@ bool ScDBQueryDataIterator::GetNext(Value& rValue)
 
 ScCellIterator::ScCellIterator( ScDocument* pDocument,
                                 SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
-                                SCCOL nECol, SCROW nERow, SCTAB nETab, BOOL bSTotal ) :
+                                SCCOL nECol, SCROW nERow, SCTAB nETab, sal_Bool bSTotal ) :
     pDoc( pDocument ),
     nStartCol( nSCol),
     nStartRow( nSRow),
@@ -997,7 +997,7 @@ ScCellIterator::ScCellIterator( ScDocument* pDocument,
 }
 
 ScCellIterator::ScCellIterator
-    ( ScDocument* pDocument, const ScRange& rRange, BOOL bSTotal ) :
+    ( ScDocument* pDocument, const ScRange& rRange, sal_Bool bSTotal ) :
     pDoc( pDocument ),
     nStartCol( rRange.aStart.Col() ),
     nStartRow( rRange.aStart.Row() ),
@@ -1107,14 +1107,14 @@ ScBaseCell* ScCellIterator::GetNext()
 //-------------------------------------------------------------------------------
 
 ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable,
-             const ScQueryParam& rParam, BOOL bMod ) :
+             const ScQueryParam& rParam, sal_Bool bMod ) :
     aParam (rParam),
     pDoc( pDocument ),
     nTab( nTable),
     nStopOnMismatch( nStopOnMismatchDisabled ),
     nTestEqualCondition( nTestEqualConditionDisabled ),
-    bAdvanceQuery( FALSE ),
-    bIgnoreMismatchOnLeadingStrings( FALSE )
+    bAdvanceQuery( sal_False ),
+    bIgnoreMismatchOnLeadingStrings( sal_False )
 {
     nCol = aParam.nCol1;
     nRow = aParam.nRow1;
@@ -1184,7 +1184,7 @@ ScBaseCell* ScQueryCellIterator::GetThis()
                 ++nRow;
             else
             {
-                BOOL bTestEqualCondition;
+                sal_Bool bTestEqualCondition;
                 if ( (pDoc->pTab[nTab])->ValidQuery( nRow, aParam, NULL,
                         (nCol == static_cast<SCCOL>(nFirstQueryField) ? pCell : NULL),
                         (nTestEqualCondition ? &bTestEqualCondition : NULL) ) )
@@ -1276,14 +1276,14 @@ void ScQueryCellIterator::AdvanceQueryParamEntryField()
 }
 
 
-BOOL ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
-        SCROW& nFoundRow, BOOL bSearchForEqualAfterMismatch,
-        BOOL bIgnoreMismatchOnLeadingStringsP )
+sal_Bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
+        SCROW& nFoundRow, sal_Bool bSearchForEqualAfterMismatch,
+        sal_Bool bIgnoreMismatchOnLeadingStringsP )
 {
     nFoundCol = MAXCOL+1;
     nFoundRow = MAXROW+1;
-    SetStopOnMismatch( TRUE );      // assume sorted keys
-    SetTestEqualCondition( TRUE );
+    SetStopOnMismatch( sal_True );      // assume sorted keys
+    SetTestEqualCondition( sal_True );
     bIgnoreMismatchOnLeadingStrings = bIgnoreMismatchOnLeadingStringsP;
     bool bRegExp = aParam.bRegExp && aParam.GetEntry(0).bQueryByString;
     bool bBinary = !bRegExp && aParam.bByRow && (aParam.GetEntry(0).eOp ==
@@ -1335,8 +1335,8 @@ BOOL ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
                 break;  // for
         }
         SCSIZE nColRowSave;
-        bIgnoreMismatchOnLeadingStrings = FALSE;
-        SetTestEqualCondition( FALSE );
+        bIgnoreMismatchOnLeadingStrings = sal_False;
+        SetTestEqualCondition( sal_False );
         do
         {
             nFoundCol = GetCol();
@@ -1347,7 +1347,7 @@ BOOL ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
         nCol = nFoundCol;
         nRow = nFoundRow;
         nColRow = nColRowSave;
-        return TRUE;
+        return sal_True;
     }
     if ( (bSearchForEqualAfterMismatch || aParam.bRegExp) &&
             StoppedOnMismatch() )
@@ -1375,8 +1375,8 @@ BOOL ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
             else
                 break;  // for
         }
-        SetStopOnMismatch( FALSE );
-        SetTestEqualCondition( FALSE );
+        SetStopOnMismatch( sal_False );
+        SetTestEqualCondition( sal_False );
         if (GetNext())
         {
             // Last of a consecutive area, avoid searching the entire parameter
@@ -1388,7 +1388,7 @@ BOOL ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol,
                 nFoundCol = GetCol();
                 nFoundRow = GetRow();
                 nColRowSave = nColRow;
-                SetStopOnMismatch( TRUE );
+                SetStopOnMismatch( sal_True );
             } while (GetNext());
             nCol = nFoundCol;
             nRow = nFoundRow;
@@ -1426,7 +1426,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch()
             pItems[nLo].pCell->HasStringData())
     {
         String aCellStr;
-        ULONG nFormat = pCol->GetNumberFormat( pItems[nLo].nRow);
+        sal_uLong nFormat = pCol->GetNumberFormat( pItems[nLo].nRow);
         ScCellFormat::GetInputString( pItems[nLo].pCell, nFormat, aCellStr,
                 rFormatter);
         sal_Int32 nTmp = pCollator->compareString( aCellStr, *rEntry.pStr);
@@ -1456,7 +1456,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch()
         pCell = pItems[nLastInRange].pCell;
         if (pCell->HasStringData())
         {
-            ULONG nFormat = pCol->GetNumberFormat( pItems[nLastInRange].nRow);
+            sal_uLong nFormat = pCol->GetNumberFormat( pItems[nLastInRange].nRow);
             ScCellFormat::GetInputString( pCell, nFormat, aLastInRangeString,
                     rFormatter);
         }
@@ -1497,7 +1497,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch()
                 bDone = true;
             continue;   // while
         }
-        BOOL bStr = pItems[i].pCell->HasStringData();
+        sal_Bool bStr = pItems[i].pCell->HasStringData();
         nRes = 0;
         // compares are content<query:-1, content>query:1
         // Cell value comparison similar to ScTable::ValidQuery()
@@ -1558,7 +1558,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch()
         else if (bStr && bByString)
         {
             String aCellStr;
-            ULONG nFormat = pCol->GetNumberFormat( pItems[i].nRow);
+            sal_uLong nFormat = pCol->GetNumberFormat( pItems[i].nRow);
             ScCellFormat::GetInputString( pItems[i].pCell, nFormat, aCellStr,
                     rFormatter);
             nRes = pCollator->compareString( aCellStr, *rEntry.pStr);
@@ -1676,7 +1676,7 @@ ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB
     nEndRow( nRow2 ),
     nCol( nCol1 ),
     nRow( nRow1 ),
-    bMore( TRUE )
+    bMore( sal_True )
 {
     SCCOL i;
     SCSIZE nIndex;
@@ -1740,7 +1740,7 @@ ScBaseCell* ScHorizontalCellIterator::GetNext( SCCOL& rCol, SCROW& rRow )
         return NULL;
 }
 
-BOOL ScHorizontalCellIterator::ReturnNext( SCCOL& rCol, SCROW& rRow )
+sal_Bool ScHorizontalCellIterator::ReturnNext( SCCOL& rCol, SCROW& rRow )
 {
     rCol = nCol;
     rRow = nRow;
@@ -1749,14 +1749,14 @@ BOOL ScHorizontalCellIterator::ReturnNext( SCCOL& rCol, SCROW& rRow )
 
 void ScHorizontalCellIterator::Advance()
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCCOL i;
 
     for (i=nCol+1; i<=nEndCol && !bFound; i++)
         if (pNextRows[i-nStartCol] == nRow)
         {
             nCol = i;
-            bFound = TRUE;
+            bFound = sal_True;
         }
 
     if (!bFound)
@@ -1772,12 +1772,12 @@ void ScHorizontalCellIterator::Advance()
         if (nMinRow <= nEndRow)
         {
             nRow = nMinRow;
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 
     if ( !bFound )
-        bMore = FALSE;
+        bMore = sal_False;
 }
 
 //-------------------------------------------------------------------------------
@@ -1797,14 +1797,14 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB
 
     nRow = nStartRow;
     nCol = nStartCol;
-    bRowEmpty = FALSE;
+    bRowEmpty = sal_False;
 
     pIndices	= new SCSIZE[nEndCol-nStartCol+1];
     pNextEnd	= new SCROW[nEndCol-nStartCol+1];
     ppPatterns	= new const ScPatternAttr*[nEndCol-nStartCol+1];
 
     SCROW nSkipTo = MAXROW;
-    BOOL bEmpty = TRUE;
+    sal_Bool bEmpty = sal_True;
     for (i=nStartCol; i<=nEndCol; i++)
     {
         SCCOL nPos = i - nStartCol;
@@ -1823,7 +1823,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB
                 nSkipTo = nThisEnd;			// nSkipTo kann gleich hier gesetzt werden
         }
         else
-            bEmpty = FALSE;					// Attribute gefunden
+            bEmpty = sal_False;					// Attribute gefunden
 
         pIndices[nPos] = nIndex;
         pNextEnd[nPos] = nThisEnd;
@@ -1872,7 +1872,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
         if ( nRow > nEndRow )		// schon am Ende?
             return NULL;			// nichts gefunden
 
-        BOOL bEmpty = TRUE;
+        sal_Bool bEmpty = sal_True;
         SCCOL i;
 
         for ( i = nStartCol; i <= nEndCol; i++)
@@ -1890,7 +1890,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
                     if ( IsDefaultItem( pPattern ) )
                         pPattern = NULL;
                     else
-                        bEmpty = FALSE;					// Attribute gefunden
+                        bEmpty = sal_False;					// Attribute gefunden
 
                     pNextEnd[nPos] = nThisEnd;
                     ppPatterns[nPos] = pPattern;
@@ -1905,7 +1905,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
                 }
             }
             else if ( ppPatterns[nPos] )
-                bEmpty = FALSE;							// Bereich noch nicht zuende
+                bEmpty = sal_False;							// Bereich noch nicht zuende
         }
 
         if (bEmpty)
@@ -1926,7 +1926,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
 
 //-------------------------------------------------------------------------------
 
-inline BOOL IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
+inline sal_Bool IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
 {
     return ( nRow1 > nRow2 ) || ( nRow1 == nRow2 && nCol1 > nCol2 );
 }
@@ -1946,7 +1946,7 @@ ScUsedAreaIterator::~ScUsedAreaIterator()
 {
 }
 
-BOOL ScUsedAreaIterator::GetNext()
+sal_Bool ScUsedAreaIterator::GetNext()
 {
     //	Iteratoren weiterzaehlen
 
@@ -1964,8 +1964,8 @@ BOOL ScUsedAreaIterator::GetNext()
 
     //	naechsten Abschnitt heraussuchen
 
-    BOOL bFound = TRUE;
-    BOOL bUseCell = FALSE;
+    sal_Bool bFound = sal_True;
+    sal_Bool bUseCell = sal_False;
 
     if ( pCell && pPattern )
     {
@@ -1982,7 +1982,7 @@ BOOL ScUsedAreaIterator::GetNext()
         }
         else
         {
-            bUseCell = TRUE;
+            bUseCell = sal_True;
             if ( nAttrRow == nCellRow && nAttrCol1 == nCellCol )		// Attribute auf der Zelle ?
                 pFoundPattern = pPattern;
             else
@@ -1992,7 +1992,7 @@ BOOL ScUsedAreaIterator::GetNext()
     else if ( pCell )					// nur Zelle -> direkt uebernehmen
     {
         pFoundPattern = NULL;
-        bUseCell = TRUE;				// Position von Zelle
+        bUseCell = sal_True;				// Position von Zelle
     }
     else if ( pPattern )				// nur Attribute -> direkt uebernehmen
     {
@@ -2003,7 +2003,7 @@ BOOL ScUsedAreaIterator::GetNext()
         nFoundEndCol = nAttrCol2;
     }
     else								// gar nichts
-        bFound = FALSE;
+        bFound = sal_False;
 
     if ( bUseCell )						// Position von Zelle
     {
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index b1724eabe..2d4aaf63a 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -81,17 +81,17 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-USHORT* ScDocumentPool::pVersionMap1 = 0;
-USHORT* ScDocumentPool::pVersionMap2 = 0;
-USHORT* ScDocumentPool::pVersionMap3 = 0;
-USHORT* ScDocumentPool::pVersionMap4 = 0;
-USHORT* ScDocumentPool::pVersionMap5 = 0;
-USHORT* ScDocumentPool::pVersionMap6 = 0;
-USHORT* ScDocumentPool::pVersionMap7 = 0;
-USHORT* ScDocumentPool::pVersionMap8 = 0;
-USHORT* ScDocumentPool::pVersionMap9 = 0;
-USHORT* ScDocumentPool::pVersionMap10 = 0;
-USHORT* ScDocumentPool::pVersionMap11 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap1 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap2 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap3 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap4 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap5 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap6 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap7 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap8 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap9 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap10 = 0;
+sal_uInt16* ScDocumentPool::pVersionMap11 = 0;
 
 // ATTR_FONT_TWOLINES (not used) was changed to ATTR_USERDEF (not saved in binary format) in 641c
 
@@ -190,7 +190,7 @@ static SfxItemInfo __READONLY_DATA  aItemInfos[] =
 
 // -----------------------------------------------------------------------
 
-ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
+ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, sal_Bool bLoadRefCounts )
 
     :	SfxItemPool	( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScDocumentPool")),
                         ATTR_STARTINDEX, ATTR_ENDINDEX,
@@ -222,9 +222,9 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
 
     pGlobalBorderInnerAttr->SetLine(NULL, BOXINFO_LINE_HORI);
     pGlobalBorderInnerAttr->SetLine(NULL, BOXINFO_LINE_VERT);
-    pGlobalBorderInnerAttr->SetTable(TRUE);
-    pGlobalBorderInnerAttr->SetDist(TRUE);
-    pGlobalBorderInnerAttr->SetMinDist(FALSE);
+    pGlobalBorderInnerAttr->SetTable(sal_True);
+    pGlobalBorderInnerAttr->SetDist(sal_True);
+    pGlobalBorderInnerAttr->SetMinDist(sal_False);
 
     ppPoolDefaults = new SfxPoolItem*[ATTR_ENDINDEX-ATTR_STARTINDEX+1];
 
@@ -262,7 +262,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
     ppPoolDefaults[ ATTR_HOR_JUSTIFY     - ATTR_STARTINDEX ] = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY);
     ppPoolDefaults[	ATTR_INDENT			 - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_INDENT, 0 );
     ppPoolDefaults[ ATTR_VER_JUSTIFY     - ATTR_STARTINDEX ] = new SvxVerJustifyItem( SVX_VER_JUSTIFY_STANDARD, ATTR_VER_JUSTIFY);
-    ppPoolDefaults[ ATTR_STACKED         - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_STACKED, FALSE );
+    ppPoolDefaults[ ATTR_STACKED         - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_STACKED, sal_False );
     ppPoolDefaults[	ATTR_ROTATE_VALUE	 - ATTR_STARTINDEX ] = new SfxInt32Item( ATTR_ROTATE_VALUE, 0 );
     ppPoolDefaults[	ATTR_ROTATE_MODE	 - ATTR_STARTINDEX ] = new SvxRotateModeItem( SVX_ROTATE_MODE_BOTTOM, ATTR_ROTATE_MODE );
     ppPoolDefaults[	ATTR_VERTICAL_ASIAN	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_VERTICAL_ASIAN );
@@ -305,16 +305,16 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
     ppPoolDefaults[	ATTR_PAGE_MAXSIZE	 - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_MAXSIZE );
     ppPoolDefaults[	ATTR_PAGE_HORCENTER	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HORCENTER );
     ppPoolDefaults[	ATTR_PAGE_VERCENTER	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_VERCENTER );
-    ppPoolDefaults[	ATTR_PAGE_ON		 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, TRUE );
-    ppPoolDefaults[	ATTR_PAGE_DYNAMIC	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, TRUE );
-    ppPoolDefaults[	ATTR_PAGE_SHARED	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, TRUE );
-    ppPoolDefaults[	ATTR_PAGE_NOTES		 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NOTES, FALSE );
-    ppPoolDefaults[	ATTR_PAGE_GRID		 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_GRID, FALSE );
-    ppPoolDefaults[	ATTR_PAGE_HEADERS	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HEADERS, FALSE );
+    ppPoolDefaults[	ATTR_PAGE_ON		 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, sal_True );
+    ppPoolDefaults[	ATTR_PAGE_DYNAMIC	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, sal_True );
+    ppPoolDefaults[	ATTR_PAGE_SHARED	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, sal_True );
+    ppPoolDefaults[	ATTR_PAGE_NOTES		 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NOTES, sal_False );
+    ppPoolDefaults[	ATTR_PAGE_GRID		 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_GRID, sal_False );
+    ppPoolDefaults[	ATTR_PAGE_HEADERS	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HEADERS, sal_False );
     ppPoolDefaults[	ATTR_PAGE_CHARTS	 - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_CHARTS );
     ppPoolDefaults[	ATTR_PAGE_OBJECTS	 - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_OBJECTS );
     ppPoolDefaults[	ATTR_PAGE_DRAWINGS	 - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_DRAWINGS );
-    ppPoolDefaults[	ATTR_PAGE_TOPDOWN	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_TOPDOWN, TRUE );
+    ppPoolDefaults[	ATTR_PAGE_TOPDOWN	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_TOPDOWN, sal_True );
     ppPoolDefaults[	ATTR_PAGE_SCALE		 - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALE, 100 );
     ppPoolDefaults[	ATTR_PAGE_SCALETOPAGES-ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 1 );
     ppPoolDefaults[	ATTR_PAGE_FIRSTPAGENO- ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 1 );
@@ -328,8 +328,8 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
     ppPoolDefaults[	ATTR_PAGE_FOOTERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT );
     ppPoolDefaults[	ATTR_PAGE_HEADERSET	 - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_HEADERSET, aSetItemItemSet );
     ppPoolDefaults[	ATTR_PAGE_FOOTERSET	 - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_FOOTERSET, aSetItemItemSet );
-    ppPoolDefaults[	ATTR_PAGE_FORMULAS	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, FALSE );
-    ppPoolDefaults[	ATTR_PAGE_NULLVALS	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, TRUE );
+    ppPoolDefaults[	ATTR_PAGE_FORMULAS	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, sal_False );
+    ppPoolDefaults[	ATTR_PAGE_NULLVALS	 - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, sal_True );
     ppPoolDefaults[ ATTR_PAGE_SCALETO    - ATTR_STARTINDEX ] = new ScPageScaleToItem( 1, 1 );
 //	ppPoolDefaults[	ATTR_ITEM_DOUBLE	 - ATTR_STARTINDEX ] = new ScDoubleItem( ATTR_ITEM_DOUBLE, 0 );
 
@@ -379,7 +379,7 @@ __EXPORT ScDocumentPool::~ScDocumentPool()
 {
     Delete();
 
-    for ( USHORT i=0; i < ATTR_ENDINDEX-ATTR_STARTINDEX+1; i++ )
+    for ( sal_uInt16 i=0; i < ATTR_ENDINDEX-ATTR_STARTINDEX+1; i++ )
     {
         SetRefCount( *ppPoolDefaults[i], 0 );
         delete ppPoolDefaults[i];
@@ -403,12 +403,12 @@ void ScDocumentPool::InitVersionMaps()
 
     //	erste Map: ATTR_LANGUAGE_FORMAT ab sv329 eingefuegt
 
-    const USHORT nMap1Start	= 100;	// alter ATTR_STARTINDEX
-    const USHORT nMap1End	= 157;	// alter ATTR_ENDINDEX
-    const USHORT nMap1Count = nMap1End - nMap1Start + 1;
-    const USHORT nMap1New	= 18;	// ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX
-    pVersionMap1 = new USHORT [ nMap1Count ];
-    USHORT i, j;
+    const sal_uInt16 nMap1Start	= 100;	// alter ATTR_STARTINDEX
+    const sal_uInt16 nMap1End	= 157;	// alter ATTR_ENDINDEX
+    const sal_uInt16 nMap1Count = nMap1End - nMap1Start + 1;
+    const sal_uInt16 nMap1New	= 18;	// ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX
+    pVersionMap1 = new sal_uInt16 [ nMap1Count ];
+    sal_uInt16 i, j;
     for ( i=0, j=nMap1Start; i < nMap1New; i++, j++ )
         pVersionMap1[i] = j;
     // ein Eintrag eingefuegt...
@@ -417,11 +417,11 @@ void ScDocumentPool::InitVersionMaps()
 
     //	zweite Map: ATTR_VALIDDATA und ATTR_CONDITIONAL ab 341 eingefuegt
 
-    const USHORT nMap2Start	= 100;	// ATTR_STARTINDEX
-    const USHORT nMap2End	= 158;	// ATTR_ENDINDEX
-    const USHORT nMap2Count = nMap2End - nMap2Start + 1;
-    const USHORT nMap2New   = 24;	// ATTR_VALIDDATA - ATTR_STARTINDEX
-    pVersionMap2 = new USHORT [ nMap2Count ];
+    const sal_uInt16 nMap2Start	= 100;	// ATTR_STARTINDEX
+    const sal_uInt16 nMap2End	= 158;	// ATTR_ENDINDEX
+    const sal_uInt16 nMap2Count = nMap2End - nMap2Start + 1;
+    const sal_uInt16 nMap2New   = 24;	// ATTR_VALIDDATA - ATTR_STARTINDEX
+    pVersionMap2 = new sal_uInt16 [ nMap2Count ];
     for ( i=0, j=nMap2Start; i < nMap2New; i++, j++ )
         pVersionMap2[i] = j;
     // zwei Eintraege eingefuegt...
@@ -430,11 +430,11 @@ void ScDocumentPool::InitVersionMaps()
 
     //	dritte Map: ATTR_INDENT ab 350 eingefuegt
 
-    const USHORT nMap3Start	= 100;	// ATTR_STARTINDEX
-    const USHORT nMap3End	= 160;	// ATTR_ENDINDEX
-    const USHORT nMap3Count = nMap3End - nMap3Start + 1;
-    const USHORT nMap3New   = 11;	// ATTR_INDENT - ATTR_STARTINDEX
-    pVersionMap3 = new USHORT [ nMap3Count ];
+    const sal_uInt16 nMap3Start	= 100;	// ATTR_STARTINDEX
+    const sal_uInt16 nMap3End	= 160;	// ATTR_ENDINDEX
+    const sal_uInt16 nMap3Count = nMap3End - nMap3Start + 1;
+    const sal_uInt16 nMap3New   = 11;	// ATTR_INDENT - ATTR_STARTINDEX
+    pVersionMap3 = new sal_uInt16 [ nMap3Count ];
     for ( i=0, j=nMap3Start; i < nMap3New; i++, j++ )
         pVersionMap3[i] = j;
     // ein Eintrag eingefuegt...
@@ -443,11 +443,11 @@ void ScDocumentPool::InitVersionMaps()
 
     //	vierte Map: ATTR_ROTATE_VALUE und ATTR_ROTATE_MODE ab 367 eingefuegt
 
-    const USHORT nMap4Start	= 100;	// ATTR_STARTINDEX
-    const USHORT nMap4End	= 161;	// ATTR_ENDINDEX
-    const USHORT nMap4Count = nMap4End - nMap4Start + 1;
-    const USHORT nMap4New   = 14;	// ATTR_ROTATE_VALUE - ATTR_STARTINDEX
-    pVersionMap4 = new USHORT [ nMap4Count ];
+    const sal_uInt16 nMap4Start	= 100;	// ATTR_STARTINDEX
+    const sal_uInt16 nMap4End	= 161;	// ATTR_ENDINDEX
+    const sal_uInt16 nMap4Count = nMap4End - nMap4Start + 1;
+    const sal_uInt16 nMap4New   = 14;	// ATTR_ROTATE_VALUE - ATTR_STARTINDEX
+    pVersionMap4 = new sal_uInt16 [ nMap4Count ];
     for ( i=0, j=nMap4Start; i < nMap4New; i++, j++ )
         pVersionMap4[i] = j;
     // zwei Eintraege eingefuegt...
@@ -456,11 +456,11 @@ void ScDocumentPool::InitVersionMaps()
 
     //	fifth map: CJK..., CTL..., EMPHASISMARK, TWOLINES (12 items) added in 614
 
-    const USHORT nMap5Start	= 100;	// ATTR_STARTINDEX
-    const USHORT nMap5End	= 163;	// ATTR_ENDINDEX
-    const USHORT nMap5Count = nMap5End - nMap5Start + 1;
-    const USHORT nMap5New   = 10;	// ATTR_CJK_FONT - ATTR_STARTINDEX
-    pVersionMap5 = new USHORT [ nMap5Count ];
+    const sal_uInt16 nMap5Start	= 100;	// ATTR_STARTINDEX
+    const sal_uInt16 nMap5End	= 163;	// ATTR_ENDINDEX
+    const sal_uInt16 nMap5Count = nMap5End - nMap5Start + 1;
+    const sal_uInt16 nMap5New   = 10;	// ATTR_CJK_FONT - ATTR_STARTINDEX
+    pVersionMap5 = new sal_uInt16 [ nMap5Count ];
     for ( i=0, j=nMap5Start; i < nMap5New; i++, j++ )
         pVersionMap5[i] = j;
     // 12 entries inserted
@@ -469,11 +469,11 @@ void ScDocumentPool::InitVersionMaps()
 
     // sixth map: ATTR_SCRIPTSPACE, ATTR_HANGPUNCTUATION, ATTR_FORBIDDEN_RULES added in 614d
 
-    const USHORT nMap6Start	= 100;	// ATTR_STARTINDEX
-    const USHORT nMap6End	= 175;	// ATTR_ENDINDEX
-    const USHORT nMap6Count = nMap6End - nMap6Start + 1;
-    const USHORT nMap6New   = 22;	// ATTR_SCRIPTSPACE - ATTR_STARTINDEX
-    pVersionMap6 = new USHORT [ nMap6Count ];
+    const sal_uInt16 nMap6Start	= 100;	// ATTR_STARTINDEX
+    const sal_uInt16 nMap6End	= 175;	// ATTR_ENDINDEX
+    const sal_uInt16 nMap6Count = nMap6End - nMap6Start + 1;
+    const sal_uInt16 nMap6New   = 22;	// ATTR_SCRIPTSPACE - ATTR_STARTINDEX
+    pVersionMap6 = new sal_uInt16 [ nMap6Count ];
     for ( i=0, j=nMap6Start; i < nMap6New; i++, j++ )
         pVersionMap6[i] = j;
     // 3 entries inserted
@@ -482,11 +482,11 @@ void ScDocumentPool::InitVersionMaps()
 
     //	seventh map: ATTR_FONT_WORDLINE, ATTR_FONT_RELIEF, ATTR_HYPHENATE added in 632b
 
-    const USHORT nMap7Start	= 100;	// ATTR_STARTINDEX
-    const USHORT nMap7End	= 178;	// ATTR_ENDINDEX
-    const USHORT nMap7Count = nMap7End - nMap7Start + 1;
-    const USHORT nMap7New   = 22;	// ATTR_FONT_WORDLINE - ATTR_STARTINDEX
-    pVersionMap7 = new USHORT [ nMap7Count ];
+    const sal_uInt16 nMap7Start	= 100;	// ATTR_STARTINDEX
+    const sal_uInt16 nMap7End	= 178;	// ATTR_ENDINDEX
+    const sal_uInt16 nMap7Count = nMap7End - nMap7Start + 1;
+    const sal_uInt16 nMap7New   = 22;	// ATTR_FONT_WORDLINE - ATTR_STARTINDEX
+    pVersionMap7 = new sal_uInt16 [ nMap7Count ];
     for ( i=0, j=nMap7Start; i < nMap7New; i++, j++ )
         pVersionMap7[i] = j;
     // 3 entries inserted
@@ -495,11 +495,11 @@ void ScDocumentPool::InitVersionMaps()
 
     //	eighth map: ATTR_VERTICAL_ASIAN added in 642q
 
-    const USHORT nMap8Start	= 100;	// ATTR_STARTINDEX
-    const USHORT nMap8End	= 181;	// ATTR_ENDINDEX
-    const USHORT nMap8Count = nMap8End - nMap8Start + 1;
-    const USHORT nMap8New   = 34;	// ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX
-    pVersionMap8 = new USHORT [ nMap8Count ];
+    const sal_uInt16 nMap8Start	= 100;	// ATTR_STARTINDEX
+    const sal_uInt16 nMap8End	= 181;	// ATTR_ENDINDEX
+    const sal_uInt16 nMap8Count = nMap8End - nMap8Start + 1;
+    const sal_uInt16 nMap8New   = 34;	// ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX
+    pVersionMap8 = new sal_uInt16 [ nMap8Count ];
     for ( i=0, j=nMap8Start; i < nMap8New; i++, j++ )
         pVersionMap8[i] = j;
     // 1 entry inserted
@@ -508,11 +508,11 @@ void ScDocumentPool::InitVersionMaps()
 
     //	9th map: ATTR_WRITINGDIR added in 643y
 
-    const USHORT nMap9Start	= 100;	// ATTR_STARTINDEX
-    const USHORT nMap9End	= 182;	// ATTR_ENDINDEX
-    const USHORT nMap9Count = nMap9End - nMap9Start + 1;
-    const USHORT nMap9New   = 35;	// ATTR_WRITINGDIR - ATTR_STARTINDEX
-    pVersionMap9 = new USHORT [ nMap9Count ];
+    const sal_uInt16 nMap9Start	= 100;	// ATTR_STARTINDEX
+    const sal_uInt16 nMap9End	= 182;	// ATTR_ENDINDEX
+    const sal_uInt16 nMap9Count = nMap9End - nMap9Start + 1;
+    const sal_uInt16 nMap9New   = 35;	// ATTR_WRITINGDIR - ATTR_STARTINDEX
+    pVersionMap9 = new sal_uInt16 [ nMap9Count ];
     for ( i=0, j=nMap9Start; i < nMap9New; i++, j++ )
         pVersionMap9[i] = j;
     // 1 entry inserted
@@ -523,11 +523,11 @@ void ScDocumentPool::InitVersionMaps()
 
     // 10th map: ATTR_SHRINKTOFIT, ATTR_BORDER_TL_BR, ATTR_BORDER_BL_TR added in 680/dr14
 
-    const USHORT nMap10Start = 100;  // ATTR_STARTINDEX
-    const USHORT nMap10End   = 184;  // ATTR_ENDINDEX
-    const USHORT nMap10Count = nMap10End - nMap10Start + 1;
-    const USHORT nMap10New   = 37;   // ATTR_SHRINKTOFIT - ATTR_STARTINDEX
-    pVersionMap10 = new USHORT [ nMap10Count ];
+    const sal_uInt16 nMap10Start = 100;  // ATTR_STARTINDEX
+    const sal_uInt16 nMap10End   = 184;  // ATTR_ENDINDEX
+    const sal_uInt16 nMap10Count = nMap10End - nMap10Start + 1;
+    const sal_uInt16 nMap10New   = 37;   // ATTR_SHRINKTOFIT - ATTR_STARTINDEX
+    pVersionMap10 = new sal_uInt16 [ nMap10Count ];
     for ( i=0, j=nMap10Start; i < nMap10New; i++, j++ )
         pVersionMap10[i] = j;
     // 3 entries inserted
@@ -536,11 +536,11 @@ void ScDocumentPool::InitVersionMaps()
 
     // 11th map: ATTR_FONT_OVERLINE added in DEV300/overline2
 
-    const USHORT nMap11Start = 100;  // ATTR_STARTINDEX
-    const USHORT nMap11End   = 187;  // ATTR_ENDINDEX
-    const USHORT nMap11Count = nMap11End - nMap11Start + 1;
-    const USHORT nMap11New   = 5;    // ATTR_FONT_OVERLINE - ATTR_STARTINDEX
-    pVersionMap11 = new USHORT [ nMap11Count ];
+    const sal_uInt16 nMap11Start = 100;  // ATTR_STARTINDEX
+    const sal_uInt16 nMap11End   = 187;  // ATTR_ENDINDEX
+    const sal_uInt16 nMap11Count = nMap11End - nMap11Start + 1;
+    const sal_uInt16 nMap11New   = 5;    // ATTR_FONT_OVERLINE - ATTR_STARTINDEX
+    pVersionMap11 = new sal_uInt16 [ nMap11Count ];
     for ( i=0, j=nMap11Start; i < nMap11New; i++, j++ )
         pVersionMap11[i] = j;
     // 1 entry inserted
@@ -583,7 +583,7 @@ void ScDocumentPool::DeleteVersionMaps()
 
 // ----------------------------------------------------------------------------------------
 //
-//	Fuer die Pattern-Attribute (SetItems) kann der USHORT RefCount leicht ueberlaufen
+//	Fuer die Pattern-Attribute (SetItems) kann der sal_uInt16 RefCount leicht ueberlaufen
 //	(z.B. 600 ganze Zeilen abwechselnd formatieren).
 //	Darum wird der RefCount bei SC_MAX_POOLREF festgehalten und nicht mehr hoch- oder
 //	heruntergezaehlt. Dieser RefCount wird dann erst beim naechsten Laden neu gezaehlt.
@@ -592,7 +592,7 @@ void ScDocumentPool::DeleteVersionMaps()
 //	wird (Assertions).
 //
 
-const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, USHORT nWhich )
+const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich )
 {
     if ( rItem.Which() != ATTR_PATTERN )				// nur Pattern ist special
         return SfxItemPool::Put( rItem, nWhich );
@@ -611,13 +611,13 @@ void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem )
 {
     if ( rItem.Which() == ATTR_PATTERN )				// nur Pattern ist special
     {
-        ULONG nRef = rItem.GetRefCount();
-        if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF )
+        sal_uLong nRef = rItem.GetRefCount();
+        if ( nRef >= (sal_uLong) SC_MAX_POOLREF && nRef <= (sal_uLong) SFX_ITEMS_OLD_MAXREF )
         {
-            if ( nRef != (ULONG) SC_SAFE_POOLREF )
+            if ( nRef != (sal_uLong) SC_SAFE_POOLREF )
             {
                 DBG_ERROR("Wer fummelt da an meinen Ref-Counts herum");
-                SetRefCount( (SfxPoolItem&)rItem, (ULONG) SC_SAFE_POOLREF );
+                SetRefCount( (SfxPoolItem&)rItem, (sal_uLong) SC_SAFE_POOLREF );
             }
             return;					// nicht herunterzaehlen
         }
@@ -627,14 +627,14 @@ void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem )
 
 void ScDocumentPool::CheckRef( const SfxPoolItem& rItem )	// static
 {
-    ULONG nRef = rItem.GetRefCount();
-    if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF )
+    sal_uLong nRef = rItem.GetRefCount();
+    if ( nRef >= (sal_uLong) SC_MAX_POOLREF && nRef <= (sal_uLong) SFX_ITEMS_OLD_MAXREF )
     {
         // beim Apply vom Cache wird evtl. um 2 hochgezaehlt (auf MAX+1 oder SAFE+2),
         // heruntergezaehlt wird nur einzeln (in LoadCompleted)
-        DBG_ASSERT( nRef<=(ULONG)SC_MAX_POOLREF+1 || (nRef>=(ULONG)SC_SAFE_POOLREF-1 && nRef<=(ULONG)SC_SAFE_POOLREF+2),
+        DBG_ASSERT( nRef<=(sal_uLong)SC_MAX_POOLREF+1 || (nRef>=(sal_uLong)SC_SAFE_POOLREF-1 && nRef<=(sal_uLong)SC_SAFE_POOLREF+2),
                 "ScDocumentPool::CheckRef" );
-        SetRefCount( (SfxPoolItem&)rItem, (ULONG) SC_SAFE_POOLREF );
+        SetRefCount( (SfxPoolItem&)rItem, (sal_uLong) SC_SAFE_POOLREF );
     }
 }
 
@@ -675,7 +675,7 @@ void ScDocumentPool::CellStyleCreated( const String& rName )
 
 SfxItemPool* __EXPORT ScDocumentPool::Clone() const
 {
-    return new SfxItemPool (*this, TRUE);
+    return new SfxItemPool (*this, sal_True);
 }
 
 SfxItemPresentation lcl_HFPresentation
@@ -691,9 +691,9 @@ SfxItemPresentation lcl_HFPresentation
     const SfxItemSet& rSet = ((const SfxSetItem&)rItem).GetItemSet();
     const SfxPoolItem* pItem;
 
-    if ( SFX_ITEM_SET == rSet.GetItemState(ATTR_PAGE_ON,FALSE,&pItem) )
+    if ( SFX_ITEM_SET == rSet.GetItemState(ATTR_PAGE_ON,sal_False,&pItem) )
     {
-        if( FALSE == ((const SfxBoolItem*)pItem)->GetValue() )
+        if( sal_False == ((const SfxBoolItem*)pItem)->GetValue() )
             return SFX_ITEM_PRESENTATION_NONE;
     }
 
@@ -704,7 +704,7 @@ SfxItemPresentation lcl_HFPresentation
 
     while( pItem )
     {
-        USHORT nWhich = pItem->Which();
+        sal_uInt16 nWhich = pItem->Which();
 
         aText.Erase();
 
@@ -718,14 +718,14 @@ SfxItemPresentation lcl_HFPresentation
             case ATTR_LRSPACE:
             {
                 SvxLRSpaceItem& rLRItem = (SvxLRSpaceItem&)*pItem;
-                USHORT nPropLeftMargin  = rLRItem.GetPropLeft();
-                USHORT nPropRightMargin = rLRItem.GetPropRight();
-                USHORT nLeftMargin, nRightMargin;
+                sal_uInt16 nPropLeftMargin  = rLRItem.GetPropLeft();
+                sal_uInt16 nPropRightMargin = rLRItem.GetPropRight();
+                sal_uInt16 nLeftMargin, nRightMargin;
                 long nTmp;
                 nTmp = rLRItem.GetLeft();
-                nLeftMargin = nTmp < 0 ? 0 : USHORT(nTmp);
+                nLeftMargin = nTmp < 0 ? 0 : sal_uInt16(nTmp);
                 nTmp = rLRItem.GetRight();
-                nRightMargin = nTmp < 0 ? 0 : USHORT(nTmp);
+                nRightMargin = nTmp < 0 ? 0 : sal_uInt16(nTmp);
 
                 aText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
                 if ( 100 != nPropLeftMargin )
@@ -788,7 +788,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
     String&				rText,
     const IntlWrapper* pIntl ) const
 {
-    USHORT	nW = rItem.Which();
+    sal_uInt16	nW = rItem.Which();
     String aStrYes	( ScGlobal::GetRscString(STR_YES) );
     String aStrNo	( ScGlobal::GetRscString(STR_NO) );
     String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": "));
@@ -901,7 +901,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
 
         case ATTR_PAGE_SCALETOPAGES:
         {
-            USHORT	nPagNo = ((const SfxUInt16Item&)rItem).GetValue();
+            sal_uInt16	nPagNo = ((const SfxUInt16Item&)rItem).GetValue();
 
             if( nPagNo )
             {
@@ -934,7 +934,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
 
         case ATTR_PAGE_FIRSTPAGENO:
         {
-            USHORT	nPagNo = ((const SfxUInt16Item&)rItem).GetValue();
+            sal_uInt16	nPagNo = ((const SfxUInt16Item&)rItem).GetValue();
 
             if( nPagNo )
             {
@@ -962,7 +962,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
 
         case ATTR_PAGE_SCALE:
         {
-            USHORT	nPercent = ((const SfxUInt16Item&)rItem).GetValue();
+            sal_uInt16	nPercent = ((const SfxUInt16Item&)rItem).GetValue();
 
             if( nPercent )
             {
@@ -1045,7 +1045,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
     return ePresentation;
 }
 
-SfxMapUnit __EXPORT ScDocumentPool::GetMetric( USHORT nWhich ) const
+SfxMapUnit __EXPORT ScDocumentPool::GetMetric( sal_uInt16 nWhich ) const
 {
     //	eigene Attribute: Twips, alles andere 1/100 mm
 
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 1c1cf3983..a272c7f9d 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -180,40 +180,40 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
         nVisibleTab( 0 ),
         eLinkMode(LM_UNKNOWN),
         bAutoCalc( eMode == SCDOCMODE_DOCUMENT ),
-        bAutoCalcShellDisabled( FALSE ),
-        bForcedFormulaPending( FALSE ),
-        bCalculatingFormulaTree( FALSE ),
+        bAutoCalcShellDisabled( sal_False ),
+        bForcedFormulaPending( sal_False ),
+        bCalculatingFormulaTree( sal_False ),
         bIsClip( eMode == SCDOCMODE_CLIP ),
         bIsUndo( eMode == SCDOCMODE_UNDO ),
-        bIsVisible( FALSE ),
-        bIsEmbedded( FALSE ),
-//		bNoSetDirty( TRUE ),
-        bNoSetDirty( FALSE ),
-        bInsertingFromOtherDoc( FALSE ),
+        bIsVisible( sal_False ),
+        bIsEmbedded( sal_False ),
+//		bNoSetDirty( sal_True ),
+        bNoSetDirty( sal_False ),
+        bInsertingFromOtherDoc( sal_False ),
         bLoadingMedium( false ),
         bImportingXML( false ),
-        bXMLFromWrapper( FALSE ),
-        bCalcingAfterLoad( FALSE ),
-        bNoListening( FALSE ),
-        bIdleDisabled( FALSE ),
-        bInLinkUpdate( FALSE ),
-        bChartListenerCollectionNeedsUpdate( FALSE ),
-        bHasForcedFormulas( FALSE ),
-        bInDtorClear( FALSE ),
-        bExpandRefs( FALSE ),
-        bDetectiveDirty( FALSE ),
+        bXMLFromWrapper( sal_False ),
+        bCalcingAfterLoad( sal_False ),
+        bNoListening( sal_False ),
+        bIdleDisabled( sal_False ),
+        bInLinkUpdate( sal_False ),
+        bChartListenerCollectionNeedsUpdate( sal_False ),
+        bHasForcedFormulas( sal_False ),
+        bInDtorClear( sal_False ),
+        bExpandRefs( sal_False ),
+        bDetectiveDirty( sal_False ),
         nMacroCallMode( SC_MACROCALL_ALLOWED ),
-        bHasMacroFunc( FALSE ),
+        bHasMacroFunc( sal_False ),
         nVisSpellState( 0 ),
         nAsianCompression(SC_ASIANCOMPRESSION_INVALID),
         nAsianKerning(SC_ASIANKERNING_INVALID),
-        bSetDrawDefaults( FALSE ),
-        bPastingDrawFromOtherDoc( FALSE ),
+        bSetDrawDefaults( sal_False ),
+        bPastingDrawFromOtherDoc( sal_False ),
         nInDdeLinkUpdate( 0 ),
-        bInUnoBroadcast( FALSE ),
-        bInUnoListenerCall( FALSE ),
+        bInUnoBroadcast( sal_False ),
+        bInUnoListenerCall( sal_False ),
         eGrammar( formula::FormulaGrammar::GRAM_NATIVE ),
-        bStyleSheetUsageInvalid( TRUE ),
+        bStyleSheetUsageInvalid( sal_True ),
         mbUndoEnabled( true ),
         mbAdjustHeightEnabled( true ),
         mbExecuteLinkEnabled( true ),
@@ -248,8 +248,8 @@ ScDocument::ScDocument( ScDocumentMode	eMode,
     for (SCTAB i=1; i<=MAXTAB; i++)
         pTab[i] = NULL;
 
-    pRangeName = new ScRangeName( 4, 4, FALSE, this );
-    pDBCollection = new ScDBCollection( 4, 4, FALSE, this );
+    pRangeName = new ScRangeName( 4, 4, sal_False, this );
+    pDBCollection = new ScDBCollection( 4, 4, sal_False, this );
     pSelectionAttr = NULL;
     pChartCollection = new ScChartCollection;
     apTemporaryChartLock = std::auto_ptr< ScTemporaryChartLock >( new ScTemporaryChartLock(this) );
@@ -291,7 +291,7 @@ void ScDocument::SetStorageGrammar( formula::FormulaGrammar::Grammar eGram )
 }
 
 
-void ScDocument::SetDocVisible( BOOL bSet )
+void ScDocument::SetDocVisible( sal_Bool bSet )
 {
     //	called from view ctor - only for a visible document,
     //	each new sheet's RTL flag is initialized from the locale
@@ -347,7 +347,7 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
 
         if (!pShell->IsModified())
         {
-            pShell->SetModified( TRUE );
+            pShell->SetModified( sal_True );
             SfxBindings* pBindings = GetViewBindings();
             if (pBindings)
             {
@@ -370,7 +370,7 @@ ScDocument::~ScDocument()
 {
     DBG_ASSERT( !bInLinkUpdate, "bInLinkUpdate in dtor" );
 
-    bInDtorClear = TRUE;
+    bInDtorClear = sal_True;
 
     // first of all disable all refresh timers by deleting the control
     if ( pRefreshTimerControl )
@@ -385,7 +385,7 @@ ScDocument::~ScDocument()
     if ( GetLinkManager() )
     {
         // BaseLinks freigeben
-        for ( USHORT n = pLinkManager->GetServers().Count(); n; )
+        for ( sal_uInt16 n = pLinkManager->GetServers().Count(); n; )
             pLinkManager->GetServers()[ --n ]->Closed();
 
         if ( pLinkManager->GetLinks().Count() )
@@ -415,7 +415,7 @@ ScDocument::~ScDocument()
     delete pUnoRefUndoList;
     delete pUnoListenerCalls;
 
-    Clear( sal_True );              // TRUE = from destructor (needed for SdrModel::ClearModel)
+    Clear( sal_True );              // sal_True = from destructor (needed for SdrModel::ClearModel)
 
     if (pCondFormList)
     {
@@ -528,8 +528,8 @@ ScFieldEditEngine& ScDocument::GetEditEngine()
     if ( !pEditEngine )
     {
         pEditEngine = new ScFieldEditEngine( GetEnginePool(), GetEditPool() );
-        pEditEngine->SetUpdateMode( FALSE );
-        pEditEngine->EnableUndo( FALSE );
+        pEditEngine->SetUpdateMode( sal_False );
+        pEditEngine->EnableUndo( sal_False );
         pEditEngine->SetRefMapMode( MAP_100TH_MM );
         pEditEngine->SetForbiddenCharsTable( xForbiddenCharacters );
     }
@@ -541,8 +541,8 @@ ScNoteEditEngine& ScDocument::GetNoteEngine()
     if ( !pNoteEngine )
     {
         pNoteEngine = new ScNoteEditEngine( GetEnginePool(), GetEditPool() );
-        pNoteEngine->SetUpdateMode( FALSE );
-        pNoteEngine->EnableUndo( FALSE );
+        pNoteEngine->SetUpdateMode( sal_False );
+        pNoteEngine->EnableUndo( sal_False );
         pNoteEngine->SetRefMapMode( MAP_100TH_MM );
         pNoteEngine->SetForbiddenCharsTable( xForbiddenCharacters );
                 const SfxItemSet& rItemSet = GetDefPattern()->GetItemSet();
@@ -604,19 +604,19 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab )
 void ScDocument::DeleteNumberFormat( const sal_uInt32* /* pDelKeys */, sal_uInt32 /* nCount */ )
 {
 /*
-    for (ULONG i = 0; i < nCount; i++)
+    for (sal_uLong i = 0; i < nCount; i++)
         xPoolHelper->GetFormTable()->DeleteEntry(pDelKeys[i]);
 */
 }
 
 void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
-                          ScBaseCell* pCell, ULONG nFormatIndex, BOOL bForceTab )
+                          ScBaseCell* pCell, sal_uLong nFormatIndex, sal_Bool bForceTab )
 {
     if (VALIDTAB(nTab))
     {
         if ( bForceTab && !pTab[nTab] )
         {
-            BOOL bExtras = !bIsUndo;		// Spaltenbreiten, Zeilenhoehen, Flags
+            sal_Bool bExtras = !bIsUndo;		// Spaltenbreiten, Zeilenhoehen, Flags
 
             pTab[nTab] = new ScTable(this, nTab,
                                 String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")),
@@ -629,12 +629,12 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
 }
 
 //UNUSED2009-05 void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell,
-//UNUSED2009-05                             ULONG nFormatIndex, BOOL bForceTab )
+//UNUSED2009-05                             sal_uLong nFormatIndex, sal_Bool bForceTab )
 //UNUSED2009-05 {
 //UNUSED2009-05     SCTAB nTab = rPos.Tab();
 //UNUSED2009-05     if ( bForceTab && !pTab[nTab] )
 //UNUSED2009-05     {
-//UNUSED2009-05         BOOL bExtras = !bIsUndo;        // Spaltenbreiten, Zeilenhoehen, Flags
+//UNUSED2009-05         sal_Bool bExtras = !bIsUndo;        // Spaltenbreiten, Zeilenhoehen, Flags
 //UNUSED2009-05 
 //UNUSED2009-05         pTab[nTab] = new ScTable(this, nTab,
 //UNUSED2009-05                             String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")),
@@ -645,20 +645,20 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
 //UNUSED2009-05         pTab[nTab]->PutCell( rPos, nFormatIndex, pCell );
 //UNUSED2009-05 }
 
-BOOL ScDocument::GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
-                                BOOL bNotes ) const
+sal_Bool ScDocument::GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
+                                sal_Bool bNotes ) const
 {
     if (ValidTab(nTab) && pTab[nTab])
     {
-        BOOL bAny = pTab[nTab]->GetPrintArea( rEndCol, rEndRow, bNotes );
+        sal_Bool bAny = pTab[nTab]->GetPrintArea( rEndCol, rEndRow, bNotes );
         if (pDrawLayer)
         {
             ScRange aDrawRange(0,0,nTab, MAXCOL,MAXROW,nTab);
-            if (DrawGetPrintArea( aDrawRange, TRUE, TRUE ))
+            if (DrawGetPrintArea( aDrawRange, sal_True, sal_True ))
             {
                 if (aDrawRange.aEnd.Col()>rEndCol) rEndCol=aDrawRange.aEnd.Col();
                 if (aDrawRange.aEnd.Row()>rEndRow) rEndRow=aDrawRange.aEnd.Row();
-                bAny = TRUE;
+                bAny = sal_True;
             }
         }
         return bAny;
@@ -666,66 +666,66 @@ BOOL ScDocument::GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
 
     rEndCol = 0;
     rEndRow = 0;
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow,
-                                        SCCOL& rEndCol, BOOL bNotes ) const
+sal_Bool ScDocument::GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow,
+                                        SCCOL& rEndCol, sal_Bool bNotes ) const
 {
     if (ValidTab(nTab) && pTab[nTab])
     {
-        BOOL bAny = pTab[nTab]->GetPrintAreaHor( nStartRow, nEndRow, rEndCol, bNotes );
+        sal_Bool bAny = pTab[nTab]->GetPrintAreaHor( nStartRow, nEndRow, rEndCol, bNotes );
         if (pDrawLayer)
         {
             ScRange aDrawRange(0,nStartRow,nTab, MAXCOL,nEndRow,nTab);
-            if (DrawGetPrintArea( aDrawRange, TRUE, FALSE ))
+            if (DrawGetPrintArea( aDrawRange, sal_True, sal_False ))
             {
                 if (aDrawRange.aEnd.Col()>rEndCol) rEndCol=aDrawRange.aEnd.Col();
-                bAny = TRUE;
+                bAny = sal_True;
             }
         }
         return bAny;
     }
 
     rEndCol = 0;
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol,
-                                        SCROW& rEndRow, BOOL bNotes ) const
+sal_Bool ScDocument::GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol,
+                                        SCROW& rEndRow, sal_Bool bNotes ) const
 {
     if (ValidTab(nTab) && pTab[nTab])
     {
-        BOOL bAny = pTab[nTab]->GetPrintAreaVer( nStartCol, nEndCol, rEndRow, bNotes );
+        sal_Bool bAny = pTab[nTab]->GetPrintAreaVer( nStartCol, nEndCol, rEndRow, bNotes );
         if (pDrawLayer)
         {
             ScRange aDrawRange(nStartCol,0,nTab, nEndCol,MAXROW,nTab);
-            if (DrawGetPrintArea( aDrawRange, FALSE, TRUE ))
+            if (DrawGetPrintArea( aDrawRange, sal_False, sal_True ))
             {
                 if (aDrawRange.aEnd.Row()>rEndRow) rEndRow=aDrawRange.aEnd.Row();
-                bAny = TRUE;
+                bAny = sal_True;
             }
         }
         return bAny;
     }
 
     rEndRow = 0;
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const
+sal_Bool ScDocument::GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const
 {
     if (ValidTab(nTab) && pTab[nTab])
     {
-        BOOL bAny = pTab[nTab]->GetDataStart( rStartCol, rStartRow );
+        sal_Bool bAny = pTab[nTab]->GetDataStart( rStartCol, rStartRow );
         if (pDrawLayer)
         {
             ScRange aDrawRange(0,0,nTab, MAXCOL,MAXROW,nTab);
-            if (DrawGetPrintArea( aDrawRange, TRUE, TRUE ))
+            if (DrawGetPrintArea( aDrawRange, sal_True, sal_True ))
             {
                 if (aDrawRange.aStart.Col()<rStartCol) rStartCol=aDrawRange.aStart.Col();
                 if (aDrawRange.aStart.Row()<rStartRow) rStartRow=aDrawRange.aStart.Row();
-                bAny = TRUE;
+                bAny = sal_True;
             }
         }
         return bAny;
@@ -733,13 +733,13 @@ BOOL ScDocument::GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow )
 
     rStartCol = 0;
     rStartRow = 0;
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos )
+sal_Bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos )
 {
-    if (nOldPos == nNewPos) return FALSE;
-    BOOL bValid = FALSE;
+    if (nOldPos == nNewPos) return sal_False;
+    sal_Bool bValid = sal_False;
     if (VALIDTAB(nOldPos))
     {
         if (pTab[nOldPos])
@@ -747,9 +747,9 @@ BOOL ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos )
             SCTAB nTabCount = GetTableCount();
             if (nTabCount > 1)
             {
-                BOOL bOldAutoCalc = GetAutoCalc();
-                SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
-                SetNoListening( TRUE );
+                sal_Bool bOldAutoCalc = GetAutoCalc();
+                SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
+                SetNoListening( sal_True );
                 ScProgress* pProgress = new ScProgress( GetDocumentShell(),
                     ScGlobal::GetRscString(STR_UNDO_MOVE_TAB), GetCodeCount() );
                 if (nNewPos == SC_TAB_APPEND)
@@ -794,7 +794,7 @@ BOOL ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos )
                 for (i = 0; i <= MAXTAB; i++)
                     if (pTab[i])
                         pTab[i]->UpdateCompile();
-                SetNoListening( FALSE );
+                SetNoListening( sal_False );
                 for (i = 0; i <= MAXTAB; i++)
                     if (pTab[i])
                         pTab[i]->StartAllListeners();
@@ -806,14 +806,14 @@ BOOL ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos )
                 if (pDrawLayer)
                     DrawMovePage( static_cast<sal_uInt16>(nOldPos), static_cast<sal_uInt16>(nNewPos) );
 
-                bValid = TRUE;
+                bValid = sal_True;
             }
         }
     }
     return bValid;
 }
 
-BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyMarked )
+sal_Bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyMarked )
 {
     if (SC_TAB_APPEND == nNewPos ) nNewPos = nMaxTableNumber;
     String aName;
@@ -821,20 +821,20 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
 
     //	vorneweg testen, ob der Prefix als gueltig erkannt wird
     //	wenn nicht, nur doppelte vermeiden
-    BOOL bPrefix = ValidTabName( aName );
+    sal_Bool bPrefix = ValidTabName( aName );
     DBG_ASSERT(bPrefix, "ungueltiger Tabellenname");
     SCTAB nDummy;
 
     CreateValidTabName(aName);
 
-    BOOL bValid;
+    sal_Bool bValid;
     if (bPrefix)
         bValid = ( ValidNewTabName(aName) && (nMaxTableNumber <= MAXTAB) );
     else
         bValid = ( !GetTable( aName, nDummy ) && (nMaxTableNumber <= MAXTAB) );
 
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     if (bValid)
     {
         if (nNewPos == nMaxTableNumber)
@@ -846,7 +846,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
         {
             if (VALIDTAB(nNewPos) && (nNewPos < nMaxTableNumber))
             {
-                SetNoListening( TRUE );
+                SetNoListening( sal_True );
 
                 ScRange aRange( 0,0,nNewPos, MAXCOL,MAXROW,MAXTAB );
                 xColNameRanges->UpdateReference( URM_INSDEL, this, aRange, 0,0,1 );
@@ -873,11 +873,11 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
                     nOldPos++;
                 pTab[nNewPos] = new ScTable(this, nNewPos, aName);
                 ++nMaxTableNumber;
-                bValid = TRUE;
+                bValid = sal_True;
                 for (i = 0; i <= MAXTAB; i++)
                     if (pTab[i] && i != nOldPos && i != nNewPos)
                         pTab[i]->UpdateCompile();
-                SetNoListening( FALSE );
+                SetNoListening( sal_False );
                 for (i = 0; i <= MAXTAB; i++)
                     if (pTab[i] && i != nOldPos && i != nNewPos)
                         pTab[i]->StartAllListeners();
@@ -891,12 +891,12 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
                 pChartListenerCollection->UpdateScheduledSeriesRanges();
             }
             else
-                bValid = FALSE;
+                bValid = sal_False;
         }
     }
     if (bValid)
     {
-        SetNoListening( TRUE );		// noch nicht bei CopyToTable/Insert
+        SetNoListening( sal_True );		// noch nicht bei CopyToTable/Insert
         pTab[nOldPos]->CopyToTable(0, 0, MAXCOL, MAXROW, IDF_ALL, (pOnlyMarked != NULL),
                                         pTab[nNewPos], pOnlyMarked );
         pTab[nNewPos]->SetTabBgColor(pTab[nOldPos]->GetTabBgColor());
@@ -913,8 +913,8 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
         pTab[nOldPos]->UpdateInsertTab(nNewPos);
 
         pTab[nOldPos]->UpdateCompile();
-        pTab[nNewPos]->UpdateCompile( TRUE );	// #67996# maybe already compiled in Clone, but used names need recompilation
-        SetNoListening( FALSE );
+        pTab[nNewPos]->UpdateCompile( sal_True );	// #67996# maybe already compiled in Clone, but used names need recompilation
+        SetNoListening( sal_False );
         pTab[nOldPos]->StartAllListeners();
         pTab[nNewPos]->StartAllListeners();
         SetDirty();
@@ -933,14 +933,14 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
 
 void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String& sModuleSource );
 
-ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
-                                SCTAB nDestPos, BOOL bInsertNew,
-                                BOOL bResultsOnly )
+sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
+                                SCTAB nDestPos, sal_Bool bInsertNew,
+                                sal_Bool bResultsOnly )
 {
-    ULONG nRetVal = 1;						// 0 => Fehler 1 = ok
+    sal_uLong nRetVal = 1;						// 0 => Fehler 1 = ok
                                             // 2 => RefBox, 3 => NameBox
                                             // 4 => beides
-    BOOL bValid = TRUE;
+    sal_Bool bValid = sal_True;
     if (bInsertNew)				// neu einfuegen
     {
         String aName;
@@ -955,19 +955,19 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
             pTab[nDestPos]->DeleteArea( 0,0, MAXCOL,MAXROW, IDF_ALL );
         }
         else
-            bValid = FALSE;
+            bValid = sal_False;
     }
 
     if (bValid)
     {
-        BOOL bOldAutoCalcSrc = FALSE;
-        BOOL bOldAutoCalc = GetAutoCalc();
-        SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
-        SetNoListening( TRUE );
+        sal_Bool bOldAutoCalcSrc = sal_False;
+        sal_Bool bOldAutoCalc = GetAutoCalc();
+        SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
+        SetNoListening( sal_True );
         if ( bResultsOnly )
         {
             bOldAutoCalcSrc = pSrcDoc->GetAutoCalc();
-            pSrcDoc->SetAutoCalc( TRUE );	// falls was berechnet werden muss
+            pSrcDoc->SetAutoCalc( sal_True );	// falls was berechnet werden muss
         }
 
         {
@@ -978,33 +978,33 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                 ScBulkBroadcast aBulkBroadcast( pBASM);
                 pSrcDoc->pTab[nSrcPos]->CopyToTable(0, 0, MAXCOL, MAXROW,
                         ( bResultsOnly ? IDF_ALL & ~IDF_FORMULA : IDF_ALL),
-                        FALSE, pTab[nDestPos] );
+                        sal_False, pTab[nDestPos] );
             }
         }
         pTab[nDestPos]->SetTabNo(nDestPos);
 
         if ( !bResultsOnly )
         {
-            BOOL bNamesLost = FALSE;
-            USHORT nSrcRangeNames = pSrcDoc->pRangeName->GetCount();
+            sal_Bool bNamesLost = sal_False;
+            sal_uInt16 nSrcRangeNames = pSrcDoc->pRangeName->GetCount();
             // array containing range names which might need update of indices
             ScRangeData** pSrcRangeNames = nSrcRangeNames ? new ScRangeData* [nSrcRangeNames] : NULL;
             // the index mapping thereof
             ScRangeData::IndexMap aSrcRangeMap;
-            BOOL bRangeNameReplace = FALSE;
+            sal_Bool bRangeNameReplace = sal_False;
 
             // find named ranges that are used in the source sheet
-            std::set<USHORT> aUsedNames;
+            std::set<sal_uInt16> aUsedNames;
             pSrcDoc->pTab[nSrcPos]->FindRangeNamesInUse( 0, 0, MAXCOL, MAXROW, aUsedNames );
 
-            for (USHORT i = 0; i < nSrcRangeNames; i++)		//! DB-Bereiche Pivot-Bereiche auch !!!
+            for (sal_uInt16 i = 0; i < nSrcRangeNames; i++)		//! DB-Bereiche Pivot-Bereiche auch !!!
             {
                 ScRangeData* pSrcData = (*pSrcDoc->pRangeName)[i];
-                USHORT nOldIndex = pSrcData->GetIndex();
+                sal_uInt16 nOldIndex = pSrcData->GetIndex();
                 bool bInUse = ( aUsedNames.find(nOldIndex) != aUsedNames.end() );
                 if (bInUse)
                 {
-                    USHORT nExisting = 0;
+                    sal_uInt16 nExisting = 0;
                     if ( pRangeName->SearchName( pSrcData->GetName(), nExisting ) )
                     {
                         // the name exists already in the destination document
@@ -1012,13 +1012,13 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                         // (when refreshing links, the existing name is used and the warning not shown)
 
                         ScRangeData* pExistingData = (*pRangeName)[nExisting];
-                        USHORT nExistingIndex = pExistingData->GetIndex();
+                        sal_uInt16 nExistingIndex = pExistingData->GetIndex();
 
                         pSrcRangeNames[i] = NULL;       // don't modify the named range
                         aSrcRangeMap.insert(
                             ScRangeData::IndexMap::value_type(nOldIndex, nExistingIndex));
-                        bRangeNameReplace = TRUE;
-                        bNamesLost = TRUE;
+                        bRangeNameReplace = sal_True;
+                        bNamesLost = sal_True;
                     }
                     else
                     {
@@ -1035,7 +1035,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                         {
                             pData->TransferTabRef( nSrcPos, nDestPos );
                             pSrcRangeNames[i] = pData;
-                            USHORT nNewIndex = pData->GetIndex();
+                            sal_uInt16 nNewIndex = pData->GetIndex();
                             aSrcRangeMap.insert(
                                 ScRangeData::IndexMap::value_type(nOldIndex, nNewIndex));
                             if ( !bRangeNameReplace )
@@ -1053,7 +1053,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
             {
                 // first update all inserted named formulas if they contain other
                 // range names and used indices changed
-                for (USHORT i = 0; i < nSrcRangeNames; i++)		//! DB-Bereiche Pivot-Bereiche auch
+                for (sal_uInt16 i = 0; i < nSrcRangeNames; i++)		//! DB-Bereiche Pivot-Bereiche auch
                 {
                     if ( pSrcRangeNames[i] )
                         pSrcRangeNames[i]->ReplaceRangeNamesInUse( aSrcRangeMap );
@@ -1069,7 +1069,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                                                      MAXCOL, MAXROW, nDestPos,
                                                      0, 0, nDz, NULL);
             // Test for outside absolute references for info box
-            BOOL bIsAbsRef = pSrcDoc->pTab[nSrcPos]->TestTabRefAbs(nSrcPos);
+            sal_Bool bIsAbsRef = pSrcDoc->pTab[nSrcPos]->TestTabRefAbs(nSrcPos);
             // Readjust self-contained absolute references to this sheet
             pTab[nDestPos]->TestTabRefAbs(nSrcPos);
             if (bIsAbsRef)
@@ -1085,7 +1085,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
             pTab[nDestPos]->CompileAll();
         }
 
-        SetNoListening( FALSE );
+        SetNoListening( sal_False );
         if ( !bResultsOnly )
             pTab[nDestPos]->StartAllListeners();
         SetDirty( ScRange( 0, 0, nDestPos, MAXCOL, MAXROW, nDestPos));
@@ -1103,7 +1103,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
     }
     if (!bValid)
         nRetVal = 0;
-    BOOL bVbaEnabled = IsInVBAMode();
+    sal_Bool bVbaEnabled = IsInVBAMode();
 
     if ( bVbaEnabled  )
     {
@@ -1145,16 +1145,16 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
 
 //	----------------------------------------------------------------------------
 
-void ScDocument::SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError)
+void ScDocument::SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const sal_uInt16 nError)
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
             pTab[nTab]->SetError( nCol, nRow, nError );
 }
 
-void ScDocument::EraseNonUsedSharedNames(USHORT nLevel)
+void ScDocument::EraseNonUsedSharedNames(sal_uInt16 nLevel)
 {
-    for (USHORT i = 0; i < pRangeName->GetCount(); i++)
+    for (sal_uInt16 i = 0; i < pRangeName->GetCount(); i++)
     {
         ScRangeData* pRangeData = (*pRangeName)[i];
         if (pRangeData && pRangeData->HasType(RT_SHARED))
@@ -1162,11 +1162,11 @@ void ScDocument::EraseNonUsedSharedNames(USHORT nLevel)
             String aName;
             pRangeData->GetName(aName);
             aName.Erase(0, 6);						// !!! vgl. Table4, FillFormula !!
-            USHORT nInd = (USHORT) aName.ToInt32();
+            sal_uInt16 nInd = (sal_uInt16) aName.ToInt32();
             if (nInd <= nLevel)
             {
-                USHORT nIndex = pRangeData->GetIndex();
-                BOOL bInUse = FALSE;
+                sal_uInt16 nIndex = pRangeData->GetIndex();
+                sal_Bool bInUse = sal_False;
                 for (SCTAB j = 0; !bInUse && (j <= MAXTAB); j++)
                 {
                     if (pTab[j])
@@ -1210,16 +1210,16 @@ ScFieldEditEngine* ScDocument::CreateFieldEditEngine()
     if (!pCacheFieldEditEngine)
     {
         pNewEditEngine = new ScFieldEditEngine( GetEnginePool(),
-            GetEditPool(), FALSE );
+            GetEditPool(), sal_False );
     }
     else
     {
         if ( !bImportingXML )
         {
             // #i66209# previous use might not have restored update mode,
-            // ensure same state as for a new EditEngine (UpdateMode = TRUE)
+            // ensure same state as for a new EditEngine (UpdateMode = sal_True)
             if ( !pCacheFieldEditEngine->GetUpdateMode() )
-                pCacheFieldEditEngine->SetUpdateMode(TRUE);
+                pCacheFieldEditEngine->SetUpdateMode(sal_True);
         }
 
         pNewEditEngine = pCacheFieldEditEngine;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 695160ca0..46f213414 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -105,7 +105,7 @@ void ScDocument::SetRangeName( ScRangeName* pNewRangeName )
 }
 
 //UNUSED2008-05  ScRangeData* ScDocument::GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab,
-//UNUSED2008-05                                              BOOL bStartOnly) const
+//UNUSED2008-05                                              sal_Bool bStartOnly) const
 //UNUSED2008-05  {
 //UNUSED2008-05      if ( pRangeName )
 //UNUSED2008-05          return pRangeName->GetRangeAtCursor( ScAddress( nCol, nRow, nTab ), bStartOnly );
@@ -130,7 +130,7 @@ ScDBCollection* ScDocument::GetDBCollection() const
     return pDBCollection;
 }
 
-void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemoveAutoFilter )
+void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, sal_Bool bRemoveAutoFilter )
 {
     if ( bRemoveAutoFilter )
     {
@@ -139,8 +139,8 @@ void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemove
 
         if ( pDBCollection )
         {
-            USHORT nOldCount = pDBCollection->GetCount();
-            for (USHORT nOld=0; nOld<nOldCount; nOld++)
+            sal_uInt16 nOldCount = pDBCollection->GetCount();
+            for (sal_uInt16 nOld=0; nOld<nOldCount; nOld++)
             {
                 ScDBData* pOldData = (*pDBCollection)[nOld];
                 if ( pOldData->HasAutoFilter() )
@@ -148,8 +148,8 @@ void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemove
                     ScRange aOldRange;
                     pOldData->GetArea( aOldRange );
 
-                    BOOL bFound = FALSE;
-                    USHORT nNewIndex = 0;
+                    sal_Bool bFound = sal_False;
+                    sal_uInt16 nNewIndex = 0;
                     if ( pNewDBCollection &&
                         pNewDBCollection->SearchName( pOldData->GetName(), nNewIndex ) )
                     {
@@ -159,7 +159,7 @@ void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemove
                             ScRange aNewRange;
                             pNewData->GetArea( aNewRange );
                             if ( aOldRange.aStart == aNewRange.aStart )
-                                bFound = TRUE;
+                                bFound = sal_True;
                         }
                     }
 
@@ -181,7 +181,7 @@ void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemove
     pDBCollection = pNewDBCollection;
 }
 
-ScDBData* ScDocument::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const
+ScDBData* ScDocument::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const
 {
     if (pDBCollection)
         return pDBCollection->GetDBAtCursor(nCol, nRow, nTab, bStartOnly);
@@ -209,9 +209,9 @@ ScDPObject* ScDocument::GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const
     if (!pDPCollection)
         return NULL;
 
-    USHORT nCount = pDPCollection->GetCount();
+    sal_uInt16 nCount = pDPCollection->GetCount();
     ScAddress aPos( nCol, nRow, nTab );
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         if ( (*pDPCollection)[i]->GetOutRange().In( aPos ) )
             return (*pDPCollection)[i];
 
@@ -225,7 +225,7 @@ ScDPObject* ScDocument::GetDPAtBlock( const ScRange & rBlock ) const
 
     /* Walk the collection in reverse order to get something of an
      * approximation of MS Excels 'most recent' effect. */
-    USHORT i = pDPCollection->GetCount();
+    sal_uInt16 i = pDPCollection->GetCount();
     while ( i-- > 0 )
         if ( (*pDPCollection)[i]->GetOutRange().In( rBlock ) )
             return (*pDPCollection)[i];
@@ -246,7 +246,7 @@ void ScDocument::StopTemporaryChartLock()
 
 void ScDocument::SetChartListenerCollection(
             ScChartListenerCollection* pNewChartListenerCollection,
-            BOOL bSetChartRangeLists )
+            sal_Bool bSetChartRangeLists )
 {
     ScChartListenerCollection* pOld = pChartListenerCollection;
     pChartListenerCollection = pNewChartListenerCollection;
@@ -259,23 +259,23 @@ void ScDocument::SetChartListenerCollection(
     delete pOld;
 }
 
-void ScDocument::SetScenario( SCTAB nTab, BOOL bFlag )
+void ScDocument::SetScenario( SCTAB nTab, sal_Bool bFlag )
 {
     if (ValidTab(nTab) && pTab[nTab])
         pTab[nTab]->SetScenario(bFlag);
 }
 
-BOOL ScDocument::IsScenario( SCTAB nTab ) const
+sal_Bool ScDocument::IsScenario( SCTAB nTab ) const
 {
     return ValidTab(nTab) && pTab[nTab] &&pTab[nTab]->IsScenario();
     //if (ValidTab(nTab) && pTab[nTab])
     //	return pTab[nTab]->IsScenario();
 
-    //return FALSE;
+    //return sal_False;
 }
 
 void ScDocument::SetScenarioData( SCTAB nTab, const String& rComment,
-                                        const Color& rColor, USHORT nFlags )
+                                        const Color& rColor, sal_uInt16 nFlags )
 {
     if (ValidTab(nTab) && pTab[nTab] && pTab[nTab]->IsScenario())
     {
@@ -306,7 +306,7 @@ bool ScDocument::IsDefaultTabBgColor( SCTAB nTab ) const
 }
 
 void ScDocument::GetScenarioData( SCTAB nTab, String& rComment,
-                                        Color& rColor, USHORT& rFlags ) const
+                                        Color& rColor, sal_uInt16& rFlags ) const
 {
     if (ValidTab(nTab) && pTab[nTab] && pTab[nTab]->IsScenario())
     {
@@ -316,19 +316,19 @@ void ScDocument::GetScenarioData( SCTAB nTab, String& rComment,
     }
 }
 
-void ScDocument::GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const
+void ScDocument::GetScenarioFlags( SCTAB nTab, sal_uInt16& rFlags ) const
 {
     if (VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->IsScenario())
         rFlags = pTab[nTab]->GetScenarioFlags();
 }
 
-BOOL ScDocument::IsLinked( SCTAB nTab ) const
+sal_Bool ScDocument::IsLinked( SCTAB nTab ) const
 {
     return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->IsLinked();
     // euqivalent to
     //if (ValidTab(nTab) && pTab[nTab])
     //	return pTab[nTab]->IsLinked();
-    //return FALSE;
+    //return sal_False;
 }
 
 formula::FormulaGrammar::AddressConvention ScDocument::GetAddressConvention() const
@@ -346,7 +346,7 @@ void ScDocument::SetGrammar( formula::FormulaGrammar::Grammar eGram )
     eGrammar = eGram;
 }
 
-BOOL ScDocument::GetLinkMode( SCTAB nTab ) const
+sal_Bool ScDocument::GetLinkMode( SCTAB nTab ) const
 {
     if (ValidTab(nTab) && pTab[nTab])
         return pTab[nTab]->GetLinkMode();
@@ -381,22 +381,22 @@ const String& ScDocument::GetLinkTab( SCTAB nTab ) const
     return EMPTY_STRING;
 }
 
-ULONG ScDocument::GetLinkRefreshDelay( SCTAB nTab ) const
+sal_uLong ScDocument::GetLinkRefreshDelay( SCTAB nTab ) const
 {
     if (ValidTab(nTab) && pTab[nTab])
         return pTab[nTab]->GetLinkRefreshDelay();
     return 0;
 }
 
-void ScDocument::SetLink( SCTAB nTab, BYTE nMode, const String& rDoc,
+void ScDocument::SetLink( SCTAB nTab, sal_uInt8 nMode, const String& rDoc,
                             const String& rFilter, const String& rOptions,
-                            const String& rTabName, ULONG nRefreshDelay )
+                            const String& rTabName, sal_uLong nRefreshDelay )
 {
     if (ValidTab(nTab) && pTab[nTab])
         pTab[nTab]->SetLink( nMode, rDoc, rFilter, rOptions, rTabName, nRefreshDelay );
 }
 
-BOOL ScDocument::HasLink( const String& rDoc,
+sal_Bool ScDocument::HasLink( const String& rDoc,
                             const String& rFilter, const String& rOptions ) const
 {
     SCTAB nCount = GetTableCount();
@@ -405,18 +405,18 @@ BOOL ScDocument::HasLink( const String& rDoc,
                 && pTab[i]->GetLinkDoc() == rDoc
                 && pTab[i]->GetLinkFlt() == rFilter
                 && pTab[i]->GetLinkOpt() == rOptions)
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab,
+sal_Bool ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab,
         const String& aFileName, const String& aTabName )
 {
     if ( IsClipboard() )
     {
         DBG_ERRORFILE( "LinkExternalTab in Clipboard" );
-        return FALSE;
+        return sal_False;
     }
     rTab = 0;
     String	aFilterName;		// wird vom Loader gefuellt
@@ -424,42 +424,42 @@ BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab,
     sal_uInt32 nLinkCnt = pExtDocOptions ? pExtDocOptions->GetDocSettings().mnLinkCnt : 0;
     ScDocumentLoader aLoader( aFileName, aFilterName, aOptions, nLinkCnt + 1 );
     if ( aLoader.IsError() )
-        return FALSE;
+        return sal_False;
     ScDocument* pSrcDoc = aLoader.GetDocument();
 
     //	Tabelle kopieren
     SCTAB nSrcTab;
     if ( pSrcDoc->GetTable( aTabName, nSrcTab ) )
     {
-        if ( !InsertTab( SC_TAB_APPEND, aDocTab, TRUE ) )
+        if ( !InsertTab( SC_TAB_APPEND, aDocTab, sal_True ) )
         {
             DBG_ERRORFILE("can't insert external document table");
-            return FALSE;
+            return sal_False;
         }
         rTab = GetTableCount() - 1;
         // nicht neu einfuegen, nur Ergebnisse
-        TransferTab( pSrcDoc, nSrcTab, rTab, FALSE, TRUE );
+        TransferTab( pSrcDoc, nSrcTab, rTab, sal_False, sal_True );
     }
     else
-        return FALSE;
+        return sal_False;
 
-    ULONG nRefreshDelay = 0;
+    sal_uLong nRefreshDelay = 0;
 
-    BOOL bWasThere = HasLink( aFileName, aFilterName, aOptions );
+    sal_Bool bWasThere = HasLink( aFileName, aFilterName, aOptions );
     SetLink( rTab, SC_LINK_VALUE, aFileName, aFilterName, aOptions, aTabName, nRefreshDelay );
     if ( !bWasThere )		// Link pro Quelldokument nur einmal eintragen
     {
         ScTableLink* pLink = new ScTableLink( pShell, aFileName, aFilterName, aOptions, nRefreshDelay );
-        pLink->SetInCreate( TRUE );
+        pLink->SetInCreate( sal_True );
         GetLinkManager()->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFileName,
                                         &aFilterName );
         pLink->Update();
-        pLink->SetInCreate( FALSE );
+        pLink->SetInCreate( sal_False );
         SfxBindings* pBindings = GetViewBindings();
         if (pBindings)
             pBindings->Invalidate( SID_LINKS );
     }
-    return TRUE;
+    return sal_True;
 }
 
 ScExternalRefManager* ScDocument::GetExternalRefManager() const
@@ -551,28 +551,28 @@ bool ScDocument::HasAnyCalcNotification() const
     return false;
 }
 
-BOOL ScDocument::HasCalcNotification( SCTAB nTab ) const
+sal_Bool ScDocument::HasCalcNotification( SCTAB nTab ) const
 {
     if (VALIDTAB(nTab) && pTab[nTab])
         return pTab[nTab]->GetCalcNotification();
-    return FALSE;
+    return sal_False;
 }
 
 void ScDocument::SetCalcNotification( SCTAB nTab )
 {
     // set only if not set before
     if (VALIDTAB(nTab) && pTab[nTab] && !pTab[nTab]->GetCalcNotification())
-        pTab[nTab]->SetCalcNotification(TRUE);
+        pTab[nTab]->SetCalcNotification(sal_True);
 }
 
 void ScDocument::ResetCalcNotifications()
 {
     for (SCTAB nTab = 0; nTab <= MAXTAB; nTab++)
         if (pTab[nTab] && pTab[nTab]->GetCalcNotification())
-            pTab[nTab]->SetCalcNotification(FALSE);
+            pTab[nTab]->SetCalcNotification(sal_False);
 }
 
-ScOutlineTable* ScDocument::GetOutlineTable( SCTAB nTab, BOOL bCreate )
+ScOutlineTable* ScDocument::GetOutlineTable( SCTAB nTab, sal_Bool bCreate )
 {
     ScOutlineTable* pVal = NULL;
 
@@ -591,14 +591,14 @@ ScOutlineTable* ScDocument::GetOutlineTable( SCTAB nTab, BOOL bCreate )
     return pVal;
 }
 
-BOOL ScDocument::SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline )
+sal_Bool ScDocument::SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline )
 {
     return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->SetOutlineTable(pNewOutline);
     //if (VALIDTAB(nTab))
     //	if (pTab[nTab])
     //		return pTab[nTab]->SetOutlineTable(pNewOutline);
 
-    //return FALSE;
+    //return sal_False;
 }
 
 void ScDocument::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow,
@@ -608,13 +608,13 @@ void ScDocument::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow,
         pTab[nTab]->DoAutoOutline( nStartCol, nStartRow, nEndCol, nEndRow );
 }
 
-BOOL ScDocument::TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam )
+sal_Bool ScDocument::TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam )
 {
     return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->TestRemoveSubTotals( rParam );
     //if (VALIDTAB(nTab) && pTab[nTab] )
     //	return pTab[nTab]->TestRemoveSubTotals( rParam );
 
-    //return FALSE;
+    //return sal_False;
 }
 
 void ScDocument::RemoveSubTotals( SCTAB nTab, ScSubTotalParam& rParam )
@@ -623,28 +623,28 @@ void ScDocument::RemoveSubTotals( SCTAB nTab, ScSubTotalParam& rParam )
         pTab[nTab]->RemoveSubTotals( rParam );
 }
 
-BOOL ScDocument::DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam )
+sal_Bool ScDocument::DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam )
 {
     return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->DoSubTotals( rParam );
     //if (VALIDTAB(nTab))
     //	if (pTab[nTab])
     //		return pTab[nTab]->DoSubTotals( rParam );
 
-    //return FALSE;
+    //return sal_False;
 }
 
-BOOL ScDocument::HasSubTotalCells( const ScRange& rRange )
+sal_Bool ScDocument::HasSubTotalCells( const ScRange& rRange )
 {
     ScCellIterator aIter( this, rRange );
     ScBaseCell* pCell = aIter.GetFirst();
     while (pCell)
     {
         if ( pCell->GetCellType() == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell)->IsSubTotal() )
-            return TRUE;
+            return sal_True;
 
         pCell = aIter.GetNext();
     }
-    return FALSE;	// none found
+    return sal_False;	// none found
 }
 
 //	kopiert aus diesem Dokument die Zellen von Positionen, an denen in pPosDoc
@@ -658,7 +658,7 @@ void ScDocument::CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc )
             pTab[nTab]->CopyUpdated( pPosDoc->pTab[nTab], pDestDoc->pTab[nTab] );
 }
 
-void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario )
+void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bNewScenario )
 {
     if (ValidTab(nSrcTab) && ValidTab(nDestTab) && pTab[nSrcTab] && pTab[nDestTab])
     {
@@ -666,7 +666,7 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario
         //	und aktuelle Werte in bisher aktive Szenarios zurueckschreiben
 
         ScRangeList aRanges = *pTab[nSrcTab]->GetScenarioRanges();
-        const ULONG nRangeCount = aRanges.Count();
+        const sal_uLong nRangeCount = aRanges.Count();
 
         //	nDestTab ist die Zieltabelle
         for ( SCTAB nTab = nDestTab+1;
@@ -675,27 +675,27 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario
         {
             if ( pTab[nTab]->IsActiveScenario() )		// auch wenn's dasselbe Szenario ist
             {
-                BOOL bTouched = FALSE;
-                for ( ULONG nR=0; nR<nRangeCount && !bTouched; nR++)
+                sal_Bool bTouched = sal_False;
+                for ( sal_uLong nR=0; nR<nRangeCount && !bTouched; nR++)
                 {
                     const ScRange* pRange = aRanges.GetObject(nR);
                     if ( pTab[nTab]->HasScenarioRange( *pRange ) )
-                        bTouched = TRUE;
+                        bTouched = sal_True;
                 }
                 if (bTouched)
                 {
-                    pTab[nTab]->SetActiveScenario(FALSE);
+                    pTab[nTab]->SetActiveScenario(sal_False);
                     if ( pTab[nTab]->GetScenarioFlags() & SC_SCENARIO_TWOWAY )
                         pTab[nTab]->CopyScenarioFrom( pTab[nDestTab] );
                 }
             }
         }
 
-        pTab[nSrcTab]->SetActiveScenario(TRUE);		// da kommt's her...
+        pTab[nSrcTab]->SetActiveScenario(sal_True);		// da kommt's her...
         if (!bNewScenario)							// Daten aus dem ausgewaehlten Szenario kopieren
         {
-            BOOL bOldAutoCalc = GetAutoCalc();
-            SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+            sal_Bool bOldAutoCalc = GetAutoCalc();
+            SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
             pTab[nSrcTab]->CopyScenarioTo( pTab[nDestTab] );
             SetDirty();
             SetAutoCalc( bOldAutoCalc );
@@ -704,7 +704,7 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario
 }
 
 void ScDocument::MarkScenario( SCTAB nSrcTab, SCTAB nDestTab, ScMarkData& rDestMark,
-                                BOOL bResetMark, USHORT nNeededBits ) const
+                                sal_Bool bResetMark, sal_uInt16 nNeededBits ) const
 {
     if (bResetMark)
         rDestMark.ResetMark();
@@ -715,13 +715,13 @@ void ScDocument::MarkScenario( SCTAB nSrcTab, SCTAB nDestTab, ScMarkData& rDestM
     rDestMark.SetAreaTab( nDestTab );
 }
 
-BOOL ScDocument::HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const
+sal_Bool ScDocument::HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const
 {
     return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->HasScenarioRange( rRange );
     //if (ValidTab(nTab) && pTab[nTab])
     //	return pTab[nTab]->HasScenarioRange( rRange );
 
-    //return FALSE;
+    //return sal_False;
 }
 
 const ScRangeList* ScDocument::GetScenarioRanges( SCTAB nTab ) const
@@ -732,28 +732,28 @@ const ScRangeList* ScDocument::GetScenarioRanges( SCTAB nTab ) const
     return NULL;
 }
 
-BOOL ScDocument::IsActiveScenario( SCTAB nTab ) const
+sal_Bool ScDocument::IsActiveScenario( SCTAB nTab ) const
 {
     return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->IsActiveScenario(  );
     //if (ValidTab(nTab) && pTab[nTab])
     //	return pTab[nTab]->IsActiveScenario();
 
-    //return FALSE;
+    //return sal_False;
 }
 
-void ScDocument::SetActiveScenario( SCTAB nTab, BOOL bActive )
+void ScDocument::SetActiveScenario( SCTAB nTab, sal_Bool bActive )
 {
     if (ValidTab(nTab) && pTab[nTab])
         pTab[nTab]->SetActiveScenario( bActive );
 }
 
-BOOL ScDocument::TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const
+sal_Bool ScDocument::TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const
 {
     if (ValidTab(nSrcTab) && ValidTab(nDestTab))
         return pTab[nSrcTab]->TestCopyScenarioTo( pTab[nDestTab] );
 
     DBG_ERROR("falsche Tabelle bei TestCopyScenario");
-    return FALSE;
+    return sal_False;
 }
 
 void ScDocument::AddUnoObject( SfxListener& rObject )
@@ -812,9 +812,9 @@ void ScDocument::BroadcastUno( const SfxHint &rHint )
 {
     if (pUnoBroadcaster)
     {
-        bInUnoBroadcast = TRUE;
+        bInUnoBroadcast = sal_True;
         pUnoBroadcaster->Broadcast( rHint );
-        bInUnoBroadcast = FALSE;
+        bInUnoBroadcast = sal_False;
 
         // During Broadcast notification, Uno objects can add to pUnoListenerCalls.
         // The listener calls must be processed after completing the broadcast,
@@ -829,9 +829,9 @@ void ScDocument::BroadcastUno( const SfxHint &rHint )
             // outermost call executes them all.
 
             ScChartLockGuard aChartLockGuard(this);
-            bInUnoListenerCall = TRUE;
+            bInUnoListenerCall = sal_True;
             pUnoListenerCalls->ExecuteAndClear();
-            bInUnoListenerCall = FALSE;
+            bInUnoListenerCall = sal_False;
         }
     }
 }
@@ -876,7 +876,7 @@ void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode,
                                     SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                    ScDocument* pUndoDoc, BOOL bIncludeDraw,
+                                    ScDocument* pUndoDoc, sal_Bool bIncludeDraw,
                                     bool bUpdateNoteCaptionPos )
 {
     PutInOrder( nCol1, nCol2 );
@@ -884,7 +884,7 @@ void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode,
     PutInOrder( nTab1, nTab2 );
     if (VALIDTAB(nTab1) && VALIDTAB(nTab2))
     {
-        BOOL bExpandRefsOld = IsExpandRefs();
+        sal_Bool bExpandRefsOld = IsExpandRefs();
         if ( eUpdateRefMode == URM_INSDEL && (nDx > 0 || nDy > 0 || nDz > 0) )
             SetExpandRefs( SC_MOD()->GetInputOptions().GetExpandRefs() );
         SCTAB i;
@@ -999,7 +999,7 @@ void ScDocument::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY )
 }
 
 void ScDocument::Fill(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark,
-                        ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
+                        sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
                         double nStepValue, double nMaxValue)
 {
     PutInOrder( nCol1, nCol2 );
@@ -1022,7 +1022,7 @@ String ScDocument::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCRO
 }
 
 void ScDocument::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                    USHORT nFormatNo, const ScMarkData& rMark )
+                                    sal_uInt16 nFormatNo, const ScMarkData& rMark )
 {
     PutInOrder( nStartCol, nEndCol );
     PutInOrder( nStartRow, nEndRow );
@@ -1050,8 +1050,8 @@ void ScDocument::GetAutoFormatData(SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
 void ScDocument::GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
         SCCOL& rCol, SCROW& rRow )
 {
-    USHORT nCommand = rSearchItem.GetCommand();
-    BOOL bReplace = ( nCommand == SVX_SEARCHCMD_REPLACE ||
+    sal_uInt16 nCommand = rSearchItem.GetCommand();
+    sal_Bool bReplace = ( nCommand == SVX_SEARCHCMD_REPLACE ||
         nCommand == SVX_SEARCHCMD_REPLACE_ALL );
     if ( rSearchItem.GetBackward() )
     {
@@ -1133,7 +1133,7 @@ void ScDocument::GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
     }
 }
 
-BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem,
+sal_Bool ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem,
                                 SCCOL& rCol, SCROW& rRow, SCTAB& rTab,
                                 ScMarkData& rMark,
                                 String& rUndoStr, ScDocument* pUndoDoc)
@@ -1142,13 +1142,13 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem,
 
     rMark.MarkToMulti();
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if (VALIDTAB(rTab))
     {
         SCCOL nCol;
         SCROW nRow;
         SCTAB nTab;
-        USHORT nCommand = rSearchItem.GetCommand();
+        sal_uInt16 nCommand = rSearchItem.GetCommand();
         if ( nCommand == SVX_SEARCHCMD_FIND_ALL ||
              nCommand == SVX_SEARCHCMD_REPLACE_ALL )
         {
@@ -1219,36 +1219,36 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem,
 
 //	Outline anpassen
 
-BOOL ScDocument::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow )
+sal_Bool ScDocument::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, sal_Bool bShow )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->UpdateOutlineCol( nStartCol, nEndCol, bShow );
 
     DBG_ERROR("missing tab");
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow )
+sal_Bool ScDocument::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_Bool bShow )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->UpdateOutlineRow( nStartRow, nEndRow, bShow );
 
     DBG_ERROR("missing tab");
-    return FALSE;
+    return sal_False;
 }
 
-void ScDocument::Sort(SCTAB nTab, const ScSortParam& rSortParam, BOOL bKeepQuery)
+void ScDocument::Sort(SCTAB nTab, const ScSortParam& rSortParam, sal_Bool bKeepQuery)
 {
     if ( ValidTab(nTab) && pTab[nTab] )
     {
-        BOOL bOldDisableIdle = IsIdleDisabled();
-        DisableIdle( TRUE );
+        sal_Bool bOldDisableIdle = IsIdleDisabled();
+        DisableIdle( sal_True );
         pTab[nTab]->Sort(rSortParam, bKeepQuery);
         DisableIdle( bOldDisableIdle );
     }
 }
 
-SCSIZE ScDocument::Query(SCTAB nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub)
+SCSIZE ScDocument::Query(SCTAB nTab, const ScQueryParam& rQueryParam, sal_Bool bKeepSub)
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->Query((ScQueryParam&)rQueryParam, bKeepSub);
@@ -1258,13 +1258,13 @@ SCSIZE ScDocument::Query(SCTAB nTab, const ScQueryParam& rQueryParam, BOOL bKeep
 }
 
 
-BOOL ScDocument::ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, BOOL* pSpecial )
+sal_Bool ScDocument::ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, sal_Bool* pSpecial )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->ValidQuery( nRow, rQueryParam, pSpecial );
 
     DBG_ERROR("missing tab");
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1276,19 +1276,19 @@ void ScDocument::GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String&
         rStr.Erase();
 }
 
-BOOL ScDocument::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam)
+sal_Bool ScDocument::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam)
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->CreateQueryParam(nCol1, nRow1, nCol2, nRow2, rQueryParam);
 
     DBG_ERROR("missing tab");
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::HasAutoFilter( SCCOL nCurCol, SCROW nCurRow, SCTAB nCurTab )
+sal_Bool ScDocument::HasAutoFilter( SCCOL nCurCol, SCROW nCurRow, SCTAB nCurTab )
 {
     ScDBData*		pDBData			= GetDBAtCursor( nCurCol, nCurRow, nCurTab );
-    BOOL			bHasAutoFilter	= ( pDBData != NULL );
+    sal_Bool			bHasAutoFilter	= ( pDBData != NULL );
 
     if ( pDBData )
     {
@@ -1296,7 +1296,7 @@ BOOL ScDocument::HasAutoFilter( SCCOL nCurCol, SCROW nCurRow, SCTAB nCurTab )
         {
             SCCOL nCol;
             SCROW nRow;
-            INT16  nFlag;
+            sal_Int16  nFlag;
 
             ScQueryParam aParam;
             pDBData->GetQueryParam( aParam );
@@ -1309,17 +1309,17 @@ BOOL ScDocument::HasAutoFilter( SCCOL nCurCol, SCROW nCurRow, SCTAB nCurTab )
                                 GetValue();
 
                 if ( (nFlag & SC_MF_AUTO) == 0 )
-                    bHasAutoFilter = FALSE;
+                    bHasAutoFilter = sal_False;
             }
         }
         else
-            bHasAutoFilter = FALSE;
+            bHasAutoFilter = sal_False;
     }
 
     return bHasAutoFilter;
 }
 
-BOOL ScDocument::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
+sal_Bool ScDocument::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                                     SCTAB nTab )
 {
     return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow );
@@ -1327,10 +1327,10 @@ BOOL ScDocument::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
     //	if (pTab[nTab])
     //		return pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow );
 
-    //return FALSE;
+    //return sal_False;
 }
 
-BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
+sal_Bool ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                                     SCTAB nTab )
 {
     return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow );
@@ -1338,19 +1338,19 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
     //	if (pTab[nTab])
     //		return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow );
 
-    //return FALSE;
+    //return sal_False;
 }
 
 //
 //	GetFilterEntries - Eintraege fuer AutoFilter-Listbox
 //
 
-BOOL ScDocument::GetFilterEntries(
+sal_Bool ScDocument::GetFilterEntries(
     SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates)
 {
     if ( ValidTab(nTab) && pTab[nTab] && pDBCollection )
     {
-        ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE);	//!??
+        ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, sal_False);	//!??
         if (pDBData)
         {
             SCTAB nAreaTab;
@@ -1390,47 +1390,47 @@ BOOL ScDocument::GetFilterEntries(
                 pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings, rHasDates );
             }
 
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //
 //	GetFilterEntriesArea - Eintraege fuer Filter-Dialog
 //
 
-BOOL ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
+sal_Bool ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow,
                                         SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
     {
         pTab[nTab]->GetFilterEntries( nCol, nStartRow, nEndRow, rStrings, rHasDates );
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //
 //	GetDataEntries - Eintraege fuer Auswahlliste-Listbox (keine Zahlen / Formeln)
 //
 
-BOOL ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                    TypedScStrCollection& rStrings, BOOL bLimit )
+sal_Bool ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
+                                    TypedScStrCollection& rStrings, sal_Bool bLimit )
 {
     if( !bLimit )
     {
         /*  Try to generate the list from list validation. This part is skipped,
-            if bLimit==TRUE, because in that case this function is called to get
+            if bLimit==sal_True, because in that case this function is called to get
             cell values for auto completion on input. */
         sal_uInt32 nValidation = static_cast< const SfxUInt32Item* >( GetAttr( nCol, nRow, nTab, ATTR_VALIDDATA ) )->GetValue();
         if( nValidation )
         {
             const ScValidationData* pData = GetValidationEntry( nValidation );
             if( pData && pData->FillSelectionList( rStrings, ScAddress( nCol, nRow, nTab ) ) )
-                return TRUE;
+                return sal_True;
         }
     }
 
@@ -1438,7 +1438,7 @@ BOOL ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
     //if (ValidTab(nTab) && pTab[nTab])
     //	return pTab[nTab]->GetDataEntries( nCol, nRow, rStrings, bLimit );
 
-    //return FALSE;
+    //return sal_False;
 }
 
 //
@@ -1450,9 +1450,9 @@ BOOL ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
 #define SC_STRTYPE_DBNAMES		3
 #define SC_STRTYPE_HEADERS		4
 
-BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings )
+sal_Bool ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings )
 {
-    USHORT i;
+    sal_uInt16 i;
 
     //
     //	Bereichsnamen
@@ -1460,7 +1460,7 @@ BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings )
 
     if ( pRangeName )
     {
-        USHORT nRangeCount = pRangeName->GetCount();
+        sal_uInt16 nRangeCount = pRangeName->GetCount();
         for ( i=0; i<nRangeCount; i++ )
         {
             ScRangeData* pData = (*pRangeName)[i];
@@ -1479,7 +1479,7 @@ BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings )
 
     if ( pDBCollection )
     {
-        USHORT nDBCount = pDBCollection->GetCount();
+        sal_uInt16 nDBCount = pDBCollection->GetCount();
         for ( i=0; i<nDBCount; i++ )
         {
             ScDBData* pData = (*pDBCollection)[i];
@@ -1499,7 +1499,7 @@ BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings )
     ScRangePairList* pLists[2];
     pLists[0] = GetColNameRanges();
     pLists[1] = GetRowNameRanges();
-    for (USHORT nListNo=0; nListNo<2; nListNo++)
+    for (sal_uInt16 nListNo=0; nListNo<2; nListNo++)
     {
         ScRangePairList* pList = pLists[nListNo];
         if (pList)
@@ -1518,11 +1518,11 @@ BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings )
             }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScDocument::IsEmbedded() const
+sal_Bool ScDocument::IsEmbedded() const
 {
     return bIsEmbedded;
 }
@@ -1563,20 +1563,20 @@ Rectangle ScDocument::GetEmbeddedRect() const						// 1/100 mm
 
 void ScDocument::SetEmbedded( const ScRange& rRange )
 {
-    bIsEmbedded = TRUE;
+    bIsEmbedded = sal_True;
     aEmbedRange = rRange;
 }
 
 void ScDocument::ResetEmbedded()
 {
-    bIsEmbedded = FALSE;
+    bIsEmbedded = sal_False;
     aEmbedRange = ScRange();
 }
 
 
 /** Similar to ScViewData::AddPixelsWhile(), but add height twips and only 
     while result is less than nStopTwips.
-    @return TRUE if advanced at least one row.
+    @return sal_True if advanced at least one row.
  */
 bool lcl_AddTwipsWhile( long & rTwips, long nStopTwips, SCROW & rPosY, SCROW nEndRow, const ScTable * pTable )
 {
@@ -1586,7 +1586,7 @@ bool lcl_AddTwipsWhile( long & rTwips, long nStopTwips, SCROW & rPosY, SCROW nEn
     while (rTwips < nStopTwips && nRow <= nEndRow && !bStop)
     {
         SCROW nHeightEndRow;
-        USHORT nHeight = pTable->GetRowHeight( nRow, NULL, &nHeightEndRow);
+        sal_uInt16 nHeight = pTable->GetRowHeight( nRow, NULL, &nHeightEndRow);
         if (nHeightEndRow > nEndRow)
             nHeightEndRow = nEndRow;
         if (!nHeight)
@@ -1637,13 +1637,13 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect )
     long nSize;
     long nTwips;
     long nAdd;
-    BOOL bEnd;
+    sal_Bool bEnd;
 
     nSize = 0;
     nTwips = (long) (aPosRect.Left() / HMM_PER_TWIPS);
 
     SCCOL nX1 = 0;
-    bEnd = FALSE;
+    bEnd = sal_False;
     while (!bEnd)
     {
         nAdd = (long) pTable->GetColWidth(nX1);
@@ -1653,13 +1653,13 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect )
             ++nX1;
         }
         else
-            bEnd = TRUE;
+            bEnd = sal_True;
     }
 
     nTwips = (long) (aPosRect.Right() / HMM_PER_TWIPS);
 
     SCCOL nX2 = nX1;
-    bEnd = FALSE;
+    bEnd = sal_False;
     while (!bEnd)
     {
         nAdd = (long) pTable->GetColWidth(nX2);
@@ -1669,7 +1669,7 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect )
             ++nX2;
         }
         else
-            bEnd = TRUE;
+            bEnd = sal_True;
     }
 
 
@@ -1693,7 +1693,7 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect )
 
 void ScDocument::SetEmbedded( const Rectangle& rRect )			// aus VisArea (1/100 mm)
 {
-    bIsEmbedded = TRUE;
+    bIsEmbedded = sal_True;
     aEmbedRange = GetRange( nVisibleTab, rRect );
 }
 
@@ -1764,7 +1764,7 @@ void ScDocument::SnapVisArea( Rectangle& rRect ) const
         return;
     }
 
-    BOOL bNegativePage = IsNegativePage( nVisibleTab );
+    sal_Bool bNegativePage = IsNegativePage( nVisibleTab );
     if ( bNegativePage )
         ScDrawLayer::MirrorRectRTL( rRect );        // calculate with positive (LTR) values
 
@@ -1795,24 +1795,24 @@ void ScDocument::SetDocProtection(const ScDocProtection* pProtect)
         pDocProtection.reset(NULL);
 }
 
-BOOL ScDocument::IsDocProtected() const
+sal_Bool ScDocument::IsDocProtected() const
 {
     return pDocProtection.get() && pDocProtection->isProtected();
 }
 
-BOOL ScDocument::IsDocEditable() const
+sal_Bool ScDocument::IsDocEditable() const
 {
     // import into read-only document is possible
     return !IsDocProtected() && ( bImportingXML || mbChangeReadOnlyEnabled || !pShell || !pShell->IsReadOnly() );
 }
 
-BOOL ScDocument::IsTabProtected( SCTAB nTab ) const
+sal_Bool ScDocument::IsTabProtected( SCTAB nTab ) const
 {
     if (VALIDTAB(nTab) && pTab[nTab])
         return pTab[nTab]->IsProtected();
 
     DBG_ERROR("Falsche Tabellennummer");
-    return FALSE;
+    return sal_False;
 }
 
 ScTableProtection* ScDocument::GetTabProtection( SCTAB nTab ) const
@@ -1890,7 +1890,7 @@ void ScDocument::SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageTy
 
 void ScDocument::SetDrawDefaults()
 {
-    bSetDrawDefaults = TRUE;
+    bSetDrawDefaults = sal_True;
     UpdateDrawDefaults();
 }
 
@@ -1973,7 +1973,7 @@ void ScDocument::DoMerge( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
         ApplyFlagsTab( nStartCol+1, nStartRow+1, nEndCol, nEndRow, nTab, SC_MF_HOR | SC_MF_VER );
 
     // remove all covered notes (removed captions are collected by drawing undo if active)
-    USHORT nDelFlag = IDF_NOTE | (bDeleteCaptions ? 0 : IDF_NOCAPTIONS);
+    sal_uInt16 nDelFlag = IDF_NOTE | (bDeleteCaptions ? 0 : IDF_NOCAPTIONS);
     if( nStartCol < nEndCol )
         DeleteAreaTab( nStartCol + 1, nStartRow, nEndCol, nStartRow, nTab, nDelFlag );
     if( nStartRow < nEndRow )
@@ -2032,7 +2032,7 @@ ScDPTableDataCache* ScDocument::GetDPObjectCache( long nID )
 ScDPTableDataCache* ScDocument::GetUsedDPObjectCache ( ScRange rRange ) 
 {
     ScDPTableDataCache* pCache = NULL;
-    USHORT nCount = GetDPCollection()->GetCount();
+    sal_uInt16 nCount = GetDPCollection()->GetCount();
     for ( short i=nCount-1; i>=0 ; i--)
     {
         if ( const ScSheetSourceDesc* pUsedSheetDesc = (*pDPCollection)[i]->GetSheetDesc() )
@@ -2101,8 +2101,8 @@ void ScDocument::RemoveUnusedDPObjectCaches()
     for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ )
     { 
         long  nID = (*iter)->GetId();
-        USHORT nCount = GetDPCollection()->GetCount();
-        USHORT i ;
+        sal_uInt16 nCount = GetDPCollection()->GetCount();
+        sal_uInt16 i ;
         for ( i=0; i<nCount; i++)
         {
             if ( nID ==  (*pDPCollection)[i]->GetCacheId() )
@@ -2123,8 +2123,8 @@ void ScDocument::GetUsedDPObjectCache( std::list<ScDPTableDataCache*>& usedlist
     for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ )
     { 
         long  nID = (*iter)->GetId();
-        USHORT nCount = GetDPCollection()->GetCount();
-        USHORT i=0; 
+        sal_uInt16 nCount = GetDPCollection()->GetCount();
+        sal_uInt16 i=0; 
         for ( i=0; i<nCount; i++)
             if ( nID ==  (*pDPCollection)[i]->GetCacheId() )
                 break;
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index d2cbca2c4..bed74910a 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -61,11 +61,11 @@ using namespace formula;
 // -----------------------------------------------------------------------
 
 // Nach der Regula Falsi Methode
-BOOL ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab,
+sal_Bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab,
                         SCCOL nVCol, SCROW nVRow, SCTAB nVTab,
                         const String& sValStr, double& nX)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     nX = 0.0;
     if (ValidColRow(nFCol, nFRow) && ValidColRow(nVCol, nVRow) &&
         VALIDTAB(nFTab) && VALIDTAB(nVTab) && pTab[nFTab] && pTab[nVTab])
@@ -110,10 +110,10 @@ BOOL ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab,
                 // FIXME FIXME FIXME this might need to be reworked now that we have formula::FormulaErrorToken and ScFormulaResult, double check !!!
                 DBG_ERRORFILE("ScDocument::Solver: -> ScFormulaCell::GetValueAlways might need reimplementation");
                 pCell->Interpret();
-                USHORT nErrCode = pCell->GetErrCode();
+                sal_uInt16 nErrCode = pCell->GetErrCode();
                 nX = pCell->GetValueAlways();
                 if (nErrCode == 0)					// kein fehler beim Rechnen
-                    bRet = TRUE;
+                    bRet = sal_True;
                 delete pCell;
             }
         }
@@ -134,11 +134,11 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
     SCCOL j;
     SCROW k;
     i = 0;
-    BOOL bStop = FALSE;
+    sal_Bool bStop = sal_False;
     while (i <= MAXTAB && !bStop)				// erste markierte Tabelle finden
     {
         if (pTab[i] && rMark.GetTableSelect(i))
-            bStop = TRUE;
+            bStop = sal_True;
         else
             i++;
     }
@@ -173,9 +173,9 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
     aRefData.nCol = nCol1;
     aRefData.nRow = nRow1;
     aRefData.nTab = nTab1;
-    aRefData.SetColRel( TRUE );
-    aRefData.SetRowRel( TRUE );
-    aRefData.SetTabRel( TRUE );
+    aRefData.SetColRel( sal_True );
+    aRefData.SetRowRel( sal_True );
+    aRefData.SetTabRel( sal_True );
     aRefData.CalcRelFromAbs( ScAddress( nCol1, nRow1, nTab1 ) );
 
     ScTokenArray aArr;
@@ -221,11 +221,11 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam,      // Mehrfachopera
     SCCOL j;
     SCROW k;
     i = 0;
-    BOOL bStop = FALSE;
+    sal_Bool bStop = sal_False;
     while (i <= MAXTAB && !bStop)				// erste markierte Tabelle finden
     {
         if (pTab[i] && rMark.GetTableSelect(i))
-            bStop = TRUE;
+            bStop = sal_True;
         else
             i++;
     }
@@ -245,12 +245,12 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam,      // Mehrfachopera
     const String& sSep = ScCompiler::GetNativeSymbol( ocSep);
     if (rParam.nMode == 0)							// nur Spalte
     {
-        aRef.Set( rParam.aRefFormulaCell.GetAddress(), TRUE, FALSE, FALSE );
+        aRef.Set( rParam.aRefFormulaCell.GetAddress(), sal_True, sal_False, sal_False );
         aForString += aRef.GetRefString(this, nTab1);
         aForString += sSep; 
         aForString += rParam.aRefColCell.GetRefString(this, nTab1);
         aForString += sSep;
-        aRef.Set( nCol1, nRow1, nTab1, FALSE, TRUE, TRUE );
+        aRef.Set( nCol1, nRow1, nTab1, sal_False, sal_True, sal_True );
         aForString += aRef.GetRefString(this, nTab1);
         nCol1++;
         nCol2 = Min( nCol2, (SCCOL)(rParam.aRefFormulaEnd.Col() -
@@ -258,12 +258,12 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam,      // Mehrfachopera
     }
     else if (rParam.nMode == 1)					// nur zeilenweise
     {
-        aRef.Set( rParam.aRefFormulaCell.GetAddress(), FALSE, TRUE, FALSE );
+        aRef.Set( rParam.aRefFormulaCell.GetAddress(), sal_False, sal_True, sal_False );
         aForString += aRef.GetRefString(this, nTab1);
         aForString += sSep;
         aForString += rParam.aRefRowCell.GetRefString(this, nTab1);
         aForString += sSep;
-        aRef.Set( nCol1, nRow1, nTab1, TRUE, FALSE, TRUE );
+        aRef.Set( nCol1, nRow1, nTab1, sal_True, sal_False, sal_True );
         aForString += aRef.GetRefString(this, nTab1);
         nRow1++;
         nRow2 = Min( nRow2, (SCROW)(rParam.aRefFormulaEnd.Row() -
@@ -275,12 +275,12 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam,      // Mehrfachopera
         aForString += sSep;
         aForString += rParam.aRefColCell.GetRefString(this, nTab1);
         aForString += sSep;
-        aRef.Set( nCol1, nRow1 + 1, nTab1, FALSE, TRUE, TRUE );
+        aRef.Set( nCol1, nRow1 + 1, nTab1, sal_False, sal_True, sal_True );
         aForString += aRef.GetRefString(this, nTab1);
         aForString += sSep;
         aForString += rParam.aRefRowCell.GetRefString(this, nTab1);
         aForString += sSep;
-        aRef.Set( nCol1 + 1, nRow1, nTab1, TRUE, FALSE, TRUE );
+        aRef.Set( nCol1 + 1, nRow1, nTab1, sal_True, sal_False, sal_True );
         aForString += aRef.GetRefString(this, nTab1);
         nCol1++; nRow1++;
     }
@@ -337,33 +337,33 @@ bool ScDocument::MarkUsedExternalReferences( ScTokenArray & rArr )
     return bAllMarked;
 }
 
-BOOL ScDocument::GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab,
-                        BOOL bInSel, const ScMarkData& rMark) const
+sal_Bool ScDocument::GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab,
+                        sal_Bool bInSel, const ScMarkData& rMark) const
 {
     if (ValidTab(nTab) && pTab[nTab])
         return pTab[nTab]->GetNextSpellingCell( nCol, nRow, bInSel, rMark );
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScDocument::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab,
+sal_Bool ScDocument::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab,
                                         const ScMarkData& rMark )
 {
     if (ValidTab(nTab) && pTab[nTab])
         return pTab[nTab]->GetNextMarkedCell( rCol, rRow, rMark );
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScDocument::ReplaceStyle(const SvxSearchItem& rSearchItem,
+sal_Bool ScDocument::ReplaceStyle(const SvxSearchItem& rSearchItem,
                               SCCOL nCol, SCROW nRow, SCTAB nTab,
                               ScMarkData& rMark,
-                              BOOL bIsUndoP)
+                              sal_Bool bIsUndoP)
 {
     if (pTab[nTab])
         return pTab[nTab]->ReplaceStyle(rSearchItem, nCol, nRow, rMark, bIsUndoP);
     else
-        return FALSE;
+        return sal_False;
 }
 
 void ScDocument::CompileDBFormula()
@@ -374,7 +374,7 @@ void ScDocument::CompileDBFormula()
     }
 }
 
-void ScDocument::CompileDBFormula( BOOL bCreateFormulaString )
+void ScDocument::CompileDBFormula( sal_Bool bCreateFormulaString )
 {
     for (SCTAB i=0; i<=MAXTAB; i++)
     {
@@ -382,7 +382,7 @@ void ScDocument::CompileDBFormula( BOOL bCreateFormulaString )
     }
 }
 
-void ScDocument::CompileNameFormula( BOOL bCreateFormulaString )
+void ScDocument::CompileNameFormula( sal_Bool bCreateFormulaString )
 {
     if ( pCondFormList )
         pCondFormList->CompileAll();	// nach ScNameDlg noetig
@@ -441,7 +441,7 @@ xub_StrLen ScDocument::GetMaxNumberStringLen( sal_uInt16& nPrecision, SCTAB nTab
         return 0;
 }
 
-BOOL ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc,
+sal_Bool ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc,
                                         const ScAddress& rCursor, const ScMarkData& rMark,
                                         double& rResult )
 {
@@ -477,14 +477,14 @@ BOOL ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc,
                 if (aData.nCount)
                     rResult = aData.nVal / (double) aData.nCount;
                 else
-                    aData.bError = TRUE;
+                    aData.bError = sal_True;
                 break;
             case SUBTOTAL_FUNC_MAX:
             case SUBTOTAL_FUNC_MIN:
                 if (aData.nCount)
                     rResult = aData.nVal;
                 else
-                    aData.bError = TRUE;
+                    aData.bError = sal_True;
                 break;
             default:
             {
@@ -498,7 +498,7 @@ BOOL ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc,
     return !aData.bError;
 }
 
-double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat )
+double ScDocument::RoundValueAsShown( double fVal, sal_uLong nFormat )
 {
     short nType;
     if ( (nType = GetFormatTable()->GetType( nFormat )) != NUMBERFORMAT_DATE
@@ -544,7 +544,7 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat )
 //			bedingte Formate und Gueltigkeitsbereiche
 //
 
-ULONG ScDocument::AddCondFormat( const ScConditionalFormat& rNew )
+sal_uLong ScDocument::AddCondFormat( const ScConditionalFormat& rNew )
 {
     if (rNew.IsEmpty())
         return 0;					// leer ist immer 0
@@ -552,12 +552,12 @@ ULONG ScDocument::AddCondFormat( const ScConditionalFormat& rNew )
     if (!pCondFormList)
         pCondFormList = new ScConditionalFormatList;
 
-    ULONG nMax = 0;
-    USHORT nCount = pCondFormList->Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uLong nMax = 0;
+    sal_uInt16 nCount = pCondFormList->Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         const ScConditionalFormat* pForm = (*pCondFormList)[i];
-        ULONG nKey = pForm->GetKey();
+        sal_uLong nKey = pForm->GetKey();
         if ( pForm->EqualEntries( rNew ) )
             return nKey;
         if ( nKey > nMax )
@@ -566,14 +566,14 @@ ULONG ScDocument::AddCondFormat( const ScConditionalFormat& rNew )
 
     // Der Aufruf kann aus ScPatternAttr::PutInPool kommen, darum Clone (echte Kopie)
 
-    ULONG nNewKey = nMax + 1;
+    sal_uLong nNewKey = nMax + 1;
     ScConditionalFormat* pInsert = rNew.Clone(this);
     pInsert->SetKey( nNewKey );
     pCondFormList->InsertNew( pInsert );
     return nNewKey;
 }
 
-ULONG ScDocument::AddValidationEntry( const ScValidationData& rNew )
+sal_uLong ScDocument::AddValidationEntry( const ScValidationData& rNew )
 {
     if (rNew.IsEmpty())
         return 0;					// leer ist immer 0
@@ -581,12 +581,12 @@ ULONG ScDocument::AddValidationEntry( const ScValidationData& rNew )
     if (!pValidationList)
         pValidationList = new ScValidationDataList;
 
-    ULONG nMax = 0;
-    USHORT nCount = pValidationList->Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uLong nMax = 0;
+    sal_uInt16 nCount = pValidationList->Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         const ScValidationData* pData = (*pValidationList)[i];
-        ULONG nKey = pData->GetKey();
+        sal_uLong nKey = pData->GetKey();
         if ( pData->EqualEntries( rNew ) )
             return nKey;
         if ( nKey > nMax )
@@ -595,7 +595,7 @@ ULONG ScDocument::AddValidationEntry( const ScValidationData& rNew )
 
     // Der Aufruf kann aus ScPatternAttr::PutInPool kommen, darum Clone (echte Kopie)
 
-    ULONG nNewKey = nMax + 1;
+    sal_uLong nNewKey = nMax + 1;
     ScValidationData* pInsert = rNew.Clone(this);
     pInsert->SetKey( nNewKey );
     pValidationList->InsertNew( pInsert );
@@ -603,16 +603,16 @@ ULONG ScDocument::AddValidationEntry( const ScValidationData& rNew )
 }
 
 const SfxPoolItem* ScDocument::GetEffItem(
-                        SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const
+                        SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const
 {
     const ScPatternAttr* pPattern = GetPattern( nCol, nRow, nTab );
     if ( pPattern )
     {
         const SfxItemSet& rSet = pPattern->GetItemSet();
         const SfxPoolItem* pItem;
-        if ( rSet.GetItemState( ATTR_CONDITIONAL, TRUE, &pItem ) == SFX_ITEM_SET )
+        if ( rSet.GetItemState( ATTR_CONDITIONAL, sal_True, &pItem ) == SFX_ITEM_SET )
         {
-            ULONG nIndex = ((const SfxUInt32Item*)pItem)->GetValue();
+            sal_uLong nIndex = ((const SfxUInt32Item*)pItem)->GetValue();
             if (nIndex && pCondFormList)
             {
                 const ScConditionalFormat* pForm = pCondFormList->GetFormat( nIndex );
@@ -625,7 +625,7 @@ const SfxPoolItem* ScDocument::GetEffItem(
                         SfxStyleSheetBase* pStyleSheet = xPoolHelper->GetStylePool()->Find(
                                                                 aStyle, SFX_STYLE_FAMILY_PARA );
                         if ( pStyleSheet && pStyleSheet->GetItemSet().GetItemState(
-                                                nWhich, TRUE, &pItem ) == SFX_ITEM_SET )
+                                                nWhich, sal_True, &pItem ) == SFX_ITEM_SET )
                             return pItem;
                     }
                 }
@@ -658,7 +658,7 @@ const SfxItemSet* ScDocument::GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab
 const ScConditionalFormat* ScDocument::GetCondFormat(
                             SCCOL nCol, SCROW nRow, SCTAB nTab ) const
 {
-    ULONG nIndex = ((const SfxUInt32Item*)GetAttr(nCol,nRow,nTab,ATTR_CONDITIONAL))->GetValue();
+    sal_uLong nIndex = ((const SfxUInt32Item*)GetAttr(nCol,nRow,nTab,ATTR_CONDITIONAL))->GetValue();
     if (nIndex)
     {
         if (pCondFormList)
@@ -672,7 +672,7 @@ const ScConditionalFormat* ScDocument::GetCondFormat(
     return NULL;
 }
 
-const ScValidationData*	ScDocument::GetValidationEntry( ULONG nIndex ) const
+const ScValidationData*	ScDocument::GetValidationEntry( sal_uLong nIndex ) const
 {
     if ( pValidationList )
         return pValidationList->GetData( nIndex );
@@ -680,19 +680,19 @@ const ScValidationData*	ScDocument::GetValidationEntry( ULONG nIndex ) const
         return NULL;
 }
 
-void ScDocument::FindConditionalFormat( ULONG nKey, ScRangeList& rRanges )
+void ScDocument::FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges )
 {
     for (SCTAB i=0; i<=MAXTAB && pTab[i]; i++)
         pTab[i]->FindConditionalFormat( nKey, rRanges );
 }
 
-void ScDocument::FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB nTab )
+void ScDocument::FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab )
 {
     if(VALIDTAB(nTab) && pTab[nTab])
         pTab[nTab]->FindConditionalFormat( nKey, rRanges );
 }
 
-void ScDocument::ConditionalChanged( ULONG nKey )
+void ScDocument::ConditionalChanged( sal_uLong nKey )
 {
     if ( nKey && pCondFormList && !bIsClip && !bIsUndo )		// nKey==0 -> noop
     {
@@ -715,7 +715,7 @@ void ScDocument::SetCondFormList(ScConditionalFormatList* pNew)
 
 //------------------------------------------------------------------------
 
-BOOL ScDocument::HasDetectiveOperations() const
+sal_Bool ScDocument::HasDetectiveOperations() const
 {
     return pDetOpList && pDetOpList->Count();
 }
@@ -753,12 +753,12 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew)
 #define SC_DOCCOMP_ROWS		100
 
 
-USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab,
+sal_uInt16 ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab,
                                     ScDocument& rOtherDoc, SCROW nOtherRow, SCTAB nOtherTab,
                                     SCCOL nMaxCol, SCCOLROW* pOtherCols )
 {
-    ULONG nDif = 0;
-    ULONG nUsed = 0;
+    sal_uLong nDif = 0;
+    sal_uLong nUsed = 0;
     for (SCCOL nThisCol=0; nThisCol<=nMaxCol; nThisCol++)
     {
         SCCOL nOtherCol;
@@ -786,20 +786,20 @@ USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab,
     }
 
     if (nUsed > 0)
-        return static_cast<USHORT>((nDif*64)/nUsed);			// max.256 (SC_DOCCOMP_MAXDIFF)
+        return static_cast<sal_uInt16>((nDif*64)/nUsed);			// max.256 (SC_DOCCOMP_MAXDIFF)
 
     DBG_ASSERT(!nDif,"Diff ohne Used");
     return 0;
 }
 
-USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab,
+sal_uInt16 ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab,
                                     ScDocument& rOtherDoc, SCCOL nOtherCol, SCTAB nOtherTab,
                                     SCROW nMaxRow, SCCOLROW* pOtherRows )
 {
     //!	optimieren mit Iterator oder so
 
-    ULONG nDif = 0;
-    ULONG nUsed = 0;
+    sal_uLong nDif = 0;
+    sal_uLong nUsed = 0;
     for (SCROW nThisRow=0; nThisRow<=nMaxRow; nThisRow++)
     {
         SCROW nOtherRow;
@@ -827,17 +827,17 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab,
     }
 
     if (nUsed > 0)
-        return static_cast<USHORT>((nDif*64)/nUsed);	// max.256
+        return static_cast<sal_uInt16>((nDif*64)/nUsed);	// max.256
 
     DBG_ASSERT(!nDif,"Diff ohne Used");
     return 0;
 }
 
 void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW nOtherEndRow,
-                            BOOL bColumns, ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab,
-                            SCCOLROW nEndCol, SCCOLROW* pTranslate, ScProgress* pProgress, ULONG nProAdd )
+                            sal_Bool bColumns, ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab,
+                            SCCOLROW nEndCol, SCCOLROW* pTranslate, ScProgress* pProgress, sal_uLong nProAdd )
 {
-    //	bColumns=TRUE: Zeilen sind Spalten und umgekehrt
+    //	bColumns=sal_True: Zeilen sind Spalten und umgekehrt
 
     SCCOLROW nMaxCont;						// wieviel weiter
     SCCOLROW nMinGood;						// was ist ein Treffer (incl.)
@@ -852,19 +852,19 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW
         nMaxCont = SC_DOCCOMP_ROWS;			// 100 Zeilen
         nMinGood = SC_DOCCOMP_MINGOOD;
     }
-    BOOL bUseTotal = bColumns && !pTranslate;		// nur beim ersten Durchgang
+    sal_Bool bUseTotal = bColumns && !pTranslate;		// nur beim ersten Durchgang
 
 
     SCCOLROW nOtherRow = 0;
-    USHORT nComp;
+    sal_uInt16 nComp;
     SCCOLROW nThisRow;
-    BOOL bTotal = FALSE;		// ueber verschiedene nThisRow beibehalten
+    sal_Bool bTotal = sal_False;		// ueber verschiedene nThisRow beibehalten
     SCCOLROW nUnknown = 0;
     for (nThisRow = 0; nThisRow <= nThisEndRow; nThisRow++)
     {
         SCCOLROW nTempOther = nOtherRow;
-        BOOL bFound = FALSE;
-        USHORT nBest = SC_DOCCOMP_MAXDIFF;
+        sal_Bool bFound = sal_False;
+        sal_uInt16 nBest = SC_DOCCOMP_MAXDIFF;
         SCCOLROW nMax = Min( nOtherEndRow, static_cast<SCCOLROW>(( nTempOther + nMaxCont + nUnknown )) );
         for (SCCOLROW i=nTempOther; i<=nMax && nBest>0; i++)	// bei 0 abbrechen
         {
@@ -876,12 +876,12 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW
             {
                 nTempOther = i;
                 nBest = nComp;
-                bFound = TRUE;
+                bFound = sal_True;
             }
             if ( nComp < SC_DOCCOMP_MAXDIFF || bFound )
-                bTotal = FALSE;
+                bTotal = sal_False;
             else if ( i == nTempOther && bUseTotal )
-                bTotal = TRUE;							// nur ganz oben
+                bTotal = sal_True;							// nur ganz oben
         }
         if ( bFound )
         {
@@ -896,14 +896,14 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW
         }
 
         if (pProgress)
-            pProgress->SetStateOnPercent(nProAdd+static_cast<ULONG>(nThisRow));
+            pProgress->SetStateOnPercent(nProAdd+static_cast<sal_uLong>(nThisRow));
     }
 
     //	Bloecke ohne Uebereinstimmung ausfuellen
 
     SCROW nFillStart = 0;
     SCROW nFillPos = 0;
-    BOOL bInFill = FALSE;
+    sal_Bool bInFill = sal_False;
     for (nThisRow = 0; nThisRow <= nThisEndRow+1; nThisRow++)
     {
         SCROW nThisOther = ( nThisRow <= nThisEndRow ) ? pOtherRows[nThisRow] : (nOtherEndRow+1);
@@ -920,13 +920,13 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW
                         pOtherRows[nFillPos+i] = nFillStart+i;
                 }
 
-                bInFill = FALSE;
+                bInFill = sal_False;
             }
             nFillStart = nThisOther + 1;
             nFillPos = nThisRow + 1;
         }
         else
-            bInFill = TRUE;
+            bInFill = sal_True;
     }
 }
 
@@ -962,7 +962,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
     //	auffuellen, damit einzeln umbenannte Tabellen nicht wegfallen
     SCTAB nFillStart = 0;
     SCTAB nFillPos = 0;
-    BOOL bInFill = FALSE;
+    sal_Bool bInFill = sal_False;
     for (nThisTab = 0; nThisTab <= nThisCount; nThisTab++)
     {
         SCTAB nThisOther = ( nThisTab < nThisCount ) ? pOtherTabs[nThisTab] : nOtherCount;
@@ -980,13 +980,13 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
                             pOtherTabs[nFillPos+i] = nFillStart+i;
                 }
 
-                bInFill = FALSE;
+                bInFill = sal_False;
             }
             nFillStart = nThisOther + 1;
             nFillPos = nThisTab + 1;
         }
         else
-            bInFill = TRUE;
+            bInFill = sal_True;
     }
 
     //
@@ -1008,7 +1008,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
             SCROW nEndRow = Max(nThisEndRow, nOtherEndRow);
             SCCOL nThisCol;
             SCROW nThisRow;
-            ULONG n1,n2;	// fuer AppendDeleteRange
+            sal_uLong n1,n2;	// fuer AppendDeleteRange
 
             //!	ein Progress ueber alle Tabellen ???
             String aTabName;
@@ -1034,23 +1034,23 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
             //!	Spalten vergleichen zweimal mit unterschiedlichem nMinGood ???
 
             // 1
-            FindOrder( pTempRows, nThisEndRow, nOtherEndRow, FALSE,
+            FindOrder( pTempRows, nThisEndRow, nOtherEndRow, sal_False,
                         rOtherDoc, nThisTab, nOtherTab, nEndCol, NULL, &aProgress, 0 );
             // 2
-            FindOrder( pOtherCols, nThisEndCol, nOtherEndCol, TRUE,
+            FindOrder( pOtherCols, nThisEndCol, nOtherEndCol, sal_True,
                         rOtherDoc, nThisTab, nOtherTab, nEndRow, NULL, NULL, 0 );
-            FindOrder( pOtherRows, nThisEndRow, nOtherEndRow, FALSE,
+            FindOrder( pOtherRows, nThisEndRow, nOtherEndRow, sal_False,
                         rOtherDoc, nThisTab, nOtherTab, nThisEndCol,
                         pOtherCols, &aProgress, nThisEndRow );
 
-            ULONG nMatch1 = 0;	// pTempRows, keine Spalten
+            sal_uLong nMatch1 = 0;	// pTempRows, keine Spalten
             for (nThisRow = 0; nThisRow<=nThisEndRow; nThisRow++)
                 if (ValidRow(pTempRows[nThisRow]))
                     nMatch1 += SC_DOCCOMP_MAXDIFF -
                                RowDifferences( nThisRow, nThisTab, rOtherDoc, pTempRows[nThisRow],
                                                 nOtherTab, nEndCol, NULL );
 
-            ULONG nMatch2 = 0;	// pOtherRows, pOtherCols
+            sal_uLong nMatch2 = 0;	// pOtherRows, pOtherCols
             for (nThisRow = 0; nThisRow<=nThisEndRow; nThisRow++)
                 if (ValidRow(pOtherRows[nThisRow]))
                     nMatch2 += SC_DOCCOMP_MAXDIFF -
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index cd011ce22..919a3bc37 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -134,11 +134,11 @@ void ScDocument::UpdateAllCharts()
     if ( !pDrawLayer || !pShell )
         return;
 
-    USHORT nDataCount = pChartCollection->GetCount();
+    sal_uInt16 nDataCount = pChartCollection->GetCount();
     if ( !nDataCount )
         return ;		// nothing to do
 
-    USHORT nPos;
+    sal_uInt16 nPos;
 
     for (SCTAB nTab=0; nTab<=MAXTAB; nTab++)
     {
@@ -208,7 +208,7 @@ void ScDocument::UpdateAllCharts()
     pChartCollection->FreeAll();
 }
 
-BOOL ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName )
+sal_Bool ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName )
 {
     if (pDrawLayer && pTab[nTab])
     {
@@ -228,7 +228,7 @@ BOOL ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName )
                 {
                     if (pName)
                         *pName = ((SdrOle2Obj*)pObject)->GetPersistName();
-                    return TRUE;
+                    return sal_True;
                 }
             }
             pObject = aIter.Next();
@@ -237,12 +237,12 @@ BOOL ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName )
 
     if (pName)
         pName->Erase();
-    return FALSE;					// nix gefunden
+    return sal_False;					// nix gefunden
 }
 
 void ScDocument::UpdateChartArea( const String& rChartName,
-            const ScRange& rNewArea, BOOL bColHeaders, BOOL bRowHeaders,
-            BOOL bAdd )
+            const ScRange& rNewArea, sal_Bool bColHeaders, sal_Bool bRowHeaders,
+            sal_Bool bAdd )
 {
     ScRangeListRef aRLR( new ScRangeList );
     aRLR->Append( rNewArea );
@@ -313,7 +313,7 @@ void ScDocument::SetChartRanges( const String& rChartName, const ::std::vector<
 }
 
 void ScDocument::GetOldChartParameters( const String& rName,
-            ScRangeList& rRanges, BOOL& rColHeaders, BOOL& rRowHeaders )
+            ScRangeList& rRanges, sal_Bool& rColHeaders, sal_Bool& rRowHeaders )
 {
     // used for undo of changing chart source area
 
@@ -362,8 +362,8 @@ void ScDocument::GetOldChartParameters( const String& rName,
 }
 
 void ScDocument::UpdateChartArea( const String& rChartName,
-            const ScRangeListRef& rNewList, BOOL bColHeaders, BOOL bRowHeaders,
-            BOOL bAdd )
+            const ScRangeListRef& rNewList, sal_Bool bColHeaders, sal_Bool bRowHeaders,
+            sal_Bool bAdd )
 {
     if (!pDrawLayer)
         return;
@@ -400,8 +400,8 @@ void ScDocument::UpdateChartArea( const String& rChartName,
                         aNewRanges = new ScRangeList;
                         aNewRanges->Parse( aRangesStr, this );
 
-                        ULONG nAddCount = rNewList->Count();
-                        for ( ULONG nAdd=0; nAdd<nAddCount; nAdd++ )
+                        sal_uLong nAddCount = rNewList->Count();
+                        for ( sal_uLong nAdd=0; nAdd<nAddCount; nAdd++ )
                             aNewRanges->Append( *rNewList->GetObject(nAdd) );
                     }
                     else
@@ -514,15 +514,15 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
     if (!pDrawLayer)
         return;
 
-    USHORT nChartCount = pChartListenerCollection->GetCount();
-    for ( USHORT nIndex = 0; nIndex < nChartCount; nIndex++ )
+    sal_uInt16 nChartCount = pChartListenerCollection->GetCount();
+    for ( sal_uInt16 nIndex = 0; nIndex < nChartCount; nIndex++ )
     {
         ScChartListener* pChartListener =
             (ScChartListener*) (pChartListenerCollection->At(nIndex));
         ScRangeListRef aRLR( pChartListener->GetRangeList() );
         ScRangeListRef aNewRLR( new ScRangeList );
-        BOOL bChanged = FALSE;
-        BOOL bDataChanged = FALSE;
+        sal_Bool bChanged = sal_False;
+        sal_Bool bDataChanged = sal_False;
         for ( ScRangePtr pR = aRLR->First(); pR; pR = aRLR->Next() )
         {
             SCCOL theCol1 = pR->aStart.Col();
@@ -539,7 +539,7 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
                 theCol2,theRow2,theTab2 );
             if ( eRes != UR_NOTHING )
             {
-                bChanged = TRUE;
+                bChanged = sal_True;
                 aNewRLR->Append( ScRange(
                     theCol1, theRow1, theTab1,
                     theCol2, theRow2, theTab2 ));
@@ -553,7 +553,7 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
                     || (pR->aEnd.Tab() - pR->aStart.Tab()
                         != theTab2 - theTab1))) )
                 {
-                    bDataChanged = TRUE;
+                    bDataChanged = sal_True;
                 }
             }
             else
@@ -656,12 +656,12 @@ void ScDocument::SetChartRangeList( const String& rChartName,
 }
 
 
-BOOL ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab )
+sal_Bool ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab )
 {
     if (pTab[nTab])
         return pTab[nTab]->HasData( nCol, nRow );
     else
-        return FALSE;
+        return sal_False;
 }
 
 uno::Reference< embed::XEmbeddedObject >
@@ -700,19 +700,19 @@ uno::Reference< embed::XEmbeddedObject >
     return uno::Reference< embed::XEmbeddedObject >();
 }
 
-BOOL lcl_StringInCollection( const ScStrCollection* pColl, const String& rStr )
+sal_Bool lcl_StringInCollection( const ScStrCollection* pColl, const String& rStr )
 {
     if ( !pColl )
-        return FALSE;
+        return sal_False;
 
     StrData aData( rStr );
-    USHORT nDummy;
+    sal_uInt16 nDummy;
     return pColl->Search( &aData, nDummy );
 }
 
 void ScDocument::UpdateChartListenerCollection()
 {
-    bChartListenerCollectionNeedsUpdate = FALSE;
+    bChartListenerCollectionNeedsUpdate = sal_False;
     if (!pDrawLayer)
         return;
     else
@@ -738,11 +738,11 @@ void ScDocument::UpdateChartListenerCollection()
                     {
                         String aObjName = ((SdrOle2Obj*)pObject)->GetPersistName();
                         aCLSearcher.SetString( aObjName );
-                        USHORT nIndex;
+                        sal_uInt16 nIndex;
                         if ( pChartListenerCollection->Search( &aCLSearcher, nIndex ) )
                         {
                             ((ScChartListener*) (pChartListenerCollection->
-                                At( nIndex )))->SetUsed( TRUE );
+                                At( nIndex )))->SetUsed( sal_True );
                         }
                         else if ( lcl_StringInCollection( pOtherObjects, aObjName ) )
                         {
diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index a64201857..b7e4b08d4 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -69,7 +69,7 @@ const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator()
     return pScriptTypeData->xBreakIter;
 }
 
-BOOL ScDocument::HasStringWeakCharacters( const String& rString )
+sal_Bool ScDocument::HasStringWeakCharacters( const String& rString )
 {
     if (rString.Len())
     {
@@ -84,7 +84,7 @@ BOOL ScDocument::HasStringWeakCharacters( const String& rString )
             {
                 sal_Int16 nType = xBreakIter->getScriptType( aText, nPos );
                 if ( nType == i18n::ScriptType::WEAK )
-                    return TRUE;							// found
+                    return sal_True;							// found
 
                 nPos = xBreakIter->endOfScript( aText, nPos, nType );
             }
@@ -92,13 +92,13 @@ BOOL ScDocument::HasStringWeakCharacters( const String& rString )
         }
     }
 
-    return FALSE;		// none found
+    return sal_False;		// none found
 }
 
-BYTE ScDocument::GetStringScriptType( const String& rString )
+sal_uInt8 ScDocument::GetStringScriptType( const String& rString )
 {
 
-    BYTE nRet = 0;
+    sal_uInt8 nRet = 0;
     if (rString.Len())
     {
         uno::Reference<i18n::XBreakIterator> xBreakIter = GetBreakIterator();
@@ -132,12 +132,12 @@ BYTE ScDocument::GetStringScriptType( const String& rString )
     return nRet;
 }
 
-BYTE ScDocument::GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat )
+sal_uInt8 ScDocument::GetCellScriptType( ScBaseCell* pCell, sal_uLong nNumberFormat )
 {
     if ( !pCell )
         return 0;		// empty
 
-    BYTE nStored = pCell->GetScriptType();
+    sal_uInt8 nStored = pCell->GetScriptType();
     if ( nStored != SC_SCRIPTTYPE_UNKNOWN )			// stored value valid?
         return nStored;								// use stored value
 
@@ -145,14 +145,14 @@ BYTE ScDocument::GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat )
     Color* pColor;
     ScCellFormat::GetString( pCell, nNumberFormat, aStr, &pColor, *xPoolHelper->GetFormTable() );
 
-    BYTE nRet = GetStringScriptType( aStr );
+    sal_uInt8 nRet = GetStringScriptType( aStr );
 
     pCell->SetScriptType( nRet );		// store for later calls
 
     return nRet;
 }
 
-BYTE ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell )
+sal_uInt8 ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell )
 {
     // if cell is not passed, take from document
 
@@ -165,7 +165,7 @@ BYTE ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*
 
     // if script type is set, don't have to get number formats
 
-    BYTE nStored = pCell->GetScriptType();
+    sal_uInt8 nStored = pCell->GetScriptType();
     if ( nStored != SC_SCRIPTTYPE_UNKNOWN )			// stored value valid?
         return nStored;								// use stored value
 
@@ -177,7 +177,7 @@ BYTE ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*
     if ( ((const SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue() )
         pCondSet = GetCondResult( nCol, nRow, nTab );
 
-    ULONG nFormat = pPattern->GetNumberFormat( xPoolHelper->GetFormTable(), pCondSet );
+    sal_uLong nFormat = pPattern->GetNumberFormat( xPoolHelper->GetFormTable(), pCondSet );
     return GetCellScriptType( pCell, nFormat );
 }
 
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 96484dc2f..17fc82aa1 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -63,8 +63,8 @@ extern const ScFormulaCell* pLastFormulaTreeTop;	// cellform.cxx Err527 WorkArou
 // STATIC DATA -----------------------------------------------------------
 
 #ifdef erDEBUG
-ULONG erCountBCAInserts = 0;
-ULONG erCountBCAFinds = 0;
+sal_uLong erCountBCAInserts = 0;
+sal_uLong erCountBCAFinds = 0;
 #endif
 
 // -----------------------------------------------------------------------
@@ -87,7 +87,7 @@ void ScDocument::EndListeningArea( const ScRange& rRange,
 }
 
 
-void ScDocument::Broadcast( ULONG nHint, const ScAddress& rAddr,
+void ScDocument::Broadcast( sal_uLong nHint, const ScAddress& rAddr,
         ScBaseCell* pCell
     )
 {
@@ -105,7 +105,7 @@ void ScDocument::Broadcast( const ScHint& rHint )
     if ( !nHardRecalcState )
     {
         ScBulkBroadcast aBulkBroadcast( pBASM);     // scoped bulk broadcast
-        BOOL bIsBroadcasted = FALSE;
+        sal_Bool bIsBroadcasted = sal_False;
         ScBaseCell* pCell = rHint.GetCell();
         if ( pCell )
         {
@@ -113,7 +113,7 @@ void ScDocument::Broadcast( const ScHint& rHint )
             if ( pBC )
             {
                 pBC->Broadcast( rHint );
-                bIsBroadcasted = TRUE;
+                bIsBroadcasted = sal_True;
             }
         }
         if ( pBASM->AreaBroadcast( rHint ) || bIsBroadcasted )
@@ -128,7 +128,7 @@ void ScDocument::Broadcast( const ScHint& rHint )
     {
         SCTAB nTab = rHint.GetAddress().Tab();
         if (pTab[nTab] && pTab[nTab]->IsStreamValid())
-            pTab[nTab]->SetStreamValid(FALSE);
+            pTab[nTab]->SetStreamValid(sal_False);
     }
 }
 
@@ -252,7 +252,7 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell )
             pEOFormulaTree = pPrev;			// ist letzte Zelle
         pCell->SetPrevious( 0 );
         pCell->SetNext( 0 );
-        USHORT nRPN = pCell->GetCode()->GetCodeLen();
+        sal_uInt16 nRPN = pCell->GetCode()->GetCodeLen();
         if ( nFormulaCodeInTree >= nRPN )
             nFormulaCodeInTree -= nRPN;
         else
@@ -269,27 +269,27 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell )
 }
 
 
-BOOL ScDocument::IsInFormulaTree( ScFormulaCell* pCell ) const
+sal_Bool ScDocument::IsInFormulaTree( ScFormulaCell* pCell ) const
 {
     return pCell->GetPrevious() || pFormulaTree == pCell;
 }
 
 
-void ScDocument::CalcFormulaTree( BOOL bOnlyForced, BOOL bNoProgress )
+void ScDocument::CalcFormulaTree( sal_Bool bOnlyForced, sal_Bool bNoProgress )
 {
     DBG_ASSERT( !IsCalculatingFormulaTree(), "CalcFormulaTree recursion" );
     // never ever recurse into this, might end up lost in infinity
     if ( IsCalculatingFormulaTree() )
         return ;
-    bCalculatingFormulaTree = TRUE;
+    bCalculatingFormulaTree = sal_True;
 
-    SetForcedFormulaPending( FALSE );
-    BOOL bOldIdleDisabled = IsIdleDisabled();
-    DisableIdle( TRUE );
-    BOOL bOldAutoCalc = GetAutoCalc();
-    //! _nicht_ SetAutoCalc( TRUE ) weil das evtl. CalcFormulaTree( TRUE )
+    SetForcedFormulaPending( sal_False );
+    sal_Bool bOldIdleDisabled = IsIdleDisabled();
+    DisableIdle( sal_True );
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    //! _nicht_ SetAutoCalc( sal_True ) weil das evtl. CalcFormulaTree( sal_True )
     //! aufruft, wenn vorher disabled war und bHasForcedFormulas gesetzt ist
-    bAutoCalc = TRUE;
+    bAutoCalc = sal_True;
     if ( nHardRecalcState )
         CalcAll();
     else
@@ -317,9 +317,9 @@ void ScDocument::CalcFormulaTree( BOOL bOnlyForced, BOOL bNoProgress )
                 }
             }
         }
-        BOOL bProgress = !bOnlyForced && nFormulaCodeInTree && !bNoProgress;
+        sal_Bool bProgress = !bOnlyForced && nFormulaCodeInTree && !bNoProgress;
         if ( bProgress )
-            ScProgress::CreateInterpretProgress( this, TRUE );
+            ScProgress::CreateInterpretProgress( this, sal_True );
 
         pCell = pFormulaTree;
         ScFormulaCell* pLastNoGood = 0;
@@ -377,7 +377,7 @@ void ScDocument::CalcFormulaTree( BOOL bOnlyForced, BOOL bNoProgress )
     }
     bAutoCalc = bOldAutoCalc;
     DisableIdle( bOldIdleDisabled );
-    bCalculatingFormulaTree = FALSE;
+    bCalculatingFormulaTree = sal_False;
 }
 
 
@@ -435,7 +435,7 @@ void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell )
 }
 
 
-BOOL ScDocument::IsInFormulaTrack( ScFormulaCell* pCell ) const
+sal_Bool ScDocument::IsInFormulaTrack( ScFormulaCell* pCell ) const
 {
     return pCell->GetPreviousTrack() || pFormulaTrack == pCell;
 }
@@ -447,7 +447,7 @@ BOOL ScDocument::IsInFormulaTrack( ScFormulaCell* pCell ) const
     Der nachfolgende broadcastet wieder usw.
     View stoesst Interpret an.
  */
-void ScDocument::TrackFormulas( ULONG nHintId )
+void ScDocument::TrackFormulas( sal_uLong nHintId )
 {
 
     if ( pFormulaTrack )
@@ -474,24 +474,24 @@ void ScDocument::TrackFormulas( ULONG nHintId )
             pTrack = pTrack->GetNextTrack();
         } while ( pTrack );
         pTrack = pFormulaTrack;
-        BOOL bHaveForced = FALSE;
+        sal_Bool bHaveForced = sal_False;
         do
         {
             pNext = pTrack->GetNextTrack();
             RemoveFromFormulaTrack( pTrack );
             PutInFormulaTree( pTrack );
             if ( pTrack->GetCode()->IsRecalcModeForced() )
-                bHaveForced = TRUE;
+                bHaveForced = sal_True;
             pTrack = pNext;
         } while ( pTrack );
         if ( bHaveForced )
         {
-            SetForcedFormulas( TRUE );
+            SetForcedFormulas( sal_True );
             if ( bAutoCalc && !IsAutoCalcShellDisabled() && !IsInInterpreter()
                     && !IsCalculatingFormulaTree() )
-                CalcFormulaTree( TRUE );
+                CalcFormulaTree( sal_True );
             else
-                SetForcedFormulaPending( TRUE );
+                SetForcedFormulaPending( sal_True );
         }
     }
     DBG_ASSERT( nFormulaTrackCount==0, "TrackFormulas: nFormulaTrackCount!=0" );
@@ -509,7 +509,7 @@ void ScDocument::UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
         const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz
     )
 {
-    BOOL bExpandRefsOld = IsExpandRefs();
+    sal_Bool bExpandRefsOld = IsExpandRefs();
     if ( eUpdateRefMode == URM_INSDEL && (nDx > 0 || nDy > 0 || nDz > 0) )
         SetExpandRefs( SC_MOD()->GetInputOptions().GetExpandRefs() );
     if ( pBASM )
@@ -517,16 +517,16 @@ void ScDocument::UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
     SetExpandRefs( bExpandRefsOld );
 }
 
-void ScDocument::SetAutoCalc( BOOL bNewAutoCalc )
+void ScDocument::SetAutoCalc( sal_Bool bNewAutoCalc )
 {
-    BOOL bOld = bAutoCalc;
+    sal_Bool bOld = bAutoCalc;
     bAutoCalc = bNewAutoCalc;
     if ( !bOld && bNewAutoCalc && bHasForcedFormulas )
     {
         if ( IsAutoCalcShellDisabled() )
-            SetForcedFormulaPending( TRUE );
+            SetForcedFormulaPending( sal_True );
         else if ( !IsInInterpreter() )
-            CalcFormulaTree( TRUE );
+            CalcFormulaTree( sal_True );
     }
 }
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 8b806b26e..70b2dd500 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -124,7 +124,7 @@ void ScDocument::ImplDeleteOptions()
 
 //------------------------------------------------------------------------
 
-SfxPrinter* ScDocument::GetPrinter(BOOL bCreateIfNotExist)
+SfxPrinter* ScDocument::GetPrinter(sal_Bool bCreateIfNotExist)
 {
     if ( !pPrinter && bCreateIfNotExist )
     {
@@ -137,7 +137,7 @@ SfxPrinter* ScDocument::GetPrinter(BOOL bCreateIfNotExist)
                             NULL );
 
         ::utl::MiscCfg aMisc;
-        USHORT nFlags = 0;
+        sal_uInt16 nFlags = 0;
         if ( aMisc.IsPaperOrientationWarning() )
             nFlags |= SFX_PRINTER_CHG_ORIENTATION;
         if ( aMisc.IsPaperSizeWarning() )
@@ -173,7 +173,7 @@ void ScDocument::SetPrinter( SfxPrinter* pNewPrinter )
         pPrinter->SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
         delete pOld;
     }
-    InvalidateTextWidth(NULL, NULL, FALSE);     // in both cases
+    InvalidateTextWidth(NULL, NULL, sal_False);     // in both cases
 }
 
 //------------------------------------------------------------------------
@@ -188,7 +188,7 @@ void ScDocument::SetPrintOptions()
         ::utl::MiscCfg aMisc;
         SfxItemSet aOptSet( pPrinter->GetOptions() );
 
-        USHORT nFlags = 0;
+        sal_uInt16 nFlags = 0;
         if ( aMisc.IsPaperOrientationWarning() )
             nFlags |= SFX_PRINTER_CHG_ORIENTATION;
         if ( aMisc.IsPaperSizeWarning() )
@@ -240,11 +240,11 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
     {
         case SFX_STYLE_FAMILY_PAGE:
             {
-                const USHORT nOldScale		  = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE);
-                const USHORT nOldScaleToPages = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALETOPAGES);
+                const sal_uInt16 nOldScale		  = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE);
+                const sal_uInt16 nOldScaleToPages = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALETOPAGES);
                 rSet.Put( rChanges );
-                const USHORT nNewScale		  = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE);
-                const USHORT nNewScaleToPages = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALETOPAGES);
+                const sal_uInt16 nNewScale		  = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE);
+                const sal_uInt16 nNewScaleToPages = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALETOPAGES);
 
                 if ( (nOldScale != nNewScale) || (nOldScaleToPages != nNewScaleToPages) )
                     InvalidateTextWidth( rStyleSheet.GetName() );
@@ -252,7 +252,7 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
                 if( SvtLanguageOptions().IsCTLFontEnabled() )
                 {
                     const SfxPoolItem *pItem = NULL;
-                    if( rChanges.GetItemState(ATTR_WRITINGDIR, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if( rChanges.GetItemState(ATTR_WRITINGDIR, sal_True, &pItem ) == SFX_ITEM_SET )
                         ScChartHelper::DoUpdateAllCharts( this );
                 }
             }
@@ -260,19 +260,19 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
 
         case SFX_STYLE_FAMILY_PARA:
             {
-                BOOL bNumFormatChanged;
+                sal_Bool bNumFormatChanged;
                 if ( ScGlobal::CheckWidthInvalidate( bNumFormatChanged,
                         rSet, rChanges ) )
                     InvalidateTextWidth( NULL, NULL, bNumFormatChanged );
 
                 for (SCTAB nTab=0; nTab<=MAXTAB; ++nTab)
                     if (pTab[nTab] && pTab[nTab]->IsStreamValid())
-                        pTab[nTab]->SetStreamValid( FALSE );
+                        pTab[nTab]->SetStreamValid( sal_False );
 
-                ULONG nOldFormat =
+                sal_uLong nOldFormat =
                     ((const SfxUInt32Item*)&rSet.Get(
                     ATTR_VALUE_FORMAT ))->GetValue();
-                ULONG nNewFormat =
+                sal_uLong nNewFormat =
                     ((const SfxUInt32Item*)&rChanges.Get(
                     ATTR_VALUE_FORMAT ))->GetValue();
                 LanguageType eNewLang, eOldLang;
@@ -289,10 +289,10 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
                 //	Dontcare		- Default setzen
                 //	Default			- keine Aenderung
                 // ("keine Aenderung" geht nicht mit PutExtended, darum Schleife)
-                for (USHORT nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; nWhich++)
+                for (sal_uInt16 nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; nWhich++)
                 {
                     const SfxPoolItem* pItem;
-                    SfxItemState eState = rChanges.GetItemState( nWhich, FALSE, &pItem );
+                    SfxItemState eState = rChanges.GetItemState( nWhich, sal_False, &pItem );
                     if ( eState == SFX_ITEM_SET )
                         rSet.Put( *pItem );
                     else if ( eState == SFX_ITEM_DONTCARE )
@@ -337,14 +337,14 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab )
 {
     ScAddress aAdrFrom( 0,	  0,        nTab );
     ScAddress aAdrTo  ( MAXCOL, MAXROW, nTab );
-    InvalidateTextWidth( &aAdrFrom, &aAdrTo, FALSE );
+    InvalidateTextWidth( &aAdrFrom, &aAdrTo, sal_False );
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScDocument::IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab )
+sal_Bool ScDocument::IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab )
 {
-    BOOL		 bInUse = FALSE;
+    sal_Bool		 bInUse = sal_False;
     const SCTAB nCount = GetTableCount();
     SCTAB i;
 
@@ -359,30 +359,30 @@ BOOL ScDocument::IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab )
 
 //------------------------------------------------------------------------
 
-BOOL ScDocument::RemovePageStyleInUse( const String& rStyle )
+sal_Bool ScDocument::RemovePageStyleInUse( const String& rStyle )
 {
-    BOOL bWasInUse = FALSE;
+    sal_Bool bWasInUse = sal_False;
     const SCTAB nCount = GetTableCount();
 
     for ( SCTAB i=0; i<nCount && pTab[i]; i++ )
         if ( pTab[i]->GetPageStyle() == rStyle )
         {
-            bWasInUse = TRUE;
+            bWasInUse = sal_True;
             pTab[i]->SetPageStyle( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
         }
 
     return bWasInUse;
 }
 
-BOOL ScDocument::RenamePageStyleInUse( const String& rOld, const String& rNew )
+sal_Bool ScDocument::RenamePageStyleInUse( const String& rOld, const String& rNew )
 {
-    BOOL bWasInUse = FALSE;
+    sal_Bool bWasInUse = sal_False;
     const SCTAB nCount = GetTableCount();
 
     for ( SCTAB i=0; i<nCount && pTab[i]; i++ )
         if ( pTab[i]->GetPageStyle() == rOld )
         {
-            bWasInUse = TRUE;
+            bWasInUse = sal_True;
             pTab[i]->SetPageStyle( rNew );
         }
 
@@ -391,7 +391,7 @@ BOOL ScDocument::RenamePageStyleInUse( const String& rOld, const String& rNew )
 
 //------------------------------------------------------------------------
 
-BYTE ScDocument::GetEditTextDirection(SCTAB nTab) const
+sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const
 {
     EEHorizontalTextDirection eRet = EE_HTEXTDIR_DEFAULT;
 
@@ -410,15 +410,15 @@ BYTE ScDocument::GetEditTextDirection(SCTAB nTab) const
         // else (invalid for EditEngine): keep "default"
     }
 
-    return sal::static_int_cast<BYTE>(eRet);
+    return sal::static_int_cast<sal_uInt8>(eRet);
 }
 
 //------------------------------------------------------------------------
 
 void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
-                                      BOOL bNumFormatChanged )
+                                      sal_Bool bNumFormatChanged )
 {
-    BOOL bBroadcast = (bNumFormatChanged && GetDocOptions().IsCalcAsShown() && !IsImportingXML() && !IsClipboard());
+    sal_Bool bBroadcast = (bNumFormatChanged && GetDocOptions().IsCalcAsShown() && !IsImportingXML() && !IsClipboard());
     if ( pAdrFrom && !pAdrTo )
     {
         const SCTAB nTab = pAdrFrom->Tab();
@@ -442,17 +442,17 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress
 #define CALCMAX					1000	// Berechnungen
 #define ABORT_EVENTS			(INPUT_ANY & ~INPUT_TIMER & ~INPUT_OTHER)
 
-BOOL ScDocument::IdleCalcTextWidth()			// TRUE = demnaechst wieder versuchen
+sal_Bool ScDocument::IdleCalcTextWidth()			// sal_True = demnaechst wieder versuchen
 {
     // #i75610# if a printer hasn't been set or created yet, don't create one for this
-    if ( bIdleDisabled || IsInLinkUpdate() || GetPrinter(FALSE) == NULL )
-        return FALSE;
-    bIdleDisabled = TRUE;
+    if ( bIdleDisabled || IsInLinkUpdate() || GetPrinter(sal_False) == NULL )
+        return sal_False;
+    bIdleDisabled = sal_True;
 
-// ULONG nMs = 0;
-// USHORT nIter = 0;
+// sal_uLong nMs = 0;
+// sal_uInt16 nIter = 0;
 
-    const ULONG			nStart	 = Time::GetSystemTicks();
+    const sal_uLong			nStart	 = Time::GetSystemTicks();
     double				nPPTX	 = 0.0;
     double 				nPPTY	 = 0.0;
     OutputDevice*		pDev	 = NULL;
@@ -465,9 +465,9 @@ BOOL ScDocument::IdleCalcTextWidth()			// TRUE = demnaechst wieder versuchen
     SCTAB				nTab  	 = aCurTextWidthCalcPos.Tab();
     SCROW				nRow   	 = aCurTextWidthCalcPos.Row();
     SCsCOL				nCol  	 = aCurTextWidthCalcPos.Col();
-    USHORT				nRestart = 0;
-    USHORT 				nZoom	 = 0;
-    BOOL				bNeedMore= FALSE;
+    sal_uInt16				nRestart = 0;
+    sal_uInt16 				nZoom	 = 0;
+    sal_Bool				bNeedMore= sal_False;
 
     if ( !ValidRow(nRow) )
         nRow = 0, nCol--;
@@ -483,7 +483,7 @@ BOOL ScDocument::IdleCalcTextWidth()			// TRUE = demnaechst wieder versuchen
     //	Query-Box aufgemacht wird !!!
 
     ScStyleSheetPool* pStylePool = xPoolHelper->GetStylePool();
-    USHORT nOldMask = pStylePool->GetSearchMask();
+    sal_uInt16 nOldMask = pStylePool->GetSearchMask();
     SfxStyleFamily eOldFam = pStylePool->GetSearchFamily();
 
     pTable = pTab[nTab];
@@ -493,10 +493,10 @@ BOOL ScDocument::IdleCalcTextWidth()			// TRUE = demnaechst wieder versuchen
 
     DBG_ASSERT( pStyle, "Missing StyleSheet :-/" );
 
-    BOOL bProgress = FALSE;
+    sal_Bool bProgress = sal_False;
     if ( pStyle && 0 == GET_SCALEVALUE(pStyle->GetItemSet(),ATTR_PAGE_SCALETOPAGES) )
     {
-        USHORT nCount = 0;
+        sal_uInt16 nCount = 0;
 
         nZoom	 = GET_SCALEVALUE(pStyle->GetItemSet(),ATTR_PAGE_SCALE);
         Fraction aZoomFract( nZoom, 100 );
@@ -522,28 +522,28 @@ BOOL ScDocument::IdleCalcTextWidth()			// TRUE = demnaechst wieder versuchen
                     if ( !bProgress && pCell->GetCellType() == CELLTYPE_FORMULA
                       && ((ScFormulaCell*)pCell)->GetDirty() )
                     {
-                        ScProgress::CreateInterpretProgress( this, FALSE );
-                        bProgress = TRUE;
+                        ScProgress::CreateInterpretProgress( this, sal_False );
+                        bProgress = sal_True;
                     }
 
 //					DBG_ERROR( String("t,c,r = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow)  );
 //					DBG_ERROR( String("nOldWidth = ") + String(pCell->GetTextWidth()) );
 
-                    USHORT nNewWidth = (USHORT)GetNeededSize( nCol, nRow, nTab,
+                    sal_uInt16 nNewWidth = (sal_uInt16)GetNeededSize( nCol, nRow, nTab,
                                                               pDev, nPPTX, nPPTY,
-                                                              aZoomFract,aZoomFract, TRUE,
-                                                              TRUE );	// bTotalSize
+                                                              aZoomFract,aZoomFract, sal_True,
+                                                              sal_True );	// bTotalSize
 
 //					DBG_ERROR( String("nNewWidth = ") + String(nNewWidth) );
 
                     pCell->SetTextWidth( nNewWidth );
 
-                    bNeedMore = TRUE;
+                    bNeedMore = sal_True;
                 }
             }
             else
             {
-                BOOL bNewTab = FALSE;
+                sal_Bool bNewTab = sal_False;
 
                 nRow = 0;
                 nCol--;
@@ -552,14 +552,14 @@ BOOL ScDocument::IdleCalcTextWidth()			// TRUE = demnaechst wieder versuchen
                 {
                     nCol = MAXCOL;
                     nTab++;
-                    bNewTab = TRUE;
+                    bNewTab = sal_True;
                 }
 
                 if ( !ValidTab(nTab) || !pTab[nTab] )
                 {
                     nTab = 0;
                     nRestart++;
-                    bNewTab = TRUE;
+                    bNewTab = sal_True;
                 }
 
                 if ( nRestart < 2 )
@@ -631,7 +631,7 @@ BOOL ScDocument::IdleCalcTextWidth()			// TRUE = demnaechst wieder versuchen
 // DBG_ERROR( String(nMs) + String(" ms (") + String(nIter) + String(')') );
 
     pStylePool->SetSearchMask( eOldFam, nOldMask );
-    bIdleDisabled = FALSE;
+    bIdleDisabled = sal_False;
 
     return bNeedMore;
 }
@@ -641,18 +641,18 @@ BOOL ScDocument::IdleCalcTextWidth()			// TRUE = demnaechst wieder versuchen
 class ScSpellStatus
 {
 public:
-    BOOL	bModified;
+    sal_Bool	bModified;
 
-    ScSpellStatus() : bModified(FALSE) {};
+    ScSpellStatus() : bModified(sal_False) {};
 
     DECL_LINK (EventHdl, EditStatus*);
 };
 
 IMPL_LINK( ScSpellStatus, EventHdl, EditStatus *, pStatus )
 {
-    ULONG nStatus = pStatus->GetStatusWord();
+    sal_uLong nStatus = pStatus->GetStatusWord();
     if ( nStatus & EE_STAT_WRONGWORDCHANGED )
-        bModified = TRUE;
+        bModified = sal_True;
 
     return 0;
 }
@@ -668,16 +668,16 @@ IMPL_LINK( ScSpellStatus, EventHdl, EditStatus *, pStatus )
 #define SPELL_MAXTEST_ALL	3
 #define SPELL_MAXCELLS		256
 
-BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos,
-                                     USHORT nMaxTest )
+sal_Bool ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos,
+                                     sal_uInt16 nMaxTest )
 {
     ScEditEngineDefaulter* pEngine = NULL;				//! am Dokument speichern
     SfxItemSet* pDefaults = NULL;
     ScSpellStatus aStatus;
 
-    USHORT nCellCount = 0;			// Zellen insgesamt
-    USHORT nTestCount = 0;			// Aufrufe Spelling
-    BOOL bChanged = FALSE;			// Aenderungen?
+    sal_uInt16 nCellCount = 0;			// Zellen insgesamt
+    sal_uInt16 nTestCount = 0;			// Aufrufe Spelling
+    sal_Bool bChanged = sal_False;			// Aenderungen?
 
     SCCOL nCol = rSpellRange.aStart.Col();		// iterator always starts on the left edge
     SCROW nRow = rSpellPos.Row();
@@ -689,7 +689,7 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
         if ( !pTab[nTab] )
         {
             //	may happen for visible range
-            return FALSE;
+            return sal_False;
         }
     }
     ScHorizontalCellIterator aIter( this, nTab,
@@ -729,9 +729,9 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
 
             const ScPatternAttr* pPattern = GetPattern( nCol, nRow, nTab );
             pPattern->FillEditItemSet( pDefaults );
-            pEngine->SetDefaults( pDefaults, FALSE );				//! noetig ?
+            pEngine->SetDefaults( pDefaults, sal_False );				//! noetig ?
 
-            USHORT nCellLang = ((const SvxLanguageItem&)
+            sal_uInt16 nCellLang = ((const SvxLanguageItem&)
                                     pPattern->GetItem(ATTR_FONT_LANGUAGE)).GetValue();
             if ( nCellLang == LANGUAGE_SYSTEM )
                 nCellLang = Application::GetSettings().GetLanguage();   // never use SYSTEM for spelling
@@ -746,11 +746,11 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
             else
                 pEngine->SetText( *((ScEditCell*)pCell)->GetData() );
 
-            aStatus.bModified = FALSE;
+            aStatus.bModified = sal_False;
             pEngine->CompleteOnlineSpelling();
             if ( aStatus.bModified )				// Fehler dazu oder weggekommen?
             {
-                BOOL bNeedEdit = TRUE;						//	Test auf einfachen Text
+                sal_Bool bNeedEdit = sal_True;						//	Test auf einfachen Text
                 if ( !pEngine->HasOnlineSpellErrors() )
                 {
                     ScEditAttrTester aTester( pEngine );
@@ -777,11 +777,11 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
                     //	#47751# Seitenvorschau ist davon nicht betroffen
                     //	(sollte jedenfalls nicht)
                     ScPaintHint aHint( ScRange( nCol, nRow, nTab ), PAINT_GRID );
-                    aHint.SetPrintFlag( FALSE );
+                    aHint.SetPrintFlag( sal_False );
                     pShell->Broadcast( aHint );
                 }
 
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
 
             if ( ++nTestCount >= nMaxTest )				// checked enough text?
@@ -823,24 +823,24 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
 }
 
 
-BOOL ScDocument::ContinueOnlineSpelling()
+sal_Bool ScDocument::ContinueOnlineSpelling()
 {
     if ( bIdleDisabled || !pDocOptions->IsAutoSpell() || (pShell && pShell->IsReadOnly()) )
-        return FALSE;
+        return sal_False;
 
     // #i48433# set bInsertingFromOtherDoc flag so there are no broadcasts when PutCell is called
     // (same behavior as in RemoveAutoSpellObj: just transfer the broadcaster)
-    BOOL bOldInserting = IsInsertingFromOtherDoc();
-    SetInsertingFromOtherDoc( TRUE );
+    sal_Bool bOldInserting = IsInsertingFromOtherDoc();
+    SetInsertingFromOtherDoc( sal_True );
 
     //!	use one EditEngine for both calls
 
     //	#41504# first check visible range
-    BOOL bResult = OnlineSpellInRange( aVisSpellRange, aVisSpellPos, SPELL_MAXTEST_VIS );
+    sal_Bool bResult = OnlineSpellInRange( aVisSpellRange, aVisSpellPos, SPELL_MAXTEST_VIS );
 
     //	during first pass through visible range, always continue
     if ( nVisSpellState == VSPL_START )
-        bResult = TRUE;
+        bResult = sal_True;
 
     if (bResult)
     {
@@ -869,13 +869,13 @@ void ScDocument::SetOnlineSpellPos( const ScAddress& rPos )
         aOnlineSpellPos = aVisSpellRange.aEnd;
 }
 
-BOOL ScDocument::SetVisibleSpellRange( const ScRange& rNewRange )
+sal_Bool ScDocument::SetVisibleSpellRange( const ScRange& rNewRange )
 {
-    BOOL bChange = ( aVisSpellRange != rNewRange );
+    sal_Bool bChange = ( aVisSpellRange != rNewRange );
     if (bChange)
     {
         //	continue spelling through visible range when scrolling down
-        BOOL bContDown = ( nVisSpellState == VSPL_START && rNewRange.In( aVisSpellPos ) &&
+        sal_Bool bContDown = ( nVisSpellState == VSPL_START && rNewRange.In( aVisSpellPos ) &&
                             rNewRange.aStart.Row() >  aVisSpellRange.aStart.Row() &&
                             rNewRange.aStart.Col() == aVisSpellRange.aStart.Col() &&
                             rNewRange.aEnd.Col()   == aVisSpellRange.aEnd.Col() );
@@ -915,15 +915,15 @@ void ScDocument::RepaintRange( const ScRange& rRange )
 
 //------------------------------------------------------------------------
 
-BOOL ScDocument::IdleCheckLinks()			// TRUE = demnaechst wieder versuchen
+sal_Bool ScDocument::IdleCheckLinks()			// sal_True = demnaechst wieder versuchen
 {
-    BOOL bAnyLeft = FALSE;
+    sal_Bool bAnyLeft = sal_False;
 
     if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScDdeLink))
@@ -933,7 +933,7 @@ BOOL ScDocument::IdleCheckLinks()			// TRUE = demnaechst wieder versuchen
                 {
                     pDdeLink->TryUpdate();
                     if (pDdeLink->NeedsUpdate())        // war nix?
-                        bAnyLeft = TRUE;
+                        bAnyLeft = sal_True;
                 }
             }
         }
@@ -945,15 +945,15 @@ BOOL ScDocument::IdleCheckLinks()			// TRUE = demnaechst wieder versuchen
 void ScDocument::SaveDdeLinks(SvStream& rStream) const
 {
     //	bei 4.0-Export alle mit Modus != DEFAULT weglassen
-    BOOL bExport40 = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_40 );
+    sal_Bool bExport40 = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_40 );
 
     const ::sfx2::SvBaseLinks& rLinks = GetLinkManager()->GetLinks();
-    USHORT nCount = rLinks.Count();
+    sal_uInt16 nCount = rLinks.Count();
 
     //	erstmal zaehlen...
 
-    USHORT nDdeCount = 0;
-    USHORT i;
+    sal_uInt16 nDdeCount = 0;
+    sal_uInt16 i;
     for (i=0; i<nCount; i++)
     {
         ::sfx2::SvBaseLink* pBase = *rLinks[i];
@@ -986,9 +986,9 @@ void ScDocument::LoadDdeLinks(SvStream& rStream)
     ScMultipleReadHeader aHdr( rStream );
 
     GetLinkManager();
-    USHORT nCount;
+    sal_uInt16 nCount;
     rStream >> nCount;
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ScDdeLink* pLink = new ScDdeLink( this, rStream, aHdr );
         pLinkManager->InsertDDELink( pLink,
@@ -996,21 +996,21 @@ void ScDocument::LoadDdeLinks(SvStream& rStream)
     }
 }
 
-BOOL ScDocument::HasDdeLinks() const
+sal_Bool ScDocument::HasDdeLinks() const
 {
     if (GetLinkManager())			// Clipboard z.B. hat keinen LinkManager
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
             if ((*rLinks[i])->ISA(ScDdeLink))
-                return TRUE;
+                return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-void ScDocument::SetInLinkUpdate(BOOL bSet)
+void ScDocument::SetInLinkUpdate(sal_Bool bSet)
 {
     //	called from TableLink and AreaLink
 
@@ -1018,7 +1018,7 @@ void ScDocument::SetInLinkUpdate(BOOL bSet)
     bInLinkUpdate = bSet;
 }
 
-BOOL ScDocument::IsInLinkUpdate() const
+sal_Bool ScDocument::IsInLinkUpdate() const
 {
     return bInLinkUpdate || IsInDdeLinkUpdate();
 }
@@ -1029,10 +1029,10 @@ void ScDocument::UpdateExternalRefLinks()
         return;
 
     const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-    USHORT nCount = rLinks.Count();
+    sal_uInt16 nCount = rLinks.Count();
 
     bool bAny = false;
-    for (USHORT i = 0; i < nCount; ++i)
+    for (sal_uInt16 i = 0; i < nCount; ++i)
     {
         ::sfx2::SvBaseLink* pBase = *rLinks[i];
         ScExternalRefLink* pRefLink = dynamic_cast<ScExternalRefLink*>(pBase);
@@ -1051,7 +1051,7 @@ void ScDocument::UpdateExternalRefLinks()
         // #i101960# set document modified, as in TrackTimeHdl for DDE links
         if (!pShell->IsModified())
         {
-            pShell->SetModified( TRUE );
+            pShell->SetModified( sal_True );
             SfxBindings* pBindings = GetViewBindings();
             if (pBindings)
             {
@@ -1067,19 +1067,19 @@ void ScDocument::UpdateDdeLinks()
     if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        USHORT i;
+        sal_uInt16 nCount = rLinks.Count();
+        sal_uInt16 i;
 
         //  #49226# falls das Updaten laenger dauert, erstmal alle Werte
         //  zuruecksetzen, damit nichts altes (falsches) stehen bleibt
-        BOOL bAny = FALSE;
+        sal_Bool bAny = sal_False;
         for (i=0; i<nCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScDdeLink))
             {
                 ((ScDdeLink*)pBase)->ResetValue();
-                bAny = TRUE;
+                bAny = sal_True;
             }
         }
         if (bAny)
@@ -1103,18 +1103,18 @@ void ScDocument::UpdateDdeLinks()
     }
 }
 
-BOOL ScDocument::UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem )
+sal_Bool ScDocument::UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem )
 {
     //	fuer refresh() per StarOne Api
     //	ResetValue() fuer einzelnen Link nicht noetig
     //!	wenn's mal alles asynchron wird, aber auch hier
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScDdeLink))
@@ -1125,7 +1125,7 @@ BOOL ScDocument::UpdateDdeLink( const String& rAppl, const String& rTopic, const
                      pDdeLink->GetItem() == rItem )
                 {
                     pDdeLink->TryUpdate();
-                    bFound = TRUE;          // koennen theoretisch mehrere sein (Mode), darum weitersuchen
+                    bFound = sal_True;          // koennen theoretisch mehrere sein (Mode), darum weitersuchen
                 }
             }
         }
@@ -1138,8 +1138,8 @@ void ScDocument::DisconnectDdeLinks()
     if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScDdeLink))
@@ -1161,8 +1161,8 @@ void ScDocument::CopyDdeLinks( ScDocument* pDestDoc ) const
     else if (GetLinkManager())              // Links direkt kopieren
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScDdeLink))
@@ -1176,14 +1176,14 @@ void ScDocument::CopyDdeLinks( ScDocument* pDestDoc ) const
     }
 }
 
-USHORT ScDocument::GetDdeLinkCount() const
+sal_uInt16 ScDocument::GetDdeLinkCount() const
 {
-    USHORT nDdeCount = 0;
+    sal_uInt16 nDdeCount = 0;
     if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
             if ((*rLinks[i])->ISA(ScDdeLink))
                 ++nDdeCount;
     }
@@ -1200,15 +1200,15 @@ namespace {
     @return  The DDE link, if it exists, otherwise 0. */
 ScDdeLink* lclGetDdeLink(
         const sfx2::LinkManager* pLinkManager,
-        const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode,
-        USHORT* pnDdePos = NULL )
+        const String& rAppl, const String& rTopic, const String& rItem, sal_uInt8 nMode,
+        sal_uInt16* pnDdePos = NULL )
 {
     if( pLinkManager )
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
+        sal_uInt16 nCount = rLinks.Count();
         if( pnDdePos ) *pnDdePos = 0;
-        for( USHORT nIndex = 0; nIndex < nCount; ++nIndex )
+        for( sal_uInt16 nIndex = 0; nIndex < nCount; ++nIndex )
         {
             ::sfx2::SvBaseLink* pLink = *rLinks[ nIndex ];
             if( ScDdeLink* pDdeLink = PTR_CAST( ScDdeLink, pLink ) )
@@ -1228,14 +1228,14 @@ ScDdeLink* lclGetDdeLink(
 /** Returns a pointer to the specified DDE link.
     @param nDdePos  Index of the DDE link (does not include other links from link manager).
     @return  The DDE link, if it exists, otherwise 0. */
-ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, USHORT nDdePos )
+ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, sal_uInt16 nDdePos )
 {
     if( pLinkManager )
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        USHORT nDdeIndex = 0;       // counts only the DDE links
-        for( USHORT nIndex = 0; nIndex < nCount; ++nIndex )
+        sal_uInt16 nCount = rLinks.Count();
+        sal_uInt16 nDdeIndex = 0;       // counts only the DDE links
+        for( sal_uInt16 nIndex = 0; nIndex < nCount; ++nIndex )
         {
             ::sfx2::SvBaseLink* pLink = *rLinks[ nIndex ];
             if( ScDdeLink* pDdeLink = PTR_CAST( ScDdeLink, pLink ) )
@@ -1253,12 +1253,12 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, USHORT nDdePos
 
 // ----------------------------------------------------------------------------
 
-bool ScDocument::FindDdeLink( const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode, USHORT& rnDdePos )
+bool ScDocument::FindDdeLink( const String& rAppl, const String& rTopic, const String& rItem, sal_uInt8 nMode, sal_uInt16& rnDdePos )
 {
     return lclGetDdeLink( GetLinkManager(), rAppl, rTopic, rItem, nMode, &rnDdePos ) != NULL;
 }
 
-bool ScDocument::GetDdeLinkData( USHORT nDdePos, String& rAppl, String& rTopic, String& rItem ) const
+bool ScDocument::GetDdeLinkData( sal_uInt16 nDdePos, String& rAppl, String& rTopic, String& rItem ) const
 {
     if( const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) )
     {
@@ -1270,7 +1270,7 @@ bool ScDocument::GetDdeLinkData( USHORT nDdePos, String& rAppl, String& rTopic,
     return false;
 }
 
-bool ScDocument::GetDdeLinkMode( USHORT nDdePos, BYTE& rnMode ) const
+bool ScDocument::GetDdeLinkMode( sal_uInt16 nDdePos, sal_uInt8& rnMode ) const
 {
     if( const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) )
     {
@@ -1280,13 +1280,13 @@ bool ScDocument::GetDdeLinkMode( USHORT nDdePos, BYTE& rnMode ) const
     return false;
 }
 
-const ScMatrix* ScDocument::GetDdeLinkResultMatrix( USHORT nDdePos ) const
+const ScMatrix* ScDocument::GetDdeLinkResultMatrix( sal_uInt16 nDdePos ) const
 {
     const ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos );
     return pDdeLink ? pDdeLink->GetResult() : NULL;
 }
 
-bool ScDocument::CreateDdeLink( const String& rAppl, const String& rTopic, const String& rItem, BYTE nMode, ScMatrix* pResults )
+bool ScDocument::CreateDdeLink( const String& rAppl, const String& rTopic, const String& rItem, sal_uInt8 nMode, ScMatrix* pResults )
 {
     /*  Create a DDE link without updating it (i.e. for Excel import), to prevent
         unwanted connections. First try to find existing link. Set result array
@@ -1312,7 +1312,7 @@ bool ScDocument::CreateDdeLink( const String& rAppl, const String& rTopic, const
     return false;
 }
 
-bool ScDocument::SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults )
+bool ScDocument::SetDdeLinkResultMatrix( sal_uInt16 nDdePos, ScMatrix* pResults )
 {
     if( ScDdeLink* pDdeLink = lclGetDdeLink( GetLinkManager(), nDdePos ) )
     {
@@ -1324,18 +1324,18 @@ bool ScDocument::SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults )
 
 //------------------------------------------------------------------------
 
-BOOL ScDocument::HasAreaLinks() const
+sal_Bool ScDocument::HasAreaLinks() const
 {
     if (GetLinkManager())			// Clipboard z.B. hat keinen LinkManager
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
             if ((*rLinks[i])->ISA(ScAreaLink))
-                return TRUE;
+                return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void ScDocument::UpdateAreaLinks()
@@ -1343,8 +1343,8 @@ void ScDocument::UpdateAreaLinks()
     if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScAreaLink))
@@ -1358,7 +1358,7 @@ void ScDocument::DeleteAreaLinksOnTab( SCTAB nTab )
     if (GetLinkManager())
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         while ( nPos < rLinks.Count() )
         {
             const ::sfx2::SvBaseLink* pBase = *rLinks[nPos];
@@ -1379,8 +1379,8 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
         bool bAnyUpdate = false;
 
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nCount = rLinks.Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScAreaLink))
@@ -1414,7 +1414,7 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
             // If several links start at the same cell, the one with the lower index is removed
             // (file format specifies only one link definition for a cell).
 
-            USHORT nFirstIndex = 0;
+            sal_uInt16 nFirstIndex = 0;
             while ( nFirstIndex < nCount )
             {
                 bool bFound = false;
@@ -1422,7 +1422,7 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
                 if ( pFirst->ISA(ScAreaLink) )
                 {
                     ScAddress aFirstPos = static_cast<ScAreaLink*>(pFirst)->GetDestArea().aStart;
-                    for ( USHORT nSecondIndex = nFirstIndex + 1; nSecondIndex < nCount && !bFound; ++nSecondIndex )
+                    for ( sal_uInt16 nSecondIndex = nFirstIndex + 1; nSecondIndex < nCount && !bFound; ++nSecondIndex )
                     {
                         ::sfx2::SvBaseLink* pSecond = *rLinks[nSecondIndex];
                         if ( pSecond->ISA(ScAreaLink) &&
@@ -1455,12 +1455,12 @@ void ScDocument::KeyInput( const KeyEvent& )
 
 //	----------------------------------------------------------------------------
 
-BOOL ScDocument::CheckMacroWarn()
+sal_Bool ScDocument::CheckMacroWarn()
 {
     //	The check for macro configuration, macro warning and disabling is now handled
     //	in SfxObjectShell::AdjustMacroMode, called by SfxObjectShell::CallBasic.
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -1491,23 +1491,23 @@ SfxBindings* ScDocument::GetViewBindings()
 
 void lcl_TransliterateEditEngine( ScEditEngineDefaulter& rEngine,
                                 utl::TransliterationWrapper& rTranslitarationWrapper,
-                                BOOL bConsiderLanguage, ScDocument* pDoc )
+                                sal_Bool bConsiderLanguage, ScDocument* pDoc )
 {
     //!	should use TransliterateText method of EditEngine instead, when available!
 
     sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
 
-    USHORT nParCount = rEngine.GetParagraphCount();
-    for (USHORT nPar=0; nPar<nParCount; nPar++)
+    sal_uInt16 nParCount = rEngine.GetParagraphCount();
+    for (sal_uInt16 nPar=0; nPar<nParCount; nPar++)
     {
         SvUShorts aPortions;
-        rEngine.GetPortions( (USHORT)nPar, aPortions );
+        rEngine.GetPortions( (sal_uInt16)nPar, aPortions );
 
-        for ( USHORT nPos = aPortions.Count(); nPos; )
+        for ( sal_uInt16 nPos = aPortions.Count(); nPos; )
         {
             --nPos;
-            USHORT nEnd = aPortions.GetObject( nPos );
-            USHORT nStart = nPos ? aPortions.GetObject( nPos - 1 ) : 0;
+            sal_uInt16 nEnd = aPortions.GetObject( nPos );
+            sal_uInt16 nStart = nPos ? aPortions.GetObject( nPos - 1 ) : 0;
 
             ESelection aSel( nPar, nStart, nPar, nEnd );
             String aOldStr = rEngine.GetText( aSel );
@@ -1517,8 +1517,8 @@ void lcl_TransliterateEditEngine( ScEditEngineDefaulter& rEngine,
             {
                 if ( bConsiderLanguage )
                 {
-                    BYTE nScript = pDoc->GetStringScriptType( aOldStr );
-                    USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? EE_CHAR_LANGUAGE_CJK :
+                    sal_uInt8 nScript = pDoc->GetStringScriptType( aOldStr );
+                    sal_uInt16 nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? EE_CHAR_LANGUAGE_CJK :
                                     ( ( nScript == SCRIPTTYPE_COMPLEX ) ? EE_CHAR_LANGUAGE_CTL :
                                                                             EE_CHAR_LANGUAGE );
                     nLanguage = ((const SvxLanguageItem&)aAttr.Get(nWhich)).GetValue();
@@ -1545,7 +1545,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp
     DBG_ASSERT( rMultiMark.IsMultiMarked(), "TransliterateText: no selection" );
 
     utl::TransliterationWrapper aTranslitarationWrapper( xServiceManager, nType );
-    BOOL bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode();
+    sal_Bool bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode();
     sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
 
     ScEditEngineDefaulter* pEngine = NULL;		// not using pEditEngine member because of defaults
@@ -1557,7 +1557,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp
             SCCOL nCol = 0;
             SCROW nRow = 0;
 
-            BOOL bFound = rMultiMark.IsCellMarked( nCol, nRow );
+            sal_Bool bFound = rMultiMark.IsCellMarked( nCol, nRow );
             if (!bFound)
                 bFound = GetNextMarkedCell( nCol, nRow, nTab, rMultiMark );
 
@@ -1574,8 +1574,8 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp
 
                     if ( bConsiderLanguage )
                     {
-                        BYTE nScript = GetStringScriptType( aOldStr );		//! cell script type?
-                        USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE :
+                        sal_uInt8 nScript = GetStringScriptType( aOldStr );		//! cell script type?
+                        sal_uInt16 nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE :
                                         ( ( nScript == SCRIPTTYPE_COMPLEX ) ? ATTR_CTL_FONT_LANGUAGE :
                                                                                 ATTR_FONT_LANGUAGE );
                         nLanguage = ((const SvxLanguageItem*)GetAttr( nCol, nRow, nTab, nWhich ))->GetValue();
@@ -1596,7 +1596,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp
                     const ScPatternAttr* pPattern = GetPattern( nCol, nRow, nTab );
                     SfxItemSet* pDefaults = new SfxItemSet( pEngine->GetEmptyItemSet() );
                     pPattern->FillEditItemSet( pDefaults );
-                    pEngine->SetDefaults( pDefaults, TRUE );
+                    pEngine->SetDefaults( pDefaults, sal_True );
 
                     const EditTextObject* pData = ((const ScEditCell*)pCell)->GetData();
                     pEngine->SetText( *pData );
@@ -1612,7 +1612,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp
                         {
                             // remove defaults (paragraph attributes) before creating text object
                             SfxItemSet* pEmpty = new SfxItemSet( pEngine->GetEmptyItemSet() );
-                            pEngine->SetDefaults( pEmpty, TRUE );
+                            pEngine->SetDefaults( pEmpty, sal_True );
 
                             EditTextObject* pNewData = pEngine->CreateTextObject();
                             PutCell( nCol, nRow, nTab,
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 337c971b8..f164fe2c6 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -170,8 +170,8 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
 
                 pTab[nTab]->SetDrawPageSize(false,false);     // #54782# set the right size immediately
 #if 0
-                ULONG nx = (ULONG) ((double) (MAXCOL+1) * STD_COL_WIDTH			  * HMM_PER_TWIPS );
-                ULONG ny = (ULONG) ((double) (MAXROW+1) * ScGlobal::nStdRowHeight * HMM_PER_TWIPS );
+                sal_uLong nx = (sal_uLong) ((double) (MAXCOL+1) * STD_COL_WIDTH			  * HMM_PER_TWIPS );
+                sal_uLong ny = (sal_uLong) ((double) (MAXROW+1) * ScGlobal::nStdRowHeight * HMM_PER_TWIPS );
                 pDrawLayer->SetPageSize( nTab, Size( nx, ny ) );
 #endif
             }
@@ -183,7 +183,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
         UpdateDrawDefaults();
         UpdateDrawLanguages();
         if (bImportingXML)
-            pDrawLayer->EnableAdjust(FALSE);
+            pDrawLayer->EnableAdjust(sal_False);
 
         pDrawLayer->SetForbiddenCharsTable( xForbiddenCharacters );
         pDrawLayer->SetCharCompressType( GetAsianCompression() );
@@ -209,7 +209,7 @@ void ScDocument::UpdateDrawDefaults()
     if ( pDrawLayer && bSetDrawDefaults )
     {
         SfxItemPool& rDrawPool = pDrawLayer->GetItemPool();
-        rDrawPool.SetPoolDefaultItem( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+        rDrawPool.SetPoolDefaultItem( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) );
     }
 }
 
@@ -238,11 +238,11 @@ sal_Bool ScDocument::IsChart( const SdrObject* pObject )
     return sal_False;
 }
 
-IMPL_LINK_INLINE_START( ScDocument, GetUserDefinedColor, USHORT *, pColorIndex )
+IMPL_LINK_INLINE_START( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex )
 {
     return (long) &((GetColorTable()->GetColor(*pColorIndex))->GetColor());
 }
-IMPL_LINK_INLINE_END( ScDocument, GetUserDefinedColor, USHORT *, pColorIndex )
+IMPL_LINK_INLINE_END( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex )
 
 void ScDocument::DeleteDrawLayer()
 {
@@ -254,20 +254,20 @@ void ScDocument::DeleteColorTable()
     delete pColorTable;
 }
 
-BOOL ScDocument::DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const
+sal_Bool ScDocument::DrawGetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const
 {
     return pDrawLayer->GetPrintArea( rRange, bSetHor, bSetVer );
 }
 
-void ScDocument::DrawMovePage( USHORT nOldPos, USHORT nNewPos )
+void ScDocument::DrawMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
 {
     pDrawLayer->ScMovePage(nOldPos,nNewPos);
 }
 
-void ScDocument::DrawCopyPage( USHORT nOldPos, USHORT nNewPos )
+void ScDocument::DrawCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
 {
     // angelegt wird die Page schon im ScTable ctor
-    pDrawLayer->ScCopyPage( nOldPos, nNewPos, FALSE );
+    pDrawLayer->ScCopyPage( nOldPos, nNewPos, sal_False );
 }
 
 void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
@@ -290,12 +290,12 @@ void ScDocument::DeleteObjectsInSelection( const ScMarkData& rMark )
     pDrawLayer->DeleteObjectsInSelection( rMark );
 }
 
-BOOL ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark )
+sal_Bool ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark )
 {
     //	pTabMark is used only for selected tables. If pTabMark is 0, all tables of rRange are used.
 
     if (!pDrawLayer)
-        return FALSE;
+        return sal_False;
 
     SCTAB nStartTab = 0;
     SCTAB nEndTab = MAXTAB;
@@ -322,7 +322,7 @@ BOOL ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* p
                 {
                     if ( pObject->GetObjIdentifier() == OBJ_OLE2 &&
                             aMMRect.IsInside( pObject->GetCurrentBoundRect() ) )
-                        return TRUE;
+                        return sal_True;
 
                     pObject = aIter.Next();
                 }
@@ -330,7 +330,7 @@ BOOL ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* p
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -365,7 +365,7 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin )
 //UNUSED2008-05      if (!pDrawLayer)
 //UNUSED2008-05          return;
 //UNUSED2008-05
-//UNUSED2008-05      BOOL bAnyIntObj = FALSE;
+//UNUSED2008-05      sal_Bool bAnyIntObj = sal_False;
 //UNUSED2008-05      SCTAB nTab;
 //UNUSED2008-05      ScPostIt aNote(this);
 //UNUSED2008-05      for (nTab=0; nTab<=MAXTAB && pTab[nTab]; nTab++)
@@ -380,7 +380,7 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin )
 //UNUSED2008-05              {
 //UNUSED2008-05                  if ( pObject->GetLayer() == SC_LAYER_INTERN )
 //UNUSED2008-05                  {
-//UNUSED2008-05                      bAnyIntObj = TRUE;  // for all internal objects, including detective
+//UNUSED2008-05                      bAnyIntObj = sal_True;  // for all internal objects, including detective
 //UNUSED2008-05
 //UNUSED2008-05                      if ( pObject->ISA( SdrCaptionObj ) )
 //UNUSED2008-05                      {
@@ -390,7 +390,7 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin )
 //UNUSED2008-05                              if ( GetNote( pData->aStt.Col(), pData->aStt.Row(), nTab, aNote))
 //UNUSED2008-05                                  if ( !aNote.IsShown() )
 //UNUSED2008-05                                  {
-//UNUSED2008-05                                      aNote.SetShown(TRUE);
+//UNUSED2008-05                                      aNote.SetShown(sal_True);
 //UNUSED2008-05                                      SetNote( pData->aStt.Col(), pData->aStt.Row(), nTab, aNote);
 //UNUSED2008-05                                  }
 //UNUSED2008-05                          }
@@ -412,7 +412,7 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin )
 //UNUSED2008-05      }
 //UNUSED2008-05  }
 
-BOOL ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect )
+sal_Bool ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect )
 {
     //	Gibt es Objekte auf dem Hintergrund-Layer, die (teilweise) von rMMRect
     //	betroffen sind?
@@ -420,47 +420,47 @@ BOOL ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect )
     //	 zu werden)
 
     if (!pDrawLayer)
-        return FALSE;
+        return sal_False;
     SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
     DBG_ASSERT(pPage,"Page ?");
     if (!pPage)
-        return FALSE;
+        return sal_False;
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     SdrObjListIter aIter( *pPage, IM_FLAT );
     SdrObject* pObject = aIter.Next();
     while (pObject && !bFound)
     {
         if ( pObject->GetLayer() == SC_LAYER_BACK && pObject->GetCurrentBoundRect().IsOver( rMMRect ) )
-            bFound = TRUE;
+            bFound = sal_True;
         pObject = aIter.Next();
     }
 
     return bFound;
 }
 
-BOOL ScDocument::HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect )
+sal_Bool ScDocument::HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect )
 {
     //	Gibt es ueberhaupt Objekte, die (teilweise) von rMMRect
     //	betroffen sind?
     //	(um leere Seiten beim Drucken zu erkennen)
 
     if (!pDrawLayer)
-        return FALSE;
+        return sal_False;
     SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
     DBG_ASSERT(pPage,"Page ?");
     if (!pPage)
-        return FALSE;
+        return sal_False;
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     SdrObjListIter aIter( *pPage, IM_FLAT );
     SdrObject* pObject = aIter.Next();
     while (pObject && !bFound)
     {
         if ( pObject->GetCurrentBoundRect().IsOver( rMMRect ) )
-            bFound = TRUE;
+            bFound = sal_True;
         pObject = aIter.Next();
     }
 
@@ -512,12 +512,12 @@ SdrObject* ScDocument::GetObjectAtPoint( SCTAB nTab, const Point& rPos )
     return pFound;
 }
 
-BOOL ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
-                                SCCOL nEndCol, SCROW nEndRow, BOOL bLeftIsEmpty,
+sal_Bool ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
+                                SCCOL nEndCol, SCROW nEndRow, sal_Bool bLeftIsEmpty,
                                 ScRange* pLastRange, Rectangle* pLastMM ) const
 {
     if (!IsBlockEmpty( nTab, nStartCol, nStartRow, nEndCol, nEndRow ))
-        return FALSE;
+        return sal_False;
 
     ScDocument* pThis = (ScDocument*)this;	//! GetMMRect / HasAnyDraw etc. const !!!
 
@@ -549,7 +549,7 @@ BOOL ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
     }
 
     if ( pThis->HasAnyDraw( nTab, aMMRect ))
-        return FALSE;
+        return sal_False;
 
     if ( nStartCol > 0 && !bLeftIsEmpty )
     {
@@ -560,16 +560,16 @@ BOOL ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
         SCROW nTmpRow = nEndRow;
 
         pThis->ExtendMerge( 0,nStartRow, nExtendCol,nTmpRow, nTab,
-                            FALSE, TRUE );		// kein Refresh, incl. Attrs
+                            sal_False, sal_True );		// kein Refresh, incl. Attrs
 
         OutputDevice* pDev = pThis->GetPrinter();
         pDev->SetMapMode( MAP_PIXEL );				// wichtig fuer GetNeededSize
         pThis->ExtendPrintArea( pDev, nTab, 0, nStartRow, nExtendCol, nEndRow );
         if ( nExtendCol >= nStartCol )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScDocument::Clear( sal_Bool bFromDestructor )
@@ -591,9 +591,9 @@ void ScDocument::Clear( sal_Bool bFromDestructor )
     }
 }
 
-BOOL ScDocument::HasControl( SCTAB nTab, const Rectangle& rMMRect )
+sal_Bool ScDocument::HasControl( SCTAB nTab, const Rectangle& rMMRect )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     if (pDrawLayer)
     {
@@ -609,7 +609,7 @@ BOOL ScDocument::HasControl( SCTAB nTab, const Rectangle& rMMRect )
                 {
                     Rectangle aObjRect = pObject->GetLogicRect();
                     if ( aObjRect.IsOver( rMMRect ) )
-                        bFound = TRUE;
+                        bFound = sal_True;
                 }
 
                 pObject = aIter.Next();
@@ -652,12 +652,12 @@ void ScDocument::InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle&
     }
 }
 
-BOOL ScDocument::HasDetectiveObjects(SCTAB nTab) const
+sal_Bool ScDocument::HasDetectiveObjects(SCTAB nTab) const
 {
     //	looks for detective objects, annotations don't count
     //	(used to adjust scale so detective objects hit their cells better)
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     if (pDrawLayer)
     {
@@ -671,7 +671,7 @@ BOOL ScDocument::HasDetectiveObjects(SCTAB nTab) const
             {
                 // anything on the internal layer except captions (annotations)
                 if ( (pObject->GetLayer() == SC_LAYER_INTERN) && !ScDrawLayer::IsNoteCaption( pObject ) )
-                    bFound = TRUE;
+                    bFound = sal_True;
 
                 pObject = aIter.Next();
             }
@@ -689,7 +689,7 @@ void ScDocument::UpdateFontCharSet()
     //	Alles, was nicht SYMBOL ist, wird auf den System-CharSet umgesetzt.
     //	Bei neuen Dokumenten (Version SC_FONTCHARSET) sollte der CharSet stimmen.
 
-    BOOL bUpdateOld = ( nSrcVer < SC_FONTCHARSET );
+    sal_Bool bUpdateOld = ( nSrcVer < SC_FONTCHARSET );
 
     CharSet eSysSet = gsl_getSystemTextEncoding();
     if ( eSrcSet != eSysSet || bUpdateOld )
@@ -747,15 +747,15 @@ void ScDocument::SetImportingXML( bool bVal )
         for ( SCTAB nTab=0; nTab<=MAXTAB && pTab[nTab]; nTab++ )
             if ( pTab[nTab]->IsLoadingRTL() )
             {
-                pTab[nTab]->SetLoadingRTL( FALSE );
-                SetLayoutRTL( nTab, TRUE );             // includes mirroring; bImportingXML must be cleared first
+                pTab[nTab]->SetLoadingRTL( sal_False );
+                SetLayoutRTL( nTab, sal_True );             // includes mirroring; bImportingXML must be cleared first
             }
     }
 
     SetLoadingMedium(bVal);
 }
 
-void ScDocument::SetXMLFromWrapper( BOOL bVal )
+void ScDocument::SetXMLFromWrapper( sal_Bool bVal )
 {
     bXMLFromWrapper = bVal;
 }
@@ -774,12 +774,12 @@ void ScDocument::SetForbiddenCharacters( const vos::ORef<SvxForbiddenCharactersT
         pDrawLayer->SetForbiddenCharsTable( xForbiddenCharacters );
 }
 
-BOOL ScDocument::IsValidAsianCompression() const
+sal_Bool ScDocument::IsValidAsianCompression() const
 {
     return ( nAsianCompression != SC_ASIANCOMPRESSION_INVALID );
 }
 
-BYTE ScDocument::GetAsianCompression() const
+sal_uInt8 ScDocument::GetAsianCompression() const
 {
     if ( nAsianCompression == SC_ASIANCOMPRESSION_INVALID )
         return 0;
@@ -787,7 +787,7 @@ BYTE ScDocument::GetAsianCompression() const
         return nAsianCompression;
 }
 
-void ScDocument::SetAsianCompression(BYTE nNew)
+void ScDocument::SetAsianCompression(sal_uInt8 nNew)
 {
     nAsianCompression = nNew;
     if ( pEditEngine )
@@ -796,25 +796,25 @@ void ScDocument::SetAsianCompression(BYTE nNew)
         pDrawLayer->SetCharCompressType( nAsianCompression );
 }
 
-BOOL ScDocument::IsValidAsianKerning() const
+sal_Bool ScDocument::IsValidAsianKerning() const
 {
     return ( nAsianKerning != SC_ASIANKERNING_INVALID );
 }
 
-BOOL ScDocument::GetAsianKerning() const
+sal_Bool ScDocument::GetAsianKerning() const
 {
     if ( nAsianKerning == SC_ASIANKERNING_INVALID )
-        return FALSE;
+        return sal_False;
     else
-        return (BOOL)nAsianKerning;
+        return (sal_Bool)nAsianKerning;
 }
 
-void ScDocument::SetAsianKerning(BOOL bNew)
+void ScDocument::SetAsianKerning(sal_Bool bNew)
 {
-    nAsianKerning = (BYTE)bNew;
+    nAsianKerning = (sal_uInt8)bNew;
     if ( pEditEngine )
-        pEditEngine->SetKernAsianPunctuation( (BOOL)nAsianKerning );
+        pEditEngine->SetKernAsianPunctuation( (sal_Bool)nAsianKerning );
     if ( pDrawLayer )
-        pDrawLayer->SetKernAsianPunctuation( (BOOL)nAsianKerning );
+        pDrawLayer->SetKernAsianPunctuation( (sal_Bool)nAsianKerning );
 }
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index fbdecd457..c340bcde1 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -136,56 +136,56 @@ void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck )
 }
 
 
-BOOL ScDocument::HasTable( SCTAB nTab ) const
+sal_Bool ScDocument::HasTable( SCTAB nTab ) const
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScDocument::GetName( SCTAB nTab, String& rName ) const
+sal_Bool ScDocument::GetName( SCTAB nTab, String& rName ) const
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
         {
             pTab[nTab]->GetName( rName );
-            return TRUE;
+            return sal_True;
         }
     rName.Erase();
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::SetCodeName( SCTAB nTab, const String& rName )
+sal_Bool ScDocument::SetCodeName( SCTAB nTab, const String& rName )
 {
     if (VALIDTAB(nTab))
     {
         if (pTab[nTab])
         {
             pTab[nTab]->SetCodeName( rName );
-            return TRUE;
+            return sal_True;
         }
     }
     OSL_TRACE( "**** can't set code name %s", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDocument::GetCodeName( SCTAB nTab, String& rName ) const
+sal_Bool ScDocument::GetCodeName( SCTAB nTab, String& rName ) const
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
         {
             pTab[nTab]->GetCodeName( rName );
-            return TRUE;
+            return sal_True;
         }
     rName.Erase();
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScDocument::GetTable( const String& rName, SCTAB& rTab ) const
+sal_Bool ScDocument::GetTable( const String& rName, SCTAB& rTab ) const
 {
     String aUpperName = rName;
     ScGlobal::pCharClass->toUpper(aUpperName);
@@ -196,15 +196,15 @@ BOOL ScDocument::GetTable( const String& rName, SCTAB& rTab ) const
             if ( pTab[i]->GetUpperName() == aUpperName )
             {
                 rTab = i;
-                return TRUE;
+                return sal_True;
             }
         }
     rTab = 0;
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScDocument::ValidTabName( const String& rName ) const
+sal_Bool ScDocument::ValidTabName( const String& rName ) const
 {
     xub_StrLen nLen = rName.Len();
     if (!nLen)
@@ -244,9 +244,9 @@ BOOL ScDocument::ValidTabName( const String& rName ) const
 }
 
 
-BOOL ScDocument::ValidNewTabName( const String& rName ) const
+sal_Bool ScDocument::ValidNewTabName( const String& rName ) const
 {
-    BOOL bValid = ValidTabName(rName);
+    sal_Bool bValid = ValidTabName(rName);
     for (SCTAB i=0; (i<=MAXTAB) && bValid; i++)
         if (pTab[i])
         {
@@ -265,11 +265,11 @@ void ScDocument::CreateValidTabName(String& rName) const
         // neu erzeugen
 
         const String aStrTable( ScResId(SCSTR_TABLE) );
-        BOOL		 bOk   = FALSE;
+        sal_Bool		 bOk   = sal_False;
 
         //	vorneweg testen, ob der Prefix als gueltig erkannt wird
         //	wenn nicht, nur doppelte vermeiden
-        BOOL bPrefix = ValidTabName( aStrTable );
+        sal_Bool bPrefix = ValidTabName( aStrTable );
         DBG_ASSERT(bPrefix, "ungueltiger Tabellenname");
         SCTAB nDummy;
 
@@ -311,11 +311,11 @@ void ScDocument::CreateValidTabName(String& rName) const
 }
 
 
-BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName,
-            BOOL bExternalDocument )
+sal_Bool ScDocument::InsertTab( SCTAB nPos, const String& rName,
+            sal_Bool bExternalDocument )
 {
     SCTAB	nTabCount = GetTableCount();
-    BOOL	bValid = ValidTab(nTabCount);
+    sal_Bool	bValid = ValidTab(nTabCount);
     if ( !bExternalDocument )	// sonst rName == "'Doc'!Tab", vorher pruefen
         bValid = (bValid && ValidNewTabName(rName));
     if (bValid)
@@ -326,7 +326,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName,
             pTab[nTabCount]->SetCodeName( rName );
             ++nMaxTableNumber;
             if ( bExternalDocument )
-                pTab[nTabCount]->SetVisible( FALSE );
+                pTab[nTabCount]->SetVisible( sal_False );
         }
         else
         {
@@ -382,19 +382,19 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName,
                     pChartListenerCollection->UpdateScheduledSeriesRanges();
 
                 SetDirty();
-                bValid = TRUE;
+                bValid = sal_True;
             }
             else
-                bValid = FALSE;
+                bValid = sal_False;
         }
     }
     return bValid;
 }
 
 
-BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc )
+sal_Bool ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc )
 {
-    BOOL bValid = FALSE;
+    sal_Bool bValid = sal_False;
     if (VALIDTAB(nTab))
     {
         if (pTab[nTab])
@@ -402,8 +402,8 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc )
             SCTAB nTabCount = GetTableCount();
             if (nTabCount > 1)
             {
-                BOOL bOldAutoCalc = GetAutoCalc();
-                SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+                sal_Bool bOldAutoCalc = GetAutoCalc();
+                SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
                 ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab );
                 DelBroadcastAreasInRange( aRange );
 
@@ -443,7 +443,7 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc )
                 SCTAB i;
                 for (i=0; i<=MAXTAB; i++)
                     if (pTab[i])
-                        pTab[i]->UpdateDeleteTab(nTab,FALSE,
+                        pTab[i]->UpdateDeleteTab(nTab,sal_False,
                                     pRefUndoDoc ? pRefUndoDoc->pTab[i] : 0);
                 delete pTab[nTab];
                 for (i=nTab + 1; i < nTabCount; i++)
@@ -470,7 +470,7 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc )
                 pChartListenerCollection->UpdateScheduledSeriesRanges();
 
                 SetAutoCalc( bOldAutoCalc );
-                bValid = TRUE;
+                bValid = sal_True;
             }
         }
     }
@@ -478,16 +478,16 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc )
 }
 
 
-BOOL ScDocument::RenameTab( SCTAB nTab, const String& rName, BOOL /* bUpdateRef */,
-        BOOL bExternalDocument )
+sal_Bool ScDocument::RenameTab( SCTAB nTab, const String& rName, sal_Bool /* bUpdateRef */,
+        sal_Bool bExternalDocument )
 {
-    BOOL	bValid = FALSE;
+    sal_Bool	bValid = sal_False;
     SCTAB	i;
     if VALIDTAB(nTab)
         if (pTab[nTab])
         {
             if ( bExternalDocument )
-                bValid = TRUE;		// zusammengesetzter Name
+                bValid = sal_True;		// zusammengesetzter Name
             else
                 bValid = ValidTabName(rName);
             for (i=0; (i<=MAXTAB) && bValid; i++)
@@ -509,14 +509,14 @@ BOOL ScDocument::RenameTab( SCTAB nTab, const String& rName, BOOL /* bUpdateRef
                 // but the XML stream must be re-generated.
                 for (i=0; i<=MAXTAB; ++i)
                     if (pTab[i] && pTab[i]->IsStreamValid())
-                        pTab[i]->SetStreamValid( FALSE );
+                        pTab[i]->SetStreamValid( sal_False );
             }
         }
     return bValid;
 }
 
 
-void ScDocument::SetVisible( SCTAB nTab, BOOL bVisible )
+void ScDocument::SetVisible( SCTAB nTab, sal_Bool bVisible )
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
@@ -524,26 +524,26 @@ void ScDocument::SetVisible( SCTAB nTab, BOOL bVisible )
 }
 
 
-BOOL ScDocument::IsVisible( SCTAB nTab ) const
+sal_Bool ScDocument::IsVisible( SCTAB nTab ) const
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
             return pTab[nTab]->IsVisible();
 
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScDocument::IsStreamValid( SCTAB nTab ) const
+sal_Bool ScDocument::IsStreamValid( SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->IsStreamValid();
 
-    return FALSE;
+    return sal_False;
 }
 
 
-void ScDocument::SetStreamValid( SCTAB nTab, BOOL bSet, BOOL bIgnoreLock )
+void ScDocument::SetStreamValid( SCTAB nTab, sal_Bool bSet, sal_Bool bIgnoreLock )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetStreamValid( bSet, bIgnoreLock );
@@ -556,30 +556,30 @@ void ScDocument::LockStreamValid( bool bLock )
 }
 
 
-BOOL ScDocument::IsPendingRowHeights( SCTAB nTab ) const
+sal_Bool ScDocument::IsPendingRowHeights( SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->IsPendingRowHeights();
 
-    return FALSE;
+    return sal_False;
 }
 
 
-void ScDocument::SetPendingRowHeights( SCTAB nTab, BOOL bSet )
+void ScDocument::SetPendingRowHeights( SCTAB nTab, sal_Bool bSet )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetPendingRowHeights( bSet );
 }
 
 
-void ScDocument::SetLayoutRTL( SCTAB nTab, BOOL bRTL )
+void ScDocument::SetLayoutRTL( SCTAB nTab, sal_Bool bRTL )
 {
     if ( ValidTab(nTab)  && pTab[nTab] )
     {
         if ( bImportingXML )
         {
             // #i57869# only set the LoadingRTL flag, the real setting (including mirroring)
-            // is applied in SetImportingXML(FALSE). This is so the shapes can be loaded in
+            // is applied in SetImportingXML(sal_False). This is so the shapes can be loaded in
             // normal LTR mode.
 
             pTab[nTab]->SetLoadingRTL( bRTL );
@@ -617,16 +617,16 @@ void ScDocument::SetLayoutRTL( SCTAB nTab, BOOL bRTL )
 }
 
 
-BOOL ScDocument::IsLayoutRTL( SCTAB nTab ) const
+sal_Bool ScDocument::IsLayoutRTL( SCTAB nTab ) const
 {
     if ( ValidTab(nTab)  && pTab[nTab] )
         return pTab[nTab]->IsLayoutRTL();
 
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScDocument::IsNegativePage( SCTAB nTab ) const
+sal_Bool ScDocument::IsNegativePage( SCTAB nTab ) const
 {
     //	Negative page area is always used for RTL layout.
     //	The separate method is used to find all RTL handling of drawing objects.
@@ -644,7 +644,7 @@ BOOL ScDocument::IsNegativePage( SCTAB nTab ) const
 ---------------------------------------------------------------------------- */
 
 
-BOOL ScDocument::GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const
+sal_Bool ScDocument::GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
@@ -652,11 +652,11 @@ BOOL ScDocument::GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const
 
     rEndCol = 0;
     rEndRow = 0;
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const
+sal_Bool ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
@@ -664,7 +664,7 @@ BOOL ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) cons
 
     rEndCol = 0;
     rEndRow = 0;
-    return FALSE;
+    return sal_False;
 }
 
 bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const
@@ -698,18 +698,21 @@ bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow
     return true;  // success!
 }
 
-bool ScDocument::ShrinkToUsedDataArea( SCTAB nTab, SCCOL& rStartCol,
+bool ScDocument::ShrinkToUsedDataArea( bool& o_bShrunk, SCTAB nTab, SCCOL& rStartCol,
         SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const
 {
     if (!ValidTab(nTab) || !pTab[nTab])
+    {
+        o_bShrunk = false;
         return false;
-    return pTab[nTab]->ShrinkToUsedDataArea( rStartCol, rStartRow, rEndCol, rEndRow, bColumnsOnly);
+    }
+    return pTab[nTab]->ShrinkToUsedDataArea( o_bShrunk, rStartCol, rStartRow, rEndCol, rEndRow, bColumnsOnly);
 }
 
 //	zusammenhaengender Bereich
 
 void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
-                              SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const
+                              SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bIncludeOld, bool bOnlyDown ) const
 {
     if (ValidTab(nTab) && pTab[nTab])
         pTab[nTab]->GetDataArea( rStartCol, rStartRow, rEndCol, rEndRow, bIncludeOld, bOnlyDown );
@@ -730,8 +733,8 @@ void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList )
     ScRangeListRef aNew = new ScRangeList;
     if (rRangeList.Is())
     {
-        ULONG nCount = rRangeList->Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = rRangeList->Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScRange aRange(*rRangeList->GetObject( i ));
             if ( ( aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL ) ||
@@ -797,7 +800,7 @@ bool lcl_GetNextTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMa
 }
 
 
-BOOL ScDocument::CanInsertRow( const ScRange& rRange ) const
+sal_Bool ScDocument::CanInsertRow( const ScRange& rRange ) const
 {
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -810,7 +813,7 @@ BOOL ScDocument::CanInsertRow( const ScRange& rRange ) const
     PutInOrder( nStartTab, nEndTab );
     SCSIZE nSize = static_cast<SCSIZE>(nEndRow - nStartRow + 1);
 
-    BOOL bTest = TRUE;
+    sal_Bool bTest = sal_True;
     for (SCTAB i=nStartTab; i<=nEndTab && bTest; i++)
         if (pTab[i])
             bTest &= pTab[i]->TestInsertRow( nStartCol, nEndCol, nSize );
@@ -819,7 +822,7 @@ BOOL ScDocument::CanInsertRow( const ScRange& rRange ) const
 }
 
 
-BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
+sal_Bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
                             SCCOL nEndCol,   SCTAB nEndTab,
                             SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc,
                             const ScMarkData* pTabMark )
@@ -834,10 +837,10 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
         nEndTab = MAXTAB;
     }
 
-    BOOL bTest = TRUE;
-    BOOL bRet = FALSE;
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bTest = sal_True;
+    sal_Bool bRet = sal_False;
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for ( i = nStartTab; i <= nEndTab && bTest; i++)
         if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i)))
             bTest &= pTab[i]->TestInsertRow( nStartCol, nEndCol, nSize );
@@ -863,7 +866,7 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
         {
             UpdateReference( URM_INSDEL, nStartCol, nStartRow, nTabRangeStart,
                              nEndCol, MAXROW, nTabRangeEnd,
-                             0, static_cast<SCsROW>(nSize), 0, pRefUndoDoc, FALSE );        // without drawing objects
+                             0, static_cast<SCsROW>(nSize), 0, pRefUndoDoc, sal_False );        // without drawing objects
         }
         while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark ) );
 
@@ -896,7 +899,7 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
                 if (pTab[i])
                     pTab[i]->SetRelNameDirty();
         }
-        bRet = TRUE;
+        bRet = sal_True;
     }
     SetAutoCalc( bOldAutoCalc );
     if ( bRet )
@@ -905,7 +908,7 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
 }
 
 
-BOOL ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc )
+sal_Bool ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc )
 {
     return InsertRow( rRange.aStart.Col(), rRange.aStart.Tab(),
                       rRange.aEnd.Col(),   rRange.aEnd.Tab(),
@@ -917,7 +920,7 @@ BOOL ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc )
 void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
                             SCCOL nEndCol,   SCTAB nEndTab,
                             SCROW nStartRow, SCSIZE nSize,
-                            ScDocument* pRefUndoDoc, BOOL* pUndoOutline,
+                            ScDocument* pRefUndoDoc, sal_Bool* pUndoOutline,
                             const ScMarkData* pTabMark )
 {
     SCTAB i;
@@ -930,8 +933,8 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
         nEndTab = MAXTAB;
     }
 
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
 
     // handle chunks of consecutive selected sheets together
     SCTAB nTabRangeStart = nStartTab;
@@ -962,13 +965,13 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
         {
             UpdateReference( URM_INSDEL, nStartCol, nStartRow+nSize, nTabRangeStart,
                              nEndCol, MAXROW, nTabRangeEnd,
-                             0, -(static_cast<SCsROW>(nSize)), 0, pRefUndoDoc, TRUE, false );
+                             0, -(static_cast<SCsROW>(nSize)), 0, pRefUndoDoc, sal_True, false );
         }
         while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark ) );
     }
 
     if (pUndoOutline)
-        *pUndoOutline = FALSE;
+        *pUndoOutline = sal_False;
 
     for ( i = nStartTab; i <= nEndTab; i++)
         if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i)))
@@ -991,7 +994,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
 }
 
 
-void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, BOOL* pUndoOutline )
+void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, sal_Bool* pUndoOutline )
 {
     DeleteRow( rRange.aStart.Col(), rRange.aStart.Tab(),
                rRange.aEnd.Col(),   rRange.aEnd.Tab(),
@@ -1000,7 +1003,7 @@ void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, BOOL
 }
 
 
-BOOL ScDocument::CanInsertCol( const ScRange& rRange ) const
+sal_Bool ScDocument::CanInsertCol( const ScRange& rRange ) const
 {
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -1013,7 +1016,7 @@ BOOL ScDocument::CanInsertCol( const ScRange& rRange ) const
     PutInOrder( nStartTab, nEndTab );
     SCSIZE nSize = static_cast<SCSIZE>(nEndCol - nStartCol + 1);
 
-    BOOL bTest = TRUE;
+    sal_Bool bTest = sal_True;
     for (SCTAB i=nStartTab; i<=nEndTab && bTest; i++)
         if (pTab[i])
             bTest &= pTab[i]->TestInsertCol( nStartRow, nEndRow, nSize );
@@ -1022,7 +1025,7 @@ BOOL ScDocument::CanInsertCol( const ScRange& rRange ) const
 }
 
 
-BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
+sal_Bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
                             SCROW nEndRow,   SCTAB nEndTab,
                             SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc,
                             const ScMarkData* pTabMark )
@@ -1037,10 +1040,10 @@ BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
         nEndTab = MAXTAB;
     }
 
-    BOOL bTest = TRUE;
-    BOOL bRet = FALSE;
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bTest = sal_True;
+    sal_Bool bRet = sal_False;
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for ( i = nStartTab; i <= nEndTab && bTest; i++)
         if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i)))
             bTest &= pTab[i]->TestInsertCol( nStartRow, nEndRow, nSize );
@@ -1063,7 +1066,7 @@ BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
         {
             UpdateReference( URM_INSDEL, nStartCol, nStartRow, nTabRangeStart,
                              MAXCOL, nEndRow, nTabRangeEnd,
-                             static_cast<SCsCOL>(nSize), 0, 0, pRefUndoDoc, TRUE, false );
+                             static_cast<SCsCOL>(nSize), 0, 0, pRefUndoDoc, sal_True, false );
         }
         while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark ) );
 
@@ -1088,7 +1091,7 @@ BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
                 if (pTab[i])
                     pTab[i]->SetRelNameDirty();
         }
-        bRet = TRUE;
+        bRet = sal_True;
     }
     SetAutoCalc( bOldAutoCalc );
     if ( bRet )
@@ -1097,7 +1100,7 @@ BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
 }
 
 
-BOOL ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc )
+sal_Bool ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc )
 {
     return InsertCol( rRange.aStart.Row(), rRange.aStart.Tab(),
                       rRange.aEnd.Row(),   rRange.aEnd.Tab(),
@@ -1108,7 +1111,7 @@ BOOL ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc )
 
 void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab,
                                 SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc,
-                                BOOL* pUndoOutline, const ScMarkData* pTabMark )
+                                sal_Bool* pUndoOutline, const ScMarkData* pTabMark )
 {
     SCTAB i;
 
@@ -1120,8 +1123,8 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA
         nEndTab = MAXTAB;
     }
 
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
 
     // handle chunks of consecutive selected sheets together
     SCTAB nTabRangeStart = nStartTab;
@@ -1152,13 +1155,13 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA
         {
             UpdateReference( URM_INSDEL, sal::static_int_cast<SCCOL>(nStartCol+nSize), nStartRow, nTabRangeStart,
                              MAXCOL, nEndRow, nTabRangeEnd,
-                             -static_cast<SCsCOL>(nSize), 0, 0, pRefUndoDoc, TRUE, false );
+                             -static_cast<SCsCOL>(nSize), 0, 0, pRefUndoDoc, sal_True, false );
         }
         while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark ) );
     }
 
     if (pUndoOutline)
-        *pUndoOutline = FALSE;
+        *pUndoOutline = sal_False;
 
     for ( i = nStartTab; i <= nEndTab; i++)
         if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i)))
@@ -1181,7 +1184,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA
 }
 
 
-void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, BOOL* pUndoOutline )
+void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, sal_Bool* pUndoOutline )
 {
     DeleteCol( rRange.aStart.Row(), rRange.aStart.Tab(),
                rRange.aEnd.Row(),   rRange.aEnd.Tab(),
@@ -1195,12 +1198,12 @@ void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, BOOL
 
 
 void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew,
-                            ScRange& rColRange, BOOL& rInsCol, BOOL& rDelCol,
-                            ScRange& rRowRange, BOOL& rInsRow, BOOL& rDelRow )
+                            ScRange& rColRange, sal_Bool& rInsCol, sal_Bool& rDelCol,
+                            ScRange& rRowRange, sal_Bool& rInsRow, sal_Bool& rDelRow )
 {
     DBG_ASSERT( rOld.aStart == rNew.aStart, "FitBlock: Anfang unterschiedlich" );
 
-    rInsCol = rDelCol = rInsRow = rDelRow = FALSE;
+    rInsCol = rDelCol = rInsRow = rDelRow = sal_False;
 
     SCCOL nStartX = rOld.aStart.Col();
     SCROW nStartY = rOld.aStart.Row();
@@ -1211,7 +1214,7 @@ void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew,
     SCTAB nTab = rOld.aStart.Tab();
 
     //	wenn es mehr Zeilen werden, werden Spalten auf der alten Hoehe eingefuegt/geloescht
-    BOOL bGrowY = ( nNewEndY > nOldEndY );
+    sal_Bool bGrowY = ( nNewEndY > nOldEndY );
     SCROW nColEndY = bGrowY ? nOldEndY : nNewEndY;
     SCCOL nRowEndX = bGrowY ? nNewEndX : nOldEndX;
 
@@ -1220,12 +1223,12 @@ void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew,
     if ( nNewEndX > nOldEndX )			// Spalten einfuegen
     {
         rColRange = ScRange( nOldEndX+1, nStartY, nTab, nNewEndX, nColEndY, nTab );
-        rInsCol = TRUE;
+        rInsCol = sal_True;
     }
     else if ( nNewEndX < nOldEndX )		// Spalten loeschen
     {
         rColRange = ScRange( nNewEndX+1, nStartY, nTab, nOldEndX, nColEndY, nTab );
-        rDelCol = TRUE;
+        rDelCol = sal_True;
     }
 
     //	Zeilen
@@ -1233,19 +1236,19 @@ void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew,
     if ( nNewEndY > nOldEndY )			// Zeilen einfuegen
     {
         rRowRange = ScRange( nStartX, nOldEndY+1, nTab, nRowEndX, nNewEndY, nTab );
-        rInsRow = TRUE;
+        rInsRow = sal_True;
     }
     else if ( nNewEndY < nOldEndY )		// Zeilen loeschen
     {
         rRowRange = ScRange( nStartX, nNewEndY+1, nTab, nRowEndX, nOldEndY, nTab );
-        rDelRow = TRUE;
+        rDelRow = sal_True;
     }
 }
 
 
-BOOL ScDocument::HasPartOfMerged( const ScRange& rRange )
+sal_Bool ScDocument::HasPartOfMerged( const ScRange& rRange )
 {
-    BOOL bPart = FALSE;
+    sal_Bool bPart = sal_False;
     SCTAB nTab = rRange.aStart.Tab();
 
     SCCOL nStartX = rRange.aStart.Col();
@@ -1266,44 +1269,44 @@ BOOL ScDocument::HasPartOfMerged( const ScRange& rRange )
 }
 
 
-BOOL ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew )
+sal_Bool ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew )
 {
     if ( rOld == rNew )
-        return TRUE;
+        return sal_True;
 
-    BOOL bOk = TRUE;
-    BOOL bInsCol,bDelCol,bInsRow,bDelRow;
+    sal_Bool bOk = sal_True;
+    sal_Bool bInsCol,bDelCol,bInsRow,bDelRow;
     ScRange aColRange,aRowRange;
     lcl_GetInsDelRanges( rOld, rNew, aColRange,bInsCol,bDelCol, aRowRange,bInsRow,bDelRow );
 
     if ( bInsCol && !CanInsertCol( aColRange ) )			// Zellen am Rand ?
-        bOk = FALSE;
+        bOk = sal_False;
     if ( bInsRow && !CanInsertRow( aRowRange ) )			// Zellen am Rand ?
-        bOk = FALSE;
+        bOk = sal_False;
 
     if ( bInsCol || bDelCol )
     {
         aColRange.aEnd.SetCol(MAXCOL);
         if ( HasPartOfMerged(aColRange) )
-            bOk = FALSE;
+            bOk = sal_False;
     }
     if ( bInsRow || bDelRow )
     {
         aRowRange.aEnd.SetRow(MAXROW);
         if ( HasPartOfMerged(aRowRange) )
-            bOk = FALSE;
+            bOk = sal_False;
     }
 
     return bOk;
 }
 
 
-void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear )
+void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, sal_Bool bClear )
 {
     if (bClear)
         DeleteAreaTab( rOld, IDF_ALL );
 
-    BOOL bInsCol,bDelCol,bInsRow,bDelRow;
+    sal_Bool bInsCol,bDelCol,bInsRow,bDelRow;
     ScRange aColRange,aRowRange;
     lcl_GetInsDelRanges( rOld, rNew, aColRange,bInsCol,bDelCol, aRowRange,bInsRow,bDelRow );
 
@@ -1333,12 +1336,12 @@ void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear
 
 void ScDocument::DeleteArea(SCCOL nCol1, SCROW nRow1,
                             SCCOL nCol2, SCROW nRow2,
-                            const ScMarkData& rMark, USHORT nDelFlag)
+                            const ScMarkData& rMark, sal_uInt16 nDelFlag)
 {
     PutInOrder( nCol1, nCol2 );
     PutInOrder( nRow1, nRow2 );
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for (SCTAB i = 0; i <= MAXTAB; i++)
         if (pTab[i])
             if ( rMark.GetTableSelect(i) || bIsUndo )
@@ -1349,21 +1352,21 @@ void ScDocument::DeleteArea(SCCOL nCol1, SCROW nRow1,
 
 void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1,
                                 SCCOL nCol2, SCROW nRow2,
-                                SCTAB nTab, USHORT nDelFlag)
+                                SCTAB nTab, sal_uInt16 nDelFlag)
 {
     PutInOrder( nCol1, nCol2 );
     PutInOrder( nRow1, nRow2 );
     if ( VALIDTAB(nTab) && pTab[nTab] )
     {
-        BOOL bOldAutoCalc = GetAutoCalc();
-        SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+        sal_Bool bOldAutoCalc = GetAutoCalc();
+        SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
         pTab[nTab]->DeleteArea(nCol1, nRow1, nCol2, nRow2, nDelFlag);
         SetAutoCalc( bOldAutoCalc );
     }
 }
 
 
-void ScDocument::DeleteAreaTab( const ScRange& rRange, USHORT nDelFlag )
+void ScDocument::DeleteAreaTab( const ScRange& rRange, sal_uInt16 nDelFlag )
 {
     for ( SCTAB nTab = rRange.aStart.Tab(); nTab <= rRange.aEnd.Tab(); nTab++ )
         DeleteAreaTab( rRange.aStart.Col(), rRange.aStart.Row(),
@@ -1373,7 +1376,7 @@ void ScDocument::DeleteAreaTab( const ScRange& rRange, USHORT nDelFlag )
 
 
 void ScDocument::InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection,
-                                BOOL bColInfo, BOOL bRowInfo )
+                                sal_Bool bColInfo, sal_Bool bRowInfo )
 {
     if (bIsUndo)
     {
@@ -1397,7 +1400,7 @@ void ScDocument::InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSe
 
 
 void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2,
-                                BOOL bColInfo, BOOL bRowInfo )
+                                sal_Bool bColInfo, sal_Bool bRowInfo )
 {
     if (bIsUndo)
     {
@@ -1418,7 +1421,7 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2,
 }
 
 
-void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, BOOL bColInfo, BOOL bRowInfo )
+void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, sal_Bool bColInfo, sal_Bool bRowInfo )
 {
     if (bIsUndo)
     {
@@ -1437,7 +1440,7 @@ void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, BOOL bColInfo, BOOL bRowI
 }
 
 
-void ScDocument::SetCutMode( BOOL bVal )
+void ScDocument::SetCutMode( sal_Bool bVal )
 {
     if (bIsClip)
         GetClipParam().mbCutMode = bVal;
@@ -1448,22 +1451,22 @@ void ScDocument::SetCutMode( BOOL bVal )
 }
 
 
-BOOL ScDocument::IsCutMode()
+sal_Bool ScDocument::IsCutMode()
 {
     if (bIsClip)
         return GetClipParam().mbCutMode;
     else
     {
         DBG_ERROR("IsCutMode ohne bIsClip");
-        return FALSE;
+        return sal_False;
     }
 }
 
 
 void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                             SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
-                            USHORT nFlags, BOOL bOnlyMarked, ScDocument* pDestDoc,
-                            const ScMarkData* pMarks, BOOL bColRowFlags )
+                            sal_uInt16 nFlags, sal_Bool bOnlyMarked, ScDocument* pDestDoc,
+                            const ScMarkData* pMarks, sal_Bool bColRowFlags )
 {
     PutInOrder( nCol1, nCol2 );
     PutInOrder( nRow1, nRow2 );
@@ -1472,14 +1475,14 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
         pDestDoc->aDocName = aDocName;
     if (VALIDTAB(nTab1) && VALIDTAB(nTab2))
     {
-        BOOL bOldAutoCalc = pDestDoc->GetAutoCalc();
-        pDestDoc->SetAutoCalc( FALSE );		// Mehrfachberechnungen vermeiden
+        sal_Bool bOldAutoCalc = pDestDoc->GetAutoCalc();
+        pDestDoc->SetAutoCalc( sal_False );		// Mehrfachberechnungen vermeiden
         for (SCTAB i = nTab1; i <= nTab2; i++)
         {
             if (pTab[i] && pDestDoc->pTab[i])
                 pTab[i]->CopyToTable( nCol1, nRow1, nCol2, nRow2, nFlags,
                                       bOnlyMarked, pDestDoc->pTab[i], pMarks,
-                                      FALSE, bColRowFlags );
+                                      sal_False, bColRowFlags );
         }
         pDestDoc->SetAutoCalc( bOldAutoCalc );
     }
@@ -1488,7 +1491,7 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
 
 void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                             SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
-                            USHORT nFlags, BOOL bOnlyMarked, ScDocument* pDestDoc,
+                            sal_uInt16 nFlags, sal_Bool bOnlyMarked, ScDocument* pDestDoc,
                             const ScMarkData* pMarks)
 {
     PutInOrder( nCol1, nCol2 );
@@ -1496,10 +1499,10 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
     PutInOrder( nTab1, nTab2 );
     if (VALIDTAB(nTab1) && VALIDTAB(nTab2))
     {
-        BOOL bOldAutoCalc = pDestDoc->GetAutoCalc();
-        pDestDoc->SetAutoCalc( FALSE );		// Mehrfachberechnungen vermeiden
+        sal_Bool bOldAutoCalc = pDestDoc->GetAutoCalc();
+        pDestDoc->SetAutoCalc( sal_False );		// Mehrfachberechnungen vermeiden
         if (nTab1 > 0)
-            CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, FALSE, pDestDoc, pMarks );
+            CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, sal_False, pDestDoc, pMarks );
 
         for (SCTAB i = nTab1; i <= nTab2; i++)
         {
@@ -1509,35 +1512,35 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
         }
 
         if (nTab2 < MAXTAB)
-            CopyToDocument( 0,0,nTab2+1, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA, FALSE, pDestDoc, pMarks );
+            CopyToDocument( 0,0,nTab2+1, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA, sal_False, pDestDoc, pMarks );
         pDestDoc->SetAutoCalc( bOldAutoCalc );
     }
 }
 
 
 void ScDocument::CopyToDocument(const ScRange& rRange,
-                            USHORT nFlags, BOOL bOnlyMarked, ScDocument* pDestDoc,
-                            const ScMarkData* pMarks, BOOL bColRowFlags)
+                            sal_uInt16 nFlags, sal_Bool bOnlyMarked, ScDocument* pDestDoc,
+                            const ScMarkData* pMarks, sal_Bool bColRowFlags)
 {
     ScRange aNewRange = rRange;
     aNewRange.Justify();
 
     if( !pDestDoc->aDocName.Len() )
         pDestDoc->aDocName = aDocName;
-    BOOL bOldAutoCalc = pDestDoc->GetAutoCalc();
-    pDestDoc->SetAutoCalc( FALSE );		// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDestDoc->GetAutoCalc();
+    pDestDoc->SetAutoCalc( sal_False );		// Mehrfachberechnungen vermeiden
     for (SCTAB i = aNewRange.aStart.Tab(); i <= aNewRange.aEnd.Tab(); i++)
         if (pTab[i] && pDestDoc->pTab[i])
             pTab[i]->CopyToTable(aNewRange.aStart.Col(), aNewRange.aStart.Row(),
                                  aNewRange.aEnd.Col(), aNewRange.aEnd.Row(),
                                  nFlags, bOnlyMarked, pDestDoc->pTab[i],
-                                 pMarks, FALSE, bColRowFlags);
+                                 pMarks, sal_False, bColRowFlags);
     pDestDoc->SetAutoCalc( bOldAutoCalc );
 }
 
 
 void ScDocument::UndoToDocument(const ScRange& rRange,
-                            USHORT nFlags, BOOL bOnlyMarked, ScDocument* pDestDoc,
+                            sal_uInt16 nFlags, sal_Bool bOnlyMarked, ScDocument* pDestDoc,
                             const ScMarkData* pMarks)
 {
     ScRange aNewRange = rRange;
@@ -1545,10 +1548,10 @@ void ScDocument::UndoToDocument(const ScRange& rRange,
     SCTAB nTab1 = aNewRange.aStart.Tab();
     SCTAB nTab2 = aNewRange.aEnd.Tab();
 
-    BOOL bOldAutoCalc = pDestDoc->GetAutoCalc();
-    pDestDoc->SetAutoCalc( FALSE );		// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDestDoc->GetAutoCalc();
+    pDestDoc->SetAutoCalc( sal_False );		// Mehrfachberechnungen vermeiden
     if (nTab1 > 0)
-        CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, FALSE, pDestDoc, pMarks );
+        CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, sal_False, pDestDoc, pMarks );
 
     for (SCTAB i = nTab1; i <= nTab2; i++)
     {
@@ -1559,7 +1562,7 @@ void ScDocument::UndoToDocument(const ScRange& rRange,
     }
 
     if (nTab2 < MAXTAB)
-        CopyToDocument( 0,0,nTab2+1, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA, FALSE, pDestDoc, pMarks );
+        CopyToDocument( 0,0,nTab2+1, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA, sal_False, pDestDoc, pMarks );
     pDestDoc->SetAutoCalc( bOldAutoCalc );
 }
 
@@ -1629,14 +1632,14 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1,
         pClipDoc->ResetClip( this, nTab );
 
         if (pTab[nTab] && pClipDoc->pTab[nTab])
-            pTab[nTab]->CopyToClip(nCol1, nRow1, nCol2, nRow2, pClipDoc->pTab[nTab], FALSE, TRUE);
+            pTab[nTab]->CopyToClip(nCol1, nRow1, nCol2, nRow2, pClipDoc->pTab[nTab], sal_False, sal_True);
 
         pClipDoc->GetClipParam().mbCutMode = false;
     }
 }
 
 
-void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsLink )
+void ScDocument::TransposeClip( ScDocument* pTransClip, sal_uInt16 nFlags, sal_Bool bAsLink )
 {
     DBG_ASSERT( bIsClip && pTransClip && pTransClip->bIsClip,
                     "TransposeClip mit falschem Dokument" );
@@ -1649,9 +1652,9 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL
         //	Bereiche uebernehmen
 
     pTransClip->pRangeName->FreeAll();
-    for (USHORT i = 0; i < pRangeName->GetCount(); i++)		//! DB-Bereiche Pivot-Bereiche auch !!!
+    for (sal_uInt16 i = 0; i < pRangeName->GetCount(); i++)		//! DB-Bereiche Pivot-Bereiche auch !!!
     {
-        USHORT nIndex = ((ScRangeData*)((*pRangeName)[i]))->GetIndex();
+        sal_uInt16 nIndex = ((ScRangeData*)((*pRangeName)[i]))->GetIndex();
         ScRangeData* pData = new ScRangeData(*((*pRangeName)[i]));
         if (!pTransClip->pRangeName->Insert(pData))
             delete pData;
@@ -1705,7 +1708,7 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL
 
 void ScDocument::CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks, bool bAllTabs)
 {
-    std::set<USHORT> aUsedNames;        // indexes of named ranges that are used in the copied cells
+    std::set<sal_uInt16> aUsedNames;        // indexes of named ranges that are used in the copied cells
     for (SCTAB i = 0; i <= MAXTAB; ++i)
         if (pTab[i] && pClipDoc->pTab[i])
             if ( bAllTabs || !pMarks || pMarks->GetTableSelect(i) )
@@ -1714,9 +1717,9 @@ void ScDocument::CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClip
                     rClipRange.aEnd.Col(), rClipRange.aEnd.Row(), aUsedNames);
 
     pClipDoc->pRangeName->FreeAll();
-    for (USHORT i = 0; i < pRangeName->GetCount(); i++)        //! DB-Bereiche Pivot-Bereiche auch !!!
+    for (sal_uInt16 i = 0; i < pRangeName->GetCount(); i++)        //! DB-Bereiche Pivot-Bereiche auch !!!
     {
-        USHORT nIndex = ((ScRangeData*)((*pRangeName)[i]))->GetIndex();
+        sal_uInt16 nIndex = ((ScRangeData*)((*pRangeName)[i]))->GetIndex();
         bool bInUse = ( aUsedNames.find(nIndex) != aUsedNames.end() );
         if (bInUse)
         {
@@ -1771,12 +1774,12 @@ void ScDocument::CopyRangeNamesFromClip(ScDocument* pClipDoc, ScClipRangeNameDat
             The adjustment of the indices in the formulas is done later.
         */
         ScRangeData* pClipRangeData = (*pClipDoc->pRangeName)[i];
-        USHORT k;
+        sal_uInt16 k;
         if ( pRangeName->SearchName( pClipRangeData->GetName(), k ) )
         {
             aClipRangeNames.mpRangeNames[i] = NULL;  // range name not inserted
-            USHORT nOldIndex = pClipRangeData->GetIndex();
-            USHORT nNewIndex = ((*pRangeName)[k])->GetIndex();
+            sal_uInt16 nOldIndex = pClipRangeData->GetIndex();
+            sal_uInt16 nNewIndex = ((*pRangeName)[k])->GetIndex();
             aClipRangeNames.insert(nOldIndex, nNewIndex);
             if ( !aClipRangeNames.mbReplace )
                 aClipRangeNames.mbReplace = ( nOldIndex != nNewIndex );
@@ -1790,8 +1793,8 @@ void ScDocument::CopyRangeNamesFromClip(ScDocument* pClipDoc, ScClipRangeNameDat
             if ( pRangeName->Insert( pData ) )
             {
                 aClipRangeNames.mpRangeNames[i] = pData;
-                USHORT nOldIndex = pClipRangeData->GetIndex();
-                USHORT nNewIndex = pData->GetIndex();
+                sal_uInt16 nOldIndex = pClipRangeData->GetIndex();
+                sal_uInt16 nNewIndex = pData->GetIndex();
                 aClipRangeNames.insert(nOldIndex, nNewIndex);
                 if ( !aClipRangeNames.mbReplace )
                     aClipRangeNames.mbReplace = ( nOldIndex != nNewIndex );
@@ -1827,7 +1830,7 @@ void ScDocument::UpdateRangeNamesInFormulas(
             rRangeNames.mpRangeNames[i]->ReplaceRangeNamesInUse(rRangeNames.maRangeMap);
     }
     // then update the formulas, they might need just the updated range names
-    for (ULONG nRange = 0; nRange < rDestRanges.Count(); ++nRange)
+    for (sal_uLong nRange = 0; nRange < rDestRanges.Count(); ++nRange)
     {
         const ScRange* pRange = rDestRanges.GetObject( nRange);
         SCCOL nCol1 = pRange->aStart.Col();
@@ -1879,7 +1882,7 @@ void ScDocument::SetClipParam(const ScClipParam& rParam)
     mpClipParam.reset(new ScClipParam(rParam));
 }
 
-BOOL ScDocument::IsClipboardSource() const
+sal_Bool ScDocument::IsClipboardSource() const
 {
     ScDocument* pClipDoc = SC_MOD()->GetClipDoc();
     return pClipDoc && pClipDoc->xPoolHelper.isValid() &&
@@ -1889,7 +1892,7 @@ BOOL ScDocument::IsClipboardSource() const
 
 void ScDocument::StartListeningFromClip( SCCOL nCol1, SCROW nRow1,
                                         SCCOL nCol2, SCROW nRow2,
-                                        const ScMarkData& rMark, USHORT nInsFlag )
+                                        const ScMarkData& rMark, sal_uInt16 nInsFlag )
 {
     if (nInsFlag & IDF_CONTENTS)
     {
@@ -1903,7 +1906,7 @@ void ScDocument::StartListeningFromClip( SCCOL nCol1, SCROW nRow1,
 
 void ScDocument::BroadcastFromClip( SCCOL nCol1, SCROW nRow1,
                                     SCCOL nCol2, SCROW nRow2,
-                                    const ScMarkData& rMark, USHORT nInsFlag )
+                                    const ScMarkData& rMark, sal_uInt16 nInsFlag )
 {
     if (nInsFlag & IDF_CONTENTS)
     {
@@ -1979,8 +1982,8 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1,
 
                 if ( pCBFCP->pClipDoc->GetClipParam().mbCutMode )
                 {
-                    BOOL bOldInserting = IsInsertingFromOtherDoc();
-                    SetInsertingFromOtherDoc( TRUE);
+                    sal_Bool bOldInserting = IsInsertingFromOtherDoc();
+                    SetInsertingFromOtherDoc( sal_True);
                     UpdateReference( URM_MOVE,
                         nCol1, nRow1, i, nCol2, nRow2, i+nFollow,
                         nDx, nDy, nDz, pCBFCP->pRefUndoDoc, FALSE );
@@ -1989,7 +1992,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1,
                 else
                     UpdateReference( URM_COPY,
                         nCol1, nRow1, i, nCol2, nRow2, i+nFollow,
-                        nDx, nDy, nDz, pCBFCP->pRefUndoDoc, FALSE );
+                        nDx, nDy, nDz, pCBFCP->pRefUndoDoc, sal_False );
 
                 nClipTab = (nClipTab+nFollow+1) % (MAXTAB+1);
                 i = sal::static_int_cast<SCTAB>( i + nFollow );
@@ -2050,9 +2053,9 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1,
 
 
 void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark,
-                                USHORT nInsFlag,
-                                ScDocument* pRefUndoDoc, ScDocument* pClipDoc, BOOL bResetCut,
-                                BOOL bAsLink, BOOL bIncludeFiltered, BOOL bSkipAttrForEmpty,
+                                sal_uInt16 nInsFlag,
+                                ScDocument* pRefUndoDoc, ScDocument* pClipDoc, sal_Bool bResetCut,
+                                sal_Bool bAsLink, sal_Bool bIncludeFiltered, sal_Bool bSkipAttrForEmpty,
                                 const ScRangeList * pDestRanges )
 {
     if (!bIsClip)
@@ -2064,8 +2067,8 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
         }
         if (pClipDoc->bIsClip && pClipDoc->GetTableCount())
         {
-            BOOL bOldAutoCalc = GetAutoCalc();
-            SetAutoCalc( FALSE );	// avoid multiple recalculations
+            sal_Bool bOldAutoCalc = GetAutoCalc();
+            SetAutoCalc( sal_False );	// avoid multiple recalculations
 
             NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc);
 
@@ -2110,7 +2113,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
                 overwrite/delete existing cells but to insert the notes into
                 these cells. In this case, just delete old notes from the
                 destination area. */
-            USHORT nDelFlag = IDF_NONE;
+            sal_uInt16 nDelFlag = IDF_NONE;
             if ( (nInsFlag & (IDF_CONTENTS | IDF_ADDNOTES)) == (IDF_NOTE | IDF_ADDNOTES) )
                 nDelFlag |= IDF_NOTE;
             else if ( nInsFlag & IDF_CONTENTS )
@@ -2149,19 +2152,19 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
                 pDestRanges = &aLocalRangeList;
             }
 
-            bInsertingFromOtherDoc = TRUE;	// kein Broadcast/Listener aufbauen bei Insert
+            bInsertingFromOtherDoc = sal_True;	// kein Broadcast/Listener aufbauen bei Insert
 
             // bei mindestens 64 Zeilen wird in ScColumn::CopyFromClip voralloziert
-            BOOL bDoDouble = ( nYw < 64 && nAllRow2 - nAllRow1 > 64);
-            BOOL bOldDouble = ScColumn::bDoubleAlloc;
+            sal_Bool bDoDouble = ( nYw < 64 && nAllRow2 - nAllRow1 > 64);
+            sal_Bool bOldDouble = ScColumn::bDoubleAlloc;
             if (bDoDouble)
-                ScColumn::bDoubleAlloc = TRUE;
+                ScColumn::bDoubleAlloc = sal_True;
 
             SCCOL nClipStartCol = aClipRange.aStart.Col();
             SCROW nClipStartRow = aClipRange.aStart.Row();
             // WaE: commented because unused:   SCCOL nClipEndCol = pClipDoc->aClipRange.aEnd.Col();
             SCROW nClipEndRow = aClipRange.aEnd.Row();
-            for (ULONG nRange = 0; nRange < pDestRanges->Count(); ++nRange)
+            for (sal_uLong nRange = 0; nRange < pDestRanges->Count(); ++nRange)
             {
                 const ScRange* pRange = pDestRanges->GetObject( nRange);
                 SCCOL nCol1 = pRange->aStart.Col();
@@ -2227,7 +2230,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
                 if (pTab[k] && rMark.GetTableSelect(k))
                     pTab[k]->DecRecalcLevel();
 
-            bInsertingFromOtherDoc = FALSE;
+            bInsertingFromOtherDoc = sal_False;
 
             UpdateRangeNamesInFormulas(aClipRangeNames, *pDestRanges, rMark, nXw, nYw);
 
@@ -2243,7 +2246,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
 }
 
 static SCROW lcl_getLastNonFilteredRow(
-    const ScBitMaskCompressedArray<SCROW, BYTE>& rFlags, SCROW nBegRow, SCROW nEndRow,
+    const ScBitMaskCompressedArray<SCROW, sal_uInt8>& rFlags, SCROW nBegRow, SCROW nEndRow,
     SCROW nRowCount)
 {
     SCROW nFilteredRow = rFlags.GetFirstForCondition(
@@ -2268,8 +2271,8 @@ void ScDocument::CopyMultiRangeFromClip(
         // There is nothing in the clip doc to copy.
         return;
 
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( FALSE );   // avoid multiple recalculations
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_False );   // avoid multiple recalculations
 
     NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc);
 
@@ -2304,11 +2307,11 @@ void ScDocument::CopyMultiRangeFromClip(
     rMark.GetMarkArea(aDestRange);
     SCROW nLastMarkedRow = aDestRange.aEnd.Row();
 
-    bInsertingFromOtherDoc = TRUE;  // kein Broadcast/Listener aufbauen bei Insert
+    bInsertingFromOtherDoc = sal_True;  // kein Broadcast/Listener aufbauen bei Insert
 
     SCROW nBegRow = nRow1;
     sal_uInt16 nDelFlag = IDF_CONTENTS;
-    const ScBitMaskCompressedArray<SCROW, BYTE>& rFlags = GetRowFlagsArray(aCBFCP.nTabStart);
+    const ScBitMaskCompressedArray<SCROW, sal_uInt8>& rFlags = GetRowFlagsArray(aCBFCP.nTabStart);
 
     for (ScRange* p = rClipParam.maRanges.First(); p; p = rClipParam.maRanges.Next())
     {
@@ -2362,7 +2365,7 @@ void ScDocument::CopyMultiRangeFromClip(
         if (pTab[i] && rMark.GetTableSelect(i))
             pTab[i]->DecRecalcLevel();
 
-    bInsertingFromOtherDoc = FALSE;
+    bInsertingFromOtherDoc = sal_False;
 
     ScRangeList aRanges;
     aRanges.Append(aDestRange);
@@ -2382,7 +2385,7 @@ void ScDocument::CopyMultiRangeFromClip(
     SetAutoCalc( bOldAutoCalc );
 }
 
-void ScDocument::SetClipArea( const ScRange& rArea, BOOL bCut )
+void ScDocument::SetClipArea( const ScRange& rArea, sal_Bool bCut )
 {
     if (bIsClip)
     {
@@ -2398,7 +2401,7 @@ void ScDocument::SetClipArea( const ScRange& rArea, BOOL bCut )
 }
 
 
-void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered)
+void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, sal_Bool bIncludeFiltered)
 {
     if (!bIsClip)
     {
@@ -2468,7 +2471,7 @@ void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY)
 }
 
 
-BOOL ScDocument::HasClipFilteredRows()
+sal_Bool ScDocument::HasClipFilteredRows()
 {
     //	count on first used table in clipboard
     SCTAB nCountTab = 0;
@@ -2489,7 +2492,7 @@ BOOL ScDocument::HasClipFilteredRows()
 }
 
 
-void ScDocument::MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSkipEmpty,
+void ScDocument::MixDocument( const ScRange& rRange, sal_uInt16 nFunction, sal_Bool bSkipEmpty,
                                     ScDocument* pSrcDoc )
 {
     SCTAB nTab1 = rRange.aStart.Tab();
@@ -2503,10 +2506,10 @@ void ScDocument::MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSki
 
 
 void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark,
-                                USHORT nFlags, USHORT nFunction,
-                                BOOL bSkipEmpty, BOOL bAsLink )
+                                sal_uInt16 nFlags, sal_uInt16 nFunction,
+                                sal_Bool bSkipEmpty, sal_Bool bAsLink )
 {
-    USHORT nDelFlags = nFlags;
+    sal_uInt16 nDelFlags = nFlags;
     if (nDelFlags & IDF_CONTENTS)
         nDelFlags |= IDF_CONTENTS;			// immer alle Inhalte oder keine loeschen!
 
@@ -2519,10 +2522,10 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark,
         SCCOL nEndCol = rSrcArea.aEnd.Col();
         SCROW nEndRow = rSrcArea.aEnd.Row();
         ScDocument* pMixDoc = NULL;
-        BOOL bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS );
+        sal_Bool bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS );
 
-        BOOL bOldAutoCalc = GetAutoCalc();
-        SetAutoCalc( FALSE );					// Mehrfachberechnungen vermeiden
+        sal_Bool bOldAutoCalc = GetAutoCalc();
+        SetAutoCalc( sal_False );					// Mehrfachberechnungen vermeiden
 
         SCTAB nCount = GetTableCount();
         for (SCTAB i=0; i<nCount; i++)
@@ -2538,11 +2541,11 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark,
                     else
                         pMixDoc->AddUndoTab( i, i );
                     pTab[i]->CopyToTable( nStartCol,nStartRow, nEndCol,nEndRow,
-                                            IDF_CONTENTS, FALSE, pMixDoc->pTab[i] );
+                                            IDF_CONTENTS, sal_False, pMixDoc->pTab[i] );
                 }
                 pTab[i]->DeleteArea( nStartCol,nStartRow, nEndCol,nEndRow, nDelFlags);
                 pTab[nSrcTab]->CopyToTable( nStartCol,nStartRow, nEndCol,nEndRow,
-                                                 nFlags, FALSE, pTab[i], NULL, bAsLink );
+                                                 nFlags, sal_False, pTab[i], NULL, bAsLink );
 
                 if (bDoMix)
                     pTab[i]->MixData( nStartCol,nStartRow, nEndCol,nEndRow,
@@ -2561,20 +2564,20 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark,
 
 
 void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark,
-                                USHORT nFlags, USHORT nFunction,
-                                BOOL bSkipEmpty, BOOL bAsLink )
+                                sal_uInt16 nFlags, sal_uInt16 nFunction,
+                                sal_Bool bSkipEmpty, sal_Bool bAsLink )
 {
-    USHORT nDelFlags = nFlags;
+    sal_uInt16 nDelFlags = nFlags;
     if (nDelFlags & IDF_CONTENTS)
         nDelFlags |= IDF_CONTENTS;			// immer alle Inhalte oder keine loeschen!
 
     if (ValidTab(nSrcTab)  && pTab[nSrcTab])
     {
         ScDocument* pMixDoc = NULL;
-        BOOL bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS );
+        sal_Bool bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS );
 
-        BOOL bOldAutoCalc = GetAutoCalc();
-        SetAutoCalc( FALSE );					// Mehrfachberechnungen vermeiden
+        sal_Bool bOldAutoCalc = GetAutoCalc();
+        SetAutoCalc( sal_False );					// Mehrfachberechnungen vermeiden
 
         ScRange aArea;
         rMark.GetMultiMarkArea( aArea );
@@ -2597,12 +2600,12 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark,
                     else
                         pMixDoc->AddUndoTab( i, i );
                     pTab[i]->CopyToTable( nStartCol,nStartRow, nEndCol,nEndRow,
-                                            IDF_CONTENTS, TRUE, pMixDoc->pTab[i], &rMark );
+                                            IDF_CONTENTS, sal_True, pMixDoc->pTab[i], &rMark );
                 }
 
                 pTab[i]->DeleteSelection( nDelFlags, rMark );
                 pTab[nSrcTab]->CopyToTable( nStartCol,nStartRow, nEndCol,nEndRow,
-                                             nFlags, TRUE, pTab[i], &rMark, bAsLink );
+                                             nFlags, sal_True, pTab[i], &rMark, bAsLink );
 
                 if (bDoMix)
                     pTab[i]->MixMarked( rMark, nFunction, bSkipEmpty, pMixDoc->pTab[i] );
@@ -2619,13 +2622,13 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark,
 }
 
 
-void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, BOOL bForceTab )
+void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, sal_Bool bForceTab )
 {
     if (VALIDTAB(nTab))
     {
         if ( bForceTab && !pTab[nTab] )
         {
-            BOOL bExtras = !bIsUndo;		// Spaltenbreiten, Zeilenhoehen, Flags
+            sal_Bool bExtras = !bIsUndo;		// Spaltenbreiten, Zeilenhoehen, Flags
 
             pTab[nTab] = new ScTable(this, nTab,
                             String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")),
@@ -2639,12 +2642,12 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
 }
 
 
-void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceTab )
+void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, sal_Bool bForceTab )
 {
     SCTAB nTab = rPos.Tab();
     if ( bForceTab && !pTab[nTab] )
     {
-        BOOL bExtras = !bIsUndo;		// Spaltenbreiten, Zeilenhoehen, Flags
+        sal_Bool bExtras = !bIsUndo;		// Spaltenbreiten, Zeilenhoehen, Flags
 
         pTab[nTab] = new ScTable(this, nTab,
                         String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")),
@@ -2657,13 +2660,13 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
 }
 
 
-BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
+sal_Bool ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, 
                             SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pFormatter, bDetectNumberFormat );
     else
-        return FALSE;
+        return sal_False;
 }
 
 
@@ -2733,7 +2736,7 @@ sal_uInt32 ScDocument::GetNumberFormat( const ScAddress& rPos ) const
 }
 
 
-void ScDocument::GetNumberFormatInfo( short& nType, ULONG& nIndex,
+void ScDocument::GetNumberFormatInfo( short& nType, sal_uLong& nIndex,
             const ScAddress& rPos, const ScBaseCell* pCell ) const
 {
     SCTAB nTab = rPos.Tab();
@@ -2755,7 +2758,7 @@ void ScDocument::GetNumberFormatInfo( short& nType, ULONG& nIndex,
 
 
 void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula,
-                             BOOL bAsciiExport ) const
+                             sal_Bool bAsciiExport ) const
 {
     if ( VALIDTAB(nTab) && pTab[nTab] )
             pTab[nTab]->GetFormula( nCol, nRow, rFormula, bAsciiExport );
@@ -2807,27 +2810,27 @@ ScBaseCell* ScDocument::GetCell( const ScAddress& rPos ) const
 }
 
 
-BOOL ScDocument::HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+sal_Bool ScDocument::HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
 {
     if ( VALIDTAB(nTab) && pTab[nTab] )
             return pTab[nTab]->HasStringData( nCol, nRow );
     else
-        return FALSE;
+        return sal_False;
 }
 
 
-BOOL ScDocument::HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+sal_Bool ScDocument::HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
 {
     if ( VALIDTAB(nTab) && pTab[nTab] )
             return pTab[nTab]->HasValueData( nCol, nRow );
     else
-        return FALSE;
+        return sal_False;
 }
 
 
-BOOL ScDocument::HasStringCells( const ScRange& rRange ) const
+sal_Bool ScDocument::HasStringCells( const ScRange& rRange ) const
 {
-    //	TRUE, wenn String- oder Editzellen im Bereich
+    //	sal_True, wenn String- oder Editzellen im Bereich
 
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -2838,20 +2841,20 @@ BOOL ScDocument::HasStringCells( const ScRange& rRange ) const
 
     for ( SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++ )
         if ( pTab[nTab] && pTab[nTab]->HasStringCells( nStartCol, nStartRow, nEndCol, nEndRow ) )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScDocument::HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+sal_Bool ScDocument::HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
 {
     sal_uInt32 nValidation = static_cast< const SfxUInt32Item* >( GetAttr( nCol, nRow, nTab, ATTR_VALIDDATA ) )->GetValue();
     if( nValidation )
     {
         const ScValidationData* pData = GetValidationEntry( nValidation );
         if( pData && pData->HasSelectionList() )
-            return TRUE;
+            return sal_True;
     }
     return HasStringCells( ScRange( nCol, 0, nTab, nCol, MAXROW, nTab ) );
 }
@@ -2913,8 +2916,8 @@ void ScDocument::InitializeAllNoteCaptions( bool bForced )
 
 void ScDocument::SetDirty()
 {
-    BOOL bOldAutoCalc = GetAutoCalc();
-    bAutoCalc = FALSE;		// keine Mehrfachberechnung
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    bAutoCalc = sal_False;		// keine Mehrfachberechnung
     {   // scope for bulk broadcast
         ScBulkBroadcast aBulkBroadcast( GetBASM());
         for (SCTAB i=0; i<=MAXTAB; i++)
@@ -2933,8 +2936,8 @@ void ScDocument::SetDirty()
 
 void ScDocument::SetDirty( const ScRange& rRange )
 {
-    BOOL bOldAutoCalc = GetAutoCalc();
-    bAutoCalc = FALSE;		// keine Mehrfachberechnung
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    bAutoCalc = sal_False;		// keine Mehrfachberechnung
     {   // scope for bulk broadcast
         ScBulkBroadcast aBulkBroadcast( GetBASM());
         SCTAB nTab2 = rRange.aEnd.Tab();
@@ -2947,8 +2950,8 @@ void ScDocument::SetDirty( const ScRange& rRange )
 
 void ScDocument::SetTableOpDirty( const ScRange& rRange )
 {
-    BOOL bOldAutoCalc = GetAutoCalc();
-    bAutoCalc = FALSE;		// no multiple recalculation
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    bAutoCalc = sal_False;		// no multiple recalculation
     SCTAB nTab2 = rRange.aEnd.Tab();
     for (SCTAB i=rRange.aStart.Tab(); i<=nTab2; i++)
         if (pTab[i]) pTab[i]->SetTableOpDirty( rRange );
@@ -2958,8 +2961,8 @@ void ScDocument::SetTableOpDirty( const ScRange& rRange )
 
 void ScDocument::InterpretDirtyCells( const ScRangeList& rRanges )
 {
-    ULONG nRangeCount = rRanges.Count();
-    for (ULONG nPos=0; nPos<nRangeCount; nPos++)
+    sal_uLong nRangeCount = rRanges.Count();
+    for (sal_uLong nPos=0; nPos<nRangeCount; nPos++)
     {
         ScCellIterator aIter( this, *rRanges.GetObject(nPos) );
         ScBaseCell* pCell = aIter.GetFirst();
@@ -2997,8 +3000,8 @@ void ScDocument::AddTableOpFormulaCell( ScFormulaCell* pCell )
 void ScDocument::CalcAll()
 {
     ClearLookupCaches();    // Ensure we don't deliver zombie data.
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( TRUE );
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_True );
     SCTAB i;
     for (i=0; i<=MAXTAB; i++)
         if (pTab[i]) pTab[i]->SetDirtyVar();
@@ -3022,8 +3025,8 @@ void ScDocument::CompileAll()
 
 void ScDocument::CompileXML()
 {
-    BOOL bOldAutoCalc = GetAutoCalc();
-    SetAutoCalc( FALSE );
+    sal_Bool bOldAutoCalc = GetAutoCalc();
+    SetAutoCalc( sal_False );
     ScProgress aProgress( GetDocumentShell(), ScGlobal::GetRscString(
                 STR_PROGRESS_CALCULATING ), GetXMLImportedFormulaCount() );
 
@@ -3053,14 +3056,14 @@ void ScDocument::CalcAfterLoad()
     if (bIsClip)	// Excel-Dateien werden aus dem Clipboard in ein Clip-Doc geladen
         return;		// dann wird erst beim Einfuegen in das richtige Doc berechnet
 
-    bCalcingAfterLoad = TRUE;
+    bCalcingAfterLoad = sal_True;
     for ( i = 0; i <= MAXTAB; i++)
         if (pTab[i]) pTab[i]->CalcAfterLoad();
     for (i=0; i<=MAXTAB; i++)
         if (pTab[i]) pTab[i]->SetDirtyAfterLoad();
-    bCalcingAfterLoad = FALSE;
+    bCalcingAfterLoad = sal_False;
 
-    SetDetectiveDirty(FALSE);	// noch keine wirklichen Aenderungen
+    SetDetectiveDirty(sal_False);	// noch keine wirklichen Aenderungen
 
     // #i112436# If formula cells are already dirty, they don't broadcast further changes.
     // So the source ranges of charts must be interpreted even if they are not visible,
@@ -3077,7 +3080,7 @@ void ScDocument::CalcAfterLoad()
 }
 
 
-USHORT ScDocument::GetErrCode( const ScAddress& rPos ) const
+sal_uInt16 ScDocument::GetErrCode( const ScAddress& rPos ) const
 {
     SCTAB nTab = rPos.Tab();
     if ( pTab[nTab] )
@@ -3100,41 +3103,41 @@ void ScDocument::ResetChanged( const ScRange& rRange )
 //
 
 
-void ScDocument::SetColWidth( SCCOL nCol, SCTAB nTab, USHORT nNewWidth )
+void ScDocument::SetColWidth( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetColWidth( nCol, nNewWidth );
 }
 
 
-void ScDocument::SetRowHeight( SCROW nRow, SCTAB nTab, USHORT nNewHeight )
+void ScDocument::SetRowHeight( SCROW nRow, SCTAB nTab, sal_uInt16 nNewHeight )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetRowHeight( nRow, nNewHeight );
 }
 
 
-void ScDocument::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nNewHeight )
+void ScDocument::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt16 nNewHeight )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetRowHeightRange
             ( nStartRow, nEndRow, nNewHeight, 1.0, 1.0 );
 }
 
-void ScDocument::SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nNewHeight )
+void ScDocument::SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt16 nNewHeight )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetRowHeightOnly( nStartRow, nEndRow, nNewHeight );
 }
 
-void ScDocument::SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bManual )
+void ScDocument::SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_Bool bManual )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetManualHeight( nStartRow, nEndRow, bManual );
 }
 
 
-USHORT ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab ) const
+sal_uInt16 ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetColWidth( nCol );
@@ -3143,7 +3146,7 @@ USHORT ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab ) const
 }
 
 
-USHORT ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const
+sal_uInt16 ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetOriginalWidth( nCol );
@@ -3152,7 +3155,7 @@ USHORT ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const
 }
 
 
-USHORT ScDocument::GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const
+sal_uInt16 ScDocument::GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetCommonWidth( nEndCol );
@@ -3161,7 +3164,7 @@ USHORT ScDocument::GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const
 }
 
 
-USHORT ScDocument::GetOriginalHeight( SCROW nRow, SCTAB nTab ) const
+sal_uInt16 ScDocument::GetOriginalHeight( SCROW nRow, SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetOriginalHeight( nRow );
@@ -3170,7 +3173,7 @@ USHORT ScDocument::GetOriginalHeight( SCROW nRow, SCTAB nTab ) const
 }
 
 
-USHORT ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) const
+sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetRowHeight( nRow, NULL, NULL, bHiddenAsZero );
@@ -3179,7 +3182,7 @@ USHORT ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) co
 }
 
 
-USHORT ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const
+sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetRowHeight( nRow, pStartRow, pEndRow, bHiddenAsZero );
@@ -3188,7 +3191,7 @@ USHORT ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW
 }
 
 
-ULONG ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const
+sal_uLong ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const
 {
     if (nStartRow == nEndRow)
         return GetRowHeight( nStartRow, nTab);  // faster for a single row
@@ -3204,17 +3207,17 @@ ULONG ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) con
     return 0;
 }
 
-SCROW ScDocument::GetRowForHeight( SCTAB nTab, ULONG nHeight ) const
+SCROW ScDocument::GetRowForHeight( SCTAB nTab, sal_uLong nHeight ) const
 {
     return pTab[nTab]->GetRowForHeight(nHeight);
 }
 
-ULONG ScDocument::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow,
+sal_uLong ScDocument::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow,
         SCTAB nTab, double fScale ) const
 {
     // faster for a single row
     if (nStartRow == nEndRow)
-        return (ULONG) (GetRowHeight( nStartRow, nTab) * fScale);
+        return (sal_uLong) (GetRowHeight( nStartRow, nTab) * fScale);
 
     // check bounds because this method replaces former for(i=start;i<=end;++i) loops
     if (nStartRow > nEndRow)
@@ -3236,7 +3239,7 @@ SCROW ScDocument::GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const
 }
 
 
-ULONG ScDocument::GetColOffset( SCCOL nCol, SCTAB nTab ) const
+sal_uLong ScDocument::GetColOffset( SCCOL nCol, SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetColOffset( nCol );
@@ -3245,7 +3248,7 @@ ULONG ScDocument::GetColOffset( SCCOL nCol, SCTAB nTab ) const
 }
 
 
-ULONG ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab ) const
+sal_uLong ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetRowOffset( nRow );
@@ -3254,11 +3257,11 @@ ULONG ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab ) const
 }
 
 
-USHORT ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev,
+sal_uInt16 ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev,
                                         double nPPTX, double nPPTY,
                                         const Fraction& rZoomX, const Fraction& rZoomY,
-                                        BOOL bFormula, const ScMarkData* pMarkData,
-                                        BOOL bSimpleTextImport )
+                                        sal_Bool bFormula, const ScMarkData* pMarkData,
+                                        sal_Bool bSimpleTextImport )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetOptimalColWidth( nCol, pDev, nPPTX, nPPTY,
@@ -3272,7 +3275,7 @@ long ScDocument::GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bWidth, BOOL bTotalSize )
+                                    sal_Bool bWidth, sal_Bool bTotalSize )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetNeededSize
@@ -3282,18 +3285,18 @@ long ScDocument::GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
 }
 
 
-BOOL ScDocument::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nExtra,
+sal_Bool ScDocument::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt16 nExtra,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bShrink )
+                                    sal_Bool bShrink )
 {
 //!	MarkToMulti();
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->SetOptimalHeight( nStartRow, nEndRow, nExtra,
                                                 pDev, nPPTX, nPPTY, rZoomX, rZoomY, bShrink );
     DBG_ERROR("Falsche Tabellennummer");
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -3302,19 +3305,19 @@ void ScDocument::UpdateAllRowHeights( OutputDevice* pDev, double nPPTX, double n
 {
     // one progress across all (selected) sheets
 
-    ULONG nCellCount = 0;
+    sal_uLong nCellCount = 0;
     for ( SCTAB nTab=0; nTab<=MAXTAB; nTab++ )
         if ( pTab[nTab] && ( !pTabMark || pTabMark->GetTableSelect(nTab) ) )
             nCellCount += pTab[nTab]->GetWeightedCount();
 
     ScProgress aProgress( GetDocumentShell(), ScGlobal::GetRscString(STR_PROGRESS_HEIGHTING), nCellCount );
 
-    ULONG nProgressStart = 0;
+    sal_uLong nProgressStart = 0;
     for ( SCTAB nTab=0; nTab<=MAXTAB; nTab++ )
         if ( pTab[nTab] && ( !pTabMark || pTabMark->GetTableSelect(nTab) ) )
         {
             pTab[nTab]->SetOptimalHeight( 0, MAXROW, 0,
-                        pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE, &aProgress, nProgressStart );
+                        pDev, nPPTX, nPPTY, rZoomX, rZoomY, sal_False, &aProgress, nProgressStart );
             nProgressStart += pTab[nTab]->GetWeightedCount();
         }
 }
@@ -3324,49 +3327,49 @@ void ScDocument::UpdateAllRowHeights( OutputDevice* pDev, double nPPTX, double n
 //	Spalten-/Zeilen-Flags	----------------------------------------------
 //
 
-void ScDocument::ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow)
+void ScDocument::ShowCol(SCCOL nCol, SCTAB nTab, sal_Bool bShow)
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->ShowCol( nCol, bShow );
 }
 
 
-void ScDocument::ShowRow(SCROW nRow, SCTAB nTab, BOOL bShow)
+void ScDocument::ShowRow(SCROW nRow, SCTAB nTab, sal_Bool bShow)
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->ShowRow( nRow, bShow );
 }
 
 
-void ScDocument::ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, BOOL bShow)
+void ScDocument::ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, sal_Bool bShow)
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->ShowRows( nRow1, nRow2, bShow );
 }
 
 
-void ScDocument::SetColFlags( SCCOL nCol, SCTAB nTab, BYTE nNewFlags )
+void ScDocument::SetColFlags( SCCOL nCol, SCTAB nTab, sal_uInt8 nNewFlags )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetColFlags( nCol, nNewFlags );
 }
 
 
-void ScDocument::SetRowFlags( SCROW nRow, SCTAB nTab, BYTE nNewFlags )
+void ScDocument::SetRowFlags( SCROW nRow, SCTAB nTab, sal_uInt8 nNewFlags )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetRowFlags( nRow, nNewFlags );
 }
 
 
-void ScDocument::SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BYTE nNewFlags )
+void ScDocument::SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt8 nNewFlags )
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         pTab[nTab]->SetRowFlags( nStartRow, nEndRow, nNewFlags );
 }
 
 
-BYTE ScDocument::GetColFlags( SCCOL nCol, SCTAB nTab ) const
+sal_uInt8 ScDocument::GetColFlags( SCCOL nCol, SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetColFlags( nCol );
@@ -3374,7 +3377,7 @@ BYTE ScDocument::GetColFlags( SCCOL nCol, SCTAB nTab ) const
     return 0;
 }
 
-BYTE ScDocument::GetRowFlags( SCROW nRow, SCTAB nTab ) const
+sal_uInt8 ScDocument::GetRowFlags( SCROW nRow, SCTAB nTab ) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
         return pTab[nTab]->GetRowFlags( nRow );
@@ -3382,17 +3385,17 @@ BYTE ScDocument::GetRowFlags( SCROW nRow, SCTAB nTab ) const
     return 0;
 }
 
-ScBitMaskCompressedArray< SCROW, BYTE> & ScDocument::GetRowFlagsArrayModifiable(
+ScBitMaskCompressedArray< SCROW, sal_uInt8> & ScDocument::GetRowFlagsArrayModifiable(
         SCTAB nTab )
 {
-    return const_cast< ScBitMaskCompressedArray< SCROW, BYTE> & >(
+    return const_cast< ScBitMaskCompressedArray< SCROW, sal_uInt8> & >(
             GetRowFlagsArray( nTab));
 }
 
-const ScBitMaskCompressedArray< SCROW, BYTE> & ScDocument::GetRowFlagsArray(
+const ScBitMaskCompressedArray< SCROW, sal_uInt8> & ScDocument::GetRowFlagsArray(
         SCTAB nTab ) const
 {
-    const ScBitMaskCompressedArray< SCROW, BYTE> * pFlags;
+    const ScBitMaskCompressedArray< SCROW, sal_uInt8> * pFlags;
     if ( ValidTab(nTab) && pTab[nTab] )
         pFlags = pTab[nTab]->GetRowFlagsArray();
     else
@@ -3403,7 +3406,7 @@ const ScBitMaskCompressedArray< SCROW, BYTE> & ScDocument::GetRowFlagsArray(
     if (!pFlags)
     {
         DBG_ERROR("no row flags at sheet");
-        static ScBitMaskCompressedArray< SCROW, BYTE> aDummy( MAXROW, 0);
+        static ScBitMaskCompressedArray< SCROW, sal_uInt8> aDummy( MAXROW, 0);
         pFlags = &aDummy;
     }
     return *pFlags;
@@ -3690,8 +3693,8 @@ SCCOL ScDocument::GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const
 {
     if ( ValidTab(nTab) && pTab[nTab] )
     {
-        BYTE nStartFlags = pTab[nTab]->GetColFlags(nStart);
-        USHORT nStartWidth = pTab[nTab]->GetOriginalWidth(nStart);
+        sal_uInt8 nStartFlags = pTab[nTab]->GetColFlags(nStart);
+        sal_uInt16 nStartWidth = pTab[nTab]->GetOriginalWidth(nStart);
         for (SCCOL nCol = nStart + 1; nCol <= MAXCOL; nCol++)
         {
             if (((nStartFlags & CR_MANUALBREAK) != (pTab[nTab]->GetColFlags(nCol) & CR_MANUALBREAK)) ||
@@ -3706,7 +3709,7 @@ SCCOL ScDocument::GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const
 
 SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCareManualSize) const
 {
-    const ScBitMaskCompressedArray< SCROW, BYTE> * pRowFlagsArray;
+    const ScBitMaskCompressedArray< SCROW, sal_uInt8> * pRowFlagsArray;
     if ( ValidTab(nTab) && pTab[nTab] && ((pRowFlagsArray = pTab[nTab]->GetRowFlagsArray()) != NULL) && 
             pTab[nTab]->mpRowHeights && pTab[nTab]->mpHiddenRows )
     {
@@ -3714,12 +3717,12 @@ SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCa
         SCROW nFlagsEndRow;
         SCROW nHiddenEndRow;
         SCROW nHeightEndRow;
-        BYTE nFlags;
+        sal_uInt8 nFlags;
         bool bHidden;
-        USHORT nHeight;
-        BYTE nStartFlags = nFlags = pRowFlagsArray->GetValue( nStart, nIndex, nFlagsEndRow);
+        sal_uInt16 nHeight;
+        sal_uInt8 nStartFlags = nFlags = pRowFlagsArray->GetValue( nStart, nIndex, nFlagsEndRow);
         bool bStartHidden = bHidden = pTab[nTab]->RowHidden( nStart, NULL, &nHiddenEndRow);
-        USHORT nStartHeight = nHeight = pTab[nTab]->GetRowHeight( nStart, NULL, &nHeightEndRow, false);
+        sal_uInt16 nStartHeight = nHeight = pTab[nTab]->GetRowHeight( nStart, NULL, &nHeightEndRow, false);
         SCROW nRow;
         while ((nRow = std::min( nHiddenEndRow, std::min( nFlagsEndRow, nHeightEndRow)) + 1) <= MAXROW)
         {
@@ -3741,9 +3744,9 @@ SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCa
     return 0;
 }
 
-BOOL ScDocument::GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault)
+sal_Bool ScDocument::GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault)
 {
-    BOOL bRet(FALSE);
+    sal_Bool bRet(sal_False);
     nDefault = 0;
     ScDocAttrIterator aDocAttrItr(this, nTab, nCol, 0, nCol, nLastRow);
     SCCOL nColumn;
@@ -3786,16 +3789,16 @@ BOOL ScDocument::GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& n
             aItr++;
         }
         nDefault = aDefaultItr->nFirst;
-        bRet = TRUE;
+        bRet = sal_True;
     }
     else
-        bRet = TRUE;
+        bRet = sal_True;
     return bRet;
 }
 
-BOOL ScDocument::GetRowDefault( SCTAB /* nTab */, SCROW /* nRow */, SCCOL /* nLastCol */, SCCOL& /* nDefault */ )
+sal_Bool ScDocument::GetRowDefault( SCTAB /* nTab */, SCROW /* nRow */, SCCOL /* nLastCol */, SCCOL& /* nDefault */ )
 {
-    BOOL bRet(FALSE);
+    sal_Bool bRet(sal_False);
     return bRet;
 }
 
@@ -3816,7 +3819,7 @@ void ScDocument::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, S
 //	Attribute	----------------------------------------------------------
 //
 
-const SfxPoolItem* ScDocument::GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const
+const SfxPoolItem* ScDocument::GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const
 {
     if ( ValidTab(nTab)  && pTab[nTab] )
     {
@@ -3941,7 +3944,7 @@ void ScDocument::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkDat
 
 
 void ScDocument::ApplySelectionLineStyle( const ScMarkData& rMark,
-                    const SvxBorderLine* pLine, BOOL bColorOnly )
+                    const SvxBorderLine* pLine, sal_Bool bColorOnly )
 {
     if ( bColorOnly && !pLine )
         return;
@@ -3964,8 +3967,8 @@ const ScStyleSheet*	ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) c
 
 const ScStyleSheet*	ScDocument::GetSelectionStyle( const ScMarkData& rMark ) const
 {
-    BOOL	bEqual = TRUE;
-    BOOL	bFound;
+    sal_Bool	bEqual = sal_True;
+    sal_Bool	bFound;
 
     const ScStyleSheet* pStyle = NULL;
     const ScStyleSheet* pNewStyle;
@@ -3978,7 +3981,7 @@ const ScStyleSheet*	ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con
                 if (bFound)
                 {
                     if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
-                        bEqual = FALSE;												// unterschiedliche
+                        bEqual = sal_False;												// unterschiedliche
                     pStyle = pNewStyle;
                 }
             }
@@ -3995,7 +3998,7 @@ const ScStyleSheet*	ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con
                 if (bFound)
                 {
                     if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
-                        bEqual = FALSE;												// unterschiedliche
+                        bEqual = sal_False;												// unterschiedliche
                     pStyle = pNewStyle;
                 }
             }
@@ -4005,7 +4008,7 @@ const ScStyleSheet*	ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con
 }
 
 
-void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved,
+void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool bRemoved,
                                     OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY )
@@ -4023,7 +4026,7 @@ void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL b
 }
 
 
-BOOL ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
+sal_Bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const
 {
     if ( bStyleSheetUsageInvalid || rStyle.GetUsage() == ScStyleSheet::UNKNOWN )
     {
@@ -4040,7 +4043,7 @@ BOOL ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllSt
             }
         }
 
-        BOOL bIsUsed = FALSE;
+        sal_Bool bIsUsed = sal_False;
 
         for ( SCTAB i=0; i<=MAXTAB; i++ )
         {
@@ -4049,14 +4052,14 @@ BOOL ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllSt
                 if ( pTab[i]->IsStyleSheetUsed( rStyle, bGatherAllStyles ) )
                 {
                     if ( !bGatherAllStyles )
-                        return TRUE;
-                    bIsUsed = TRUE;
+                        return sal_True;
+                    bIsUsed = sal_True;
                 }
             }
         }
 
         if ( bGatherAllStyles )
-            bStyleSheetUsageInvalid = FALSE;
+            bStyleSheetUsageInvalid = sal_False;
 
         return bIsUsed;
     }
@@ -4065,32 +4068,32 @@ BOOL ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllSt
 }
 
 
-BOOL ScDocument::ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow,
-                        SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, INT16 nFlags )
+sal_Bool ScDocument::ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow,
+                        SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, sal_Int16 nFlags )
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
             return pTab[nTab]->ApplyFlags( nStartCol, nStartRow, nEndCol, nEndRow, nFlags );
 
     DBG_ERROR("ApplyFlags: falsche Tabelle");
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScDocument::RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow,
-                        SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, INT16 nFlags )
+sal_Bool ScDocument::RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow,
+                        SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, sal_Int16 nFlags )
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
             return pTab[nTab]->RemoveFlags( nStartCol, nStartRow, nEndCol, nEndRow, nFlags );
 
     DBG_ERROR("RemoveFlags: falsche Tabelle");
-    return FALSE;
+    return sal_False;
 }
 
 
 void ScDocument::SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr,
-                                BOOL bPutToPool )
+                                sal_Bool bPutToPool )
 {
     if (VALIDTAB(nTab))
         if (pTab[nTab])
@@ -4099,7 +4102,7 @@ void ScDocument::SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPattern
 
 
 void ScDocument::SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr,
-                                BOOL bPutToPool )
+                                sal_Bool bPutToPool )
 {
     SCTAB nTab = rPos.Tab();
     if (pTab[nTab])
@@ -4107,7 +4110,7 @@ void ScDocument::SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr,
 }
 
 
-ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep )
+ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, sal_Bool bDeep )
 {
     ScMergePatternState aState;
 
@@ -4136,7 +4139,7 @@ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, BOOL
 }
 
 
-const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, BOOL bDeep )
+const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, sal_Bool bDeep )
 {
     delete pSelectionAttr;
     pSelectionAttr = CreateSelectionPattern( rMark, bDeep );
@@ -4156,9 +4159,9 @@ void ScDocument::GetSelectionFrame( const ScMarkData& rMark,
 
     rLineInner.SetLine(NULL, BOXINFO_LINE_HORI);
     rLineInner.SetLine(NULL, BOXINFO_LINE_VERT);
-    rLineInner.SetTable(TRUE);
-    rLineInner.SetDist(TRUE);
-    rLineInner.SetMinDist(FALSE);
+    rLineInner.SetTable(sal_True);
+    rLineInner.SetDist(sal_True);
+    rLineInner.SetMinDist(sal_False);
 
     ScLineFlags aFlags;
 
@@ -4187,7 +4190,7 @@ void ScDocument::GetSelectionFrame( const ScMarkData& rMark,
 
 
 bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
-                            SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nMask )
+                            SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nMask )
 {
     if ( nMask & HASATTR_ROTATE )
     {
@@ -4196,7 +4199,7 @@ bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
 
         ScDocumentPool* pPool = xPoolHelper->GetDocPool();
 
-        BOOL bAnyItem = FALSE;
+        sal_Bool bAnyItem = sal_False;
         sal_uInt32 nRotCount = pPool->GetItemCount2( ATTR_ROTATE_VALUE );
         for (sal_uInt32 nItem=0; nItem<nRotCount; nItem++)
         {
@@ -4205,10 +4208,10 @@ bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
             {
                 // 90 or 270 degrees is former SvxOrientationItem - only look for other values
                 // (see ScPatternAttr::GetCellOrientation)
-                INT32 nAngle = static_cast<const SfxInt32Item*>(pItem)->GetValue();
+                sal_Int32 nAngle = static_cast<const SfxInt32Item*>(pItem)->GetValue();
                 if ( nAngle != 0 && nAngle != 9000 && nAngle != 27000 )
                 {
-                    bAnyItem = TRUE;
+                    bAnyItem = sal_True;
                     break;
                 }
             }
@@ -4224,14 +4227,14 @@ bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
 
         ScDocumentPool* pPool = xPoolHelper->GetDocPool();
 
-        BOOL bHasRtl = FALSE;
+        sal_Bool bHasRtl = sal_False;
         sal_uInt32 nDirCount = pPool->GetItemCount2( ATTR_WRITINGDIR );
         for (sal_uInt32 nItem=0; nItem<nDirCount; nItem++)
         {
             const SfxPoolItem* pItem = pPool->GetItem2( ATTR_WRITINGDIR, nItem );
             if ( pItem && ((const SvxFrameDirectionItem*)pItem)->GetValue() == FRMDIR_HORI_RIGHT_TOP )
             {
-                bHasRtl = TRUE;
+                bHasRtl = sal_True;
                 break;
             }
         }
@@ -4254,7 +4257,7 @@ bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
             if ( nMask & HASATTR_RIGHTORCENTER )
             {
                 //  On a RTL sheet, don't start to look for the default left value
-                //  (which is then logically right), instead always assume TRUE.
+                //  (which is then logically right), instead always assume sal_True.
                 //  That way, ScAttrArray::HasAttrib doesn't have to handle RTL sheets.
 
                 if ( IsLayoutRTL(i) )
@@ -4268,7 +4271,7 @@ bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
     return bFound;
 }
 
-bool ScDocument::HasAttrib( const ScRange& rRange, USHORT nMask )
+bool ScDocument::HasAttrib( const ScRange& rRange, sal_uInt16 nMask )
 {
     return HasAttrib( rRange.aStart.Col(), rRange.aStart.Row(), rRange.aStart.Tab(),
                       rRange.aEnd.Col(),   rRange.aEnd.Row(),   rRange.aEnd.Tab(),
@@ -4339,7 +4342,7 @@ void ScDocument::GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab,
         *ppBottom = pBottomLine;
 }
 
-BOOL ScDocument::IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
+sal_Bool ScDocument::IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
                                         SCCOL nEndCol, SCROW nEndRow, bool bIgnoreNotes ) const
 {
     if (VALIDTAB(nTab))
@@ -4347,7 +4350,7 @@ BOOL ScDocument::IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
             return pTab[nTab]->IsBlockEmpty( nStartCol, nStartRow, nEndCol, nEndRow, bIgnoreNotes );
 
     DBG_ERROR("Falsche Tabellennummer");
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -4373,16 +4376,16 @@ void ScDocument::UnlockTable(SCTAB nTab)
 }
 
 
-BOOL ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
+sal_Bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
                                         SCCOL nEndCol, SCROW nEndRow,
-                                        BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
+                                        sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
 {
     // import into read-only document is possible
     if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
     {
         if ( pOnlyNotBecauseOfMatrix )
-            *pOnlyNotBecauseOfMatrix = FALSE;
-        return FALSE;
+            *pOnlyNotBecauseOfMatrix = sal_False;
+        return sal_False;
     }
 
     if (VALIDTAB(nTab))
@@ -4392,27 +4395,27 @@ BOOL ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
 
     DBG_ERROR("Falsche Tabellennummer");
     if ( pOnlyNotBecauseOfMatrix )
-        *pOnlyNotBecauseOfMatrix = FALSE;
-    return FALSE;
+        *pOnlyNotBecauseOfMatrix = sal_False;
+    return sal_False;
 }
 
 
-BOOL ScDocument::IsSelectionEditable( const ScMarkData& rMark,
-            BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
+sal_Bool ScDocument::IsSelectionEditable( const ScMarkData& rMark,
+            sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
 {
     // import into read-only document is possible
     if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
     {
         if ( pOnlyNotBecauseOfMatrix )
-            *pOnlyNotBecauseOfMatrix = FALSE;
-        return FALSE;
+            *pOnlyNotBecauseOfMatrix = sal_False;
+        return sal_False;
     }
 
     ScRange aRange;
     rMark.GetMarkArea(aRange);
 
-    BOOL bOk = TRUE;
-    BOOL bMatrix = ( pOnlyNotBecauseOfMatrix != NULL );
+    sal_Bool bOk = sal_True;
+    sal_Bool bMatrix = ( pOnlyNotBecauseOfMatrix != NULL );
     for ( SCTAB i=0; i<=MAXTAB && (bOk || bMatrix); i++ )
     {
         if ( pTab[i] && rMark.GetTableSelect(i) )
@@ -4423,7 +4426,7 @@ BOOL ScDocument::IsSelectionEditable( const ScMarkData& rMark,
                         aRange.aStart.Row(), aRange.aEnd.Col(),
                         aRange.aEnd.Row(), pOnlyNotBecauseOfMatrix ) )
                 {
-                    bOk = FALSE;
+                    bOk = sal_False;
                     if ( pOnlyNotBecauseOfMatrix )
                         bMatrix = *pOnlyNotBecauseOfMatrix;
                 }
@@ -4432,7 +4435,7 @@ BOOL ScDocument::IsSelectionEditable( const ScMarkData& rMark,
             {
                 if ( !pTab[i]->IsSelectionEditable( rMark, pOnlyNotBecauseOfMatrix ) )
                 {
-                    bOk = FALSE;
+                    bOk = sal_False;
                     if ( pOnlyNotBecauseOfMatrix )
                         bMatrix = *pOnlyNotBecauseOfMatrix;
                 }
@@ -4447,26 +4450,26 @@ BOOL ScDocument::IsSelectionEditable( const ScMarkData& rMark,
 }
 
 
-BOOL ScDocument::HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow,
+sal_Bool ScDocument::HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow,
                                 SCCOL nEndCol, SCROW nEndRow,
                                 const ScMarkData& rMark ) const
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     for (SCTAB i=0; i<=MAXTAB && bOk; i++)
         if (pTab[i])
             if (rMark.GetTableSelect(i))
                 if (pTab[i]->HasBlockMatrixFragment( nStartCol, nStartRow, nEndCol, nEndRow ))
-                    bOk = FALSE;
+                    bOk = sal_False;
 
     return !bOk;
 }
 
 
-BOOL ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix )
+sal_Bool ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix )
 {
     //	if rCell is part of a matrix formula, return its complete range
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ScBaseCell* pCell = GetCell( rCellPos );
     if (pCell && pCell->GetCellType() == CELLTYPE_FORMULA)
     {
@@ -4498,7 +4501,7 @@ BOOL ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMat
 
                     rMatrix.aStart = aOrigin;
                     rMatrix.aEnd = aEnd;
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
         }
@@ -4507,10 +4510,10 @@ BOOL ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMat
 }
 
 
-BOOL ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
+sal_Bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
                                 SCCOL nEndCol, SCROW nEndRow, SCTAB nTab )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if ( ValidColRow(rStartCol,rStartRow) && ValidColRow(nEndCol,nEndRow) && ValidTab(nTab) )
     {
         if (pTab[nTab])
@@ -4562,13 +4565,13 @@ BOOL ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow,
 }
 
 
-BOOL ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
+sal_Bool ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
                               SCCOL& rEndCol, SCROW& rEndRow,
-                              const ScMarkData& rMark, BOOL bRefresh, BOOL bAttrs )
+                              const ScMarkData& rMark, sal_Bool bRefresh, sal_Bool bAttrs )
 {
     // use all selected sheets from rMark
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCCOL nOldEndCol = rEndCol;
     SCROW nOldEndRow = rEndRow;
 
@@ -4578,7 +4581,7 @@ BOOL ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
             SCCOL nThisEndCol = nOldEndCol;
             SCROW nThisEndRow = nOldEndRow;
             if ( ExtendMerge( nStartCol, nStartRow, nThisEndCol, nThisEndRow, nTab, bRefresh, bAttrs ) )
-                bFound = TRUE;
+                bFound = sal_True;
             if ( nThisEndCol > rEndCol )
                 rEndCol = nThisEndCol;
             if ( nThisEndRow > rEndRow )
@@ -4589,11 +4592,11 @@ BOOL ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow,
 }
 
 
-BOOL ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
+sal_Bool ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
                               SCCOL& rEndCol,  SCROW& rEndRow,
-                              SCTAB nTab, BOOL bRefresh, BOOL bAttrs )
+                              SCTAB nTab, sal_Bool bRefresh, sal_Bool bAttrs )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if ( ValidColRow(nStartCol,nStartRow) && ValidColRow(rEndCol,rEndRow) && ValidTab(nTab) )
     {
         if (pTab[nTab])
@@ -4611,9 +4614,9 @@ BOOL ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
 }
 
 
-BOOL ScDocument::ExtendMerge( ScRange& rRange, BOOL bRefresh, BOOL bAttrs )
+sal_Bool ScDocument::ExtendMerge( ScRange& rRange, sal_Bool bRefresh, sal_Bool bAttrs )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCTAB nStartTab = rRange.aStart.Tab();
     SCTAB nEndTab   = rRange.aEnd.Tab();
     SCCOL nEndCol   = rRange.aEnd.Col();
@@ -4628,7 +4631,7 @@ BOOL ScDocument::ExtendMerge( ScRange& rRange, BOOL bRefresh, BOOL bAttrs )
                          nExtendCol,          nExtendRow,
                          nTab, bRefresh, bAttrs ) )
         {
-            bFound = TRUE;
+            bFound = sal_True;
             if (nExtendCol > nEndCol) nEndCol = nExtendCol;
             if (nExtendRow > nEndRow) nEndRow = nExtendRow;
         }
@@ -4640,12 +4643,12 @@ BOOL ScDocument::ExtendMerge( ScRange& rRange, BOOL bRefresh, BOOL bAttrs )
     return bFound;
 }
 
-BOOL ScDocument::ExtendTotalMerge( ScRange& rRange )
+sal_Bool ScDocument::ExtendTotalMerge( ScRange& rRange )
 {
     //	Bereich genau dann auf zusammengefasste Zellen erweitern, wenn
     //	dadurch keine neuen nicht-ueberdeckten Zellen getroffen werden
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ScRange aExt = rRange;
     if (ExtendMerge(aExt))
     {
@@ -4670,9 +4673,9 @@ BOOL ScDocument::ExtendTotalMerge( ScRange& rRange )
     return bRet;
 }
 
-BOOL ScDocument::ExtendOverlapped( ScRange& rRange )
+sal_Bool ScDocument::ExtendOverlapped( ScRange& rRange )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCTAB nStartTab = rRange.aStart.Tab();
     SCTAB nEndTab   = rRange.aEnd.Tab();
     SCCOL nStartCol = rRange.aStart.Col();
@@ -4688,12 +4691,12 @@ BOOL ScDocument::ExtendOverlapped( ScRange& rRange )
         if (nExtendCol < nStartCol)
         {
             nStartCol = nExtendCol;
-            bFound = TRUE;
+            bFound = sal_True;
         }
         if (nExtendRow < nStartRow)
         {
             nStartRow = nExtendRow;
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 
@@ -4703,11 +4706,11 @@ BOOL ScDocument::ExtendOverlapped( ScRange& rRange )
     return bFound;
 }
 
-BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
+sal_Bool ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
                                     SCCOL nEndCol, SCROW nEndRow, SCTAB nTab )
 {
-    USHORT nCount = pDBCollection->GetCount();
-    USHORT i;
+    sal_uInt16 nCount = pDBCollection->GetCount();
+    sal_uInt16 i;
     ScDBData* pData;
     SCTAB nDBTab;
     SCCOL nDBStartCol;
@@ -4717,7 +4720,7 @@ BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
 
     //		Autofilter loeschen
 
-    BOOL bChange = RemoveFlagsTab( nStartCol,nStartRow, nEndCol,nEndRow, nTab, SC_MF_AUTO );
+    sal_Bool bChange = RemoveFlagsTab( nStartCol,nStartRow, nEndCol,nEndRow, nTab, SC_MF_AUTO );
 
     //		Autofilter setzen
 
@@ -4732,7 +4735,7 @@ BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
             {
                 if (ApplyFlagsTab( nDBStartCol,nDBStartRow, nDBEndCol,nDBStartRow,
                                     nDBTab, SC_MF_AUTO ))
-                    bChange = TRUE;
+                    bChange = sal_True;
             }
         }
     }
@@ -4740,7 +4743,7 @@ BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow,
 }
 
 
-BOOL ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+sal_Bool ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
 {
     const ScMergeFlagAttr* pAttr = (const ScMergeFlagAttr*)
                                         GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG );
@@ -4749,12 +4752,12 @@ BOOL ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
     else
     {
         DBG_ERROR("Overlapped: Attr==0");
-        return FALSE;
+        return sal_False;
     }
 }
 
 
-BOOL ScDocument::IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+sal_Bool ScDocument::IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
 {
     const ScMergeFlagAttr* pAttr = (const ScMergeFlagAttr*)
                                         GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG );
@@ -4763,7 +4766,7 @@ BOOL ScDocument::IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
     else
     {
         DBG_ERROR("Overlapped: Attr==0");
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -4773,13 +4776,13 @@ void ScDocument::ApplySelectionFrame( const ScMarkData& rMark,
                                       const SvxBoxInfoItem* pLineInner )
 {
     ScRangeList aRangeList;
-    rMark.FillRangeListWithMarks( &aRangeList, FALSE );
-    ULONG nRangeCount = aRangeList.Count();
+    rMark.FillRangeListWithMarks( &aRangeList, sal_False );
+    sal_uLong nRangeCount = aRangeList.Count();
     for (SCTAB i=0; i<=MAXTAB; i++)
     {
         if (pTab[i] && rMark.GetTableSelect(i))
         {
-            for (ULONG j=0; j<nRangeCount; j++)
+            for (sal_uLong j=0; j<nRangeCount; j++)
             {
                 ScRange aRange = *aRangeList.GetObject(j);
                 pTab[i]->ApplyBlockFrame( pLineOuter, pLineInner,
@@ -4808,11 +4811,11 @@ void ScDocument::ApplyFrameAreaTab( const ScRange& rRange,
 void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark )
 {
     const SfxItemSet* pSet = &rAttr.GetItemSet();
-    BOOL bSet = FALSE;
-    USHORT i;
+    sal_Bool bSet = sal_False;
+    sal_uInt16 i;
     for (i=ATTR_PATTERN_START; i<=ATTR_PATTERN_END && !bSet; i++)
         if (pSet->GetItemState(i) == SFX_ITEM_SET)
-            bSet = TRUE;
+            bSet = sal_True;
 
     if (bSet)
     {
@@ -4836,7 +4839,7 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark
 }
 
 
-void ScDocument::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark )
+void ScDocument::ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark )
 {
     for (SCTAB i=0; i<=MAXTAB; i++)
         if (pTab[i] && rMark.GetTableSelect(i))
@@ -4844,7 +4847,7 @@ void ScDocument::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark
 }
 
 
-void ScDocument::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark )
+void ScDocument::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark )
 {
     for (SCTAB i=0; i<=MAXTAB; i++)
         if (pTab[i] && rMark.GetTableSelect(i))
@@ -4852,7 +4855,7 @@ void ScDocument::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rM
 }
 
 
-void ScDocument::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
+void ScDocument::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
 {
     for (SCTAB i=0; i<=MAXTAB; i++)
         if (pTab[i] && rMark.GetTableSelect(i))
@@ -4860,7 +4863,7 @@ void ScDocument::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
 }
 
 
-void ScDocument::DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark )
+void ScDocument::DeleteSelectionTab( SCTAB nTab, sal_uInt16 nDelFlag, const ScMarkData& rMark )
 {
     if (ValidTab(nTab)  && pTab[nTab])
         pTab[nTab]->DeleteSelection( nDelFlag, rMark );
@@ -4916,12 +4919,12 @@ void ScDocument::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX
 
 
 void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY,
-                                BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark )
+                                sal_Bool bMarked, sal_Bool bUnprotected, const ScMarkData& rMark )
 {
     DBG_ASSERT( !nMovX || !nMovY, "GetNextPos: nur X oder Y" );
 
     ScMarkData aCopyMark = rMark;
-    aCopyMark.SetMarking(FALSE);
+    aCopyMark.SetMarking(sal_False);
     aCopyMark.MarkToMulti();
 
     if (ValidTab(nTab) && pTab[nTab])
@@ -4969,9 +4972,9 @@ void ScDocument::StylesToNames()
 }
 
 
-ULONG ScDocument::GetCellCount() const
+sal_uLong ScDocument::GetCellCount() const
 {
-    ULONG nCellCount = 0L;
+    sal_uLong nCellCount = 0L;
 
     for ( SCTAB nTab=0; nTab<=MAXTAB; nTab++ )
         if ( pTab[nTab] )
@@ -4988,9 +4991,9 @@ SCSIZE ScDocument::GetCellCount(SCTAB nTab, SCCOL nCol) const
     return pTab[nTab]->GetCellCount(nCol);
 }
 
-ULONG ScDocument::GetCodeCount() const
+sal_uLong ScDocument::GetCodeCount() const
 {
-    ULONG nCodeCount = 0;
+    sal_uLong nCodeCount = 0;
 
     for ( SCTAB nTab=0; nTab<=MAXTAB; nTab++ )
         if ( pTab[nTab] )
@@ -5000,9 +5003,9 @@ ULONG ScDocument::GetCodeCount() const
 }
 
 
-ULONG ScDocument::GetWeightedCount() const
+sal_uLong ScDocument::GetWeightedCount() const
 {
-    ULONG nCellCount = 0L;
+    sal_uLong nCellCount = 0L;
 
     for ( SCTAB nTab=0; nTab<=MAXTAB; nTab++ )
         if ( pTab[nTab] )
@@ -5075,13 +5078,13 @@ void ScDocument::RemoveManualBreaks( SCTAB nTab )
         pTab[nTab]->RemoveManualBreaks();
 }
 
-BOOL ScDocument::HasManualBreaks( SCTAB nTab ) const
+sal_Bool ScDocument::HasManualBreaks( SCTAB nTab ) const
 {
     if ( ValidTab(nTab)  && pTab[nTab] )
         return pTab[nTab]->HasManualBreaks();
 
     DBG_ERROR("falsche Tab");
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -5093,9 +5096,9 @@ void ScDocument::GetDocStat( ScDocStat& rDocStat )
 }
 
 
-BOOL ScDocument::HasPrintRange()
+sal_Bool ScDocument::HasPrintRange()
 {
-    BOOL bResult = FALSE;
+    sal_Bool bResult = sal_False;
 
     for ( SCTAB i=0; !bResult && i<nMaxTableNumber; i++ )
         if ( pTab[i] )
@@ -5105,13 +5108,13 @@ BOOL ScDocument::HasPrintRange()
 }
 
 
-BOOL ScDocument::IsPrintEntireSheet( SCTAB nTab ) const
+sal_Bool ScDocument::IsPrintEntireSheet( SCTAB nTab ) const
 {
     return (ValidTab(nTab) ) && pTab[nTab] && pTab[nTab]->IsPrintEntireSheet();
 }
 
 
-USHORT ScDocument::GetPrintRangeCount( SCTAB nTab )
+sal_uInt16 ScDocument::GetPrintRangeCount( SCTAB nTab )
 {
     if (ValidTab(nTab) && pTab[nTab])
         return pTab[nTab]->GetPrintRangeCount();
@@ -5120,7 +5123,7 @@ USHORT ScDocument::GetPrintRangeCount( SCTAB nTab )
 }
 
 
-const ScRange* ScDocument::GetPrintRange( SCTAB nTab, USHORT nPos )
+const ScRange* ScDocument::GetPrintRange( SCTAB nTab, sal_uInt16 nPos )
 {
     if (ValidTab(nTab) && pTab[nTab])
         return pTab[nTab]->GetPrintRange(nPos);
@@ -5209,7 +5212,7 @@ void ScDocument::RestorePrintRanges( const ScPrintRangeSaver& rSaver )
 }
 
 
-BOOL ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const
+sal_Bool ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const
 {
     //  Die Seitennummern-Zaehlung faengt bei einer Tabelle neu an, wenn eine
     //	andere Vorlage als bei der vorherigen gesetzt ist (nur Namen vergleichen)
@@ -5224,14 +5227,14 @@ BOOL ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const
             if ( pStyle )
             {
                 const SfxItemSet& rSet = pStyle->GetItemSet();
-                USHORT nFirst = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_FIRSTPAGENO)).GetValue();
+                sal_uInt16 nFirst = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_FIRSTPAGENO)).GetValue();
                 if ( nFirst != 0 )
-                    return TRUE;		// Seitennummer in neuer Vorlage angegeben
+                    return sal_True;		// Seitennummer in neuer Vorlage angegeben
             }
         }
     }
 
-    return FALSE;		// sonst nicht
+    return sal_False;		// sonst nicht
 }
 
 SfxUndoManager* ScDocument::GetUndoManager()
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index 89caa2660..e79cd1d24 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -66,7 +66,7 @@ using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::sheet::DataPilotFieldFilter;
 
 
-static BOOL lcl_HasQueryEntry( const ScQueryParam& rParam )
+static sal_Bool lcl_HasQueryEntry( const ScQueryParam& rParam )
 {
     return rParam.GetEntryCount() > 0 &&
             rParam.GetEntry(0).bDoQuery;
@@ -183,7 +183,7 @@ sal_Int32 ScDPCacheTable::getColSize() const
     return GetCache()->GetColumnCount();
 }
 
-void ScDPCacheTable::fillTable(  const ScQueryParam& rQuery, BOOL* pSpecial,
+void ScDPCacheTable::fillTable(  const ScQueryParam& rQuery, sal_Bool* pSpecial,
                                bool bIgnoreEmptyRows, bool bRepeatIfEmpty )
 {
     if ( mpCache == NULL )
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 56655a2f0..aa6c1f4e9 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -116,7 +116,7 @@ void ScDPSaveGroupItem::AddToData( ScDPGroupDimension& rDataDim, SvNumberFormatt
         sal_uInt32 nFormat = 0;      //! ...
         double fValue;
         if ( pFormatter->IsNumberFormat( *aIter, nFormat, fValue ) )
-            aData = ScDPItemData( *aIter, fValue, TRUE );
+            aData = ScDPItemData( *aIter, fValue, sal_True );
         else
             aData.SetString( *aIter );
 
@@ -257,7 +257,7 @@ bool ScDPSaveGroupDimension::HasOnlyHidden( const ScStrCollection& rVisible )
     for ( ScDPSaveGroupItemVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end() && bAllHidden; aIter++ )
     {
         StrData aSearch( aIter->GetGroupName() );
-        USHORT nCollIndex;
+        sal_uInt16 nCollIndex;
         if ( rVisible.Search( &aSearch, nCollIndex ) )
             bAllHidden = false;                             // found one that is visible
     }
diff --git a/sc/source/core/data/dpglobal.cxx b/sc/source/core/data/dpglobal.cxx
index 9c5539eb7..83bd836d4 100755..100644
--- a/sc/source/core/data/dpglobal.cxx
+++ b/sc/source/core/data/dpglobal.cxx
@@ -47,23 +47,23 @@ namespace ScDPGlobal
         return rcResult;
     }
 
-    String GetFuncString( const String &rString, const USHORT nIndex )
+    String GetFuncString( const String &rString, const sal_uInt16 nIndex )
     {
         if ( nIndex <= 1 ) return rString;
-        ULONG uch = rString.Len() ? rString.GetChar( rString.Len()-1 ) : (L'9'+1);
+        sal_uLong uch = rString.Len() ? rString.GetChar( rString.Len()-1 ) : (L'9'+1);
         bool bEndWithDigital = ( L'0'<=uch && uch<=L'9');
         char szTemp[__MAX_NUM_LEN+1];
         int nLen = sprintf( szTemp, bEndWithDigital ? DATA_RENAME_SEPARATOR"%hu" : "%hu", nIndex );
         String strRet = rString;
-        strRet.Append( String::CreateFromAscii( szTemp, static_cast<USHORT>(nLen) ));
+        strRet.Append( String::CreateFromAscii( szTemp, static_cast<sal_uInt16>(nLen) ));
         return strRet;
     }
 
-   bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip /*= FALSE*/ )
+   bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, sal_uInt16 nEndTab, sal_Bool bExcludeClip /*= sal_False*/ )
     {
         if ( ScDPCollection* pDPCollection = pDestDoc->GetDPCollection() )
         {
-            USHORT nCount = pDPCollection->GetCount();
+            sal_uInt16 nCount = pDPCollection->GetCount();
             SCsCOL nOffsetX = nStartCol - nClipStartCol;
             SCsROW nOffsetY = nStartRow - nClipStartRow;
 
@@ -71,12 +71,12 @@ namespace ScDPGlobal
             {
                 ScRange aRange = iter->GetOutRange();
 
-                for( USHORT nCurrTab = nStartTab; nCurrTab<=nEndTab; nCurrTab++ )
+                for( sal_uInt16 nCurrTab = nStartTab; nCurrTab<=nEndTab; nCurrTab++ )
                 {
                     SCsTAB nOffsetZ = nCurrTab - aRange.aStart.Tab();
                     aRange.Move( nOffsetX, nOffsetY, nOffsetZ );
 
-                    for ( USHORT i = 0; i<nCount; i++)
+                    for ( sal_uInt16 i = 0; i<nCount; i++)
                     {
                         if ( (*pDPCollection)[i] && aRange.Intersects( (*pDPCollection)[i]->GetOutRange()))
                         {
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 586dd0024..269b7869d 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -72,7 +72,7 @@ using ::boost::shared_ptr;
 
 #define D_TIMEFACTOR              86400.0
 
-const USHORT SC_DP_LEAPYEAR = 1648;     // arbitrary leap year for date calculations
+const sal_uInt16 SC_DP_LEAPYEAR = 1648;     // arbitrary leap year for date calculations
 
 // part values for the extra "<" and ">" entries (same for all parts)
 const sal_Int32 SC_DP_DATE_FIRST = -1;
@@ -81,10 +81,10 @@ const sal_Int32 SC_DP_DATE_LAST = 10000;
 // ============================================================================
 namespace 
 {  
-    BOOL lcl_Search( SCCOL nSourceDim, ScDPTableDataCache* pCache , const std::vector< SCROW >& vIdx, SCROW nNew , SCROW& rIndex)
+    sal_Bool lcl_Search( SCCOL nSourceDim, ScDPTableDataCache* pCache , const std::vector< SCROW >& vIdx, SCROW nNew , SCROW& rIndex)
     {
         rIndex = vIdx.size();
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         SCROW nLo = 0;
         SCROW nHi = vIdx.size() - 1;
         SCROW nIndex;
@@ -104,7 +104,7 @@ namespace
                 nHi = nIndex - 1;
                 if (nCompare == 0)
                 {
-                    bFound = TRUE;
+                    bFound = sal_True;
                     nLo = nIndex;
                 }
             }
@@ -145,7 +145,7 @@ namespace
     template<bool bUpdateData>
     void lcl_InsertValue ( SCCOL nSourceDim, ScDPTableDataCache* pCache ,  std::vector< SCROW >& vIdx, const String&  rString, const double& fValue )
     {
-        lcl_InsertValue<bUpdateData>( nSourceDim, pCache, vIdx, ScDPItemData( rString, fValue, TRUE ) );
+        lcl_InsertValue<bUpdateData>( nSourceDim, pCache, vIdx, ScDPItemData( rString, fValue, sal_True ) );
     }
 
     template<bool bUpdateData>
@@ -156,7 +156,7 @@ namespace
 
     void lcl_AppendDateStr( rtl::OUStringBuffer& rBuffer, double fValue, SvNumberFormatter* pFormatter )
     {
-        ULONG nFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge );
+        sal_uLong nFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATE, ScGlobal::eLnge );
         String aString;
         pFormatter->GetInputLineString( fValue, nFormat, aString );
         rBuffer.append( aString );
@@ -447,7 +447,7 @@ String lcl_GetDateGroupName( sal_Int32 nDatePart, sal_Int32 nValue, SvNumberForm
                 Date aNullDate = *(pFormatter->GetNullDate());
                 long nDays = aDate - aNullDate;
 
-                ULONG nFormat = pFormatter->GetFormatIndex( NF_DATE_SYS_DDMMM, ScGlobal::eLnge );
+                sal_uLong nFormat = pFormatter->GetFormatIndex( NF_DATE_SYS_DDMMM, ScGlobal::eLnge );
                 Color* pColor;
                 pFormatter->GetOutputString( nDays, nFormat, aRet, &pColor );
             }
@@ -539,7 +539,7 @@ sal_Int32 lcl_GetDatePartValue( double fValue, sal_Int32 nDatePart, SvNumberForm
     return nResult;
 }
 
-BOOL lcl_DateContained( sal_Int32 nGroupPart, const ScDPItemData& rGroupData,
+sal_Bool lcl_DateContained( sal_Int32 nGroupPart, const ScDPItemData& rGroupData,
                         sal_Int32 nBasePart, const ScDPItemData& rBaseData )
 {
     if ( !rGroupData.IsValue() || !rBaseData.IsValue() )
@@ -569,7 +569,7 @@ BOOL lcl_DateContained( sal_Int32 nGroupPart, const ScDPItemData& rGroupData,
         return ( nGroupValue == nBaseValue );
     }
 
-    BOOL bContained = TRUE;
+    sal_Bool bContained = sal_True;
     switch ( nBasePart )        // inner part
     {
         case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS:
@@ -1145,13 +1145,13 @@ String ScDPGroupTableData::getDimensionName(long nColumn)
     return pSourceData->getDimensionName( nColumn );
 }
 
-BOOL ScDPGroupTableData::getIsDataLayoutDimension(long nColumn)
+sal_Bool ScDPGroupTableData::getIsDataLayoutDimension(long nColumn)
 {
     // position of data layout dimension is moved from source data
     return ( nColumn == sal::static_int_cast<long>( nSourceCount + aGroups.size() ) );    // data layout dimension?
 }
 
-BOOL ScDPGroupTableData::IsDateDimension(long nDim)
+sal_Bool ScDPGroupTableData::IsDateDimension(long nDim)
 {
     if ( nDim >= nSourceCount )
     {
@@ -1164,7 +1164,7 @@ BOOL ScDPGroupTableData::IsDateDimension(long nDim)
     return pSourceData->IsDateDimension( nDim );
 }
 
-ULONG ScDPGroupTableData::GetNumberFormat(long nDim)
+sal_uLong ScDPGroupTableData::GetNumberFormat(long nDim)
 {
     if ( nDim >= nSourceCount )
     {
@@ -1188,7 +1188,7 @@ void ScDPGroupTableData::DisposeData()
     pSourceData->DisposeData();
 }
 
-void ScDPGroupTableData::SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty )
+void ScDPGroupTableData::SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty )
 {
     pSourceData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
 }
@@ -1392,7 +1392,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt
                     double fGroupValue;
                     String aGroupName = lcl_GetNumGroupForValue( pData->GetValue(),
                              aNumInfo, bHasNonInteger, cDecSeparator, fGroupValue, pDoc );
-                    ScDPItemData  aItemData ( aGroupName, fGroupValue, TRUE ) ;
+                    ScDPItemData  aItemData ( aGroupName, fGroupValue, sal_True ) ;
                     pItemDataIndex[nDim] = pCache->GetAdditionalItemID( aItemData  );
                 }
                 // else (textual) keep original value
@@ -1418,16 +1418,16 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt
     }
 }
 
-BOOL ScDPGroupTableData::IsBaseForGroup(long nDim) const
+sal_Bool ScDPGroupTableData::IsBaseForGroup(long nDim) const
 {
     for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); aIter++ )
     {
         const ScDPGroupDimension& rDim = *aIter;
         if ( rDim.GetSourceDim() == nDim )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 long ScDPGroupTableData::GetGroupBase(long nGroupDim) const
@@ -1442,7 +1442,7 @@ long ScDPGroupTableData::GetGroupBase(long nGroupDim) const
     return -1;      // none
 }
 
-BOOL ScDPGroupTableData::IsNumOrDateGroup(long nDimension) const
+sal_Bool ScDPGroupTableData::IsNumOrDateGroup(long nDimension) const
 {
     // Virtual method from ScDPTableData, used in result data to force text labels.
 
@@ -1459,10 +1459,10 @@ BOOL ScDPGroupTableData::IsNumOrDateGroup(long nDimension) const
             return ( rDim.GetDateHelper() != NULL );
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+sal_Bool ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
                                     const ScDPItemData& rBaseData, long nBaseIndex ) const
 {
     for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); aIter++ )
@@ -1486,7 +1486,7 @@ BOOL ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupI
                 if ( !pBaseDateHelper )
                 {
                     DBG_ERROR( "mix of date and non-date groups" );
-                    return TRUE;
+                    return sal_True;
                 }
 
                 sal_Int32 nGroupPart = pGroupDateHelper->GetDatePart();
@@ -1506,10 +1506,10 @@ BOOL ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupI
     }
 
     DBG_ERROR("IsInGroup: no group dimension found");
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
+sal_Bool ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex,
                                          const ScDPItemData& rSecondData, long nSecondIndex ) const
 {
     const ScDPGroupDimension* pFirstDim = NULL;
@@ -1532,7 +1532,7 @@ BOOL ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long
             if ( !pFirstDateHelper || !pSecondDateHelper )
             {
                 DBG_ERROR( "mix of date and non-date groups" );
-                return TRUE;
+                return sal_True;
             }
 
             sal_Int32 nFirstPart = pFirstDateHelper->GetDatePart();
@@ -1544,7 +1544,7 @@ BOOL ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long
         const ScDPGroupItem* pSecondItem = pSecondDim->GetGroupForName( rSecondData );
         if ( pFirstItem && pSecondItem )
         {
-            // two existing groups -> TRUE if they have a common element
+            // two existing groups -> sal_True if they have a common element
             return pFirstItem->HasCommonElement( *pSecondItem );
         }
         else if ( pFirstItem )
@@ -1559,13 +1559,13 @@ BOOL ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long
         }
         else
         {
-            // no groups -> TRUE if equal
+            // no groups -> sal_True if equal
             return rFirstData.IsCaseInsEqual( rSecondData );
         }
     }
 
     DBG_ERROR("HasCommonElement: no group dimension found");
-    return TRUE;
+    return sal_True;
 }
 
 long ScDPGroupTableData::GetSourceDim( long nDim )
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 8048f0ebf..c59d6ff6e 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -130,7 +130,7 @@ using ::rtl::OUString;
 
 // -----------------------------------------------------------------------
 
-USHORT lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplier>& xSource )
+sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplier>& xSource )
 {
     long nRet = sheet::DataPilotFieldOrientation_HIDDEN;
     if ( xSource.is() )
@@ -138,7 +138,7 @@ USHORT lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplie
         uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
         uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName );
         long nIntCount = xIntDims->getCount();
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         for (long nIntDim=0; nIntDim<nIntCount && !bFound; nIntDim++)
         {
             uno::Reference<uno::XInterface> xIntDim =
@@ -156,7 +156,7 @@ USHORT lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplie
             }
         }
     }
-    return static_cast< USHORT >( nRet );
+    return static_cast< sal_uInt16 >( nRet );
 }
 
 // -----------------------------------------------------------------------
@@ -169,13 +169,13 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
     pServDesc( NULL ),
     mpTableData(static_cast<ScDPTableData*>(NULL)),
     pOutput( NULL ),
-    bSettingsChanged( FALSE ),
-    bAlive( FALSE ),
+    bSettingsChanged( sal_False ),
+    bAlive( sal_False ),
     mnAutoFormatIndex( 65535 ),
-    bAllowMove( FALSE ),
+    bAllowMove( sal_False ),
     nHeaderRows( 0 ),
     mbHeaderLayout(false),
-    bRefresh( FALSE ), // Wang Xu Ming - DataPilot migration
+    bRefresh( sal_False ), // Wang Xu Ming - DataPilot migration
     mnCacheId( -1) // Wang Xu Ming - DataPilot migration
 {
 }
@@ -192,10 +192,10 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
     pServDesc( NULL ),
     mpTableData(static_cast<ScDPTableData*>(NULL)), 
     pOutput( NULL ),
-    bSettingsChanged( FALSE ),
-    bAlive( FALSE ),
+    bSettingsChanged( sal_False ),
+    bAlive( sal_False ),
     mnAutoFormatIndex( r.mnAutoFormatIndex ),
-    bAllowMove( FALSE ),
+    bAllowMove( sal_False ),
     nHeaderRows( r.nHeaderRows ),
     mbHeaderLayout( r.mbHeaderLayout ),
     bRefresh( r.bRefresh ), // Wang Xu Ming - DataPilot migration
@@ -228,12 +228,12 @@ ScDataObject* ScDPObject::Clone() const
     return new ScDPObject(*this);
 }
 
-void ScDPObject::SetAlive(BOOL bSet)
+void ScDPObject::SetAlive(sal_Bool bSet)
 {
     bAlive = bSet;
 }
 
-void ScDPObject::SetAllowMove(BOOL bSet)
+void ScDPObject::SetAllowMove(sal_Bool bSet)
 {
     bAllowMove = bSet;
 }
@@ -301,7 +301,7 @@ void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc)
     pSheetDesc->aQueryParam.nRow1 = pSheetDesc->aSourceRange.aStart.Row();
     pSheetDesc->aQueryParam.nCol2 = pSheetDesc->aSourceRange.aEnd.Col();
     pSheetDesc->aQueryParam.nRow2 = pSheetDesc->aSourceRange.aEnd.Row();;
-    pSheetDesc->aQueryParam.bHasHeader = TRUE;
+    pSheetDesc->aQueryParam.bHasHeader = sal_True;
 
     InvalidateSource();		// new source must be created
 }
@@ -354,7 +354,7 @@ void ScDPObject::WriteTempDataTo( ScDPObject& rDest ) const
     rDest.nHeaderRows = nHeaderRows;
 }
 
-BOOL ScDPObject::IsSheetData() const
+sal_Bool ScDPObject::IsSheetData() const
 {
     return ( pSheetDesc != NULL );
 }
@@ -396,7 +396,7 @@ void ScDPObject::CreateOutput()
     CreateObjects();
     if (!pOutput)
     {
-        BOOL bFilterButton = IsSheetData() && pSaveData && pSaveData->GetFilterButton();
+        sal_Bool bFilterButton = IsSheetData() && pSaveData && pSaveData->GetFilterButton();
         pOutput = new ScDPOutput( pDoc, xSource, aOutRange.aStart, bFilterButton );
         pOutput->SetHeaderLayout ( mbHeaderLayout );
 
@@ -421,7 +421,7 @@ void ScDPObject::CreateOutput()
 
             //!	modify aOutRange?
 
-            bAllowMove = FALSE;		// use only once
+            bAllowMove = sal_False;		// use only once
         }
     }
 }
@@ -500,7 +500,7 @@ void ScDPObject::CreateObjects()
             if ( pSaveData && bRefresh )
             {
                 pSaveData->Refresh( xSource );
-                bRefresh = FALSE;
+                bRefresh = sal_False;
             }
         }
         if (pSaveData  )
@@ -526,12 +526,12 @@ void ScDPObject::CreateObjects()
         if (pSaveData)
             pSaveData->WriteToSource( xSource );
     }
-    bSettingsChanged = FALSE;
+    bSettingsChanged = sal_False;
 }
 
 void ScDPObject::InvalidateData()
 {
-    bSettingsChanged = TRUE;
+    bSettingsChanged = sal_True;
 }
 
 void ScDPObject::InvalidateSource()
@@ -552,7 +552,7 @@ void ScDPObject::InvalidateSource()
     mpTableData.reset();
 }
 
-ScRange ScDPObject::GetNewOutputRange( BOOL& rOverflow )
+ScRange ScDPObject::GetNewOutputRange( sal_Bool& rOverflow )
 {
     CreateOutput();				// create xSource and pOutput if not already done
 
@@ -599,7 +599,7 @@ const ScRange ScDPObject::GetOutputRangeByType( sal_Int32 nType )
     return pOutput->GetOutputRange(nType);
 }
 
-BOOL lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
+sal_Bool lcl_HasButton( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
 {
     return ((const ScMergeFlagAttr*)pDoc->GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ))->HasButton();
 }
@@ -624,7 +624,7 @@ void ScDPObject::RefreshAfterLoad()
         pDoc->IsBlockEmpty( nTab, nFirstCol, nFirstRow + nInitial, nFirstCol, nFirstRow + nInitial ) &&
         aOutRange.aEnd.Col() > nFirstCol )
     {
-        BOOL bFilterButton = IsSheetData();			// when available, filter button setting must be checked here
+        sal_Bool bFilterButton = IsSheetData();			// when available, filter button setting must be checked here
 
         SCROW nSkip = bFilterButton ? 1 : 0;
         for (SCROW nPos=nSkip; nPos<nInitial; nPos++)
@@ -756,23 +756,23 @@ void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
     }
 }
 
-BOOL ScDPObject::RefsEqual( const ScDPObject& r ) const
+sal_Bool ScDPObject::RefsEqual( const ScDPObject& r ) const
 {
     if ( aOutRange != r.aOutRange )
-        return FALSE;
+        return sal_False;
 
     if ( pSheetDesc && r.pSheetDesc )
     {
         if ( pSheetDesc->aSourceRange != r.pSheetDesc->aSourceRange )
-            return FALSE;
+            return sal_False;
     }
     else if ( pSheetDesc || r.pSheetDesc )
     {
         DBG_ERROR("RefsEqual: SheetDesc set at only one object");
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScDPObject::WriteRefsTo( ScDPObject& r ) const
@@ -846,9 +846,9 @@ bool ScDPObject::IsDimNameInUse(const OUString& rName) const
     return false;
 }
 
-String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags )
+String ScDPObject::GetDimName( long nDim, sal_Bool& rIsDataLayout, sal_Int32* pFlags )
 {
-    rIsDataLayout = FALSE;
+    rIsDataLayout = sal_False;
     String aRet;
 
     if ( xSource.is() )
@@ -864,7 +864,7 @@ String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags
             uno::Reference<beans::XPropertySet> xDimProp( xIntDim, uno::UNO_QUERY );
             if ( xDimName.is() && xDimProp.is() )
             {
-                BOOL bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+                sal_Bool bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
                                 rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
                 //!	error checking -- is "IsDataLayoutDimension" property required??
 
@@ -877,7 +877,7 @@ String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags
                 {
                 }
                 if ( bData )
-                    rIsDataLayout = TRUE;
+                    rIsDataLayout = sal_True;
                 else
                     aRet = String( aName );
 
@@ -891,9 +891,9 @@ String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags
     return aRet;
 }
 
-BOOL ScDPObject::IsDuplicated( long nDim )
+sal_Bool ScDPObject::IsDuplicated( long nDim )
 {
-    BOOL bDuplicated = FALSE;
+    sal_Bool bDuplicated = sal_False;
     if ( xSource.is() )
     {
         uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
@@ -912,7 +912,7 @@ BOOL ScDPObject::IsDuplicated( long nDim )
                                 rtl::OUString::createFromAscii(DP_PROP_ORIGINAL) );
                     uno::Reference<uno::XInterface> xIntOrig;
                     if ( (aOrigAny >>= xIntOrig) && xIntOrig.is() )
-                        bDuplicated = TRUE;
+                        bDuplicated = sal_True;
                 }
                 catch(uno::Exception&)
                 {
@@ -1051,8 +1051,8 @@ void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHead
         aPosData.PositionData >>= rData;
 }
 
-// Returns TRUE on success and stores the result in rTarget
-BOOL ScDPObject::GetPivotData( ScDPGetPivotDataField& rTarget,
+// Returns sal_True on success and stores the result in rTarget
+sal_Bool ScDPObject::GetPivotData( ScDPGetPivotDataField& rTarget,
                                const std::vector< ScDPGetPivotDataField >& rFilters )
 {
     CreateOutput();             // create xSource and pOutput if not already done
@@ -1060,22 +1060,22 @@ BOOL ScDPObject::GetPivotData( ScDPGetPivotDataField& rTarget,
     return pOutput->GetPivotData( rTarget, rFilters );
 }
 
-BOOL ScDPObject::IsFilterButton( const ScAddress& rPos )
+sal_Bool ScDPObject::IsFilterButton( const ScAddress& rPos )
 {
     CreateOutput();				// create xSource and pOutput if not already done
 
     return pOutput->IsFilterButton( rPos );
 }
 
-long ScDPObject::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient )
+long ScDPObject::GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient )
 {
     CreateOutput();				// create xSource and pOutput if not already done
 
     return pOutput->GetHeaderDim( rPos, rOrient );
 }
 
-BOOL ScDPObject::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim,
-                                Rectangle& rPosRect, USHORT& rOrient, long& rDimPos )
+sal_Bool ScDPObject::GetHeaderDrag( const ScAddress& rPos, sal_Bool bMouseLeft, sal_Bool bMouseTop, long nDragDim,
+                                Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos )
 {
     CreateOutput();				// create xSource and pOutput if not already done
 
@@ -1311,7 +1311,7 @@ bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatc
     return false;
 }
 
-BOOL ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
+sal_Bool ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
                                std::vector< ScDPGetPivotDataField >& rFilters,
                                const String& rFilterList )
 {
@@ -1337,7 +1337,7 @@ BOOL ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
         uno::Reference<container::XNamed> xDim( xIntDim, uno::UNO_QUERY );
         uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
         uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDim, uno::UNO_QUERY );
-        BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+        sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
                             rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
         sal_Int32 nOrient = ScUnoHelpFunctions::GetEnumProperty(
                             xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
@@ -1547,7 +1547,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
     String aDimName = xDim->getName();
 
     uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
-    BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+    sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
                         rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
     if (bDataLayout)
     {
@@ -1593,8 +1593,8 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
     if ( xMbrSupp.is() )
         xMembers = xMbrSupp->getMembers();
 
-    BOOL bFound = FALSE;
-    BOOL bShowDetails = TRUE;
+    sal_Bool bFound = sal_False;
+    sal_Bool bShowDetails = sal_True;
 
     if ( xMembers.is() )
     {
@@ -1608,7 +1608,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
                 bShowDetails = ScUnoHelpFunctions::GetBoolProperty( xMbrProp,
                                     rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS) );
                 //! don't set bFound if property is unknown?
-                bFound = TRUE;
+                bFound = sal_True;
             }
         }
     }
@@ -1647,7 +1647,7 @@ long lcl_FindName( const rtl::OUString& rString, const uno::Reference<container:
     return -1;		// not found
 }
 
-USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp )		// PIVOT_FUNC mask
+sal_uInt16 lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp )		// PIVOT_FUNC mask
 {
     uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDimProp, uno::UNO_QUERY );
     if ( xDimProp.is() && xDimSupp.is() )
@@ -1681,7 +1681,7 @@ USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp )
                 uno::Sequence<sheet::GeneralFunction> aSeq;
                 if ( aSubAny >>= aSeq )
                 {
-                    USHORT nMask = 0;
+                    sal_uInt16 nMask = 0;
                     const sheet::GeneralFunction* pArray = aSeq.getConstArray();
                     long nCount = aSeq.getLength();
                     for (long i=0; i<nCount; i++)
@@ -1696,13 +1696,13 @@ USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp )
     return 0;
 }
 
-USHORT lcl_CountBits( USHORT nBits )
+sal_uInt16 lcl_CountBits( sal_uInt16 nBits )
 {
     if (!nBits) return 0;
 
-    USHORT nCount = 0;
-    USHORT nMask = 1;
-    for (USHORT i=0; i<16; i++)
+    sal_uInt16 nCount = 0;
+    sal_uInt16 nMask = 1;
+    for (sal_uInt16 i=0; i<16; i++)
     {
         if ( nBits & nMask )
             ++nCount;
@@ -1713,10 +1713,10 @@ USHORT lcl_CountBits( USHORT nBits )
 
 SCSIZE lcl_FillOldFields( PivotField* pFields,
                             const uno::Reference<sheet::XDimensionsSupplier>& xSource,
-                            USHORT nOrient, SCCOL nColAdd, BOOL bAddData )
+                            sal_uInt16 nOrient, SCCOL nColAdd, sal_Bool bAddData )
 {
     SCSIZE nOutCount = 0;
-    BOOL bDataFound = FALSE;
+    sal_Bool bDataFound = sal_False;
 
     SCSIZE nCount = (nOrient == sheet::DataPilotFieldOrientation_PAGE) ? PIVOT_MAXPAGEFIELD : PIVOT_MAXFIELD;
 
@@ -1738,7 +1738,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
                             sheet::DataPilotFieldOrientation_HIDDEN );
         if ( xDimProp.is() && nDimOrient == nOrient )
         {
-            USHORT nMask = 0;
+            sal_uInt16 nMask = 0;
             if ( nOrient == sheet::DataPilotFieldOrientation_DATA )
             {
                 sheet::GeneralFunction eFunc = (sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty(
@@ -1754,7 +1754,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
             else
                 nMask = lcl_FirstSubTotal( xDimProp );		// from first hierarchy
 
-            BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+            sal_Bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
                                     rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
             uno::Any aOrigAny;
             try
@@ -1775,7 +1775,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
                     nDupSource = lcl_FindName( xNameOrig->getName(), xDimsName );
             }
 
-            BOOL bDupUsed = FALSE;
+            sal_Bool bDupUsed = sal_False;
             if ( nDupSource >= 0 )
             {
                 //	add function bit to previous entry
@@ -1794,7 +1794,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
                         {
                             pFields[nOld].nFuncMask |= nMask;
                             pFields[nOld].nFuncCount = lcl_CountBits( pFields[nOld].nFuncMask );
-                            bDupUsed = TRUE;
+                            bDupUsed = sal_True;
                         }
                     }
             }
@@ -1804,7 +1804,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
                 if ( bDataLayout )
                 {
                     pFields[nOutCount].nCol = PIVOT_DATA_FIELD;
-                    bDataFound = TRUE;
+                    bDataFound = sal_True;
                 }
                 else if ( nDupSource >= 0 )		// if source was not found (different orientation)
                     pFields[nOutCount].nCol = static_cast<SCsCOL>(nDupSource)+nColAdd;		//! seek from name
@@ -1856,7 +1856,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
     return nOutCount;
 }
 
-BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const
+sal_Bool ScDPObject::FillOldParam(ScPivotParam& rParam, sal_Bool bForFile) const
 {
     ((ScDPObject*)this)->CreateObjects();		// xSource is needed for field numbers
 
@@ -1874,15 +1874,15 @@ BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const
         nColAdd = pSheetDesc->aSourceRange.aStart.Col();
     }
 
-    BOOL bAddData = ( lcl_GetDataGetOrientation( xSource ) == sheet::DataPilotFieldOrientation_HIDDEN );
+    sal_Bool bAddData = ( lcl_GetDataGetOrientation( xSource ) == sheet::DataPilotFieldOrientation_HIDDEN );
     rParam.nPageCount = lcl_FillOldFields( rParam.aPageArr,
-                            xSource, sheet::DataPilotFieldOrientation_PAGE,   nColAdd, FALSE );
+                            xSource, sheet::DataPilotFieldOrientation_PAGE,   nColAdd, sal_False );
     rParam.nColCount  = lcl_FillOldFields( rParam.aColArr,
                             xSource, sheet::DataPilotFieldOrientation_COLUMN, nColAdd, bAddData );
     rParam.nRowCount  = lcl_FillOldFields( rParam.aRowArr,
-                            xSource, sheet::DataPilotFieldOrientation_ROW,    nColAdd, FALSE );
+                            xSource, sheet::DataPilotFieldOrientation_ROW,    nColAdd, sal_False );
     rParam.nDataCount = lcl_FillOldFields( rParam.aDataArr,
-                            xSource, sheet::DataPilotFieldOrientation_DATA,   nColAdd, FALSE );
+                            xSource, sheet::DataPilotFieldOrientation_DATA,   nColAdd, sal_False );
 
     uno::Reference<beans::XPropertySet> xProp( xSource, uno::UNO_QUERY );
     if (xProp.is())
@@ -1890,9 +1890,9 @@ BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const
         try
         {
             rParam.bMakeTotalCol = ScUnoHelpFunctions::GetBoolProperty( xProp,
-                        rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), TRUE );
+                        rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), sal_True );
             rParam.bMakeTotalRow = ScUnoHelpFunctions::GetBoolProperty( xProp,
-                        rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), TRUE );
+                        rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), sal_True );
 
             // following properties may be missing for external sources
             rParam.bIgnoreEmptyRows = ScUnoHelpFunctions::GetBoolProperty( xProp,
@@ -1905,7 +1905,7 @@ BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const
             // no error
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp )
@@ -1952,7 +1952,7 @@ void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XProp
     }
 }
 
-BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
+sal_Bool ScDPObject::FillLabelData(ScPivotParam& rParam)
 {
     rParam.maLabelArray.clear();
 
@@ -1964,7 +1964,7 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
     if ( nDimCount > MAX_LABELS )
         nDimCount = MAX_LABELS;
     if (!nDimCount)
-        return FALSE;
+        return sal_False;
 
     for (long nDim=0; nDim < nDimCount; nDim++)
     {
@@ -1976,8 +1976,8 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
 
         if ( xDimName.is() && xDimProp.is() )
         {
-            BOOL bDuplicated = FALSE;
-            BOOL bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+            sal_Bool bDuplicated = sal_False;
+            sal_Bool bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
                             rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
             //!	error checking -- is "IsDataLayoutDimension" property required??
 
@@ -1989,7 +1989,7 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
                             rtl::OUString::createFromAscii(DP_PROP_ORIGINAL) );
                 uno::Reference<uno::XInterface> xIntOrig;
                 if ( (aOrigAny >>= xIntOrig) && xIntOrig.is() )
-                    bDuplicated = TRUE;
+                    bDuplicated = sal_True;
             }
             catch(uno::Exception&)
             {
@@ -2015,12 +2015,12 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xHiers )
+sal_Bool ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xHiers )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     uno::Reference<container::XNameAccess> xDimsName( GetSource()->getDimensions() );
     uno::Reference<container::XIndexAccess> xIntDims(new ScNameToIndexAccess( xDimsName ));
     if( xIntDims.is() )
@@ -2035,14 +2035,14 @@ BOOL ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container::XN
     return bRet;
 }
 
-BOOL ScDPObject::GetHierarchies( sal_Int32 nDim, uno::Sequence< rtl::OUString >& rHiers )
+sal_Bool ScDPObject::GetHierarchies( sal_Int32 nDim, uno::Sequence< rtl::OUString >& rHiers )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     uno::Reference< container::XNameAccess > xHiersNA;
     if( GetHierarchiesNA( nDim, xHiersNA ) )
     {
         rHiers = xHiersNA->getElementNames();
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return bRet;
 }
@@ -2058,14 +2058,14 @@ sal_Int32 ScDPObject::GetUsedHierarchy( sal_Int32 nDim )
     return nHier;
 }
 
-BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xMembers )
+sal_Bool ScDPObject::GetMembersNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xMembers )
 {
     return GetMembersNA( nDim, GetUsedHierarchy( nDim ), xMembers );
 }
 
-BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< container::XNameAccess >& xMembers )
+sal_Bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< container::XNameAccess >& xMembers )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     uno::Reference<container::XNameAccess> xDimsName( GetSource()->getDimensions() );
     uno::Reference<container::XIndexAccess> xIntDims(new ScNameToIndexAccess( xDimsName ));
     uno::Reference<beans::XPropertySet> xDim(xIntDims->getByIndex( nDim ), uno::UNO_QUERY);
@@ -2088,7 +2088,7 @@ BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference<
                         if ( xMembSupp.is() )
                         {
                             xMembers.set(xMembSupp->getMembers());
-                            bRet = TRUE;
+                            bRet = sal_True;
                         }
                     }
                 }
@@ -2131,10 +2131,10 @@ String lcl_GetDimName( const uno::Reference<sheet::XDimensionsSupplier>& xSource
 
 // static
 void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData,
-                            PivotField* pFields, SCSIZE nCount, USHORT nOrient,
+                            PivotField* pFields, SCSIZE nCount, sal_uInt16 nOrient,
                             ScDocument* pDoc, SCROW nRow, SCTAB nTab,
                             const uno::Reference<sheet::XDimensionsSupplier>& xSource,
-                            BOOL bOldDefaults,
+                            sal_Bool bOldDefaults,
                             PivotField* pRefColFields, SCSIZE nRefColCount,
                             PivotField* pRefRowFields, SCSIZE nRefRowCount,
                             PivotField* pRefPageFields, SCSIZE nRefPageCount )
@@ -2148,7 +2148,7 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData,
     for (SCSIZE i=0; i<nCount; i++)
     {
         SCCOL nCol = pFields[i].nCol;
-        USHORT nFuncs = pFields[i].nFuncMask;
+        sal_uInt16 nFuncs = pFields[i].nFuncMask;
         const sheet::DataPilotFieldReference& rFieldRef = pFields[i].maFieldRef;
 
         if ( nCol == PIVOT_DATA_FIELD )
@@ -2171,45 +2171,45 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData,
             if ( nOrient == sheet::DataPilotFieldOrientation_DATA )		// set summary function
             {
                 //	generate an individual entry for each function
-                BOOL bFirst = TRUE;
+                sal_Bool bFirst = sal_True;
 
                 //  if a dimension is used for column/row/page and data,
                 //	use duplicated dimensions for all data occurrences
                 if (pRefColFields)
                     for (SCSIZE nRefCol=0; nRefCol<nRefColCount; nRefCol++)
                         if (pRefColFields[nRefCol].nCol == nCol)
-                            bFirst = FALSE;
+                            bFirst = sal_False;
                 if (pRefRowFields)
                     for (SCSIZE nRefRow=0; nRefRow<nRefRowCount; nRefRow++)
                         if (pRefRowFields[nRefRow].nCol == nCol)
-                            bFirst = FALSE;
+                            bFirst = sal_False;
                 if (pRefPageFields)
-                    for (USHORT nRefPage=0; nRefPage<nRefPageCount; ++nRefPage)
+                    for (sal_uInt16 nRefPage=0; nRefPage<nRefPageCount; ++nRefPage)
                         if (pRefPageFields[nRefPage].nCol == nCol)
-                            bFirst = FALSE;
+                            bFirst = sal_False;
 
                 //	if set via api, a data column may occur several times
                 //	(if the function hasn't been changed yet) -> also look for duplicate data column
                 for (SCSIZE nPrevData=0; nPrevData<i; nPrevData++)
                     if (pFields[nPrevData].nCol == nCol)
-                        bFirst = FALSE;
+                        bFirst = sal_False;
 
-                USHORT nMask = 1;
-                for (USHORT nBit=0; nBit<16; nBit++)
+                sal_uInt16 nMask = 1;
+                for (sal_uInt16 nBit=0; nBit<16; nBit++)
                 {
                     if ( nFuncs & nMask )
                     {
                         sheet::GeneralFunction eFunc = ScDataPilotConversion::FirstFunc( nMask );
                         ScDPSaveDimension* pCurrDim = bFirst ? pDim : rSaveData.DuplicateDimension(pDim->GetName());
                         pCurrDim->SetOrientation( nOrient );
-                        pCurrDim->SetFunction( sal::static_int_cast<USHORT>(eFunc) );
+                        pCurrDim->SetFunction( sal::static_int_cast<sal_uInt16>(eFunc) );
 
                         if( rFieldRef.ReferenceType == sheet::DataPilotFieldReferenceType::NONE )
                             pCurrDim->SetReferenceValue( 0 );
                         else
                             pCurrDim->SetReferenceValue( &rFieldRef );
 
-                        bFirst = FALSE;
+                        bFirst = sal_False;
                     }
                     nMask *= 2;
                 }
@@ -2218,13 +2218,13 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData,
             {
                 pDim->SetOrientation( nOrient );
 
-                USHORT nFuncArray[16];
-                USHORT nFuncCount = 0;
-                USHORT nMask = 1;
-                for (USHORT nBit=0; nBit<16; nBit++)
+                sal_uInt16 nFuncArray[16];
+                sal_uInt16 nFuncCount = 0;
+                sal_uInt16 nMask = 1;
+                for (sal_uInt16 nBit=0; nBit<16; nBit++)
                 {
                     if ( nFuncs & nMask )
-                        nFuncArray[nFuncCount++] = sal::static_int_cast<USHORT>(ScDataPilotConversion::FirstFunc( nMask ));
+                        nFuncArray[nFuncCount++] = sal::static_int_cast<sal_uInt16>(ScDataPilotConversion::FirstFunc( nMask ));
                     nMask *= 2;
                 }
                 pDim->SetSubTotals( nFuncCount, nFuncArray );
@@ -2232,14 +2232,14 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData,
                 //	ShowEmpty was implicit in old tables,
                 //	must be set for data layout dimension (not accessible in dialog)
                 if ( bOldDefaults || nCol == PIVOT_DATA_FIELD )
-                    pDim->SetShowEmpty( TRUE );
+                    pDim->SetShowEmpty( sal_True );
             }
         }
     }
 }
 
 // static
-bool ScDPObject::IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags )
+bool ScDPObject::IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags )
 {
     bool bAllowed = true;
     switch (nOrient)
@@ -2267,9 +2267,9 @@ bool ScDPObject::IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags )
 // -----------------------------------------------------------------------
 
 //	static
-BOOL ScDPObject::HasRegisteredSources()
+sal_Bool ScDPObject::HasRegisteredSources()
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory();
     uno::Reference<container::XContentEnumerationAccess> xEnAc( xManager, uno::UNO_QUERY );
@@ -2278,7 +2278,7 @@ BOOL ScDPObject::HasRegisteredSources()
         uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
                                         rtl::OUString::createFromAscii( SCDPSOURCE_SERVICE ) );
         if ( xEnum.is() && xEnum->hasMoreElements() )
-            bFound = TRUE;
+            bFound = sal_True;
     }
 
     return bFound;
@@ -2425,7 +2425,7 @@ ScDataObject* ScDPCollection::Clone() const
 
 void ScDPCollection::DeleteOnTab( SCTAB nTab )
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     while ( nPos < nCount )
     {
         // look for output positions on the deleted sheet
@@ -2439,20 +2439,20 @@ void ScDPCollection::DeleteOnTab( SCTAB nTab )
 void ScDPCollection::UpdateReference( UpdateRefMode eUpdateRefMode,
                                          const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         ((ScDPObject*)At(i))->UpdateReference( eUpdateRefMode, r, nDx, nDy, nDz );
 }
 
-BOOL ScDPCollection::RefsEqual( const ScDPCollection& r ) const
+sal_Bool ScDPCollection::RefsEqual( const ScDPCollection& r ) const
 {
     if ( nCount != r.nCount )
-        return FALSE;
+        return sal_False;
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         if ( ! ((const ScDPObject*)At(i))->RefsEqual( *((const ScDPObject*)r.At(i)) ) )
-            return FALSE;
+            return sal_False;
 
-    return TRUE;	// all equal
+    return sal_True;	// all equal
 }
 
 void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
@@ -2460,7 +2460,7 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
     if ( nCount == r.nCount )
     {
         //!	assert equal names?
-        for (USHORT i=0; i<nCount; i++)
+        for (sal_uInt16 i=0; i<nCount; i++)
             ((const ScDPObject*)At(i))->WriteRefsTo( *((ScDPObject*)r.At(i)) );
     }
     else
@@ -2470,12 +2470,12 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
         // Matching objects are found by their names.
 
         DBG_ASSERT( nCount >= r.nCount, "WriteRefsTo: missing entries in document" );
-        for (USHORT nSourcePos=0; nSourcePos<nCount; nSourcePos++)
+        for (sal_uInt16 nSourcePos=0; nSourcePos<nCount; nSourcePos++)
         {
             const ScDPObject* pSourceObj = static_cast<const ScDPObject*>(At(nSourcePos));
             String aName = pSourceObj->GetName();
             bool bFound = false;
-            for (USHORT nDestPos=0; nDestPos<r.nCount && !bFound; nDestPos++)
+            for (sal_uInt16 nDestPos=0; nDestPos<r.nCount && !bFound; nDestPos++)
             {
                 ScDPObject* pDestObj = static_cast<ScDPObject*>(r.At(nDestPos));
                 if ( pDestObj->GetName() == aName )
@@ -2489,7 +2489,7 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
                 // none found, re-insert deleted object (see ScUndoDataPilot::Undo)
 
                 ScDPObject* pDestObj = new ScDPObject( *pSourceObj );
-                pDestObj->SetAlive(TRUE);
+                pDestObj->SetAlive(sal_True);
                 if ( !r.InsertNewTable(pDestObj) )
                 {
                     DBG_ERROR("cannot insert DPObject");
@@ -2503,25 +2503,25 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
 
 ScDPObject* ScDPCollection::GetByName(const String& rName) const
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         if (static_cast<const ScDPObject*>(pItems[i])->GetName() == rName)
             return static_cast<ScDPObject*>(pItems[i]);
     return NULL;
 }
 
-String ScDPCollection::CreateNewName( USHORT nMin ) const
+String ScDPCollection::CreateNewName( sal_uInt16 nMin ) const
 {
     String aBase = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DataPilot"));
     //!	from Resource?
 
-    for (USHORT nAdd=0; nAdd<=nCount; nAdd++)	//	nCount+1 tries
+    for (sal_uInt16 nAdd=0; nAdd<=nCount; nAdd++)	//	nCount+1 tries
     {
         String aNewName = aBase;
         aNewName += String::CreateFromInt32( nMin + nAdd );
-        BOOL bFound = FALSE;
-        for (USHORT i=0; i<nCount && !bFound; i++)
+        sal_Bool bFound = sal_False;
+        for (sal_uInt16 i=0; i<nCount && !bFound; i++)
             if (((const ScDPObject*)pItems[i])->GetName() == aNewName)
-                bFound = TRUE;
+                bFound = sal_True;
         if (!bFound)
             return aNewName;			// found unused Name
     }
@@ -2539,7 +2539,7 @@ long ScDPObject::GetCacheId() const
     else 
         return mnCacheId;
 }
-ULONG ScDPObject::RefreshCache()
+sal_uLong ScDPObject::RefreshCache()
 {
     if ( pServDesc )
     {
@@ -2548,7 +2548,7 @@ ULONG ScDPObject::RefreshCache()
     }
 
     CreateObjects();
-    ULONG nErrId = 0; 
+    sal_uLong nErrId = 0; 
     if ( pSheetDesc) 
         nErrId =  pSheetDesc->CheckValidate( pDoc );
     if ( nErrId == 0 )
@@ -2573,10 +2573,10 @@ ULONG ScDPObject::RefreshCache()
 
         nNewId = pCache->GetId();
 
-        bRefresh = TRUE;
+        bRefresh = sal_True;
         ScDPCollection* pDPCollection = pDoc->GetDPCollection();
-        USHORT nCount = pDPCollection->GetCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pDPCollection->GetCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
         { //set new cache id
             if ( (*pDPCollection)[i]->GetCacheId() == nOldId  )
             {
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 16f1be0ca..5aac9e691 100755..100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -115,7 +115,7 @@ struct ScDPOutLevelData
         mbHasHiddenMember = false;
     }
 
-    BOOL operator<(const ScDPOutLevelData& r) const
+    sal_Bool operator<(const ScDPOutLevelData& r) const
         { return nDimPos<r.nDimPos || ( nDimPos==r.nDimPos && nHier<r.nHier ) ||
             ( nDimPos==r.nDimPos && nHier==r.nHier && nLevel<r.nLevel ); }
 
@@ -130,7 +130,7 @@ struct ScDPOutLevelData
 
 void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab,
                     SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                    USHORT nStrId )
+                    sal_uInt16 nStrId )
 {
     if ( nCol1 > nCol2 || nRow1 > nRow2 )
     {
@@ -160,7 +160,7 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab,
 
 void lcl_SetFrame( ScDocument* pDoc, SCTAB nTab,
                     SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                    USHORT nWidth )
+                    sal_uInt16 nWidth )
 {
     SvxBorderLine aLine;
     aLine.SetOutWidth(nWidth);
@@ -170,16 +170,16 @@ void lcl_SetFrame( ScDocument* pDoc, SCTAB nTab,
     aBox.SetLine(&aLine, BOX_LINE_RIGHT);
     aBox.SetLine(&aLine, BOX_LINE_BOTTOM);
     SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER );
-    aBoxInfo.SetValid(VALID_HORI,FALSE);
-    aBoxInfo.SetValid(VALID_VERT,FALSE);
-    aBoxInfo.SetValid(VALID_DISTANCE,FALSE);
+    aBoxInfo.SetValid(VALID_HORI,sal_False);
+    aBoxInfo.SetValid(VALID_VERT,sal_False);
+    aBoxInfo.SetValid(VALID_DISTANCE,sal_False);
 
     pDoc->ApplyFrameAreaTab( ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ), &aBox, &aBoxInfo );
 }
 
 // -----------------------------------------------------------------------
 
-void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount,
+void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount,
                             const uno::Reference<sheet::XDataPilotMemberResults>& xLevRes,
                             const uno::Reference<container::XIndexAccess>& xDims )
 {
@@ -198,9 +198,9 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount,
         //!	merge this with the loop to collect ScDPOutLevelData?
 
         String aDataNames[SC_DPOUT_MAXLEVELS];
-        UINT32 nDataFormats[SC_DPOUT_MAXLEVELS];
+        sal_uInt32 nDataFormats[SC_DPOUT_MAXLEVELS];
         long nDataCount = 0;
-        BOOL bAnySet = FALSE;
+        sal_Bool bAnySet = sal_False;
 
         long nDimCount = xDims->getCount();
         for (long nDim=0; nDim<nDimCount; nDim++)
@@ -223,7 +223,7 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount,
                                             rtl::OUString::createFromAscii(DP_PROP_NUMBERFORMAT) );
                     nDataFormats[nDataCount] = nFormat;
                     if ( nFormat != 0 )
-                        bAnySet = TRUE;
+                        bAnySet = sal_True;
                     ++nDataCount;
                 }
             }
@@ -234,7 +234,7 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount,
             const sheet::MemberResult* pArray = aResult.getConstArray();
 
             String aName;
-            UINT32* pNumFmt = new UINT32[nSize];
+            sal_uInt32* pNumFmt = new sal_uInt32[nSize];
             if (nDataCount == 1)
             {
                 //	only one data dimension -> use its numberformat everywhere
@@ -251,7 +251,7 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount,
                     if ( !(pArray[nPos].Flags & sheet::MemberResultFlags::CONTINUE) )
                         aName = String( pArray[nPos].Name );
 
-                    UINT32 nFormat = 0;
+                    sal_uInt32 nFormat = 0;
                     for (long i=0; i<nDataCount; i++)
                         if (aName == aDataNames[i])			//!	search more efficiently?
                         {
@@ -268,7 +268,7 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount,
     }
 }
 
-UINT32 lcl_GetFirstNumberFormat( const uno::Reference<container::XIndexAccess>& xDims )
+sal_uInt32 lcl_GetFirstNumberFormat( const uno::Reference<container::XIndexAccess>& xDims )
 {
     long nDimCount = xDims->getCount();
     for (long nDim=0; nDim<nDimCount; nDim++)
@@ -306,7 +306,7 @@ void lcl_SortFields( ScDPOutLevelData* pFields, long nFieldCount )
     }
 }
 
-BOOL lcl_MemberEmpty( const uno::Sequence<sheet::MemberResult>& rSeq )
+sal_Bool lcl_MemberEmpty( const uno::Sequence<sheet::MemberResult>& rSeq )
 {
     //	used to skip levels that have no members
 
@@ -314,9 +314,9 @@ BOOL lcl_MemberEmpty( const uno::Sequence<sheet::MemberResult>& rSeq )
     const sheet::MemberResult* pArray = rSeq.getConstArray();
     for (long i=0; i<nLen; i++)
         if (pArray[i].Flags & sheet::MemberResultFlags::HASMEMBER)
-            return FALSE;
+            return sal_False;
 
-    return TRUE;	// no member data -> empty
+    return sal_True;	// no member data -> empty
 }
 
 uno::Sequence<sheet::MemberResult> lcl_GetSelectedPageAsResult( const uno::Reference<beans::XPropertySet>& xDimProp )
@@ -356,20 +356,20 @@ uno::Sequence<sheet::MemberResult> lcl_GetSelectedPageAsResult( const uno::Refer
 }
 
 ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsSupplier>& xSrc,
-                                const ScAddress& rPos, BOOL bFilter ) :
+                                const ScAddress& rPos, sal_Bool bFilter ) :
     pDoc( pD ),
     xSource( xSrc ),
     aStartPos( rPos ),
     bDoFilter( bFilter ),
-    bResultsError( FALSE ),
+    bResultsError( sal_False ),
     mbHasDataLayout(false),
     pColNumFmt( NULL ),
     pRowNumFmt( NULL ),
     nColFmtCount( 0 ),
     nRowFmtCount( 0 ),
     nSingleNumFmt( 0 ),
-    bSizesValid( FALSE ),
-    bSizeOverflow( FALSE ),
+    bSizesValid( sal_False ),
+    bSizeOverflow( sal_False ),
     mbHeaderLayout( false )
 {
     nTabStartCol = nMemberStartCol = nDataStartCol = nTabEndCol = 0;
@@ -404,7 +404,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
                         sheet::DataPilotFieldOrientation_HIDDEN );
                 long nDimPos = ScUnoHelpFunctions::GetLongProperty( xDimProp,
                         rtl::OUString::createFromAscii(DP_PROP_POSITION) );
-                BOOL bIsDataLayout = ScUnoHelpFunctions::GetBoolProperty(
+                sal_Bool bIsDataLayout = ScUnoHelpFunctions::GetBoolProperty(
                                                 xDimProp,
                                                 rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
                 bool bHasHiddenMember = ScUnoHelpFunctions::GetBoolProperty(
@@ -532,7 +532,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
         }
         catch (uno::RuntimeException&)
         {
-            bResultsError = TRUE;
+            bResultsError = sal_True;
         }
     }
 
@@ -568,7 +568,7 @@ ScDPOutput::~ScDPOutput()
 void ScDPOutput::SetPosition( const ScAddress& rPos )
 {
     aStartPos = rPos;
-    bSizesValid = bSizeOverflow = FALSE;
+    bSizesValid = bSizeOverflow = sal_False;
 }
 
 void ScDPOutput::DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const sheet::DataResult& rData )
@@ -585,7 +585,7 @@ void ScDPOutput::DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const sheet::Data
         //	use number formats from source
 
         DBG_ASSERT( bSizesValid, "DataCell: !bSizesValid" );
-        UINT32 nFormat = 0;
+        sal_uInt32 nFormat = 0;
         if ( pColNumFmt )
         {
             if ( nCol >= nDataStartCol )
@@ -618,7 +618,7 @@ void ScDPOutput::DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const sheet::Data
 }
 
 void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                const sheet::MemberResult& rData, BOOL bColHeader, long nLevel )
+                                const sheet::MemberResult& rData, sal_Bool bColHeader, long nLevel )
 {
     long nFlags = rData.Flags;
 
@@ -664,7 +664,7 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
         {
             // Wang Xu Ming -- 2009-8-17
             // DataPilot Migration - Cache&&Performance
-            //lcl_SetFrame( pDoc,nTab, nMemberStartCol+(USHORT)nLevel,nRow, nTabEndCol,nRow, SC_DP_FRAME_INNER_BOLD );
+            //lcl_SetFrame( pDoc,nTab, nMemberStartCol+(sal_uInt16)nLevel,nRow, nTabEndCol,nRow, SC_DP_FRAME_INNER_BOLD );
             outputimp.OutputBlockFrame( nMemberStartCol+(SCCOL)nLevel,nRow, nDataStartCol-1,nRow );
             // End Comments
             lcl_SetStyleById( pDoc,nTab, nMemberStartCol+(SCCOL)nLevel,nRow, nDataStartCol-1,nRow,
@@ -728,7 +728,7 @@ void ScDPOutput::CalcSizes()
         if ( aStartPos.Col() + nRowFieldCount + nColCount - 1 > MAXCOL ||
              aStartPos.Row() + nPageSize + nHeaderSize + nColFieldCount + nRowCount > MAXROW )
         {
-            bSizeOverflow = TRUE;
+            bSizeOverflow = sal_True;
         }
 
         nTabStartCol = aStartPos.Col();
@@ -748,7 +748,7 @@ void ScDPOutput::CalcSizes()
             nTabEndRow = nDataStartRow + (SCROW)nRowCount - 1;
         else
             nTabEndRow = nDataStartRow;		// single row will remain empty
-        bSizesValid = TRUE;
+        bSizesValid = sal_True;
     }
 }
 
@@ -890,7 +890,7 @@ void ScDPOutput::Output()
         for (long nCol=0; nCol<nThisColCount; nCol++)
         {
             SCCOL nColPos = nDataStartCol + (SCCOL)nCol;				//! check for overflow
-            HeaderCell( nColPos, nRowPos, nTab, pArray[nCol], TRUE, nField );
+            HeaderCell( nColPos, nRowPos, nTab, pArray[nCol], sal_True, nField );
             // Wang Xu Ming -- 2009-8-17
             // DataPilot Migration - Cache&&Performance
             if ( ( pArray[nCol].Flags & sheet::MemberResultFlags::HASMEMBER ) &&
@@ -908,7 +908,7 @@ void ScDPOutput::Output()
                     {
                         outputimp.AddCol( nColPos );            
                         if ( nColPos + 1 == nEndColPos  )
-                            outputimp.OutputBlockFrame( nColPos,nRowPos, nEndColPos,nRowPos+1, TRUE );
+                            outputimp.OutputBlockFrame( nColPos,nRowPos, nEndColPos,nRowPos+1, sal_True );
                     }
                     else
                         outputimp.OutputBlockFrame( nColPos,nRowPos, nEndColPos,nRowPos );
@@ -927,8 +927,8 @@ void ScDPOutput::Output()
     }
 
     //	output row headers:
-    std::vector<BOOL> vbSetBorder;
-    vbSetBorder.resize( nTabEndRow - nDataStartRow + 1, FALSE );
+    std::vector<sal_Bool> vbSetBorder;
+    vbSetBorder.resize( nTabEndRow - nDataStartRow + 1, sal_False );
     for (nField=0; nField<nRowFieldCount; nField++)
     {
         bool bDataLayout = mbHasDataLayout && (nField == nRowFieldCount-1);
@@ -946,7 +946,7 @@ void ScDPOutput::Output()
         for (long nRow=0; nRow<nThisRowCount; nRow++)
         {
             SCROW nRowPos = nDataStartRow + (SCROW)nRow;				//! check for overflow
-            HeaderCell( nColPos, nRowPos, nTab, pArray[nRow], FALSE, nField );
+            HeaderCell( nColPos, nRowPos, nTab, pArray[nRow], sal_False, nField );
             if ( ( pArray[nRow].Flags & sheet::MemberResultFlags::HASMEMBER ) &&
                 !( pArray[nRow].Flags & sheet::MemberResultFlags::SUBTOTAL ) )
             {
@@ -961,10 +961,10 @@ void ScDPOutput::Output()
                     //  lcl_SetFrame( pDoc,nTab, nColPos,nRowPos, nColPos,nEndRowPos, SC_DP_FRAME_INNER_BOLD );
                     //lcl_SetFrame( pDoc,nTab, nColPos,nRowPos, nTabEndCol,nEndRowPos, SC_DP_FRAME_INNER_BOLD );
                     outputimp.AddRow( nRowPos );
-                    if ( vbSetBorder[ nRow ] == FALSE )
+                    if ( vbSetBorder[ nRow ] == sal_False )
                     {
                         outputimp.OutputBlockFrame( nColPos, nRowPos, nTabEndCol, nEndRowPos );
-                        vbSetBorder[ nRow ]  = TRUE;
+                        vbSetBorder[ nRow ]  = sal_True;
                     }
                     outputimp.OutputBlockFrame( nColPos, nRowPos, nColPos, nEndRowPos );
 
@@ -1017,7 +1017,7 @@ ScRange ScDPOutput::GetOutputRange( sal_Int32 nRegionType )
     return ScRange(aStartPos.Col(), aStartPos.Row(), nTab, nTabEndCol, nTabEndRow, nTab);
 }
 
-BOOL ScDPOutput::HasError()
+sal_Bool ScDPOutput::HasError()
 {
     CalcSizes();
 
@@ -1098,12 +1098,12 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s
     rDataOrient = sheet::DataPilotFieldOrientation_HIDDEN;
 
     uno::Reference<beans::XPropertySet> xSrcProp( xSource, uno::UNO_QUERY );
-    BOOL bColGrand = ScUnoHelpFunctions::GetBoolProperty( xSrcProp,
+    sal_Bool bColGrand = ScUnoHelpFunctions::GetBoolProperty( xSrcProp,
                                          rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND) );
     if ( bColGrand )
         rGrandTotalCols = 1;    // default if data layout not in columns
 
-    BOOL bRowGrand = ScUnoHelpFunctions::GetBoolProperty( xSrcProp,
+    sal_Bool bRowGrand = ScUnoHelpFunctions::GetBoolProperty( xSrcProp,
                                          rtl::OUString::createFromAscii(DP_PROP_ROWGRAND) );
     if ( bRowGrand )
         rGrandTotalRows = 1;    // default if data layout not in rows
@@ -1375,13 +1375,13 @@ bool lcl_IsCondition( const sheet::MemberResult& rResultEntry, const ScDPGetPivo
 
 bool lcl_CheckPageField( const ScDPOutLevelData& rField,
                         const std::vector< ScDPGetPivotDataField >& rFilters,
-                        std::vector< BOOL >& rFilterUsed )
+                        std::vector< sal_Bool >& rFilterUsed )
 {
     for (SCSIZE nFilterPos = 0; nFilterPos < rFilters.size(); ++nFilterPos)
     {
         if ( lcl_IsNamedCategoryField( rFilters[nFilterPos], rField ) )
         {
-            rFilterUsed[nFilterPos] = TRUE;
+            rFilterUsed[nFilterPos] = sal_True;
 
             // page field result is empty or the selection as single entry (see lcl_GetSelectedPageAsResult)
             if ( rField.aResult.getLength() == 1 &&
@@ -1459,10 +1459,10 @@ uno::Sequence<sheet::GeneralFunction> lcl_GetSubTotals(
     return aSubTotals;
 }
 
-void lcl_FilterInclude( std::vector< BOOL >& rResult, std::vector< sal_Int32 >& rSubtotal,
+void lcl_FilterInclude( std::vector< sal_Bool >& rResult, std::vector< sal_Int32 >& rSubtotal,
                         const ScDPOutLevelData& rField,
                         const std::vector< ScDPGetPivotDataField >& rFilters,
-                        std::vector< BOOL >& rFilterUsed,
+                        std::vector< sal_Bool >& rFilterUsed,
                         bool& rBeforeDataLayout,
                         sal_Int32 nGrandTotals, sal_Int32 nDataLayoutIndex,
                         const std::vector<String>& rDataNames, const std::vector<String>& rGivenNames,
@@ -1485,7 +1485,7 @@ void lcl_FilterInclude( std::vector< BOOL >& rResult, std::vector< sal_Int32 >&
             if ( lcl_IsNamedCategoryField( rFilters[nFilterPos], rField ) )
             {
                 aFilter = rFilters[nFilterPos];
-                rFilterUsed[nFilterPos] = TRUE;
+                rFilterUsed[nFilterPos] = sal_True;
                 bHasFilter = true;
             }
         }
@@ -1597,7 +1597,7 @@ void lcl_FilterInclude( std::vector< BOOL >& rResult, std::vector< sal_Int32 >&
 
                     // if a function was specified, automatic subtotals never match
                     if ( bHasFunc )
-                        rResult[j] = FALSE;
+                        rResult[j] = sal_False;
                 }
             }
 
@@ -1631,7 +1631,7 @@ void lcl_FilterInclude( std::vector< BOOL >& rResult, std::vector< sal_Int32 >&
 
                 // if a function was specified, simple (non-subtotal) values never match
                 if ( bHasFunc && nSubTotalCount == 0 )
-                    rResult[j] = FALSE;
+                    rResult[j] = sal_False;
             }
             // if no condition is given, keep the columns/rows included
         }
@@ -1639,7 +1639,7 @@ void lcl_FilterInclude( std::vector< BOOL >& rResult, std::vector< sal_Int32 >&
     }
 }
 
-void lcl_StripSubTotals( std::vector< BOOL >& rResult, const std::vector< sal_Int32 >& rSubtotal )
+void lcl_StripSubTotals( std::vector< sal_Bool >& rResult, const std::vector< sal_Int32 >& rSubtotal )
 {
     sal_Int32 nSize = rResult.size();
     DBG_ASSERT( (sal_Int32)rSubtotal.size() == nSize, "sizes don't match" );
@@ -1652,13 +1652,13 @@ void lcl_StripSubTotals( std::vector< BOOL >& rResult, const std::vector< sal_In
             DBG_ASSERT( nStart >= 0, "invalid subtotal count" );
 
             for (sal_Int32 nPrev = nStart; nPrev < nPos; nPrev++)
-                rResult[nPrev] = FALSE;
+                rResult[nPrev] = sal_False;
         }
 }
 
 String lcl_GetDataFieldName( const String& rSourceName, sheet::GeneralFunction eFunc )
 {
-    USHORT nStrId = 0;
+    sal_uInt16 nStrId = 0;
     switch ( eFunc )
     {
         case sheet::GeneralFunction_SUM:        nStrId = STR_FUN_TEXT_SUM;      break;
@@ -1711,9 +1711,9 @@ void ScDPOutput::GetDataDimensionNames( String& rSourceName, String& rGivenName,
     }
 }
 
-// Returns TRUE on success and stores the result in rTarget
-// Returns FALSE if rFilters or rTarget describes something that is not visible
-BOOL ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget,
+// Returns sal_True on success and stores the result in rTarget
+// Returns sal_False if rFilters or rTarget describes something that is not visible
+sal_Bool ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget,
                                const std::vector< ScDPGetPivotDataField >& rFilters )
 {
     CalcSizes();
@@ -1728,7 +1728,7 @@ BOOL ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget,
     lcl_GetTableVars( nGrandTotalCols, nGrandTotalRows, nDataLayoutIndex, aDataNames, aGivenNames, eDataOrient, xSource );
 
     if ( aDataNames.empty() )
-        return FALSE;               // incomplete table without data fields -> no result
+        return sal_False;               // incomplete table without data fields -> no result
 
     if ( eDataOrient == sheet::DataPilotFieldOrientation_HIDDEN )
     {
@@ -1736,15 +1736,15 @@ BOOL ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget,
 
         DBG_ASSERT( aDataNames.size() == 1, "several data fields but no data layout field" );
         if ( !lcl_IsNamedDataField( rTarget, aDataNames[0], aGivenNames[0] ) )
-            return FALSE;
+            return sal_False;
     }
 
-    std::vector< BOOL > aIncludeCol( nColCount, TRUE );
+    std::vector< sal_Bool > aIncludeCol( nColCount, sal_True );
     std::vector< sal_Int32 > aSubtotalCol( nColCount, 0 );
-    std::vector< BOOL > aIncludeRow( nRowCount, TRUE );
+    std::vector< sal_Bool > aIncludeRow( nRowCount, sal_True );
     std::vector< sal_Int32 > aSubtotalRow( nRowCount, 0 );
 
-    std::vector< BOOL > aFilterUsed( rFilters.size(), FALSE );
+    std::vector< sal_Bool > aFilterUsed( rFilters.size(), sal_False );
 
     long nField;
     long nCol;
@@ -1769,12 +1769,12 @@ BOOL ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget,
 
     for (nField=0; nField<nPageFieldCount; nField++)
         if ( !lcl_CheckPageField( pPageFields[nField], rFilters, aFilterUsed ) )
-            return FALSE;
+            return sal_False;
 
     // all filter fields must be used
     for (SCSIZE nFilter=0; nFilter<aFilterUsed.size(); nFilter++)
         if (!aFilterUsed[nFilter])
-            return FALSE;
+            return sal_False;
 
     lcl_StripSubTotals( aIncludeCol, aSubtotalCol );
     lcl_StripSubTotals( aIncludeRow, aSubtotalRow );
@@ -1798,35 +1798,35 @@ BOOL ScDPOutput::GetPivotData( ScDPGetPivotDataField& rTarget,
         }
 
     if ( nColIncluded != 1 || nRowIncluded != 1 )
-        return FALSE;
+        return sal_False;
 
     const uno::Sequence<sheet::DataResult>& rDataRow = aData[nRowPos];
     if ( nColPos >= rDataRow.getLength() )
-        return FALSE;
+        return sal_False;
 
     const sheet::DataResult& rResult = rDataRow[nColPos];
     if ( rResult.Flags & sheet::DataResultFlags::ERROR )
-        return FALSE;                                       //! different error?
+        return sal_False;                                       //! different error?
 
-    rTarget.mbValIsStr = FALSE;
+    rTarget.mbValIsStr = sal_False;
     rTarget.mnValNum = rResult.Value;
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDPOutput::IsFilterButton( const ScAddress& rPos )
+sal_Bool ScDPOutput::IsFilterButton( const ScAddress& rPos )
 {
     SCCOL nCol = rPos.Col();
     SCROW nRow = rPos.Row();
     SCTAB nTab = rPos.Tab();
     if ( nTab != aStartPos.Tab() || !bDoFilter )
-        return FALSE;								// wrong sheet or no button at all
+        return sal_False;								// wrong sheet or no button at all
 
     //	filter button is at top left
     return ( nCol == aStartPos.Col() && nRow == aStartPos.Row() );
 }
 
-long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient )
+long ScDPOutput::GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient )
 {
     SCCOL nCol = rPos.Col();
     SCROW nRow = rPos.Row();
@@ -1872,9 +1872,9 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient )
     return -1;		// invalid
 }
 
-BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop,
+sal_Bool ScDPOutput::GetHeaderDrag( const ScAddress& rPos, sal_Bool bMouseLeft, sal_Bool bMouseTop,
                                 long nDragDim,
-                                Rectangle& rPosRect, USHORT& rOrient, long& rDimPos )
+                                Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos )
 {
     //	Rectangle instead of ScRange for rPosRect to allow for negative values
 
@@ -1882,7 +1882,7 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
     SCROW nRow = rPos.Row();
     SCTAB nTab = rPos.Tab();
     if ( nTab != aStartPos.Tab() )
-        return FALSE;										// wrong sheet
+        return sal_False;										// wrong sheet
 
     //	calculate output positions and sizes
 
@@ -1897,25 +1897,25 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
         if (nField < 0)
         {
             nField = 0;
-            bMouseTop = TRUE;
+            bMouseTop = sal_True;
         }
         //!	find start of dimension
 
         rPosRect = Rectangle( nDataStartCol, nMemberStartRow + nField,
                               nTabEndCol, nMemberStartRow + nField -1 );
 
-        BOOL bFound = FALSE;			// is this within the same orientation?
-        BOOL bBeforeDrag = FALSE;
-        BOOL bAfterDrag = FALSE;
+        sal_Bool bFound = sal_False;			// is this within the same orientation?
+        sal_Bool bBeforeDrag = sal_False;
+        sal_Bool bAfterDrag = sal_False;
         for (long nPos=0; nPos<nColFieldCount && !bFound; nPos++)
         {
             if (pColFields[nPos].nDim == nDragDim)
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 if ( nField < nPos )
-                    bBeforeDrag = TRUE;
+                    bBeforeDrag = sal_True;
                 else if ( nField > nPos )
-                    bAfterDrag = TRUE;
+                    bAfterDrag = sal_True;
             }
         }
 
@@ -1940,13 +1940,13 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
 
         rOrient = sheet::DataPilotFieldOrientation_COLUMN;
         rDimPos = nField;						//!...
-        return TRUE;
+        return sal_True;
     }
 
     //	test for row header
 
     //	special case if no row fields
-    BOOL bSpecial = ( nRow+1 >= nDataStartRow && nRow <= nTabEndRow &&
+    sal_Bool bSpecial = ( nRow+1 >= nDataStartRow && nRow <= nTabEndRow &&
                         nRowFieldCount == 0 && nCol == nTabStartCol && bMouseLeft );
 
     if ( bSpecial || ( nRow+1 >= nDataStartRow && nRow <= nTabEndRow &&
@@ -1958,18 +1958,18 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
         rPosRect = Rectangle( nTabStartCol + nField, nDataStartRow - 1,
                               nTabStartCol + nField - 1, nTabEndRow );
 
-        BOOL bFound = FALSE;			// is this within the same orientation?
-        BOOL bBeforeDrag = FALSE;
-        BOOL bAfterDrag = FALSE;
+        sal_Bool bFound = sal_False;			// is this within the same orientation?
+        sal_Bool bBeforeDrag = sal_False;
+        sal_Bool bAfterDrag = sal_False;
         for (long nPos=0; nPos<nRowFieldCount && !bFound; nPos++)
         {
             if (pRowFields[nPos].nDim == nDragDim)
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 if ( nField < nPos )
-                    bBeforeDrag = TRUE;
+                    bBeforeDrag = sal_True;
                 else if ( nField > nPos )
-                    bAfterDrag = TRUE;
+                    bAfterDrag = sal_True;
             }
         }
 
@@ -1994,7 +1994,7 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
 
         rOrient = sheet::DataPilotFieldOrientation_ROW;
         rDimPos = nField;						//!...
-        return TRUE;
+        return sal_True;
     }
 
     //	test for page fields
@@ -2007,25 +2007,25 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
         if (nField < 0)
         {
             nField = 0;
-            bMouseTop = TRUE;
+            bMouseTop = sal_True;
         }
         //!	find start of dimension
 
         rPosRect = Rectangle( aStartPos.Col(), nPageStartRow + nField,
                               nTabEndCol, nPageStartRow + nField - 1 );
 
-        BOOL bFound = FALSE;			// is this within the same orientation?
-        BOOL bBeforeDrag = FALSE;
-        BOOL bAfterDrag = FALSE;
+        sal_Bool bFound = sal_False;			// is this within the same orientation?
+        sal_Bool bBeforeDrag = sal_False;
+        sal_Bool bAfterDrag = sal_False;
         for (long nPos=0; nPos<nPageFieldCount && !bFound; nPos++)
         {
             if (pPageFields[nPos].nDim == nDragDim)
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 if ( nField < nPos )
-                    bBeforeDrag = TRUE;
+                    bBeforeDrag = sal_True;
                 else if ( nField > nPos )
-                    bAfterDrag = TRUE;
+                    bAfterDrag = sal_True;
             }
         }
 
@@ -2050,10 +2050,10 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
 
         rOrient = sheet::DataPilotFieldOrientation_PAGE;
         rDimPos = nField;						//!...
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index bdf788c72..85fed0e19 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -118,32 +118,32 @@ ScDPSaveMember::~ScDPSaveMember()
 {
 }
 
-BOOL ScDPSaveMember::operator== ( const ScDPSaveMember& r ) const
+sal_Bool ScDPSaveMember::operator== ( const ScDPSaveMember& r ) const
 {
     if ( aName			  != r.aName 			||
          nVisibleMode	  != r.nVisibleMode		||
          nShowDetailsMode != r.nShowDetailsMode )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDPSaveMember::HasIsVisible() const
+sal_Bool ScDPSaveMember::HasIsVisible() const
 {
     return nVisibleMode != SC_DPSAVEMODE_DONTKNOW;
 }
 
-void ScDPSaveMember::SetIsVisible(BOOL bSet)
+void ScDPSaveMember::SetIsVisible(sal_Bool bSet)
 {
     nVisibleMode = bSet;
 }
 
-BOOL ScDPSaveMember::HasShowDetails() const
+sal_Bool ScDPSaveMember::HasShowDetails() const
 {
     return nShowDetailsMode != SC_DPSAVEMODE_DONTKNOW;
 }
 
-void ScDPSaveMember::SetShowDetails(BOOL bSet)
+void ScDPSaveMember::SetShowDetails(sal_Bool bSet)
 {
     nShowDetailsMode = bSet;
 }
@@ -181,11 +181,11 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
 
         if ( nVisibleMode != SC_DPSAVEMODE_DONTKNOW )
             lcl_SetBoolProperty( xMembProp,
-                    rtl::OUString::createFromAscii(DP_PROP_ISVISIBLE), (BOOL)nVisibleMode );
+                    rtl::OUString::createFromAscii(DP_PROP_ISVISIBLE), (sal_Bool)nVisibleMode );
 
         if ( nShowDetailsMode != SC_DPSAVEMODE_DONTKNOW )
             lcl_SetBoolProperty( xMembProp,
-                    rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS), (BOOL)nShowDetailsMode );
+                    rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS), (sal_Bool)nShowDetailsMode );
 
         if (mpLayoutName.get())
             ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, SC_UNO_LAYOUTNAME, *mpLayoutName);
@@ -197,18 +197,18 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
 
 // -----------------------------------------------------------------------
 
-ScDPSaveDimension::ScDPSaveDimension(const String& rName, BOOL bDataLayout) :
+ScDPSaveDimension::ScDPSaveDimension(const String& rName, sal_Bool bDataLayout) :
     aName( rName ),
     pSelectedPage( NULL ),
     mpLayoutName(NULL),
     mpSubtotalName(NULL),
     bIsDataLayout( bDataLayout ),
-    bDupFlag( FALSE ),
+    bDupFlag( sal_False ),
     nOrientation( sheet::DataPilotFieldOrientation_HIDDEN ),
     nFunction( sheet::GeneralFunction_AUTO ),
     nUsedHierarchy( -1 ),
     nShowEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
-    bSubTotalDefault( TRUE ),
+    bSubTotalDefault( sal_True ),
     nSubTotalCount( 0 ),
     pSubTotalFuncs( NULL ),
     pReferenceValue( NULL ),
@@ -234,7 +234,7 @@ ScDPSaveDimension::ScDPSaveDimension(const ScDPSaveDimension& r) :
 {
     if ( nSubTotalCount && r.pSubTotalFuncs )
     {
-        pSubTotalFuncs = new USHORT[nSubTotalCount];
+        pSubTotalFuncs = new sal_uInt16[nSubTotalCount];
         for (long nSub=0; nSub<nSubTotalCount; nSub++)
             pSubTotalFuncs[nSub] = r.pSubTotalFuncs[nSub];
     }
@@ -284,7 +284,7 @@ ScDPSaveDimension::~ScDPSaveDimension()
     delete [] pSubTotalFuncs;
 }
 
-BOOL ScDPSaveDimension::operator== ( const ScDPSaveDimension& r ) const
+sal_Bool ScDPSaveDimension::operator== ( const ScDPSaveDimension& r ) const
 {
     if ( aName			  != r.aName			||
          bIsDataLayout    != r.bIsDataLayout	||
@@ -295,71 +295,71 @@ BOOL ScDPSaveDimension::operator== ( const ScDPSaveDimension& r ) const
          nShowEmptyMode   != r.nShowEmptyMode   ||
          bSubTotalDefault != r.bSubTotalDefault ||
          nSubTotalCount   != r.nSubTotalCount )
-        return FALSE;
+        return sal_False;
 
     if ( nSubTotalCount && ( !pSubTotalFuncs || !r.pSubTotalFuncs ) )	// should not happen
-        return FALSE;
+        return sal_False;
 
     long i;
     for (i=0; i<nSubTotalCount; i++)
         if ( pSubTotalFuncs[i] != r.pSubTotalFuncs[i] )
-            return FALSE;
+            return sal_False;
 
     if (maMemberHash.size() != r.maMemberHash.size() )
-        return FALSE;
+        return sal_False;
 
     MemberList::const_iterator a=maMemberList.begin();
     MemberList::const_iterator b=r.maMemberList.begin();
     for (; a != maMemberList.end() ; ++a, ++b)
         if (!(**a == **b))
-            return FALSE;
+            return sal_False;
 
     if ( this->HasCurrentPage() && r.HasCurrentPage() )
     {
         if ( this->GetCurrentPage() != r.GetCurrentPage() )
         {
-            return FALSE;
+            return sal_False;
         }
     }
     else if ( this->HasCurrentPage() || r.HasCurrentPage() )
     {
-        return FALSE;
+        return sal_False;
     }
     if( pReferenceValue && r.pReferenceValue )
     {
         if ( !(*pReferenceValue == *r.pReferenceValue) )
         {
-            return FALSE;
+            return sal_False;
         }
     }
     else if ( pReferenceValue || r.pReferenceValue )
     {
-        return FALSE;
+        return sal_False;
     }
     if( this->pSortInfo && r.pSortInfo )
     {
         if ( !(*this->pSortInfo == *r.pSortInfo) )
         {
-            return FALSE;
+            return sal_False;
         }
     }
     else if ( this->pSortInfo || r.pSortInfo )
     {
-        return FALSE;
+        return sal_False;
     }
     if( this->pAutoShowInfo && r.pAutoShowInfo )
     {
         if ( !(*this->pAutoShowInfo == *r.pAutoShowInfo) )
         {
-            return FALSE;
+            return sal_False;
         }
     }
     else if ( this->pAutoShowInfo || r.pAutoShowInfo )
     {
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScDPSaveDimension::AddMember(ScDPSaveMember* pMember)
@@ -388,26 +388,26 @@ void ScDPSaveDimension::SetName( const String& rNew )
     aName = rNew;
 }
 
-void ScDPSaveDimension::SetOrientation(USHORT nNew)
+void ScDPSaveDimension::SetOrientation(sal_uInt16 nNew)
 {
     nOrientation = nNew;
 }
 
-void ScDPSaveDimension::SetSubTotals(long nCount, const USHORT* pFuncs)
+void ScDPSaveDimension::SetSubTotals(long nCount, const sal_uInt16* pFuncs)
 {
     if (pSubTotalFuncs)
         delete [] pSubTotalFuncs;
     nSubTotalCount = nCount;
     if ( nCount && pFuncs )
     {
-        pSubTotalFuncs = new USHORT[nCount];
+        pSubTotalFuncs = new sal_uInt16[nCount];
         for (long i=0; i<nCount; i++)
             pSubTotalFuncs[i] = pFuncs[i];
     }
     else
         pSubTotalFuncs = NULL;
 
-    bSubTotalDefault = FALSE;
+    bSubTotalDefault = sal_False;
 }
 
 bool ScDPSaveDimension::HasShowEmpty() const
@@ -415,12 +415,12 @@ bool ScDPSaveDimension::HasShowEmpty() const
     return nShowEmptyMode != SC_DPSAVEMODE_DONTKNOW;
 }
 
-void ScDPSaveDimension::SetShowEmpty(BOOL bSet)
+void ScDPSaveDimension::SetShowEmpty(sal_Bool bSet)
 {
     nShowEmptyMode = bSet;
 }
 
-void ScDPSaveDimension::SetFunction(USHORT nNew)
+void ScDPSaveDimension::SetFunction(sal_uInt16 nNew)
 {
     nFunction = nNew;
 }
@@ -516,7 +516,7 @@ void ScDPSaveDimension::SetCurrentPage( const String* pPage )
         pSelectedPage = NULL;
 }
 
-BOOL ScDPSaveDimension::HasCurrentPage() const
+sal_Bool ScDPSaveDimension::HasCurrentPage() const
 {
     return ( pSelectedPage != NULL );
 }
@@ -580,7 +580,7 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
 
         if ( nUsedHierarchy >= 0 )
         {
-            aAny <<= (INT32)nUsedHierarchy;
+            aAny <<= (sal_Int32)nUsedHierarchy;
             xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY), aAny );
         }
 
@@ -664,7 +664,7 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
                 }
                 if ( nShowEmptyMode != SC_DPSAVEMODE_DONTKNOW )
                     lcl_SetBoolProperty( xLevProp,
-                        rtl::OUString::createFromAscii(DP_PROP_SHOWEMPTY), (BOOL)nShowEmptyMode );
+                        rtl::OUString::createFromAscii(DP_PROP_SHOWEMPTY), (sal_Bool)nShowEmptyMode );
 
                 if ( pSortInfo )
                     ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_SORTING, *pSortInfo);
@@ -751,8 +751,8 @@ ScDPSaveData::ScDPSaveData() :
     nRowGrandMode( SC_DPSAVEMODE_DONTKNOW ),
     nIgnoreEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
     nRepeatEmptyMode( SC_DPSAVEMODE_DONTKNOW ),
-    bFilterButton( TRUE ),
-    bDrillDown( TRUE ),
+    bFilterButton( sal_True ),
+    bDrillDown( sal_True ),
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
     mnCacheId( -1),
@@ -805,7 +805,7 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r )
     return *this;
 }
 
-BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
+sal_Bool ScDPSaveData::operator== ( const ScDPSaveData& r ) const
 {
     if ( nColumnGrandMode != r.nColumnGrandMode ||
          nRowGrandMode    != r.nRowGrandMode	||
@@ -815,20 +815,20 @@ BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
          mnCacheId		  != r.mnCacheId ||/// Wang Xu Ming -- 2009-6-18 DataPilot Migration
          bDrillDown       != r.bDrillDown ||
          mbDimensionMembersBuilt != r.mbDimensionMembersBuilt)
-        return FALSE;
+        return sal_False;
 
     if ( pDimensionData || r.pDimensionData )
         if ( !pDimensionData || !r.pDimensionData || !( *pDimensionData == *r.pDimensionData ) )
-            return FALSE;
+            return sal_False;
 
-    ULONG nCount = aDimList.Count();
+    sal_uLong nCount = aDimList.Count();
     if ( nCount != r.aDimList.Count() )
-        return FALSE;
+        return sal_False;
 
-    for (ULONG i=0; i<nCount; i++)
+    for (sal_uLong i=0; i<nCount; i++)
         if ( !( *(ScDPSaveDimension*)aDimList.GetObject(i) ==
                 *(ScDPSaveDimension*)r.aDimList.GetObject(i) ) )
-            return FALSE;
+            return sal_False;
 
     if (mpGrandTotalName.get())
     {
@@ -840,7 +840,7 @@ BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const
     else if (r.mpGrandTotalName.get())
         return false;
 
-    return TRUE;
+    return sal_True;
 }
 
 ScDPSaveData::~ScDPSaveData()
@@ -872,7 +872,7 @@ ScDPSaveDimension* ScDPSaveData::GetDimensionByName(const String& rName)
         if ( pDim->GetName() == rName && !pDim->IsDataLayout() )
             return pDim;
     }
-    ScDPSaveDimension* pNew = new ScDPSaveDimension( rName, FALSE );
+    ScDPSaveDimension* pNew = new ScDPSaveDimension( rName, sal_False );
     aDimList.Insert( pNew, LIST_APPEND );
     return pNew;
 }
@@ -898,7 +898,7 @@ ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const String& rName)
         if ( pDim->GetName() == rName && !pDim->IsDataLayout() )
             return DuplicateDimension(rName);
     }
-    ScDPSaveDimension* pNew = new ScDPSaveDimension( rName, FALSE );
+    ScDPSaveDimension* pNew = new ScDPSaveDimension( rName, sal_False );
     aDimList.Insert( pNew, LIST_APPEND );
     return pNew;
 }
@@ -909,7 +909,7 @@ ScDPSaveDimension* ScDPSaveData::GetDataLayoutDimension()
     if (pDim)
         return pDim;
 
-    ScDPSaveDimension* pNew = new ScDPSaveDimension( String(), TRUE );
+    ScDPSaveDimension* pNew = new ScDPSaveDimension( String(), sal_True );
     aDimList.Insert( pNew, LIST_APPEND );
     return pNew;
 }
@@ -933,7 +933,7 @@ ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const String& rName)
 
     ScDPSaveDimension* pOld = GetDimensionByName( rName );
     ScDPSaveDimension* pNew = new ScDPSaveDimension( *pOld );
-    pNew->SetDupFlag( TRUE );
+    pNew->SetDupFlag( sal_True );
     aDimList.Insert( pNew, LIST_APPEND );
     return pNew;
 }
@@ -956,12 +956,12 @@ void ScDPSaveData::RemoveDimensionByName(const String& rName)
 ScDPSaveDimension& ScDPSaveData::DuplicateDimension( const ScDPSaveDimension& rDim )
 {
     ScDPSaveDimension* pNew = new ScDPSaveDimension( rDim );
-    pNew->SetDupFlag( TRUE );
+    pNew->SetDupFlag( sal_True );
     aDimList.Insert( pNew, LIST_APPEND );
     return *pNew;
 }
 
-ScDPSaveDimension* ScDPSaveData::GetInnermostDimension(USHORT nOrientation)
+ScDPSaveDimension* ScDPSaveData::GetInnermostDimension(sal_uInt16 nOrientation)
 {
     //  return the innermost dimension for the given orientation,
     //  excluding data layout dimension
@@ -1008,12 +1008,12 @@ void ScDPSaveData::SetPosition( ScDPSaveDimension* pDim, long nNew )
 {
     //	position (nNew) is counted within dimensions of the same orientation
 
-    USHORT nOrient = pDim->GetOrientation();
+    sal_uInt16 nOrient = pDim->GetOrientation();
 
     aDimList.Remove( pDim );
-    ULONG nCount = aDimList.Count();		// after remove
+    sal_uLong nCount = aDimList.Count();		// after remove
 
-    ULONG nInsPos = 0;
+    sal_uLong nInsPos = 0;
     while ( nNew > 0 && nInsPos < nCount )
     {
         if ( ((ScDPSaveDimension*)aDimList.GetObject(nInsPos))->GetOrientation() == nOrient )
@@ -1024,32 +1024,32 @@ void ScDPSaveData::SetPosition( ScDPSaveDimension* pDim, long nNew )
     aDimList.Insert( pDim, nInsPos );
 }
 
-void ScDPSaveData::SetColumnGrand(BOOL bSet)
+void ScDPSaveData::SetColumnGrand(sal_Bool bSet)
 {
     nColumnGrandMode = bSet;
 }
 
-void ScDPSaveData::SetRowGrand(BOOL bSet)
+void ScDPSaveData::SetRowGrand(sal_Bool bSet)
 {
     nRowGrandMode = bSet;
 }
 
-void ScDPSaveData::SetIgnoreEmptyRows(BOOL bSet)
+void ScDPSaveData::SetIgnoreEmptyRows(sal_Bool bSet)
 {
     nIgnoreEmptyMode = bSet;
 }
 
-void ScDPSaveData::SetRepeatIfEmpty(BOOL bSet)
+void ScDPSaveData::SetRepeatIfEmpty(sal_Bool bSet)
 {
     nRepeatEmptyMode = bSet;
 }
 
-void ScDPSaveData::SetFilterButton(BOOL bSet)
+void ScDPSaveData::SetFilterButton(sal_Bool bSet)
 {
     bFilterButton = bSet;
 }
 
-void ScDPSaveData::SetDrillDown(BOOL bSet)
+void ScDPSaveData::SetDrillDown(sal_Bool bSet)
 {
     bDrillDown = bSet;
 }
@@ -1092,10 +1092,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
         {
             if ( nIgnoreEmptyMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
-                    rtl::OUString::createFromAscii(DP_PROP_IGNOREEMPTY), (BOOL)nIgnoreEmptyMode );
+                    rtl::OUString::createFromAscii(DP_PROP_IGNOREEMPTY), (sal_Bool)nIgnoreEmptyMode );
             if ( nRepeatEmptyMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
-                    rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY), (BOOL)nRepeatEmptyMode );
+                    rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY), (sal_Bool)nRepeatEmptyMode );
         }
         catch(uno::Exception&)
         {
@@ -1125,14 +1125,14 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
 
             DBG_TRACESTR(pDim->GetName());
             
-            BOOL bData = pDim->IsDataLayout();
+            sal_Bool bData = pDim->IsDataLayout();
 
             //!	getByName for ScDPSource, including DataLayoutDimension !!!!!!!!
 
             uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
             uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName );
             long nIntCount = xIntDims->getCount();
-            BOOL bFound = FALSE;
+            sal_Bool bFound = sal_False;
             for (long nIntDim=0; nIntDim<nIntCount && !bFound; nIntDim++)
             {
                 uno::Reference<uno::XInterface> xIntDim = ScUnoHelpFunctions::AnyToInterface( xIntDims->getByIndex(nIntDim) );
@@ -1150,7 +1150,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
                 {
                     uno::Reference<container::XNamed> xDimName( xIntDim, uno::UNO_QUERY );
                     if ( xDimName.is() && xDimName->getName() == aName )
-                        bFound = TRUE;
+                        bFound = sal_True;
                 }
 
                 if ( bFound )
@@ -1187,10 +1187,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
         {
             if ( nColumnGrandMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
-                    rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), (BOOL)nColumnGrandMode );
+                    rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), (sal_Bool)nColumnGrandMode );
             if ( nRowGrandMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
-                    rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), (BOOL)nRowGrandMode );
+                    rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), (sal_Bool)nRowGrandMode );
         }
     }
     catch(uno::Exception&)
@@ -1199,16 +1199,16 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
     }
 }
 
-BOOL ScDPSaveData::IsEmpty() const
+sal_Bool ScDPSaveData::IsEmpty() const
 {
     long nCount = aDimList.Count();
     for (long i=0; i<nCount; i++)
     {
         ScDPSaveDimension* pDim = (ScDPSaveDimension*)aDimList.GetObject(i);
         if ( pDim->GetOrientation() != sheet::DataPilotFieldOrientation_HIDDEN && !pDim->IsDataLayout() )
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;	// no entries that are not hidden
+    return sal_True;	// no entries that are not hidden
 }
 
 ScDPDimensionSaveData* ScDPSaveData::GetDimensionData()
@@ -1301,13 +1301,13 @@ void ScDPSaveData::Refresh( const uno::Reference<sheet::XDimensionsSupplier>& xS
             uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
             uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName );
             long nIntCount = xIntDims->getCount();
-            BOOL bFound = FALSE;
+            sal_Bool bFound = sal_False;
             for (long nIntDim=0; nIntDim<nIntCount && !bFound; nIntDim++)
             {
                 uno::Reference<uno::XInterface> xIntDim = ScUnoHelpFunctions::AnyToInterface( xIntDims->getByIndex(nIntDim) );
                 uno::Reference<container::XNamed> xDimName( xIntDim, uno::UNO_QUERY );
                 if ( xDimName.is() && xDimName->getName() == aName )
-                    bFound = TRUE;
+                    bFound = sal_True;
             }
             if ( !bFound )
             {
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 0d4a1af94..8a2975847 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -82,7 +82,7 @@ using ::com::sun::star::uno::UNO_QUERY;
 {
     ScDPTableDataCache* pCache = NULL;
     ScDPCollection* pDPCollection= pDoc->GetDPCollection();
-    USHORT nCount = pDPCollection->GetCount();
+    sal_uInt16 nCount = pDPCollection->GetCount();
     
     for ( short i=nCount-1; i>=0 ; i--)
     {
@@ -250,18 +250,18 @@ String ScDatabaseDPData::getDimensionName(long nColumn)
     return aCacheTable.getFieldName((SCCOL)nColumn);
 }
 
-BOOL ScDatabaseDPData::getIsDataLayoutDimension(long nColumn)
+sal_Bool ScDatabaseDPData::getIsDataLayoutDimension(long nColumn)
 {
     return ( nColumn == GetCacheTable().getColSize());
 }
 
-BOOL ScDatabaseDPData::IsDateDimension(long /* nDim */)
+sal_Bool ScDatabaseDPData::IsDateDimension(long /* nDim */)
 {
     //!	later...
-    return FALSE;
+    return sal_False;
 }
 
-void ScDatabaseDPData::SetEmptyFlags( BOOL /* bIgnoreEmptyRows */, BOOL /* bRepeatIfEmpty */ )
+void ScDatabaseDPData::SetEmptyFlags( sal_Bool /* bIgnoreEmptyRows */, sal_Bool /* bRepeatIfEmpty */ )
 {
     //	not used for database data
     //!	disable flags
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 6bdf5170c..d7a0d3269 100755..100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -65,12 +65,12 @@ ScSheetDPData::ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc , l
     ScDPTableData(pD, rDesc.GetCacheId( pD, nCacheId) ), // DataPilot Migration - Cache&&Performance
     aQuery ( rDesc.aQueryParam  ),
     pSpecial(NULL),
-    bIgnoreEmptyRows( FALSE ),
-    bRepeatIfEmpty(FALSE),
+    bIgnoreEmptyRows( sal_False ),
+    bRepeatIfEmpty(sal_False),
     aCacheTable( pD, rDesc.GetCacheId( pD, nCacheId))
 {
     SCSIZE nEntryCount( aQuery.GetEntryCount());
-    pSpecial = new BOOL[nEntryCount];
+    pSpecial = new sal_Bool[nEntryCount];
     for (SCSIZE j = 0; j < nEntryCount; ++j )
     {
         ScQueryEntry& rEntry = aQuery.GetEntry(j);
@@ -130,18 +130,18 @@ String ScSheetDPData::getDimensionName(long nColumn)
     }
 }
 
-BOOL ScSheetDPData::IsDateDimension(long nDim)
+sal_Bool ScSheetDPData::IsDateDimension(long nDim)
 {
     CreateCacheTable();
     long nColCount = aCacheTable.getColSize();
     if (getIsDataLayoutDimension(nDim))
     {
-        return FALSE;
+        return sal_False;
     }
     else if (nDim >= nColCount)
     {
         DBG_ERROR("IsDateDimension: invalid dimension");
-        return FALSE;
+        return sal_False;
     }
     else
     {
@@ -149,7 +149,7 @@ BOOL ScSheetDPData::IsDateDimension(long nDim)
     }
 }
 
-ULONG ScSheetDPData::GetNumberFormat(long nDim)
+sal_uLong ScSheetDPData::GetNumberFormat(long nDim)
 {
     CreateCacheTable();
     if (getIsDataLayoutDimension(nDim))
@@ -166,7 +166,7 @@ ULONG ScSheetDPData::GetNumberFormat(long nDim)
         return GetCacheTable().GetCache()->GetNumberFormat( nDim );
     } 
 }
-UINT32	ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx )
+sal_uInt32	ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx )
 {
     if( !mpDoc )
         return 0;
@@ -177,13 +177,13 @@ UINT32	ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx )
     return 0;
 }
 
-BOOL ScSheetDPData::getIsDataLayoutDimension(long nColumn)
+sal_Bool ScSheetDPData::getIsDataLayoutDimension(long nColumn)
 {
     CreateCacheTable();
     return (nColumn ==(long)( aCacheTable.getColSize()));
 }
 
-void ScSheetDPData::SetEmptyFlags( BOOL bIgnoreEmptyRowsP, BOOL bRepeatIfEmptyP )
+void ScSheetDPData::SetEmptyFlags( sal_Bool bIgnoreEmptyRowsP, sal_Bool bRepeatIfEmptyP )
 {
     bIgnoreEmptyRows = bIgnoreEmptyRowsP;
     bRepeatIfEmpty   = bRepeatIfEmptyP;
@@ -245,7 +245,7 @@ ScDPTableDataCache* ScSheetSourceDesc::CreateCache( ScDocument* pDoc , long nID
         if ( pCache && ( nID < 0 || nID == pCache->GetId() ) )
             return pCache;
 
-        ULONG nErrId = CheckValidate( pDoc );
+        sal_uLong nErrId = CheckValidate( pDoc );
         if ( !nErrId )
         {
             pCache = new ScDPTableDataCache( pDoc );
@@ -286,12 +286,12 @@ long ScSheetSourceDesc:: GetCacheId( ScDocument* pDoc, long nID ) const
         return pCache->GetId();
 }
 
-ULONG ScSheetSourceDesc::CheckValidate( ScDocument* pDoc ) const
+sal_uLong ScSheetSourceDesc::CheckValidate( ScDocument* pDoc ) const
 {
     ScRange aSrcRange( aSourceRange);
     if ( !pDoc )
         return STR_ERR_DATAPILOTSOURCE;
-    for(USHORT i= aSrcRange.aStart.Col();i <= aSrcRange.aEnd.Col();i++)
+    for(sal_uInt16 i= aSrcRange.aStart.Col();i <= aSrcRange.aEnd.Col();i++)
     {
         if ( pDoc->IsBlockEmpty( aSrcRange.aStart.Tab(),
             i, aSrcRange.aStart.Row(),i, aSrcRange.aStart.Row()))
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index 7ae5fb453..4d014db49 100755..100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -124,14 +124,14 @@ bool ScDPTableData::IsRepeatIfEmpty()
     return false;
 }
 
-ULONG ScDPTableData::GetNumberFormat(long)
+sal_uLong ScDPTableData::GetNumberFormat(long)
 {
     return 0;			// default format
 }
 
-BOOL ScDPTableData::IsBaseForGroup(long) const
+sal_Bool ScDPTableData::IsBaseForGroup(long) const
 {
-    return FALSE;       // always false
+    return sal_False;       // always false
 }
 
 long ScDPTableData::GetGroupBase(long) const
@@ -139,23 +139,23 @@ long ScDPTableData::GetGroupBase(long) const
     return -1;          // always none
 }
 
-BOOL ScDPTableData::IsNumOrDateGroup(long) const
+sal_Bool ScDPTableData::IsNumOrDateGroup(long) const
 {
-    return FALSE;       // always false
+    return sal_False;       // always false
 }
 
-BOOL ScDPTableData::IsInGroup( const ScDPItemData&, long,
+sal_Bool ScDPTableData::IsInGroup( const ScDPItemData&, long,
                                const ScDPItemData&, long ) const
 {
     DBG_ERROR("IsInGroup shouldn't be called for non-group data");
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDPTableData::HasCommonElement( const ScDPItemData&, long,
+sal_Bool ScDPTableData::HasCommonElement( const ScDPItemData&, long,
                                       const ScDPItemData&, long ) const
 {
     DBG_ERROR("HasCommonElement shouldn't be called for non-group data");
-    return FALSE;
+    return sal_False;
 }
 void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPCacheTable& rCacheTable, 
                                         const CalcInfo& rInfo, CalcRowData& rData)
@@ -191,13 +191,13 @@ void ScDPTableData::ProcessRowData(CalcInfo& rInfo, CalcRowData& rData, bool bAu
         // DataPilot Migration    
     if (!bAutoShow)
     {
-            LateInitParams  aColParams( rInfo.aColDims, rInfo.aColLevels, FALSE );
-            LateInitParams  aRowParams ( rInfo.aRowDims, rInfo.aRowLevels, TRUE );
+            LateInitParams  aColParams( rInfo.aColDims, rInfo.aColLevels, sal_False );
+            LateInitParams  aRowParams ( rInfo.aRowDims, rInfo.aRowLevels, sal_True );
             // root always init child
-            aColParams.SetInitChild( TRUE );
-            aColParams.SetInitAllChildren( FALSE);
-            aRowParams.SetInitChild( TRUE );
-            aRowParams.SetInitAllChildren( FALSE);
+            aColParams.SetInitChild( sal_True );
+            aColParams.SetInitAllChildren( sal_False);
+            aRowParams.SetInitChild( sal_True );
+            aRowParams.SetInitAllChildren( sal_False);
 
             rInfo.pColRoot->LateInitFrom( aColParams, rData.aColData,0, *rInfo.pInitState);
             rInfo.pRowRoot->LateInitFrom( aRowParams, rData.aRowData, 0, *rInfo.pInitState);
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 4f445e899..622c190eb 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -59,15 +59,15 @@ using ::com::sun::star::uno::UNO_QUERY_THROW;
 // -----------------------------------------------------------------------
 namespace 
 {
-    BOOL lcl_isDate( ULONG nNumType )
+    sal_Bool lcl_isDate( sal_uLong nNumType )
     {
         return ( (nNumType & NUMBERFORMAT_DATE) != 0 )? 1:0 ;
     }
 
-    BOOL lcl_Search( const std::vector<ScDPItemData*>& list, const ::std::vector<SCROW>& rOrder, const ScDPItemData& item, SCROW& rIndex)
+    sal_Bool lcl_Search( const std::vector<ScDPItemData*>& list, const ::std::vector<SCROW>& rOrder, const ScDPItemData& item, SCROW& rIndex)
     {
         rIndex = list.size();
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         SCROW nLo = 0;
         SCROW nHi = list.size() - 1;
         SCROW nIndex;
@@ -83,7 +83,7 @@ namespace
                 nHi = nIndex - 1;
                 if (nCompare == 0)
                 {
-                    bFound = TRUE;
+                    bFound = sal_True;
                     nLo = nIndex;
                 }
             }
@@ -107,7 +107,7 @@ namespace
                 {
                     nNumType = NUMBERFORMAT_LOGICAL;
                     fValue  = xRow->getBoolean(nCol) ? 1 : 0;    
-                    return new ScDPItemData( rStr, fValue,TRUE,nNumType);
+                    return new ScDPItemData( rStr, fValue,sal_True,nNumType);
                 }
                 //break;
 
@@ -123,7 +123,7 @@ namespace
                 {
                     //! do the conversion here?
                     fValue = xRow->getDouble(nCol);
-                    return new ScDPItemData( rStr, fValue,TRUE);
+                    return new ScDPItemData( rStr, fValue,sal_True);
                 }
                 //break;
 
@@ -133,7 +133,7 @@ namespace
 
                     util::Date aDate = xRow->getDate(nCol);
                     fValue = Date(aDate.Day, aDate.Month, aDate.Year) - rNullDate;
-                    return new ScDPItemData( rStr, fValue, TRUE, nNumType );
+                    return new ScDPItemData( rStr, fValue, sal_True, nNumType );
                 }
                 //break;
 
@@ -144,7 +144,7 @@ namespace
                     util::Time aTime = xRow->getTime(nCol);
                     fValue = ( aTime.Hours * 3600 + aTime.Minutes * 60 +
                         aTime.Seconds + aTime.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
-                    return new ScDPItemData( rStr,fValue, TRUE, nNumType );
+                    return new ScDPItemData( rStr,fValue, sal_True, nNumType );
                 }
                 //break;
 
@@ -156,7 +156,7 @@ namespace
                     fValue = ( Date( aStamp.Day, aStamp.Month, aStamp.Year ) - rNullDate ) +
                         ( aStamp.Hours * 3600 + aStamp.Minutes * 60 +
                         aStamp.Seconds + aStamp.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
-                    return new ScDPItemData( rStr,fValue, TRUE, nNumType );
+                    return new ScDPItemData( rStr,fValue, sal_True, nNumType );
                 }
                 //break;
             case sdbc::DataType::CHAR:
@@ -183,13 +183,13 @@ namespace
 }
 // Wang Xu Ming -- 12/23/2008
 //Refactor cache data
-ScDPItemData::ScDPItemData( const String& rS, double fV/* = 0.0*/, BOOL bHV/* = FALSE*/, const ULONG nNumFormatP /*= 0*/ , BOOL bData/* = TRUE*/) :
+ScDPItemData::ScDPItemData( const String& rS, double fV/* = 0.0*/, sal_Bool bHV/* = sal_False*/, const sal_uLong nNumFormatP /*= 0*/ , sal_Bool bData/* = sal_True*/) :
 nNumFormat( nNumFormatP ), aString(rS), fValue(fV),
-mbFlag( (MK_VAL*!!bHV) | (MK_DATA*!!bData) | (MK_ERR*!!FALSE) | (MK_DATE*!!lcl_isDate( nNumFormat ) ) )
+mbFlag( (MK_VAL*!!bHV) | (MK_DATA*!!bData) | (MK_ERR*!!sal_False) | (MK_DATE*!!lcl_isDate( nNumFormat ) ) )
 { 
 }
 
-ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab  ):
+ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, sal_uInt16 nCol, sal_uInt16 nDocTab  ):
         nNumFormat( 0 ), fValue(0.0), mbFlag( 0 )
 {
     String aDocStr;
@@ -203,13 +203,13 @@ ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nD
     if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell)->GetErrCode() )
     {
         SetString ( aDocStr );      //[SODC_19347] add liyi
-        //bErr = TRUE;              //[SODC_19347] del liyi
+        //bErr = sal_True;              //[SODC_19347] del liyi
         mbFlag |= MK_ERR;
     }
     else if ( pDoc->HasValueData( nCol, nRow, nDocTab ) )
     {
         double fVal = pDoc->GetValue(ScAddress(nCol, nRow, nDocTab));
-        ULONG nFormat = NUMBERFORMAT_NUMBER;
+        sal_uLong nFormat = NUMBERFORMAT_NUMBER;
         if ( pFormatter )
             nFormat = pFormatter->GetType( pDoc->GetNumberFormat( ScAddress( nCol, nRow, nDocTab ) ) );
         aString = aDocStr;
@@ -223,7 +223,7 @@ ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nD
 }
 // End Comments
 
-BOOL ScDPItemData::IsCaseInsEqual( const ScDPItemData& r ) const
+sal_Bool ScDPItemData::IsCaseInsEqual( const ScDPItemData& r ) const
 { //TODO: indified Date?
     //! pass Transliteration?
     //!	inline?
@@ -242,27 +242,27 @@ size_t ScDPItemData::Hash() const
         return rtl_ustr_hashCode_WithLength( aString.GetBuffer(), aString.Len() );
 }
 
-BOOL ScDPItemData::operator==( const ScDPItemData& r ) const
+sal_Bool ScDPItemData::operator==( const ScDPItemData& r ) const
 {
     if ( IsValue() )
     {
         if( (HasDatePart() != r.HasDatePart())  || (HasDatePart() && mnDatePart != r.mnDatePart) )
-            return FALSE;
+            return sal_False;
 
 // Wang Xu Ming -- 1/9/2009
 // Add Data Cache Support.
 // Identify date
         if ( IsDate() != r.IsDate() )
-            return FALSE;
+            return sal_False;
       else 
         if ( r.IsValue() )
             return rtl::math::approxEqual( fValue, r.fValue );
         else
-            return FALSE;
+            return sal_False;
 // End Comments
     }
     else if ( r.IsValue() )
-        return FALSE;
+        return sal_False;
     else
         // need exact equality until we have a safe case insensitive string hash
         return aString == r.aString;
@@ -334,17 +334,17 @@ sal_uInt8 ScDPItemData::GetType() const
 
 }
 
-BOOL ScDPItemData::IsHasData() const 
+sal_Bool ScDPItemData::IsHasData() const 
 {
     return !!(mbFlag&MK_DATA);
 }
 
-BOOL ScDPItemData::IsHasErr() const 
+sal_Bool ScDPItemData::IsHasErr() const 
 { 
     return !!(mbFlag&MK_ERR); 
 }
 
-BOOL ScDPItemData::IsValue() const 
+sal_Bool ScDPItemData::IsValue() const 
 { 
     return !!(mbFlag&MK_VAL);
 }
@@ -359,25 +359,25 @@ double ScDPItemData::GetValue() const
 { 
     return fValue;
 }
-ULONG  ScDPItemData::GetNumFormat() const 
+sal_uLong  ScDPItemData::GetNumFormat() const 
 { 
     return nNumFormat;
 }
 
-BOOL ScDPItemData::HasStringData() const 
+sal_Bool ScDPItemData::HasStringData() const 
 
 { 
     return IsHasData()&&!IsHasErr()&&!IsValue();
 }
-BOOL ScDPItemData::IsDate() const
+sal_Bool ScDPItemData::IsDate() const
 { 
     return !!(mbFlag&MK_DATE); 
 }
-BOOL ScDPItemData::HasDatePart() const
+sal_Bool ScDPItemData::HasDatePart() const
 {
     return !!(mbFlag&MK_DATEPART); 
 }
-void ScDPItemData::SetDate( BOOL b ) 
+void ScDPItemData::SetDate( sal_Bool b ) 
 {
     b ? ( mbFlag |= MK_DATE ) : ( mbFlag &= ~MK_DATE ); 
 }
@@ -386,17 +386,17 @@ void ScDPItemData::SetDate( BOOL b )
 //class ScDPTableDataCache
 //To cache the pivot table data source
 
-BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const
+sal_Bool ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const
 {
     if ( GetColumnCount() == r.GetColumnCount() )
     {
         for ( SCCOL i = 0 ; i < GetColumnCount(); i++ )
         {	//check dim names
             if ( GetDimensionName( i ) != r.GetDimensionName( i ) )
-                return FALSE;
+                return sal_False;
             //check rows count
             if ( GetRowCount() != r.GetRowCount() )
-                return FALSE;
+                return sal_False;
             //check dim member values
             size_t nMembersCount = GetDimMemberValues( i ).size();
             if ( GetDimMemberValues( i ).size() == r. GetDimMemberValues( i ).size() )
@@ -406,22 +406,22 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const
                     if ( *( GetDimMemberValues( i )[j] ) == *( r.GetDimMemberValues( i )[j] ) )
                         continue;
                     else 
-                        return FALSE;
+                        return sal_False;
                 }
             }
             else 
-                return FALSE;		
+                return sal_False;		
             //check source table index
             for ( SCROW k=0 ; k < GetRowCount(); k ++ )
             {
-                if ( GetItemDataId( i, k, FALSE ) == r.GetItemDataId( i,k,FALSE) )
+                if ( GetItemDataId( i, k, sal_False ) == r.GetItemDataId( i,k,sal_False) )
                     continue;
                 else
-                    return FALSE;
+                    return sal_False;
             }				
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 ScDPTableDataCache::ScDPTableDataCache(  ScDocument* pDoc  ) :
@@ -441,10 +441,10 @@ ScDPTableDataCache::~ScDPTableDataCache()
     {
 // Wang Xu Ming -- 2/17/2009
 // Performance issue
-        USHORT nCol;
+        sal_uInt16 nCol;
         for (  nCol=0; nCol < GetColumnCount() ; nCol++ )
         {
-            for ( ULONG row = 0 ;  row < mpTableDataValues[nCol].size(); row++ )
+            for ( sal_uLong row = 0 ;  row < mpTableDataValues[nCol].size(); row++ )
                 delete mpTableDataValues[nCol][row];
         }
         for ( nCol =0; nCol < mrLabelNames.size(); nCol++ )		
@@ -464,7 +464,7 @@ ScDPTableDataCache::~ScDPTableDataCache()
 }
 
 // -----------------------------------------------------------------------
-void ScDPTableDataCache::AddRow( ScDPItemData* pRow, USHORT nCount )
+void ScDPTableDataCache::AddRow( ScDPItemData* pRow, sal_uInt16 nCount )
 { 
     DBG_ASSERT( pRow , " empty pointer" );
     if ( !mrLabelNames.size() )
@@ -475,12 +475,12 @@ void ScDPTableDataCache::AddRow( ScDPItemData* pRow, USHORT nCount )
         mpGlobalOrder	  = new	std::vector<SCROW>[ mnColumnCount ];
         mpIndexOrder	  = new std::vector<SCROW>[ mnColumnCount ];
 
-        for ( USHORT i = 0; i < nCount ; i ++ )
+        for ( sal_uInt16 i = 0; i < nCount ; i ++ )
             AddLabel( new ScDPItemData( pRow[i] ) );
     }
     else
     {
-        for ( USHORT i = 0; i < nCount && i < mnColumnCount; i ++ )
+        for ( sal_uInt16 i = 0; i < nCount && i < mnColumnCount; i ++ )
             AddData( i, new ScDPItemData( pRow[i] ) );
     }
 }
@@ -529,18 +529,18 @@ bool ScDPTableDataCache::InitFromDoc(  ScDocument* pDoc, const ScRange& rRange )
     //
     SCROW nStartRow = rRange.aStart.Row();	// start of data
     SCROW nEndRow = rRange.aEnd.Row();
-    USHORT nStartCol = rRange.aStart.Col();
-    USHORT nEndCol = rRange.aEnd.Col();
-    USHORT nDocTab = rRange.aStart.Tab();
+    sal_uInt16 nStartCol = rRange.aStart.Col();
+    sal_uInt16 nEndCol = rRange.aEnd.Col();
+    sal_uInt16 nDocTab = rRange.aStart.Tab();
         
     //init 
      long nOldColumCount = mnColumnCount;
     mnColumnCount = nEndCol - nStartCol + 1;
     if ( IsValid() )
     {
-        for ( USHORT nCol=0; nCol < nOldColumCount ; nCol++ )
+        for ( sal_uInt16 nCol=0; nCol < nOldColumCount ; nCol++ )
         {
-            for ( ULONG row = 0 ;  row < mpTableDataValues[nCol].size(); row++ )
+            for ( sal_uLong row = 0 ;  row < mpTableDataValues[nCol].size(); row++ )
                 delete mpTableDataValues[nCol][row];
             delete mrLabelNames[nCol];
         }
@@ -558,7 +558,7 @@ bool ScDPTableDataCache::InitFromDoc(  ScDocument* pDoc, const ScRange& rRange )
     //check valid
     for ( SCROW nRow = nStartRow; nRow <= nEndRow; nRow ++ )
     {
-        for ( USHORT nCol = nStartCol; nCol <= nEndCol; nCol++ )
+        for ( sal_uInt16 nCol = nStartCol; nCol <= nEndCol; nCol++ )
         {
             if ( nRow == nStartRow )
                 AddLabel( new ScDPItemData( pDoc, nRow, nCol, nDocTab  ) );
@@ -566,7 +566,7 @@ bool ScDPTableDataCache::InitFromDoc(  ScDocument* pDoc, const ScRange& rRange )
                 AddData( nCol - nStartCol, new ScDPItemData( pDoc, nRow, nCol, nDocTab  ) );
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -586,9 +586,9 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS
     mnColumnCount = xMeta->getColumnCount();
     if ( IsValid() )
     {
-        for ( USHORT nCol=0; nCol < nOldColumCount ; nCol++ )
+        for ( sal_uInt16 nCol=0; nCol < nOldColumCount ; nCol++ )
         {
-            for ( ULONG row = 0 ;  row < mpTableDataValues[nCol].size(); row++ )
+            for ( sal_uLong row = 0 ;  row < mpTableDataValues[nCol].size(); row++ )
                 delete mpTableDataValues[nCol][row];
             delete mrLabelNames[nCol];
         }
@@ -638,7 +638,7 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS
     }
 }
 // -----------------------------------------------------------------------
-ULONG ScDPTableDataCache::GetDimNumType( SCCOL nDim) const
+sal_uLong ScDPTableDataCache::GetDimNumType( SCCOL nDim) const
 {
     DBG_ASSERT( IsValid(), "  IsValid() == false " );
     DBG_ASSERT( nDim < mnColumnCount && nDim >=0, " dimention out of bound " );
@@ -649,20 +649,20 @@ ULONG ScDPTableDataCache::GetDimNumType( SCCOL nDim) const
 }
 
 // -----------------------------------------------------------------------
-bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOOL *pSpecial) 
+bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, sal_Bool *pSpecial) 
 { //Copied and modified from ScTable::ValidQuery
         if (!rParam.GetEntry(0).bDoQuery)
-            return TRUE;
-        BOOL	bMatchWholeCell = mpDoc->GetDocOptions().IsMatchWholeCell();
+            return sal_True;
+        sal_Bool	bMatchWholeCell = mpDoc->GetDocOptions().IsMatchWholeCell();
     
         //---------------------------------------------------------------
 
         const SCSIZE nFixedBools = 32;
-        BOOL aBool[nFixedBools];
-        BOOL aTest[nFixedBools];
+        sal_Bool aBool[nFixedBools];
+        sal_Bool aTest[nFixedBools];
         SCSIZE nEntryCount = rParam.GetEntryCount();
-        BOOL* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new BOOL[nEntryCount] );
-        BOOL* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new BOOL[nEntryCount] );
+        sal_Bool* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new sal_Bool[nEntryCount] );
+        sal_Bool* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new sal_Bool[nEntryCount] );
 
         long	nPos = -1;
         SCSIZE	i	 = 0;
@@ -682,11 +682,11 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO
             if ( nQueryCol > rParam.nCol2 )
                 nQueryCol = rParam.nCol2;
             SCCOL nSourceField = nQueryCol - rParam.nCol1;
-            SCROW nId = GetItemDataId( nSourceField, nRow, FALSE ); 
+            SCROW nId = GetItemDataId( nSourceField, nRow, sal_False ); 
             const ScDPItemData* pCellData = GetItemDataById( nSourceField, nId ); 
 
-            BOOL bOk = FALSE;
-            BOOL bTestEqual = FALSE;
+            sal_Bool bOk = sal_False;
+            sal_Bool bTestEqual = sal_False;
 
             if ( pSpecial && pSpecial[i] )
             {
@@ -720,7 +720,7 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO
                         bOk = !::rtl::math::approxEqual( nCellVal, rEntry.nVal );
                         break;
                                  default:
-                                    bOk= FALSE;
+                                    bOk= sal_False;
                                     break;
                 }
             }
@@ -731,19 +731,19 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO
             {	// by String
                 String	aCellStr = pCellData->GetString();
 
-                BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
+                sal_Bool bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
                     || (rEntry.eOp == SC_NOT_EQUAL)));
-                BOOL bTestRegExp = FALSE;
+                sal_Bool bTestRegExp = sal_False;
                 if ( bRealRegExp || bTestRegExp )
                 {
                     xub_StrLen nStart = 0;
                     xub_StrLen nEnd   = aCellStr.Len();
-                    BOOL bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens )
+                    sal_Bool bMatch = (sal_Bool) rEntry.GetSearchTextPtr( rParam.bCaseSens )
                         ->SearchFrwrd( aCellStr, &nStart, &nEnd );
                     // from 614 on, nEnd is behind the found text
                     if ( bMatch && bMatchWholeCell
                             && (nStart != 0 || nEnd != aCellStr.Len()) )
-                        bMatch = FALSE;    // RegExp must match entire cell string
+                        bMatch = sal_False;    // RegExp must match entire cell string
                     if ( bRealRegExp )
                         bOk = ((rEntry.eOp == SC_NOT_EQUAL) ? !bMatch : bMatch);
                     else
@@ -768,7 +768,7 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO
                             {
                                 for(i=0;(i<nIndex) && (i< aCellStr.Len()) ; i++)
                                 {
-                                    if(aCellStr.GetChar( (USHORT)i ) == aStr.GetChar((USHORT) i ))
+                                    if(aCellStr.GetChar( (sal_uInt16)i ) == aStr.GetChar((sal_uInt16) i ))
                                     {
                                         bOk=1;
                                     }
@@ -857,7 +857,7 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO
             pTest[0] = pTest[0] || pTest[j];
         }
 
-        BOOL bRet = pPasst[0];
+        sal_Bool bRet = pPasst[0];
         if ( pPasst != &aBool[0] )
             delete [] pPasst;
         if ( pTest != &aTest[0] )
@@ -874,18 +874,18 @@ bool ScDPTableDataCache::IsRowEmpty( SCROW nRow ) const
 }
 
 // -----------------------------------------------------------------------
-bool ScDPTableDataCache::IsEmptyMember( SCROW nRow, USHORT nColumn ) const
+bool ScDPTableDataCache::IsEmptyMember( SCROW nRow, sal_uInt16 nColumn ) const
 {
-    return !GetItemDataById( nColumn, GetItemDataId( nColumn, nRow, FALSE ) )->IsHasData();
+    return !GetItemDataById( nColumn, GetItemDataId( nColumn, nRow, sal_False ) )->IsHasData();
 }
 
-BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
+sal_Bool ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
 {
     DBG_ASSERT( IsValid(), "  IsValid() == false " );
     DBG_ASSERT( nDim < mnColumnCount && nDim >=0 , "dimension out of bound" );
     SCROW nIndex = 0; 
 
-    BOOL	bInserted = FALSE;
+    sal_Bool	bInserted = sal_False;
     
     pitemData->SetDate( lcl_isDate( GetNumType( pitemData->nNumFormat ) ) );
 
@@ -895,7 +895,7 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
         mpGlobalOrder[nDim].insert( mpGlobalOrder[nDim].begin()+nIndex, mpTableDataValues[nDim].size()-1  );
         DBG_ASSERT( (size_t) mpGlobalOrder[nDim][nIndex] == mpTableDataValues[nDim].size()-1 ,"ScDPTableDataCache::AddData ");
         mpSourceData[nDim].push_back( mpTableDataValues[nDim].size()-1 );
-        bInserted = TRUE;
+        bInserted = sal_True;
     }
     else
         mpSourceData[nDim].push_back( mpGlobalOrder[nDim][nIndex] );
@@ -903,22 +903,22 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
     size_t  nCurRow = mpSourceData[nDim].size() -1 ;
 
     while ( mbEmptyRow.size() <= nCurRow )
-        mbEmptyRow.push_back( TRUE );
+        mbEmptyRow.push_back( sal_True );
 
     if ( pitemData->IsHasData() )
-        mbEmptyRow[ nCurRow ] = FALSE;
+        mbEmptyRow[ nCurRow ] = sal_False;
 
     if ( !bInserted ) 
         delete pitemData;
 
-    return TRUE;
+    return sal_True;
 }
 
 
-String ScDPTableDataCache::GetDimensionName( USHORT nColumn ) const
+String ScDPTableDataCache::GetDimensionName( sal_uInt16 nColumn ) const
 {
     DBG_ASSERT( /* nColumn>=0 && */ nColumn < mrLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName");
-    DBG_ASSERT( mrLabelNames.size() == static_cast <USHORT> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName");
+    DBG_ASSERT( mrLabelNames.size() == static_cast <sal_uInt16> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName");
     if ( static_cast<size_t>(nColumn+1) < mrLabelNames.size() )
     { 
         return mrLabelNames[nColumn+1]->aString;
@@ -937,7 +937,7 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData)
 
     //reset name if needed
     String strNewName = pData->aString;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     long nIndex = 1;
     do
     {
@@ -948,7 +948,7 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData)
                 strNewName  =  pData->aString;
                 strNewName += String::CreateFromInt32( nIndex );
                 nIndex ++ ;
-                bFound = TRUE;
+                bFound = sal_True;
             }
         }
         bFound = !bFound;
@@ -959,7 +959,7 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData)
     mrLabelNames.push_back( pData );  
 }
 
-SCROW ScDPTableDataCache::GetItemDataId(USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty) const
+SCROW ScDPTableDataCache::GetItemDataId(sal_uInt16 nDim, SCROW nRow, sal_Bool bRepeatIfEmpty) const
 { //
     DBG_ASSERT( IsValid(), "  IsValid() == false " );
     DBG_ASSERT( /* nDim >= 0 && */ nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId " );
@@ -1007,16 +1007,16 @@ SCROW ScDPTableDataCache::GetSortedItemDataId(SCCOL nDim, SCROW nOrder) const
     return mpGlobalOrder[nDim][nOrder];
 }
 
-ULONG ScDPTableDataCache::GetNumType(ULONG nFormat) const
+sal_uLong ScDPTableDataCache::GetNumType(sal_uLong nFormat) const
 {
     SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
-    ULONG nType = NUMBERFORMAT_NUMBER;
+    sal_uLong nType = NUMBERFORMAT_NUMBER;
     if ( pFormatter )
         nType = pFormatter->GetType( nFormat );
     return nType;
 }
 
-ULONG ScDPTableDataCache::GetNumberFormat( long nDim ) const
+sal_uLong ScDPTableDataCache::GetNumberFormat( long nDim ) const
 {
     if ( nDim >= mnColumnCount )
         return 0;
@@ -1026,7 +1026,7 @@ ULONG ScDPTableDataCache::GetNumberFormat( long nDim ) const
         return mpTableDataValues[nDim][0]->nNumFormat;
 }
 
-BOOL ScDPTableDataCache::IsDateDimension( long nDim ) const 
+sal_Bool ScDPTableDataCache::IsDateDimension( long nDim ) const 
 {
     if ( nDim >= mnColumnCount )
         return false;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index aef7a8c7c..cc207117a 100755..100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -72,7 +72,7 @@ SV_IMPL_PTRARR( ScDPDataMembers, ScDPDataMemberPtr );
 
 // -----------------------------------------------------------------------
 
-static USHORT nFuncStrIds[12] =		// passend zum enum ScSubTotalFunc
+static sal_uInt16 nFuncStrIds[12] =		// passend zum enum ScSubTotalFunc
 {
     0,								// SUBTOTAL_FUNC_NONE
     STR_FUN_TEXT_AVG,				// SUBTOTAL_FUNC_AVE
@@ -99,10 +99,10 @@ namespace {
         }
         vec.resize( nSize, NULL );
     }
-    BOOL lcl_SearchMember( const std::vector <ScDPResultMember *>& list, SCROW nOrder, SCROW& rIndex)
+    sal_Bool lcl_SearchMember( const std::vector <ScDPResultMember *>& list, SCROW nOrder, SCROW& rIndex)
     {
         rIndex = list.size();
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         SCROW  nLo = 0;
         SCROW nHi = list.size() - 1;
         SCROW nIndex;
@@ -116,7 +116,7 @@ namespace {
                 nHi = nIndex - 1;
                 if ( list[nIndex]->GetOrder() == nOrder )
                 {
-                    bFound = TRUE;
+                    bFound = sal_True;
                     nLo = nIndex;
                 }
             }
@@ -135,37 +135,37 @@ class ScDPRowMembersOrder
 {
     ScDPResultDimension& rDimension;
     long                 nMeasure;
-    BOOL                 bAscending;
+    sal_Bool                 bAscending;
 
 public:
-            ScDPRowMembersOrder( ScDPResultDimension& rDim, long nM, BOOL bAsc ) :
+            ScDPRowMembersOrder( ScDPResultDimension& rDim, long nM, sal_Bool bAsc ) :
                 rDimension(rDim),
                 nMeasure(nM),
                 bAscending(bAsc)
             {}
             ~ScDPRowMembersOrder() {}
 
-    BOOL operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
+    sal_Bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
 };
 
 class ScDPColMembersOrder
 {
     ScDPDataDimension& rDimension;
     long               nMeasure;
-    BOOL               bAscending;
+    sal_Bool               bAscending;
 
 public:
-            ScDPColMembersOrder( ScDPDataDimension& rDim, long nM, BOOL bAsc ) :
+            ScDPColMembersOrder( ScDPDataDimension& rDim, long nM, sal_Bool bAsc ) :
                 rDimension(rDim),
                 nMeasure(nM),
                 bAscending(bAsc)
             {}
             ~ScDPColMembersOrder() {}
 
-    BOOL operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
+    sal_Bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
 };
 
-static BOOL lcl_IsLess( const ScDPDataMember* pDataMember1, const ScDPDataMember* pDataMember2, long nMeasure, BOOL bAscending )
+static sal_Bool lcl_IsLess( const ScDPDataMember* pDataMember1, const ScDPDataMember* pDataMember2, long nMeasure, sal_Bool bAscending )
 {
     // members can be NULL if used for rows
 
@@ -173,17 +173,17 @@ static BOOL lcl_IsLess( const ScDPDataMember* pDataMember1, const ScDPDataMember
     const ScDPAggData* pAgg1 = pDataMember1 ? pDataMember1->GetConstAggData( nMeasure, aEmptyState ) : NULL;
     const ScDPAggData* pAgg2 = pDataMember2 ? pDataMember2->GetConstAggData( nMeasure, aEmptyState ) : NULL;
 
-    BOOL bError1 = pAgg1 && pAgg1->HasError();
-    BOOL bError2 = pAgg2 && pAgg2->HasError();
+    sal_Bool bError1 = pAgg1 && pAgg1->HasError();
+    sal_Bool bError2 = pAgg2 && pAgg2->HasError();
     if ( bError1 )
     {
         if ( bError2 )
-            return FALSE;       // equal
+            return sal_False;       // equal
         else
-            return FALSE;       // errors are always sorted at the end
+            return sal_False;       // errors are always sorted at the end
     }
     else if ( bError2 )
-        return TRUE;            // errors are always sorted at the end
+        return sal_True;            // errors are always sorted at the end
     else
     {
         double fVal1 = ( pAgg1 && pAgg1->HasData() ) ? pAgg1->GetResult() : 0.0;    // no data is sorted as 0
@@ -196,7 +196,7 @@ static BOOL lcl_IsLess( const ScDPDataMember* pDataMember1, const ScDPDataMember
     }
 }
 
-static BOOL lcl_IsEqual( const ScDPDataMember* pDataMember1, const ScDPDataMember* pDataMember2, long nMeasure )
+static sal_Bool lcl_IsEqual( const ScDPDataMember* pDataMember1, const ScDPDataMember* pDataMember2, long nMeasure )
 {
     // members can be NULL if used for rows
 
@@ -204,17 +204,17 @@ static BOOL lcl_IsEqual( const ScDPDataMember* pDataMember1, const ScDPDataMembe
     const ScDPAggData* pAgg1 = pDataMember1 ? pDataMember1->GetConstAggData( nMeasure, aEmptyState ) : NULL;
     const ScDPAggData* pAgg2 = pDataMember2 ? pDataMember2->GetConstAggData( nMeasure, aEmptyState ) : NULL;
 
-    BOOL bError1 = pAgg1 && pAgg1->HasError();
-    BOOL bError2 = pAgg2 && pAgg2->HasError();
+    sal_Bool bError1 = pAgg1 && pAgg1->HasError();
+    sal_Bool bError2 = pAgg2 && pAgg2->HasError();
     if ( bError1 )
     {
         if ( bError2 )
-            return TRUE;        // equal
+            return sal_True;        // equal
         else
-            return FALSE;
+            return sal_False;
     }
     else if ( bError2 )
-        return FALSE;
+        return sal_False;
     else
     {
         double fVal1 = ( pAgg1 && pAgg1->HasData() ) ? pAgg1->GetResult() : 0.0;    // no data is sorted as 0
@@ -227,7 +227,7 @@ static BOOL lcl_IsEqual( const ScDPDataMember* pDataMember1, const ScDPDataMembe
     }
 }
 
-BOOL ScDPRowMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
+sal_Bool ScDPRowMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
 {
     const ScDPResultMember* pMember1 = rDimension.GetMember(nIndex1);
     const ScDPResultMember* pMember2 = rDimension.GetMember(nIndex2);
@@ -240,17 +240,17 @@ BOOL ScDPRowMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) con
     const ScDPDataMember* pDataMember2 =  pMember2->GetDataRoot();
 // End Comments
     //  GetDataRoot can be NULL if there was no data.
-    //  IsVisible == FALSE can happen after AutoShow.
+    //  IsVisible == sal_False can happen after AutoShow.
     return lcl_IsLess( pDataMember1, pDataMember2, nMeasure, bAscending );
 }
 
-BOOL ScDPColMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
+sal_Bool ScDPColMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
 {
     ScDPDataMember* pDataMember1 = rDimension.GetMember(nIndex1);
     ScDPDataMember* pDataMember2 = rDimension.GetMember(nIndex2);
     // Wang Xu Ming -- 2009-6-17
-        BOOL bHide1 = pDataMember1 && !pDataMember1->IsVisible();
-        BOOL bHide2 =  pDataMember2 && !pDataMember2->IsVisible();
+        sal_Bool bHide1 = pDataMember1 && !pDataMember1->IsVisible();
+        sal_Bool bHide2 =  pDataMember2 && !pDataMember2->IsVisible();
         if ( bHide1 || bHide2 )
             return !bHide1;
     // End Comments
@@ -510,7 +510,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub
 
     //	check the error conditions for the selected function
 
-    BOOL bError = FALSE;
+    sal_Bool bError = sal_False;
     switch (eFunc)
     {
         case SUBTOTAL_FUNC_SUM:
@@ -585,7 +585,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub
         }
     }
 
-    BOOL bEmpty = ( nCount == 0 );			// no data
+    sal_Bool bEmpty = ( nCount == 0 );			// no data
 
     //	store the result
     //	Empty is checked first, so empty results are shown empty even for "average" etc.
@@ -608,7 +608,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub
     fAux = 0.0;				// used for running total or original result of reference value
 }
 
-BOOL ScDPAggData::IsCalculated() const
+sal_Bool ScDPAggData::IsCalculated() const
 {
     return ( nCount <= SC_DPAGG_RESULT_EMPTY );
 }
@@ -620,14 +620,14 @@ double ScDPAggData::GetResult() const
     return fVal;        // use calculated value
 }
 
-BOOL ScDPAggData::HasError() const
+sal_Bool ScDPAggData::HasError() const
 {
     DBG_ASSERT( IsCalculated(), "ScDPAggData not calculated" );
 
     return ( nCount == SC_DPAGG_RESULT_ERROR );
 }
 
-BOOL ScDPAggData::HasData() const
+sal_Bool ScDPAggData::HasData() const
 {
     DBG_ASSERT( IsCalculated(), "ScDPAggData not calculated" );
 
@@ -648,7 +648,7 @@ void ScDPAggData::SetError()
     nCount = SC_DPAGG_RESULT_ERROR;
 }
 
-void ScDPAggData::SetEmpty( BOOL bSet )
+void ScDPAggData::SetEmpty( sal_Bool bSet )
 {
     DBG_ASSERT( IsCalculated(), "ScDPAggData not calculated" );
 
@@ -693,7 +693,7 @@ void ScDPAggData::Reset()
 // -----------------------------------------------------------------------
 
 ScDPRowTotals::ScDPRowTotals() :
-    bIsInColRoot( FALSE )
+    bIsInColRoot( sal_False )
 {
 }
 
@@ -772,9 +772,9 @@ ScDPResultData::ScDPResultData( ScDPSource* pSrc ) :		//! Ref
     pMeasRefs( NULL ),
     pMeasRefOrient( NULL ),
     pMeasNames( NULL ),
-    bLateInit( FALSE ),
-    bDataAtCol( FALSE ),
-    bDataAtRow( FALSE )
+    bLateInit( sal_False ),
+    bDataAtCol( sal_False ),
+    bDataAtRow( sal_False )
 {
 
     lcl_ResizePointVector( mpDimMembers , SC_DAPI_MAXFIELDS );
@@ -791,7 +791,7 @@ ScDPResultData::~ScDPResultData()
 }
 
 void ScDPResultData::SetMeasureData( long nCount, const ScSubTotalFunc* pFunctions,
-                                    const sheet::DataPilotFieldReference* pRefs, const USHORT* pRefOrient,
+                                    const sheet::DataPilotFieldReference* pRefs, const sal_uInt16* pRefOrient,
                                     const String* pNames )
 {
     delete[] pMeasFuncs;
@@ -803,7 +803,7 @@ void ScDPResultData::SetMeasureData( long nCount, const ScSubTotalFunc* pFunctio
         nMeasCount = nCount;
         pMeasFuncs = new ScSubTotalFunc[nCount];
         pMeasRefs  = new sheet::DataPilotFieldReference[nCount];
-        pMeasRefOrient = new USHORT[nCount];
+        pMeasRefOrient = new sal_uInt16[nCount];
         pMeasNames = new String[nCount];
         for (long i=0; i<nCount; i++)
         {
@@ -820,20 +820,20 @@ void ScDPResultData::SetMeasureData( long nCount, const ScSubTotalFunc* pFunctio
         pMeasFuncs = new ScSubTotalFunc[1];
         pMeasFuncs[0] = SUBTOTAL_FUNC_NONE;
         pMeasRefs  = new sheet::DataPilotFieldReference[1];	// default ctor is ok
-        pMeasRefOrient = new USHORT[1];
+        pMeasRefOrient = new sal_uInt16[1];
         pMeasRefOrient[0] = sheet::DataPilotFieldOrientation_HIDDEN;
         pMeasNames = new String[1];
         pMeasNames[0] = ScGlobal::GetRscString( STR_EMPTYDATA );
     }
 }
 
-void ScDPResultData::SetDataLayoutOrientation( USHORT nOrient )
+void ScDPResultData::SetDataLayoutOrientation( sal_uInt16 nOrient )
 {
     bDataAtCol = ( nOrient == sheet::DataPilotFieldOrientation_COLUMN );
     bDataAtRow = ( nOrient == sheet::DataPilotFieldOrientation_ROW );
 }
 
-void ScDPResultData::SetLateInit( BOOL bSet )
+void ScDPResultData::SetLateInit( sal_Bool bSet )
 {
     bLateInit = bSet;
 }
@@ -862,15 +862,15 @@ const sheet::DataPilotFieldReference& ScDPResultData::GetMeasureRefVal(long nMea
     return pMeasRefs[nMeasure];
 }
 
-USHORT ScDPResultData::GetMeasureRefOrient(long nMeasure) const
+sal_uInt16 ScDPResultData::GetMeasureRefOrient(long nMeasure) const
 {
     DBG_ASSERT( pMeasRefOrient && nMeasure < nMeasCount, "bumm" );
     return pMeasRefOrient[nMeasure];
 }
 
-String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const
+String ScDPResultData::GetMeasureString(long nMeasure, sal_Bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const
 {
-    //	with bForce==TRUE, return function instead of "result" for single measure
+    //	with bForce==sal_True, return function instead of "result" for single measure
     //	with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc
     rbTotalResult = false;
     if ( nMeasure < 0 || ( nMeasCount == 1 && !bForce && eForceFunc == SUBTOTAL_FUNC_NONE ) )
@@ -896,7 +896,7 @@ String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFu
         String aRet;
         ScSubTotalFunc eFunc = ( eForceFunc == SUBTOTAL_FUNC_NONE ) ?
                                     GetMeasureFunction(nMeasure) : eForceFunc;
-        USHORT nId = nFuncStrIds[eFunc];
+        sal_uInt16 nId = nFuncStrIds[eFunc];
         if (nId)
         {
             aRet += ScGlobal::GetRscString(nId);		// function name
@@ -919,7 +919,7 @@ String ScDPResultData::GetMeasureDimensionName(long nMeasure) const
     return pSource->GetDataDimName( nMeasure );
 }
 
-BOOL ScDPResultData::IsBaseForGroup( long nDim ) const
+sal_Bool ScDPResultData::IsBaseForGroup( long nDim ) const
 {
     return pSource->GetData()->IsBaseForGroup( nDim );
 }
@@ -929,38 +929,38 @@ long ScDPResultData::GetGroupBase( long nGroupDim ) const
     return pSource->GetData()->GetGroupBase( nGroupDim );
 }
 
-BOOL ScDPResultData::IsNumOrDateGroup( long nDim ) const
+sal_Bool ScDPResultData::IsNumOrDateGroup( long nDim ) const
 {
     return pSource->GetData()->IsNumOrDateGroup( nDim );
 }
 
-BOOL ScDPResultData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+sal_Bool ScDPResultData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
                                 long nBaseDataId, long nBaseIndex ) const
 {
     const ScDPItemData* pData = pSource->GetItemDataById( nGroupIndex , nBaseDataId);
     if ( pData )
          return pSource->GetData()->IsInGroup( rGroupData, nGroupIndex, *pData , nBaseIndex );
     else 
-        return FALSE;
+        return sal_False;
 }
-BOOL ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex,
+sal_Bool ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex,
                                                                const ScDPItemData& rBaseData, long nBaseIndex ) const
 {
     const ScDPItemData* pGroupData = pSource->GetItemDataById( nGroupIndex , nGroupDataId);
     if ( pGroupData )
         return pSource->GetData()->IsInGroup( *pGroupData, nGroupIndex, rBaseData , nBaseIndex );
     else 
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScDPResultData::HasCommonElement(/* const ScDPItemData& rFirstData*/SCROW nFirstDataId, long nFirstIndex,
+sal_Bool ScDPResultData::HasCommonElement(/* const ScDPItemData& rFirstData*/SCROW nFirstDataId, long nFirstIndex,
                                        const ScDPItemData& rSecondData, long nSecondIndex ) const
 {
     const ScDPItemData* pFirstData = pSource->GetItemDataById( nFirstIndex , nFirstDataId);
     if ( pFirstData )
         return pSource->GetData()->HasCommonElement( *pFirstData, nFirstIndex, rSecondData, nSecondIndex );
     else
-        return FALSE;
+        return sal_False;
 }
 
 const ScDPSource* ScDPResultData::GetSource() const
@@ -1002,31 +1002,31 @@ ResultMembers* ScDPResultData::GetDimResultMembers( long nDim ,  ScDPDimension*
 
 
 ScDPResultMember::ScDPResultMember(  const ScDPResultData* pData, const ScDPParentDimData& rParentDimData ,
-                                    BOOL bForceSub ) :
+                                    sal_Bool bForceSub ) :
     pResultData( pData ),
        aParentDimData( rParentDimData ),
     pChildDimension( NULL ),
     pDataRoot( NULL ),
-    bHasElements( FALSE ),
+    bHasElements( sal_False ),
     bForceSubTotal( bForceSub ),
-    bHasHiddenDetails( FALSE ),
-    bInitialized( FALSE ),
-    bAutoHidden( FALSE ),
+    bHasHiddenDetails( sal_False ),
+    bInitialized( sal_False ),
+    bAutoHidden( sal_False ),
     nMemberStep( 1 )
 {
     // pParentLevel/pMemberDesc is 0 for root members
 }
 
 ScDPResultMember::ScDPResultMember(  const ScDPResultData* pData, 
-                                    BOOL bForceSub ) :
+                                    sal_Bool bForceSub ) :
     pResultData( pData ),
         pChildDimension( NULL ),
     pDataRoot( NULL ),
-    bHasElements( FALSE ),
+    bHasElements( sal_False ),
     bForceSubTotal( bForceSub ),
-    bHasHiddenDetails( FALSE ),
-    bInitialized( FALSE ),
-    bAutoHidden( FALSE ),
+    bHasHiddenDetails( sal_False ),
+    bInitialized( sal_False ),
+    bAutoHidden( sal_False ),
     nMemberStep( 1 )
 {
 }
@@ -1054,13 +1054,13 @@ void ScDPResultMember::FillItemData( ScDPItemData& rData ) const
         rData.SetString( ScGlobal::GetRscString(STR_PIVOT_TOTAL) );     // root member
 }
 
-BOOL ScDPResultMember::IsNamedItem( SCROW nIndex ) const
+sal_Bool ScDPResultMember::IsNamedItem( SCROW nIndex ) const
 {
     //!	store ScDPMember pointer instead of ScDPMember ???
   const ScDPMember*   pMemberDesc = GetDPMember();
     if (pMemberDesc)
         return ((ScDPMember*)pMemberDesc)->IsNamedItem( nIndex  );
-    return FALSE;
+    return sal_False;
 }
 
 bool ScDPResultMember::IsValidEntry( const vector< SCROW >& aMembers ) const
@@ -1084,13 +1084,13 @@ bool ScDPResultMember::IsValidEntry( const vector< SCROW >& aMembers ) const
 
 void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, 
                                  size_t nPos, ScDPInitState& rInitState ,
-                                 BOOL bInitChild /*= TRUE */)
+                                 sal_Bool bInitChild /*= sal_True */)
 {
     //	with LateInit, initialize only those members that have data
     if ( pResultData->IsLateInit() )
         return;
 
-    bInitialized = TRUE;
+    bInitialized = sal_True;
 
     if (nPos >= ppDim.size())
         return;
@@ -1107,7 +1107,7 @@ void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vect
             {
                  if ( !pChildDimension )
                         pChildDimension = new ScDPResultDimension( pResultData );
-                    pChildDimension->InitFrom( ppDim, ppLev, nPos, rInitState , FALSE );
+                    pChildDimension->InitFrom( ppDim, ppLev, nPos, rInitState , sal_False );
                     return;
             }
             else 
@@ -1117,14 +1117,14 @@ void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vect
             }
         }
         // End Comments
-        bHasHiddenDetails = TRUE;	// only if there is a next dimension
+        bHasHiddenDetails = sal_True;	// only if there is a next dimension
         return;
     }
     
     if ( bInitChild )
     {
         pChildDimension = new ScDPResultDimension( pResultData );
-        pChildDimension->InitFrom( ppDim, ppLev, nPos, rInitState, TRUE  );
+        pChildDimension->InitFrom( ppDim, ppLev, nPos, rInitState, sal_True  );
     }
 }
 
@@ -1136,7 +1136,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD
     if ( !pResultData->IsLateInit() )
         return;
 
-    bInitialized = TRUE;
+    bInitialized = sal_True;
 
     if ( rParams.IsEnd( nPos )  /*nPos >= ppDim.size()*/)
         // No next dimension.  Bail out.
@@ -1158,8 +1158,8 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD
 
                 // #i111462# reset InitChild flag only for this child dimension's LateInitFrom call,
                 // not for following members of parent dimensions
-                BOOL bWasInitChild = rParams.GetInitChild();
-                rParams.SetInitChild( FALSE );
+                sal_Bool bWasInitChild = rParams.GetInitChild();
+                rParams.SetInitChild( sal_False );
                 pChildDimension->LateInitFrom( rParams, pItemData, nPos, rInitState );
                 rParams.SetInitChild( bWasInitChild );
                 return;
@@ -1171,7 +1171,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD
             }
         }
         // End Comments
-        bHasHiddenDetails = TRUE;   // only if there is a next dimension
+        bHasHiddenDetails = sal_True;   // only if there is a next dimension
         return;
     }
 
@@ -1184,9 +1184,9 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD
     }
 }
 
-BOOL ScDPResultMember::IsSubTotalInTitle(long nMeasure) const
+sal_Bool ScDPResultMember::IsSubTotalInTitle(long nMeasure) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if ( pChildDimension && /*pParentLevel*/GetParentLevel() &&
          /*pParentLevel*/GetParentLevel()->IsOutlineLayout() && /*pParentLevel*/GetParentLevel()->IsSubtotalsAtTop() )
     {
@@ -1200,7 +1200,7 @@ BOOL ScDPResultMember::IsSubTotalInTitle(long nMeasure) const
 
             // only a single subtotal row will be shown in the outline title row
             if ( nSubTotals == 1 )
-                bRet = TRUE;
+                bRet = sal_True;
         }
     }
     return bRet;
@@ -1243,7 +1243,7 @@ long ScDPResultMember::GetSize(long nMeasure) const
     }
 }
 
-BOOL ScDPResultMember::IsVisible() const
+sal_Bool ScDPResultMember::IsVisible() const
 {
     //	not initialized -> shouldn't be there at all
     //	(allocated only to preserve ordering)
@@ -1251,22 +1251,22 @@ BOOL ScDPResultMember::IsVisible() const
     return ( bHasElements || ( pParentLevel && pParentLevel->getShowEmpty() ) ) && IsValid() && bInitialized;
 }
 
-BOOL ScDPResultMember::IsValid() const
+sal_Bool ScDPResultMember::IsValid() const
 {
     //	non-Valid members are left out of calculation
 
     //	was member set no invisible at the DataPilotSource?
   const ScDPMember*		pMemberDesc =GetDPMember();
     if ( pMemberDesc && !pMemberDesc->getIsVisible() )
-        return FALSE;
+        return sal_False;
 
     if ( bAutoHidden )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDPResultMember::HasHiddenDetails() const
+sal_Bool ScDPResultMember::HasHiddenDetails() const
 {
     // bHasHiddenDetails is set only if the "show details" flag is off,
     // and there was a child dimension to skip
@@ -1371,7 +1371,7 @@ static String lcl_parseSubtotalName(const String& rSubStr, const String& rCaptio
 }
 
 void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pSequences,
-                                            long& rPos, long nMeasure, BOOL bRoot,
+                                            long& rPos, long nMeasure, sal_Bool bRoot,
                                             const String* pMemberName,
                                             const String* pMemberCaption )
 {
@@ -1382,7 +1382,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
     sheet::MemberResult* pArray = pSequences->getArray();
     DBG_ASSERT( rPos+nSize <= pSequences->getLength(), "bumm" );
 
-    BOOL bIsNumeric = FALSE;
+    sal_Bool bIsNumeric = sal_False;
     String aName;
     if ( pMemberName )			// if pMemberName != NULL, use instead of real member name
         aName = *pMemberName;
@@ -1398,7 +1398,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
     {
         // Numeric group dimensions use numeric entries for proper sorting,
         // but the group titles must be output as text.
-        bIsNumeric = FALSE;
+        bIsNumeric = sal_False;
     }
 
     String aCaption = aName;
@@ -1439,15 +1439,15 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
     if ( pParentLevel && pParentLevel->IsAddEmpty() )
         ++nExtraSpace;
 
-    BOOL bTitleLine = FALSE;
+    sal_Bool bTitleLine = sal_False;
     if ( pParentLevel && pParentLevel->IsOutlineLayout() )
-        bTitleLine = TRUE;
+        bTitleLine = sal_True;
 
     // if the subtotals are shown at the top (title row) in outline layout,
     // no extra row for the subtotals is needed
-    BOOL bSubTotalInTitle = IsSubTotalInTitle( nMeasure );
+    sal_Bool bSubTotalInTitle = IsSubTotalInTitle( nMeasure );
 
-    BOOL bHasChild = ( pChildDimension != NULL );
+    sal_Bool bHasChild = ( pChildDimension != NULL );
     if (bHasChild)
     {
         if ( bTitleLine )           // in tabular layout the title is on a separate row
@@ -1489,7 +1489,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
                 bool bTotalResult = false;
                 String aSubStr = aCaption;
                 aSubStr += ' ';
-                aSubStr += pResultData->GetMeasureString(nMemberMeasure, FALSE, eForce, bTotalResult);
+                aSubStr += pResultData->GetMeasureString(nMemberMeasure, sal_False, eForce, bTotalResult);
 
                 if (bTotalResult)
                 {
@@ -1560,13 +1560,13 @@ void ScDPResultMember::FillDataResults( const ScDPResultMember* pRefMember,
     if ( pParentLevel && pParentLevel->IsAddEmpty() )
         ++nExtraSpace;
 
-    BOOL bTitleLine = FALSE;
+    sal_Bool bTitleLine = sal_False;
     if ( pParentLevel && pParentLevel->IsOutlineLayout() )
-        bTitleLine = TRUE;
+        bTitleLine = sal_True;
 
-    BOOL bSubTotalInTitle = IsSubTotalInTitle( nMeasure );
+    sal_Bool bSubTotalInTitle = IsSubTotalInTitle( nMeasure );
 
-    BOOL bHasChild = ( pChildDimension != NULL );
+    sal_Bool bHasChild = ( pChildDimension != NULL );
     if (bHasChild)
     {
         if ( bTitleLine )           // in tabular layout the title is on a separate row
@@ -1650,7 +1650,7 @@ void ScDPResultMember::UpdateDataResults( const ScDPResultMember* pRefMember, lo
     //  IsVisible() test is in ScDPResultDimension::FillDataResults
     //  (not on data layout dimension)
 
-    BOOL bHasChild = ( pChildDimension != NULL );
+    sal_Bool bHasChild = ( pChildDimension != NULL );
 
     long nUserSubCount = GetSubTotalCount();
     // process subtotals even if not shown
@@ -1697,7 +1697,7 @@ void ScDPResultMember::UpdateDataResults( const ScDPResultMember* pRefMember, lo
 
 void ScDPResultMember::SortMembers( ScDPResultMember* pRefMember )
 {
-    BOOL bHasChild = ( pChildDimension != NULL );
+    sal_Bool bHasChild = ( pChildDimension != NULL );
     if (bHasChild)
         pChildDimension->SortMembers( pRefMember );     // sorting is done at the dimension
 
@@ -1712,7 +1712,7 @@ void ScDPResultMember::SortMembers( ScDPResultMember* pRefMember )
 
 void ScDPResultMember::DoAutoShow( ScDPResultMember* pRefMember )
 {
-    BOOL bHasChild = ( pChildDimension != NULL );
+    sal_Bool bHasChild = ( pChildDimension != NULL );
     if (bHasChild)
         pChildDimension->DoAutoShow( pRefMember );     // sorting is done at the dimension
 
@@ -1725,7 +1725,7 @@ void ScDPResultMember::DoAutoShow( ScDPResultMember* pRefMember )
     }
 }
 
-void ScDPResultMember::ResetResults( BOOL /*bRoot*/ )
+void ScDPResultMember::ResetResults( sal_Bool /*bRoot*/ )
 {
     if (pDataRoot)
         pDataRoot->ResetResults();
@@ -1734,7 +1734,7 @@ void ScDPResultMember::ResetResults( BOOL /*bRoot*/ )
         pChildDimension->ResetResults();
 
  //   if (!bRoot)
- //       bHasElements = FALSE;
+ //       bHasElements = sal_False;
 }
 
 void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure,
@@ -1745,7 +1745,7 @@ void ScDPResultMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
 
     rTotals.SetInColRoot( IsRoot() );
 
-    BOOL bHasChild = ( pChildDimension != NULL );
+    sal_Bool bHasChild = ( pChildDimension != NULL );
 
     long nUserSubCount = GetSubTotalCount();
     //if ( nUserSubCount || !bHasChild )
@@ -1838,28 +1838,28 @@ String ScDPDataMember::GetName() const
         return EMPTY_STRING;
 }
 
-BOOL ScDPDataMember::IsVisible() const
+sal_Bool ScDPDataMember::IsVisible() const
 {
     if (pResultMember)
         return pResultMember->IsVisible();
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScDPDataMember::IsNamedItem( /*const ScDPItemData& r*/SCROW r ) const
+sal_Bool ScDPDataMember::IsNamedItem( /*const ScDPItemData& r*/SCROW r ) const
 {
     if (pResultMember)
         return pResultMember->IsNamedItem(r);
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScDPDataMember::HasHiddenDetails() const
+sal_Bool ScDPDataMember::HasHiddenDetails() const
 {
     if (pResultMember)
         return pResultMember->HasHiddenDetails();
     else
-        return FALSE;
+        return sal_False;
 }
 
 void ScDPDataMember::InitFrom( const ScDPResultDimension* pDim )
@@ -1949,26 +1949,26 @@ void ScDPDataMember::ProcessData( const vector< SCROW >& aChildMembers, const ve
         pChildDimension->ProcessData( aChildMembers, aValues, rSubState );		// with unmodified subtotal state
 }
 
-BOOL ScDPDataMember::HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const
+sal_Bool ScDPDataMember::HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const
 {
     if ( rSubState.eColForce != SUBTOTAL_FUNC_NONE && rSubState.eRowForce != SUBTOTAL_FUNC_NONE &&
                                                         rSubState.eColForce != rSubState.eRowForce )
-        return FALSE;
+        return sal_False;
 
     //	#74542# HasData can be different between measures!
 
     const ScDPAggData* pAgg = GetConstAggData( nMeasure, rSubState );
     if (!pAgg)
-        return FALSE;			//! error?
+        return sal_False;			//! error?
 
     return pAgg->HasData();
 }
 
-BOOL ScDPDataMember::HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const
+sal_Bool ScDPDataMember::HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const
 {
     const ScDPAggData* pAgg = GetConstAggData( nMeasure, rSubState );
     if (!pAgg)
-        return TRUE;
+        return sal_True;
 
     return pAgg->HasError();
 }
@@ -2024,7 +2024,7 @@ const ScDPAggData* ScDPDataMember::GetConstAggData( long nMeasure, const ScDPSub
 
 void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember,
                                     uno::Sequence<sheet::DataResult>& rSequence,
-                                    long& rCol, long nMeasure, BOOL bIsSubTotalRow,
+                                    long& rCol, long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState ) const
 {
     DBG_ASSERT( pRefMember == pResultMember || !pResultMember, "bla" );
@@ -2042,15 +2042,15 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember,
         if ( pRefParentLevel && pRefParentLevel->IsAddEmpty() )
             ++nExtraSpace;
 
-        BOOL bTitleLine = FALSE;
+        sal_Bool bTitleLine = sal_False;
         if ( pRefParentLevel && pRefParentLevel->IsOutlineLayout() )
-            bTitleLine = TRUE;
+            bTitleLine = sal_True;
 
-        BOOL bSubTotalInTitle = pRefMember->IsSubTotalInTitle( nMeasure );
+        sal_Bool bSubTotalInTitle = pRefMember->IsSubTotalInTitle( nMeasure );
 
         //	leave space for children even if the DataMember hasn't been initialized
         //	(pDataChild is null then, this happens when no values for it are in this row)
-        BOOL bHasChild = ( pRefChild != NULL );
+        sal_Bool bHasChild = ( pRefChild != NULL );
 
         if ( bHasChild )
         {
@@ -2059,7 +2059,7 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember,
 
             if ( pDataChild )
                 pDataChild->FillDataRow( pRefChild, rSequence, rCol, nMeasure, bIsSubTotalRow, rSubState );
-            rCol += (USHORT)pRefMember->GetSize( nMeasure );
+            rCol += (sal_uInt16)pRefMember->GetSize( nMeasure );
 
             if ( bTitleLine )           // title column is included in GetSize, so the following
                 --rCol;                 // positions are calculated with the normal values
@@ -2142,7 +2142,7 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember,
 }
 
 void ScDPDataMember::UpdateDataRow( const ScDPResultMember* pRefMember,
-                                long nMeasure, BOOL bIsSubTotalRow,
+                                long nMeasure, sal_Bool bIsSubTotalRow,
                                 const ScDPSubTotalState& rSubState )
 {
     DBG_ASSERT( pRefMember == pResultMember || !pResultMember, "bla" );
@@ -2153,7 +2153,7 @@ void ScDPDataMember::UpdateDataRow( const ScDPResultMember* pRefMember,
 
     //  leave space for children even if the DataMember hasn't been initialized
     //  (pDataChild is null then, this happens when no values for it are in this row)
-    BOOL bHasChild = ( pRefChild != NULL );
+    sal_Bool bHasChild = ( pRefChild != NULL );
 
     // process subtotals even if not shown
     long nUserSubCount = pRefMember->GetSubTotalCount();
@@ -2250,7 +2250,7 @@ void ScDPDataMember::ResetResults()
 }
 
 void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
-                                long nMeasure, BOOL bIsSubTotalRow,
+                                long nMeasure, sal_Bool bIsSubTotalRow,
                                 const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning,
                                 ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent )
 {
@@ -2261,11 +2261,11 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
         const ScDPDataDimension* pDataChild = GetChildDimension();
         const ScDPResultDimension* pRefChild = pRefMember->GetChildDimension();
 
-        BOOL bIsRoot = ( pResultMember == NULL || pResultMember->GetParentLevel() == NULL );
+        sal_Bool bIsRoot = ( pResultMember == NULL || pResultMember->GetParentLevel() == NULL );
 
         //  leave space for children even if the DataMember hasn't been initialized
         //  (pDataChild is null then, this happens when no values for it are in this row)
-        BOOL bHasChild = ( pRefChild != NULL );
+        sal_Bool bHasChild = ( pRefChild != NULL );
 
         long nUserSubCount = pRefMember->GetSubTotalCount();
         //if ( nUserSubCount || !bHasChild )
@@ -2307,8 +2307,8 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                              eRefType == sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE ||
                              eRefType == sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE_DIFFERENCE )
                         {
-                            BOOL bRunningTotal = ( eRefType == sheet::DataPilotFieldReferenceType::RUNNING_TOTAL );
-                            BOOL bRelative =
+                            sal_Bool bRunningTotal = ( eRefType == sheet::DataPilotFieldReferenceType::RUNNING_TOTAL );
+                            sal_Bool bRelative =
                                 ( aReferenceValue.ReferenceItemType != sheet::DataPilotFieldReferenceItemType::NAMED && !bRunningTotal );
                             long nRelativeDir = bRelative ?
                                 ( ( aReferenceValue.ReferenceItemType == sheet::DataPilotFieldReferenceItemType::PREVIOUS ) ? -1 : 1 ) : 0;
@@ -2321,9 +2321,9 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                             String aRefFieldName = aReferenceValue.ReferenceField;
 
                             //! aLocalSubState?
-                            USHORT nRefOrient = pResultData->GetMeasureRefOrient( nMemberMeasure );
-                            BOOL bRefDimInCol = ( nRefOrient == sheet::DataPilotFieldOrientation_COLUMN );
-                            BOOL bRefDimInRow = ( nRefOrient == sheet::DataPilotFieldOrientation_ROW );
+                            sal_uInt16 nRefOrient = pResultData->GetMeasureRefOrient( nMemberMeasure );
+                            sal_Bool bRefDimInCol = ( nRefOrient == sheet::DataPilotFieldOrientation_COLUMN );
+                            sal_Bool bRefDimInRow = ( nRefOrient == sheet::DataPilotFieldOrientation_ROW );
 
                             const ScDPResultDimension* pSelectDim = NULL;
                             long nRowPos = 0;
@@ -2367,7 +2367,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                                     pSelectDim = NULL;
                             }
 
-                            BOOL bNoDetailsInRef = FALSE;
+                            sal_Bool bNoDetailsInRef = sal_False;
                             if ( pSelectDim && bRunningTotal )
                             {
                                 //  Running totals:
@@ -2382,7 +2382,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                                     if ( pMyRefMember && pMyRefMember->HasHiddenDetails() )
                                     {
                                         pSelectDim = NULL;          // don't calculate
-                                        bNoDetailsInRef = TRUE;     // show error, not empty
+                                        bNoDetailsInRef = sal_True;     // show error, not empty
                                     }
                                 }
                             }
@@ -2401,17 +2401,17 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                                 //  - Otherwise, the error isn't strictly necessary, but shown for
                                 //    consistency.
 
-                                BOOL bInnerNoDetails = bRefDimInCol ? HasHiddenDetails() :
-                                                     ( bRefDimInRow ? rRowParent.HasHiddenDetails() : TRUE );
+                                sal_Bool bInnerNoDetails = bRefDimInCol ? HasHiddenDetails() :
+                                                     ( bRefDimInRow ? rRowParent.HasHiddenDetails() : sal_True );
                                 if ( bInnerNoDetails )
                                 {
                                     pSelectDim = NULL;
-                                    bNoDetailsInRef = TRUE;         // show error, not empty
+                                    bNoDetailsInRef = sal_True;         // show error, not empty
                                 }
                             }
 
                             if ( !bRefDimInCol && !bRefDimInRow )   // invalid dimension specified
-                                bNoDetailsInRef = TRUE;             // pSelectDim is then already NULL
+                                bNoDetailsInRef = sal_True;             // pSelectDim is then already NULL
 
                             //
                             //  get the member for the reference item and do the calculation
@@ -2449,7 +2449,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                                             fTotal += pAggData->GetResult();
                                             pSelectData->SetAuxiliary( fTotal );
                                             pAggData->SetResult( fTotal );
-                                            pAggData->SetEmpty(FALSE);              // always display
+                                            pAggData->SetEmpty(sal_False);              // always display
                                         }
                                     }
                                     else
@@ -2458,7 +2458,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                                 else if (bNoDetailsInRef)
                                     pAggData->SetError();
                                 else
-                                    pAggData->SetEmpty(TRUE);                       // empty (dim set to 0 above)
+                                    pAggData->SetEmpty(sal_True);                       // empty (dim set to 0 above)
                             }
                             else
                             {
@@ -2495,7 +2495,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                                     if ( pSelectMember == this &&
                                          eRefType != sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE )
                                     {
-                                        pAggData->SetEmpty(TRUE);
+                                        pAggData->SetEmpty(sal_True);
                                     }
                                     else if ( pSelectMember )
                                     {
@@ -2509,7 +2509,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
 
                                             double fOtherResult = pOtherAggData->GetAuxiliary();
                                             double fThisResult = pAggData->GetResult();
-                                            BOOL bError = FALSE;
+                                            sal_Bool bError = sal_False;
                                             switch ( eRefType )
                                             {
                                                 case sheet::DataPilotFieldReferenceType::ITEM_DIFFERENCE:
@@ -2517,13 +2517,13 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                                                     break;
                                                 case sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE:
                                                     if ( fOtherResult == 0.0 )
-                                                        bError = TRUE;
+                                                        bError = sal_True;
                                                     else
                                                         fThisResult = fThisResult / fOtherResult;
                                                     break;
                                                 case sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE_DIFFERENCE:
                                                     if ( fOtherResult == 0.0 )
-                                                        bError = TRUE;
+                                                        bError = sal_True;
                                                     else
                                                         fThisResult = ( fThisResult - fOtherResult ) / fOtherResult;
                                                     break;
@@ -2537,20 +2537,20 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
                                             else
                                             {
                                                 pAggData->SetResult(fThisResult);
-                                                pAggData->SetEmpty(FALSE);              // always display
+                                                pAggData->SetEmpty(sal_False);              // always display
                                             }
                                             //! errors in data?
                                         }
                                     }
                                     else if (bRelative && !bNoDetailsInRef)
-                                        pAggData->SetEmpty(TRUE);                   // empty
+                                        pAggData->SetEmpty(sal_True);                   // empty
                                     else
                                         pAggData->SetError();                       // error
                                 }
                                 else if (bNoDetailsInRef)
                                     pAggData->SetError();                           // error
                                 else
-                                    pAggData->SetEmpty(TRUE);                       // empty
+                                    pAggData->SetEmpty(sal_True);                       // empty
                             }
                         }
                         else if ( eRefType == sheet::DataPilotFieldReferenceType::ROW_PERCENTAGE ||
@@ -2654,8 +2654,8 @@ private:
     const ScDPResultData* pResultData;
     const ScDPInitState& rInitState;
     long                 nDimSource;
-    BOOL                 bIncludeAll;
-    BOOL                 bIsBase;
+    sal_Bool                 bIncludeAll;
+    sal_Bool                 bIsBase;
     long                 nGroupBase;
     // Wang Xu Ming -- 2009-8-6
     // DataPilot Migration - Cache&&Performance
@@ -2665,8 +2665,8 @@ public:
             ScDPGroupCompare( const ScDPResultData* pData, const ScDPInitState& rState, long nDimension );
             ~ScDPGroupCompare() {}
 
-    BOOL    IsIncluded( const ScDPMember& rMember )     { return bIncludeAll || TestIncluded( rMember ); }
-    BOOL    TestIncluded( const ScDPMember& rMember );
+    sal_Bool    IsIncluded( const ScDPMember& rMember )     { return bIncludeAll || TestIncluded( rMember ); }
+    sal_Bool    TestIncluded( const ScDPMember& rMember );
 };
 
 ScDPGroupCompare::ScDPGroupCompare( const ScDPResultData* pData, const ScDPInitState& rState, long nDimension ) :
@@ -2684,9 +2684,9 @@ ScDPGroupCompare::ScDPGroupCompare( const ScDPResultData* pData, const ScDPInitS
     bIncludeAll = !( bIsBase || nGroupBase >= 0 );
 }
 
-BOOL ScDPGroupCompare::TestIncluded( const ScDPMember& rMember )
+sal_Bool ScDPGroupCompare::TestIncluded( const ScDPMember& rMember )
 {
-    BOOL bInclude = TRUE;
+    sal_Bool bInclude = sal_True;
     if ( nBaseDataId >=0 )
     {
         ScDPItemData aMemberData;
@@ -2738,13 +2738,13 @@ BOOL ScDPGroupCompare::TestIncluded( const ScDPMember& rMember )
 
 ScDPResultDimension::ScDPResultDimension( const ScDPResultData* pData ) :
     pResultData( pData ),
-    bInitialized( FALSE ),
-    bIsDataLayout( FALSE ),
-    bSortByData( FALSE ),
-    bSortAscending( FALSE ),
+    bInitialized( sal_False ),
+    bIsDataLayout( sal_False ),
+    bSortByData( sal_False ),
+    bSortAscending( sal_False ),
     nSortMeasure( 0 ),
-    bAutoShow( FALSE ),
-    bAutoTopItems( FALSE ),
+    bAutoShow( sal_False ),
+    bAutoTopItems( sal_False ),
     nAutoMeasure( 0 ),
     nAutoCount( 0 )
 {
@@ -2781,7 +2781,7 @@ ScDPResultMember *ScDPResultDimension::FindMember(  SCROW  iData ) const
 }
 
 void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, 
-                                    size_t nPos, ScDPInitState& rInitState,  BOOL bInitChild /*= TRUE */ )
+                                    size_t nPos, ScDPInitState& rInitState,  sal_Bool bInitChild /*= sal_True */ )
 {
     if (nPos >= ppDim.size() || nPos >= ppLev.size())
     {
@@ -2805,7 +2805,7 @@ void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const v
     const sheet::DataPilotFieldAutoShowInfo& rAutoInfo = pThisLevel->GetAutoShow();
     if ( rAutoInfo.IsEnabled )
     {
-        bAutoShow     = TRUE;
+        bAutoShow     = sal_True;
         bAutoTopItems = ( rAutoInfo.ShowItemsMode == sheet::DataPilotFieldShowItemsMode::FROM_TOP );
         nAutoMeasure  = pThisLevel->GetAutoMeasure();
         nAutoCount    = rAutoInfo.ItemCount;
@@ -2815,7 +2815,7 @@ void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const v
     const sheet::DataPilotFieldSortInfo& rSortInfo = pThisLevel->GetSortInfo();
     if ( rSortInfo.Mode == sheet::DataPilotFieldSortMode::DATA )
     {
-        bSortByData = TRUE;
+        bSortByData = sal_True;
         bSortAscending = rSortInfo.IsAscending;
         nSortMeasure = pThisLevel->GetSortMeasure();
     }
@@ -2844,7 +2844,7 @@ void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const v
             rInitState.RemoveMember();
         }
     }
-    bInitialized = TRUE;
+    bInitialized = sal_True;
 }
 
 void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev*/,
@@ -2866,7 +2866,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
 
     long nDimSource = pThisDim->GetDimension();     //! check GetSourceDim?
 
-    BOOL bShowEmpty = pThisLevel->getShowEmpty();
+    sal_Bool bShowEmpty = pThisLevel->getShowEmpty();
 
     if ( !bInitialized )
     { // init some values
@@ -2877,7 +2877,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
         const sheet::DataPilotFieldAutoShowInfo& rAutoInfo = pThisLevel->GetAutoShow();
         if ( rAutoInfo.IsEnabled )
         {
-            bAutoShow     = TRUE;
+            bAutoShow     = sal_True;
             bAutoTopItems = ( rAutoInfo.ShowItemsMode == sheet::DataPilotFieldShowItemsMode::FROM_TOP );
             nAutoMeasure  = pThisLevel->GetAutoMeasure();
             nAutoCount    = rAutoInfo.ItemCount;
@@ -2886,7 +2886,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
         const sheet::DataPilotFieldSortInfo& rSortInfo = pThisLevel->GetSortInfo();
         if ( rSortInfo.Mode == sheet::DataPilotFieldSortMode::DATA )
         {
-            bSortByData = TRUE;
+            bSortByData = sal_True;
             bSortAscending = rSortInfo.IsAscending;
             nSortMeasure = pThisLevel->GetSortMeasure();
         }
@@ -2903,7 +2903,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
     if ( pMembers->IsHasHideDetailsMembers() )
         DBG_TRACE ( "HasHideDetailsMembers" );
 #endif
-     pMembers->SetHasHideDetailsMembers( FALSE );
+     pMembers->SetHasHideDetailsMembers( sal_False );
     }
  
     bool bNewAllMembers =(!rParams.IsRow()) ||  nPos == 0 || bLateInitAllMembers ;
@@ -2929,7 +2929,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
                     AddMember( aData );
                 }
             }
-            bInitialized = TRUE;    // don't call again, even if no members were included
+            bInitialized = sal_True;    // don't call again, even if no members were included
         }
         //	initialize only specific member (or all if "show empty" flag is set)
         if ( bLateInitAllMembers  )
@@ -2940,13 +2940,13 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
                 ScDPResultMember* pResultMember = maMemberArray[i];
                 
                 // check show empty 
-                BOOL bAllChildren = FALSE;
+                sal_Bool bAllChildren = sal_False;
                 if( bShowEmpty )
                 {
                     if (  pResultMember->IsNamedItem( rThisData ) )
-                        bAllChildren = FALSE;
+                        bAllChildren = sal_False;
                     else 
-                        bAllChildren = TRUE;
+                        bAllChildren = sal_True;
                 }
                 rParams.SetInitAllChildren( bAllChildren );
                 rInitState.AddMember( nDimSource,  pResultMember->GetDataId() );
@@ -3049,11 +3049,11 @@ void ScDPResultDimension::FillMemberResults( uno::Sequence<sheet::MemberResult>*
         {
             bool bTotalResult = false;
             String aMbrName = pResultData->GetMeasureDimensionName( nSorted );
-            String aMbrCapt = pResultData->GetMeasureString( nSorted, FALSE, SUBTOTAL_FUNC_NONE, bTotalResult );
-            maMemberArray[0]->FillMemberResults( pSequences, nPos, nSorted, FALSE, &aMbrName, &aMbrCapt );
+            String aMbrCapt = pResultData->GetMeasureString( nSorted, sal_False, SUBTOTAL_FUNC_NONE, bTotalResult );
+            maMemberArray[0]->FillMemberResults( pSequences, nPos, nSorted, sal_False, &aMbrName, &aMbrCapt );
         }
         else if ( pMember->IsVisible() )
-            pMember->FillMemberResults( pSequences, nPos, nMeasure, FALSE, NULL, NULL );
+            pMember->FillMemberResults( pSequences, nPos, nMeasure, sal_False, NULL, NULL );
         // nPos is modified
     }
 }
@@ -3170,10 +3170,10 @@ void ScDPResultDimension::DoAutoShow( ScDPResultMember* pRefMember )
         long nIncluded = nAutoCount;
         const ScDPResultMember* pMember1 = maMemberArray[aAutoOrder[nIncluded - 1]];
         const ScDPDataMember* pDataMember1 = pMember1->IsVisible() ? pMember1->GetDataRoot() : NULL;
-        BOOL bContinue = TRUE;
+        sal_Bool bContinue = sal_True;
         while ( bContinue )
         {
-            bContinue = FALSE;
+            bContinue = sal_False;
             if ( nIncluded < nCount )
             {
                 const ScDPResultMember* pMember2 = maMemberArray[aAutoOrder[nIncluded]];
@@ -3182,7 +3182,7 @@ void ScDPResultDimension::DoAutoShow( ScDPResultMember* pRefMember )
                 if ( lcl_IsEqual( pDataMember1, pDataMember2, nAutoMeasure ) )
                 {
                     ++nIncluded;                // include more members if values are equal
-                    bContinue = TRUE;
+                    bContinue = sal_True;
                 }
             }
         }
@@ -3204,7 +3204,7 @@ void ScDPResultDimension::ResetResults()
     {
         // sort order doesn't matter
         ScDPResultMember* pMember = maMemberArray[bIsDataLayout ? 0 : i];
-        pMember->ResetResults( FALSE );
+        pMember->ResetResults( sal_False );
     }
 }
 
@@ -3254,7 +3254,7 @@ ScDPDataMember* ScDPResultDimension::GetRowReferenceMember( const ScDPRelativePo
 
     ScDPDataMember* pColMember = NULL;
 
-    BOOL bFirstExisting = ( pRelativePos == NULL && pName == NULL );
+    sal_Bool bFirstExisting = ( pRelativePos == NULL && pName == NULL );
     long nMemberCount = maMemberArray.size();
     long nMemberIndex = 0;      // unsorted
     long nDirection = 1;        // forward if no relative position is used
@@ -3282,7 +3282,7 @@ ScDPDataMember* ScDPResultDimension::GetRowReferenceMember( const ScDPRelativePo
         }
     }
 
-    BOOL bContinue = TRUE;
+    sal_Bool bContinue = sal_True;
     while ( bContinue && nMemberIndex >= 0 && nMemberIndex < nMemberCount )
     {
         const ScDPResultMember* pRowMember = maMemberArray[GetSortedIndex(nMemberIndex)];
@@ -3389,7 +3389,7 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( const ScDPRelativePo
         {
             long nReferenceCount = pReferenceDim->GetMemberCount();
 
-            BOOL bFirstExisting = ( pRelativePos == NULL && pName == NULL );
+            sal_Bool bFirstExisting = ( pRelativePos == NULL && pName == NULL );
             long nMemberIndex = 0;      // unsorted
             long nDirection = 1;        // forward if no relative position is used
             pColMember = NULL;          // don't use parent dimension's member if none found
@@ -3415,7 +3415,7 @@ ScDPDataMember* ScDPResultDimension::GetColReferenceMember( const ScDPRelativePo
                 }
             }
 
-            BOOL bContinue = TRUE;
+            sal_Bool bContinue = sal_True;
             while ( bContinue && nMemberIndex >= 0 && nMemberIndex < nReferenceCount )
             {
                 pColMember = pReferenceDim->GetMember( pReferenceDim->GetSortedIndex( nMemberIndex ) );
@@ -3519,7 +3519,7 @@ void ScDPResultDimension::FillVisibilityData(ScDPResultVisibilityData& rData) co
 ScDPDataDimension::ScDPDataDimension( const ScDPResultData* pData ) :
     pResultData( pData ),
     pResultDimension( NULL ),
-    bIsDataLayout( FALSE )
+    bIsDataLayout( sal_False )
 {
 }
 
@@ -3565,7 +3565,7 @@ void ScDPDataDimension::ProcessData( const vector< SCROW >& aDataMembers, const
     long nCount = aMembers.Count();
     for (long i=0; i<nCount; i++)
     {
-        ScDPDataMember* pMember = aMembers[(USHORT)i];
+        ScDPDataMember* pMember = aMembers[(sal_uInt16)i];
 
         // always first member for data layout dim
         if ( bIsDataLayout || ( !aDataMembers.empty() && pMember->IsNamedItem(aDataMembers[0]) ) )
@@ -3586,7 +3586,7 @@ void ScDPDataDimension::ProcessData( const vector< SCROW >& aDataMembers, const
 
 void ScDPDataDimension::FillDataRow( const ScDPResultDimension* pRefDim,
                                     uno::Sequence<sheet::DataResult>& rSequence,
-                                    long nCol, long nMeasure, BOOL bIsSubTotalRow,
+                                    long nCol, long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState ) const
 {
     DBG_ASSERT( pRefDim && pRefDim->GetMemberCount() == aMembers.Count(), "dimensions don't match" );
@@ -3613,7 +3613,7 @@ void ScDPDataDimension::FillDataRow( const ScDPResultDimension* pRefDim,
         const ScDPResultMember* pRefMember = pRefDim->GetMember(nMemberPos);
         if ( pRefMember->IsVisible() )	//! here or in ScDPDataMember::FillDataRow ???
         {
-            const ScDPDataMember* pDataMember = aMembers[(USHORT)nMemberPos];
+            const ScDPDataMember* pDataMember = aMembers[(sal_uInt16)nMemberPos];
             pDataMember->FillDataRow( pRefMember, rSequence, nMemberCol, nMemberMeasure, bIsSubTotalRow, rSubState );
             // nMemberCol is modified
         }
@@ -3621,7 +3621,7 @@ void ScDPDataDimension::FillDataRow( const ScDPResultDimension* pRefDim,
 }
 
 void ScDPDataDimension::UpdateDataRow( const ScDPResultDimension* pRefDim,
-                                    long nMeasure, BOOL bIsSubTotalRow,
+                                    long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState ) const
 {
     DBG_ASSERT( pRefDim && pRefDim->GetMemberCount() == aMembers.Count(), "dimensions don't match" );
@@ -3642,7 +3642,7 @@ void ScDPDataDimension::UpdateDataRow( const ScDPResultDimension* pRefDim,
 
         // Calculate must be called even if the member is not visible (for use as reference value)
         const ScDPResultMember* pRefMember = pRefDim->GetMember(nMemberPos);
-        ScDPDataMember* pDataMember = aMembers[(USHORT)nMemberPos];
+        ScDPDataMember* pDataMember = aMembers[(sal_uInt16)nMemberPos];
         pDataMember->UpdateDataRow( pRefMember, nMemberMeasure, bIsSubTotalRow, rSubState );
     }
 }
@@ -3677,7 +3677,7 @@ void ScDPDataDimension::SortMembers( ScDPResultDimension* pRefDim )
         ScDPResultMember* pRefMember = pRefDim->GetMember(i);
         if ( pRefMember->IsVisible() )  //! here or in ScDPDataMember ???
         {
-            ScDPDataMember* pDataMember = aMembers[(USHORT)i];
+            ScDPDataMember* pDataMember = aMembers[(sal_uInt16)i];
             pDataMember->SortMembers( pRefMember );
         }
     }
@@ -3699,7 +3699,7 @@ void ScDPDataDimension::DoAutoShow( ScDPResultDimension* pRefDim )
         ScDPResultMember* pRefMember = pRefDim->GetMember(i);
         if ( pRefMember->IsVisible() )  //! here or in ScDPDataMember ???
         {
-            ScDPDataMember* pDataMember = aMembers[(USHORT)i];
+            ScDPDataMember* pDataMember = aMembers[(sal_uInt16)i];
             pDataMember->DoAutoShow( pRefMember );
         }
     }
@@ -3720,23 +3720,23 @@ void ScDPDataDimension::DoAutoShow( ScDPResultDimension* pRefDim )
         // look for equal values to the last included one
 
         long nIncluded = pRefDim->GetAutoCount();
-        ScDPDataMember* pDataMember1 = aMembers[(USHORT)aAutoOrder[nIncluded - 1]];
+        ScDPDataMember* pDataMember1 = aMembers[(sal_uInt16)aAutoOrder[nIncluded - 1]];
         if ( !pDataMember1->IsVisible() )
             pDataMember1 = NULL;
-        BOOL bContinue = TRUE;
+        sal_Bool bContinue = sal_True;
         while ( bContinue )
         {
-            bContinue = FALSE;
+            bContinue = sal_False;
             if ( nIncluded < nCount )
             {
-                ScDPDataMember* pDataMember2 = aMembers[(USHORT)aAutoOrder[nIncluded]];
+                ScDPDataMember* pDataMember2 = aMembers[(sal_uInt16)aAutoOrder[nIncluded]];
                 if ( !pDataMember2->IsVisible() )
                     pDataMember2 = NULL;
 
                 if ( lcl_IsEqual( pDataMember1, pDataMember2, pRefDim->GetAutoMeasure() ) )
                 {
                     ++nIncluded;                // include more members if values are equal
-                    bContinue = TRUE;
+                    bContinue = sal_True;
                 }
             }
         }
@@ -3759,7 +3759,7 @@ void ScDPDataDimension::ResetResults()
         //  sort order doesn't matter
 
         long nMemberPos = bIsDataLayout ? 0 : i;
-        ScDPDataMember* pDataMember = aMembers[(USHORT)nMemberPos];
+        ScDPDataMember* pDataMember = aMembers[(sal_uInt16)nMemberPos];
         pDataMember->ResetResults();
     }
 }
@@ -3774,7 +3774,7 @@ long ScDPDataDimension::GetSortedIndex( long nUnsorted ) const
 }
 
 void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim,
-                                    long nMeasure, BOOL bIsSubTotalRow,
+                                    long nMeasure, sal_Bool bIsSubTotalRow,
                                     const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning,
                                     ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent ) const
 {
@@ -3805,7 +3805,7 @@ void ScDPDataDimension::UpdateRunningTotals( const ScDPResultDimension* pRefDim,
             else
                 rRunning.AddColIndex( i, nSorted );
 
-            ScDPDataMember* pDataMember = aMembers[(USHORT)nMemberPos];
+            ScDPDataMember* pDataMember = aMembers[(sal_uInt16)nMemberPos];
             pDataMember->UpdateRunningTotals( pRefMember, nMemberMeasure,
                                             bIsSubTotalRow, rSubState, rRunning, rTotals, rRowParent );
 
@@ -3825,7 +3825,7 @@ void ScDPDataDimension::DumpState( const ScDPResultDimension* pRefDim, ScDocumen
     for (long i=0; i<nCount; i++)
     {
         const ScDPResultMember* pRefMember = pRefDim->GetMember(i);
-        const ScDPDataMember* pDataMember = aMembers[(USHORT)i];
+        const ScDPDataMember* pDataMember = aMembers[(sal_uInt16)i];
         pDataMember->DumpState( pRefMember, pDoc, rPos );
     }
 
@@ -3839,7 +3839,7 @@ long ScDPDataDimension::GetMemberCount() const
 
 ScDPDataMember* ScDPDataDimension::GetMember(long n) const
 {
-    return aMembers[(USHORT)n];
+    return aMembers[(sal_uInt16)n];
 }
 
 // ----------------------------------------------------------------------------
@@ -3939,7 +3939,7 @@ SCROW ScDPResultMember::GetDataId( ) const
 
 ScDPResultMember* ScDPResultDimension::AddMember(const ScDPParentDimData &aData )
 {
-    ScDPResultMember* pMember = new ScDPResultMember( pResultData, aData, FALSE );
+    ScDPResultMember* pMember = new ScDPResultMember( pResultData, aData, sal_False );
     SCROW	nDataIndex = pMember->GetDataId();
     maMemberArray.push_back( pMember );
     
@@ -3974,7 +3974,7 @@ ScDPResultMember* ScDPResultDimension::InsertMember(ScDPParentDimData *pMemberDa
     SCROW  nInsert = 0;
     if ( !lcl_SearchMember( maMemberArray, pMemberData->mnOrder , nInsert ) )
     { //Member not exist
-        ScDPResultMember* pNew = new ScDPResultMember( pResultData, *pMemberData, FALSE );
+        ScDPResultMember* pNew = new ScDPResultMember( pResultData, *pMemberData, sal_False );
         maMemberArray.insert( maMemberArray.begin()+nInsert, pNew );
 
         SCROW	nDataIndex = pMemberData->mpMemberDesc->GetItemDataId();
@@ -4008,7 +4008,7 @@ void ScDPResultDimension::  InitWithMembers(  LateInitParams& rParams,
         if ( bInitialized  ) 
             pResultMember = FindMember( nDataID );
         else 
-            bInitialized = TRUE;
+            bInitialized = sal_True;
 
         if ( pResultMember == NULL )
         { //only insert found item
@@ -4039,12 +4039,12 @@ ScDPParentDimData* ResultMembers::FindMember( const SCROW& nIndex ) const
 void  ResultMembers::InsertMember(  ScDPParentDimData* pNew )
 {
     if ( !pNew->mpMemberDesc->getShowDetails() )
-        mbHasHideDetailsMember = TRUE;
+        mbHasHideDetailsMember = sal_True;
     maMemberHash.insert( std::pair< const SCROW, ScDPParentDimData *>( pNew->mpMemberDesc->GetItemDataId(), pNew ) );
 }
 
 ResultMembers::ResultMembers():
-    mbHasHideDetailsMember( FALSE )
+    mbHasHideDetailsMember( sal_False )
 {
 }
 ResultMembers::~ResultMembers()
@@ -4053,7 +4053,7 @@ ResultMembers::~ResultMembers()
         delete iter->second;
 }
 // -----------------------------------------------------------------------
-LateInitParams::LateInitParams( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, BOOL bRow, BOOL bInitChild, BOOL bAllChildren ):
+LateInitParams::LateInitParams( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, sal_Bool bRow, sal_Bool bInitChild, sal_Bool bAllChildren ):
     mppDim( ppDim ),
     mppLev( ppLev ),
     mbRow( bRow ),
@@ -4066,7 +4066,7 @@ LateInitParams::~LateInitParams()
 {
 }
 
-BOOL LateInitParams::IsEnd( size_t nPos ) const
+sal_Bool LateInitParams::IsEnd( size_t nPos ) const
 {
     return nPos >= mppDim.size();
 }
@@ -4074,7 +4074,7 @@ BOOL LateInitParams::IsEnd( size_t nPos ) const
 // End Comments
 // Wang Xu Ming -- 2009-8-4
 // DataPilot Migration - old defects merge
-void ScDPResultDimension::CheckShowEmpty( BOOL bShow )
+void ScDPResultDimension::CheckShowEmpty( sal_Bool bShow )
 {
         long nCount = maMemberArray.size();
 
@@ -4087,7 +4087,7 @@ void ScDPResultDimension::CheckShowEmpty( BOOL bShow )
 
 }
 
-void ScDPResultMember::CheckShowEmpty( BOOL bShow )
+void ScDPResultMember::CheckShowEmpty( sal_Bool bShow )
 {
         if ( bHasElements )
         {
@@ -4103,7 +4103,7 @@ void ScDPResultMember::CheckShowEmpty( BOOL bShow )
                                             SetHasElements();
                                                         ScDPResultDimension* pChildDim = GetChildDimension();
                                                                     if (pChildDim )
-                                                                                        pChildDim->CheckShowEmpty( TRUE );
+                                                                                        pChildDim->CheckShowEmpty( sal_True );
                             }   
         }
 }// End Comments
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 21756486a..92039ff43 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -108,14 +108,14 @@ SC_SIMPLE_SERVICE_INFO( ScDPMember,      "ScDPMember",      "com.sun.star.sheet.
 // -----------------------------------------------------------------------
 
 //!	move to a header?
-BOOL lcl_GetBoolFromAny( const uno::Any& aAny )
+sal_Bool lcl_GetBoolFromAny( const uno::Any& aAny )
 {
     if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
         return *(sal_Bool*)aAny.getValue();
-    return FALSE;
+    return sal_False;
 }
 
-void lcl_SetBoolInAny( uno::Any& rAny, BOOL bValue )
+void lcl_SetBoolInAny( uno::Any& rAny, sal_Bool bValue )
 {
     rAny.setValue( &bValue, getBooleanCppuType() );
 }
@@ -129,17 +129,17 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) :
     nRowDimCount( 0 ),
     nDataDimCount( 0 ),
     nPageDimCount( 0 ),
-    bColumnGrand( TRUE ),		// default is true
-    bRowGrand( TRUE ),
-    bIgnoreEmptyRows( FALSE ),
-    bRepeatIfEmpty( FALSE ),
+    bColumnGrand( sal_True ),		// default is true
+    bRowGrand( sal_True ),
+    bIgnoreEmptyRows( sal_False ),
+    bRepeatIfEmpty( sal_False ),
     nDupCount( 0 ),
     pResData( NULL ),
     pColResRoot( NULL ),
     pRowResRoot( NULL ),
     pColResults( NULL ),
     pRowResults( NULL ),
-    bResultOverflow( FALSE ),
+    bResultOverflow( sal_False ),
     mpGrandTotalName(NULL)
 {
     pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
@@ -170,7 +170,7 @@ const ::rtl::OUString* ScDPSource::GetGrandTotalName() const
     return mpGrandTotalName.get();
 }
 
-USHORT ScDPSource::GetOrientation(long nColumn)
+sal_uInt16 ScDPSource::GetOrientation(long nColumn)
 {
     long i;
     for (i=0; i<nColDimCount; i++)
@@ -229,14 +229,14 @@ long ScDPSource::GetPosition(long nColumn)
     return 0;
 }
 
-BOOL lcl_TestSubTotal( BOOL& rAllowed, long nColumn, long* pArray, long nCount, ScDPSource* pSource )
+sal_Bool lcl_TestSubTotal( sal_Bool& rAllowed, long nColumn, long* pArray, long nCount, ScDPSource* pSource )
 {
     for (long i=0; i<nCount; i++)
         if (pArray[i] == nColumn)
         {
             //	no subtotals for data layout dim, no matter where
             if ( pSource->IsDataLayoutDimension(nColumn) )
-                rAllowed = FALSE;
+                rAllowed = sal_False;
             else
             {
                 //	no subtotals if no other dim but data layout follows
@@ -244,18 +244,18 @@ BOOL lcl_TestSubTotal( BOOL& rAllowed, long nColumn, long* pArray, long nCount,
                 if ( nNextIndex < nCount && pSource->IsDataLayoutDimension(pArray[nNextIndex]) )
                     ++nNextIndex;
                 if ( nNextIndex >= nCount )
-                    rAllowed = FALSE;
+                    rAllowed = sal_False;
             }
 
-            return TRUE;	// found
+            return sal_True;	// found
         }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDPSource::SubTotalAllowed(long nColumn)
+sal_Bool ScDPSource::SubTotalAllowed(long nColumn)
 {
     //!	cache this at ScDPResultData
-    BOOL bAllowed = TRUE;
+    sal_Bool bAllowed = sal_True;
     if ( lcl_TestSubTotal( bAllowed, nColumn, nColDims, nColDimCount, this ) )
         return bAllowed;
     if ( lcl_TestSubTotal( bAllowed, nColumn, nRowDims, nRowDimCount, this ) )
@@ -275,7 +275,7 @@ void lcl_RemoveDim( long nRemove, long* pDims, long& rCount )
         }
 }
 
-void ScDPSource::SetOrientation(long nColumn, USHORT nNew)
+void ScDPSource::SetOrientation(long nColumn, sal_uInt16 nNew)
 {
     //!	change to no-op if new orientation is equal to old?
 
@@ -311,22 +311,22 @@ void ScDPSource::SetOrientation(long nColumn, USHORT nNew)
     }
 }
 
-BOOL ScDPSource::IsDataLayoutDimension(long nDim)
+sal_Bool ScDPSource::IsDataLayoutDimension(long nDim)
 {
     return nDim == pData->GetColumnCount();
 }
 
-USHORT ScDPSource::GetDataLayoutOrientation()
+sal_uInt16 ScDPSource::GetDataLayoutOrientation()
 {
     return GetOrientation(pData->GetColumnCount());
 }
 
-BOOL ScDPSource::IsDateDimension(long nDim)
+sal_Bool ScDPSource::IsDateDimension(long nDim)
 {
     return pData->IsDateDimension(nDim);
 }
 
-UINT32	ScDPSource::GetNumberFormat(long nDim)
+sal_uInt32	ScDPSource::GetNumberFormat(long nDim)
 {
     return pData->GetNumberFormat( nDim );
 }
@@ -506,7 +506,7 @@ String ScDPSource::getDataDescription()
     if ( pResData->GetMeasureCount() == 1 )
     {
         bool bTotalResult = false;
-        aRet = pResData->GetMeasureString( 0, TRUE, SUBTOTAL_FUNC_NONE, bTotalResult );
+        aRet = pResData->GetMeasureString( 0, sal_True, SUBTOTAL_FUNC_NONE, bTotalResult );
     }
 
     //	empty for more than one measure
@@ -514,43 +514,43 @@ String ScDPSource::getDataDescription()
     return aRet;
 }
 
-BOOL ScDPSource::getColumnGrand() const
+sal_Bool ScDPSource::getColumnGrand() const
 {
     return bColumnGrand;
 }
 
-void ScDPSource::setColumnGrand(BOOL bSet)
+void ScDPSource::setColumnGrand(sal_Bool bSet)
 {
     bColumnGrand = bSet;
 }
 
-BOOL ScDPSource::getRowGrand() const
+sal_Bool ScDPSource::getRowGrand() const
 {
     return bRowGrand;
 }
 
-void ScDPSource::setRowGrand(BOOL bSet)
+void ScDPSource::setRowGrand(sal_Bool bSet)
 {
     bRowGrand = bSet;
 }
 
-BOOL ScDPSource::getIgnoreEmptyRows() const
+sal_Bool ScDPSource::getIgnoreEmptyRows() const
 {
     return bIgnoreEmptyRows;
 }
 
-void ScDPSource::setIgnoreEmptyRows(BOOL bSet)
+void ScDPSource::setIgnoreEmptyRows(sal_Bool bSet)
 {
     bIgnoreEmptyRows = bSet;
     pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
 }
 
-BOOL ScDPSource::getRepeatIfEmpty() const
+sal_Bool ScDPSource::getRepeatIfEmpty() const
 {
     return bRepeatIfEmpty;
 }
 
-void ScDPSource::setRepeatIfEmpty(BOOL bSet)
+void ScDPSource::setRepeatIfEmpty(sal_Bool bSet)
 {
     bRepeatIfEmpty = bSet;
     pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
@@ -589,7 +589,7 @@ void ScDPSource::disposeData()
     nColDimCount = nRowDimCount = nDataDimCount = nPageDimCount = 0;
 
     pData->DisposeData();	// cached entries etc.
-    bResultOverflow = FALSE;
+    bResultOverflow = sal_False;
 }
 
 long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLevel, long nLevels )
@@ -599,7 +599,7 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL
 
     long nTotal = 1;
     long nDataCount = 1;
-    BOOL bWasShowAll = TRUE;
+    sal_Bool bWasShowAll = sal_True;
     long nPos = nLevels;
     while ( nPos > 0 )
     {
@@ -611,7 +611,7 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL
             return 0;
         }
 
-        BOOL bDo = FALSE;
+        sal_Bool bDo = sal_False;
         if ( ppDim[nPos]->getIsDataLayoutDimension() )
         {
             //	data layout dim doesn't interfere with "show all" flags
@@ -621,11 +621,11 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL
         }
         else if ( bWasShowAll )     // "show all" set for all following levels?
         {
-            bDo = TRUE;
+            bDo = sal_True;
             if ( !ppLevel[nPos]->getShowEmpty() )
             {
                 //	this level is counted, following ones are not
-                bWasShowAll = FALSE;
+                bWasShowAll = sal_False;
             }
         }
         if ( bDo )
@@ -692,7 +692,7 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool
             pLevel->SetEnableLayout( bIsRow );           
 
             if ( pLevel->GetAutoShow().IsEnabled )
-                rHasAutoShow = TRUE;
+                rHasAutoShow = sal_True;
 
             if (bIsRow)
             {
@@ -794,7 +794,7 @@ void ScDPSource::CreateRes_Impl()
 {
     if ( !pResData )
     {
-        USHORT nDataOrient = GetDataLayoutOrientation();
+        sal_uInt16 nDataOrient = GetDataLayoutOrientation();
         if ( nDataDimCount > 1 && ( nDataOrient != sheet::DataPilotFieldOrientation_COLUMN &&
                                     nDataOrient != sheet::DataPilotFieldOrientation_ROW ) )
         {
@@ -809,7 +809,7 @@ void ScDPSource::CreateRes_Impl()
         String* pDataNames = NULL;
         sheet::DataPilotFieldReference* pDataRefValues = NULL;
         ScSubTotalFunc eDataFunctions[SC_DAPI_MAXFIELDS];
-        USHORT nDataRefOrient[SC_DAPI_MAXFIELDS];
+        sal_uInt16 nDataRefOrient[SC_DAPI_MAXFIELDS];
         if (nDataDimCount)
         {
             pDataNames = new String[nDataDimCount];
@@ -821,7 +821,7 @@ void ScDPSource::CreateRes_Impl()
 
         //	LateInit (initialize only those rows/children that are used) can be used unless
         //	any data dimension needs reference values from column/row dimensions
-        BOOL bLateInit = TRUE;
+        sal_Bool bLateInit = sal_True;
 
         // Go through all data dimensions (i.e. fields) and build their meta data
         // so that they can be passed on to ScDPResultData instance later.
@@ -859,7 +859,7 @@ void ScDPSource::CreateRes_Impl()
                     //	need fully initialized results to find reference values
                     //	(both in column or row dimensions), so updated values or
                     //	differences to 0 can be displayed even for empty results.
-                    bLateInit = FALSE;
+                    bLateInit = sal_False;
                 }
             }
 
@@ -920,7 +920,7 @@ void ScDPSource::CreateRes_Impl()
         if ( nRowLevelCount > 0 )
         {
             // disable layout flags for the innermost row field (level)
-            aInfo.aRowLevels[nRowLevelCount-1]->SetEnableLayout( FALSE );
+            aInfo.aRowLevels[nRowLevelCount-1]->SetEnableLayout( sal_False );
         }
 
         pRowResRoot->InitFrom( aInfo.aRowDims, aInfo.aRowLevels, 0, aInitState );
@@ -951,7 +951,7 @@ void ScDPSource::CreateRes_Impl()
             //	resulting table is too big -> abort before calculating
             //	(this relies on late init, so no members are allocated in InitFrom above)
 
-            bResultOverflow = TRUE;
+            bResultOverflow = sal_True;
         }
         else
         {
@@ -982,8 +982,8 @@ void ScDPSource::CreateRes_Impl()
 
                 //  Reset all results to empty, so they can be built again with data for the
                 //  desired members only.
-                pColResRoot->ResetResults( TRUE );
-                pRowResRoot->ResetResults( TRUE );
+                pColResRoot->ResetResults( sal_True );
+                pRowResRoot->ResetResults( sal_True );
                 pData->CalcResults(aInfo, true);
 
                 //  Call UpdateDataResults again, with the new (limited) values.
@@ -1021,7 +1021,7 @@ void ScDPSource::CreateRes_Impl()
 //UNUSED2009-05     pRowResRoot->DumpState( pColResRoot, pDoc, aDocPos );
 //UNUSED2009-05 }
 
-void ScDPSource::FillLevelList( USHORT nOrientation, List& rList )
+void ScDPSource::FillLevelList( sal_uInt16 nOrientation, List& rList )
 {
     rList.Clear();
 
@@ -1102,7 +1102,7 @@ void ScDPSource::FillMemberResults()
             // pColResDim->FillMemberResults( pColResults, 0, pResData->GetColStartMeasure() );
             long nPos = 0;
             pColResRoot->FillMemberResults( pColResults, nPos, pResData->GetColStartMeasure(),
-                                            TRUE, NULL, NULL );
+                                            sal_True, NULL, NULL );
         }
 
         FillLevelList( sheet::DataPilotFieldOrientation_ROW, aRowLevelList );
@@ -1118,7 +1118,7 @@ void ScDPSource::FillMemberResults()
             // pRowResDim->FillMemberResults( pRowResults, 0, pResData->GetRowStartMeasure() );
             long nPos = 0;
             pRowResRoot->FillMemberResults( pRowResults, nPos, pResData->GetRowStartMeasure(),
-                                            TRUE, NULL, NULL );
+                                            sal_True, NULL, NULL );
         }
     }
 }
@@ -1319,8 +1319,8 @@ sal_Bool SAL_CALL ScDPDimensions::hasByName( const rtl::OUString& aName ) throw(
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
         if ( getByIndex(i)->getName() == aName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 uno::Type SAL_CALL ScDPDimensions::getElementType() throw(uno::RuntimeException)
@@ -1375,7 +1375,7 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
     mpLayoutName(NULL),
     mpSubtotalName(NULL),
     nSourceDim( -1 ),
-    bHasSelectedPage( FALSE ),
+    bHasSelectedPage( sal_False ),
     pSelectedData( NULL ),
     mbHasHiddenMember(false)
 {
@@ -1432,12 +1432,12 @@ void SAL_CALL ScDPDimension::setName( const ::rtl::OUString& rNewName ) throw(un
     aName = String( rNewName );
 }
 
-USHORT ScDPDimension::getOrientation() const
+sal_uInt16 ScDPDimension::getOrientation() const
 {
     return pSource->GetOrientation( nDim );
 }
 
-void ScDPDimension::setOrientation(USHORT nNew)
+void ScDPDimension::setOrientation(sal_uInt16 nNew)
 {
     pSource->SetOrientation( nDim, nNew );
 }
@@ -1452,17 +1452,17 @@ void ScDPDimension::setPosition(long /* nNew */)
     //!	...
 }
 
-BOOL ScDPDimension::getIsDataLayoutDimension() const
+sal_Bool ScDPDimension::getIsDataLayoutDimension() const
 {
     return pSource->GetData()->getIsDataLayoutDimension( nDim );
 }
 
-USHORT ScDPDimension::getFunction() const
+sal_uInt16 ScDPDimension::getFunction() const
 {
     return nFunction;
 }
 
-void ScDPDimension::setFunction(USHORT nNew)
+void ScDPDimension::setFunction(sal_uInt16 nNew)
 {
     nFunction = nNew;
 }
@@ -1498,7 +1498,7 @@ uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno
     return CreateCloneObject();
 }
 
-BOOL ScDPDimension::isDuplicated() const
+sal_Bool ScDPDimension::isDuplicated() const
 {
     return (nSourceDim >= 0);
 }
@@ -1539,21 +1539,21 @@ const ScDPItemData& ScDPDimension::GetSelectedData()
         }
 
         if ( !pSelectedData )
-            pSelectedData = new ScDPItemData( aSelectedPage, 0.0, FALSE );		// default - name only
+            pSelectedData = new ScDPItemData( aSelectedPage, 0.0, sal_False );		// default - name only
     }
 
     return *pSelectedData;
 }
 
-//UNUSED2009-05 BOOL ScDPDimension::IsValidPage( const ScDPItemData& rData )
+//UNUSED2009-05 sal_Bool ScDPDimension::IsValidPage( const ScDPItemData& rData )
 //UNUSED2009-05 {
 //UNUSED2009-05     if ( bHasSelectedPage )
 //UNUSED2009-05         return rData.IsCaseInsEqual( GetSelectedData() );
 //UNUSED2009-05 
-//UNUSED2009-05     return TRUE;        // no selection -> all data
+//UNUSED2009-05     return sal_True;        // no selection -> all data
 //UNUSED2009-05 }
 
-BOOL ScDPDimension::IsVisible( const ScDPItemData& rData )
+sal_Bool ScDPDimension::IsVisible( const ScDPItemData& rData )
 {
     if( ScDPMembers* pMembers = this->GetHierarchiesObject()->getByIndex(0)->
         GetLevelsObject()->getByIndex(0)->GetMembersObject() )
@@ -1561,10 +1561,10 @@ BOOL ScDPDimension::IsVisible( const ScDPItemData& rData )
         for( long i = pMembers->getCount()-1; i>=0; i-- )
             if( ScDPMember *pDPMbr = pMembers->getByIndex( i ) )
                 if( rData.IsCaseInsEqual( pDPMbr->GetItemData() ) && !pDPMbr->getIsVisible() )
-                    return FALSE;
+                    return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 // XPropertySet
 
@@ -1603,13 +1603,13 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
     String aNameStr = aPropertyName;
     if ( aNameStr.EqualsAscii( SC_UNO_POSITION ) )
     {
-        INT32 nInt = 0;
+        sal_Int32 nInt = 0;
         if (aValue >>= nInt)
             setPosition( nInt );
     }
     else if ( aNameStr.EqualsAscii( SC_UNO_USEDHIER ) )
     {
-        INT32 nInt = 0;
+        sal_Int32 nInt = 0;
         if (aValue >>= nInt)
             setUsedHierarchy( nInt );
     }
@@ -1617,19 +1617,19 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
     {
         sheet::DataPilotFieldOrientation eEnum;
         if (aValue >>= eEnum)
-            setOrientation( sal::static_int_cast<USHORT>(eEnum) );
+            setOrientation( sal::static_int_cast<sal_uInt16>(eEnum) );
     }
     else if ( aNameStr.EqualsAscii( SC_UNO_FUNCTION ) )
     {
         sheet::GeneralFunction eEnum;
         if (aValue >>= eEnum)
-            setFunction( sal::static_int_cast<USHORT>(eEnum) );
+            setFunction( sal::static_int_cast<sal_uInt16>(eEnum) );
     }
     else if ( aNameStr.EqualsAscii( SC_UNO_REFVALUE ) )
         aValue >>= aReferenceValue;
     else if ( aNameStr.EqualsAscii( SC_UNO_FILTER ) )
     {
-        BOOL bDone = FALSE;
+        sal_Bool bDone = sal_False;
         uno::Sequence<sheet::TableFilterField> aSeq;
         if (aValue >>= aSeq)
         {
@@ -1637,8 +1637,8 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
             if ( nLength == 0 )
             {
                 aSelectedPage.Erase();
-                bHasSelectedPage = FALSE;
-                bDone = TRUE;
+                bHasSelectedPage = sal_False;
+                bDone = sal_True;
             }
             else if ( nLength == 1 )
             {
@@ -1646,8 +1646,8 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
                 if ( rField.Field == 0 && rField.Operator == sheet::FilterOperator_EQUAL && !rField.IsNumeric )
                 {
                     aSelectedPage = rField.StringValue;
-                    bHasSelectedPage = TRUE;
-                    bDone = TRUE;
+                    bHasSelectedPage = sal_True;
+                    bDone = sal_True;
                 }
             }
         }
@@ -1839,8 +1839,8 @@ sal_Bool SAL_CALL ScDPHierarchies::hasByName( const rtl::OUString& aName ) throw
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
         if ( getByIndex(i)->getName() == aName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 uno::Type SAL_CALL ScDPHierarchies::getElementType() throw(uno::RuntimeException)
@@ -2023,8 +2023,8 @@ sal_Bool SAL_CALL ScDPLevels::hasByName( const rtl::OUString& aName ) throw(uno:
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
         if ( getByIndex(i)->getName() == aName )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 uno::Type SAL_CALL ScDPLevels::getElementType() throw(uno::RuntimeException)
@@ -2071,19 +2071,19 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const
 class ScDPGlobalMembersOrder
 {
     ScDPLevel&  rLevel;
-    BOOL        bAscending;
+    sal_Bool        bAscending;
 
 public:
-            ScDPGlobalMembersOrder( ScDPLevel& rLev, BOOL bAsc ) :
+            ScDPGlobalMembersOrder( ScDPLevel& rLev, sal_Bool bAsc ) :
                 rLevel(rLev),
                 bAscending(bAsc)
             {}
             ~ScDPGlobalMembersOrder() {}
 
-    BOOL operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
+    sal_Bool operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const;
 };
 
-BOOL ScDPGlobalMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
+sal_Bool ScDPGlobalMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) const
 {
     sal_Int32 nCompare = 0;
     // seems that some ::std::sort() implementations pass the same index twice
@@ -2105,11 +2105,11 @@ ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) :
     nHier( nH ),
     nLev( nL ),
     pMembers( NULL ),
-    bShowEmpty( FALSE ),
+    bShowEmpty( sal_False ),
     aSortInfo( EMPTY_STRING, sal_True, sheet::DataPilotFieldSortMode::NAME ),   // default: sort by name
     nSortMeasure( 0 ),
     nAutoMeasure( 0 ),
-    bEnableLayout( FALSE )
+    bEnableLayout( sal_False )
 {
     //!	hold pSource
     //	aSubTotals is empty
@@ -2157,7 +2157,7 @@ void ScDPLevel::EvaluateSortOrder()
                     aGlobalOrder[nPos] = nPos;
 
                 // allow manual or name (manual is always ascending)
-                BOOL bAscending = ( aSortInfo.Mode == sheet::DataPilotFieldSortMode::MANUAL || aSortInfo.IsAscending );
+                sal_Bool bAscending = ( aSortInfo.Mode == sheet::DataPilotFieldSortMode::MANUAL || aSortInfo.IsAscending );
                 ScDPGlobalMembersOrder aComp( *this, bAscending );
                 ::std::sort( aGlobalOrder.begin(), aGlobalOrder.end(), aComp );
             }
@@ -2183,7 +2183,7 @@ void ScDPLevel::EvaluateSortOrder()
     }
 }
 
-void ScDPLevel::SetEnableLayout( BOOL bSet )
+void ScDPLevel::SetEnableLayout( sal_Bool bSet )
 {
     bEnableLayout = bSet;
 }
@@ -2291,12 +2291,12 @@ void ScDPLevel::setSubTotals(const uno::Sequence<sheet::GeneralFunction>& rNew)
     //!	set "manual change" flag?
 }
 
-BOOL ScDPLevel::getShowEmpty() const
+sal_Bool ScDPLevel::getShowEmpty() const
 {
     return bShowEmpty;
 }
 
-void ScDPLevel::setShowEmpty(BOOL bSet)
+void ScDPLevel::setShowEmpty(sal_Bool bSet)
 {
     bShowEmpty = bSet;
 }
@@ -2645,7 +2645,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
                 if ( !aName.Len() )
                     aName = String::CreateFromInt32(nVal);
                    
-                            ScDPItemData  rData( aName, nVal, TRUE, 0 ) ;
+                            ScDPItemData  rData( aName, nVal, sal_True, 0 ) ;
                     pNew = new ScDPMember( pSource, nDim, nHier, nLev, pSource->GetCache()->GetAdditionalItemID(rData));
             }
             else
@@ -2668,7 +2668,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
 // -----------------------------------------------------------------------
 
 ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
-                        SCROW nIndex /*const String& rN, double fV, BOOL bHV*/ ) :
+                        SCROW nIndex /*const String& rN, double fV, sal_Bool bHV*/ ) :
     pSource( pSrc ),
     nDim( nD ),
     nHier( nH ),
@@ -2676,8 +2676,8 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
     mnDataId( nIndex ),
     mpLayoutName(NULL),
     nPosition( -1 ),
-    bVisible( TRUE ),
-    bShowDet( TRUE )
+    bVisible( sal_True ),
+    bShowDet( sal_True )
 {
     //!	hold pSource
 }
@@ -2687,7 +2687,7 @@ ScDPMember::~ScDPMember()
     //!	release pSource
 }
 
-BOOL ScDPMember::IsNamedItem( const ScDPItemData& r ) const
+sal_Bool ScDPMember::IsNamedItem( const ScDPItemData& r ) const
 {
     long nSrcDim = pSource->GetSourceDim( nDim );
     if ( nHier != SC_DAPI_HIERARCHY_FLAT && pSource->IsDateDimension( nSrcDim ) && r.IsValue() )
@@ -2703,7 +2703,7 @@ BOOL ScDPMember::IsNamedItem( const ScDPItemData& r ) const
     return r.IsCaseInsEqual( GetItemData() );
 }
 
-BOOL ScDPMember::IsNamedItem( SCROW    nIndex ) const
+sal_Bool ScDPMember::IsNamedItem( SCROW    nIndex ) const
 {
     long nSrcDim = pSource->GetSourceDim( nDim );
     if ( nHier != SC_DAPI_HIERARCHY_FLAT && pSource->IsDateDimension( nSrcDim ) )
@@ -2774,23 +2774,23 @@ void SAL_CALL ScDPMember::setName( const ::rtl::OUString& /* rNewName */ ) throw
     DBG_ERROR("not implemented");		//! exception?
 }
 
-BOOL ScDPMember::getIsVisible() const
+sal_Bool ScDPMember::getIsVisible() const
 {
     return bVisible;
 }
 
-void ScDPMember::setIsVisible(BOOL bSet)
+void ScDPMember::setIsVisible(sal_Bool bSet)
 {
     bVisible = bSet;
     //!	set "manual change" flag
 }
 
-BOOL ScDPMember::getShowDetails() const
+sal_Bool ScDPMember::getShowDetails() const
 {
     return bShowDet;
 }
 
-void ScDPMember::setShowDetails(BOOL bSet)
+void ScDPMember::setShowDetails(sal_Bool bSet)
 {
     bShowDet = bSet;
     //!	set "manual change" flag
diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx
index 1b635098b..7380ae2d1 100644
--- a/sc/source/core/data/drawpage.cxx
+++ b/sc/source/core/data/drawpage.cxx
@@ -43,7 +43,7 @@
 
 // -----------------------------------------------------------------------
 
-ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, BOOL bMasterPage) :
+ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, sal_Bool bMasterPage) :
     FmFormPage(rNewModel, pBasic, bMasterPage)
 {
     SetSize( Size( LONG_MAX, LONG_MAX ) );
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 271882427..6ffc57128 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -101,12 +101,12 @@ TYPEINIT1(ScTabSizeChangedHint, SfxHint);
 
 static ScDrawObjFactory* pFac = NULL;
 static E3dObjFactory* pF3d = NULL;
-static USHORT nInst = 0;
+static sal_uInt16 nInst = 0;
 
 SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL;
 //REMOVE	SvPersist* ScDrawLayer::pGlobalDrawPersist = NULL;
 
-BOOL bDrawIsInUndo = FALSE;			//! Member
+sal_Bool bDrawIsInUndo = sal_False;			//! Member
 
 // -----------------------------------------------------------------------
 
@@ -211,13 +211,13 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
                  pGlobalDrawPersist ?
                      pGlobalDrawPersist :
                      ( pDocument ? pDocument->GetDocumentShell() : NULL ),
-                 TRUE ),		// bUseExtColorTable (is set below)
+                 sal_True ),		// bUseExtColorTable (is set below)
     aName( rName ),
     pDoc( pDocument ),
     pUndoGroup( NULL ),
-    bRecording( FALSE ),
-    bAdjustEnabled( TRUE ),
-    bHyphenatorSet( FALSE )
+    bRecording( sal_False ),
+    bAdjustEnabled( sal_True ),
+    bHyphenatorSet( sal_False )
 {
     pGlobalDrawPersist = NULL;			// nur einmal benutzen
 
@@ -234,8 +234,8 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
     else
         SetColorTable( XColorTable::GetStdColorTable() );
 
-    SetSwapGraphics(TRUE);
-//	SetSwapAsynchron(TRUE);		// an der View
+    SetSwapGraphics(sal_True);
+//	SetSwapAsynchron(sal_True);		// an der View
 
     SetScaleUnit(MAP_100TH_MM);
     SfxItemPool& rPool = GetItemPool();
@@ -254,7 +254,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
          eOfficeLanguage == LANGUAGE_JAPANESE )
     {
         // secondary is edit engine pool
-        rPool.GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( FALSE, EE_PARA_ASIANCJKSPACING ) );
+        rPool.GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( sal_False, EE_PARA_ASIANCJKSPACING ) );
     }
 
     rPool.FreezeIdRanges();							// the pool is also used directly
@@ -318,7 +318,7 @@ void ScDrawLayer::UseHyphenator()
         GetDrawOutliner().SetHyphenator( xHyphenator );
         GetHitTestOutliner().SetHyphenator( xHyphenator );
 
-        bHyphenatorSet = TRUE;
+        bHyphenatorSet = sal_True;
     }
 }
 
@@ -326,18 +326,18 @@ SdrPage* __EXPORT ScDrawLayer::AllocPage(FASTBOOL bMasterPage)
 {
     //	don't create basic until it is needed
     StarBASIC* pBasic = NULL;
-    ScDrawPage* pPage = new ScDrawPage( *this, pBasic, sal::static_int_cast<BOOL>(bMasterPage) );
+    ScDrawPage* pPage = new ScDrawPage( *this, pBasic, sal::static_int_cast<sal_Bool>(bMasterPage) );
     return pPage;
 }
 
-BOOL ScDrawLayer::HasObjects() const
+sal_Bool ScDrawLayer::HasObjects() const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
-    USHORT nCount = GetPageCount();
-    for (USHORT i=0; i<nCount && !bFound; i++)
+    sal_uInt16 nCount = GetPageCount();
+    for (sal_uInt16 i=0; i<nCount && !bFound; i++)
         if (GetPage(i)->GetObjCount())
-            bFound = TRUE;
+            bFound = sal_True;
 
     return bFound;
 }
@@ -371,17 +371,17 @@ Window* __EXPORT ScDrawLayer::GetCurDocViewWin()
     return NULL;
 }
 
-BOOL ScDrawLayer::ScAddPage( SCTAB nTab )
+sal_Bool ScDrawLayer::ScAddPage( SCTAB nTab )
 {
     if (bDrawIsInUndo)
-        return FALSE;   // not inserted
+        return sal_False;   // not inserted
 
-    ScDrawPage* pPage = (ScDrawPage*)AllocPage( FALSE );
+    ScDrawPage* pPage = (ScDrawPage*)AllocPage( sal_False );
     InsertPage(pPage, static_cast<sal_uInt16>(nTab));
     if (bRecording)
         AddCalcUndo(new SdrUndoNewPage(*pPage));
 
-    return TRUE;        // inserted
+    return sal_True;        // inserted
 }
 
 void ScDrawLayer::ScRemovePage( SCTAB nTab )
@@ -407,20 +407,20 @@ void ScDrawLayer::ScRenamePage( SCTAB nTab, const String& rNewName )
         pPage->SetName(rNewName);
 }
 
-void ScDrawLayer::ScMovePage( USHORT nOldPos, USHORT nNewPos )
+void ScDrawLayer::ScMovePage( sal_uInt16 nOldPos, sal_uInt16 nNewPos )
 {
     MovePage( nOldPos, nNewPos );
 }
 
-void ScDrawLayer::ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc )
+void ScDrawLayer::ScCopyPage( sal_uInt16 nOldPos, sal_uInt16 nNewPos, sal_Bool bAlloc )
 {
-    //!	remove argument bAlloc (always FALSE)
+    //!	remove argument bAlloc (always sal_False)
 
     if (bDrawIsInUndo)
         return;
 
     SdrPage* pOldPage = GetPage(nOldPos);
-    SdrPage* pNewPage = bAlloc ? AllocPage(FALSE) : GetPage(nNewPos);
+    SdrPage* pNewPage = bAlloc ? AllocPage(sal_False) : GetPage(nNewPos);
 
     // kopieren
 
@@ -449,7 +449,7 @@ void ScDrawLayer::ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc )
         InsertPage(pNewPage, nNewPos);
 }
 
-inline BOOL IsInBlock( const ScAddress& rPos, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 )
+inline sal_Bool IsInBlock( const ScAddress& rPos, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 )
 {
     return rPos.Col() >= nCol1 && rPos.Col() <= nCol2 &&
            rPos.Row() >= nRow1 && rPos.Row() <= nRow2;
@@ -463,10 +463,10 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC
     if (!pPage)
         return;
 
-    BOOL bNegativePage = pDoc && pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc && pDoc->IsNegativePage( nTab );
 
-    ULONG nCount = pPage->GetObjCount();
-    for ( ULONG i = 0; i < nCount; i++ )
+    sal_uLong nCount = pPage->GetObjCount();
+    for ( sal_uLong i = 0; i < nCount; i++ )
     {
         SdrObject* pObj = pPage->GetObj( i );
         ScDrawObjData* pData = GetObjDataTab( pObj, nTab );
@@ -474,18 +474,18 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC
         {
             const ScAddress aOldStt = pData->maStart;
             const ScAddress aOldEnd = pData->maEnd;
-            BOOL bChange = FALSE;
+            sal_Bool bChange = sal_False;
             if ( aOldStt.IsValid() && IsInBlock( aOldStt, nCol1,nRow1, nCol2,nRow2 ) )
             {
                 pData->maStart.IncCol( nDx );
                 pData->maStart.IncRow( nDy );
-                bChange = TRUE;
+                bChange = sal_True;
             }
             if ( aOldEnd.IsValid() && IsInBlock( aOldEnd, nCol1,nRow1, nCol2,nRow2 ) )
             {
                 pData->maEnd.IncCol( nDx );
                 pData->maEnd.IncRow( nDy );
-                bChange = TRUE;
+                bChange = sal_True;
             }
             if (bChange)
             {
@@ -498,7 +498,7 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC
     }
 }
 
-void ScDrawLayer::SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos )
+void ScDrawLayer::SetPageSize( sal_uInt16 nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos )
 {
     SdrPage* pPage = GetPage(nPageNo);
     if (pPage)
@@ -513,10 +513,10 @@ void ScDrawLayer::SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNo
         //	auch wenn Groesse gleich geblieben ist
         //	(einzelne Zeilen/Spalten koennen geaendert sein)
 
-        BOOL bNegativePage = pDoc && pDoc->IsNegativePage( static_cast<SCTAB>(nPageNo) );
+        sal_Bool bNegativePage = pDoc && pDoc->IsNegativePage( static_cast<SCTAB>(nPageNo) );
 
-        ULONG nCount = pPage->GetObjCount();
-        for ( ULONG i = 0; i < nCount; i++ )
+        sal_uLong nCount = pPage->GetObjCount();
+        for ( sal_uLong i = 0; i < nCount; i++ )
         {
             SdrObject* pObj = pPage->GetObj( i );
             ScDrawObjData* pData = GetObjDataTab( pObj, static_cast<SCTAB>(nPageNo) );
@@ -702,18 +702,18 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
     }
 }
 
-BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const
+sal_Bool ScDrawLayer::GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool bSetVer ) const
 {
     DBG_ASSERT( pDoc, "ScDrawLayer::GetPrintArea without document" );
     if ( !pDoc )
-        return FALSE;
+        return sal_False;
 
     SCTAB nTab = rRange.aStart.Tab();
     DBG_ASSERT( rRange.aEnd.Tab() == nTab, "GetPrintArea: Tab unterschiedlich" );
 
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
 
-    BOOL bAny = FALSE;
+    sal_Bool bAny = sal_False;
     long nEndX = 0;
     long nEndY = 0;
     long nStartX = LONG_MAX;
@@ -762,11 +762,11 @@ BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) co
                             //! Flags (ausgeblendet?) testen
 
             Rectangle aObjRect = pObject->GetCurrentBoundRect();
-            BOOL bFit = TRUE;
+            sal_Bool bFit = sal_True;
             if ( !bSetHor && ( aObjRect.Right() < nStartX || aObjRect.Left() > nEndX ) )
-                bFit = FALSE;
+                bFit = sal_False;
             if ( !bSetVer && ( aObjRect.Bottom() < nStartY || aObjRect.Top() > nEndY ) )
-                bFit = FALSE;
+                bFit = sal_False;
             if ( bFit )
             {
                 if (bSetHor)
@@ -779,7 +779,7 @@ BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) co
                     if (aObjRect.Top()  < nStartY) nStartY = aObjRect.Top();
                     if (aObjRect.Bottom() > nEndY) nEndY = aObjRect.Bottom();
                 }
-                bAny = TRUE;
+                bAny = sal_True;
             }
 
             pObject = aIter.Next();
@@ -860,7 +860,7 @@ void ScDrawLayer::BeginCalcUndo()
 //! DBG_ASSERT( !bRecording, "BeginCalcUndo ohne GetCalcUndo" );
 
     DELETEZ(pUndoGroup);
-    bRecording = TRUE;
+    bRecording = sal_True;
 }
 
 SdrUndoGroup* ScDrawLayer::GetCalcUndo()
@@ -869,7 +869,7 @@ SdrUndoGroup* ScDrawLayer::GetCalcUndo()
 
     SdrUndoGroup* pRet = pUndoGroup;
     pUndoGroup = NULL;
-    bRecording = FALSE;
+    bRecording = sal_False;
     return pRet;
 }
 
@@ -885,16 +885,16 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
     if (!pPage)
         return;
 
-    BOOL bNegativePage = pDoc && pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc && pDoc->IsNegativePage( nTab );
 
     // fuer Shrinking!
     Rectangle aNew( rArea );
-    BOOL bShrink = FALSE;
+    sal_Bool bShrink = sal_False;
     if ( rMove.X() < 0 || rMove.Y() < 0 )		// verkleinern
     {
         if ( rTopLeft != rArea.TopLeft() )		// sind gleich beim Verschieben von Zellen
         {
-            bShrink = TRUE;
+            bShrink = sal_True;
             aNew.Left() = rTopLeft.X();
             aNew.Top() = rTopLeft.Y();
         }
@@ -916,14 +916,14 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
             }
             else if ( pObject->IsPolyObj() && pObject->GetPointCount()==2 )
             {
-                for (USHORT i=0; i<2; i++)
+                for (sal_uInt16 i=0; i<2; i++)
                 {
-                    BOOL bMoved = FALSE;
+                    sal_Bool bMoved = sal_False;
                     Point aPoint = pObject->GetPoint(i);
                     lcl_ReverseTwipsToMM( aPoint );
                     if (rArea.IsInside(aPoint))
                     {
-                        aPoint += rMove; bMoved = TRUE;
+                        aPoint += rMove; bMoved = sal_True;
                     }
                     else if (bShrink && aNew.IsInside(aPoint))
                     {
@@ -932,13 +932,13 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
                         {
                             aPoint.X() = rArea.Left() + rMove.X() - SHRINK_DIST_TWIPS;
                             if ( aPoint.X() < 0 ) aPoint.X() = 0;
-                            bMoved = TRUE;
+                            bMoved = sal_True;
                         }
                         if ( rMove.Y() && aPoint.Y() >= rArea.Top() + rMove.Y() )
                         {
                             aPoint.Y() = rArea.Top() + rMove.Y() - SHRINK_DIST_TWIPS;
                             if ( aPoint.Y() < 0 ) aPoint.Y() = 0;
-                            bMoved = TRUE;
+                            bMoved = sal_True;
                         }
                     }
                     if( bMoved )
@@ -957,11 +957,11 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
                 lcl_ReverseTwipsToMM( aObjRect );
                 Point aTopLeft = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft();	// logical left
                 Size aMoveSize;
-                BOOL bDoMove = FALSE;
+                sal_Bool bDoMove = sal_False;
                 if (rArea.IsInside(aTopLeft))
                 {
                     aMoveSize = Size(rMove.X(),rMove.Y());
-                    bDoMove = TRUE;
+                    bDoMove = sal_True;
                 }
                 else if (bShrink && aNew.IsInside(aTopLeft))
                 {
@@ -969,12 +969,12 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
                     if ( rMove.X() && aTopLeft.X() >= rArea.Left() + rMove.X() )
                     {
                         aMoveSize.Width() = rArea.Left() + rMove.X() - SHRINK_DIST - aTopLeft.X();
-                        bDoMove = TRUE;
+                        bDoMove = sal_True;
                     }
                     if ( rMove.Y() && aTopLeft.Y() >= rArea.Top() + rMove.Y() )
                     {
                         aMoveSize.Height() = rArea.Top() + rMove.Y() - SHRINK_DIST - aTopLeft.Y();
-                        bDoMove = TRUE;
+                        bDoMove = sal_True;
                     }
                 }
                 if ( bDoMove )
@@ -1019,7 +1019,7 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
 }
 
 void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
-                            SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos )
+                            SCsCOL nDx,SCsROW nDy, sal_Bool bInsDel, bool bUpdateNoteCaptionPos )
 {
     DBG_ASSERT( pDoc, "ScDrawLayer::MoveArea without document" );
     if ( !pDoc )
@@ -1028,7 +1028,7 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR
     if (!bAdjustEnabled)
         return;
 
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
 
     Rectangle aRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab );
     lcl_ReverseTwipsToMM( aRect );
@@ -1094,7 +1094,7 @@ void ScDrawLayer::WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips )
 
     //!	aTopLeft ist falsch, wenn mehrere Spalten auf einmal ausgeblendet werden
 
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
     if ( bNegativePage )
     {
         MirrorRectRTL( aRect );
@@ -1127,7 +1127,7 @@ void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips )
 
     //!	aTopLeft ist falsch, wenn mehrere Zeilen auf einmal ausgeblendet werden
 
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
     if ( bNegativePage )
     {
         MirrorRectRTL( aRect );
@@ -1137,11 +1137,11 @@ void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips )
     MoveAreaTwips( nTab, aRect, Point( 0,nDifTwips ), aTopLeft );
 }
 
-BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
+sal_Bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes )
 {
     DBG_ASSERT( pDoc, "ScDrawLayer::HasObjectsInRows without document" );
     if ( !pDoc )
-        return FALSE;
+        return sal_False;
 
     Rectangle aTestRect;
 
@@ -1161,16 +1161,16 @@ BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
     aTestRect.Left()  = 0;
     aTestRect.Right() = MAXMM;
 
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
     if ( bNegativePage )
         MirrorRectRTL( aTestRect );
 
     SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab));
     DBG_ASSERT(pPage,"Page nicht gefunden");
     if (!pPage)
-        return FALSE;
+        return sal_False;
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     Rectangle aObjRect;
     SdrObjListIter aIter( *pPage );
@@ -1178,8 +1178,10 @@ BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
     while ( pObject && !bFound )
     {
         aObjRect = pObject->GetSnapRect();	//! GetLogicRect ?
-        if (aTestRect.IsInside(aObjRect.TopLeft()) || aTestRect.IsInside(aObjRect.BottomLeft()))
-            bFound = TRUE;
+        // #i116164# note captions are handled separately, don't have to be included for each single row height change
+        if ( (aTestRect.IsInside(aObjRect.TopLeft()) || aTestRect.IsInside(aObjRect.BottomLeft())) &&
+             (bIncludeNotes || !IsNoteCaption(pObject)) )
+            bFound = sal_True;
 
         pObject = aIter.Next();
     }
@@ -1198,7 +1200,7 @@ void ScDrawLayer::DeleteObjects( SCTAB nTab )
     pPage->RecalcObjOrdNums();
 
     long	nDelCount = 0;
-    ULONG	nObjCount = pPage->GetObjCount();
+    sal_uLong	nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
         SdrObject** ppObj = new SdrObject*[nObjCount];
@@ -1240,7 +1242,7 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
     pPage->RecalcObjOrdNums();
 
     long	nDelCount = 0;
-    ULONG	nObjCount = pPage->GetObjCount();
+    sal_uLong	nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
         Rectangle aDelRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab );
@@ -1296,7 +1298,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
             {
                 pPage->RecalcObjOrdNums();
                 long	nDelCount = 0;
-                ULONG	nObjCount = pPage->GetObjCount();
+                sal_uLong	nObjCount = pPage->GetObjCount();
                 if (nObjCount)
                 {
                     //	Rechteck um die ganze Selektion
@@ -1402,7 +1404,7 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle&
     }
 }
 
-BOOL lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange& rClipRange )
+sal_Bool lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange& rClipRange )
 {
     //	check if every range of rRangesVector is completely in rClipRange
 
@@ -1410,30 +1412,30 @@ BOOL lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const
     for( ;aIt!=rRangesVector.end(); ++aIt )
     {
         const ScRangeList& rRanges = *aIt;
-        ULONG nCount = rRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = rRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScRange aRange = *rRanges.GetObject(i);
             if ( !rClipRange.In( aRange ) )
             {
-                return FALSE;	// at least one range is not valid
+                return sal_False;	// at least one range is not valid
             }
         }
     }
 
-    return TRUE;			// everything is fine
+    return sal_True;			// everything is fine
 }
 
-BOOL lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos )
+sal_Bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
     ::std::vector< ScRangeList >::iterator aIt = rRangesVector.begin();
     for( ;aIt!=rRangesVector.end(); ++aIt )
     {
         ScRangeList& rRanges = *aIt;
-        ULONG nCount = rRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = rRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScRange* pRange = rRanges.GetObject(i);
             if ( rSourceRange.In( *pRange ) )
@@ -1442,7 +1444,7 @@ BOOL lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange&
                 SCsROW nDiffY = rDestPos.Row() - (SCsROW)rSourceRange.aStart.Row();
                 SCsTAB nDiffZ = rDestPos.Tab() - (SCsTAB)rSourceRange.aStart.Tab();
                 pRange->Move( nDiffX, nDiffY, nDiffZ );
-                bChanged = TRUE;
+                bChanged = sal_True;
             }
         }
     }
@@ -1466,7 +1468,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
         return;
     }
 
-    BOOL bMirrorObj = ( rSourceRange.Left() < 0 && rSourceRange.Right() < 0 &&
+    sal_Bool bMirrorObj = ( rSourceRange.Left() < 0 && rSourceRange.Right() < 0 &&
                         rDestRange.Left()   > 0 && rDestRange.Right()   > 0 ) ||
                       ( rSourceRange.Left() > 0 && rSourceRange.Right() > 0 &&
                         rDestRange.Left()   < 0 && rDestRange.Right()   < 0 );
@@ -1489,13 +1491,13 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
     //  a clipboard document and its source share the same document item pool,
     //  so the pointers can be compared to see if this is copy&paste within
     //  the same document
-    BOOL bSameDoc = pDoc && pClipDoc && pDoc->GetPool() == pClipDoc->GetPool();
-    BOOL bDestClip = pDoc && pDoc->IsClipboard();
+    sal_Bool bSameDoc = pDoc && pClipDoc && pDoc->GetPool() == pClipDoc->GetPool();
+    sal_Bool bDestClip = pDoc && pDoc->IsClipboard();
 
     //#i110034# charts need correct sheet names for xml range conversion during load
     //so the target sheet name is temporarily renamed (if we have any SdrObjects)
     String aDestTabName;
-    BOOL bRestoreDestTabName = FALSE;
+    sal_Bool bRestoreDestTabName = sal_False;
     if( pOldObject && !bSameDoc && !bDestClip )
     {
         if( pDoc && pClipDoc )
@@ -1507,7 +1509,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
                 if( !(aSourceTabName==aDestTabName) &&
                     pDoc->ValidNewTabName(aSourceTabName) )
                 {
-                    bRestoreDestTabName = pDoc->RenameTab( nDestTab, aSourceTabName ); //BOOL bUpdateRef = TRUE, BOOL bExternalDocument = FALSE
+                    bRestoreDestTabName = pDoc->RenameTab( nDestTab, aSourceTabName ); //sal_Bool bUpdateRef = sal_True, sal_Bool bExternalDocument = sal_False
                 }
             }
         }
@@ -1526,18 +1528,18 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
 
     Fraction aHorFract(1,1);
     Fraction aVerFract(1,1);
-    BOOL bResize = FALSE;
+    sal_Bool bResize = sal_False;
     // sizes can differ by 1 from twips->1/100mm conversion for equal cell sizes,
     // don't resize to empty size when pasting into hidden columns or rows
     if ( Abs(nWidthDiff) > 1 && nDestWidth > 1 && nSourceWidth > 1 )
     {
         aHorFract = Fraction( nDestWidth, nSourceWidth );
-        bResize = TRUE;
+        bResize = sal_True;
     }
     if ( Abs(nHeightDiff) > 1 && nDestHeight > 1 && nSourceHeight > 1 )
     {
         aVerFract = Fraction( nDestHeight, nSourceHeight );
-        bResize = TRUE;
+        bResize = sal_True;
     }
     Point aRefPos = rDestRange.TopLeft();		// for resizing (after moving)
 
@@ -1591,7 +1593,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
                         pDoc->GetChartRanges( aChartName, aRangesVector, pDoc );
                         if( !aRangesVector.empty() )
                         {
-                            BOOL bInSourceRange = FALSE;
+                            sal_Bool bInSourceRange = sal_False;
                             ScRange aClipRange;
                             if ( pClipDoc )
                             {
@@ -1600,7 +1602,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
                                 SCCOL nClipEndX;
                                 SCROW nClipEndY;
                                 pClipDoc->GetClipStart( nClipStartX, nClipStartY );
-                                pClipDoc->GetClipArea( nClipEndX, nClipEndY, TRUE );
+                                pClipDoc->GetClipArea( nClipEndX, nClipEndY, sal_True );
                                 nClipEndX = nClipEndX + nClipStartX;
                                 nClipEndY += nClipStartY;   // GetClipArea returns the difference
 
@@ -1655,11 +1657,11 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
 
 void ScDrawLayer::MirrorRTL( SdrObject* pObj )
 {
-    UINT16 nIdent = pObj->GetObjIdentifier();
+    sal_uInt16 nIdent = pObj->GetObjIdentifier();
 
     //	don't mirror OLE or graphics, otherwise ask the object
     //	if it can be mirrored
-    BOOL bCanMirror = ( nIdent != OBJ_GRAF && nIdent != OBJ_OLE2 );
+    sal_Bool bCanMirror = ( nIdent != OBJ_GRAF && nIdent != OBJ_OLE2 );
     if (bCanMirror)
     {
         SdrObjTransformInfoRec aInfo;
@@ -1757,7 +1759,7 @@ String ScDrawLayer::GetVisibleName( SdrObject* pObj )
 
 inline sal_Bool IsNamedObject( SdrObject* pObj, const String& rName )
 {
-    //	TRUE if rName is the object's Name or PersistName
+    //	sal_True if rName is the object's Name or PersistName
     //	(used to find a named object)
 
     return ( pObj->GetName() == rName ||
@@ -1765,7 +1767,7 @@ inline sal_Bool IsNamedObject( SdrObject* pObj, const String& rName )
               static_cast<SdrOle2Obj*>(pObj)->GetPersistName() == rName ) );
 }
 
-SdrObject* ScDrawLayer::GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const
+SdrObject* ScDrawLayer::GetNamedObject( const String& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const
 {
     sal_uInt16 nTabCount = GetPageCount();
     for (sal_uInt16 nTab=0; nTab<nTabCount; nTab++)
@@ -1798,7 +1800,7 @@ String ScDrawLayer::GetNewGraphicName( long* pnCounter ) const
     String aBase = ScGlobal::GetRscString(STR_GRAPHICNAME);
     aBase += ' ';
 
-    BOOL bThere = TRUE;
+    sal_Bool bThere = sal_True;
     String aGraphicName;
     SCTAB nDummy;
     long nId = pnCounter ? *pnCounter : 0;
@@ -1865,10 +1867,10 @@ ScAnchorType ScDrawLayer::GetAnchor( const SdrObject* pObj )
     return ( aAnchor.Y() != 0 ) ? SCA_PAGE : SCA_CELL;
 }
 
-ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate )		// static
+ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, sal_Bool bCreate )		// static
 {
-    USHORT nCount = pObj ? pObj->GetUserDataCount() : 0;
-    for( USHORT i = 0; i < nCount; i++ )
+    sal_uInt16 nCount = pObj ? pObj->GetUserDataCount() : 0;
+    for( sal_uInt16 i = 0; i < nCount; i++ )
     {
         SdrObjUserData* pData = pObj->GetUserData( i );
         if( pData && pData->GetInventor() == SC_DRAWLAYER
@@ -1911,8 +1913,8 @@ ScDrawObjData* ScDrawLayer::GetNoteCaptionData( SdrObject* pObj, SCTAB nTab )
 
 ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj )				// static
 {
-    USHORT nCount = pObj->GetUserDataCount();
-    for( USHORT i = 0; i < nCount; i++ )
+    sal_uInt16 nCount = pObj->GetUserDataCount();
+    for( sal_uInt16 i = 0; i < nCount; i++ )
     {
         SdrObjUserData* pData = pObj->GetUserData( i );
         if( pData && pData->GetInventor() == SC_DRAWLAYER
@@ -1938,7 +1940,7 @@ IMapObject*	ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
         Size		aGraphSize;
         ImageMap&	rImageMap = (ImageMap&) pIMapInfo->GetImageMap();
         Graphic		aGraphic;
-        BOOL		bObjSupported = FALSE;
+        sal_Bool		bObjSupported = sal_False;
 
         if ( pObj->ISA( SdrGrafObj )  ) // einfaches Grafik-Objekt
         {
@@ -1967,13 +1969,13 @@ IMapObject*	ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
                                                          rGraphic.GetPrefMapMode(),
                                                          aMap100 );
 
-            bObjSupported = TRUE;
+            bObjSupported = sal_True;
         }
         else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
         {
             // TODO/LEAN: working with visual area needs running state
             aGraphSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize();
-            bObjSupported = TRUE;
+            bObjSupported = sal_True;
         }
 
         // hat alles geklappt, dann HitTest ausfuehren
@@ -1988,10 +1990,10 @@ IMapObject*	ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
     return pIMapObj;
 }
 
-ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate )             // static
+ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, sal_Bool bCreate )             // static
 {
-    USHORT nCount = pObj->GetUserDataCount();
-    for( USHORT i = 0; i < nCount; i++ )
+    sal_uInt16 nCount = pObj->GetUserDataCount();
+    for( sal_uInt16 i = 0; i < nCount; i++ )
     {
         SdrObjUserData* pData = pObj->GetUserData( i );
         if( pData && pData->GetInventor() == SC_DRAWLAYER
@@ -2016,7 +2018,7 @@ void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist)			// static
 void __EXPORT ScDrawLayer::SetChanged( sal_Bool bFlg /* = sal_True */ )
 {
     if ( bFlg && pDoc )
-        pDoc->SetChartListenerCollectionNeedsUpdate( TRUE );
+        pDoc->SetChartListenerCollectionNeedsUpdate( sal_True );
     FmFormModel::SetChanged( bFlg );
 }
 
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 463011eca..ea7f2fe6b 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -54,7 +54,7 @@
 
 // -----------------------------------------------------------------------
 
-const USHORT ROWINFO_MAX = 1024;
+const sal_uInt16 ROWINFO_MAX = 1024;
 
 
 enum FillInfoLinePos
@@ -94,8 +94,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
 
     rStartX = nX;
     rStartY = nY;
-    BOOL bHOver = pInfo->bHOverlapped;
-    BOOL bVOver = pInfo->bVOverlapped;
+    sal_Bool bHOver = pInfo->bHOverlapped;
+    sal_Bool bVOver = pInfo->bVOverlapped;
     SCCOL nLastCol;
     SCROW nLastRow;
 
@@ -109,7 +109,7 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
         }
         else
         {
-            USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
+            sal_uInt16 nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
                                 rStartX, rStartY, nTab, ATTR_MERGE_FLAG ))->GetValue();
             bHOver = ((nOverlap & SC_MF_HOR) != 0);
             bVOver = ((nOverlap & SC_MF_VER) != 0);
@@ -133,7 +133,7 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
         }
         else
         {
-            USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
+            sal_uInt16 nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
                                 rStartX, rStartY, nTab, ATTR_MERGE_FLAG ))->GetValue();
             bHOver = ((nOverlap & SC_MF_HOR) != 0);
             bVOver = ((nOverlap & SC_MF_VER) != 0);
@@ -160,11 +160,11 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
 
 void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                             SCTAB nTab, double nScaleX, double nScaleY,
-                            BOOL bPageMode, BOOL bFormulaMode, const ScMarkData* pMarkData )
+                            sal_Bool bPageMode, sal_Bool bFormulaMode, const ScMarkData* pMarkData )
 {
     DBG_ASSERT( pTab[nTab], "Tabelle existiert nicht" );
 
-    BOOL bLayoutRTL = IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = IsLayoutRTL( nTab );
 
     ScDocumentPool* pPool = xPoolHelper->GetDocPool();
     ScStyleSheetPool* pStlPool = xPoolHelper->GetStylePool();
@@ -185,16 +185,16 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
     SCCOL nArrX;
     SCSIZE nArrY;
     SCSIZE nArrCount;
-    BOOL bAnyMerged = FALSE;
-    BOOL bAnyShadow = FALSE;
-    BOOL bAnyCondition = FALSE;
+    sal_Bool bAnyMerged = sal_False;
+    sal_Bool bAnyShadow = sal_False;
+    sal_Bool bAnyCondition = sal_False;
 
-    BOOL bTabProtect = IsTabProtected(nTab);
+    sal_Bool bTabProtect = IsTabProtected(nTab);
 
                                                 // fuer Blockmarken von zusammengefassten Zellen mit
                                                 // versteckter erster Zeile / Spalte
-    BOOL bPaintMarks = FALSE;
-    BOOL bSkipMarks = FALSE;
+    sal_Bool bPaintMarks = sal_False;
+    sal_Bool bSkipMarks = sal_False;
     SCCOL nBlockStartX = 0, nBlockEndX = 0;
     SCROW nBlockEndY = 0, nBlockStartY = 0;
     if (pMarkData && pMarkData->IsMarked())
@@ -209,9 +209,9 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
             nBlockEndY = aTmpRange.aEnd.Row();
             ExtendHidden( nBlockStartX, nBlockStartY, nBlockEndX, nBlockEndY, nTab );	//? noetig ?
             if (pMarkData->IsMarkNegative())
-                bSkipMarks = TRUE;
+                bSkipMarks = sal_True;
             else
-                bPaintMarks = TRUE;
+                bPaintMarks = sal_True;
         }
     }
 
@@ -219,7 +219,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
 
     nArrY=0;
     SCROW nYExtra = nY2+1;
-    USHORT nDocHeight = ScGlobal::nStdRowHeight;
+    sal_uInt16 nDocHeight = ScGlobal::nStdRowHeight;
     SCROW nDocHeightEndRow = -1;
     for (nSignedY=((SCsROW)nY1)-1; nSignedY<=(SCsROW)nYExtra; nSignedY++)
     {
@@ -241,17 +241,17 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
             RowInfo* pThisRowInfo = &pRowInfo[nArrY];
             pThisRowInfo->pCellInfo = NULL;					// wird unten belegt
 
-            USHORT nHeight = (USHORT) ( nDocHeight * nScaleY );
+            sal_uInt16 nHeight = (sal_uInt16) ( nDocHeight * nScaleY );
             if (!nHeight)
                 nHeight = 1;
 
             pThisRowInfo->nRowNo		= nY;				//! Fall < 0 ?
             pThisRowInfo->nHeight 		= nHeight;
-            pThisRowInfo->bEmptyBack	= TRUE;
-            pThisRowInfo->bEmptyText	= TRUE;
-            pThisRowInfo->bChanged		= TRUE;
-            pThisRowInfo->bAutoFilter	= FALSE;
-            pThisRowInfo->bPushButton	= FALSE;
+            pThisRowInfo->bEmptyBack	= sal_True;
+            pThisRowInfo->bEmptyText	= sal_True;
+            pThisRowInfo->bChanged		= sal_True;
+            pThisRowInfo->bAutoFilter	= sal_False;
+            pThisRowInfo->bPushButton	= sal_False;
             pThisRowInfo->nRotMaxCol	= SC_ROTMAX_NONE;
 
             ++nArrY;
@@ -271,12 +271,12 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
     //	rotierter Text...
 
     //	Attribut im Dokument ueberhaupt verwendet?
-    BOOL bAnyItem = FALSE;
+    sal_Bool bAnyItem = sal_False;
     sal_uInt32 nRotCount = pPool->GetItemCount2( ATTR_ROTATE_VALUE );
     for (sal_uInt32 nItem=0; nItem<nRotCount; nItem++)
         if (pPool->GetItem2( ATTR_ROTATE_VALUE, nItem ))
         {
-            bAnyItem = TRUE;
+            bAnyItem = sal_True;
             break;
         }
 
@@ -313,28 +313,28 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                 nX = MAXCOL+1;		// ungueltig
 
             CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX];
-            pInfo->bEmptyCellText = TRUE;
+            pInfo->bEmptyCellText = sal_True;
             pInfo->pCell = NULL;
             if (bPaintMarks)
                 pInfo->bMarked = ( nX >= nBlockStartX && nX <= nBlockEndX
                                 && nY >= nBlockStartY && nY <= nBlockEndY );
             else
-                pInfo->bMarked = FALSE;
+                pInfo->bMarked = sal_False;
             pInfo->nWidth = 0;
 
             pInfo->nClipMark	= SC_CLIPMARK_NONE;
-            pInfo->bMerged		= FALSE;
-            pInfo->bHOverlapped = FALSE;
-            pInfo->bVOverlapped = FALSE;
-            pInfo->bAutoFilter	= FALSE;
-            pInfo->bPushButton	= FALSE;
+            pInfo->bMerged		= sal_False;
+            pInfo->bHOverlapped = sal_False;
+            pInfo->bVOverlapped = sal_False;
+            pInfo->bAutoFilter	= sal_False;
+            pInfo->bPushButton	= sal_False;
             pInfo->bPopupButton = false;
             pInfo->bFilterActive = false;
             pInfo->nRotateDir	= SC_ROTDIR_NONE;
 
-            pInfo->bPrinted		= FALSE;					//	view-intern
-            pInfo->bHideGrid	= FALSE;					//	view-intern
-            pInfo->bEditEngine	= FALSE;					//	view-intern
+            pInfo->bPrinted		= sal_False;					//	view-intern
+            pInfo->bHideGrid	= sal_False;					//	view-intern
+            pInfo->bEditEngine	= sal_False;					//	view-intern
 
             pInfo->pBackground  = NULL;						//! weglassen?
             pInfo->pPatternAttr = NULL;
@@ -357,7 +357,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
         {
             if (!ColHidden(nX, nTab))
             {
-                USHORT nThisWidth = (USHORT) (GetColWidth( nX, nTab ) * nScaleX);
+                sal_uInt16 nThisWidth = (sal_uInt16) (GetColWidth( nX, nTab ) * nScaleX);
                 if (!nThisWidth)
                     nThisWidth = 1;
 
@@ -378,7 +378,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
             // TODO: Optimize this loop.
             if (!ColHidden(nX, nTab))
             {
-                USHORT nThisWidth = (USHORT) (GetColWidth( nX, nTab ) * nScaleX);
+                sal_uInt16 nThisWidth = (sal_uInt16) (GetColWidth( nX, nTab ) * nScaleX);
                 if (!nThisWidth)
                     nThisWidth = 1;
 
@@ -407,8 +407,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                         pInfo->pCell = pThisCol->pItems[nUIndex].pCell;
                         if (pInfo->pCell->GetCellType() != CELLTYPE_NOTE)
                         {
-                            pThisRowInfo->bEmptyText = FALSE;                   // Zeile nicht leer
-                            pInfo->bEmptyCellText = FALSE;                      // Zelle nicht leer
+                            pThisRowInfo->bEmptyText = sal_False;                   // Zeile nicht leer
+                            pInfo->bEmptyCellText = sal_False;                      // Zelle nicht leer
                         }
                         ++nArrY;
                     }
@@ -449,24 +449,24 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                         const SvxShadowItem* pShadowAttr = (const SvxShadowItem*)
                                                         &pPattern->GetItem(ATTR_SHADOW);
                         if (pShadowAttr != pDefShadow)
-                            bAnyShadow = TRUE;
+                            bAnyShadow = sal_True;
 
                         const ScMergeAttr* pMergeAttr = (const ScMergeAttr*)
                                                 &pPattern->GetItem(ATTR_MERGE);
-                        BOOL bMerged = ( pMergeAttr != pDefMerge && *pMergeAttr != *pDefMerge );
-                        USHORT nOverlap = ((const ScMergeFlagAttr*) &pPattern->GetItemSet().
+                        sal_Bool bMerged = ( pMergeAttr != pDefMerge && *pMergeAttr != *pDefMerge );
+                        sal_uInt16 nOverlap = ((const ScMergeFlagAttr*) &pPattern->GetItemSet().
                                                         Get(ATTR_MERGE_FLAG))->GetValue();
-                        BOOL bHOverlapped = ((nOverlap & SC_MF_HOR) != 0);
-                        BOOL bVOverlapped = ((nOverlap & SC_MF_VER) != 0);
-                        BOOL bAutoFilter  = ((nOverlap & SC_MF_AUTO) != 0);
-                        BOOL bPushButton  = ((nOverlap & SC_MF_BUTTON) != 0);
-                        BOOL bScenario	  = ((nOverlap & SC_MF_SCENARIO) != 0);
+                        sal_Bool bHOverlapped = ((nOverlap & SC_MF_HOR) != 0);
+                        sal_Bool bVOverlapped = ((nOverlap & SC_MF_VER) != 0);
+                        sal_Bool bAutoFilter  = ((nOverlap & SC_MF_AUTO) != 0);
+                        sal_Bool bPushButton  = ((nOverlap & SC_MF_BUTTON) != 0);
+                        sal_Bool bScenario	  = ((nOverlap & SC_MF_SCENARIO) != 0);
                         bool bPopupButton = ((nOverlap & SC_MF_BUTTON_POPUP) != 0);
                         bool bFilterActive = ((nOverlap & SC_MF_HIDDEN_MEMBER) != 0);
                         if (bMerged||bHOverlapped||bVOverlapped)
-                            bAnyMerged = TRUE;								// intern
+                            bAnyMerged = sal_True;								// intern
 
-                        BOOL bHidden, bHideFormula;
+                        sal_Bool bHidden, bHideFormula;
                         if (bTabProtect)
                         {
                             const ScProtectionAttr& rProtAttr = (const ScProtectionAttr&)
@@ -475,9 +475,9 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                             bHideFormula = rProtAttr.GetHideFormula();
                         }
                         else
-                            bHidden = bHideFormula = FALSE;
+                            bHidden = bHideFormula = sal_False;
 
-                        ULONG nConditional = ((const SfxUInt32Item&)pPattern->
+                        sal_uLong nConditional = ((const SfxUInt32Item&)pPattern->
                                                 GetItem(ATTR_CONDITIONAL)).GetValue();
                         const ScConditionalFormat* pCondForm = NULL;
                         if ( nConditional && pCondFormList )
@@ -491,11 +491,11 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                             {
                                 RowInfo* pThisRowInfo = &pRowInfo[nArrY];
                                 if (pBackground != pDefBackground)			// Spalten-HG == Standard ?
-                                    pThisRowInfo->bEmptyBack = FALSE;
+                                    pThisRowInfo->bEmptyBack = sal_False;
                                 if (bAutoFilter)
-                                    pThisRowInfo->bAutoFilter = TRUE;
+                                    pThisRowInfo->bAutoFilter = sal_True;
                                 if (bPushButton)
-                                    pThisRowInfo->bPushButton = TRUE;
+                                    pThisRowInfo->bPushButton = sal_True;
 
                                 CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX];
                                 pInfo->pBackground	= pBackground;
@@ -513,7 +513,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                                 pInfo->pShadowAttr	= pShadowAttr;
                                 //	nWidth wird nicht mehr einzeln gesetzt
 
-                                BOOL bEmbed = FALSE; //bIsEmbedded &&
+                                sal_Bool bEmbed = sal_False; //bIsEmbedded &&
                                         nTab	>= aEmbedRange.aStart.Tab() &&
                                         nTab    <= aEmbedRange.aEnd.Tab()   &&
                                         nX		>= aEmbedRange.aStart.Col() &&
@@ -524,18 +524,18 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                                 if (bScenario)
                                 {
                                     pInfo->pBackground = ScGlobal::GetButtonBrushItem();
-                                    pThisRowInfo->bEmptyBack = FALSE;
+                                    pThisRowInfo->bEmptyBack = sal_False;
                                 }
                                 else if (bEmbed)
                                 {
                                     pInfo->pBackground = ScGlobal::GetEmbeddedBrushItem();
-                                    pThisRowInfo->bEmptyBack = FALSE;
+                                    pThisRowInfo->bEmptyBack = sal_False;
                                 }
 
                                 if (bHidden || ( bFormulaMode && bHideFormula && pInfo->pCell
                                                     && pInfo->pCell->GetCellType()
                                                         == CELLTYPE_FORMULA ))
-                                    pInfo->bEmptyCellText = TRUE;
+                                    pInfo->bEmptyCellText = sal_True;
 
                                 if ( pCondForm )
                                 {
@@ -549,7 +549,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                                         {
                                             //!	Style-Sets cachen !!!
                                             pInfo->pConditionSet = &pStyleSheet->GetItemSet();
-                                            bAnyCondition = TRUE;
+                                            bAnyCondition = sal_True;
                                         }
                                         // if style is not there, treat like no condition
                                     }
@@ -575,7 +575,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                     {
                         //	Blockmarken
                         const ScMarkArray* pThisMarkArr = pMarkData->GetArray()+nX;
-                        BOOL bThisMarked;
+                        sal_Bool bThisMarked;
                         nArrY = 1;
                         nCurRow = nY1;										// einzelne Zeile
                         nThisRow = nY1;										// Ende des Bereichs
@@ -593,7 +593,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                                     {
                                         if ( bThisMarked )
                                         {
-                                            BOOL bSkip = bSkipMarks &&
+                                            sal_Bool bSkip = bSkipMarks &&
                                                         nX      >= nBlockStartX &&
                                                         nX      <= nBlockEndX   &&
                                                         nCurRow >= nBlockStartY &&
@@ -602,7 +602,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                                             {
                                                 RowInfo* pThisRowInfo = &pRowInfo[nArrY];
                                                 CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX];
-                                                pInfo->bMarked = TRUE;
+                                                pInfo->bMarked = sal_True;
                                             }
                                         }
                                         ++nArrY;
@@ -649,26 +649,26 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                     const SfxPoolItem* pItem;
 
                             //	Hintergrund
-                    if ( pCondSet->GetItemState( ATTR_BACKGROUND, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pCondSet->GetItemState( ATTR_BACKGROUND, sal_True, &pItem ) == SFX_ITEM_SET )
                     {
                         pInfo->pBackground = (const SvxBrushItem*) pItem;
-                        pRowInfo[nArrY].bEmptyBack = FALSE;
+                        pRowInfo[nArrY].bEmptyBack = sal_False;
                     }
 
                             //	Umrandung
-                    if ( pCondSet->GetItemState( ATTR_BORDER, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pCondSet->GetItemState( ATTR_BORDER, sal_True, &pItem ) == SFX_ITEM_SET )
                         pInfo->pLinesAttr = (const SvxBoxItem*) pItem;
 
-                    if ( pCondSet->GetItemState( ATTR_BORDER_TLBR, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pCondSet->GetItemState( ATTR_BORDER_TLBR, sal_True, &pItem ) == SFX_ITEM_SET )
                         pInfo->mpTLBRLine = static_cast< const SvxLineItem* >( pItem );
-                    if ( pCondSet->GetItemState( ATTR_BORDER_BLTR, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pCondSet->GetItemState( ATTR_BORDER_BLTR, sal_True, &pItem ) == SFX_ITEM_SET )
                         pInfo->mpBLTRLine = static_cast< const SvxLineItem* >( pItem );
 
                             //	Schatten
-                    if ( pCondSet->GetItemState( ATTR_SHADOW, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pCondSet->GetItemState( ATTR_SHADOW, sal_True, &pItem ) == SFX_ITEM_SET )
                     {
                         pInfo->pShadowAttr = (const SvxShadowItem*) pItem;
-                        bAnyShadow = TRUE;
+                        bAnyShadow = sal_True;
                     }
                 }
             }
@@ -709,23 +709,23 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                     // Hintergrund kopieren (oder in output.cxx)
 
                     if ( !pStartCond || pStartCond->
-                                    GetItemState(ATTR_BACKGROUND,TRUE,&pItem) != SFX_ITEM_SET )
+                                    GetItemState(ATTR_BACKGROUND,sal_True,&pItem) != SFX_ITEM_SET )
                         pItem = &pStartPattern->GetItem(ATTR_BACKGROUND);
                     pInfo->pBackground = (const SvxBrushItem*) pItem;
-                    pRowInfo[nArrY].bEmptyBack = FALSE;
+                    pRowInfo[nArrY].bEmptyBack = sal_False;
 
                     // Schatten
 
                     if ( !pStartCond || pStartCond->
-                                    GetItemState(ATTR_SHADOW,TRUE,&pItem) != SFX_ITEM_SET )
+                                    GetItemState(ATTR_SHADOW,sal_True,&pItem) != SFX_ITEM_SET )
                         pItem = &pStartPattern->GetItem(ATTR_SHADOW);
                     pInfo->pShadowAttr = (const SvxShadowItem*) pItem;
                     if (pInfo->pShadowAttr != pDefShadow)
-                        bAnyShadow = TRUE;
+                        bAnyShadow = sal_True;
 
                     // Blockmarken - wieder mit Original-Merge-Werten
 
-                    BOOL bCellMarked = FALSE;
+                    sal_Bool bCellMarked = sal_False;
                     if (bPaintMarks)
                         bCellMarked = ( nStartX >= (SCsCOL) nBlockStartX
                                     && nStartX <= (SCsCOL) nBlockEndX
@@ -749,13 +749,13 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
     {
         for (nArrY=0; nArrY<nArrCount; nArrY++)
         {
-            BOOL bTop = ( nArrY == 0 );
-            BOOL bBottom = ( nArrY+1 == nArrCount );
+            sal_Bool bTop = ( nArrY == 0 );
+            sal_Bool bBottom = ( nArrY+1 == nArrCount );
 
             for (nArrX=nX1; nArrX<=nX2+2; nArrX++)					// links und rechts einer mehr
             {
-                BOOL bLeft = ( nArrX == nX1 );
-                BOOL bRight = ( nArrX == nX2+2 );
+                sal_Bool bLeft = ( nArrX == nX1 );
+                sal_Bool bRight = ( nArrX == nX2+2 );
 
                 CellInfo* pInfo = &pRowInfo[nArrY].pCellInfo[nArrX];
                 const SvxShadowItem* pThisAttr = pInfo->pShadowAttr;
@@ -772,13 +772,13 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                     while ( nArrX+nDxNeg > nX1 && pRowInfo[0].pCellInfo[nArrX+nDxNeg].nWidth == 0 )
                         --nDxNeg;
 
-                    BOOL bLeftDiff = !bLeft &&
+                    sal_Bool bLeftDiff = !bLeft &&
                             CELLINFO(nDxNeg,0).pShadowAttr->GetLocation() == SVX_SHADOW_NONE;
-                    BOOL bRightDiff = !bRight &&
+                    sal_Bool bRightDiff = !bRight &&
                             CELLINFO(nDxPos,0).pShadowAttr->GetLocation() == SVX_SHADOW_NONE;
-                    BOOL bTopDiff = !bTop &&
+                    sal_Bool bTopDiff = !bTop &&
                             CELLINFO(0,-1).pShadowAttr->GetLocation() == SVX_SHADOW_NONE;
-                    BOOL bBottomDiff = !bBottom &&
+                    sal_Bool bBottomDiff = !bBottom &&
                             CELLINFO(0,1).pShadowAttr->GetLocation() == SVX_SHADOW_NONE;
 
                     if ( bLayoutRTL )
@@ -886,7 +886,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
         }
     }
 
-    rTabInfo.mnArrCount = sal::static_int_cast<USHORT>(nArrCount);
+    rTabInfo.mnArrCount = sal::static_int_cast<sal_uInt16>(nArrCount);
     rTabInfo.mbPageMode = bPageMode;
 
     // ========================================================================
@@ -904,12 +904,12 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
 
     for( size_t nRow = 0; nRow < nRowCount; ++nRow )
     {
-        USHORT nCellInfoY = static_cast< USHORT >( nRow );
+        sal_uInt16 nCellInfoY = static_cast< sal_uInt16 >( nRow );
         RowInfo& rThisRowInfo = pRowInfo[ nCellInfoY ];
 
         for( size_t nCol = 0; nCol < nColCount; ++nCol )
         {
-            USHORT nCellInfoX = static_cast< USHORT >( nCol + nX1 );
+            sal_uInt16 nCellInfoX = static_cast< sal_uInt16 >( nCol + nX1 );
             const CellInfo& rInfo = rThisRowInfo.pCellInfo[ nCellInfoX ];
 
             const SvxBoxItem* pBox = rInfo.pLinesAttr;
@@ -952,16 +952,16 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
 
                 // first visible column (nX1-1 is first processed document column)
                 SCCOL nFirstDocCol = (nX1 > 0) ? ::std::max< SCCOL >( nFirstRealDocCol, nX1 - 1 ) : nFirstRealDocCol;
-                USHORT nFirstCellInfoX = static_cast< USHORT >( nFirstDocCol + 1 );
+                sal_uInt16 nFirstCellInfoX = static_cast< sal_uInt16 >( nFirstDocCol + 1 );
                 nFirstCol = static_cast< size_t >( nFirstCellInfoX - nX1 );
 
                 // last visible column (nX2+1 is last processed document column)
                 SCCOL nLastDocCol = (nX2 < MAXCOL) ? ::std::min< SCCOL >( nLastRealDocCol, nX2 + 1 ) : nLastRealDocCol;
-                USHORT nLastCellInfoX = static_cast< USHORT >( nLastDocCol + 1 );
+                sal_uInt16 nLastCellInfoX = static_cast< sal_uInt16 >( nLastDocCol + 1 );
                 size_t nLastCol = static_cast< size_t >( nLastCellInfoX - nX1 );
 
                 // first visible row
-                USHORT nFirstCellInfoY = nCellInfoY;
+                sal_uInt16 nFirstCellInfoY = nCellInfoY;
                 while( ((nFirstCellInfoY > 1) && (pRowInfo[ nFirstCellInfoY - 1 ].nRowNo >= nFirstRealDocRow)) ||
                        ((nFirstCellInfoY == 1) && (static_cast< SCROW >( nY1 - 1 ) >= nFirstRealDocRow)) )
                     --nFirstCellInfoY;
@@ -969,7 +969,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
                 nFirstRow = static_cast< size_t >( nFirstCellInfoY );
 
                 // last visible row
-                USHORT nLastCellInfoY = nCellInfoY;
+                sal_uInt16 nLastCellInfoY = nCellInfoY;
                 while( (sal::static_int_cast<SCSIZE>(nLastCellInfoY + 1) < nArrCount) &&
                             (pRowInfo[ nLastCellInfoY + 1 ].nRowNo <= nLastRealDocRow) )
                     ++nLastCellInfoY;
@@ -1064,13 +1064,13 @@ ScTableInfo::ScTableInfo() :
     mpRowInfo( new RowInfo[ ROWINFO_MAX ] ),
     mbPageMode( false )
 {
-    for( USHORT nIdx = 0; nIdx < ROWINFO_MAX; ++nIdx )
+    for( sal_uInt16 nIdx = 0; nIdx < ROWINFO_MAX; ++nIdx )
         mpRowInfo[ nIdx ].pCellInfo = 0;
 }
 
 ScTableInfo::~ScTableInfo()
 {
-    for( USHORT nIdx = 0; nIdx < ROWINFO_MAX; ++nIdx )
+    for( sal_uInt16 nIdx = 0; nIdx < ROWINFO_MAX; ++nIdx )
         delete [] mpRowInfo[ nIdx ].pCellInfo;
     delete [] mpRowInfo;
 }
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 895c345ee..bab0fb75c 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -135,19 +135,19 @@ SvNumberFormatter* ScGlobal::pEnglishFormatter = NULL;
 double			ScGlobal::nScreenPPTX			= 96.0;
 double			ScGlobal::nScreenPPTY			= 96.0;
 
-USHORT			ScGlobal::nDefFontHeight		= 240;
-USHORT			ScGlobal::nStdRowHeight			= 257;
+sal_uInt16			ScGlobal::nDefFontHeight		= 240;
+sal_uInt16			ScGlobal::nStdRowHeight			= 257;
 
 long			ScGlobal::nLastRowHeightExtra	= 0;
 long			ScGlobal::nLastColWidthExtra	= STD_EXTRA_WIDTH;
 
-static USHORT nPPTZoom = 0;		// ScreenZoom used to determine nScreenPPTX/Y
+static sal_uInt16 nPPTZoom = 0;		// ScreenZoom used to determine nScreenPPTX/Y
 
 
 class SfxViewShell;
 SfxViewShell* pScActiveViewShell = NULL;			//! als Member !!!!!
-USHORT nScClickMouseModifier = 0;					//! dito
-USHORT nScFillModeMouseModifier = 0;				//! dito
+sal_uInt16 nScClickMouseModifier = 0;					//! dito
+sal_uInt16 nScFillModeMouseModifier = 0;				//! dito
 
 // Hack: ScGlobal::GetUserList() muss InitAppOptions in der UI aufrufen,
 //		 damit UserList aus Cfg geladen wird
@@ -160,11 +160,11 @@ void global_InitAppOptions();
 //
 //========================================================================
 
-BOOL ScGlobal::HasAttrChanged( const SfxItemSet&  rNewAttrs,
+sal_Bool ScGlobal::HasAttrChanged( const SfxItemSet&  rNewAttrs,
                                const SfxItemSet&  rOldAttrs,
-                               const USHORT		  nWhich )
+                               const sal_uInt16		  nWhich )
 {
-    BOOL				bInvalidate = FALSE;
+    sal_Bool				bInvalidate = sal_False;
     const SfxItemState	eNewState	= rNewAttrs.GetItemState( nWhich );
     const SfxItemState	eOldState	= rOldAttrs.GetItemState( nWhich );
 
@@ -190,14 +190,14 @@ BOOL ScGlobal::HasAttrChanged( const SfxItemSet&  rNewAttrs,
                     ? rNewAttrs.Get( nWhich )
                     : rNewAttrs.GetPool()->GetDefaultItem( nWhich );
 
-        bInvalidate = sal::static_int_cast<BOOL>(rNewItem != rOldItem);
+        bInvalidate = sal::static_int_cast<sal_Bool>(rNewItem != rOldItem);
     }
 
     return bInvalidate;
 }
 
-ULONG ScGlobal::GetStandardFormat( SvNumberFormatter& rFormatter,
-        ULONG nFormat, short nType )
+sal_uLong ScGlobal::GetStandardFormat( SvNumberFormatter& rFormatter,
+        sal_uLong nFormat, short nType )
 {
     const SvNumberformat* pFormat = rFormatter.GetEntry( nFormat );
     if ( pFormat )
@@ -205,8 +205,8 @@ ULONG ScGlobal::GetStandardFormat( SvNumberFormatter& rFormatter,
     return rFormatter.GetStandardFormat( nType, eLnge );
 }
 
-ULONG ScGlobal::GetStandardFormat( double fNumber, SvNumberFormatter& rFormatter,
-        ULONG nFormat, short nType )
+sal_uLong ScGlobal::GetStandardFormat( double fNumber, SvNumberFormatter& rFormatter,
+        sal_uLong nFormat, short nType )
 {
     const SvNumberformat* pFormat = rFormatter.GetEntry( nFormat );
     if ( pFormat )
@@ -231,7 +231,7 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter()
 
 //------------------------------------------------------------------------
 
-BOOL ScGlobal::CheckWidthInvalidate( BOOL& bNumFormatChanged,
+sal_Bool ScGlobal::CheckWidthInvalidate( sal_Bool& bNumFormatChanged,
                                      const SfxItemSet& rNewAttrs,
                                      const SfxItemSet& rOldAttrs )
 {
@@ -347,7 +347,7 @@ void ScGlobal::SetUserList( const ScUserList* pNewList )
     }
 }
 
-const String& ScGlobal::GetRscString( USHORT nIndex )
+const String& ScGlobal::GetRscString( sal_uInt16 nIndex )
 {
     DBG_ASSERT( nIndex < STR_COUNT, "ScGlobal::GetRscString - invalid string index");
     if( !ppRscString[ nIndex ] )
@@ -390,7 +390,7 @@ const String& ScGlobal::GetRscString( USHORT nIndex )
     return *ppRscString[ nIndex ];
 }
 
-String ScGlobal::GetErrorString(USHORT nErrNumber)
+String ScGlobal::GetErrorString(sal_uInt16 nErrNumber)
 {
     String sResStr;
     switch (nErrNumber)
@@ -416,7 +416,7 @@ String ScGlobal::GetErrorString(USHORT nErrNumber)
     return sResStr;
 }
 
-String ScGlobal::GetLongErrorString(USHORT nErrNumber)
+String ScGlobal::GetLongErrorString(sal_uInt16 nErrNumber)
 {
     switch (nErrNumber)
     {
@@ -546,7 +546,7 @@ void ScGlobal::Init()
     pLocaleData = pSysLocale->GetLocaleDataPtr();
     
     ppRscString = new String *[ STR_COUNT ];
-    for( USHORT nC = 0 ; nC < STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL;
+    for( sal_uInt16 nC = 0 ; nC < STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL;
 
     pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ), ATTR_BACKGROUND );
     pButtonBrushItem = new SvxBrushItem( Color(), ATTR_BACKGROUND );
@@ -571,7 +571,7 @@ void ScGlobal::Init()
 
 void ScGlobal::UpdatePPT( OutputDevice* pDev )
 {
-    USHORT nCurrentZoom = Application::GetSettings().GetStyleSettings().GetScreenZoom();
+    sal_uInt16 nCurrentZoom = Application::GetSettings().GetStyleSettings().GetScreenZoom();
     if ( nCurrentZoom != nPPTZoom )
     {
         //	Screen PPT values must be updated when ScreenZoom has changed.
@@ -621,12 +621,12 @@ void ScGlobal::InitTextHeight(SfxItemPool* pPool)
     Font aDefFont;
     pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow);		// font color doesn't matter here
     aVirtWindow.SetFont(aDefFont);
-    nDefFontHeight = (USHORT) aVirtWindow.PixelToLogic(Size(0, aVirtWindow.GetTextHeight()),
+    nDefFontHeight = (sal_uInt16) aVirtWindow.PixelToLogic(Size(0, aVirtWindow.GetTextHeight()),
                                 MAP_TWIP).Height();
 
     const SvxMarginItem* pMargin = (const SvxMarginItem*)&pPattern->GetItem(ATTR_MARGIN);
 
-    nStdRowHeight = (USHORT) ( nDefFontHeight +
+    nStdRowHeight = (sal_uInt16) ( nDefFontHeight +
                                 pMargin->GetTopMargin() + pMargin->GetBottomMargin()
                                 - STD_ROWHEIGHT_DIFF );
 }
@@ -642,7 +642,7 @@ void ScGlobal::Clear()
     DELETEZ(pAddInCollection);
     DELETEZ(pUserList);
 
-    for( USHORT nC = 0 ; nC < STR_COUNT ; nC++ )
+    for( sal_uInt16 nC = 0 ; nC < STR_COUNT ; nC++ )
         if( ppRscString ) delete ppRscString[ nC ];
     delete[] ppRscString;
     ppRscString = NULL;
@@ -889,33 +889,33 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico
 
 //------------------------------------------------------------------------
 
-BOOL ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
+sal_Bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
                                const EditTextObject* pObj2 )
 {
     if ( pObj1 == pObj2 )				// both empty or the same object
-        return TRUE;
+        return sal_True;
 
     if ( pObj1 && pObj2 )
     {
         //	first test for equal text content
-        USHORT nParCount = pObj1->GetParagraphCount();
+        sal_uInt16 nParCount = pObj1->GetParagraphCount();
         if ( nParCount != pObj2->GetParagraphCount() )
-            return FALSE;
-        for (USHORT nPar=0; nPar<nParCount; nPar++)
+            return sal_False;
+        for (sal_uInt16 nPar=0; nPar<nParCount; nPar++)
             if ( pObj1->GetText(nPar) != pObj2->GetText(nPar) )
-                return FALSE;
+                return sal_False;
 
         SvMemoryStream	aStream1;
         SvMemoryStream	aStream2;
         pObj1->Store( aStream1 );
         pObj2->Store( aStream2 );
-        ULONG nSize = aStream1.Tell();
+        sal_uLong nSize = aStream1.Tell();
         if ( aStream2.Tell() == nSize )
-            if ( !memcmp( aStream1.GetData(), aStream2.GetData(), (USHORT) nSize ) )
-                return TRUE;
+            if ( !memcmp( aStream1.GetData(), aStream2.GetData(), (sal_uInt16) nSize ) )
+                return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void ScGlobal::OpenURL( const String& rURL, const String& rTarget )
@@ -943,8 +943,8 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget )
     SfxFrameItem aFrm( SID_DOCFRAME, pFrame );
     SfxStringItem aReferer( SID_REFERER, aReferName );
 
-    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, FALSE );
-    SfxBoolItem aBrowsing( SID_BROWSE, TRUE );
+    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_False );
+    SfxBoolItem aBrowsing( SID_BROWSE, sal_True );
 
     //	kein SID_SILENT mehr wegen Bug #42525# (war angeblich sowieso falsch)
 
@@ -960,19 +960,19 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget )
 
 //------------------------------------------------------------------------
 
-BOOL ScGlobal::IsSystemRTL()
+sal_Bool ScGlobal::IsSystemRTL()
 {
     return MsLangId::isRightToLeft( Application::GetSettings().GetLanguage() );
 }
 
-BYTE ScGlobal::GetDefaultScriptType()
+sal_uInt8 ScGlobal::GetDefaultScriptType()
 {
     //	Used when text contains only WEAK characters.
     //	Script type of office language is used then (same as GetEditDefaultLanguage,
     //	to get consistent behavior of text in simple cells and EditEngine,
     //	also same as GetAppLanguage() in Writer)
 
-    return (BYTE) SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguage() );
+    return (sal_uInt8) SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguage() );
 }
 
 LanguageType ScGlobal::GetEditDefaultLanguage()
@@ -982,7 +982,7 @@ LanguageType ScGlobal::GetEditDefaultLanguage()
     return Application::GetSettings().GetLanguage();
 }
 
-USHORT ScGlobal::GetScriptedWhichID( BYTE nScriptType, USHORT nWhich )
+sal_uInt16 ScGlobal::GetScriptedWhichID( sal_uInt8 nScriptType, sal_uInt16 nWhich )
 {
     switch ( nScriptType )
     {
@@ -1074,16 +1074,16 @@ USHORT ScGlobal::GetScriptedWhichID( BYTE nScriptType, USHORT nWhich )
 
 void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter )
 {
-    DBG_ASSERT( rSet.GetItemState( ATTR_LANGUAGE_FORMAT, FALSE ) == SFX_ITEM_DEFAULT,
+    DBG_ASSERT( rSet.GetItemState( ATTR_LANGUAGE_FORMAT, sal_False ) == SFX_ITEM_DEFAULT,
         "ScGlobal::AddLanguage - language already added");
 
     const SfxPoolItem* pHardItem;
-    if ( rSet.GetItemState( ATTR_VALUE_FORMAT, FALSE, &pHardItem ) == SFX_ITEM_SET )
+    if ( rSet.GetItemState( ATTR_VALUE_FORMAT, sal_False, &pHardItem ) == SFX_ITEM_SET )
     {
         const SvNumberformat* pHardFormat = rFormatter.GetEntry(
             ((const SfxUInt32Item*)pHardItem)->GetValue() );
 
-        ULONG nParentFmt = 0;   // pool default
+        sal_uLong nParentFmt = 0;   // pool default
         const SfxItemSet* pParent = rSet.GetParent();
         if ( pParent )
             nParentFmt = ((const SfxUInt32Item&)pParent->Get( ATTR_VALUE_FORMAT )).GetValue();
@@ -1113,7 +1113,7 @@ public:
     ScFuncRes( ResId&, ScFuncDesc*, bool & rbSuppressed );
 
 private:
-    USHORT GetNum();
+    sal_uInt16 GetNum();
 };
 
 //--------------------------------------------------------------------
@@ -1125,20 +1125,20 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
     pDesc->nCategory = GetNum();
     pDesc->sHelpId = ReadByteStringRes();		//! Hack, see scfuncs.src
     pDesc->nArgCount = GetNum();
-    USHORT nArgs = pDesc->nArgCount;
+    sal_uInt16 nArgs = pDesc->nArgCount;
     if (nArgs >= VAR_ARGS)
         nArgs -= VAR_ARGS - 1;
     if (nArgs)
     {
         pDesc->pDefArgFlags = new ScFuncDesc::ParameterFlags[nArgs];
-        for (USHORT i = 0; i < nArgs; i++)
+        for (sal_uInt16 i = 0; i < nArgs; i++)
         {
             pDesc->pDefArgFlags[i].bOptional = (bool)GetNum();
         }
     }
     // Need to read the value from the resource even if nArgs==0 to advance the
     // resource position pointer, so this can't be in the if(nArgs) block above.
-    USHORT nSuppressed = GetNum();
+    sal_uInt16 nSuppressed = GetNum();
     if (nSuppressed)
     {
         if (nSuppressed > nArgs)
@@ -1147,9 +1147,9 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
                     aRes.GetId(), (int)nSuppressed, (int)nArgs);
             nSuppressed = nArgs;    // sanitize
         }
-        for (USHORT i=0; i < nSuppressed; ++i)
+        for (sal_uInt16 i=0; i < nSuppressed; ++i)
         {
-            USHORT nParam = GetNum();
+            sal_uInt16 nParam = GetNum();
             if (nParam < nArgs)
             {
                 if (pDesc->nArgCount >= VAR_ARGS && nParam == nArgs-1)
@@ -1178,7 +1178,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
     {
         pDesc->ppDefArgNames = new String*[nArgs];
         pDesc->ppDefArgDescs = new String*[nArgs];
-        for (USHORT i = 0; i < nArgs; i++)
+        for (sal_uInt16 i = 0; i < nArgs; i++)
         {
             pDesc->ppDefArgNames[i] = new String(ScResId(2*(i+1)  ));
             pDesc->ppDefArgDescs[i] = new String(ScResId(2*(i+1)+1));
@@ -1190,7 +1190,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
 
 //------------------------------------------------------------------------
 
-USHORT ScFuncRes::GetNum()
+sal_uInt16 ScFuncRes::GetNum()
 {
     return ReadShortRes();
 }
@@ -1205,7 +1205,7 @@ private:
 public:
         ScResourcePublisher( const ScResId& rId ) : Resource( rId ) {}
         ~ScResourcePublisher() { FreeResource(); }
-    BOOL			IsAvailableRes( const ResId& rId ) const
+    sal_Bool			IsAvailableRes( const ResId& rId ) const
                         { return Resource::IsAvailableRes( rId ); }
     
 };
@@ -1217,17 +1217,17 @@ ScFunctionList::ScFunctionList() :
     ScFuncDesc*		pDesc	= NULL;
     xub_StrLen		nStrLen = 0;
     FuncCollection*	pFuncColl;
-    USHORT i,j;
-    USHORT nDescBlock[] =
+    sal_uInt16 i,j;
+    sal_uInt16 nDescBlock[] =
     {
         RID_SC_FUNCTION_DESCRIPTIONS1,
         RID_SC_FUNCTION_DESCRIPTIONS2
     };
-    const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT);
+    const sal_uInt16 nBlocks = sizeof(nDescBlock) / sizeof(sal_uInt16);
 
     aFunctionList.Clear();
 
-    for ( USHORT k = 0; k < nBlocks; k++ )
+    for ( sal_uInt16 k = 0; k < nBlocks; k++ )
     {
         ::std::auto_ptr<ScResourcePublisher> pBlock( new ScResourcePublisher( ScResId( nDescBlock[k] ) ) );
         // Browse for all possible OpCodes. This is not the fastest method, but
@@ -1262,7 +1262,7 @@ ScFunctionList::ScFunctionList() :
         }
     }
 
-    USHORT nNextId = SC_OPCODE_LAST_OPCODE_ID + 1;		// FuncID for AddIn functions
+    sal_uInt16 nNextId = SC_OPCODE_LAST_OPCODE_ID + 1;		// FuncID for AddIn functions
 
     // Auswertung AddIn-Liste
     String aDefArgNameValue(RTL_CONSTASCII_STRINGPARAM("value"));
@@ -1283,7 +1283,7 @@ ScFunctionList::ScFunctionList() :
     {
         pDesc = new ScFuncDesc;
         FuncData *pAddInFuncData = (FuncData*)pFuncColl->At(i);
-        USHORT nArgs = pAddInFuncData->GetParamCount() - 1;
+        sal_uInt16 nArgs = pAddInFuncData->GetParamCount() - 1;
         pAddInFuncData->GetParamDesc( aArgName, aArgDesc, 0 );
           pDesc->nFIndex     = nNextId++;				//  ??? OpCode vergeben
           pDesc->nCategory   = ID_FUNCTION_GRP_ADDINS;
@@ -1428,11 +1428,11 @@ ScFuncDesc::~ScFuncDesc()
 
 void ScFuncDesc::Clear()
 {
-    USHORT nArgs = nArgCount;
+    sal_uInt16 nArgs = nArgCount;
     if (nArgs >= VAR_ARGS) nArgs -= VAR_ARGS-1;
     if (nArgs)
     {
-        for (USHORT i=0; i<nArgs; i++ )
+        for (sal_uInt16 i=0; i<nArgs; i++ )
         {
             delete ppDefArgNames[i];
             delete ppDefArgDescs[i];
@@ -1471,9 +1471,9 @@ String ScFuncDesc::GetParamList() const
     {
         if ( nArgCount < VAR_ARGS )
         {
-            USHORT nLastSuppressed = nArgCount;
-            USHORT nLastAdded = nArgCount;
-            for ( USHORT i=0; i<nArgCount; i++ )
+            sal_uInt16 nLastSuppressed = nArgCount;
+            sal_uInt16 nLastAdded = nArgCount;
+            for ( sal_uInt16 i=0; i<nArgCount; i++ )
             {
                 if (pDefArgFlags[i].bSuppress)
                     nLastSuppressed = i;
@@ -1496,8 +1496,8 @@ String ScFuncDesc::GetParamList() const
         }
         else
         {
-            USHORT nFix = nArgCount - VAR_ARGS;
-            for ( USHORT nArg = 0; nArg < nFix; nArg++ )
+            sal_uInt16 nFix = nArgCount - VAR_ARGS;
+            for ( sal_uInt16 nArg = 0; nArg < nFix; nArg++ )
             {
                 if (!pDefArgFlags[nArg].bSuppress)
                 {
@@ -1566,7 +1566,7 @@ String ScFuncDesc::GetSignature() const
         
         if ( nArgCount > 0 && aIter != aEnd )
         {
-            BOOL bLastArg = ( aIter->getLength() == 0 );
+            sal_Bool bLastArg = ( aIter->getLength() == 0 );
 
             while( aIter != aEnd && !bLastArg )
             {
@@ -1589,16 +1589,16 @@ String ScFuncDesc::GetSignature() const
 
 //------------------------------------------------------------------------
 
-USHORT ScFuncDesc::GetSuppressedArgCount() const
+sal_uInt16 ScFuncDesc::GetSuppressedArgCount() const
 {
     if (!bHasSuppressedArgs || !pDefArgFlags)
         return nArgCount;
 
-    USHORT nArgs = nArgCount;
+    sal_uInt16 nArgs = nArgCount;
     if (nArgs >= VAR_ARGS)
         nArgs -= VAR_ARGS - 1;
-    USHORT nCount = nArgs;
-    for (USHORT i=0; i < nArgs; ++i)
+    sal_uInt16 nCount = nArgs;
+    for (sal_uInt16 i=0; i < nArgs; ++i)
     {
         if (pDefArgFlags[i].bSuppress)
             --nCount;
@@ -1638,7 +1638,7 @@ xub_StrLen ScFuncDesc::getSuppressedArgumentCount() const
 }
 // -----------------------------------------------------------------------------
 // 
-void ScFuncDesc::fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const 
+void ScFuncDesc::fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const 
 {
     if (!bHasSuppressedArgs || !pDefArgFlags)
     {
@@ -1647,10 +1647,10 @@ void ScFuncDesc::fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments)
     }
 
     _rArguments.reserve( nArgCount);
-    USHORT nArgs = nArgCount;
+    sal_uInt16 nArgs = nArgCount;
     if (nArgs >= VAR_ARGS)
         nArgs -= VAR_ARGS - 1;
-    for (USHORT i=0; i < nArgs; ++i)
+    for (sal_uInt16 i=0; i < nArgs; ++i)
     {
         if (!pDefArgFlags[i].bSuppress)
             _rArguments.push_back(i);
@@ -1665,7 +1665,7 @@ void ScFuncDesc::initArgumentInfo()  const
     if ( bIncomplete && pFuncName )
     {
         ScUnoAddInCollection& rAddIns = *ScGlobal::GetAddInCollection();
-        String aIntName = rAddIns.FindFunction( *pFuncName, TRUE );         // pFuncName is upper-case
+        String aIntName = rAddIns.FindFunction( *pFuncName, sal_True );         // pFuncName is upper-case
 
         if ( aIntName.Len() )
         {
@@ -1678,7 +1678,7 @@ void ScFuncDesc::initArgumentInfo()  const
         if ( bIncomplete )
         {
             DBG_ERRORFILE( "couldn't initialize add-in function" );
-            const_cast<ScFuncDesc*>(this)->bIncomplete = FALSE;         // even if there was an error, don't try again
+            const_cast<ScFuncDesc*>(this)->bIncomplete = sal_False;         // even if there was an error, don't try again
         }
     }
 }
@@ -1723,19 +1723,19 @@ ScFunctionMgr::ScFunctionMgr()
         pCurCatList	( NULL )
 {
     DBG_ASSERT( pFuncList, "Funktionsliste nicht gefunden." );
-    ULONG		nCount	= pFuncList->GetCount();
+    sal_uLong		nCount	= pFuncList->GetCount();
     const ScFuncDesc*	pDesc;
     List*		pRootList;
-    ULONG		n;
+    sal_uLong		n;
 
-    for ( USHORT i=0; i<MAX_FUNCCAT; i++ )					// Kategorie-Listen erstellen
+    for ( sal_uInt16 i=0; i<MAX_FUNCCAT; i++ )					// Kategorie-Listen erstellen
         aCatLists[i] = new List;
 
     pRootList = aCatLists[0];								// Gesamtliste ("Alle") erstellen
     CollatorWrapper* pCaseCollator = ScGlobal::GetCaseCollator();
     for ( n=0; n<nCount; n++ )
     {
-        ULONG nTmpCnt=0;
+        sal_uLong nTmpCnt=0;
         pDesc = pFuncList->GetFunction(n);
         for (nTmpCnt = 0; nTmpCnt < n; nTmpCnt++)
         {
@@ -1761,7 +1761,7 @@ ScFunctionMgr::ScFunctionMgr()
 
 ScFunctionMgr::~ScFunctionMgr()
 {
-    for (USHORT i = 0; i < MAX_FUNCCAT; i++)
+    for (sal_uInt16 i = 0; i < MAX_FUNCCAT; i++)
         delete aCatLists[i];
 //  delete pFuncList;       // Macht spaeter die App
 }
@@ -1780,7 +1780,7 @@ const ScFuncDesc* ScFunctionMgr::Get( const String& rFName ) const
 
 //------------------------------------------------------------------------
 
-const ScFuncDesc* ScFunctionMgr::Get( USHORT nFIndex ) const
+const ScFuncDesc* ScFunctionMgr::Get( sal_uInt16 nFIndex ) const
 {
     const ScFuncDesc*	pDesc;
     for (pDesc = First(0); pDesc; pDesc = Next())
@@ -1791,7 +1791,7 @@ const ScFuncDesc* ScFunctionMgr::Get( USHORT nFIndex ) const
 
 //------------------------------------------------------------------------
 
-const ScFuncDesc*	ScFunctionMgr::First( USHORT nCategory ) const
+const ScFuncDesc*	ScFunctionMgr::First( sal_uInt16 nCategory ) const
 {
     DBG_ASSERT( nCategory < MAX_FUNCCAT, "Unbekannte Kategorie" );
 
@@ -1840,12 +1840,12 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula::
 #define LRU_MAX 10
 
     const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
-    USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX );
-    USHORT*	pLRUListIds = rAppOpt.GetLRUFuncList();
+    sal_uInt16 nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (sal_uInt16)LRU_MAX );
+    sal_uInt16*	pLRUListIds = rAppOpt.GetLRUFuncList();
 
     if ( pLRUListIds )
     {
-        for ( USHORT i=0; i<nLRUFuncCount; i++ )
+        for ( sal_uInt16 i=0; i<nLRUFuncCount; i++ )
             _rLastRUFunctions.push_back( Get( pLRUListIds[i] ) );
     }
 }
@@ -1859,7 +1859,7 @@ String ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
     } // if ( _nCategoryNumber >= SC_FUNCGROUP_COUNT )
 
     ::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
-    return String(ScResId((USHORT)_nCategoryNumber));
+    return String(ScResId((sal_uInt16)_nCategoryNumber));
 }
 sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToken _eToken) const
 {
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 55fa221af..1e0a4389f 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -72,9 +72,9 @@ ScImportParam::ScImportParam() :
     nRow1(0),
     nCol2(0),
     nRow2(0),
-    bImport(FALSE),
-    bNative(FALSE),
-    bSql(TRUE),
+    bImport(sal_False),
+    bNative(sal_False),
+    bSql(sal_True),
     nType(ScDbTable)
 {
 }
@@ -101,9 +101,9 @@ ScImportParam::~ScImportParam()
 //UNUSED2009-05 {
 //UNUSED2009-05     nCol1 = nCol2 = 0;
 //UNUSED2009-05     nRow1 = nRow2 = 0;
-//UNUSED2009-05     bImport = FALSE;
-//UNUSED2009-05     bNative = FALSE;
-//UNUSED2009-05     bSql = TRUE;
+//UNUSED2009-05     bImport = sal_False;
+//UNUSED2009-05     bNative = sal_False;
+//UNUSED2009-05     bSql = sal_True;
 //UNUSED2009-05     nType = ScDbTable;
 //UNUSED2009-05     aDBName.Erase();
 //UNUSED2009-05     aStatement.Erase();
@@ -125,7 +125,7 @@ ScImportParam& ScImportParam::operator=( const ScImportParam& r )
     return *this;
 }
 
-BOOL ScImportParam::operator==( const ScImportParam& rOther ) const
+sal_Bool ScImportParam::operator==( const ScImportParam& rOther ) const
 {
     return(	nCol1		== rOther.nCol1 &&
             nRow1		== rOther.nRow1 &&
@@ -146,8 +146,8 @@ BOOL ScImportParam::operator==( const ScImportParam& rOther ) const
 // struct ScQueryParam:
 
 ScQueryEntry::ScQueryEntry() :
-    bDoQuery(FALSE),
-    bQueryByString(FALSE),
+    bDoQuery(sal_False),
+    bQueryByString(sal_False),
     bQueryByDate(false),
     nField(0),
     eOp(SC_EQUAL),
@@ -206,8 +206,8 @@ ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r )
 
 void ScQueryEntry::Clear()
 {
-    bDoQuery		= FALSE;
-    bQueryByString	= FALSE;
+    bDoQuery		= sal_False;
+    bQueryByString	= sal_False;
     bQueryByDate    = false;
     eOp				= SC_EQUAL;
     eConnect		= SC_AND;
@@ -223,7 +223,7 @@ void ScQueryEntry::Clear()
     pSearchText		= NULL;
 }
 
-BOOL ScQueryEntry::operator==( const ScQueryEntry& r ) const
+sal_Bool ScQueryEntry::operator==( const ScQueryEntry& r ) const
 {
     return bDoQuery			== r.bDoQuery
         && bQueryByString	== r.bQueryByString
@@ -236,12 +236,12 @@ BOOL ScQueryEntry::operator==( const ScQueryEntry& r ) const
     //! pSearchParam und pSearchText nicht vergleichen
 }
 
-utl::TextSearch* ScQueryEntry::GetSearchTextPtr( BOOL bCaseSens )
+utl::TextSearch* ScQueryEntry::GetSearchTextPtr( sal_Bool bCaseSens )
 {
     if ( !pSearchParam )
     {
         pSearchParam = new utl::SearchParam( *pStr, utl::SearchParam::SRCH_REGEXP,
-            bCaseSens, FALSE, FALSE );
+            bCaseSens, sal_False, sal_False );
         pSearchText = new utl::TextSearch( *pSearchParam, *ScGlobal::pCharClass );
     }
     return pSearchText;
@@ -252,7 +252,7 @@ utl::TextSearch* ScQueryEntry::GetSearchTextPtr( BOOL bCaseSens )
 
 ScSubTotalParam::ScSubTotalParam()
 {
-    for ( USHORT i=0; i<MAXSUBTOTAL; i++ )
+    for ( sal_uInt16 i=0; i<MAXSUBTOTAL; i++ )
     {
         nSubTotals[i] = 0;
         pSubTotals[i] = NULL;
@@ -270,7 +270,7 @@ ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) :
         bDoSort(r.bDoSort),bAscending(r.bAscending),bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),
         bIncludePattern(r.bIncludePattern)
 {
-    for (USHORT i=0; i<MAXSUBTOTAL; i++)
+    for (sal_uInt16 i=0; i<MAXSUBTOTAL; i++)
     {
         bGroupActive[i]	= r.bGroupActive[i];
         nField[i]		= r.nField[i];
@@ -303,12 +303,12 @@ void ScSubTotalParam::Clear()
     nCol1=nCol2= 0;
     nRow1=nRow2 = 0;
     nUserIndex = 0;
-    bPagebreak=bCaseSens=bUserDef=bIncludePattern=bRemoveOnly = FALSE;
-    bAscending=bReplace=bDoSort = TRUE;
+    bPagebreak=bCaseSens=bUserDef=bIncludePattern=bRemoveOnly = sal_False;
+    bAscending=bReplace=bDoSort = sal_True;
 
-    for (USHORT i=0; i<MAXSUBTOTAL; i++)
+    for (sal_uInt16 i=0; i<MAXSUBTOTAL; i++)
     {
-        bGroupActive[i]	= FALSE;
+        bGroupActive[i]	= sal_False;
         nField[i]		= 0;
 
         if ( (nSubTotals[i] > 0) && pSubTotals[i] && pFunctions[i] )
@@ -339,7 +339,7 @@ ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r )
     nUserIndex		= r.nUserIndex;
     bIncludePattern	= r.bIncludePattern;
 
-    for (USHORT i=0; i<MAXSUBTOTAL; i++)
+    for (sal_uInt16 i=0; i<MAXSUBTOTAL; i++)
     {
         bGroupActive[i]	= r.bGroupActive[i];
         nField[i]		= r.nField[i];
@@ -372,9 +372,9 @@ ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r )
 
 //------------------------------------------------------------------------
 
-BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
+sal_Bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
 {
-    BOOL bEqual =   (nCol1			== rOther.nCol1)
+    sal_Bool bEqual =   (nCol1			== rOther.nCol1)
                  && (nRow1			== rOther.nRow1)
                  && (nCol2			== rOther.nCol2)
                  && (nRow2			== rOther.nRow2)
@@ -390,8 +390,8 @@ BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
 
     if ( bEqual )
     {
-        bEqual = TRUE;
-        for ( USHORT i=0; i<MAXSUBTOTAL && bEqual; i++ )
+        bEqual = sal_True;
+        for ( sal_uInt16 i=0; i<MAXSUBTOTAL && bEqual; i++ )
         {
             bEqual =   (bGroupActive[i]	== rOther.bGroupActive[i])
                     && (nField[i]		== rOther.nField[i])
@@ -416,10 +416,10 @@ BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
 
 //------------------------------------------------------------------------
 
-void ScSubTotalParam::SetSubTotals( USHORT					nGroup,
+void ScSubTotalParam::SetSubTotals( sal_uInt16					nGroup,
                                     const SCCOL*			ptrSubTotals,
                                     const ScSubTotalFunc*	ptrFunctions,
-                                    USHORT					nCount )
+                                    sal_uInt16					nCount )
 {
     DBG_ASSERT( (nGroup <= MAXSUBTOTAL),
                 "ScSubTotalParam::SetSubTotals(): nGroup > MAXSUBTOTAL!" );
@@ -443,7 +443,7 @@ void ScSubTotalParam::SetSubTotals( USHORT					nGroup,
         pFunctions[nGroup] = new ScSubTotalFunc	[nCount];
         nSubTotals[nGroup] = static_cast<SCCOL>(nCount);
 
-        for ( USHORT i=0; i<nCount; i++ )
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
             pSubTotals[nGroup][i] = ptrSubTotals[i];
             pFunctions[nGroup][i] = ptrFunctions[i];
@@ -472,7 +472,7 @@ ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) :
     {
         nDataAreaCount = r.nDataAreaCount;
         ppDataAreas = new ScArea*[nDataAreaCount];
-        for ( USHORT i=0; i<nDataAreaCount; i++ )
+        for ( sal_uInt16 i=0; i<nDataAreaCount; i++ )
             ppDataAreas[i] = new ScArea( *(r.ppDataAreas[i]) );
     }
 }
@@ -490,7 +490,7 @@ void __EXPORT ScConsolidateParam::ClearDataAreas()
 {
     if ( ppDataAreas )
     {
-        for ( USHORT i=0; i<nDataAreaCount; i++ )
+        for ( sal_uInt16 i=0; i<nDataAreaCount; i++ )
             delete ppDataAreas[i];
         delete [] ppDataAreas;
         ppDataAreas = NULL;
@@ -507,7 +507,7 @@ void __EXPORT ScConsolidateParam::Clear()
     nCol = 0;
     nRow = 0;
     nTab = 0;
-    bByCol = bByRow = bReferenceData	= FALSE;
+    bByCol = bByRow = bReferenceData	= sal_False;
     eFunction							= SUBTOTAL_FUNC_SUM;
 }
 
@@ -529,9 +529,9 @@ ScConsolidateParam& __EXPORT ScConsolidateParam::operator=( const ScConsolidateP
 
 //------------------------------------------------------------------------
 
-BOOL __EXPORT ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
+sal_Bool __EXPORT ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
 {
-    BOOL bEqual = 	(nCol			== r.nCol)
+    sal_Bool bEqual = 	(nCol			== r.nCol)
                  &&	(nRow			== r.nRow)
                  && (nTab			== r.nTab)
                  && (bByCol			== r.bByCol)
@@ -546,7 +546,7 @@ BOOL __EXPORT ScConsolidateParam::operator==( const ScConsolidateParam& r ) cons
         bEqual = bEqual && (ppDataAreas != NULL) && (r.ppDataAreas != NULL);
 
     if ( bEqual && (nDataAreaCount > 0) )
-        for ( USHORT i=0; i<nDataAreaCount && bEqual; i++ )
+        for ( sal_uInt16 i=0; i<nDataAreaCount && bEqual; i++ )
             bEqual = *(ppDataAreas[i]) == *(r.ppDataAreas[i]);
 
     return bEqual;
@@ -554,13 +554,13 @@ BOOL __EXPORT ScConsolidateParam::operator==( const ScConsolidateParam& r ) cons
 
 //------------------------------------------------------------------------
 
-void __EXPORT ScConsolidateParam::SetAreas( ScArea* const* ppAreas, USHORT nCount )
+void __EXPORT ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount )
 {
     ClearDataAreas();
     if ( ppAreas && nCount > 0 )
     {
         ppDataAreas = new ScArea*[nCount];
-        for ( USHORT i=0; i<nCount; i++ )
+        for ( sal_uInt16 i=0; i<nCount; i++ )
             ppDataAreas[i] = new ScArea( *(ppAreas[i]) );
         nDataAreaCount = nCount;
     }
@@ -568,7 +568,7 @@ void __EXPORT ScConsolidateParam::SetAreas( ScArea* const* ppAreas, USHORT nCoun
 
 // -----------------------------------------------------------------------
 
-PivotField::PivotField( SCsCOL nNewCol, USHORT nNewFuncMask ) :
+PivotField::PivotField( SCsCOL nNewCol, sal_uInt16 nNewFuncMask ) :
     nCol( nNewCol ),
     nFuncMask( nNewFuncMask ),
     nFuncCount( 0 )
@@ -592,8 +592,8 @@ bool PivotField::operator==( const PivotField& r ) const
 ScPivotParam::ScPivotParam()
     :	nCol(0), nRow(0), nTab(0),
         nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0),
-        bIgnoreEmptyRows(FALSE), bDetectCategories(FALSE),
-        bMakeTotalCol(TRUE), bMakeTotalRow(TRUE)
+        bIgnoreEmptyRows(sal_False), bDetectCategories(sal_False),
+        bMakeTotalCol(sal_True), bMakeTotalRow(sal_True)
 {
 }
 
@@ -626,8 +626,8 @@ __EXPORT ScPivotParam::~ScPivotParam()
 //UNUSED2009-05     nCol = 0;
 //UNUSED2009-05     nRow = 0;
 //UNUSED2009-05     nTab = 0;
-//UNUSED2009-05     bIgnoreEmptyRows = bDetectCategories = FALSE;
-//UNUSED2009-05     bMakeTotalCol = bMakeTotalRow = TRUE;
+//UNUSED2009-05     bIgnoreEmptyRows = bDetectCategories = sal_False;
+//UNUSED2009-05     bMakeTotalCol = bMakeTotalRow = sal_True;
 //UNUSED2009-05     ClearLabelData();
 //UNUSED2009-05     ClearPivotArrays();
 //UNUSED2009-05 }
@@ -704,9 +704,9 @@ ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r )
 
 //------------------------------------------------------------------------
 
-BOOL __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const
+sal_Bool __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const
 {
-    BOOL bEqual = 	(nCol		== r.nCol)
+    sal_Bool bEqual = 	(nCol		== r.nCol)
                  &&	(nRow		== r.nRow)
                  && (nTab		== r.nTab)
                  && (bIgnoreEmptyRows  == r.bIgnoreEmptyRows)
@@ -792,17 +792,17 @@ ScSolveParam& __EXPORT ScSolveParam::operator=( const ScSolveParam& r )
 
 //------------------------------------------------------------------------
 
-BOOL ScSolveParam::operator==( const ScSolveParam& r ) const
+sal_Bool ScSolveParam::operator==( const ScSolveParam& r ) const
 {
-    BOOL bEqual = 	(aRefFormulaCell  == r.aRefFormulaCell)
+    sal_Bool bEqual = 	(aRefFormulaCell  == r.aRefFormulaCell)
                  &&	(aRefVariableCell == r.aRefVariableCell);
 
     if ( bEqual )
     {
         if ( !pStrTargetVal && !r.pStrTargetVal )
-            bEqual = TRUE;
+            bEqual = sal_True;
         else if ( !pStrTargetVal || !r.pStrTargetVal )
-            bEqual = FALSE;
+            bEqual = sal_False;
         else if ( pStrTargetVal && r.pStrTargetVal )
             bEqual = ( *pStrTargetVal == *(r.pStrTargetVal) );
     }
@@ -829,7 +829,7 @@ ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell,
                             const ScRefAddress& rFormulaEnd,
                             const ScRefAddress& rRowCell,
                             const ScRefAddress& rColCell,
-                                  BYTE		 nMd)
+                                  sal_uInt8		 nMd)
     :	aRefFormulaCell	( rFormulaCell ),
         aRefFormulaEnd	( rFormulaEnd ),
         aRefRowCell		( rRowCell ),
@@ -852,7 +852,7 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r )
 
 //------------------------------------------------------------------------
 
-BOOL __EXPORT ScTabOpParam::operator==( const ScTabOpParam& r ) const
+sal_Bool __EXPORT ScTabOpParam::operator==( const ScTabOpParam& r ) const
 {
     return (		(aRefFormulaCell == r.aRefFormulaCell)
                  &&	(aRefFormulaEnd	 == r.aRefFormulaEnd)
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index dba34fc05..4ec726567 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -59,7 +59,7 @@ ScMarkArray::~ScMarkArray()
 
 //------------------------------------------------------------------------
 
-void ScMarkArray::Reset( BOOL bMarked )
+void ScMarkArray::Reset( sal_Bool bMarked )
 {
     // always create pData here
     // (or have separate method to ensure pData)
@@ -74,14 +74,14 @@ void ScMarkArray::Reset( BOOL bMarked )
 
 //------------------------------------------------------------------------
 
-BOOL ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const
+sal_Bool ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const
 {
     long	nLo 		= 0;
     long	nHi 		= static_cast<long>(nCount) - 1;
     long	nStartRow	= 0;
     long	nEndRow 	= 0;
     long	i			= 0;
-    BOOL	bFound		= (nCount == 1);
+    sal_Bool	bFound		= (nCount == 1);
     if (pData)
     {
         while ( !bFound && nLo <= nHi )
@@ -98,11 +98,11 @@ BOOL ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const
                 if (nStartRow >= (long) nRow)
                     nHi = --i;
                 else
-                    bFound = TRUE;
+                    bFound = sal_True;
         }
     }
     else
-        bFound = FALSE;
+        bFound = sal_False;
 
     if (bFound)
         nIndex=(SCSIZE)i;
@@ -111,19 +111,19 @@ BOOL ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const
     return bFound;
 }
 
-BOOL ScMarkArray::GetMark( SCROW nRow ) const
+sal_Bool ScMarkArray::GetMark( SCROW nRow ) const
 {
     SCSIZE i;
     if (Search( nRow, i ))
         return pData[i].bMarked;
     else
-        return FALSE;
+        return sal_False;
 
 }
 
 //------------------------------------------------------------------------
 
-void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked )
+void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, sal_Bool bMarked )
 {
     if (ValidRow(nStartRow) && ValidRow(nEndRow))
     {
@@ -134,7 +134,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked )
         else
         {
             if (!pData)
-                Reset(FALSE);   // create pData for further processing - could use special case handling!
+                Reset(sal_False);   // create pData for further processing - could use special case handling!
 
             SCSIZE nNeeded = nCount + 2;
             if ( nLimit < nNeeded )
@@ -150,8 +150,8 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked )
 
             SCSIZE ni;          // number of entries in beginning
             SCSIZE nInsert;     // insert position (MAXROW+1 := no insert)
-            BOOL bCombined = FALSE;
-            BOOL bSplit = FALSE;
+            sal_Bool bCombined = sal_False;
+            sal_Bool bSplit = sal_False;
             if ( nStartRow > 0 )
             {
                 // skip beginning
@@ -166,7 +166,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked )
                     {   // may be a split or a simple insert or just a shrink,
                         // row adjustment is done further down
                         if ( pData[ni].nRow > nEndRow )
-                            bSplit = TRUE;
+                            bSplit = sal_True;
                         ni++;
                         nInsert = ni;
                     }
@@ -177,7 +177,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked )
                 {   // combine
                     pData[ni-1].nRow = nEndRow;
                     nInsert = MAXROWCOUNT;
-                    bCombined = TRUE;
+                    bCombined = sal_True;
                 }
             }
             else
@@ -204,7 +204,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked )
                             pData[ni-1].nRow = nStartRow - 1;   // shrink
                     }
                     nInsert = MAXROWCOUNT;
-                    bCombined = TRUE;
+                    bCombined = sal_True;
                 }
                 else if ( ni > 0 && ni == nInsert )
                     pData[ni-1].nRow = nStartRow - 1;   // shrink
@@ -253,10 +253,10 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked )
 
 //UNUSED2009-05 void ScMarkArray::DeleteArea(SCROW nStartRow, SCROW nEndRow)
 //UNUSED2009-05 {
-//UNUSED2009-05     SetMarkArea(nStartRow, nEndRow, FALSE);
+//UNUSED2009-05     SetMarkArea(nStartRow, nEndRow, sal_False);
 //UNUSED2009-05 }
 
-BOOL ScMarkArray::IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScMarkArray::IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const
 {
     SCSIZE nStartIndex;
     SCSIZE nEndIndex;
@@ -265,21 +265,21 @@ BOOL ScMarkArray::IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const
         if (pData[nStartIndex].bMarked)
             if (Search( nEndRow, nEndIndex ))
                 if (nEndIndex==nStartIndex)
-                    return TRUE;
+                    return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScMarkArray::HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const
+sal_Bool ScMarkArray::HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if ( nCount == 1 )
     {
         if ( pData[0].bMarked )
         {
             rStartRow = 0;
             rEndRow = MAXROW;
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     else if ( nCount == 2 )
@@ -294,7 +294,7 @@ BOOL ScMarkArray::HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const
             rStartRow = pData[0].nRow + 1;
             rEndRow = MAXROW;
         }
-        bRet = TRUE;
+        bRet = sal_True;
     }
     else if ( nCount == 3 )
     {
@@ -302,7 +302,7 @@ BOOL ScMarkArray::HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const
         {
             rStartRow = pData[0].nRow + 1;
             rEndRow = pData[1].nRow;
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     return bRet;
@@ -323,10 +323,10 @@ void ScMarkArray::CopyMarksTo( ScMarkArray& rDestMarkArray ) const
     rDestMarkArray.nCount = rDestMarkArray.nLimit = nCount;
 }
 
-SCsROW ScMarkArray::GetNextMarked( SCsROW nRow, BOOL bUp ) const
+SCsROW ScMarkArray::GetNextMarked( SCsROW nRow, sal_Bool bUp ) const
 {
     if (!pData)
-        const_cast<ScMarkArray*>(this)->Reset(FALSE);   // create pData for further processing
+        const_cast<ScMarkArray*>(this)->Reset(sal_False);   // create pData for further processing
 
     SCsROW nRet = nRow;
     if (VALIDROW(nRow))
@@ -349,10 +349,10 @@ SCsROW ScMarkArray::GetNextMarked( SCsROW nRow, BOOL bUp ) const
     return nRet;
 }
 
-SCROW ScMarkArray::GetMarkEnd( SCROW nRow, BOOL bUp ) const
+SCROW ScMarkArray::GetMarkEnd( SCROW nRow, sal_Bool bUp ) const
 {
     if (!pData)
-        const_cast<ScMarkArray*>(this)->Reset(FALSE);   // create pData for further processing
+        const_cast<ScMarkArray*>(this)->Reset(sal_False);   // create pData for further processing
 
     SCROW nRet;
     SCSIZE nIndex;
@@ -385,15 +385,15 @@ ScMarkArrayIter::~ScMarkArrayIter()
 {
 }
 
-BOOL ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom )
+sal_Bool ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom )
 {
     if ( nPos >= pArray->nCount )
-        return FALSE;
+        return sal_False;
     while (!pArray->pData[nPos].bMarked)
     {
         ++nPos;
         if ( nPos >= pArray->nCount )
-            return FALSE;
+            return sal_False;
     }
     rBottom = pArray->pData[nPos].nRow;
     if (nPos==0)
@@ -401,7 +401,7 @@ BOOL ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom )
     else
         rTop = pArray->pData[nPos-1].nRow + 1;
     ++nPos;
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 63d226af9..4ba12e65b 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -46,7 +46,7 @@ ScMarkData::ScMarkData() :
     pMultiSel( NULL )
 {
     for (SCTAB i=0; i<=MAXTAB; i++)
-        bTabMarked[i] = FALSE;
+        bTabMarked[i] = sal_False;
 
     ResetMark();
 }
@@ -110,8 +110,8 @@ void ScMarkData::ResetMark()
     delete[] pMultiSel;
     pMultiSel = NULL;
 
-    bMarked = bMultiMarked = FALSE;
-    bMarking = bMarkIsNeg = FALSE;
+    bMarked = bMultiMarked = sal_False;
+    bMarking = bMarkIsNeg = sal_False;
 }
 
 void ScMarkData::SetMarkArea( const ScRange& rRange )
@@ -124,8 +124,8 @@ void ScMarkData::SetMarkArea( const ScRange& rRange )
         // may query (default) attributes although no sheet is marked yet.
         // => mark that one.
         if ( !GetSelectCount() )
-            bTabMarked[ aMarkRange.aStart.Tab() ] = TRUE;
-        bMarked = TRUE;
+            bTabMarked[ aMarkRange.aStart.Tab() ] = sal_True;
+        bMarked = sal_True;
     }
 }
 
@@ -139,7 +139,7 @@ void ScMarkData::GetMultiMarkArea( ScRange& rRange ) const
     rRange = aMultiRange;
 }
 
-void ScMarkData::SetMultiMarkArea( const ScRange& rRange, BOOL bMark )
+void ScMarkData::SetMultiMarkArea( const ScRange& rRange, sal_Bool bMark )
 {
     if (!pMultiSel)
     {
@@ -148,8 +148,8 @@ void ScMarkData::SetMultiMarkArea( const ScRange& rRange, BOOL bMark )
         // if simple mark range is set, copy to multi marks
         if ( bMarked && !bMarkIsNeg )
         {
-            bMarked = FALSE;
-            SetMultiMarkArea( aMarkRange, TRUE );
+            bMarked = sal_False;
+            SetMultiMarkArea( aMarkRange, sal_True );
         }
     }
 
@@ -178,7 +178,7 @@ void ScMarkData::SetMultiMarkArea( const ScRange& rRange, BOOL bMark )
     else
     {
         aMultiRange = rRange;			// neu
-        bMultiMarked = TRUE;
+        bMultiMarked = sal_True;
     }
 }
 
@@ -221,7 +221,7 @@ void ScMarkData::MarkToMulti()
     if ( bMarked && !bMarking )
     {
         SetMultiMarkArea( aMarkRange, !bMarkIsNeg );
-        bMarked = FALSE;
+        bMarked = sal_False;
 
         //	check if all multi mark ranges have been removed
         if ( bMarkIsNeg && !HasAnyMultiMarks() )
@@ -243,7 +243,7 @@ void ScMarkData::MarkToSimple()
 
         ScRange aNew = aMultiRange;
 
-        BOOL bOk = FALSE;
+        sal_Bool bOk = sal_False;
         SCCOL nStartCol = aNew.aStart.Col();
         SCCOL nEndCol   = aNew.aEnd.Col();
 
@@ -256,12 +256,12 @@ void ScMarkData::MarkToSimple()
         SCROW nStartRow, nEndRow;
         if ( pMultiSel[nStartCol].HasOneMark( nStartRow, nEndRow ) )
         {
-            bOk = TRUE;
+            bOk = sal_True;
             SCROW nCmpStart, nCmpEnd;
             for (SCCOL nCol=nStartCol+1; nCol<=nEndCol && bOk; nCol++)
                 if ( !pMultiSel[nCol].HasOneMark( nCmpStart, nCmpEnd )
                         || nCmpStart != nStartRow || nCmpEnd != nEndRow )
-                    bOk = FALSE;
+                    bOk = sal_False;
         }
 
         if (bOk)
@@ -273,18 +273,18 @@ void ScMarkData::MarkToSimple()
 
             ResetMark();
             aMarkRange = aNew;
-            bMarked = TRUE;
-            bMarkIsNeg = FALSE;
+            bMarked = sal_True;
+            bMarkIsNeg = sal_False;
         }
     }
 }
 
-BOOL ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple ) const
+sal_Bool ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, sal_Bool bNoSimple ) const
 {
     if ( bMarked && !bNoSimple && !bMarkIsNeg )
         if ( aMarkRange.aStart.Col() <= nCol && aMarkRange.aEnd.Col() >= nCol &&
              aMarkRange.aStart.Row() <= nRow && aMarkRange.aEnd.Row() >= nRow )
-            return TRUE;
+            return sal_True;
 
     if (bMultiMarked)
     {
@@ -294,10 +294,10 @@ BOOL ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple ) const
         return pMultiSel[nCol].GetMark( nRow );
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScMarkData::IsColumnMarked( SCCOL nCol ) const
+sal_Bool ScMarkData::IsColumnMarked( SCCOL nCol ) const
 {
     //	bMarkIsNeg inzwischen auch fuer Spaltenkoepfe
     //!	GetMarkColumnRanges fuer komplett markierte Spalten
@@ -305,15 +305,15 @@ BOOL ScMarkData::IsColumnMarked( SCCOL nCol ) const
     if ( bMarked && !bMarkIsNeg &&
                     aMarkRange.aStart.Col() <= nCol && aMarkRange.aEnd.Col() >= nCol &&
                     aMarkRange.aStart.Row() == 0	&& aMarkRange.aEnd.Row() == MAXROW )
-        return TRUE;
+        return sal_True;
 
     if ( bMultiMarked && pMultiSel[nCol].IsAllMarked(0,MAXROW) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScMarkData::IsRowMarked( SCROW nRow ) const
+sal_Bool ScMarkData::IsRowMarked( SCROW nRow ) const
 {
     //	bMarkIsNeg inzwischen auch fuer Zeilenkoepfe
     //!	GetMarkRowRanges fuer komplett markierte Zeilen
@@ -321,48 +321,48 @@ BOOL ScMarkData::IsRowMarked( SCROW nRow ) const
     if ( bMarked && !bMarkIsNeg &&
                     aMarkRange.aStart.Col() == 0	&& aMarkRange.aEnd.Col() == MAXCOL &&
                     aMarkRange.aStart.Row() <= nRow && aMarkRange.aEnd.Row() >= nRow )
-        return TRUE;
+        return sal_True;
 
     if ( bMultiMarked )
     {
         DBG_ASSERT(pMultiSel, "bMultiMarked, aber pMultiSel == 0");
         for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
             if (!pMultiSel[nCol].GetMark(nRow))
-                return FALSE;
-        return TRUE;
+                return sal_False;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-void ScMarkData::MarkFromRangeList( const ScRangeList& rList, BOOL bReset )
+void ScMarkData::MarkFromRangeList( const ScRangeList& rList, sal_Bool bReset )
 {
     if (bReset)
     {
         for (SCTAB i=0; i<=MAXTAB; i++)
-            bTabMarked[i] = FALSE;				// Tabellen sind nicht in ResetMark
+            bTabMarked[i] = sal_False;				// Tabellen sind nicht in ResetMark
         ResetMark();
     }
 
-    ULONG nCount = rList.Count();
+    sal_uLong nCount = rList.Count();
     if ( nCount == 1 && !bMarked && !bMultiMarked )
     {
         ScRange aRange = *rList.GetObject(0);
         SetMarkArea( aRange );
-        SelectTable( aRange.aStart.Tab(), TRUE );
+        SelectTable( aRange.aStart.Tab(), sal_True );
     }
     else
     {
-        for (ULONG i=0; i<nCount; i++)
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScRange aRange = *rList.GetObject(i);
-            SetMultiMarkArea( aRange, TRUE );
-            SelectTable( aRange.aStart.Tab(), TRUE );
+            SetMultiMarkArea( aRange, sal_True );
+            SelectTable( aRange.aStart.Tab(), sal_True );
         }
     }
 }
 
-void ScMarkData::FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const
+void ScMarkData::FillRangeListWithMarks( ScRangeList* pList, sal_Bool bClear ) const
 {
     if (!pList)
         return;
@@ -410,8 +410,8 @@ void ScMarkData::ExtendRangeListTables( ScRangeList* pList ) const
     for (SCTAB nTab=0; nTab<=MAXTAB; nTab++)
         if (bTabMarked[nTab])
         {
-            ULONG nCount = aOldList.Count();
-            for (ULONG i=0; i<nCount; i++)
+            sal_uLong nCount = aOldList.Count();
+            for (sal_uLong i=0; i<nCount; i++)
             {
                 ScRange aRange = *aOldList.GetObject(i);
                 aRange.aStart.SetTab(nTab);
@@ -483,8 +483,8 @@ SCCOLROW ScMarkData::GetMarkRowRanges( SCCOLROW* pRanges )
     const SCCOLROW nMultiStart = aMultiRange.aStart.Row();
     const SCCOLROW nMultiEnd = aMultiRange.aEnd.Row();
 
-    BOOL*   bRowMarked = new BOOL[MAXROWCOUNT];
-    memset( bRowMarked, 0, sizeof(BOOL) * MAXROWCOUNT);
+    sal_Bool*   bRowMarked = new sal_Bool[MAXROWCOUNT];
+    memset( bRowMarked, 0, sizeof(sal_Bool) * MAXROWCOUNT);
     SCROW  nRow;
     SCCOL  nCol;
 
@@ -494,7 +494,7 @@ SCCOLROW ScMarkData::GetMarkRowRanges( SCCOLROW* pRanges )
         ScMarkArrayIter aMarkIter( &pMultiSel[nCol] );
         while (aMarkIter.Next( nTop, nBottom ))
             for (nRow=nTop; nRow<=nBottom; nRow++)
-                bRowMarked[nRow] = TRUE;
+                bRowMarked[nRow] = sal_True;
         if (nTop == nMultiStart && nBottom == nMultiEnd)
             break;  // for, all relevant rows marked
     }
@@ -535,10 +535,10 @@ SCCOLROW ScMarkData::GetMarkRowRanges( SCCOLROW* pRanges )
     return nRangeCnt;
 }
 
-BOOL ScMarkData::IsAllMarked( const ScRange& rRange ) const
+sal_Bool ScMarkData::IsAllMarked( const ScRange& rRange ) const
 {
     if ( !bMultiMarked )
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT(pMultiSel, "bMultiMarked, aber pMultiSel == 0");
 
@@ -546,15 +546,15 @@ BOOL ScMarkData::IsAllMarked( const ScRange& rRange ) const
     SCROW nStartRow = rRange.aStart.Row();
     SCCOL nEndCol = rRange.aEnd.Col();
     SCROW nEndRow = rRange.aEnd.Row();
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     for (SCCOL nCol=nStartCol; nCol<=nEndCol && bOk; nCol++)
         if ( !pMultiSel[nCol].IsAllMarked( nStartRow, nEndRow ) )
-            bOk = FALSE;
+            bOk = sal_False;
 
     return bOk;
 }
 
-SCsROW ScMarkData::GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const
+SCsROW ScMarkData::GetNextMarked( SCCOL nCol, SCsROW nRow, sal_Bool bUp ) const
 {
     if ( !bMultiMarked )
         return nRow;
@@ -564,42 +564,42 @@ SCsROW ScMarkData::GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const
     return pMultiSel[nCol].GetNextMarked( nRow, bUp );
 }
 
-BOOL ScMarkData::HasMultiMarks( SCCOL nCol ) const
+sal_Bool ScMarkData::HasMultiMarks( SCCOL nCol ) const
 {
     if ( !bMultiMarked )
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT(pMultiSel, "bMultiMarked, aber pMultiSel == 0");
 
     return pMultiSel[nCol].HasMarks();
 }
 
-BOOL ScMarkData::HasAnyMultiMarks() const
+sal_Bool ScMarkData::HasAnyMultiMarks() const
 {
     if ( !bMultiMarked )
-        return FALSE;
+        return sal_False;
 
     DBG_ASSERT(pMultiSel, "bMultiMarked, aber pMultiSel == 0");
 
     for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
         if ( pMultiSel[nCol].HasMarks() )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;		// nix
+    return sal_False;		// nix
 }
 
 void ScMarkData::InsertTab( SCTAB nTab )
 {
     for (SCTAB i=MAXTAB; i>nTab; i--)
         bTabMarked[i] = bTabMarked[i-1];
-    bTabMarked[nTab] = FALSE;
+    bTabMarked[nTab] = sal_False;
 }
 
 void ScMarkData::DeleteTab( SCTAB nTab )
 {
     for (SCTAB i=nTab; i<MAXTAB; i++)
         bTabMarked[i] = bTabMarked[i+1];
-    bTabMarked[MAXTAB] = FALSE;
+    bTabMarked[MAXTAB] = sal_False;
 }
 
 
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 9c52b02fd..531c42b33 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -49,7 +49,7 @@ ScOutlineEntry::ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNew
     nStart  ( nNewStart ),
     nSize   ( nNewSize ),
     bHidden ( bNewHidden ),
-    bVisible( TRUE )
+    bVisible( sal_True )
 {
 }
 
@@ -107,7 +107,7 @@ void ScOutlineEntry::SetVisible( bool bNewVisible )
 //------------------------------------------------------------------------
 
 ScOutlineCollection::ScOutlineCollection() :
-    ScSortedCollection( 4,4,FALSE )
+    ScSortedCollection( 4,4,sal_False )
 {
 }
 
@@ -124,13 +124,13 @@ short ScOutlineCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) con
                         ((ScOutlineEntry*)pKey2)->GetStart() );
 }
 
-USHORT ScOutlineCollection::FindStart( SCCOLROW nMinStart )
+sal_uInt16 ScOutlineCollection::FindStart( SCCOLROW nMinStart )
 {
     //!                 binaer suchen ?
 
-    USHORT nPos = 0;
-    USHORT nLocalCount = GetCount();
-    while ( (nPos<nLocalCount) ? (((ScOutlineEntry*)At(nPos))->GetStart() < nMinStart) : FALSE )
+    sal_uInt16 nPos = 0;
+    sal_uInt16 nLocalCount = GetCount();
+    while ( (nPos<nLocalCount) ? (((ScOutlineEntry*)At(nPos))->GetStart() < nMinStart) : sal_False )
         ++nPos;
 
     return nPos;
@@ -146,10 +146,10 @@ ScOutlineArray::ScOutlineArray() :
 ScOutlineArray::ScOutlineArray( const ScOutlineArray& rArray ) :
     nDepth( rArray.nDepth )
 {
-    for (USHORT nLevel=0; nLevel<nDepth; nLevel++)
+    for (sal_uInt16 nLevel=0; nLevel<nDepth; nLevel++)
     {
-        USHORT nCount = rArray.aCollections[nLevel].GetCount();
-        for (USHORT nEntry=0; nEntry<nCount; nEntry++)
+        sal_uInt16 nCount = rArray.aCollections[nLevel].GetCount();
+        for (sal_uInt16 nEntry=0; nEntry<nCount; nEntry++)
         {
             ScOutlineEntry* pEntry = (ScOutlineEntry*) rArray.aCollections[nLevel].At(nEntry);
             aCollections[nLevel].Insert( new ScOutlineEntry( *pEntry ) );
@@ -157,19 +157,19 @@ ScOutlineArray::ScOutlineArray( const ScOutlineArray& rArray ) :
     }
 }
 
-void ScOutlineArray::FindEntry( SCCOLROW nSearchPos, USHORT& rFindLevel, USHORT& rFindIndex,
-                                USHORT nMaxLevel )
+void ScOutlineArray::FindEntry( SCCOLROW nSearchPos, sal_uInt16& rFindLevel, sal_uInt16& rFindIndex,
+                                sal_uInt16 nMaxLevel )
 {
     rFindLevel = rFindIndex = 0;
 
     if (nMaxLevel > nDepth)
         nMaxLevel = nDepth;
 
-    for (USHORT nLevel=0; nLevel<nMaxLevel; nLevel++)               //! rueckwaerts suchen ?
+    for (sal_uInt16 nLevel=0; nLevel<nMaxLevel; nLevel++)               //! rueckwaerts suchen ?
     {
         ScOutlineCollection* pCollect = &aCollections[nLevel];
-        USHORT nCount = pCollect->GetCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pCollect->GetCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ScOutlineEntry* pEntry = (ScOutlineEntry*) pCollect->At(i);
             if ( pEntry->GetStart() <= nSearchPos && pEntry->GetEnd() >= nSearchPos )
@@ -181,28 +181,28 @@ void ScOutlineArray::FindEntry( SCCOLROW nSearchPos, USHORT& rFindLevel, USHORT&
     }
 }
 
-BOOL ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, BOOL& rSizeChanged,
-                                BOOL bHidden, BOOL bVisible )
+sal_Bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, sal_Bool& rSizeChanged,
+                                sal_Bool bHidden, sal_Bool bVisible )
 {
-    rSizeChanged = FALSE;
+    rSizeChanged = sal_False;
 
-    USHORT nStartLevel;
-    USHORT nStartIndex;
-    USHORT nEndLevel;
-    USHORT nEndIndex;
-    BOOL bFound = FALSE;
+    sal_uInt16 nStartLevel;
+    sal_uInt16 nStartIndex;
+    sal_uInt16 nEndLevel;
+    sal_uInt16 nEndIndex;
+    sal_Bool bFound = sal_False;
 
-    BOOL bCont;
-    USHORT nFindMax;
+    sal_Bool bCont;
+    sal_uInt16 nFindMax;
     FindEntry( nStartCol, nStartLevel, nStartIndex );       // nLevel = neuer Level (alter+1) !!!
     FindEntry( nEndCol, nEndLevel, nEndIndex );
     nFindMax = Max(nStartLevel,nEndLevel);
     do
     {
-        bCont = FALSE;
+        bCont = sal_False;
 
         if ( nStartLevel == nEndLevel && nStartIndex == nEndIndex && nStartLevel < SC_OL_MAXDEPTH )
-            bFound = TRUE;
+            bFound = sal_True;
 
         if (!bFound)
         {
@@ -217,25 +217,25 @@ BOOL ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, BOOL& rSizeCh
                     if ( ((ScOutlineEntry*)aCollections[nEndLevel-1].At(nEndIndex))->
                                 GetEnd() == nEndCol )
                         FindEntry( nEndCol, nEndLevel, nEndIndex, nFindMax );
-                bCont = TRUE;
+                bCont = sal_True;
             }
         }
     }
     while ( !bFound && bCont );
 
     if (!bFound)
-        return FALSE;
+        return sal_False;
 
-    USHORT nLevel = nStartLevel;
+    sal_uInt16 nLevel = nStartLevel;
 
     //  untere verschieben
 
-    BOOL bNeedSize = FALSE;
+    sal_Bool bNeedSize = sal_False;
     for ( short nMoveLevel = nDepth-1; nMoveLevel >= (short) nLevel; nMoveLevel-- )
     {
-        USHORT nCount = aCollections[nMoveLevel].GetCount();
-        BOOL bMoved = FALSE;
-        for ( USHORT i=0; i<nCount; i += bMoved ? 0 : 1 )
+        sal_uInt16 nCount = aCollections[nMoveLevel].GetCount();
+        sal_Bool bMoved = sal_False;
+        for ( sal_uInt16 i=0; i<nCount; i += bMoved ? 0 : 1 )
         {
             ScOutlineEntry* pEntry = (ScOutlineEntry*) aCollections[nMoveLevel].At(i);
             SCCOLROW nEntryStart = pEntry->GetStart();
@@ -243,40 +243,40 @@ BOOL ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, BOOL& rSizeCh
             {
                 if (nMoveLevel >= SC_OL_MAXDEPTH - 1)
                 {
-                    rSizeChanged = FALSE;               // kein Platz
-                    return FALSE;
+                    rSizeChanged = sal_False;               // kein Platz
+                    return sal_False;
                 }
                 aCollections[nMoveLevel+1].Insert( new ScOutlineEntry( *pEntry ) );
                 aCollections[nMoveLevel].AtFree( i );
                 nCount = aCollections[nMoveLevel].GetCount();
-                bMoved = TRUE;
+                bMoved = sal_True;
                 if (nMoveLevel == (short) nDepth - 1)
-                    bNeedSize = TRUE;
+                    bNeedSize = sal_True;
             }
             else
-                bMoved = FALSE;
+                bMoved = sal_False;
         }
     }
 
     if (bNeedSize)
     {
         ++nDepth;
-        rSizeChanged = TRUE;
+        rSizeChanged = sal_True;
     }
 
     if (nDepth <= nLevel)
     {
         nDepth = nLevel+1;
-        rSizeChanged = TRUE;
+        rSizeChanged = sal_True;
     }
 
 /*          nicht zusammenfassen!
 
     //  zusammenfassen
 
-    USHORT nCount = aCollections[nLevel].GetCount();
-    USHORT nIndex;
-    bFound = FALSE;
+    sal_uInt16 nCount = aCollections[nLevel].GetCount();
+    sal_uInt16 nIndex;
+    bFound = sal_False;
     for ( nIndex=0; nIndex<nCount && !bFound; nIndex++ )
     {
         if ( ((ScOutlineEntry*) aCollections[nLevel].At(nIndex))->GetEnd() + 1 == nStartCol )
@@ -284,18 +284,18 @@ BOOL ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, BOOL& rSizeCh
             nStartCol = ((ScOutlineEntry*) aCollections[nLevel].At(nIndex))->GetStart();
             aCollections[nLevel].AtFree(nIndex);
             nCount = aCollections[nLevel].GetCount();       // Daten geaendert
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 
-    bFound = FALSE;
+    bFound = sal_False;
     for ( nIndex=0; nIndex<nCount && !bFound; nIndex++ )
     {
         if ( ((ScOutlineEntry*) aCollections[nLevel].At(nIndex))->GetStart() == nEndCol + 1 )
         {
             nEndCol = ((ScOutlineEntry*) aCollections[nLevel].At(nIndex))->GetEnd();
             aCollections[nLevel].AtFree(nIndex);
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 */
@@ -303,19 +303,19 @@ BOOL ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, BOOL& rSizeCh
     pNewEntry->SetVisible( bVisible );
     aCollections[nLevel].Insert( pNewEntry );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, USHORT& rFindLevel ) const
+sal_Bool ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, sal_uInt16& rFindLevel ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     rFindLevel = 0;
 
-    for (USHORT nLevel=0; nLevel<nDepth; nLevel++)
+    for (sal_uInt16 nLevel=0; nLevel<nDepth; nLevel++)
     {
         const ScOutlineCollection* pCollect = &aCollections[nLevel];
-        USHORT nCount = pCollect->GetCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pCollect->GetCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ScOutlineEntry* pEntry = (ScOutlineEntry*) pCollect->At(i);
             SCCOLROW nStart = pEntry->GetStart();
@@ -325,7 +325,7 @@ BOOL ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd,
                  ( nBlockEnd  >=nStart && nBlockEnd  <=nEnd ) )
             {
                 rFindLevel = nLevel;            // wirklicher Level
-                bFound = TRUE;
+                bFound = sal_True;
             }
         }
     }
@@ -333,16 +333,16 @@ BOOL ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd,
     return bFound;
 }
 
-void ScOutlineArray::RemoveSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nLevel )
+void ScOutlineArray::RemoveSub( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_uInt16 nLevel )
 {
     if ( nLevel >= nDepth )
         return;
     ScOutlineCollection* pCollect = &aCollections[nLevel];
-    USHORT nCount = pCollect->GetCount();
-    BOOL bFound = FALSE;
-    for ( USHORT i=0; i<nCount; i += ( bFound ? 0 : 1 ) )
+    sal_uInt16 nCount = pCollect->GetCount();
+    sal_Bool bFound = sal_False;
+    for ( sal_uInt16 i=0; i<nCount; i += ( bFound ? 0 : 1 ) )
     {
-        bFound = FALSE;
+        bFound = sal_False;
         ScOutlineEntry* pEntry = (ScOutlineEntry*) pCollect->At(i);
         SCCOLROW nStart = pEntry->GetStart();
         SCCOLROW nEnd   = pEntry->GetEnd();
@@ -352,12 +352,12 @@ void ScOutlineArray::RemoveSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nLe
             RemoveSub( nStart, nEnd, nLevel+1 );
             pCollect->AtFree(i);
             nCount = pCollect->GetCount();
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 }
 
-void ScOutlineArray::PromoteSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nStartLevel )
+void ScOutlineArray::PromoteSub( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_uInt16 nStartLevel )
 {
     if (nStartLevel==0)
     {
@@ -365,14 +365,14 @@ void ScOutlineArray::PromoteSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nS
         return;
     }
 
-    for (USHORT nLevel = nStartLevel; nLevel < nDepth; nLevel++)
+    for (sal_uInt16 nLevel = nStartLevel; nLevel < nDepth; nLevel++)
     {
         ScOutlineCollection* pCollect = &aCollections[nLevel];
-        USHORT nCount = pCollect->GetCount();
-        BOOL bFound = FALSE;
-        for ( USHORT i=0; i<nCount; i += ( bFound ? 0 : 1 ) )
+        sal_uInt16 nCount = pCollect->GetCount();
+        sal_Bool bFound = sal_False;
+        for ( sal_uInt16 i=0; i<nCount; i += ( bFound ? 0 : 1 ) )
         {
-            bFound = FALSE;
+            bFound = sal_False;
             ScOutlineEntry* pEntry = (ScOutlineEntry*) pCollect->At(i);
             SCCOLROW nStart = pEntry->GetStart();
             SCCOLROW nEnd   = pEntry->GetEnd();
@@ -382,43 +382,43 @@ void ScOutlineArray::PromoteSub( SCCOLROW nStartPos, SCCOLROW nEndPos, USHORT nS
                 aCollections[nLevel-1].Insert( new ScOutlineEntry( *pEntry ) );
                 pCollect->AtFree(i);
                 nCount = pCollect->GetCount();
-                bFound = TRUE;
+                bFound = sal_True;
             }
         }
     }
 }
 
-BOOL ScOutlineArray::DecDepth()                         // nDepth auf leere Levels anpassen
+sal_Bool ScOutlineArray::DecDepth()                         // nDepth auf leere Levels anpassen
 {
-    BOOL bChanged = FALSE;
-    BOOL bCont;
+    sal_Bool bChanged = sal_False;
+    sal_Bool bCont;
     do
     {
-        bCont = FALSE;
+        bCont = sal_False;
         if (nDepth)
             if (aCollections[nDepth-1].GetCount() == 0)
             {
                 --nDepth;
-                bChanged = TRUE;
-                bCont = TRUE;
+                bChanged = sal_True;
+                bCont = sal_True;
             }
     }
     while (bCont);
     return bChanged;
 }
 
-BOOL ScOutlineArray::Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, BOOL& rSizeChanged )
+sal_Bool ScOutlineArray::Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, sal_Bool& rSizeChanged )
 {
-    USHORT nLevel;
+    sal_uInt16 nLevel;
     FindTouchedLevel( nBlockStart, nBlockEnd, nLevel );
 
     ScOutlineCollection* pCollect = &aCollections[nLevel];
-    USHORT nCount = pCollect->GetCount();
-    BOOL bFound = FALSE;
-    BOOL bAny = FALSE;
-    for ( USHORT i=0; i<nCount; i += ( bFound ? 0 : 1 ) )
+    sal_uInt16 nCount = pCollect->GetCount();
+    sal_Bool bFound = sal_False;
+    sal_Bool bAny = sal_False;
+    for ( sal_uInt16 i=0; i<nCount; i += ( bFound ? 0 : 1 ) )
     {
-        bFound = FALSE;
+        bFound = sal_False;
         ScOutlineEntry* pEntry = (ScOutlineEntry*) pCollect->At(i);
         SCCOLROW nStart = pEntry->GetStart();
         SCCOLROW nEnd   = pEntry->GetEnd();
@@ -430,34 +430,34 @@ BOOL ScOutlineArray::Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, BOOL& rSi
             PromoteSub( nStart, nEnd, nLevel+1 );
             nCount = pCollect->GetCount();
             i = pCollect->FindStart( nEnd+1 );
-            bFound = TRUE;
-            bAny = TRUE;
+            bFound = sal_True;
+            bAny = sal_True;
         }
     }
 
     if (bAny)                                   // Depth anpassen
         if (DecDepth())
-            rSizeChanged = TRUE;
+            rSizeChanged = sal_True;
 
     return bAny;
 }
 
-ScOutlineEntry* ScOutlineArray::GetEntry( USHORT nLevel, USHORT nIndex ) const
+ScOutlineEntry* ScOutlineArray::GetEntry( sal_uInt16 nLevel, sal_uInt16 nIndex ) const
 {
     return (ScOutlineEntry*)((nLevel < nDepth) ? aCollections[nLevel].At(nIndex) : NULL);
 }
 
-USHORT ScOutlineArray::GetCount( USHORT nLevel ) const
+sal_uInt16 ScOutlineArray::GetCount( sal_uInt16 nLevel ) const
 {
     return (nLevel < nDepth) ? aCollections[nLevel].GetCount() : 0;
 }
 
-ScOutlineEntry* ScOutlineArray::GetEntryByPos( USHORT nLevel, SCCOLROW nPos ) const
+ScOutlineEntry* ScOutlineArray::GetEntryByPos( sal_uInt16 nLevel, SCCOLROW nPos ) const
 {
-    USHORT          nCount  = GetCount( nLevel );
+    sal_uInt16          nCount  = GetCount( nLevel );
     ScOutlineEntry* pEntry;
 
-    for (USHORT nIndex = 0; nIndex < nCount; nIndex++)
+    for (sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++)
     {
         pEntry = GetEntry( nLevel, nIndex );
         if ((pEntry->GetStart() <= nPos) && (nPos <= pEntry->GetEnd()))
@@ -466,34 +466,34 @@ ScOutlineEntry* ScOutlineArray::GetEntryByPos( USHORT nLevel, SCCOLROW nPos ) co
     return NULL;
 }
 
-BOOL ScOutlineArray::GetEntryIndex( USHORT nLevel, SCCOLROW nPos, USHORT& rnIndex ) const
+sal_Bool ScOutlineArray::GetEntryIndex( sal_uInt16 nLevel, SCCOLROW nPos, sal_uInt16& rnIndex ) const
 {
     // found entry contains passed position
-    USHORT nCount  = GetCount( nLevel );
+    sal_uInt16 nCount  = GetCount( nLevel );
     for ( rnIndex = 0; rnIndex < nCount; ++rnIndex )
     {
         const ScOutlineEntry* pEntry = GetEntry( nLevel, rnIndex );
         if ( (pEntry->GetStart() <= nPos) && (nPos <= pEntry->GetEnd()) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScOutlineArray::GetEntryIndexInRange(
-        USHORT nLevel, SCCOLROW nBlockStart, SCCOLROW nBlockEnd, USHORT& rnIndex ) const
+sal_Bool ScOutlineArray::GetEntryIndexInRange(
+        sal_uInt16 nLevel, SCCOLROW nBlockStart, SCCOLROW nBlockEnd, sal_uInt16& rnIndex ) const
 {
     // found entry will be completely inside of passed range
-    USHORT nCount  = GetCount( nLevel );
+    sal_uInt16 nCount  = GetCount( nLevel );
     for ( rnIndex = 0; rnIndex < nCount; ++rnIndex )
     {
         const ScOutlineEntry* pEntry = GetEntry( nLevel, rnIndex );
         if ( (nBlockStart <= pEntry->GetStart()) && (pEntry->GetEnd() <= nBlockEnd) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-void ScOutlineArray::SetVisibleBelow( USHORT nLevel, USHORT nEntry, BOOL bValue, BOOL bSkipHidden )
+void ScOutlineArray::SetVisibleBelow( sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bValue, sal_Bool bSkipHidden )
 {
     ScOutlineEntry* pEntry = GetEntry( nLevel, nEntry );
     if( pEntry )
@@ -501,9 +501,9 @@ void ScOutlineArray::SetVisibleBelow( USHORT nLevel, USHORT nEntry, BOOL bValue,
         SCCOLROW nStart = pEntry->GetStart();
         SCCOLROW nEnd   = pEntry->GetEnd();
 
-        for (USHORT nSubLevel=nLevel+1; nSubLevel<nDepth; nSubLevel++)
+        for (sal_uInt16 nSubLevel=nLevel+1; nSubLevel<nDepth; nSubLevel++)
         {
-            USHORT i = 0;
+            sal_uInt16 i = 0;
             pEntry = (ScOutlineEntry*) aCollections[nSubLevel].At(i);
             while (pEntry)
             {
@@ -513,7 +513,7 @@ void ScOutlineArray::SetVisibleBelow( USHORT nLevel, USHORT nEntry, BOOL bValue,
 
                     if (bSkipHidden)
                         if (!pEntry->IsHidden())
-                            SetVisibleBelow( nSubLevel, i, bValue, TRUE );
+                            SetVisibleBelow( nSubLevel, i, bValue, sal_True );
                 }
 
                 ++i;
@@ -528,7 +528,7 @@ void ScOutlineArray::SetVisibleBelow( USHORT nLevel, USHORT nEntry, BOOL bValue,
 
 void ScOutlineArray::GetRange( SCCOLROW& rStart, SCCOLROW& rEnd ) const
 {
-    USHORT nCount = aCollections[0].GetCount();
+    sal_uInt16 nCount = aCollections[0].GetCount();
     if (nCount)
     {
         rStart = ((ScOutlineEntry*) aCollections[0].At(0))->GetStart();
@@ -538,12 +538,12 @@ void ScOutlineArray::GetRange( SCCOLROW& rStart, SCCOLROW& rEnd ) const
         rStart = rEnd = 0;
 }
 
-void ScOutlineArray::ExtendBlock( USHORT nLevel, SCCOLROW& rBlkStart, SCCOLROW& rBlkEnd )
+void ScOutlineArray::ExtendBlock( sal_uInt16 nLevel, SCCOLROW& rBlkStart, SCCOLROW& rBlkEnd )
 {
-    USHORT  nCount;
+    sal_uInt16  nCount;
     SCCOLROW    nStart;
     SCCOLROW    nEnd;
-    USHORT  i;
+    sal_uInt16  i;
     ScOutlineEntry* pEntry;
 
     nCount = GetCount(nLevel);
@@ -561,16 +561,16 @@ void ScOutlineArray::ExtendBlock( USHORT nLevel, SCCOLROW& rBlkStart, SCCOLROW&
     }
 }
 
-BOOL ScOutlineArray::TestInsertSpace( SCSIZE nSize, SCCOLROW nMaxVal ) const
+sal_Bool ScOutlineArray::TestInsertSpace( SCSIZE nSize, SCCOLROW nMaxVal ) const
 {
-    USHORT nCount = aCollections[0].GetCount();
+    sal_uInt16 nCount = aCollections[0].GetCount();
     if (nCount)
     {
         SCCOLROW nEnd = ((ScOutlineEntry*) aCollections[0].At(nCount-1))->GetEnd();
         return ( sal::static_int_cast<SCCOLROW>(nEnd+nSize) <= nMaxVal );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScOutlineArray::InsertSpace( SCCOLROW nStartPos, SCSIZE nSize )
@@ -596,11 +596,11 @@ void ScOutlineArray::InsertSpace( SCCOLROW nStartPos, SCSIZE nSize )
     }
 }
 
-BOOL ScOutlineArray::DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize )
+sal_Bool ScOutlineArray::DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize )
 {
     SCCOLROW nEndPos = nStartPos + nSize - 1;
-    BOOL bNeedSave = FALSE;                         // Original fuer Undo benoetigt?
-    BOOL bChanged = FALSE;                          // fuer Test auf Level
+    sal_Bool bNeedSave = sal_False;                         // Original fuer Undo benoetigt?
+    sal_Bool bChanged = sal_False;                          // fuer Test auf Level
 
     ScSubOutlineIterator aIter( this );
     ScOutlineEntry* pEntry;
@@ -618,11 +618,11 @@ BOOL ScOutlineArray::DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize )
                 pEntry->SetSize( nEntrySize-nSize );
             else
             {
-                bNeedSave = TRUE;
+                bNeedSave = sal_True;
                 if ( nEntryStart >= nStartPos && nEntryEnd <= nEndPos )             // innen
                 {
                     aIter.DeleteLast();
-                    bChanged = TRUE;
+                    bChanged = sal_True;
                 }
                 else if ( nEntryStart >= nStartPos )                                // rechts ueber
                     pEntry->SetPosSize( nStartPos, static_cast<SCSIZE>(nEntryEnd-nEndPos) );
@@ -673,7 +673,7 @@ bool ScOutlineArray::ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos, bool bS
 
 void ScOutlineArray::RemoveAll()
 {
-    for (USHORT nLevel=0; nLevel<nDepth; nLevel++)
+    for (sal_uInt16 nLevel=0; nLevel<nDepth; nLevel++)
         aCollections[nLevel].FreeAll();
 
     nDepth = 0;
@@ -691,7 +691,7 @@ ScOutlineTable::ScOutlineTable( const ScOutlineTable& rOutline ) :
 {
 }
 
-BOOL ScOutlineTable::TestInsertCol( SCSIZE nSize )
+sal_Bool ScOutlineTable::TestInsertCol( SCSIZE nSize )
 {
     return aColOutline.TestInsertSpace( nSize, MAXCOL );
 }
@@ -701,12 +701,12 @@ void ScOutlineTable::InsertCol( SCCOL nStartCol, SCSIZE nSize )
     aColOutline.InsertSpace( nStartCol, nSize );
 }
 
-BOOL ScOutlineTable::DeleteCol( SCCOL nStartCol, SCSIZE nSize )
+sal_Bool ScOutlineTable::DeleteCol( SCCOL nStartCol, SCSIZE nSize )
 {
     return aColOutline.DeleteSpace( nStartCol, nSize );
 }
 
-BOOL ScOutlineTable::TestInsertRow( SCSIZE nSize )
+sal_Bool ScOutlineTable::TestInsertRow( SCSIZE nSize )
 {
     return aRowOutline.TestInsertSpace( nSize, MAXROW );
 }
@@ -716,7 +716,7 @@ void ScOutlineTable::InsertRow( SCROW nStartRow, SCSIZE nSize )
     aRowOutline.InsertSpace( nStartRow, nSize );
 }
 
-BOOL ScOutlineTable::DeleteRow( SCROW nStartRow, SCSIZE nSize )
+sal_Bool ScOutlineTable::DeleteRow( SCROW nStartRow, SCSIZE nSize )
 {
     return aRowOutline.DeleteSpace( nStartRow, nSize );
 }
@@ -734,7 +734,7 @@ ScSubOutlineIterator::ScSubOutlineIterator( ScOutlineArray* pOutlineArray ) :
 }
 
 ScSubOutlineIterator::ScSubOutlineIterator( ScOutlineArray* pOutlineArray,
-                                            USHORT nLevel, USHORT nEntry ) :
+                                            sal_uInt16 nLevel, sal_uInt16 nEntry ) :
         pArray( pOutlineArray )
 {
     ScOutlineEntry* pEntry = (ScOutlineEntry*) pArray->aCollections[nLevel].At(nEntry);
@@ -748,7 +748,7 @@ ScSubOutlineIterator::ScSubOutlineIterator( ScOutlineArray* pOutlineArray,
 ScOutlineEntry* ScSubOutlineIterator::GetNext()
 {
     ScOutlineEntry* pEntry;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     do
     {
         if (nSubLevel >= nDepth)
@@ -763,7 +763,7 @@ ScOutlineEntry* ScSubOutlineIterator::GetNext()
         else
         {
             if ( pEntry->GetStart() >= nStart && pEntry->GetEnd() <= nEnd )
-                bFound = TRUE;
+                bFound = sal_True;
             ++nSubEntry;
         }
     }
@@ -771,12 +771,12 @@ ScOutlineEntry* ScSubOutlineIterator::GetNext()
     return pEntry;                  // nSubLevel gueltig, wenn pEntry != 0
 }
 
-USHORT ScSubOutlineIterator::LastLevel() const
+sal_uInt16 ScSubOutlineIterator::LastLevel() const
 {
     return nSubLevel;
 }
 
-USHORT ScSubOutlineIterator::LastEntry() const
+sal_uInt16 ScSubOutlineIterator::LastEntry() const
 {
     if (nSubEntry == 0)
     {
diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx
index 94a9d01b4..5e4400575 100644
--- a/sc/source/core/data/pagepar.cxx
+++ b/sc/source/core/data/pagepar.cxx
@@ -57,11 +57,11 @@ ScPageTableParam::~ScPageTableParam()
 
 void ScPageTableParam::Reset()
 {
-    bCellContent = TRUE;
+    bCellContent = sal_True;
     bNotes=bGrid=bHeaders=bDrawings=
     bLeftRight=bScaleAll=bScaleTo=bScalePageNum=
-    bFormulas=bNullVals=bSkipEmpty			= FALSE;
-    bTopDown=bScaleNone=bCharts=bObjects	= TRUE;
+    bFormulas=bNullVals=bSkipEmpty			= sal_False;
+    bTopDown=bScaleNone=bCharts=bObjects	= sal_True;
     nScaleAll = 100;
     nScalePageNum = nScaleWidth = nScaleHeight = 0;
     nFirstPageNo = 1;
@@ -69,7 +69,7 @@ void ScPageTableParam::Reset()
 
 //------------------------------------------------------------------------
 
-BOOL ScPageTableParam::operator==( const ScPageTableParam& r ) const
+sal_Bool ScPageTableParam::operator==( const ScPageTableParam& r ) const
 {
     return ( memcmp( this, &r, sizeof(ScPageTableParam) ) == 0 );
 }
@@ -92,7 +92,7 @@ ScPageAreaParam::~ScPageAreaParam()
 
 void ScPageAreaParam::Reset()
 {
-    bPrintArea = bRepeatRow = bRepeatCol = FALSE;
+    bPrintArea = bRepeatRow = bRepeatCol = sal_False;
 
     memset( &aPrintArea, 0, sizeof(ScRange) );
     memset( &aRepeatRow, 0, sizeof(ScRange) );
@@ -101,9 +101,9 @@ void ScPageAreaParam::Reset()
 
 //------------------------------------------------------------------------
 
-BOOL ScPageAreaParam::operator==( const ScPageAreaParam& r ) const
+sal_Bool ScPageAreaParam::operator==( const ScPageAreaParam& r ) const
 {
-    BOOL bEqual =
+    sal_Bool bEqual =
             bPrintArea 	== r.bPrintArea
         &&	bRepeatRow 	== r.bRepeatRow
         &&	bRepeatCol 	== r.bRepeatCol;
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 7b6309366..e484b87a4 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -126,7 +126,7 @@ __EXPORT ScPatternAttr::~ScPatternAttr()
 
 SfxPoolItem* __EXPORT ScPatternAttr::Clone( SfxItemPool *pPool ) const
 {
-    ScPatternAttr* pPattern = new ScPatternAttr( GetItemSet().Clone(TRUE, pPool) );
+    ScPatternAttr* pPattern = new ScPatternAttr( GetItemSet().Clone(sal_True, pPool) );
 
     pPattern->pStyle = pStyle;
     pPattern->pName  = pName ? new String(*pName) : NULL;
@@ -136,7 +136,7 @@ SfxPoolItem* __EXPORT ScPatternAttr::Clone( SfxItemPool *pPool ) const
 
 inline int StrCmp( const String* pStr1, const String* pStr2 )
 {
-    return ( pStr1 ? ( pStr2 ? ( *pStr1 == *pStr2 ) : FALSE ) : ( pStr2 ? FALSE : TRUE ) );
+    return ( pStr1 ? ( pStr2 ? ( *pStr1 == *pStr2 ) : sal_False ) : ( pStr2 ? sal_False : sal_True ) );
 }
 
 inline bool EqualPatternSets( const SfxItemSet& rSet1, const SfxItemSet& rSet2 )
@@ -162,10 +162,10 @@ int __EXPORT ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
              StrCmp( GetStyleName(), static_cast<const ScPatternAttr&>(rCmp).GetStyleName() ) );
 }
 
-SfxPoolItem* __EXPORT ScPatternAttr::Create( SvStream& rStream, USHORT /* nVersion */ ) const
+SfxPoolItem* __EXPORT ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ ) const
 {
     String* pStr;
-    BOOL	bHasStyle;
+    sal_Bool	bHasStyle;
     short	eFamDummy;
 
     rStream >> bHasStyle;
@@ -190,9 +190,9 @@ SfxPoolItem* __EXPORT ScPatternAttr::Create( SvStream& rStream, USHORT /* nVersi
     return pPattern;
 }
 
-SvStream& __EXPORT ScPatternAttr::Store(SvStream& rStream, USHORT /* nItemVersion */) const
+SvStream& __EXPORT ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) const
 {
-    rStream << (BOOL)TRUE;
+    rStream << (sal_Bool)sal_True;
 
     if ( pStyle )
         rStream.WriteByteString( pStyle->GetName(), rStream.GetStreamCharSet() );
@@ -219,7 +219,7 @@ SvxCellOrientation ScPatternAttr::GetCellOrientation( const SfxItemSet& rItemSet
     }
     else
     {
-        INT32 nAngle = ((const SfxInt32Item&)GetItem( ATTR_ROTATE_VALUE, rItemSet, pCondSet )).GetValue();
+        sal_Int32 nAngle = ((const SfxInt32Item&)GetItem( ATTR_ROTATE_VALUE, rItemSet, pCondSet )).GetValue();
         if( nAngle == 9000 )
             eOrient = SVX_ORIENTATION_BOTTOMTOP;
         else if( nAngle == 27000 )
@@ -237,27 +237,27 @@ SvxCellOrientation ScPatternAttr::GetCellOrientation( const SfxItemSet* pCondSet
 void ScPatternAttr::GetFont(
         Font& rFont, const SfxItemSet& rItemSet, ScAutoFontColorMode eAutoMode,
         OutputDevice* pOutDev, const Fraction* pScale,
-        const SfxItemSet* pCondSet, BYTE nScript,
+        const SfxItemSet* pCondSet, sal_uInt8 nScript,
         const Color* pBackConfigColor, const Color* pTextConfigColor )
 {
     //	Items auslesen
 
     const SvxFontItem* pFontAttr;
-    UINT32 nFontHeight;
+    sal_uInt32 nFontHeight;
     FontWeight eWeight;
     FontItalic eItalic;
     FontUnderline eUnder;
     FontUnderline eOver;
-    BOOL bWordLine;
+    sal_Bool bWordLine;
     FontStrikeout eStrike;
-    BOOL bOutline;
-    BOOL bShadow;
+    sal_Bool bOutline;
+    sal_Bool bShadow;
     FontEmphasisMark eEmphasis;
     FontRelief eRelief;
     Color aColor;
     LanguageType eLang;
 
-    USHORT nFontId, nHeightId, nWeightId, nPostureId, nLangId;
+    sal_uInt16 nFontId, nHeightId, nWeightId, nPostureId, nLangId;
     if ( nScript == SCRIPTTYPE_ASIAN )
     {
         nFontId    = ATTR_CJK_FONT;
@@ -287,59 +287,59 @@ void ScPatternAttr::GetFont(
     {
         const SfxPoolItem* pItem;
 
-        if ( pCondSet->GetItemState( nFontId, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( nFontId, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( nFontId );
         pFontAttr = (const SvxFontItem*) pItem;
 
-        if ( pCondSet->GetItemState( nHeightId, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( nHeightId, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( nHeightId );
         nFontHeight = ((const SvxFontHeightItem*)pItem)->GetHeight();
 
-        if ( pCondSet->GetItemState( nWeightId, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( nWeightId, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( nWeightId );
         eWeight = (FontWeight)((const SvxWeightItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( nPostureId, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( nPostureId, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( nPostureId );
         eItalic = (FontItalic)((const SvxPostureItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_UNDERLINE );
         eUnder = (FontUnderline)((const SvxUnderlineItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_OVERLINE );
         eOver = (FontUnderline)((const SvxOverlineItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_WORDLINE );
         bWordLine = ((const SvxWordLineModeItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_CROSSEDOUT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_CROSSEDOUT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_CROSSEDOUT );
         eStrike = (FontStrikeout)((const SvxCrossedOutItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_CONTOUR, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_CONTOUR, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_CONTOUR );
         bOutline = ((const SvxContourItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_SHADOWED, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_SHADOWED, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_SHADOWED );
         bShadow = ((const SvxShadowedItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_EMPHASISMARK, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_EMPHASISMARK, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_EMPHASISMARK );
         eEmphasis = ((const SvxEmphasisMarkItem*)pItem)->GetEmphasisMark();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_RELIEF, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_RELIEF, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_RELIEF );
         eRelief = (FontRelief)((const SvxCharReliefItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_COLOR, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_COLOR, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( ATTR_FONT_COLOR );
         aColor = ((const SvxColorItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( nLangId, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( nLangId, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rItemSet.Get( nLangId );
         eLang = ((const SvxLanguageItem*)pItem)->GetLanguage();
     }
@@ -432,7 +432,7 @@ void ScPatternAttr::GetFont(
             if ( pCondSet )
             {
                 const SfxPoolItem* pItem;
-                if ( pCondSet->GetItemState( ATTR_BACKGROUND, TRUE, &pItem ) != SFX_ITEM_SET )
+                if ( pCondSet->GetItemState( ATTR_BACKGROUND, sal_True, &pItem ) != SFX_ITEM_SET )
                     pItem = &rItemSet.Get( ATTR_BACKGROUND );
                 aBackColor = ((const SvxBrushItem*)pItem)->GetColor();
             }
@@ -497,13 +497,13 @@ void ScPatternAttr::GetFont(
     rFont.SetEmphasisMark( eEmphasis );
     rFont.SetRelief( eRelief );
     rFont.SetColor( aColor );
-    rFont.SetTransparent( TRUE );
+    rFont.SetTransparent( sal_True );
 }
 
 void ScPatternAttr::GetFont(
         Font& rFont, ScAutoFontColorMode eAutoMode,
         OutputDevice* pOutDev, const Fraction* pScale,
-        const SfxItemSet* pCondSet, BYTE nScript,
+        const SfxItemSet* pCondSet, sal_uInt8 nScript,
         const Color* pBackConfigColor, const Color* pTextConfigColor ) const
 {
     GetFont( rFont, GetItemSet(), eAutoMode, pOutDev, pScale, pCondSet, nScript, pBackConfigColor, pTextConfigColor );
@@ -522,16 +522,16 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r
     FontWeight		eWeight, eCjkWeight, eCtlWeight;
     SvxUnderlineItem aUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE);
     SvxOverlineItem aOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE);
-    BOOL			bWordLine;
+    sal_Bool			bWordLine;
     FontStrikeout	eStrike;
     FontItalic		eItalic, eCjkItalic, eCtlItalic;
-    BOOL			bOutline;
-    BOOL			bShadow;
-    BOOL			bForbidden;
+    sal_Bool			bOutline;
+    sal_Bool			bShadow;
+    sal_Bool			bForbidden;
     FontEmphasisMark eEmphasis;
     FontRelief		eRelief;
     LanguageType	eLang, eCjkLang, eCtlLang;
-    BOOL			bHyphenate;
+    sal_Bool			bHyphenate;
     SvxFrameDirection eDirection;
 
     //!	additional parameter to control if language is needed?
@@ -540,100 +540,100 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r
     {
         const SfxPoolItem* pItem;
 
-        if ( pCondSet->GetItemState( ATTR_FONT_COLOR, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_COLOR, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_COLOR );
         aColorItem = *(const SvxColorItem*)pItem;
 
-        if ( pCondSet->GetItemState( ATTR_FONT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT );
         aFontItem = *(const SvxFontItem*)pItem;
-        if ( pCondSet->GetItemState( ATTR_CJK_FONT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CJK_FONT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CJK_FONT );
         aCjkFontItem = *(const SvxFontItem*)pItem;
-        if ( pCondSet->GetItemState( ATTR_CTL_FONT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CTL_FONT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CTL_FONT );
         aCtlFontItem = *(const SvxFontItem*)pItem;
 
-        if ( pCondSet->GetItemState( ATTR_FONT_HEIGHT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_HEIGHT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_HEIGHT );
         nTHeight = ((const SvxFontHeightItem*)pItem)->GetHeight();
-        if ( pCondSet->GetItemState( ATTR_CJK_FONT_HEIGHT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CJK_FONT_HEIGHT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CJK_FONT_HEIGHT );
         nCjkTHeight = ((const SvxFontHeightItem*)pItem)->GetHeight();
-        if ( pCondSet->GetItemState( ATTR_CTL_FONT_HEIGHT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CTL_FONT_HEIGHT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CTL_FONT_HEIGHT );
         nCtlTHeight = ((const SvxFontHeightItem*)pItem)->GetHeight();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_WEIGHT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_WEIGHT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_WEIGHT );
         eWeight = (FontWeight)((const SvxWeightItem*)pItem)->GetValue();
-        if ( pCondSet->GetItemState( ATTR_CJK_FONT_WEIGHT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CJK_FONT_WEIGHT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CJK_FONT_WEIGHT );
         eCjkWeight = (FontWeight)((const SvxWeightItem*)pItem)->GetValue();
-        if ( pCondSet->GetItemState( ATTR_CTL_FONT_WEIGHT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CTL_FONT_WEIGHT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CTL_FONT_WEIGHT );
         eCtlWeight = (FontWeight)((const SvxWeightItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_POSTURE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_POSTURE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_POSTURE );
         eItalic = (FontItalic)((const SvxPostureItem*)pItem)->GetValue();
-        if ( pCondSet->GetItemState( ATTR_CJK_FONT_POSTURE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CJK_FONT_POSTURE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CJK_FONT_POSTURE );
         eCjkItalic = (FontItalic)((const SvxPostureItem*)pItem)->GetValue();
-        if ( pCondSet->GetItemState( ATTR_CTL_FONT_POSTURE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CTL_FONT_POSTURE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CTL_FONT_POSTURE );
         eCtlItalic = (FontItalic)((const SvxPostureItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_UNDERLINE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_UNDERLINE );
         aUnderlineItem = *(const SvxUnderlineItem*)pItem;
 
-        if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_OVERLINE );
         aOverlineItem = *(const SvxOverlineItem*)pItem;
 
-        if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_WORDLINE );
         bWordLine = ((const SvxWordLineModeItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_CROSSEDOUT, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_CROSSEDOUT, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_CROSSEDOUT );
         eStrike = (FontStrikeout)((const SvxCrossedOutItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_CONTOUR, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_CONTOUR, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_CONTOUR );
         bOutline = ((const SvxContourItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_SHADOWED, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_SHADOWED, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_SHADOWED );
         bShadow = ((const SvxShadowedItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FORBIDDEN_RULES, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FORBIDDEN_RULES, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FORBIDDEN_RULES );
         bForbidden = ((const SvxForbiddenRuleItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_EMPHASISMARK, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_EMPHASISMARK, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_EMPHASISMARK );
         eEmphasis = ((const SvxEmphasisMarkItem*)pItem)->GetEmphasisMark();
-        if ( pCondSet->GetItemState( ATTR_FONT_RELIEF, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_RELIEF, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_RELIEF );
         eRelief = (FontRelief)((const SvxCharReliefItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_FONT_LANGUAGE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_FONT_LANGUAGE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_FONT_LANGUAGE );
         eLang = ((const SvxLanguageItem*)pItem)->GetLanguage();
-        if ( pCondSet->GetItemState( ATTR_CJK_FONT_LANGUAGE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CJK_FONT_LANGUAGE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CJK_FONT_LANGUAGE );
         eCjkLang = ((const SvxLanguageItem*)pItem)->GetLanguage();
-        if ( pCondSet->GetItemState( ATTR_CTL_FONT_LANGUAGE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_CTL_FONT_LANGUAGE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_CTL_FONT_LANGUAGE );
         eCtlLang = ((const SvxLanguageItem*)pItem)->GetLanguage();
 
-        if ( pCondSet->GetItemState( ATTR_HYPHENATE, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_HYPHENATE, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_HYPHENATE );
         bHyphenate = ((const SfxBoolItem*)pItem)->GetValue();
 
-        if ( pCondSet->GetItemState( ATTR_WRITINGDIR, TRUE, &pItem ) != SFX_ITEM_SET )
+        if ( pCondSet->GetItemState( ATTR_WRITINGDIR, sal_True, &pItem ) != SFX_ITEM_SET )
             pItem = &rSrcSet.Get( ATTR_WRITINGDIR );
         eDirection = (SvxFrameDirection)((const SvxFrameDirectionItem*)pItem)->GetValue();
     }
@@ -740,7 +740,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r
     // (don't evaluate attributes that can't be changed).
     // If a locale-dependent default is needed, it has to go into the cell
     // style, like the fonts.
-    rEditSet.Put( SvxScriptSpaceItem( FALSE, EE_PARA_ASIANCJKSPACING ) );
+    rEditSet.Put( SvxScriptSpaceItem( sal_False, EE_PARA_ASIANCJKSPACING ) );
 }
 
 void ScPatternAttr::FillEditItemSet( SfxItemSet* pEditSet, const SfxItemSet* pCondSet ) const
@@ -754,80 +754,80 @@ void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet&
 {
     const SfxPoolItem* pItem;
 
-    if (rEditSet.GetItemState(EE_CHAR_COLOR,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_COLOR,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxColorItem(ATTR_FONT_COLOR) = *(const SvxColorItem*)pItem );
 
-    if (rEditSet.GetItemState(EE_CHAR_FONTINFO,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_FONTINFO,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxFontItem(ATTR_FONT) = *(const SvxFontItem*)pItem );
-    if (rEditSet.GetItemState(EE_CHAR_FONTINFO_CJK,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_FONTINFO_CJK,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxFontItem(ATTR_CJK_FONT) = *(const SvxFontItem*)pItem );
-    if (rEditSet.GetItemState(EE_CHAR_FONTINFO_CTL,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_FONTINFO_CTL,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxFontItem(ATTR_CTL_FONT) = *(const SvxFontItem*)pItem );
 
-    if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxFontHeightItem( HMMToTwips( ((const SvxFontHeightItem*)pItem)->GetHeight() ),
                         100, ATTR_FONT_HEIGHT ) );
-    if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT_CJK,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT_CJK,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxFontHeightItem( HMMToTwips( ((const SvxFontHeightItem*)pItem)->GetHeight() ),
                         100, ATTR_CJK_FONT_HEIGHT ) );
-    if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT_CTL,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_FONTHEIGHT_CTL,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxFontHeightItem( HMMToTwips( ((const SvxFontHeightItem*)pItem)->GetHeight() ),
                         100, ATTR_CTL_FONT_HEIGHT ) );
 
-    if (rEditSet.GetItemState(EE_CHAR_WEIGHT,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_WEIGHT,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxWeightItem( (FontWeight)((const SvxWeightItem*)pItem)->GetValue(),
                         ATTR_FONT_WEIGHT) );
-    if (rEditSet.GetItemState(EE_CHAR_WEIGHT_CJK,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_WEIGHT_CJK,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxWeightItem( (FontWeight)((const SvxWeightItem*)pItem)->GetValue(),
                         ATTR_CJK_FONT_WEIGHT) );
-    if (rEditSet.GetItemState(EE_CHAR_WEIGHT_CTL,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_WEIGHT_CTL,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxWeightItem( (FontWeight)((const SvxWeightItem*)pItem)->GetValue(),
                         ATTR_CTL_FONT_WEIGHT) );
 
     // SvxTextLineItem contains enum and color
-    if (rEditSet.GetItemState(EE_CHAR_UNDERLINE,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_UNDERLINE,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxUnderlineItem(UNDERLINE_NONE,ATTR_FONT_UNDERLINE) = *(const SvxUnderlineItem*)pItem );
-    if (rEditSet.GetItemState(EE_CHAR_OVERLINE,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_OVERLINE,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxOverlineItem(UNDERLINE_NONE,ATTR_FONT_OVERLINE) = *(const SvxOverlineItem*)pItem );
-    if (rEditSet.GetItemState(EE_CHAR_WLM,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_WLM,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxWordLineModeItem( ((const SvxWordLineModeItem*)pItem)->GetValue(),
                         ATTR_FONT_WORDLINE) );
 
-    if (rEditSet.GetItemState(EE_CHAR_STRIKEOUT,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_STRIKEOUT,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxCrossedOutItem( (FontStrikeout)((const SvxCrossedOutItem*)pItem)->GetValue(),
                         ATTR_FONT_CROSSEDOUT) );
 
-    if (rEditSet.GetItemState(EE_CHAR_ITALIC,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_ITALIC,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxPostureItem( (FontItalic)((const SvxPostureItem*)pItem)->GetValue(),
                         ATTR_FONT_POSTURE) );
-    if (rEditSet.GetItemState(EE_CHAR_ITALIC_CJK,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_ITALIC_CJK,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxPostureItem( (FontItalic)((const SvxPostureItem*)pItem)->GetValue(),
                         ATTR_CJK_FONT_POSTURE) );
-    if (rEditSet.GetItemState(EE_CHAR_ITALIC_CTL,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_ITALIC_CTL,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxPostureItem( (FontItalic)((const SvxPostureItem*)pItem)->GetValue(),
                         ATTR_CTL_FONT_POSTURE) );
 
-    if (rEditSet.GetItemState(EE_CHAR_OUTLINE,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_OUTLINE,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxContourItem( ((const SvxContourItem*)pItem)->GetValue(),
                         ATTR_FONT_CONTOUR) );
-    if (rEditSet.GetItemState(EE_CHAR_SHADOW,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_SHADOW,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxShadowedItem( ((const SvxShadowedItem*)pItem)->GetValue(),
                         ATTR_FONT_SHADOWED) );
-    if (rEditSet.GetItemState(EE_CHAR_EMPHASISMARK,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_EMPHASISMARK,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxEmphasisMarkItem( ((const SvxEmphasisMarkItem*)pItem)->GetEmphasisMark(),
                         ATTR_FONT_EMPHASISMARK) );
-    if (rEditSet.GetItemState(EE_CHAR_RELIEF,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_RELIEF,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxCharReliefItem( (FontRelief)((const SvxCharReliefItem*)pItem)->GetValue(),
                         ATTR_FONT_RELIEF) );
 
-    if (rEditSet.GetItemState(EE_CHAR_LANGUAGE,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_LANGUAGE,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxLanguageItem(static_cast<const SvxLanguageItem*>(pItem)->GetValue(), ATTR_FONT_LANGUAGE) );
-    if (rEditSet.GetItemState(EE_CHAR_LANGUAGE_CJK,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_LANGUAGE_CJK,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxLanguageItem(static_cast<const SvxLanguageItem*>(pItem)->GetValue(), ATTR_CJK_FONT_LANGUAGE) );
-    if (rEditSet.GetItemState(EE_CHAR_LANGUAGE_CTL,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_CHAR_LANGUAGE_CTL,sal_True,&pItem) == SFX_ITEM_SET)
         rDestSet.Put( SvxLanguageItem(static_cast<const SvxLanguageItem*>(pItem)->GetValue(), ATTR_CTL_FONT_LANGUAGE) );
 
-    if (rEditSet.GetItemState(EE_PARA_JUST,TRUE,&pItem) == SFX_ITEM_SET)
+    if (rEditSet.GetItemState(EE_PARA_JUST,sal_True,&pItem) == SFX_ITEM_SET)
     {
         SvxCellHorJustify eVal;
         switch ( ((const SvxAdjustItem*)pItem)->GetAdjust() )
@@ -896,12 +896,12 @@ void ScPatternAttr::DeleteUnchanged( const ScPatternAttr* pOldAttrs )
     const SfxPoolItem* pThisItem;
     const SfxPoolItem* pOldItem;
 
-    for ( USHORT nSubWhich=ATTR_PATTERN_START; nSubWhich<=ATTR_PATTERN_END; nSubWhich++ )
+    for ( sal_uInt16 nSubWhich=ATTR_PATTERN_START; nSubWhich<=ATTR_PATTERN_END; nSubWhich++ )
     {
         //	only items that are set are interesting
-        if ( rThisSet.GetItemState( nSubWhich, FALSE, &pThisItem ) == SFX_ITEM_SET )
+        if ( rThisSet.GetItemState( nSubWhich, sal_False, &pThisItem ) == SFX_ITEM_SET )
         {
-            SfxItemState eOldState = rOldSet.GetItemState( nSubWhich, TRUE, &pOldItem );
+            SfxItemState eOldState = rOldSet.GetItemState( nSubWhich, sal_True, &pOldItem );
             if ( eOldState == SFX_ITEM_SET )
             {
                 //	item is set in OldAttrs (or its parent) -> compare pointers
@@ -918,19 +918,19 @@ void ScPatternAttr::DeleteUnchanged( const ScPatternAttr* pOldAttrs )
     }
 }
 
-BOOL ScPatternAttr::HasItemsSet( const USHORT* pWhich ) const
+sal_Bool ScPatternAttr::HasItemsSet( const sal_uInt16* pWhich ) const
 {
     const SfxItemSet& rSet = GetItemSet();
-    for (USHORT i=0; pWhich[i]; i++)
-        if ( rSet.GetItemState( pWhich[i], FALSE ) == SFX_ITEM_SET )
-            return TRUE;
-    return FALSE;
+    for (sal_uInt16 i=0; pWhich[i]; i++)
+        if ( rSet.GetItemState( pWhich[i], sal_False ) == SFX_ITEM_SET )
+            return sal_True;
+    return sal_False;
 }
 
-void ScPatternAttr::ClearItems( const USHORT* pWhich )
+void ScPatternAttr::ClearItems( const sal_uInt16* pWhich )
 {
     SfxItemSet& rSet = GetItemSet();
-    for (USHORT i=0; pWhich[i]; i++)
+    for (sal_uInt16 i=0; pWhich[i]; i++)
         rSet.ClearItem(pWhich[i]);
 }
 
@@ -968,9 +968,9 @@ SfxStyleSheetBase* lcl_CopyStyleToPool
 
         const SfxPoolItem* pSrcItem;
         if ( pFormatExchangeList &&
-             rSrcSet.GetItemState( ATTR_VALUE_FORMAT, FALSE, &pSrcItem ) == SFX_ITEM_SET )
+             rSrcSet.GetItemState( ATTR_VALUE_FORMAT, sal_False, &pSrcItem ) == SFX_ITEM_SET )
         {
-            ULONG nOldFormat = static_cast<const SfxUInt32Item*>(pSrcItem)->GetValue();
+            sal_uLong nOldFormat = static_cast<const SfxUInt32Item*>(pSrcItem)->GetValue();
             sal_uInt32* pNewFormat = static_cast<sal_uInt32*>(pFormatExchangeList->Get( nOldFormat ));
             if (pNewFormat)
                 rDestSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, *pNewFormat ) );
@@ -1016,10 +1016,10 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
         pDestPattern->SetStyleSheet( (ScStyleSheet*)pStyleCpy );
     }
 
-    for ( USHORT nAttrId = ATTR_PATTERN_START; nAttrId <= ATTR_PATTERN_END; nAttrId++ )
+    for ( sal_uInt16 nAttrId = ATTR_PATTERN_START; nAttrId <= ATTR_PATTERN_END; nAttrId++ )
     {
         const SfxPoolItem* pSrcItem;
-        SfxItemState eItemState = pSrcSet->GetItemState( nAttrId, FALSE, &pSrcItem );
+        SfxItemState eItemState = pSrcSet->GetItemState( nAttrId, sal_False, &pSrcItem );
         if (eItemState==SFX_ITEM_ON)
         {
             SfxPoolItem* pNewItem = NULL;
@@ -1028,11 +1028,11 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
             {
                 //	Bedingte Formate ins neue Dokument kopieren
 
-                ULONG nNewIndex = 0;
+                sal_uLong nNewIndex = 0;
                 ScConditionalFormatList* pSrcList = pSrcDoc->GetCondFormList();
                 if ( pSrcList )
                 {
-                    ULONG nOldIndex = ((const SfxUInt32Item*)pSrcItem)->GetValue();
+                    sal_uLong nOldIndex = ((const SfxUInt32Item*)pSrcItem)->GetValue();
                     const ScConditionalFormat* pOldData = pSrcList->GetFormat( nOldIndex );
                     if ( pOldData )
                     {
@@ -1044,8 +1044,8 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
                         ScStyleSheetPool* pSrcSPool = pSrcDoc->GetStyleSheetPool();
                         ScStyleSheetPool* pDestSPool = pDestDoc->GetStyleSheetPool();
                         const SvNumberFormatterIndexTable* pFormatExchangeList = pDestDoc->GetFormatExchangeList();
-                        USHORT nStlCnt = pOldData->Count();
-                        for (USHORT i=0; i<nStlCnt; i++)
+                        sal_uInt16 nStlCnt = pOldData->Count();
+                        for (sal_uInt16 i=0; i<nStlCnt; i++)
                         {
                             String aName = pOldData->GetEntry(i)->GetStyle();
                             SfxStyleSheetBase* pSrcStl =
@@ -1060,11 +1060,11 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
             {
                 //	Gueltigkeit ins neue Dokument kopieren
 
-                ULONG nNewIndex = 0;
+                sal_uLong nNewIndex = 0;
                 ScValidationDataList* pSrcList = pSrcDoc->GetValidationList();
                 if ( pSrcList )
                 {
-                    ULONG nOldIndex = ((const SfxUInt32Item*)pSrcItem)->GetValue();
+                    sal_uLong nOldIndex = ((const SfxUInt32Item*)pSrcItem)->GetValue();
                     const ScValidationData* pOldData = pSrcList->GetData( nOldIndex );
                     if ( pOldData )
                         nNewIndex = pDestDoc->AddValidationEntry( *pOldData );
@@ -1075,10 +1075,10 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
             {
                 //	Zahlformate nach Exchange-Liste
 
-                ULONG nOldFormat = ((const SfxUInt32Item*)pSrcItem)->GetValue();
+                sal_uLong nOldFormat = ((const SfxUInt32Item*)pSrcItem)->GetValue();
                 sal_uInt32* pNewFormat = static_cast<sal_uInt32*>(pDestDoc->GetFormatExchangeList()->Get(nOldFormat));
                 if (pNewFormat)
-                    pNewItem = new SfxUInt32Item( ATTR_VALUE_FORMAT, (UINT32) (*pNewFormat) );
+                    pNewItem = new SfxUInt32Item( ATTR_VALUE_FORMAT, (sal_uInt32) (*pNewFormat) );
             }
 
             if ( pNewItem )
@@ -1097,53 +1097,53 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
     return pPatternAttr;
 }
 
-BOOL ScPatternAttr::IsVisible() const
+sal_Bool ScPatternAttr::IsVisible() const
 {
     const SfxItemSet& rSet = GetItemSet();
 
     const SfxPoolItem* pItem;
     SfxItemState eState;
 
-    eState = rSet.GetItemState( ATTR_BACKGROUND, TRUE, &pItem );
+    eState = rSet.GetItemState( ATTR_BACKGROUND, sal_True, &pItem );
     if ( eState == SFX_ITEM_SET )
         if ( ((const SvxBrushItem*)pItem)->GetColor().GetColor() != COL_TRANSPARENT )
-            return TRUE;
+            return sal_True;
 
-    eState = rSet.GetItemState( ATTR_BORDER, TRUE, &pItem );
+    eState = rSet.GetItemState( ATTR_BORDER, sal_True, &pItem );
     if ( eState == SFX_ITEM_SET )
     {
         const SvxBoxItem* pBoxItem = (SvxBoxItem*) pItem;
         if ( pBoxItem->GetTop() || pBoxItem->GetBottom() ||
              pBoxItem->GetLeft() || pBoxItem->GetRight() )
-            return TRUE;
+            return sal_True;
     }
 
-    eState = rSet.GetItemState( ATTR_BORDER_TLBR, TRUE, &pItem );
+    eState = rSet.GetItemState( ATTR_BORDER_TLBR, sal_True, &pItem );
     if ( eState == SFX_ITEM_SET )
         if( static_cast< const SvxLineItem* >( pItem )->GetLine() )
-            return TRUE;
+            return sal_True;
 
-    eState = rSet.GetItemState( ATTR_BORDER_BLTR, TRUE, &pItem );
+    eState = rSet.GetItemState( ATTR_BORDER_BLTR, sal_True, &pItem );
     if ( eState == SFX_ITEM_SET )
         if( static_cast< const SvxLineItem* >( pItem )->GetLine() )
-            return TRUE;
+            return sal_True;
 
-    eState = rSet.GetItemState( ATTR_SHADOW, TRUE, &pItem );
+    eState = rSet.GetItemState( ATTR_SHADOW, sal_True, &pItem );
     if ( eState == SFX_ITEM_SET )
         if ( ((const SvxShadowItem*)pItem)->GetLocation() != SVX_SHADOW_NONE )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-inline BOOL OneEqual( const SfxItemSet& rSet1, const SfxItemSet& rSet2, USHORT nId )
+inline sal_Bool OneEqual( const SfxItemSet& rSet1, const SfxItemSet& rSet2, sal_uInt16 nId )
 {
     const SfxPoolItem* pItem1 = &rSet1.Get(nId);
     const SfxPoolItem* pItem2 = &rSet2.Get(nId);
     return ( pItem1 == pItem2 || *pItem1 == *pItem2 );
 }
 
-BOOL ScPatternAttr::IsVisibleEqual( const ScPatternAttr& rOther ) const
+sal_Bool ScPatternAttr::IsVisibleEqual( const ScPatternAttr& rOther ) const
 {
     const SfxItemSet& rThisSet = GetItemSet();
     const SfxItemSet& rOtherSet = rOther.GetItemSet();
@@ -1170,9 +1170,9 @@ void ScPatternAttr::SetStyleSheet( ScStyleSheet* pNewStyle )
         SfxItemSet&		  rPatternSet = GetItemSet();
         const SfxItemSet& rStyleSet = pNewStyle->GetItemSet();
 
-        for (USHORT i=ATTR_PATTERN_START; i<=ATTR_PATTERN_END; i++)
+        for (sal_uInt16 i=ATTR_PATTERN_START; i<=ATTR_PATTERN_END; i++)
         {
-            if (rStyleSet.GetItemState(i, TRUE) == SFX_ITEM_SET)
+            if (rStyleSet.GetItemState(i, sal_True) == SFX_ITEM_SET)
                 rPatternSet.ClearItem(i);
         }
         rPatternSet.SetParent(&pNewStyle->GetItemSet());
@@ -1229,20 +1229,20 @@ void ScPatternAttr::StyleToName()
     }
 }
 
-BOOL ScPatternAttr::IsSymbolFont() const
+sal_Bool ScPatternAttr::IsSymbolFont() const
 {
     const SfxPoolItem* pItem;
-    if( GetItemSet().GetItemState( ATTR_FONT, TRUE, &pItem ) == SFX_ITEM_SET )
-        return BOOL( ((const SvxFontItem*) pItem)->GetCharSet()
+    if( GetItemSet().GetItemState( ATTR_FONT, sal_True, &pItem ) == SFX_ITEM_SET )
+        return sal_Bool( ((const SvxFontItem*) pItem)->GetCharSet()
             == RTL_TEXTENCODING_SYMBOL );
     else
-        return FALSE;
+        return sal_False;
 }
 
-//UNUSED2008-05  FontToSubsFontConverter ScPatternAttr::GetSubsFontConverter( ULONG nFlags ) const
+//UNUSED2008-05  FontToSubsFontConverter ScPatternAttr::GetSubsFontConverter( sal_uLong nFlags ) const
 //UNUSED2008-05  {
 //UNUSED2008-05      const SfxPoolItem* pItem;
-//UNUSED2008-05      if( GetItemSet().GetItemState( ATTR_FONT, TRUE, &pItem ) == SFX_ITEM_SET )
+//UNUSED2008-05      if( GetItemSet().GetItemState( ATTR_FONT, sal_True, &pItem ) == SFX_ITEM_SET )
 //UNUSED2008-05          return CreateFontToSubsFontConverter(
 //UNUSED2008-05              ((const SvxFontItem*) pItem)->GetFamilyName(), nFlags );
 //UNUSED2008-05      else
@@ -1250,9 +1250,9 @@ BOOL ScPatternAttr::IsSymbolFont() const
 //UNUSED2008-05  }
 
 
-ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const
+sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const
 {
-    ULONG nFormat =
+    sal_uLong nFormat =
         ((SfxUInt32Item*)&GetItemSet().Get( ATTR_VALUE_FORMAT ))->GetValue();
     LanguageType eLang =
         ((SvxLanguageItem*)&GetItemSet().Get( ATTR_LANGUAGE_FORMAT ))->GetLanguage();
@@ -1265,17 +1265,17 @@ ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const
 
 //	dasselbe, wenn bedingte Formatierung im Spiel ist:
 
-ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter,
+sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter,
                                         const SfxItemSet* pCondSet ) const
 {
     DBG_ASSERT(pFormatter,"GetNumberFormat ohne Formatter");
 
     const SfxPoolItem* pFormItem;
-    if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,TRUE,&pFormItem) != SFX_ITEM_SET )
+    if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,sal_True,&pFormItem) != SFX_ITEM_SET )
         pFormItem = &GetItemSet().Get(ATTR_VALUE_FORMAT);
 
     const SfxPoolItem* pLangItem;
-    if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,TRUE,&pLangItem) != SFX_ITEM_SET )
+    if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,sal_True,&pLangItem) != SFX_ITEM_SET )
         pLangItem = &GetItemSet().Get(ATTR_LANGUAGE_FORMAT);
 
     return pFormatter->GetFormatForLanguageIfBuiltIn(
@@ -1283,15 +1283,15 @@ ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter,
                     ((SvxLanguageItem*)pLangItem)->GetLanguage() );
 }
 
-const SfxPoolItem& ScPatternAttr::GetItem( USHORT nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet )
+const SfxPoolItem& ScPatternAttr::GetItem( sal_uInt16 nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet )
 {
     const SfxPoolItem* pCondItem;
-    if ( pCondSet && pCondSet->GetItemState( nWhich, TRUE, &pCondItem ) == SFX_ITEM_SET )
+    if ( pCondSet && pCondSet->GetItemState( nWhich, sal_True, &pCondItem ) == SFX_ITEM_SET )
         return *pCondItem;
     return rItemSet.Get(nWhich);
 }
 
-const SfxPoolItem& ScPatternAttr::GetItem( USHORT nSubWhich, const SfxItemSet* pCondSet ) const
+const SfxPoolItem& ScPatternAttr::GetItem( sal_uInt16 nSubWhich, const SfxItemSet* pCondSet ) const
 {
     return GetItem( nSubWhich, GetItemSet(), pCondSet );
 }
@@ -1303,7 +1303,7 @@ long ScPatternAttr::GetRotateVal( const SfxItemSet* pCondSet ) const
     long nAttrRotate = 0;
     if ( GetCellOrientation() == SVX_ORIENTATION_STANDARD )
     {
-        BOOL bRepeat = ( static_cast<const SvxHorJustifyItem&>(GetItem(ATTR_HOR_JUSTIFY, pCondSet)).
+        sal_Bool bRepeat = ( static_cast<const SvxHorJustifyItem&>(GetItem(ATTR_HOR_JUSTIFY, pCondSet)).
                             GetValue() == SVX_HOR_JUSTIFY_REPEAT );
         // ignore orientation/rotation if "repeat" is active
         if ( !bRepeat )
@@ -1312,9 +1312,9 @@ long ScPatternAttr::GetRotateVal( const SfxItemSet* pCondSet ) const
     return nAttrRotate;
 }
 
-BYTE ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const
+sal_uInt8 ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const
 {
-    BYTE nRet = SC_ROTDIR_NONE;
+    sal_uInt8 nRet = SC_ROTDIR_NONE;
 
     long nAttrRotate = GetRotateVal( pCondSet );
     if ( nAttrRotate )
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index d565e2cbe..7b899b088 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -98,13 +98,13 @@ OUString ScDPLabelData::getDisplayName() const
 
 // ============================================================================
 
-ScDPFuncData::ScDPFuncData( short nCol, USHORT nFuncMask ) :
+ScDPFuncData::ScDPFuncData( short nCol, sal_uInt16 nFuncMask ) :
     mnCol( nCol ),
     mnFuncMask( nFuncMask )
 {
 }
 
-ScDPFuncData::ScDPFuncData( short nCol, USHORT nFuncMask, const DataPilotFieldReference& rFieldRef ) :
+ScDPFuncData::ScDPFuncData( short nCol, sal_uInt16 nFuncMask, const DataPilotFieldReference& rFieldRef ) :
     mnCol( nCol ),
     mnFuncMask( nFuncMask ),
     maFieldRef( rFieldRef )
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index fda341f7d..8de362613 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -101,10 +101,10 @@ void ScPoolHelper::UseDocOptions() const
 {
     if (pFormTable)
     {
-        USHORT d,m,y;
+        sal_uInt16 d,m,y;
         aOpt.GetDate( d,m,y );
         pFormTable->ChangeNullDate( d,m,y );
-        pFormTable->ChangeStandardPrec( (USHORT)aOpt.GetStdPrecision() );
+        pFormTable->ChangeStandardPrec( (sal_uInt16)aOpt.GetStdPrecision() );
         pFormTable->SetYear2000( aOpt.GetYear2000() );
     }
 }
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index d90f5b94a..7970ae13c 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -129,16 +129,16 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj& rCaption, ScDocument& rDoc )
         value. */
     aItemSet.Put( XLineStartItem( String::EmptyString(), ::basegfx::B2DPolyPolygon( aTriangle ) ) );
     aItemSet.Put( XLineStartWidthItem( 200 ) );
-    aItemSet.Put( XLineStartCenterItem( FALSE ) );
+    aItemSet.Put( XLineStartCenterItem( sal_False ) );
     aItemSet.Put( XFillStyleItem( XFILL_SOLID ) );
     aItemSet.Put( XFillColorItem( String::EmptyString(), ScDetectiveFunc::GetCommentColor() ) );
     aItemSet.Put( SdrCaptionEscDirItem( SDRCAPT_ESCBESTFIT ) );
 
     // shadow
-    /*  SdrShadowItem has FALSE, instead the shadow is set for the
+    /*  SdrShadowItem has sal_False, instead the shadow is set for the
         rectangle only with SetSpecialTextBoxShadow() when the object is
         created (item must be set to adjust objects from older files). */
-    aItemSet.Put( SdrShadowItem( FALSE ) );
+    aItemSet.Put( SdrShadowItem( sal_False ) );
     aItemSet.Put( SdrShadowXDistItem( 100 ) );
     aItemSet.Put( SdrShadowYDistItem( 100 ) );
 
@@ -147,8 +147,8 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj& rCaption, ScDocument& rDoc )
     aItemSet.Put( SdrTextRightDistItem( 100 ) );
     aItemSet.Put( SdrTextUpperDistItem( 100 ) );
     aItemSet.Put( SdrTextLowerDistItem( 100 ) );
-    aItemSet.Put( SdrTextAutoGrowWidthItem( FALSE ) );
-    aItemSet.Put( SdrTextAutoGrowHeightItem( TRUE ) );
+    aItemSet.Put( SdrTextAutoGrowWidthItem( sal_False ) );
+    aItemSet.Put( SdrTextAutoGrowHeightItem( sal_True ) );
     // #78943# use the default cell style to be able to modify the caption font
     const ScPatternAttr& rDefPattern = static_cast< const ScPatternAttr& >( rDoc.GetPool()->GetDefaultItem( ATTR_PATTERN ) );
     rDefPattern.FillEditItemSet( &aItemSet );
@@ -161,7 +161,7 @@ void ScCaptionUtil::SetCaptionItems( SdrCaptionObj& rCaption, const SfxItemSet&
     // copy all items
     rCaption.SetMergedItemSet( rItemSet );
     // reset shadow items
-    rCaption.SetMergedItem( SdrShadowItem( FALSE ) );
+    rCaption.SetMergedItem( SdrShadowItem( sal_False ) );
     rCaption.SetMergedItem( SdrShadowXDistItem( 100 ) );
     rCaption.SetMergedItem( SdrShadowYDistItem( 100 ) );
     rCaption.SetSpecialTextBoxShadow();
@@ -566,7 +566,7 @@ OUString ScPostIt::GetText() const
     if( const EditTextObject* pEditObj = GetEditTextObject() )
     {
         OUStringBuffer aBuffer;
-        for( USHORT nPara = 0, nParaCount = pEditObj->GetParagraphCount(); nPara < nParaCount; ++nPara )
+        for( sal_uInt16 nPara = 0, nParaCount = pEditObj->GetParagraphCount(); nPara < nParaCount; ++nPara )
         {
             if( nPara > 0 )
                 aBuffer.append( sal_Unicode( '\n' ) );
@@ -836,10 +836,10 @@ SdrCaptionObj* ScNoteUtil::CreateTempCaption(
         ScCaptionUtil::SetDefaultItems( *pCaption, rDoc );
         // adjust caption size to text size
         long nMaxWidth = ::std::min< long >( aVisRect.GetWidth() * 2 / 3, SC_NOTECAPTION_MAXWIDTH_TEMP );
-        pCaption->SetMergedItem( SdrTextAutoGrowWidthItem( TRUE ) );
+        pCaption->SetMergedItem( SdrTextAutoGrowWidthItem( sal_True ) );
         pCaption->SetMergedItem( SdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) );
         pCaption->SetMergedItem( SdrTextMaxFrameWidthItem( nMaxWidth ) );
-        pCaption->SetMergedItem( SdrTextAutoGrowHeightItem( TRUE ) );
+        pCaption->SetMergedItem( SdrTextAutoGrowHeightItem( sal_True ) );
         pCaption->AdjustTextFrameWidthAndHeight();
     }
 
diff --git a/sc/source/core/data/scdpoutputimpl.cxx b/sc/source/core/data/scdpoutputimpl.cxx
index b780768b9..76796c041 100644
--- a/sc/source/core/data/scdpoutputimpl.cxx
+++ b/sc/source/core/data/scdpoutputimpl.cxx
@@ -52,7 +52,7 @@ void OutputImpl::OutputDataArea()
     mnCols.push_back( mnTabEndCol+1); //set last row bottom 
     mnRows.push_back( mnTabEndRow+1); //set last col bottom
     
-    BOOL bAllRows = ( ( mnTabEndRow - mnDataStartRow + 2 ) == (SCROW) mnRows.size() );
+    sal_Bool bAllRows = ( ( mnTabEndRow - mnDataStartRow + 2 ) == (SCROW) mnRows.size() );
     
     std::sort( mnCols.begin(), mnCols.end(), lcl_compareColfuc );
     std::sort( mnRows.begin(), mnRows.end(), lcl_compareRowfuc );
@@ -88,7 +88,7 @@ void OutputImpl::OutputDataArea()
     OutputBlockFrame( mnDataStartCol, mnTabStartRow, mnTabEndCol, mnDataStartRow-1 );
 }
 
-OutputImpl::OutputImpl( ScDocument*	pDoc, USHORT nTab,
+OutputImpl::OutputImpl( ScDocument*	pDoc, sal_uInt16 nTab,
         SCCOL	nTabStartCol,
         SCROW	nTabStartRow,
         SCCOL	nMemberStartCol,
@@ -113,32 +113,32 @@ OutputImpl::OutputImpl( ScDocument*	pDoc, USHORT nTab,
     
 }
 
-BOOL OutputImpl::AddRow( SCROW nRow )
+sal_Bool OutputImpl::AddRow( SCROW nRow )
 {
     if ( !mbNeedLineRows[ nRow - mnDataStartRow ] )
     {
         mbNeedLineRows[ nRow - mnDataStartRow ] = true;
         mnRows.push_back( nRow );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL OutputImpl::AddCol( SCCOL nCol )
+sal_Bool OutputImpl::AddCol( SCCOL nCol )
 {
     
     if ( !mbNeedLineCols[ nCol - mnDataStartCol ] )
     {
         mbNeedLineCols[ nCol - mnDataStartCol ] = true;
         mnCols.push_back( nCol );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;	
+        return sal_False;	
 }
 
-void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bHori )
+void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Bool bHori )
 {
 
     SvxBorderLine aLine, aOutLine;
@@ -171,16 +171,16 @@ void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEnd
 
         
     SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER );
-    aBoxInfo.SetValid(VALID_VERT,FALSE );
+    aBoxInfo.SetValid(VALID_VERT,sal_False );
     if ( bHori )
     {
-        aBoxInfo.SetValid(VALID_HORI,TRUE);
+        aBoxInfo.SetValid(VALID_HORI,sal_True);
         aBoxInfo.SetLine( &aLine, BOXINFO_LINE_HORI );
     }
     else
-        aBoxInfo.SetValid(VALID_HORI,FALSE );
+        aBoxInfo.SetValid(VALID_HORI,sal_False );
 
-    aBoxInfo.SetValid(VALID_DISTANCE,FALSE);
+    aBoxInfo.SetValid(VALID_DISTANCE,sal_False);
 
     mpDoc->ApplyFrameAreaTab( ScRange(  nStartCol, nStartRow, mnTab, nEndCol, nEndRow , mnTab ), &aBox, &aBoxInfo );
 
diff --git a/sc/source/core/data/scdpoutputimpl.hxx b/sc/source/core/data/scdpoutputimpl.hxx
index 34f61ed99..dd13bfebe 100755..100644
--- a/sc/source/core/data/scdpoutputimpl.hxx
+++ b/sc/source/core/data/scdpoutputimpl.hxx
@@ -41,7 +41,7 @@
 class OutputImpl
 {
     ScDocument*			mpDoc;
-    USHORT				mnTab;
+    sal_uInt16				mnTab;
     ::std::vector< bool > mbNeedLineCols;
     ::std::vector< SCCOL > mnCols;
     
@@ -59,7 +59,7 @@ class OutputImpl
     SCROW	mnTabEndRow;
 
 public:
-    OutputImpl( ScDocument*	pDoc, USHORT nTab,
+    OutputImpl( ScDocument*	pDoc, sal_uInt16 nTab,
         SCCOL	nTabStartCol,
         SCROW	nTabStartRow,
         SCCOL	nMemberStartCol,
@@ -68,11 +68,11 @@ public:
         SCROW nDataStartRow, 
         SCCOL nTabEndCol, 
         SCROW nTabEndRow );
-    BOOL AddRow( SCROW nRow );
-    BOOL AddCol( SCCOL nCol );
+    sal_Bool AddRow( SCROW nRow );
+    sal_Bool AddCol( SCCOL nCol );
     
     void OutputDataArea();
-    void OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bHori = FALSE );
+    void OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Bool bHori = sal_False );
     
 };
 
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index dd3a9cdf4..9c683c7fc 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -54,7 +54,7 @@ ScSortParam::ScSortParam( const ScSortParam& r ) :
         nDestTab(r.nDestTab),nDestCol(r.nDestCol),nDestRow(r.nDestRow),
         aCollatorLocale( r.aCollatorLocale ), aCollatorAlgorithm( r.aCollatorAlgorithm )
 {
-    for (USHORT i=0; i<MAXSORT; i++)
+    for (sal_uInt16 i=0; i<MAXSORT; i++)
     {
         bDoSort[i]	  = r.bDoSort[i];
         nField[i]	  = r.nField[i];
@@ -71,16 +71,16 @@ void ScSortParam::Clear()
     nCompatHeader = 2;
     nDestTab = 0;
     nUserIndex = 0;
-    bHasHeader=bCaseSens=bUserDef = FALSE;
-    bByRow=bIncludePattern=bInplace	= TRUE;
+    bHasHeader=bCaseSens=bUserDef = sal_False;
+    bByRow=bIncludePattern=bInplace	= sal_True;
     aCollatorLocale = ::com::sun::star::lang::Locale();
     aCollatorAlgorithm.Erase();
 
-    for (USHORT i=0; i<MAXSORT; i++)
+    for (sal_uInt16 i=0; i<MAXSORT; i++)
     {
-        bDoSort[i]	  = FALSE;
+        bDoSort[i]	  = sal_False;
         nField[i]	  = 0;
-        bAscending[i] = TRUE;
+        bAscending[i] = sal_True;
     }
 }
 
@@ -105,7 +105,7 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r )
     aCollatorLocale			= r.aCollatorLocale;
     aCollatorAlgorithm		= r.aCollatorAlgorithm;
 
-    for (USHORT i=0; i<MAXSORT; i++)
+    for (sal_uInt16 i=0; i<MAXSORT; i++)
     {
         bDoSort[i]	  = r.bDoSort[i];
         nField[i]	  = r.nField[i];
@@ -117,12 +117,12 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r )
 
 //------------------------------------------------------------------------
 
-BOOL ScSortParam::operator==( const ScSortParam& rOther ) const
+sal_Bool ScSortParam::operator==( const ScSortParam& rOther ) const
 {
-    BOOL bEqual = FALSE;
+    sal_Bool bEqual = sal_False;
     // Anzahl der Sorts gleich?
-    USHORT nLast 	  = 0;
-    USHORT nOtherLast = 0;
+    sal_uInt16 nLast 	  = 0;
+    sal_uInt16 nOtherLast = 0;
     while ( bDoSort[nLast++] && nLast < MAXSORT ) ;
     while ( rOther.bDoSort[nOtherLast++] && nOtherLast < MAXSORT ) ;
     nLast--;
@@ -148,8 +148,8 @@ BOOL ScSortParam::operator==( const ScSortParam& rOther ) const
         && (aCollatorAlgorithm			== rOther.aCollatorAlgorithm)
         )
     {
-        bEqual = TRUE;
-        for ( USHORT i=0; i<=nLast && bEqual; i++ )
+        bEqual = sal_True;
+        for ( sal_uInt16 i=0; i<=nLast && bEqual; i++ )
         {
             bEqual = (nField[i] == rOther.nField[i]) && (bAscending[i]	== rOther.bAscending[i]);
         }
@@ -161,14 +161,14 @@ BOOL ScSortParam::operator==( const ScSortParam& rOther ) const
 
 ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) :
         nCol1(rSub.nCol1),nRow1(rSub.nRow1),nCol2(rSub.nCol2),nRow2(rSub.nRow2),
-        bHasHeader(TRUE),bByRow(TRUE),bCaseSens(rSub.bCaseSens),
+        bHasHeader(sal_True),bByRow(sal_True),bCaseSens(rSub.bCaseSens),
         bUserDef(rSub.bUserDef),nUserIndex(rSub.nUserIndex),bIncludePattern(rSub.bIncludePattern),
-        bInplace(TRUE),
+        bInplace(sal_True),
         nDestTab(0),nDestCol(0),nDestRow(0),
         aCollatorLocale( rOld.aCollatorLocale ), aCollatorAlgorithm( rOld.aCollatorAlgorithm )
 {
-    USHORT nNewCount = 0;
-    USHORT i;
+    sal_uInt16 nNewCount = 0;
+    sal_uInt16 i;
 
     //	zuerst die Gruppen aus den Teilergebnissen
     if (rSub.bDoSort)
@@ -177,7 +177,7 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
             {
                 if (nNewCount < MAXSORT)
                 {
-                    bDoSort[nNewCount]	  = TRUE;
+                    bDoSort[nNewCount]	  = sal_True;
                     nField[nNewCount]	  = rSub.nField[i];
                     bAscending[nNewCount] = rSub.bAscending;
                     ++nNewCount;
@@ -189,15 +189,15 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
         if (rOld.bDoSort[i])
         {
             SCCOLROW nThisField = rOld.nField[i];
-            BOOL bDouble = FALSE;
-            for (USHORT j=0; j<nNewCount; j++)
+            sal_Bool bDouble = sal_False;
+            for (sal_uInt16 j=0; j<nNewCount; j++)
                 if ( nField[j] == nThisField )
-                    bDouble = TRUE;
+                    bDouble = sal_True;
             if (!bDouble)				// ein Feld nicht zweimal eintragen
             {
                 if (nNewCount < MAXSORT)
                 {
-                    bDoSort[nNewCount]	  = TRUE;
+                    bDoSort[nNewCount]	  = sal_True;
                     nField[nNewCount]	  = nThisField;
                     bAscending[nNewCount] = rOld.bAscending[i];
                     ++nNewCount;
@@ -207,9 +207,9 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
 
     for (i=nNewCount; i<MAXSORT; i++)		// Rest loeschen
     {
-        bDoSort[i]	  = FALSE;
+        bDoSort[i]	  = sal_False;
         nField[i]	  = 0;
-        bAscending[i] = TRUE;
+        bAscending[i] = sal_True;
     }
 }
 
@@ -217,20 +217,20 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
 
 ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) :
         nCol1(nCol),nRow1(rParam.nRow1),nCol2(nCol),nRow2(rParam.nRow2),
-        bHasHeader(rParam.bHasHeader),bByRow(TRUE),bCaseSens(rParam.bCaseSens),
+        bHasHeader(rParam.bHasHeader),bByRow(sal_True),bCaseSens(rParam.bCaseSens),
 //! TODO: what about Locale and Algorithm?
-        bUserDef(FALSE),nUserIndex(0),bIncludePattern(FALSE),
-        bInplace(TRUE),
+        bUserDef(sal_False),nUserIndex(0),bIncludePattern(sal_False),
+        bInplace(sal_True),
         nDestTab(0),nDestCol(0),nDestRow(0)
 {
-    bDoSort[0] = TRUE;
+    bDoSort[0] = sal_True;
     nField[0] = nCol;
-    bAscending[0] = TRUE;
-    for (USHORT i=1; i<MAXSORT; i++)
+    bAscending[0] = sal_True;
+    for (sal_uInt16 i=1; i<MAXSORT; i++)
     {
-        bDoSort[i]	  = FALSE;
+        bDoSort[i]	  = sal_False;
         nField[i]	  = 0;
-        bAscending[i] = TRUE;
+        bAscending[i] = sal_True;
     }
 }
 
@@ -247,13 +247,13 @@ void ScSortParam::MoveToDest()
         nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
         nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
         nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
-        for (USHORT i=0; i<MAXSORT; i++)
+        for (sal_uInt16 i=0; i<MAXSORT; i++)
             if (bByRow)
                 nField[i] += nDifX;
             else
                 nField[i] += nDifY;
 
-        bInplace = TRUE;
+        bInplace = sal_True;
     }
     else
     {
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 863ff1c39..4cd0652c5 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -100,7 +100,7 @@ void ScStyleSheetPool::SetDocument( ScDocument* pDocument )
 //------------------------------------------------------------------------
 
 SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
-                            SfxStyleFamily eFam, USHORT mask, USHORT nPos )
+                            SfxStyleFamily eFam, sal_uInt16 mask, sal_uInt16 nPos )
 {
     //	When updating styles from a template, Office 5.1 sometimes created
     //	files with multiple default styles.
@@ -129,7 +129,7 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
 SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create(
                                             const String&	rName,
                                             SfxStyleFamily	eFamily,
-                                            USHORT          nMaskP )
+                                            sal_uInt16          nMaskP )
 {
     ScStyleSheet* pSheet = new ScStyleSheet( rName, *this, eFamily, nMaskP );
     if ( eFamily == SFX_STYLE_FAMILY_PARA && ScGlobal::GetRscString(STR_STYLENAME_STANDARD) != rName )
@@ -182,14 +182,14 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
         {
             //	Set-Items
 
-            if ( rSourceSet.GetItemState( ATTR_PAGE_HEADERSET, FALSE, &pItem ) == SFX_ITEM_SET )
+            if ( rSourceSet.GetItemState( ATTR_PAGE_HEADERSET, sal_False, &pItem ) == SFX_ITEM_SET )
             {
                 const SfxItemSet& rSrcSub = ((const SvxSetItem*) pItem)->GetItemSet();
                 SfxItemSet aDestSub( *rDestSet.GetPool(), rSrcSub.GetRanges() );
                 aDestSub.PutExtended( rSrcSub, SFX_ITEM_DONTCARE, SFX_ITEM_DEFAULT );
                 rDestSet.Put( SvxSetItem( ATTR_PAGE_HEADERSET, aDestSub ) );
             }
-            if ( rSourceSet.GetItemState( ATTR_PAGE_FOOTERSET, FALSE, &pItem ) == SFX_ITEM_SET )
+            if ( rSourceSet.GetItemState( ATTR_PAGE_FOOTERSET, sal_False, &pItem ) == SFX_ITEM_SET )
             {
                 const SfxItemSet& rSrcSub = ((const SvxSetItem*) pItem)->GetItemSet();
                 SfxItemSet aDestSub( *rDestSet.GetPool(), rSrcSub.GetRanges() );
@@ -202,9 +202,9 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
             // #b5017505# number format exchange list has to be handled here, too
 
             if ( pDoc && pDoc->GetFormatExchangeList() &&
-                 rSourceSet.GetItemState( ATTR_VALUE_FORMAT, FALSE, &pItem ) == SFX_ITEM_SET )
+                 rSourceSet.GetItemState( ATTR_VALUE_FORMAT, sal_False, &pItem ) == SFX_ITEM_SET )
             {
-                ULONG nOldFormat = static_cast<const SfxUInt32Item*>(pItem)->GetValue();
+                sal_uLong nOldFormat = static_cast<const SfxUInt32Item*>(pItem)->GetValue();
                 sal_uInt32* pNewFormat = static_cast<sal_uInt32*>(pDoc->GetFormatExchangeList()->Get( nOldFormat ));
                 if (pNewFormat)
                     rDestSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, *pNewFormat ) );
@@ -236,7 +236,7 @@ void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool )
 
 //------------------------------------------------------------------------
 
-void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, USHORT nFontType, USHORT nItemId )
+void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, sal_uInt16 nFontType, sal_uInt16 nItemId )
 {
     if ( eLang != LANGUAGE_NONE && eLang != LANGUAGE_DONTKNOW && eLang != LANGUAGE_SYSTEM )
     {
@@ -260,12 +260,12 @@ void ScStyleSheetPool::CreateStandardStyles()
     String			aStr;
     xub_StrLen		nStrLen;
     String			aHelpFile;//XXX JN welcher Text???
-    //ULONG			nNumFmt			= 0L;
+    //sal_uLong			nNumFmt			= 0L;
     SfxItemSet*		pSet			= NULL;
     SfxItemSet*		pHFSet			= NULL;
     SvxSetItem*		pHFSetItem		= NULL;
-    ScEditEngineDefaulter*	pEdEngine	= new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE );
-    pEdEngine->SetUpdateMode( FALSE );
+    ScEditEngineDefaulter*	pEdEngine	= new ScEditEngineDefaulter( EditEngine::CreatePool(), sal_True );
+    pEdEngine->SetUpdateMode( sal_False );
     EditTextObject* pEmptyTxtObj	= pEdEngine->CreateTextObject();
     EditTextObject* pTxtObj			= NULL;
     ScPageHFItem*	pHeaderItem		= new ScPageHFItem( ATTR_PAGE_HEADERRIGHT );
@@ -442,13 +442,13 @@ void ScStyleSheetPool::CreateStandardStyles()
     aBoxItem.SetLine( &aBorderLine, BOX_LINE_LEFT );
     aBoxItem.SetLine( &aBorderLine, BOX_LINE_RIGHT );
     aBoxItem.SetDistance( 10 ); // 0.2mm
-    aBoxInfoItem.SetValid( VALID_TOP, TRUE );
-    aBoxInfoItem.SetValid( VALID_BOTTOM, TRUE );
-    aBoxInfoItem.SetValid( VALID_LEFT, TRUE );
-    aBoxInfoItem.SetValid( VALID_RIGHT, TRUE );
-    aBoxInfoItem.SetValid( VALID_DISTANCE, TRUE );
-    aBoxInfoItem.SetTable( FALSE );
-    aBoxInfoItem.SetDist ( TRUE );
+    aBoxInfoItem.SetValid( VALID_TOP, sal_True );
+    aBoxInfoItem.SetValid( VALID_BOTTOM, sal_True );
+    aBoxInfoItem.SetValid( VALID_LEFT, sal_True );
+    aBoxInfoItem.SetValid( VALID_RIGHT, sal_True );
+    aBoxInfoItem.SetValid( VALID_DISTANCE, sal_True );
+    aBoxInfoItem.SetTable( sal_False );
+    aBoxInfoItem.SetDist ( sal_True );
 
     pHFSetItem = new SvxSetItem( ((SvxSetItem&)pSet->Get( ATTR_PAGE_HEADERSET ) ) );
     pHFSet = &(pHFSetItem->GetItemSet());
@@ -521,12 +521,12 @@ void ScStyleSheetPool::CreateStandardStyles()
 //UNUSED2008-05          if (!pStyle->IsUserDefined())
 //UNUSED2008-05          {
 //UNUSED2008-05              String aOldName     = pStyle->GetName();
-//UNUSED2008-05              ULONG nHelpId       = pStyle->GetHelpId( aHelpFile );
+//UNUSED2008-05              sal_uLong nHelpId       = pStyle->GetHelpId( aHelpFile );
 //UNUSED2008-05              SfxStyleFamily eFam = pStyle->GetFamily();
 //UNUSED2008-05  
-//UNUSED2008-05              BOOL bHelpKnown = TRUE;
+//UNUSED2008-05              sal_Bool bHelpKnown = sal_True;
 //UNUSED2008-05              String aNewName;
-//UNUSED2008-05              USHORT nNameId = 0;
+//UNUSED2008-05              sal_uInt16 nNameId = 0;
 //UNUSED2008-05              switch( nHelpId )
 //UNUSED2008-05              {
 //UNUSED2008-05                  case HID_SC_SHEET_CELL_STD:
@@ -538,7 +538,7 @@ void ScStyleSheetPool::CreateStandardStyles()
 //UNUSED2008-05                  case HID_SC_SHEET_PAGE_REP:  nNameId = STR_STYLENAME_REPORT;    break;
 //UNUSED2008-05                  default:
 //UNUSED2008-05                      // 0 oder falsche (alte) HelpId
-//UNUSED2008-05                      bHelpKnown = FALSE;
+//UNUSED2008-05                      bHelpKnown = sal_False;
 //UNUSED2008-05              }
 //UNUSED2008-05              if (bHelpKnown)
 //UNUSED2008-05              {
@@ -571,7 +571,7 @@ void ScStyleSheetPool::CreateStandardStyles()
 //UNUSED2008-05                  //  saved again with a new version in a different language
 //UNUSED2008-05                  //  (so SrcVersion doesn't help)
 //UNUSED2008-05  
-//UNUSED2008-05                  USHORT nNewId = 0;
+//UNUSED2008-05                  sal_uInt16 nNewId = 0;
 //UNUSED2008-05                  if ( eFam == SFX_STYLE_FAMILY_PARA )
 //UNUSED2008-05                  {
 //UNUSED2008-05                      if ( aOldName == SCSTR( STR_STYLENAME_STANDARD ) )
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index f55fff64b..c63ac31ad 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -67,7 +67,7 @@ TYPEINIT1(ScStyleSheet, SfxStyleSheet);
 ScStyleSheet::ScStyleSheet( const String&		rName,
                             ScStyleSheetPool&   rPoolP,
                             SfxStyleFamily		eFamily,
-                            USHORT              nMaskP )
+                            sal_uInt16              nMaskP )
 
     :   SfxStyleSheet   ( rName, rPoolP, eFamily, nMaskP )
     , eUsage( UNKNOWN )
@@ -90,21 +90,21 @@ __EXPORT ScStyleSheet::~ScStyleSheet()
 
 //------------------------------------------------------------------------
 
-BOOL __EXPORT ScStyleSheet::HasFollowSupport() const
+sal_Bool __EXPORT ScStyleSheet::HasFollowSupport() const
 {
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
 
-BOOL __EXPORT ScStyleSheet::HasParentSupport () const
+sal_Bool __EXPORT ScStyleSheet::HasParentSupport () const
 {
-    BOOL bHasParentSupport = FALSE;
+    sal_Bool bHasParentSupport = sal_False;
 
     switch ( GetFamily() )
     {
-        case SFX_STYLE_FAMILY_PARA:	bHasParentSupport = TRUE;	break;
-        case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = FALSE;	break;
+        case SFX_STYLE_FAMILY_PARA:	bHasParentSupport = sal_True;	break;
+        case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = sal_False;	break;
         default:
         {
             // added to avoid warnings
@@ -116,9 +116,9 @@ BOOL __EXPORT ScStyleSheet::HasParentSupport () const
 
 //------------------------------------------------------------------------
 
-BOOL __EXPORT ScStyleSheet::SetParent( const String& rParentName )
+sal_Bool __EXPORT ScStyleSheet::SetParent( const String& rParentName )
 {
-    BOOL bResult = FALSE;
+    sal_Bool bResult = sal_False;
     String aEffName = rParentName;
     SfxStyleSheetBase* pStyle = rPool.Find( aEffName, nFamily );
     if (!pStyle)
@@ -207,12 +207,12 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
                                                       ATTR_ULSPACE );
                         SvxBoxInfoItem	aBoxInfoItem( ATTR_BORDER_INNER );
 
-                        aBoxInfoItem.SetTable( FALSE );
-                        aBoxInfoItem.SetDist( TRUE );
-                        aBoxInfoItem.SetValid( VALID_DISTANCE, TRUE );
+                        aBoxInfoItem.SetTable( sal_False );
+                        aBoxInfoItem.SetDist( sal_True );
+                        aBoxInfoItem.SetValid( VALID_DISTANCE, sal_True );
 
                         // aPageItem.SetLandscape( ORIENTATION_LANDSCAPE == pPrinter->GetOrientation() );
-                        aPageItem.SetLandscape( FALSE );
+                        aPageItem.SetLandscape( sal_False );
 
                         rHFSet.Put( aBoxInfoItem );
                         rHFSet.Put( aHFSizeItem );
@@ -251,7 +251,7 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
                                        0 );
                 break;
         }
-        bMySet = TRUE;
+        bMySet = sal_True;
     } // if ( !pSet )
     if ( nHelpId == HID_SC_SHEET_CELL_ERG1 )
     {
@@ -260,7 +260,7 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
             ScDocument* pDoc = ((ScStyleSheetPool&)GetPool()).GetDocument();
             if ( pDoc )
             {
-                ULONG nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY,ScGlobal::eLnge );
+                sal_uLong nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY,ScGlobal::eLnge );
                 pSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumFmt ) );
             } // if ( pDoc && pDoc->IsLoadingDone() )
         }
@@ -271,21 +271,21 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
 
 //------------------------------------------------------------------------
 
-BOOL __EXPORT ScStyleSheet::IsUsed() const
+sal_Bool __EXPORT ScStyleSheet::IsUsed() const
 {
     if ( GetFamily() == SFX_STYLE_FAMILY_PARA )
     {
         // Always query the document to let it decide if a rescan is necessary,
         // and store the state.
         ScDocument* pDoc = ((ScStyleSheetPool&)rPool).GetDocument();
-        if ( pDoc && pDoc->IsStyleSheetUsed( *this, TRUE ) )
+        if ( pDoc && pDoc->IsStyleSheetUsed( *this, sal_True ) )
             eUsage = USED;
         else
             eUsage = NOTUSED;
         return eUsage == USED;
     }
     else
-        return TRUE;
+        return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -340,11 +340,11 @@ const String& ScStyleSheet::GetFollow() const
 //!	Flag gesetzt und abgefragt werden.
 //!	Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt.
 
-BOOL ScStyleSheet::SetName( const String& rNew )
+sal_Bool ScStyleSheet::SetName( const String& rNew )
 {
     String aFileStdName = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_STANDARD));
     if ( rNew == aFileStdName && aFileStdName != ScGlobal::GetRscString(STR_STYLENAME_STANDARD) )
-        return FALSE;
+        return sal_False;
     else
         return SfxStyleSheet::SetName( rNew );
 }
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 4d1fe0248..a1403ea7f 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -57,15 +57,15 @@
 // -----------------------------------------------------------------------
 
 ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
-                    BOOL bColInfo, BOOL bRowInfo ) :
+                    sal_Bool bColInfo, sal_Bool bRowInfo ) :
     aName( rNewName ),
     aCodeName( rNewName ),
-    bScenario( FALSE ),
-    bLayoutRTL( FALSE ),
-    bLoadingRTL( FALSE ),
+    bScenario( sal_False ),
+    bLayoutRTL( sal_False ),
+    bLoadingRTL( sal_False ),
     nLinkMode( 0 ),
     aPageStyle( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ),
-    bPageSizeValid( FALSE ),
+    bPageSizeValid( sal_False ),
     nRepeatStartX( SCCOL_REPEAT_NONE ),
     nRepeatStartY( SCROW_REPEAT_NONE ),
     pTabProtection( NULL ),
@@ -79,18 +79,18 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
     mpFilteredRows(new ScFlatBoolRowSegments),
     pOutlineTable( NULL ),
     pSheetEvents( NULL ),
-    bTableAreaValid( FALSE ),
-    bVisible( TRUE ),
-    bStreamValid( FALSE ),
-    bPendingRowHeights( FALSE ),
-    bCalcNotification( FALSE ),
+    bTableAreaValid( sal_False ),
+    bVisible( sal_True ),
+    bStreamValid( sal_False ),
+    bPendingRowHeights( sal_False ),
+    bCalcNotification( sal_False ),
     nTab( nNewTab ),
     nRecalcLvl( 0 ),
     pDocument( pDoc ),
     pSearchParam( NULL ),
     pSearchText ( NULL ),
     pSortCollator( NULL ),
-    bPrintEntireSheet( FALSE ),
+    bPrintEntireSheet( sal_False ),
     pRepeatColRange( NULL ),
     pRepeatRowRange( NULL ),
     nLockCount( 0 ),
@@ -98,14 +98,14 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
     aScenarioColor( COL_LIGHTGRAY ),
     aTabBgColor( COL_AUTO ),
     nScenarioFlags( 0 ),
-    bActiveScenario( FALSE ),
+    bActiveScenario( sal_False ),
     mbPageBreaksValid(false)
 {
 
     if (bColInfo)
     {
-        pColWidth  = new USHORT[ MAXCOL+1 ];
-        pColFlags  = new BYTE[ MAXCOL+1 ];
+        pColWidth  = new sal_uInt16[ MAXCOL+1 ];
+        pColFlags  = new sal_uInt8[ MAXCOL+1 ];
 
         for (SCCOL i=0; i<=MAXCOL; i++)
         {
@@ -117,7 +117,7 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
     if (bRowInfo)
     {
         mpRowHeights.reset(new ScFlatUInt16RowSegments(ScGlobal::nStdRowHeight));
-        pRowFlags  = new ScBitMaskCompressedArray< SCROW, BYTE>( MAXROW, 0);
+        pRowFlags  = new ScBitMaskCompressedArray< SCROW, sal_uInt8>( MAXROW, 0);
     }
 
     if ( pDocument->IsDocVisible() )
@@ -130,11 +130,11 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
     ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
     if (pDrawLayer)
     {
-        if ( pDrawLayer->ScAddPage( nTab ) )    // FALSE (not inserted) during Undo
+        if ( pDrawLayer->ScAddPage( nTab ) )    // sal_False (not inserted) during Undo
         {
             pDrawLayer->ScRenamePage( nTab, aName );
-            ULONG nx = (ULONG) ((double) (MAXCOL+1) * STD_COL_WIDTH			  * HMM_PER_TWIPS );
-            ULONG ny = (ULONG) ((double) (MAXROW+1) * ScGlobal::nStdRowHeight * HMM_PER_TWIPS );
+            sal_uLong nx = (sal_uLong) ((double) (MAXCOL+1) * STD_COL_WIDTH			  * HMM_PER_TWIPS );
+            sal_uLong ny = (sal_uLong) ((double) (MAXROW+1) * ScGlobal::nStdRowHeight * HMM_PER_TWIPS );
             pDrawLayer->SetPageSize( static_cast<sal_uInt16>(nTab), Size( nx, ny ), false );
         }
     }
@@ -189,31 +189,31 @@ const String& ScTable::GetUpperName() const
     return aUpperName;
 }
 
-void ScTable::SetVisible( BOOL bVis )
+void ScTable::SetVisible( sal_Bool bVis )
 {
     if (bVisible != bVis && IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 
     bVisible = bVis;
 }
 
-void ScTable::SetStreamValid( BOOL bSet, BOOL bIgnoreLock )
+void ScTable::SetStreamValid( sal_Bool bSet, sal_Bool bIgnoreLock )
 {
     if ( bIgnoreLock || !pDocument->IsStreamValidLocked() )
         bStreamValid = bSet;
 }
 
-void ScTable::SetPendingRowHeights( BOOL bSet )
+void ScTable::SetPendingRowHeights( sal_Bool bSet )
 {
     bPendingRowHeights = bSet;
 }
 
-void ScTable::SetLayoutRTL( BOOL bSet )
+void ScTable::SetLayoutRTL( sal_Bool bSet )
 {
     bLayoutRTL = bSet;
 }
 
-void ScTable::SetLoadingRTL( BOOL bSet )
+void ScTable::SetLoadingRTL( sal_Bool bSet )
 {
     bLoadingRTL = bSet;
 }
@@ -234,14 +234,14 @@ void ScTable::SetTabBgColor(const Color& rColor)
     }
 }
 
-void ScTable::SetScenario( BOOL bFlag )
+void ScTable::SetScenario( sal_Bool bFlag )
 {
     bScenario = bFlag;
 }
 
-void ScTable::SetLink( BYTE nMode,
+void ScTable::SetLink( sal_uInt8 nMode,
                         const String& rDoc, const String& rFlt, const String& rOpt,
-                        const String& rTab, ULONG nRefreshDelay )
+                        const String& rTab, sal_uLong nRefreshDelay )
 {
     nLinkMode = nMode;
     aLinkDoc = rDoc;		// Datei
@@ -251,14 +251,14 @@ void ScTable::SetLink( BYTE nMode,
     nLinkRefreshDelay = nRefreshDelay;	// refresh delay in seconds, 0==off
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
-USHORT ScTable::GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
+sal_uInt16 ScTable::GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
                                     double nPPTX, double nPPTY,
                                     const Fraction& rZoomX, const Fraction& rZoomY,
-                                    BOOL bFormula, const ScMarkData* pMarkData,
-                                    BOOL bSimpleTextImport )
+                                    sal_Bool bFormula, const ScMarkData* pMarkData,
+                                    sal_Bool bSimpleTextImport )
 {
     return aCol[nCol].GetOptimalColWidth( pDev, nPPTX, nPPTY, rZoomX, rZoomY,
         bFormula, STD_COL_WIDTH - STD_EXTRA_WIDTH, pMarkData, bSimpleTextImport );
@@ -268,30 +268,30 @@ long ScTable::GetNeededSize( SCCOL nCol, SCROW nRow,
                                 OutputDevice* pDev,
                                 double nPPTX, double nPPTY,
                                 const Fraction& rZoomX, const Fraction& rZoomY,
-                                BOOL bWidth, BOOL bTotalSize )
+                                sal_Bool bWidth, sal_Bool bTotalSize )
 {
     ScNeededSizeOptions aOptions;
-    aOptions.bSkipMerged = FALSE;		// zusammengefasste mitzaehlen
+    aOptions.bSkipMerged = sal_False;		// zusammengefasste mitzaehlen
     aOptions.bTotalSize  = bTotalSize;
 
     return aCol[nCol].GetNeededSize
         ( nRow, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bWidth, aOptions );
 }
 
-BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
+sal_Bool ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtra,
                                 OutputDevice* pDev,
                                 double nPPTX, double nPPTY,
                                 const Fraction& rZoomX, const Fraction& rZoomY,
-                                BOOL bForce, ScProgress* pOuterProgress, ULONG nProgressStart )
+                                sal_Bool bForce, ScProgress* pOuterProgress, sal_uLong nProgressStart )
 {
     DBG_ASSERT( nExtra==0 || bForce, "autom. OptimalHeight mit Extra" );
 
     if ( !pDocument->IsAdjustHeightEnabled() )
     {
-        return FALSE;
+        return sal_False;
     }
 
-    BOOL    bChanged = FALSE;
+    sal_Bool    bChanged = sal_False;
     SCSIZE  nCount = static_cast<SCSIZE>(nEndRow-nStartRow+1);
 
     ScProgress* pProgress = NULL;
@@ -301,8 +301,8 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
         pProgress = new ScProgress( pDocument->GetDocumentShell(),
                             ScGlobal::GetRscString(STR_PROGRESS_HEIGHTING), GetWeightedCount() );
 
-    USHORT* pHeight = new USHORT[nCount];                   // Twips !
-    memset( pHeight, 0, sizeof(USHORT) * nCount );
+    sal_uInt16* pHeight = new sal_uInt16[nCount];                   // Twips !
+    memset( pHeight, 0, sizeof(sal_uInt16) * nCount );
 
     //	zuerst einmal ueber den ganzen Bereich
     //	(mit der letzten Spalte in der Hoffnung, dass die am ehesten noch auf
@@ -313,13 +313,13 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
 
     //	daraus Standardhoehe suchen, die im unteren Bereich gilt
 
-    USHORT nMinHeight = pHeight[nCount-1];
+    sal_uInt16 nMinHeight = pHeight[nCount-1];
     SCSIZE nPos = nCount-1;
     while ( nPos && pHeight[nPos-1] >= nMinHeight )
         --nPos;
     SCROW nMinStart = nStartRow + nPos;
 
-    ULONG nWeightedCount = 0;
+    sal_uLong nWeightedCount = 0;
     for (SCCOL nCol=0; nCol<MAXCOL; nCol++)		// MAXCOL schon oben
     {
         aCol[nCol].GetOptimalHeight(
@@ -328,7 +328,7 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
 
         if (pProgress)
         {
-            ULONG nWeight = aCol[nCol].GetWeightedCount();
+            sal_uLong nWeight = aCol[nCol].GetWeightedCount();
             if (nWeight)		// nochmal denselben Status muss auch nicht sein
             {
                 nWeightedCount += nWeight;
@@ -339,12 +339,12 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
 
     SCROW nRngStart = 0;
     SCROW nRngEnd = 0;
-    USHORT nLast = 0;
+    sal_uInt16 nLast = 0;
     for (SCSIZE i=0; i<nCount; i++)
     {
         size_t nIndex;
         SCROW nRegionEndRow;
-        BYTE nRowFlag = pRowFlags->GetValue( nStartRow+i, nIndex, nRegionEndRow );
+        sal_uInt8 nRowFlag = pRowFlags->GetValue( nStartRow+i, nIndex, nRegionEndRow );
         if ( nRegionEndRow > nEndRow )
             nRegionEndRow = nEndRow;
         SCSIZE nMoreRows = nRegionEndRow - ( nStartRow+i );     // additional equal rows after first
@@ -398,17 +398,17 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
     return bChanged;
 }
 
-BOOL ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
+sal_Bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCCOL nMaxX = 0;
     SCROW nMaxY = 0;
     for (SCCOL i=0; i<=MAXCOL; i++)
-        if (!aCol[i].IsEmptyVisData(TRUE))		// TRUE = Notizen zaehlen auch
+        if (!aCol[i].IsEmptyVisData(sal_True))		// sal_True = Notizen zaehlen auch
         {
-            bFound = TRUE;
+            bFound = sal_True;
             nMaxX = i;
-            SCROW nColY = aCol[i].GetLastVisDataPos(TRUE);
+            SCROW nColY = aCol[i].GetLastVisDataPos(sal_True);
             if (nColY > nMaxY)
                 nMaxY = nColY;
         }
@@ -418,14 +418,14 @@ BOOL ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
     return bFound;
 }
 
-BOOL ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
+sal_Bool ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
 {
-    BOOL bRet = TRUE;				//! merken?
+    sal_Bool bRet = sal_True;				//! merken?
     if (!bTableAreaValid)
     {
         bRet = GetPrintArea( ((ScTable*)this)->nTableAreaX,
-                                ((ScTable*)this)->nTableAreaY, TRUE );
-        ((ScTable*)this)->bTableAreaValid = TRUE;
+                                ((ScTable*)this)->nTableAreaY, sal_True );
+        ((ScTable*)this)->bTableAreaValid = sal_True;
     }
     rEndCol = nTableAreaX;
     rEndRow = nTableAreaY;
@@ -434,13 +434,13 @@ BOOL ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
 
 /*		vorher:
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCCOL nMaxX = 0;
     SCROW nMaxY = 0;
     for (SCCOL i=0; i<=MAXCOL; i++)
         if (!aCol[i].IsEmpty())
         {
-            bFound = TRUE;
+            bFound = sal_True;
             nMaxX = i;
             SCCOL nColY = aCol[i].GetLastEntryPos();
             if (nColY > nMaxY)
@@ -454,9 +454,9 @@ BOOL ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
 
 const SCCOL SC_COLUMNS_STOP = 30;
 
-BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const
+sal_Bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bNotes ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCCOL nMaxX = 0;
     SCROW nMaxY = 0;
     SCCOL i;
@@ -464,7 +464,7 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const
     for (i=0; i<=MAXCOL; i++)				// Daten testen
         if (!aCol[i].IsEmptyVisData(bNotes))
         {
-            bFound = TRUE;
+            bFound = sal_True;
             if (i>nMaxX)
                 nMaxX = i;
             SCROW nColY = aCol[i].GetLastVisDataPos(bNotes);
@@ -479,7 +479,7 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const
         SCROW nLastRow;
         if (aCol[i].GetLastVisibleAttr( nLastRow ))
         {
-            bFound = TRUE;
+            bFound = sal_True;
             nMaxX = i;
             if (nLastRow > nMaxY)
                 nMaxY = nLastRow;
@@ -525,10 +525,10 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const
     return bFound;
 }
 
-BOOL ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
-                                SCCOL& rEndCol, BOOL /* bNotes */ ) const
+sal_Bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
+                                SCCOL& rEndCol, sal_Bool /* bNotes */ ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCCOL nMaxX = 0;
     SCCOL i;
 
@@ -536,7 +536,7 @@ BOOL ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
     {
         if (aCol[i].HasVisibleAttrIn( nStartRow, nEndRow ))
         {
-            bFound = TRUE;
+            bFound = sal_True;
             nMaxX = i;
         }
     }
@@ -552,7 +552,7 @@ BOOL ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
     {
         if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow ))		//! bNotes ??????
         {
-            bFound = TRUE;
+            bFound = sal_True;
             if (i>nMaxX)
                 nMaxX = i;
         }
@@ -562,10 +562,10 @@ BOOL ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
     return bFound;
 }
 
-BOOL ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
-                                SCROW& rEndRow, BOOL bNotes ) const
+sal_Bool ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
+                                SCROW& rEndRow, sal_Bool bNotes ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCROW nMaxY = 0;
     SCCOL i;
 
@@ -574,7 +574,7 @@ BOOL ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
         SCROW nLastRow;
         if (aCol[i].GetLastVisibleAttr( nLastRow ))
         {
-            bFound = TRUE;
+            bFound = sal_True;
             if (nLastRow > nMaxY)
                 nMaxY = nLastRow;
         }
@@ -583,7 +583,7 @@ BOOL ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
     for (i=nStartCol; i<=nEndCol; i++)				// Daten testen
         if (!aCol[i].IsEmptyVisData(bNotes))
         {
-            bFound = TRUE;
+            bFound = sal_True;
             SCROW nColY = aCol[i].GetLastVisDataPos(bNotes);
             if (nColY > nMaxY)
                 nMaxY = nColY;
@@ -593,9 +593,9 @@ BOOL ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
     return bFound;
 }
 
-BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
+sal_Bool ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCCOL nMinX = MAXCOL;
     SCROW nMinY = MAXROW;
     SCCOL i;
@@ -607,7 +607,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
         {
             if (!bFound)
                 nMinX = i;
-            bFound = TRUE;
+            bFound = sal_True;
             if (nFirstRow < nMinY)
                 nMinY = nFirstRow;
         }
@@ -623,14 +623,14 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
         }
     }
 
-    BOOL bDatFound = FALSE;
+    sal_Bool bDatFound = sal_False;
     for (i=0; i<=MAXCOL; i++)					// Daten testen
-        if (!aCol[i].IsEmptyVisData(TRUE))
+        if (!aCol[i].IsEmptyVisData(sal_True))
         {
             if (!bDatFound && i<nMinX)
                 nMinX = i;
-            bFound = bDatFound = TRUE;
-            SCROW nColY = aCol[i].GetFirstVisDataPos(TRUE);
+            bFound = bDatFound = sal_True;
+            SCROW nColY = aCol[i].GetFirstVisDataPos(sal_True);
             if (nColY < nMinY)
                 nMinY = nColY;
         }
@@ -641,20 +641,20 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
 }
 
 void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
-                           BOOL bIncludeOld, bool bOnlyDown ) const
+                           sal_Bool bIncludeOld, bool bOnlyDown ) const
 {
-    BOOL bLeft       = FALSE;
-    BOOL bRight  = FALSE;
-    BOOL bTop        = FALSE;
-    BOOL bBottom = FALSE;
-    BOOL bChanged;
-    BOOL bFound;
+    sal_Bool bLeft       = sal_False;
+    sal_Bool bRight  = sal_False;
+    sal_Bool bTop        = sal_False;
+    sal_Bool bBottom = sal_False;
+    sal_Bool bChanged;
+    sal_Bool bFound;
     SCCOL i;
     SCROW nTest;
 
     do
     {
-        bChanged = FALSE;
+        bChanged = sal_False;
 
         if (!bOnlyDown)
         {
@@ -667,30 +667,30 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
                 if (!aCol[rEndCol+1].IsEmptyBlock(nStart,nEnd))
                 {
                     ++rEndCol;
-                    bChanged = TRUE;
-                    bRight = TRUE;
+                    bChanged = sal_True;
+                    bRight = sal_True;
                 }
 
             if (rStartCol > 0)
                 if (!aCol[rStartCol-1].IsEmptyBlock(nStart,nEnd))
                 {
                     --rStartCol;
-                    bChanged = TRUE;
-                    bLeft = TRUE;
+                    bChanged = sal_True;
+                    bLeft = sal_True;
                 }
 
             if (rStartRow > 0)
             {
                 nTest = rStartRow-1;
-                bFound = FALSE;
+                bFound = sal_False;
                 for (i=rStartCol; i<=rEndCol && !bFound; i++)
                     if (aCol[i].HasDataAt(nTest))
-                        bFound = TRUE;
+                        bFound = sal_True;
                 if (bFound)
                 {
                     --rStartRow;
-                    bChanged = TRUE;
-                    bTop = TRUE;
+                    bChanged = sal_True;
+                    bTop = sal_True;
                 }
             }
         }
@@ -698,15 +698,15 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
         if (rEndRow < MAXROW)
         {
             nTest = rEndRow+1;
-            bFound = FALSE;
+            bFound = sal_False;
             for (i=rStartCol; i<=rEndCol && !bFound; i++)
                 if (aCol[i].HasDataAt(nTest))
-                    bFound = TRUE;
+                    bFound = sal_True;
             if (bFound)
             {
                 ++rEndRow;
-                bChanged = TRUE;
-                bBottom = TRUE;
+                bChanged = sal_True;
+                bBottom = sal_True;
             }
         }
     }
@@ -722,19 +722,19 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
                 --rEndCol;
         if ( !bTop && rStartRow < MAXROW && rStartRow < rEndRow )
         {
-            bFound = FALSE;
+            bFound = sal_False;
             for (i=rStartCol; i<=rEndCol && !bFound; i++)
                 if (aCol[i].HasDataAt(rStartRow))
-                    bFound = TRUE;
+                    bFound = sal_True;
             if (!bFound)
                 ++rStartRow;
         }
         if ( !bBottom && rEndRow > 0 && rStartRow < rEndRow )
         {
-            bFound = FALSE;
+            bFound = sal_False;
             for (i=rStartCol; i<=rEndCol && !bFound; i++)
                 if (aCol[i].HasDataAt(rEndRow))
-                    bFound = TRUE;
+                    bFound = sal_True;
             if (!bFound)
                 --rEndRow;
         }
@@ -742,18 +742,28 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
 }
 
 
-bool ScTable::ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow,
+bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rStartRow,
         SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const
 {
-    bool bRet = false;
-    bool bChanged;
+    o_bShrunk = false;
+
+    PutInOrder( rStartCol, rEndCol);
+    PutInOrder( rStartRow, rEndRow);
+    if (rStartCol < 0)
+        rStartCol = 0, o_bShrunk = true;
+    if (rStartRow < 0)
+        rStartRow = 0, o_bShrunk = true;
+    if (rEndCol > MAXCOL)
+        rEndCol = MAXCOL, o_bShrunk = true;
+    if (rEndRow > MAXROW)
+        rEndRow = MAXROW, o_bShrunk = true;
 
+    bool bChanged;
     do
     {
         bChanged = false;
 
-        bool bCont = true;
-        while (rEndCol > 0 && bCont && rStartCol < rEndCol)
+        while (rStartCol < rEndCol)
         {
             if (aCol[rEndCol].IsEmptyBlock( rStartRow, rEndRow))
             {
@@ -761,11 +771,10 @@ bool ScTable::ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow,
                 bChanged = true;
             }
             else
-                bCont = false;
+                break;  // while
         }
 
-        bCont = true;
-        while (rStartCol < MAXCOL && bCont && rStartCol < rEndCol)
+        while (rStartCol < rEndCol)
         {
             if (aCol[rStartCol].IsEmptyBlock( rStartRow, rEndRow))
             {
@@ -773,12 +782,12 @@ bool ScTable::ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow,
                 bChanged = true;
             }
             else
-                bCont = false;
+                break;  // while
         }
 
         if (!bColumnsOnly)
         {
-            if (rStartRow < MAXROW && rStartRow < rEndRow)
+            if (rStartRow < rEndRow)
             {
                 bool bFound = false;
                 for (SCCOL i=rStartCol; i<=rEndCol && !bFound; i++)
@@ -791,7 +800,7 @@ bool ScTable::ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow,
                 }
             }
 
-            if (rEndRow > 0 && rStartRow < rEndRow)
+            if (rStartRow < rEndRow)
             {
                 bool bFound = false;
                 for (SCCOL i=rStartCol; i<=rEndCol && !bFound; i++)
@@ -806,9 +815,12 @@ bool ScTable::ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow,
         }
 
         if (bChanged)
-            bRet = true;
+            o_bShrunk = true;
     } while( bChanged );
-    return bRet;
+
+    return rStartCol != rEndCol || (bColumnsOnly ? 
+            !aCol[rStartCol].IsEmptyBlock( rStartRow, rEndRow) :
+            (rStartRow != rEndRow || aCol[rStartCol].HasDataAt( rStartRow)));
 }
 
 
@@ -845,12 +857,12 @@ SCSIZE ScTable::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
     return nCount;
 }
 
-BOOL ScTable::IsEmptyLine( SCROW nRow, SCCOL nStartCol, SCCOL nEndCol )
+sal_Bool ScTable::IsEmptyLine( SCROW nRow, SCCOL nStartCol, SCCOL nEndCol )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     for (SCCOL i=nStartCol; i<=nEndCol && !bFound; i++)
         if (aCol[i].HasDataAt(nRow))
-            bFound = TRUE;
+            bFound = sal_True;
     return !bFound;
 }
 
@@ -874,20 +886,20 @@ void ScTable::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY
     if (nMovX)
     {
         SCsCOL nNewCol = (SCsCOL) rCol;
-        BOOL bThere = aCol[nNewCol].HasVisibleDataAt(rRow);
-        BOOL bFnd;
+        sal_Bool bThere = aCol[nNewCol].HasVisibleDataAt(rRow);
+        sal_Bool bFnd;
         if (bThere)
         {
             do
             {
                 nNewCol = sal::static_int_cast<SCsCOL>( nNewCol + nMovX );
-                bFnd = (nNewCol>=0 && nNewCol<=MAXCOL) ? aCol[nNewCol].HasVisibleDataAt(rRow) : FALSE;
+                bFnd = (nNewCol>=0 && nNewCol<=MAXCOL) ? aCol[nNewCol].HasVisibleDataAt(rRow) : sal_False;
             }
             while (bFnd);
             nNewCol = sal::static_int_cast<SCsCOL>( nNewCol - nMovX );
 
             if (nNewCol == (SCsCOL)rCol)
-                bThere = FALSE;
+                bThere = sal_False;
         }
 
         if (!bThere)
@@ -895,7 +907,7 @@ void ScTable::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY
             do
             {
                 nNewCol = sal::static_int_cast<SCsCOL>( nNewCol + nMovX );
-                bFnd = (nNewCol>=0 && nNewCol<=MAXCOL) ? aCol[nNewCol].HasVisibleDataAt(rRow) : TRUE;
+                bFnd = (nNewCol>=0 && nNewCol<=MAXCOL) ? aCol[nNewCol].HasVisibleDataAt(rRow) : sal_True;
             }
             while (!bFnd);
         }
@@ -909,22 +921,22 @@ void ScTable::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY
         aCol[rCol].FindDataAreaPos(rRow,nMovY);
 }
 
-BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
-                                BOOL bMarked, BOOL bUnprotected )
+sal_Bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
+                                sal_Bool bMarked, sal_Bool bUnprotected )
 {
     if (!ValidCol(nCol) || !ValidRow(nRow))
-        return FALSE;
+        return sal_False;
 
     if (pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED))
         // Skip an overlapped cell.
         return false;
 
     if (bMarked && !rMark.IsCellMarked(nCol,nRow))
-        return FALSE;
+        return sal_False;
 
     if (bUnprotected && ((const ScProtectionAttr*)
                         GetAttr(nCol,nRow,ATTR_PROTECTION))->GetProtection())
-        return FALSE;
+        return sal_False;
 
     if (bMarked || bUnprotected)		//! auch sonst ???
     {
@@ -933,22 +945,22 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
         //!	per Extra-Parameter steuern, nur fuer Cursor-Bewegung ???
 
         if (RowHidden(nRow))
-            return FALSE;
+            return sal_False;
 
         if (ColHidden(nCol))
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
-                                BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark )
+                                sal_Bool bMarked, sal_Bool bUnprotected, const ScMarkData& rMark )
 {
     if (bUnprotected && !IsProtected())		// Tabelle ueberhaupt geschuetzt?
-        bUnprotected = FALSE;
+        bUnprotected = sal_False;
 
-    USHORT nWrap = 0;
+    sal_uInt16 nWrap = 0;
     SCsCOL nCol = rCol;
     SCsROW nRow = rRow;
 
@@ -960,7 +972,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
 
     if ( nMovY && bMarked )
     {
-        BOOL bUp = ( nMovY < 0 );
+        sal_Bool bUp = ( nMovY < 0 );
         nRow = rMark.GetNextMarked( nCol, nRow, bUp );
         while ( VALIDROW(nRow) && 
                 (RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
@@ -1033,9 +1045,9 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
                 {
                     SCsROW nNextRow = pNextRows[nCol] + 1;
                     if ( bMarked )
-                        nNextRow = rMark.GetNextMarked( nCol, nNextRow, FALSE );
+                        nNextRow = rMark.GetNextMarked( nCol, nNextRow, sal_False );
                     if ( bUnprotected )
-                        nNextRow = aCol[nCol].GetNextUnprotected( nNextRow, FALSE );
+                        nNextRow = aCol[nCol].GetNextUnprotected( nNextRow, sal_False );
                     pNextRows[nCol] = nNextRow;
 
                     SCsROW nMinRow = MAXROW+1;
@@ -1066,9 +1078,9 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
                 {
                     SCsROW nNextRow = pNextRows[nCol] - 1;
                     if ( bMarked )
-                        nNextRow = rMark.GetNextMarked( nCol, nNextRow, TRUE );
+                        nNextRow = rMark.GetNextMarked( nCol, nNextRow, sal_True );
                     if ( bUnprotected )
-                        nNextRow = aCol[nCol].GetNextUnprotected( nNextRow, TRUE );
+                        nNextRow = aCol[nCol].GetNextUnprotected( nNextRow, sal_True );
                     pNextRows[nCol] = nNextRow;
 
                     SCsROW nMaxRow = -1;
@@ -1107,12 +1119,12 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
     }
 }
 
-BOOL ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark )
+sal_Bool ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark )
 {
     const ScMarkArray* pMarkArray = rMark.GetArray();
     DBG_ASSERT(pMarkArray,"GetNextMarkedCell ohne MarkArray");
     if ( !pMarkArray )
-        return FALSE;
+        return sal_False;
 
     ++rRow;					// naechste Zelle ist gesucht
 
@@ -1121,10 +1133,10 @@ BOOL ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa
         const ScMarkArray& rArray = pMarkArray[rCol];
         while ( rRow <= MAXROW )
         {
-            SCROW nStart = (SCROW) rArray.GetNextMarked( (SCsROW) rRow, FALSE );
+            SCROW nStart = (SCROW) rArray.GetNextMarked( (SCsROW) rRow, sal_False );
             if ( nStart <= MAXROW )
             {
-                SCROW nEnd = rArray.GetMarkEnd( nStart, FALSE );
+                SCROW nEnd = rArray.GetMarkEnd( nStart, sal_False );
                 ScColumnIterator aColIter( &aCol[rCol], nStart, nEnd );
                 SCROW nCellRow;
                 ScBaseCell* pCell = NULL;
@@ -1133,7 +1145,7 @@ BOOL ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa
                     if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE )
                     {
                         rRow = nCellRow;
-                        return TRUE;			// Zelle gefunden
+                        return sal_True;			// Zelle gefunden
                     }
                 }
                 rRow = nEnd + 1;				// naechsten markierten Bereich suchen
@@ -1145,7 +1157,7 @@ BOOL ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa
         ++rCol;									// naechste Spalte testen
     }
 
-    return FALSE;								// alle Spalten durch
+    return sal_False;								// alle Spalten durch
 }
 
 void ScTable::UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
@@ -1173,7 +1185,7 @@ void ScTable::UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nR
 
 void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                      SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                     ScDocument* pUndoDoc, BOOL bIncludeDraw, bool bUpdateNoteCaptionPos )
+                     ScDocument* pUndoDoc, sal_Bool bIncludeDraw, bool bUpdateNoteCaptionPos )
 {
     SCCOL i;
     SCCOL iMax;
@@ -1202,7 +1214,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
         SCROW nSRow = 0;
         SCCOL nECol = 0;
         SCROW nERow = 0;
-        BOOL bRecalcPages = FALSE;
+        sal_Bool bRecalcPages = sal_False;
 
         for ( ScRangeVec::iterator aIt = aPrintRanges.begin(), aEnd = aPrintRanges.end(); aIt != aEnd; ++aIt )
         {
@@ -1218,7 +1230,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
                                       nSCol,nSRow,nSTab, nECol,nERow,nETab ) )
             {
                 *aIt = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 );
-                bRecalcPages = TRUE;
+                bRecalcPages = sal_True;
             }
         }
 
@@ -1236,7 +1248,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
                                       nSCol,nSRow,nSTab, nECol,nERow,nETab ) )
             {
                 *pRepeatColRange = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 );
-                bRecalcPages = TRUE;
+                bRecalcPages = sal_True;
                 nRepeatStartX = nSCol;	// fuer UpdatePageBreaks
                 nRepeatEndX = nECol;
             }
@@ -1256,7 +1268,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
                                       nSCol,nSRow,nSTab, nECol,nERow,nETab ) )
             {
                 *pRepeatRowRange = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 );
-                bRecalcPages = TRUE;
+                bRecalcPages = sal_True;
                 nRepeatStartY = nSRow;	// fuer UpdatePageBreaks
                 nRepeatEndY = nERow;
             }
@@ -1291,7 +1303,7 @@ void ScTable::UpdateInsertTab(SCTAB nTable)
     for (SCCOL i=0; i <= MAXCOL; i++) aCol[i].UpdateInsertTab(nTable);
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 //UNUSED2008-05  void ScTable::UpdateInsertTabOnlyCells(SCTAB nTable)
@@ -1299,7 +1311,7 @@ void ScTable::UpdateInsertTab(SCTAB nTable)
 //UNUSED2008-05      for (SCCOL i=0; i <= MAXCOL; i++) aCol[i].UpdateInsertTabOnlyCells(nTable);
 //UNUSED2008-05  }
 
-void ScTable::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo )
+void ScTable::UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScTable* pRefUndo )
 {
     if (nTab > nTable) nTab--;
 
@@ -1310,7 +1322,7 @@ void ScTable::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo )
         for (i=0; i <= MAXCOL; i++) aCol[i].UpdateDeleteTab(nTable, bIsMove, NULL);
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 void ScTable::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo,
@@ -1324,10 +1336,10 @@ void ScTable::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo,
     }
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
-void ScTable::UpdateCompile( BOOL bForceIfNameInUse )
+void ScTable::UpdateCompile( sal_Bool bForceIfNameInUse )
 {
     for (SCCOL i=0; i <= MAXCOL; i++)
     {
@@ -1341,17 +1353,17 @@ void ScTable::SetTabNo(SCTAB nNewTab)
     for (SCCOL i=0; i <= MAXCOL; i++) aCol[i].SetTabNo(nNewTab);
 }
 
-BOOL ScTable::IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                               USHORT nIndex) const
+sal_Bool ScTable::IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                               sal_uInt16 nIndex) const
 {
-    BOOL bInUse = FALSE;
+    sal_Bool bInUse = sal_False;
     for (SCCOL i = nCol1; !bInUse && (i <= nCol2) && (ValidCol(i)); i++)
         bInUse = aCol[i].IsRangeNameInUse(nRow1, nRow2, nIndex);
     return bInUse;
 }
 
 void ScTable::FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                               std::set<USHORT>& rIndexes) const
+                               std::set<sal_uInt16>& rIndexes) const
 {
     for (SCCOL i = nCol1; i <= nCol2 && ValidCol(i); i++)
         aCol[i].FindRangeNamesInUse(nRow1, nRow2, rIndexes);
@@ -1465,14 +1477,14 @@ void ScTable::MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, d
     if ( TEXTWIDTH_DIRTY == nPixel )
     {
         ScNeededSizeOptions aOptions;
-        aOptions.bTotalSize  = TRUE;
+        aOptions.bTotalSize  = sal_True;
         aOptions.bFormula    = bFormula;
-        aOptions.bSkipMerged = FALSE;
+        aOptions.bSkipMerged = sal_False;
 
         Fraction aZoom(1,1);
         nPixel = aCol[rCol].GetNeededSize(
             nRow, pDev, nPPTX, nPPTY, aZoom, aZoom, true, aOptions );
-        pCell->SetTextWidth( (USHORT)nPixel );
+        pCell->SetTextWidth( (sal_uInt16)nPixel );
     }
 
     long nTwips = (long) (nPixel / nPPTX);
@@ -1538,7 +1550,7 @@ void ScTable::SetRepeatColRange( const ScRange* pNew )
     SET_PRINTRANGE( pRepeatColRange, pNew );
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 void ScTable::SetRepeatRowRange( const ScRange* pNew )
@@ -1546,26 +1558,26 @@ void ScTable::SetRepeatRowRange( const ScRange* pNew )
     SET_PRINTRANGE( pRepeatRowRange, pNew );
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 void ScTable::ClearPrintRanges()
 {
     aPrintRanges.clear();
-    bPrintEntireSheet = FALSE;
+    bPrintEntireSheet = sal_False;
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 void ScTable::AddPrintRange( const ScRange& rNew )
 {
-    bPrintEntireSheet = FALSE;
+    bPrintEntireSheet = sal_False;
     if( aPrintRanges.size() < 0xFFFF )
         aPrintRanges.push_back( rNew );
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 //UNUSED2009-05 void ScTable::SetPrintRange( const ScRange& rNew )
@@ -1579,11 +1591,11 @@ void ScTable::SetPrintEntireSheet()
     if( !IsPrintEntireSheet() )
     {
         ClearPrintRanges();
-        bPrintEntireSheet = TRUE;
+        bPrintEntireSheet = sal_True;
     }
 }
 
-const ScRange* ScTable::GetPrintRange(USHORT nPos) const
+const ScRange* ScTable::GetPrintRange(sal_uInt16 nPos) const
 {
     return (nPos < GetPrintRangeCount()) ? &aPrintRanges[ nPos ] : NULL;
 }
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 765f8316e..ebbf38d66 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -65,12 +65,12 @@
 // STATIC DATA -----------------------------------------------------------
 
 
-BOOL ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline )
+sal_Bool ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline )
 {
-    USHORT nOldSizeX = 0;
-    USHORT nOldSizeY = 0;
-    USHORT nNewSizeX = 0;
-    USHORT nNewSizeY = 0;
+    sal_uInt16 nOldSizeX = 0;
+    sal_uInt16 nOldSizeY = 0;
+    sal_uInt16 nNewSizeX = 0;
+    sal_uInt16 nNewSizeY = 0;
 
     if (pOutlineTable)
     {
@@ -107,22 +107,22 @@ void ScTable::SetSheetEvents( const ScSheetEvents* pNew )
     else
         pSheetEvents = NULL;
 
-    SetCalcNotification( FALSE );       // discard notifications before the events were set
+    SetCalcNotification( sal_False );       // discard notifications before the events were set
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 
-void ScTable::SetCalcNotification( BOOL bSet )
+void ScTable::SetCalcNotification( sal_Bool bSet )
 {
     bCalcNotification = bSet;
 }
 
 
-BOOL ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize )
+sal_Bool ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize )
 {
-    BOOL bTest = TRUE;
+    sal_Bool bTest = sal_True;
 
     if ( nStartCol==0 && nEndCol==MAXCOL && pOutlineTable )
         bTest = pOutlineTable->TestInsertRow(nSize);
@@ -143,7 +143,7 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
         if (mpRowHeights && pRowFlags)
         {
             mpRowHeights->insertSegment(nStartRow, nSize, false);
-            BYTE nNewFlags = pRowFlags->Insert( nStartRow, nSize);
+            sal_uInt8 nNewFlags = pRowFlags->Insert( nStartRow, nSize);
             // only copy manual size flag, clear all others
             if (nNewFlags && (nNewFlags != CR_MANUALSIZE))
                 pRowFlags->SetValue( nStartRow, nStartRow + nSize - 1,
@@ -182,7 +182,7 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
 
 
 void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize,
-                            BOOL* pUndoOutline )
+                            sal_Bool* pUndoOutline )
 {
     IncRecalcLevel();
     InitializeNoteCaptions();
@@ -197,7 +197,7 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
         if (pOutlineTable)
             if (pOutlineTable->DeleteRow( nStartRow, nSize ))
                 if (pUndoOutline)
-                    *pUndoOutline = TRUE;
+                    *pUndoOutline = sal_True;
 
         mpFilteredRows->removeSegment(nStartRow, nStartRow+nSize);
         mpHiddenRows->removeSegment(nStartRow, nStartRow+nSize);
@@ -226,15 +226,15 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
 }
 
 
-BOOL ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize )
+sal_Bool ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize )
 {
-    BOOL bTest = TRUE;
+    sal_Bool bTest = sal_True;
 
     if ( nStartRow==0 && nEndRow==MAXROW && pOutlineTable )
         bTest = pOutlineTable->TestInsertCol(nSize);
 
     if ( nSize > static_cast<SCSIZE>(MAXCOL) )
-        bTest = FALSE;
+        bTest = sal_False;
 
     for (SCCOL i=MAXCOL; (i+static_cast<SCCOL>(nSize)>MAXCOL) && bTest; i--)
         bTest = aCol[i].TestInsertCol(nStartRow, nEndRow);
@@ -294,14 +294,14 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
 
     if (nStartCol>0)						// copy old attributes
     {
-        USHORT nWhichArray[2];
+        sal_uInt16 nWhichArray[2];
         nWhichArray[0] = ATTR_MERGE;
         nWhichArray[1] = 0;
 
         for (SCSIZE i=0; i<nSize; i++)
         {
             aCol[nStartCol-1].CopyToColumn( nStartRow, nEndRow, IDF_ATTRIB,
-                                                FALSE, aCol[nStartCol+i] );
+                                                sal_False, aCol[nStartCol+i] );
             aCol[nStartCol+i].RemoveFlags( nStartRow, nEndRow,
                                                 SC_MF_HOR | SC_MF_VER | SC_MF_AUTO );
             aCol[nStartCol+i].ClearItems( nStartRow, nEndRow, nWhichArray );
@@ -314,7 +314,7 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
 
 
 void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize,
-                            BOOL* pUndoOutline )
+                            sal_Bool* pUndoOutline )
 {
     IncRecalcLevel();
     InitializeNoteCaptions();
@@ -330,7 +330,7 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
         if (pOutlineTable)
             if (pOutlineTable->DeleteCol( nStartCol, nSize ))
                 if (pUndoOutline)
-                    *pUndoOutline = TRUE;
+                    *pUndoOutline = sal_True;
 
         SCCOL nRmSize = nStartCol + static_cast<SCCOL>(nSize);
         mpHiddenCols->removeSegment(nStartCol, nRmSize);
@@ -373,7 +373,7 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
 }
 
 
-void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag)
+void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nDelFlag)
 {
     if (nCol2 > MAXCOL) nCol2 = MAXCOL;
     if (nRow2 > MAXROW) nRow2 = MAXROW;
@@ -394,7 +394,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH
         if ( IsProtected() && (nDelFlag & IDF_ATTRIB) )
         {
             ScPatternAttr aPattern(pDocument->GetPool());
-            aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) );
+            aPattern.GetItemSet().Put( ScProtectionAttr( sal_False ) );
             ApplyPatternArea( nCol1, nRow1, nCol2, nRow2, aPattern );
         }
 
@@ -403,7 +403,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH
 }
 
 
-void ScTable::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
+void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
 {
     {   // scope for bulk broadcast
         ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM());
@@ -419,7 +419,7 @@ void ScTable::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
     {
         ScDocumentPool* pPool = pDocument->GetPool();
         SfxItemSet aSet( *pPool, ATTR_PATTERN_START, ATTR_PATTERN_END );
-        aSet.Put( ScProtectionAttr( FALSE ) );
+        aSet.Put( ScProtectionAttr( sal_False ) );
         SfxItemPoolCache aCache( pPool, &aSet );
         ApplySelectionCache( &aCache, rMark );
     }
@@ -428,7 +428,7 @@ void ScTable::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
 
 //	pTable = Clipboard
 void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                        ScTable* pTable, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions)
+                        ScTable* pTable, sal_Bool bKeepScenarioFlags, sal_Bool bCloneNoteCaptions)
 {
     if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
     {
@@ -477,8 +477,8 @@ void ScTable::CopyToClip(const ScRangeList& rRanges, ScTable* pTable,
 }
 
 void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                            SCsCOL nDx, SCsROW nDy, USHORT nInsFlag,
-                            BOOL bAsLink, BOOL bSkipAttrForEmpty, ScTable* pTable)
+                            SCsCOL nDx, SCsROW nDy, sal_uInt16 nInsFlag,
+                            sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty, ScTable* pTable)
 {
     SCCOL i;
 
@@ -506,7 +506,7 @@ void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     if ( pTable->pRowFlags->GetValue(j-nDy) & CR_MANUALSIZE )
                         pRowFlags->OrValue( j, CR_MANUALSIZE);
                     else
-                        pRowFlags->AndValue( j, sal::static_int_cast<BYTE>(~CR_MANUALSIZE));
+                        pRowFlags->AndValue( j, sal::static_int_cast<sal_uInt8>(~CR_MANUALSIZE));
                 }
             }
 
@@ -517,7 +517,7 @@ void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             if ( IsProtected() && (nInsFlag & IDF_ATTRIB) )
             {
                 ScPatternAttr aPattern(pDocument->GetPool());
-                aPattern.GetItemSet().Put( ScProtectionAttr( FALSE ) );
+                aPattern.GetItemSet().Put( ScProtectionAttr( sal_False ) );
                 ApplyPatternArea( nCol1, nRow1, nCol2, nRow2, aPattern );
             }
         }
@@ -527,7 +527,7 @@ void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
 
 void ScTable::MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                            USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab )
+                            sal_uInt16 nFunction, sal_Bool bSkipEmpty, ScTable* pSrcTab )
 {
     for (SCCOL i=nCol1; i<=nCol2; i++)
         aCol[i].MixData( nRow1, nRow2, nFunction, bSkipEmpty, pSrcTab->aCol[i] );
@@ -535,8 +535,8 @@ void ScTable::MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
 
 //	Markierung von diesem Dokument
-void ScTable::MixMarked( const ScMarkData& rMark, USHORT nFunction,
-                        BOOL bSkipEmpty, ScTable* pSrcTab )
+void ScTable::MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
+                        sal_Bool bSkipEmpty, ScTable* pSrcTab )
 {
     for (SCCOL i=0; i<=MAXCOL; i++)
         aCol[i].MixMarked( rMark, nFunction, bSkipEmpty, pSrcTab->aCol[i] );
@@ -544,9 +544,9 @@ void ScTable::MixMarked( const ScMarkData& rMark, USHORT nFunction,
 
 
 void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                ScTable* pTransClip, USHORT nFlags, BOOL bAsLink )
+                                ScTable* pTransClip, sal_uInt16 nFlags, sal_Bool bAsLink )
 {
-    BOOL bWasCut = pDocument->IsCutMode();
+    sal_Bool bWasCut = pDocument->IsCutMode();
 
     ScDocument* pDestDoc = pTransClip->pDocument;
 
@@ -569,7 +569,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 aRef.nRow = nRow;
                 aRef.nTab = nTab;
                 aRef.InitFlags();							// -> all absolute
-                aRef.SetFlag3D(TRUE);
+                aRef.SetFlag3D(sal_True);
                 aRef.CalcRelFromAbs( aDestPos );
                 ScTokenArray aArr;
                 aArr.AddSingleReference( aRef );
@@ -622,13 +622,13 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             if ( !IsDefaultItem( pPattern ) )
             {
                 const SfxItemSet& rSet = pPattern->GetItemSet();
-                if ( rSet.GetItemState( ATTR_MERGE, FALSE ) == SFX_ITEM_DEFAULT &&
-                     rSet.GetItemState( ATTR_MERGE_FLAG, FALSE ) == SFX_ITEM_DEFAULT &&
-                     rSet.GetItemState( ATTR_BORDER, FALSE ) == SFX_ITEM_DEFAULT )
+                if ( rSet.GetItemState( ATTR_MERGE, sal_False ) == SFX_ITEM_DEFAULT &&
+                     rSet.GetItemState( ATTR_MERGE_FLAG, sal_False ) == SFX_ITEM_DEFAULT &&
+                     rSet.GetItemState( ATTR_BORDER, sal_False ) == SFX_ITEM_DEFAULT )
                 {
                     // no borders or merge items involved - use pattern as-is
                     for (nRow = nAttrRow1; nRow<=nAttrRow2; nRow++)
-                        pTransClip->SetPattern( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), *pPattern, TRUE );
+                        pTransClip->SetPattern( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), *pPattern, sal_True );
                 }
                 else
                 {
@@ -662,7 +662,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     const ScMergeFlagAttr& rOldFlag = (const ScMergeFlagAttr&)rSet.Get(ATTR_MERGE_FLAG);
                     if (rOldFlag.IsOverlapped())
                     {
-                        INT16 nNewFlags = rOldFlag.GetValue() & ~( SC_MF_HOR | SC_MF_VER );
+                        sal_Int16 nNewFlags = rOldFlag.GetValue() & ~( SC_MF_HOR | SC_MF_VER );
                         if ( nNewFlags )
                             rNewSet.Put( ScMergeFlagAttr( nNewFlags ) );
                         else
@@ -671,7 +671,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
                     for (nRow = nAttrRow1; nRow<=nAttrRow2; nRow++)
                         pTransClip->SetPattern( static_cast<SCCOL>(nRow-nRow1),
-                                static_cast<SCROW>(nCol-nCol1), aNewPattern, TRUE);
+                                static_cast<SCROW>(nCol-nCol1), aNewPattern, sal_True);
                 }
             }
         }
@@ -718,9 +718,9 @@ void ScTable::StartListeningInArea( SCCOL nCol1, SCROW nRow1,
 
 
 void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                            USHORT nFlags, BOOL bMarked, ScTable* pDestTab,
+                            sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab,
                             const ScMarkData* pMarkData,
-                            BOOL bAsLink, BOOL bColRowFlags)
+                            sal_Bool bAsLink, sal_Bool bColRowFlags)
 {
     if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
     {
@@ -736,8 +736,8 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
             bool bFlagChange = false;
 
-            BOOL bWidth  = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
-            BOOL bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights && pDestTab->mpRowHeights);
+            sal_Bool bWidth  = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
+            sal_Bool bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights && pDestTab->mpRowHeights);
 
             if (bWidth||bHeight)
             {
@@ -774,6 +774,9 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     pDestTab->pRowFlags->CopyFrom(*pRowFlags, nRow1, nRow2);
 
                     // Hidden flags.
+                    // #i116164# Collect information first, then apply the changes,
+                    // so RowHidden doesn't rebuild the tree for each row range.
+                    std::vector<ScShowRowsEntry> aEntries;
                     for (SCROW i = nRow1; i <= nRow2; ++i)
                     {
                         SCROW nThisLastRow, nDestLastRow;
@@ -786,7 +789,8 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                             // the last row shouldn't exceed the upper bound the caller specified.
                             nLastRow = nRow2;
     
-                        pDestTab->SetRowHidden(i, nLastRow, bThisHidden);
+                        //pDestTab->SetRowHidden(i, nLastRow, bThisHidden);
+                        aEntries.push_back(ScShowRowsEntry(i, nLastRow, !bThisHidden));
 
                         bool bThisHiddenChange = (bThisHidden != bDestHidden);
                         if (bThisHiddenChange && pCharts)
@@ -801,7 +805,20 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                         // Jump to the last row of the identical flag segment.
                         i = nLastRow;
                     }
-                
+
+                    std::vector<ScShowRowsEntry>::const_iterator aEnd = aEntries.end();
+                    std::vector<ScShowRowsEntry>::const_iterator aIter = aEntries.begin();
+                    if ( aIter != aEnd )
+                    {
+                        pDestTab->mpHiddenRows->setInsertFromBack(true);    // important for undo document
+                        while (aIter != aEnd)
+                        {
+                            pDestTab->SetRowHidden(aIter->mnRow1, aIter->mnRow2, !aIter->mbShow);
+                            ++aIter;
+                        }
+                        pDestTab->mpHiddenRows->setInsertFromBack(false);
+                    }
+
                     // Filtered flags.
                     for (SCROW i = nRow1; i <= nRow2; ++i)
                     {
@@ -828,13 +845,13 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
 
 void ScTable::UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                            USHORT nFlags, BOOL bMarked, ScTable* pDestTab,
+                            sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab,
                             const ScMarkData* pMarkData)
 {
     if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
     {
-        BOOL bWidth  = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
-        BOOL bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights && pDestTab->mpRowHeights);
+        sal_Bool bWidth  = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
+        sal_Bool bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights && pDestTab->mpRowHeights);
 
         if (bWidth||bHeight)
             IncRecalcLevel();
@@ -845,7 +862,7 @@ void ScTable::UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 aCol[i].UndoToColumn(nRow1, nRow2, nFlags, bMarked, pDestTab->aCol[i],
                                         pMarkData);
             else
-                aCol[i].CopyToColumn(0, MAXROW, IDF_FORMULA, FALSE, pDestTab->aCol[i]);
+                aCol[i].CopyToColumn(0, MAXROW, IDF_FORMULA, sal_False, pDestTab->aCol[i]);
         }
 
         if (bWidth||bHeight)
@@ -875,7 +892,7 @@ void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const
 
 void ScTable::InvalidateTableArea()
 {
-    bTableAreaValid = FALSE;
+    bTableAreaValid = sal_False;
 }
 
 void ScTable::InvalidatePageBreaks()
@@ -899,7 +916,7 @@ void ScTable::CopyScenarioFrom( const ScTable* pSrcTab )
         aCol[i].CopyScenarioFrom( pSrcTab->aCol[i] );
 }
 
-void ScTable::MarkScenarioIn( ScMarkData& rDestMark, USHORT nNeededBits ) const
+void ScTable::MarkScenarioIn( ScMarkData& rDestMark, sal_uInt16 nNeededBits ) const
 {
     DBG_ASSERT( bScenario, "bScenario == FALSE" );
 
@@ -910,7 +927,7 @@ void ScTable::MarkScenarioIn( ScMarkData& rDestMark, USHORT nNeededBits ) const
         aCol[i].MarkScenarioIn( rDestMark );
 }
 
-BOOL ScTable::HasScenarioRange( const ScRange& rRange ) const
+sal_Bool ScTable::HasScenarioRange( const ScRange& rRange ) const
 {
     DBG_ASSERT( bScenario, "bScenario == FALSE" );
 
@@ -927,16 +944,16 @@ BOOL ScTable::HasScenarioRange( const ScRange& rRange ) const
 
     if (pList)
     {
-        ULONG nCount = pList->Count();
-        for ( ULONG j = 0; j < nCount; j++ )
+        sal_uLong nCount = pList->Count();
+        for ( sal_uLong j = 0; j < nCount; j++ )
         {
             ScRange* pR = pList->GetObject( j );
             if ( pR->Intersects( aTabRange ) )
-                return TRUE;
+                return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void ScTable::InvalidateScenarioRanges()
@@ -954,19 +971,19 @@ const ScRangeList* ScTable::GetScenarioRanges() const
         ((ScTable*)this)->pScenarioRanges = new ScRangeList;
         ScMarkData aMark;
         MarkScenarioIn( aMark, 0 );		// immer
-        aMark.FillRangeListWithMarks( pScenarioRanges, FALSE );
+        aMark.FillRangeListWithMarks( pScenarioRanges, sal_False );
     }
     return pScenarioRanges;
 }
 
-BOOL ScTable::TestCopyScenarioTo( const ScTable* pDestTab ) const
+sal_Bool ScTable::TestCopyScenarioTo( const ScTable* pDestTab ) const
 {
     DBG_ASSERT( bScenario, "bScenario == FALSE" );
 
     if (!pDestTab->IsProtected())
-        return TRUE;
+        return sal_True;
 
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     for (SCCOL i=0; i<=MAXCOL && bOk; i++)
         bOk = aCol[i].TestCopyScenarioTo( pDestTab->aCol[i] );
     return bOk;
@@ -984,7 +1001,7 @@ void ScTable::PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell )
 }
 
 
-void ScTable::PutCell( SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell )
+void ScTable::PutCell( SCCOL nCol, SCROW nRow, sal_uLong nFormatIndex, ScBaseCell* pCell )
 {
     if (ValidColRow(nCol,nRow))
     {
@@ -1005,7 +1022,7 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
 }
 
 
-//UNUSED2009-05 void ScTable::PutCell( const ScAddress& rPos, ULONG nFormatIndex, ScBaseCell* pCell )
+//UNUSED2009-05 void ScTable::PutCell( const ScAddress& rPos, sal_uLong nFormatIndex, ScBaseCell* pCell )
 //UNUSED2009-05 {
 //UNUSED2009-05     if (pCell)
 //UNUSED2009-05         aCol[rPos.Col()].Insert( rPos.Row(), nFormatIndex, pCell );
@@ -1014,14 +1031,14 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
 //UNUSED2009-05 }
 
 
-BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, 
+sal_Bool ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, 
                          SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
 {
     if (ValidColRow(nCol,nRow))
         return aCol[nCol].SetString( 
             nRow, nTabP, rString, pDocument->GetAddressConvention(), pFormatter, bDetectNumberFormat );
     else
-        return FALSE;
+        return sal_False;
 }
 
 
@@ -1059,7 +1076,7 @@ double ScTable::GetValue( SCCOL nCol, SCROW nRow )
 
 
 void ScTable::GetFormula( SCCOL nCol, SCROW nRow, String& rFormula,
-                          BOOL bAsciiExport )
+                          sal_Bool bAsciiExport )
 {
     if (ValidColRow(nCol,nRow))
         aCol[nCol].GetFormula( nRow, rFormula, bAsciiExport );
@@ -1135,10 +1152,16 @@ ScBaseCell* ScTable::GetCell( SCCOL nCol, SCROW nRow ) const
 void ScTable::GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const
 {
     rCol = 0;
-    rRow = 0;
+    rRow = MAXROW+1;
     while (aCol[rCol].IsEmptyData() && rCol < MAXCOL)
         ++rCol;
-    rRow = aCol[rCol].GetFirstDataPos();
+    SCCOL nCol = rCol;
+    while (nCol <= MAXCOL && rRow > 0)
+    {
+        if (!aCol[nCol].IsEmptyData())
+            rRow = ::std::min( rRow, aCol[nCol].GetFirstDataPos());
+        ++nCol;
+    }
 }
 
 void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
@@ -1148,54 +1171,51 @@ void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
     while (aCol[rCol].IsEmptyData() && (rCol > 0))
         rCol--;
     SCCOL nCol = rCol;
-    while ((SCsCOL)nCol >= 0)
-    {
-        rRow = Max(rRow, aCol[nCol].GetLastDataPos());
-        nCol--;
-    }
+    while (nCol >= 0 && rRow < MAXROW)
+        rRow = ::std::max( rRow, aCol[nCol--].GetLastDataPos());
 }
 
 
-BOOL ScTable::HasData( SCCOL nCol, SCROW nRow )
+sal_Bool ScTable::HasData( SCCOL nCol, SCROW nRow )
 {
     if (ValidColRow(nCol,nRow))
         return aCol[nCol].HasDataAt( nRow );
     else
-        return FALSE;
+        return sal_False;
 }
 
 
-BOOL ScTable::HasStringData( SCCOL nCol, SCROW nRow )
+sal_Bool ScTable::HasStringData( SCCOL nCol, SCROW nRow )
 {
     if (ValidColRow(nCol,nRow))
         return aCol[nCol].HasStringData( nRow );
     else
-        return FALSE;
+        return sal_False;
 }
 
 
-BOOL ScTable::HasValueData( SCCOL nCol, SCROW nRow )
+sal_Bool ScTable::HasValueData( SCCOL nCol, SCROW nRow )
 {
     if (ValidColRow(nCol,nRow))
         return aCol[nCol].HasValueData( nRow );
     else
-        return FALSE;
+        return sal_False;
 }
 
 
-BOOL ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow,
+sal_Bool ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow,
                                 SCCOL nEndCol, SCROW nEndRow ) const
 {
     if ( ValidCol(nEndCol) )
         for ( SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++ )
             if (aCol[nCol].HasStringCells(nStartRow, nEndRow))
-                return TRUE;
+                return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 
-//UNUSED2008-05  USHORT ScTable::GetErrCode( SCCOL nCol, SCROW nRow ) const
+//UNUSED2008-05  sal_uInt16 ScTable::GetErrCode( SCCOL nCol, SCROW nRow ) const
 //UNUSED2008-05  {
 //UNUSED2008-05      if (ValidColRow( nCol, nRow ))
 //UNUSED2008-05          return aCol[nCol].GetErrCode( nRow );
@@ -1212,8 +1232,8 @@ void ScTable::SetDirtyVar()
 
 void ScTable::SetDirty()
 {
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for (SCCOL i=0; i<=MAXCOL; i++)
         aCol[i].SetDirty();
     pDocument->SetAutoCalc( bOldAutoCalc );
@@ -1222,8 +1242,8 @@ void ScTable::SetDirty()
 
 void ScTable::SetDirty( const ScRange& rRange )
 {
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     SCCOL nCol2 = rRange.aEnd.Col();
     for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++)
         aCol[i].SetDirty( rRange );
@@ -1233,8 +1253,8 @@ void ScTable::SetDirty( const ScRange& rRange )
 
 void ScTable::SetTableOpDirty( const ScRange& rRange )
 {
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// no multiple recalculation
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// no multiple recalculation
     SCCOL nCol2 = rRange.aEnd.Col();
     for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++)
         aCol[i].SetTableOpDirty( rRange );
@@ -1244,8 +1264,8 @@ void ScTable::SetTableOpDirty( const ScRange& rRange )
 
 void ScTable::SetDirtyAfterLoad()
 {
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for (SCCOL i=0; i<=MAXCOL; i++)
         aCol[i].SetDirtyAfterLoad();
     pDocument->SetAutoCalc( bOldAutoCalc );
@@ -1254,8 +1274,8 @@ void ScTable::SetDirtyAfterLoad()
 
 void ScTable::SetRelNameDirty()
 {
-    BOOL bOldAutoCalc = pDocument->GetAutoCalc();
-    pDocument->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+    sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+    pDocument->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
     for (SCCOL i=0; i<=MAXCOL; i++)
         aCol[i].SetRelNameDirty();
     pDocument->SetAutoCalc( bOldAutoCalc );
@@ -1312,7 +1332,7 @@ void ScTable::ResetChanged( const ScRange& rRange )
 
 //	Attribute
 
-const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const
+const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW nRow, sal_uInt16 nWhich ) const
 {
     if (ValidColRow(nCol,nRow))
         return aCol[nCol].GetAttr( nRow, nWhich );
@@ -1321,7 +1341,7 @@ const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) con
 }
 
 
-ULONG ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
+sal_uLong ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
 {
     if (ValidColRow(nCol,nRow))
         return aCol[nCol].GetNumberFormat( nRow );
@@ -1351,7 +1371,7 @@ const ScPatternAttr* ScTable::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, S
 }
 
 
-bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nMask ) const
+bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nMask ) const
 {
     bool bFound = false;
     for (SCCOL i=nCol1; i<=nCol2 && !bFound; i++)
@@ -1360,7 +1380,7 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH
 }
 
 
-//UNUSED2009-05 BOOL ScTable::HasLines( const ScRange& rRange, Rectangle& rSizes ) const
+//UNUSED2009-05 sal_Bool ScTable::HasLines( const ScRange& rRange, Rectangle& rSizes ) const
 //UNUSED2009-05 {
 //UNUSED2009-05     SCCOL nCol1 = rRange.aStart.Col();
 //UNUSED2009-05     SCROW nRow1 = rRange.aStart.Row();
@@ -1369,34 +1389,34 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH
 //UNUSED2009-05     PutInOrder( nCol1, nCol2 );
 //UNUSED2009-05     PutInOrder( nRow1, nRow2 );
 //UNUSED2009-05 
-//UNUSED2009-05     BOOL bFound = FALSE;
+//UNUSED2009-05     sal_Bool bFound = sal_False;
 //UNUSED2009-05     for (SCCOL i=nCol1; i<=nCol2; i++)
 //UNUSED2009-05         if (aCol[i].HasLines( nRow1, nRow2, rSizes, (i==nCol1), (i==nCol2) ))
-//UNUSED2009-05             bFound = TRUE;
+//UNUSED2009-05             bFound = sal_True;
 //UNUSED2009-05 
 //UNUSED2009-05     return bFound;
 //UNUSED2009-05 }
 
 
-BOOL ScTable::HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const
+sal_Bool ScTable::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const
 {
-    BOOL bFound=FALSE;
+    sal_Bool bFound=sal_False;
     for (SCCOL i=0; i<=MAXCOL && !bFound; i++)
         bFound |= aCol[i].HasAttribSelection( rMark, nMask );
     return bFound;
 }
 
 
-BOOL ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
+sal_Bool ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
                            SCCOL& rEndCol, SCROW& rEndRow,
-                           BOOL bRefresh, BOOL bAttrs )
+                           sal_Bool bRefresh, sal_Bool bAttrs )
 {
     if (!(ValidCol(nStartCol) && ValidCol(rEndCol)))
     {
         DBG_ERRORFILE("ScTable::ExtendMerge: invalid column number");
-        return FALSE;
+        return sal_False;
     }
-    BOOL bFound=FALSE;
+    sal_Bool bFound=sal_False;
     SCCOL nOldEndX = rEndCol;
     SCROW nOldEndY = rEndRow;
     for (SCCOL i=nStartCol; i<=nOldEndX; i++)
@@ -1405,14 +1425,14 @@ BOOL ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
 }
 
 
-BOOL ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes ) const
+sal_Bool ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes ) const
 {
     if (!(ValidCol(nCol1) && ValidCol(nCol2)))
     {
         DBG_ERRORFILE("ScTable::IsBlockEmpty: invalid column number");
-        return FALSE;
+        return sal_False;
     }
-    BOOL bEmpty = TRUE;
+    sal_Bool bEmpty = sal_True;
     for (SCCOL i=nCol1; i<=nCol2 && bEmpty; i++)
         bEmpty = aCol[i].IsEmptyBlock( nRow1, nRow2, bIgnoreNotes );
     return bEmpty;
@@ -1424,10 +1444,10 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
 {
     //	Rueckgabe = neues nArrY
 
-    BYTE nRotDir = pPattern->GetRotateDir( pCondSet );
+    sal_uInt8 nRotDir = pPattern->GetRotateDir( pCondSet );
     if ( nRotDir != SC_ROTDIR_NONE )
     {
-        BOOL bHit = TRUE;
+        sal_Bool bHit = sal_True;
         if ( nCol+1 < nX1 )								// column to the left
             bHit = ( nRotDir != SC_ROTDIR_LEFT );
         else if ( nCol > nX2+1 )						// column to the right
@@ -1455,7 +1475,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
             {
                 if (!RowHidden(nRow))
                 {
-                    BOOL bHitOne = TRUE;
+                    sal_Bool bHitOne = sal_True;
                     if ( nCol > nX2+1 )
                     {
                         // reicht die gedrehte Zelle bis in den sichtbaren Bereich?
@@ -1469,7 +1489,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
                             nWidth += GetColWidth( nTouchedCol );
                         }
                         if ( nTouchedCol > nX2 )
-                            bHitOne = FALSE;
+                            bHitOne = sal_False;
                     }
 
                     if (bHitOne)
@@ -1512,13 +1532,13 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
             while ( pPattern )
             {
                 const SfxPoolItem* pCondItem;
-                if ( pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, TRUE, &pCondItem )
+                if ( pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, sal_True, &pCondItem )
                         == SFX_ITEM_SET )
                 {
                     //	alle Formate durchgehen, damit die Zellen nicht einzeln
                     //	angeschaut werden muessen
 
-                    ULONG nIndex = ((const SfxUInt32Item*)pCondItem)->GetValue();
+                    sal_uLong nIndex = ((const SfxUInt32Item*)pCondItem)->GetValue();
                     ScConditionalFormatList* pList = pDocument->GetCondFormList();
                     ScStyleSheetPool* pStylePool = pDocument->GetStyleSheetPool();
                     if (pList && pStylePool && nIndex)
@@ -1526,8 +1546,8 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
                         const ScConditionalFormat* pFormat = pList->GetFormat(nIndex);
                         if ( pFormat )
                         {
-                            USHORT nEntryCount = pFormat->Count();
-                            for (USHORT nEntry=0; nEntry<nEntryCount; nEntry++)
+                            sal_uInt16 nEntryCount = pFormat->Count();
+                            for (sal_uInt16 nEntry=0; nEntry<nEntryCount; nEntry++)
                             {
                                 String aStyleName = pFormat->GetEntry(nEntry)->GetStyle();
                                 if (aStyleName.Len())
@@ -1557,62 +1577,62 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
     }
 }
 
-BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const
+sal_Bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const
 {
     // nix:0, mitte:1, unten:2, links:4, oben:8, rechts:16, offen:32
-    USHORT nEdges;
+    sal_uInt16 nEdges;
 
     if ( nCol1 == nCol2 )
     {	// linke und rechte Spalte
-        const USHORT n = 4 | 16;
+        const sal_uInt16 n = 4 | 16;
         nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, n );
         // nicht (4 und 16) oder 1 oder 32
         if ( nEdges && (((nEdges & n) != n) || (nEdges & 33)) )
-            return TRUE;		// linke oder rechte Kante fehlt oder offen
+            return sal_True;		// linke oder rechte Kante fehlt oder offen
     }
     else
     {	// linke Spalte
         nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, 4 );
         // nicht 4 oder 1 oder 32
         if ( nEdges && (((nEdges & 4) != 4) || (nEdges & 33)) )
-            return TRUE;		// linke Kante fehlt oder offen
+            return sal_True;		// linke Kante fehlt oder offen
         // rechte Spalte
         nEdges = aCol[nCol2].GetBlockMatrixEdges( nRow1, nRow2, 16 );
         // nicht 16 oder 1 oder 32
         if ( nEdges && (((nEdges & 16) != 16) || (nEdges & 33)) )
-            return TRUE;		// rechte Kante fehlt oder offen
+            return sal_True;		// rechte Kante fehlt oder offen
     }
 
     if ( nRow1 == nRow2 )
     {	// obere und untere Zeile
-        BOOL bOpen = FALSE;
-        const USHORT n = 2 | 8;
+        sal_Bool bOpen = sal_False;
+        const sal_uInt16 n = 2 | 8;
         for ( SCCOL i=nCol1; i<=nCol2; i++)
         {
             nEdges = aCol[i].GetBlockMatrixEdges( nRow1, nRow1, n );
             if ( nEdges )
             {
                 if ( (nEdges & n) != n )
-                    return TRUE;		// obere oder untere Kante fehlt
+                    return sal_True;		// obere oder untere Kante fehlt
                 if ( nEdges & 4 )
-                    bOpen = TRUE;		// linke Kante oeffnet, weitersehen
+                    bOpen = sal_True;		// linke Kante oeffnet, weitersehen
                 else if ( !bOpen )
-                    return TRUE;		// es gibt was, was nicht geoeffnet wurde
+                    return sal_True;		// es gibt was, was nicht geoeffnet wurde
                 if ( nEdges & 16 )
-                    bOpen = FALSE;		// rechte Kante schliesst
+                    bOpen = sal_False;		// rechte Kante schliesst
             }
         }
         if ( bOpen )
-            return TRUE;				// es geht noch weiter
+            return sal_True;				// es geht noch weiter
     }
     else
     {
-        USHORT j, n;
+        sal_uInt16 j, n;
         SCROW nR;
         // erst obere Zeile, dann untere Zeile
         for ( j=0, nR=nRow1, n=8; j<2; j++, nR=nRow2, n=2 )
         {
-            BOOL bOpen = FALSE;
+            sal_Bool bOpen = sal_False;
             for ( SCCOL i=nCol1; i<=nCol2; i++)
             {
                 nEdges = aCol[i].GetBlockMatrixEdges( nR, nR, n );
@@ -1621,61 +1641,61 @@ BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR
                     // in oberere Zeile keine obere Kante bzw.
                     // in unterer Zeile keine untere Kante
                     if ( (nEdges & n) != n )
-                        return TRUE;
+                        return sal_True;
                     if ( nEdges & 4 )
-                        bOpen = TRUE;		// linke Kante oeffnet, weitersehen
+                        bOpen = sal_True;		// linke Kante oeffnet, weitersehen
                     else if ( !bOpen )
-                        return TRUE;		// es gibt was, was nicht geoeffnet wurde
+                        return sal_True;		// es gibt was, was nicht geoeffnet wurde
                     if ( nEdges & 16 )
-                        bOpen = FALSE;		// rechte Kante schliesst
+                        bOpen = sal_False;		// rechte Kante schliesst
                 }
             }
             if ( bOpen )
-                return TRUE;				// es geht noch weiter
+                return sal_True;				// es geht noch weiter
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const
+sal_Bool ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const
 {
-    BOOL bFound=FALSE;
+    sal_Bool bFound=sal_False;
     for (SCCOL i=0; i<=MAXCOL && !bFound; i++)
         bFound |= aCol[i].HasSelectionMatrixFragment(rMark);
     return bFound;
 }
 
 
-BOOL ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
-            SCROW nRow2, BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
+sal_Bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
+            SCROW nRow2, sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
 {
     if ( !ValidColRow( nCol2, nRow2 ) )
     {
         DBG_ERRORFILE("IsBlockEditable: invalid column or row");
         if (pOnlyNotBecauseOfMatrix)
-            *pOnlyNotBecauseOfMatrix = FALSE;
-        return FALSE;
+            *pOnlyNotBecauseOfMatrix = sal_False;
+        return sal_False;
     }
 
-    BOOL bIsEditable = TRUE;
+    sal_Bool bIsEditable = sal_True;
     if ( nLockCount )
-        bIsEditable = FALSE;
+        bIsEditable = sal_False;
     else if ( IsProtected() && !pDocument->IsScenario(nTab) )
     {
-        if((bIsEditable = !HasAttrib( nCol1, nRow1, nCol2, nRow2, HASATTR_PROTECTED )) != FALSE)
+        if((bIsEditable = !HasAttrib( nCol1, nRow1, nCol2, nRow2, HASATTR_PROTECTED )) != sal_False)
         {
             // If Sheet is protected and cells are not protected then
             // check the active scenario protect flag if this range is
             // on the active scenario range. Note the 'copy back' must also
             // be set to apply protection.
-            USHORT nScenTab = nTab+1;
+            sal_uInt16 nScenTab = nTab+1;
             while(pDocument->IsScenario(nScenTab))
             {
                 ScRange aEditRange(nCol1, nRow1, nScenTab, nCol2, nRow2, nScenTab);
                 if(pDocument->IsActiveScenario(nScenTab) && pDocument->HasScenarioRange(nScenTab, aEditRange))
                 {
-                    USHORT nFlags;
+                    sal_uInt16 nFlags;
                     pDocument->GetScenarioFlags(nScenTab,nFlags);
                     bIsEditable = !((nFlags & SC_SCENARIO_PROTECT) && (nFlags & SC_SCENARIO_TWOWAY));
                     break;
@@ -1699,7 +1719,7 @@ BOOL ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
             ScRange aEditRange(nCol1, nRow1, nTab, nCol2, nRow2, nTab);
             if(pDocument->HasScenarioRange(nTab, aEditRange))
             {
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDocument->GetScenarioFlags(nTab,nFlags);
                 bIsEditable = !(nFlags & SC_SCENARIO_PROTECT);
             }
@@ -1709,46 +1729,46 @@ BOOL ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
     {
         if ( HasBlockMatrixFragment( nCol1, nRow1, nCol2, nRow2 ) )
         {
-            bIsEditable = FALSE;
+            bIsEditable = sal_False;
             if ( pOnlyNotBecauseOfMatrix )
-                *pOnlyNotBecauseOfMatrix = TRUE;
+                *pOnlyNotBecauseOfMatrix = sal_True;
         }
         else if ( pOnlyNotBecauseOfMatrix )
-            *pOnlyNotBecauseOfMatrix = FALSE;
+            *pOnlyNotBecauseOfMatrix = sal_False;
     }
     else if ( pOnlyNotBecauseOfMatrix )
-        *pOnlyNotBecauseOfMatrix = FALSE;
+        *pOnlyNotBecauseOfMatrix = sal_False;
     return bIsEditable;
 }
 
 
-BOOL ScTable::IsSelectionEditable( const ScMarkData& rMark,
-            BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
+sal_Bool ScTable::IsSelectionEditable( const ScMarkData& rMark,
+            sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
 {
-    BOOL bIsEditable = TRUE;
+    sal_Bool bIsEditable = sal_True;
     if ( nLockCount )
-        bIsEditable = FALSE;
+        bIsEditable = sal_False;
     else if ( IsProtected() && !pDocument->IsScenario(nTab) )
     {
-        if((bIsEditable = !HasAttribSelection( rMark, HASATTR_PROTECTED )) != FALSE)
+        if((bIsEditable = !HasAttribSelection( rMark, HASATTR_PROTECTED )) != sal_False)
         {
             // If Sheet is protected and cells are not protected then
             // check the active scenario protect flag if this area is
             // in the active scenario range.
             ScRangeList aRanges;
-            rMark.FillRangeListWithMarks( &aRanges, FALSE );
-            ULONG nRangeCount = aRanges.Count();
+            rMark.FillRangeListWithMarks( &aRanges, sal_False );
+            sal_uLong nRangeCount = aRanges.Count();
             SCTAB nScenTab = nTab+1;
             while(pDocument->IsScenario(nScenTab) && bIsEditable)
             {
                 if(pDocument->IsActiveScenario(nScenTab))
                 {
-                    for (ULONG i=0; i<nRangeCount && bIsEditable; i++)
+                    for (sal_uLong i=0; i<nRangeCount && bIsEditable; i++)
                     {
                         ScRange aRange = *aRanges.GetObject(i);
                         if(pDocument->HasScenarioRange(nScenTab, aRange))
                         {
-                            USHORT nFlags;
+                            sal_uInt16 nFlags;
                             pDocument->GetScenarioFlags(nScenTab,nFlags);
                             bIsEditable = !((nFlags & SC_SCENARIO_PROTECT) && (nFlags & SC_SCENARIO_TWOWAY));
                         }
@@ -1771,14 +1791,14 @@ BOOL ScTable::IsSelectionEditable( const ScMarkData& rMark,
         if(pDocument->IsTabProtected(nActualTab))
         {
             ScRangeList aRanges;
-            rMark.FillRangeListWithMarks( &aRanges, FALSE );
-            ULONG nRangeCount = aRanges.Count();
-            for (ULONG i=0; i<nRangeCount && bIsEditable; i++)
+            rMark.FillRangeListWithMarks( &aRanges, sal_False );
+            sal_uLong nRangeCount = aRanges.Count();
+            for (sal_uLong i=0; i<nRangeCount && bIsEditable; i++)
             {
                 ScRange aRange = *aRanges.GetObject(i);
                 if(pDocument->HasScenarioRange(nTab, aRange))
                 {
-                    USHORT nFlags;
+                    sal_uInt16 nFlags;
                     pDocument->GetScenarioFlags(nTab,nFlags);
                     bIsEditable = !(nFlags & SC_SCENARIO_PROTECT);
                 }
@@ -1789,15 +1809,15 @@ BOOL ScTable::IsSelectionEditable( const ScMarkData& rMark,
     {
         if ( HasSelectionMatrixFragment( rMark ) )
         {
-            bIsEditable = FALSE;
+            bIsEditable = sal_False;
             if ( pOnlyNotBecauseOfMatrix )
-                *pOnlyNotBecauseOfMatrix = TRUE;
+                *pOnlyNotBecauseOfMatrix = sal_True;
         }
         else if ( pOnlyNotBecauseOfMatrix )
-            *pOnlyNotBecauseOfMatrix = FALSE;
+            *pOnlyNotBecauseOfMatrix = sal_False;
     }
     else if ( pOnlyNotBecauseOfMatrix )
-        *pOnlyNotBecauseOfMatrix = FALSE;
+        *pOnlyNotBecauseOfMatrix = sal_False;
     return bIsEditable;
 }
 
@@ -1820,7 +1840,7 @@ void ScTable::UnlockTable()
 }
 
 
-void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const
+void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, sal_Bool bDeep ) const
 {
     for (SCCOL i=0; i<=MAXCOL; i++)
         aCol[i].MergeSelectionPattern( rState, rMark, bDeep );
@@ -1828,7 +1848,7 @@ void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkDa
 
 
 void ScTable::MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1,
-                                                    SCCOL nCol2, SCROW nRow2, BOOL bDeep ) const
+                                                    SCCOL nCol2, SCROW nRow2, sal_Bool bDeep ) const
 {
     for (SCCOL i=nCol1; i<=nCol2; i++)
         aCol[i].MergePatternArea( rState, nRow1, nRow2, bDeep );
@@ -1921,7 +1941,7 @@ void ScTable::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData&
 
 
 void ScTable::ApplySelectionLineStyle( const ScMarkData& rMark,
-                            const SvxBorderLine* pLine, BOOL bColorOnly )
+                            const SvxBorderLine* pLine, sal_Bool bColorOnly )
 {
     if ( bColorOnly && !pLine )
         return;
@@ -1940,12 +1960,12 @@ const ScStyleSheet* ScTable::GetStyle( SCCOL nCol, SCROW nRow ) const
 }
 
 
-const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const
+const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, sal_Bool& rFound ) const
 {
-    rFound = FALSE;
+    rFound = sal_False;
 
-    BOOL	bEqual = TRUE;
-    BOOL	bColFound;
+    sal_Bool	bEqual = sal_True;
+    sal_Bool	bColFound;
 
     const ScStyleSheet* pStyle = NULL;
     const ScStyleSheet* pNewStyle;
@@ -1956,9 +1976,9 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r
             pNewStyle = aCol[i].GetSelectionStyle( rMark, bColFound );
             if (bColFound)
             {
-                rFound = TRUE;
+                rFound = sal_True;
                 if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
-                    bEqual = FALSE;												// unterschiedliche
+                    bEqual = sal_False;												// unterschiedliche
                 pStyle = pNewStyle;
             }
         }
@@ -1967,13 +1987,13 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r
 }
 
 
-const ScStyleSheet*	ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1,
+const ScStyleSheet*	ScTable::GetAreaStyle( sal_Bool& rFound, SCCOL nCol1, SCROW nRow1,
                                                     SCCOL nCol2, SCROW nRow2 ) const
 {
-    rFound = FALSE;
+    rFound = sal_False;
 
-    BOOL	bEqual = TRUE;
-    BOOL	bColFound;
+    sal_Bool	bEqual = sal_True;
+    sal_Bool	bColFound;
 
     const ScStyleSheet* pStyle = NULL;
     const ScStyleSheet* pNewStyle;
@@ -1983,9 +2003,9 @@ const ScStyleSheet*	ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow
         pNewStyle = aCol[i].GetAreaStyle(bColFound, nRow1, nRow2);
         if (bColFound)
         {
-            rFound = TRUE;
+            rFound = sal_True;
             if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
-                bEqual = FALSE;												// unterschiedliche
+                bEqual = sal_False;												// unterschiedliche
             pStyle = pNewStyle;
         }
     }
@@ -1994,17 +2014,17 @@ const ScStyleSheet*	ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow
 }
 
 
-BOOL ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
+sal_Bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const
 {
-    BOOL bIsUsed = FALSE;
+    sal_Bool bIsUsed = sal_False;
 
     for ( SCCOL i=0; i<=MAXCOL; i++ )
     {
         if ( aCol[i].IsStyleSheetUsed( rStyle, bGatherAllStyles ) )
         {
             if ( !bGatherAllStyles )
-                return TRUE;
-            bIsUsed = TRUE;
+                return sal_True;
+            bIsUsed = sal_True;
         }
     }
 
@@ -2012,7 +2032,7 @@ BOOL ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyle
 }
 
 
-void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved,
+void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool bRemoved,
                                 OutputDevice* pDev,
                                 double nPPTX, double nPPTY,
                                 const Fraction& rZoomX, const Fraction& rZoomY )
@@ -2031,17 +2051,17 @@ void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRem
 
         SCROW nEndRow = aData.mnRow2;
         if (aData.mbValue)
-            SetOptimalHeight(nRow, nEndRow, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE);
+            SetOptimalHeight(nRow, nEndRow, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, sal_False);
 
         nRow = nEndRow + 1;
     }
 }
 
 
-BOOL ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                    INT16 nFlags )
+sal_Bool ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
+                                    sal_Int16 nFlags )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
         for (SCCOL i = nStartCol; i <= nEndCol; i++)
             bChanged |= aCol[i].ApplyFlags(nStartRow, nEndRow, nFlags);
@@ -2049,10 +2069,10 @@ BOOL ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW
 }
 
 
-BOOL ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                    INT16 nFlags )
+sal_Bool ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
+                                    sal_Int16 nFlags )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
         for (SCCOL i = nStartCol; i <= nEndCol; i++)
             bChanged |= aCol[i].RemoveFlags(nStartRow, nEndRow, nFlags);
@@ -2060,7 +2080,7 @@ BOOL ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
 }
 
 
-void ScTable::SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool )
+void ScTable::SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, sal_Bool bPutToPool )
 {
     if (ValidColRow(nCol,nRow))
         aCol[nCol].SetPattern( nRow, rAttr, bPutToPool );
@@ -2081,14 +2101,14 @@ void ScTable::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& r
 }
 
 
-void ScTable::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark )
+void ScTable::ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark )
 {
     for (SCCOL i=0; i<=MAXCOL; i++)
         aCol[i].ChangeSelectionIndent( bIncrement, rMark );
 }
 
 
-void ScTable::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark )
+void ScTable::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark )
 {
     for (SCCOL i=0; i<=MAXCOL; i++)
         aCol[i].ClearSelectionItems( pWhich, rMark );
@@ -2097,7 +2117,7 @@ void ScTable::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark
 
 //	Spaltenbreiten / Zeilenhoehen
 
-void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth )
+void ScTable::SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth )
 {
     if (VALIDCOL(nCol) && pColWidth)
     {
@@ -2127,7 +2147,7 @@ void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth )
 }
 
 
-void ScTable::SetRowHeight( SCROW nRow, USHORT nNewHeight )
+void ScTable::SetRowHeight( SCROW nRow, sal_uInt16 nNewHeight )
 {
     if (VALIDROW(nRow) && mpRowHeights)
     {
@@ -2191,10 +2211,10 @@ bool lcl_pixelSizeChanged(
 
 }
 
-BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight,
+sal_Bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight,
                                     double /* nPPTX */, double nPPTY )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && mpRowHeights)
     {
         IncRecalcLevel();
@@ -2205,18 +2225,18 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
             nNewHeight = ScGlobal::nStdRowHeight;
         }
 
-        BOOL bSingle = FALSE;   // TRUE = process every row for its own
+        sal_Bool bSingle = sal_False;   // sal_True = process every row for its own
         ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
         if (pDrawLayer)
             if (pDrawLayer->HasObjectsInRows( nTab, nStartRow, nEndRow ))
-                bSingle = TRUE;
+                bSingle = sal_True;
 
         if (bSingle)
         {
             ScFlatUInt16RowSegments::RangeData aData;
             mpRowHeights->getRangeData(nStartRow, aData);
             if (nNewHeight == aData.mnValue && nEndRow <= aData.mnRow2)
-                bSingle = FALSE;    // no difference in this range
+                bSingle = sal_False;    // no difference in this range
         }
         if (bSingle)
         {
@@ -2246,9 +2266,9 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
             {
                 SCROW nMid = (nStartRow+nEndRow) / 2;
                 if (SetRowHeightRange( nStartRow, nMid, nNewHeight, 1.0, 1.0 ))
-                    bChanged = TRUE;
+                    bChanged = sal_True;
                 if (SetRowHeightRange( nMid+1, nEndRow, nNewHeight, 1.0, 1.0 ))
-                    bChanged = TRUE;
+                    bChanged = sal_True;
             }
         }
         else
@@ -2282,7 +2302,7 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig
     return bChanged;
 }
 
-void ScTable::SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight )
+void ScTable::SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight )
 {
     if (!ValidRow(nStartRow) || !ValidRow(nEndRow) || !mpRowHeights)
         return;
@@ -2293,14 +2313,14 @@ void ScTable::SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeigh
     mpRowHeights->setValue(nStartRow, nEndRow, nNewHeight);
 }
 
-void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual )
+void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, sal_Bool bManual )
 {
     if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowFlags)
     {
         if (bManual)
             pRowFlags->OrValue( nStartRow, nEndRow, CR_MANUALSIZE);
         else
-            pRowFlags->AndValue( nStartRow, nEndRow, sal::static_int_cast<BYTE>(~CR_MANUALSIZE));
+            pRowFlags->AndValue( nStartRow, nEndRow, sal::static_int_cast<sal_uInt8>(~CR_MANUALSIZE));
     }
     else
     {
@@ -2309,7 +2329,7 @@ void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual )
 }
 
 
-USHORT ScTable::GetColWidth( SCCOL nCol ) const
+sal_uInt16 ScTable::GetColWidth( SCCOL nCol ) const
 {
     DBG_ASSERT(VALIDCOL(nCol),"Falsche Spaltennummer");
 
@@ -2321,22 +2341,22 @@ USHORT ScTable::GetColWidth( SCCOL nCol ) const
             return pColWidth[nCol];
     }
     else
-        return (USHORT) STD_COL_WIDTH;
+        return (sal_uInt16) STD_COL_WIDTH;
 }
 
 
-USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const		// immer die eingestellte
+sal_uInt16 ScTable::GetOriginalWidth( SCCOL nCol ) const		// immer die eingestellte
 {
     DBG_ASSERT(VALIDCOL(nCol),"Falsche Spaltennummer");
 
     if (VALIDCOL(nCol) && pColWidth)
         return pColWidth[nCol];
     else
-        return (USHORT) STD_COL_WIDTH;
+        return (sal_uInt16) STD_COL_WIDTH;
 }
 
 
-USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
+sal_uInt16 ScTable::GetCommonWidth( SCCOL nEndCol )
 {
     //	get the width that is used in the largest continuous column range (up to nEndCol)
 
@@ -2346,8 +2366,8 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
         nEndCol = MAXCOL;
     }
 
-    USHORT nMaxWidth = 0;
-    USHORT nMaxCount = 0;
+    sal_uInt16 nMaxWidth = 0;
+    sal_uInt16 nMaxCount = 0;
     SCCOL nRangeStart = 0;
     while ( nRangeStart <= nEndCol )
     {
@@ -2356,8 +2376,8 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
             ++nRangeStart;
         if ( nRangeStart <= nEndCol )
         {
-            USHORT nThisCount = 0;
-            USHORT nThisWidth = pColWidth[nRangeStart];
+            sal_uInt16 nThisCount = 0;
+            sal_uInt16 nThisWidth = pColWidth[nRangeStart];
             SCCOL nRangeEnd = nRangeStart;
             while ( nRangeEnd <= nEndCol && pColWidth[nRangeEnd] == nThisWidth )
             {
@@ -2383,7 +2403,7 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
 }
 
 
-USHORT ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const
+sal_uInt16 ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const
 {
     DBG_ASSERT(VALIDROW(nRow),"Invalid row number");
 
@@ -2421,18 +2441,18 @@ USHORT ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool
             *pStartRow = nRow;
         if (pEndRow)
             *pEndRow = nRow;
-        return (USHORT) ScGlobal::nStdRowHeight;
+        return (sal_uInt16) ScGlobal::nStdRowHeight;
     }
 }
 
 
-ULONG ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const
+sal_uLong ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const
 {
     DBG_ASSERT(VALIDROW(nStartRow) && VALIDROW(nEndRow),"Falsche Zeilennummer");
 
     if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && mpRowHeights)
     {
-        ULONG nHeight = 0;
+        sal_uLong nHeight = 0;
         SCROW nRow = nStartRow;
         while (nRow <= nEndRow)
         {
@@ -2448,17 +2468,17 @@ ULONG ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const
         return nHeight;
     }
     else
-        return (ULONG) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight);
+        return (sal_uLong) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight);
 }
 
 
-ULONG ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const
+sal_uLong ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const
 {
     DBG_ASSERT(VALIDROW(nStartRow) && VALIDROW(nEndRow),"Falsche Zeilennummer");
 
     if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && mpRowHeights)
     {
-        ULONG nHeight = 0;
+        sal_uLong nHeight = 0;
         SCROW nRow = nStartRow;
         while (nRow <= nEndRow)
         {
@@ -2468,25 +2488,25 @@ ULONG ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale
                 if (nLastRow > nEndRow)
                     nLastRow = nEndRow;
                 sal_uInt32 nThisHeight = mpRowHeights->getSumValue(nRow, nLastRow);
-                nHeight += static_cast<ULONG>(nThisHeight * fScale);
+                nHeight += static_cast<sal_uLong>(nThisHeight * fScale);
             }
             nRow = nLastRow + 1;
         }
         return nHeight;
     }
     else
-        return (ULONG) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight * fScale);
+        return (sal_uLong) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight * fScale);
 }
 
 
-USHORT ScTable::GetOriginalHeight( SCROW nRow ) const		// non-0 even if hidden
+sal_uInt16 ScTable::GetOriginalHeight( SCROW nRow ) const		// non-0 even if hidden
 {
     DBG_ASSERT(VALIDROW(nRow),"wrong row number");
 
     if (VALIDROW(nRow) && mpRowHeights)
         return mpRowHeights->getValue(nRow);
     else
-        return (USHORT) ScGlobal::nStdRowHeight;
+        return (sal_uInt16) ScGlobal::nStdRowHeight;
 }
 
 
@@ -2625,10 +2645,10 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow)
 }
 
 
-void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
+void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bSetFlags)
 {
+    // #i116164# IncRecalcLevel/DecRecalcLevel is in ScTable::Query
     SCROW nStartRow = nRow1;
-    IncRecalcLevel();
     InitializeNoteCaptions();
     while (nStartRow <= nRow2)
     {
@@ -2637,8 +2657,8 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
         if (nEndRow > nRow2)
             nEndRow = nRow2;
 
-        BOOL bChanged = ( bWasVis != bShow );
-        if ( bChanged )
+        sal_Bool bChanged = ( bWasVis != bShow );
+        if ( bChanged && bSetFlags )
         {
             ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
             if (pDrawLayer)
@@ -2651,8 +2671,13 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
             }
         }
 
-        SetRowHidden(nStartRow, nEndRow, !bShow);
-        SetRowFiltered(nStartRow, nEndRow, !bShow);
+        // #i116164# Directly modify the flags only if there are drawing objects within the area.
+        // Otherwise, all modifications are made together in ScTable::Query, so the tree isn't constantly rebuilt.
+        if ( bSetFlags )
+        {
+            SetRowHidden(nStartRow, nEndRow, !bShow);
+            SetRowFiltered(nStartRow, nEndRow, !bShow);
+        }
 
         if ( bChanged )
         {
@@ -2669,8 +2694,6 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
     //	to be done here.
     if (pOutlineTable)
         UpdateOutlineRow( nRow1, nRow2, bShow );
-
-    DecRecalcLevel();
 }
 
 
@@ -2679,6 +2702,14 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
     SCROW nStartRow = nRow1;
     IncRecalcLevel();
     InitializeNoteCaptions();
+
+    // #i116164# if there are no drawing objects within the row range, a single HeightChanged call is enough
+    ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
+    bool bHasObjects = pDrawLayer && pDrawLayer->HasObjectsInRows( nTab, nRow1, nRow2, false );
+    long nOldHeight = 0;
+    if ( pDrawLayer && !bHasObjects )
+        nOldHeight = static_cast<long>(GetRowHeight(nRow1, nRow2));
+
     while (nStartRow <= nRow2)
     {
         SCROW nEndRow = -1;
@@ -2686,10 +2717,9 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
         if (nEndRow > nRow2)
             nEndRow = nRow2;
 
-        BOOL bChanged = ( bWasVis != bShow );
-        if ( bChanged )
+        sal_Bool bChanged = ( bWasVis != bShow );
+        if ( bChanged && bHasObjects )
         {
-            ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
             if (pDrawLayer)
             {
                 long nHeight = static_cast<long>(mpRowHeights->getSumValue(nStartRow, nEndRow));
@@ -2700,9 +2730,14 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
             }
         }
 
-        SetRowHidden(nStartRow, nEndRow, !bShow);
-        if (bShow)
-            SetRowFiltered(nStartRow, nEndRow, false);
+        // #i116164# Directly modify the flags only if there are drawing objects within the area.
+        // Otherwise, all rows are modified together after the loop, so the tree isn't constantly rebuilt.
+        if ( bHasObjects )
+        {
+            SetRowHidden(nStartRow, nEndRow, !bShow);
+            if (bShow)
+                SetRowFiltered(nStartRow, nEndRow, false);
+        }
 
         if ( bChanged )
         {
@@ -2715,11 +2750,30 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
 
         nStartRow = nEndRow + 1;
     }
+
+    if ( !bHasObjects )
+    {
+        // #i116164# set the flags for the whole range at once
+        SetRowHidden(nRow1, nRow2, !bShow);
+        if (bShow)
+            SetRowFiltered(nRow1, nRow2, false);
+
+        if ( pDrawLayer )
+        {
+            // if there are no objects in the range, a single HeightChanged call is enough
+            long nNewHeight = 0;
+            if ( bShow )
+                nNewHeight = static_cast<long>(GetRowHeight(nRow1, nRow2));
+            if ( nNewHeight != nOldHeight )
+                pDrawLayer->HeightChanged( nTab, nRow1, nNewHeight - nOldHeight );
+        }
+    }
+
     DecRecalcLevel();
 }
 
 
-void ScTable::SetColFlags( SCCOL nCol, BYTE nNewFlags )
+void ScTable::SetColFlags( SCCOL nCol, sal_uInt8 nNewFlags )
 {
     if (VALIDCOL(nCol) && pColFlags)
         pColFlags[nCol] = nNewFlags;
@@ -2730,7 +2784,7 @@ void ScTable::SetColFlags( SCCOL nCol, BYTE nNewFlags )
 }
 
 
-void ScTable::SetRowFlags( SCROW nRow, BYTE nNewFlags )
+void ScTable::SetRowFlags( SCROW nRow, sal_uInt8 nNewFlags )
 {
     if (VALIDROW(nRow) && pRowFlags)
         pRowFlags->SetValue( nRow, nNewFlags);
@@ -2741,7 +2795,7 @@ void ScTable::SetRowFlags( SCROW nRow, BYTE nNewFlags )
 }
 
 
-void ScTable::SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags )
+void ScTable::SetRowFlags( SCROW nStartRow, SCROW nEndRow, sal_uInt8 nNewFlags )
 {
     if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowFlags)
         pRowFlags->SetValue( nStartRow, nEndRow, nNewFlags);
@@ -2752,7 +2806,7 @@ void ScTable::SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags )
 }
 
 
-BYTE ScTable::GetColFlags( SCCOL nCol ) const
+sal_uInt8 ScTable::GetColFlags( SCCOL nCol ) const
 {
     if (VALIDCOL(nCol) && pColFlags)
         return pColFlags[nCol];
@@ -2761,7 +2815,7 @@ BYTE ScTable::GetColFlags( SCCOL nCol ) const
 }
 
 
-BYTE ScTable::GetRowFlags( SCROW nRow ) const
+sal_uInt8 ScTable::GetRowFlags( SCROW nRow ) const
 {
     if (VALIDROW(nRow) && pRowFlags)
         return pRowFlags->GetValue(nRow);
@@ -2775,7 +2829,7 @@ SCROW ScTable::GetLastFlaggedRow() const
     SCROW nLastFound = 0;
     if (pRowFlags)
     {    
-        SCROW nRow = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) );
+        SCROW nRow = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<sal_uInt8>(CR_ALL) );
         if (ValidRow(nRow))
             nLastFound = nRow;
     }
@@ -2833,24 +2887,24 @@ SCROW ScTable::GetLastChangedRow() const
 }
 
 
-BOOL ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow )
+sal_Bool ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, sal_Bool bShow )
 {
     if (pOutlineTable && pColFlags)
     {
-        ScBitMaskCompressedArray< SCCOLROW, BYTE> aArray( MAXCOL, pColFlags, MAXCOLCOUNT);
+        ScBitMaskCompressedArray< SCCOLROW, sal_uInt8> aArray( MAXCOL, pColFlags, MAXCOLCOUNT);
         return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, *this, true );
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 
-BOOL ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow )
+sal_Bool ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, sal_Bool bShow )
 {
     if (pOutlineTable && pRowFlags)
         return pOutlineTable->GetRowArray()->ManualAction( nStartRow, nEndRow, bShow, *this, false );
     else
-        return FALSE;
+        return sal_False;
 }
 
 
@@ -2924,13 +2978,13 @@ short DiffSign( T a, T b )
 
 void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
 {
-    BOOL bSizeChanged = FALSE;
-    BOOL bMissed	  = FALSE;
+    sal_Bool bSizeChanged = sal_False;
+    sal_Bool bMissed	  = sal_False;
 
     SCCOL nCol;
     SCROW nRow;
     SCROW i;
-    BOOL bFound;
+    sal_Bool bFound;
     ScOutlineArray* pArray;
     ScBaseCell* pCell;
     ScRange aRef;
@@ -2943,9 +2997,9 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
                             // Zeilen
 
     SCROW	nCount = nEndRow-nStartRow+1;
-    BOOL*	pUsed = new BOOL[nCount];
+    sal_Bool*	pUsed = new sal_Bool[nCount];
     for (i=0; i<nCount; i++)
-        pUsed[i] = FALSE;
+        pUsed[i] = sal_False;
     for (nCol=nStartCol; nCol<=nEndCol; nCol++)
         if (!aCol[nCol].IsEmptyData())
             aCol[nCol].FindUsed( nStartRow, nEndRow, pUsed );
@@ -2954,7 +3008,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
     for (nRow=nStartRow; nRow<=nEndRow; nRow++)
         if (pUsed[nRow-nStartRow])
         {
-            bFound = FALSE;
+            bFound = sal_False;
             for (nCol=nStartCol; nCol<=nEndCol && !bFound; nCol++)
                 if (!aCol[nCol].IsEmptyData())
                 {
@@ -2970,10 +3024,10 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
                                     if (pArray->Insert( aRef.aStart.Row(), aRef.aEnd.Row(), bSizeChanged ))
                                     {
 //										ApplyPatternArea( nStartCol, nRow, nEndCol, nRow, aBoldPattern );
-                                        bFound = TRUE;
+                                        bFound = sal_True;
                                     }
                                     else
-                                        bMissed = TRUE;
+                                        bMissed = sal_True;
                                 }
                 }
         }
@@ -2987,7 +3041,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
     {
         if (!aCol[nCol].IsEmptyData())
         {
-            bFound = FALSE;
+            bFound = sal_False;
             ScColumnIterator aIter( &aCol[nCol], nStartRow, nEndRow );
             while ( aIter.Next( nRow, pCell ) && !bFound )
             {
@@ -3001,10 +3055,10 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
                             if (pArray->Insert( aRef.aStart.Col(), aRef.aEnd.Col(), bSizeChanged ))
                             {
 //								ApplyPatternArea( nCol, nStartRow, nCol, nEndRow, aBoldPattern );
-                                bFound = TRUE;
+                                bFound = sal_True;
                             }
                             else
-                                bMissed = TRUE;
+                                bMissed = sal_True;
                         }
             }
         }
@@ -3021,7 +3075,7 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n
     ScAddress aSrc( nStartCol, nStartRow, nTab );
     ScAddress aDest( nDestCol, nDestRow, nDestTab );
     ScRange aRange( aSrc, aDest );
-    BOOL bThisTab = ( nDestTab == nTab );
+    sal_Bool bThisTab = ( nDestTab == nTab );
     SCROW nDestY = nDestRow;
     for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
     {
@@ -3048,12 +3102,12 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n
             if (bThisTab)
             {
                 PutCell( nDestX, nDestY, pCell );
-                SetPattern( nDestX, nDestY, *GetPattern( nCol, nRow ), TRUE );
+                SetPattern( nDestX, nDestY, *GetPattern( nCol, nRow ), sal_True );
             }
             else
             {
                 pDocument->PutCell( aDest, pCell );
-                pDocument->SetPattern( aDest, *GetPattern( nCol, nRow ), TRUE );
+                pDocument->SetPattern( aDest, *GetPattern( nCol, nRow ), sal_True );
             }
 
             ++nDestX;
@@ -3063,7 +3117,7 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n
 }
 
 
-BOOL ScTable::RefVisible(ScFormulaCell* pCell)
+sal_Bool ScTable::RefVisible(ScFormulaCell* pCell)
 {
     ScRange aRef;
 
@@ -3077,12 +3131,12 @@ BOOL ScTable::RefVisible(ScFormulaCell* pCell)
                 nEndRow = ::std::numeric_limits<SCROW>::max();
 
             if (!ValidRow(nEndRow) || nEndRow < aRef.aEnd.Row())
-                return TRUE;    // at least partly visible
-            return FALSE;       // completely invisible
+                return sal_True;    // at least partly visible
+            return sal_False;       // completely invisible
         }
     }
 
-    return TRUE;						// irgendwie anders
+    return sal_True;						// irgendwie anders
 }
 
 
@@ -3119,13 +3173,13 @@ void ScTable::SetDrawPageSize(bool bResetStreamValid, bool bUpdateNoteCaptionPos
     // #i102616# actions that modify the draw page size count as sheet modification
     // (exception: InitDrawLayer)
     if (bResetStreamValid && IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 
-ULONG ScTable::GetRowOffset( SCROW nRow ) const
+sal_uLong ScTable::GetRowOffset( SCROW nRow ) const
 {
-    ULONG n = 0;
+    sal_uLong n = 0;
     if ( mpHiddenRows && mpRowHeights )
     {
         if (nRow == 0)
@@ -3146,7 +3200,7 @@ ULONG ScTable::GetRowOffset( SCROW nRow ) const
     return n;
 }
 
-SCROW ScTable::GetRowForHeight(ULONG nHeight) const
+SCROW ScTable::GetRowForHeight(sal_uLong nHeight) const
 {
     sal_uInt32 nSum = 0;
 
@@ -3173,9 +3227,9 @@ SCROW ScTable::GetRowForHeight(ULONG nHeight) const
 }
 
 
-ULONG ScTable::GetColOffset( SCCOL nCol ) const
+sal_uLong ScTable::GetColOffset( SCCOL nCol ) const
 {
-    ULONG n = 0;
+    sal_uLong n = 0;
     if ( pColWidth )
     {
         SCCOL i;
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index d3f025ba6..8af7cc998 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -59,12 +59,14 @@
 #include "cellform.hxx"
 #include "postit.hxx"
 #include "queryparam.hxx"
+#include "segmenttree.hxx"
+#include "drwlayer.hxx"
 
 #include <vector>
 
 // STATIC DATA -----------------------------------------------------------
 
-const USHORT nMaxSorts = 3;		// maximale Anzahl Sortierkriterien in aSortParam
+const sal_uInt16 nMaxSorts = 3;		// maximale Anzahl Sortierkriterien in aSortParam
 
 struct ScSortInfo
 {
@@ -72,7 +74,7 @@ struct ScSortInfo
     SCCOLROW		nOrg;
     DECL_FIXEDMEMPOOL_NEWDEL( ScSortInfo );
 };
-const USHORT nMemPoolSortInfo = (0x8000 - 64) / sizeof(ScSortInfo);
+const sal_uInt16 nMemPoolSortInfo = (0x8000 - 64) / sizeof(ScSortInfo);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo, nMemPoolSortInfo, nMemPoolSortInfo )
 
 // END OF STATIC DATA -----------------------------------------------------
@@ -84,14 +86,14 @@ private:
     ScSortInfo**	pppInfo[nMaxSorts];
     SCSIZE			nCount;
     SCCOLROW		nStart;
-    USHORT			nUsedSorts;
+    sal_uInt16			nUsedSorts;
 
 public:
-                ScSortInfoArray( USHORT nSorts, SCCOLROW nInd1, SCCOLROW nInd2 ) :
+                ScSortInfoArray( sal_uInt16 nSorts, SCCOLROW nInd1, SCCOLROW nInd2 ) :
                         nCount( nInd2 - nInd1 + 1 ), nStart( nInd1 ),
                         nUsedSorts( Min( nSorts, nMaxSorts ) )
                     {
-                        for ( USHORT nSort = 0; nSort < nUsedSorts; nSort++ )
+                        for ( sal_uInt16 nSort = 0; nSort < nUsedSorts; nSort++ )
                         {
                             ScSortInfo** ppInfo = new ScSortInfo* [nCount];
                             for ( SCSIZE j = 0; j < nCount; j++ )
@@ -101,7 +103,7 @@ public:
                     }
                 ~ScSortInfoArray()
                     {
-                        for ( USHORT nSort = 0; nSort < nUsedSorts; nSort++ )
+                        for ( sal_uInt16 nSort = 0; nSort < nUsedSorts; nSort++ )
                         {
                             ScSortInfo** ppInfo = pppInfo[nSort];
                             for ( SCSIZE j = 0; j < nCount; j++ )
@@ -109,13 +111,13 @@ public:
                             delete [] ppInfo;
                         }
                     }
-    ScSortInfo*	Get( USHORT nSort, SCCOLROW nInd )
+    ScSortInfo*	Get( sal_uInt16 nSort, SCCOLROW nInd )
                     { return (pppInfo[nSort])[ nInd - nStart ]; }
     void		Swap( SCCOLROW nInd1, SCCOLROW nInd2 )
                     {
                         SCSIZE n1 = static_cast<SCSIZE>(nInd1 - nStart);
                         SCSIZE n2 = static_cast<SCSIZE>(nInd2 - nStart);
-                        for ( USHORT nSort = 0; nSort < nUsedSorts; nSort++ )
+                        for ( sal_uInt16 nSort = 0; nSort < nUsedSorts; nSort++ )
                         {
                             ScSortInfo** ppInfo = pppInfo[nSort];
                             ScSortInfo* pTmp = ppInfo[n1];
@@ -123,7 +125,7 @@ public:
                             ppInfo[n2] = pTmp;
                         }
                     }
-    USHORT		GetUsedSorts() { return nUsedSorts; }
+    sal_uInt16		GetUsedSorts() { return nUsedSorts; }
     ScSortInfo**	GetFirstArray() { return pppInfo[0]; }
     SCCOLROW	GetStart() { return nStart; }
     SCSIZE		GetCount() { return nCount; }
@@ -131,13 +133,13 @@ public:
 
 ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 )
 {
-    USHORT nUsedSorts = 1;
+    sal_uInt16 nUsedSorts = 1;
     while ( nUsedSorts < nMaxSorts && aSortParam.bDoSort[nUsedSorts] )
         nUsedSorts++;
     ScSortInfoArray* pArray = new ScSortInfoArray( nUsedSorts, nInd1, nInd2 );
     if ( aSortParam.bByRow )
     {
-        for ( USHORT nSort = 0; nSort < nUsedSorts; nSort++ )
+        for ( sal_uInt16 nSort = 0; nSort < nUsedSorts; nSort++ )
         {
             SCCOL nCol = static_cast<SCCOL>(aSortParam.nField[nSort]);
             ScColumn* pCol = &aCol[nCol];
@@ -152,7 +154,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 )
     }
     else
     {
-        for ( USHORT nSort = 0; nSort < nUsedSorts; nSort++ )
+        for ( sal_uInt16 nSort = 0; nSort < nUsedSorts; nSort++ )
         {
             SCROW nRow = aSortParam.nField[nSort];
             for ( SCCOL nCol = static_cast<SCCOL>(nInd1);
@@ -168,7 +170,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 )
 }
 
 
-BOOL ScTable::IsSortCollatorGlobal() const
+sal_Bool ScTable::IsSortCollatorGlobal() const
 {
     return	pSortCollator == ScGlobal::GetCollator() ||
             pSortCollator == ScGlobal::GetCaseCollator();
@@ -206,7 +208,7 @@ void ScTable::DestroySortCollator()
 
 void ScTable::SortReorder( ScSortInfoArray* pArray, ScProgress& rProgress )
 {
-    BOOL bByRow = aSortParam.bByRow;
+    sal_Bool bByRow = aSortParam.bByRow;
     SCSIZE nCount = pArray->GetCount();
     SCCOLROW nStart = pArray->GetStart();
     ScSortInfo** ppInfo = pArray->GetFirstArray();
@@ -237,7 +239,7 @@ void ScTable::SortReorder( ScSortInfoArray* pArray, ScProgress& rProgress )
     }
 }
 
-short ScTable::CompareCell( USHORT nSort,
+short ScTable::CompareCell( sal_uInt16 nSort,
             ScBaseCell* pCell1, SCCOL nCell1Col, SCROW nCell1Row,
             ScBaseCell* pCell2, SCCOL nCell2Col, SCROW nCell2Row )
 {
@@ -261,12 +263,12 @@ short ScTable::CompareCell( USHORT nSort,
     {
         if (pCell2)
         {
-            BOOL bStr1 = ( eType1 != CELLTYPE_VALUE );
+            sal_Bool bStr1 = ( eType1 != CELLTYPE_VALUE );
             if ( eType1 == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell1)->IsValue() )
-                bStr1 = FALSE;
-            BOOL bStr2 = ( eType2 != CELLTYPE_VALUE );
+                bStr1 = sal_False;
+            sal_Bool bStr2 = ( eType2 != CELLTYPE_VALUE );
             if ( eType2 == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell2)->IsValue() )
-                bStr2 = FALSE;
+                bStr2 = sal_False;
 
             if ( bStr1 && bStr2 )			// nur Strings untereinander als String vergleichen!
             {
@@ -280,7 +282,7 @@ short ScTable::CompareCell( USHORT nSort,
                     ((ScStringCell*)pCell2)->GetString(aStr2);
                 else
                     GetString(nCell2Col, nCell2Row, aStr2);
-                BOOL bUserDef = aSortParam.bUserDef;
+                sal_Bool bUserDef = aSortParam.bUserDef;
                 if (bUserDef)
                 {
                     ScUserListData* pData =
@@ -294,7 +296,7 @@ short ScTable::CompareCell( USHORT nSort,
                             nRes = sal::static_int_cast<short>( pData->ICompare(aStr1, aStr2) );
                     }
                     else
-                        bUserDef = FALSE;
+                        bUserDef = sal_False;
 
                 }
                 if (!bUserDef)
@@ -344,7 +346,7 @@ short ScTable::CompareCell( USHORT nSort,
 short ScTable::Compare( ScSortInfoArray* pArray, SCCOLROW nIndex1, SCCOLROW nIndex2 )
 {
     short nRes;
-    USHORT nSort = 0;
+    sal_uInt16 nSort = 0;
     do
     {
         ScSortInfo* pInfo1 = pArray->Get( nSort, nIndex1 );
@@ -423,8 +425,8 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
             const ScPatternAttr* pPat2 = GetPattern(nCol2, nRow);
             if (pPat1 != pPat2)
             {
-                SetPattern(nCol1, nRow, *pPat2, TRUE);
-                SetPattern(nCol2, nRow, *pPat1, TRUE);
+                SetPattern(nCol1, nRow, *pPat2, sal_True);
+                SetPattern(nCol2, nRow, *pPat1, sal_True);
             }
         }
     }
@@ -441,8 +443,8 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
             const ScPatternAttr* pPat2 = GetPattern(nCol, nRow2);
             if (pPat1 != pPat2)
             {
-                SetPattern(nCol, nRow1, *pPat2, TRUE);
-                SetPattern(nCol, nRow2, *pPat1, TRUE);
+                SetPattern(nCol, nRow1, *pPat2, sal_True);
+                SetPattern(nCol, nRow2, *pPat1, sal_True);
             }
         }
     }
@@ -463,7 +465,7 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
 short ScTable::Compare(SCCOLROW nIndex1, SCCOLROW nIndex2)
 {
     short nRes;
-    USHORT nSort = 0;
+    sal_uInt16 nSort = 0;
     if (aSortParam.bByRow)
     {
         do
@@ -488,14 +490,14 @@ short ScTable::Compare(SCCOLROW nIndex1, SCCOLROW nIndex2)
     return nRes;
 }
 
-BOOL ScTable::IsSorted( SCCOLROW nStart, SCCOLROW nEnd )    // ueber aSortParam
+sal_Bool ScTable::IsSorted( SCCOLROW nStart, SCCOLROW nEnd )    // ueber aSortParam
 {
     for (SCCOLROW i=nStart; i<nEnd; i++)
     {
         if (Compare( i, i+1 ) > 0)
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void ScTable::DecoladeRow( ScSortInfoArray* pArray, SCROW nRow1, SCROW nRow2 )
@@ -509,7 +511,7 @@ void ScTable::DecoladeRow( ScSortInfoArray* pArray, SCROW nRow1, SCROW nRow2 )
     }
 }
 
-void ScTable::Sort(const ScSortParam& rSortParam, BOOL bKeepQuery)
+void ScTable::Sort(const ScSortParam& rSortParam, sal_Bool bKeepQuery)
 {
     aSortParam = rSortParam;
     InitSortCollator( rSortParam );
@@ -564,7 +566,7 @@ void ScTable::Sort(const ScSortParam& rSortParam, BOOL bKeepQuery)
 //		Testen, ob beim Loeschen von Zwischenergebnissen andere Daten mit geloescht werden
 //		(fuer Hinweis-Box)
 
-BOOL ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
+sal_Bool ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
 {
     SCCOL nStartCol = rParam.nCol1;
     SCROW nStartRow = rParam.nRow1 + 1;		// Header
@@ -575,7 +577,7 @@ BOOL ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
     SCROW nRow;
     ScBaseCell* pCell;
 
-    BOOL bWillDelete = FALSE;
+    sal_Bool bWillDelete = sal_False;
     for ( nCol=nStartCol; nCol<=nEndCol && !bWillDelete; nCol++ )
     {
         ScColumnIterator aIter( &aCol[nCol],nStartRow,nEndRow );
@@ -587,7 +589,7 @@ BOOL ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
                     for (SCCOL nTestCol=0; nTestCol<=MAXCOL; nTestCol++)
                         if (nTestCol<nStartCol || nTestCol>nEndCol)
                             if (aCol[nTestCol].HasDataAt(nRow))
-                                bWillDelete = TRUE;
+                                bWillDelete = sal_True;
                 }
         }
     }
@@ -632,14 +634,14 @@ void ScTable::RemoveSubTotals( ScSubTotalParam& rParam )
 void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow )
 {
     const ScPatternAttr* pPattern = pTab->GetPattern( nCol, nRow );
-    if ( pPattern->GetItemSet().GetItemState( ATTR_VALUE_FORMAT, FALSE )
+    if ( pPattern->GetItemSet().GetItemState( ATTR_VALUE_FORMAT, sal_False )
             == SFX_ITEM_SET )
     {
         ScPatternAttr aNewPattern( *pPattern );
         SfxItemSet& rSet = aNewPattern.GetItemSet();
         rSet.ClearItem( ATTR_VALUE_FORMAT );
         rSet.ClearItem( ATTR_LANGUAGE_FORMAT );
-        pTab->SetPattern( nCol, nRow, aNewPattern, TRUE );
+        pTab->SetPattern( nCol, nRow, aNewPattern, sal_True );
     }
 }
 
@@ -647,7 +649,7 @@ void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow )
 // at least MSC needs this at linkage level to be able to use it in a template
 typedef struct lcl_ScTable_DoSubTotals_RowEntry
 {
-    USHORT  nGroupNo;
+    sal_uInt16  nGroupNo;
     SCROW   nSubStartRow;
     SCROW   nDestRow;
     SCROW   nFuncStart;
@@ -657,13 +659,13 @@ typedef struct lcl_ScTable_DoSubTotals_RowEntry
 //		neue Zwischenergebnisse
 //		rParam.nRow2 wird veraendert !
 
-BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
+sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
 {
     SCCOL nStartCol = rParam.nCol1;
     SCROW nStartRow = rParam.nRow1 + 1;		// Header
     SCCOL nEndCol   = rParam.nCol2;
     SCROW nEndRow	 = rParam.nRow2;			// wird veraendert
-    USHORT i;
+    sal_uInt16 i;
 
     //	Leerzeilen am Ende weglassen,
     //	damit alle Ueberlaeufe (MAXROW) bei InsertRow gefunden werden (#35180#)
@@ -671,16 +673,16 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
     SCSIZE nEmpty = GetEmptyLinesInBlock( nStartCol, nStartRow, nEndCol, nEndRow, DIR_BOTTOM );
     nEndRow -= nEmpty;
 
-    USHORT nLevelCount = 0;				// Anzahl Gruppierungen
-    BOOL bDoThis = TRUE;
+    sal_uInt16 nLevelCount = 0;				// Anzahl Gruppierungen
+    sal_Bool bDoThis = sal_True;
     for (i=0; i<MAXSUBTOTAL && bDoThis; i++)
         if (rParam.bGroupActive[i])
             nLevelCount = i+1;
         else
-            bDoThis = FALSE;
+            bDoThis = sal_False;
 
     if (nLevelCount==0)					// nichts tun
-        return TRUE;
+        return sal_True;
 
     SCCOL*			nGroupCol = rParam.nField;	// Spalten nach denen
                                                 // gruppiert wird
@@ -688,12 +690,12 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
     //	#44444# Durch (leer) als eigene Kategorie muss immer auf
     //	Teilergebniszeilen aus den anderen Spalten getestet werden
     //	(frueher nur, wenn eine Spalte mehrfach vorkam)
-    BOOL bTestPrevSub = ( nLevelCount > 1 );
+    sal_Bool bTestPrevSub = ( nLevelCount > 1 );
 
     String	aSubString;
     String	aOutString;
 
-    BOOL bIgnoreCase = !rParam.bCaseSens;
+    sal_Bool bIgnoreCase = !rParam.bCaseSens;
 
     String *pCompString[MAXSUBTOTAL];				// Pointer wegen Compiler-Problemen
     for (i=0; i<MAXSUBTOTAL; i++)
@@ -704,7 +706,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
     ScStyleSheet* pStyle = (ScStyleSheet*) pDocument->GetStyleSheetPool()->Find(
                                 ScGlobal::GetRscString(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA );
 
-    BOOL bSpaceLeft = TRUE;											// Erfolg beim Einfuegen?
+    sal_Bool bSpaceLeft = sal_True;											// Erfolg beim Einfuegen?
 
     // #90279# For performance reasons collect formula entries so their
     // references don't have to be tested for updates each time a new row is
@@ -712,9 +714,9 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
     RowEntry aRowEntry;
     ::std::vector< RowEntry > aRowVector;
 
-    for (USHORT nLevel=0; nLevel<=nLevelCount && bSpaceLeft; nLevel++)		// incl. Gesamtergebnis
+    for (sal_uInt16 nLevel=0; nLevel<=nLevelCount && bSpaceLeft; nLevel++)		// incl. Gesamtergebnis
     {
-        BOOL bTotal = ( nLevel == nLevelCount );
+        sal_Bool bTotal = ( nLevel == nLevelCount );
         aRowEntry.nGroupNo = bTotal ? 0 : (nLevelCount-nLevel-1);
 
         // how many results per level
@@ -733,16 +735,16 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
                     *pCompString[i] = aSubString;
             }													// aSubString bleibt auf dem letzten stehen
 
-            BOOL bBlockVis = FALSE;				// Gruppe eingeblendet?
+            sal_Bool bBlockVis = sal_False;				// Gruppe eingeblendet?
             aRowEntry.nSubStartRow = nStartRow;
             for (SCROW nRow=nStartRow; nRow<=nEndRow+1 && bSpaceLeft; nRow++)
             {
-                BOOL bChanged;
+                sal_Bool bChanged;
                 if (nRow>nEndRow)
-                    bChanged = TRUE;
+                    bChanged = sal_True;
                 else
                 {
-                    bChanged = FALSE;
+                    bChanged = sal_False;
                     if (!bTotal)
                     {
                         String aString;
@@ -765,7 +767,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
                             {
                                 if ( iEntry->nDestRow == nRow )
                                 {
-                                    bChanged = FALSE;
+                                    bChanged = sal_False;
                                     break;
                                 }
                             }
@@ -781,7 +783,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
                     bSpaceLeft = pDocument->InsertRow( 0, nTab, MAXCOL, nTab,
                             aRowEntry.nDestRow, 1 );
                     DBShowRow( aRowEntry.nDestRow, bBlockVis );
-                    bBlockVis = FALSE;
+                    bBlockVis = sal_False;
                     if ( rParam.bPagebreak && nRow < MAXROW &&
                             aRowEntry.nSubStartRow != nStartRow && nLevel == 0)
                         SetRowBreak(aRowEntry.nSubStartRow, false, true);
@@ -812,7 +814,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
                             if (!aOutString.Len())
                                 aOutString = ScGlobal::GetRscString( STR_EMPTYDATA );
                             aOutString += ' ';
-                            USHORT nStrId = STR_TABLE_ERGEBNIS;
+                            sal_uInt16 nStrId = STR_TABLE_ERGEBNIS;
                             if ( nResCount == 1 )
                                 switch ( eResFunc[0] )
                                 {
@@ -915,25 +917,25 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
 }
 
 
-BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
-        BOOL* pSpecial /* =NULL */ , ScBaseCell* pCell /* =NULL */ ,
-        BOOL* pbTestEqualCondition /* = NULL */ )
+sal_Bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
+        sal_Bool* pSpecial /* =NULL */ , ScBaseCell* pCell /* =NULL */ ,
+        sal_Bool* pbTestEqualCondition /* = NULL */ )
 {
     if (!rParam.GetEntry(0).bDoQuery)
-        return TRUE;
+        return sal_True;
 
     //---------------------------------------------------------------
 
     const SCSIZE nFixedBools = 32;
-    BOOL aBool[nFixedBools];
-    BOOL aTest[nFixedBools];
+    sal_Bool aBool[nFixedBools];
+    sal_Bool aTest[nFixedBools];
     SCSIZE nEntryCount = rParam.GetEntryCount();
-    BOOL* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new BOOL[nEntryCount] );
-    BOOL* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new BOOL[nEntryCount] );
+    sal_Bool* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new sal_Bool[nEntryCount] );
+    sal_Bool* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new sal_Bool[nEntryCount] );
 
     long	nPos = -1;
     SCSIZE	i	 = 0;
-    BOOL	bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell();
+    sal_Bool	bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell();
     CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() :
         ScGlobal::GetCollator());
     ::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ?
@@ -946,8 +948,8 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
         if ( !pCell || i > 0 )
             pCell = GetCell( static_cast<SCCOL>(rEntry.nField), nRow );
 
-        BOOL bOk = FALSE;
-        BOOL bTestEqual = FALSE;
+        sal_Bool bOk = sal_False;
+        sal_Bool bTestEqual = sal_False;
 
         if ( pSpecial && pSpecial[i] )
         {
@@ -1049,24 +1051,24 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
             if( rEntry.eOp == SC_CONTAINS || rEntry.eOp == SC_DOES_NOT_CONTAIN
                 || rEntry.eOp == SC_BEGINS_WITH || rEntry.eOp == SC_ENDS_WITH
                 || rEntry.eOp == SC_DOES_NOT_BEGIN_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH )
-                bMatchWholeCell = FALSE;
+                bMatchWholeCell = sal_False;
             if ( pCell )
             {
                 if (pCell->GetCellType() != CELLTYPE_NOTE)
                 {
-                    ULONG nFormat = GetNumberFormat( static_cast<SCCOL>(rEntry.nField), nRow );
+                    sal_uLong nFormat = GetNumberFormat( static_cast<SCCOL>(rEntry.nField), nRow );
                     ScCellFormat::GetInputString( pCell, nFormat, aCellStr, *(pDocument->GetFormatTable()) );
                 }
             }
             else
                 GetInputString( static_cast<SCCOL>(rEntry.nField), nRow, aCellStr );
 
-            BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
+            sal_Bool bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
                 || (rEntry.eOp == SC_NOT_EQUAL) || (rEntry.eOp == SC_CONTAINS) 
                 || (rEntry.eOp == SC_DOES_NOT_CONTAIN) || (rEntry.eOp == SC_BEGINS_WITH)
                 || (rEntry.eOp == SC_ENDS_WITH) || (rEntry.eOp == SC_DOES_NOT_BEGIN_WITH)
                 || (rEntry.eOp == SC_DOES_NOT_END_WITH)));
-            BOOL bTestRegExp = (pbTestEqualCondition && rParam.bRegExp
+            sal_Bool bTestRegExp = (pbTestEqualCondition && rParam.bRegExp
                 && ((rEntry.eOp == SC_LESS_EQUAL)
                     || (rEntry.eOp == SC_GREATER_EQUAL)));
             if ( bRealRegExp || bTestRegExp )
@@ -1075,22 +1077,22 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
                 xub_StrLen nEnd   = aCellStr.Len();
                 
                 // from 614 on, nEnd is behind the found text
-                BOOL bMatch = FALSE;
+                sal_Bool bMatch = sal_False;
                 if ( rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH )
                 {
                     nEnd = 0;
                     nStart = aCellStr.Len();
-                    bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens )
+                    bMatch = (sal_Bool) rEntry.GetSearchTextPtr( rParam.bCaseSens )
                         ->SearchBkwrd( aCellStr, &nStart, &nEnd );
                 } 
                 else
                 {
-                    bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens )
+                    bMatch = (sal_Bool) rEntry.GetSearchTextPtr( rParam.bCaseSens )
                         ->SearchFrwrd( aCellStr, &nStart, &nEnd );
                 }
                 if ( bMatch && bMatchWholeCell
                         && (nStart != 0 || nEnd != aCellStr.Len()) )
-                    bMatch = FALSE;    // RegExp must match entire cell string
+                    bMatch = sal_False;    // RegExp must match entire cell string
                 if ( bRealRegExp )
                     switch (rEntry.eOp)
                 {
@@ -1134,7 +1136,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
                         // #i18374# When used from functions (match, countif, sumif, vlookup, hlookup, lookup),
                         // the query value is assigned directly, and the string is empty. In that case,
                         // don't find any string (isEqual would find empty string results in formula cells).
-                        bOk = FALSE;
+                        bOk = sal_False;
                         if ( rEntry.eOp == SC_NOT_EQUAL )
                             bOk = !bOk;
                     }
@@ -1221,14 +1223,14 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
                     (pCell ? pCell->HasValueData() :
                      HasValueData( static_cast<SCCOL>(rEntry.nField), nRow)))
             {
-                bOk = TRUE;
+                bOk = sal_True;
             }
             else if (!rEntry.bQueryByString &&
                     (rEntry.eOp == SC_GREATER || rEntry.eOp == SC_GREATER_EQUAL) &&
                     (pCell ? pCell->HasStringData() :
                      HasStringData( static_cast<SCCOL>(rEntry.nField), nRow)))
             {
-                bOk = TRUE;
+                bOk = sal_True;
             }
         }
 
@@ -1261,7 +1263,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
         pTest[0] = pTest[0] || pTest[j];
     }
 
-    BOOL bRet = pPasst[0];
+    sal_Bool bRet = pPasst[0];
     if ( pPasst != &aBool[0] )
         delete [] pPasst;
     if ( pbTestEqualCondition )
@@ -1274,7 +1276,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
 
 void ScTable::TopTenQuery( ScQueryParam& rParam )
 {
-    BOOL bSortCollatorInitialized = FALSE;
+    sal_Bool bSortCollatorInitialized = sal_False;
     SCSIZE nEntryCount = rParam.GetEntryCount();
     SCROW nRow1 = (rParam.bHasHeader ? rParam.nRow1 + 1 : rParam.nRow1);
     SCSIZE nCount = static_cast<SCSIZE>(rParam.nRow2 - nRow1 + 1);
@@ -1292,7 +1294,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
                 aSortParam = aLocalSortParam;		// used in CreateSortInfoArray, Compare
                 if ( !bSortCollatorInitialized )
                 {
-                    bSortCollatorInitialized = TRUE;
+                    bSortCollatorInitialized = sal_True;
                     InitSortCollator( aLocalSortParam );
                 }
                 ScSortInfoArray* pArray = CreateSortInfoArray( nRow1, rParam.nRow2 );
@@ -1312,7 +1314,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
                 {
                     if ( rEntry.bQueryByString )
                     {	// dat wird nix
-                        rEntry.bQueryByString = FALSE;
+                        rEntry.bQueryByString = sal_False;
                         rEntry.nVal = 10;	// 10 bzw. 10%
                     }
                     SCSIZE nVal = (rEntry.nVal >= 1 ? static_cast<SCSIZE>(rEntry.nVal) : 1);
@@ -1378,7 +1380,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
                 else
                 {
                     rEntry.eOp = SC_GREATER_EQUAL;
-                    rEntry.bQueryByString = FALSE;
+                    rEntry.bQueryByString = sal_False;
                     rEntry.nVal = 0;
                 }
                 delete pArray;
@@ -1394,14 +1396,14 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
         DestroySortCollator();
 }
 
-static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rParam, BOOL* pSpecial )
+static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rParam, sal_Bool* pSpecial )
 {
     bool bTopTen = false;
     SCSIZE nEntryCount = rParam.GetEntryCount();
 
     for ( SCSIZE i = 0; i < nEntryCount; ++i )
     {
-        pSpecial[i] = FALSE;
+        pSpecial[i] = sal_False;
         ScQueryEntry& rEntry = rParam.GetEntry(i);
         if ( rEntry.bDoQuery )
         {
@@ -1433,7 +1435,7 @@ static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rPa
                 // #58736# call from UNO or second call from autofilter
                 if ( rEntry.nVal == SC_EMPTYFIELDS || rEntry.nVal == SC_NONEMPTYFIELDS )
                 {
-                    pSpecial[i] = TRUE;
+                    pSpecial[i] = sal_True;
                 }
             }
             if ( !bTopTen )
@@ -1462,14 +1464,14 @@ static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rPa
     }
 }
 
-SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
+SCSIZE ScTable::Query(ScQueryParam& rParamOrg, sal_Bool bKeepSub)
 {
     ScQueryParam    aParam( rParamOrg );
     ScStrCollection	aScStrCollection;
     StrData*		pStrData = NULL;
 
-    BOOL	bStarted = FALSE;
-    BOOL	bOldResult = TRUE;
+    sal_Bool	bStarted = sal_False;
+    sal_Bool	bOldResult = sal_True;
     SCROW	nOldStart = 0;
     SCROW	nOldEnd = 0;
 
@@ -1478,7 +1480,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
     SCROW nHeader   = aParam.bHasHeader ? 1 : 0;
 
     SCSIZE nEntryCount = aParam.GetEntryCount();
-    BOOL* pSpecial = new BOOL[nEntryCount];
+    sal_Bool* pSpecial = new sal_Bool[nEntryCount];
     lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
 
     if (!aParam.bInplace)
@@ -1489,10 +1491,18 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
                             aParam.nDestCol, aParam.nDestRow, aParam.nDestTab );
     }
 
+    if (aParam.bInplace)
+        IncRecalcLevel();       // #i116164# once for all entries
+
+    // #i116164# If there are no drawing objects within the area, call SetRowHidden/SetRowFiltered for all rows at the end
+    std::vector<ScShowRowsEntry> aEntries;
+    ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
+    bool bHasObjects = pDrawLayer && pDrawLayer->HasObjectsInRows( nTab, aParam.nRow1 + nHeader, aParam.nRow2, false );
+
     for (SCROW j=aParam.nRow1 + nHeader; j<=aParam.nRow2; j++)
     {
-        BOOL bResult;									// Filterergebnis
-        BOOL bValid = ValidQuery(j, aParam, pSpecial);
+        sal_Bool bResult;									// Filterergebnis
+        sal_Bool bValid = ValidQuery(j, aParam, pSpecial);
         if (!bValid && bKeepSub)						// Subtotals stehenlassen
         {
             for (SCCOL nCol=aParam.nCol1; nCol<=aParam.nCol2 && !bValid; nCol++)
@@ -1503,13 +1513,13 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
                     if ( pCell->GetCellType() == CELLTYPE_FORMULA )
                         if (((ScFormulaCell*)pCell)->IsSubTotal())
                             if (RefVisible((ScFormulaCell*)pCell))
-                                bValid = TRUE;
+                                bValid = sal_True;
             }
         }
         if (bValid)
         {
             if (aParam.bDuplicate)
-                bResult = TRUE;
+                bResult = sal_True;
             else
             {
                 String aStr;
@@ -1522,20 +1532,20 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
                 }
                 pStrData = new StrData(aStr);
 
-                BOOL bIsUnique = TRUE;
+                sal_Bool bIsUnique = sal_True;
                 if (pStrData)
                     bIsUnique = aScStrCollection.Insert(pStrData);
                 if (bIsUnique)
-                    bResult = TRUE;
+                    bResult = sal_True;
                 else
                 {
                     delete pStrData;
-                    bResult = FALSE;
+                    bResult = sal_False;
                 }
             }
         }
         else
-            bResult = FALSE;
+            bResult = sal_False;
 
         if (aParam.bInplace)
         {
@@ -1544,11 +1554,15 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
             else
             {
                 if (bStarted)
-                    DBShowRows(nOldStart,nOldEnd, bOldResult);
+                {
+                    DBShowRows(nOldStart,nOldEnd, bOldResult, bHasObjects);
+                    if (!bHasObjects)
+                        aEntries.push_back(ScShowRowsEntry(nOldStart, nOldEnd, bOldResult));
+                }
                 nOldStart = nOldEnd = j;
                 bOldResult = bResult;
             }
-            bStarted = TRUE;
+            bStarted = sal_True;
         }
         else
         {
@@ -1563,16 +1577,67 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
     }
 
     if (aParam.bInplace && bStarted)
-        DBShowRows(nOldStart,nOldEnd, bOldResult);
+    {
+        DBShowRows(nOldStart,nOldEnd, bOldResult, bHasObjects);
+        if (!bHasObjects)
+            aEntries.push_back(ScShowRowsEntry(nOldStart, nOldEnd, bOldResult));
+    }
+
+    // #i116164# execute the collected SetRowHidden/SetRowFiltered calls
+    if (!bHasObjects)
+    {
+        std::vector<ScShowRowsEntry>::const_iterator aEnd = aEntries.end();
+        std::vector<ScShowRowsEntry>::const_iterator aIter = aEntries.begin();
+        if ( aIter != aEnd )
+        {
+            // do only one HeightChanged call with the final difference in heights
+            long nOldHeight = 0;
+            if ( pDrawLayer )
+                nOldHeight = static_cast<long>(GetRowHeight(aParam.nRow1 + nHeader, aParam.nRow2));
+
+            // clear the range first instead of many changes in the middle of the filled array
+            SetRowHidden(aParam.nRow1 + nHeader, aParam.nRow2, false);
+            SetRowFiltered(aParam.nRow1 + nHeader, aParam.nRow2, false);
+
+            // insert from back, in case the filter range is large
+            mpHiddenRows->setInsertFromBack(true);
+            mpFilteredRows->setInsertFromBack(true);
+
+            while (aIter != aEnd)
+            {
+                if (!aIter->mbShow)
+                {
+                    SCROW nStartRow = aIter->mnRow1;
+                    SCROW nEndRow = aIter->mnRow2;
+                    SetRowHidden(nStartRow, nEndRow, true);
+                    SetRowFiltered(nStartRow, nEndRow, true);
+                }
+                ++aIter;
+            }
+
+            mpHiddenRows->setInsertFromBack(false);
+            mpFilteredRows->setInsertFromBack(false);
+
+            if ( pDrawLayer )
+            {
+                // if there are no objects in the filtered range, a single HeightChanged call is enough
+                long nNewHeight = static_cast<long>(GetRowHeight(aParam.nRow1 + nHeader, aParam.nRow2));
+                pDrawLayer->HeightChanged( nTab, aParam.nRow1 + nHeader, nNewHeight - nOldHeight );
+            }
+        }
+    }
+
+    if (aParam.bInplace)
+        DecRecalcLevel();
 
     delete[] pSpecial;
 
     return nCount;
 }
 
-BOOL ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
+sal_Bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
 {
-    BOOL	bValid = TRUE;
+    sal_Bool	bValid = sal_True;
     SCCOL* pFields = new SCCOL[nCol2-nCol1+1];
     String	aCellStr;
     SCCOL	nCol = nCol1;
@@ -1585,7 +1650,7 @@ BOOL ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
     {
         String aQueryStr;
         GetUpperCellString(nCol, nRow1, aQueryStr);
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         SCCOL i = rQueryParam.nCol1;
         while (!bFound && (i <= nDBCol2))
         {
@@ -1599,12 +1664,12 @@ BOOL ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
         if (bFound)
             pFields[nCol - nCol1] = i;
         else
-            bValid = FALSE;
+            bValid = sal_False;
         nCol++;
     }
     if (bValid)
     {
-        ULONG nVisible = 0;
+        sal_uLong nVisible = 0;
         for ( nCol=nCol1; nCol<=nCol2; nCol++ )
             nVisible += aCol[nCol].VisibleCount( nRow1+1, nRow2 );
 
@@ -1637,7 +1702,7 @@ BOOL ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
                             rQueryParam.GetEntry(nIndex).eConnect = SC_AND;
                     }
                     else
-                        bValid = FALSE;
+                        bValid = sal_False;
                 }
                 nCol++;
             }
@@ -1650,7 +1715,7 @@ BOOL ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
     return bValid;
 }
 
-BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
+sal_Bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
 {
     // A valid StarQuery must be at least 4 columns wide. To be precise it
     // should be exactly 4 columns ...
@@ -1661,10 +1726,10 @@ BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
     // range wasn't sufficiently specified data changes wouldn't flag formula
     // cells for recalculation.
     if (nCol2 - nCol1 < 3)
-        return FALSE;
+        return sal_False;
 
-    BOOL bValid;
-    BOOL bFound;
+    sal_Bool bValid;
+    sal_Bool bFound;
     String aCellStr;
     SCSIZE nIndex = 0;
     SCROW nRow = nRow1;
@@ -1680,7 +1745,7 @@ BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
     {
         ScQueryEntry& rEntry = rQueryParam.GetEntry(nIndex);
 
-        bValid = FALSE;
+        bValid = sal_False;
         // Erste Spalte UND/ODER
         if (nIndex > 0)
         {
@@ -1688,18 +1753,18 @@ BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
             if ( aCellStr == ScGlobal::GetRscString(STR_TABLE_UND) )
             {
                 rEntry.eConnect = SC_AND;
-                bValid = TRUE;
+                bValid = sal_True;
             }
             else if ( aCellStr == ScGlobal::GetRscString(STR_TABLE_ODER) )
             {
                 rEntry.eConnect = SC_OR;
-                bValid = TRUE;
+                bValid = sal_True;
             }
         }
         // Zweite Spalte FeldName
         if ((nIndex < 1) || bValid)
         {
-            bFound = FALSE;
+            bFound = sal_False;
             GetUpperCellString(nCol1 + 1, nRow, aCellStr);
             for (SCCOL i=rQueryParam.nCol1; (i <= nDBCol2) && (!bFound); i++)
             {
@@ -1712,16 +1777,16 @@ BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
                 if (bFound)
                 {
                     rEntry.nField = i;
-                    bValid = TRUE;
+                    bValid = sal_True;
                 }
                 else
-                    bValid = FALSE;
+                    bValid = sal_False;
             }
         }
         // Dritte Spalte Operator =<>...
         if (bValid)
         {
-            bFound = FALSE;
+            bFound = sal_False;
             GetUpperCellString(nCol1 + 2, nRow, aCellStr);
             if (aCellStr.GetChar(0) == '<')
             {
@@ -1747,7 +1812,7 @@ BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
         if (bValid)
         {
             GetString(nCol1 + 3, nRow, *rEntry.pStr);
-            rEntry.bDoQuery = TRUE;
+            rEntry.bDoQuery = sal_True;
         }
         nIndex++;
         nRow++;
@@ -1756,7 +1821,7 @@ BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
     return bValid;
 }
 
-BOOL ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
+sal_Bool ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
 {
     SCSIZE i, nCount;
     PutInOrder(nCol1, nCol2);
@@ -1767,7 +1832,7 @@ BOOL ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
         rQueryParam.GetEntry(i).Clear();
 
     // Standard QueryTabelle
-    BOOL bValid = CreateStarQuery(nCol1, nRow1, nCol2, nRow2, rQueryParam);
+    sal_Bool bValid = CreateStarQuery(nCol1, nRow1, nCol2, nRow2, rQueryParam);
     // Excel QueryTabelle
     if (!bValid)
         bValid = CreateExcelQuery(nCol1, nRow1, nCol2, nRow2, rQueryParam);
@@ -1777,7 +1842,7 @@ BOOL ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
     {
         //	bQueryByString muss gesetzt sein
         for (i=0; i < nCount; i++)
-            rQueryParam.GetEntry(i).bQueryByString = TRUE;
+            rQueryParam.GetEntry(i).bQueryByString = sal_True;
     }
     else
     {
@@ -1788,26 +1853,26 @@ BOOL ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
     return bValid;
 }
 
-BOOL ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW /* nEndRow */ )
+sal_Bool ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW /* nEndRow */ )
 {
     for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
     {
         CellType eType = GetCellType( nCol, nStartRow );
         if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT)
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndCol */, SCROW nEndRow )
+sal_Bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndCol */, SCROW nEndRow )
 {
     for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
     {
         CellType eType = GetCellType( nStartCol, nRow );
         if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT)
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void ScTable::GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates)
@@ -1832,7 +1897,7 @@ void ScTable::GetFilteredFilterEntries(
     }
     nEntryCount = aParam.GetEntryCount();
 
-    BOOL* pSpecial = new BOOL[nEntryCount];
+    sal_Bool* pSpecial = new sal_Bool[nEntryCount];
     lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
     bool bHasDates = false;
     for ( SCROW j = nRow1; j <= nRow2; ++j )
@@ -1849,7 +1914,7 @@ void ScTable::GetFilteredFilterEntries(
     delete[] pSpecial;
 }
 
-BOOL ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit)
+sal_Bool ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, sal_Bool bLimit)
 {
     return aCol[nCol].GetDataEntries( nRow, rStrings, bLimit );
 }
@@ -1859,9 +1924,9 @@ SCSIZE ScTable::GetCellCount(SCCOL nCol) const
     return aCol[nCol].GetCellCount();
 }
 
-ULONG ScTable::GetCellCount() const
+sal_uLong ScTable::GetCellCount() const
 {
-    ULONG nCellCount = 0;
+    sal_uLong nCellCount = 0;
 
     for ( SCCOL nCol=0; nCol<=MAXCOL; nCol++ )
         nCellCount += aCol[nCol].GetCellCount();
@@ -1869,9 +1934,9 @@ ULONG ScTable::GetCellCount() const
     return nCellCount;
 }
 
-ULONG ScTable::GetWeightedCount() const
+sal_uLong ScTable::GetWeightedCount() const
 {
-    ULONG nCellCount = 0;
+    sal_uLong nCellCount = 0;
 
     for ( SCCOL nCol=0; nCol<=MAXCOL; nCol++ )
         if ( aCol[nCol].GetCellCount() )					// GetCellCount ist inline
@@ -1880,9 +1945,9 @@ ULONG ScTable::GetWeightedCount() const
     return nCellCount;
 }
 
-ULONG ScTable::GetCodeCount() const
+sal_uLong ScTable::GetCodeCount() const
 {
-    ULONG nCodeCount = 0;
+    sal_uLong nCodeCount = 0;
 
     for ( SCCOL nCol=0; nCol<=MAXCOL; nCol++ )
         if ( aCol[nCol].GetCellCount() )					// GetCellCount ist inline
@@ -1915,7 +1980,7 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
 {
     //	Cursor neben einer Markierung nicht beruecksichtigen:
     //!	nur noch MarkData uebergeben, Cursorposition ggf. hineinselektieren!!!
-    BOOL bSingle = ( rMark.IsMarked() || !rMark.IsMultiMarked() );
+    sal_Bool bSingle = ( rMark.IsMarked() || !rMark.IsMultiMarked() );
 
     // Mehrfachselektion:
 
@@ -1935,7 +2000,7 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
                 aCol[nCol].UpdateAreaFunction( rData, *mpHiddenRows, nStartRow, nEndRow );
 }
 
-void ScTable::FindConditionalFormat( ULONG nKey, ScRangeList& rList )
+void ScTable::FindConditionalFormat( sal_uLong nKey, ScRangeList& rList )
 {
     SCROW nStartRow = 0, nEndRow = 0;
     for (SCCOL nCol=0; nCol<=MAXCOL; nCol++)
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index cbb4f0181..2cc609f11 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -85,11 +85,11 @@
 
 #define _D_MAX_LONG_  (double) 0x7fffffff
 
-extern USHORT nScFillModeMouseModifier;		// global.cxx
+extern sal_uInt16 nScFillModeMouseModifier;		// global.cxx
 
 // -----------------------------------------------------------------------
 
-short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits = NULL )
+short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* pMinDigits = NULL )
 {
     if ( !aValue.Len() )
     {
@@ -144,7 +144,7 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits
     return 0;
 }
 
-String lcl_ValueString( sal_Int32 nValue, USHORT nMinDigits )
+String lcl_ValueString( sal_Int32 nValue, sal_uInt16 nMinDigits )
 {
     if ( nMinDigits <= 1 )
         return String::CreateFromInt32( nValue );			// simple case...
@@ -165,8 +165,8 @@ String lcl_ValueString( sal_Int32 nValue, USHORT nMinDigits )
 }
 
 static ScBaseCell * lcl_getSuffixCell( ScDocument* pDocument, sal_Int32 nValue,
-        USHORT nDigits, const String& rSuffix, CellType eCellType,
-        BOOL bIsOrdinalSuffix )
+        sal_uInt16 nDigits, const String& rSuffix, CellType eCellType,
+        sal_Bool bIsOrdinalSuffix )
 {
     String aValue( lcl_ValueString( nValue, nDigits ));
     if (!bIsOrdinalSuffix)
@@ -189,8 +189,8 @@ static ScBaseCell * lcl_getSuffixCell( ScDocument* pDocument, sal_Int32 nValue,
 
 void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                             FillCmd& rCmd, FillDateCmd& rDateCmd,
-                            double& rInc, USHORT& rMinDigits,
-                            ScUserListData*& rListData, USHORT& rListIndex)
+                            double& rInc, sal_uInt16& rMinDigits,
+                            ScUserListData*& rListData, sal_uInt16& rListIndex)
 {
     DBG_ASSERT( nCol1==nCol2 || nRow1==nRow2, "FillAnalyse: falscher Bereich" );
 
@@ -225,8 +225,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
     if (eCellType == CELLTYPE_VALUE)
     {
-        UINT32 nFormat = ((const SfxUInt32Item*)GetAttr(nCol,nRow,ATTR_VALUE_FORMAT))->GetValue();
-        BOOL bDate = ( pDocument->GetFormatTable()->GetType(nFormat) == NUMBERFORMAT_DATE );
+        sal_uInt32 nFormat = ((const SfxUInt32Item*)GetAttr(nCol,nRow,ATTR_VALUE_FORMAT))->GetValue();
+        sal_Bool bDate = ( pDocument->GetFormatTable()->GetType(nFormat) == NUMBERFORMAT_DATE );
         if (bDate)
         {
             if (nCount > 1)
@@ -259,8 +259,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
                     nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
                     nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
-                    BOOL bVal = TRUE;
-                    for (USHORT i=1; i<nCount && bVal; i++)
+                    sal_Bool bVal = sal_True;
+                    for (sal_uInt16 i=1; i<nCount && bVal; i++)
                     {
                         ScBaseCell* pCell = GetCell(nCol,nRow);
                         if (pCell && pCell->GetCellType() == CELLTYPE_VALUE)
@@ -270,7 +270,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                             if ( eType == FILL_DAY )
                             {
                                 if ( aDate2-aDate1 != nCmpInc )
-                                    bVal = FALSE;
+                                    bVal = sal_False;
                             }
                             else
                             {
@@ -278,14 +278,14 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 nMDiff = aDate2.GetMonth() - (long) aDate1.GetMonth();
                                 nYDiff = aDate2.GetYear()  - (long) aDate1.GetYear();
                                 if (nDDiff || ( nMDiff + 12 * nYDiff != nCmpInc ))
-                                    bVal = FALSE;
+                                    bVal = sal_False;
                             }
                             aDate1 = aDate2;
                             nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
                             nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
                         }
                         else
-                            bVal = FALSE;	// #50965# kein Datum passt auch nicht
+                            bVal = sal_False;	// #50965# kein Datum passt auch nicht
                     }
                     if (bVal)
                     {
@@ -316,8 +316,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 rInc = nVal2 - nVal1;
                 nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
                 nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
-                BOOL bVal = TRUE;
-                for (USHORT i=1; i<nCount && bVal; i++)
+                sal_Bool bVal = sal_True;
+                for (sal_uInt16 i=1; i<nCount && bVal; i++)
                 {
                     ScBaseCell* pCell = GetCell(nCol,nRow);
                     if (pCell && pCell->GetCellType() == CELLTYPE_VALUE)
@@ -325,11 +325,11 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                         nVal2 = ((ScValueCell*)pCell)->GetValue();
                         double nDiff = nVal2 - nVal1;
                         if ( !::rtl::math::approxEqual( nDiff, rInc ) )
-                            bVal = FALSE;
+                            bVal = sal_False;
                         nVal1 = nVal2;
                     }
                     else
-                        bVal = FALSE;
+                        bVal = sal_False;
                     nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
                     nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
                 }
@@ -348,7 +348,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             rListData->GetSubIndex(aStr, rListIndex);
             nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
             nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
-            for (USHORT i=1; i<nCount && rListData; i++)
+            for (sal_uInt16 i=1; i<nCount && rListData; i++)
             {
                 GetString(nCol, nRow, aStr);
                 if (!rListData->GetSubIndex(aStr, rListIndex))
@@ -374,8 +374,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     rInc = (double)nVal2 - (double)nVal1;
                     nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
                     nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
-                    BOOL bVal = TRUE;
-                    for (USHORT i=1; i<nCount && bVal; i++)
+                    sal_Bool bVal = sal_True;
+                    for (sal_uInt16 i=1; i<nCount && bVal; i++)
                     {
                         ScBaseCell* pCell = GetCell(nCol,nRow);
                         CellType eType = pCell ? pCell->GetCellType() : CELLTYPE_NONE;
@@ -390,14 +390,14 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                             {
                                 double nDiff = (double)nVal2 - (double)nVal1;
                                 if ( !::rtl::math::approxEqual( nDiff, rInc ) )
-                                    bVal = FALSE;
+                                    bVal = sal_False;
                                 nVal1 = nVal2;
                             }
                             else
-                                bVal = FALSE;
+                                bVal = sal_False;
                         }
                         else
-                            bVal = FALSE;
+                            bVal = sal_False;
                         nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
                         nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
                     }
@@ -415,10 +415,10 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
     }
 }
 
-void ScTable::FillFormula(ULONG& /* nFormulaCounter */, BOOL /* bFirst */, ScFormulaCell* pSrcCell,
-                          SCCOL nDestCol, SCROW nDestRow, BOOL bLast )
+void ScTable::FillFormula(sal_uLong& /* nFormulaCounter */, sal_Bool /* bFirst */, ScFormulaCell* pSrcCell,
+                          SCCOL nDestCol, SCROW nDestRow, sal_Bool bLast )
 {
-/*	USHORT nTokArrLen = pSrcCell->GetTokenArrayLen();
+/*	sal_uInt16 nTokArrLen = pSrcCell->GetTokenArrayLen();
     if ( nTokArrLen > 15 )							// mehr als =A1 oder =67
     {
         ScRangeName* pRangeName = pDocument->GetRangeName();
@@ -437,9 +437,9 @@ void ScTable::FillFormula(ULONG& /* nFormulaCounter */, BOOL /* bFirst */, ScFor
             if (!pRangeName->Insert( pAktRange ))
                 delete pAktRange;
             else
-                bSharedNameInserted = TRUE;
+                bSharedNameInserted = sal_True;
         }
-        USHORT nIndex;
+        sal_uInt16 nIndex;
         pRangeName->SearchName(aName, nIndex);
         if (!pRangeName)
         {
@@ -456,7 +456,7 @@ void ScTable::FillFormula(ULONG& /* nFormulaCounter */, BOOL /* bFirst */, ScFor
     }
     else
 */	{
-        pDocument->SetNoListening( TRUE );	// noch falsche Referenzen
+        pDocument->SetNoListening( sal_True );	// noch falsche Referenzen
         ScAddress aAddr( nDestCol, nDestRow, nTab );
         ScFormulaCell* pDestCell = new ScFormulaCell( *pSrcCell, *pDocument, aAddr );
         aCol[nDestCol].Insert(nDestRow, pDestCell);
@@ -497,13 +497,13 @@ void ScTable::FillFormula(ULONG& /* nFormulaCounter */, BOOL /* bFirst */, ScFor
                 DBG_ERRORFILE( "FillFormula: kein MatrixOrigin" );
             }
         }
-        pDocument->SetNoListening( FALSE );
+        pDocument->SetNoListening( sal_False );
         pDestCell->StartListeningTo( pDocument );
     }
 }
 
 void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                        ULONG nFillCount, FillDir eFillDir, ScProgress& rProgress )
+                        sal_uLong nFillCount, FillDir eFillDir, ScProgress& rProgress )
 {
     if ( (nFillCount == 0) || !ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2) )
         return;
@@ -512,19 +512,19 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
     //	Richtung auswerten
     //
 
-    BOOL bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
-    BOOL bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT);
+    sal_Bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
+    sal_Bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT);
 
-    ULONG nCol = 0;
-    ULONG nRow = 0;
-    ULONG& rInner = bVertical ? nRow : nCol;		// Schleifenvariablen
-    ULONG& rOuter = bVertical ? nCol : nRow;
-    ULONG nOStart;
-    ULONG nOEnd;
-    ULONG nIStart;
-    ULONG nIEnd;
-    ULONG nISrcStart;
-    ULONG nISrcEnd;
+    sal_uLong nCol = 0;
+    sal_uLong nRow = 0;
+    sal_uLong& rInner = bVertical ? nRow : nCol;		// Schleifenvariablen
+    sal_uLong& rOuter = bVertical ? nCol : nRow;
+    sal_uLong nOStart;
+    sal_uLong nOEnd;
+    sal_uLong nIStart;
+    sal_uLong nIEnd;
+    sal_uLong nISrcStart;
+    sal_uLong nISrcEnd;
 
     if (bVertical)
     {
@@ -564,32 +564,32 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             nIEnd = nCol1 - nFillCount;
         }
     }
-    ULONG nIMin = nIStart;
-    ULONG nIMax = nIEnd;
+    sal_uLong nIMin = nIStart;
+    sal_uLong nIMax = nIEnd;
     PutInOrder(nIMin,nIMax);
     if (bVertical)
         DeleteArea(nCol1, static_cast<SCROW>(nIMin), nCol2, static_cast<SCROW>(nIMax), IDF_AUTOFILL);
     else
         DeleteArea(static_cast<SCCOL>(nIMin), nRow1, static_cast<SCCOL>(nIMax), nRow2, IDF_AUTOFILL);
 
-    ULONG nProgress = rProgress.GetState();
+    sal_uLong nProgress = rProgress.GetState();
 
     //
     //	ausfuehren
     //
 
-    ULONG nActFormCnt = 0;
+    sal_uLong nActFormCnt = 0;
     for (rOuter = nOStart; rOuter <= nOEnd; rOuter++)
     {
-        ULONG nMaxFormCnt = 0;						// fuer Formeln
+        sal_uLong nMaxFormCnt = 0;						// fuer Formeln
 
         //	Attributierung uebertragen
 
         const ScPatternAttr* pSrcPattern = NULL;
         const ScStyleSheet* pStyleSheet = NULL;
-        ULONG nAtSrc = nISrcStart;
+        sal_uLong nAtSrc = nISrcStart;
         ScPatternAttr* pNewPattern = NULL;
-        BOOL bGetPattern = TRUE;
+        sal_Bool bGetPattern = sal_True;
         rInner = nIStart;
         while (true)        // #i53728# with "for (;;)" old solaris/x86 compiler mis-optimizes
         {
@@ -601,12 +601,12 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     pSrcPattern = aCol[nCol].GetPattern(static_cast<SCROW>(nAtSrc));
                 else                // rInner&:=nCol, rOuter&:=nRow
                     pSrcPattern = aCol[nAtSrc].GetPattern(static_cast<SCROW>(nRow));
-                bGetPattern = FALSE;
+                bGetPattern = sal_False;
                 pStyleSheet = pSrcPattern->GetStyleSheet();
                 //	Merge/Mergeflag nicht uebernehmen,
                 const SfxItemSet& rSet = pSrcPattern->GetItemSet();
-                if ( rSet.GetItemState(ATTR_MERGE, FALSE) == SFX_ITEM_SET
-                  || rSet.GetItemState(ATTR_MERGE_FLAG, FALSE) == SFX_ITEM_SET )
+                if ( rSet.GetItemState(ATTR_MERGE, sal_False) == SFX_ITEM_SET
+                  || rSet.GetItemState(ATTR_MERGE_FLAG, sal_False) == SFX_ITEM_SET )
                 {
                     pNewPattern = new ScPatternAttr( *pSrcPattern );
                     SfxItemSet& rNewSet = pNewPattern->GetItemSet();
@@ -654,18 +654,18 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 if ( nAtSrc != nISrcStart )
                 {	// mehr als eine Source-Zelle
                     nAtSrc = nISrcStart;
-                    bGetPattern = TRUE;
+                    bGetPattern = sal_True;
                 }
             }
             else if (bPositive)
             {
                 ++nAtSrc;
-                bGetPattern = TRUE;
+                bGetPattern = sal_True;
             }
             else
             {
                 --nAtSrc;
-                bGetPattern = TRUE;
+                bGetPattern = sal_True;
             }
 
             if (rInner == nIEnd) break;
@@ -679,9 +679,9 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
         FillCmd eFillCmd;
         FillDateCmd eDateCmd;
         double nInc;
-        USHORT nMinDigits;
+        sal_uInt16 nMinDigits;
         ScUserListData* pListData = NULL;
-        USHORT nListIndex;
+        sal_uInt16 nListIndex;
         if (bVertical)
             FillAnalyse(static_cast<SCCOL>(nCol),nRow1,
                     static_cast<SCCOL>(nCol),nRow2, eFillCmd,eDateCmd,
@@ -696,12 +696,12 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
         if (pListData)
         {
-            USHORT nListCount = pListData->GetSubCount();
+            sal_uInt16 nListCount = pListData->GetSubCount();
             if ( !bPositive )
             {
                 //	nListIndex auf FillAnalyse zeigt auf den letzten Eintrag -> anpassen
-                ULONG nSub = nISrcStart - nISrcEnd;
-                for (ULONG i=0; i<nSub; i++)
+                sal_uLong nSub = nISrcStart - nISrcEnd;
+                for (sal_uLong i=0; i<nSub; i++)
                 {
                     if (nListIndex == 0) nListIndex = nListCount;
                     --nListIndex;
@@ -731,7 +731,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
         }
         else if (eFillCmd == FILL_SIMPLE)			// Auffuellen mit Muster
         {
-            ULONG nSource = nISrcStart;
+            sal_uLong nSource = nISrcStart;
             double nDelta;
             if ( nScFillModeMouseModifier & KEY_MOD1 )
                 nDelta = 0.0;
@@ -740,16 +740,16 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             else
                 nDelta = -1.0;
             double nVal = 0.0;
-            ULONG nFormulaCounter = nActFormCnt;
-            BOOL bFirst = TRUE;
-            BOOL bGetCell = TRUE;
-            USHORT nCellDigits = 0;
+            sal_uLong nFormulaCounter = nActFormCnt;
+            sal_Bool bFirst = sal_True;
+            sal_Bool bGetCell = sal_True;
+            sal_uInt16 nCellDigits = 0;
             short nHeadNoneTail = 0;
             sal_Int32 nStringValue = 0;
             String aValue;
             ScBaseCell* pSrcCell = NULL;
             CellType eCellType = CELLTYPE_NONE;
-            BOOL bIsOrdinalSuffix = FALSE;
+            sal_Bool bIsOrdinalSuffix = sal_False;
 
             rInner = nIStart;
             while (true)        // #i53728# with "for (;;)" old solaris/x86 compiler mis-optimizes
@@ -760,7 +760,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                         pSrcCell = aCol[nCol].GetCell( static_cast<SCROW>(nSource) );
                     else				// rInner&:=nCol, rOuter&:=nRow
                         pSrcCell = aCol[nSource].GetCell( static_cast<SCROW>(nRow) );
-                    bGetCell = FALSE;
+                    bGetCell = sal_False;
                     if ( pSrcCell )
                     {
                         eCellType = pSrcCell->GetCellType();
@@ -859,7 +859,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                     if ( nSource != nISrcStart )
                     {	// mehr als eine Source-Zelle
                         nSource = nISrcStart;
-                        bGetCell = TRUE;
+                        bGetCell = sal_True;
                     }
                     if ( !(nScFillModeMouseModifier & KEY_MOD1) )
                     {
@@ -869,17 +869,17 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                             nDelta -= 1.0;
                     }
                     nFormulaCounter = nActFormCnt;
-                    bFirst = FALSE;
+                    bFirst = sal_False;
                 }
                 else if (bPositive)
                 {
                     ++nSource;
-                    bGetCell = TRUE;
+                    bGetCell = sal_True;
                 }
                 else
                 {
                     --nSource;
-                    bGetCell = TRUE;
+                    bGetCell = sal_True;
                 }
 
                 //	Progress in der inneren Schleife nur bei teuren Zellen,
@@ -902,12 +902,12 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             if (bVertical)
                 FillSeries( static_cast<SCCOL>(nCol), nRow1,
                         static_cast<SCCOL>(nCol), nRow2, nFillCount, eFillDir,
-                        eFillCmd, eDateCmd, nInc, nEndVal, nMinDigits, FALSE,
+                        eFillCmd, eDateCmd, nInc, nEndVal, nMinDigits, sal_False,
                         rProgress );
             else
                 FillSeries( nCol1, static_cast<SCROW>(nRow), nCol2,
                         static_cast<SCROW>(nRow), nFillCount, eFillDir,
-                        eFillCmd, eDateCmd, nInc, nEndVal, nMinDigits, FALSE,
+                        eFillCmd, eDateCmd, nInc, nEndVal, nMinDigits, sal_False,
                         rProgress );
             nProgress = rProgress.GetState();
         }
@@ -924,12 +924,12 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
     SCROW nRow1 = rSource.aStart.Row();
     SCCOL nCol2 = rSource.aEnd.Col();
     SCROW nRow2 = rSource.aEnd.Row();
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     long nIndex = 0;
-    ULONG nSrcCount = 0;
+    sal_uLong nSrcCount = 0;
     FillDir eFillDir = FILL_TO_BOTTOM;
     if ( nEndX == nCol2 && nEndY == nRow2 )		// leer
-        bOk = FALSE;
+        bOk = sal_False;
     else if ( nEndX == nCol2 )					// nach oben/unten
     {
         nEndX = nCol2 = nCol1;					// nur erste Spalte ansehen
@@ -951,29 +951,29 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
             eFillDir = FILL_TO_LEFT;
     }
     else										// Richtung nicht eindeutig
-        bOk = FALSE;
+        bOk = sal_False;
 
     if ( bOk )
     {
         FillCmd eFillCmd;
         FillDateCmd eDateCmd;
         double nInc;
-        USHORT nMinDigits;
+        sal_uInt16 nMinDigits;
         ScUserListData* pListData = NULL;
-        USHORT nListIndex;
+        sal_uInt16 nListIndex;
 
         FillAnalyse(nCol1,nRow1, nCol2,nRow2, eFillCmd,eDateCmd, nInc,nMinDigits, pListData,nListIndex);
 
         if ( pListData )							// benutzerdefinierte Liste
         {
-            USHORT nListCount = pListData->GetSubCount();
+            sal_uInt16 nListCount = pListData->GetSubCount();
             if ( nListCount )
             {
-                ULONG nSub = nSrcCount - 1;	//	nListIndex ist vom letzten Source-Eintrag
+                sal_uLong nSub = nSrcCount - 1;	//	nListIndex ist vom letzten Source-Eintrag
                 while ( nIndex < sal::static_int_cast<long>(nSub) )
                     nIndex += nListCount;
-                ULONG nPos = ( nListIndex + nIndex - nSub ) % nListCount;
-                aValue = pListData->GetSubStr(sal::static_int_cast<USHORT>(nPos));
+                sal_uLong nPos = ( nListIndex + nIndex - nSub ) % nListCount;
+                aValue = pListData->GetSubStr(sal::static_int_cast<sal_uInt16>(nPos));
             }
         }
         else if ( eFillCmd == FILL_SIMPLE )			// Auffuellen mit Muster
@@ -981,7 +981,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
             long nPosIndex = nIndex;
             while ( nPosIndex < 0 )
                 nPosIndex += nSrcCount;
-            ULONG nPos = nPosIndex % nSrcCount;
+            sal_uLong nPos = nPosIndex % nSrcCount;
             SCCOL nSrcX = nCol1;
             SCROW nSrcY = nRow1;
             if ( eFillDir == FILL_TO_TOP || eFillDir == FILL_TO_BOTTOM )
@@ -1011,7 +1011,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
                         if ( !(nScFillModeMouseModifier & KEY_MOD1) )
                         {
                             sal_Int32 nVal;
-                            USHORT nCellDigits = 0;	// look at each source cell individually
+                            sal_uInt16 nCellDigits = 0;	// look at each source cell individually
                             short nFlag = lcl_DecompValueString( aValue, nVal, &nCellDigits );
                             if ( nFlag < 0 )
                             {
@@ -1033,7 +1033,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
                             nVal += (double) nDelta;
 
                         Color* pColor;
-                        ULONG nNumFmt = GetNumberFormat( nSrcX, nSrcY );
+                        sal_uLong nNumFmt = GetNumberFormat( nSrcX, nSrcY );
                         pDocument->GetFormatTable()->
                             GetOutputString( nVal, nNumFmt, aValue, &pColor );
                     }
@@ -1048,7 +1048,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
         }
         else if ( eFillCmd == FILL_LINEAR || eFillCmd == FILL_DATE )		// Werte
         {
-            BOOL bValueOk;
+            sal_Bool bValueOk;
             double nStart;
             sal_Int32 nVal = 0;
             short nHeadNoneTail = 0;
@@ -1092,8 +1092,8 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
             }
             else		// Datum
             {
-                bValueOk = TRUE;
-                USHORT nDayOfMonth = 0;
+                bValueOk = sal_True;
+                sal_uInt16 nDayOfMonth = 0;
                 if ( nIndex < 0 )
                 {
                     nIndex = -nIndex;
@@ -1121,7 +1121,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
                 {
                     //!	Zahlformat je nach Index holen?
                     Color* pColor;
-                    ULONG nNumFmt = GetNumberFormat( nCol1, nRow1 );
+                    sal_uLong nNumFmt = GetNumberFormat( nCol1, nRow1 );
                     pDocument->GetFormatTable()->
                         GetOutputString( nStart, nNumFmt, aValue, &pColor );
                 }
@@ -1136,7 +1136,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
     return aValue;
 }
 
-void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateCmd eCmd)
+void ScTable::IncDate(double& rVal, sal_uInt16& nDayOfMonth, double nStep, FillDateCmd eCmd)
 {
     if (eCmd == FILL_DAY)
     {
@@ -1145,8 +1145,8 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC
     }
 
     // class Date Grenzen
-    const USHORT nMinYear = 1583;
-    const USHORT nMaxYear = 9956;
+    const sal_uInt16 nMinYear = 1583;
+    const sal_uInt16 nMaxYear = 9956;
 
     long nInc = (long) nStep;		// nach oben/unten begrenzen ?
     Date aNullDate = *pDocument->GetFormatTable()->GetNullDate();
@@ -1208,8 +1208,8 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC
                     aDate = Date( 31,12, nMaxYear );
                 else
                 {
-                    aDate.SetMonth((USHORT) nMonth);
-                    aDate.SetYear((USHORT) nYear);
+                    aDate.SetMonth((sal_uInt16) nMonth);
+                    aDate.SetYear((sal_uInt16) nYear);
                     if ( nDayOfMonth > 28 )
                         aDate.SetDay( Min( aDate.GetDaysInMonth(), nDayOfMonth ) );
                 }
@@ -1224,7 +1224,7 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC
                 else if ( nYear > nMaxYear )
                     aDate = Date( 31,12, nMaxYear );
                 else
-                    aDate.SetYear((USHORT) nYear);
+                    aDate.SetYear((sal_uInt16) nYear);
             }
             break;
         default:
@@ -1237,26 +1237,26 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC
 }
 
 void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                    ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
-                    double nStepValue, double nMaxValue, USHORT nArgMinDigits,
-                    BOOL bAttribs, ScProgress& rProgress )
+                    sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
+                    double nStepValue, double nMaxValue, sal_uInt16 nArgMinDigits,
+                    sal_Bool bAttribs, ScProgress& rProgress )
 {
     //
     //	Richtung auswerten
     //
 
-    BOOL bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
-    BOOL bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT);
+    sal_Bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
+    sal_Bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT);
 
-    ULONG nCol = 0;
-    ULONG nRow = 0;
-    ULONG& rInner = bVertical ? nRow : nCol;		// Schleifenvariablen
-    ULONG& rOuter = bVertical ? nCol : nRow;
-    ULONG nOStart;
-    ULONG nOEnd;
-    ULONG nIStart;
-    ULONG nIEnd;
-    ULONG nISource;
+    sal_uLong nCol = 0;
+    sal_uLong nRow = 0;
+    sal_uLong& rInner = bVertical ? nRow : nCol;		// Schleifenvariablen
+    sal_uLong& rOuter = bVertical ? nCol : nRow;
+    sal_uLong nOStart;
+    sal_uLong nOEnd;
+    sal_uLong nIStart;
+    sal_uLong nIEnd;
+    sal_uLong nISource;
 
     if (bVertical)
     {
@@ -1299,25 +1299,25 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
         }
     }
 
-    ULONG nIMin = nIStart;
-    ULONG nIMax = nIEnd;
+    sal_uLong nIMin = nIStart;
+    sal_uLong nIMax = nIEnd;
     PutInOrder(nIMin,nIMax);
-    USHORT nDel = bAttribs ? IDF_AUTOFILL : (IDF_AUTOFILL & IDF_CONTENTS);
+    sal_uInt16 nDel = bAttribs ? IDF_AUTOFILL : (IDF_AUTOFILL & IDF_CONTENTS);
     if (bVertical)
         DeleteArea(nCol1, static_cast<SCROW>(nIMin), nCol2, static_cast<SCROW>(nIMax), nDel);
     else
         DeleteArea(static_cast<SCCOL>(nIMin), nRow1, static_cast<SCCOL>(nIMax), nRow2, nDel);
 
-    ULONG nProgress = rProgress.GetState();
+    sal_uLong nProgress = rProgress.GetState();
 
     //
     //	ausfuehren
     //
 
-    ULONG nActFormCnt = 0;
+    sal_uLong nActFormCnt = 0;
     for (rOuter = nOStart; rOuter <= nOEnd; rOuter++)
     {
-        BOOL bFirst = TRUE;
+        sal_Bool bFirst = sal_True;
         rInner = nISource;
         ScBaseCell* pSrcCell = aCol[nCol].GetCell(static_cast<SCROW>(nRow));
 
@@ -1329,10 +1329,10 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             const ScPatternAttr* pSrcPattern = aCol[nCol].GetPattern(static_cast<SCROW>(nRow));
             if (bVertical)
                 aCol[nCol].SetPatternArea( static_cast<SCROW>(nIMin),
-                        static_cast<SCROW>(nIMax), *pSrcPattern, TRUE );
+                        static_cast<SCROW>(nIMax), *pSrcPattern, sal_True );
             else
                 for (SCCOL nAtCol = static_cast<SCCOL>(nIMin); nAtCol <= sal::static_int_cast<SCCOL>(nIMax); nAtCol++)
-                    aCol[nAtCol].SetPattern(static_cast<SCROW>(nRow), *pSrcPattern, TRUE);
+                    aCol[nAtCol].SetPattern(static_cast<SCROW>(nRow), *pSrcPattern, sal_True);
         }
 
         if (pSrcCell)
@@ -1345,10 +1345,10 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 {
                     for (rInner = nIMin; rInner <= nIMax; rInner++)
                     {
-                        ULONG nInd = nActFormCnt;
+                        sal_uLong nInd = nActFormCnt;
                         FillFormula(nInd, bFirst, (ScFormulaCell*)pSrcCell,
                             static_cast<SCCOL>(nCol), nRow, (rInner == nIEnd) );
-                        bFirst = FALSE;
+                        bFirst = sal_False;
                         rProgress.SetStateOnPercent( ++nProgress );
                     }
                 }
@@ -1373,10 +1373,10 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 double nVal = nStartVal;
                 long nIndex = 0;
 
-                BOOL bError = FALSE;
-                BOOL bOverflow = FALSE;
+                sal_Bool bError = sal_False;
+                sal_Bool bOverflow = sal_False;
 
-                USHORT nDayOfMonth = 0;
+                sal_uInt16 nDayOfMonth = 0;
                 rInner = nIStart;
                 while (true)        // #i53728# with "for (;;)" old solaris/x86 compiler mis-optimizes
                 {
@@ -1392,16 +1392,16 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                     double nAdd = nStepValue;
                                     if ( !SubTotal::SafeMult( nAdd, (double) ++nIndex ) ||
                                          !SubTotal::SafePlus( nVal, nAdd ) )
-                                        bError = TRUE;
+                                        bError = sal_True;
                                 }
                                 break;
                             case FILL_GROWTH:
                                 if (!SubTotal::SafeMult(nVal, nStepValue))
-                                    bError = TRUE;
+                                    bError = sal_True;
                                 break;
                             case FILL_DATE:
                                 if (fabs(nVal) > _D_MAX_LONG_)
-                                    bError = TRUE;
+                                    bError = sal_True;
                                 else
                                     IncDate(nVal, nDayOfMonth, nStepValue, eFillDateCmd);
                                 break;
@@ -1416,7 +1416,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                             if (nVal > nMaxValue)			// Zielwert erreicht?
                             {
                                 nVal = nMaxValue;
-                                bOverflow = TRUE;
+                                bOverflow = sal_True;
                             }
                         }
                         else
@@ -1424,7 +1424,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                             if (nVal < nMaxValue)
                             {
                                 nVal = nMaxValue;
-                                bOverflow = TRUE;
+                                bOverflow = sal_True;
                             }
                         }
                     }
@@ -1458,17 +1458,17 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                 else
                     ((ScEditCell*)pSrcCell)->GetString( aValue );
                 sal_Int32 nStringValue;
-                USHORT nMinDigits = nArgMinDigits;
+                sal_uInt16 nMinDigits = nArgMinDigits;
                 short nHeadNoneTail = lcl_DecompValueString( aValue, nStringValue, &nMinDigits );
                 if ( nHeadNoneTail )
                 {
                     double nStartVal = (double)nStringValue;
                     double nVal = nStartVal;
                     long nIndex = 0;
-                    BOOL bError = FALSE;
-                    BOOL bOverflow = FALSE;
+                    sal_Bool bError = sal_False;
+                    sal_Bool bOverflow = sal_False;
 
-                    BOOL bIsOrdinalSuffix = aValue.Equals( ScGlobal::GetOrdinalSuffix(
+                    sal_Bool bIsOrdinalSuffix = aValue.Equals( ScGlobal::GetOrdinalSuffix(
                                 (sal_Int32)nStartVal));
 
                     rInner = nIStart;
@@ -1486,12 +1486,12 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                         double nAdd = nStepValue;
                                         if ( !SubTotal::SafeMult( nAdd, (double) ++nIndex ) ||
                                              !SubTotal::SafePlus( nVal, nAdd ) )
-                                            bError = TRUE;
+                                            bError = sal_True;
                                     }
                                     break;
                                 case FILL_GROWTH:
                                     if (!SubTotal::SafeMult(nVal, nStepValue))
-                                        bError = TRUE;
+                                        bError = sal_True;
                                     break;
                                 default:
                                 {
@@ -1504,7 +1504,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 if (nVal > nMaxValue)			// Zielwert erreicht?
                                 {
                                     nVal = nMaxValue;
-                                    bOverflow = TRUE;
+                                    bOverflow = sal_True;
                                 }
                             }
                             else
@@ -1512,7 +1512,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 if (nVal < nMaxValue)
                                 {
                                     nVal = nMaxValue;
-                                    bOverflow = TRUE;
+                                    bOverflow = sal_True;
                                 }
                             }
                         }
@@ -1557,10 +1557,10 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 }
 
 void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                    ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
+                    sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
                     double nStepValue, double nMaxValue)
 {
-    ULONG nProgCount;
+    sal_uLong nProgCount;
     if (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP)
         nProgCount = nCol2 - nCol1 + 1;
     else
@@ -1569,13 +1569,13 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
     ScProgress aProgress( pDocument->GetDocumentShell(),
                             ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount );
 
-    bSharedNameInserted = FALSE;
+    bSharedNameInserted = sal_False;
 
     if (eFillCmd == FILL_AUTO)
         FillAuto(nCol1, nRow1, nCol2, nRow2, nFillCount, eFillDir, aProgress);
     else
         FillSeries(nCol1, nRow1, nCol2, nRow2, nFillCount, eFillDir,
-                    eFillCmd, eFillDateCmd, nStepValue, nMaxValue, 0, TRUE, aProgress);
+                    eFillCmd, eFillDateCmd, nStepValue, nMaxValue, 0, sal_True, aProgress);
 
     if (bSharedNameInserted)						// Wurde Shared-Name eingefuegt?
         pDocument->GetRangeName()->SetSharedMaxIndex(
@@ -1584,7 +1584,7 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
 
 
 void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                const ScPatternAttr& rAttr, USHORT nFormatNo)
+                                const ScPatternAttr& rAttr, sal_uInt16 nFormatNo)
 {
     ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat();
     if (pAutoFormat)
@@ -1600,7 +1600,7 @@ void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
 }
 
 void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                            USHORT nFormatNo )
+                            sal_uInt16 nFormatNo )
 {
     if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
     {
@@ -1619,7 +1619,7 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW
 
                 SCCOL nCol = nStartCol;
                 SCROW nRow = nStartRow;
-                USHORT nIndex = 0;
+                sal_uInt16 nIndex = 0;
                 // Linke obere Ecke
                 AutoFormatArea(nCol, nRow, nCol, nRow, *pPatternAttrs[nIndex], nFormatNo);
                 // Linke Spalte
@@ -1741,9 +1741,9 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW
     } // if ValidColRow
 }
 
-void ScTable::GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData)
+void ScTable::GetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, ScAutoFormatData& rData)
 {
-    UINT32 nFormatIndex = GetNumberFormat( nCol, nRow );
+    sal_uInt32 nFormatIndex = GetNumberFormat( nCol, nRow );
     ScNumFormatAbbrev 	aNumFormat( nFormatIndex, *pDocument->GetFormatTable() );
     rData.GetFromItemSet( nIndex, GetPattern( nCol, nRow )->GetItemSet(), aNumFormat );
 }
@@ -1754,7 +1754,7 @@ void ScTable::GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFor
 #define LF_BOTTOM       8
 #define LF_ALL          (LF_LEFT | LF_TOP | LF_RIGHT | LF_BOTTOM)
 
-void ScTable::GetAutoFormatFrame(SCCOL nCol, SCROW nRow, USHORT nFlags, USHORT nIndex, ScAutoFormatData& rData)
+void ScTable::GetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, sal_uInt16 nIndex, ScAutoFormatData& rData)
 {
     const SvxBoxItem* pTheBox = (SvxBoxItem*)GetAttr(nCol, nRow, ATTR_BORDER);
     const SvxBoxItem* pLeftBox = (SvxBoxItem*)GetAttr(nCol - 1, nRow, ATTR_BORDER);
@@ -1886,7 +1886,7 @@ void ScTable::GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
     }
 }
 
-void ScTable::SetError( SCCOL nCol, SCROW nRow, USHORT nError)
+void ScTable::SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError)
 {
     if (ValidColRow(nCol, nRow))
         aCol[nCol].SetError( nRow, nError );
@@ -1898,7 +1898,7 @@ void ScTable::UpdateInsertTabAbs(SCTAB nTable)
         aCol[i].UpdateInsertTabAbs(nTable);
 }
 
-//UNUSED2008-05  USHORT ScTable::GetErrorData( SCCOL nCol, SCROW nRow ) const
+//UNUSED2008-05  sal_uInt16 ScTable::GetErrorData( SCCOL nCol, SCROW nRow ) const
 //UNUSED2008-05  {
 //UNUSED2008-05      if (ValidColRow(nCol,nRow))
 //UNUSED2008-05          return aCol[nCol].GetErrorData( nRow );
@@ -1906,7 +1906,7 @@ void ScTable::UpdateInsertTabAbs(SCTAB nTable)
 //UNUSED2008-05          return 0;
 //UNUSED2008-05  }
 
-BOOL ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel,
+sal_Bool ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, sal_Bool bInSel,
                                     const ScMarkData& rMark) const
 {
     if (rRow == MAXROW+2)						// Tabellenende
@@ -1924,17 +1924,17 @@ BOOL ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel,
         }
     }
     if (rCol == MAXCOL+1)
-        return TRUE;
+        return sal_True;
     else
     {
-        BOOL bStop = FALSE;
+        sal_Bool bStop = sal_False;
         while (!bStop)
         {
             if (ValidCol(rCol))
             {
                 bStop = aCol[rCol].GetNextSpellingCell(rRow, bInSel, rMark);
                 if (bStop)
-                    return TRUE;
+                    return sal_True;
                 else /*if (rRow == MAXROW+1) */
                 {
                     rCol++;
@@ -1942,10 +1942,10 @@ BOOL ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel,
                 }
             }
             else
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 void ScTable::RemoveAutoSpellObj()
@@ -1954,12 +1954,12 @@ void ScTable::RemoveAutoSpellObj()
         aCol[i].RemoveAutoSpellObj();
 }
 
-BOOL ScTable::TestTabRefAbs(SCTAB nTable)
+sal_Bool ScTable::TestTabRefAbs(SCTAB nTable)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     for (SCCOL i=0; i <= MAXCOL; i++)
         if (aCol[i].TestTabRefAbs(nTable))
-            bRet = TRUE;
+            bRet = sal_True;
     return bRet;
 }
 
@@ -1968,12 +1968,12 @@ void ScTable::CompileDBFormula()
     for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CompileDBFormula();
 }
 
-void ScTable::CompileDBFormula( BOOL bCreateFormulaString )
+void ScTable::CompileDBFormula( sal_Bool bCreateFormulaString )
 {
     for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CompileDBFormula( bCreateFormulaString );
 }
 
-void ScTable::CompileNameFormula( BOOL bCreateFormulaString )
+void ScTable::CompileNameFormula( sal_Bool bCreateFormulaString )
 {
     for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CompileNameFormula( bCreateFormulaString );
 }
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 64e0577a2..7afaafaa4 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -106,7 +106,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
     }
     else
     {
-        USHORT nAreaCount = GetPrintRangeCount();
+        sal_uInt16 nAreaCount = GetPrintRangeCount();
         if ( nAreaCount > 1 )
         {
             //	bei mehreren Bereichen nichts anzeigen:
@@ -136,13 +136,13 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
     bool bSkipColBreaks = false;
     bool bSkipRowBreaks = false;
 
-    if ( pStyleSet->GetItemState( ATTR_PAGE_SCALETOPAGES, FALSE, &pItem ) == SFX_ITEM_SET )
+    if ( pStyleSet->GetItemState( ATTR_PAGE_SCALETOPAGES, sal_False, &pItem ) == SFX_ITEM_SET )
     {
         DBG_ASSERT( pItem->ISA(SfxUInt16Item), "falsches Item" );
         bSkipColBreaks = bSkipRowBreaks = ( ((const SfxUInt16Item*)pItem)->GetValue() > 0 );
     }
 
-    if ( !bSkipColBreaks && pStyleSet->GetItemState(ATTR_PAGE_SCALETO, FALSE, &pItem) == SFX_ITEM_SET )
+    if ( !bSkipColBreaks && pStyleSet->GetItemState(ATTR_PAGE_SCALETO, sal_False, &pItem) == SFX_ITEM_SET )
     {
         // #i54993# when fitting to width or height, ignore only manual breaks in that direction
         const ScPageScaleToItem* pScaleToItem = static_cast<const ScPageScaleToItem*>(pItem);
@@ -170,24 +170,24 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
 
         //	Mittelteil: Breaks verteilen
 
-    BOOL bRepeatCol = ( nRepeatStartX != SCCOL_REPEAT_NONE );
-    BOOL bColFound = FALSE;
+    sal_Bool bRepeatCol = ( nRepeatStartX != SCCOL_REPEAT_NONE );
+    sal_Bool bColFound = sal_False;
     long nSizeX = 0;
     for (nX=nStartCol; nX<=nEndCol; nX++)
     {
-        BOOL bStartOfPage = FALSE;
+        sal_Bool bStartOfPage = sal_False;
         long nThisX = ColHidden(nX) ? 0 : pColWidth[nX];
         bool bManualBreak = HasColManualBreak(nX);
         if ( (nSizeX+nThisX > nPageSizeX) || (bManualBreak && !bSkipColBreaks) )
         {
             SetColBreak(nX, true, false);
             nSizeX = 0;
-            bStartOfPage = TRUE;
+            bStartOfPage = sal_True;
         }
         else if (nX != nStartCol)
             RemoveColBreak(nX, true, false);
         else
-            bStartOfPage = TRUE;
+            bStartOfPage = sal_True;
 
         if ( bStartOfPage && bRepeatCol && nX>nRepeatStartX && !bColFound )
         {
@@ -196,7 +196,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
                 nPageSizeX -= ColHidden(i) ? 0 : pColWidth[i];
             while (nX<=nRepeatEndX)
                 RemoveColBreak(++nX, true, false);
-            bColFound = TRUE;
+            bColFound = sal_True;
         }
 
         nSizeX += nThisX;
@@ -206,15 +206,15 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
     RemoveRowPageBreaks(nStartRow+1, nEndRow);
 
     // And set new page breaks.
-    BOOL bRepeatRow = ( nRepeatStartY != SCROW_REPEAT_NONE );
-    BOOL bRowFound = FALSE;
+    sal_Bool bRepeatRow = ( nRepeatStartY != SCROW_REPEAT_NONE );
+    sal_Bool bRowFound = sal_False;
     long nSizeY = 0;
     ScFlatBoolRowSegments::ForwardIterator aIterHidden(*mpHiddenRows);
     ScFlatUInt16RowSegments::ForwardIterator aIterHeights(*mpRowHeights);
     SCROW nNextManualBreak = GetNextManualBreak(nStartRow); // -1 => no more manual breaks
     for (SCROW nY = nStartRow; nY <= nEndRow; ++nY)
     {
-        BOOL bStartOfPage = FALSE;
+        sal_Bool bStartOfPage = sal_False;
         bool bThisRowHidden = false;
         aIterHidden.getValue(nY, bThisRowHidden);
         long nThisY = 0;
@@ -238,12 +238,12 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
         {
             SetRowBreak(nY, true, false);
             nSizeY = 0;
-            bStartOfPage = TRUE;
+            bStartOfPage = sal_True;
         }
         else if (nY != nStartRow)
             ; // page break already removed
         else
-            bStartOfPage = TRUE;
+            bStartOfPage = sal_True;
 
         if ( bStartOfPage && bRepeatRow && nY>nRepeatStartY && !bRowFound )
         {
@@ -256,7 +256,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
             nPageSizeY -= nHeights;
             if (nY <= nRepeatEndY)
                 RemoveRowPageBreaks(nY, nRepeatEndY);
-            bRowFound = TRUE;
+            bRowFound = sal_True;
         }
 
         if (bThisRowHidden)
@@ -318,10 +318,10 @@ void ScTable::RemoveManualBreaks()
     InvalidatePageBreaks();
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
-BOOL ScTable::HasManualBreaks() const
+sal_Bool ScTable::HasManualBreaks() const
 {
     return !maRowManualBreaks.empty() || !maColManualBreaks.empty();
 }
@@ -331,7 +331,7 @@ void ScTable::SetRowManualBreaks( const ::std::set<SCROW>& rBreaks )
     maRowManualBreaks = rBreaks;
     InvalidatePageBreaks();
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 void ScTable::SetColManualBreaks( const ::std::set<SCCOL>& rBreaks )
@@ -339,7 +339,7 @@ void ScTable::SetColManualBreaks( const ::std::set<SCCOL>& rBreaks )
     maColManualBreaks = rBreaks;
     InvalidatePageBreaks();
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 void ScTable::GetAllRowBreaks(set<SCROW>& rBreaks, bool bPage, bool bManual) const
@@ -935,13 +935,13 @@ SCROW ScTable::CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow) const
 namespace {
 
 void lcl_syncFlags(ScFlatBoolColSegments& rColSegments, ScFlatBoolRowSegments& rRowSegments,
-    BYTE* pColFlags, ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags, const BYTE nFlagMask)
+    sal_uInt8* pColFlags, ScBitMaskCompressedArray< SCROW, sal_uInt8>* pRowFlags, const sal_uInt8 nFlagMask)
 {
     using ::sal::static_int_cast;
 
-    pRowFlags->AndValue(0, MAXROW, static_int_cast<BYTE>(~nFlagMask));
+    pRowFlags->AndValue(0, MAXROW, static_int_cast<sal_uInt8>(~nFlagMask));
     for (SCCOL i = 0; i <= MAXCOL; ++i)
-        pColFlags[i] &= static_int_cast<BYTE>(~nFlagMask);
+        pColFlags[i] &= static_int_cast<sal_uInt8>(~nFlagMask);
 
     {
         // row hidden flags.
@@ -954,7 +954,7 @@ void lcl_syncFlags(ScFlatBoolColSegments& rColSegments, ScFlatBoolRowSegments& r
                 break;
 
             if (aData.mbValue)
-                pRowFlags->OrValue(nRow, aData.mnRow2, static_int_cast<BYTE>(nFlagMask));
+                pRowFlags->OrValue(nRow, aData.mnRow2, static_int_cast<sal_uInt8>(nFlagMask));
 
             nRow = aData.mnRow2 + 1;
         }
@@ -988,15 +988,15 @@ void ScTable::SyncColRowFlags()
     using ::sal::static_int_cast;
 
     // Manual breaks.
-    pRowFlags->AndValue(0, MAXROW, static_int_cast<BYTE>(~CR_MANUALBREAK));
+    pRowFlags->AndValue(0, MAXROW, static_int_cast<sal_uInt8>(~CR_MANUALBREAK));
     for (SCCOL i = 0; i <= MAXCOL; ++i)
-        pColFlags[i] &= static_int_cast<BYTE>(~CR_MANUALBREAK);
+        pColFlags[i] &= static_int_cast<sal_uInt8>(~CR_MANUALBREAK);
 
     if (!maRowManualBreaks.empty())
     {
         for (set<SCROW>::const_iterator itr = maRowManualBreaks.begin(), itrEnd = maRowManualBreaks.end();
               itr != itrEnd; ++itr)
-            pRowFlags->OrValue(*itr, static_int_cast<BYTE>(CR_MANUALBREAK));
+            pRowFlags->OrValue(*itr, static_int_cast<sal_uInt8>(CR_MANUALBREAK));
     }
 
     if (!maColManualBreaks.empty())
@@ -1018,14 +1018,14 @@ void ScTable::SetPageSize( const Size& rSize )
         if (aPageSizeTwips != rSize)
             InvalidatePageBreaks();
 
-        bPageSizeValid = TRUE;
+        bPageSizeValid = sal_True;
         aPageSizeTwips = rSize;
     }
     else
-        bPageSizeValid = FALSE;
+        bPageSizeValid = sal_False;
 }
 
-BOOL ScTable::IsProtected() const
+sal_Bool ScTable::IsProtected() const
 {
     return pTabProtection.get() && pTabProtection->isProtected();
 }
@@ -1038,7 +1038,7 @@ void ScTable::SetProtection(const ScTableProtection* pProtect)
         pTabProtection.reset(NULL);
 
     if (IsStreamValid())
-        SetStreamValid(FALSE);
+        SetStreamValid(sal_False);
 }
 
 ScTableProtection* ScTable::GetProtection()
@@ -1094,20 +1094,20 @@ void ScTable::SetPageStyle( const String& rName )
             {
                 SfxItemSet&  rOldSet		  = pOldStyle->GetItemSet();
                 SfxItemSet&  rNewSet 		  = pNewStyle->GetItemSet();
-                const USHORT nOldScale		  = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALE);
-                const USHORT nOldScaleToPages = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALETOPAGES);
-                const USHORT nNewScale		  = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALE);
-                const USHORT nNewScaleToPages = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALETOPAGES);
+                const sal_uInt16 nOldScale		  = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALE);
+                const sal_uInt16 nOldScaleToPages = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALETOPAGES);
+                const sal_uInt16 nNewScale		  = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALE);
+                const sal_uInt16 nNewScaleToPages = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALETOPAGES);
 
                 if ( (nOldScale != nNewScale) || (nOldScaleToPages != nNewScaleToPages) )
-                    InvalidateTextWidth(NULL, NULL, FALSE, FALSE);
+                    InvalidateTextWidth(NULL, NULL, sal_False, sal_False);
             }
 
             if ( pNewStyle )			// auch ohne den alten (fuer UpdateStdNames)
                 aPageStyle = aStrNew;
 
             if (IsStreamValid())
-                SetStreamValid(FALSE);
+                SetStreamValid(sal_False);
         }
     }
 }
@@ -1115,11 +1115,11 @@ void ScTable::SetPageStyle( const String& rName )
 void ScTable::PageStyleModified( const String& rNewName )
 {
     aPageStyle = rNewName;
-    InvalidateTextWidth(NULL, NULL, FALSE, FALSE);      // don't know what was in the style before
+    InvalidateTextWidth(NULL, NULL, sal_False, sal_False);      // don't know what was in the style before
 }
 
 void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
-                                   BOOL bNumFormatChanged, BOOL bBroadcast )
+                                   sal_Bool bNumFormatChanged, sal_Bool bBroadcast )
 {
     if ( pAdrFrom && !pAdrTo )
     {
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 381cd9c00..0a7ff1a8d 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -49,9 +49,9 @@
 //--------------------------------------------------------------------------
 
 
-BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal )
+sal_Bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal )
 {
-    //	TRUE = more than 1 paragraph
+    //	sal_True = more than 1 paragraph
 
     const EditTextObject* pData = NULL;
     rCell.GetData( pData );
@@ -61,12 +61,12 @@ BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& r
     return ( rEngine.GetParagraphCount() > 1 );
 }
 
-BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
+sal_Bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
                             const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
 {
-    BOOL	bFound = FALSE;
-    BOOL 	bDoSearch = TRUE;
-    BOOL	bDoBack = rSearchItem.GetBackward();
+    sal_Bool	bFound = sal_False;
+    sal_Bool 	bDoSearch = sal_True;
+    sal_Bool	bDoBack = rSearchItem.GetBackward();
 
     String	aString;
     ScBaseCell* pCell;
@@ -74,7 +74,7 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
         bDoSearch = rMark.IsCellMarked(nCol, nRow);
     if ( bDoSearch && ((pCell = aCol[nCol].GetCell( nRow )) != NULL) )
     {
-        BOOL bMultiLine = FALSE;
+        sal_Bool bMultiLine = sal_False;
         CellType eCellType = pCell->GetCellType();
         switch (rSearchItem.GetCellType())
         {
@@ -117,13 +117,13 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
             if ( bDoBack )
             {
                 xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp;
-                bFound = (BOOL)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd, &aSearchResult));
+                bFound = (sal_Bool)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd, &aSearchResult));
                 // change results to definition before 614:
                 --nEnd;
             }
             else
             {
-                bFound = (BOOL)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd, &aSearchResult));
+                bFound = (sal_Bool)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd, &aSearchResult));
                 // change results to definition before 614:
                 --nEnd;
             }
@@ -137,7 +137,7 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
             return bFound;
         }
 
-        BYTE cMatrixFlag = MM_NONE;
+        sal_uInt8 cMatrixFlag = MM_NONE;
         if ( bFound &&
             ( (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE)
             ||(rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL) ) &&
@@ -156,13 +156,13 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
                 ScBaseCell* pUndoCell = pCell->CloneWithoutNote( *pUndoDoc );
                 pUndoDoc->PutCell( aAdr, pUndoCell);
             }
-            BOOL bRepeat = !rSearchItem.GetWordOnly();
+            sal_Bool bRepeat = !rSearchItem.GetWordOnly();
             do
             {
                 //	wenn der gefundene Text leer ist, nicht weitersuchen,
                 //	sonst wuerde man nie mehr aufhoeren (#35410#)
                 if ( nEnd < nStart || nEnd == STRING_MAXLEN )
-                    bRepeat = FALSE;
+                    bRepeat = sal_False;
 
                 String sReplStr = rSearchItem.GetReplaceString();
                 if (rSearchItem.GetRegExp())
@@ -194,17 +194,17 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
                 if (bRepeat)
                 {
                     if ( rSearchItem.GetCommand() != SVX_SEARCHCMD_REPLACE_ALL || nStart >= nEnd )
-                        bRepeat = FALSE;
+                        bRepeat = sal_False;
                     else if (bDoBack)
                     {
                         xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp;
-                        bRepeat = ((BOOL)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd)));
+                        bRepeat = ((sal_Bool)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd)));
                         // change results to definition before 614:
                         --nEnd;
                     }
                     else
                     {
-                        bRepeat = ((BOOL)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd)));
+                        bRepeat = ((sal_Bool)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd)));
                         // change results to definition before 614:
                         --nEnd;
                     }
@@ -246,11 +246,11 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
     return bFound;
 }
 
-BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+sal_Bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                         const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
 {
-    BOOL bFound = FALSE;
-    BOOL bAll =  (rSearchItem.GetCommand() == SVX_SEARCHCMD_FIND_ALL)
+    sal_Bool bFound = sal_False;
+    sal_Bool bAll =  (rSearchItem.GetCommand() == SVX_SEARCHCMD_FIND_ALL)
                ||(rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL);
     SCCOL nCol = rCol;
     SCROW nRow = rRow;
@@ -271,14 +271,14 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                     bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
                     if (!bFound)
                     {
-                        BOOL bIsEmpty;
+                        sal_Bool bIsEmpty;
                         do
                         {
                             nCol--;
                             if ((SCsCOL)nCol >= 0)
                                 bIsEmpty = aCol[nCol].IsEmptyData();
                             else
-                                bIsEmpty = TRUE;
+                                bIsEmpty = sal_True;
                         }
                         while (((SCsCOL)nCol >= 0) && bIsEmpty);
                     }
@@ -306,7 +306,7 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                 }
                 if (!bFound)
                 {
-                    BOOL bIsEmpty;
+                    sal_Bool bIsEmpty;
                     nRow = nLastRow;
                     do
                     {
@@ -314,7 +314,7 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                         if ((SCsCOL)nCol >= 0)
                             bIsEmpty = aCol[nCol].IsEmptyData();
                         else
-                            bIsEmpty = TRUE;
+                            bIsEmpty = sal_True;
                     }
                     while (((SCsCOL)nCol >= 0) && bIsEmpty);
                 }
@@ -375,10 +375,10 @@ BOOL ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
     return bFound;
 }
 
-BOOL ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+sal_Bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
                         String& rUndoStr, ScDocument* pUndoDoc)
 {
-    BOOL bFound = TRUE;
+    sal_Bool bFound = sal_True;
     SCCOL nCol = 0;
     SCROW nRow = -1;
 
@@ -398,10 +398,10 @@ BOOL ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
     return (aNewMark.IsMultiMarked());
 }
 
-BOOL ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+sal_Bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                         const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCCOL nCol = rCol;
     SCROW nRow = rRow;
     if (rSearchItem.GetBackward())
@@ -427,14 +427,14 @@ BOOL ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow
     return bFound;
 }
 
-BOOL ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+sal_Bool ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
                             String& rUndoStr, ScDocument* pUndoDoc)
 {
-    BOOL bOldDouble = ScColumn::bDoubleAlloc;		// sollte immer FALSE sein?
+    sal_Bool bOldDouble = ScColumn::bDoubleAlloc;		// sollte immer sal_False sein?
     DBG_ASSERT(!bOldDouble,"bDoubleAlloc ???");
-    ScColumn::bDoubleAlloc = TRUE;					// fuer Undo-Doc
+    ScColumn::bDoubleAlloc = sal_True;					// fuer Undo-Doc
 
-    BOOL bFound = TRUE;
+    sal_Bool bFound = sal_True;
     SCCOL nCol = 0;
     SCROW nRow = -1;
 
@@ -456,7 +456,7 @@ BOOL ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
     return (aNewMark.IsMultiMarked());
 }
 
-BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+sal_Bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
                             ScMarkData& rMark)
 {
     const ScStyleSheet* pSearchStyle = (const ScStyleSheet*)
@@ -465,11 +465,11 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
 
     SCsCOL nCol = rCol;
     SCsROW nRow = rRow;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
-    BOOL bSelect = rSearchItem.GetSelection();
-    BOOL bRows = rSearchItem.GetRowDirection();
-    BOOL bBack = rSearchItem.GetBackward();
+    sal_Bool bSelect = rSearchItem.GetSelection();
+    sal_Bool bRows = rSearchItem.GetRowDirection();
+    sal_Bool bBack = rSearchItem.GetBackward();
     short nAdd = bBack ? -1 : 1;
 
     if (bRows)										// zeilenweise
@@ -486,7 +486,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
             else
             {
                 nRow = nNextRow;
-                bFound = TRUE;
+                bFound = sal_True;
             }
         }
         while (!bFound && ValidCol(nCol));
@@ -510,7 +510,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
                 {
                     nCol = i;
                     nRow = nNextRows[i];
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
         }
         else								// vorwaerts
@@ -521,7 +521,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
                 {
                     nCol = i;
                     nRow = nNextRows[i];
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
         }
     }
@@ -536,12 +536,12 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
 
 //!		einzelnes Pattern fuer Undo zurueckgeben
 
-BOOL ScTable::ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
-                           ScMarkData& rMark, BOOL bIsUndo)
+sal_Bool ScTable::ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+                           ScMarkData& rMark, sal_Bool bIsUndo)
 {
-    BOOL bRet;
+    sal_Bool bRet;
     if (bIsUndo)
-        bRet = TRUE;
+        bRet = sal_True;
     else
         bRet = SearchStyle(rSearchItem, rCol, rRow, rMark);
     if (bRet)
@@ -561,19 +561,19 @@ BOOL ScTable::ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
     return bRet;
 }
 
-BOOL ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark)
+sal_Bool ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark)
 {
     const ScStyleSheet* pSearchStyle = (const ScStyleSheet*)
                                         pDocument->GetStyleSheetPool()->Find(
                                         rSearchItem.GetSearchString(), SFX_STYLE_FAMILY_PARA );
-    BOOL bSelect = rSearchItem.GetSelection();
-    BOOL bBack = rSearchItem.GetBackward();
+    sal_Bool bSelect = rSearchItem.GetSelection();
+    sal_Bool bBack = rSearchItem.GetBackward();
 
     ScMarkData aNewMark( rMark );	// Tabellen-Markierungen kopieren
     aNewMark.ResetMark();
     for (SCCOL i=0; i<=MAXCOL; i++)
     {
-        BOOL bFound = TRUE;
+        sal_Bool bFound = sal_True;
         SCsROW nRow = 0;
         SCsROW nEndRow;
         while (bFound && nRow <= MAXROW)
@@ -599,10 +599,10 @@ BOOL ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark
     return (aNewMark.IsMultiMarked());
 }
 
-BOOL ScTable::ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+sal_Bool ScTable::ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
                                 ScDocument* pUndoDoc)
 {
-    BOOL bRet = SearchAllStyle(rSearchItem, rMark);
+    sal_Bool bRet = SearchAllStyle(rSearchItem, rMark);
     if (bRet)
     {
         const ScStyleSheet* pReplaceStyle = (const ScStyleSheet*)
@@ -613,7 +613,7 @@ BOOL ScTable::ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMar
         {
             if (pUndoDoc)
                 pDocument->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab,
-                                            IDF_ATTRIB, TRUE, pUndoDoc, &rMark );
+                                            IDF_ATTRIB, sal_True, pUndoDoc, &rMark );
             ApplySelectionStyle( *pReplaceStyle, rMark );
         }
         else
@@ -625,12 +625,12 @@ BOOL ScTable::ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMar
     return bRet;
 }
 
-BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
+sal_Bool ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
                                 SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
                                 String& rUndoStr, ScDocument* pUndoDoc)
 {
-    USHORT nCommand = rSearchItem.GetCommand();
-    BOOL bFound = FALSE;
+    sal_uInt16 nCommand = rSearchItem.GetCommand();
+    sal_Bool bFound = sal_False;
     if ( ValidColRow(rCol, rRow) ||
          ((nCommand == SVX_SEARCHCMD_FIND || nCommand == SVX_SEARCHCMD_REPLACE) &&
            (((rCol == MAXCOLCOUNT || rCol == -1) && VALIDROW(rRow)) ||
@@ -639,13 +639,13 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
          )
        )
     {
-        BOOL bStyles = rSearchItem.GetPattern();
+        sal_Bool bStyles = rSearchItem.GetPattern();
         if (bStyles)
         {
             if (nCommand == SVX_SEARCHCMD_FIND)
                 bFound = SearchStyle(rSearchItem, rCol, rRow, rMark);
             else if (nCommand == SVX_SEARCHCMD_REPLACE)
-                bFound = ReplaceStyle(rSearchItem, rCol, rRow, rMark, FALSE);
+                bFound = ReplaceStyle(rSearchItem, rCol, rRow, rMark, sal_False);
             else if (nCommand == SVX_SEARCHCMD_FIND_ALL)
                 bFound = SearchAllStyle(rSearchItem, rMark);
             else if (nCommand == SVX_SEARCHCMD_REPLACE_ALL)
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 020ad95e4..e61068732 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -81,7 +81,7 @@ ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOpe
     eErrorStyle( SC_VALERR_STOP ),
     mnListType( ValidListType::UNSORTED )
 {
-    bShowInput = bShowError = FALSE;
+    bShowInput = bShowError = sal_False;
 }
 
 ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOper,
@@ -93,7 +93,7 @@ ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOpe
     eErrorStyle( SC_VALERR_STOP ),
     mnListType( ValidListType::UNSORTED )
 {
-    bShowInput = bShowError = FALSE;
+    bShowInput = bShowError = sal_False;
 }
 
 ScValidationData::ScValidationData( const ScValidationData& r ) :
@@ -132,14 +132,14 @@ ScValidationData::~ScValidationData()
 {
 }
 
-BOOL ScValidationData::IsEmpty() const
+sal_Bool ScValidationData::IsEmpty() const
 {
     String aEmpty;
     ScValidationData aDefault( SC_VALID_ANY, SC_COND_EQUAL, aEmpty, aEmpty, GetDocument(), ScAddress() );
     return EqualEntries( aDefault );
 }
 
-BOOL ScValidationData::EqualEntries( const ScValidationData& r ) const
+sal_Bool ScValidationData::EqualEntries( const ScValidationData& r ) const
 {
         //	gleiche Parameter eingestellt (ohne Key)
 
@@ -157,17 +157,17 @@ BOOL ScValidationData::EqualEntries( const ScValidationData& r ) const
 
 void ScValidationData::ResetInput()
 {
-    bShowInput = FALSE;
+    bShowInput = sal_False;
 }
 
 void ScValidationData::ResetError()
 {
-    bShowError = FALSE;
+    bShowError = sal_False;
 }
 
 void ScValidationData::SetInput( const String& rTitle, const String& rMsg )
 {
-    bShowInput = TRUE;
+    bShowInput = sal_True;
     aInputTitle = rTitle;
     aInputMessage = rMsg;
 }
@@ -175,13 +175,13 @@ void ScValidationData::SetInput( const String& rTitle, const String& rMsg )
 void ScValidationData::SetError( const String& rTitle, const String& rMsg,
                                     ScValidErrorStyle eStyle )
 {
-    bShowError = TRUE;
+    bShowError = sal_True;
     eErrorStyle = eStyle;
     aErrorTitle = rTitle;
     aErrorMessage = rMsg;
 }
 
-BOOL ScValidationData::GetErrMsg( String& rTitle, String& rMsg,
+sal_Bool ScValidationData::GetErrMsg( String& rTitle, String& rMsg,
                                     ScValidErrorStyle& rStyle ) const
 {
     rTitle = aErrorTitle;
@@ -190,15 +190,15 @@ BOOL ScValidationData::GetErrMsg( String& rTitle, String& rMsg,
     return bShowError;
 }
 
-BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
+sal_Bool ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
                                 ScFormulaCell* pCell, Window* pParent ) const
 {
     ScDocument* pDocument = GetDocument();
     SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
     if ( !pDocSh || !pDocument->CheckMacroWarn() )
-        return FALSE;
+        return sal_False;
 
-    BOOL bScriptReturnedFalse = FALSE;	// Standard: kein Abbruch
+    sal_Bool bScriptReturnedFalse = sal_False;	// Standard: kein Abbruch
 
     // Set up parameters
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aParams(2);
@@ -206,7 +206,7 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
     //	1) eingegebener / berechneter Wert
     String aValStr = rInput;
     double nValue;
-    BOOL bIsValue = FALSE;
+    sal_Bool bIsValue = sal_False;
     if ( pCell )				// wenn Zelle gesetzt, aus Interpret gerufen
     {
         bIsValue = pCell->IsValue();
@@ -227,9 +227,9 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
 
     //	use link-update flag to prevent closing the document
     //	while the macro is running
-    BOOL bWasInLinkUpdate = pDocument->IsInLinkUpdate();
+    sal_Bool bWasInLinkUpdate = pDocument->IsInLinkUpdate();
     if ( !bWasInLinkUpdate )
-        pDocument->SetInLinkUpdate( TRUE );
+        pDocument->SetInLinkUpdate( sal_True );
 
     if ( pCell )
         pDocument->LockTable( rPos.Tab() );
@@ -245,17 +245,17 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
         pDocument->UnlockTable( rPos.Tab() );
 
     if ( !bWasInLinkUpdate )
-        pDocument->SetInLinkUpdate( FALSE );
+        pDocument->SetInLinkUpdate( sal_False );
 
     // Check the return value from the script
     // The contents of the cell get reset if the script returns false
-    BOOL bTmp = FALSE;
+    sal_Bool bTmp = sal_False;
     if ( eRet == ERRCODE_NONE &&
              aRet.getValueType() == getCppuBooleanType() &&
              sal_True == ( aRet >>= bTmp ) &&
-             bTmp == FALSE )
+             bTmp == sal_False )
     {
-        bScriptReturnedFalse = TRUE;
+        bScriptReturnedFalse = sal_True;
     }
 
     if ( eRet == ERRCODE_BASIC_METHOD_NOT_FOUND && !pCell )
@@ -271,9 +271,9 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
     return bScriptReturnedFalse;
 }
 
-    // TRUE -> Abbruch
+    // sal_True -> Abbruch
 
-BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
+sal_Bool ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
                                 ScFormulaCell* pCell, Window* pParent ) const
 {
     if ( SfxApplication::IsXScriptURL( aErrorTitle ) )
@@ -284,12 +284,10 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
     ScDocument* pDocument = GetDocument();
     SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
     if ( !pDocSh || !pDocument->CheckMacroWarn() )
-        return FALSE;
+        return sal_False;
 
-    BOOL bDone = FALSE;
-    BOOL bRet = FALSE;						// Standard: kein Abbruch
-    SfxApplication* pSfxApp = SFX_APP();
-    pSfxApp->EnterBasicCall();				// Dok-Basic anlegen etc.
+    sal_Bool bDone = sal_False;
+    sal_Bool bRet = sal_False;						// Standard: kein Abbruch
 
     //	Wenn das Dok waehrend eines Basic-Calls geladen wurde,
     //	ist das Sbx-Objekt evtl. nicht angelegt (?)
@@ -340,7 +338,7 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
         //	1) eingegebener / berechneter Wert
         String aValStr = rInput;
         double nValue = 0.0;
-        BOOL bIsValue = FALSE;
+        sal_Bool bIsValue = sal_False;
         if ( pCell )				// wenn Zelle gesetzt, aus Interpret gerufen
         {
             bIsValue = pCell->IsValue();
@@ -361,26 +359,25 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
 
         //	use link-update flag to prevent closing the document
         //	while the macro is running
-        BOOL bWasInLinkUpdate = pDocument->IsInLinkUpdate();
+        sal_Bool bWasInLinkUpdate = pDocument->IsInLinkUpdate();
         if ( !bWasInLinkUpdate )
-            pDocument->SetInLinkUpdate( TRUE );
+            pDocument->SetInLinkUpdate( sal_True );
 
         if ( pCell )
             pDocument->LockTable( rPos.Tab() );
         SbxVariableRef refRes = new SbxVariable;
-        ErrCode eRet = pDocSh->CallBasic( aMacroStr, aBasicStr, NULL, refPar, refRes );
+        ErrCode eRet = pDocSh->CallBasic( aMacroStr, aBasicStr, refPar, refRes );
         if ( pCell )
             pDocument->UnlockTable( rPos.Tab() );
 
         if ( !bWasInLinkUpdate )
-            pDocument->SetInLinkUpdate( FALSE );
+            pDocument->SetInLinkUpdate( sal_False );
 
-        //	Eingabe abbrechen, wenn Basic-Makro FALSE zurueckgibt
-        if ( eRet == ERRCODE_NONE && refRes->GetType() == SbxBOOL && refRes->GetBool() == FALSE )
-            bRet = TRUE;
-        bDone = TRUE;
+        //	Eingabe abbrechen, wenn Basic-Makro sal_False zurueckgibt
+        if ( eRet == ERRCODE_NONE && refRes->GetType() == SbxBOOL && refRes->GetBool() == sal_False )
+            bRet = sal_True;
+        bDone = sal_True;
     }
-    pSfxApp->LeaveBasicCall();
 
     if ( !bDone && !pCell )			// Makro nicht gefunden (nur bei Eingabe)
     {
@@ -400,9 +397,9 @@ void ScValidationData::DoCalcError( ScFormulaCell* pCell ) const
         DoMacro( pCell->aPos, EMPTY_STRING, pCell, NULL );
 }
 
-    // TRUE -> Abbruch
+    // sal_True -> Abbruch
 
-BOOL ScValidationData::DoError( Window* pParent, const String& rInput,
+sal_Bool ScValidationData::DoError( Window* pParent, const String& rInput,
                                 const ScAddress& rPos ) const
 {
     if ( eErrorStyle == SC_VALERR_MACRO )
@@ -439,20 +436,20 @@ BOOL ScValidationData::DoError( Window* pParent, const String& rInput,
     }
 
     MessBox aBox( pParent, WinBits(nStyle), aTitle, aMessage );
-    USHORT nRet = aBox.Execute();
+    sal_uInt16 nRet = aBox.Execute();
 
     return ( eErrorStyle == SC_VALERR_STOP || nRet == RET_CANCEL );
 }
 
 
-BOOL ScValidationData::IsDataValid( const String& rTest, const ScPatternAttr& rPattern,
+sal_Bool ScValidationData::IsDataValid( const String& rTest, const ScPatternAttr& rPattern,
                                     const ScAddress& rPos ) const
 {
     if ( eDataMode == SC_VALID_ANY )
-        return TRUE;						// alles erlaubt
+        return sal_True;						// alles erlaubt
 
     if ( rTest.GetChar(0) == '=' )
-        return FALSE;						// Formeln sind sonst immer ungueltig
+        return sal_False;						// Formeln sind sonst immer ungueltig
 
     if ( !rTest.Len() )
         return IsIgnoreBlank();				// leer: wie eingestellt
@@ -464,27 +461,27 @@ BOOL ScValidationData::IsDataValid( const String& rTest, const ScPatternAttr& rP
     sal_uInt32 nFormat = rPattern.GetNumberFormat( pFormatter );
 
     double nVal;
-    BOOL bIsVal = pFormatter->IsNumberFormat( rTest, nFormat, nVal );
+    sal_Bool bIsVal = pFormatter->IsNumberFormat( rTest, nFormat, nVal );
     ScBaseCell* pCell;
     if (bIsVal)
         pCell = new ScValueCell( nVal );
     else
         pCell = new ScStringCell( rTest );
 
-    BOOL bRet = IsDataValid( pCell, rPos );
+    sal_Bool bRet = IsDataValid( pCell, rPos );
 
     pCell->Delete();
     return bRet;
 }
 
-BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const
+sal_Bool ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const
 {
     if( eDataMode == SC_VALID_LIST )
         return IsListValid( pCell, rPos );
 
     double nVal = 0.0;
     String aString;
-    BOOL bIsVal = TRUE;
+    sal_Bool bIsVal = sal_True;
 
     switch (pCell->GetCellType())
     {
@@ -493,11 +490,11 @@ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) c
             break;
         case CELLTYPE_STRING:
             ((ScStringCell*)pCell)->GetString( aString );
-            bIsVal = FALSE;
+            bIsVal = sal_False;
             break;
         case CELLTYPE_EDIT:
             ((ScEditCell*)pCell)->GetString( aString );
-            bIsVal = FALSE;
+            bIsVal = sal_False;
             break;
         case CELLTYPE_FORMULA:
             {
@@ -513,7 +510,7 @@ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) c
             return IsIgnoreBlank();		// wie eingestellt
     }
 
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     switch (eDataMode)
     {
         // SC_VALID_ANY schon oben
@@ -606,7 +603,7 @@ const String* ScStringTokenIterator::Next()
 // ----------------------------------------------------------------------------
 
 /** Returns the number format of the passed cell, or the standard format. */
-ULONG lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos )
+sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos )
 {
     const ScPatternAttr* pPattern = rDoc.GetPattern( rPos.Col(), rPos.Row(), rPos.Tab() );
     if( !pPattern )
@@ -661,7 +658,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings,
         // Use an interim matrix to create the TypedStrData below.
         xMatRef = new ScMatrix(1,1);
 
-        USHORT nErrCode = aValidationSrc.GetErrCode();
+        sal_uInt16 nErrCode = aValidationSrc.GetErrCode();
         if (nErrCode)
         {
             /* TODO : to use later in an alert box?
@@ -693,7 +690,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings,
     SCSIZE  nCol, nRow, nCols, nRows, n = 0;
     pValues->GetDimensions( nCols, nRows );
 
-    BOOL bRef = FALSE;
+    sal_Bool bRef = sal_False;
     ScRange aRange;
 
     ScTokenArray* pArr = (ScTokenArray*) &rTokArr;
@@ -706,7 +703,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings,
             if( ScDBData* pDBData = pDocument->GetDBCollection()->FindIndex( t->GetIndex() ) )
             {
                 pDBData->GetArea(aRange);
-                bRef = TRUE;
+                bRef = sal_True;
             }
         }
         else if (t->GetOpCode() == ocName)
@@ -714,7 +711,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings,
             ScRangeData* pName = pDocument->GetRangeName()->FindIndex( t->GetIndex() );
             if (pName && pName->IsReference(aRange))
             {
-                bRef = TRUE;
+                bRef = sal_True;
             }
         }
         else if (t->GetType() != svIndex)
@@ -722,7 +719,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings,
             t->CalcAbsIfRel(rPos);
             if (pArr->IsValidReference(aRange))
             {
-                bRef = TRUE;
+                bRef = sal_True;
             }
         }
     }
@@ -757,7 +754,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings,
             }
             else
             {
-                USHORT nErr = pMatVal->GetError();
+                sal_uInt16 nErr = pMatVal->GetError();
 
                 if( 0 != nErr )
                 {
@@ -820,7 +817,7 @@ bool ScValidationData::FillSelectionList( TypedScStrCollection& rStrColl, const
         // *** try if formula is a string list ***
 
         bool bSortList = (mnListType == ValidListType::SORTEDASCENDING);
-        UINT32 nFormat = lclGetCellFormat( *GetDocument(), rPos );
+        sal_uInt32 nFormat = lclGetCellFormat( *GetDocument(), rPos );
         ScStringTokenIterator aIt( *pTokArr );
         for( const String* pString = aIt.First(); pString && aIt.Ok(); pString = aIt.Next() )
         {
@@ -872,7 +869,7 @@ bool ScValidationData::IsListValid( ScBaseCell* pCell, const ScAddress& rPos ) c
 
     // *** try if formula is a string list ***
 
-    UINT32 nFormat = lclGetCellFormat( *GetDocument(), rPos );
+    sal_uInt32 nFormat = lclGetCellFormat( *GetDocument(), rPos );
     ScStringTokenIterator aIt( *pTokArr );
     for( const String* pString = aIt.First(); pString && aIt.Ok(); pString = aIt.Next() )
     {
@@ -916,9 +913,9 @@ ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList) :
 {
     //	fuer Ref-Undo - echte Kopie mit neuen Tokens!
 
-    USHORT nCount = rList.Count();
+    sal_uInt16 nCount = rList.Count();
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         InsertNew( rList[i]->Clone() );
 
     //!		sortierte Eintraege aus rList schneller einfuegen ???
@@ -929,9 +926,9 @@ ScValidationDataList::ScValidationDataList(ScDocument* pNewDoc,
 {
     //	fuer neues Dokument - echte Kopie mit neuen Tokens!
 
-    USHORT nCount = rList.Count();
+    sal_uInt16 nCount = rList.Count();
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         InsertNew( rList[i]->Clone(pNewDoc) );
 
     //!		sortierte Eintraege aus rList schneller einfuegen ???
@@ -941,8 +938,8 @@ ScValidationData* ScValidationDataList::GetData( sal_uInt32 nKey )
 {
     //!	binaer suchen
 
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         if ((*this)[i]->GetKey() == nKey)
             return (*this)[i];
 
@@ -952,44 +949,44 @@ ScValidationData* ScValidationDataList::GetData( sal_uInt32 nKey )
 
 void ScValidationDataList::CompileXML()
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->CompileXML();
 }
 
 void ScValidationDataList::UpdateReference( UpdateRefMode eUpdateRefMode,
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->UpdateReference( eUpdateRefMode, rRange, nDx, nDy, nDz);
 }
 
 void ScValidationDataList::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         (*this)[i]->UpdateMoveTab( nOldPos, nNewPos );
 }
 
 bool ScValidationDataList::MarkUsedExternalReferences() const
 {
     bool bAllMarked = false;
-    USHORT nCount = Count();
-    for (USHORT i=0; !bAllMarked && i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; !bAllMarked && i<nCount; i++)
         bAllMarked = (*this)[i]->MarkUsedExternalReferences();
     return bAllMarked;
 }
 
-BOOL ScValidationDataList::operator==( const ScValidationDataList& r ) const
+sal_Bool ScValidationDataList::operator==( const ScValidationDataList& r ) const
 {
     // fuer Ref-Undo - interne Variablen werden nicht verglichen
 
-    USHORT nCount = Count();
-    BOOL bEqual = ( nCount == r.Count() );
-    for (USHORT i=0; i<nCount && bEqual; i++)			// Eintraege sind sortiert
+    sal_uInt16 nCount = Count();
+    sal_Bool bEqual = ( nCount == r.Count() );
+    for (sal_uInt16 i=0; i<nCount && bEqual; i++)			// Eintraege sind sortiert
         if ( !(*this)[i]->EqualEntries(*r[i]) )			// Eintraege unterschiedlich ?
-            bEqual = FALSE;
+            bEqual = sal_False;
 
     return bEqual;
 }
diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx
index ad4de2ba4..b8805ad8d 100644
--- a/sc/source/core/inc/addinlis.hxx
+++ b/sc/source/core/inc/addinlis.hxx
@@ -71,7 +71,7 @@ public:
                                     com::sun::star::sheet::XVolatileResult> xVR );
     static void				RemoveDocument( ScDocument* pDocument );
 
-    BOOL					HasDocument( ScDocument* pDoc ) const	{ return pDocs->Seek_Entry( pDoc ); }
+    sal_Bool					HasDocument( ScDocument* pDoc ) const	{ return pDocs->Seek_Entry( pDoc ); }
     void					AddDocument( ScDocument* pDoc )			{ pDocs->Insert( pDoc ); }
     const com::sun::star::uno::Any& GetResult() const				{ return aResult; }
 
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 5391b65dc..5062bae2a 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -59,32 +59,32 @@ private:
     };
     ScAddInDocs*	pDocs;				// Liste der benutzenden Dokumente
     FuncData* 		pFuncData;			// Zeiger auf die Daten in der Collection
-    ULONG			nHandle;			// wird von double auf ULONG gecasted
+    sal_uLong			nHandle;			// wird von double auf sal_uLong gecasted
     ParamType		eType;				// PTR_DOUBLE oder PTR_STRING Ergebnis
-    BOOL			bValid;				// ob Wert gueltig
+    sal_Bool			bValid;				// ob Wert gueltig
 
 public:
                     // cTor nur wenn ScAddInAsync::Get fehlschlaegt!
                     // nIndex: Index aus der FunctionCollection
-                    ScAddInAsync( ULONG nHandle, USHORT nIndex,
+                    ScAddInAsync( sal_uLong nHandle, sal_uInt16 nIndex,
                                     ScDocument* pDoc );
                     // default-cTor nur fuer das eine globale aSeekObj !!!
                     ScAddInAsync();
     virtual			~ScAddInAsync();
-    static ScAddInAsync*	Get( ULONG nHandle );
-    static void		CallBack( ULONG nHandle, void* pData );
+    static ScAddInAsync*	Get( sal_uLong nHandle );
+    static void		CallBack( sal_uLong nHandle, void* pData );
     static void		RemoveDocument( ScDocument* pDocument );
-    BOOL			IsValid() const			{ return bValid; }
+    sal_Bool			IsValid() const			{ return bValid; }
     ParamType		GetType() const			{ return eType; }
     double			GetValue() const		{ return nVal; }
     const String&	GetString() const		{ return *pStr; }
-    BOOL			HasDocument( ScDocument* pDoc ) const
+    sal_Bool			HasDocument( ScDocument* pDoc ) const
                         { return pDocs->Seek_Entry( pDoc ); }
     void			AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); }
 
     // Vergleichsoperatoren fuer PtrArrSort
-    BOOL operator < ( const ScAddInAsync& r ) { return nHandle <  r.nHandle; }
-    BOOL operator ==( const ScAddInAsync& r ) { return nHandle == r.nHandle; }
+    sal_Bool operator < ( const ScAddInAsync& r ) { return nHandle <  r.nHandle; }
+    sal_Bool operator ==( const ScAddInAsync& r ) { return nHandle == r.nHandle; }
 };
 
 
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 42f06abea..90956fe65 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -47,13 +47,13 @@ private:
     ScBroadcastArea*	pUpdateChainNext;
     SvtBroadcaster      aBroadcaster;
     ScRange             aRange;
-    ULONG				nRefCount;
-    BOOL				bInUpdateChain;
+    sal_uLong				nRefCount;
+    sal_Bool				bInUpdateChain;
 
 public:
             ScBroadcastArea( const ScRange& rRange )
                 : pUpdateChainNext( NULL ), aRange( rRange ),
-                nRefCount( 0 ), bInUpdateChain( FALSE ) {}
+                nRefCount( 0 ), bInUpdateChain( sal_False ) {}
     inline SvtBroadcaster&       GetBroadcaster()       { return aBroadcaster; }
     inline const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; }
     inline void			UpdateRange( const ScRange& rNewRange )
@@ -62,12 +62,12 @@ public:
     inline const ScAddress& GetStart() const { return aRange.aStart; }
     inline const ScAddress& GetEnd() const { return aRange.aEnd; }
     inline void			IncRef() { ++nRefCount; }
-    inline ULONG		DecRef() { return nRefCount ? --nRefCount : 0; }
-    inline ULONG		GetRef() { return nRefCount; }
+    inline sal_uLong		DecRef() { return nRefCount ? --nRefCount : 0; }
+    inline sal_uLong		GetRef() { return nRefCount; }
     inline ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; }
     inline void			SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; }
-    inline BOOL			IsInUpdateChain() const { return bInUpdateChain; }
-    inline void			SetInUpdateChain( BOOL b ) { bInUpdateChain = b; }
+    inline sal_Bool			IsInUpdateChain() const { return bInUpdateChain; }
+    inline void			SetInUpdateChain( sal_Bool b ) { bInUpdateChain = b; }
 
     /** Equalness of this or range. */
     inline  bool        operator==( const ScBroadcastArea & rArea ) const;
@@ -139,7 +139,7 @@ private:
         whether there would be an overflow when adding an area, setting the 
         proper state if so.
 
-        @return TRUE if a HardRecalcState is effective and area is not to be 
+        @return sal_True if a HardRecalcState is effective and area is not to be 
         added.
       */
     bool                CheckHardRecalcStateCondition() const;
@@ -165,7 +165,7 @@ public:
             as InsertListeningArea(), so use that instead.
 
         @return
-            TRUE if rpArea passed was NULL and ScBroadcastArea is newly 
+            sal_True if rpArea passed was NULL and ScBroadcastArea is newly 
             created. 
      */
     bool				StartListeningArea( const ScRange& rRange,
@@ -181,9 +181,9 @@ public:
     void				EndListeningArea( const ScRange& rRange,
                                             SvtListener* pListener,
                                             ScBroadcastArea*& rpArea );
-    BOOL				AreaBroadcast( const ScHint& rHint ) const;
-    /// @return TRUE if at least one broadcast occurred.
-    BOOL				AreaBroadcastInRange( const ScRange& rRange,
+    sal_Bool				AreaBroadcast( const ScHint& rHint ) const;
+    /// @return sal_True if at least one broadcast occurred.
+    sal_Bool				AreaBroadcastInRange( const ScRange& rRange,
                                               const ScHint& rHint ) const;
     void				DelBroadcastAreasInRange( const ScRange& rRange );
     void				UpdateRemove( UpdateRefMode eUpdateRefMode,
@@ -245,7 +245,7 @@ private:
     ScDocument           *pDoc;
     ScBroadcastArea      *pUpdateChain;
     ScBroadcastArea      *pEOUpdateChain;
-    ULONG                 nInBulkBroadcast;
+    sal_uLong                 nInBulkBroadcast;
 
     inline SCSIZE		ComputeSlotOffset( const ScAddress& rAddress ) const;
     void				ComputeAreaPoints( const ScRange& rRange,
@@ -259,9 +259,9 @@ public:
                                             SvtListener* pListener );
     void				EndListeningArea( const ScRange& rRange,
                                             SvtListener* pListener );
-    BOOL				AreaBroadcast( const ScHint& rHint ) const;
+    sal_Bool				AreaBroadcast( const ScHint& rHint ) const;
         // return: at least one broadcast occurred
-    BOOL                AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const;
+    sal_Bool                AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const;
     void				DelBroadcastAreasInRange( const ScRange& rRange );
     void				UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
                                             const ScRange& rRange,
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 7450b284f..6e2b02778 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -41,16 +41,16 @@ class SvStream;
 class ScDdeLink : public ::sfx2::SvBaseLink, public SvtBroadcaster
 {
 private:
-static BOOL	bIsInUpdate;
+static sal_Bool	bIsInUpdate;
 
     ScDocument*		pDoc;
 
     String			aAppl;			// Verbindungsdaten
     String			aTopic;
     String			aItem;
-    BYTE			nMode;			// Zahlformat-Modus
+    sal_uInt8			nMode;			// Zahlformat-Modus
 
-    BOOL			bNeedUpdate;	// wird gesetzt, wenn Update nicht moeglich war
+    sal_Bool			bNeedUpdate;	// wird gesetzt, wenn Update nicht moeglich war
 
     ScMatrixRef		pResult;		// Ergebnis
 
@@ -59,7 +59,7 @@ public:
 
             ScDdeLink( ScDocument* pD,
                         const String& rA, const String& rT, const String& rI,
-                        BYTE nM );
+                        sal_uInt8 nM );
             ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& rHdr );
             ScDdeLink( ScDocument* pD, const ScDdeLink& rOther );
     virtual ~ScDdeLink();
@@ -84,14 +84,14 @@ public:
     const String&	GetAppl() const		{ return aAppl; }
     const String&	GetTopic() const	{ return aTopic; }
     const String&	GetItem() const		{ return aItem; }
-    BYTE			GetMode() const		{ return nMode; }
+    sal_uInt8			GetMode() const		{ return nMode; }
 
     void			ResetValue();			// Wert zuruecksetzen
     void			TryUpdate();
 
-    BOOL			NeedsUpdate() const { return bNeedUpdate; }
+    sal_Bool			NeedsUpdate() const { return bNeedUpdate; }
 
-    static BOOL		IsInUpdate()		{ return bIsInUpdate; }
+    static sal_Bool		IsInUpdate()		{ return bIsInUpdate; }
 };
 
 
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index d80573a60..e11a4ccae 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -53,14 +53,14 @@ struct ScCompare
 {
     double  nVal[2];
     String* pVal[2];
-    BOOL    bVal[2];
-    BOOL    bEmpty[2];
+    sal_Bool    bVal[2];
+    sal_Bool    bEmpty[2];
         ScCompare( String* p1, String* p2 )
         {
             pVal[ 0 ] = p1;
             pVal[ 1 ] = p2;
-            bEmpty[0] = FALSE;
-            bEmpty[1] = FALSE;
+            bEmpty[0] = sal_False;
+            bEmpty[1] = sal_False;
         }
 };
 
@@ -125,9 +125,9 @@ public:
 
     /// Could string be a regular expression?
     /// If pDoc!=NULL the document options are taken into account and if
-    /// RegularExpressions are disabled the function returns FALSE regardless
+    /// RegularExpressions are disabled the function returns sal_False regardless
     /// of the string content.
-    static BOOL MayBeRegExp( const String& rStr, const ScDocument* pDoc );
+    static sal_Bool MayBeRegExp( const String& rStr, const ScDocument* pDoc );
 
     /// Fail safe division, returning an errDivisionByZero coded into a double
     /// if denominator is 0.0
@@ -136,7 +136,7 @@ public:
     ScMatrixRef GetNewMat(SCSIZE nC, SCSIZE nR);
 private:
     static ScTokenStack*    pGlobalStack;
-    static BOOL             bGlobalStackInUse;
+    static sal_Bool             bGlobalStackInUse;
 
     formula::FormulaTokenIterator aCode;
     ScAddress   aPos;
@@ -153,26 +153,26 @@ private:
     String      aTempStr;               // for GetString()
     ScTokenStack* pStackObj;            // contains the stacks
     formula::FormulaToken**   pStack;                 // the current stack
-    USHORT      nGlobalError;           // global (local to this formula expression) error
-    USHORT      sp;                     // stack pointer
-    USHORT      maxsp;                  // the maximal used stack pointer
-    ULONG       nFuncFmtIndex;          // NumberFormatIndex of a function
-    ULONG       nCurFmtIndex;           // current NumberFormatIndex
-    ULONG       nRetFmtIndex;           // NumberFormatIndex of an expression, if any
+    sal_uInt16      nGlobalError;           // global (local to this formula expression) error
+    sal_uInt16      sp;                     // stack pointer
+    sal_uInt16      maxsp;                  // the maximal used stack pointer
+    sal_uLong       nFuncFmtIndex;          // NumberFormatIndex of a function
+    sal_uLong       nCurFmtIndex;           // current NumberFormatIndex
+    sal_uLong       nRetFmtIndex;           // NumberFormatIndex of an expression, if any
     short       nFuncFmtType;           // NumberFormatType of a function
     short       nCurFmtType;            // current NumberFormatType
     short       nRetFmtType;            // NumberFormatType of an expression
-    USHORT      mnStringNoValueError;   // the error set in ConvertStringToValue() if no value
-    BOOL        glSubTotal;             // flag for subtotal functions
-    BYTE        cPar;                   // current count of parameters
-    BOOL        bCalcAsShown;           // precision as shown
-    BOOL        bMatrixFormula;         // formula cell is a matrix formula
+    sal_uInt16      mnStringNoValueError;   // the error set in ConvertStringToValue() if no value
+    sal_Bool        glSubTotal;             // flag for subtotal functions
+    sal_uInt8        cPar;                   // current count of parameters
+    sal_Bool        bCalcAsShown;           // precision as shown
+    sal_Bool        bMatrixFormula;         // formula cell is a matrix formula
 
 //---------------------------------Funktionen in interpre.cxx---------
 // nMust <= nAct <= nMax ? ok : PushError
-inline BOOL MustHaveParamCount( short nAct, short nMust );
-inline BOOL MustHaveParamCount( short nAct, short nMust, short nMax );
-inline BOOL MustHaveParamCountMin( short nAct, short nMin );
+inline sal_Bool MustHaveParamCount( short nAct, short nMust );
+inline sal_Bool MustHaveParamCount( short nAct, short nMust, short nMax );
+inline sal_Bool MustHaveParamCountMin( short nAct, short nMin );
 void PushParameterExpected();
 void PushIllegalParameter();
 void PushIllegalArgument();
@@ -183,8 +183,8 @@ void PushNA();
 //-------------------------------------------------------------------------
 void ReplaceCell( ScAddress& );     // for TableOp
 void ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab );  // for TableOp
-BOOL IsTableOpInRange( const ScRange& );
-ULONG GetCellNumberFormat( const ScAddress&, const ScBaseCell* );
+sal_Bool IsTableOpInRange( const ScRange& );
+sal_uLong GetCellNumberFormat( const ScAddress&, const ScBaseCell* );
 double ConvertStringToValue( const String& );
 double GetCellValue( const ScAddress&, const ScBaseCell* );
 double GetCellValueOrZero( const ScAddress&, const ScBaseCell* );
@@ -192,26 +192,26 @@ double GetValueCellValue( const ScAddress&, const ScValueCell* );
 ScBaseCell* GetCell( const ScAddress& rPos )
     { return pDok->GetCell( rPos ); }
 void GetCellString( String& rStr, const ScBaseCell* pCell );
-inline USHORT GetCellErrCode( const ScBaseCell* pCell )
+inline sal_uInt16 GetCellErrCode( const ScBaseCell* pCell )
     { return pCell ? pCell->GetErrorCode() : 0; }
 inline CellType GetCellType( const ScBaseCell* pCell )
     { return pCell ? pCell->GetCellType() : CELLTYPE_NONE; }
 /// Really empty or inherited emptiness.
-inline BOOL HasCellEmptyData( const ScBaseCell* pCell )
-    { return pCell ? pCell->HasEmptyData() : TRUE; }
+inline sal_Bool HasCellEmptyData( const ScBaseCell* pCell )
+    { return pCell ? pCell->HasEmptyData() : sal_True; }
 /// This includes inherited emptiness, which usually is regarded as value!
-inline BOOL HasCellValueData( const ScBaseCell* pCell )
-    { return pCell ? pCell->HasValueData() : FALSE; }
+inline sal_Bool HasCellValueData( const ScBaseCell* pCell )
+    { return pCell ? pCell->HasValueData() : sal_False; }
 /// Not empty and not value.
-inline BOOL HasCellStringData( const ScBaseCell* pCell )
-    { return pCell ? pCell->HasStringData() : FALSE; }
+inline sal_Bool HasCellStringData( const ScBaseCell* pCell )
+    { return pCell ? pCell->HasStringData() : sal_False; }
 
-BOOL CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
-                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2, BYTE* pCellArr);
-BOOL CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
-                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2, BYTE* pCellArr);
-BOOL CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
-                   SCCOL nCol2, SCROW nRow2, SCTAB nTab2, BYTE* pCellArr);
+sal_Bool CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr);
+sal_Bool CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr);
+sal_Bool CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+                   SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr);
 
 //-----------------------------------------------------------------------------
 // Stack operations
@@ -266,7 +266,7 @@ inline bool IfErrorPushError()
     result. Also obtain number format and type if _both_, type and index
     pointer, are not NULL. */
 void PushCellResultToken( bool bDisplayEmptyAsString, const ScAddress & rAddress,
-        short * pRetTypeExpr, ULONG * pRetIndexExpr );
+        short * pRetTypeExpr, sal_uLong * pRetIndexExpr );
 
 formula::FormulaTokenRef PopToken();
 void Pop();
@@ -279,7 +279,7 @@ void ValidateRef( const ScRefList & rRefList );
 void SingleRefToVars( const ScSingleRefData & rRef, SCCOL & rCol, SCROW & rRow, SCTAB & rTab );
 void PopSingleRef( ScAddress& );
 void PopSingleRef(SCCOL& rCol, SCROW &rRow, SCTAB& rTab);
-void DoubleRefToRange( const ScComplexRefData&, ScRange&, BOOL bDontCheckForTableOp = FALSE );
+void DoubleRefToRange( const ScComplexRefData&, ScRange&, sal_Bool bDontCheckForTableOp = sal_False );
 /** If formula::StackVar formula::svDoubleRef pop ScDoubleRefToken and return values of
     ScComplexRefData.
     Else if StackVar svRefList return values of the ScComplexRefData where
@@ -289,26 +289,26 @@ void DoubleRefToRange( const ScComplexRefData&, ScRange&, BOOL bDontCheckForTabl
     while(nParamCount--) PopDoubleRef(aRange,nParamCount,nRefInList);
   */
 void PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRefInList );
-void PopDoubleRef( ScRange&, BOOL bDontCheckForTableOp = FALSE );
+void PopDoubleRef( ScRange&, sal_Bool bDontCheckForTableOp = sal_False );
 void DoubleRefToVars( const ScToken* p,
         SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
         SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
-        BOOL bDontCheckForTableOp = FALSE );
+        sal_Bool bDontCheckForTableOp = sal_False );
 ScDBRangeBase* PopDoubleRef();
 void PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
                           SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
-                          BOOL bDontCheckForTableOp = FALSE );
-BOOL PopDoubleRefOrSingleRef( ScAddress& rAdr );
+                          sal_Bool bDontCheckForTableOp = sal_False );
+sal_Bool PopDoubleRefOrSingleRef( ScAddress& rAdr );
 void PopDoubleRefPushMatrix();
 // If MatrixFormula: convert formula::svDoubleRef to svMatrix, create JumpMatrix.
 // Else convert area reference parameters marked as ForceArray to array.
-// Returns TRUE if JumpMatrix created.
+// Returns sal_True if JumpMatrix created.
 bool ConvertMatrixParameters();
 inline void MatrixDoubleRefToMatrix();      // if MatrixFormula: PopDoubleRefPushMatrix
 // If MatrixFormula or ForceArray: ConvertMatrixParameters()
 inline bool MatrixParameterConversion();
 ScMatrixRef PopMatrix();
-//void PushByte(BYTE nVal);
+//void PushByte(sal_uInt8 nVal);
 void PushDouble(double nVal);
 void PushInt( int nVal );
 void PushStringBuffer( const sal_Unicode* pString );
@@ -317,20 +317,20 @@ void PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab);
 void PushDoubleRef(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                  SCCOL nCol2, SCROW nRow2, SCTAB nTab2);
 void PushMatrix(ScMatrix* pMat);
-void PushError( USHORT nError );
+void PushError( sal_uInt16 nError );
 /// Raw stack type without default replacements.
 formula::StackVar GetRawStackType();
 /// Stack type with replacement of defaults, e.g. svMissing and formula::svEmptyCell will result in formula::svDouble.
 formula::StackVar GetStackType();
 // peek StackType of Parameter, Parameter 1 == TOS, 2 == TOS-1, ...
-formula::StackVar GetStackType( BYTE nParam );
-BYTE GetByte() { return cPar; }
+formula::StackVar GetStackType( sal_uInt8 nParam );
+sal_uInt8 GetByte() { return cPar; }
 // generiert aus DoubleRef positionsabhaengige SingleRef
-BOOL DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr );
+sal_Bool DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr );
 double GetDouble();
 double GetDoubleWithDefault(double nDefault);
-BOOL IsMissing();
-BOOL GetBool() { return GetDouble() != 0.0; }
+sal_Bool IsMissing();
+sal_Bool GetBool() { return GetDouble() != 0.0; }
 const String& GetString();
 // pop matrix and obtain one element, upper left or according to jump matrix
 ScMatValType GetDoubleOrStringFromMatrix( double& rDouble, String& rString );
@@ -344,15 +344,15 @@ void ScTableOp();                                       // Mehrfachoperationen
 void ScErrCell();                                       // Sonderbehandlung
                                                         // Fehlerzelle
 //-----------------------------allgemeine Hilfsfunktionen
-void SetMaxIterationCount(USHORT n);
+void SetMaxIterationCount(sal_uInt16 n);
 inline void CurFmtToFuncFmt()
     { nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; }
 // Check for String overflow of rResult+rAdd and set error and erase rResult
-// if so. Return TRUE if ok, FALSE if overflow
-inline BOOL CheckStringResultLen( String& rResult, const String& rAdd );
+// if so. Return sal_True if ok, sal_False if overflow
+inline sal_Bool CheckStringResultLen( String& rResult, const String& rAdd );
 // Set error according to rVal, and set rVal to 0.0 if there was an error.
 inline void TreatDoubleError( double& rVal );
-// Lookup using ScLookupCache, @returns TRUE if found and result address
+// Lookup using ScLookupCache, @returns sal_True if found and result address
 bool LookupQueryWithCache( ScAddress & o_rResultPos,
         const ScQueryParam & rParam ) const;
 
@@ -449,20 +449,20 @@ void ScJis();
 void ScAsc();
 void ScUnicode();
 void ScUnichar();
-void ScMin( BOOL bTextAsZero = FALSE );
-void ScMax( BOOL bTextAsZero = FALSE );
-double IterateParameters( ScIterFunc, BOOL bTextAsZero = FALSE );
+void ScMin( sal_Bool bTextAsZero = sal_False );
+void ScMax( sal_Bool bTextAsZero = sal_False );
+double IterateParameters( ScIterFunc, sal_Bool bTextAsZero = sal_False );
 void ScSumSQ();
 void ScSum();
 void ScProduct();
-void ScAverage( BOOL bTextAsZero = FALSE );
+void ScAverage( sal_Bool bTextAsZero = sal_False );
 void ScCount();
 void ScCount2();
-void GetStVarParams( double& rVal, double& rValCount, BOOL bTextAsZero = FALSE );
-void ScVar( BOOL bTextAsZero = FALSE );
-void ScVarP( BOOL bTextAsZero = FALSE );
-void ScStDev( BOOL bTextAsZero = FALSE );
-void ScStDevP( BOOL bTextAsZero = FALSE );
+void GetStVarParams( double& rVal, double& rValCount, sal_Bool bTextAsZero = sal_False );
+void ScVar( sal_Bool bTextAsZero = sal_False );
+void ScVarP( sal_Bool bTextAsZero = sal_False );
+void ScStDev( sal_Bool bTextAsZero = sal_False );
+void ScStDevP( sal_Bool bTextAsZero = sal_False );
 void ScColumns();
 void ScRows();
 void ScTables();
@@ -478,13 +478,13 @@ void ScHLookup();
 void ScVLookup();
 void ScSubTotal();
 
-// If upon call rMissingField==TRUE then the database field parameter may be
+// If upon call rMissingField==sal_True then the database field parameter may be
 // missing (Xcl DCOUNT() syntax), or may be faked as missing by having the
 // value 0.0 or being exactly the entire database range reference (old SO
-// compatibility). If this was the case then rMissingField is set to TRUE upon
-// return. If rMissingField==FALSE upon call all "missing cases" are considered
+// compatibility). If this was the case then rMissingField is set to sal_True upon
+// return. If rMissingField==sal_False upon call all "missing cases" are considered
 // to be an error.
-ScDBQueryParamBase* GetDBParams( BOOL& rMissingField );
+ScDBQueryParamBase* GetDBParams( sal_Bool& rMissingField );
 
 void DBIterator( ScIterFunc );
 void ScDBSum();
@@ -522,8 +522,8 @@ void ScConcat();
 void ScExternal();
 void ScMissing();
 void ScMacro();
-BOOL SetSbxVariable( SbxVariable* pVar, const ScAddress& );
-BOOL SetSbxVariable( SbxVariable* pVar, SCCOL nCol, SCROW nRow, SCTAB nTab );
+sal_Bool SetSbxVariable( SbxVariable* pVar, const ScAddress& );
+sal_Bool SetSbxVariable( SbxVariable* pVar, SCCOL nCol, SCROW nRow, SCTAB nTab );
 void ScErrorType();
 void ScDBArea();
 void ScColRowNameAuto();
@@ -537,13 +537,13 @@ void ScTTT();
 
 /** Obtain the date serial number for a given date.
     @param bStrict
-        If FALSE, nYear < 100 takes the two-digit year setting into account, 
+        If sal_False, nYear < 100 takes the two-digit year setting into account, 
         and rollover of invalid calendar dates takes place, e.g. 1999-02-31 => 
         1999-03-03.
-        If TRUE, the date passed must be a valid Gregorian calendar date. No 
+        If sal_True, the date passed must be a valid Gregorian calendar date. No 
         two-digit expanding or rollover is done.
  */
-double GetDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, bool bStrict );
+double GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool bStrict );
 
 void ScGetActDate();
 void ScGetActTime();
@@ -653,28 +653,28 @@ void ScSumX2DY2();
 void ScSumXMY2();
 void ScGrowth();
 // multiple Regression: Varianzen der Koeffizienten
-BOOL RGetVariances( ScMatrix* pV, ScMatrix* pX, SCSIZE nC, SCSIZE nR,
-    BOOL bSwapColRow, BOOL bZeroConstant );
-void Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef& pQ,ScMatrixRef& pV,ScMatrixRef& pMatX,BOOL bConstant,SCSIZE N,SCSIZE M,BYTE nCase);
-ScMatrixRef Calculate2(const BOOL bConstant,const SCSIZE M ,const SCSIZE N,ScMatrixRef& pMatX,ScMatrixRef& pMatY,BYTE nCase);
+sal_Bool RGetVariances( ScMatrix* pV, ScMatrix* pX, SCSIZE nC, SCSIZE nR,
+    sal_Bool bSwapColRow, sal_Bool bZeroConstant );
+void Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef& pQ,ScMatrixRef& pV,ScMatrixRef& pMatX,sal_Bool bConstant,SCSIZE N,SCSIZE M,sal_uInt8 nCase);
+ScMatrixRef Calculate2(const sal_Bool bConstant,const SCSIZE M ,const SCSIZE N,ScMatrixRef& pMatX,ScMatrixRef& pMatY,sal_uInt8 nCase);
 bool Calculate3(const SCSIZE M ,ScMatrixRef& pQ);
-bool Calculate4(BOOL _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,BOOL bConstant,SCSIZE N,SCSIZE M);
+bool Calculate4(sal_Bool _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,sal_Bool bConstant,SCSIZE N,SCSIZE M);
 bool CalculateSkew(double& fSum,double& fCount,double& vSum,std::vector<double>& values);
-void CalculateSlopeIntercept(BOOL bSlope);
-void CalculateSmallLarge(BOOL bSmall);
-void CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy);
-bool CalculateTest( BOOL _bTemplin
+void CalculateSlopeIntercept(sal_Bool bSlope);
+void CalculateSmallLarge(sal_Bool bSmall);
+void CalculatePearsonCovar(sal_Bool _bPearson,sal_Bool _bStexy);
+bool CalculateTest( sal_Bool _bTemplin
                    ,const SCSIZE nC1, const SCSIZE nC2,const SCSIZE nR1,const SCSIZE nR2
                    ,const ScMatrixRef& pMat1,const ScMatrixRef& pMat2
                    ,double& fT,double& fF);
-void CalculateLookup(BOOL HLookup);
+void CalculateLookup(sal_Bool HLookup);
 bool FillEntry(ScQueryEntry& rEntry);
-void CalculateAddSub(BOOL _bSub);
-void CalculateTrendGrowth(BOOL _bGrowth);
-void CalulateRGPRKP(BOOL _bRKP);
-void CalculateSumX2MY2SumX2DY2(BOOL _bSumX2DY2);
+void CalculateAddSub(sal_Bool _bSub);
+void CalculateTrendGrowth(sal_Bool _bGrowth);
+void CalulateRGPRKP(sal_Bool _bRKP);
+void CalculateSumX2MY2SumX2DY2(sal_Bool _bSumX2DY2);
 void CalculateMatrixValue(const ScMatrix* pMat,SCSIZE nC,SCSIZE nR);
-bool CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY);
+bool CheckMatrix(sal_Bool _bLOG,sal_Bool _bTrendGrowth,sal_uInt8& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY);
 
 void ScRGP();
 void ScRKP();
@@ -685,7 +685,7 @@ void ScBadName();
 // Statistik:
 double phi(double x);
 double integralPhi(double x);
-double taylor(double* pPolynom, USHORT nMax, double x);
+double taylor(double* pPolynom, sal_uInt16 nMax, double x);
 double gauss(double x);
 double gaussinv(double x);
 double GetBetaDist(double x, double alpha, double beta);  //cumulative distribution function
@@ -744,8 +744,8 @@ void ScSkew();
 void ScMedian();
 double GetMedian( ::std::vector<double> & rArray );
 double GetPercentile( ::std::vector<double> & rArray, double fPercentile );
-void GetNumberSequenceArray( BYTE nParamCount, ::std::vector<double>& rArray );
-void GetSortArray(BYTE nParamCount, ::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder = NULL);
+void GetNumberSequenceArray( sal_uInt8 nParamCount, ::std::vector<double>& rArray );
+void GetSortArray(sal_uInt8 nParamCount, ::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder = NULL);
 void QuickSort(::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder = NULL);
 void ScModalValue();
 void ScAveDev();
@@ -796,17 +796,17 @@ public:
 
     formula::StackVar Interpret();
 
-    void SetError(USHORT nError)
+    void SetError(sal_uInt16 nError)
             { if (nError && !nGlobalError) nGlobalError = nError; }
 
-    USHORT GetError()                               const   { return nGlobalError; }
+    sal_uInt16 GetError()                               const   { return nGlobalError; }
     formula::StackVar  GetResultType()              const   { return xResult->GetType(); }
     const String&   GetStringResult()               const   { return xResult->GetString(); }
     double          GetNumResult()                  const   { return xResult->GetDouble(); }
     formula::FormulaTokenRef 
                     GetResultToken()                const   { return xResult; }
     short           GetRetFormatType()              const   { return nRetFmtType; }
-    ULONG           GetRetFormatIndex()             const   { return nRetFmtIndex; }
+    sal_uLong           GetRetFormatIndex()             const   { return nRetFmtIndex; }
 };
 
 
@@ -836,48 +836,48 @@ inline ScTokenMatrixMap& ScInterpreter::GetTokenMatrixMap()
 }
 
 
-inline BOOL ScInterpreter::MustHaveParamCount( short nAct, short nMust )
+inline sal_Bool ScInterpreter::MustHaveParamCount( short nAct, short nMust )
 {
     if ( nAct == nMust )
-        return TRUE;
+        return sal_True;
     if ( nAct < nMust )
         PushParameterExpected();
     else
         PushIllegalParameter();
-    return FALSE;
+    return sal_False;
 }
 
 
-inline BOOL ScInterpreter::MustHaveParamCount( short nAct, short nMust, short nMax )
+inline sal_Bool ScInterpreter::MustHaveParamCount( short nAct, short nMust, short nMax )
 {
     if ( nMust <= nAct && nAct <= nMax )
-        return TRUE;
+        return sal_True;
     if ( nAct < nMust )
         PushParameterExpected();
     else
         PushIllegalParameter();
-    return FALSE;
+    return sal_False;
 }
 
 
-inline BOOL ScInterpreter::MustHaveParamCountMin( short nAct, short nMin )
+inline sal_Bool ScInterpreter::MustHaveParamCountMin( short nAct, short nMin )
 {
     if ( nAct >= nMin )
-        return TRUE;
+        return sal_True;
     PushParameterExpected();
-    return FALSE;
+    return sal_False;
 }
 
 
-inline BOOL ScInterpreter::CheckStringResultLen( String& rResult, const String& rAdd )
+inline sal_Bool ScInterpreter::CheckStringResultLen( String& rResult, const String& rAdd )
 {
-    if ( (ULONG) rResult.Len() + rAdd.Len() > STRING_MAXLEN )
+    if ( (sal_uLong) rResult.Len() + rAdd.Len() > STRING_MAXLEN )
     {
         SetError( errStringOverflow );
         rResult.Erase();
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -885,7 +885,7 @@ inline void ScInterpreter::TreatDoubleError( double& rVal )
 {
     if ( !::rtl::math::isFinite( rVal ) )
     {
-        USHORT nErr = GetDoubleErrorValue( rVal );
+        sal_uInt16 nErr = GetDoubleErrorValue( rVal );
         if ( nErr )
             SetError( nErr );
         else
diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx
index 36c20beba..3f5ab2f41 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -122,7 +122,7 @@ public:
                                             short nStart, short nNext,
                                             short nStop = SHRT_MAX )
                                     {
-                                        pJump[ (ULONG)nCol * nRows + nRow ].
+                                        pJump[ (sal_uLong)nCol * nRows + nRow ].
                                             SetJump( fBool, nStart, nNext, nStop);
                                     }
             void                GetJump( SCSIZE nCol, SCSIZE nRow, double& rBool,
@@ -144,15 +144,15 @@ public:
                                             nCol = 0;
                                             nRow = 0;
                                         }
-                                        pJump[ (ULONG)nCol * nRows + nRow ].
+                                        pJump[ (sal_uLong)nCol * nRows + nRow ].
                                             GetJump( rBool, rStart, rNext, rStop);
                                     }
             void                SetAllJumps( double fBool,
                                             short nStart, short nNext,
                                             short nStop = SHRT_MAX )
                                     {
-                                        ULONG n = (ULONG)nCols * nRows;
-                                        for ( ULONG j=0; j<n; ++j )
+                                        sal_uLong n = (sal_uLong)nCols * nRows;
+                                        for ( sal_uLong j=0; j<n; ++j )
                                         {
                                             pJump[ j ].SetJump( fBool, nStart,
                                                     nNext, nStop);
diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index eaf794d98..16bf7c41b 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -88,7 +88,7 @@ public:
                                     @param nParameter
                                         Which parameter, 0-based */
     static  Type                GetParameterType( const formula::FormulaToken* pToken,
-                                        USHORT nParameter);
+                                        sal_uInt16 nParameter);
 
                                 /** Whether OpCode has a parameter of type
                                     ForceArray or ReferenceOrForceArray. */
@@ -124,7 +124,7 @@ private:
     struct RunData
     {
         CommonData  aData;
-        BYTE        nMinParams;         // fix or minimum, or repeat start
+        sal_uInt8        nMinParams;         // fix or minimum, or repeat start
         bool        bHasForceArray;
     };
 
@@ -133,7 +133,7 @@ private:
 
     // ocExternal AddIns
     static  Type                GetExternalParameterType(
-                                    const formula::FormulaToken* pToken, USHORT nParameter);
+                                    const formula::FormulaToken* pToken, sal_uInt16 nParameter);
 
 #if OSL_DEBUG_LEVEL > 1
     // Generate documentation to stdout if environment variable
@@ -151,14 +151,14 @@ private:
 
                                 /** Minimum number of parameters, or fix number
                                     of parameters if HasRepeatParameters()
-                                    returns FALSE. For opcodes not specified in
+                                    returns sal_False. For opcodes not specified in
                                     the implementation a parameter count of 1
                                     is assumed, for opcodes out of range 0 is
                                     assumed. If HasRepeatParameters() returns
-                                    TRUE, information is NOT related to whether
+                                    sal_True, information is NOT related to whether
                                     any parameters are optional, only the type
                                     of parameters is significant. */
-    static  inline  BYTE        GetMinimumParameters( OpCode eOp)
+    static  inline  sal_uInt8        GetMinimumParameters( OpCode eOp)
                                     {
                                         if ( eOp <= SC_OPCODE_LAST_OPCODE_ID )
                                             return pData[eOp].aData.nParam[0]
diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx
index d27bcb273..19975987d 100644
--- a/sc/source/core/inc/refupdat.hxx
+++ b/sc/source/core/inc/refupdat.hxx
@@ -63,7 +63,7 @@ public:
 
     static ScRefUpdateRes Update( UpdateRefMode eUpdateRefMode,
                                 const ScBigRange& rWhere,
-                                INT32 nDx, INT32 nDy, INT32 nDz,
+                                sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz,
                                 ScBigRange& rWhat );
 
     /// Before calling, the absolute references must be up-to-date!
@@ -76,7 +76,7 @@ public:
     /// Before calling, the absolute references must be up-to-date!
     static ScRefUpdateRes Move( ScDocument* pDoc, const ScAddress& rPos,
                                 SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                ScComplexRefData& rRef, BOOL bWrap, BOOL bAbsolute );
+                                ScComplexRefData& rRef, sal_Bool bWrap, sal_Bool bAbsolute );
 
     static void MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos, 
                              SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData& rRef );
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index b13878dab..875dfa7ec 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -83,7 +83,7 @@ using namespace com::sun::star;
 
 ScUnoAddInFuncData::ScUnoAddInFuncData( const String& rNam, const String& rLoc,
                                         const String& rDesc,
-                                        USHORT nCat, const rtl::OString& sHelp,
+                                        sal_uInt16 nCat, const rtl::OString& sHelp,
                                         const uno::Reference<reflection::XIdlMethod>& rFunc,
                                         const uno::Any& rO,
                                         long nAC, const ScAddInArgDesc* pAD,
@@ -99,7 +99,7 @@ ScUnoAddInFuncData::ScUnoAddInFuncData( const String& rNam, const String& rLoc,
     nCallerPos( nCP ),
     nCategory( nCat ),
     sHelpId( sHelp ),
-    bCompInitialized( FALSE )
+    bCompInitialized( sal_False )
 {
     if ( nArgCount )
     {
@@ -152,7 +152,7 @@ const uno::Sequence<sheet::LocalizedName>& ScUnoAddInFuncData::GetCompNames() co
             }
         }
 
-        bCompInitialized = TRUE;        // also if not successful
+        bCompInitialized = sal_True;        // also if not successful
     }
     return aCompNames;
 }
@@ -179,10 +179,10 @@ void ScUnoAddInFuncData::SetCompNames( const uno::Sequence< sheet::LocalizedName
         }
     }
 
-    bCompInitialized = TRUE;
+    bCompInitialized = sal_True;
 }
 
-BOOL ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, String& rRetExcelName ) const
+sal_Bool ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, String& rRetExcelName ) const
 {
     const uno::Sequence<sheet::LocalizedName>& rSequence = GetCompNames();
     long nSeqLen = rSequence.getLength();
@@ -203,7 +203,7 @@ BOOL ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, String& rRetExcel
                     pArray[i].Locale.Country  == aUserCountry )
             {
                 rRetExcelName = pArray[i].Name;
-                return TRUE;
+                return sal_True;
             }
 
         //  second: check only language
@@ -212,7 +212,7 @@ BOOL ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, String& rRetExcel
             if ( pArray[i].Locale.Language == aUserLang )
             {
                 rRetExcelName = pArray[i].Name;
-                return TRUE;
+                return sal_True;
             }
 
         // third: #i57772# fall-back to en-US
@@ -223,9 +223,9 @@ BOOL ScUnoAddInFuncData::GetExcelName( LanguageType eDestLang, String& rRetExcel
         //  forth: use first (default) entry
 
         rRetExcelName = pArray[0].Name;
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 void ScUnoAddInFuncData::SetFunction( const uno::Reference< reflection::XIdlMethod>& rNewFunc, const uno::Any& rNewObj )
@@ -262,7 +262,7 @@ ScUnoAddInCollection::ScUnoAddInCollection() :
     pExactHashMap( NULL ),
     pNameHashMap( NULL ),
     pLocalHashMap( NULL ),
-    bInitialized( FALSE )
+    bInitialized( sal_False )
 {
 }
 
@@ -285,7 +285,7 @@ void ScUnoAddInCollection::Clear()
     ppFuncData = NULL;
     nFuncCount = 0;
 
-    bInitialized = FALSE;
+    bInitialized = sal_False;
 }
 
 uno::Reference<uno::XComponentContext> getContext(uno::Reference<lang::XMultiServiceFactory> xMSF)
@@ -358,11 +358,11 @@ void ScUnoAddInCollection::Initialize()
     // when argument information is needed).
     ReadConfiguration();
 
-    bInitialized = TRUE;        // with or without functions
+    bInitialized = sal_True;        // with or without functions
 }
 // -----------------------------------------------------------------------------
 
-USHORT lcl_GetCategory( const String& rName )
+sal_uInt16 lcl_GetCategory( const String& rName )
 {
     static const sal_Char* aFuncNames[SC_FUNCGROUP_COUNT] =
     {
@@ -380,7 +380,7 @@ USHORT lcl_GetCategory( const String& rName )
         "Text",             // ID_FUNCTION_GRP_TEXT
         "Add-In"            // ID_FUNCTION_GRP_ADDINS
     };
-    for (USHORT i=0; i<SC_FUNCGROUP_COUNT; i++)
+    for (sal_uInt16 i=0; i<SC_FUNCGROUP_COUNT; i++)
         if ( rName.EqualsAscii( aFuncNames[i] ) )
             return i+1;                             // IDs start at 1
 
@@ -474,7 +474,7 @@ void ScUnoAddInCollection::ReadConfiguration()
             {
                 rtl::OUString aLocalName;
                 rtl::OUString aDescription;
-                USHORT nCategory = ID_FUNCTION_GRP_ADDINS;
+                sal_uInt16 nCategory = ID_FUNCTION_GRP_ADDINS;
 
                 // get direct information on the function
 
@@ -588,7 +588,7 @@ void ScUnoAddInCollection::ReadConfiguration()
 
                         ScAddInArgDesc aDesc;
                         aDesc.eType = SC_ADDINARG_NONE;     // arg type is not in configuration
-                        aDesc.bOptional = FALSE;
+                        aDesc.bOptional = sal_False;
 
                         nVisibleCount = nArgumentCount;
                         pVisibleArgs = new ScAddInArgDesc[nVisibleCount];
@@ -660,16 +660,16 @@ void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData )
     }
 }
 
-BOOL ScUnoAddInCollection::GetExcelName( const String& rCalcName,
+sal_Bool ScUnoAddInCollection::GetExcelName( const String& rCalcName,
                                         LanguageType eDestLang, String& rRetExcelName )
 {
     const ScUnoAddInFuncData* pFuncData = GetFuncData( rCalcName );
     if ( pFuncData )
         return pFuncData->GetExcelName( eDestLang, rRetExcelName);
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScUnoAddInCollection::GetCalcName( const String& rExcelName, String& rRetCalcName )
+sal_Bool ScUnoAddInCollection::GetCalcName( const String& rExcelName, String& rRetCalcName )
 {
     if (!bInitialized)
         Initialize();
@@ -694,24 +694,24 @@ BOOL ScUnoAddInCollection::GetCalcName( const String& rExcelName, String& rRetCa
 
                         //  use the first function that has this name for any language
                         rRetCalcName = pFuncData->GetOriginalName();
-                        return TRUE;
+                        return sal_True;
                     }
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-inline BOOL IsTypeName( const rtl::OUString& rName, const uno::Type& rType )
+inline sal_Bool IsTypeName( const rtl::OUString& rName, const uno::Type& rType )
 {
     return rName == rType.getTypeName();
 }
 
-BOOL lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass>& xClass )
+sal_Bool lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass>& xClass )
 {
     //  this must match with ScUnoAddInCall::SetResult
 
-    if ( !xClass.is() ) return FALSE;
+    if ( !xClass.is() ) return sal_False;
 
     switch (xClass->getTypeClass())
     {
@@ -730,7 +730,7 @@ BOOL lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass>& xClass )
         case uno::TypeClass_FLOAT:
         case uno::TypeClass_DOUBLE:
         case uno::TypeClass_STRING:
-            return TRUE;                        // values or string
+            return sal_True;                        // values or string
 
         case uno::TypeClass_INTERFACE:
             {
@@ -750,13 +750,13 @@ BOOL lcl_ValidReturnType( const uno::Reference<reflection::XIdlClass>& xClass )
 
                 rtl::OUString sName = xClass->getName();
                 return (
-                    IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<INT32> >*)0) ) ||
+                    IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<sal_Int32> >*)0) ) ||
                     IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<double> >*)0) ) ||
                     IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<rtl::OUString> >*)0) ) ||
                     IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<uno::Any> >*)0) ) );
             }
     }
-    return FALSE;
+    return sal_False;
 }
 
 ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdlClass>& xClass )
@@ -778,7 +778,7 @@ ScAddInArgumentType lcl_GetArgType( const uno::Reference<reflection::XIdlClass>&
     //! XIdlClass needs getType() method!
     rtl::OUString sName = xClass->getName();
 
-    if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<INT32> >*)0) ))
+    if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<sal_Int32> >*)0) ))
         return SC_ADDINARG_INTEGER_ARRAY;
 
     if (IsTypeName( sName, getCppuType((uno::Sequence< uno::Sequence<double> >*)0) ))
@@ -873,7 +873,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                 //  leave out internal functions
                                 uno::Reference<reflection::XIdlClass> xClass =
                                                 xFunc->getDeclaringClass();
-                                BOOL bSkip = TRUE;
+                                sal_Bool bSkip = sal_True;
                                 if ( xClass.is() )
                                 {
                                     //! XIdlClass needs getType() method!
@@ -895,7 +895,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                     uno::Reference<reflection::XIdlClass> xReturn =
                                                 xFunc->getReturnType();
                                     if ( !lcl_ValidReturnType( xReturn ) )
-                                        bSkip = TRUE;
+                                        bSkip = sal_True;
                                 }
                                 if (!bSkip)
                                 {
@@ -906,7 +906,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                     aFuncName += '.';
                                     aFuncName += String( aFuncU );
 
-                                    BOOL bValid = TRUE;
+                                    sal_Bool bValid = sal_True;
                                     long nVisibleCount = 0;
                                     long nCallerPos = SC_CALLERPOS_NONE;
 
@@ -918,12 +918,12 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                     for (nParamPos=0; nParamPos<nParamCount; nParamPos++)
                                     {
                                         if ( pParArr[nParamPos].aMode != reflection::ParamMode_IN )
-                                            bValid = FALSE;
+                                            bValid = sal_False;
                                         uno::Reference<reflection::XIdlClass> xParClass =
                                                     pParArr[nParamPos].aType;
                                         ScAddInArgumentType eArgType = lcl_GetArgType( xParClass );
                                         if ( eArgType == SC_ADDINARG_NONE )
-                                            bValid = FALSE;
+                                            bValid = sal_False;
                                         else if ( eArgType == SC_ADDINARG_CALLER )
                                             nCallerPos = nParamPos;
                                         else
@@ -931,7 +931,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                     }
                                     if (bValid)
                                     {
-                                        USHORT nCategory = lcl_GetCategory(
+                                        sal_uInt16 nCategory = lcl_GetCategory(
                                             String(
                                             xAddIn->getProgrammaticCategoryName(
                                             aFuncU ) ) );
@@ -996,7 +996,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                                         aArgName = rtl::OUString::createFromAscii( "###" );
                                                     }
 
-                                                    BOOL bOptional =
+                                                    sal_Bool bOptional =
                                                         ( eArgType == SC_ADDINARG_VALUE_OR_ARRAY ||
                                                           eArgType == SC_ADDINARG_VARARGS );
 
@@ -1050,8 +1050,8 @@ void lcl_UpdateFunctionList( ScFunctionList& rFunctionList, const ScUnoAddInFunc
 {
     String aCompare = rFuncData.GetUpperLocal();    // as used in FillFunctionDescFromData
 
-    ULONG nCount = rFunctionList.GetCount();
-    for (ULONG nPos=0; nPos<nCount; nPos++)
+    sal_uLong nCount = rFunctionList.GetCount();
+    for (sal_uLong nPos=0; nPos<nCount; nPos++)
     {
         const ScFuncDesc* pDesc = rFunctionList.GetFunction( nPos );
         if ( pDesc && pDesc->pFuncName && *pDesc->pFuncName == aCompare )
@@ -1132,7 +1132,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface
                             // Local names and descriptions from pOldData are looked up using the
                             // internal argument name.
 
-                            BOOL bValid = TRUE;
+                            sal_Bool bValid = sal_True;
                             long nVisibleCount = 0;
                             long nCallerPos = SC_CALLERPOS_NONE;
 
@@ -1144,12 +1144,12 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface
                             for (nParamPos=0; nParamPos<nParamCount; nParamPos++)
                             {
                                 if ( pParArr[nParamPos].aMode != reflection::ParamMode_IN )
-                                    bValid = FALSE;
+                                    bValid = sal_False;
                                 uno::Reference<reflection::XIdlClass> xParClass =
                                             pParArr[nParamPos].aType;
                                 ScAddInArgumentType eArgType = lcl_GetArgType( xParClass );
                                 if ( eArgType == SC_ADDINARG_NONE )
-                                    bValid = FALSE;
+                                    bValid = sal_False;
                                 else if ( eArgType == SC_ADDINARG_CALLER )
                                     nCallerPos = nParamPos;
                                 else
@@ -1180,7 +1180,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface
                                             else
                                                 aDesc.aName = aDesc.aDescription = String::CreateFromAscii( "###" );
 
-                                            BOOL bOptional =
+                                            sal_Bool bOptional =
                                                 ( eArgType == SC_ADDINARG_VALUE_OR_ARRAY ||
                                                   eArgType == SC_ADDINARG_VARARGS );
 
@@ -1212,7 +1212,7 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface
     }
 }
 
-String ScUnoAddInCollection::FindFunction( const String& rUpperName, BOOL bLocalFirst )
+String ScUnoAddInCollection::FindFunction( const String& rUpperName, sal_Bool bLocalFirst )
 {
     if (!bInitialized)
         Initialize();
@@ -1307,13 +1307,13 @@ long ScUnoAddInCollection::GetFuncCount()
     return nFuncCount;
 }
 
-BOOL ScUnoAddInCollection::FillFunctionDesc( long nFunc, ScFuncDesc& rDesc )
+sal_Bool ScUnoAddInCollection::FillFunctionDesc( long nFunc, ScFuncDesc& rDesc )
 {
     if (!bInitialized)
         Initialize();
 
     if (nFunc >= nFuncCount || !ppFuncData[nFunc])
-        return FALSE;
+        return sal_False;
 
     const ScUnoAddInFuncData& rFuncData = *ppFuncData[nFunc];
 
@@ -1321,15 +1321,15 @@ BOOL ScUnoAddInCollection::FillFunctionDesc( long nFunc, ScFuncDesc& rDesc )
 }
 
 // static
-BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc )
+sal_Bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc )
 {
     rDesc.Clear();
 
-    BOOL bIncomplete = !rFuncData.GetFunction().is();       //! extra flag?
+    sal_Bool bIncomplete = !rFuncData.GetFunction().is();       //! extra flag?
 
     long nArgCount = rFuncData.GetArgumentCount();
     if ( nArgCount > USHRT_MAX )
-        return FALSE;
+        return sal_False;
 
     if ( bIncomplete )
         nArgCount = 0;      // if incomplete, fill without argument info (no wrong order)
@@ -1347,10 +1347,10 @@ BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r
 
     // AddInArgumentType_CALLER is already left out in FuncData
 
-    rDesc.nArgCount = (USHORT)nArgCount;
+    rDesc.nArgCount = (sal_uInt16)nArgCount;
     if ( nArgCount )
     {
-        BOOL bMultiple = FALSE;
+        sal_Bool bMultiple = sal_False;
         const ScAddInArgDesc* pArgs = rFuncData.GetArguments();
 
         rDesc.ppDefArgNames = new String*[nArgCount];
@@ -1373,7 +1373,7 @@ BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r
 
             //  last argument repeated?
             if ( nArg+1 == nArgCount && ( pArgs[nArg].eType == SC_ADDINARG_VARARGS ) )
-                bMultiple = TRUE;
+                bMultiple = sal_True;
         }
 
         if ( bMultiple )
@@ -1382,7 +1382,7 @@ BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r
 
     rDesc.bIncomplete = bIncomplete;
 
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1390,9 +1390,9 @@ BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r
 
 ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const String& rName,
                                 long nParamCount ) :
-    bValidCount( FALSE ),
+    bValidCount( sal_False ),
     nErrCode( errNoCode ),      // before function was called
-    bHasString( TRUE ),
+    bHasString( sal_True ),
     fValue( 0.0 ),
     xMatrix( NULL )
 {
@@ -1409,15 +1409,15 @@ ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const String& rName
         {
             long nVarCount = nParamCount - ( nDescCount - 1 );  // size of last argument
             aVarArg.realloc( nVarCount );
-            bValidCount = TRUE;
+            bValidCount = sal_True;
         }
         else if ( nParamCount <= nDescCount )
         {
             //  all args behind nParamCount must be optional
-            bValidCount = TRUE;
+            bValidCount = sal_True;
             for (long i=nParamCount; i<nDescCount; i++)
                 if ( !pArgs[i].bOptional )
-                    bValidCount = FALSE;
+                    bValidCount = sal_False;
         }
         // else invalid (too many arguments)
 
@@ -1431,7 +1431,7 @@ ScUnoAddInCall::~ScUnoAddInCall()
     // pFuncData is deleted with ScUnoAddInCollection
 }
 
-BOOL ScUnoAddInCall::ValidParamCount()
+sal_Bool ScUnoAddInCall::ValidParamCount()
 {
     return bValidCount;
 }
@@ -1453,7 +1453,7 @@ ScAddInArgumentType ScUnoAddInCall::GetArgType( long nPos )
     return SC_ADDINARG_VALUE_OR_ARRAY;      //! error code !!!!
 }
 
-BOOL ScUnoAddInCall::NeedsCaller() const
+sal_Bool ScUnoAddInCall::NeedsCaller() const
 {
     return pFuncData && pFuncData->GetCallerPos() != SC_CALLERPOS_NONE;
 }
@@ -1628,7 +1628,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
             {
                 uno::TypeClass eMyClass;
                 ScApiTypeConversion::ConvertAnyToDouble( fValue, eMyClass, rNewRes);
-                bHasString = FALSE;
+                bHasString = sal_False;
             }
             break;
 
@@ -1637,7 +1637,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
                 rtl::OUString aUStr;
                 rNewRes >>= aUStr;
                 aString = String( aUStr );
-                bHasString = TRUE;
+                bHasString = sal_True;
             }
             break;
 
@@ -1655,19 +1655,19 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
             break;
 
         default:
-            if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<INT32> > *)0 ) ) )
+            if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<sal_Int32> > *)0 ) ) )
             {
-                const uno::Sequence< uno::Sequence<INT32> >* pRowSeq = NULL;
+                const uno::Sequence< uno::Sequence<sal_Int32> >* pRowSeq = NULL;
 
                 //! use pointer from any!
-                uno::Sequence< uno::Sequence<INT32> > aSequence;
+                uno::Sequence< uno::Sequence<sal_Int32> > aSequence;
                 if ( rNewRes >>= aSequence )
                     pRowSeq = &aSequence;
 
                 if ( pRowSeq )
                 {
                     long nRowCount = pRowSeq->getLength();
-                    const uno::Sequence<INT32>* pRowArr = pRowSeq->getConstArray();
+                    const uno::Sequence<sal_Int32>* pRowArr = pRowSeq->getConstArray();
                     long nMaxColCount = 0;
                     long nCol, nRow;
                     for (nRow=0; nRow<nRowCount; nRow++)
@@ -1685,7 +1685,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
                         for (nRow=0; nRow<nRowCount; nRow++)
                         {
                             long nColCount = pRowArr[nRow].getLength();
-                            const INT32* pColArr = pRowArr[nRow].getConstArray();
+                            const sal_Int32* pColArr = pRowArr[nRow].getConstArray();
                             for (nCol=0; nCol<nColCount; nCol++)
                                 pMatrix->PutDouble( pColArr[nCol],
                                         static_cast<SCSIZE>(nCol),
diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index c2bce37ae..f64ae89ed 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -87,8 +87,8 @@ ScAddInListener* ScAddInListener::Get( uno::Reference<sheet::XVolatileResult> xV
 {
     sheet::XVolatileResult* pComp = xVR.get();
 
-    ULONG nCount = aAllListeners.Count();
-    for (ULONG nPos=0; nPos<nCount; nPos++)
+    sal_uLong nCount = aAllListeners.Count();
+    for (sal_uLong nPos=0; nPos<nCount; nPos++)
     {
         ScAddInListener* pLst = (ScAddInListener*)aAllListeners.GetObject(nPos);
         if ( pComp == (sheet::XVolatileResult*)pLst->xVolRes.get() )
@@ -101,14 +101,14 @@ ScAddInListener* ScAddInListener::Get( uno::Reference<sheet::XVolatileResult> xV
 // static
 void ScAddInListener::RemoveDocument( ScDocument* pDocumentP )
 {
-    ULONG nPos = aAllListeners.Count();
+    sal_uLong nPos = aAllListeners.Count();
     while (nPos)
     {
         //	loop backwards because elements are removed
         --nPos;
         ScAddInListener* pLst = (ScAddInListener*)aAllListeners.GetObject(nPos);
         ScAddInDocs* p = pLst->pDocs;
-        USHORT nFoundPos;
+        sal_uInt16 nFoundPos;
         if ( p->Seek_Entry( pDocumentP, &nFoundPos ) )
         {
             p->Remove( nFoundPos );
@@ -158,8 +158,8 @@ void SAL_CALL ScAddInListener::modified( const ::com::sun::star::sheet::ResultEv
     Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) );
 
     const ScDocument** ppDoc = (const ScDocument**) pDocs->GetData();
-    USHORT nCount = pDocs->Count();
-    for ( USHORT j=0; j<nCount; j++, ppDoc++ )
+    sal_uInt16 nCount = pDocs->Count();
+    for ( sal_uInt16 j=0; j<nCount; j++, ppDoc++ )
     {
         ScDocument* pDoc = (ScDocument*)*ppDoc;
         pDoc->TrackFormulas();
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index a4a77c9fe..fe71b198b 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -162,7 +162,7 @@ const sal_Unicode* lcl_eatWhiteSpace( const sal_Unicode* p )
  */
 static bool lcl_ScRange_External_TabSpan(
         ScRange & rRange,
-        USHORT & rFlags, 
+        sal_uInt16 & rFlags, 
         ScAddress::ExternalInfo* pExtInfo,
         const String & rExternDocName,
         const String & rStartTabName,
@@ -271,7 +271,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start,
     }
     else
     {
-        bool only_digits = TRUE;
+        bool only_digits = sal_True;
 
         /*
          * Valid: Normal!a1
@@ -299,7 +299,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start,
                     p = start;
                     break;
                 }
-                only_digits = FALSE;
+                only_digits = sal_False;
                 p++;
             }
             else if( CharClass::isAsciiDigit( uc ))
@@ -341,12 +341,12 @@ const sal_Unicode* ScRange::Parse_XL_Header(
         String& rExternDocName,
         String& rStartTabName,
         String& rEndTabName,
-        USHORT& nFlags,
+        sal_uInt16& nFlags,
         bool bOnlyAcceptSingle,
         const uno::Sequence< const sheet::ExternalLinkInfo > * pExternalLinks )
 {
     const sal_Unicode* startTabs, *start = p;
-    USHORT nSaveFlags = nFlags;
+    sal_uInt16 nSaveFlags = nFlags;
 
     // Is this an external reference ?
     rStartTabName.Erase();
@@ -536,7 +536,7 @@ const sal_Unicode* ScRange::Parse_XL_Header(
 static const sal_Unicode*
 lcl_r1c1_get_col( const sal_Unicode* p,
                   const ScAddress::Details& rDetails,
-                  ScAddress* pAddr, USHORT* nFlags )
+                  ScAddress* pAddr, sal_uInt16* nFlags )
 {
     const sal_Unicode *pEnd;
     long int n;
@@ -581,7 +581,7 @@ lcl_r1c1_get_col( const sal_Unicode* p,
 static inline const sal_Unicode*
 lcl_r1c1_get_row( const sal_Unicode* p,
                   const ScAddress::Details& rDetails,
-                  ScAddress* pAddr, USHORT* nFlags )
+                  ScAddress* pAddr, sal_uInt16* nFlags )
 {
     const sal_Unicode *pEnd;
     long int n;
@@ -624,7 +624,7 @@ lcl_r1c1_get_row( const sal_Unicode* p,
     return pEnd;
 }
 
-static USHORT
+static sal_uInt16
 lcl_ScRange_Parse_XL_R1C1( ScRange& r,
                            const sal_Unicode* p,
                            ScDocument* pDoc,
@@ -634,9 +634,9 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r,
 {
     const sal_Unicode* pTmp = NULL;
     String aExternDocName, aStartTabName, aEndTabName;
-    USHORT nFlags = SCA_VALID | SCA_VALID_TAB;
+    sal_uInt16 nFlags = SCA_VALID | SCA_VALID_TAB;
     // Keep in mind that nFlags2 gets left-shifted by 4 bits before being merged.
-    USHORT nFlags2 = SCA_VALID_TAB;
+    sal_uInt16 nFlags2 = SCA_VALID_TAB;
 
 #if 0
     {
@@ -767,7 +767,7 @@ failed :
 }
 
 static inline const sal_Unicode*
-lcl_a1_get_col( const sal_Unicode* p, ScAddress* pAddr, USHORT* nFlags )
+lcl_a1_get_col( const sal_Unicode* p, ScAddress* pAddr, sal_uInt16* nFlags )
 {
     SCCOL nCol;
 
@@ -790,7 +790,7 @@ lcl_a1_get_col( const sal_Unicode* p, ScAddress* pAddr, USHORT* nFlags )
 }
 
 static inline const sal_Unicode*
-lcl_a1_get_row( const sal_Unicode* p, ScAddress* pAddr, USHORT* nFlags )
+lcl_a1_get_row( const sal_Unicode* p, ScAddress* pAddr, sal_uInt16* nFlags )
 {
     const sal_Unicode *pEnd;
     long int n;
@@ -808,7 +808,7 @@ lcl_a1_get_row( const sal_Unicode* p, ScAddress* pAddr, USHORT* nFlags )
     return pEnd;
 }
 
-static USHORT
+static sal_uInt16
 lcl_ScRange_Parse_XL_A1( ScRange& r,
                          const sal_Unicode* p,
                          ScDocument* pDoc,
@@ -818,7 +818,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
 {
     const sal_Unicode* tmp1, *tmp2;
     String aExternDocName, aStartTabName, aEndTabName; // for external link table
-    USHORT nFlags = SCA_VALID | SCA_VALID_TAB, nFlags2 = SCA_VALID_TAB;
+    sal_uInt16 nFlags = SCA_VALID | SCA_VALID_TAB, nFlags2 = SCA_VALID_TAB;
 
 #if 0
     {
@@ -947,11 +947,11 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
                     used in conjunction with pExtInfo to determine the tab span 
                     of a 3D reference.
  */
-static USHORT
+static sal_uInt16
 lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr, 
                          ScAddress::ExternalInfo* pExtInfo = NULL, ScRange* pRange = NULL )
 {
-    USHORT  nRes = 0;
+    sal_uInt16  nRes = 0;
     String  aDocName;       // der pure Dokumentenname
     String  aTab;
     bool    bExtDoc = false;
@@ -980,7 +980,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd
     SCCOL   nCol = 0;
     SCROW   nRow = 0;
     SCTAB   nTab = 0;
-    USHORT  nBits = SCA_VALID_TAB;
+    sal_uInt16  nBits = SCA_VALID_TAB;
     const sal_Unicode* q;
     if ( ScGlobal::FindUnquoted( p, '.') )
     {
@@ -1137,7 +1137,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd
                             nRes = 0;
                         else
                         {
-                            USHORT nFlags = nRes | SCA_VALID_TAB2;
+                            sal_uInt16 nFlags = nRes | SCA_VALID_TAB2;
                             if (!lcl_ScRange_External_TabSpan( *pRange, nFlags, 
                                         pExtInfo, aDocName, 
                                         pExtInfo->maTabName, aTab, pDoc))
@@ -1166,7 +1166,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd
     }
     if( !*p )
     {
-        USHORT nMask = nRes & ( SCA_VALID_ROW | SCA_VALID_COL | SCA_VALID_TAB );
+        sal_uInt16 nMask = nRes & ( SCA_VALID_ROW | SCA_VALID_COL | SCA_VALID_TAB );
         if( nMask == ( SCA_VALID_ROW | SCA_VALID_COL | SCA_VALID_TAB ) )
             nRes |= SCA_VALID;
     }
@@ -1175,7 +1175,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd
     return nRes;
 }
 
-static USHORT
+static sal_uInt16
 lcl_ScAddress_Parse ( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr,
                       const ScAddress::Details& rDetails,
                       ScAddress::ExternalInfo* pExtInfo = NULL,
@@ -1196,7 +1196,7 @@ lcl_ScAddress_Parse ( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr,
     case formula::FormulaGrammar::CONV_XL_OOX:
         {
             ScRange r = rAddr;
-            USHORT nFlags = lcl_ScRange_Parse_XL_A1( r, p, pDoc, true, pExtInfo,
+            sal_uInt16 nFlags = lcl_ScRange_Parse_XL_A1( r, p, pDoc, true, pExtInfo,
                     (rDetails.eConv == formula::FormulaGrammar::CONV_XL_OOX ? pExternalLinks : NULL) );
             rAddr = r.aStart;
             return nFlags;
@@ -1204,7 +1204,7 @@ lcl_ScAddress_Parse ( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr,
     case formula::FormulaGrammar::CONV_XL_R1C1:
         {
             ScRange r = rAddr;
-            USHORT nFlags = lcl_ScRange_Parse_XL_R1C1( r, p, pDoc, rDetails, true, pExtInfo );
+            sal_uInt16 nFlags = lcl_ScRange_Parse_XL_R1C1( r, p, pDoc, rDetails, true, pExtInfo );
             rAddr = r.aStart;
             return nFlags;
         }
@@ -1221,7 +1221,7 @@ bool ConvertSingleRef( ScDocument* pDoc, const String& rRefString,
     if (pExtInfo || (ScGlobal::FindUnquoted( rRefString, SC_COMPILER_FILE_TAB_SEP) == STRING_NOTFOUND))
     {
         ScAddress aAddr( 0, 0, nDefTab );
-        USHORT nRes = aAddr.Parse( rRefString, pDoc, rDetails, pExtInfo);
+        sal_uInt16 nRes = aAddr.Parse( rRefString, pDoc, rDetails, pExtInfo);
         if ( nRes & SCA_VALID )
         {
             rRefAddress.Set( aAddr,
@@ -1244,7 +1244,7 @@ bool ConvertDoubleRef( ScDocument* pDoc, const String& rRefString, SCTAB nDefTab
     if (pExtInfo || (ScGlobal::FindUnquoted( rRefString, SC_COMPILER_FILE_TAB_SEP) == STRING_NOTFOUND))
     {
         ScRange aRange( ScAddress( 0, 0, nDefTab));
-        USHORT nRes = aRange.Parse( rRefString, pDoc, rDetails, pExtInfo);
+        sal_uInt16 nRes = aRange.Parse( rRefString, pDoc, rDetails, pExtInfo);
         if ( nRes & SCA_VALID )
         {
             rStartRefAddress.Set( aRange.aStart,
@@ -1262,7 +1262,7 @@ bool ConvertDoubleRef( ScDocument* pDoc, const String& rRefString, SCTAB nDefTab
 }
 
 
-USHORT ScAddress::Parse( const String& r, ScDocument* pDoc,
+sal_uInt16 ScAddress::Parse( const String& r, ScDocument* pDoc,
                          const Details& rDetails,
                          ExternalInfo* pExtInfo,
                          const uno::Sequence< const sheet::ExternalLinkInfo > * pExternalLinks )
@@ -1316,10 +1316,10 @@ void ScRange::ExtendTo( const ScRange& rRange )
         *this = rRange;
 }
 
-static USHORT
+static sal_uInt16
 lcl_ScRange_Parse_OOo( ScRange &aRange, const String& r, ScDocument* pDoc, ScAddress::ExternalInfo* pExtInfo = NULL )
 {
-    USHORT nRes1 = 0, nRes2 = 0;
+    sal_uInt16 nRes1 = 0, nRes2 = 0;
     xub_StrLen nPos = ScGlobal::FindUnquoted( r, ':');
     if (nPos != STRING_NOTFOUND)
     {
@@ -1332,7 +1332,7 @@ lcl_ScRange_Parse_OOo( ScRange &aRange, const String& r, ScDocument* pDoc, ScAdd
             if ( (nRes2 = lcl_ScAddress_Parse_OOo( p + nPos+ 1, pDoc, aRange.aEnd, pExtInfo, &aRange ) ) != 0 )
             {
                 // PutInOrder / Justify
-                USHORT nMask, nBits1, nBits2;
+                sal_uInt16 nMask, nBits1, nBits2;
                 SCCOL nTempCol;
                 if ( aRange.aEnd.Col() < (nTempCol = aRange.aStart.Col()) )
                 {
@@ -1378,7 +1378,7 @@ lcl_ScRange_Parse_OOo( ScRange &aRange, const String& r, ScDocument* pDoc, ScAdd
     return nRes1;
 }
 
-USHORT ScRange::Parse( const String& r, ScDocument* pDoc,
+sal_uInt16 ScRange::Parse( const String& r, ScDocument* pDoc,
                        const ScAddress::Details& rDetails,
                        ScAddress::ExternalInfo* pExtInfo,
                        const uno::Sequence< const sheet::ExternalLinkInfo > * pExternalLinks )
@@ -1404,11 +1404,11 @@ USHORT ScRange::Parse( const String& r, ScDocument* pDoc,
 
 
 // Accept a full range, or an address
-USHORT ScRange::ParseAny( const String& r, ScDocument* pDoc,
+sal_uInt16 ScRange::ParseAny( const String& r, ScDocument* pDoc,
                           const ScAddress::Details& rDetails )
 {
-    USHORT nRet = Parse( r, pDoc, rDetails );
-    const USHORT nValid = SCA_VALID | SCA_VALID_COL2 | SCA_VALID_ROW2 |
+    sal_uInt16 nRet = Parse( r, pDoc, rDetails );
+    const sal_uInt16 nValid = SCA_VALID | SCA_VALID_COL2 | SCA_VALID_ROW2 |
         SCA_VALID_TAB2;
 
     if ( (nRet & nValid) != nValid )
@@ -1422,11 +1422,11 @@ USHORT ScRange::ParseAny( const String& r, ScDocument* pDoc,
 }
 
 // Parse only full row references
-USHORT ScRange::ParseCols( const String& rStr, ScDocument* pDoc,
+sal_uInt16 ScRange::ParseCols( const String& rStr, ScDocument* pDoc,
                            const ScAddress::Details& rDetails )
 {
     const sal_Unicode* p = rStr.GetBuffer();
-    USHORT nRes = 0, ignored = 0;
+    sal_uInt16 nRes = 0, ignored = 0;
 
     if( NULL == p )
         return 0;
@@ -1481,11 +1481,11 @@ USHORT ScRange::ParseCols( const String& rStr, ScDocument* pDoc,
 }
 
 // Parse only full row references
-USHORT ScRange::ParseRows( const String& rStr, ScDocument* pDoc,
+sal_uInt16 ScRange::ParseRows( const String& rStr, ScDocument* pDoc,
                            const ScAddress::Details& rDetails )
 {
     const sal_Unicode* p = rStr.GetBuffer();
-    USHORT nRes = 0, ignored = 0;
+    sal_uInt16 nRes = 0, ignored = 0;
 
     if( NULL == p )
         return 0;
@@ -1627,7 +1627,7 @@ getFileNameFromDoc( const ScDocument* pDoc )
     return sFileName;
 }
 
-void ScAddress::Format( String& r, USHORT nFlags, ScDocument* pDoc,
+void ScAddress::Format( String& r, sal_uInt16 nFlags, ScDocument* pDoc,
                         const Details& rDetails) const
 {
     r.Erase();
@@ -1716,7 +1716,7 @@ void ScAddress::Format( String& r, USHORT nFlags, ScDocument* pDoc,
 static void
 lcl_Split_DocTab( const ScDocument* pDoc,  SCTAB nTab,
                   const ScAddress::Details& rDetails,
-                  USHORT nFlags,
+                  sal_uInt16 nFlags,
                   String& rTabName, String& rDocName )
 {
     pDoc->GetName( nTab, rTabName );
@@ -1752,7 +1752,7 @@ lcl_Split_DocTab( const ScDocument* pDoc,  SCTAB nTab,
 
 static void
 lcl_ScRange_Format_XL_Header( String& r, const ScRange& rRange,
-                              USHORT nFlags, ScDocument* pDoc,
+                              sal_uInt16 nFlags, ScDocument* pDoc,
                               const ScAddress::Details& rDetails )
 {
     if( nFlags & SCA_TAB_3D )
@@ -1779,7 +1779,7 @@ lcl_ScRange_Format_XL_Header( String& r, const ScRange& rRange,
     }
 }
 
-void ScRange::Format( String& r, USHORT nFlags, ScDocument* pDoc,
+void ScRange::Format( String& r, sal_uInt16 nFlags, ScDocument* pDoc,
                       const ScAddress::Details& rDetails ) const
 {
     r.Erase();
@@ -1793,7 +1793,7 @@ void ScRange::Format( String& r, USHORT nFlags, ScDocument* pDoc,
     switch( rDetails.eConv ) {
     default :
     case formula::FormulaGrammar::CONV_OOO: {
-        BOOL bOneTab = (aStart.Tab() == aEnd.Tab());
+        sal_Bool bOneTab = (aStart.Tab() == aEnd.Tab());
         if ( !bOneTab )
             nFlags |= SCA_TAB_3D;
         aStart.Format( r, nFlags, pDoc, rDetails );
@@ -1889,19 +1889,19 @@ bool ScAddress::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScDocument* pDoc )
     dx = Col() + dx;
     dy = Row() + dy;
     dz = Tab() + dz;
-    BOOL bValid = TRUE;
+    sal_Bool bValid = sal_True;
     if( dx < 0 )
-        dx = 0, bValid = FALSE;
+        dx = 0, bValid = sal_False;
     else if( dx > MAXCOL )
-        dx = MAXCOL, bValid =FALSE;
+        dx = MAXCOL, bValid =sal_False;
     if( dy < 0 )
-        dy = 0, bValid = FALSE;
+        dy = 0, bValid = sal_False;
     else if( dy > MAXROW )
-        dy = MAXROW, bValid =FALSE;
+        dy = MAXROW, bValid =sal_False;
     if( dz < 0 )
-        dz = 0, bValid = FALSE;
+        dz = 0, bValid = sal_False;
     else if( dz >= nMaxTab )
-        dz = nMaxTab-1, bValid =FALSE;
+        dz = nMaxTab-1, bValid =sal_False;
     Set( dx, dy, dz );
     return bValid;
 }
@@ -1955,7 +1955,7 @@ String ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab,
         return ScGlobal::GetRscString( STR_NOREF_STR );
 
     String aString;
-    USHORT nFlags = SCA_VALID;
+    sal_uInt16 nFlags = SCA_VALID;
     if ( nActTab != Tab() )
     {
         nFlags |= SCA_TAB_3D;
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index e23e24cd5..0caf22480 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -55,7 +55,7 @@ SV_IMPL_PTRARR_SORT( ScAddInDocs, ScAddInDocPtr );
 extern "C" {
 void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData )
 {
-    ScAddInAsync::CallBack( ULONG( nHandle ), pData );
+    ScAddInAsync::CallBack( sal_uLong( nHandle ), pData );
 }
 }
 
@@ -69,11 +69,11 @@ ScAddInAsync::ScAddInAsync() :
 
 
 
-ScAddInAsync::ScAddInAsync( ULONG nHandleP, USHORT nIndex, ScDocument* pDoc ) :
+ScAddInAsync::ScAddInAsync( sal_uLong nHandleP, sal_uInt16 nIndex, ScDocument* pDoc ) :
     SvtBroadcaster(),
     pStr( NULL ),
     nHandle( nHandleP ),
-    bValid( FALSE )
+    bValid( sal_False )
 {
     pDocs = new ScAddInDocs( 1, 1 );
     pDocs->Insert( pDoc );
@@ -99,9 +99,9 @@ ScAddInAsync::~ScAddInAsync()
 
 
 
-ScAddInAsync* ScAddInAsync::Get( ULONG nHandleP )
+ScAddInAsync* ScAddInAsync::Get( sal_uLong nHandleP )
 {
-    USHORT nPos;
+    sal_uInt16 nPos;
     ScAddInAsync* pRet = 0;
     aSeekObj.nHandle = nHandleP;
     if ( theAddInAsyncTbl.Seek_Entry( &aSeekObj, &nPos ) )
@@ -112,7 +112,7 @@ ScAddInAsync* ScAddInAsync::Get( ULONG nHandleP )
 
 
 
-void ScAddInAsync::CallBack( ULONG nHandleP, void* pData )
+void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData )
 {
     ScAddInAsync* p;
     if ( (p = Get( nHandleP )) == NULL )
@@ -140,12 +140,12 @@ void ScAddInAsync::CallBack( ULONG nHandleP, void* pData )
             DBG_ERROR( "unbekannter AsyncType" );
             return;
     }
-    p->bValid = TRUE;
+    p->bValid = sal_True;
     p->Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) );
 
     const ScDocument** ppDoc = (const ScDocument**) p->pDocs->GetData();
-    USHORT nCount = p->pDocs->Count();
-    for ( USHORT j=0; j<nCount; j++, ppDoc++ )
+    sal_uInt16 nCount = p->pDocs->Count();
+    for ( sal_uInt16 j=0; j<nCount; j++, ppDoc++ )
     {
         ScDocument* pDoc = (ScDocument*)*ppDoc;
         pDoc->TrackFormulas();
@@ -158,7 +158,7 @@ void ScAddInAsync::CallBack( ULONG nHandleP, void* pData )
 
 void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
 {
-    USHORT nPos = theAddInAsyncTbl.Count();
+    sal_uInt16 nPos = theAddInAsyncTbl.Count();
     if ( nPos )
     {
         const ScAddInAsync** ppAsync =
@@ -166,7 +166,7 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
         for ( ; nPos-- >0; ppAsync-- )
         {	// rueckwaerts wg. Pointer-Aufrueckerei im Array
             ScAddInDocs* p = ((ScAddInAsync*)*ppAsync)->pDocs;
-            USHORT nFoundPos;
+            sal_uInt16 nFoundPos;
             if ( p->Seek_Entry( pDocumentP, &nFoundPos ) )
             {
                 p->Remove( nFoundPos );
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index e14b16c2a..ebb6208e4 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -53,7 +53,7 @@ using namespace com::sun::star::uno;
 
 // STATIC DATA -----------------------------------------------------------
 
-#define SC_VERSION ((USHORT)304)
+#define SC_VERSION ((sal_uInt16)304)
 
 //========================================================================
 //      ScAppOptions - Applikations-Optionen
@@ -89,13 +89,13 @@ void ScAppOptions::SetDefaults()
 
     nZoom 			= 100;
     eZoomType		= SVX_ZOOM_PERCENT;
-    bSynchronizeZoom = TRUE;
+    bSynchronizeZoom = sal_True;
     nStatusFunc		= SUBTOTAL_FUNC_SUM;
-    bAutoComplete	= TRUE;
-    bDetectiveAuto	= TRUE;
+    bAutoComplete	= sal_True;
+    bDetectiveAuto	= sal_True;
 
     delete [] pLRUList;
-    pLRUList = new USHORT[5];				// sinnvoll vorbelegen
+    pLRUList = new sal_uInt16[5];				// sinnvoll vorbelegen
     pLRUList[0] = SC_OPCODE_SUM;
     pLRUList[1] = SC_OPCODE_AVERAGE;
     pLRUList[2] = SC_OPCODE_MIN;
@@ -140,7 +140,7 @@ const ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy )
 
 //------------------------------------------------------------------------
 
-void ScAppOptions::SetLRUFuncList( const USHORT* pList,	const USHORT nCount )
+void ScAppOptions::SetLRUFuncList( const sal_uInt16* pList,	const sal_uInt16 nCount )
 {
     delete [] pLRUList;
 
@@ -148,9 +148,9 @@ void ScAppOptions::SetLRUFuncList( const USHORT* pList,	const USHORT nCount )
 
     if ( nLRUFuncCount > 0 )
     {
-        pLRUList = new USHORT[nLRUFuncCount];
+        pLRUList = new sal_uInt16[nLRUFuncCount];
 
-        for ( USHORT i=0; i<nLRUFuncCount; i++ )
+        for ( sal_uInt16 i=0; i<nLRUFuncCount; i++ )
             pLRUList[i] = pList[i];
     }
     else
@@ -170,11 +170,11 @@ void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue )
         if ( nCount < USHRT_MAX )
         {
             const sal_Int32* pArray = aSeq.getConstArray();
-            USHORT* pUShorts = new USHORT[nCount];
+            sal_uInt16* pUShorts = new sal_uInt16[nCount];
             for (long i=0; i<nCount; i++)
-                pUShorts[i] = (USHORT) pArray[i];
+                pUShorts[i] = (sal_uInt16) pArray[i];
 
-            rOpt.SetLRUFuncList( pUShorts, sal::static_int_cast<USHORT>(nCount) );
+            rOpt.SetLRUFuncList( pUShorts, sal::static_int_cast<sal_uInt16>(nCount) );
 
             delete[] pUShorts;
         }
@@ -184,7 +184,7 @@ void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue )
 void lcl_GetLastFunctions( Any& rDest, const ScAppOptions& rOpt )
 {
     long nCount = rOpt.GetLRUFuncListCount();
-    USHORT* pUShorts = rOpt.GetLRUFuncList();
+    sal_uInt16* pUShorts = rOpt.GetLRUFuncList();
     if ( nCount && pUShorts )
     {
         Sequence<sal_Int32> aSeq( nCount );
@@ -208,7 +208,7 @@ void lcl_SetSortList( const Any& rValue )
 
         //	if setting is "default", keep default values from ScUserList ctor
         //!	mark "default" in a safe way
-        BOOL bDefault = ( nCount == 1 &&
+        sal_Bool bDefault = ( nCount == 1 &&
                         pArray[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NULL" ) ) );
 
         if (!bDefault)
@@ -236,7 +236,7 @@ void lcl_GetSortList( Any& rDest )
         Sequence<OUString> aSeq( nCount );
         OUString* pArray = aSeq.getArray();
         for (long i=0; i<nCount; i++)
-            pArray[i] = (*pUserList)[sal::static_int_cast<USHORT>(i)]->GetString();
+            pArray[i] = (*pUserList)[sal::static_int_cast<sal_uInt16>(i)]->GetString();
         rDest <<= aSeq;
     }
     else
@@ -419,10 +419,10 @@ ScAppCfg::ScAppCfg() :
                         if (pValues[nProp] >>= nIntVal) SetAppMetric( (FieldUnit) nIntVal );
                         break;
                     case SCLAYOUTOPT_STATUSBAR:
-                        if (pValues[nProp] >>= nIntVal) SetStatusFunc( (USHORT) nIntVal );
+                        if (pValues[nProp] >>= nIntVal) SetStatusFunc( (sal_uInt16) nIntVal );
                         break;
                     case SCLAYOUTOPT_ZOOMVAL:
-                        if (pValues[nProp] >>= nIntVal) SetZoom( (USHORT) nIntVal );
+                        if (pValues[nProp] >>= nIntVal) SetZoom( (sal_uInt16) nIntVal );
                         break;
                     case SCLAYOUTOPT_ZOOMTYPE:
                         if (pValues[nProp] >>= nIntVal) SetZoomType( (SvxZoomType) nIntVal );
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 0ed8c1962..e56e7bc2b 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -61,43 +61,43 @@ const sal_Char *linker_dummy = "";
 static const sal_Char __FAR_DATA sAutoTblFmtName[] = "autotbl.fmt";
 
 // bis SO5PF
-const USHORT AUTOFORMAT_ID_X		= 9501;
-const USHORT AUTOFORMAT_ID_358		= 9601;
-const USHORT AUTOFORMAT_DATA_ID_X	= 9502;
+const sal_uInt16 AUTOFORMAT_ID_X		= 9501;
+const sal_uInt16 AUTOFORMAT_ID_358		= 9601;
+const sal_uInt16 AUTOFORMAT_DATA_ID_X	= 9502;
 
 // ab SO5
 //! in nachfolgenden Versionen muss der Betrag dieser IDs groesser sein
-const USHORT AUTOFORMAT_ID_504		= 9801;
-const USHORT AUTOFORMAT_DATA_ID_504	= 9802;
+const sal_uInt16 AUTOFORMAT_ID_504		= 9801;
+const sal_uInt16 AUTOFORMAT_DATA_ID_504	= 9802;
 
-const USHORT AUTOFORMAT_ID_552		= 9901;
-const USHORT AUTOFORMAT_DATA_ID_552	= 9902;
+const sal_uInt16 AUTOFORMAT_ID_552		= 9901;
+const sal_uInt16 AUTOFORMAT_DATA_ID_552	= 9902;
 
 // --- from 641 on: CJK and CTL font settings
-const USHORT AUTOFORMAT_ID_641      = 10001;
-const USHORT AUTOFORMAT_DATA_ID_641 = 10002;
+const sal_uInt16 AUTOFORMAT_ID_641      = 10001;
+const sal_uInt16 AUTOFORMAT_DATA_ID_641 = 10002;
 
 // --- from 680/dr14 on: diagonal frame lines
-const USHORT AUTOFORMAT_ID_680DR14      = 10011;
-const USHORT AUTOFORMAT_DATA_ID_680DR14 = 10012;
+const sal_uInt16 AUTOFORMAT_ID_680DR14      = 10011;
+const sal_uInt16 AUTOFORMAT_DATA_ID_680DR14 = 10012;
 
 // --- from 680/dr25 on: #21549# store strings as UTF-8
-const USHORT AUTOFORMAT_ID_680DR25      = 10021;
-const USHORT AUTOFORMAT_DATA_ID_680DR25 = 10022;
+const sal_uInt16 AUTOFORMAT_ID_680DR25      = 10021;
+const sal_uInt16 AUTOFORMAT_DATA_ID_680DR25 = 10022;
 
 // --- from DEV300/overline2 on: #5991# overline support
-const USHORT AUTOFORMAT_ID_300OVRLN      = 10031;
-const USHORT AUTOFORMAT_DATA_ID_300OVRLN = 10032;
+const sal_uInt16 AUTOFORMAT_ID_300OVRLN      = 10031;
+const sal_uInt16 AUTOFORMAT_DATA_ID_300OVRLN = 10032;
 
 // aktuelle Version
-const USHORT AUTOFORMAT_ID          = AUTOFORMAT_ID_300OVRLN;
-const USHORT AUTOFORMAT_DATA_ID     = AUTOFORMAT_DATA_ID_300OVRLN;
+const sal_uInt16 AUTOFORMAT_ID          = AUTOFORMAT_ID_300OVRLN;
+const sal_uInt16 AUTOFORMAT_DATA_ID     = AUTOFORMAT_DATA_ID_300OVRLN;
 
 
 #ifdef READ_OLDVERS
-const USHORT AUTOFORMAT_OLD_ID_OLD	= 4201;
-const USHORT AUTOFORMAT_OLD_DATA_ID	= 4202;
-const USHORT AUTOFORMAT_OLD_ID_NEW 	= 4203;
+const sal_uInt16 AUTOFORMAT_OLD_ID_OLD	= 4201;
+const sal_uInt16 AUTOFORMAT_OLD_DATA_ID	= 4202;
+const sal_uInt16 AUTOFORMAT_OLD_ID_NEW 	= 4203;
 #endif
 
 
@@ -106,34 +106,34 @@ const USHORT AUTOFORMAT_OLD_ID_NEW 	= 4203;
 struct ScAfVersions
 {
 public:
-    USHORT nFontVersion;
-    USHORT nFontHeightVersion;
-    USHORT nWeightVersion;
-    USHORT nPostureVersion;
-    USHORT nUnderlineVersion;
-    USHORT nOverlineVersion;
-    USHORT nCrossedOutVersion;
-    USHORT nContourVersion;
-    USHORT nShadowedVersion;
-    USHORT nColorVersion;
-    USHORT nBoxVersion;
-    USHORT nLineVersion;
-    USHORT nBrushVersion;
-
-    USHORT nAdjustVersion;
-
-    USHORT nHorJustifyVersion;
-    USHORT nVerJustifyVersion;
-    USHORT nOrientationVersion;
-    USHORT nMarginVersion;
-    USHORT nBoolVersion;
-    USHORT nInt32Version;
-    USHORT nRotateModeVersion;
-
-    USHORT nNumFmtVersion;
+    sal_uInt16 nFontVersion;
+    sal_uInt16 nFontHeightVersion;
+    sal_uInt16 nWeightVersion;
+    sal_uInt16 nPostureVersion;
+    sal_uInt16 nUnderlineVersion;
+    sal_uInt16 nOverlineVersion;
+    sal_uInt16 nCrossedOutVersion;
+    sal_uInt16 nContourVersion;
+    sal_uInt16 nShadowedVersion;
+    sal_uInt16 nColorVersion;
+    sal_uInt16 nBoxVersion;
+    sal_uInt16 nLineVersion;
+    sal_uInt16 nBrushVersion;
+
+    sal_uInt16 nAdjustVersion;
+
+    sal_uInt16 nHorJustifyVersion;
+    sal_uInt16 nVerJustifyVersion;
+    sal_uInt16 nOrientationVersion;
+    sal_uInt16 nMarginVersion;
+    sal_uInt16 nBoolVersion;
+    sal_uInt16 nInt32Version;
+    sal_uInt16 nRotateModeVersion;
+
+    sal_uInt16 nNumFmtVersion;
 
     ScAfVersions();
-    void Load( SvStream& rStream, USHORT nVer );
+    void Load( SvStream& rStream, sal_uInt16 nVer );
     static void Write(SvStream& rStream);
 };
 
@@ -163,7 +163,7 @@ ScAfVersions::ScAfVersions() :
 {
 }
 
-void ScAfVersions::Load( SvStream& rStream, USHORT nVer )
+void ScAfVersions::Load( SvStream& rStream, sal_uInt16 nVer )
 {
     rStream >> nFontVersion;
     rStream >> nFontHeightVersion;
@@ -220,7 +220,7 @@ void ScAfVersions::Write(SvStream& rStream)
     rStream << SfxInt32Item(ATTR_ROTATE_VALUE).GetVersion(SOFFICE_FILEFORMAT_40);
     rStream << SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD,0).GetVersion(SOFFICE_FILEFORMAT_40);
 
-    rStream << (USHORT)0;		// Num-Format
+    rStream << (sal_uInt16)0;		// Num-Format
 }
 
 //	---------------------------------------------------------------------------
@@ -312,7 +312,7 @@ void ScAutoFormatDataField::SetAdjust( const SvxAdjustItem& rAdjust )
     aItem = *(ItemType*)pNew;               \
     delete pNew;
 
-BOOL ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersions, USHORT nVer )
+sal_Bool ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersions, sal_uInt16 nVer )
 {
     SfxPoolItem* pNew;
     SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0 );
@@ -396,7 +396,7 @@ BOOL ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersio
 }
 
 #ifdef READ_OLDVERS
-BOOL ScAutoFormatDataField::LoadOld( SvStream& rStream, const ScAfVersions& rVersions )
+sal_Bool ScAutoFormatDataField::LoadOld( SvStream& rStream, const ScAfVersions& rVersions )
 {
     SfxPoolItem* pNew;
     SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0 );
@@ -429,7 +429,7 @@ BOOL ScAutoFormatDataField::LoadOld( SvStream& rStream, const ScAfVersions& rVer
 }
 #endif
 
-BOOL ScAutoFormatDataField::Save( SvStream& rStream )
+sal_Bool ScAutoFormatDataField::Save( SvStream& rStream )
 {
     SvxOrientationItem aOrientation( aRotateAngle.GetValue(), aStacked.GetValue(), 0 );
 
@@ -491,10 +491,10 @@ ScAutoFormatData::ScAutoFormatData()
     bIncludeJustify =
     bIncludeFrame =
     bIncludeBackground =
-    bIncludeWidthHeight = TRUE;
+    bIncludeWidthHeight = sal_True;
 
     ppDataField = new ScAutoFormatDataField*[ 16 ];
-    for( USHORT nIndex = 0; nIndex < 16; ++nIndex )
+    for( sal_uInt16 nIndex = 0; nIndex < 16; ++nIndex )
         ppDataField[ nIndex ] = new ScAutoFormatDataField;
 }
 
@@ -510,32 +510,32 @@ ScAutoFormatData::ScAutoFormatData( const ScAutoFormatData& rData ) :
         bIncludeWidthHeight( rData.bIncludeWidthHeight )
 {
     ppDataField = new ScAutoFormatDataField*[ 16 ];
-    for( USHORT nIndex = 0; nIndex < 16; ++nIndex )
+    for( sal_uInt16 nIndex = 0; nIndex < 16; ++nIndex )
         ppDataField[ nIndex ] = new ScAutoFormatDataField( rData.GetField( nIndex ) );
 }
 
 ScAutoFormatData::~ScAutoFormatData()
 {
-    for( USHORT nIndex = 0; nIndex < 16; ++nIndex )
+    for( sal_uInt16 nIndex = 0; nIndex < 16; ++nIndex )
         delete ppDataField[ nIndex ];
     delete[] ppDataField;
 }
 
-ScAutoFormatDataField& ScAutoFormatData::GetField( USHORT nIndex )
+ScAutoFormatDataField& ScAutoFormatData::GetField( sal_uInt16 nIndex )
 {
     DBG_ASSERT( nIndex < 16, "ScAutoFormatData::GetField - illegal index" );
     DBG_ASSERT( ppDataField && ppDataField[ nIndex ], "ScAutoFormatData::GetField - no data" );
     return *ppDataField[ nIndex ];
 }
 
-const ScAutoFormatDataField& ScAutoFormatData::GetField( USHORT nIndex ) const
+const ScAutoFormatDataField& ScAutoFormatData::GetField( sal_uInt16 nIndex ) const
 {
     DBG_ASSERT( nIndex < 16, "ScAutoFormatData::GetField - illegal index" );
     DBG_ASSERT( ppDataField && ppDataField[ nIndex ], "ScAutoFormatData::GetField - no data" );
     return *ppDataField[ nIndex ];
 }
 
-const SfxPoolItem* ScAutoFormatData::GetItem( USHORT nIndex, USHORT nWhich ) const
+const SfxPoolItem* ScAutoFormatData::GetItem( sal_uInt16 nIndex, sal_uInt16 nWhich ) const
 {
     const ScAutoFormatDataField& rField = GetField( nIndex );
     switch( nWhich )
@@ -573,7 +573,7 @@ const SfxPoolItem* ScAutoFormatData::GetItem( USHORT nIndex, USHORT nWhich ) con
     return NULL;
 }
 
-void ScAutoFormatData::PutItem( USHORT nIndex, const SfxPoolItem& rItem )
+void ScAutoFormatData::PutItem( sal_uInt16 nIndex, const SfxPoolItem& rItem )
 {
     ScAutoFormatDataField& rField = GetField( nIndex );
     switch( rItem.Which() )
@@ -610,21 +610,21 @@ void ScAutoFormatData::PutItem( USHORT nIndex, const SfxPoolItem& rItem )
     }
 }
 
-void ScAutoFormatData::CopyItem( USHORT nToIndex, USHORT nFromIndex, USHORT nWhich )
+void ScAutoFormatData::CopyItem( sal_uInt16 nToIndex, sal_uInt16 nFromIndex, sal_uInt16 nWhich )
 {
     const SfxPoolItem* pItem = GetItem( nFromIndex, nWhich );
     if( pItem )
         PutItem( nToIndex, *pItem );
 }
 
-const ScNumFormatAbbrev& ScAutoFormatData::GetNumFormat( USHORT nIndex ) const
+const ScNumFormatAbbrev& ScAutoFormatData::GetNumFormat( sal_uInt16 nIndex ) const
 {
     return GetField( nIndex ).GetNumFormat();
 }
 
-BOOL ScAutoFormatData::IsEqualData( USHORT nIndex1, USHORT nIndex2 ) const
+sal_Bool ScAutoFormatData::IsEqualData( sal_uInt16 nIndex1, sal_uInt16 nIndex2 ) const
 {
-    BOOL bEqual = TRUE;
+    sal_Bool bEqual = sal_True;
     const ScAutoFormatDataField& rField1 = GetField( nIndex1 );
     const ScAutoFormatDataField& rField2 = GetField( nIndex2 );
 
@@ -681,7 +681,7 @@ BOOL ScAutoFormatData::IsEqualData( USHORT nIndex1, USHORT nIndex2 ) const
     return bEqual;
 }
 
-void ScAutoFormatData::FillToItemSet( USHORT nIndex, SfxItemSet& rItemSet, ScDocument& rDoc ) const
+void ScAutoFormatData::FillToItemSet( sal_uInt16 nIndex, SfxItemSet& rItemSet, ScDocument& rDoc ) const
 {
     const ScAutoFormatDataField& rField = GetField( nIndex );
 
@@ -756,7 +756,7 @@ void ScAutoFormatData::FillToItemSet( USHORT nIndex, SfxItemSet& rItemSet, ScDoc
         rItemSet.Put( rField.GetBackground() );
 }
 
-void ScAutoFormatData::GetFromItemSet( USHORT nIndex, const SfxItemSet& rItemSet, const ScNumFormatAbbrev& rNumFormat )
+void ScAutoFormatData::GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rItemSet, const ScNumFormatAbbrev& rNumFormat )
 {
     ScAutoFormatDataField& rField = GetField( nIndex );
 
@@ -791,10 +791,10 @@ void ScAutoFormatData::GetFromItemSet( USHORT nIndex, const SfxItemSet& rItemSet
     rField.SetRotateMode    ( (const SvxRotateModeItem&)    rItemSet.Get( ATTR_ROTATE_MODE ) );
 }
 
-BOOL ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
+sal_Bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
 {
-    BOOL    bRet = TRUE;
-    USHORT  nVer = 0;
+    sal_Bool    bRet = sal_True;
+    sal_uInt16  nVer = 0;
     rStream >> nVer;
     bRet = 0 == rStream.GetError();
     if( bRet && (nVer == AUTOFORMAT_DATA_ID_X ||
@@ -806,7 +806,7 @@ BOOL ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
         if( AUTOFORMAT_DATA_ID_552 <= nVer )
         {
             rStream >> nStrResId;
-            USHORT nId = RID_SVXSTR_TBLAFMT_BEGIN + nStrResId;
+            sal_uInt16 nId = RID_SVXSTR_TBLAFMT_BEGIN + nStrResId;
             if( RID_SVXSTR_TBLAFMT_BEGIN <= nId &&
                 nId < RID_SVXSTR_TBLAFMT_END )
             {
@@ -816,7 +816,7 @@ BOOL ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
                 nStrResId = USHRT_MAX;
         }
 
-        BOOL b;
+        sal_Bool b;
         rStream >> b; bIncludeFont = b;
         rStream >> b; bIncludeJustify = b;
         rStream >> b; bIncludeFrame = b;
@@ -825,25 +825,25 @@ BOOL ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
         rStream >> b; bIncludeWidthHeight = b;
 
         bRet = 0 == rStream.GetError();
-        for( USHORT i = 0; bRet && i < 16; ++i )
+        for( sal_uInt16 i = 0; bRet && i < 16; ++i )
             bRet = GetField( i ).Load( rStream, rVersions, nVer );
     }
     else
-        bRet = FALSE;
+        bRet = sal_False;
     return bRet;
 }
 
 #ifdef READ_OLDVERS
-BOOL ScAutoFormatData::LoadOld( SvStream& rStream, const ScAfVersions& rVersions )
+sal_Bool ScAutoFormatData::LoadOld( SvStream& rStream, const ScAfVersions& rVersions )
 {
-    BOOL    bRet = TRUE;
-    USHORT  nVal = 0;
+    sal_Bool    bRet = sal_True;
+    sal_uInt16  nVal = 0;
     rStream >> nVal;
     bRet = (rStream.GetError() == 0);
     if (bRet && (nVal == AUTOFORMAT_OLD_DATA_ID))
     {
         rStream.ReadByteString( aName, rStream.GetStreamCharSet() );
-        BOOL b;
+        sal_Bool b;
         rStream >> b; bIncludeFont = b;
         rStream >> b; bIncludeJustify = b;
         rStream >> b; bIncludeFrame = b;
@@ -852,19 +852,19 @@ BOOL ScAutoFormatData::LoadOld( SvStream& rStream, const ScAfVersions& rVersions
         rStream >> b; bIncludeWidthHeight = b;
 
         bRet = 0 == rStream.GetError();
-        for (USHORT i=0; bRet && i < 16; i++)
+        for (sal_uInt16 i=0; bRet && i < 16; i++)
             bRet = GetField( i ).LoadOld( rStream, rVersions );
     }
     else
-        bRet = FALSE;
+        bRet = sal_False;
     return bRet;
 }
 #endif
 
-BOOL ScAutoFormatData::Save(SvStream& rStream)
+sal_Bool ScAutoFormatData::Save(SvStream& rStream)
 {
-    USHORT nVal = AUTOFORMAT_DATA_ID;
-    BOOL b;
+    sal_uInt16 nVal = AUTOFORMAT_DATA_ID;
+    sal_Bool b;
     rStream << nVal;
     // --- from 680/dr25 on: #21549# store strings as UTF-8
     rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 );
@@ -880,7 +880,7 @@ BOOL ScAutoFormatData::Save(SvStream& rStream)
         if( 0 != aIniVal.ToInt32() )
         {
             // check Name for ResId
-            for( USHORT nId = RID_SVXSTR_TBLAFMT_BEGIN;
+            for( sal_uInt16 nId = RID_SVXSTR_TBLAFMT_BEGIN;
                         RID_SVXSTR_TBLAFMT_END > nId; ++nId )
             {
                 String s( SVX_RES( nId ) );
@@ -902,8 +902,8 @@ BOOL ScAutoFormatData::Save(SvStream& rStream)
     rStream << ( b = bIncludeValueFormat );
     rStream << ( b = bIncludeWidthHeight );
 
-    BOOL bRet = 0 == rStream.GetError();
-    for (USHORT i = 0; bRet && (i < 16); i++)
+    sal_Bool bRet = 0 == rStream.GetError();
+    for (sal_uInt16 i = 0; bRet && (i < 16); i++)
         bRet = GetField( i ).Save( rStream );
 
     return bRet;
@@ -912,9 +912,9 @@ BOOL ScAutoFormatData::Save(SvStream& rStream)
 //---------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------
 
-ScAutoFormat::ScAutoFormat(USHORT nLim, USHORT nDel, BOOL bDup):
+ScAutoFormat::ScAutoFormat(sal_uInt16 nLim, sal_uInt16 nDel, sal_Bool bDup):
     ScSortedCollection        (nLim, nDel, bDup),
-    bSaveLater				(FALSE)
+    bSaveLater				(sal_False)
 {
     //  create default autoformat
     ScAutoFormatData* pData = new ScAutoFormatData;
@@ -960,7 +960,7 @@ ScAutoFormat::ScAutoFormat(USHORT nLim, USHORT nDel, BOOL bDup):
     SvxBrushItem aGray70Back( Color(0x4d, 0x4d, 0x4d), ATTR_BACKGROUND );
     SvxBrushItem aGray20Back( Color(0xcc, 0xcc, 0xcc), ATTR_BACKGROUND );
 
-    for (USHORT i=0; i<16; i++)
+    for (sal_uInt16 i=0; i<16; i++)
     {
         pData->PutItem( i, aBox );
         pData->PutItem( i, aFontItem );
@@ -999,7 +999,7 @@ ScAutoFormat::ScAutoFormat(USHORT nLim, USHORT nDel, BOOL bDup):
 
 ScAutoFormat::ScAutoFormat(const ScAutoFormat& rAutoFormat) :
     ScSortedCollection (rAutoFormat),
-    bSaveLater		 (FALSE)
+    bSaveLater		 (sal_False)
 {}
 
 ScAutoFormat::~ScAutoFormat()
@@ -1011,7 +1011,7 @@ ScAutoFormat::~ScAutoFormat()
         Save();
 }
 
-void ScAutoFormat::SetSaveLater( BOOL bSet )
+void ScAutoFormat::SetSaveLater( sal_Bool bSet )
 {
     bSaveLater = bSet;
 }
@@ -1030,9 +1030,9 @@ short ScAutoFormat::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
     return (short) ScGlobal::GetpTransliteration()->compareString( aStr1, aStr2 );
 }
 
-BOOL ScAutoFormat::Load()
+sal_Bool ScAutoFormat::Load()
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     INetURLObject aURL;
     SvtPathOptions aPathOpt;
@@ -1040,14 +1040,14 @@ BOOL ScAutoFormat::Load()
     aURL.setFinalSlash();
     aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( sAutoTblFmtName ) ) );
 
-    SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_READ, TRUE );
+    SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_READ, sal_True );
     SvStream* pStream = aMedium.GetInStream();
     bRet = (pStream && pStream->GetError() == 0);
     if (bRet)
     {
         SvStream& rStream = *pStream;
         // Achtung hier muss ein allgemeiner Header gelesen werden
-        USHORT nVal = 0;
+        sal_uInt16 nVal = 0;
         rStream >> nVal;
         bRet = 0 == rStream.GetError();
 
@@ -1058,13 +1058,13 @@ BOOL ScAutoFormat::Load()
             if( nVal == AUTOFORMAT_ID_358 ||
                     (AUTOFORMAT_ID_504 <= nVal && nVal <= AUTOFORMAT_ID) )
             {
-                UINT16 nFileVers = SOFFICE_FILEFORMAT_40;
-                BYTE nChrSet, nCnt;
+                sal_uInt16 nFileVers = SOFFICE_FILEFORMAT_40;
+                sal_uInt8 nChrSet, nCnt;
                 long nPos = rStream.Tell();
                 rStream >> nCnt >> nChrSet;
 //				if( 4 <= nCnt )
 //					rStream >> nFileVers;
-                if( rStream.Tell() != ULONG(nPos + nCnt) )
+                if( rStream.Tell() != sal_uLong(nPos + nCnt) )
                 {
                     DBG_ERRORFILE( "Der Header enthaelt mehr/neuere Daten" );
                     rStream.Seek( nPos + nCnt );
@@ -1079,10 +1079,10 @@ BOOL ScAutoFormat::Load()
                 aVersions.Load( rStream, nVal );		// Item-Versionen
 
                 ScAutoFormatData* pData;
-                USHORT nAnz = 0;
+                sal_uInt16 nAnz = 0;
                 rStream >> nAnz;
                 bRet = (rStream.GetError() == 0);
-                for (USHORT i=0; bRet && (i < nAnz); i++)
+                for (sal_uInt16 i=0; bRet && (i < nAnz); i++)
                 {
                     pData = new ScAutoFormatData();
                     bRet = pData->Load(rStream, aVersions);
@@ -1116,10 +1116,10 @@ BOOL ScAutoFormat::Load()
                     AUTOFORMAT_OLD_ID_NEW == nVal )
                 {
                     ScAutoFormatData* pData;
-                    USHORT nAnz = 0;
+                    sal_uInt16 nAnz = 0;
                     rStream >> nAnz;
                     bRet = 0 == rStream.GetError();
-                    for( USHORT i=0; bRet && (i < nAnz); ++i )
+                    for( sal_uInt16 i=0; bRet && (i < nAnz); ++i )
                     {
                         pData = new ScAutoFormatData();
                         bRet = pData->LoadOld( rStream, aVersions );
@@ -1127,18 +1127,18 @@ BOOL ScAutoFormat::Load()
                     }
                 }
                 else
-                    bRet = FALSE;
+                    bRet = sal_False;
             }
 #endif
         }
     }
-    bSaveLater = FALSE;
+    bSaveLater = sal_False;
     return bRet;
 }
 
-BOOL ScAutoFormat::Save()
+sal_Bool ScAutoFormat::Save()
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     INetURLObject aURL;
     SvtPathOptions aPathOpt;
@@ -1146,7 +1146,7 @@ BOOL ScAutoFormat::Save()
     aURL.setFinalSlash();
     aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM( sAutoTblFmtName ) ) );
 
-    SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE, TRUE );
+    SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE, sal_True );
     SvStream* pStream = aMedium.GetOutStream();
     bRet = (pStream && pStream->GetError() == 0);
     if (bRet)
@@ -1155,35 +1155,35 @@ BOOL ScAutoFormat::Save()
         rStream.SetVersion( SOFFICE_FILEFORMAT_40 );
 
         // Achtung hier muss ein allgemeiner Header gespeichert werden
-        USHORT nVal = AUTOFORMAT_ID;
+        sal_uInt16 nVal = AUTOFORMAT_ID;
         rStream << nVal
-                << (BYTE)2 		// Anzahl von Zeichen des Headers incl. diesem
-                << (BYTE)::GetSOStoreTextEncoding(
-                    gsl_getSystemTextEncoding(), sal::static_int_cast<USHORT>(rStream.GetVersion()) );
-//				<< (BYTE)4 		// Anzahl von Zeichen des Headers incl. diesem
-//				<< (BYTE)::GetStoreCharSet(::GetSystemCharSet())
+                << (sal_uInt8)2 		// Anzahl von Zeichen des Headers incl. diesem
+                << (sal_uInt8)::GetSOStoreTextEncoding(
+                    gsl_getSystemTextEncoding(), sal::static_int_cast<sal_uInt16>(rStream.GetVersion()) );
+//				<< (sal_uInt8)4 		// Anzahl von Zeichen des Headers incl. diesem
+//				<< (sal_uInt8)::GetStoreCharSet(::GetSystemCharSet())
 //				<< (UNIT16)SOFFICE_FILEFORMAT_NOW;
         ScAfVersions::Write(rStream);			// Item-Versionen
 
         bRet = (rStream.GetError() == 0);
         //-----------------------------------------------------------
-        rStream << (USHORT)(nCount - 1);
+        rStream << (sal_uInt16)(nCount - 1);
         bRet = (rStream.GetError() == 0);
-        for (USHORT i=1; bRet && (i < nCount); i++)
+        for (sal_uInt16 i=1; bRet && (i < nCount); i++)
             bRet = ((ScAutoFormatData*)pItems[i])->Save(rStream);
         rStream.Flush();
 
         aMedium.Commit();
     }
-    bSaveLater = FALSE;
+    bSaveLater = sal_False;
     return bRet;
 }
 
-USHORT ScAutoFormat::FindIndexPerName( const String& rName ) const
+sal_uInt16 ScAutoFormat::FindIndexPerName( const String& rName ) const
 {
     String				aName;
 
-    for( USHORT i=0; i<nCount ; i++ )
+    for( sal_uInt16 i=0; i<nCount ; i++ )
     {
         ScAutoFormatData* pItem = (ScAutoFormatData*)pItems[i];
         pItem->GetName( aName );
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 966706bbc..5071e6100 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -61,17 +61,17 @@ typedef void (CALLTYPE* ExFuncPtr14)(void*, void*, void*, void*, void*, void*, v
 typedef void (CALLTYPE* ExFuncPtr15)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (CALLTYPE* ExFuncPtr16)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 
-typedef void (CALLTYPE* GetFuncCountPtr)(USHORT& nCount);
+typedef void (CALLTYPE* GetFuncCountPtr)(sal_uInt16& nCount);
 typedef void (CALLTYPE* GetFuncDataPtr)
-    (USHORT& nNo, sal_Char* pFuncName, USHORT& nParamCount, ParamType* peType, sal_Char* pInternalName);
+    (sal_uInt16& nNo, sal_Char* pFuncName, sal_uInt16& nParamCount, ParamType* peType, sal_Char* pInternalName);
 
-typedef void (CALLTYPE* SetLanguagePtr)( USHORT& nLanguage );
+typedef void (CALLTYPE* SetLanguagePtr)( sal_uInt16& nLanguage );
 typedef void (CALLTYPE* GetParamDesc)
-    (USHORT& nNo, USHORT& nParam, sal_Char* pName, sal_Char* pDesc );
+    (sal_uInt16& nNo, sal_uInt16& nParam, sal_Char* pName, sal_Char* pDesc );
 
-typedef void (CALLTYPE* IsAsync) ( USHORT&		nNo,
+typedef void (CALLTYPE* IsAsync) ( sal_uInt16&		nNo,
                                    ParamType*	peType );
-typedef void (CALLTYPE* Advice)  ( USHORT&		nNo,
+typedef void (CALLTYPE* Advice)  ( sal_uInt16&		nNo,
                                    AdvData&		pfCallback );
 typedef void (CALLTYPE* Unadvice)( double&		nHandle );
 
@@ -110,7 +110,7 @@ FuncData::FuncData(const String& rIName) :
     nParamCount		(0),
     eAsyncType		(NONE)
 {
-    for (USHORT i = 0; i < MAXFUNCPARAM; i++)
+    for (sal_uInt16 i = 0; i < MAXFUNCPARAM; i++)
         eParamType[i] = PTR_DOUBLE;
 }
 
@@ -119,8 +119,8 @@ FuncData::FuncData(const String& rIName) :
 FuncData::FuncData(const ModuleData*pModule,
                    const String&	rIName,
                    const String&	rFName,
-                         USHORT	nNo,
-                    USHORT	nCount,
+                         sal_uInt16	nNo,
+                    sal_uInt16	nCount,
                    const ParamType* peType,
                     ParamType  eType) :
     pModuleData		(pModule),
@@ -130,7 +130,7 @@ FuncData::FuncData(const ModuleData*pModule,
     nParamCount		(nCount),
     eAsyncType		(eType)
 {
-    for (USHORT i = 0; i < MAXFUNCPARAM; i++)
+    for (sal_uInt16 i = 0; i < MAXFUNCPARAM; i++)
         eParamType[i] = peType[i];
 }
 
@@ -145,7 +145,7 @@ FuncData::FuncData(const FuncData& rData) :
     nParamCount		(rData.nParamCount),
     eAsyncType		(rData.eAsyncType)
 {
-    for (USHORT i = 0; i < MAXFUNCPARAM; i++)
+    for (sal_uInt16 i = 0; i < MAXFUNCPARAM; i++)
         eParamType[i] = rData.eParamType[i];
 }
 
@@ -159,7 +159,7 @@ short FuncCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
 
 //------------------------------------------------------------------------
 
-BOOL FuncCollection::SearchFunc( const String& rName, USHORT& rIndex ) const
+sal_Bool FuncCollection::SearchFunc( const String& rName, sal_uInt16& rIndex ) const
 {
     FuncData aDataObj(rName);
     return Search( &aDataObj, rIndex );
@@ -186,13 +186,13 @@ public:
 class ModuleCollection : public ScSortedCollection
 {
 public:
-    ModuleCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : ScSortedCollection ( nLim, nDel, bDup ) {}
+    ModuleCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = sal_False) : ScSortedCollection ( nLim, nDel, bDup ) {}
     ModuleCollection(const ModuleCollection& rModuleCollection) : ScSortedCollection ( rModuleCollection ) {}
 
     virtual ScDataObject*		Clone() const { return new ModuleCollection(*this); }
-            ModuleData*		operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);}
+            ModuleData*		operator[]( const sal_uInt16 nIndex) const {return (ModuleData*)At(nIndex);}
     virtual short			Compare(ScDataObject* pKey1, ScDataObject* pKey2) const;
-            BOOL			SearchModule( const String& rName,
+            sal_Bool			SearchModule( const String& rName,
                                           const ModuleData*& rpModule ) const;
 };
 
@@ -208,12 +208,12 @@ short ModuleCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
 
 //------------------------------------------------------------------------
 
-BOOL ModuleCollection::SearchModule( const String& rName,
+sal_Bool ModuleCollection::SearchModule( const String& rName,
                                      const ModuleData*& rpModule ) const
 {
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     ModuleData aSearchModule(rName, 0);
-    BOOL bFound = Search( &aSearchModule, nIndex );
+    sal_Bool bFound = Search( &aSearchModule, nIndex );
     if (bFound)
         rpModule = (ModuleData*)At(nIndex);
     else
@@ -223,19 +223,19 @@ BOOL ModuleCollection::SearchModule( const String& rName,
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-BOOL InitExternalFunc(const rtl::OUString& rModuleName)
+sal_Bool InitExternalFunc(const rtl::OUString& rModuleName)
 {
     String aModuleName( rModuleName );
 
     // Module schon geladen?
     const ModuleData* pTemp;
     if (aModuleCollection.SearchModule(aModuleName, pTemp))
-        return FALSE;
+        return sal_False;
 
     rtl::OUString aNP;
     aNP = rModuleName;
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     osl::Module* pLib = new osl::Module( aNP );
     if (pLib->is())
     {
@@ -249,7 +249,7 @@ BOOL InitExternalFunc(const rtl::OUString& rModuleName)
             if ( fpSetLanguage )
             {
                 LanguageType eLanguage = Application::GetSettings().GetUILanguage();
-                USHORT nLanguage = (USHORT) eLanguage;
+                sal_uInt16 nLanguage = (sal_uInt16) eLanguage;
                 (*((SetLanguagePtr)fpSetLanguage))( nLanguage );
             }
 
@@ -261,20 +261,20 @@ BOOL InitExternalFunc(const rtl::OUString& rModuleName)
             AdvData pfCallBack = &ScAddInAsyncCallBack;
             FuncData* pFuncData;
             FuncCollection* pFuncCol = ScGlobal::GetFuncCollection();
-            USHORT nCount;
+            sal_uInt16 nCount;
             (*((GetFuncCountPtr)fpGetCount))(nCount);
-            for (USHORT i=0; i < nCount; i++)
+            for (sal_uInt16 i=0; i < nCount; i++)
             {
                 sal_Char cFuncName[256];
                 sal_Char cInternalName[256];
-                USHORT nParamCount;
+                sal_uInt16 nParamCount;
                 ParamType eParamType[MAXFUNCPARAM];
                 ParamType eAsyncType = NONE;
                 // #62113# alles initialisieren, falls das AddIn sich schlecht verhaelt
                 cFuncName[0] = 0;
                 cInternalName[0] = 0;
                 nParamCount = 0;
-                for ( USHORT j=0; j<MAXFUNCPARAM; j++ )
+                for ( sal_uInt16 j=0; j<MAXFUNCPARAM; j++ )
                 {
                     eParamType[j] = NONE;
                 }
@@ -297,7 +297,7 @@ BOOL InitExternalFunc(const rtl::OUString& rModuleName)
                                           eAsyncType );
                 pFuncCol->Insert(pFuncData);
             }
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else
             delete pLib;
@@ -311,8 +311,8 @@ BOOL InitExternalFunc(const rtl::OUString& rModuleName)
 
 void ExitExternalFunc()
 {
-    USHORT nCount = aModuleCollection.GetCount();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = aModuleCollection.GetCount();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ModuleData* pData = aModuleCollection[i];
         pData->FreeInstance();
@@ -321,9 +321,9 @@ void ExitExternalFunc()
 
 //------------------------------------------------------------------------
 
-BOOL FuncData::Call(void** ppParam)
+sal_Bool FuncData::Call(void** ppParam)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     osl::Module* pLib = pModuleData->GetInstance();
     FARPROC fProc = (FARPROC)pLib->getFunctionSymbol(aFuncName);
     if (fProc != NULL)
@@ -332,81 +332,81 @@ BOOL FuncData::Call(void** ppParam)
         {
             case 1 :
                 (*((ExFuncPtr1)fProc))(ppParam[0]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 2 :
                 (*((ExFuncPtr2)fProc))(ppParam[0], ppParam[1]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 3 :
                 (*((ExFuncPtr3)fProc))(ppParam[0], ppParam[1], ppParam[2]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 4 :
                 (*((ExFuncPtr4)fProc))(ppParam[0], ppParam[1], ppParam[2], ppParam[3]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 5 :
                 (*((ExFuncPtr5)fProc))(ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 6 :
                 (*((ExFuncPtr6)fProc))(ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 7 :
                 (*((ExFuncPtr7)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 8 :
                 (*((ExFuncPtr8)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 9 :
                 (*((ExFuncPtr9)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7], ppParam[8]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 10 :
                 (*((ExFuncPtr10)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7], ppParam[8], ppParam[9]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 11 :
                 (*((ExFuncPtr11)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 12:
                 (*((ExFuncPtr12)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 13:
                 (*((ExFuncPtr13)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11],
                                         ppParam[12]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 14 :
                 (*((ExFuncPtr14)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11],
                                         ppParam[12], ppParam[13]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 15 :
                 (*((ExFuncPtr15)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11],
                                         ppParam[12], ppParam[13], ppParam[14]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             case 16 :
                 (*((ExFuncPtr16)fProc))( ppParam[0], ppParam[1], ppParam[2], ppParam[3], ppParam[4], ppParam[5],
                                         ppParam[6], ppParam[7], ppParam[8], ppParam[9], ppParam[10], ppParam[11],
                                         ppParam[12], ppParam[13], ppParam[14], ppParam[15]);
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             default : break;
         }
@@ -416,15 +416,15 @@ BOOL FuncData::Call(void** ppParam)
 
 //------------------------------------------------------------------------
 
-BOOL FuncData::Unadvice( double nHandle )
+sal_Bool FuncData::Unadvice( double nHandle )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     osl::Module* pLib = pModuleData->GetInstance();
     FARPROC fProc = (FARPROC)pLib->getFunctionSymbol(LIBFUNCNAME(UNADVICE));
     if (fProc != NULL)
     {
         ((::Unadvice)fProc)(nHandle);
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return bRet;
 }
@@ -439,9 +439,9 @@ const String& FuncData::GetModuleName() const
 
 //------------------------------------------------------------------------
 
-BOOL FuncData::GetParamDesc( String& aName, String& aDesc, USHORT nParam )
+sal_Bool FuncData::GetParamDesc( String& aName, String& aDesc, sal_uInt16 nParam )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if ( nParam <= nParamCount )
     {
         osl::Module* pLib = pModuleData->GetInstance();
@@ -451,11 +451,11 @@ BOOL FuncData::GetParamDesc( String& aName, String& aDesc, USHORT nParam )
             sal_Char pcName[256];
             sal_Char pcDesc[256];
             *pcName = *pcDesc = 0;
-            USHORT nFuncNo = nNumber;	// nicht per Reference versauen lassen..
+            sal_uInt16 nFuncNo = nNumber;	// nicht per Reference versauen lassen..
             ((::GetParamDesc)fProc)( nFuncNo, nParam, pcName, pcDesc );
             aName = String( pcName, osl_getThreadTextEncoding() );
             aDesc = String( pcDesc, osl_getThreadTextEncoding() );
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     if ( !bRet )
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 5c1dbf8e1..f22149a79 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -46,10 +46,10 @@ const ScFormulaCell* pLastFormulaTreeTop = 0;
 
 // -----------------------------------------------------------------------
 
-void ScCellFormat::GetString( ScBaseCell* pCell, ULONG nFormat, String& rString,
+void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, String& rString,
                               Color** ppColor, SvNumberFormatter& rFormatter,
-                              BOOL bNullVals,
-                              BOOL bFormula,
+                              sal_Bool bNullVals,
+                              sal_Bool bFormula,
                               ScForceTextFmt eForceTextFmt )
 {
     *ppColor = NULL;
@@ -120,7 +120,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, ULONG nFormat, String& rString,
                     }
                     else
                     {
-                        USHORT nErrCode = pFCell->GetErrCode();
+                        sal_uInt16 nErrCode = pFCell->GetErrCode();
 
                         // erst nach dem Interpretieren (GetErrCode) das Zahlformat holen:
                         if ( (nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
@@ -155,7 +155,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, ULONG nFormat, String& rString,
     }
 }
 
-void ScCellFormat::GetInputString( ScBaseCell* pCell, ULONG nFormat, String& rString,
+void ScCellFormat::GetInputString( ScBaseCell* pCell, sal_uLong nFormat, String& rString,
                                       SvNumberFormatter& rFormatter )
 {
     if (&rFormatter==NULL)
@@ -199,7 +199,7 @@ void ScCellFormat::GetInputString( ScBaseCell* pCell, ULONG nFormat, String& rSt
                     ((ScFormulaCell*)pCell)->GetString( rString );
                 }
 
-                USHORT nErrCode = ((ScFormulaCell*)pCell)->GetErrCode();
+                sal_uInt16 nErrCode = ((ScFormulaCell*)pCell)->GetErrCode();
                 if (nErrCode != 0)
                 {
                     rString.Erase();
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index 4a359b54b..729e09b6d 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -84,7 +84,7 @@ ScChartArray::ScChartArray( ScDocument* pDoc, SCTAB nTab,
         aName( rChartName ),
         pDocument( pDoc ),
         aPositioner(pDoc, nTab, nStartColP, nStartRowP, nEndColP, nEndRowP),
-        bValid( TRUE )
+        bValid( sal_True )
 {
 }
 
@@ -93,7 +93,7 @@ ScChartArray::ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList,
         aName( rChartName ),
         pDocument( pDoc ),
         aPositioner(pDoc, rRangeList),
-        bValid( TRUE )
+        bValid( sal_True )
 {
 }
 
@@ -115,7 +115,7 @@ ScDataObject* ScChartArray::Clone() const
     return new ScChartArray(*this);
 }
 
-BOOL ScChartArray::operator==(const ScChartArray& rCmp) const
+sal_Bool ScChartArray::operator==(const ScChartArray& rCmp) const
 {
     return aPositioner == rCmp.aPositioner
         && aName == rCmp.aName;
@@ -128,7 +128,7 @@ BOOL ScChartArray::operator==(const ScChartArray& rCmp) const
 ScMemChart* ScChartArray::CreateMemChart()
 {
     ScRangeListRef aRangeListRef(GetRangeList());
-    ULONG nCount = aRangeListRef->Count();
+    sal_uLong nCount = aRangeListRef->Count();
     if ( nCount > 1 )
         return CreateMemChartMulti();
     else if ( nCount == 1 )
@@ -225,16 +225,16 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
         nRowCount = 0;
     }
 
-    BOOL bValidData = TRUE;
+    sal_Bool bValidData = sal_True;
     if ( !nColCount )
     {
-        bValidData = FALSE;
+        bValidData = sal_False;
         nColCount = 1;
         aCols.push_back(nStrCol);
     }
     if ( !nRowCount )
     {
-        bValidData = FALSE;
+        bValidData = sal_False;
         nRowCount = 1;
         aRows.push_back(nStrRow);
     }
@@ -251,7 +251,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
 //		pMemChart->SetNumberFormatter( pFormatter );
         if ( bValidData )
         {
-            BOOL bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
+            sal_Bool bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
             ScBaseCell* pCell;
             for (nCol=0; nCol<nColCount; nCol++)
             {
@@ -314,7 +314,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
             }
             pMemChart->SetColText( static_cast<short>(nCol), aString);
 
-//            ULONG nNumberAttr = (nTotalRows ? pDocument->GetNumberFormat(
+//            sal_uLong nNumberAttr = (nTotalRows ? pDocument->GetNumberFormat(
 //                        ScAddress( pCols[nCol], nRow1, nTab1)) : 0);
 //			pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr );
         }
@@ -339,7 +339,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
             }
             pMemChart->SetRowText( static_cast<short>(nRow), aString);
 
-//            ULONG nNumberAttr = (nTotalCols ? pDocument->GetNumberFormat(
+//            sal_uLong nNumberAttr = (nTotalCols ? pDocument->GetNumberFormat(
 //                        ScAddress( nCol1, pRows[nRow], nTab1)) : 0);
 //			pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr );
         }
@@ -358,7 +358,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
         //	Zahlen-Typ
         //
 
-//        ULONG nNumberAttr = (nTotalCols && nTotalRows ?
+//        sal_uLong nNumberAttr = (nTotalCols && nTotalRows ?
 //                pDocument->GetNumberFormat( ScAddress( nCol1, nRow1, nTab1)) :
 //                0);
 //		if (pFormatter)
@@ -389,15 +389,15 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
         nRowCount = 0;
     }
 
-    BOOL bValidData = TRUE;
+    sal_Bool bValidData = sal_True;
     if ( !nColCount )
     {
-        bValidData = FALSE;
+        bValidData = sal_False;
         nColCount = 1;
     }
     if ( !nRowCount )
     {
-        bValidData = FALSE;
+        bValidData = sal_False;
         nRowCount = 1;
     }
 
@@ -410,8 +410,8 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
     if (pMemChart)
     {
 //		pMemChart->SetNumberFormatter( pDocument->GetFormatTable() );
-        BOOL bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
-        ULONG nIndex = 0;
+        sal_Bool bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
+        sal_uLong nIndex = 0;
         if (bValidData)
         {
             for ( nCol = 0; nCol < nColCount; nCol++ )
@@ -431,7 +431,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
                                 nVal = ((ScValueCell*)pCell)->GetValue();
                                 if ( bCalcAsShown && nVal != 0.0 )
                                 {
-                                    ULONG nFormat = pDocument->GetNumberFormat( *pPos );
+                                    sal_uLong nFormat = pDocument->GetNumberFormat( *pPos );
                                     nVal = pDocument->RoundValueAsShown( nVal, nFormat );
                                 }
                             }
@@ -464,7 +464,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
                             nVal = ((ScValueCell*)pCell)->GetValue();
                             if ( bCalcAsShown && nVal != 0.0 )
                             {
-                                ULONG nFormat = pDocument->GetNumberFormat( *pPos );
+                                sal_uLong nFormat = pDocument->GetNumberFormat( *pPos );
                                 nVal = pDocument->RoundValueAsShown( nVal, nFormat );
                             }
                         }
@@ -509,7 +509,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
             }
             pMemChart->SetColText( static_cast<short>(nCol), aString);
 
-//			ULONG nNumberAttr = 0;
+//			sal_uLong nNumberAttr = 0;
 //			pPos = GetPositionMap()->GetPosition( nCol, 0 );
 //			if ( pPos )
 //				nNumberAttr = pDocument->GetNumberFormat( *pPos );
@@ -542,7 +542,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
             }
             pMemChart->SetRowText( static_cast<short>(nRow), aString);
 
-//			ULONG nNumberAttr = 0;
+//			sal_uLong nNumberAttr = 0;
 //			pPos = GetPositionMap()->GetPosition( 0, nRow );
 //			if ( pPos )
 //				nNumberAttr = pDocument->GetNumberFormat( *pPos );
@@ -566,14 +566,14 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
 //		SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
 //		if (pFormatter)
 //		{
-//			ULONG nIndex = 0;
-//			ULONG nCount = GetPositionMap()->GetCount();
+//			sal_uLong nIndex = 0;
+//			sal_uLong nCount = GetPositionMap()->GetCount();
 //			const ScAddress* pPos;
 //			do
 //			{
 //				pPos = GetPositionMap()->GetPosition( nIndex );
 //			} while ( !pPos && ++nIndex < nCount );
-//			ULONG nFormat = ( pPos ? pDocument->GetNumberFormat( *pPos ) : 0 );
+//			sal_uLong nFormat = ( pPos ? pDocument->GetNumberFormat( *pPos ) : 0 );
 //			pMemChart->SetDataType( pFormatter->GetType( nFormat ) );
 //		}
 
@@ -601,15 +601,15 @@ ScDataObject*	ScChartCollection::Clone() const
     return new ScChartCollection(*this);
 }
 
-BOOL ScChartCollection::operator==(const ScChartCollection& rCmp) const
+sal_Bool ScChartCollection::operator==(const ScChartCollection& rCmp) const
 {
     if (nCount != rCmp.nCount)
-        return FALSE;
+        return sal_False;
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         if (!((*(const ScChartArray*)pItems[i]) == (*(const ScChartArray*)rCmp.pItems[i])))
-            return FALSE;
+            return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 085fda0de..180e38114 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -52,16 +52,16 @@ namespace
 {
 
 
-USHORT lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCharts )
+sal_uInt16 lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, sal_Bool bAllCharts )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
         return 0;
 
-    USHORT nFound = 0;
+    sal_uInt16 nFound = 0;
 
-    USHORT nPageCount = pModel->GetPageCount();
-    for (USHORT nPageNo=0; nPageNo<nPageCount; nPageNo++)
+    sal_uInt16 nPageCount = pModel->GetPageCount();
+    for (sal_uInt16 nPageNo=0; nPageNo<nPageCount; nPageNo++)
     {
         SdrPage* pPage = pModel->GetPage(nPageNo);
         DBG_ASSERT(pPage,"Page ?");
@@ -73,12 +73,12 @@ USHORT lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCha
             if ( pObject->GetObjIdentifier() == OBJ_OLE2 && pDoc->IsChart( pObject ) )
             {
                 String aName = ((SdrOle2Obj*)pObject)->GetPersistName();
-                BOOL bHit = TRUE;
+                sal_Bool bHit = sal_True;
                 if ( !bAllCharts )
                 {
                     ScRangeList aRanges;
-                    BOOL bColHeaders = FALSE;
-                    BOOL bRowHeaders = FALSE;
+                    sal_Bool bColHeaders = sal_False;
+                    sal_Bool bRowHeaders = sal_False;
                     pDoc->GetOldChartParameters( aName, aRanges, bColHeaders, bRowHeaders );
                     bHit = aRanges.In( rPos );
                 }
@@ -94,31 +94,31 @@ USHORT lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCha
     return nFound;
 }
 
-BOOL lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, SCTAB nTabCount )
+sal_Bool lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, SCTAB nTabCount )
 {
     //!	if multiple sheets are copied, update references into the other copied sheets?
 
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
-    ULONG nCount = rRanges.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = rRanges.Count();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         ScRange* pRange = rRanges.GetObject(i);
         if ( pRange->aStart.Tab() == nSourceTab && pRange->aEnd.Tab() == nSourceTab )
         {
             pRange->aStart.SetTab( nDestTab );
             pRange->aEnd.SetTab( nDestTab );
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
         if ( pRange->aStart.Tab() >= nTabCount )
         {
             pRange->aStart.SetTab( nTabCount > 0 ? ( nTabCount - 1 ) : 0 );
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
         if ( pRange->aEnd.Tab() >= nTabCount )
         {
             pRange->aEnd.SetTab( nTabCount > 0 ? ( nTabCount - 1 ) : 0 );
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
     }
 
@@ -130,15 +130,15 @@ BOOL lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, S
 // === ScChartHelper ======================================
 
 //static
-USHORT ScChartHelper::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc )
+sal_uInt16 ScChartHelper::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc )
 {
-    return lcl_DoUpdateCharts( rPos, pDoc, FALSE );
+    return lcl_DoUpdateCharts( rPos, pDoc, sal_False );
 }
 
 //static
-USHORT ScChartHelper::DoUpdateAllCharts( ScDocument* pDoc )
+sal_uInt16 ScChartHelper::DoUpdateAllCharts( ScDocument* pDoc )
 {
-    return lcl_DoUpdateCharts( ScAddress(), pDoc, TRUE );
+    return lcl_DoUpdateCharts( ScAddress(), pDoc, sal_True );
 }
 
 //static
@@ -318,7 +318,7 @@ void ScChartHelper::AddRangesIfProtectedChart( ScRangeListVector& rRangesVector,
                     ::rtl::OUString aChartName = pSdrOle2Obj->GetPersistName();
                     ScRange aEmptyRange;
                     ScChartListener aSearcher( aChartName, pDocument, aEmptyRange );
-                    USHORT nIndex = 0;
+                    sal_uInt16 nIndex = 0;
                     ScChartListenerCollection* pCollection = pDocument->GetChartListenerCollection();
                     if ( pCollection && pCollection->Search( &aSearcher, nIndex ) )
                     {
@@ -408,7 +408,7 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd
                                 {
                                     ScRange aEmptyRange;
                                     ScChartListener aSearcher( aChartName, pDoc, aEmptyRange );
-                                    USHORT nIndex = 0;
+                                    sal_uInt16 nIndex = 0;
                                     ScChartListenerCollection* pCollection = pDoc->GetChartListenerCollection();
                                     if ( pCollection && !pCollection->Search( &aSearcher, nIndex ) )
                                     {
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 926a89690..3ebb69e5f 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -131,9 +131,9 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP,
     mpTokens(new vector<ScSharedTokenRef>), 
     pUnoData( NULL ),
     pDoc( pDocP ),
-    bUsed( FALSE ),
-    bDirty( FALSE ),
-    bSeriesRangesScheduled( FALSE )
+    bUsed( sal_False ),
+    bDirty( sal_False ),
+    bSeriesRangesScheduled( sal_False )
 {
     SetRangeList( rRange );
 }
@@ -146,9 +146,9 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP,
     mpTokens(new vector<ScSharedTokenRef>), 
     pUnoData( NULL ),
     pDoc( pDocP ),
-    bUsed( FALSE ),
-    bDirty( FALSE ),
-    bSeriesRangesScheduled( FALSE )
+    bUsed( sal_False ),
+    bDirty( sal_False ),
+    bSeriesRangesScheduled( sal_False )
 {
     ScRefTokenHelper::getTokensFromRangeList(*mpTokens, *rRangeList);
 }
@@ -160,9 +160,9 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP, vector
     mpTokens(pTokens),
     pUnoData( NULL ),
     pDoc( pDocP ),
-    bUsed( FALSE ),
-    bDirty( FALSE ),
-    bSeriesRangesScheduled( FALSE )
+    bUsed( sal_False ),
+    bDirty( sal_False ),
+    bSeriesRangesScheduled( sal_False )
 {
 }
 
@@ -173,7 +173,7 @@ ScChartListener::ScChartListener( const ScChartListener& r ) :
     mpTokens(new vector<ScSharedTokenRef>(*r.mpTokens)),
     pUnoData( NULL ),
     pDoc( r.pDoc ),
-    bUsed( FALSE ),
+    bUsed( sal_False ),
     bDirty( r.bDirty ),
     bSeriesRangesScheduled( r.bSeriesRangesScheduled )
 {
@@ -260,7 +260,7 @@ void ScChartListener::Update()
     }
     if ( pUnoData )
     {
-        bDirty = FALSE;
+        bDirty = sal_False;
         //!	irgendwann mal erkennen, was sich innerhalb des Charts geaendert hat
         chart::ChartDataChangeEvent aEvent( pUnoData->GetSource(),
                                         chart::ChartDataChangeType_ALL,
@@ -269,7 +269,7 @@ void ScChartListener::Update()
     }
     else if ( pDoc->GetAutoCalc() )
     {
-        bDirty = FALSE;
+        bDirty = sal_False;
         pDoc->UpdateChart( GetString());
     }
 }
@@ -381,13 +381,13 @@ void ScChartListener::EndListeningTo()
 
 
 void ScChartListener::ChangeListening( const ScRangeListRef& rRangeListRef,
-            BOOL bDirtyP  )
+            sal_Bool bDirtyP  )
 {
     EndListeningTo();
     SetRangeList( rRangeListRef );
     StartListeningTo();
     if ( bDirtyP )
-        SetDirty( TRUE );
+        SetDirty( sal_True );
 }
 
 
@@ -395,7 +395,7 @@ void ScChartListener::UpdateScheduledSeriesRanges()
 {
     if ( bSeriesRangesScheduled )
     {
-        bSeriesRangesScheduled = FALSE;
+        bSeriesRangesScheduled = sal_False;
         UpdateSeriesRanges();
     }
 }
@@ -435,7 +435,7 @@ void ScChartListener::SetUpdateQueue()
     pDoc->GetChartListenerCollection()->StartTimer();
 }
 
-BOOL ScChartListener::operator==( const ScChartListener& r )
+sal_Bool ScChartListener::operator==( const ScChartListener& r )
 {
     bool b1 = (mpTokens.get() && !mpTokens->empty());
     bool b2 = (r.mpTokens.get() && !r.mpTokens->empty());
@@ -471,7 +471,7 @@ ScChartListenerCollection::RangeListenerItem::RangeListenerItem(const ScRange& r
 }
 
 ScChartListenerCollection::ScChartListenerCollection( ScDocument* pDocP ) :
-    ScStrCollection( 4, 4, FALSE ),
+    ScStrCollection( 4, 4, sal_False ),
     pDoc( pDocP )
 {
     aTimer.SetTimeoutHdl( LINK( this, ScChartListenerCollection, TimerHdl ) );
@@ -502,18 +502,18 @@ ScDataObject*	ScChartListenerCollection::Clone() const
 
 void ScChartListenerCollection::StartAllListeners()
 {
-    for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
+    for ( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ )
     {
         ((ScChartListener*) pItems[ nIndex ])->StartListeningTo();
     }
 }
 
 void ScChartListenerCollection::ChangeListening( const String& rName,
-        const ScRangeListRef& rRangeListRef, BOOL bDirty )
+        const ScRangeListRef& rRangeListRef, sal_Bool bDirty )
 {
     ScChartListener aCLSearcher( rName, pDoc, rRangeListRef );
     ScChartListener* pCL;
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     if ( Search( &aCLSearcher, nIndex ) )
     {
         pCL = (ScChartListener*) pItems[ nIndex ];
@@ -527,13 +527,13 @@ void ScChartListenerCollection::ChangeListening( const String& rName,
     }
     pCL->StartListeningTo();
     if ( bDirty )
-        pCL->SetDirty( TRUE );
+        pCL->SetDirty( sal_True );
 }
 
 void ScChartListenerCollection::FreeUnused()
 {
     // rueckwaerts wg. Pointer-Aufrueckerei im Array
-    for ( USHORT nIndex = nCount; nIndex-- >0; )
+    for ( sal_uInt16 nIndex = nCount; nIndex-- >0; )
     {
         ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
         //	Uno-Charts nicht rauskicken
@@ -541,7 +541,7 @@ void ScChartListenerCollection::FreeUnused()
         if ( !pCL->IsUno() )
         {
             if ( pCL->IsUsed() )
-                pCL->SetUsed( FALSE );
+                pCL->SetUsed( sal_False );
             else
                 Free( pCL );
         }
@@ -552,7 +552,7 @@ void ScChartListenerCollection::FreeUno( const uno::Reference< chart::XChartData
                                          const uno::Reference< chart::XChartData >& rSource )
 {
     // rueckwaerts wg. Pointer-Aufrueckerei im Array
-    for ( USHORT nIndex = nCount; nIndex-- >0; )
+    for ( sal_uInt16 nIndex = nCount; nIndex-- >0; )
     {
         ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
         if ( pCL->IsUno() &&
@@ -584,7 +584,7 @@ IMPL_LINK( ScChartListenerCollection, TimerHdl, Timer*, EMPTYARG )
 
 void ScChartListenerCollection::UpdateDirtyCharts()
 {
-    for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
+    for ( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ )
     {
         ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
         if ( pCL->IsDirty() )
@@ -597,24 +597,24 @@ void ScChartListenerCollection::UpdateDirtyCharts()
 
 void ScChartListenerCollection::SetDirty()
 {
-    for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
+    for ( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ )
     {
         ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
-        pCL->SetDirty( TRUE );
+        pCL->SetDirty( sal_True );
     }
     StartTimer();
 }
 
 
 void ScChartListenerCollection::SetDiffDirty(
-            const ScChartListenerCollection& rCmp, BOOL bSetChartRangeLists )
+            const ScChartListenerCollection& rCmp, sal_Bool bSetChartRangeLists )
 {
-    BOOL bDirty = FALSE;
-    for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
+    sal_Bool bDirty = sal_False;
+    for ( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ )
     {
         ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
-        USHORT nFound;
-        BOOL bFound = rCmp.Search( pCL, nFound );
+        sal_uInt16 nFound;
+        sal_Bool bFound = rCmp.Search( pCL, nFound );
         if ( !bFound ||	(*pCL != *((const ScChartListener*) rCmp.pItems[ nFound ])) )
         {
             if ( bSetChartRangeLists )
@@ -624,16 +624,16 @@ void ScChartListenerCollection::SetDiffDirty(
                     const ScRangeListRef& rList1 = pCL->GetRangeList();
                     const ScRangeListRef& rList2 =
                         ((const ScChartListener*) rCmp.pItems[ nFound ])->GetRangeList();
-                    BOOL b1 = rList1.Is();
-                    BOOL b2 = rList2.Is();
+                    sal_Bool b1 = rList1.Is();
+                    sal_Bool b2 = rList2.Is();
                     if ( b1 != b2 || (b1 && b2 && (*rList1 != *rList2)) )
                         pDoc->SetChartRangeList( pCL->GetString(), rList1 );
                 }
                 else
                     pDoc->SetChartRangeList( pCL->GetString(), pCL->GetRangeList() );
             }
-            bDirty = TRUE;
-            pCL->SetDirty( TRUE );
+            bDirty = sal_True;
+            pCL->SetDirty( sal_True );
         }
     }
     if ( bDirty )
@@ -643,15 +643,15 @@ void ScChartListenerCollection::SetDiffDirty(
 
 void ScChartListenerCollection::SetRangeDirty( const ScRange& rRange )
 {
-    BOOL bDirty = FALSE;
-    for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
+    sal_Bool bDirty = sal_False;
+    for ( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ )
     {
         ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
         const ScRangeListRef& rList = pCL->GetRangeList();
         if ( rList.Is() && rList->Intersects( rRange ) )
         {
-            bDirty = TRUE;
-            pCL->SetDirty( TRUE );
+            bDirty = sal_True;
+            pCL->SetDirty( sal_True );
         }
     }
     if ( bDirty )
@@ -669,7 +669,7 @@ void ScChartListenerCollection::SetRangeDirty( const ScRange& rRange )
 
 void ScChartListenerCollection::UpdateScheduledSeriesRanges()
 {
-    for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
+    for ( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ )
     {
         ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
         pCL->UpdateScheduledSeriesRanges();
@@ -680,7 +680,7 @@ void ScChartListenerCollection::UpdateScheduledSeriesRanges()
 void ScChartListenerCollection::UpdateChartsContainingTab( SCTAB nTab )
 {
     ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab );
-    for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
+    for ( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ )
     {
         ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
         pCL->UpdateChartIntersecting( aRange );
@@ -688,19 +688,19 @@ void ScChartListenerCollection::UpdateChartsContainingTab( SCTAB nTab )
 }
 
 
-BOOL ScChartListenerCollection::operator==( const ScChartListenerCollection& r )
+sal_Bool ScChartListenerCollection::operator==( const ScChartListenerCollection& r )
 {
     // hier nicht ScStrCollection::operator==() verwenden, der umstaendlich via
     // IsEqual und Compare laeuft, stattdessen ScChartListener::operator==()
     if ( pDoc != r.pDoc || nCount != r.nCount )
-        return FALSE;
-    for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
+        return sal_False;
+    for ( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ )
     {
         if ( *((ScChartListener*) pItems[ nIndex ]) !=
                 *((ScChartListener*) r.pItems[ nIndex ]) )
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void ScChartListenerCollection::StartListeningHiddenRange( const ScRange& rRange, ScChartHiddenRangeListener* pListener )
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index 56403e8a8..3953c60e7 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -36,6 +36,22 @@
 #include "document.hxx"
 #include "rechead.hxx"
 
+namespace
+{
+    bool lcl_hasValueDataButNoDates( ScDocument* pDocument, SCCOL nCol, SCROW nRow, SCTAB nTab )
+    {
+        bool bReturn = false;
+        if (pDocument->HasValueData( nCol, nRow, nTab ))
+        {
+            //treat dates like text #i25706#
+            sal_uInt32 nNumberFormat = pDocument->GetNumberFormat( ScAddress( nCol, nRow, nTab ) );
+            short nType = pDocument->GetFormatTable()->GetType(nNumberFormat);
+            bool bIsDate = (nType & NUMBERFORMAT_DATE);
+            bReturn = !bIsDate;
+        }
+        return bReturn;
+    }
+}
 
 ScChartPositioner::ScChartPositioner( ScDocument* pDoc, SCTAB nTab,
                     SCCOL nStartColP, SCROW nStartRowP, SCCOL nEndColP, SCROW nEndRowP) :
@@ -44,9 +60,9 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, SCTAB nTab,
         eGlue( SC_CHARTGLUE_NA ),
         nStartCol(0),
         nStartRow(0),
-        bColHeaders( FALSE ),
-        bRowHeaders( FALSE ),
-        bDummyUpperLeft( FALSE )
+        bColHeaders( sal_False ),
+        bRowHeaders( sal_False ),
+        bDummyUpperLeft( sal_False )
 {
     SetRangeList( ScRange( nStartColP, nStartRowP, nTab, nEndColP, nEndRowP, nTab ) );
     CheckColRowHeaders();
@@ -59,9 +75,9 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rR
         eGlue( SC_CHARTGLUE_NA ),
         nStartCol(0),
         nStartRow(0),
-        bColHeaders( FALSE ),
-        bRowHeaders( FALSE ),
-        bDummyUpperLeft( FALSE )
+        bColHeaders( sal_False ),
+        bRowHeaders( sal_False ),
+        bDummyUpperLeft( sal_False )
 {
     if ( aRangeListRef.Is() )
         CheckColRowHeaders();
@@ -85,7 +101,7 @@ ScChartPositioner::~ScChartPositioner()
     delete pPositionMap;
 }
 
-BOOL ScChartPositioner::operator==(const ScChartPositioner& rCmp) const
+sal_Bool ScChartPositioner::operator==(const ScChartPositioner& rCmp) const
 {
     return bColHeaders == rCmp.bColHeaders
         && bRowHeaders == rCmp.bRowHeaders
@@ -103,7 +119,7 @@ void ScChartPositioner::GlueState()
 {
     if ( eGlue != SC_CHARTGLUE_NA )
         return;
-    bDummyUpperLeft = FALSE;
+    bDummyUpperLeft = sal_False;
     ScRangePtr pR;
     if ( aRangeListRef->Count() <= 1 )
     {
@@ -124,7 +140,7 @@ void ScChartPositioner::GlueState()
         }
         return;
     }
-// 	ULONG nOldPos = aRangeListRef->GetCurPos();
+// 	sal_uLong nOldPos = aRangeListRef->GetCurPos();
 
     pR = aRangeListRef->First();
     nStartCol = pR->aStart.Col();
@@ -161,7 +177,7 @@ void ScChartPositioner::GlueState()
         eGlue = SC_CHARTGLUE_COLS;
         return;
     }
-    ULONG nCR = (ULONG)nC * nR;
+    sal_uLong nCR = (sal_uLong)nC * nR;
 //2do:
 /*
     Erstmal simpel ohne Bitmaskiererei, maximal koennten so 8MB alloziert
@@ -171,13 +187,13 @@ void ScChartPositioner::GlueState()
     Zeilen/Spalten abzulegen, wuerde aber ein weiteres durchlaufen der
     RangeList und indirekten Zugriff auf das Array bedeuten.
  */
-    const BYTE nHole = 0;
-    const BYTE nOccu = 1;
-    const BYTE nFree = 2;
-    const BYTE nGlue = 3;
-    BYTE* p;
-    BYTE* pA = new BYTE[ nCR ];
-    memset( pA, 0, nCR * sizeof(BYTE) );
+    const sal_uInt8 nHole = 0;
+    const sal_uInt8 nOccu = 1;
+    const sal_uInt8 nFree = 2;
+    const sal_uInt8 nGlue = 3;
+    sal_uInt8* p;
+    sal_uInt8* pA = new sal_uInt8[ nCR ];
+    memset( pA, 0, nCR * sizeof(sal_uInt8) );
 
     SCCOL nCol, nCol1, nCol2;
     SCROW nRow, nRow1, nRow2;
@@ -189,17 +205,17 @@ void ScChartPositioner::GlueState()
         nRow2 = pR->aEnd.Row() - nStartRow;
         for ( nCol = nCol1; nCol <= nCol2; nCol++ )
         {
-            p = pA + (ULONG)nCol * nR + nRow1;
+            p = pA + (sal_uLong)nCol * nR + nRow1;
             for ( nRow = nRow1; nRow <= nRow2; nRow++, p++ )
                 *p = nOccu;
         }
     }
-    BOOL bGlue = TRUE;
+    sal_Bool bGlue = sal_True;
 
-    BOOL bGlueCols = FALSE;
+    sal_Bool bGlueCols = sal_False;
     for ( nCol = 0; bGlue && nCol < nC; nCol++ )
     {	// Spalten probieren durchzugehen und als frei markieren
-        p = pA + (ULONG)nCol * nR;
+        p = pA + (sal_uLong)nCol * nR;
         for ( nRow = 0; bGlue && nRow < nR; nRow++, p++ )
         {
             if ( *p == nOccu )
@@ -207,21 +223,21 @@ void ScChartPositioner::GlueState()
                 // moeglich. Am Rand koennte ok sein, wenn in dieser Spalte
                 // in jeder belegten Zeile einer belegt ist.
                 if ( nRow > 0 && nCol > 0 )
-                    bGlue = FALSE;		// nCol==0 kann DummyUpperLeft sein
+                    bGlue = sal_False;		// nCol==0 kann DummyUpperLeft sein
                 else
                     nRow = nR;
             }
             else
                 *p = nFree;
         }
-        if ( bGlue && *(p = (pA + ((((ULONG)nCol+1) * nR) - 1))) == nFree )
+        if ( bGlue && *(p = (pA + ((((sal_uLong)nCol+1) * nR) - 1))) == nFree )
         {	// Spalte als komplett frei markieren
             *p = nGlue;
-            bGlueCols = TRUE;		// mindestens eine freie Spalte
+            bGlueCols = sal_True;		// mindestens eine freie Spalte
         }
     }
 
-    BOOL bGlueRows = FALSE;
+    sal_Bool bGlueRows = sal_False;
     for ( nRow = 0; bGlue && nRow < nR; nRow++ )
     {	// Zeilen probieren durchzugehen und als frei markieren
         p = pA + nRow;
@@ -230,28 +246,28 @@ void ScChartPositioner::GlueState()
             if ( *p == nOccu )
             {
                 if ( nCol > 0 && nRow > 0 )
-                    bGlue = FALSE;		// nRow==0 kann DummyUpperLeft sein
+                    bGlue = sal_False;		// nRow==0 kann DummyUpperLeft sein
                 else
                     nCol = nC;
             }
             else
                 *p = nFree;
         }
-        if ( bGlue && *(p = (pA + ((((ULONG)nC-1) * nR) + nRow))) == nFree )
+        if ( bGlue && *(p = (pA + ((((sal_uLong)nC-1) * nR) + nRow))) == nFree )
         {	// Zeile als komplett frei markieren
             *p = nGlue;
-            bGlueRows = TRUE;		// mindestens eine freie Zeile
+            bGlueRows = sal_True;		// mindestens eine freie Zeile
         }
     }
 
     // n=1: die linke obere Ecke koennte bei Beschriftung automagisch
     // hinzugezogen werden
     p = pA + 1;
-    for ( ULONG n = 1; bGlue && n < nCR; n++, p++ )
+    for ( sal_uLong n = 1; bGlue && n < nCR; n++, p++ )
     {	// ein unberuehrtes Feld heisst, dass es weder spaltenweise noch
         // zeilenweise zu erreichen war, also nichts zusamenzufassen
         if ( *p == nHole )
-            bGlue = FALSE;
+            bGlue = sal_False;
     }
     if ( bGlue )
     {
@@ -262,7 +278,7 @@ void ScChartPositioner::GlueState()
         else
             eGlue = SC_CHARTGLUE_COLS;
         if ( *pA != nOccu )
-            bDummyUpperLeft = TRUE;
+            bDummyUpperLeft = sal_True;
     }
     else
     {
@@ -278,45 +294,45 @@ void ScChartPositioner::CheckColRowHeaders()
     SCROW nRow1, nRow2, iRow;
     SCTAB nTab1, nTab2;
 
-    BOOL bColStrings = TRUE;
-    BOOL bRowStrings = TRUE;
+    sal_Bool bColStrings = sal_True;
+    sal_Bool bRowStrings = sal_True;
     GlueState();
     if ( aRangeListRef->Count() == 1 )
     {
         aRangeListRef->First()->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
         if ( nCol1 > nCol2 || nRow1 > nRow2 )
-            bColStrings = bRowStrings = FALSE;
+            bColStrings = bRowStrings = sal_False;
         else
         {
             for (iCol=nCol1; iCol<=nCol2 && bColStrings; iCol++)
             {
-                if (pDocument->HasValueData( iCol, nRow1, nTab1 ))
-                        bColStrings = FALSE;
+                if (lcl_hasValueDataButNoDates( pDocument, iCol, nRow1, nTab1 ))
+                        bColStrings = sal_False;
             }
             for (iRow=nRow1; iRow<=nRow2 && bRowStrings; iRow++)
             {
-                if (pDocument->HasValueData( nCol1, iRow, nTab1 ))
-                        bRowStrings = FALSE;
+                if (lcl_hasValueDataButNoDates( pDocument, nCol1, iRow, nTab1 ))
+                        bRowStrings = sal_False;
             }
         }
     }
     else
     {
-        BOOL bVert = (eGlue == SC_CHARTGLUE_NONE || eGlue == SC_CHARTGLUE_ROWS);
+        sal_Bool bVert = (eGlue == SC_CHARTGLUE_NONE || eGlue == SC_CHARTGLUE_ROWS);
         for ( ScRangePtr pR = aRangeListRef->First();
                 pR && (bColStrings || bRowStrings);
                 pR = aRangeListRef->Next() )
         {
             pR->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
-            BOOL bTopRow = (nRow1 == nStartRow);
+            sal_Bool bTopRow = (nRow1 == nStartRow);
             if ( bRowStrings && (bVert || nCol1 == nStartCol) )
             {	// NONE oder ROWS: RowStrings in jeder Selektion moeglich
                 // COLS oder BOTH: nur aus der ersten Spalte
                 if ( nCol1 <= nCol2 )
                     for (iRow=nRow1; iRow<=nRow2 && bRowStrings; iRow++)
                     {
-                        if (pDocument->HasValueData( nCol1, iRow, nTab1 ))
-                                bRowStrings = FALSE;
+                        if (lcl_hasValueDataButNoDates( pDocument, nCol1, iRow, nTab1 ))
+                                bRowStrings = sal_False;
                     }
             }
             if ( bColStrings && bTopRow )
@@ -324,8 +340,8 @@ void ScChartPositioner::CheckColRowHeaders()
                 if ( nRow1 <= nRow2 )
                     for (iCol=nCol1; iCol<=nCol2 && bColStrings; iCol++)
                     {
-                        if (pDocument->HasValueData( iCol, nRow1, nTab1 ))
-                                bColStrings = FALSE;
+                        if (lcl_hasValueDataButNoDates( pDocument, iCol, nRow1, nTab1 ))
+                                bColStrings = sal_False;
                     }
             }
         }
@@ -368,7 +384,7 @@ void ScChartPositioner::CreatePositionMap()
 
     GlueState();
 
-    BOOL bNoGlue = (eGlue == SC_CHARTGLUE_NONE);
+    sal_Bool bNoGlue = (eGlue == SC_CHARTGLUE_NONE);
     Table* pCols = new Table;
     Table* pNewRowTable = new Table;
     ScAddress* pNewAddress = new ScAddress;
@@ -382,8 +398,8 @@ void ScChartPositioner::CreatePositionMap()
         for ( nTab = nTab1; nTab <= nTab2; nTab++ )
         {
             // nTab im ColKey, um gleiche Col/Row in anderer Table haben zu koennen
-            ULONG nInsCol = (static_cast<ULONG>(nTab) << 16) | (bNoGlue ? 0 :
-                    static_cast<ULONG>(nCol1));
+            sal_uLong nInsCol = (static_cast<sal_uLong>(nTab) << 16) | (bNoGlue ? 0 :
+                    static_cast<sal_uLong>(nCol1));
             for ( nCol = nCol1; nCol <= nCol2; ++nCol, ++nInsCol )
             {
                 if ( bNoGlue || eGlue == SC_CHARTGLUE_ROWS )
@@ -407,7 +423,7 @@ void ScChartPositioner::CreatePositionMap()
                 }
                 // bei anderer Tabelle wurde bereits neuer ColKey erzeugt,
                 // die Zeilen muessen fuer's Dummy fuellen gleich sein!
-                ULONG nInsRow = (bNoGlue ? nNoGlueRow : nRow1);
+                sal_uLong nInsRow = (bNoGlue ? nNoGlueRow : nRow1);
                 for ( nRow = nRow1; nRow <= nRow2; nRow++, nInsRow++ )
                 {
                     if ( pCol->Insert( nInsRow, pNewAddress ) )
@@ -470,11 +486,11 @@ void ScChartPositioner::CreatePositionMap()
         if ( bNoGlue )
         {	// Luecken mit Dummies fuellen, erste Spalte ist Master
             Table* pFirstCol = (Table*) pCols->First();
-            ULONG nCount = pFirstCol->Count();
+            sal_uLong nCount = pFirstCol->Count();
             pFirstCol->First();
-            for ( ULONG n = 0; n < nCount; n++, pFirstCol->Next() )
+            for ( sal_uLong n = 0; n < nCount; n++, pFirstCol->Next() )
             {
-                ULONG nKey = pFirstCol->GetCurKey();
+                sal_uLong nKey = pFirstCol->GetCurKey();
                 pCols->First();
                 while ( (pCol = (Table*) pCols->Next())!=NULL )
                     pCol->Insert( nKey, (void*)0 );		// keine Daten
@@ -499,7 +515,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows,
         ppData( new ScAddress* [ nChartCols * nChartRows ] ),
         ppColHeader( new ScAddress* [ nChartCols ] ),
         ppRowHeader( new ScAddress* [ nChartRows ] ),
-        nCount( (ULONG) nChartCols * nChartRows ),
+        nCount( (sal_uLong) nChartCols * nChartRows ),
         nColCount( nChartCols ),
         nRowCount( nChartRows )
 {
@@ -535,7 +551,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows,
         pCol = (Table*) rCols.Next();
 
     // Daten spaltenweise und Spalten-Header
-    ULONG nIndex = 0;
+    sal_uLong nIndex = 0;
     for ( nCol = 0; nCol < nColCount; nCol++ )
     {
         if ( pCol )
@@ -569,7 +585,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows,
 
 ScChartPositionMap::~ScChartPositionMap()
 {
-    for ( ULONG nIndex=0; nIndex < nCount; nIndex++ )
+    for ( sal_uLong nIndex=0; nIndex < nCount; nIndex++ )
     {
         delete ppData[nIndex];
     }
@@ -595,8 +611,8 @@ ScChartPositionMap::~ScChartPositionMap()
 //UNUSED2009-05     ScRangeListRef xRangeList = new ScRangeList;
 //UNUSED2009-05     if ( nChartCol < nColCount )
 //UNUSED2009-05     {
-//UNUSED2009-05         ULONG nStop = GetIndex( nChartCol, nRowCount );
-//UNUSED2009-05         for ( ULONG nIndex = GetIndex( nChartCol, 0 ); nIndex < nStop; nIndex++ )
+//UNUSED2009-05         sal_uLong nStop = GetIndex( nChartCol, nRowCount );
+//UNUSED2009-05         for ( sal_uLong nIndex = GetIndex( nChartCol, 0 ); nIndex < nStop; nIndex++ )
 //UNUSED2009-05         {
 //UNUSED2009-05             if ( ppData[ nIndex ] )
 //UNUSED2009-05                 xRangeList->Join( *ppData[ nIndex ] );
@@ -611,8 +627,8 @@ ScChartPositionMap::~ScChartPositionMap()
 //UNUSED2009-05     ScRangeListRef xRangeList = new ScRangeList;
 //UNUSED2009-05     if ( nChartRow < nRowCount )
 //UNUSED2009-05     {
-//UNUSED2009-05         ULONG nStop = GetIndex( nColCount, nChartRow );
-//UNUSED2009-05         for ( ULONG nIndex = GetIndex( 0, nChartRow ); nIndex < nStop;
+//UNUSED2009-05         sal_uLong nStop = GetIndex( nColCount, nChartRow );
+//UNUSED2009-05         for ( sal_uLong nIndex = GetIndex( 0, nChartRow ); nIndex < nStop;
 //UNUSED2009-05                 nIndex += nRowCount )
 //UNUSED2009-05         {
 //UNUSED2009-05             if ( ppData[ nIndex ] )
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 944324aee..a246e1024 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -61,10 +61,10 @@
 
 DECLARE_STACK( ScChangeActionStack, ScChangeAction* )
 
-const USHORT nMemPoolChangeActionCellListEntry = (0x2000 - 64) / sizeof(ScChangeActionCellListEntry);
+const sal_uInt16 nMemPoolChangeActionCellListEntry = (0x2000 - 64) / sizeof(ScChangeActionCellListEntry);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry, nMemPoolChangeActionCellListEntry, nMemPoolChangeActionCellListEntry )
 
-const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActionLinkEntry);
+const sal_uInt16 nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActionLinkEntry);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, nMemPoolChangeActionLinkEntry, nMemPoolChangeActionLinkEntry )
 
 // loaded MSB > eigenes => inkompatibel
@@ -115,7 +115,7 @@ ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScRange& rRange
 }
 
 ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScBigRange& rRange,
-                        const ULONG nTempAction, const ULONG nTempRejectAction,
+                        const sal_uLong nTempAction, const sal_uLong nTempRejectAction,
                         const ScChangeActionState eTempState, const DateTime& aTempDateTime,
                         const String& aTempUser,  const String& aTempComment)
         :
@@ -137,7 +137,7 @@ ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScBigRange& rRa
 }
 
 ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScBigRange& rRange,
-                        const ULONG nTempAction)
+                        const sal_uLong nTempAction)
         :
         aBigRange( rRange ),
         pNext( NULL ),
@@ -161,45 +161,45 @@ ScChangeAction::~ScChangeAction()
 }
 
 
-BOOL ScChangeAction::IsVisible() const
+sal_Bool ScChangeAction::IsVisible() const
 {
     //! sequence order of execution is significant
     if ( IsRejected() || GetType() == SC_CAT_DELETE_TABS || IsDeletedIn() )
-        return FALSE;
+        return sal_False;
     if ( GetType() == SC_CAT_CONTENT )
         return ((ScChangeActionContent*)this)->IsTopContent();
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScChangeAction::IsTouchable() const
+sal_Bool ScChangeAction::IsTouchable() const
 {
     //! sequence order of execution is significant
     if ( IsRejected() || GetType() == SC_CAT_REJECT || IsDeletedIn() )
-        return FALSE;
+        return sal_False;
     // content may reject and be touchable if on top
     if ( GetType() == SC_CAT_CONTENT )
         return ((ScChangeActionContent*)this)->IsTopContent();
     if ( IsRejecting() )
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
 
-BOOL ScChangeAction::IsClickable() const
+sal_Bool ScChangeAction::IsClickable() const
 {
     //! sequence order of execution is significant
     if ( !IsVirgin() )
-        return FALSE;
+        return sal_False;
     if ( IsDeletedIn() )
-        return FALSE;
+        return sal_False;
     if ( GetType() == SC_CAT_CONTENT )
     {
         ScChangeActionContentCellType eCCT =
             ScChangeActionContent::GetContentCellType(
             ((ScChangeActionContent*)this)->GetNewCell() );
         if ( eCCT == SC_CACCT_MATREF )
-            return FALSE;
+            return sal_False;
         if ( eCCT == SC_CACCT_MATORG )
         {	// no Accept-Select if one of the references is in a deleted col/row
             const ScChangeActionLinkEntry* pL =
@@ -208,101 +208,101 @@ BOOL ScChangeAction::IsClickable() const
             {
                 ScChangeAction* p = (ScChangeAction*) pL->GetAction();
                 if ( p && p->IsDeletedIn() )
-                    return FALSE;
+                    return sal_False;
                 pL = pL->GetNext();
             }
         }
-        return TRUE;	// for Select() a content doesn't have to be touchable
+        return sal_True;	// for Select() a content doesn't have to be touchable
     }
     return IsTouchable();	// Accept()/Reject() only on touchables
 }
 
 
-BOOL ScChangeAction::IsRejectable() const
+sal_Bool ScChangeAction::IsRejectable() const
 {
     //! sequence order of execution is significant
     if ( !IsClickable() )
-        return FALSE;
+        return sal_False;
     if ( GetType() == SC_CAT_CONTENT )
     {
         if ( ((ScChangeActionContent*)this)->IsOldMatrixReference() )
-            return FALSE;
+            return sal_False;
         ScChangeActionContent* pNextContent =
             ((ScChangeActionContent*)this)->GetNextContent();
         if ( pNextContent == NULL )
-            return TRUE;		// *this is TopContent
+            return sal_True;		// *this is TopContent
         return pNextContent->IsRejected();		// *this is next rejectable
     }
     return IsTouchable();
 }
 
 
-BOOL ScChangeAction::IsInternalRejectable() const
+sal_Bool ScChangeAction::IsInternalRejectable() const
 {
     //! sequence order of execution is significant
     if ( !IsVirgin() )
-        return FALSE;
+        return sal_False;
     if ( IsDeletedIn() )
-        return FALSE;
+        return sal_False;
     if ( GetType() == SC_CAT_CONTENT )
     {
         ScChangeActionContent* pNextContent =
             ((ScChangeActionContent*)this)->GetNextContent();
         if ( pNextContent == NULL )
-            return TRUE;		// *this is TopContent
+            return sal_True;		// *this is TopContent
         return pNextContent->IsRejected();		// *this is next rejectable
     }
     return IsTouchable();
 }
 
 
-BOOL ScChangeAction::IsDialogRoot() const
+sal_Bool ScChangeAction::IsDialogRoot() const
 {
     return IsInternalRejectable();		// only rejectables in root
 }
 
 
-BOOL ScChangeAction::IsDialogParent() const
+sal_Bool ScChangeAction::IsDialogParent() const
 {
     //! sequence order of execution is significant
     if ( GetType() == SC_CAT_CONTENT )
     {
         if ( !IsDialogRoot() )
-            return FALSE;
+            return sal_False;
         if ( ((ScChangeActionContent*)this)->IsMatrixOrigin() && HasDependent() )
-            return TRUE;
+            return sal_True;
         ScChangeActionContent* pPrevContent =
             ((ScChangeActionContent*)this)->GetPrevContent();
         return pPrevContent && pPrevContent->IsVirgin();
     }
     if ( HasDependent() )
-        return IsDeleteType() ? TRUE : !IsDeletedIn();
+        return IsDeleteType() ? sal_True : !IsDeletedIn();
     if ( HasDeleted() )
     {
         if ( IsDeleteType() )
         {
             if ( IsDialogRoot() )
-                return TRUE;
+                return sal_True;
             ScChangeActionLinkEntry* pL = pLinkDeleted;
             while ( pL )
             {
                 ScChangeAction* p = pL->GetAction();
                 if ( p && p->GetType() != eType )
-                    return TRUE;
+                    return sal_True;
                 pL = pL->GetNext();
             }
         }
         else
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScChangeAction::IsMasterDelete() const
+sal_Bool ScChangeAction::IsMasterDelete() const
 {
     if ( !IsDeleteType() )
-        return FALSE;
+        return sal_False;
     ScChangeActionDel* pDel = (ScChangeActionDel*) this;
     return pDel->IsMultiDelete() && (pDel->IsTopDelete() || pDel->IsRejectable());
 }
@@ -324,9 +324,9 @@ void ScChangeAction::RemoveAllAnyLinks()
 }
 
 
-BOOL ScChangeAction::RemoveDeletedIn( const ScChangeAction* p )
+sal_Bool ScChangeAction::RemoveDeletedIn( const ScChangeAction* p )
 {
-    BOOL bRemoved = FALSE;
+    sal_Bool bRemoved = sal_False;
     ScChangeActionLinkEntry* pL = GetDeletedIn();
     while ( pL )
     {
@@ -334,7 +334,7 @@ BOOL ScChangeAction::RemoveDeletedIn( const ScChangeAction* p )
         if ( pL->GetAction() == p )
         {
             delete pL;
-            bRemoved = TRUE;
+            bRemoved = sal_True;
         }
         pL = pNextLink;
     }
@@ -342,16 +342,16 @@ BOOL ScChangeAction::RemoveDeletedIn( const ScChangeAction* p )
 }
 
 
-BOOL ScChangeAction::IsDeletedIn( const ScChangeAction* p ) const
+sal_Bool ScChangeAction::IsDeletedIn( const ScChangeAction* p ) const
 {
     ScChangeActionLinkEntry* pL = GetDeletedIn();
     while ( pL )
     {
         if ( pL->GetAction() == p )
-            return TRUE;
+            return sal_True;
         pL = pL->GetNext();
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -363,7 +363,7 @@ void ScChangeAction::RemoveAllDeletedIn()
 }
 
 
-BOOL ScChangeAction::IsDeletedInDelType( ScChangeActionType eDelType ) const
+sal_Bool ScChangeAction::IsDeletedInDelType( ScChangeActionType eDelType ) const
 {
     ScChangeAction* p;
     ScChangeActionLinkEntry* pL = GetDeletedIn();
@@ -389,11 +389,11 @@ BOOL ScChangeAction::IsDeletedInDelType( ScChangeActionType eDelType ) const
         {
             if ( (p = pL->GetAction()) != NULL &&
                     (p->GetType() == eDelType || p->GetType() == eInsType) )
-                return TRUE;
+                return sal_True;
             pL = pL->GetNext();
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -433,14 +433,14 @@ DateTime ScChangeAction::GetDateTime() const
 
 void ScChangeAction::UpdateReference( const ScChangeTrack* /* pTrack */,
         UpdateRefMode eMode, const ScBigRange& rRange,
-        INT32 nDx, INT32 nDy, INT32 nDz )
+        sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz )
 {
     ScRefUpdate::Update( eMode, rRange, nDx, nDy, nDz, GetBigRange() );
 }
 
 
 void ScChangeAction::GetDescription( String& rStr, ScDocument* /* pDoc */,
-        BOOL /* bSplitRange */, bool bWarning ) const
+        sal_Bool /* bSplitRange */, bool bWarning ) const
 {
     if ( IsRejecting() && bWarning )
     {
@@ -483,7 +483,7 @@ void ScChangeAction::GetDescription( String& rStr, ScDocument* /* pDoc */,
                     else if (pReject->HasDependent())
                     {
                         ScChangeActionTable aTable;
-                        pCT->GetDependents( pReject, aTable, FALSE, TRUE );
+                        pCT->GetDependents( pReject, aTable, sal_False, sal_True );
                         for ( const ScChangeAction* p = aTable.First(); p;
                                 p = aTable.Next() )
                         {
@@ -511,10 +511,10 @@ void ScChangeAction::GetDescription( String& rStr, ScDocument* /* pDoc */,
 
 
 String ScChangeAction::GetRefString( const ScBigRange& rRange,
-        ScDocument* pDoc, BOOL bFlag3D ) const
+        ScDocument* pDoc, sal_Bool bFlag3D ) const
 {
     String aStr;
-    USHORT nFlags = ( rRange.IsValid( pDoc ) ? SCA_VALID : 0 );
+    sal_uInt16 nFlags = ( rRange.IsValid( pDoc ) ? SCA_VALID : 0 );
     if ( !nFlags )
         aStr = ScGlobal::GetRscString( STR_NOREF_STR );
     else
@@ -560,7 +560,7 @@ String ScChangeAction::GetRefString( const ScBigRange& rRange,
 
 
 void ScChangeAction::GetRefString( String& rStr, ScDocument* pDoc,
-        BOOL bFlag3D ) const
+        sal_Bool bFlag3D ) const
 {
     rStr = GetRefString( GetBigRange(), pDoc, bFlag3D );
 }
@@ -603,7 +603,7 @@ void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack,
         }
     }
     SetState( SC_CAS_REJECTED );		// vor UpdateReference fuer Move
-    pTrack->UpdateReference( this, TRUE );		// LinkDeleted freigeben
+    pTrack->UpdateReference( this, sal_True );		// LinkDeleted freigeben
     DBG_ASSERT( !pLinkDeleted, "ScChangeAction::RejectRestoreContents: pLinkDeleted != NULL" );
     // Liste der Contents abarbeiten und loeschen
     ScDocument* pDoc = pTrack->GetDocument();
@@ -622,7 +622,7 @@ void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack,
 }
 
 
-void ScChangeAction::SetDeletedInThis( ULONG nActionNumber,
+void ScChangeAction::SetDeletedInThis( sal_uLong nActionNumber,
         const ScChangeTrack* pTrack )
 {
     if ( nActionNumber )
@@ -635,7 +635,7 @@ void ScChangeAction::SetDeletedInThis( ULONG nActionNumber,
 }
 
 
-void ScChangeAction::AddDependent( ULONG nActionNumber,
+void ScChangeAction::AddDependent( sal_uLong nActionNumber,
         const ScChangeTrack* pTrack )
 {
     if ( nActionNumber )
@@ -687,14 +687,14 @@ String ScChangeAction::ToString( ScDocument* pDoc ) const
     }
 
     String aReference;
-    GetRefString( aReference, pDoc, TRUE );
+    GetRefString( aReference, pDoc, sal_True );
 
     String aAuthor = GetUser();
 
     DateTime aDT = GetDateTime();
     String aDate = ScGlobal::pLocaleData->getDate( aDT );
     aDate += ' ';
-    aDate += ScGlobal::pLocaleData->getTime( aDT, FALSE, FALSE );
+    aDate += ScGlobal::pLocaleData->getTime( aDT, sal_False, sal_False );
 
     String aDescription;
     GetDescription( aDescription, pDoc );
@@ -823,7 +823,7 @@ ScChangeActionIns::ScChangeActionIns( const ScRange& rRange )
 }
 
 
-ScChangeActionIns::ScChangeActionIns(const ULONG nActionNumber, const ScChangeActionState eStateP, const ULONG nRejectingNumber,
+ScChangeActionIns::ScChangeActionIns(const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
                                                 const ScBigRange& aBigRangeP, const String& aUserP, const DateTime& aDateTimeP, const String& sComment,
                                                 const ScChangeActionType eTypeP)
         :
@@ -837,11 +837,11 @@ ScChangeActionIns::~ScChangeActionIns()
 
 
 void ScChangeActionIns::GetDescription( String& rStr, ScDocument* pDoc,
-        BOOL bSplitRange, bool bWarning ) const
+        sal_Bool bSplitRange, bool bWarning ) const
 {
     ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning );
 
-    USHORT nWhatId;
+    sal_uInt16 nWhatId;
     switch ( GetType() )
     {
         case SC_CAT_INSERT_COLS :
@@ -864,15 +864,15 @@ void ScChangeActionIns::GetDescription( String& rStr, ScDocument* pDoc,
 }
 
 
-BOOL ScChangeActionIns::Reject( ScDocument* pDoc )
+sal_Bool ScChangeActionIns::Reject( ScDocument* pDoc )
 {
     if ( !aBigRange.IsValid( pDoc ) )
-        return FALSE;
+        return sal_False;
 
     ScRange aRange( aBigRange.MakeRange() );
     if ( !pDoc->IsBlockEditable( aRange.aStart.Tab(), aRange.aStart.Col(),
             aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row() ) )
-        return FALSE;
+        return sal_False;
 
     switch ( GetType() )
     {
@@ -892,7 +892,7 @@ BOOL ScChangeActionIns::Reject( ScDocument* pDoc )
     }
     SetState( SC_CAS_REJECTED );
     RemoveAllLinks();
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -936,7 +936,7 @@ ScChangeActionDel::ScChangeActionDel( const ScRange& rRange,
 }
 
 
-ScChangeActionDel::ScChangeActionDel(const ULONG nActionNumber, const ScChangeActionState eStateP, const ULONG nRejectingNumber,
+ScChangeActionDel::ScChangeActionDel(const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
                                     const ScBigRange& aBigRangeP, const String& aUserP, const DateTime& aDateTimeP, const String &sComment,
                                     const ScChangeActionType eTypeP, const SCsCOLROW nD, ScChangeTrack* pTrackP) // wich of nDx and nDy is set is depend on the type
         :
@@ -976,40 +976,40 @@ void ScChangeActionDel::DeleteCellEntries()
 }
 
 
-BOOL ScChangeActionDel::IsBaseDelete() const
+sal_Bool ScChangeActionDel::IsBaseDelete() const
 {
     return !GetDx() && !GetDy();
 }
 
 
-BOOL ScChangeActionDel::IsTopDelete() const
+sal_Bool ScChangeActionDel::IsTopDelete() const
 {
     const ScChangeAction* p = GetNext();
     if ( !p || p->GetType() != GetType() )
-        return TRUE;
+        return sal_True;
     return ((ScChangeActionDel*)p)->IsBaseDelete();
 }
 
 
-BOOL ScChangeActionDel::IsMultiDelete() const
+sal_Bool ScChangeActionDel::IsMultiDelete() const
 {
     if ( GetDx() || GetDy() )
-        return TRUE;
+        return sal_True;
     const ScChangeAction* p = GetNext();
     if ( !p || p->GetType() != GetType() )
-        return FALSE;
+        return sal_False;
     const ScChangeActionDel* pDel = (const ScChangeActionDel*) p;
     if ( (pDel->GetDx() > GetDx() || pDel->GetDy() > GetDy()) &&
             pDel->GetBigRange() == aBigRange )
-        return TRUE;
-    return FALSE;
+        return sal_True;
+    return sal_False;
 }
 
 
-BOOL ScChangeActionDel::IsTabDeleteCol() const
+sal_Bool ScChangeActionDel::IsTabDeleteCol() const
 {
     if ( GetType() != SC_CAT_DELETE_COLS )
-        return FALSE;
+        return sal_False;
     const ScChangeAction* p = this;
     while ( p && p->GetType() == SC_CAT_DELETE_COLS &&
             !((const ScChangeActionDel*)p)->IsTopDelete() )
@@ -1020,7 +1020,7 @@ BOOL ScChangeActionDel::IsTabDeleteCol() const
 
 void ScChangeActionDel::UpdateReference( const ScChangeTrack* /* pTrack */,
         UpdateRefMode eMode, const ScBigRange& rRange,
-        INT32 nDxP, INT32 nDyP, INT32 nDz )
+        sal_Int32 nDxP, sal_Int32 nDyP, sal_Int32 nDz )
 {
     ScRefUpdate::Update( eMode, rRange, nDxP, nDyP, nDz, GetBigRange() );
     if ( !IsDeletedIn() )
@@ -1066,11 +1066,11 @@ ScBigRange ScChangeActionDel::GetOverAllRange() const
 
 
 void ScChangeActionDel::GetDescription( String& rStr, ScDocument* pDoc,
-        BOOL bSplitRange, bool bWarning ) const
+        sal_Bool bSplitRange, bool bWarning ) const
 {
     ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning );
 
-    USHORT nWhatId;
+    sal_uInt16 nWhatId;
     switch ( GetType() )
     {
         case SC_CAT_DELETE_COLS :
@@ -1105,12 +1105,12 @@ void ScChangeActionDel::GetDescription( String& rStr, ScDocument* pDoc,
 }
 
 
-BOOL ScChangeActionDel::Reject( ScDocument* pDoc )
+sal_Bool ScChangeActionDel::Reject( ScDocument* pDoc )
 {
     if ( !aBigRange.IsValid( pDoc ) && GetType() != SC_CAT_DELETE_TABS )
-        return FALSE;
+        return sal_False;
 
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
 
     if ( IsTopDelete() )
     {	// den kompletten Bereich in einem Rutsch restaurieren
@@ -1120,30 +1120,30 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc )
             if ( GetType() == SC_CAT_DELETE_TABS )
             {	// wird Tab angehaengt?
                 if ( aTmpRange.aStart.Tab() > pDoc->GetMaxTableNumber() )
-                    bOk = FALSE;
+                    bOk = sal_False;
             }
             else
-                bOk = FALSE;
+                bOk = sal_False;
         }
         if ( bOk )
         {
             ScRange aRange( aTmpRange.MakeRange() );
             // InDelete... fuer Formel UpdateReference in Document
             pTrack->SetInDeleteRange( aRange );
-            pTrack->SetInDeleteTop( TRUE );
-            pTrack->SetInDeleteUndo( TRUE );
-            pTrack->SetInDelete( TRUE );
+            pTrack->SetInDeleteTop( sal_True );
+            pTrack->SetInDeleteUndo( sal_True );
+            pTrack->SetInDelete( sal_True );
             switch ( GetType() )
             {
                 case SC_CAT_DELETE_COLS :
                     if ( !(aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL) )
                     {	// nur wenn nicht TabDelete
-                        if ( ( bOk = pDoc->CanInsertCol( aRange ) ) != FALSE )
+                        if ( ( bOk = pDoc->CanInsertCol( aRange ) ) != sal_False )
                             bOk = pDoc->InsertCol( aRange );
                     }
                 break;
                 case SC_CAT_DELETE_ROWS :
-                    if ( ( bOk = pDoc->CanInsertRow( aRange ) ) != FALSE )
+                    if ( ( bOk = pDoc->CanInsertRow( aRange ) ) != sal_False )
                         bOk = pDoc->InsertRow( aRange );
                 break;
                 case SC_CAT_DELETE_TABS :
@@ -1151,7 +1151,7 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc )
 //2do: Tabellennamen merken?
                     String aName;
                     pDoc->CreateValidTabName( aName );
-                    if ( ( bOk = pDoc->ValidNewTabName( aName ) ) != FALSE )
+                    if ( ( bOk = pDoc->ValidNewTabName( aName ) ) != sal_False )
                         bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName );
                 }
                 break;
@@ -1160,13 +1160,13 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc )
                     // added to avoid warnings
                 }
             }
-            pTrack->SetInDelete( FALSE );
-            pTrack->SetInDeleteUndo( FALSE );
+            pTrack->SetInDelete( sal_False );
+            pTrack->SetInDeleteUndo( sal_False );
         }
         if ( !bOk )
         {
-            pTrack->SetInDeleteTop( FALSE );
-            return FALSE;
+            pTrack->SetInDeleteTop( sal_False );
+            return sal_False;
         }
         // InDeleteTop fuer UpdateReference-Undo behalten
     }
@@ -1174,9 +1174,9 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc )
     // setzt rejected und ruft UpdateReference-Undo und DeleteCellEntries
     RejectRestoreContents( pTrack, GetDx(), GetDy() );
 
-    pTrack->SetInDeleteTop( FALSE );
+    pTrack->SetInDeleteTop( sal_False );
     RemoveAllLinks();
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1264,7 +1264,7 @@ void ScChangeActionDel::UndoCutOffInsert()
 
 // --- ScChangeActionMove --------------------------------------------------
 
-ScChangeActionMove::ScChangeActionMove(const ULONG nActionNumber, const ScChangeActionState eStateP, const ULONG nRejectingNumber,
+ScChangeActionMove::ScChangeActionMove(const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
                                     const ScBigRange& aToBigRange, const String& aUserP, const DateTime& aDateTimeP, const String &sComment,
                                     const ScBigRange& aFromBigRange, ScChangeTrack* pTrackP) // wich of nDx and nDy is set is depend on the type
         :
@@ -1299,14 +1299,14 @@ void ScChangeActionMove::DeleteCellEntries()
 
 void ScChangeActionMove::UpdateReference( const ScChangeTrack* /* pTrack */,
         UpdateRefMode eMode, const ScBigRange& rRange,
-        INT32 nDx, INT32 nDy, INT32 nDz )
+        sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz )
 {
     ScRefUpdate::Update( eMode, rRange, nDx, nDy, nDz, aFromRange );
     ScRefUpdate::Update( eMode, rRange, nDx, nDy, nDz, GetBigRange() );
 }
 
 
-void ScChangeActionMove::GetDelta( INT32& nDx, INT32& nDy, INT32& nDz ) const
+void ScChangeActionMove::GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nDz ) const
 {
     const ScBigAddress& rToPos = GetBigRange().aStart;
     const ScBigAddress& rFromPos = GetFromRange().aStart;
@@ -1317,11 +1317,11 @@ void ScChangeActionMove::GetDelta( INT32& nDx, INT32& nDy, INT32& nDz ) const
 
 
 void ScChangeActionMove::GetDescription( String& rStr, ScDocument* pDoc,
-        BOOL bSplitRange, bool bWarning ) const
+        sal_Bool bSplitRange, bool bWarning ) const
 {
     ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning );
 
-    BOOL bFlag3D = ( GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab() );
+    sal_Bool bFlag3D = ( GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab() );
 
     String aRsc( ScGlobal::GetRscString( STR_CHANGED_MOVE ) );
 
@@ -1343,7 +1343,7 @@ void ScChangeActionMove::GetDescription( String& rStr, ScDocument* pDoc,
 
 
 void ScChangeActionMove::GetRefString( String& rStr, ScDocument* pDoc,
-        BOOL bFlag3D ) const
+        sal_Bool bFlag3D ) const
 {
     if ( !bFlag3D )
         bFlag3D = ( GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab() );
@@ -1354,15 +1354,15 @@ void ScChangeActionMove::GetRefString( String& rStr, ScDocument* pDoc,
 }
 
 
-BOOL ScChangeActionMove::Reject( ScDocument* pDoc )
+sal_Bool ScChangeActionMove::Reject( ScDocument* pDoc )
 {
     if ( !(aBigRange.IsValid( pDoc ) && aFromRange.IsValid( pDoc )) )
-        return FALSE;
+        return sal_False;
 
     ScRange aToRange( aBigRange.MakeRange() );
     ScRange aFrmRange( aFromRange.MakeRange() );
 
-    BOOL bOk = pDoc->IsBlockEditable( aToRange.aStart.Tab(),
+    sal_Bool bOk = pDoc->IsBlockEditable( aToRange.aStart.Tab(),
         aToRange.aStart.Col(), aToRange.aStart.Row(),
         aToRange.aEnd.Col(), aToRange.aEnd.Row() );
     if ( bOk )
@@ -1370,7 +1370,7 @@ BOOL ScChangeActionMove::Reject( ScDocument* pDoc )
             aFrmRange.aStart.Col(), aFrmRange.aStart.Row(),
             aFrmRange.aEnd.Col(), aFrmRange.aEnd.Row() );
     if ( !bOk )
-        return FALSE;
+        return sal_False;
 
     pTrack->LookUpContents( aToRange, pDoc, 0, 0, 0 );	// zu movende Contents
 
@@ -1412,17 +1412,17 @@ BOOL ScChangeActionMove::Reject( ScDocument* pDoc )
     }
 
     RemoveAllLinks();
-    return TRUE;
+    return sal_True;
 }
 
 
 // --- ScChangeActionContent -----------------------------------------------
 
-const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeActionContent);
+const sal_uInt16 nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeActionContent);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent, nMemPoolChangeActionContent, nMemPoolChangeActionContent )
 
-ScChangeActionContent::ScChangeActionContent( const ULONG nActionNumber,
-            const ScChangeActionState eStateP, const ULONG nRejectingNumber,
+ScChangeActionContent::ScChangeActionContent( const sal_uLong nActionNumber,
+            const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
             const ScBigRange& aBigRangeP, const String& aUserP,
             const DateTime& aDateTimeP, const String& sComment,
             ScBaseCell* pTempOldCell, ScDocument* pDoc, const String& sOldValue )
@@ -1443,7 +1443,7 @@ ScChangeActionContent::ScChangeActionContent( const ULONG nActionNumber,
         aOldValue = sOldValue; // set again, because SetCell removes it
 }
 
-ScChangeActionContent::ScChangeActionContent( const ULONG nActionNumber,
+ScChangeActionContent::ScChangeActionContent( const sal_uLong nActionNumber,
             ScBaseCell* pTempNewCell, const ScBigRange& aBigRangeP,
             ScDocument* pDoc, const String& sNewValue )
         :
@@ -1508,7 +1508,7 @@ ScChangeActionLinkEntry** ScChangeActionContent::GetDeletedInAddress()
 
 
 void ScChangeActionContent::SetOldValue( const ScBaseCell* pCell,
-        const ScDocument* pFromDoc, ScDocument* pToDoc, ULONG nFormat )
+        const ScDocument* pFromDoc, ScDocument* pToDoc, sal_uLong nFormat )
 {
     ScChangeActionContent::SetValue( aOldValue, pOldCell,
         nFormat, pCell, pFromDoc, pToDoc );
@@ -1532,8 +1532,8 @@ void ScChangeActionContent::SetNewValue( const ScBaseCell* pCell,
 
 
 void ScChangeActionContent::SetOldNewCells( ScBaseCell* pOldCellP,
-                        ULONG nOldFormat, ScBaseCell* pNewCellP,
-                        ULONG nNewFormat, ScDocument* pDoc )
+                        sal_uLong nOldFormat, ScBaseCell* pNewCellP,
+                        sal_uLong nNewFormat, ScDocument* pDoc )
 {
     pOldCell = pOldCellP;
     pNewCell = pNewCellP;
@@ -1565,7 +1565,7 @@ void ScChangeActionContent::SetValueString( String& rValue, ScBaseCell*& pCell,
         rValue.Erase();
         pCell = new ScFormulaCell(
             pDoc, aBigRange.aStart.MakeAddress(), rStr, formula::FormulaGrammar::GRAM_DEFAULT, formula::FormulaGrammar::CONV_OOO );
-        ((ScFormulaCell*)pCell)->SetInChangeTrack( TRUE );
+        ((ScFormulaCell*)pCell)->SetInChangeTrack( sal_True );
     }
     else
         rValue = rStr;
@@ -1597,7 +1597,7 @@ void ScChangeActionContent::GetNewString( String& rStr ) const
 
 
 void ScChangeActionContent::GetDescription( String& rStr, ScDocument* pDoc,
-        BOOL bSplitRange, bool bWarning ) const
+        sal_Bool bSplitRange, bool bWarning ) const
 {
     ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning );
 
@@ -1632,9 +1632,9 @@ void ScChangeActionContent::GetDescription( String& rStr, ScDocument* pDoc,
 
 
 void ScChangeActionContent::GetRefString( String& rStr, ScDocument* pDoc,
-        BOOL bFlag3D ) const
+        sal_Bool bFlag3D ) const
 {
-    USHORT nFlags = ( GetBigRange().IsValid( pDoc ) ? SCA_VALID : 0 );
+    sal_uInt16 nFlags = ( GetBigRange().IsValid( pDoc ) ? SCA_VALID : 0 );
     if ( nFlags )
     {
         const ScBaseCell* pCell = GetNewCell();
@@ -1666,25 +1666,25 @@ void ScChangeActionContent::GetRefString( String& rStr, ScDocument* pDoc,
 }
 
 
-BOOL ScChangeActionContent::Reject( ScDocument* pDoc )
+sal_Bool ScChangeActionContent::Reject( ScDocument* pDoc )
 {
     if ( !aBigRange.IsValid( pDoc ) )
-        return FALSE;
+        return sal_False;
 
     PutOldValueToDoc( pDoc, 0, 0 );
 
     SetState( SC_CAS_REJECTED );
     RemoveAllLinks();
 
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack,
-        BOOL bOldest, Stack* pRejectActions )
+sal_Bool ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack,
+        sal_Bool bOldest, Stack* pRejectActions )
 {
     if ( !aBigRange.IsValid( pDoc ) )
-        return FALSE;
+        return sal_False;
 
     ScChangeActionContent* pContent = this;
     // accept previous contents
@@ -1739,7 +1739,7 @@ BOOL ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack,
     else
         SetState( SC_CAS_ACCEPTED );
 
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1761,7 +1761,7 @@ void ScChangeActionContent::GetStringOfCell( String& rStr,
 
 // static
 void ScChangeActionContent::GetStringOfCell( String& rStr,
-        const ScBaseCell* pCell, const ScDocument* pDoc, ULONG nFormat )
+        const ScBaseCell* pCell, const ScDocument* pDoc, sal_uLong nFormat )
 {
     if ( ScChangeActionContent::GetContentCellType( pCell ) )
     {
@@ -1829,7 +1829,7 @@ ScChangeActionContentCellType ScChangeActionContent::GetContentCellType( const S
 
 
 // static
-BOOL ScChangeActionContent::NeedsNumberFormat( const ScBaseCell* pCell )
+sal_Bool ScChangeActionContent::NeedsNumberFormat( const ScBaseCell* pCell )
 {
     return pCell && pCell->GetCellType() == CELLTYPE_VALUE;
 }
@@ -1840,14 +1840,14 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
         const ScAddress& rPos, const ScBaseCell* pOrgCell,
         const ScDocument* pFromDoc, ScDocument* pToDoc )
 {
-    ULONG nFormat = NeedsNumberFormat( pOrgCell ) ? pFromDoc->GetNumberFormat( rPos ) : 0;
+    sal_uLong nFormat = NeedsNumberFormat( pOrgCell ) ? pFromDoc->GetNumberFormat( rPos ) : 0;
     SetValue( rStr, pCell, nFormat, pOrgCell, pFromDoc, pToDoc );
 }
 
 
 // static
 void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
-        ULONG nFormat, const ScBaseCell* pOrgCell,
+        sal_uLong nFormat, const ScBaseCell* pOrgCell,
         const ScDocument* pFromDoc, ScDocument* pToDoc )
 {
     rStr.Erase();
@@ -1866,7 +1866,7 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
             }
             break;
             case CELLTYPE_FORMULA :
-                ((ScFormulaCell*)pCell)->SetInChangeTrack( TRUE );
+                ((ScFormulaCell*)pCell)->SetInChangeTrack( sal_True );
             break;
             default:
             {
@@ -1881,7 +1881,7 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
 
 // static
 void ScChangeActionContent::SetCell( String& rStr, ScBaseCell* pCell,
-        ULONG nFormat, const ScDocument* pDoc )
+        sal_uLong nFormat, const ScDocument* pDoc )
 {
     rStr.Erase();
     if ( pCell )
@@ -1896,7 +1896,7 @@ void ScChangeActionContent::SetCell( String& rStr, ScBaseCell* pCell,
             }
             break;
             case CELLTYPE_FORMULA :
-                ((ScFormulaCell*)pCell)->SetInChangeTrack( TRUE );
+                ((ScFormulaCell*)pCell)->SetInChangeTrack( sal_True );
             break;
             default:
             {
@@ -2035,19 +2035,19 @@ void lcl_InvalidateReference( ScToken& rTok, const ScBigAddress& rPos )
     {
         rRef1.nCol = SCCOL_MAX;
         rRef1.nRelCol = SCCOL_MAX;
-        rRef1.SetColDeleted( TRUE );
+        rRef1.SetColDeleted( sal_True );
     }
     if ( rPos.Row() < 0 || MAXROW < rPos.Row() )
     {
         rRef1.nRow = SCROW_MAX;
         rRef1.nRelRow = SCROW_MAX;
-        rRef1.SetRowDeleted( TRUE );
+        rRef1.SetRowDeleted( sal_True );
     }
     if ( rPos.Tab() < 0 || MAXTAB < rPos.Tab() )
     {
         rRef1.nTab = SCTAB_MAX;
         rRef1.nRelTab = SCTAB_MAX;
-        rRef1.SetTabDeleted( TRUE );
+        rRef1.SetTabDeleted( sal_True );
     }
     if ( rTok.GetType() == formula::svDoubleRef )
     {
@@ -2056,19 +2056,19 @@ void lcl_InvalidateReference( ScToken& rTok, const ScBigAddress& rPos )
         {
             rRef2.nCol = SCCOL_MAX;
             rRef2.nRelCol = SCCOL_MAX;
-            rRef2.SetColDeleted( TRUE );
+            rRef2.SetColDeleted( sal_True );
         }
         if ( rPos.Row() < 0 || MAXROW < rPos.Row() )
         {
             rRef2.nRow = SCROW_MAX;
             rRef2.nRelRow = SCROW_MAX;
-            rRef2.SetRowDeleted( TRUE );
+            rRef2.SetRowDeleted( sal_True );
         }
         if ( rPos.Tab() < 0 || MAXTAB < rPos.Tab() )
         {
             rRef2.nTab = SCTAB_MAX;
             rRef2.nRelTab = SCTAB_MAX;
-            rRef2.SetTabDeleted( TRUE );
+            rRef2.SetTabDeleted( sal_True );
         }
     }
 }
@@ -2076,7 +2076,7 @@ void lcl_InvalidateReference( ScToken& rTok, const ScBigAddress& rPos )
 
 void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack,
         UpdateRefMode eMode, const ScBigRange& rRange,
-        INT32 nDx, INT32 nDy, INT32 nDz )
+        sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz )
 {
     SCSIZE nOldSlot = ScChangeTrack::ComputeContentSlot( aBigRange.aStart.Row() );
     ScRefUpdate::Update( eMode, rRange, nDx, nDy, nDz, aBigRange );
@@ -2090,8 +2090,8 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack,
     if ( pTrack->IsInDelete() && !pTrack->IsInDeleteTop() )
         return ;		// Formeln nur kompletten Bereich updaten
 
-    BOOL bOldFormula = ( pOldCell && pOldCell->GetCellType() == CELLTYPE_FORMULA );
-    BOOL bNewFormula = ( pNewCell && pNewCell->GetCellType() == CELLTYPE_FORMULA );
+    sal_Bool bOldFormula = ( pOldCell && pOldCell->GetCellType() == CELLTYPE_FORMULA );
+    sal_Bool bNewFormula = ( pNewCell && pNewCell->GetCellType() == CELLTYPE_FORMULA );
     if ( bOldFormula || bNewFormula )
     {	// via ScFormulaCell UpdateReference anpassen (dort)
         if ( pTrack->IsInDelete() )
@@ -2195,7 +2195,7 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack,
 
 // --- ScChangeActionReject ------------------------------------------------
 
-ScChangeActionReject::ScChangeActionReject(const ULONG nActionNumber, const ScChangeActionState eStateP, const ULONG nRejectingNumber,
+ScChangeActionReject::ScChangeActionReject(const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber,
                                                 const ScBigRange& aBigRangeP, const String& aUserP, const DateTime& aDateTimeP, const String& sComment)
         :
         ScChangeAction(SC_CAT_CONTENT, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment)
@@ -2269,13 +2269,13 @@ void ScChangeTrack::Init()
     nLastMerge = 0;
     eMergeState = SC_CTMS_NONE;
     nLoadedFileFormatVersion = SC_CHGTRACK_FILEFORMAT;
-    bLoadSave = FALSE;
-    bInDelete = FALSE;
-    bInDeleteTop = FALSE;
-    bInDeleteUndo = FALSE;
-    bInPasteCut = FALSE;
-    bUseFixDateTime = FALSE;
-    bTime100thSeconds = TRUE;
+    bLoadSave = sal_False;
+    bInDelete = sal_False;
+    bInDeleteTop = sal_False;
+    bInDeleteUndo = sal_False;
+    bInPasteCut = sal_False;
+    bUseFixDateTime = sal_False;
+    bTime100thSeconds = sal_True;
 
     const SvtUserOptions& rUserOpt = SC_MOD()->GetUserOptions();
     aUser = rUserOpt.GetFirstName();
@@ -2342,7 +2342,7 @@ void __EXPORT ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster
     if ( !pDoc->IsInDtorClear() )
     {
         const SvtUserOptions& rUserOptions = SC_MOD()->GetUserOptions();
-        USHORT nOldCount = aUserCollection.GetCount();
+        sal_uInt16 nOldCount = aUserCollection.GetCount();
 
         String aStr( rUserOptions.GetFirstName() );
         aStr += ' ';
@@ -2377,7 +2377,7 @@ void ScChangeTrack::SetUser( const String& rUser )
 
 
 void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType,
-        ULONG nStartAction )
+        sal_uLong nStartAction )
 {
     if ( aModifiedLink.IsSet() )
     {
@@ -2390,7 +2390,7 @@ void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType,
 }
 
 
-void ScChangeTrack::EndBlockModify( ULONG nEndAction )
+void ScChangeTrack::EndBlockModify( sal_uLong nEndAction )
 {
     if ( aModifiedLink.IsSet() )
     {
@@ -2408,12 +2408,12 @@ void ScChangeTrack::EndBlockModify( ULONG nEndAction )
         }
         if ( !pBlockModifyMsg )
         {
-            BOOL bNew = FALSE;
+            sal_Bool bNew = sal_False;
             ScChangeTrackMsgInfo* pMsg;
             while ( ( pMsg = aMsgStackFinal.Pop() ) != NULL )
             {
                 aMsgQueue.Put( pMsg );
-                bNew = TRUE;
+                bNew = sal_True;
             }
             if ( bNew )
                 aModifiedLink.Call( this );
@@ -2423,7 +2423,7 @@ void ScChangeTrack::EndBlockModify( ULONG nEndAction )
 
 
 void ScChangeTrack::NotifyModified( ScChangeTrackMsgType eMsgType,
-        ULONG nStartAction, ULONG nEndAction )
+        sal_uLong nStartAction, sal_uLong nEndAction )
 {
     if ( aModifiedLink.IsSet() )
     {
@@ -2510,7 +2510,7 @@ void ScChangeTrack::AppendLoaded( ScChangeAction* pAppend )
 }
 
 
-void ScChangeTrack::Append( ScChangeAction* pAppend, ULONG nAction )
+void ScChangeTrack::Append( ScChangeAction* pAppend, sal_uLong nAction )
 {
     if ( nActionMax < nAction )
         nActionMax = nAction;
@@ -2524,7 +2524,7 @@ void ScChangeTrack::Append( ScChangeAction* pAppend, ULONG nAction )
     // UpdateReference auch wenn pLast==NULL, weil pAppend ein Delete sein
     // kann, dass DelContents generiert haben kann
     if ( pAppend->IsInsertType() && !pAppend->IsRejecting() )
-        UpdateReference( pAppend, FALSE );
+        UpdateReference( pAppend, sal_False );
     if ( !pLast )
         pFirst = pLast = pAppend;
     else
@@ -2539,7 +2539,7 @@ void ScChangeTrack::Append( ScChangeAction* pAppend, ULONG nAction )
     // ToRange nicht deleten.
     if ( !pAppend->IsInsertType() &&
             !(pAppend->GetType() == SC_CAT_MOVE && pAppend->IsRejecting()) )
-        UpdateReference( pAppend, FALSE );
+        UpdateReference( pAppend, sal_False );
     MasterLinks( pAppend );
 
     if ( aModifiedLink.IsSet() )
@@ -2550,7 +2550,7 @@ void ScChangeTrack::Append( ScChangeAction* pAppend, ULONG nAction )
             ScChangeActionContent* pContent = (ScChangeActionContent*) pAppend;
             if ( ( pContent = pContent->GetPrevContent() ) != NULL )
             {
-                ULONG nMod = pContent->GetActionNumber();
+                sal_uLong nMod = pContent->GetActionNumber();
                 NotifyModified( SC_CTM_CHANGE, nMod, nMod );
             }
         }
@@ -2568,7 +2568,7 @@ void ScChangeTrack::Append( ScChangeAction* pAppend )
 
 
 void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
-        ScDocument* pRefDoc, ULONG& nStartAction, ULONG& nEndAction, SCsTAB nDz )
+        ScDocument* pRefDoc, sal_uLong& nStartAction, sal_uLong& nEndAction, SCsTAB nDz )
 {
     nStartAction = GetActionMax() + 1;
     AppendDeleteRange( rRange, pRefDoc, nDz, 0 );
@@ -2577,7 +2577,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
 
 
 void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
-        ScDocument* pRefDoc, SCsTAB nDz, ULONG nRejectingInsert )
+        ScDocument* pRefDoc, SCsTAB nDz, sal_uLong nRejectingInsert )
 {
     SetInDeleteRange( rRange );
     StartBlockModify( SC_CTM_APPEND, GetActionMax() + 1 );
@@ -2603,7 +2603,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
                         aRange.aStart.SetCol( nCol );
                         aRange.aEnd.SetCol( nCol );
                         if ( nCol == nCol2 )
-                            SetInDeleteTop( TRUE );
+                            SetInDeleteTop( sal_True );
                         AppendOneDeleteRange( aRange, pRefDoc, nCol-nCol1, 0,
                             nTab-nTab1 + nDz, nRejectingInsert );
                     }
@@ -2619,7 +2619,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
                         aRange.aStart.SetRow( nRow );
                         aRange.aEnd.SetRow( nRow );
                         if ( nRow == nRow2 )
-                            SetInDeleteTop( TRUE );
+                            SetInDeleteTop( sal_True );
                         AppendOneDeleteRange( aRange, pRefDoc, 0, nRow-nRow1,
                             0, nRejectingInsert );
                     }
@@ -2633,7 +2633,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
                     aRange.aStart.SetCol( nCol );
                     aRange.aEnd.SetCol( nCol );
                     if ( nCol == nCol2 )
-                        SetInDeleteTop( TRUE );
+                        SetInDeleteTop( sal_True );
                     AppendOneDeleteRange( aRange, pRefDoc, nCol-nCol1, 0,
                         0, nRejectingInsert );
                 }
@@ -2642,7 +2642,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
             {
                 DBG_ERROR( "ScChangeTrack::AppendDeleteRange: Block not supported!" );
             }
-            SetInDeleteTop( FALSE );
+            SetInDeleteTop( sal_False );
         }
     }
     EndBlockModify( GetActionMax() );
@@ -2651,7 +2651,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
 
 void ScChangeTrack::AppendOneDeleteRange( const ScRange& rOrgRange,
         ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-        ULONG nRejectingInsert )
+        sal_uLong nRejectingInsert )
 {
     ScRange aTrackRange( rOrgRange );
     if ( nDx )
@@ -2726,7 +2726,7 @@ void ScChangeTrack::AppendMove( const ScRange& rFromRange,
 
 
 // static
-BOOL ScChangeTrack::IsMatrixFormulaRangeDifferent( const ScBaseCell* pOldCell,
+sal_Bool ScChangeTrack::IsMatrixFormulaRangeDifferent( const ScBaseCell* pOldCell,
         const ScBaseCell* pNewCell )
 {
     SCCOL nC1, nC2;
@@ -2761,7 +2761,7 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos,
 
 
 void ScChangeTrack::AppendContent( const ScAddress& rPos,
-        const ScBaseCell* pOldCell, ULONG nOldFormat, ScDocument* pRefDoc )
+        const ScBaseCell* pOldCell, sal_uLong nOldFormat, ScDocument* pRefDoc )
 {
     if ( !pRefDoc )
         pRefDoc = pDoc;
@@ -2835,7 +2835,7 @@ void ScChangeTrack::SetLastCutMoveRange( const ScRange& rRange,
 
 
 void ScChangeTrack::AppendContentRange( const ScRange& rRange,
-        ScDocument* pRefDoc, ULONG& nStartAction, ULONG& nEndAction,
+        ScDocument* pRefDoc, sal_uLong& nStartAction, sal_uLong& nEndAction,
         ScChangeActionClipMode eClipMode )
 {
     if ( eClipMode == SC_CACM_CUT )
@@ -2851,11 +2851,11 @@ void ScChangeTrack::AppendContentRange( const ScRange& rRange,
     SCROW nRow2;
     SCTAB nTab2;
     rRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
-    BOOL bDoContents;
+    sal_Bool bDoContents;
     if ( eClipMode == SC_CACM_PASTE && HasLastCut() )
     {
-        bDoContents = FALSE;
-        SetInPasteCut( TRUE );
+        bDoContents = sal_False;
+        SetInPasteCut( sal_True );
         // Paste und Cut abstimmen, Paste kann groesserer Range sein
         ScRange aRange( rRange );
         ScBigRange& r = pLastCutMove->GetBigRange();
@@ -2864,21 +2864,21 @@ void ScChangeTrack::AppendContentRange( const ScRange& rRange,
         {
             aRange.aEnd.SetCol( aRange.aStart.Col() + nTmpCol );
             nCol1 += nTmpCol + 1;
-            bDoContents = TRUE;
+            bDoContents = sal_True;
         }
         SCROW nTmpRow;
         if ( (nTmpRow = (SCROW) (r.aEnd.Row() - r.aStart.Row())) != (nRow2 - nRow1) )
         {
             aRange.aEnd.SetRow( aRange.aStart.Row() + nTmpRow );
             nRow1 += nTmpRow + 1;
-            bDoContents = TRUE;
+            bDoContents = sal_True;
         }
         SCTAB nTmpTab;
         if ( (nTmpTab = (SCTAB) (r.aEnd.Tab() - r.aStart.Tab())) != (nTab2 - nTab1) )
         {
             aRange.aEnd.SetTab( aRange.aStart.Tab() + nTmpTab );
             nTab1 += nTmpTab + 1;
-            bDoContents = TRUE;
+            bDoContents = sal_True;
         }
         r = aRange;
         Undo( nStartLastCut, nEndLastCut );	// hier werden sich die Cuts gemerkt
@@ -2892,11 +2892,11 @@ void ScChangeTrack::AppendContentRange( const ScRange& rRange,
         Append( pLastCutMove );
         pLastCutMove = NULL;
         ResetLastCut();
-        SetInPasteCut( FALSE );
+        SetInPasteCut( sal_False );
     }
     else
     {
-        bDoContents = TRUE;
+        bDoContents = sal_True;
         nStartAction = GetActionMax() + 1;
         StartBlockModify( SC_CTM_APPEND, nStartAction );
     }
@@ -2928,7 +2928,7 @@ void ScChangeTrack::AppendContentRange( const ScRange& rRange,
 
 
 void ScChangeTrack::AppendContentsIfInRefDoc( ScDocument* pRefDoc,
-            ULONG& nStartAction, ULONG& nEndAction )
+            sal_uLong& nStartAction, sal_uLong& nEndAction )
 {
     ScDocumentIterator aIter( pRefDoc, 0, MAXTAB );
     if ( aIter.GetFirst() )
@@ -2956,7 +2956,7 @@ void ScChangeTrack::AppendContentsIfInRefDoc( ScDocument* pRefDoc,
 
 ScChangeActionContent* ScChangeTrack::AppendContentOnTheFly(
         const ScAddress& rPos, ScBaseCell* pOldCell, ScBaseCell* pNewCell,
-        ULONG nOldFormat, ULONG nNewFormat )
+        sal_uLong nOldFormat, sal_uLong nNewFormat )
 {
     ScRange aRange( rPos );
     ScChangeActionContent* pAct = new ScChangeActionContent( aRange );
@@ -3016,7 +3016,7 @@ ScChangeActionContent* ScChangeTrack::GenerateDelContent(
 
 void ScChangeTrack::DeleteGeneratedDelContent( ScChangeActionContent* pContent )
 {
-    ULONG nAct = pContent->GetActionNumber();
+    sal_uLong nAct = pContent->GetActionNumber();
     aGeneratedTable.Remove( nAct );
     if ( pFirstGeneratedDelContent == pContent )
         pFirstGeneratedDelContent = (ScChangeActionContent*) pContent->pNext;
@@ -3057,7 +3057,7 @@ void ScChangeTrack::AddDependentWithNotify( ScChangeAction* pParent,
     pDependent->AddLink( pParent, pLink );
     if ( aModifiedLink.IsSet() )
     {
-        ULONG nMod = pParent->GetActionNumber();
+        sal_uLong nMod = pParent->GetActionNumber();
         NotifyModified( SC_CTM_PARENT, nMod, nMod );
     }
 }
@@ -3117,10 +3117,10 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
     // also genau richtig
 
     const ScBigRange& rRange = pAct->GetBigRange();
-    BOOL bActNoInsert = !pAct->IsInsertType();
-    BOOL bActColDel = ( eActType == SC_CAT_DELETE_COLS );
-    BOOL bActRowDel = ( eActType == SC_CAT_DELETE_ROWS );
-    BOOL bActTabDel = ( eActType == SC_CAT_DELETE_TABS );
+    sal_Bool bActNoInsert = !pAct->IsInsertType();
+    sal_Bool bActColDel = ( eActType == SC_CAT_DELETE_COLS );
+    sal_Bool bActRowDel = ( eActType == SC_CAT_DELETE_ROWS );
+    sal_Bool bActTabDel = ( eActType == SC_CAT_DELETE_TABS );
 
     if ( pLinkInsertCol && (eActType == SC_CAT_INSERT_COLS ||
             (bActNoInsert && !bActRowDel && !bActTabDel)) )
@@ -3214,7 +3214,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
 void ScChangeTrack::Remove( ScChangeAction* pRemove )
 {
     // aus Track ausklinken
-    ULONG nAct = pRemove->GetActionNumber();
+    sal_uLong nAct = pRemove->GetActionNumber();
     aTable.Remove( nAct );
     if ( nAct == nActionMax )
         --nActionMax;
@@ -3243,7 +3243,7 @@ void ScChangeTrack::Remove( ScChangeAction* pRemove )
             ScChangeActionContent* pContent = (ScChangeActionContent*) pRemove;
             if ( ( pContent = pContent->GetPrevContent() ) != NULL )
             {
-                ULONG nMod = pContent->GetActionNumber();
+                sal_uLong nMod = pContent->GetActionNumber();
                 NotifyModified( SC_CTM_CHANGE, nMod, nMod );
             }
         }
@@ -3263,7 +3263,7 @@ void ScChangeTrack::Remove( ScChangeAction* pRemove )
 }
 
 
-void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
+void ScChangeTrack::Undo( sal_uLong nStartAction, sal_uLong nEndAction, bool bMerge )
 {
     // #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong
     if ( bMerge )
@@ -3281,7 +3281,7 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
                 !IsInPasteCut() )
             ResetLastCut();
         StartBlockModify( SC_CTM_REMOVE, nStartAction );
-        for ( ULONG j = nEndAction; j >= nStartAction; --j )
+        for ( sal_uLong j = nEndAction; j >= nStartAction; --j )
         {	// rueckwaerts um evtl. nActionMax zu recyclen und schnelleren
             // Zugriff via pLast, Deletes in richtiger Reihenfolge
             ScChangeAction* pAct = ( (j == nActionMax && pLast &&
@@ -3293,13 +3293,13 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
                     if ( j == nEndAction || (pAct != pLast &&
                             ((ScChangeActionDel*)pAct)->IsTopDelete()) )
                     {
-                        SetInDeleteTop( TRUE );
+                        SetInDeleteTop( sal_True );
                         SetInDeleteRange( ((ScChangeActionDel*)pAct)->
                             GetOverAllRange().MakeRange() );
                     }
                 }
-                UpdateReference( pAct, TRUE );
-                SetInDeleteTop( FALSE );
+                UpdateReference( pAct, sal_True );
+                SetInDeleteTop( sal_False );
                 Remove( pAct );
                 if ( IsInPasteCut() )
                     aPasteCutTable.Insert( pAct->GetActionNumber(), pAct );
@@ -3308,14 +3308,14 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
                     if ( j == nStartAction && pAct->GetType() == SC_CAT_MOVE )
                     {
                         ScChangeActionMove* pMove = (ScChangeActionMove*) pAct;
-                        ULONG nStart = pMove->GetStartLastCut();
-                        ULONG nEnd = pMove->GetEndLastCut();
+                        sal_uLong nStart = pMove->GetStartLastCut();
+                        sal_uLong nEnd = pMove->GetEndLastCut();
                         if ( nStart && nStart <= nEnd )
                         {	// LastCut wiederherstellen
                             //! Links vor Cut-Append aufloesen
                             pMove->RemoveAllLinks();
                             StartBlockModify( SC_CTM_APPEND, nStart );
-                            for ( ULONG nCut = nStart; nCut <= nEnd; nCut++ )
+                            for ( sal_uLong nCut = nStart; nCut <= nEnd; nCut++ )
                             {
                                 ScChangeAction* pCut = aPasteCutTable.Remove( nCut );
                                 if ( pCut )
@@ -3356,22 +3356,22 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
 
 
 // static
-BOOL ScChangeTrack::MergeIgnore( const ScChangeAction& rAction, ULONG nFirstMerge )
+sal_Bool ScChangeTrack::MergeIgnore( const ScChangeAction& rAction, sal_uLong nFirstMerge )
 {
     if ( rAction.IsRejected() )
-        return TRUE;				// da kommt noch eine passende Reject-Action
+        return sal_True;				// da kommt noch eine passende Reject-Action
 
     if ( rAction.IsRejecting() && rAction.GetRejectAction() >= nFirstMerge )
-        return TRUE;				// da ist sie
+        return sal_True;				// da ist sie
 
-    return FALSE;					// alles andere
+    return sal_False;					// alles andere
 }
 
 
 void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared )
 {
     SetMergeState( SC_CTMS_PREPARE );
-    ULONG nFirstMerge = pFirstMerge->GetActionNumber();
+    sal_uLong nFirstMerge = pFirstMerge->GetActionNumber();
     ScChangeAction* pAct = GetLast();
     if ( pAct )
     {
@@ -3385,13 +3385,13 @@ void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared )
                 {
                     if ( ((ScChangeActionDel*)pAct)->IsTopDelete() )
                     {
-                        SetInDeleteTop( TRUE );
+                        SetInDeleteTop( sal_True );
                         SetInDeleteRange( ((ScChangeActionDel*)pAct)->
                             GetOverAllRange().MakeRange() );
                     }
                 }
-                UpdateReference( pAct, TRUE );
-                SetInDeleteTop( FALSE );
+                UpdateReference( pAct, sal_True );
+                SetInDeleteTop( sal_False );
                 pAct->DeleteCellEntries();		// sonst GPF bei Track Clear()
             }
             pAct = ( pAct == pFirstMerge ? NULL : pAct->GetPrev() );
@@ -3401,7 +3401,7 @@ void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared )
 }
 
 
-void ScChangeTrack::MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared )
+void ScChangeTrack::MergeOwn( ScChangeAction* pAct, sal_uLong nFirstMerge, bool bShared )
 {
     // #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong
     if ( bShared || !ScChangeTrack::MergeIgnore( *pAct, nFirstMerge ) )
@@ -3411,45 +3411,45 @@ void ScChangeTrack::MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bSha
         {
             if ( ((ScChangeActionDel*)pAct)->IsTopDelete() )
             {
-                SetInDeleteTop( TRUE );
+                SetInDeleteTop( sal_True );
                 SetInDeleteRange( ((ScChangeActionDel*)pAct)->
                     GetOverAllRange().MakeRange() );
             }
         }
-        UpdateReference( pAct, FALSE );
-        SetInDeleteTop( FALSE );
+        UpdateReference( pAct, sal_False );
+        SetInDeleteTop( sal_False );
         SetMergeState( SC_CTMS_OTHER );		//! nachfolgende per default MergeOther
     }
 }
 
 
-void ScChangeTrack::UpdateReference( ScChangeAction* pAct, BOOL bUndo )
+void ScChangeTrack::UpdateReference( ScChangeAction* pAct, sal_Bool bUndo )
 {
     ScChangeActionType eActType = pAct->GetType();
     if ( eActType == SC_CAT_CONTENT || eActType == SC_CAT_REJECT )
         return ;
 
     //! Formelzellen haengen nicht im Dokument
-    BOOL bOldAutoCalc = pDoc->GetAutoCalc();
-    pDoc->SetAutoCalc( FALSE );
-    BOOL bOldNoListening = pDoc->GetNoListening();
-    pDoc->SetNoListening( TRUE );
+    sal_Bool bOldAutoCalc = pDoc->GetAutoCalc();
+    pDoc->SetAutoCalc( sal_False );
+    sal_Bool bOldNoListening = pDoc->GetNoListening();
+    pDoc->SetNoListening( sal_True );
     //! Formelzellen ExpandRefs synchronisiert zu denen im Dokument
-    BOOL bOldExpandRefs = pDoc->IsExpandRefs();
+    sal_Bool bOldExpandRefs = pDoc->IsExpandRefs();
     if ( (!bUndo && pAct->IsInsertType()) || (bUndo && pAct->IsDeleteType()) )
         pDoc->SetExpandRefs( SC_MOD()->GetInputOptions().GetExpandRefs() );
 
     if ( pAct->IsDeleteType() )
     {
         SetInDeleteUndo( bUndo );
-        SetInDelete( TRUE );
+        SetInDelete( sal_True );
     }
     else if ( GetMergeState() == SC_CTMS_OWN )
     {
         // Referenzen von Formelzellen wiederherstellen,
         // vorheriges MergePrepare war bei einem Insert wie ein Delete
         if ( pAct->IsInsertType() )
-            SetInDeleteUndo( TRUE );
+            SetInDeleteUndo( sal_True );
     }
 
     //! erst die generated, als waeren sie vorher getrackt worden
@@ -3458,8 +3458,8 @@ void ScChangeTrack::UpdateReference( ScChangeAction* pAct, BOOL bUndo )
             bUndo );
     UpdateReference( &pFirst, pAct, bUndo );
 
-    SetInDelete( FALSE );
-    SetInDeleteUndo( FALSE );
+    SetInDelete( sal_False );
+    SetInDeleteUndo( sal_False );
 
     pDoc->SetExpandRefs( bOldExpandRefs );
     pDoc->SetNoListening( bOldNoListening );
@@ -3468,18 +3468,18 @@ void ScChangeTrack::UpdateReference( ScChangeAction* pAct, BOOL bUndo )
 
 
 void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
-        ScChangeAction* pAct, BOOL bUndo )
+        ScChangeAction* pAct, sal_Bool bUndo )
 {
     ScChangeActionType eActType = pAct->GetType();
-    BOOL bGeneratedDelContents =
+    sal_Bool bGeneratedDelContents =
         ( ppFirstAction == (ScChangeAction**)&pFirstGeneratedDelContent );
     const ScBigRange& rOrgRange = pAct->GetBigRange();
     ScBigRange aRange( rOrgRange );
     ScBigRange aDelRange( rOrgRange );
-    INT32 nDx, nDy, nDz;
+    sal_Int32 nDx, nDy, nDz;
     nDx = nDy = nDz = 0;
     UpdateRefMode eMode = URM_INSDEL;
-    BOOL bDel = FALSE;
+    sal_Bool bDel = sal_False;
     switch ( eActType )
     {
         case SC_CAT_INSERT_COLS :
@@ -3498,19 +3498,19 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
             aRange.aEnd.SetCol( nInt32Max );
             nDx = -(rOrgRange.aEnd.Col() - rOrgRange.aStart.Col() + 1);
             aDelRange.aEnd.SetCol( aDelRange.aStart.Col() - nDx - 1 );
-            bDel = TRUE;
+            bDel = sal_True;
         break;
         case SC_CAT_DELETE_ROWS :
             aRange.aEnd.SetRow( nInt32Max );
             nDy = -(rOrgRange.aEnd.Row() - rOrgRange.aStart.Row() + 1);
             aDelRange.aEnd.SetRow( aDelRange.aStart.Row() - nDy - 1 );
-            bDel = TRUE;
+            bDel = sal_True;
         break;
         case SC_CAT_DELETE_TABS :
             aRange.aEnd.SetTab( nInt32Max );
             nDz = -(rOrgRange.aEnd.Tab() - rOrgRange.aStart.Tab() + 1);
             aDelRange.aEnd.SetTab( aDelRange.aStart.Tab() - nDz - 1 );
-            bDel = TRUE;
+            bDel = sal_True;
         break;
         case SC_CAT_MOVE :
             eMode = URM_MOVE;
@@ -3552,7 +3552,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
             {
                 if ( p == pAct )
                     continue;	// for
-                BOOL bUpdate = TRUE;
+                sal_Bool bUpdate = sal_True;
                 if ( GetMergeState() == SC_CTMS_OTHER &&
                         p->GetActionNumber() <= GetLastMerge() )
                 {	// Delete in mergendem Dokument, Action im zu mergenden
@@ -3562,7 +3562,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
                         // das Insert nicht schneidet.
                         if ( !aDelRange.Intersects( p->GetBigRange() ) )
                             p->UpdateReference( this, eMode, aRange, nDx, nDy, nDz );
-                        bUpdate = FALSE;
+                        bUpdate = sal_False;
                     }
                     else if ( p->GetType() == SC_CAT_CONTENT &&
                             p->IsDeletedInDelType( eInsType ) )
@@ -3570,7 +3570,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
                         // Nicht anpassen, wenn dieses Delete in dem
                         // Insert-"Delete" sein wuerde (ist nur verschoben).
                         if ( aDelRange.In( p->GetBigRange().aStart ) )
-                            bUpdate = FALSE;
+                            bUpdate = sal_False;
                         else
                         {
                             const ScChangeActionLinkEntry* pLink = p->GetDeletedIn();
@@ -3579,7 +3579,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
                                 const ScChangeAction* pDel = pLink->GetAction();
                                 if ( pDel && pDel->GetType() == eInsType &&
                                         pDel->GetBigRange().In( aDelRange ) )
-                                    bUpdate = FALSE;
+                                    bUpdate = sal_False;
                                 pLink = pLink->GetNext();
                             }
                         }
@@ -3600,7 +3600,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
                         if ( bGeneratedDelContents )
                             pActDel->AddContent( (ScChangeActionContent*) p );
                     }
-                    bUpdate = FALSE;
+                    bUpdate = sal_False;
                 }
                 else
                 {
@@ -3765,7 +3765,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
             {
                 if ( p == pAct )
                     continue;	// for
-                BOOL bUpdate = TRUE;
+                sal_Bool bUpdate = sal_True;
                 if ( aDelRange.In( p->GetBigRange() ) )
                 {
                     // #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong
@@ -3790,18 +3790,18 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
                                 // geloescht wird in DeleteCellEntries
                             }
                         }
-                        bUpdate = FALSE;
+                        bUpdate = sal_False;
                     }
                     else if ( eActType != SC_CAT_DELETE_TABS &&
                             p->IsDeletedInDelType( SC_CAT_DELETE_TABS ) )
                     {	// in geloeschten Tabellen nicht updaten,
                         // ausser wenn Tabelle verschoben wird
-                        bUpdate = FALSE;
+                        bUpdate = sal_False;
                     }
                     if ( p->GetType() == eActType && pActDel->IsDeletedIn( p ) )
                     {
                         pActDel->RemoveDeletedIn( p );	// "druntergerutscht"
-                        bUpdate = TRUE;
+                        bUpdate = sal_True;
                     }
                 }
                 if ( bUpdate )
@@ -3817,7 +3817,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
     else if ( eActType == SC_CAT_MOVE )
     {
         ScChangeActionMove* pActMove = (ScChangeActionMove*) pAct;
-        BOOL bLastCutMove = ( pActMove == pLastCutMove );
+        sal_Bool bLastCutMove = ( pActMove == pLastCutMove );
         const ScBigRange& rTo = pActMove->GetBigRange();
         const ScBigRange& rFrom = pActMove->GetFromRange();
         if ( !bUndo )
@@ -3867,7 +3867,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
         }
         else
         {	// Undo Move
-            BOOL bActRejected = pActMove->IsRejected();
+            sal_Bool bActRejected = pActMove->IsRejected();
             for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
             {
                 if ( p == pAct )
@@ -4026,13 +4026,13 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
 
 
 void ScChangeTrack::GetDependents( ScChangeAction* pAct,
-        ScChangeActionTable& rTable, BOOL bListMasterDelete, BOOL bAllFlat ) const
+        ScChangeActionTable& rTable, sal_Bool bListMasterDelete, sal_Bool bAllFlat ) const
 {
     //! bAllFlat==TRUE: intern aus Accept oder Reject gerufen,
     //! => Generated werden nicht aufgenommen
 
-    BOOL bIsDelete = pAct->IsDeleteType();
-    BOOL bIsMasterDelete = ( bListMasterDelete && pAct->IsMasterDelete() );
+    sal_Bool bIsDelete = pAct->IsDeleteType();
+    sal_Bool bIsMasterDelete = ( bListMasterDelete && pAct->IsMasterDelete() );
 
     const ScChangeAction* pCur = pAct;
     ScChangeActionStack* pStack = new ScChangeActionStack;
@@ -4048,7 +4048,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
                 {
                     if ( bAllFlat )
                     {
-                        ULONG n = p->GetActionNumber();
+                        sal_uLong n = p->GetActionNumber();
                         if ( !IsGenerated( n ) && rTable.Insert( n, p ) )
                             if ( p->HasDependent() )
                                 pStack->Push( p );
@@ -4095,7 +4095,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
                             if ( bAllFlat )
                             {
                                 // nur ein TopContent einer Kette ist in LinkDeleted
-                                ULONG n = p->GetActionNumber();
+                                sal_uLong n = p->GetActionNumber();
                                 if ( !IsGenerated( n ) && rTable.Insert( n, p ) )
                                     if ( p->HasDeleted() ||
                                             p->GetType() == SC_CAT_CONTENT )
@@ -4144,7 +4144,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
                 {
                     if ( bAllFlat )
                     {
-                        ULONG n = p->GetActionNumber();
+                        sal_uLong n = p->GetActionNumber();
                         if ( !IsGenerated( n ) && rTable.Insert( n, p ) )
                             if ( p->HasDependent() || p->HasDeleted() )
                                 pStack->Push( p );
@@ -4188,7 +4188,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
                 {
                     if ( bAllFlat )
                     {
-                        ULONG n = p->GetActionNumber();
+                        sal_uLong n = p->GetActionNumber();
                         if ( !IsGenerated( n ) && rTable.Insert( n, p ) )
                             if ( p->HasDependent() )
                                 pStack->Push( p );
@@ -4214,10 +4214,10 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
 }
 
 
-BOOL ScChangeTrack::SelectContent( ScChangeAction* pAct, BOOL bOldest )
+sal_Bool ScChangeTrack::SelectContent( ScChangeAction* pAct, sal_Bool bOldest )
 {
     if ( pAct->GetType() != SC_CAT_CONTENT )
-        return FALSE;
+        return sal_False;
 
     ScChangeActionContent* pContent = (ScChangeActionContent*) pAct;
     if ( bOldest )
@@ -4230,7 +4230,7 @@ BOOL ScChangeTrack::SelectContent( ScChangeAction* pAct, BOOL bOldest )
     }
 
     if ( !pContent->IsClickable() )
-        return FALSE;
+        return sal_False;
 
     ScBigRange aBigRange( pContent->GetBigRange() );
     const ScBaseCell* pCell = (bOldest ? pContent->GetOldCell() :
@@ -4245,16 +4245,16 @@ BOOL ScChangeTrack::SelectContent( ScChangeAction* pAct, BOOL bOldest )
     }
 
     if ( !aBigRange.IsValid( pDoc ) )
-        return FALSE;
+        return sal_False;
 
     ScRange aRange( aBigRange.MakeRange() );
     if ( !pDoc->IsBlockEditable( aRange.aStart.Tab(), aRange.aStart.Col(),
             aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row() ) )
-        return FALSE;
+        return sal_False;
 
     if ( pContent->HasDependent() )
     {
-        BOOL bOk = TRUE;
+        sal_Bool bOk = sal_True;
         Stack aRejectActions;
         const ScChangeActionLinkEntry* pL = pContent->GetFirstDependentEntry();
         while ( pL )
@@ -4302,28 +4302,28 @@ void ScChangeTrack::AcceptAll()
 }
 
 
-BOOL ScChangeTrack::Accept( ScChangeAction* pAct )
+sal_Bool ScChangeTrack::Accept( ScChangeAction* pAct )
 {
     if ( !pAct->IsClickable() )
-        return FALSE;
+        return sal_False;
 
     if ( pAct->IsDeleteType() || pAct->GetType() == SC_CAT_CONTENT )
     {
         ScChangeActionTable aActionTable;
-        GetDependents( pAct, aActionTable, FALSE, TRUE );
+        GetDependents( pAct, aActionTable, sal_False, sal_True );
         for ( ScChangeAction* p = aActionTable.First(); p; p = aActionTable.Next() )
         {
             p->Accept();
         }
     }
     pAct->Accept();
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScChangeTrack::RejectAll()
+sal_Bool ScChangeTrack::RejectAll()
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     for ( ScChangeAction* p = GetLast(); p && bOk; p = p->GetPrev() )
     {	//! rueckwaerts, weil abhaengige hinten und RejectActions angehaengt
         if ( p->IsInternalRejectable() )
@@ -4333,7 +4333,7 @@ BOOL ScChangeTrack::RejectAll()
 }
 
 
-BOOL ScChangeTrack::Reject( ScChangeAction* pAct, bool bShared )
+sal_Bool ScChangeTrack::Reject( ScChangeAction* pAct, bool bShared )
 {
     // #i100895# When collaboration changes are reversed, it must be possible
     // to reject a deleted row above another deleted row.
@@ -4341,29 +4341,29 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, bool bShared )
         pAct->RemoveAllDeletedIn();
 
     if ( !pAct->IsRejectable() )
-        return FALSE;
+        return sal_False;
 
     ScChangeActionTable* pTable = NULL;
     if ( pAct->HasDependent() )
     {
         pTable = new ScChangeActionTable;
-        GetDependents( pAct, *pTable, FALSE, TRUE );
+        GetDependents( pAct, *pTable, sal_False, sal_True );
     }
-    BOOL bRejected = Reject( pAct, pTable, FALSE );
+    sal_Bool bRejected = Reject( pAct, pTable, sal_False );
     if ( pTable )
         delete pTable;
     return bRejected;
 }
 
 
-BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
-        BOOL bRecursion )
+sal_Bool ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
+        sal_Bool bRecursion )
 {
     if ( !pAct->IsInternalRejectable() )
-        return FALSE;
+        return sal_False;
 
-    BOOL bOk = TRUE;
-    BOOL bRejected = FALSE;
+    sal_Bool bOk = sal_True;
+    sal_Bool bRejected = sal_False;
     if ( pAct->IsInsertType() )
     {
         if ( pAct->HasDependent() && !bRecursion )
@@ -4377,10 +4377,10 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
                 else if ( p->IsDeleteType() )
                     p->Accept();		// geloeschtes ins Nirvana
                 else
-                    bOk = Reject( p, NULL, TRUE );		//! rekursiv
+                    bOk = Reject( p, NULL, sal_True );		//! rekursiv
             }
         }
-        if ( bOk && (bRejected = pAct->Reject( pDoc )) != FALSE )
+        if ( bOk && (bRejected = pAct->Reject( pDoc )) != sal_False )
         {
             // pRefDoc NULL := geloeschte Zellen nicht speichern
             AppendDeleteRange( pAct->GetBigRange().MakeRange(), NULL, (short) 0,
@@ -4391,11 +4391,11 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
     {
         DBG_ASSERT( !pTable, "ScChangeTrack::Reject: Delete mit Table" );
         ScBigRange aDelRange;
-        ULONG nRejectAction = pAct->GetActionNumber();
-        BOOL bTabDel, bTabDelOk;
+        sal_uLong nRejectAction = pAct->GetActionNumber();
+        sal_Bool bTabDel, bTabDelOk;
         if ( pAct->GetType() == SC_CAT_DELETE_TABS )
         {
-            bTabDel = TRUE;
+            bTabDel = sal_True;
             aDelRange = pAct->GetBigRange();
             bOk = bTabDelOk = pAct->Reject( pDoc );
             if ( bOk )
@@ -4405,14 +4405,14 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
             }
         }
         else
-            bTabDel = bTabDelOk = FALSE;
+            bTabDel = bTabDelOk = sal_False;
         ScChangeActionDel* pDel = (ScChangeActionDel*) pAct;
         if ( bOk )
         {
             aDelRange = pDel->GetOverAllRange();
             bOk = aDelRange.IsValid( pDoc );
         }
-        BOOL bOneOk = FALSE;
+        sal_Bool bOneOk = sal_False;
         if ( bOk )
         {
             ScChangeActionType eActType = pAct->GetType();
@@ -4433,7 +4433,7 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
                 }
             }
             ScChangeAction* p = pAct;
-            BOOL bLoop = TRUE;
+            sal_Bool bLoop = sal_True;
             do
             {
                 pDel = (ScChangeActionDel*) p;
@@ -4460,10 +4460,10 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
                         }
                     }
                     else
-                        bOneOk = TRUE;
+                        bOneOk = sal_True;
                 }
                 if ( pDel->IsBaseDelete() )
-                    bLoop = FALSE;
+                    bLoop = sal_False;
                 else
                     p = p->GetPrev();
             } while ( bOk && bLoop && p && p->GetType() == eActType &&
@@ -4487,10 +4487,10 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
             DBG_ASSERT( pTable, "ScChangeTrack::Reject: Move ohne Table" );
             for ( ScChangeAction* p = pTable->Last(); p && bOk; p = pTable->Prev() )
             {
-                bOk = Reject( p, NULL, TRUE );		//! rekursiv
+                bOk = Reject( p, NULL, sal_True );		//! rekursiv
             }
         }
-        if ( bOk && (bRejected = pAct->Reject( pDoc )) != FALSE )
+        if ( bOk && (bRejected = pAct->Reject( pDoc )) != sal_False )
         {
             ScChangeActionMove* pReject = new ScChangeActionMove(
                 pAct->GetBigRange().MakeRange(),
@@ -4512,7 +4512,7 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
             pReject = new ScChangeActionContent( aRange );
             pReject->SetOldValue( pDoc->GetCell( aRange.aStart ), pDoc, pDoc );
         }
-        if ( (bRejected = pAct->Reject( pDoc )) != FALSE && !bRecursion )
+        if ( (bRejected = pAct->Reject( pDoc )) != sal_False && !bRecursion )
         {
             pReject->SetNewValue( pDoc->GetCell( aRange.aStart ), pDoc );
             pReject->SetRejectAction( pAct->GetActionNumber() );
@@ -4531,7 +4531,7 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
 }
 
 
-ULONG ScChangeTrack::AddLoadedGenerated(ScBaseCell* pNewCell, const ScBigRange& aBigRange, const String& sNewValue )
+sal_uLong ScChangeTrack::AddLoadedGenerated(ScBaseCell* pNewCell, const ScBigRange& aBigRange, const String& sNewValue )
 {
     ScChangeActionContent* pAct = new ScChangeActionContent( --nGeneratedMin, pNewCell, aBigRange, pDoc, sNewValue );
     if ( pAct )
@@ -4733,7 +4733,7 @@ ScChangeTrack* ScChangeTrack::Clone( ScDocument* pDocument ) const
     {
         if ( pAction->HasDeleted() )
         {
-            ::std::stack< ULONG > aStack;
+            ::std::stack< sal_uLong > aStack;
             const ScChangeActionLinkEntry* pL = pAction->GetFirstDeletedEntry();
             while ( pL )
             {
@@ -4767,7 +4767,7 @@ ScChangeTrack* ScChangeTrack::Clone( ScDocument* pDocument ) const
     {
         if ( pAction->HasDependent() )
         {
-            ::std::stack< ULONG > aStack;
+            ::std::stack< sal_uLong > aStack;
             const ScChangeActionLinkEntry* pL = pAction->GetFirstDependentEntry();
             while ( pL )
             {
diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx
index 17e874642..bdc3e3fc7 100644
--- a/sc/source/core/tool/chgviset.cxx
+++ b/sc/source/core/tool/chgviset.cxx
@@ -90,16 +90,16 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting
     return *this;
 }
 
-BOOL ScChangeViewSettings::IsValidComment(const String* pCommentStr) const
+sal_Bool ScChangeViewSettings::IsValidComment(const String* pCommentStr) const
 {
-    BOOL nTheFlag=TRUE;
+    sal_Bool nTheFlag=sal_True;
 
     if(pCommentSearcher!=NULL)
     {
         xub_StrLen nStartPos = 0;
         xub_StrLen nEndPos = pCommentStr->Len();
 
-        nTheFlag=sal::static_int_cast<BOOL>(pCommentSearcher->SearchFrwrd( *pCommentStr, &nStartPos, &nEndPos));
+        nTheFlag=sal::static_int_cast<sal_Bool>(pCommentSearcher->SearchFrwrd( *pCommentStr, &nStartPos, &nEndPos));
     }
     return nTheFlag;
 }
@@ -116,7 +116,7 @@ void ScChangeViewSettings::SetTheComment(const String& rString)
     if(rString.Len()>0)
     {
         utl::SearchParam aSearchParam( rString,
-            utl::SearchParam::SRCH_REGEXP,FALSE,FALSE,FALSE );
+            utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False );
 
         pCommentSearcher = new utl::TextSearch( aSearchParam, *ScGlobal::pCharClass );
     }
diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx
index 64bf727df..ca71eb781 100644
--- a/sc/source/core/tool/collect.cxx
+++ b/sc/source/core/tool/collect.cxx
@@ -48,17 +48,17 @@ ScDataObject::~ScDataObject()
 // Collection
 //------------------------------------------------------------------------
 
-void lcl_DeleteScDataObjects( ScDataObject** p, USHORT nCount )
+void lcl_DeleteScDataObjects( ScDataObject** p, sal_uInt16 nCount )
 {
     if ( p )
     {
-        for (USHORT i = 0; i < nCount; i++) delete p[i];
+        for (sal_uInt16 i = 0; i < nCount; i++) delete p[i];
         delete[] p;
         p = NULL;
     }
 }
 
-ScCollection::ScCollection(USHORT nLim, USHORT nDel) :
+ScCollection::ScCollection(sal_uInt16 nLim, sal_uInt16 nDel) :
     nCount ( 0 ),
     nLimit ( nLim ),
     nDelta ( nDel ),
@@ -93,8 +93,8 @@ ScCollection::~ScCollection()
 }
 
 //------------------------------------------------------------------------
-USHORT ScCollection::GetCount() const { return nCount; }
-void ScCollection::AtFree(USHORT nIndex)
+sal_uInt16 ScCollection::GetCount() const { return nCount; }
+void ScCollection::AtFree(sal_uInt16 nIndex)
 {
     if ((pItems) && (nIndex < nCount))
     {
@@ -123,7 +123,7 @@ void ScCollection::FreeAll()
 
 //------------------------------------------------------------------------
 
-BOOL ScCollection::AtInsert(USHORT nIndex, ScDataObject* pScDataObject)
+sal_Bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject)
 {
     if ((nCount < MAXCOLLECTIONSIZE) && (nIndex <= nCount) && pItems)
     {
@@ -131,8 +131,8 @@ BOOL ScCollection::AtInsert(USHORT nIndex, ScDataObject* pScDataObject)
         {
             ScDataObject** pNewItems = new ScDataObject*[nLimit + nDelta];
             if (!pNewItems)
-                return FALSE;
-            nLimit = sal::static_int_cast<USHORT>( nLimit + nDelta );
+                return sal_False;
+            nLimit = sal::static_int_cast<sal_uInt16>( nLimit + nDelta );
             memmove(pNewItems, pItems, nCount * sizeof(ScDataObject*));
             delete[] pItems;
             pItems = pNewItems;
@@ -141,21 +141,21 @@ BOOL ScCollection::AtInsert(USHORT nIndex, ScDataObject* pScDataObject)
             memmove(&pItems[nIndex + 1], &pItems[nIndex], (nCount - nIndex) * sizeof(ScDataObject*));
         pItems[nIndex] = pScDataObject;
         nCount++;
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScCollection::Insert(ScDataObject* pScDataObject)
+sal_Bool ScCollection::Insert(ScDataObject* pScDataObject)
 {
     return AtInsert(nCount, pScDataObject);
 }
 
 //------------------------------------------------------------------------
 
-ScDataObject* ScCollection::At(USHORT nIndex) const
+ScDataObject* ScCollection::At(sal_uInt16 nIndex) const
 {
     if (nIndex < nCount)
         return pItems[nIndex];
@@ -165,10 +165,10 @@ ScDataObject* ScCollection::At(USHORT nIndex) const
 
 //------------------------------------------------------------------------
 
-USHORT ScCollection::IndexOf(ScDataObject* pScDataObject) const
+sal_uInt16 ScCollection::IndexOf(ScDataObject* pScDataObject) const
 {
-    USHORT nIndex = 0xffff;
-    for (USHORT i = 0; ((i < nCount) && (nIndex == 0xffff)); i++)
+    sal_uInt16 nIndex = 0xffff;
+    for (sal_uInt16 i = 0; ((i < nCount) && (nIndex == 0xffff)); i++)
     {
         if (pItems[i] == pScDataObject) nIndex = i;
     }
@@ -185,7 +185,7 @@ ScCollection& ScCollection::operator=( const ScCollection& r )
     nLimit = r.nLimit;
     nDelta = r.nDelta;
     pItems = new ScDataObject*[nLimit];
-    for ( USHORT i=0; i<nCount; i++ )
+    for ( sal_uInt16 i=0; i<nCount; i++ )
         pItems[i] = r.pItems[i]->Clone();
 
     return *this;
@@ -202,7 +202,7 @@ ScDataObject*	ScCollection::Clone() const
 // ScSortedCollection
 //------------------------------------------------------------------------
 
-ScSortedCollection::ScSortedCollection(USHORT nLim, USHORT nDel, BOOL bDup) :
+ScSortedCollection::ScSortedCollection(sal_uInt16 nLim, sal_uInt16 nDel, sal_Bool bDup) :
     ScCollection (nLim, nDel),
     bDuplicates ( bDup)
 {
@@ -210,9 +210,9 @@ ScSortedCollection::ScSortedCollection(USHORT nLim, USHORT nDel, BOOL bDup) :
 
 //------------------------------------------------------------------------
 
-USHORT ScSortedCollection::IndexOf(ScDataObject* pScDataObject) const
+sal_uInt16 ScSortedCollection::IndexOf(ScDataObject* pScDataObject) const
 {
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     if (Search(pScDataObject, nIndex))
         return nIndex;
     else
@@ -221,10 +221,10 @@ USHORT ScSortedCollection::IndexOf(ScDataObject* pScDataObject) const
 
 //------------------------------------------------------------------------
 
-BOOL ScSortedCollection::Search(ScDataObject* pScDataObject, USHORT& rIndex) const
+sal_Bool ScSortedCollection::Search(ScDataObject* pScDataObject, sal_uInt16& rIndex) const
 {
     rIndex = nCount;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     short nLo = 0;
     short nHi = nCount - 1;
     short nIndex;
@@ -240,7 +240,7 @@ BOOL ScSortedCollection::Search(ScDataObject* pScDataObject, USHORT& rIndex) con
             nHi = nIndex - 1;
             if (nCompare == 0)
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 nLo = nIndex;
             }
         }
@@ -251,16 +251,16 @@ BOOL ScSortedCollection::Search(ScDataObject* pScDataObject, USHORT& rIndex) con
 
 //------------------------------------------------------------------------
 
-BOOL ScSortedCollection::Insert(ScDataObject* pScDataObject)
+sal_Bool ScSortedCollection::Insert(ScDataObject* pScDataObject)
 {
-    USHORT nIndex;
-    BOOL bFound = Search(pScDataObject, nIndex);
+    sal_uInt16 nIndex;
+    sal_Bool bFound = Search(pScDataObject, nIndex);
     if (bFound)
     {
         if (bDuplicates)
             return AtInsert(nIndex, pScDataObject);
         else
-            return FALSE;
+            return sal_False;
     }
     else
         return AtInsert(nIndex, pScDataObject);
@@ -268,15 +268,15 @@ BOOL ScSortedCollection::Insert(ScDataObject* pScDataObject)
 
 //------------------------------------------------------------------------
 
-BOOL ScSortedCollection::InsertPos(ScDataObject* pScDataObject, USHORT& nIndex)
+sal_Bool ScSortedCollection::InsertPos(ScDataObject* pScDataObject, sal_uInt16& nIndex)
 {
-    BOOL bFound = Search(pScDataObject, nIndex);
+    sal_Bool bFound = Search(pScDataObject, nIndex);
     if (bFound)
     {
         if (bDuplicates)
             return AtInsert(nIndex, pScDataObject);
         else
-            return FALSE;
+            return sal_False;
     }
     else
         return AtInsert(nIndex, pScDataObject);
@@ -284,21 +284,21 @@ BOOL ScSortedCollection::InsertPos(ScDataObject* pScDataObject, USHORT& nIndex)
 
 //------------------------------------------------------------------------
 
-BOOL ScSortedCollection::operator==(const ScSortedCollection& rCmp) const
+sal_Bool ScSortedCollection::operator==(const ScSortedCollection& rCmp) const
 {
     if ( nCount != rCmp.nCount )
-        return FALSE;
-    for (USHORT i=0; i<nCount; i++)
+        return sal_False;
+    for (sal_uInt16 i=0; i<nCount; i++)
         if ( !IsEqual(pItems[i],rCmp.pItems[i]) )
-            return FALSE;
-    return TRUE;
+            return sal_False;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
 //	IsEqual - komplette Inhalte vergleichen
 
-BOOL ScSortedCollection::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
+sal_Bool ScSortedCollection::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
 {
     return ( Compare(pKey1, pKey2) == 0 );		// Default: nur Index vergleichen
 }
@@ -335,7 +335,7 @@ ScDataObject*	ScStrCollection::Clone() const
 //------------------------------------------------------------------------
 
 //UNUSED2008-05  TypedStrData::TypedStrData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
-//UNUSED2008-05                                  BOOL bAllStrings )
+//UNUSED2008-05                                  sal_Bool bAllStrings )
 //UNUSED2008-05  {
 //UNUSED2008-05      if ( pDoc->HasValueData( nCol, nRow, nTab ) )
 //UNUSED2008-05      {
@@ -358,10 +358,10 @@ ScDataObject*	TypedStrData::Clone() const
     return new TypedStrData(*this);
 }
 
-TypedScStrCollection::TypedScStrCollection( USHORT nLim , USHORT nDel , BOOL bDup  )
+TypedScStrCollection::TypedScStrCollection( sal_uInt16 nLim , sal_uInt16 nDel , sal_Bool bDup  )
     : ScSortedCollection( nLim, nDel, bDup ) 
 {
-    bCaseSensitive = FALSE; 
+    bCaseSensitive = sal_False; 
 }
 
 TypedScStrCollection::~TypedScStrCollection()
@@ -371,12 +371,12 @@ ScDataObject* TypedScStrCollection::Clone() const
     return new TypedScStrCollection(*this);
 }
 
-TypedStrData*	 TypedScStrCollection::operator[]( const USHORT nIndex) const
+TypedStrData*	 TypedScStrCollection::operator[]( const sal_uInt16 nIndex) const
 { 
     return (TypedStrData*)At(nIndex); 
 }
 
-void	TypedScStrCollection::SetCaseSensitive( BOOL bSet )		
+void	TypedScStrCollection::SetCaseSensitive( sal_Bool bSet )		
 { 
     bCaseSensitive = bSet; 
 }
@@ -423,13 +423,13 @@ short TypedScStrCollection::Compare( ScDataObject* pKey1, ScDataObject* pKey2 )
     return nResult;
 }
 
-BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
-                                    USHORT& rPos, BOOL bBack ) const
+sal_Bool TypedScStrCollection::FindText( const String& rStart, String& rResult,
+                                    sal_uInt16& rPos, sal_Bool bBack ) const
 {
     //	Die Collection ist nach String-Vergleichen sortiert, darum muss hier
     //	alles durchsucht werden
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     String aOldResult;
     if ( rPos != SCPOS_INVALID && rPos < nCount )
@@ -441,11 +441,11 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
 
     if ( bBack )									// rueckwaerts
     {
-        USHORT nStartPos = nCount;
+        sal_uInt16 nStartPos = nCount;
         if ( rPos != SCPOS_INVALID )
             nStartPos = rPos;						// weitersuchen...
 
-        for ( USHORT i=nStartPos; i>0; )
+        for ( sal_uInt16 i=nStartPos; i>0; )
         {
             --i;
             TypedStrData* pData = (TypedStrData*) pItems[i];
@@ -461,7 +461,7 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
                     {
                         rResult = pData->aStrValue;
                         rPos = i;
-                        bFound = TRUE;
+                        bFound = sal_True;
                         break;
                     }
                 }
@@ -470,11 +470,11 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
     }
     else											// vorwaerts
     {
-        USHORT nStartPos = 0;
+        sal_uInt16 nStartPos = 0;
         if ( rPos != SCPOS_INVALID )
             nStartPos = rPos + 1;					// weitersuchen...
 
-        for ( USHORT i=nStartPos; i<nCount; i++ )
+        for ( sal_uInt16 i=nStartPos; i<nCount; i++ )
         {
             TypedStrData* pData = (TypedStrData*) pItems[i];
             if (pData->nStrType)
@@ -489,7 +489,7 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
                     {
                         rResult = pData->aStrValue;
                         rPos = i;
-                        bFound = TRUE;
+                        bFound = sal_True;
                         break;
                     }
                 }
@@ -502,20 +502,20 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
 
         // Gross-/Kleinschreibung anpassen
 
-BOOL TypedScStrCollection::GetExactMatch( String& rString ) const
+sal_Bool TypedScStrCollection::GetExactMatch( String& rString ) const
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         TypedStrData* pData = (TypedStrData*) pItems[i];
         if ( pData->nStrType && ScGlobal::GetpTransliteration()->isEqual(
                 pData->aStrValue, rString ) )
         {
             rString = pData->aStrValue;							// String anpassen
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index f2d5b99c2..d5288807c 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -244,16 +244,16 @@ void dbg_call_generateMappingDiff()
             FormulaLanguage::ODFF);
     ScCompiler::OpCodeMapPtr xENUS = ScCompiler::GetOpCodeMap(
             FormulaLanguage::ENGLISH);
-    USHORT nPODF = xPODF->getSymbolCount();
-    USHORT nODFF = xODFF->getSymbolCount();
-    USHORT nENUS = xENUS->getSymbolCount();
+    sal_uInt16 nPODF = xPODF->getSymbolCount();
+    sal_uInt16 nODFF = xODFF->getSymbolCount();
+    sal_uInt16 nENUS = xENUS->getSymbolCount();
     printf( "%s\n", "This is a semicolon separated file, you may import it as such to Calc.");
     printf( "%s\n", "Spreadsheet functions name differences between PODF (ODF < 1.2) and ODFF (ODF >= 1.2), plus English UI names.");
     printf( "\nInternal OpCodes; PODF: %d; ODFF: %d; ENUS: %d\n",
             (int)nPODF, (int)nODFF, (int)nENUS);
-    USHORT nMax = ::std::max( ::std::max( nPODF, nODFF), nENUS);
+    sal_uInt16 nMax = ::std::max( ::std::max( nPODF, nODFF), nENUS);
 #define out(rStr) (ByteString( rStr, RTL_TEXTENCODING_UTF8).GetBuffer())
-    for (USHORT i=0; i < nMax; ++i)
+    for (sal_uInt16 i=0; i < nMax; ++i)
     {
         const String& rPODF = xPODF->getSymbol(static_cast<OpCode>(i));
         const String& rODFF = xODFF->getSymbol(static_cast<OpCode>(i));
@@ -308,14 +308,14 @@ bool ScCompiler::IsEnglishSymbol( const String& rName )
         return true;
     }
     // 2. old add in functions
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     if ( ScGlobal::GetFuncCollection()->SearchFunc( aUpper, nIndex ) )
     {
         return true;
     }
 
     // 3. new (uno) add in functions
-    String aIntName(ScGlobal::GetAddInCollection()->FindFunction( aUpper, FALSE ));
+    String aIntName(ScGlobal::GetAddInCollection()->FindFunction( aUpper, sal_False ));
     if (aIntName.Len())
     {
         return true;
@@ -413,9 +413,9 @@ void ScCompiler::SetGrammarAndRefConvention(
         SetRefConvention( eConv );
 }
 
-String ScCompiler::FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const
+String ScCompiler::FindAddInFunction( const String& rUpperName, sal_Bool bLocalFirst ) const
 {
-    return ScGlobal::GetAddInCollection()->FindFunction(rUpperName, bLocalFirst);    // bLocalFirst=FALSE for english
+    return ScGlobal::GetAddInCollection()->FindFunction(rUpperName, bLocalFirst);    // bLocalFirst=sal_False for english
 }
 
 
@@ -441,7 +441,7 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv )
     meConv( eConv )
 {
     int i;
-    ULONG *t= new ULONG [128];
+    sal_uLong *t= new sal_uLong [128];
 
     ScCompiler::pConventions[ meConv ] = this;
     mpCharTable = t;
@@ -613,7 +613,7 @@ static bool lcl_parseExternalName(
         // indexed external document names.
         ScRange aRange;
         String aStartTabName, aEndTabName;
-        USHORT nFlags = 0;
+        sal_uInt16 nFlags = 0;
         p = aRange.Parse_XL_Header( p, pDoc, aTmpFile, aStartTabName,
                 aEndTabName, nFlags, true, pExternalLinks );
         if (!p || p == pStart)
@@ -968,7 +968,7 @@ struct ConventionOOO_A1 : public Convention_A1
     void MakeRefStr( rtl::OUStringBuffer&   rBuffer,
                      const ScCompiler&      rComp,
                      const ScComplexRefData& rRef,
-                     BOOL bSingleRef ) const
+                     sal_Bool bSingleRef ) const
     {
         MakeRefStrImpl( rBuffer, rComp, rRef, bSingleRef, false);
     }
@@ -1155,7 +1155,7 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1
     void MakeRefStr( rtl::OUStringBuffer&   rBuffer,
                      const ScCompiler&      rComp,
                      const ScComplexRefData& rRef,
-                     BOOL bSingleRef ) const
+                     sal_Bool bSingleRef ) const
     {
         MakeRefStrImpl( rBuffer, rComp, rRef, bSingleRef, true);
     }
@@ -1412,7 +1412,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL
     void MakeRefStr( rtl::OUStringBuffer&   rBuf,
                      const ScCompiler&      rComp,
                      const ScComplexRefData& rRef,
-                     BOOL bSingleRef ) const
+                     sal_Bool bSingleRef ) const
     {
         ScComplexRefData aRef( rRef );
 
@@ -1614,7 +1614,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL
     void MakeRefStr( rtl::OUStringBuffer&   rBuf,
                      const ScCompiler&      rComp,
                      const ScComplexRefData& rRef,
-                     BOOL bSingleRef ) const
+                     sal_Bool bSingleRef ) const
     {
         ScComplexRefData aRef( rRef );
 
@@ -1896,7 +1896,7 @@ void ScCompiler::SetRefConvention( const ScCompiler::Convention *pConvP )
             "ScCompiler::SetRefConvention: unsupported grammar resulting");
 }
 
-void ScCompiler::SetError(USHORT nError)
+void ScCompiler::SetError(sal_uInt16 nError)
 {
     if( !pArr->GetCodeError() )
         pArr->SetCodeError( nError);
@@ -1982,7 +1982,7 @@ xub_StrLen ScCompiler::NextSymbol(bool bInArray)
     while ((c != 0) && (eState != ssStop) )
     {
         pSrc++;
-        ULONG nMask = GetCharTableFlags( c );
+        sal_uLong nMask = GetCharTableFlags( c );
         // The parameter separator and the array column and row separators end
         // things unconditionally if not in string or reference.
         if (c == cSep || (bInArray && (c == cArrayColSep || c == cArrayRowSep)))
@@ -2417,7 +2417,7 @@ Label_MaskStateMachine:
         nSrcPos = sal::static_int_cast<xub_StrLen>( nSrcPos + nSpaces );
         String aSymbol;
         mnRangeOpPosInSymbol = -1;
-        USHORT nErr = 0;
+        sal_uInt16 nErr = 0;
         do
         {
             bi18n = false;
@@ -2486,10 +2486,10 @@ Label_MaskStateMachine:
 // Convert symbol to token
 //---------------------------------------------------------------------------
 
-BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray )
+sal_Bool ScCompiler::IsOpCode( const String& rName, bool bInArray )
 {
     OpCodeHashMap::const_iterator iLook( mxSymbols->getHashMap()->find( rName));
-    BOOL bFound = (iLook != mxSymbols->getHashMap()->end());
+    sal_Bool bFound = (iLook != mxSymbols->getHashMap()->end());
     if (bFound)
     {
         ScRawToken aToken;
@@ -2532,7 +2532,7 @@ BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray )
                 ScRawToken aToken;
                 aToken.SetOpCode( aOdffAliases[i].eOp);
                 pRawToken = aToken.Clone();
-                bFound = TRUE;
+                bFound = sal_True;
                 break;  // for
             }
         }
@@ -2556,13 +2556,13 @@ BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray )
                 // last resort by just falling through to FindFunction(), but
                 // it shouldn't happen if the map was setup correctly. Don't
                 // waste time and bail out.
-                return FALSE;
+                return sal_False;
             }
         }
         if (!aIntName.Len())
         {
             // Old (deprecated) addins first for legacy.
-            USHORT nIndex;
+            sal_uInt16 nIndex;
             bFound = ScGlobal::GetFuncCollection()->SearchFunc( cSymbol, nIndex);
             if (bFound)
             {
@@ -2571,7 +2571,7 @@ BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray )
                 pRawToken = aToken.Clone();
             }
             else
-                // bLocalFirst=FALSE for (English) upper full original name
+                // bLocalFirst=sal_False for (English) upper full original name
                 // (service.function)
                 aIntName = ScGlobal::GetAddInCollection()->FindFunction(
                         rName, !mxSymbols->isEnglish());
@@ -2581,7 +2581,7 @@ BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray )
             ScRawToken aToken;
             aToken.SetExternal( aIntName.GetBuffer() );     // international name
             pRawToken = aToken.Clone();
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
     OpCode eOp;
@@ -2601,10 +2601,10 @@ BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray )
     return bFound;
 }
 
-BOOL ScCompiler::IsOpCode2( const String& rName )
+sal_Bool ScCompiler::IsOpCode2( const String& rName )
 {
-    BOOL bFound = FALSE;
-    USHORT i;
+    sal_Bool bFound = sal_False;
+    sal_uInt16 i;
 
     for( i = ocInternalBegin; i <= ocInternalEnd && !bFound; i++ )
         bFound = rName.EqualsAscii( pInternal[ i-ocInternalBegin ] );
@@ -2618,16 +2618,16 @@ BOOL ScCompiler::IsOpCode2( const String& rName )
     return bFound;
 }
 
-BOOL ScCompiler::IsValue( const String& rSym )
+sal_Bool ScCompiler::IsValue( const String& rSym )
 {
     double fVal;
     sal_uInt32 nIndex = ( mxSymbols->isEnglish() ?
         pDoc->GetFormatTable()->GetStandardIndex( LANGUAGE_ENGLISH_US ) : 0 );
-//  ULONG nIndex = 0;
-////    ULONG nIndex = pDoc->GetFormatTable()->GetStandardIndex(ScGlobal::eLnge);
+//  sal_uLong nIndex = 0;
+////    sal_uLong nIndex = pDoc->GetFormatTable()->GetStandardIndex(ScGlobal::eLnge);
     if (pDoc->GetFormatTable()->IsNumberFormat( rSym, nIndex, fVal ) )
     {
-        USHORT nType = pDoc->GetFormatTable()->GetType(nIndex);
+        sal_uInt16 nType = pDoc->GetFormatTable()->GetType(nIndex);
 
         // Don't accept 3:3 as time, it is a reference to entire row 3 instead.
         // Dates should never be entered directly and automatically converted
@@ -2635,7 +2635,7 @@ BOOL ScCompiler::IsValue( const String& rSym )
         // Usually it wouldn't be accepted anyway because the date separator
         // clashed with other separators or operators.
         if (nType & (NUMBERFORMAT_TIME | NUMBERFORMAT_DATE))
-            return FALSE;
+            return sal_False;
 
         if (nType == NUMBERFORMAT_LOGICAL)
         {
@@ -2643,12 +2643,12 @@ BOOL ScCompiler::IsValue( const String& rSym )
             while( *p == ' ' )
                 p++;
             if (*p == '(')
-                return FALSE;   // Boolean function instead.
+                return sal_False;   // Boolean function instead.
         }
 
         if( aFormula.GetChar(nSrcPos) == '.' )
             // numerical sheet name?
-            return FALSE;
+            return sal_False;
 
         if( nType == NUMBERFORMAT_TEXT )
             // HACK: number too big!
@@ -2656,23 +2656,23 @@ BOOL ScCompiler::IsValue( const String& rSym )
         ScRawToken aToken;
         aToken.SetDouble( fVal );
         pRawToken = aToken.Clone();
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScCompiler::IsString()
+sal_Bool ScCompiler::IsString()
 {
     register const sal_Unicode* p = cSymbol;
     while ( *p )
         p++;
     xub_StrLen nLen = sal::static_int_cast<xub_StrLen>( p - cSymbol - 1 );
-    BOOL bQuote = ((cSymbol[0] == '"') && (cSymbol[nLen] == '"'));
+    sal_Bool bQuote = ((cSymbol[0] == '"') && (cSymbol[nLen] == '"'));
     if ((bQuote ? nLen-2 : nLen) > MAXSTRLEN-1)
     {
         SetError(errStringOverflow);
-        return FALSE;
+        return sal_False;
     }
     if ( bQuote )
     {
@@ -2680,13 +2680,13 @@ BOOL ScCompiler::IsString()
         ScRawToken aToken;
         aToken.SetString( cSymbol+1 );
         pRawToken = aToken.Clone();
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScCompiler::IsPredetectedReference( const String& rName )
+sal_Bool ScCompiler::IsPredetectedReference( const String& rName )
 {
     // Speedup documents with lots of broken references, e.g. sheet deleted.
     xub_StrLen nPos = rName.SearchAscii( "#REF!");
@@ -2738,12 +2738,12 @@ BOOL ScCompiler::IsPredetectedReference( const String& rName )
 }
 
 
-BOOL ScCompiler::IsDoubleReference( const String& rName )
+sal_Bool ScCompiler::IsDoubleReference( const String& rName )
 {
     ScRange aRange( aPos, aPos );
     const ScAddress::Details aDetails( pConv->meConv, aPos );
     ScAddress::ExternalInfo aExtInfo;
-    USHORT nFlags = aRange.Parse( rName, pDoc, aDetails, &aExtInfo, &maExternalLinks );
+    sal_uInt16 nFlags = aRange.Parse( rName, pDoc, aDetails, &aExtInfo, &maExternalLinks );
     if( nFlags & SCA_VALID )
     {
         ScRawToken aToken;
@@ -2753,13 +2753,13 @@ BOOL ScCompiler::IsDoubleReference( const String& rName )
         aRef.Ref1.SetRowRel( (nFlags & SCA_ROW_ABSOLUTE) == 0 );
         aRef.Ref1.SetTabRel( (nFlags & SCA_TAB_ABSOLUTE) == 0 );
         if ( !(nFlags & SCA_VALID_TAB) )
-            aRef.Ref1.SetTabDeleted( TRUE );        // #REF!
+            aRef.Ref1.SetTabDeleted( sal_True );        // #REF!
         aRef.Ref1.SetFlag3D( ( nFlags & SCA_TAB_3D ) != 0 );
         aRef.Ref2.SetColRel( (nFlags & SCA_COL2_ABSOLUTE) == 0 );
         aRef.Ref2.SetRowRel( (nFlags & SCA_ROW2_ABSOLUTE) == 0 );
         aRef.Ref2.SetTabRel( (nFlags & SCA_TAB2_ABSOLUTE) == 0 );
         if ( !(nFlags & SCA_VALID_TAB2) )
-            aRef.Ref2.SetTabDeleted( TRUE );        // #REF!
+            aRef.Ref2.SetTabDeleted( sal_True );        // #REF!
         aRef.Ref2.SetFlag3D( ( nFlags & SCA_TAB2_3D ) != 0 );
         aRef.CalcRelFromAbs( aPos );
         if (aExtInfo.mbExternal)
@@ -2780,12 +2780,12 @@ BOOL ScCompiler::IsDoubleReference( const String& rName )
 }
 
 
-BOOL ScCompiler::IsSingleReference( const String& rName )
+sal_Bool ScCompiler::IsSingleReference( const String& rName )
 {
     ScAddress aAddr( aPos );
     const ScAddress::Details aDetails( pConv->meConv, aPos );
     ScAddress::ExternalInfo aExtInfo;
-    USHORT nFlags = aAddr.Parse( rName, pDoc, aDetails, &aExtInfo, &maExternalLinks );
+    sal_uInt16 nFlags = aAddr.Parse( rName, pDoc, aDetails, &aExtInfo, &maExternalLinks );
     // Something must be valid in order to recognize Sheet1.blah or blah.a1
     // as a (wrong) reference.
     if( nFlags & ( SCA_VALID_COL|SCA_VALID_ROW|SCA_VALID_TAB ) )
@@ -2826,14 +2826,14 @@ BOOL ScCompiler::IsSingleReference( const String& rName )
 }
 
 
-BOOL ScCompiler::IsReference( const String& rName )
+sal_Bool ScCompiler::IsReference( const String& rName )
 {
     // Has to be called before IsValue
     sal_Unicode ch1 = rName.GetChar(0);
     sal_Unicode cDecSep = ( mxSymbols->isEnglish() ? '.' :
         ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0) );
     if ( ch1 == cDecSep )
-        return FALSE;
+        return sal_False;
     // Who was that imbecile introducing '.' as the sheet name separator!?!
     if ( CharClass::isAsciiNumeric( ch1 ) )
     {
@@ -2848,12 +2848,12 @@ BOOL ScCompiler::IsReference( const String& rName )
             {
                 if (ScGlobal::FindUnquoted( rName, ':') != STRING_NOTFOUND)
                     break;      // may be 3:3, continue as usual
-                return FALSE;
+                return sal_False;
             }
             sal_Unicode const * const pTabSep = rName.GetBuffer() + nPos;
             sal_Unicode ch2 = pTabSep[1];   // maybe a column identifier
             if ( !(ch2 == '$' || CharClass::isAsciiAlpha( ch2 )) )
-                return FALSE;
+                return sal_False;
             if ( cDecSep == '.' && (ch2 == 'E' || ch2 == 'e')   // E + - digit
                     && (GetCharTableFlags( pTabSep[2] ) & SC_COMPILER_C_VALUE_EXP) )
             {   // #91053#
@@ -2870,7 +2870,7 @@ BOOL ScCompiler::IsReference( const String& rName )
                 String aTabName( rName.Copy( 0, nPos ) );
                 SCTAB nTab;
                 if ( !pDoc->GetTable( aTabName, nTab ) )
-                    return FALSE;
+                    return sal_False;
                 // If sheet "1" exists and the expression is 1.E+2 continue as
                 // usual, the ScRange/ScAddress parser will take care of it.
             }
@@ -2918,14 +2918,13 @@ BOOL ScCompiler::IsReference( const String& rName )
     return false;
 }
 
-BOOL ScCompiler::IsMacro( const String& rName )
+sal_Bool ScCompiler::IsMacro( const String& rName )
 {
     String aName( rName);
     StarBASIC* pObj = 0;
     SfxObjectShell* pDocSh = pDoc->GetDocumentShell();
 
     SfxApplication* pSfxApp = SFX_APP();
-    pSfxApp->EnterBasicCall();              // initialize document's BASIC
 
     if( pDocSh )//XXX
         pObj = pDocSh->GetBasic();
@@ -2942,30 +2941,27 @@ BOOL ScCompiler::IsMacro( const String& rName )
     SbxMethod* pMeth = (SbxMethod*) pObj->Find( aName, SbxCLASS_METHOD );
     if( !pMeth )
     {
-        pSfxApp->LeaveBasicCall();
-        return FALSE;
+        return sal_False;
     }
     // It really should be a BASIC function!
     if( pMeth->GetType() == SbxVOID
      || ( pMeth->IsFixed() && pMeth->GetType() == SbxEMPTY )
      || !pMeth->ISA(SbMethod) )
     {
-        pSfxApp->LeaveBasicCall();
-        return FALSE;
+        return sal_False;
     }
     ScRawToken aToken;
     aToken.SetExternal( aName.GetBuffer() );
     aToken.eOp = ocMacro;
     pRawToken = aToken.Clone();
-    pSfxApp->LeaveBasicCall();
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScCompiler::IsNamedRange( const String& rUpperName )
+sal_Bool ScCompiler::IsNamedRange( const String& rUpperName )
 {
     // IsNamedRange is called only from NextNewToken, with an upper-case string
 
-    USHORT n;
+    sal_uInt16 n;
     ScRangeName* pRangeName = pDoc->GetRangeName();
     if (pRangeName->SearchNameUpper( rUpperName, n ) )
     {
@@ -2973,10 +2969,10 @@ BOOL ScCompiler::IsNamedRange( const String& rUpperName )
         ScRawToken aToken;
         aToken.SetName( pData->GetIndex() );
         pRawToken = aToken.Clone();
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 bool ScCompiler::IsExternalNamedRange( const String& rSymbol )
@@ -3016,9 +3012,9 @@ bool ScCompiler::IsExternalNamedRange( const String& rSymbol )
 #endif
 }
 
-BOOL ScCompiler::IsDBRange( const String& rName )
+sal_Bool ScCompiler::IsDBRange( const String& rName )
 {
-    USHORT n;
+    sal_uInt16 n;
     ScDBCollection* pDBColl = pDoc->GetDBCollection();
     if (pDBColl->SearchName( rName, n ) )
     {
@@ -3027,16 +3023,16 @@ BOOL ScCompiler::IsDBRange( const String& rName )
         aToken.SetName( pData->GetIndex() );
         aToken.eOp = ocDBArea;
         pRawToken = aToken.Clone();
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScCompiler::IsColRowName( const String& rName )
+sal_Bool ScCompiler::IsColRowName( const String& rName )
 {
-    BOOL bInList = FALSE;
-    BOOL bFound = FALSE;
+    sal_Bool bInList = sal_False;
+    sal_Bool bFound = sal_False;
     ScSingleRefData aRef;
     String aName( rName );
     DeQuote( aName );
@@ -3066,10 +3062,10 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                     // recursive..
                     // Furthermore, *this* cell won't be touched, since no RPN exists yet.
                     CellType eType = pCell->GetCellType();
-                    BOOL bOk = sal::static_int_cast<BOOL>( (eType == CELLTYPE_FORMULA ?
+                    sal_Bool bOk = sal::static_int_cast<sal_Bool>( (eType == CELLTYPE_FORMULA ?
                         ((ScFormulaCell*)pCell)->GetCode()->GetCodeLen() > 0
                         && ((ScFormulaCell*)pCell)->aPos != aPos    // noIter
-                        : TRUE ) );
+                        : sal_True ) );
                     if ( bOk && pCell->HasStringData() )
                     {
                         String aStr;
@@ -3101,11 +3097,11 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                             aRef.nRow = aIter.GetRow();
                             aRef.nTab = aIter.GetTab();
                             if ( !jRow )
-                                aRef.SetColRel( TRUE );     // ColName
+                                aRef.SetColRel( sal_True );     // ColName
                             else
-                                aRef.SetRowRel( TRUE );     // RowName
+                                aRef.SetRowRel( sal_True );     // RowName
                             aRef.CalcRelFromAbs( aPos );
-                            bInList = bFound = TRUE;
+                            bInList = bFound = sal_True;
                         }
                     }
                 }
@@ -3117,7 +3113,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
         long nDistance = 0, nMax = 0;
         long nMyCol = (long) aPos.Col();
         long nMyRow = (long) aPos.Row();
-        BOOL bTwo = FALSE;
+        sal_Bool bTwo = sal_False;
         ScAddress aOne( 0, 0, aPos.Tab() );
         ScAddress aTwo( MAXCOL, MAXROW, aPos.Tab() );
 
@@ -3157,7 +3153,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                         {
                             if ( nC < 0 || nR < 0 )
                             {   // right or below
-                                bTwo = TRUE;
+                                bTwo = sal_True;
                                 aTwo.Set( nCol, nRow, aAddress.Tab() );
                                 nMax = Max( nMyCol + Abs( nC ), nMyRow + Abs( nR ) );
                                 nDistance = nD;
@@ -3167,7 +3163,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                                 // upper left, only if not further up than the
                                 // current entry and nMyRow is below (CellIter
                                 // runs column-wise)
-                                bTwo = FALSE;
+                                bTwo = sal_False;
                                 aOne.Set( nCol, nRow, aAddress.Tab() );
                                 nMax = Max( nMyCol + nC, nMyRow + nR );
                                 nDistance = nD;
@@ -3180,7 +3176,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                         nDistance = nC * nC + nR * nR;
                         nMax = Max( nMyCol + Abs( nC ), nMyRow + Abs( nR ) );
                     }
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
             }
         }
@@ -3195,10 +3191,10 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                         break;      // aIter
                 }
                 CellType eType = pCell->GetCellType();
-                BOOL bOk = sal::static_int_cast<BOOL>( (eType == CELLTYPE_FORMULA ?
+                sal_Bool bOk = sal::static_int_cast<sal_Bool>( (eType == CELLTYPE_FORMULA ?
                     ((ScFormulaCell*)pCell)->GetCode()->GetCodeLen() > 0
                     && ((ScFormulaCell*)pCell)->aPos != aPos    // noIter
-                    : TRUE ) );
+                    : sal_True ) );
                 if ( bOk && pCell->HasStringData() )
                 {
                     String aStr;
@@ -3236,7 +3232,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                             {
                                 if ( nC < 0 || nR < 0 )
                                 {   // right or below
-                                    bTwo = TRUE;
+                                    bTwo = sal_True;
                                     aTwo.Set( nCol, nRow, aIter.GetTab() );
                                     nMax = Max( nMyCol + Abs( nC ), nMyRow + Abs( nR ) );
                                     nDistance = nD;
@@ -3246,7 +3242,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                                     // upper left, only if not further up than the
                                     // current entry and nMyRow is below (CellIter
                                     // runs column-wise)
-                                    bTwo = FALSE;
+                                    bTwo = sal_False;
                                     aOne.Set( nCol, nRow, aIter.GetTab() );
                                     nMax = Max( nMyCol + nC, nMyRow + nR );
                                     nDistance = nD;
@@ -3259,7 +3255,7 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                             nDistance = nC * nC + nR * nR;
                             nMax = Max( nMyCol + Abs( nC ), nMyRow + Abs( nR ) );
                         }
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
                 }
             }
@@ -3301,9 +3297,9 @@ BOOL ScCompiler::IsColRowName( const String& rName )
                     aRef.nCol, aRef.nRow + 1, aRef.nTab ))
               || (aRef.nRow != 0 && pDoc->HasStringData(
                     aRef.nCol, aRef.nRow - 1, aRef.nTab )) )
-                aRef.SetRowRel( TRUE );     // RowName
+                aRef.SetRowRel( sal_True );     // RowName
             else
-                aRef.SetColRel( TRUE );     // ColName
+                aRef.SetColRel( sal_True );     // ColName
             aRef.CalcRelFromAbs( aPos );
         }
     }
@@ -3313,13 +3309,13 @@ BOOL ScCompiler::IsColRowName( const String& rName )
         aToken.SetSingleReference( aRef );
         aToken.eOp = ocColRowName;
         pRawToken = aToken.Clone();
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScCompiler::IsBoolean( const String& rName )
+sal_Bool ScCompiler::IsBoolean( const String& rName )
 {
     OpCodeHashMap::const_iterator iLook( mxSymbols->getHashMap()->find( rName ) );
     if( iLook != mxSymbols->getHashMap()->end() &&
@@ -3329,10 +3325,10 @@ BOOL ScCompiler::IsBoolean( const String& rName )
         ScRawToken aToken;
         aToken.SetOpCode( (*iLook).second );
         pRawToken = aToken.Clone();
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 //---------------------------------------------------------------------------
@@ -3360,17 +3356,17 @@ void ScCompiler::AutoCorrectParsedSymbol()
                 aCorrectedSymbol.SetChar( nPos, cQuote );   // '"' the 255th character
             else
                 aCorrectedSymbol.Insert( cQuote, nPos + 1 );
-            bCorrected = TRUE;
+            bCorrected = sal_True;
         }
         else if ( c1 != cQuote && c2 == cQuote )
         {   // ..."
             aCorrectedSymbol.Insert( cQuote, 0 );
-            bCorrected = TRUE;
+            bCorrected = sal_True;
         }
         else if ( nPos == 0 && (c1 == cx || c1 == cX) )
         {   // x => *
             aCorrectedSymbol = mxSymbols->getSymbol(ocMul);
-            bCorrected = TRUE;
+            bCorrected = sal_True;
         }
         else if ( (GetCharTableFlags( c1 ) & SC_COMPILER_C_CHAR_VALUE)
                && (GetCharTableFlags( c2 ) & SC_COMPILER_C_CHAR_VALUE) )
@@ -3383,7 +3379,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
                 while ( (nIndex = aCorrectedSymbol.SearchAndReplace(
                         cx, c, nIndex )) != STRING_NOTFOUND )
                     nIndex++;
-                bCorrected = TRUE;
+                bCorrected = sal_True;
             }
             if ( (nXcount = aCorrectedSymbol.GetTokenCount( cX )) > 1 )
             {   // X => *
@@ -3392,7 +3388,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
                 while ( (nIndex = aCorrectedSymbol.SearchAndReplace(
                         cX, c, nIndex )) != STRING_NOTFOUND )
                     nIndex++;
-                bCorrected = TRUE;
+                bCorrected = sal_True;
             }
         }
         else
@@ -3407,16 +3403,16 @@ void ScCompiler::AutoCorrectParsedSymbol()
                 aSymbol.Erase( 0, nPosition + 2 );
             }
             xub_StrLen nRefs = aSymbol.GetTokenCount( ':' );
-            BOOL bColons;
+            sal_Bool bColons;
             if ( nRefs > 2 )
             {   // duplicated or too many ':'? B:2::C10 => B2:C10
-                bColons = TRUE;
+                bColons = sal_True;
                 xub_StrLen nIndex = 0;
                 String aTmp1( aSymbol.GetToken( 0, ':', nIndex ) );
                 xub_StrLen nLen1 = aTmp1.Len();
                 String aSym, aTmp2;
-                BOOL bLastAlp, bNextNum;
-                bLastAlp = bNextNum = TRUE;
+                sal_Bool bLastAlp, bNextNum;
+                bLastAlp = bNextNum = sal_True;
                 xub_StrLen nStrip = 0;
                 xub_StrLen nCount = nRefs;
                 for ( xub_StrLen j=1; j<nCount; j++ )
@@ -3470,7 +3466,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
                 aSymbol += aTmp1;
             }
             else
-                bColons = FALSE;
+                bColons = sal_False;
             if ( nRefs && nRefs <= 2 )
             {   // reference twisted? 4A => A4 etc.
                 String aTab[2], aRef[2];
@@ -3483,9 +3479,9 @@ void ScCompiler::AutoCorrectParsedSymbol()
                 else
                     aRef[0] = aSymbol;
 
-                BOOL bChanged = FALSE;
-                BOOL bOk = TRUE;
-                USHORT nMask = SCA_VALID | SCA_VALID_COL | SCA_VALID_ROW;
+                sal_Bool bChanged = sal_False;
+                sal_Bool bOk = sal_True;
+                sal_uInt16 nMask = SCA_VALID | SCA_VALID_COL | SCA_VALID_ROW;
                 for ( int j=0; j<nRefs; j++ )
                 {
                     xub_StrLen nTmp = 0;
@@ -3506,7 +3502,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
                     aRef[j] += aStr2;
                     if ( bColons || aRef[j] != aOld )
                     {
-                        bChanged = TRUE;
+                        bChanged = sal_True;
                         ScAddress aAdr;
                         bOk &= ((aAdr.Parse( aRef[j], pDoc, aDetails ) & nMask) == nMask);
                     }
@@ -3522,7 +3518,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
                         aCorrectedSymbol += aTab[1];
                         aCorrectedSymbol += aRef[1];
                     }
-                    bCorrected = TRUE;
+                    bCorrected = sal_True;
                 }
             }
         }
@@ -3546,7 +3542,7 @@ inline bool lcl_UpperAsciiOrI18n( String& rUpper, const String& rOrg, FormulaGra
     }
 }
 
-BOOL ScCompiler::NextNewToken( bool bInArray )
+sal_Bool ScCompiler::NextNewToken( bool bInArray )
 {
     bool bAllowBooleans = bInArray;
     xub_StrLen nSpaces = NextSymbol(bInArray);
@@ -3563,7 +3559,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
     {
         ScRawToken aToken;
         aToken.SetOpCode( ocSpaces );
-        aToken.sbyte.cByte = (BYTE) ( nSpaces > 255 ? 255 : nSpaces );
+        aToken.sbyte.cByte = (sal_uInt8) ( nSpaces > 255 ? 255 : nSpaces );
         if( !static_cast<ScTokenArray*>(pArr)->AddRawToken( aToken ) )
         {
             SetError(errCodeOverflow);
@@ -3593,7 +3589,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
     if ( (cSymbol[0] == '#' || cSymbol[0] == '$') && cSymbol[1] == 0 &&
             !bAutoCorrect )
     {   // #101100# special case to speed up broken [$]#REF documents
-        /* FIXME: ISERROR(#REF!) would be valid and TRUE and the formula to
+        /* FIXME: ISERROR(#REF!) would be valid and sal_True and the formula to
          * be processed as usual. That would need some special treatment,
          * also in NextSymbol() because of possible combinations of
          * #REF!.#REF!#REF! parts. In case of reading ODF that is all
@@ -3720,7 +3716,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
 void ScCompiler::CreateStringFromXMLTokenArray( String& rFormula, String& rFormulaNmsp )
 {
     bool bExternal = GetGrammar() == FormulaGrammar::GRAM_EXTERNAL;
-    USHORT nExpectedCount = bExternal ? 2 : 1;
+    sal_uInt16 nExpectedCount = bExternal ? 2 : 1;
     DBG_ASSERT( pArr->GetLen() == nExpectedCount, "ScCompiler::CreateStringFromXMLTokenArray - wrong number of tokens" );
     if( pArr->GetLen() == nExpectedCount )
     {
@@ -3750,13 +3746,13 @@ ScTokenArray* ScCompiler::CompileString( const String& rFormula )
     aFormula.EraseLeadingChars();
     aFormula.EraseTrailingChars();
     nSrcPos = 0;
-    bCorrected = FALSE;
+    bCorrected = sal_False;
     if ( bAutoCorrect )
     {
         aCorrectedFormula.Erase();
         aCorrectedSymbol.Erase();
     }
-    BYTE nForced = 0;   // ==formula forces recalc even if cell is not visible
+    sal_uInt8 nForced = 0;   // ==formula forces recalc even if cell is not visible
     if( aFormula.GetChar(nSrcPos) == '=' )
     {
         nSrcPos++;
@@ -3811,7 +3807,7 @@ ScTokenArray* ScCompiler::CompileString( const String& rFormula )
                     SetError( errPairExpected );
                     if ( bAutoCorrect )
                     {
-                        bCorrected = TRUE;
+                        bCorrected = sal_True;
                         aCorrectedSymbol.Erase();
                     }
                 }
@@ -3853,7 +3849,7 @@ ScTokenArray* ScCompiler::CompileString( const String& rFormula )
                     SetError( errPairExpected );
                     if ( bAutoCorrect )
                     {
-                        bCorrected = TRUE;
+                        bCorrected = sal_True;
                         aCorrectedSymbol.Erase();
                     }
                 }
@@ -3973,12 +3969,12 @@ ScTokenArray* ScCompiler::CompileString( const String& rFormula, const String& r
 }
 
 
-BOOL ScCompiler::HandleRange()
+sal_Bool ScCompiler::HandleRange()
 {
     ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex( pToken->GetIndex() );
     if (pRangeData)
     {
-        USHORT nErr = pRangeData->GetErrCode();
+        sal_uInt16 nErr = pRangeData->GetErrCode();
         if( nErr )
             SetError( errNoName );
         else if ( !bCompileForFAP )
@@ -3994,18 +3990,18 @@ BOOL ScCompiler::HandleRange()
             FormulaToken* p2 = pArr->PeekNextNoSpaces();
             OpCode eOp1 = (p1 ? p1->GetOpCode() : static_cast<OpCode>( ocSep ) );
             OpCode eOp2 = (p2 ? p2->GetOpCode() : static_cast<OpCode>( ocSep ) );
-            BOOL bBorder1 = (eOp1 == ocSep || eOp1 == ocOpen);
-            BOOL bBorder2 = (eOp2 == ocSep || eOp2 == ocClose);
-            BOOL bAddPair = !(bBorder1 && bBorder2);
+            sal_Bool bBorder1 = (eOp1 == ocSep || eOp1 == ocOpen);
+            sal_Bool bBorder2 = (eOp2 == ocSep || eOp2 == ocClose);
+            sal_Bool bAddPair = !(bBorder1 && bBorder2);
             if ( bAddPair )
             {
                 pNew = new ScTokenArray();
                 pNew->AddOpCode( ocClose );
-                PushTokenArray( pNew, TRUE );
+                PushTokenArray( pNew, sal_True );
                 pNew->Reset();
             }
             pNew = pRangeData->GetCode()->Clone();
-            PushTokenArray( pNew, TRUE );
+            PushTokenArray( pNew, sal_True );
             if( pRangeData->HasReferences() )
             {
                 SetRelNameReference();
@@ -4016,7 +4012,7 @@ BOOL ScCompiler::HandleRange()
             {
                 pNew = new ScTokenArray();
                 pNew->AddOpCode( ocOpen );
-                PushTokenArray( pNew, TRUE );
+                PushTokenArray( pNew, sal_True );
                 pNew->Reset();
             }
             return GetToken();
@@ -4024,10 +4020,10 @@ BOOL ScCompiler::HandleRange()
     }
     else
         SetError(errNoName);
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ScCompiler::HandleExternalReference(const FormulaToken& _aToken)
+sal_Bool ScCompiler::HandleExternalReference(const FormulaToken& _aToken)
 {
     // Handle external range names.
     switch (_aToken.GetType())
@@ -4068,9 +4064,9 @@ BOOL ScCompiler::HandleExternalReference(const FormulaToken& _aToken)
         }
         default:
             DBG_ERROR("Wrong type for external reference!");
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -4092,7 +4088,7 @@ BOOL ScCompiler::HandleExternalReference(const FormulaToken& _aToken)
 
 //-----------------------------------------------------------------------------
 
-BOOL ScCompiler::HasModifiedRange()
+sal_Bool ScCompiler::HasModifiedRange()
 {
     pArr->Reset();
     for ( FormulaToken* t = pArr->Next(); t; t = pArr->Next() )
@@ -4103,24 +4099,24 @@ BOOL ScCompiler::HasModifiedRange()
              ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex(t->GetIndex());
 
             if (pRangeData && pRangeData->IsModified())
-                return TRUE;
+                return sal_True;
         }
         else if ( eOpCode == ocDBArea )
         {
             ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex(t->GetIndex());
 
             if (pDBData && pDBData->IsModified())
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
 //---------------------------------------------------------------------------
 
 template< typename T, typename S >
-S lcl_adjval( S& n, T pos, T max, BOOL bRel )
+S lcl_adjval( S& n, T pos, T max, sal_Bool bRel )
 {
     max++;
     if( bRel )
@@ -4144,12 +4140,12 @@ void ScCompiler::SetRelNameReference()
     {
         ScSingleRefData& rRef1 = t->GetSingleRef();
         if ( rRef1.IsColRel() || rRef1.IsRowRel() || rRef1.IsTabRel() )
-            rRef1.SetRelName( TRUE );
+            rRef1.SetRelName( sal_True );
         if ( t->GetType() == svDoubleRef )
         {
             ScSingleRefData& rRef2 = t->GetDoubleRef().Ref2;
             if ( rRef2.IsColRel() || rRef2.IsRowRel() || rRef2.IsTabRel() )
-                rRef2.SetRelName( TRUE );
+                rRef2.SetRelName( sal_True );
         }
     }
 }
@@ -4189,9 +4185,9 @@ void ScCompiler::MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddr
 ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                                  const ScAddress& rOldPos, const ScRange& r,
                                  SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                 BOOL& rChanged, BOOL& rRefSizeChanged )
+                                 sal_Bool& rChanged, sal_Bool& rRefSizeChanged )
 {
-    rChanged = rRefSizeChanged = FALSE;
+    rChanged = rRefSizeChanged = sal_False;
     if ( eUpdateRefMode == URM_COPY )
     {   // Normally nothing has to be done here since RelRefs are used, also
         // SharedFormulas don't need any special handling, except if they
@@ -4213,7 +4209,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                         SingleDoubleRefModifier( rRef ).Ref() )
                         != UR_NOTHING
                     )
-                    rChanged = TRUE;
+                    rChanged = sal_True;
             }
         }
         // Check for SharedFormulas.
@@ -4238,14 +4234,14 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
             for( t = static_cast<ScToken*>(pArr->GetNextReferenceRPN()); t && !pRangeData;
                  t = static_cast<ScToken*>(pArr->GetNextReferenceRPN()) )
             {
-                BOOL bRelName = (t->GetType() == svSingleRef ?
+                sal_Bool bRelName = (t->GetType() == svSingleRef ?
                         t->GetSingleRef().IsRelName() :
                         (t->GetDoubleRef().Ref1.IsRelName() ||
                          t->GetDoubleRef().Ref2.IsRelName()));
                 if (bRelName)
                 {
                     t->CalcAbsIfRel( rOldPos);
-                    BOOL bValid = (t->GetType() == svSingleRef ?
+                    sal_Bool bValid = (t->GetType() == svSingleRef ?
                             t->GetSingleRef().Valid() :
                             t->GetDoubleRef().Valid());
                     // If the reference isn't valid, copying the formula
@@ -4253,7 +4249,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                     if (!bValid)
                     {
                         pRangeData = pName;
-                        rChanged = TRUE;
+                        rChanged = sal_True;
                     }
                 }
             }
@@ -4282,7 +4278,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                 {
                     pRangeData = pName;     // maybe need a replacement of shared with own code
 #if ! SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-                    rChanged = TRUE;
+                    rChanged = sal_True;
 #endif
                 }
             }
@@ -4307,7 +4303,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                                         SingleDoubleRefModifier(
                                             t->GetSingleRef()).Ref())
                                     != UR_NOTHING)
-                                rChanged = TRUE;
+                                rChanged = sal_True;
                         }
                         break;
                     default:
@@ -4320,23 +4316,23 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                                         aPos, r, nDx, nDy, nDz,
                                         t->GetDoubleRef()) != UR_NOTHING)
                             {
-                                rChanged = TRUE;
+                                rChanged = sal_True;
                                 if (rRef.Ref2.nCol - rRef.Ref1.nCol != nCols ||
                                         rRef.Ref2.nRow - rRef.Ref1.nRow != nRows ||
                                         rRef.Ref2.nTab - rRef.Ref1.nTab != nTabs)
-                                    rRefSizeChanged = TRUE;
+                                    rRefSizeChanged = sal_True;
                             }
                         }
                 }
             }
         }
 #if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-        BOOL bEasyShared, bPosInRange;
+        sal_Bool bEasyShared, bPosInRange;
         if ( !pRangeData )
-            bEasyShared = bPosInRange = FALSE;
+            bEasyShared = bPosInRange = sal_False;
         else
         {
-            bEasyShared = TRUE;
+            bEasyShared = sal_True;
             bPosInRange = r.In( eUpdateRefMode == URM_MOVE ? aPos : rOldPos );
         }
 #endif
@@ -4346,7 +4342,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
             if ( t->GetRef() != 1 )
             {
 #if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-                bEasyShared = FALSE;
+                bEasyShared = sal_False;
 #endif
             }
             else
@@ -4358,7 +4354,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                     if ( rRef.IsRelName() )
                     {
                         ScRefUpdate::MoveRelWrap( pDoc, aPos, MAXCOL, MAXROW, aMod.Ref() );
-                        rChanged = TRUE;
+                        rChanged = sal_True;
                     }
                     else
                     {
@@ -4367,7 +4363,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                                     r, nDx, nDy, nDz, aMod.Ref() )
                                 != UR_NOTHING
                             )
-                            rChanged = TRUE;
+                            rChanged = sal_True;
                     }
 #if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
                     if ( bEasyShared )
@@ -4375,7 +4371,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                         const ScSingleRefData& rSRD = aMod.Ref().Ref1;
                         ScAddress aRef( rSRD.nCol, rSRD.nRow, rSRD.nTab );
                         if ( r.In( aRef ) != bPosInRange )
-                            bEasyShared = FALSE;
+                            bEasyShared = sal_False;
                     }
 #endif
                 }
@@ -4388,7 +4384,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                     if ( rRef.Ref1.IsRelName() || rRef.Ref2.IsRelName() )
                     {
                         ScRefUpdate::MoveRelWrap( pDoc, aPos, MAXCOL, MAXROW, rRef );
-                        rChanged = TRUE;
+                        rChanged = sal_True;
                     }
                     else
                     {
@@ -4397,14 +4393,14 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                                 != UR_NOTHING
                             )
                         {
-                            rChanged = TRUE;
+                            rChanged = sal_True;
                             if (rRef.Ref2.nCol - rRef.Ref1.nCol != nCols ||
                                     rRef.Ref2.nRow - rRef.Ref1.nRow != nRows ||
                                     rRef.Ref2.nTab - rRef.Ref1.nTab != nTabs)
                             {
-                                rRefSizeChanged = TRUE;
+                                rRefSizeChanged = sal_True;
 #if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-                                bEasyShared = FALSE;
+                                bEasyShared = sal_False;
 #endif
                             }
                         }
@@ -4416,7 +4412,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
                                 rRef.Ref1.nTab, rRef.Ref2.nCol, rRef.Ref2.nRow,
                                 rRef.Ref2.nTab );
                         if ( r.In( aRef ) != bPosInRange )
-                            bEasyShared = FALSE;
+                            bEasyShared = sal_False;
                     }
 #endif
                 }
@@ -4428,7 +4424,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
             if ( bEasyShared )
                 pRangeData = 0;
             else
-                rChanged = TRUE;
+                rChanged = sal_True;
         }
 #endif
 #undef SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
@@ -4436,13 +4432,13 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
     }
 }
 
-BOOL ScCompiler::UpdateNameReference(UpdateRefMode eUpdateRefMode,
+sal_Bool ScCompiler::UpdateNameReference(UpdateRefMode eUpdateRefMode,
                                      const ScRange& r,
                                      SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                     BOOL& rChanged, BOOL bSharedFormula)
+                                     sal_Bool& rChanged, sal_Bool bSharedFormula)
 {
-    BOOL bRelRef = FALSE;   // set if relative reference
-    rChanged = FALSE;
+    sal_Bool bRelRef = sal_False;   // set if relative reference
+    rChanged = sal_False;
     pArr->Reset();
     ScToken* t;
     while ( (t = static_cast<ScToken*>(pArr->GetNextReference())) != NULL )
@@ -4476,7 +4472,7 @@ BOOL ScCompiler::UpdateNameReference(UpdateRefMode eUpdateRefMode,
             if (ScRefUpdate::Update( pDoc, eUpdateRefMode, aPos, r,
                         nDx, nDy, nDz, rRef, ScRefUpdate::ABSOLUTE)
                     != UR_NOTHING )
-                rChanged = TRUE;
+                rChanged = sal_True;
         }
     }
     return bRelRef;
@@ -4552,12 +4548,12 @@ void ScCompiler::UpdateSharedFormulaReference( UpdateRefMode eUpdateRefMode,
 }
 
 
-ScRangeData* ScCompiler::UpdateInsertTab( SCTAB nTable, BOOL bIsName )
+ScRangeData* ScCompiler::UpdateInsertTab( SCTAB nTable, sal_Bool bIsName )
 {
     ScRangeData* pRangeData = NULL;
     SCTAB nPosTab = aPos.Tab();     // _after_ incremented!
     SCTAB nOldPosTab = ((nPosTab > nTable) ? (nPosTab - 1) : nPosTab);
-    BOOL bIsRel = FALSE;
+    sal_Bool bIsRel = sal_False;
     ScToken* t;
     pArr->Reset();
     if (bIsName)
@@ -4591,7 +4587,7 @@ ScRangeData* ScCompiler::UpdateInsertTab( SCTAB nTable, BOOL bIsName )
                 rRef.nRelTab = rRef.nTab - nPosTab;
             }
             else
-                bIsRel = TRUE;
+                bIsRel = sal_True;
             if ( t->GetType() == svDoubleRef )
             {
                 if ( !(bIsName && t->GetDoubleRef().Ref2.IsTabRel()) )
@@ -4608,7 +4604,7 @@ ScRangeData* ScCompiler::UpdateInsertTab( SCTAB nTable, BOOL bIsName )
                     rRef.nRelTab = rRef.nTab - nPosTab;
                 }
                 else
-                    bIsRel = TRUE;
+                    bIsRel = sal_True;
             }
             if ( bIsName && bIsRel )
                 pRangeData = (ScRangeData*) this;   // not dereferenced in rangenam
@@ -4660,15 +4656,15 @@ ScRangeData* ScCompiler::UpdateInsertTab( SCTAB nTable, BOOL bIsName )
     return pRangeData;
 }
 
-ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL bIsName,
-                                 BOOL& rChanged)
+ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, sal_Bool /* bIsMove */, sal_Bool bIsName,
+                                 sal_Bool& rChanged)
 {
     ScRangeData* pRangeData = NULL;
     SCTAB nTab, nTab2;
     SCTAB nPosTab = aPos.Tab();          // _after_ decremented!
     SCTAB nOldPosTab = ((nPosTab >= nTable) ? (nPosTab + 1) : nPosTab);
-    rChanged = FALSE;
-    BOOL bIsRel = FALSE;
+    rChanged = sal_False;
+    sal_Bool bIsRel = sal_False;
     ScToken* t;
     pArr->Reset();
     if (bIsName)
@@ -4685,7 +4681,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                 if (pName && pName->HasType(RT_SHAREDMOD))
                     pRangeData = pName;
             }
-            rChanged = TRUE;
+            rChanged = sal_True;
         }
         else if( t->GetType() != svIndex )  // it may be a DB area!!!
         {
@@ -4699,7 +4695,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                 if ( nTable < nTab )
                 {
                     rRef.nTab = nTab - 1;
-                    rChanged = TRUE;
+                    rChanged = sal_True;
                 }
                 else if ( nTable == nTab )
                 {
@@ -4714,7 +4710,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                           || (nTab+1) >= pDoc->GetTableCount() )
                         {
                             rRef.nTab = MAXTAB+1;
-                            rRef.SetTabDeleted( TRUE );
+                            rRef.SetTabDeleted( sal_True );
                         }
                         // else: nTab later points to what's nTable+1 now
                         // => area shrunk
@@ -4722,14 +4718,14 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                     else
                     {
                         rRef.nTab = MAXTAB+1;
-                        rRef.SetTabDeleted( TRUE );
+                        rRef.SetTabDeleted( sal_True );
                     }
-                    rChanged = TRUE;
+                    rChanged = sal_True;
                 }
                 rRef.nRelTab = rRef.nTab - nPosTab;
             }
             else
-                bIsRel = TRUE;
+                bIsRel = sal_True;
             if ( t->GetType() == svDoubleRef )
             {
                 if ( !(bIsName && t->GetDoubleRef().Ref2.IsTabRel()) )
@@ -4742,7 +4738,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                     if ( nTable < nTab )
                     {
                         rRef.nTab = nTab - 1;
-                        rChanged = TRUE;
+                        rChanged = sal_True;
                     }
                     else if ( nTable == nTab )
                     {
@@ -4751,14 +4747,14 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                         else
                         {
                             rRef.nTab = MAXTAB+1;
-                            rRef.SetTabDeleted( TRUE );
+                            rRef.SetTabDeleted( sal_True );
                         }
-                        rChanged = TRUE;
+                        rChanged = sal_True;
                     }
                     rRef.nRelTab = rRef.nTab - nPosTab;
                 }
                 else
-                    bIsRel = TRUE;
+                    bIsRel = sal_True;
             }
             if ( bIsName && bIsRel )
                 pRangeData = (ScRangeData*) this;   // not dereferenced in rangenam
@@ -4785,7 +4781,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                     if ( nTable < nTab )
                     {
                         rRef1.nTab = nTab - 1;
-                        rChanged = TRUE;
+                        rChanged = sal_True;
                     }
                     else if ( nTable == nTab )
                     {
@@ -4800,7 +4796,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                               || (nTab+1) >= pDoc->GetTableCount() )
                             {
                                 rRef1.nTab = MAXTAB+1;
-                                rRef1.SetTabDeleted( TRUE );
+                                rRef1.SetTabDeleted( sal_True );
                             }
                             // else: nTab later points to what's nTable+1 now
                             // => area shrunk
@@ -4808,9 +4804,9 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                         else
                         {
                             rRef1.nTab = MAXTAB+1;
-                            rRef1.SetTabDeleted( TRUE );
+                            rRef1.SetTabDeleted( sal_True );
                         }
-                        rChanged = TRUE;
+                        rChanged = sal_True;
                     }
                     rRef1.nRelTab = rRef1.nTab - nPosTab;
                 }
@@ -4826,7 +4822,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                         if ( nTable < nTab )
                         {
                             rRef2.nTab = nTab - 1;
-                            rChanged = TRUE;
+                            rChanged = sal_True;
                         }
                         else if ( nTable == nTab )
                         {
@@ -4835,9 +4831,9 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
                             else
                             {
                                 rRef2.nTab = MAXTAB+1;
-                                rRef2.SetTabDeleted( TRUE );
+                                rRef2.SetTabDeleted( sal_True );
                             }
-                            rChanged = TRUE;
+                            rChanged = sal_True;
                         }
                         rRef2.nRelTab = rRef2.nTab - nPosTab;
                     }
@@ -4850,7 +4846,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL
 
 // aPos.Tab() must be already adjusted!
 ScRangeData* ScCompiler::UpdateMoveTab( SCTAB nOldTab, SCTAB nNewTab,
-        BOOL bIsName )
+        sal_Bool bIsName )
 {
     ScRangeData* pRangeData = NULL;
     SCsTAB nTab;
@@ -4878,7 +4874,7 @@ ScRangeData* ScCompiler::UpdateMoveTab( SCTAB nOldTab, SCTAB nNewTab,
     else
         nOldPosTab = nPosTab - nDir;    // moved by one
 
-    BOOL bIsRel = FALSE;
+    sal_Bool bIsRel = sal_False;
     ScToken* t;
     pArr->Reset();
     if (bIsName)
@@ -4912,7 +4908,7 @@ ScRangeData* ScCompiler::UpdateMoveTab( SCTAB nOldTab, SCTAB nNewTab,
                 rRef1.nRelTab = rRef1.nTab - nPosTab;
             }
             else
-                bIsRel = TRUE;
+                bIsRel = sal_True;
             if ( t->GetType() == svDoubleRef )
             {
                 ScSingleRefData& rRef2 = t->GetDoubleRef().Ref2;
@@ -4929,7 +4925,7 @@ ScRangeData* ScCompiler::UpdateMoveTab( SCTAB nOldTab, SCTAB nNewTab,
                     rRef2.nRelTab = rRef2.nTab - nPosTab;
                 }
                 else
-                    bIsRel = TRUE;
+                    bIsRel = sal_True;
                 SCsTAB nTab1, nTab2;
                 if ( rRef1.IsTabRel() )
                     nTab1 = rRef1.nRelTab + nPosTab;
@@ -5093,7 +5089,7 @@ void ScCompiler::CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer,
                     AppendBoolean( rBuffer, pVal->GetBoolean() );
                 else
                 {
-                    USHORT nErr = pVal->GetError();
+                    sal_uInt16 nErr = pVal->GetError();
                     if( nErr )
                         rBuffer.append( ScGlobal::GetErrorString( nErr ) );
                     else
@@ -5128,16 +5124,16 @@ void ScCompiler::CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaT
         else
         {
             rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
-            pConv->MakeRefStr (rBuffer, *this, aRef, TRUE );
+            pConv->MakeRefStr (rBuffer, *this, aRef, sal_True );
         }
     }
     else
-        pConv->MakeRefStr( rBuffer, *this, aRef, TRUE );
+        pConv->MakeRefStr( rBuffer, *this, aRef, sal_True );
 }
 // -----------------------------------------------------------------------------
 void ScCompiler::CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* _pTokenP)
 {
-    pConv->MakeRefStr( rBuffer, *this, static_cast<ScToken*>(_pTokenP)->GetDoubleRef(), FALSE );
+    pConv->MakeRefStr( rBuffer, *this, static_cast<ScToken*>(_pTokenP)->GetDoubleRef(), sal_False );
 }
 // -----------------------------------------------------------------------------
 void ScCompiler::CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* _pTokenP)
@@ -5179,19 +5175,19 @@ void ScCompiler::LocalizeString( String& rName )
     ScGlobal::GetAddInCollection()->LocalizeString( rName );
 }
 // -----------------------------------------------------------------------------
-BOOL ScCompiler::IsImportingXML() const
+sal_Bool ScCompiler::IsImportingXML() const
 {
     return pDoc->IsImportingXML();
 }
 
 // Put quotes around string if non-alphanumeric characters are contained,
 // quote characters contained within are escaped by '\\'.
-BOOL ScCompiler::EnQuote( String& rStr )
+sal_Bool ScCompiler::EnQuote( String& rStr )
 {
     sal_Int32 nType = ScGlobal::pCharClass->getStringType( rStr, 0, rStr.Len() );
     if ( !CharClass::isNumericType( nType )
             && CharClass::isAlphaNumericType( nType ) )
-        return FALSE;
+        return sal_False;
 
     xub_StrLen nPos = 0;
     while ( (nPos = rStr.Search( '\'', nPos)) != STRING_NOTFOUND )
@@ -5201,7 +5197,7 @@ BOOL ScCompiler::EnQuote( String& rStr )
     }
     rStr.Insert( '\'', 0 );
     rStr += '\'';
-    return TRUE;
+    return sal_True;
 }
 
 sal_Unicode ScCompiler::GetNativeAddressSymbol( Convention::SpecialSymbolType eType ) const
@@ -5239,24 +5235,24 @@ void ScCompiler::fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaO
     // FIXME: what about those old non-UNO AddIns?
 }
 // -----------------------------------------------------------------------------
-BOOL ScCompiler::HandleSingleRef()
+sal_Bool ScCompiler::HandleSingleRef()
 {
     ScSingleRefData& rRef = static_cast<ScToken*>((FormulaToken*)pToken)->GetSingleRef();
     rRef.CalcAbsIfRel( aPos );
     if ( !rRef.Valid() )
     {
         SetError( errNoRef );
-        return TRUE;
+        return sal_True;
     }
     SCCOL nCol = rRef.nCol;
     SCROW nRow = rRef.nRow;
     SCTAB nTab = rRef.nTab;
     ScAddress aLook( nCol, nRow, nTab );
-    BOOL bColName = rRef.IsColRel();
+    sal_Bool bColName = rRef.IsColRel();
     SCCOL nMyCol = aPos.Col();
     SCROW nMyRow = aPos.Row();
-    BOOL bInList = FALSE;
-    BOOL bValidName = FALSE;
+    sal_Bool bInList = sal_False;
+    sal_Bool bValidName = sal_False;
     ScRangePairList* pRL = (bColName ?
         pDoc->GetColNameRanges() : pDoc->GetRowNameRanges());
     ScRange aRange;
@@ -5264,7 +5260,7 @@ BOOL ScCompiler::HandleSingleRef()
     {
         if ( pR->GetRange(0).In( aLook ) )
         {
-            bInList = bValidName = TRUE;
+            bInList = bValidName = sal_True;
             aRange = pR->GetRange(1);
             if ( bColName )
             {
@@ -5281,12 +5277,12 @@ BOOL ScCompiler::HandleSingleRef()
     }
     if ( !bInList && pDoc->GetDocOptions().IsLookUpColRowNames() )
     {   // automagically or created by copying and NamePos isn't in list
-        BOOL bString = pDoc->HasStringData( nCol, nRow, nTab );
+        sal_Bool bString = pDoc->HasStringData( nCol, nRow, nTab );
         if ( !bString && !pDoc->GetCell( aLook ) )
-            bString = TRUE;     // empty cell is ok
+            bString = sal_True;     // empty cell is ok
         if ( bString )
         {   //! coresponds with ScInterpreter::ScColRowNameAuto()
-            bValidName = TRUE;
+            bValidName = sal_True;
             if ( bColName )
             {   // ColName
                 SCROW nStartRow = nRow + 1;
@@ -5362,10 +5358,10 @@ BOOL ScCompiler::HandleSingleRef()
         // generated. A ocColRowName or ocIntersect as a neighbor results
         // in a range. Special case: if label is valid for a single cell, a
         // position independent SingleRef is generated.
-        BOOL bSingle = (aRange.aStart == aRange.aEnd);
-        BOOL bFound;
+        sal_Bool bSingle = (aRange.aStart == aRange.aEnd);
+        sal_Bool bFound;
         if ( bSingle )
-            bFound = TRUE;
+            bFound = sal_True;
         else
         {
             FormulaToken* p1 = pArr->PeekPrevNoSpaces();
@@ -5378,7 +5374,7 @@ BOOL ScCompiler::HandleSingleRef()
             {
                 if (    (SC_OPCODE_START_BIN_OP <= eOp1 && eOp1 < SC_OPCODE_STOP_BIN_OP) ||
                         (SC_OPCODE_START_BIN_OP <= eOp2 && eOp2 < SC_OPCODE_STOP_BIN_OP))
-                    bSingle = TRUE;
+                    bSingle = sal_True;
             }
             if ( bSingle )
             {   // column and/or row must match range
@@ -5398,7 +5394,7 @@ BOOL ScCompiler::HandleSingleRef()
                 }
             }
             else
-                bFound = TRUE;
+                bFound = sal_True;
         }
         if ( !bFound )
             SetError(errNoRef);
@@ -5410,9 +5406,9 @@ BOOL ScCompiler::HandleSingleRef()
                 ScSingleRefData aRefData;
                 aRefData.InitAddress( aRange.aStart );
                 if ( bColName )
-                    aRefData.SetColRel( TRUE );
+                    aRefData.SetColRel( sal_True );
                 else
-                    aRefData.SetRowRel( TRUE );
+                    aRefData.SetRowRel( sal_True );
                 aRefData.CalcRelFromAbs( aPos );
                 pNew->AddSingleReference( aRefData );
             }
@@ -5422,13 +5418,13 @@ BOOL ScCompiler::HandleSingleRef()
                 aRefData.InitRange( aRange );
                 if ( bColName )
                 {
-                    aRefData.Ref1.SetColRel( TRUE );
-                    aRefData.Ref2.SetColRel( TRUE );
+                    aRefData.Ref1.SetColRel( sal_True );
+                    aRefData.Ref2.SetColRel( sal_True );
                 }
                 else
                 {
-                    aRefData.Ref1.SetRowRel( TRUE );
-                    aRefData.Ref2.SetRowRel( TRUE );
+                    aRefData.Ref1.SetRowRel( sal_True );
+                    aRefData.Ref2.SetRowRel( sal_True );
                 }
                 aRefData.CalcRelFromAbs( aPos );
                 if ( bInList )
@@ -5438,17 +5434,17 @@ BOOL ScCompiler::HandleSingleRef()
                     pNew->Add( new ScDoubleRefToken( aRefData, ocColRowNameAuto ) );
                 }
             }
-            PushTokenArray( pNew, TRUE );
+            PushTokenArray( pNew, sal_True );
             pNew->Reset();
             return GetToken();
         }
     }
     else
         SetError(errNoName);
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ScCompiler::HandleDbData()
+sal_Bool ScCompiler::HandleDbData()
 {
     ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex( pToken->GetIndex() );
     if ( !pDBData )
@@ -5466,11 +5462,11 @@ BOOL ScCompiler::HandleDbData()
         aRefData.CalcRelFromAbs( aPos );
         ScTokenArray* pNew = new ScTokenArray();
         pNew->AddDoubleReference( aRefData );
-        PushTokenArray( pNew, TRUE );
+        PushTokenArray( pNew, sal_True );
         pNew->Reset();
         return GetToken();
     }
-    return TRUE;
+    return sal_True;
 }
 
 String GetScCompilerNativeSymbol( OpCode eOp )
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index b1b018cb6..b7f864884 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -50,7 +50,7 @@
 // STATIC DATA -----------------------------------------------------------
 
 /*	Strings bei Gelegenheit ganz raus...
-static USHORT nFuncRes[] = {				//	Reihenfolge wie bei enum ScSubTotalFunc
+static sal_uInt16 nFuncRes[] = {				//	Reihenfolge wie bei enum ScSubTotalFunc
         0,									//	none
         STR_PIVOTFUNC_AVG,
         STR_PIVOTFUNC_COUNT,
@@ -122,10 +122,10 @@ void lcl_AddString( String**& pData, T& nCount, const String& rInsert )
 
 ScConsData::ScConsData() :
     eFunction(SUBTOTAL_FUNC_SUM),
-    bReference(FALSE),
-    bColByName(FALSE),
-    bRowByName(FALSE),
-    bSubTitles(FALSE),
+    bReference(sal_False),
+    bColByName(sal_False),
+    bRowByName(sal_False),
+    bSubTitles(sal_False),
     nColCount(0),
     nRowCount(0),
     ppUsed(NULL),
@@ -139,7 +139,7 @@ ScConsData::ScConsData() :
     nTitleCount(0),
     ppTitles(NULL),
     ppTitlePos(NULL),
-    bCornerUsed(FALSE)
+    bCornerUsed(sal_False)
 {
 }
 
@@ -151,7 +151,7 @@ ScConsData::~ScConsData()
 
 #define DELETEARR(ppArray,nCount)	\
 {									\
-    ULONG i; 						\
+    sal_uLong i; 						\
     if (ppArray) 					\
         for(i=0; i<nCount; i++)		\
             delete[] ppArray[i];	\
@@ -161,7 +161,7 @@ ScConsData::~ScConsData()
 
 #define DELETESTR(ppArray,nCount)	\
 {									\
-    ULONG i; 						\
+    sal_uLong i; 						\
     if (ppArray) 					\
         for(i=0; i<nCount; i++)		\
             delete ppArray[i];		\
@@ -200,14 +200,14 @@ void ScConsData::DeleteData()
     if (bColByName) nColCount = 0;					// sonst stimmt ppColHeaders nicht
     if (bRowByName) nRowCount = 0;
 
-    bCornerUsed = FALSE;
+    bCornerUsed = sal_False;
     aCornerText.Erase();
 }
 
 #undef DELETEARR
 #undef DELETESTR
 
-void ScConsData::InitData( BOOL bDelete )
+void ScConsData::InitData( sal_Bool bDelete )
 {
     if (bDelete)
         DeleteData();
@@ -233,11 +233,11 @@ void ScConsData::InitData( BOOL bDelete )
 
     if (nColCount && !ppUsed)
     {
-        ppUsed = new BOOL*[nColCount];
+        ppUsed = new sal_Bool*[nColCount];
         for (SCSIZE i=0; i<nColCount; i++)
         {
-            ppUsed[i] = new BOOL[nRowCount];
-            memset( ppUsed[i], 0, nRowCount * sizeof(BOOL) );
+            ppUsed[i] = new sal_Bool[nRowCount];
+            memset( ppUsed[i], 0, nRowCount * sizeof(sal_Bool) );
         }
     }
 
@@ -256,7 +256,7 @@ void ScConsData::InitData( BOOL bDelete )
 
 void ScConsData::DoneFields()
 {
-    InitData(FALSE);
+    InitData(sal_False);
 }
 
 void ScConsData::SetSize( SCCOL nCols, SCROW nRows )
@@ -272,7 +272,7 @@ void ScConsData::GetSize( SCCOL& rCols, SCROW& rRows ) const
     rRows = static_cast<SCROW>(nRowCount);
 }
 
-void ScConsData::SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef )
+void ScConsData::SetFlags( ScSubTotalFunc eFunc, sal_Bool bColName, sal_Bool bRowName, sal_Bool bRef )
 {
     DeleteData();
     bReference = bRef;
@@ -302,10 +302,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB nTab,
             pSrcDoc->GetString( nCol, nRow1, nTab, aTitle );
             if (aTitle.Len())
             {
-                BOOL bFound = FALSE;
+                sal_Bool bFound = sal_False;
                 for (SCSIZE i=0; i<nColCount && !bFound; i++)
                     if ( *ppColHeaders[i] == aTitle )
-                        bFound = TRUE;
+                        bFound = sal_True;
                 if (!bFound)
                     lcl_AddString( ppColHeaders, nColCount, aTitle );
             }
@@ -319,10 +319,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB nTab,
             pSrcDoc->GetString( nCol1, nRow, nTab, aTitle );
             if (aTitle.Len())
             {
-                BOOL bFound = FALSE;
+                sal_Bool bFound = sal_False;
                 for (SCSIZE i=0; i<nRowCount && !bFound; i++)
                     if ( *ppRowHeaders[i] == aTitle )
-                        bFound = TRUE;
+                        bFound = sal_True;
                 if (!bFound)
                     lcl_AddString( ppRowHeaders, nRowCount, aTitle );
             }
@@ -352,7 +352,7 @@ void ScConsData::AddName( const String& rName )
             {
                 if (!ppUsed[nArrX][nArrY])
                 {
-                    ppUsed[nArrX][nArrY] = TRUE;
+                    ppUsed[nArrX][nArrY] = sal_True;
                     ppRefs[nArrX][nArrY].Init();
                 }
                 ppRefs[nArrX][nArrY].SetFullSize(nMax);
@@ -407,7 +407,7 @@ void lcl_UpdateArray( ScSubTotalFunc eFunc,
         case SUBTOTAL_FUNC_VAR:
         case SUBTOTAL_FUNC_VARP:
         {
-            BOOL bOk = SubTotal::SafePlus(rSum, nVal);
+            sal_Bool bOk = SubTotal::SafePlus(rSum, nVal);
             bOk = bOk && SubTotal::SafeMult(nVal, nVal);
             bOk = bOk && SubTotal::SafePlus(rSumSqr, nVal);
             if (!bOk)
@@ -442,7 +442,7 @@ void lcl_InitArray( ScSubTotalFunc eFunc,
         case SUBTOTAL_FUNC_VARP:
         {
             rSum = nVal;
-            BOOL bOk = SubTotal::SafeMult(nVal, nVal);
+            sal_Bool bOk = SubTotal::SafeMult(nVal, nVal);
             if (bOk)
                 rSumSqr = nVal;
             else
@@ -553,7 +553,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
         else
         {
             aCornerText = aThisCorner;
-            bCornerUsed = TRUE;
+            bCornerUsed = sal_True;
         }
     }
 
@@ -575,12 +575,12 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
             SCCOL nPos = SC_CONS_NOTFOUND;
             if (aTitle.Len())
             {
-                BOOL bFound = FALSE;
+                sal_Bool bFound = sal_False;
                 for (SCSIZE i=0; i<nColCount && !bFound; i++)
                     if ( *ppColHeaders[i] == aTitle )
                     {
                         nPos = static_cast<SCCOL>(i);
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
                 DBG_ASSERT(bFound, "Spalte nicht gefunden");
             }
@@ -596,12 +596,12 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
             SCROW nPos = SC_CONS_NOTFOUND;
             if (aTitle.Len())
             {
-                BOOL bFound = FALSE;
+                sal_Bool bFound = sal_False;
                 for (SCSIZE i=0; i<nRowCount && !bFound; i++)
                     if ( *ppRowHeaders[i] == aTitle )
                     {
                         nPos = static_cast<SCROW>(i);
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
                 DBG_ASSERT(bFound, "Zeile nicht gefunden");
             }
@@ -613,7 +613,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
 
     //		Daten
 
-    BOOL bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 );
+    sal_Bool bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 );
     for (nCol=nCol1; nCol<=nCol2; nCol++)
     {
         SCCOL nArrX = nCol-nCol1;
@@ -634,7 +634,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
                             ppRefs[nArrX][nArrY].AddEntry( nCol, nRow, nTab );
                         else
                         {
-                            ppUsed[nArrX][nArrY] = TRUE;
+                            ppUsed[nArrX][nArrY] = sal_True;
                             ppRefs[nArrX][nArrY].Init();
                             ppRefs[nArrX][nArrY].AddEntry( nCol, nRow, nTab );
                         }
@@ -649,7 +649,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
                                          nVal);
                         else
                         {
-                            ppUsed[nArrX][nArrY] = TRUE;
+                            ppUsed[nArrX][nArrY] = sal_True;
                             lcl_InitArray( eFunction, ppCount[nArrX][nArrY],
                                                   ppSum[nArrX][nArrY],
                                                   ppSumSqr[nArrX][nArrY], nVal );
@@ -745,12 +745,12 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
 
         ScSingleRefData aSRef;		// Daten fuer Referenz-Formelzellen
         aSRef.InitFlags();
-        aSRef.SetFlag3D(TRUE);
+        aSRef.SetFlag3D(sal_True);
 
         ScComplexRefData aCRef;			// Daten fuer Summen-Zellen
         aCRef.InitFlags();
-        aCRef.Ref1.SetColRel(TRUE); aCRef.Ref1.SetRowRel(TRUE); aCRef.Ref1.SetTabRel(TRUE);
-        aCRef.Ref2.SetColRel(TRUE); aCRef.Ref2.SetRowRel(TRUE); aCRef.Ref2.SetTabRel(TRUE);
+        aCRef.Ref1.SetColRel(sal_True); aCRef.Ref1.SetRowRel(sal_True); aCRef.Ref1.SetTabRel(sal_True);
+        aCRef.Ref2.SetColRel(sal_True); aCRef.Ref2.SetRowRel(sal_True); aCRef.Ref2.SetTabRel(sal_True);
 
         for (nArrY=0; nArrY<nRowCount; nArrY++)
         {
@@ -815,14 +815,14 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
 
                 //	Gliederung einfuegen
 
-                ScOutlineArray* pOutArr = pDestDoc->GetOutlineTable( nTab, TRUE )->GetRowArray();
+                ScOutlineArray* pOutArr = pDestDoc->GetOutlineTable( nTab, sal_True )->GetRowArray();
                 SCROW nOutStart = nRow+nArrY;
                 SCROW nOutEnd = nRow+nArrY+nNeeded-1;
-                BOOL bSize = FALSE;
+                sal_Bool bSize = sal_False;
                 pOutArr->Insert( nOutStart, nOutEnd, bSize );
                 for (SCROW nOutRow=nOutStart; nOutRow<=nOutEnd; nOutRow++)
-                    pDestDoc->ShowRow( nOutRow, nTab, FALSE );
-                pDestDoc->UpdateOutlineRow( nOutStart, nOutEnd, nTab, FALSE );
+                    pDestDoc->ShowRow( nOutRow, nTab, sal_False );
+                pDestDoc->UpdateOutlineRow( nOutStart, nOutEnd, nTab, sal_False );
 
                 //	Zwischentitel
 
@@ -832,10 +832,10 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
                     for (SCSIZE nPos=0; nPos<nDataCount; nPos++)
                     {
                         SCSIZE nTPos = ppTitlePos[nArrY][nPos];
-                        BOOL bDo = TRUE;
+                        sal_Bool bDo = sal_True;
                         if (nPos+1<nDataCount)
                             if (ppTitlePos[nArrY][nPos+1] == nTPos)
-                                bDo = FALSE;									// leer
+                                bDo = sal_False;									// leer
                         if ( bDo && nTPos < nNeeded )
                         {
                             aString =  *ppRowHeaders[nArrY];
diff --git a/sc/source/core/tool/dbcolect.cxx b/sc/source/core/tool/dbcolect.cxx
index 0f1d26fd6..8a4e96e1a 100644
--- a/sc/source/core/tool/dbcolect.cxx
+++ b/sc/source/core/tool/dbcolect.cxx
@@ -46,7 +46,7 @@
 ScDBData::ScDBData( const String& rName,
                     SCTAB nTab,
                     SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                    BOOL bByR, BOOL bHasH) :
+                    sal_Bool bByR, sal_Bool bHasH) :
     aName		(rName),
     nTable		(nTab),
     nStartCol	(nCol1),
@@ -55,16 +55,16 @@ ScDBData::ScDBData( const String& rName,
     nEndRow		(nRow2),
     bByRow		(bByR),
     bHasHeader	(bHasH),
-    bDoSize		(FALSE),
-    bKeepFmt	(FALSE),
-    bStripData	(FALSE),
-    bIsAdvanced	(FALSE),
-    bDBSelection(FALSE),
+    bDoSize		(sal_False),
+    bKeepFmt	(sal_False),
+    bStripData	(sal_False),
+    bIsAdvanced	(sal_False),
+    bDBSelection(sal_False),
     nIndex 		(0),
-    bAutoFilter (FALSE),
-    bModified	(FALSE)
+    bAutoFilter (sal_False),
+    bModified	(sal_False)
 {
-    USHORT i;
+    sal_uInt16 i;
 
     ScSortParam aSortParam;
     ScQueryParam aQueryParam;
@@ -140,8 +140,8 @@ ScDBData::ScDBData( const ScDBData& rData ) :
     bAutoFilter			(rData.bAutoFilter),
     bModified			(rData.bModified)
 {
-    USHORT i;
-    USHORT j;
+    sal_uInt16 i;
+    sal_uInt16 j;
 
     for (i=0; i<MAXSORT; i++)
     {
@@ -180,8 +180,8 @@ ScDBData::ScDBData( const ScDBData& rData ) :
 
 ScDBData& ScDBData::operator= (const ScDBData& rData)
 {
-    USHORT i;
-    USHORT j;
+    sal_uInt16 i;
+    sal_uInt16 j;
 
     ScRefreshTimer::operator=( rData );
     aName				= rData.aName;
@@ -272,7 +272,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData)
     return *this;
 }
 
-BOOL ScDBData::operator== (const ScDBData& rData) const
+sal_Bool ScDBData::operator== (const ScDBData& rData) const
 {
     //	Daten, die nicht in den Params sind
 
@@ -285,42 +285,42 @@ BOOL ScDBData::operator== (const ScDBData& rData) const
 //         bAutoFilter!= rData.bAutoFilter||
          ScRefreshTimer::operator!=( rData )
         )
-        return FALSE;
+        return sal_False;
 
     if ( bIsAdvanced && aAdvSource != rData.aAdvSource )
-        return FALSE;
+        return sal_False;
 
     ScSortParam aSort1, aSort2;
     GetSortParam(aSort1);
     rData.GetSortParam(aSort2);
     if (!(aSort1 == aSort2))
-        return FALSE;
+        return sal_False;
 
     ScQueryParam aQuery1, aQuery2;
     GetQueryParam(aQuery1);
     rData.GetQueryParam(aQuery2);
     if (!(aQuery1 == aQuery2))
-        return FALSE;
+        return sal_False;
 
     ScSubTotalParam aSubTotal1, aSubTotal2;
     GetSubTotalParam(aSubTotal1);
     rData.GetSubTotalParam(aSubTotal2);
     if (!(aSubTotal1 == aSubTotal2))
-        return FALSE;
+        return sal_False;
 
     ScImportParam aImport1, aImport2;
     GetImportParam(aImport1);
     rData.GetImportParam(aImport2);
     if (!(aImport1 == aImport2))
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 ScDBData::~ScDBData()
 {
     StopRefreshTimer();
-    USHORT i;
+    sal_uInt16 i;
 
     for (i=0; i<MAXQUERY; i++)
         delete pQueryStr[i];
@@ -331,7 +331,7 @@ ScDBData::~ScDBData()
     }
 }
 
-//UNUSED2008-05  BOOL ScDBData::IsBeyond(SCROW nMaxRow) const
+//UNUSED2008-05  sal_Bool ScDBData::IsBeyond(SCROW nMaxRow) const
 //UNUSED2008-05  {
 //UNUSED2008-05      return ( nStartRow > nMaxRow ||
 //UNUSED2008-05               nEndRow > nMaxRow ||
@@ -401,7 +401,7 @@ void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
 
 void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
 {
-    USHORT i;
+    sal_uInt16 i;
     long nDifX = ((long) nCol1) - ((long) nStartCol);
     long nDifY = ((long) nRow1) - ((long) nStartRow);
 
@@ -414,7 +414,7 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
         if (nSortField[i] > nSortEnd)
         {
             nSortField[i] = 0;
-            bDoSort[i]	  = FALSE;
+            bDoSort[i]	  = sal_False;
         }
     }
     for (i=0; i<MAXQUERY; i++)
@@ -423,7 +423,7 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
         if (nQueryField[i] > nCol2)
         {
             nQueryField[i] = 0;
-            bDoQuery[i]	   = FALSE;
+            bDoQuery[i]	   = sal_False;
         }
     }
     for (i=0; i<MAXSUBTOTAL; i++)
@@ -432,7 +432,7 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
         if (nSubField[i] > nCol2)
         {
             nSubField[i]   = 0;
-            bDoSubTotal[i] = FALSE;
+            bDoSubTotal[i] = sal_False;
         }
     }
 
@@ -455,7 +455,7 @@ void ScDBData::GetSortParam( ScSortParam& rSortParam ) const
     rSortParam.bIncludePattern = bIncludePattern;
     rSortParam.bUserDef	= bSortUserDef;
     rSortParam.nUserIndex = nSortUserIndex;
-    for (USHORT i=0; i<MAXSORT; i++)
+    for (sal_uInt16 i=0; i<MAXSORT; i++)
     {
         rSortParam.bDoSort[i] 	 = bDoSort[i];
         rSortParam.nField[i] 	 = nSortField[i];
@@ -475,7 +475,7 @@ void ScDBData::SetSortParam( const ScSortParam& rSortParam )
     nSortDestRow = rSortParam.nDestRow;
     bSortUserDef = rSortParam.bUserDef;
     nSortUserIndex = rSortParam.nUserIndex;
-    for (USHORT i=0; i<MAXSORT; i++)
+    for (sal_uInt16 i=0; i<MAXSORT; i++)
     {
         bDoSort[i]	  = rSortParam.bDoSort[i];
         nSortField[i] = rSortParam.nField[i];
@@ -527,9 +527,9 @@ void ScDBData::SetQueryParam(const ScQueryParam& rQueryParam)
                 !rQueryParam.GetEntry(MAXQUERY).bDoQuery,
                 "zuviele Eintraege bei ScDBData::SetQueryParam" );
 
-    //	set bIsAdvanced to FALSE for everything that is not from the
+    //	set bIsAdvanced to sal_False for everything that is not from the
     //	advanced filter dialog
-    bIsAdvanced = FALSE;
+    bIsAdvanced = sal_False;
 
     bQueryInplace = rQueryParam.bInplace;
     bQueryCaseSens = rQueryParam.bCaseSens;
@@ -558,13 +558,13 @@ void ScDBData::SetAdvancedQuerySource(const ScRange* pSource)
     if (pSource)
     {
         aAdvSource = *pSource;
-        bIsAdvanced = TRUE;
+        bIsAdvanced = sal_True;
     }
     else
-        bIsAdvanced = FALSE;
+        bIsAdvanced = sal_False;
 }
 
-BOOL ScDBData::GetAdvancedQuerySource(ScRange& rSource) const
+sal_Bool ScDBData::GetAdvancedQuerySource(ScRange& rSource) const
 {
     rSource = aAdvSource;
     return bIsAdvanced;
@@ -572,8 +572,8 @@ BOOL ScDBData::GetAdvancedQuerySource(ScRange& rSource) const
 
 void ScDBData::GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const
 {
-    USHORT i;
-    USHORT j;
+    sal_uInt16 i;
+    sal_uInt16 j;
 
     rSubTotalParam.nCol1 = nStartCol;
     rSubTotalParam.nRow1 = nStartRow;
@@ -612,8 +612,8 @@ void ScDBData::GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const
 
 void ScDBData::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam)
 {
-    USHORT i;
-    USHORT j;
+    sal_uInt16 i;
+    sal_uInt16 j;
 
     bSubRemoveOnly		= rSubTotalParam.bRemoveOnly;
     bSubReplace			= rSubTotalParam.bReplace;
@@ -669,7 +669,7 @@ void ScDBData::SetImportParam(const ScImportParam& rImportParam)
     nDBType			= rImportParam.nType;
 }
 
-BOOL ScDBData::IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const
+sal_Bool ScDBData::IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const
 {
     if (nTab == nTable)
     {
@@ -680,12 +680,12 @@ BOOL ScDBData::IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly)
                      nRow >= nStartRow && nRow <= nEndRow );
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScDBData::IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const
+sal_Bool ScDBData::IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const
 {
-    return (BOOL)((nTab == nTable)
+    return (sal_Bool)((nTab == nTable)
                     && (nCol1 == nStartCol) && (nRow1 == nStartRow)
                     && (nCol2 == nEndCol) && (nRow2 == nEndRow));
 }
@@ -708,19 +708,19 @@ short ScDBCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
 
 //	IsEqual - alles gleich
 
-BOOL ScDBCollection::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
+sal_Bool ScDBCollection::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
 {
     return *(ScDBData*)pKey1 == *(ScDBData*)pKey2;
 }
 
-ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const
+ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const
 {
     ScDBData* pNoNameData = NULL;
     if (pItems)
     {
         const String& rNoName = ScGlobal::GetRscString( STR_DB_NONAME );
 
-        for (USHORT i = 0; i < nCount; i++)
+        for (sal_uInt16 i = 0; i < nCount; i++)
             if (((ScDBData*)pItems[i])->IsDBAtCursor(nCol, nRow, nTab, bStartOnly))
             {
                 ScDBData* pDB = (ScDBData*)pItems[i];
@@ -740,7 +740,7 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCO
     {
         const String& rNoName = ScGlobal::GetRscString( STR_DB_NONAME );
 
-        for (USHORT i = 0; i < nCount; i++)
+        for (sal_uInt16 i = 0; i < nCount; i++)
             if (((ScDBData*)pItems[i])->IsDBAtArea(nTab, nCol1, nRow1, nCol2, nRow2))
             {
                 ScDBData* pDB = (ScDBData*)pItems[i];
@@ -753,7 +753,7 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCO
     return pNoNameData;				// "unbenannt" nur zurueck, wenn sonst nichts gefunden
 }
 
-BOOL ScDBCollection::SearchName( const String& rName, USHORT& rIndex ) const
+sal_Bool ScDBCollection::SearchName( const String& rName, sal_uInt16& rIndex ) const
 {
     ScDBData aDataObj( rName, 0,0,0,0,0 );
     return Search( &aDataObj, rIndex );
@@ -761,7 +761,7 @@ BOOL ScDBCollection::SearchName( const String& rName, USHORT& rIndex ) const
 
 void ScDBCollection::DeleteOnTab( SCTAB nTab )
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     while ( nPos < nCount )
     {
         // look for output positions on the deleted sheet
@@ -782,7 +782,7 @@ void ScDBCollection::UpdateReference(UpdateRefMode eUpdateRefMode,
                                 SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
                                 SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         SCCOL theCol1;
         SCROW theRow1;
@@ -793,7 +793,7 @@ void ScDBCollection::UpdateReference(UpdateRefMode eUpdateRefMode,
         ((ScDBData*)pItems[i])->GetArea( theTab1, theCol1, theRow1, theCol2, theRow2 );
         theTab2 = theTab1;
 
-        BOOL bDoUpdate = ScRefUpdate::Update( pDoc, eUpdateRefMode,
+        sal_Bool bDoUpdate = ScRefUpdate::Update( pDoc, eUpdateRefMode,
                                                 nCol1,nRow1,nTab1, nCol2,nRow2,nTab2, nDx,nDy,nDz,
                                                 theCol1,theRow1,theTab1, theCol2,theRow2,theTab2 ) != UR_NOTHING;
         if (bDoUpdate)
@@ -811,7 +811,7 @@ void ScDBCollection::UpdateReference(UpdateRefMode eUpdateRefMode,
                 aAdvSource.aEnd.Set( theCol2,theRow2,theTab2 );
                 ((ScDBData*)pItems[i])->SetAdvancedQuerySource( &aAdvSource );
 
-                bDoUpdate = TRUE;		// DBData is modified
+                bDoUpdate = sal_True;		// DBData is modified
             }
         }
 
@@ -826,7 +826,7 @@ void ScDBCollection::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
 {
     //	wenn nOldPos vor nNewPos liegt, ist nNewPos schon angepasst
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ScRange aRange;
         ScDBData* pData = (ScDBData*)pItems[i];
@@ -848,7 +848,7 @@ void ScDBCollection::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
                 ++nTab;
         }
 
-        BOOL bChanged = ( nTab != aRange.aStart.Tab() );
+        sal_Bool bChanged = ( nTab != aRange.aStart.Tab() );
         if (bChanged)
             pData->SetArea( nTab, aRange.aStart.Col(), aRange.aStart.Row(),
                                     aRange.aEnd.Col(),aRange.aEnd .Row() );
@@ -860,9 +860,9 @@ void ScDBCollection::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
 }
 
 
-ScDBData* ScDBCollection::FindIndex(USHORT nIndex)
+ScDBData* ScDBCollection::FindIndex(sal_uInt16 nIndex)
 {
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while (i < nCount)
     {
         if ((*this)[i]->GetIndex() == nIndex)
@@ -872,12 +872,12 @@ ScDBData* ScDBCollection::FindIndex(USHORT nIndex)
     return NULL;
 }
 
-BOOL ScDBCollection::Insert(ScDataObject* pScDataObject)
+sal_Bool ScDBCollection::Insert(ScDataObject* pScDataObject)
 {
     ScDBData* pData = (ScDBData*) pScDataObject;
     if (!pData->GetIndex())		// schon gesetzt?
         pData->SetIndex(nEntryIndex++);
-    BOOL bInserted = ScSortedCollection::Insert(pScDataObject);
+    sal_Bool bInserted = ScSortedCollection::Insert(pScDataObject);
     if ( bInserted && pData->HasImportParam() && !pData->HasImportSelection() )
     {
         pData->SetRefreshHandler( GetRefreshHandler() );
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index b3959f79c..1e3b54af7 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -50,19 +50,19 @@ TYPEINIT2(ScDdeLink,::sfx2::SvBaseLink,SfxBroadcaster);
 
 #define DDE_TXT_ENCODING 	gsl_getSystemTextEncoding()
 
-BOOL ScDdeLink::bIsInUpdate = FALSE;
+sal_Bool ScDdeLink::bIsInUpdate = sal_False;
 
 //------------------------------------------------------------------------
 
 ScDdeLink::ScDdeLink( ScDocument* pD, const String& rA, const String& rT, const String& rI,
-                        BYTE nM ) :
+                        sal_uInt8 nM ) :
     ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ALWAYS,FORMAT_STRING),
     pDoc( pD ),
     aAppl( rA ),
     aTopic( rT ),
     aItem( rI ),
     nMode( nM ),
-    bNeedUpdate( FALSE ),
+    bNeedUpdate( sal_False ),
     pResult( NULL )
 {
 }
@@ -81,7 +81,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, const ScDdeLink& rOther ) :
     aTopic	( rOther.aTopic ),
     aItem	( rOther.aItem ),
     nMode	( rOther.nMode ),
-    bNeedUpdate( FALSE ),
+    bNeedUpdate( sal_False ),
     pResult	( NULL )
 {
     if (rOther.pResult)
@@ -91,7 +91,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, const ScDdeLink& rOther ) :
 ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& rHdr ) :
     ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ALWAYS,FORMAT_STRING),
     pDoc( pD ),
-    bNeedUpdate( FALSE ),
+    bNeedUpdate( sal_False ),
     pResult( NULL )
 {
     rHdr.StartEntry();
@@ -101,7 +101,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r
     rStream.ReadByteString( aTopic, eCharSet );
     rStream.ReadByteString( aItem, eCharSet );
 
-    BOOL bHasValue;
+    sal_Bool bHasValue;
     rStream >> bHasValue;
     if ( bHasValue )
         pResult = new ScMatrix( rStream );
@@ -123,7 +123,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
     rStream.WriteByteString( aTopic, eCharSet );
     rStream.WriteByteString( aItem, eCharSet );
 
-    BOOL bHasValue = ( pResult != NULL );
+    sal_Bool bHasValue = ( pResult != NULL );
     rStream << bHasValue;
     if (bHasValue)
         pResult->Store( rStream );
@@ -180,7 +180,7 @@ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType,
         //	SC_DDE_DEFAULT - Zahlformat aus Zellvorlage "Standard"
         //	SC_DDE_ENGLISH - Standard-Zahlformat fuer English/US
         //	SC_DDE_TEXT    - ohne NumberFormatter direkt als String
-        ULONG nStdFormat = 0;
+        sal_uLong nStdFormat = 0;
         if ( nMode == SC_DDE_DEFAULT )
         {
             ScPatternAttr* pDefPattern = pDoc->GetDefPattern();		// enthaelt Standard-Vorlage
@@ -242,8 +242,8 @@ void ScDdeLink::ResetValue()
 
 void __EXPORT ScDdeLink::ListenersGone()
 {
-    BOOL bWas = bIsInUpdate;
-    bIsInUpdate = TRUE;				// Remove() kann Reschedule ausloesen??!?
+    sal_Bool bWas = bIsInUpdate;
+    bIsInUpdate = sal_True;				// Remove() kann Reschedule ausloesen??!?
 
     ScDocument* pStackDoc = pDoc;	// member pDoc can't be used after removing the link
 
@@ -263,16 +263,16 @@ void __EXPORT ScDdeLink::ListenersGone()
 void ScDdeLink::TryUpdate()
 {
     if (bIsInUpdate)
-        bNeedUpdate = TRUE;			// kann jetzt nicht ausgefuehrt werden
+        bNeedUpdate = sal_True;			// kann jetzt nicht ausgefuehrt werden
     else
     {
-        bIsInUpdate = TRUE;
+        bIsInUpdate = sal_True;
         //Application::Reschedule();	//! OS/2-Simulation
         pDoc->IncInDdeLinkUpdate();
         Update();
         pDoc->DecInDdeLinkUpdate();
-        bIsInUpdate = FALSE;
-        bNeedUpdate = FALSE;
+        bIsInUpdate = sal_False;
+        bNeedUpdate = sal_False;
     }
 }
 
diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxx
index 619a0c335..89f4419a4 100644
--- a/sc/source/core/tool/detdata.cxx
+++ b/sc/source/core/tool/detdata.cxx
@@ -46,17 +46,17 @@ SV_IMPL_PTRARR( ScDetOpArr_Impl, ScDetOpDataPtr );
 
 ScDetOpList::ScDetOpList(const ScDetOpList& rList) :
     ScDetOpArr_Impl(),
-    bHasAddError( FALSE )
+    bHasAddError( sal_False )
 {
-    USHORT nCount = rList.Count();
+    sal_uInt16 nCount = rList.Count();
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         Append( new ScDetOpData(*rList[i]) );
 }
 
 void ScDetOpList::DeleteOnTab( SCTAB nTab )
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     while ( nPos < Count() )
     {
         // look for operations on the deleted sheet
@@ -71,8 +71,8 @@ void ScDetOpList::DeleteOnTab( SCTAB nTab )
 void ScDetOpList::UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
                                 const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    USHORT nCount = Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ScAddress aPos = (*this)[i]->GetPos();
         SCCOL nCol1 = aPos.Col();
@@ -95,21 +95,21 @@ void ScDetOpList::UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMod
 void ScDetOpList::Append( ScDetOpData* pDetOpData )
 {
     if ( pDetOpData->GetOperation() == SCDETOP_ADDERROR )
-        bHasAddError = TRUE;
+        bHasAddError = sal_True;
 
     Insert( pDetOpData, Count() );
 }
 
 
-BOOL ScDetOpList::operator==( const ScDetOpList& r ) const
+sal_Bool ScDetOpList::operator==( const ScDetOpList& r ) const
 {
     // fuer Ref-Undo
 
-    USHORT nCount = Count();
-    BOOL bEqual = ( nCount == r.Count() );
-    for (USHORT i=0; i<nCount && bEqual; i++)		// Reihenfolge muss auch gleich sein
+    sal_uInt16 nCount = Count();
+    sal_Bool bEqual = ( nCount == r.Count() );
+    for (sal_uInt16 i=0; i<nCount && bEqual; i++)		// Reihenfolge muss auch gleich sein
         if ( !(*(*this)[i] == *r[i]) )				// Eintraege unterschiedlich ?
-            bEqual = FALSE;
+            bEqual = sal_False;
 
     return bEqual;
 }
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index b1045922c..50f3e7ce3 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -103,7 +103,7 @@ private:
     SfxItemSet	aToTabSet;
     SfxItemSet	aFromTabSet;
     SfxItemSet	aCircleSet;			//! einzeln ?
-    USHORT		nMaxLevel;
+    sal_uInt16		nMaxLevel;
 
 public:
                 ScDetectiveData( SdrModel* pModel );
@@ -114,8 +114,8 @@ public:
     SfxItemSet&	GetFromTabSet()	{ return aFromTabSet; }
     SfxItemSet&	GetCircleSet()	{ return aCircleSet; }
 
-    void		SetMaxLevel( USHORT nVal )		{ nMaxLevel = nVal; }
-    USHORT		GetMaxLevel() const				{ return nMaxLevel; }
+    void		SetMaxLevel( sal_uInt16 nVal )		{ nMaxLevel = nVal; }
+    sal_uInt16		GetMaxLevel() const				{ return nMaxLevel; }
 };
 
 class ScCommentData
@@ -135,11 +135,11 @@ private:
 ColorData ScDetectiveFunc::nArrowColor = 0;
 ColorData ScDetectiveFunc::nErrorColor = 0;
 ColorData ScDetectiveFunc::nCommentColor = 0;
-BOOL ScDetectiveFunc::bColorsInitialized = FALSE;
+sal_Bool ScDetectiveFunc::bColorsInitialized = sal_False;
 
 //------------------------------------------------------------------------
 
-BOOL lcl_HasThickLine( SdrObject& rObj )
+sal_Bool lcl_HasThickLine( SdrObject& rObj )
 {
     // thin lines get width 0 -> everything greater 0 is a thick line
 
@@ -183,28 +183,28 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
 
     aArrowSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aCircle) ) );
     aArrowSet.Put( XLineStartWidthItem( 200 ) );
-    aArrowSet.Put( XLineStartCenterItem( TRUE ) );
+    aArrowSet.Put( XLineStartCenterItem( sal_True ) );
     aArrowSet.Put( XLineEndItem( aName, basegfx::B2DPolyPolygon(aTriangle) ) );
     aArrowSet.Put( XLineEndWidthItem( 200 ) );
-    aArrowSet.Put( XLineEndCenterItem( FALSE ) );
+    aArrowSet.Put( XLineEndCenterItem( sal_False ) );
 
     aToTabSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aCircle) ) );
     aToTabSet.Put( XLineStartWidthItem( 200 ) );
-    aToTabSet.Put( XLineStartCenterItem( TRUE ) );
+    aToTabSet.Put( XLineStartCenterItem( sal_True ) );
     aToTabSet.Put( XLineEndItem( aName, basegfx::B2DPolyPolygon(aSquare) ) );
     aToTabSet.Put( XLineEndWidthItem( 300 ) );
-    aToTabSet.Put( XLineEndCenterItem( FALSE ) );
+    aToTabSet.Put( XLineEndCenterItem( sal_False ) );
 
     aFromTabSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aSquare) ) );
     aFromTabSet.Put( XLineStartWidthItem( 300 ) );
-    aFromTabSet.Put( XLineStartCenterItem( TRUE ) );
+    aFromTabSet.Put( XLineStartCenterItem( sal_True ) );
     aFromTabSet.Put( XLineEndItem( aName, basegfx::B2DPolyPolygon(aTriangle) ) );
     aFromTabSet.Put( XLineEndWidthItem( 200 ) );
-    aFromTabSet.Put( XLineEndCenterItem( FALSE ) );
+    aFromTabSet.Put( XLineEndCenterItem( sal_False ) );
 
     aCircleSet.Put( XLineColorItem( String(), Color( ScDetectiveFunc::GetErrorColor() ) ) );
     aCircleSet.Put( XFillStyleItem( XFILL_NONE ) );
-    USHORT nWidth = 55;		// 54 = 1 Pixel
+    sal_uInt16 nWidth = 55;		// 54 = 1 Pixel
     aCircleSet.Put( XLineWidthItem( nWidth ) );
 }
 
@@ -221,16 +221,16 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
 
     aCaptionSet.Put( XLineStartItem( aName, basegfx::B2DPolyPolygon(aTriangle) ) );
     aCaptionSet.Put( XLineStartWidthItem( 200 ) );
-    aCaptionSet.Put( XLineStartCenterItem( FALSE ) );
+    aCaptionSet.Put( XLineStartCenterItem( sal_False ) );
     aCaptionSet.Put( XFillStyleItem( XFILL_SOLID ) );
     Color aYellow( ScDetectiveFunc::GetCommentColor() );
     aCaptionSet.Put( XFillColorItem( String(), aYellow ) );
 
     //	shadow
-    //	SdrShadowItem has FALSE, instead the shadow is set for the rectangle
+    //	SdrShadowItem has sal_False, instead the shadow is set for the rectangle
     //	only with SetSpecialTextBoxShadow when the object is created
     //	(item must be set to adjust objects from older files)
-    aCaptionSet.Put( SdrShadowItem( FALSE ) );
+    aCaptionSet.Put( SdrShadowItem( sal_False ) );
     aCaptionSet.Put( SdrShadowXDistItem( 100 ) );
     aCaptionSet.Put( SdrShadowYDistItem( 100 ) );
 
@@ -240,8 +240,8 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
     aCaptionSet.Put( SdrTextUpperDistItem( 100 ) );
     aCaptionSet.Put( SdrTextLowerDistItem( 100 ) );
 
-    aCaptionSet.Put( SdrTextAutoGrowWidthItem( FALSE ) );
-    aCaptionSet.Put( SdrTextAutoGrowHeightItem( TRUE ) );
+    aCaptionSet.Put( SdrTextAutoGrowWidthItem( sal_False ) );
+    aCaptionSet.Put( SdrTextAutoGrowHeightItem( sal_True ) );
 
     //	#78943# do use the default cell style, so the user has a chance to
     //	modify the font for the annotations
@@ -258,9 +258,9 @@ void ScCommentData::UpdateCaptionSet( const SfxItemSet& rItemSet )
     SfxWhichIter aWhichIter( rItemSet );
     const SfxPoolItem* pPoolItem = 0;
 
-    for( USHORT nWhich = aWhichIter.FirstWhich(); nWhich > 0; nWhich = aWhichIter.NextWhich() )
+    for( sal_uInt16 nWhich = aWhichIter.FirstWhich(); nWhich > 0; nWhich = aWhichIter.NextWhich() )
     {
-        if(rItemSet.GetItemState(nWhich, FALSE, &pPoolItem) == SFX_ITEM_SET)
+        if(rItemSet.GetItemState(nWhich, sal_False, &pPoolItem) == SFX_ITEM_SET)
         {
             switch(nWhich)
             {
@@ -290,20 +290,20 @@ void ScCommentData::UpdateCaptionSet( const SfxItemSet& rItemSet )
 void ScDetectiveFunc::Modified()
 {
     if (pDoc->IsStreamValid(nTab))
-        pDoc->SetStreamValid(nTab, FALSE);
+        pDoc->SetStreamValid(nTab, sal_False);
 }
 
-inline BOOL Intersect( SCCOL nStartCol1, SCROW nStartRow1, SCCOL nEndCol1, SCROW nEndRow1,
+inline sal_Bool Intersect( SCCOL nStartCol1, SCROW nStartRow1, SCCOL nEndCol1, SCROW nEndRow1,
                         SCCOL nStartCol2, SCROW nStartRow2, SCCOL nEndCol2, SCROW nEndRow2 )
 {
     return nEndCol1 >= nStartCol2 && nEndCol2 >= nStartCol1 &&
             nEndRow1 >= nStartRow2 && nEndRow2 >= nStartRow1;
 }
 
-BOOL ScDetectiveFunc::HasError( const ScRange& rRange, ScAddress& rErrPos )
+sal_Bool ScDetectiveFunc::HasError( const ScRange& rRange, ScAddress& rErrPos )
 {
     rErrPos = rRange.aStart;
-    USHORT nError = 0;
+    sal_uInt16 nError = 0;
 
     ScCellIterator aCellIter( pDoc, rRange);
     ScBaseCell* pCell = aCellIter.GetFirst();
@@ -384,7 +384,7 @@ Rectangle ScDetectiveFunc::GetDrawRect( SCCOL nCol, SCROW nRow ) const
     return GetDrawRect( nCol, nRow, nCol, nRow );
 }
 
-BOOL lcl_IsOtherTab( const basegfx::B2DPolyPolygon& rPolyPolygon )
+sal_Bool lcl_IsOtherTab( const basegfx::B2DPolyPolygon& rPolyPolygon )
 {
     //	test if rPolygon is the line end for "other table" (rectangle)
     if(1L == rPolyPolygon.count())
@@ -402,16 +402,16 @@ BOOL lcl_IsOtherTab( const basegfx::B2DPolyPolygon& rPolyPolygon )
     return false;
 }
 
-BOOL ScDetectiveFunc::HasArrow( const ScAddress& rStart,
+sal_Bool ScDetectiveFunc::HasArrow( const ScAddress& rStart,
                                     SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab )
 {
-    BOOL bStartAlien = ( rStart.Tab() != nTab );
-    BOOL bEndAlien   = ( nEndTab != nTab );
+    sal_Bool bStartAlien = ( rStart.Tab() != nTab );
+    sal_Bool bEndAlien   = ( nEndTab != nTab );
 
     if (bStartAlien && bEndAlien)
     {
         DBG_ERROR("bStartAlien && bEndAlien");
-        return TRUE;
+        return sal_True;
     }
 
     Rectangle aStartRect;
@@ -425,7 +425,7 @@ BOOL ScDetectiveFunc::HasArrow( const ScAddress& rStart,
     SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab));
     DBG_ASSERT(pPage,"Page ?");
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SdrObjListIter aIter( *pPage, IM_FLAT );
     SdrObject* pObject = aIter.Next();
     while (pObject && !bFound)
@@ -435,18 +435,18 @@ BOOL ScDetectiveFunc::HasArrow( const ScAddress& rStart,
         {
             const SfxItemSet& rSet = pObject->GetMergedItemSet();
 
-            BOOL bObjStartAlien =
+            sal_Bool bObjStartAlien =
                 lcl_IsOtherTab( ((const XLineStartItem&)rSet.Get(XATTR_LINESTART)).GetLineStartValue() );
-            BOOL bObjEndAlien =
+            sal_Bool bObjEndAlien =
                 lcl_IsOtherTab( ((const XLineEndItem&)rSet.Get(XATTR_LINEEND)).GetLineEndValue() );
 
-            BOOL bStartHit = bStartAlien ? bObjStartAlien :
+            sal_Bool bStartHit = bStartAlien ? bObjStartAlien :
                                 ( !bObjStartAlien && aStartRect.IsInside(pObject->GetPoint(0)) );
-            BOOL bEndHit = bEndAlien ? bObjEndAlien :
+            sal_Bool bEndHit = bEndAlien ? bObjEndAlien :
                                 ( !bObjEndAlien && aEndRect.IsInside(pObject->GetPoint(1)) );
 
             if ( bStartHit && bEndHit )
-                bFound = TRUE;
+                bFound = sal_True;
         }
         pObject = aIter.Next();
     }
@@ -454,38 +454,38 @@ BOOL ScDetectiveFunc::HasArrow( const ScAddress& rStart,
     return bFound;
 }
 
-BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject )			// static
+sal_Bool ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject )			// static
 {
     if ( pObject->GetLayer()==SC_LAYER_INTERN &&
             pObject->IsPolyObj() && pObject->GetPointCount()==2 )
     {
         const SfxItemSet& rSet = pObject->GetMergedItemSet();
 
-        BOOL bObjStartAlien =
+        sal_Bool bObjStartAlien =
             lcl_IsOtherTab( ((const XLineStartItem&)rSet.Get(XATTR_LINESTART)).GetLineStartValue() );
-        BOOL bObjEndAlien =
+        sal_Bool bObjEndAlien =
             lcl_IsOtherTab( ((const XLineEndItem&)rSet.Get(XATTR_LINEEND)).GetLineEndValue() );
 
         return !bObjStartAlien && !bObjEndAlien;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
 
 //	InsertXXX: called from DrawEntry/DrawAlienEntry and InsertObject
 
-BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
+sal_Bool ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
                                 SCCOL nRefStartCol, SCROW nRefStartRow,
                                 SCCOL nRefEndCol, SCROW nRefEndRow,
-                                BOOL bFromOtherTab, BOOL bRed,
+                                sal_Bool bFromOtherTab, sal_Bool bRed,
                                 ScDetectiveData& rData )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab));
 
-    BOOL bArea = ( nRefStartCol != nRefEndCol || nRefStartRow != nRefEndRow );
+    sal_Bool bArea = ( nRefStartCol != nRefEndCol || nRefStartRow != nRefEndRow );
     if (bArea && !bFromOtherTab)
     {
         // insert the rectangle before the arrow - this is relied on in FindFrameForObject
@@ -500,7 +500,7 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
         pPage->InsertObject( pBox );
         pModel->AddCalcUndo( new SdrUndoInsertObj( *pBox ) );
 
-        ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, TRUE );
+        ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, sal_True );
         pData->maStart.Set( nRefStartCol, nRefStartRow, nTab);
         pData->maEnd.Set( nRefEndCol, nRefEndRow, nTab);
     }
@@ -510,7 +510,7 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
 
     if (bFromOtherTab)
     {
-        BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+        sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
         long nPageSign = bNegativePage ? -1 : 1;
 
         aStartPos = Point( aEndPos.X() - 1000 * nPageSign, aEndPos.Y() - 1000 );
@@ -542,7 +542,7 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
     pPage->InsertObject( pArrow );
     pModel->AddCalcUndo( new SdrUndoInsertObj( *pArrow ) );
 
-    ScDrawObjData* pData = ScDrawLayer::GetObjData( pArrow, TRUE );
+    ScDrawObjData* pData = ScDrawLayer::GetObjData( pArrow, sal_True );
     if (bFromOtherTab)
         pData->maStart.SetInvalid();
     else
@@ -551,17 +551,17 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
     pData->maEnd.Set( nCol, nRow, nTab);
 
     Modified();
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
-                                SCCOL nEndCol, SCROW nEndRow, BOOL bRed,
+sal_Bool ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
+                                SCCOL nEndCol, SCROW nEndRow, sal_Bool bRed,
                                 ScDetectiveData& rData )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab));
 
-    BOOL bArea = ( nStartCol != nEndCol || nStartRow != nEndRow );
+    sal_Bool bArea = ( nStartCol != nEndCol || nStartRow != nEndRow );
     if (bArea)
     {
         Rectangle aRect = GetDrawRect( nStartCol, nStartRow, nEndCol, nEndRow );
@@ -574,12 +574,12 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
         pPage->InsertObject( pBox );
         pModel->AddCalcUndo( new SdrUndoInsertObj( *pBox ) );
 
-        ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, TRUE );
+        ScDrawObjData* pData = ScDrawLayer::GetObjData( pBox, sal_True );
         pData->maStart.Set( nStartCol, nStartRow, nTab);
         pData->maEnd.Set( nEndCol, nEndRow, nTab);
     }
 
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
     long nPageSign = bNegativePage ? -1 : 1;
 
     Point aStartPos	= GetDrawPos( nStartCol, nStartRow, DRAWPOS_DETARROW );
@@ -609,12 +609,12 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
     pPage->InsertObject( pArrow );
     pModel->AddCalcUndo( new SdrUndoInsertObj( *pArrow ) );
 
-    ScDrawObjData* pData = ScDrawLayer::GetObjData( pArrow, TRUE );
+    ScDrawObjData* pData = ScDrawLayer::GetObjData( pArrow, sal_True );
     pData->maStart.Set( nStartCol, nStartRow, nTab);
     pData->maEnd.SetInvalid();
 
     Modified();
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -626,16 +626,16 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
 
 //		return FALSE: da war schon ein Pfeil
 
-BOOL ScDetectiveFunc::DrawEntry( SCCOL nCol, SCROW nRow,
+sal_Bool ScDetectiveFunc::DrawEntry( SCCOL nCol, SCROW nRow,
                                     const ScRange& rRef,
                                     ScDetectiveData& rData )
 {
     if ( HasArrow( rRef.aStart, nCol, nRow, nTab ) )
-        return FALSE;
+        return sal_False;
 
     ScAddress aErrorPos;
-    BOOL bError = HasError( rRef, aErrorPos );
-    BOOL bAlien = ( rRef.aEnd.Tab() < nTab || rRef.aStart.Tab() > nTab );
+    sal_Bool bError = HasError( rRef, aErrorPos );
+    sal_Bool bAlien = ( rRef.aEnd.Tab() < nTab || rRef.aStart.Tab() > nTab );
 
     return InsertArrow( nCol, nRow,
                         rRef.aStart.Col(), rRef.aStart.Row(),
@@ -643,14 +643,14 @@ BOOL ScDetectiveFunc::DrawEntry( SCCOL nCol, SCROW nRow,
                         bAlien, bError, rData );
 }
 
-BOOL ScDetectiveFunc::DrawAlienEntry( const ScRange& rRef,
+sal_Bool ScDetectiveFunc::DrawAlienEntry( const ScRange& rRef,
                                         ScDetectiveData& rData )
 {
     if ( HasArrow( rRef.aStart, 0, 0, nTab+1 ) )
-        return FALSE;
+        return sal_False;
 
     ScAddress aErrorPos;
-    BOOL bError = HasError( rRef, aErrorPos );
+    sal_Bool bError = HasError( rRef, aErrorPos );
 
     return InsertToOtherTab( rRef.aStart.Col(), rRef.aStart.Row(),
                                 rRef.aEnd.Col(), rRef.aEnd.Row(),
@@ -678,14 +678,14 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData
     pPage->InsertObject( pCircle );
     pModel->AddCalcUndo( new SdrUndoInsertObj( *pCircle ) );
 
-    ScDrawObjData* pData = ScDrawLayer::GetObjData( pCircle, TRUE );
+    ScDrawObjData* pData = ScDrawLayer::GetObjData( pCircle, sal_True );
     pData->maStart.Set( nCol, nRow, nTab);
     pData->maEnd.SetInvalid();
 
     Modified();
 }
 
-void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt )
+void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, sal_Bool bDestPnt )
 {
     Rectangle aRect = GetDrawRect( nCol, nRow );
 
@@ -696,7 +696,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt )
     pPage->RecalcObjOrdNums();
 
     long	nDelCount = 0;
-    ULONG	nObjCount = pPage->GetObjCount();
+    sal_uLong	nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
         SdrObject** ppObj = new SdrObject*[nObjCount];
@@ -732,7 +732,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt )
 
 #define SC_DET_TOLERANCE	50
 
-inline BOOL RectIsPoints( const Rectangle& rRect, const Point& rStart, const Point& rEnd )
+inline sal_Bool RectIsPoints( const Rectangle& rRect, const Point& rStart, const Point& rEnd )
 {
     return rRect.Left()   >= rStart.X() - SC_DET_TOLERANCE
         && rRect.Left()   <= rStart.X() + SC_DET_TOLERANCE
@@ -771,7 +771,7 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR
     pPage->RecalcObjOrdNums();
 
     long	nDelCount = 0;
-    ULONG	nObjCount = pPage->GetObjCount();
+    sal_uLong	nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
         SdrObject** ppObj = new SdrObject*[nObjCount];
@@ -807,10 +807,10 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR
 
 //------------------------------------------------------------------------
 
-USHORT ScDetectiveFunc::InsertPredLevelArea( const ScRange& rRef,
-                                        ScDetectiveData& rData, USHORT nLevel )
+sal_uInt16 ScDetectiveFunc::InsertPredLevelArea( const ScRange& rRef,
+                                        ScDetectiveData& rData, sal_uInt16 nLevel )
 {
-    USHORT nResult = DET_INS_EMPTY;
+    sal_uInt16 nResult = DET_INS_EMPTY;
 
     ScCellIterator aCellIter( pDoc, rRef);
     ScBaseCell* pCell = aCellIter.GetFirst();
@@ -838,8 +838,8 @@ USHORT ScDetectiveFunc::InsertPredLevelArea( const ScRange& rRef,
     return nResult;
 }
 
-USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData,
-                                            USHORT nLevel )
+sal_uInt16 ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData,
+                                            sal_uInt16 nLevel )
 {
     ScBaseCell* pCell;
     pDoc->GetCell( nCol, nRow, nTab, pCell );
@@ -854,9 +854,9 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData
 
     if (pFCell->GetDirty())
         pFCell->Interpret();				// nach SetRunning geht's nicht mehr!
-    pFCell->SetRunning(TRUE);
+    pFCell->SetRunning(sal_True);
 
-    USHORT nResult = DET_INS_EMPTY;
+    sal_uInt16 nResult = DET_INS_EMPTY;
 
     ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
     ScRange aRef;
@@ -872,8 +872,8 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData
 
             if ( nLevel < rData.GetMaxLevel() )
             {
-                USHORT nSubResult;
-                BOOL bArea = (aRef.aStart != aRef.aEnd);
+                sal_uInt16 nSubResult;
+                sal_Bool bArea = (aRef.aStart != aRef.aEnd);
                 if (bArea)
                     nSubResult = InsertPredLevelArea( aRef, rData, nLevel+1 );
                 else
@@ -902,15 +902,15 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData
         }
     }
 
-    pFCell->SetRunning(FALSE);
+    pFCell->SetRunning(sal_False);
 
     return nResult;
 }
 
-USHORT ScDetectiveFunc::FindPredLevelArea( const ScRange& rRef,
-                                                USHORT nLevel, USHORT nDeleteLevel )
+sal_uInt16 ScDetectiveFunc::FindPredLevelArea( const ScRange& rRef,
+                                                sal_uInt16 nLevel, sal_uInt16 nDeleteLevel )
 {
-    USHORT nResult = nLevel;
+    sal_uInt16 nResult = nLevel;
 
     ScCellIterator aCellIter( pDoc, rRef);
     ScBaseCell* pCell = aCellIter.GetFirst();
@@ -918,7 +918,7 @@ USHORT ScDetectiveFunc::FindPredLevelArea( const ScRange& rRef,
     {
         if (pCell->GetCellType() == CELLTYPE_FORMULA)
         {
-            USHORT nTemp = FindPredLevel( aCellIter.GetCol(), aCellIter.GetRow(), nLevel, nDeleteLevel );
+            sal_uInt16 nTemp = FindPredLevel( aCellIter.GetCol(), aCellIter.GetRow(), nLevel, nDeleteLevel );
             if (nTemp > nResult)
                 nResult = nTemp;
         }
@@ -930,7 +930,7 @@ USHORT ScDetectiveFunc::FindPredLevelArea( const ScRange& rRef,
 
                                             //	nDeleteLevel != 0	-> loeschen
 
-USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel )
+sal_uInt16 ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, sal_uInt16 nLevel, sal_uInt16 nDeleteLevel )
 {
     DBG_ASSERT( nLevel<1000, "Level" );
 
@@ -947,21 +947,21 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US
 
     if (pFCell->GetDirty())
         pFCell->Interpret();				// nach SetRunning geht's nicht mehr!
-    pFCell->SetRunning(TRUE);
+    pFCell->SetRunning(sal_True);
 
-    USHORT nResult = nLevel;
-    BOOL bDelete = ( nDeleteLevel && nLevel == nDeleteLevel-1 );
+    sal_uInt16 nResult = nLevel;
+    sal_Bool bDelete = ( nDeleteLevel && nLevel == nDeleteLevel-1 );
 
     if ( bDelete )
     {
-        DeleteArrowsAt( nCol, nRow, TRUE );					// Pfeile, die hierher zeigen
+        DeleteArrowsAt( nCol, nRow, sal_True );					// Pfeile, die hierher zeigen
     }
 
     ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
     ScRange aRef;
     while ( aIter.GetNextRef( aRef) )
     {
-        BOOL bArea = ( aRef.aStart != aRef.aEnd );
+        sal_Bool bArea = ( aRef.aStart != aRef.aEnd );
 
         if ( bDelete )					// Rahmen loeschen ?
         {
@@ -974,7 +974,7 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US
         {
             if ( HasArrow( aRef.aStart, nCol,nRow,nTab ) )
             {
-                USHORT nTemp;
+                sal_uInt16 nTemp;
                 if (bArea)
                     nTemp = FindPredLevelArea( aRef, nLevel+1, nDeleteLevel );
                 else
@@ -986,15 +986,15 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US
         }
     }
 
-    pFCell->SetRunning(FALSE);
+    pFCell->SetRunning(sal_False);
 
     return nResult;
 }
 
 //------------------------------------------------------------------------
 
-USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData,
-                                            USHORT nLevel )
+sal_uInt16 ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData,
+                                            sal_uInt16 nLevel )
 {
     ScBaseCell* pCell;
     pDoc->GetCell( nCol, nRow, nTab, pCell );
@@ -1009,19 +1009,19 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat
 
     if (pFCell->GetDirty())
         pFCell->Interpret();				// nach SetRunning geht's nicht mehr!
-    pFCell->SetRunning(TRUE);
+    pFCell->SetRunning(sal_True);
 
-    USHORT nResult = DET_INS_EMPTY;
+    sal_uInt16 nResult = DET_INS_EMPTY;
 
     ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
     ScRange aRef;
     ScAddress aErrorPos;
-    BOOL bHasError = FALSE;
+    sal_Bool bHasError = sal_False;
     while ( aIter.GetNextRef( aRef ) )
     {
         if (HasError( aRef, aErrorPos ))
         {
-            bHasError = TRUE;
+            bHasError = sal_True;
             if (DrawEntry( nCol, nRow, ScRange( aErrorPos), rData ))
                 nResult = DET_INS_INSERTED;
 
@@ -1036,7 +1036,7 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat
         }
     }
 
-    pFCell->SetRunning(FALSE);
+    pFCell->SetRunning(sal_False);
 
                                                     // Blaetter ?
     if (!bHasError)
@@ -1048,12 +1048,12 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat
 
 //------------------------------------------------------------------------
 
-USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                        ScDetectiveData& rData, USHORT nLevel )
+sal_uInt16 ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                                        ScDetectiveData& rData, sal_uInt16 nLevel )
 {
     //	ueber ganzes Dokument
 
-    USHORT nResult = DET_INS_EMPTY;
+    sal_uInt16 nResult = DET_INS_EMPTY;
 //	ScCellIterator aCellIter( pDoc, 0,0, nTab, MAXCOL,MAXROW, nTab );
     ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB );			// alle Tabellen
     ScBaseCell* pCell = aCellIter.GetFirst();
@@ -1062,11 +1062,11 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
         if (pCell->GetCellType() == CELLTYPE_FORMULA)
         {
             ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
-            BOOL bRunning = pFCell->IsRunning();
+            sal_Bool bRunning = pFCell->IsRunning();
 
             if (pFCell->GetDirty())
                 pFCell->Interpret();				// nach SetRunning geht's nicht mehr!
-            pFCell->SetRunning(TRUE);
+            pFCell->SetRunning(sal_True);
 
             ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
             ScRange aRef;
@@ -1078,8 +1078,8 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
                             aRef.aStart.Col(),aRef.aStart.Row(),
                             aRef.aEnd.Col(),aRef.aEnd.Row() ))
                     {
-                        BOOL bAlien = ( aCellIter.GetTab() != nTab );
-                        BOOL bDrawRet;
+                        sal_Bool bAlien = ( aCellIter.GetTab() != nTab );
+                        sal_Bool bDrawRet;
                         if (bAlien)
                             bDrawRet = DrawAlienEntry( aRef, rData );
                         else
@@ -1102,7 +1102,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
 
                                 if ( nLevel < rData.GetMaxLevel() )
                                 {
-                                    USHORT nSubResult = InsertSuccLevel(
+                                    sal_uInt16 nSubResult = InsertSuccLevel(
                                                             aCellIter.GetCol(), aCellIter.GetRow(),
                                                             aCellIter.GetCol(), aCellIter.GetRow(),
                                                             rData, nLevel+1 );
@@ -1138,13 +1138,13 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
     return nResult;
 }
 
-USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                                        USHORT nLevel, USHORT nDeleteLevel )
+sal_uInt16 ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                                        sal_uInt16 nLevel, sal_uInt16 nDeleteLevel )
 {
     DBG_ASSERT( nLevel<1000, "Level" );
 
-    USHORT nResult = nLevel;
-    BOOL bDelete = ( nDeleteLevel && nLevel == nDeleteLevel-1 );
+    sal_uInt16 nResult = nLevel;
+    sal_Bool bDelete = ( nDeleteLevel && nLevel == nDeleteLevel-1 );
 
     ScCellIterator aCellIter( pDoc, 0,0, nTab, MAXCOL,MAXROW, nTab );
     ScBaseCell* pCell = aCellIter.GetFirst();
@@ -1153,11 +1153,11 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC
         if (pCell->GetCellType() == CELLTYPE_FORMULA)
         {
             ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
-            BOOL bRunning = pFCell->IsRunning();
+            sal_Bool bRunning = pFCell->IsRunning();
 
             if (pFCell->GetDirty())
                 pFCell->Interpret();				// nach SetRunning geht's nicht mehr!
-            pFCell->SetRunning(TRUE);
+            pFCell->SetRunning(sal_True);
 
             ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
             ScRange aRef;
@@ -1176,13 +1176,13 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC
                                 DeleteBox( aRef.aStart.Col(), aRef.aStart.Row(),
                                                 aRef.aEnd.Col(), aRef.aEnd.Row() );
                             }
-                            DeleteArrowsAt( aRef.aStart.Col(), aRef.aStart.Row(), FALSE );
+                            DeleteArrowsAt( aRef.aStart.Col(), aRef.aStart.Row(), sal_False );
                         }
                         else if ( !bRunning &&
                                 HasArrow( aRef.aStart,
                                             aCellIter.GetCol(),aCellIter.GetRow(),aCellIter.GetTab() ) )
                         {
-                            USHORT nTemp = FindSuccLevel( aCellIter.GetCol(), aCellIter.GetRow(),
+                            sal_uInt16 nTemp = FindSuccLevel( aCellIter.GetCol(), aCellIter.GetRow(),
                                                             aCellIter.GetCol(), aCellIter.GetRow(),
                                                             nLevel+1, nDeleteLevel );
                             if (nTemp > nResult)
@@ -1205,16 +1205,16 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC
 //	--------------------------------------------------------------------------------
 //
 
-BOOL ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow )
+sal_Bool ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
     ScDetectiveData aData( pModel );
 
-    USHORT nMaxLevel = 0;
-    USHORT nResult = DET_INS_CONTINUE;
+    sal_uInt16 nMaxLevel = 0;
+    sal_uInt16 nResult = DET_INS_CONTINUE;
     while (nResult == DET_INS_CONTINUE && nMaxLevel < 1000)
     {
         aData.SetMaxLevel( nMaxLevel );
@@ -1225,16 +1225,16 @@ BOOL ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow )
     return ( nResult == DET_INS_INSERTED );
 }
 
-BOOL ScDetectiveFunc::ShowSucc( SCCOL nCol, SCROW nRow )
+sal_Bool ScDetectiveFunc::ShowSucc( SCCOL nCol, SCROW nRow )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
     ScDetectiveData aData( pModel );
 
-    USHORT nMaxLevel = 0;
-    USHORT nResult = DET_INS_CONTINUE;
+    sal_uInt16 nMaxLevel = 0;
+    sal_uInt16 nResult = DET_INS_CONTINUE;
     while (nResult == DET_INS_CONTINUE && nMaxLevel < 1000)
     {
         aData.SetMaxLevel( nMaxLevel );
@@ -1245,56 +1245,56 @@ BOOL ScDetectiveFunc::ShowSucc( SCCOL nCol, SCROW nRow )
     return ( nResult == DET_INS_INSERTED );
 }
 
-BOOL ScDetectiveFunc::ShowError( SCCOL nCol, SCROW nRow )
+sal_Bool ScDetectiveFunc::ShowError( SCCOL nCol, SCROW nRow )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
     ScRange aRange( nCol, nRow, nTab );
     ScAddress aErrPos;
     if ( !HasError( aRange,aErrPos ) )
-        return FALSE;
+        return sal_False;
 
     ScDetectiveData aData( pModel );
 
     aData.SetMaxLevel( 1000 );
-    USHORT nResult = InsertErrorLevel( nCol, nRow, aData, 0 );
+    sal_uInt16 nResult = InsertErrorLevel( nCol, nRow, aData, 0 );
 
     return ( nResult == DET_INS_INSERTED );
 }
 
-BOOL ScDetectiveFunc::DeleteSucc( SCCOL nCol, SCROW nRow )
+sal_Bool ScDetectiveFunc::DeleteSucc( SCCOL nCol, SCROW nRow )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
-    USHORT nLevelCount = FindSuccLevel( nCol, nRow, nCol, nRow, 0, 0 );
+    sal_uInt16 nLevelCount = FindSuccLevel( nCol, nRow, nCol, nRow, 0, 0 );
     if ( nLevelCount )
         FindSuccLevel( nCol, nRow, nCol, nRow, 0, nLevelCount );			// loeschen
 
     return ( nLevelCount != 0 );
 }
 
-BOOL ScDetectiveFunc::DeletePred( SCCOL nCol, SCROW nRow )
+sal_Bool ScDetectiveFunc::DeletePred( SCCOL nCol, SCROW nRow )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
-    USHORT nLevelCount = FindPredLevel( nCol, nRow, 0, 0 );
+    sal_uInt16 nLevelCount = FindPredLevel( nCol, nRow, 0, 0 );
     if ( nLevelCount )
         FindPredLevel( nCol, nRow, 0, nLevelCount );			// loeschen
 
     return ( nLevelCount != 0 );
 }
 
-BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
+sal_Bool ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
     SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab));
     DBG_ASSERT(pPage,"Page ?");
@@ -1302,7 +1302,7 @@ BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
     pPage->RecalcObjOrdNums();
 
     long	nDelCount = 0;
-    ULONG	nObjCount = pPage->GetObjCount();
+    sal_uLong	nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
         SdrObject** ppObj = new SdrObject*[nObjCount];
@@ -1313,11 +1313,11 @@ BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
         {
             if ( pObject->GetLayer() == SC_LAYER_INTERN )
             {
-                BOOL bDoThis = TRUE;
+                sal_Bool bDoThis = sal_True;
                 if ( eWhat != SC_DET_ALL )
                 {
-                    BOOL bCircle = ( pObject->ISA(SdrCircObj) );
-                    BOOL bCaption = ScDrawLayer::IsNoteCaption( pObject );
+                    sal_Bool bCircle = ( pObject->ISA(SdrCircObj) );
+                    sal_Bool bCaption = ScDrawLayer::IsNoteCaption( pObject );
                     if ( eWhat == SC_DET_DETECTIVE )		// Detektiv, aus Menue
                         bDoThis = !bCaption;				// auch Kreise
                     else if ( eWhat == SC_DET_CIRCLES )		// Kreise, wenn neue erzeugt werden
@@ -1351,14 +1351,14 @@ BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
     return ( nDelCount != 0 );
 }
 
-BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
+sal_Bool ScDetectiveFunc::MarkInvalid(sal_Bool& rOverflow)
 {
-    rOverflow = FALSE;
+    rOverflow = sal_False;
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
-    BOOL bDeleted = DeleteAll( SC_DET_CIRCLES );		// nur die Kreise
+    sal_Bool bDeleted = DeleteAll( SC_DET_CIRCLES );		// nur die Kreise
 
     ScDetectiveData aData( pModel );
     long nInsCount = 0;
@@ -1372,7 +1372,7 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
     const ScPatternAttr* pPattern = aAttrIter.GetNext( nCol, nRow1, nRow2 );
     while ( pPattern && nInsCount < SC_DET_MAXCIRCLE )
     {
-        ULONG nIndex = ((const SfxUInt32Item&)pPattern->GetItem(ATTR_VALIDDATA)).GetValue();
+        sal_uLong nIndex = ((const SfxUInt32Item&)pPattern->GetItem(ATTR_VALIDDATA)).GetValue();
         if (nIndex)
         {
             const ScValidationData*	pData = pDoc->GetValidationEntry( nIndex );
@@ -1380,7 +1380,7 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
             {
                 //	Zellen in dem Bereich durchgehen
 
-                BOOL bMarkEmpty = !pData->IsIgnoreBlank();
+                sal_Bool bMarkEmpty = !pData->IsIgnoreBlank();
                 SCROW nNextRow = nRow1;
                 SCROW nRow;
                 ScCellIterator aCellIter( pDoc, nCol,nRow1,nTab, nCol,nRow2,nTab );
@@ -1415,7 +1415,7 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
     }
 
     if ( nInsCount >= SC_DET_MAXCIRCLE )
-        rOverflow = TRUE;
+        rOverflow = sal_True;
 
     return ( bDeleted || nInsCount != 0 );
 }
@@ -1484,12 +1484,12 @@ void ScDetectiveFunc::UpdateAllArrowColors()
             {
                 if ( pObject->GetLayer() == SC_LAYER_INTERN )
                 {
-                    BOOL bArrow = FALSE;
-                    BOOL bError = FALSE;
+                    sal_Bool bArrow = sal_False;
+                    sal_Bool bError = sal_False;
 
                     ScAddress aPos;
                     ScRange aSource;
-                    BOOL bDummy;
+                    sal_Bool bDummy;
                     ScDetectiveObjType eType = GetDetectiveObjectType( pObject, nObjTab, aPos, aSource, bDummy );
                     if ( eType == SC_DETOBJ_ARROW || eType == SC_DETOBJ_TOOTHERTAB )
                     {
@@ -1497,9 +1497,9 @@ void ScDetectiveFunc::UpdateAllArrowColors()
 
                         ScAddress aErrPos;
                         if ( HasError( aSource, aErrPos ) )
-                            bError = TRUE;
+                            bError = sal_True;
                         else
-                            bArrow = TRUE;
+                            bArrow = sal_True;
                     }
                     else if ( eType == SC_DETOBJ_FROMOTHERTAB )
                     {
@@ -1509,15 +1509,15 @@ void ScDetectiveFunc::UpdateAllArrowColors()
 
                         ScAddress aErrPos;
                         if ( HasError( ScRange( aPos), aErrPos ) )
-                            bError = TRUE;
+                            bError = sal_True;
                         else
-                            bArrow = TRUE;
+                            bArrow = sal_True;
                     }
                     else if ( eType == SC_DETOBJ_CIRCLE )
                     {
                         //	circles (error marks) are always red
 
-                        bError = TRUE;
+                        bError = sal_True;
                     }
                     else if ( eType == SC_DETOBJ_NONE )
                     {
@@ -1525,7 +1525,7 @@ void ScDetectiveFunc::UpdateAllArrowColors()
 
                         if ( pObject->ISA( SdrRectObj ) && !pObject->ISA( SdrCaptionObj ) )
                         {
-                            bArrow = TRUE;
+                            bArrow = sal_True;
                         }
                     }
 
@@ -1545,17 +1545,17 @@ void ScDetectiveFunc::UpdateAllArrowColors()
     }
 }
 
-BOOL ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange )
+sal_Bool ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange )
 {
     //	find the rectangle for an arrow (always the object directly before the arrow)
     //	rRange must be initialized to the source cell of the arrow (start of area)
 
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
-    if (!pModel) return FALSE;
+    if (!pModel) return sal_False;
 
     SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab));
     DBG_ASSERT(pPage,"Page ?");
-    if (!pPage) return FALSE;
+    if (!pPage) return sal_False;
 
     // test if the object is a direct page member
     if( pObject && pObject->GetPage() && (pObject->GetPage() == pObject->GetObjList()) )
@@ -1573,18 +1573,18 @@ BOOL ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange )
                 if ( pPrevData && pPrevData->maStart.IsValid() && pPrevData->maEnd.IsValid() && (pPrevData->maStart == rRange.aStart) )
                 {
                     rRange.aEnd = pPrevData->maEnd;
-                    return TRUE;
+                    return sal_True;
                 }
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 ScDetectiveObjType ScDetectiveFunc::GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab,
-                                ScAddress& rPosition, ScRange& rSource, BOOL& rRedLine )
+                                ScAddress& rPosition, ScRange& rSource, sal_Bool& rRedLine )
 {
-    rRedLine = FALSE;
+    rRedLine = sal_False;
     ScDetectiveObjType eType = SC_DETOBJ_NONE;
 
     if ( pObject && pObject->GetLayer() == SC_LAYER_INTERN )
@@ -1617,7 +1617,7 @@ ScDetectiveObjType ScDetectiveFunc::GetDetectiveObjectType( SdrObject* pObject,
 
                 ColorData nObjColor = ((const XLineColorItem&)pObject->GetMergedItem(XATTR_LINECOLOR)).GetColorValue().GetColor();
                 if ( nObjColor == GetErrorColor() && nObjColor != GetArrowColor() )
-                    rRedLine = TRUE;
+                    rRedLine = sal_True;
             }
             else if ( pObject->ISA(SdrCircObj) )
             {
@@ -1637,7 +1637,7 @@ ScDetectiveObjType ScDetectiveFunc::GetDetectiveObjectType( SdrObject* pObject,
 
 void ScDetectiveFunc::InsertObject( ScDetectiveObjType eType,
                             const ScAddress& rPosition, const ScRange& rSource,
-                            BOOL bRedLine )
+                            sal_Bool bRedLine )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel) return;
@@ -1701,11 +1701,11 @@ void ScDetectiveFunc::InitializeColors()
     nErrorColor   = rColorCfg.GetColorValue(svtools::CALCDETECTIVEERROR).nColor;
     nCommentColor = rColorCfg.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor;
 
-    bColorsInitialized = TRUE;
+    bColorsInitialized = sal_True;
 }
 
 // static
-BOOL ScDetectiveFunc::IsColorsInitialized()
+sal_Bool ScDetectiveFunc::IsColorsInitialized()
 {
     return bColorsInitialized;
 }
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 0768b5fb2..bd7b1ab66 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star::uno;
 
 //------------------------------------------------------------------------
 
-#define SC_VERSION ((USHORT)251)
+#define SC_VERSION ((sal_uInt16)251)
 
 TYPEINIT1(ScTpCalcItem, SfxPoolItem);
 
@@ -63,7 +63,7 @@ inline long TwipsToEvenHMM(long nTwips)	{ return ( (nTwips * 127 + 72) / 144 ) *
 
 //------------------------------------------------------------------------
 
-USHORT lcl_GetDefaultTabDist()
+sal_uInt16 lcl_GetDefaultTabDist()
 {
     if ( ScOptionsUtil::IsMetricSystem() )
         return 709;					// 1,25 cm
@@ -111,8 +111,8 @@ ScDocOptions::~ScDocOptions()
 
 void ScDocOptions::ResetDocOptions()
 {
-    bIsIgnoreCase		= FALSE;
-    bIsIter				= FALSE;
+    bIsIgnoreCase		= sal_False;
+    bIsIter				= sal_False;
     nIterCount			= 100;
     fIterEps			= 1.0E-3;
     nPrecStandardFormat = SvNumberFormatter::UNLIMITED_PRECISION;
@@ -121,24 +121,24 @@ void ScDocOptions::ResetDocOptions()
     nYear				= 1899;
     nYear2000			= SvNumberFormatter::GetYear2000Default();
     nTabDistance 		= lcl_GetDefaultTabDist();
-    bCalcAsShown		= FALSE;
-    bMatchWholeCell		= TRUE;
-    bDoAutoSpell		= FALSE;
-    bLookUpColRowNames	= TRUE;
-    bFormulaRegexEnabled= TRUE;
+    bCalcAsShown		= sal_False;
+    bMatchWholeCell		= sal_True;
+    bDoAutoSpell		= sal_False;
+    bLookUpColRowNames	= sal_True;
+    bFormulaRegexEnabled= sal_True;
 }
 
 //========================================================================
 //      ScTpCalcItem - Daten fuer die CalcOptions-TabPage
 //========================================================================
 
-//UNUSED2008-05  ScTpCalcItem::ScTpCalcItem( USHORT nWhichP ) : SfxPoolItem( nWhichP )
+//UNUSED2008-05  ScTpCalcItem::ScTpCalcItem( sal_uInt16 nWhichP ) : SfxPoolItem( nWhichP )
 //UNUSED2008-05  {
 //UNUSED2008-05  }
 
 //------------------------------------------------------------------------
 
-ScTpCalcItem::ScTpCalcItem( USHORT nWhichP, const ScDocOptions& rOpt )
+ScTpCalcItem::ScTpCalcItem( sal_uInt16 nWhichP, const ScDocOptions& rOpt )
     :   SfxPoolItem ( nWhichP ),
         theOptions	( rOpt )
 {
@@ -263,7 +263,7 @@ ScDocCfg::ScDocCfg() :
     Sequence<Any> aValues;
     const Any* pValues = NULL;
 
-    USHORT nDateDay, nDateMonth, nDateYear;
+    sal_uInt16 nDateDay, nDateMonth, nDateYear;
     GetDate( nDateDay, nDateMonth, nDateYear );
 
     aNames = GetCalcPropertyNames();
@@ -284,22 +284,22 @@ ScDocCfg::ScDocCfg() :
                         SetIter( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
                         break;
                     case SCCALCOPT_ITER_STEPS:
-                        if (pValues[nProp] >>= nIntVal) SetIterCount( (USHORT) nIntVal );
+                        if (pValues[nProp] >>= nIntVal) SetIterCount( (sal_uInt16) nIntVal );
                         break;
                     case SCCALCOPT_ITER_MINCHG:
                         if (pValues[nProp] >>= fDoubleVal) SetIterEps( fDoubleVal );
                         break;
                     case SCCALCOPT_DATE_DAY:
-                        if (pValues[nProp] >>= nIntVal) nDateDay = (USHORT) nIntVal;
+                        if (pValues[nProp] >>= nIntVal) nDateDay = (sal_uInt16) nIntVal;
                         break;
                     case SCCALCOPT_DATE_MONTH:
-                        if (pValues[nProp] >>= nIntVal) nDateMonth = (USHORT) nIntVal;
+                        if (pValues[nProp] >>= nIntVal) nDateMonth = (sal_uInt16) nIntVal;
                         break;
                     case SCCALCOPT_DATE_YEAR:
-                        if (pValues[nProp] >>= nIntVal) nDateYear = (USHORT) nIntVal;
+                        if (pValues[nProp] >>= nIntVal) nDateYear = (sal_uInt16) nIntVal;
                         break;
                     case SCCALCOPT_DECIMALS:
-                        if (pValues[nProp] >>= nIntVal) SetStdPrecision( (USHORT) nIntVal );
+                        if (pValues[nProp] >>= nIntVal) SetStdPrecision( (sal_uInt16) nIntVal );
                         break;
                     case SCCALCOPT_CASESENSITIVE:
                         // content is reversed
@@ -342,7 +342,7 @@ ScDocCfg::ScDocCfg() :
                     case SCDOCLAYOUTOPT_TABSTOP:
                         // TabDistance in ScDocOptions is in twips
                         if (pValues[nProp] >>= nIntVal)
-                            SetTabDistance( (USHORT) HMMToTwips( nIntVal ) );
+                            SetTabDistance( (sal_uInt16) HMMToTwips( nIntVal ) );
                         break;
                 }
             }
@@ -357,7 +357,7 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG )
     Sequence<Any> aValues(aNames.getLength());
     Any* pValues = aValues.getArray();
 
-    USHORT nDateDay, nDateMonth, nDateYear;
+    sal_uInt16 nDateDay, nDateMonth, nDateYear;
     GetDate( nDateDay, nDateMonth, nDateYear );
 
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
index c90e7d520..d4cd756b0 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -68,8 +68,8 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
     if (pQueryRef->getColSize() < 4)
         return false;
 
-    BOOL bValid;
-    BOOL bFound;
+    sal_Bool bValid;
+    sal_Bool bFound;
     OUString aCellStr;
     SCSIZE nIndex = 0;
     SCROW nRow = 0;
@@ -81,7 +81,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
     {
         ScQueryEntry& rEntry = pParam->GetEntry(nIndex);
 
-        bValid = FALSE;
+        bValid = sal_False;
 
         if (nIndex > 0)
         {
@@ -91,19 +91,19 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
             if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_UND)) )
             {
                 rEntry.eConnect = SC_AND;
-                bValid = TRUE;
+                bValid = sal_True;
             }
             else if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_ODER)) )
             {
                 rEntry.eConnect = SC_OR;
-                bValid = TRUE;
+                bValid = sal_True;
             }
         }
 
         if ((nIndex < 1) || bValid)
         {
             // field name in the 2nd column.
-            bFound = FALSE;
+            bFound = sal_False;
             aCellStr = pQueryRef->getString(1, nRow);
             SCCOL nField = pDBRef->findFieldColumn(aCellStr); // TODO: must be case insensitive comparison.
             if (ValidCol(nField))
@@ -118,7 +118,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
         if (bValid)
         {
             // equality, non-equality operator in the 3rd column.
-            bFound = FALSE;
+            bFound = sal_False;
             aCellStr = pQueryRef->getString(2, nRow);
             lcl_toUpper(aCellStr);
             const sal_Unicode* p = aCellStr.getStr();
@@ -147,7 +147,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
         {
             // Finally, the right-hand-side value in the 4th column.
             *rEntry.pStr = pQueryRef->getString(3, nRow);
-            rEntry.bDoQuery = TRUE;
+            rEntry.bDoQuery = sal_True;
         }
         nIndex++;
         nRow++;
@@ -177,7 +177,7 @@ bool lcl_createExcelQuery(
 
     if (bValid)
     {
-//      ULONG nVisible = 0;
+//      sal_uLong nVisible = 0;
 //      for ( nCol=nCol1; nCol<=nCol2; nCol++ )
 //          nVisible += aCol[nCol].VisibleCount( nRow1+1, nRow2 );
 
@@ -214,7 +214,7 @@ bool lcl_createExcelQuery(
                             pParam->GetEntry(nIndex).eConnect = SC_AND;
                     }
                     else
-                        bValid = FALSE;
+                        bValid = sal_False;
                 }
                 nCol++;
             }
@@ -380,7 +380,7 @@ sal_uInt16 ScDBInternalRange::getCellString(OUString& rStr, ScBaseCell* pCell) c
                 if (pFCell->IsValue())
                 {
                     double fVal = pFCell->GetValue();
-                    ULONG nIndex = pFormatter->GetStandardFormat(
+                    sal_uLong nIndex = pFormatter->GetStandardFormat(
                                         NUMBERFORMAT_NUMBER,
                                         ScGlobal::eLnge);
                     pFormatter->GetInputLineString(fVal, nIndex, aStr);
@@ -392,7 +392,7 @@ sal_uInt16 ScDBInternalRange::getCellString(OUString& rStr, ScBaseCell* pCell) c
             case CELLTYPE_VALUE:
             {
                 double fVal = ((ScValueCell*) pCell)->GetValue();
-                ULONG nIndex = pFormatter->GetStandardFormat(
+                sal_uLong nIndex = pFormatter->GetStandardFormat(
                                         NUMBERFORMAT_NUMBER,
                                         ScGlobal::eLnge);
                 pFormatter->GetInputLineString(fVal, nIndex, aStr);
@@ -419,9 +419,9 @@ SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr)
     SCCOL nDBCol2 = e.Col();
 
     SCCOL   nField = nDBCol1;
-    BOOL    bFound = TRUE;
+    sal_Bool    bFound = sal_True;
 
-    bFound = FALSE;
+    bFound = sal_False;
     OUString aCellStr;
     ScAddress aLook( nDBCol1, nDBRow1, nDBTab1 );
     while (!bFound && (aLook.Col() <= nDBCol2))
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 66a275de8..30c65d293 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -84,8 +84,8 @@ String ScEditUtil::ModifyDelimiters( const String& rOld )
 static String lcl_GetDelimitedString( const EditEngine& rEngine, const sal_Char c )
 {
     String aRet;
-    USHORT nParCount = rEngine.GetParagraphCount();
-    for (USHORT nPar=0; nPar<nParCount; nPar++)
+    sal_uInt16 nParCount = rEngine.GetParagraphCount();
+    for (sal_uInt16 nPar=0; nPar<nParCount; nPar++)
     {
         if (nPar > 0)
             aRet += c;
@@ -106,17 +106,17 @@ String ScEditUtil::GetMultilineString( const EditEngine& rEngine )
 
 //------------------------------------------------------------------------
 
-Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToTop )
+Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, sal_Bool bForceToTop )
 {
     // bForceToTop = always align to top, for editing
-    // (FALSE for querying URLs etc.)
+    // (sal_False for querying URLs etc.)
 
     if (!pPattern)
         pPattern = pDoc->GetPattern( nCol, nRow, nTab );
 
     Point aStartPos = aScrPos;
 
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
     const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
@@ -135,7 +135,7 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT
     }
 
     const SvxMarginItem* pMargin = (const SvxMarginItem*)&pPattern->GetItem(ATTR_MARGIN);
-    USHORT nIndent = 0;
+    sal_uInt16 nIndent = 0;
     if ( ((const SvxHorJustifyItem&)pPattern->GetItem(ATTR_HOR_JUSTIFY)).GetValue() ==
                 SVX_HOR_JUSTIFY_LEFT )
         nIndent = ((const SfxUInt16Item&)pPattern->GetItem(ATTR_INDENT)).GetValue();
@@ -151,7 +151,7 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT
                                                 GetItem(ATTR_VER_JUSTIFY)).GetValue();
 
     //	asian vertical is always edited top-aligned
-    BOOL bAsianVertical = ((const SfxBoolItem&)pPattern->GetItem( ATTR_STACKED )).GetValue() &&
+    sal_Bool bAsianVertical = ((const SfxBoolItem&)pPattern->GetItem( ATTR_STACKED )).GetValue() &&
         ((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue();
 
     if ( eJust == SVX_VER_JUSTIFY_TOP ||
@@ -163,7 +163,7 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT
         pDev->SetMapMode( MAP_PIXEL );
 
         long nTextHeight = pDoc->GetNeededSize( nCol, nRow, nTab,
-                                                pDev, nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
+                                                pDev, nPPTX, nPPTY, aZoomX, aZoomY, sal_False );
         if (!nTextHeight)
         {									// leere Zelle
             Font aFont;
@@ -202,12 +202,12 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT
 ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
     pEngine( pEng ),
     pEditAttrs( NULL ),
-    bNeedsObject( FALSE ),
-    bNeedsCellAttr( FALSE )
+    bNeedsObject( sal_False ),
+    bNeedsCellAttr( sal_False )
 {
     if ( pEngine->GetParagraphCount() > 1 )
     {
-        bNeedsObject = TRUE;			//!	Zellatribute finden ?
+        bNeedsObject = sal_True;			//!	Zellatribute finden ?
     }
     else
     {
@@ -216,11 +216,11 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
                                         ESelection(0,0,0,pEngine->GetTextLen(0)), EditEngineAttribs_OnlyHard ) );
         const SfxItemSet& rEditDefaults = pEngine->GetDefaults();
 
-        for (USHORT nId = EE_CHAR_START; nId <= EE_CHAR_END && !bNeedsObject; nId++)
+        for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END && !bNeedsObject; nId++)
         {
-            SfxItemState eState = pEditAttrs->GetItemState( nId, FALSE, &pItem );
+            SfxItemState eState = pEditAttrs->GetItemState( nId, sal_False, &pItem );
             if (eState == SFX_ITEM_DONTCARE)
-                bNeedsObject = TRUE;
+                bNeedsObject = sal_True;
             else if (eState == SFX_ITEM_SET)
             {
                 if ( nId == EE_CHAR_ESCAPEMENT || nId == EE_CHAR_PAIRKERNING ||
@@ -232,27 +232,27 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
                     //	from "user attributes applied to the cell".
 
                     if ( *pItem != rEditDefaults.Get(nId) )
-                        bNeedsObject = TRUE;
+                        bNeedsObject = sal_True;
                 }
                 else
                     if (!bNeedsCellAttr)
                         if ( *pItem != rEditDefaults.Get(nId) )
-                            bNeedsCellAttr = TRUE;
+                            bNeedsCellAttr = sal_True;
                 //  rEditDefaults contains the defaults from the cell format
             }
         }
 
         //	Feldbefehle enthalten?
 
-        SfxItemState eFieldState = pEditAttrs->GetItemState( EE_FEATURE_FIELD, FALSE );
+        SfxItemState eFieldState = pEditAttrs->GetItemState( EE_FEATURE_FIELD, sal_False );
         if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
-            bNeedsObject = TRUE;
+            bNeedsObject = sal_True;
 
         //	not converted characters?
 
-        SfxItemState eConvState = pEditAttrs->GetItemState( EE_FEATURE_NOTCONV, FALSE );
+        SfxItemState eConvState = pEditAttrs->GetItemState( EE_FEATURE_NOTCONV, sal_False );
         if ( eConvState == SFX_ITEM_DONTCARE || eConvState == SFX_ITEM_SET )
-            bNeedsObject = TRUE;
+            bNeedsObject = sal_True;
     }
 }
 
@@ -265,12 +265,12 @@ ScEditAttrTester::~ScEditAttrTester()
 //------------------------------------------------------------------------
 
 ScEnginePoolHelper::ScEnginePoolHelper( SfxItemPool* pEnginePoolP,
-                BOOL bDeleteEnginePoolP )
+                sal_Bool bDeleteEnginePoolP )
             :
             pEnginePool( pEnginePoolP ),
             pDefaults( NULL ),
             bDeleteEnginePool( bDeleteEnginePoolP ),
-            bDeleteDefaults( FALSE )
+            bDeleteDefaults( sal_False )
 {
 }
 
@@ -280,7 +280,7 @@ ScEnginePoolHelper::ScEnginePoolHelper( const ScEnginePoolHelper& rOrg )
             pEnginePool( rOrg.bDeleteEnginePool ? rOrg.pEnginePool->Clone() : rOrg.pEnginePool ),
             pDefaults( NULL ),
             bDeleteEnginePool( rOrg.bDeleteEnginePool ),
-            bDeleteDefaults( FALSE )
+            bDeleteDefaults( sal_False )
 {
 }
 
@@ -297,7 +297,7 @@ ScEnginePoolHelper::~ScEnginePoolHelper()
 //------------------------------------------------------------------------
 
 ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP,
-                BOOL bDeleteEnginePoolP )
+                sal_Bool bDeleteEnginePoolP )
             :
             ScEnginePoolHelper( pEnginePoolP, bDeleteEnginePoolP ),
             EditEngine( pEnginePoolP )
@@ -323,41 +323,41 @@ ScEditEngineDefaulter::~ScEditEngineDefaulter()
 }
 
 
-void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, BOOL bRememberCopy )
+void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRememberCopy )
 {
     if ( bRememberCopy )
     {
         if ( bDeleteDefaults )
             delete pDefaults;
         pDefaults = new SfxItemSet( rSet );
-        bDeleteDefaults = TRUE;
+        bDeleteDefaults = sal_True;
     }
     const SfxItemSet& rNewSet = bRememberCopy ? *pDefaults : rSet;
-    BOOL bUndo = IsUndoEnabled();
-    EnableUndo( FALSE );
-    BOOL bUpdateMode = GetUpdateMode();
+    sal_Bool bUndo = IsUndoEnabled();
+    EnableUndo( sal_False );
+    sal_Bool bUpdateMode = GetUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
-    USHORT nPara = GetParagraphCount();
-    for ( USHORT j=0; j<nPara; j++ )
+        SetUpdateMode( sal_False );
+    sal_uInt16 nPara = GetParagraphCount();
+    for ( sal_uInt16 j=0; j<nPara; j++ )
     {
         SetParaAttribs( j, rNewSet );
     }
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
     if ( bUndo )
-        EnableUndo( TRUE );
+        EnableUndo( sal_True );
 }
 
 
-void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, BOOL bTakeOwnership )
+void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, sal_Bool bTakeOwnership )
 {
     if ( bDeleteDefaults )
         delete pDefaults;
     pDefaults = pSet;
     bDeleteDefaults = bTakeOwnership;
     if ( pDefaults )
-        SetDefaults( *pDefaults, FALSE );
+        SetDefaults( *pDefaults, sal_False );
 }
 
 
@@ -366,10 +366,10 @@ void ScEditEngineDefaulter::SetDefaultItem( const SfxPoolItem& rItem )
     if ( !pDefaults )
     {
         pDefaults = new SfxItemSet( GetEmptyItemSet() );
-        bDeleteDefaults = TRUE;
+        bDeleteDefaults = sal_True;
     }
     pDefaults->Put( rItem );
-    SetDefaults( *pDefaults, FALSE );
+    SetDefaults( *pDefaults, sal_False );
 }
 
 const SfxItemSet& ScEditEngineDefaulter::GetDefaults()
@@ -377,90 +377,90 @@ const SfxItemSet& ScEditEngineDefaulter::GetDefaults()
     if ( !pDefaults )
     {
         pDefaults = new SfxItemSet( GetEmptyItemSet() );
-        bDeleteDefaults = TRUE;
+        bDeleteDefaults = sal_True;
     }
     return *pDefaults;
 }
 
 void ScEditEngineDefaulter::SetText( const EditTextObject& rTextObject )
 {
-    BOOL bUpdateMode = GetUpdateMode();
+    sal_Bool bUpdateMode = GetUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
     EditEngine::SetText( rTextObject );
     if ( pDefaults )
-        SetDefaults( *pDefaults, FALSE );
+        SetDefaults( *pDefaults, sal_False );
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 }
 
 void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
-            const SfxItemSet& rSet, BOOL bRememberCopy )
+            const SfxItemSet& rSet, sal_Bool bRememberCopy )
 {
-    BOOL bUpdateMode = GetUpdateMode();
+    sal_Bool bUpdateMode = GetUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
     EditEngine::SetText( rTextObject );
     SetDefaults( rSet, bRememberCopy );
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 }
 
 void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObject,
-            SfxItemSet* pSet, BOOL bTakeOwnership )
+            SfxItemSet* pSet, sal_Bool bTakeOwnership )
 {
-    BOOL bUpdateMode = GetUpdateMode();
+    sal_Bool bUpdateMode = GetUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
     EditEngine::SetText( rTextObject );
     SetDefaults( pSet, bTakeOwnership );
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 }
 
 
 void ScEditEngineDefaulter::SetText( const String& rText )
 {
-    BOOL bUpdateMode = GetUpdateMode();
+    sal_Bool bUpdateMode = GetUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
     EditEngine::SetText( rText );
     if ( pDefaults )
-        SetDefaults( *pDefaults, FALSE );
+        SetDefaults( *pDefaults, sal_False );
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 }
 
 void ScEditEngineDefaulter::SetTextNewDefaults( const String& rText,
-            const SfxItemSet& rSet, BOOL bRememberCopy )
+            const SfxItemSet& rSet, sal_Bool bRememberCopy )
 {
-    BOOL bUpdateMode = GetUpdateMode();
+    sal_Bool bUpdateMode = GetUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
     EditEngine::SetText( rText );
     SetDefaults( rSet, bRememberCopy );
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 }
 
 void ScEditEngineDefaulter::SetTextNewDefaults( const String& rText,
-            SfxItemSet* pSet, BOOL bTakeOwnership )
+            SfxItemSet* pSet, sal_Bool bTakeOwnership )
 {
-    BOOL bUpdateMode = GetUpdateMode();
+    sal_Bool bUpdateMode = GetUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
+        SetUpdateMode( sal_False );
     EditEngine::SetText( rText );
     SetDefaults( pSet, bTakeOwnership );
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 }
 
 void ScEditEngineDefaulter::RepeatDefaults()
 {
     if ( pDefaults )
     {
-        USHORT nPara = GetParagraphCount();
-        for ( USHORT j=0; j<nPara; j++ )
+        sal_uInt16 nPara = GetParagraphCount();
+        for ( sal_uInt16 j=0; j<nPara; j++ )
             SetParaAttribs( j, *pDefaults );
     }
 }
@@ -468,18 +468,18 @@ void ScEditEngineDefaulter::RepeatDefaults()
 void ScEditEngineDefaulter::RemoveParaAttribs()
 {
     SfxItemSet* pCharItems = NULL;
-    BOOL bUpdateMode = GetUpdateMode();
+    sal_Bool bUpdateMode = GetUpdateMode();
     if ( bUpdateMode )
-        SetUpdateMode( FALSE );
-    USHORT nParCount = GetParagraphCount();
-    for (USHORT nPar=0; nPar<nParCount; nPar++)
+        SetUpdateMode( sal_False );
+    sal_uInt16 nParCount = GetParagraphCount();
+    for (sal_uInt16 nPar=0; nPar<nParCount; nPar++)
     {
         const SfxItemSet& rParaAttribs = GetParaAttribs( nPar );
-        USHORT nWhich;
+        sal_uInt16 nWhich;
         for (nWhich = EE_CHAR_START; nWhich <= EE_CHAR_END; nWhich ++)
         {
             const SfxPoolItem* pParaItem;
-            if ( rParaAttribs.GetItemState( nWhich, FALSE, &pParaItem ) == SFX_ITEM_SET )
+            if ( rParaAttribs.GetItemState( nWhich, sal_False, &pParaItem ) == SFX_ITEM_SET )
             {
                 //	if defaults are set, use only items that are different from default
                 if ( !pDefaults || *pParaItem != pDefaults->Get(nWhich) )
@@ -499,11 +499,11 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
             //	loop through the portions of the paragraph, and set only those items
             //	that are not overridden by existing character attributes
 
-            USHORT nPCount = aPortions.Count();
-            USHORT nStart = 0;
-            for ( USHORT nPos=0; nPos<nPCount; nPos++ )
+            sal_uInt16 nPCount = aPortions.Count();
+            sal_uInt16 nStart = 0;
+            for ( sal_uInt16 nPos=0; nPos<nPCount; nPos++ )
             {
-                USHORT nEnd = aPortions.GetObject( nPos );
+                sal_uInt16 nEnd = aPortions.GetObject( nPos );
                 ESelection aSel( nPar, nStart, nPar, nEnd );
                 SfxItemSet aOldCharAttrs = GetAttribs( aSel );
                 SfxItemSet aNewCharAttrs = *pCharItems;
@@ -512,7 +512,7 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
                     //	Clear those items that are different from existing character attributes.
                     //	Where no character attributes are set, GetAttribs returns the paragraph attributes.
                     const SfxPoolItem* pItem;
-                    if ( aNewCharAttrs.GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET &&
+                    if ( aNewCharAttrs.GetItemState( nWhich, sal_False, &pItem ) == SFX_ITEM_SET &&
                          *pItem != aOldCharAttrs.Get(nWhich) )
                     {
                         aNewCharAttrs.ClearItem(nWhich);
@@ -536,7 +536,7 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
         }
     }
     if ( bUpdateMode )
-        SetUpdateMode( TRUE );
+        SetUpdateMode( sal_True );
 }
 
 //------------------------------------------------------------------------
@@ -640,13 +640,13 @@ ScHeaderFieldData::ScHeaderFieldData()
     eNumType = SVX_ARABIC;
 }
 
-ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, BOOL bDeleteEnginePoolP )
+ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, sal_Bool bDeleteEnginePoolP )
         : ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP )
 {
 }
 
 String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
-                                    USHORT /* nPara */, USHORT /* nPos */,
+                                    sal_uInt16 /* nPara */, sal_uInt16 /* nPos */,
                                     Color*& /* rTxtColor */, Color*& /* rFldColor */ )
 {
     String aRet;
@@ -699,10 +699,10 @@ String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
 //------------------------------------------------------------------------
 
 ScFieldEditEngine::ScFieldEditEngine( SfxItemPool* pEnginePoolP,
-            SfxItemPool* pTextObjectPool, BOOL bDeleteEnginePoolP )
+            SfxItemPool* pTextObjectPool, sal_Bool bDeleteEnginePoolP )
         :
         ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP ),
-        bExecuteURL( TRUE )
+        bExecuteURL( sal_True )
 {
     if ( pTextObjectPool )
         SetEditTextObjectPool( pTextObjectPool );
@@ -712,7 +712,7 @@ ScFieldEditEngine::ScFieldEditEngine( SfxItemPool* pEnginePoolP,
 }
 
 String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
-                                    USHORT /* nPara */, USHORT /* nPos */,
+                                    sal_uInt16 /* nPara */, sal_uInt16 /* nPos */,
                                     Color*& rTxtColor, Color*& /* rFldColor */ )
 {
     String aRet;
@@ -755,7 +755,7 @@ String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
     return aRet;
 }
 
-void __EXPORT ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, USHORT, USHORT )
+void __EXPORT ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_uInt16, sal_uInt16 )
 {
     const SvxFieldData* pFld = rField.GetField();
 
@@ -769,7 +769,7 @@ void __EXPORT ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, USHOR
 //------------------------------------------------------------------------
 
 ScNoteEditEngine::ScNoteEditEngine( SfxItemPool* pEnginePoolP,
-            SfxItemPool* pTextObjectPool, BOOL bDeleteEnginePoolP ) :
+            SfxItemPool* pTextObjectPool, sal_Bool bDeleteEnginePoolP ) :
     ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP )
 {
     if ( pTextObjectPool )
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index 9ac27c0f8..57b81df46 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -71,7 +71,7 @@ Sequence<OUString> ScFilterOptions::GetPropertyNames()
 
 ScFilterOptions::ScFilterOptions() :
     ConfigItem( OUString::createFromAscii( CFGPATH_FILTER ) ),
-    bWK3Flag( FALSE ),
+    bWK3Flag( sal_False ),
     fExcelColScale( 0 ),
     fExcelRowScale( 0 )
 {
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index 4ca62d87e..d1c4c8692 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -46,10 +46,10 @@ TYPEINIT1(ScDataPilotModifiedHint, SfxHint);
 //      ScPaintHint - Angabe, was neu gezeichnet werden muss
 // -----------------------------------------------------------------------
 
-ScPaintHint::ScPaintHint( const ScRange& rRng, USHORT nPaint ) :
+ScPaintHint::ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint ) :
     aRange( rRng ),
     nParts( nPaint ),
-    bPrint( TRUE )
+    bPrint( sal_True )
 {
 }
 
@@ -79,7 +79,7 @@ ScUpdateRefHint::~ScUpdateRefHint()
 //      ScPointerChangedHint - Pointer ist ungueltig geworden
 // -----------------------------------------------------------------------
 
-//UNUSED2008-05  ScPointerChangedHint::ScPointerChangedHint( USHORT nF ) :
+//UNUSED2008-05  ScPointerChangedHint::ScPointerChangedHint( sal_uInt16 nF ) :
 //UNUSED2008-05      nFlags( nF )
 //UNUSED2008-05  {
 //UNUSED2008-05  }
@@ -109,7 +109,7 @@ void ScLinkRefreshedHint::SetSheetLink( const String& rSourceUrl )
 }
 
 void ScLinkRefreshedHint::SetDdeLink(
-            const String& rA, const String& rT, const String& rI, BYTE nM )
+            const String& rA, const String& rT, const String& rI, sal_uInt8 nM )
 {
     nLinkType = SC_LINKREFTYPE_DDE;
     aDdeAppl  = rA;
@@ -129,7 +129,7 @@ void ScLinkRefreshedHint::SetAreaLink( const ScAddress& rPos )
 // -----------------------------------------------------------------------
 
 ScAutoStyleHint::ScAutoStyleHint( const ScRange& rR, const String& rSt1,
-                                        ULONG nT, const String& rSt2 ) :
+                                        sal_uLong nT, const String& rSt2 ) :
     aRange( rR ),
     aStyle1( rSt1 ),
     aStyle2( rSt2 ),
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 469d2c61c..b06b0c564 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -52,7 +52,7 @@ using namespace com::sun::star::uno;
 //------------------------------------------------------------------
 
 //	Version, ab der das Item kompatibel ist
-#define SC_VERSION ((USHORT)351)
+#define SC_VERSION ((sal_uInt16)351)
 
 
 //========================================================================
@@ -82,15 +82,15 @@ ScInputOptions::~ScInputOptions()
 void ScInputOptions::SetDefaults()
 {
     nMoveDir		= DIR_BOTTOM;
-    bMoveSelection	= TRUE;
-    bEnterEdit		= FALSE;
-    bExtendFormat	= FALSE;
-    bRangeFinder	= TRUE;
-    bExpandRefs		= FALSE;
-    bMarkHeader		= TRUE;
-    bUseTabCol		= FALSE;
-    bTextWysiwyg	= FALSE;
-    bReplCellsWarn  = TRUE;
+    bMoveSelection	= sal_True;
+    bEnterEdit		= sal_False;
+    bExtendFormat	= sal_False;
+    bRangeFinder	= sal_True;
+    bExpandRefs		= sal_False;
+    bMarkHeader		= sal_True;
+    bUseTabCol		= sal_False;
+    bTextWysiwyg	= sal_False;
+    bReplCellsWarn  = sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -174,7 +174,7 @@ ScInputCfg::ScInputCfg() :
                 {
                     case SCINPUTOPT_MOVEDIR:
                         if ( pValues[nProp] >>= nIntVal )
-                            SetMoveDir( (USHORT)nIntVal );
+                            SetMoveDir( (sal_uInt16)nIntVal );
                         break;
                     case SCINPUTOPT_MOVESEL:
                         SetMoveSelection( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index aefa84cbe..08e35b644 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -80,7 +80,7 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack, 8, 4 )
 IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter, 32, 16 )
 
 ScTokenStack* ScInterpreter::pGlobalStack = NULL;
-BOOL ScInterpreter::bGlobalStackInUse = FALSE;
+sal_Bool ScInterpreter::bGlobalStackInUse = sal_False;
 
 using namespace formula;
 using ::std::auto_ptr;
@@ -270,7 +270,7 @@ void ScInterpreter::ScChoseJump()
                                     fVal = ::rtl::math::approxFloor( fVal);
                                     if ( (fVal < 1) || (fVal >= nJumpCount))
                                     {
-                                        bIsValue = FALSE;
+                                        bIsValue = sal_False;
                                         fVal = CreateDoubleError(
                                                 errIllegalArgument);
                                     }
@@ -458,11 +458,11 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
                         // Do not modify the original range because we use it
                         // to adjust the size of the result matrix if necessary.
                         ScAddress aAdr( aRange.aStart);
-                        ULONG nCol = (ULONG)aAdr.Col() + nC;
-                        ULONG nRow = (ULONG)aAdr.Row() + nR;
-                        if ((nCol > static_cast<ULONG>(aRange.aEnd.Col()) &&
+                        sal_uLong nCol = (sal_uLong)aAdr.Col() + nC;
+                        sal_uLong nRow = (sal_uLong)aAdr.Row() + nR;
+                        if ((nCol > static_cast<sal_uLong>(aRange.aEnd.Col()) &&
                                     aRange.aEnd.Col() != aRange.aStart.Col())
-                                || (nRow > static_cast<ULONG>(aRange.aEnd.Row()) &&
+                                || (nRow > static_cast<sal_uLong>(aRange.aEnd.Row()) &&
                                     aRange.aEnd.Row() != aRange.aStart.Row()))
                           {
                             fVal = CreateDoubleError( NOTAVAILABLE );
@@ -584,7 +584,7 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
         {   // push all results that have no jump path
             if ( pResMat )
             {
-                // a FALSE without path results in an empty path value
+                // a sal_False without path results in an empty path value
                 if ( fBool == 0.0 )
                     pResMat->PutEmptyPath( nC, nR );
                 else
@@ -783,16 +783,16 @@ double ScInterpreter::Compare()
         {
             case svEmptyCell:
                 Pop();
-                aComp.bEmpty[ i ] = TRUE;
+                aComp.bEmpty[ i ] = sal_True;
                 break;
             case svMissing:
             case svDouble:
                 aComp.nVal[ i ] = GetDouble();
-                aComp.bVal[ i ] = TRUE;
+                aComp.bVal[ i ] = sal_True;
                 break;
             case svString:
                 *aComp.pVal[ i ] = GetString();
-                aComp.bVal[ i ] = FALSE;
+                aComp.bVal[ i ] = sal_False;
                 break;
             case svDoubleRef :
             case svSingleRef :
@@ -802,16 +802,16 @@ double ScInterpreter::Compare()
                     break;
                 ScBaseCell* pCell = GetCell( aAdr );
                 if (HasCellEmptyData( pCell))
-                    aComp.bEmpty[ i ] = TRUE;
+                    aComp.bEmpty[ i ] = sal_True;
                 else if (HasCellStringData( pCell))
                 {
                     GetCellString( *aComp.pVal[ i ], pCell);
-                    aComp.bVal[ i ] = FALSE;
+                    aComp.bVal[ i ] = sal_False;
                 }
                 else
                 {
                     aComp.nVal[ i ] = GetCellValue( aAdr, pCell );
-                    aComp.bVal[ i ] = TRUE;
+                    aComp.bVal[ i ] = sal_True;
                 }
             }
             break;
@@ -840,32 +840,32 @@ ScMatrixRef ScInterpreter::CompareMat( ScCompareOptions* pOptions )
         {
             case svEmptyCell:
                 Pop();
-                aComp.bEmpty[ i ] = TRUE;
+                aComp.bEmpty[ i ] = sal_True;
                 break;
             case svMissing:
             case svDouble:
                 aComp.nVal[ i ] = GetDouble();
-                aComp.bVal[ i ] = TRUE;
+                aComp.bVal[ i ] = sal_True;
                 break;
             case svString:
                 *aComp.pVal[ i ] = GetString();
-                aComp.bVal[ i ] = FALSE;
+                aComp.bVal[ i ] = sal_False;
                 break;
             case svSingleRef:
             {
                 PopSingleRef( aAdr );
                 ScBaseCell* pCell = GetCell( aAdr );
                 if (HasCellEmptyData( pCell))
-                    aComp.bEmpty[ i ] = TRUE;
+                    aComp.bEmpty[ i ] = sal_True;
                 else if (HasCellStringData( pCell))
                 {
                     GetCellString( *aComp.pVal[ i ], pCell);
-                    aComp.bVal[ i ] = FALSE;
+                    aComp.bVal[ i ] = sal_False;
                 }
                 else
                 {
                     aComp.nVal[ i ] = GetCellValue( aAdr, pCell );
-                    aComp.bVal[ i ] = TRUE;
+                    aComp.bVal[ i ] = sal_True;
                 }
             }
             break;
@@ -909,15 +909,15 @@ ScMatrixRef ScInterpreter::CompareMat( ScCompareOptions* pOptions )
                         {
                             if ( pMat[i]->IsString(j,k) )
                             {
-                                aComp.bVal[i] = FALSE;
+                                aComp.bVal[i] = sal_False;
                                 *aComp.pVal[i] = pMat[i]->GetString(j,k);
                                 aComp.bEmpty[i] = pMat[i]->IsEmpty(j,k);
                             }
                             else
                             {
-                                aComp.bVal[i] = TRUE;
+                                aComp.bVal[i] = sal_True;
                                 aComp.nVal[i] = pMat[i]->GetDouble(j,k);
-                                aComp.bEmpty[i] = FALSE;
+                                aComp.bEmpty[i] = sal_False;
                             }
                         }
                         pResMat->PutDouble( CompareFunc( aComp, pOptions ), j,k );
@@ -940,13 +940,13 @@ ScMatrixRef ScInterpreter::CompareMat( ScCompareOptions* pOptions )
             {
                 if ( pMat[i]->IsValue(j) )
                 {
-                    aComp.bVal[i] = TRUE;
+                    aComp.bVal[i] = sal_True;
                     aComp.nVal[i] = pMat[i]->GetDouble(j);
-                    aComp.bEmpty[i] = FALSE;
+                    aComp.bEmpty[i] = sal_False;
                 }
                 else
                 {
-                    aComp.bVal[i] = FALSE;
+                    aComp.bVal[i] = sal_False;
                     *aComp.pVal[i] = pMat[i]->GetString(j);
                     aComp.bEmpty[i] = pMat[i]->IsEmpty(j);
                 }
@@ -1126,8 +1126,8 @@ void ScInterpreter::ScAnd()
     short nParamCount = GetByte();
     if ( MustHaveParamCountMin( nParamCount, 1 ) )
     {
-        BOOL bHaveValue = FALSE;
-        short nRes = TRUE;
+        sal_Bool bHaveValue = sal_False;
+        short nRes = sal_True;
         size_t nRefInList = 0;
         while( nParamCount-- > 0)
         {
@@ -1136,7 +1136,7 @@ void ScInterpreter::ScAnd()
                 switch ( GetStackType() )
                 {
                     case svDouble :
-                        bHaveValue = TRUE;
+                        bHaveValue = sal_True;
                         nRes &= ( PopDouble() != 0.0 );
                     break;
                     case svString :
@@ -1152,7 +1152,7 @@ void ScInterpreter::ScAnd()
                             ScBaseCell* pCell = GetCell( aAdr );
                             if ( HasCellValueData( pCell ) )
                             {
-                                bHaveValue = TRUE;
+                                bHaveValue = sal_True;
                                 nRes &= ( GetCellValue( aAdr, pCell ) != 0.0 );
                             }
                             // else: Xcl setzt hier keinen Fehler
@@ -1167,11 +1167,11 @@ void ScInterpreter::ScAnd()
                         if ( !nGlobalError )
                         {
                             double fVal;
-                            USHORT nErr = 0;
+                            sal_uInt16 nErr = 0;
                             ScValueIterator aValIter( pDok, aRange );
                             if ( aValIter.GetFirst( fVal, nErr ) )
                             {
-                                bHaveValue = TRUE;
+                                bHaveValue = sal_True;
                                 do
                                 {
                                     nRes &= ( fVal != 0.0 );
@@ -1187,13 +1187,13 @@ void ScInterpreter::ScAnd()
                         ScMatrixRef pMat = GetMatrix();
                         if ( pMat )
                         {
-                            bHaveValue = TRUE;
+                            bHaveValue = sal_True;
                             double fVal = pMat->And();
-                            USHORT nErr = GetDoubleErrorValue( fVal );
+                            sal_uInt16 nErr = GetDoubleErrorValue( fVal );
                             if ( nErr )
                             {
                                 SetError( nErr );
-                                nRes = FALSE;
+                                nRes = sal_False;
                             }
                             else
                                 nRes &= (fVal != 0.0);
@@ -1224,8 +1224,8 @@ void ScInterpreter::ScOr()
     short nParamCount = GetByte();
     if ( MustHaveParamCountMin( nParamCount, 1 ) )
     {
-        BOOL bHaveValue = FALSE;
-        short nRes = FALSE;
+        sal_Bool bHaveValue = sal_False;
+        short nRes = sal_False;
         size_t nRefInList = 0;
         while( nParamCount-- > 0)
         {
@@ -1234,7 +1234,7 @@ void ScInterpreter::ScOr()
                 switch ( GetStackType() )
                 {
                     case svDouble :
-                        bHaveValue = TRUE;
+                        bHaveValue = sal_True;
                         nRes |= ( PopDouble() != 0.0 );
                     break;
                     case svString :
@@ -1250,7 +1250,7 @@ void ScInterpreter::ScOr()
                             ScBaseCell* pCell = GetCell( aAdr );
                             if ( HasCellValueData( pCell ) )
                             {
-                                bHaveValue = TRUE;
+                                bHaveValue = sal_True;
                                 nRes |= ( GetCellValue( aAdr, pCell ) != 0.0 );
                             }
                             // else: Xcl setzt hier keinen Fehler
@@ -1265,11 +1265,11 @@ void ScInterpreter::ScOr()
                         if ( !nGlobalError )
                         {
                             double fVal;
-                            USHORT nErr = 0;
+                            sal_uInt16 nErr = 0;
                             ScValueIterator aValIter( pDok, aRange );
                             if ( aValIter.GetFirst( fVal, nErr ) )
                             {
-                                bHaveValue = TRUE;
+                                bHaveValue = sal_True;
                                 do
                                 {
                                     nRes |= ( fVal != 0.0 );
@@ -1282,17 +1282,17 @@ void ScInterpreter::ScOr()
                     break;
                     case svMatrix:
                     {
-                        bHaveValue = TRUE;
+                        bHaveValue = sal_True;
                         ScMatrixRef pMat = GetMatrix();
                         if ( pMat )
                         {
-                            bHaveValue = TRUE;
+                            bHaveValue = sal_True;
                             double fVal = pMat->Or();
-                            USHORT nErr = GetDoubleErrorValue( fVal );
+                            sal_uInt16 nErr = GetDoubleErrorValue( fVal );
                             if ( nErr )
                             {
                                 SetError( nErr );
-                                nRes = FALSE;
+                                nRes = sal_False;
                             }
                             else
                                 nRes |= (fVal != 0.0);
@@ -1363,7 +1363,7 @@ void ScInterpreter::ScPercentSign()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPercentSign" );
     nFuncFmtType = NUMBERFORMAT_PERCENT;
     const FormulaToken* pSaveCur = pCur;
-    BYTE nSavePar = cPar;
+    sal_uInt8 nSavePar = cPar;
     PushInt( 100 );
     cPar = 2;
     FormulaByteToken aDivOp( ocDiv, cPar );
@@ -1641,7 +1641,7 @@ void ScInterpreter::ScIsEmpty()
                 pJumpMatrix->GetPos( nC, nR);
                 if ( nC < nCols && nR < nRows )
                     nRes = pMat->IsEmpty( nC, nR);
-                // else: FALSE, not empty (which is what Xcl does)
+                // else: sal_False, not empty (which is what Xcl does)
             }
         }
         break;
@@ -1745,7 +1745,7 @@ void ScInterpreter::ScIsLogical()
             {
                 if (HasCellValueData(pCell))
                 {
-                    ULONG nFormat = GetCellNumberFormat( aAdr, pCell );
+                    sal_uLong nFormat = GetCellNumberFormat( aAdr, pCell );
                     nRes = ( pFormatter->GetType(nFormat)
                                                  == NUMBERFORMAT_LOGICAL);
                 }
@@ -1794,7 +1794,7 @@ void ScInterpreter::ScType()
                         break;
                     case CELLTYPE_VALUE :
                         {
-                            ULONG nFormat = GetCellNumberFormat( aAdr, pCell );
+                            sal_uLong nFormat = GetCellNumberFormat( aAdr, pCell );
                             if (pFormatter->GetType(nFormat)
                                                      == NUMBERFORMAT_LOGICAL)
                                 nType = 4;
@@ -1849,13 +1849,13 @@ void ScInterpreter::ScType()
 }
 
 
-inline BOOL lcl_FormatHasNegColor( const SvNumberformat* pFormat )
+inline sal_Bool lcl_FormatHasNegColor( const SvNumberformat* pFormat )
 {
     return pFormat && pFormat->GetColor( 1 );
 }
 
 
-inline BOOL lcl_FormatHasOpenPar( const SvNumberformat* pFormat )
+inline sal_Bool lcl_FormatHasOpenPar( const SvNumberformat* pFormat )
 {
     return pFormat && (pFormat->GetFormatstring().Search( '(' ) != STRING_NOTFOUND);
 }
@@ -1863,11 +1863,11 @@ inline BOOL lcl_FormatHasOpenPar( const SvNumberformat* pFormat )
 
 void ScInterpreter::ScCell()
 {   // ATTRIBUTE ; [REF]
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         ScAddress aCellPos( aPos );
-        BOOL bError = FALSE;
+        sal_Bool bError = sal_False;
         if( nParamCount == 2 )
             bError = !PopDoubleRefOrSingleRef( aCellPos );
         String aInfoType( GetString() );
@@ -1895,7 +1895,7 @@ void ScInterpreter::ScCell()
             }
             else if( aInfoType.EqualsAscii( "ADDRESS" ) )
             {   // address formatted as [['FILENAME'#]$TABLE.]$COL$ROW
-                USHORT nFlags = (aCellPos.Tab() == aPos.Tab()) ? (SCA_ABS) : (SCA_ABS_3D);
+                sal_uInt16 nFlags = (aCellPos.Tab() == aPos.Tab()) ? (SCA_ABS) : (SCA_ABS_3D);
                 aCellPos.Format( aFuncResult, nFlags, pDok, pDok->GetAddressConvention() );
                 PushString( aFuncResult );
             }
@@ -2000,10 +2000,10 @@ void ScInterpreter::ScCell()
 // *** FORMATTING ***
             else if( aInfoType.EqualsAscii( "FORMAT" ) )
             {   // specific format code for standard formats
-                ULONG   nFormat = pDok->GetNumberFormat( aCellPos );
-                BOOL    bAppendPrec = TRUE;
-                USHORT  nPrec, nLeading;
-                BOOL    bThousand, bIsRed;
+                sal_uLong   nFormat = pDok->GetNumberFormat( aCellPos );
+                sal_Bool    bAppendPrec = sal_True;
+                sal_uInt16  nPrec, nLeading;
+                sal_Bool    bThousand, bIsRed;
                 pFormatter->GetFormatSpecialInfo( nFormat, bThousand, bIsRed, nPrec, nLeading );
 
                 switch( pFormatter->GetType( nFormat ) )
@@ -2014,7 +2014,7 @@ void ScInterpreter::ScCell()
                     case NUMBERFORMAT_PERCENT:      aFuncResult = 'P';                      break;
                     default:
                     {
-                        bAppendPrec = FALSE;
+                        bAppendPrec = sal_False;
                         switch( pFormatter->GetIndexTableOffset( nFormat ) )
                         {
                             case NF_DATE_SYSTEM_SHORT:
@@ -2240,7 +2240,7 @@ void ScInterpreter::ScIsNV()
             else
             {
                 ScBaseCell* pCell = GetCell( aAdr );
-                USHORT nErr = GetCellErrCode( pCell );
+                sal_uInt16 nErr = GetCellErrCode( pCell );
                 nRes = (nErr == NOTAVAILABLE);
             }
         }
@@ -2289,7 +2289,7 @@ void ScInterpreter::ScIsErr()
             else
             {
                 ScBaseCell* pCell = GetCell( aAdr );
-                USHORT nErr = GetCellErrCode( pCell );
+                sal_uInt16 nErr = GetCellErrCode( pCell );
                 nRes = (nErr && nErr != NOTAVAILABLE);
             }
         }
@@ -2301,7 +2301,7 @@ void ScInterpreter::ScIsErr()
                 nRes = ((nGlobalError && nGlobalError != NOTAVAILABLE) || !pMat);
             else if ( !pJumpMatrix )
             {
-                USHORT nErr = pMat->GetErrorIfNotString( 0 );
+                sal_uInt16 nErr = pMat->GetErrorIfNotString( 0 );
                 nRes = (nErr && nErr != NOTAVAILABLE);
             }
             else
@@ -2311,7 +2311,7 @@ void ScInterpreter::ScIsErr()
                 pJumpMatrix->GetPos( nC, nR);
                 if ( nC < nCols && nR < nRows )
                 {
-                    USHORT nErr = pMat->GetErrorIfNotString( nC, nR);
+                    sal_uInt16 nErr = pMat->GetErrorIfNotString( nC, nR);
                     nRes = (nErr && nErr != NOTAVAILABLE);
                 }
             }
@@ -2394,7 +2394,7 @@ short ScInterpreter::IsEven()
             if ( !PopDoubleRefOrSingleRef( aAdr ) )
                 break;
             ScBaseCell* pCell = GetCell( aAdr );
-            USHORT nErr = GetCellErrCode( pCell );
+            sal_uInt16 nErr = GetCellErrCode( pCell );
             if (nErr != 0)
                 SetError(nErr);
             else
@@ -2479,11 +2479,11 @@ void ScInterpreter::ScIsOdd()
 void ScInterpreter::ScN()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScN" );
-    USHORT nErr = nGlobalError;
+    sal_uInt16 nErr = nGlobalError;
     nGlobalError = 0;
     // Temporarily override the ConvertStringToValue() error for 
     // GetCellValue() / GetCellValueOrZero()
-    USHORT nSErr = mnStringNoValueError;
+    sal_uInt16 nSErr = mnStringNoValueError;
     mnStringNoValueError = errCellNoValue;
     double fVal = GetDouble();
     mnStringNoValueError = nSErr;
@@ -2586,14 +2586,14 @@ void ScInterpreter::ScT()
                 PushInt(0);
                 return ;
             }
-            BOOL bValue = FALSE;
+            sal_Bool bValue = sal_False;
             ScBaseCell* pCell = GetCell( aAdr );
             if ( GetCellErrCode( pCell ) == 0 )
             {
                 switch ( GetCellType( pCell ) )
                 {
                     case CELLTYPE_VALUE :
-                        bValue = TRUE;
+                        bValue = sal_True;
                         break;
                     case CELLTYPE_FORMULA :
                         bValue = ((ScFormulaCell*)pCell)->IsValue();
@@ -2704,7 +2704,7 @@ void ScInterpreter::ScValue()
 
 
 //2do: this should be a proper unicode string method
-inline BOOL lcl_ScInterpreter_IsPrintable( sal_Unicode c )
+inline sal_Bool lcl_ScInterpreter_IsPrintable( sal_Unicode c )
 {
     return 0x20 <= c && c != 0x7f;
 }
@@ -2762,7 +2762,7 @@ static ::rtl::OUString lcl_convertIntoHalfWidth( const ::rtl::OUString & rStr )
         bFirstASCCall = false;
     }
 
-    return aTrans.transliterate( rStr, 0, USHORT( rStr.getLength() ), NULL );
+    return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ), NULL );
 }
 
 
@@ -2777,7 +2777,7 @@ static ::rtl::OUString lcl_convertIntoFullWidth( const ::rtl::OUString & rStr )
         bFirstJISCall = false;
     }    
 
-    return aTrans.transliterate( rStr, 0, USHORT( rStr.getLength() ), NULL );
+    return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ), NULL );
 }
 
 
@@ -2846,7 +2846,7 @@ void ScInterpreter::ScUnichar()
 }
 
 
-void ScInterpreter::ScMin( BOOL bTextAsZero )
+void ScInterpreter::ScMin( sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMin" );
     short nParamCount = GetByte();
@@ -2888,7 +2888,7 @@ void ScInterpreter::ScMin( BOOL bTextAsZero )
             case svDoubleRef :
             case svRefList :
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 PopDoubleRef( aRange, nParamCount, nRefInList);
                 ScValueIterator aValIter( pDok, aRange, glSubTotal, bTextAsZero );
                 if (aValIter.GetFirst(nVal, nErr))
@@ -2967,7 +2967,7 @@ void ScInterpreter::ScMin( BOOL bTextAsZero )
         PushDouble(nMin);
 }
 
-void ScInterpreter::ScMax( BOOL bTextAsZero )
+void ScInterpreter::ScMax( sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMax" );
     short nParamCount = GetByte();
@@ -3009,7 +3009,7 @@ void ScInterpreter::ScMax( BOOL bTextAsZero )
             case svDoubleRef :
             case svRefList :
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 PopDoubleRef( aRange, nParamCount, nRefInList);
                 ScValueIterator aValIter( pDok, aRange, glSubTotal, bTextAsZero );
                 if (aValIter.GetFirst(nVal, nErr))
@@ -3088,15 +3088,15 @@ void ScInterpreter::ScMax( BOOL bTextAsZero )
         PushDouble(nMax);
 }
 
-double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
+double ScInterpreter::IterateParameters( ScIterFunc eFunc, sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::IterateParameters" );
     short nParamCount = GetByte();
     double fRes = ( eFunc == ifPRODUCT ) ? 1.0 : 0.0;
     double fVal = 0.0;
     double fMem = 0.0;
-    BOOL bNull = TRUE;
-    ULONG nCount = 0;
+    sal_Bool bNull = sal_True;
+    sal_uLong nCount = 0;
     ScAddress aAdr;
     ScRange aRange;
     size_t nRefInList = 0;
@@ -3156,7 +3156,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
                     case ifSUM:
                         if ( bNull && fVal != 0.0 )
                         {
-                            bNull = FALSE;
+                            bNull = sal_False;
                             fMem = fVal;
                         }
                         else
@@ -3200,7 +3200,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
                             case ifSUM:
                                 if ( bNull && fVal != 0.0 )
                                 {
-                                    bNull = FALSE;
+                                    bNull = sal_False;
                                     fMem = fVal;
                                 }
                                 else
@@ -3230,7 +3230,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
             case svDoubleRef :
             case svRefList :
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 PopDoubleRef( aRange, nParamCount, nRefInList);
                 if ( nGlobalError && ( eFunc == ifCOUNT2 || eFunc == ifCOUNT ) )
                 {
@@ -3272,7 +3272,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
                                         SetError(nErr);
                                         if ( bNull && fVal != 0.0 )
                                         {
-                                            bNull = FALSE;
+                                            bNull = sal_False;
                                             fMem = fVal;
                                         }
                                         else
@@ -3323,7 +3323,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
                     nFuncFmtType = NUMBERFORMAT_NUMBER;
                     pMat->GetDimensions(nC, nR);
                     if( eFunc == ifCOUNT2 )
-                        nCount += (ULONG) nC * nR;
+                        nCount += (sal_uLong) nC * nR;
                     else
                     {
                         for (SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++)
@@ -3340,7 +3340,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
                                         case ifSUM:
                                             if ( bNull && fVal != 0.0 )
                                             {
-                                                bNull = FALSE;
+                                                bNull = sal_False;
                                                 fMem = fVal;
                                             }
                                             else
@@ -3392,7 +3392,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
         case ifPRODUCT: if ( !nCount ) fRes = 0.0; break;
         default: ; // nothing
     }
-    // Bei Summen etc. macht ein BOOL-Ergebnis keinen Sinn
+    // Bei Summen etc. macht ein sal_Bool-Ergebnis keinen Sinn
     // und Anzahl ist immer Number (#38345#)
     if( eFunc == ifCOUNT || nFuncFmtType == NUMBERFORMAT_LOGICAL )
         nFuncFmtType = NUMBERFORMAT_NUMBER;
@@ -3421,7 +3421,7 @@ void ScInterpreter::ScProduct()
 }
 
 
-void ScInterpreter::ScAverage( BOOL bTextAsZero )
+void ScInterpreter::ScAverage( sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAverage" );
     PushDouble( IterateParameters( ifAVERAGE, bTextAsZero ) );
@@ -3443,7 +3443,7 @@ void ScInterpreter::ScCount2()
 
 
 void ScInterpreter::GetStVarParams( double& rVal, double& rValCount,
-                BOOL bTextAsZero )
+                sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetStVarParams" );
     short nParamCount = GetByte();
@@ -3490,7 +3490,7 @@ void ScInterpreter::GetStVarParams( double& rVal, double& rValCount,
             case svDoubleRef :
             case svRefList :
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 PopDoubleRef( aRange, nParamCount, nRefInList);
                 ScValueIterator aValIter( pDok, aRange, glSubTotal, bTextAsZero );
                 if (aValIter.GetFirst(fVal, nErr))
@@ -3559,7 +3559,7 @@ void ScInterpreter::GetStVarParams( double& rVal, double& rValCount,
 }
 
 
-void ScInterpreter::ScVar( BOOL bTextAsZero )
+void ScInterpreter::ScVar( sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVar" );
     double nVal;
@@ -3573,7 +3573,7 @@ void ScInterpreter::ScVar( BOOL bTextAsZero )
 }
 
 
-void ScInterpreter::ScVarP( BOOL bTextAsZero )
+void ScInterpreter::ScVarP( sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVarP" );
     double nVal;
@@ -3584,7 +3584,7 @@ void ScInterpreter::ScVarP( BOOL bTextAsZero )
 }
 
 
-void ScInterpreter::ScStDev( BOOL bTextAsZero )
+void ScInterpreter::ScStDev( sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScStDev" );
     double nVal;
@@ -3597,7 +3597,7 @@ void ScInterpreter::ScStDev( BOOL bTextAsZero )
 }
 
 
-void ScInterpreter::ScStDevP( BOOL bTextAsZero )
+void ScInterpreter::ScStDevP( sal_Bool bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScStDevP" );
     double nVal;
@@ -3630,8 +3630,8 @@ void ScInterpreter::ScStDevP( BOOL bTextAsZero )
 void ScInterpreter::ScColumns()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScColumns" );
-    BYTE nParamCount = GetByte();
-    ULONG nVal = 0;
+    sal_uInt8 nParamCount = GetByte();
+    sal_uLong nVal = 0;
     SCCOL nCol1;
     SCROW nRow1;
     SCTAB nTab1;
@@ -3648,8 +3648,8 @@ void ScInterpreter::ScColumns()
                 break;
             case svDoubleRef:
                 PopDoubleRef(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-                nVal += static_cast<ULONG>(nTab2 - nTab1 + 1) *
-                    static_cast<ULONG>(nCol2 - nCol1 + 1);
+                nVal += static_cast<sal_uLong>(nTab2 - nTab1 + 1) *
+                    static_cast<sal_uLong>(nCol2 - nCol1 + 1);
                 break;
             case svMatrix:
             {
@@ -3674,8 +3674,8 @@ void ScInterpreter::ScColumns()
 void ScInterpreter::ScRows()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRows" );
-    BYTE nParamCount = GetByte();
-    ULONG nVal = 0;
+    sal_uInt8 nParamCount = GetByte();
+    sal_uLong nVal = 0;
     SCCOL nCol1;
     SCROW nRow1;
     SCTAB nTab1;
@@ -3692,8 +3692,8 @@ void ScInterpreter::ScRows()
                 break;
             case svDoubleRef:
                 PopDoubleRef(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-                nVal += static_cast<ULONG>(nTab2 - nTab1 + 1) *
-                    static_cast<ULONG>(nRow2 - nRow1 + 1);
+                nVal += static_cast<sal_uLong>(nTab2 - nTab1 + 1) *
+                    static_cast<sal_uLong>(nRow2 - nRow1 + 1);
                 break;
             case svMatrix:
             {
@@ -3717,8 +3717,8 @@ void ScInterpreter::ScRows()
 void ScInterpreter::ScTables()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTables" );
-    BYTE nParamCount = GetByte();
-    ULONG nVal;
+    sal_uInt8 nParamCount = GetByte();
+    sal_uLong nVal;
     if ( nParamCount == 0 )
         nVal = pDok->GetTableCount();
     else
@@ -3740,7 +3740,7 @@ void ScInterpreter::ScTables()
                 break;
                 case svDoubleRef:
                     PopDoubleRef(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-                    nVal += static_cast<ULONG>(nTab2 - nTab1 + 1);
+                    nVal += static_cast<sal_uLong>(nTab2 - nTab1 + 1);
                 break;
                 case svMatrix:
                     PopError();
@@ -3759,7 +3759,7 @@ void ScInterpreter::ScTables()
 void ScInterpreter::ScColumn()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScColumn" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 0, 1 ) )
     {
         double nVal = 0;
@@ -3835,7 +3835,7 @@ void ScInterpreter::ScColumn()
 void ScInterpreter::ScRow()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRow" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 0, 1 ) )
     {
         double nVal = 0;
@@ -3910,7 +3910,7 @@ void ScInterpreter::ScRow()
 void ScInterpreter::ScTable()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTable" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 0, 1 ) )
     {
         SCTAB nVal = 0;
@@ -4061,7 +4061,7 @@ void ScInterpreter::ScMatch()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMatch" );
     ScMatrixRef pMatSrc = NULL;
 
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
         double fTyp;
@@ -4107,10 +4107,10 @@ void ScInterpreter::ScMatch()
             rParam.nRow1       = nRow1;
             rParam.nCol2       = nCol2;
             rParam.nTab        = nTab1;
-            rParam.bMixedComparison = TRUE;
+            rParam.bMixedComparison = sal_True;
 
             ScQueryEntry& rEntry = rParam.GetEntry(0);
-            rEntry.bDoQuery = TRUE;
+            rEntry.bDoQuery = sal_True;
             if (fTyp < 0.0)
                 rEntry.eOp = SC_GREATER_EQUAL;
             else if (fTyp > 0.0)
@@ -4120,14 +4120,14 @@ void ScInterpreter::ScMatch()
                 case svDouble:
                 {
                     fVal = GetDouble();
-                    rEntry.bQueryByString = FALSE;
+                    rEntry.bQueryByString = sal_False;
                     rEntry.nVal = fVal;
                 }
                 break;
                 case svString:
                 {
                     sStr = GetString();
-                    rEntry.bQueryByString = TRUE;
+                    rEntry.bQueryByString = sal_True;
                     *rEntry.pStr = sStr;
                 }
                 break;
@@ -4144,13 +4144,13 @@ void ScInterpreter::ScMatch()
                     if (HasCellValueData(pCell))
                     {
                         fVal = GetCellValue( aAdr, pCell );
-                        rEntry.bQueryByString = FALSE;
+                        rEntry.bQueryByString = sal_False;
                         rEntry.nVal = fVal;
                     }
                     else
                     {
                         GetCellString(sStr, pCell);
-                        rEntry.bQueryByString = TRUE;
+                        rEntry.bQueryByString = sal_True;
                         *rEntry.pStr = sStr;
                     }
                 }
@@ -4280,12 +4280,12 @@ void ScInterpreter::ScMatch()
             else
             {                                           // search column in row
                 SCCOL nC;
-                rParam.bByRow = FALSE;
+                rParam.bByRow = sal_False;
                 rParam.nRow2 = nRow1;
                 rEntry.nField = nCol1;
-                ScQueryCellIterator aCellIter(pDok, nTab1, rParam, FALSE);
+                ScQueryCellIterator aCellIter(pDok, nTab1, rParam, sal_False);
                 // Advance Entry.nField in Iterator if column changed
-                aCellIter.SetAdvanceQueryParamEntryField( TRUE );
+                aCellIter.SetAdvanceQueryParamEntryField( sal_True );
                 if (fTyp == 0.0)
                 {                                       // EQUAL
                     if ( aCellIter.GetFirst() )
@@ -4320,7 +4320,7 @@ void ScInterpreter::ScCountEmptyCells()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCountEmptyCells" );
     if ( MustHaveParamCount( GetByte(), 1 ) )
     {
-        ULONG nMaxCount = 0, nCount = 0;
+        sal_uLong nMaxCount = 0, nCount = 0;
         CellType eCellType;
         switch (GetStackType())
         {
@@ -4344,9 +4344,9 @@ void ScInterpreter::ScCountEmptyCells()
                 {
                     PopDoubleRef( aRange, nParam, nRefInList);
                     nMaxCount +=
-                        static_cast<ULONG>(aRange.aEnd.Row() - aRange.aStart.Row() + 1) *
-                        static_cast<ULONG>(aRange.aEnd.Col() - aRange.aStart.Col() + 1) *
-                        static_cast<ULONG>(aRange.aEnd.Tab() - aRange.aStart.Tab() + 1);
+                        static_cast<sal_uLong>(aRange.aEnd.Row() - aRange.aStart.Row() + 1) *
+                        static_cast<sal_uLong>(aRange.aEnd.Col() - aRange.aStart.Col() + 1) *
+                        static_cast<sal_uLong>(aRange.aEnd.Tab() - aRange.aStart.Tab() + 1);
                     ScBaseCell* pCell;
                     ScCellIterator aDocIter( pDok, aRange, glSubTotal);
                     if ( (pCell = aDocIter.GetFirst()) != NULL )
@@ -4375,7 +4375,7 @@ void ScInterpreter::ScCountIf()
     {
         String rString;
         double fVal = 0.0;
-        BOOL bIsString = TRUE;
+        sal_Bool bIsString = sal_True;
         switch ( GetStackType() )
         {
             case svDoubleRef :
@@ -4392,13 +4392,13 @@ void ScInterpreter::ScCountIf()
                 {
                     case CELLTYPE_VALUE :
                         fVal = GetCellValue( aAdr, pCell );
-                        bIsString = FALSE;
+                        bIsString = sal_False;
                         break;
                     case CELLTYPE_FORMULA :
                         if( ((ScFormulaCell*)pCell)->IsValue() )
                         {
                             fVal = GetCellValue( aAdr, pCell );
-                            bIsString = FALSE;
+                            bIsString = sal_False;
                         }
                         else
                             GetCellString(rString, pCell);
@@ -4409,7 +4409,7 @@ void ScInterpreter::ScCountIf()
                         break;
                     default:
                         fVal = 0.0;
-                        bIsString = FALSE;
+                        bIsString = sal_False;
                 }
             }
             break;
@@ -4426,7 +4426,7 @@ void ScInterpreter::ScCountIf()
             default:
             {
                 fVal = GetDouble();
-                bIsString = FALSE;
+                bIsString = sal_False;
             }
         }
         double fSum = 0.0;
@@ -4496,10 +4496,10 @@ void ScInterpreter::ScCountIf()
                 rParam.nRow2       = nRow2;
 
                 ScQueryEntry& rEntry = rParam.GetEntry(0);
-                rEntry.bDoQuery = TRUE;
+                rEntry.bDoQuery = sal_True;
                 if (!bIsString)
                 {
-                    rEntry.bQueryByString = FALSE;
+                    rEntry.bQueryByString = sal_False;
                     rEntry.nVal = fVal;
                     rEntry.eOp = SC_EQUAL;
                 }
@@ -4537,9 +4537,9 @@ void ScInterpreter::ScCountIf()
                 }
                 else
                 {
-                    ScQueryCellIterator aCellIter(pDok, nTab1, rParam, FALSE);
+                    ScQueryCellIterator aCellIter(pDok, nTab1, rParam, sal_False);
                     // Entry.nField im Iterator bei Spaltenwechsel weiterschalten
-                    aCellIter.SetAdvanceQueryParamEntryField( TRUE );
+                    aCellIter.SetAdvanceQueryParamEntryField( sal_True );
                     if ( aCellIter.GetFirst() )
                     {
                         do
@@ -4563,7 +4563,7 @@ void ScInterpreter::ScCountIf()
 void ScInterpreter::ScSumIf()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumIf" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
         SCCOL nCol3 = 0;
@@ -4606,7 +4606,7 @@ void ScInterpreter::ScSumIf()
         }
         String rString;
         double fVal = 0.0;
-        BOOL bIsString = TRUE;
+        sal_Bool bIsString = sal_True;
         switch ( GetStackType() )
         {
             case svDoubleRef :
@@ -4623,13 +4623,13 @@ void ScInterpreter::ScSumIf()
                 {
                     case CELLTYPE_VALUE :
                         fVal = GetCellValue( aAdr, pCell );
-                        bIsString = FALSE;
+                        bIsString = sal_False;
                         break;
                     case CELLTYPE_FORMULA :
                         if( ((ScFormulaCell*)pCell)->IsValue() )
                         {
                             fVal = GetCellValue( aAdr, pCell );
-                            bIsString = FALSE;
+                            bIsString = sal_False;
                         }
                         else
                             GetCellString(rString, pCell);
@@ -4640,7 +4640,7 @@ void ScInterpreter::ScSumIf()
                         break;
                     default:
                         fVal = 0.0;
-                        bIsString = FALSE;
+                        bIsString = sal_False;
                 }
             }
             break;
@@ -4657,13 +4657,13 @@ void ScInterpreter::ScSumIf()
             default:
             {
                 fVal = GetDouble();
-                bIsString = FALSE;
+                bIsString = sal_False;
             }
         }
 
         double fSum = 0.0;
         double fMem = 0.0;
-        BOOL bNull = TRUE;
+        sal_Bool bNull = sal_True;
         short nParam = 1;
         size_t nRefInList = 0;
         while (nParam-- > 0)
@@ -4779,10 +4779,10 @@ void ScInterpreter::ScSumIf()
                 rParam.nRow2       = nRow2;
 
                 ScQueryEntry& rEntry = rParam.GetEntry(0);
-                rEntry.bDoQuery = TRUE;
+                rEntry.bDoQuery = sal_True;
                 if (!bIsString)
                 {
-                    rEntry.bQueryByString = FALSE;
+                    rEntry.bQueryByString = sal_False;
                     rEntry.nVal = fVal;
                     rEntry.eOp = SC_EQUAL;
                 }
@@ -4830,7 +4830,7 @@ void ScInterpreter::ScSumIf()
                                         fVal = pSumExtraMatrix->GetDouble( nC, nR);
                                         if ( bNull && fVal != 0.0 )
                                         {
-                                            bNull = FALSE;
+                                            bNull = sal_False;
                                             fMem = fVal;
                                         }
                                         else
@@ -4856,7 +4856,7 @@ void ScInterpreter::ScSumIf()
                                         fVal = GetCellValue( aAdr, pCell );
                                         if ( bNull && fVal != 0.0 )
                                         {
-                                            bNull = FALSE;
+                                            bNull = sal_False;
                                             fMem = fVal;
                                         }
                                         else
@@ -4869,9 +4869,9 @@ void ScInterpreter::ScSumIf()
                 }
                 else
                 {
-                    ScQueryCellIterator aCellIter(pDok, nTab1, rParam, FALSE);
+                    ScQueryCellIterator aCellIter(pDok, nTab1, rParam, sal_False);
                     // Increment Entry.nField in iterator when switching to next column.
-                    aCellIter.SetAdvanceQueryParamEntryField( TRUE );
+                    aCellIter.SetAdvanceQueryParamEntryField( sal_True );
                     if ( aCellIter.GetFirst() )
                     {
                         if (pSumExtraMatrix)
@@ -4885,7 +4885,7 @@ void ScInterpreter::ScSumIf()
                                     fVal = pSumExtraMatrix->GetDouble( nC, nR);
                                     if ( bNull && fVal != 0.0 )
                                     {
-                                        bNull = FALSE;
+                                        bNull = sal_False;
                                         fMem = fVal;
                                     }
                                     else
@@ -4905,7 +4905,7 @@ void ScInterpreter::ScSumIf()
                                     fVal = GetCellValue( aAdr, pCell );
                                     if ( bNull && fVal != 0.0 )
                                     {
-                                        bNull = FALSE;
+                                        bNull = sal_False;
                                         fMem = fVal;
                                     }
                                     else
@@ -4930,7 +4930,7 @@ void ScInterpreter::ScSumIf()
 void ScInterpreter::ScLookup()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLookup" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 2, 3 ) )
         return ;
 
@@ -5345,13 +5345,13 @@ void ScInterpreter::ScLookup()
     aParam.bByRow           = bVertical;
     aParam.bMixedComparison = true;
 
-    rEntry.bDoQuery = TRUE;
+    rEntry.bDoQuery = sal_True;
     rEntry.eOp = SC_LESS_EQUAL;
     rEntry.nField = nCol1;
     if ( rEntry.bQueryByString )
         aParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
 
-    ScQueryCellIterator aCellIter(pDok, nTab1, aParam, FALSE);
+    ScQueryCellIterator aCellIter(pDok, nTab1, aParam, sal_False);
     SCCOL nC;
     SCROW nR;
     // Advance Entry.nField in iterator upon switching columns if
@@ -5476,19 +5476,19 @@ void ScInterpreter::ScLookup()
 void ScInterpreter::ScHLookup()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScHLookup" );
-    CalculateLookup(TRUE);
+    CalculateLookup(sal_True);
 }
-void ScInterpreter::CalculateLookup(BOOL HLookup)
+void ScInterpreter::CalculateLookup(sal_Bool HLookup)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateLookup" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 3, 4 ) )
     {
-        BOOL bSorted;
+        sal_Bool bSorted;
         if (nParamCount == 4)
             bSorted = GetBool();
         else
-            bSorted = TRUE;
+            bSorted = sal_True;
         double fIndex = ::rtl::math::approxFloor( GetDouble() ) - 1.0;
         ScMatrixRef pMat = NULL;
         SCSIZE nC = 0, nR = 0;
@@ -5546,7 +5546,7 @@ void ScInterpreter::CalculateLookup(BOOL HLookup)
             {
                 rParam.nCol2       = nCol2;
                 rParam.nRow2       = nRow1;     // nur in der ersten Zeile suchen
-                rParam.bByRow      = FALSE;
+                rParam.bByRow      = sal_False;
             } // if ( HLookup )
             else
             {
@@ -5554,10 +5554,10 @@ void ScInterpreter::CalculateLookup(BOOL HLookup)
                 rParam.nRow2       = nRow2;
                 rParam.nTab        = nTab1;
             }
-            rParam.bMixedComparison = TRUE;
+            rParam.bMixedComparison = sal_True;
 
             ScQueryEntry& rEntry = rParam.GetEntry(0);
-            rEntry.bDoQuery = TRUE;
+            rEntry.bDoQuery = sal_True;
             if ( bSorted )
                 rEntry.eOp = SC_LESS_EQUAL;
             if ( !FillEntry(rEntry) )
@@ -5659,16 +5659,16 @@ void ScInterpreter::CalculateLookup(BOOL HLookup)
             else
             {
                 rEntry.nField = nCol1;
-                BOOL bFound = FALSE;
+                sal_Bool bFound = sal_False;
                 SCCOL nCol = 0;
                 SCROW nRow = 0;
                 if ( bSorted )
                     rEntry.eOp = SC_LESS_EQUAL;
                 if ( HLookup )
                 {
-                    ScQueryCellIterator aCellIter(pDok, nTab1, rParam, FALSE);
+                    ScQueryCellIterator aCellIter(pDok, nTab1, rParam, sal_False);
                     // advance Entry.nField in Iterator upon switching columns
-                    aCellIter.SetAdvanceQueryParamEntryField( TRUE );
+                    aCellIter.SetAdvanceQueryParamEntryField( sal_True );
                     if ( bSorted )
                     {
                         SCROW nRow1_temp;
@@ -5676,7 +5676,7 @@ void ScInterpreter::CalculateLookup(BOOL HLookup)
                     }
                     else if ( aCellIter.GetFirst() )
                     {
-                        bFound = TRUE;
+                        bFound = sal_True;
                         nCol = aCellIter.GetCol();
                     }
                     nRow = nZIndex;
@@ -5709,14 +5709,14 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry)
     {
         case svDouble:
         {
-            rEntry.bQueryByString = FALSE;
+            rEntry.bQueryByString = sal_False;
             rEntry.nVal = GetDouble();
         }
         break;
         case svString:
         {
             const String sStr = GetString();
-            rEntry.bQueryByString = TRUE;
+            rEntry.bQueryByString = sal_True;
             *rEntry.pStr = sStr;
         }
         break;
@@ -5732,21 +5732,21 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry)
             ScBaseCell* pCell = GetCell( aAdr );
             if (HasCellValueData(pCell))
             {
-                rEntry.bQueryByString = FALSE;
+                rEntry.bQueryByString = sal_False;
                 rEntry.nVal = GetCellValue( aAdr, pCell );
             }
             else
             {
                 if ( GetCellType( pCell ) == CELLTYPE_NOTE )
                 {
-                    rEntry.bQueryByString = FALSE;
+                    rEntry.bQueryByString = sal_False;
                     rEntry.nVal = 0.0;
                 }
                 else
                 {
                     String sStr;
                     GetCellString(sStr, pCell);
-                    rEntry.bQueryByString = TRUE;
+                    rEntry.bQueryByString = sal_True;
                     *rEntry.pStr = sStr;
                 }
             }
@@ -5769,13 +5769,13 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry)
 void ScInterpreter::ScVLookup()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVLookup" );
-    CalculateLookup(FALSE);
+    CalculateLookup(sal_False);
 }
 
 void ScInterpreter::ScSubTotal()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSubTotal" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCountMin( nParamCount, 2 ) )
     {
         // We must fish the 1st parameter deep from the stack! And push it on top.
@@ -5787,7 +5787,7 @@ void ScInterpreter::ScSubTotal()
         else
         {
             cPar = nParamCount - 1;
-            glSubTotal = TRUE;
+            glSubTotal = sal_True;
             switch( nFunc )
             {
                 case SUBTOTAL_FUNC_AVE  : ScAverage(); break;
@@ -5803,7 +5803,7 @@ void ScInterpreter::ScSubTotal()
                 case SUBTOTAL_FUNC_VARP : ScVarP();    break;
                 default : PushIllegalArgument();       break;
             }
-            glSubTotal = FALSE;
+            glSubTotal = sal_False;
         }
         // Get rid of the 1st (fished) parameter.
         double nVal = GetDouble();
@@ -5812,14 +5812,14 @@ void ScInterpreter::ScSubTotal()
     }
 }
 
-ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
+ScDBQueryParamBase* ScInterpreter::GetDBParams( sal_Bool& rMissingField )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDBParams" );
-    BOOL bAllowMissingField = FALSE;
+    sal_Bool bAllowMissingField = sal_False;
     if ( rMissingField )
     {
-        bAllowMissingField = TRUE;
-        rMissingField = FALSE;
+        bAllowMissingField = sal_True;
+        rMissingField = sal_False;
     }
     if ( GetByte() == 3 )
     {
@@ -5828,20 +5828,20 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
         if (!pQueryRef.get())
             return NULL;
 
-        BOOL    bByVal = TRUE;
+        sal_Bool    bByVal = sal_True;
         double  nVal = 0.0;
         String  aStr;
         ScRange aMissingRange;
-        BOOL bRangeFake = FALSE;
+        sal_Bool bRangeFake = sal_False;
         switch (GetStackType())
         {
             case svDouble :
                 nVal = ::rtl::math::approxFloor( GetDouble() );
                 if ( bAllowMissingField && nVal == 0.0 )
-                    rMissingField = TRUE;   // fake missing parameter
+                    rMissingField = sal_True;   // fake missing parameter
                 break;
             case svString :
-                bByVal = FALSE;
+                bByVal = sal_False;
                 aStr = GetString();
                 break;
             case svSingleRef :
@@ -5853,7 +5853,7 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
                         nVal = GetCellValue( aAdr, pCell );
                     else
                     {
-                        bByVal = FALSE;
+                        bByVal = sal_False;
                         GetCellString(aStr, pCell);
                     }
                 }
@@ -5861,7 +5861,7 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
             case svDoubleRef :
                 if ( bAllowMissingField )
                 {   // fake missing parameter for old SO compatibility
-                    bRangeFake = TRUE;
+                    bRangeFake = sal_True;
                     PopDoubleRef( aMissingRange );
                 }
                 else
@@ -5873,7 +5873,7 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
             case svMissing :
                 PopError();
                 if ( bAllowMissingField )
-                    rMissingField = TRUE;
+                    rMissingField = sal_True;
                 else
                     SetError( errIllegalParameter );
                 break;
@@ -5891,7 +5891,7 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
         {
             // range parameter must match entire database range
             if (pDBRef->isRangeEqual(aMissingRange))
-                rMissingField = TRUE;
+                rMissingField = sal_True;
             else
                 SetError( errIllegalParameter );
         }
@@ -5952,9 +5952,9 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc )
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DBIterator" );
     double nErg = 0.0;
     double fMem = 0.0;
-    BOOL bNull = TRUE;
-    ULONG nCount = 0;
-    BOOL bMissingField = FALSE;
+    sal_Bool bNull = sal_True;
+    sal_uLong nCount = 0;
+    sal_Bool bMissingField = sal_False;
     auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
     if (pQueryParam.get())
     {
@@ -5978,7 +5978,7 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc )
                     case ifSUM:
                         if ( bNull && aValue.mfValue != 0.0 )
                         {
-                            bNull = FALSE;
+                            bNull = sal_False;
                             fMem = aValue.mfValue;
                         }
                         else
@@ -6018,11 +6018,11 @@ void ScInterpreter::ScDBSum()
 void ScInterpreter::ScDBCount()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount" );
-    BOOL bMissingField = TRUE;
+    sal_Bool bMissingField = sal_True;
     auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
     if (pQueryParam.get())
     {
-        ULONG nCount = 0;
+        sal_uLong nCount = 0;
         if ( bMissingField && pQueryParam->GetType() == ScDBQueryParamBase::INTERNAL )
         {   // count all matching records
             // TODO: currently the QueryIterators only return cell pointers of
@@ -6072,11 +6072,11 @@ void ScInterpreter::ScDBCount()
 void ScInterpreter::ScDBCount2()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBCount2" );
-    BOOL bMissingField = TRUE;
+    sal_Bool bMissingField = sal_True;
     auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
     if (pQueryParam.get())
     {
-        ULONG nCount = 0;
+        sal_uLong nCount = 0;
         pQueryParam->mbSkipString = false;
         ScDBQueryDataIterator aValIter( pDok, pQueryParam.release());
         ScDBQueryDataIterator::Value aValue;
@@ -6133,7 +6133,7 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount )
 
     rValCount = 0.0;
     double fSum    = 0.0;
-    BOOL bMissingField = FALSE;
+    sal_Bool bMissingField = sal_False;
     auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
     if (pQueryParam.get())
     {
@@ -6248,7 +6248,7 @@ ScTokenArray* lcl_CreateExternalRefTokenArray( const ScAddress& rPos, ScDocument
 void ScInterpreter::ScIndirect()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIndirect" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 2 )  )
     {
         bool bTryXlA1 = true;   // whether to try XL_A1 style as well.
@@ -6311,7 +6311,7 @@ void ScInterpreter::ScIndirect()
                 if (!pNames)
                     break;
 
-                USHORT nPos = 0;
+                sal_uInt16 nPos = 0;
                 if (!pNames->SearchName( sRefStr, nPos)) 
                     break;
 
@@ -6359,7 +6359,7 @@ void ScInterpreter::ScAddressFunc()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAddressFunc" );
     String  sTabStr;
 
-    BYTE    nParamCount = GetByte();
+    sal_uInt8    nParamCount = GetByte();
     if( !MustHaveParamCount( nParamCount, 2, 5 ) )
         return;
 
@@ -6370,10 +6370,10 @@ void ScInterpreter::ScAddressFunc()
     if( nParamCount >= 4 && 0.0 == ::rtl::math::approxFloor( GetDoubleWithDefault( 1.0)))
         eConv = FormulaGrammar::CONV_XL_R1C1;
 
-    USHORT  nFlags = SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE;   // default
+    sal_uInt16  nFlags = SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE;   // default
     if( nParamCount >= 3 )
     {
-        USHORT n = (USHORT) ::rtl::math::approxFloor( GetDoubleWithDefault( 1.0));
+        sal_uInt16 n = (sal_uInt16) ::rtl::math::approxFloor( GetDoubleWithDefault( 1.0));
         switch ( n )
         {
             default :
@@ -6432,7 +6432,7 @@ void ScInterpreter::ScAddressFunc()
 void ScInterpreter::ScOffset()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScOffset" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 3, 5 ) )
     {
         long nColNew = -1, nRowNew = -1, nColPlus, nRowPlus;
@@ -6508,7 +6508,7 @@ void ScInterpreter::ScOffset()
 void ScInterpreter::ScIndex()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIndex" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 4 ) )
     {
         long nArea;
@@ -6547,7 +6547,7 @@ void ScInterpreter::ScIndex()
                 {
                     if (nArea != 1)
                         SetError(errIllegalArgument);
-                    USHORT nOldSp = sp;
+                    sal_uInt16 nOldSp = sp;
                     ScMatrixRef pMat = GetMatrix();
                     if (pMat)
                     {
@@ -6645,7 +6645,7 @@ void ScInterpreter::ScIndex()
                     SCCOL nCol2 = 0;
                     SCROW nRow2 = 0;
                     SCTAB nTab2 = 0;
-                    BOOL bRowArray = FALSE;
+                    sal_Bool bRowArray = sal_False;
                     if (GetStackType() == svRefList)
                     {
                         FormulaTokenRef xRef = PopToken();
@@ -6658,13 +6658,13 @@ void ScInterpreter::ScIndex()
                         DoubleRefToRange( (*(static_cast<ScToken*>(xRef.get())->GetRefList()))[nArea-1], aRange);
                         aRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
                         if ( nParamCount == 2 && nRow1 == nRow2 )
-                            bRowArray = TRUE;
+                            bRowArray = sal_True;
                     }
                     else
                     {
                         PopDoubleRef( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
                         if ( nParamCount == 2 && nRow1 == nRow2 )
-                            bRowArray = TRUE;
+                            bRowArray = sal_True;
                     }
                     if ( nTab1 != nTab2 ||
                             (nCol > 0 && nCol1+nCol-1 > nCol2) ||
@@ -6715,7 +6715,7 @@ void ScInterpreter::ScMultiArea()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMultiArea" );
     // Legacy support, convert to RefList
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if (MustHaveParamCountMin( nParamCount, 1))
     {
         while (!nGlobalError && nParamCount-- > 1)
@@ -6729,7 +6729,7 @@ void ScInterpreter::ScMultiArea()
 void ScInterpreter::ScAreas()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAreas" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if (MustHaveParamCount( nParamCount, 1))
     {
         size_t nCount = 0;
@@ -6767,7 +6767,7 @@ void ScInterpreter::ScAreas()
 void ScInterpreter::ScCurrency()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCurrency" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         String aStr;
@@ -6796,18 +6796,18 @@ void ScInterpreter::ScCurrency()
         Color* pColor = NULL;
         if ( fDec < 0.0 )
             fDec = 0.0;
-        ULONG nIndex = pFormatter->GetStandardFormat(
+        sal_uLong nIndex = pFormatter->GetStandardFormat(
                                         NUMBERFORMAT_CURRENCY,
                                         ScGlobal::eLnge);
-        if ( (USHORT) fDec != pFormatter->GetFormatPrecision( nIndex ) )
+        if ( (sal_uInt16) fDec != pFormatter->GetFormatPrecision( nIndex ) )
         {
             String sFormatString;
             pFormatter->GenerateFormat(sFormatString,
                                                    nIndex,
                                                    ScGlobal::eLnge,
-                                                   TRUE,        // mit Tausenderpunkt
-                                                   FALSE,       // nicht rot
-                                                  (USHORT) fDec,// Nachkommastellen
+                                                   sal_True,        // mit Tausenderpunkt
+                                                   sal_False,       // nicht rot
+                                                  (sal_uInt16) fDec,// Nachkommastellen
                                                    1);          // 1 Vorkommanull
             if (!pFormatter->GetPreviewString(sFormatString,
                                                   fVal,
@@ -6858,16 +6858,16 @@ void ScInterpreter::ScReplace()
 void ScInterpreter::ScFixed()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFixed" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 3 ) )
     {
         String aStr;
         double fDec;
-        BOOL bThousand;
+        sal_Bool bThousand;
         if (nParamCount == 3)
             bThousand = !GetBool();     // Param TRUE: keine Tausenderpunkte
         else
-            bThousand = TRUE;
+            bThousand = sal_True;
         if (nParamCount >= 2)
         {
             fDec = ::rtl::math::approxFloor(GetDoubleWithDefault( 2.0 ));
@@ -6893,15 +6893,15 @@ void ScInterpreter::ScFixed()
         String sFormatString;
         if (fDec < 0.0)
             fDec = 0.0;
-        ULONG nIndex = pFormatter->GetStandardFormat(
+        sal_uLong nIndex = pFormatter->GetStandardFormat(
                                             NUMBERFORMAT_NUMBER,
                                             ScGlobal::eLnge);
         pFormatter->GenerateFormat(sFormatString,
                                                nIndex,
                                                ScGlobal::eLnge,
                                                bThousand,   // mit Tausenderpunkt
-                                               FALSE,       // nicht rot
-                                               (USHORT) fDec,// Nachkommastellen
+                                               sal_False,       // nicht rot
+                                               (sal_uInt16) fDec,// Nachkommastellen
                                                1);          // 1 Vorkommanull
         if (!pFormatter->GetPreviewString(sFormatString,
                                                   fVal,
@@ -6918,7 +6918,7 @@ void ScInterpreter::ScFixed()
 void ScInterpreter::ScFind()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFind" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
         double fAnz;
@@ -6957,7 +6957,7 @@ void ScInterpreter::ScExact()
 void ScInterpreter::ScLeft()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLeft" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         xub_StrLen n;
@@ -6984,7 +6984,7 @@ void ScInterpreter::ScLeft()
 void ScInterpreter::ScRight()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRight" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         xub_StrLen n;
@@ -7013,7 +7013,7 @@ void ScInterpreter::ScSearch()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSearch" );
     double fAnz;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
         if (nParamCount == 3)
@@ -7038,7 +7038,7 @@ void ScInterpreter::ScSearch()
             utl::SearchParam::SearchType eSearchType =
                 (MayBeRegExp( SearchStr, pDok ) ?
                 utl::SearchParam::SRCH_REGEXP : utl::SearchParam::SRCH_NORMAL);
-            utl::SearchParam sPar(SearchStr, eSearchType, FALSE, FALSE, FALSE);
+            utl::SearchParam sPar(SearchStr, eSearchType, sal_False, sal_False, sal_False);
             utl::TextSearch sT( sPar, *ScGlobal::pCharClass );
             int nBool = sT.SearchFrwrd(sStr, &nPos, &nEndPos);
             if (!nBool)
@@ -7091,7 +7091,7 @@ void ScInterpreter::ScText()
                         PushTempToken( xTok);
                         // Temporarily override the ConvertStringToValue() 
                         // error for GetCellValue() / GetCellValueOrZero()
-                        USHORT nSErr = mnStringNoValueError;
+                        sal_uInt16 nSErr = mnStringNoValueError;
                         mnStringNoValueError = errNotNumericString;
                         fVal = GetDouble();
                         mnStringNoValueError = nSErr;
@@ -7144,7 +7144,7 @@ void ScInterpreter::ScText()
 void ScInterpreter::ScSubstitute()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSubstitute" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 3, 4 ) )
     {
         xub_StrLen nAnz;
@@ -7168,7 +7168,7 @@ void ScInterpreter::ScSubstitute()
         xub_StrLen nCount = 0;
         xub_StrLen nNewLen = sNewStr.Len();
         xub_StrLen nOldLen = sOldStr.Len();
-        while( TRUE )
+        while( sal_True )
         {
             nPos = sStr.Search( sOldStr, nPos );
             if (nPos != STRING_NOTFOUND)
@@ -7232,7 +7232,7 @@ void ScInterpreter::ScRept()
 void ScInterpreter::ScConcat()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScConcat" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     String aRes;
     while( nParamCount-- > 0)
     {
@@ -7246,8 +7246,8 @@ void ScInterpreter::ScConcat()
 void ScInterpreter::ScErrorType()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScErrorType" );
-    USHORT nErr;
-    USHORT nOldError = nGlobalError;
+    sal_uInt16 nErr;
+    sal_uInt16 nOldError = nGlobalError;
     nGlobalError = 0;
     switch ( GetStackType() )
     {
@@ -7325,13 +7325,13 @@ void ScInterpreter::ScErrorType()
 }
 
 
-BOOL ScInterpreter::MayBeRegExp( const String& rStr, const ScDocument* pDoc  )
+sal_Bool ScInterpreter::MayBeRegExp( const String& rStr, const ScDocument* pDoc  )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::MayBeRegExp" );
     if ( pDoc && !pDoc->GetDocOptions().IsFormulaRegexEnabled() )
-        return FALSE;
+        return sal_False;
     if ( !rStr.Len() || (rStr.Len() == 1 && rStr.GetChar(0) != '.') )
-        return FALSE;   // einzelnes Metazeichen kann keine RegExp sein
+        return sal_False;   // einzelnes Metazeichen kann keine RegExp sein
     static const sal_Unicode cre[] = { '.','*','+','?','[',']','^','$','\\','<','>','(',')','|', 0 };
     const sal_Unicode* p1 = rStr.GetBuffer();
     sal_Unicode c1;
@@ -7341,17 +7341,17 @@ BOOL ScInterpreter::MayBeRegExp( const String& rStr, const ScDocument* pDoc  )
         while ( *p2 )
         {
             if ( c1 == *p2++ )
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 static bool lcl_LookupQuery( ScAddress & o_rResultPos, ScDocument * pDoc,
         const ScQueryParam & rParam, const ScQueryEntry & rEntry )
 {
     bool bFound = false;
-    ScQueryCellIterator aCellIter( pDoc, rParam.nTab, rParam, FALSE);
+    ScQueryCellIterator aCellIter( pDoc, rParam.nTab, rParam, sal_False);
     if (rEntry.eOp != SC_EQUAL)
     {
         // range lookup <= or >=
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 88193b1ff..065ef031c 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -66,14 +66,14 @@ using namespace formula;
 // Datum und Zeit
 //-----------------------------------------------------------------------------
 
-double ScInterpreter::GetDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, bool bStrict )
+double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool bStrict )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDateSerial" );
     if ( nYear < 100 && !bStrict )
         nYear = pFormatter->ExpandTwoDigitYear( nYear );
     // Do not use a default Date ctor here because it asks system time with a 
     // performance penalty.
-    INT16 nY, nM, nD;
+    sal_Int16 nY, nM, nD;
     if (bStrict)
         nY = nYear, nM = nMonth, nD = nDay;
     else
@@ -201,7 +201,7 @@ void ScInterpreter::ScGetDateValue()
 void ScInterpreter::ScGetDayOfWeek()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetDayOfWeek" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         short nFlag;
@@ -245,8 +245,8 @@ void ScInterpreter::ScEasterSunday()
     nFuncFmtType = NUMBERFORMAT_DATE;
     if ( MustHaveParamCount( GetByte(), 1 ) )
     {
-        INT16 nDay, nMonth, nYear;
-        nYear = (INT16) ::rtl::math::approxFloor( GetDouble() );
+        sal_Int16 nDay, nMonth, nYear;
+        nYear = (sal_Int16) ::rtl::math::approxFloor( GetDouble() );
         if ( nYear < 100 )
             nYear = pFormatter->ExpandTwoDigitYear( nYear );
         // don't worry, be happy :)
@@ -264,8 +264,8 @@ void ScInterpreter::ScEasterSunday()
         L = (32 + 2 * E + 2 * I - H - K) % 7;
         M = int((N + 11 * H + 22 * L) / 451);
         O = H + L - 7 * M + 114;
-        nDay = sal::static_int_cast<INT16>( O % 31 + 1 );
-        nMonth = sal::static_int_cast<INT16>( int(O / 31) );
+        nDay = sal::static_int_cast<sal_Int16>( O % 31 + 1 );
+        nMonth = sal::static_int_cast<sal_Int16>( int(O / 31) );
         PushDouble( GetDateSerial( nYear, nMonth, nDay, true ) );
     }
 }
@@ -276,9 +276,9 @@ void ScInterpreter::ScGetDate()
     nFuncFmtType = NUMBERFORMAT_DATE;
     if ( MustHaveParamCount( GetByte(), 3 ) )
     {
-        INT16 nDay   = (INT16) ::rtl::math::approxFloor(GetDouble());
-        INT16 nMonth = (INT16) ::rtl::math::approxFloor(GetDouble());
-        INT16 nYear  = (INT16) ::rtl::math::approxFloor(GetDouble());
+        sal_Int16 nDay   = (sal_Int16) ::rtl::math::approxFloor(GetDouble());
+        sal_Int16 nMonth = (sal_Int16) ::rtl::math::approxFloor(GetDouble());
+        sal_Int16 nYear  = (sal_Int16) ::rtl::math::approxFloor(GetDouble());
         if (nYear < 0)
             PushIllegalArgument();
         else
@@ -340,14 +340,14 @@ void ScInterpreter::ScGetDiffDate360()
      * In Calc the result is 419 respectively -419. I consider the -418 a bug in Excel.
      */
 
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
-        BOOL bFlag;
+        sal_Bool bFlag;
         if (nParamCount == 3)
             bFlag = GetBool();
         else
-            bFlag = FALSE;
+            bFlag = sal_False;
         double nDate2 = GetDouble();
         double nDate1 = GetDouble();
         double fSign;
@@ -371,7 +371,7 @@ void ScInterpreter::ScGetDiffDate360()
             Date aDate2 = *(pFormatter->GetNullDate());
             aDate2 += (long) ::rtl::math::approxFloor(nDate2);
             if (aDate1.GetDay() == 31)
-                aDate1 -= (ULONG) 1;
+                aDate1 -= (sal_uLong) 1;
             else if (!bFlag)
             {
                 if (aDate1.GetMonth() == 2)
@@ -393,7 +393,7 @@ void ScInterpreter::ScGetDiffDate360()
                 if (!bFlag )
                 {
                     if (aDate1.GetDay() == 30)
-                        aDate2 -= (ULONG) 1;
+                        aDate2 -= (sal_uLong) 1;
                 }
                 else
                     aDate2.SetDay(30);
@@ -457,7 +457,7 @@ void ScInterpreter::ScInt()
 void ScInterpreter::RoundNumber( rtl_math_RoundingMode eMode )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::RoundNumber" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         double fVal = 0.0;
@@ -465,7 +465,7 @@ void ScInterpreter::RoundNumber( rtl_math_RoundingMode eMode )
             fVal = ::rtl::math::round( GetDouble(), 0, eMode );
         else
         {
-            INT32 nDec = (INT32) ::rtl::math::approxFloor(GetDouble());
+            sal_Int32 nDec = (sal_Int32) ::rtl::math::approxFloor(GetDouble());
             if( nDec < -20 || nDec > 20 )
                 PushIllegalArgument();
             else
@@ -496,10 +496,10 @@ void ScInterpreter::ScRoundUp()
 void ScInterpreter::ScCeil()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCeil" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
-        BOOL bAbs = ( nParamCount == 3 ? GetBool() : FALSE );
+        sal_Bool bAbs = ( nParamCount == 3 ? GetBool() : sal_False );
         double fDec = GetDouble();
         double fVal = GetDouble();
         if ( fDec == 0.0 )
@@ -519,10 +519,10 @@ void ScInterpreter::ScCeil()
 void ScInterpreter::ScFloor()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScFloor" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
-        BOOL bAbs = ( nParamCount == 3 ? GetBool() : FALSE );
+        sal_Bool bAbs = ( nParamCount == 3 ? GetBool() : sal_False );
         double fDec = GetDouble();
         double fVal = GetDouble();
         if ( fDec == 0.0 )
@@ -582,7 +582,7 @@ void ScInterpreter::ScArcTan2()
 void ScInterpreter::ScLog()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLog" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         double nBase;
@@ -657,7 +657,7 @@ void ScInterpreter::ScNPV()
                     case svDoubleRef :
                     case svRefList :
                     {
-                        USHORT nErr = 0;
+                        sal_uInt16 nErr = 0;
                         double nCellVal;
                         PopDoubleRef( aRange, nParamCount, nRefInList);
                         ScValueIterator aValIter(pDok, aRange, glSubTotal);
@@ -687,14 +687,14 @@ void ScInterpreter::ScIRR()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIRR" );
     double fSchaetzwert;
     nFuncFmtType = NUMBERFORMAT_PERCENT;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 1, 2 ) )
         return;
     if (nParamCount == 2)
         fSchaetzwert = GetDouble();
     else
         fSchaetzwert = 0.1;
-    USHORT sPos = sp;                       // Stack-Position merken
+    sal_uInt16 sPos = sp;                       // Stack-Position merken
     double fEps = 1.0;
     double x, xNeu, fWert, fZaehler, fNenner, nCount;
     if (fSchaetzwert == -1.0)
@@ -711,8 +711,8 @@ void ScInterpreter::ScIRR()
             return;
         }
     }
-    const USHORT nIterationsMax = 20;
-    USHORT nItCount = 0;
+    const sal_uInt16 nIterationsMax = 20;
+    sal_uInt16 nItCount = 0;
     ScRange aRange;
     while (fEps > SCdEpsilon && nItCount < nIterationsMax)
     {                                       // Newton-Verfahren:
@@ -720,7 +720,7 @@ void ScInterpreter::ScIRR()
         nCount = 0.0;
         fZaehler = 0.0;
         fNenner = 0.0;
-        USHORT nErr = 0;
+        sal_uInt16 nErr = 0;
         PopDoubleRef( aRange );
         ScValueIterator aValIter(pDok, aRange, glSubTotal);
         if (aValIter.GetFirst(fWert, nErr))
@@ -771,10 +771,10 @@ void ScInterpreter::ScMIRR()
         {
             ScValueIterator aValIter( pDok, aRange, glSubTotal );
             double fCellValue;
-            ULONG nCount = 0;
-            USHORT nIterError = 0;
+            sal_uLong nCount = 0;
+            sal_uInt16 nIterError = 0;
 
-            BOOL bLoop = aValIter.GetFirst( fCellValue, nIterError );
+            sal_Bool bLoop = aValIter.GetFirst( fCellValue, nIterError );
             while( bLoop )
             {
                 if( fCellValue > 0.0 )          // reinvestments
@@ -842,7 +842,7 @@ void ScInterpreter::ScBW()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBW" );
     nFuncFmtType = NUMBERFORMAT_CURRENCY;
     double nRmz, nZzr, nZins, nZw = 0, nFlag = 0;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 5 ) )
         return;
     if (nParamCount == 5)
@@ -902,7 +902,7 @@ void ScInterpreter::ScGDA()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGDA" );
     nFuncFmtType = NUMBERFORMAT_CURRENCY;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 4, 5 ) )
     {
         double nFaktor;
@@ -926,7 +926,7 @@ void ScInterpreter::ScGDA2()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGDA2" );
     nFuncFmtType = NUMBERFORMAT_CURRENCY;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 4, 5 ) )
         return ;
     double nMonate;
@@ -955,8 +955,8 @@ void ScInterpreter::ScGDA2()
         double nSummAbRate = nErsteAbRate;
         double nMin = nDauer;
         if (nMin > nPeriode) nMin = nPeriode;
-        USHORT iMax = (USHORT)::rtl::math::approxFloor(nMin);
-        for (USHORT i = 2; i <= iMax; i++)
+        sal_uInt16 iMax = (sal_uInt16)::rtl::math::approxFloor(nMin);
+        for (sal_uInt16 i = 2; i <= iMax; i++)
         {
             nGda2 = (nWert - nSummAbRate) * nAbRate;
             nSummAbRate += nGda2;
@@ -974,14 +974,14 @@ double ScInterpreter::ScInterVDB(double fWert,double fRest,double fDauer,
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScInterVDB" );
     double fVdb=0;
     double fIntEnd   = ::rtl::math::approxCeil(fPeriode);
-    ULONG nLoopEnd   = (ULONG) fIntEnd;
+    sal_uLong nLoopEnd   = (sal_uLong) fIntEnd;
 
     double fTerm, fLia;
     double fRestwert = fWert - fRest;
-    BOOL bNowLia = FALSE;
+    sal_Bool bNowLia = sal_False;
 
     double fGda;
-    ULONG i;
+    sal_uLong i;
     fLia=0;
     for ( i = 1; i <= nLoopEnd; i++)
     {
@@ -993,7 +993,7 @@ double ScInterpreter::ScInterVDB(double fWert,double fRest,double fDauer,
             if (fLia > fGda)
             {
                 fTerm = fLia;
-                bNowLia = TRUE;
+                bNowLia = sal_True;
             }
             else
             {
@@ -1024,15 +1024,15 @@ void ScInterpreter::ScVDB()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScVDB" );
     nFuncFmtType = NUMBERFORMAT_CURRENCY;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 5, 7 ) )
     {
         double fWert, fRest, fDauer, fAnfang, fEnde, fFaktor, fVdb = 0.0;
-        BOOL bFlag;
+        sal_Bool bFlag;
         if (nParamCount == 7)
             bFlag = GetBool();
         else
-            bFlag = FALSE;
+            bFlag = sal_False;
         if (nParamCount >= 6)
             fFaktor = GetDouble();
         else
@@ -1049,13 +1049,13 @@ void ScInterpreter::ScVDB()
         {
             double fIntStart = ::rtl::math::approxFloor(fAnfang);
             double fIntEnd   = ::rtl::math::approxCeil(fEnde);
-            ULONG nLoopStart = (ULONG) fIntStart;
-            ULONG nLoopEnd   = (ULONG) fIntEnd;
+            sal_uLong nLoopStart = (sal_uLong) fIntStart;
+            sal_uLong nLoopEnd   = (sal_uLong) fIntEnd;
 
             fVdb = 0.0;
             if (bFlag)
             {
-                for (ULONG i = nLoopStart + 1; i <= nLoopEnd; i++)
+                for (sal_uLong i = nLoopStart + 1; i <= nLoopEnd; i++)
                 {
                     double fTerm = ScGetGDA(fWert, fRest, fDauer, (double) i, fFaktor);
 
@@ -1147,7 +1147,7 @@ void ScInterpreter::ScRMZ()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRMZ" );
     double nZins, nZzr, nBw, nZw = 0, nFlag = 0;
     nFuncFmtType = NUMBERFORMAT_CURRENCY;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 5 ) )
         return;
     if (nParamCount == 5)
@@ -1196,7 +1196,7 @@ void ScInterpreter::ScZW()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZW" );
     double nZins, nZzr, nRmz, nBw = 0, nFlag = 0;
     nFuncFmtType = NUMBERFORMAT_CURRENCY;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 5 ) )
         return;
     if (nParamCount == 5)
@@ -1213,7 +1213,7 @@ void ScInterpreter::ScZZR()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZZR" );
     double nZins, nRmz, nBw, nZw = 0, nFlag = 0;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 5 ) )
         return;
     if (nParamCount == 5)
@@ -1244,8 +1244,8 @@ bool ScInterpreter::RateIteration( double fNper, double fPayment, double fPv,
     bool bValid = true, bFound = false;
     double fX, fXnew, fTerm, fTermDerivation;
     double fGeoSeries, fGeoSeriesDerivation;
-    const USHORT nIterationsMax = 150;
-    USHORT nCount = 0;
+    const sal_uInt16 nIterationsMax = 150;
+    sal_uInt16 nCount = 0;
     const double fEpsilonSmall = 1.0E-14;
     // convert any fPayType situation to fPayType == zero situation
     fFv = fFv - fPayment * fPayType;
@@ -1335,7 +1335,7 @@ void ScInterpreter::ScZins()
     double fFv = 0, fPayType = 0, fGuess = 0.1;
     bool bValid = true;
     nFuncFmtType = NUMBERFORMAT_PERCENT;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 6 ) )
         return;
     if (nParamCount == 6)
@@ -1390,7 +1390,7 @@ void ScInterpreter::ScZinsZ()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZinsZ" );
     double nZins, nZr, nRmz, nZzr, nBw, nZw = 0, nFlag = 0;
     nFuncFmtType = NUMBERFORMAT_CURRENCY;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 4, 6 ) )
         return;
     if (nParamCount == 6)
@@ -1412,7 +1412,7 @@ void ScInterpreter::ScKapz()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScKapz" );
     double nZins, nZr, nZzr, nBw, nZw = 0, nFlag = 0, nRmz, nZinsz;
     nFuncFmtType = NUMBERFORMAT_CURRENCY;
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 4, 6 ) )
         return;
     if (nParamCount == 6)
@@ -1450,8 +1450,8 @@ void ScInterpreter::ScKumZinsZ()
             PushIllegalArgument();
         else
         {
-            ULONG nAnfang = (ULONG) fAnfang;
-            ULONG nEnde = (ULONG) fEnde ;
+            sal_uLong nAnfang = (sal_uLong) fAnfang;
+            sal_uLong nEnde = (sal_uLong) fEnde ;
             fRmz = ScGetRmz(fZins, fZzr, fBw, 0.0, fF);
             fZinsZ = 0.0;
             if (nAnfang == 1)
@@ -1460,7 +1460,7 @@ void ScInterpreter::ScKumZinsZ()
                     fZinsZ = -fBw;
                 nAnfang++;
             }
-            for (ULONG i = nAnfang; i <= nEnde; i++)
+            for (sal_uLong i = nAnfang; i <= nEnde; i++)
             {
                 if (fF > 0.0)
                     fZinsZ += ScGetZw(fZins, (double)(i-2), fRmz, fBw, 1.0) - fRmz;
@@ -1493,8 +1493,8 @@ void ScInterpreter::ScKumKapZ()
         {
             fRmz = ScGetRmz(fZins, fZzr, fBw, 0.0, fF);
             fKapZ = 0.0;
-            ULONG nAnfang = (ULONG) fAnfang;
-            ULONG nEnde = (ULONG) fEnde;
+            sal_uLong nAnfang = (sal_uLong) fAnfang;
+            sal_uLong nEnde = (sal_uLong) fEnde;
             if (nAnfang == 1)
             {
                 if (fF <= 0.0)
@@ -1503,7 +1503,7 @@ void ScInterpreter::ScKumKapZ()
                     fKapZ = fRmz;
                 nAnfang++;
             }
-            for (ULONG i = nAnfang; i <= nEnde; i++)
+            for (sal_uLong i = nAnfang; i <= nEnde; i++)
             {
                 if (fF > 0.0)
                     fKapZ += fRmz - (ScGetZw(fZins, (double)(i-2), fRmz, fBw, 1.0) - fRmz) * fZins;
@@ -1594,7 +1594,7 @@ void ScInterpreter::ScBackSolver()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBackSolver" );
     if ( MustHaveParamCount( GetByte(), 3 ) )
     {
-        BOOL bDoneIteration = FALSE;
+        sal_Bool bDoneIteration = sal_False;
         ScAddress aValueAdr, aFormulaAdr;
         double fTargetVal = GetDouble();
         PopSingleRef( aFormulaAdr );
@@ -1604,7 +1604,7 @@ void ScInterpreter::ScBackSolver()
         {
             ScBaseCell* pVCell = GetCell( aValueAdr );
             // CELLTYPE_NOTE: kein Value aber von Formel referiert
-            BOOL bTempCell = (!pVCell || pVCell->GetCellType() == CELLTYPE_NOTE);
+            sal_Bool bTempCell = (!pVCell || pVCell->GetCellType() == CELLTYPE_NOTE);
             ScBaseCell* pFCell = GetCell( aFormulaAdr );
 
             if ( ((pVCell && pVCell->GetCellType() == CELLTYPE_VALUE) || bTempCell)
@@ -1624,7 +1624,7 @@ void ScInterpreter::ScBackSolver()
                 else
                     fSaveVal = GetCellValue( aValueAdr, pVCell );
 
-                const USHORT nMaxIter = 100;
+                const sal_uInt16 nMaxIter = 100;
                 const double fEps = 1E-10;
                 const double fDelta = 1E-6;
 
@@ -1636,22 +1636,22 @@ void ScInterpreter::ScBackSolver()
                 ScValueCell* pValue = (ScValueCell*) pVCell;
 
                 pFormula->Interpret();
-                BOOL bError = ( pFormula->GetErrCode() != 0 );
+                sal_Bool bError = ( pFormula->GetErrCode() != 0 );
                 // bError always corresponds with fF
 
                 fFPrev = pFormula->GetValue() - fTargetVal;
 
                 fBestF = fabs( fFPrev );
                 if ( fBestF < fDelta )
-                    bDoneIteration = TRUE;
+                    bDoneIteration = sal_True;
 
                 double fX = fXPrev + fEps;
                 double fF = fFPrev;
                 double fSlope;
 
-                USHORT nIter = 0;
+                sal_uInt16 nIter = 0;
 
-                BOOL bHorMoveError = FALSE;
+                sal_Bool bHorMoveError = sal_False;
                                                 // Nach der Regula Falsi Methode
                 while ( !bDoneIteration && ( nIter++ < nMaxIter ) )
                 {
@@ -1669,18 +1669,18 @@ void ScInterpreter::ScBackSolver()
                         // may become zero which ultimately causes the goal seek operation
                         // to fail. #i28955#
 
-                        USHORT nHorIter = 0;
+                        sal_uInt16 nHorIter = 0;
                         const double fHorStepAngle = 5.0;
                         const double fHorMaxAngle = 80.0;
                         int nHorMaxIter = static_cast<int>( fHorMaxAngle / fHorStepAngle );
-                        BOOL bDoneHorMove = FALSE;
+                        sal_Bool bDoneHorMove = sal_False;
 
                         while ( !bDoneHorMove && !bHorMoveError && nHorIter++ < nHorMaxIter )
                         {
                             double fHorAngle = fHorStepAngle * static_cast<double>( nHorIter );
                             double fHorTangent = ::rtl::math::tan( fHorAngle * F_PI / 180 );
 
-                            USHORT nIdx = 0;
+                            sal_uInt16 nIdx = 0;
                             while( nIdx++ < 2 && !bDoneHorMove )
                             {
                                 double fHorX;
@@ -1700,12 +1700,12 @@ void ScInterpreter::ScBackSolver()
                                 if ( fF != fFPrev )
                                 {
                                     fX = fHorX;
-                                    bDoneHorMove = TRUE;
+                                    bDoneHorMove = sal_True;
                                 }
                             }
                         }
                         if ( !bDoneHorMove )
-                            bHorMoveError = TRUE;
+                            bHorMoveError = sal_True;
                     }
 
                     if ( bError )
@@ -1722,7 +1722,7 @@ void ScInterpreter::ScBackSolver()
                     {
                         // converged to root
                         fBestX = fX;
-                        bDoneIteration = TRUE;
+                        bDoneIteration = sal_True;
                     }
                     else
                     {
@@ -2054,7 +2054,7 @@ void ScInterpreter::ScCurrent()
 void ScInterpreter::ScStyle()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScStyle" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if (nParamCount >= 1 && nParamCount <= 3)
     {
         String aStyle2;                             // Vorlage nach Timer
@@ -2092,10 +2092,10 @@ void ScInterpreter::ScStyle()
 }
 
 ScDdeLink* lcl_GetDdeLink( sfx2::LinkManager* pLinkMgr,
-                                const String& rA, const String& rT, const String& rI, BYTE nM )
+                                const String& rA, const String& rT, const String& rI, sal_uInt8 nM )
 {
-    USHORT nCount = pLinkMgr->GetLinks().Count();
-    for (USHORT i=0; i<nCount; i++ )
+    sal_uInt16 nCount = pLinkMgr->GetLinks().Count();
+    for (sal_uInt16 i=0; i<nCount; i++ )
     {
         ::sfx2::SvBaseLink* pBase = *pLinkMgr->GetLinks()[i];
         if (pBase->ISA(ScDdeLink))
@@ -2118,12 +2118,12 @@ void ScInterpreter::ScDde()
     //  Applikation, Datei, Bereich
     //  Application, Topic, Item
 
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 3, 4 ) )
     {
-        BYTE nMode = SC_DDE_DEFAULT;
+        sal_uInt8 nMode = SC_DDE_DEFAULT;
         if (nParamCount == 4)
-            nMode = (BYTE) ::rtl::math::approxFloor(GetDouble());
+            nMode = (sal_uInt8) ::rtl::math::approxFloor(GetDouble());
         String aItem  = GetString();
         String aTopic = GetString();
         String aAppl  = GetString();
@@ -2149,8 +2149,8 @@ void ScInterpreter::ScDde()
             //  solange der Link nicht ausgewertet ist, Idle abklemmen
             //  (um zirkulaere Referenzen zu vermeiden)
 
-        BOOL bOldDis = pDok->IsIdleDisabled();
-        pDok->DisableIdle( TRUE );
+        sal_Bool bOldDis = pDok->IsIdleDisabled();
+        pDok->DisableIdle( sal_True );
 
             //  Link-Objekt holen / anlegen
 
@@ -2159,7 +2159,7 @@ void ScInterpreter::ScDde()
         //! Dde-Links (zusaetzlich) effizienter am Dokument speichern !!!!!
         //      ScDdeLink* pLink = pDok->GetDdeLink( aAppl, aTopic, aItem );
 
-        BOOL bWasError = ( pMyFormulaCell->GetRawError() != 0 );
+        sal_Bool bWasError = ( pMyFormulaCell->GetRawError() != 0 );
 
         if (!pLink)
         {
@@ -2215,7 +2215,7 @@ void ScInterpreter::ScDde()
 
 void ScInterpreter::ScBase()
 {   // Value, Base [, MinLen]
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
         static const sal_Unicode __FAR_DATA pDigits[] = {
@@ -2258,10 +2258,10 @@ void ScInterpreter::ScBase()
             }
             sal_Unicode* p = pBuf + nBuf - 1;
             *p = 0;
-            if ( fVal <= (ULONG)(~0) )
+            if ( fVal <= (sal_uLong)(~0) )
             {
-                ULONG nVal = (ULONG) fVal;
-                ULONG nBase = (ULONG) fBase;
+                sal_uLong nVal = (sal_uLong) fVal;
+                sal_uLong nBase = (sal_uLong) fBase;
                 while ( nVal && p > pBuf )
                 {
                     *--p = pDigits[ nVal % nBase ];
@@ -2271,7 +2271,7 @@ void ScInterpreter::ScBase()
             }
             else
             {
-                BOOL bDirt = FALSE;
+                sal_Bool bDirt = sal_False;
                 while ( fVal && p > pBuf )
                 {
 //! mit fmod Rundungsfehler ab 2**48
@@ -2301,7 +2301,7 @@ void ScInterpreter::ScBase()
                     size_t nDig;
                     if ( fVal < fMult )
                     {   // da ist was gekippt
-                        bDirt = TRUE;
+                        bDirt = sal_True;
                         nDig = 0;
                     }
                     else
@@ -2309,7 +2309,7 @@ void ScInterpreter::ScBase()
                         double fDig = ::rtl::math::approxFloor( ::rtl::math::approxSub( fVal, fMult ) );
                         if ( bDirt )
                         {
-                            bDirt = FALSE;
+                            bDirt = sal_False;
                             --fDig;
                         }
                         if ( fDig <= 0.0 )
@@ -2422,7 +2422,7 @@ void ScInterpreter::ScConvert()
 
 void ScInterpreter::ScRoman()
 {   // Value [Mode]
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         double fMode = (nParamCount == 2) ? ::rtl::math::approxFloor( GetDouble() ) : 0.0;
@@ -2432,22 +2432,22 @@ void ScInterpreter::ScRoman()
         else if( (fMode >= 0.0) && (fMode < 5.0) && (fVal >= 0.0) && (fVal < 4000.0) )
         {
             static const sal_Unicode pChars[] = { 'M', 'D', 'C', 'L', 'X', 'V', 'I' };
-            static const USHORT pValues[] = { 1000, 500, 100, 50, 10, 5, 1 };
-            static const USHORT nMaxIndex = (USHORT)(sizeof(pValues) / sizeof(pValues[0]) - 1);
+            static const sal_uInt16 pValues[] = { 1000, 500, 100, 50, 10, 5, 1 };
+            static const sal_uInt16 nMaxIndex = (sal_uInt16)(sizeof(pValues) / sizeof(pValues[0]) - 1);
 
             String aRoman;
-            USHORT nVal = (USHORT) fVal;
-            USHORT nMode = (USHORT) fMode;
+            sal_uInt16 nVal = (sal_uInt16) fVal;
+            sal_uInt16 nMode = (sal_uInt16) fMode;
 
-            for( UINT16 i = 0; i <= nMaxIndex / 2; i++ )
+            for( sal_uInt16 i = 0; i <= nMaxIndex / 2; i++ )
             {
-                USHORT nIndex = 2 * i;
-                USHORT nDigit = nVal / pValues[ nIndex ];
+                sal_uInt16 nIndex = 2 * i;
+                sal_uInt16 nDigit = nVal / pValues[ nIndex ];
 
                 if( (nDigit % 5) == 4 )
                 {
-                    USHORT nIndex2 = (nDigit == 4) ? nIndex - 1 : nIndex - 2;
-                    USHORT nSteps = 0;
+                    sal_uInt16 nIndex2 = (nDigit == 4) ? nIndex - 1 : nIndex - 2;
+                    sal_uInt16 nSteps = 0;
                     while( (nSteps < nMode) && (nIndex < nMaxIndex) )
                     {
                         nSteps++;
@@ -2458,8 +2458,8 @@ void ScInterpreter::ScRoman()
                     }
                     aRoman += pChars[ nIndex ];
                     aRoman += pChars[ nIndex2 ];
-                    nVal = sal::static_int_cast<USHORT>( nVal + pValues[ nIndex ] );
-                    nVal = sal::static_int_cast<USHORT>( nVal - pValues[ nIndex2 ] );
+                    nVal = sal::static_int_cast<sal_uInt16>( nVal + pValues[ nIndex ] );
+                    nVal = sal::static_int_cast<sal_uInt16>( nVal - pValues[ nIndex2 ] );
                 }
                 else
                 {
@@ -2478,21 +2478,21 @@ void ScInterpreter::ScRoman()
 }
 
 
-BOOL lcl_GetArabicValue( sal_Unicode cChar, USHORT& rnValue, BOOL& rbIsDec )
+sal_Bool lcl_GetArabicValue( sal_Unicode cChar, sal_uInt16& rnValue, sal_Bool& rbIsDec )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBase" );
     switch( cChar )
     {
-        case 'M':   rnValue = 1000; rbIsDec = TRUE;     break;
-        case 'D':   rnValue = 500;  rbIsDec = FALSE;    break;
-        case 'C':   rnValue = 100;  rbIsDec = TRUE;     break;
-        case 'L':   rnValue = 50;   rbIsDec = FALSE;    break;
-        case 'X':   rnValue = 10;   rbIsDec = TRUE;     break;
-        case 'V':   rnValue = 5;    rbIsDec = FALSE;    break;
-        case 'I':   rnValue = 1;    rbIsDec = TRUE;     break;
-        default:    return FALSE;
+        case 'M':   rnValue = 1000; rbIsDec = sal_True;     break;
+        case 'D':   rnValue = 500;  rbIsDec = sal_False;    break;
+        case 'C':   rnValue = 100;  rbIsDec = sal_True;     break;
+        case 'L':   rnValue = 50;   rbIsDec = sal_False;    break;
+        case 'X':   rnValue = 10;   rbIsDec = sal_True;     break;
+        case 'V':   rnValue = 5;    rbIsDec = sal_False;    break;
+        case 'I':   rnValue = 1;    rbIsDec = sal_True;     break;
+        default:    return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -2506,18 +2506,18 @@ void ScInterpreter::ScArabic()
     {
         aRoman.ToUpperAscii();
 
-        USHORT nValue = 0;
-        USHORT nValidRest = 3999;
-        USHORT nCharIndex = 0;
-        USHORT nCharCount = aRoman.Len();
-        BOOL bValid = TRUE;
+        sal_uInt16 nValue = 0;
+        sal_uInt16 nValidRest = 3999;
+        sal_uInt16 nCharIndex = 0;
+        sal_uInt16 nCharCount = aRoman.Len();
+        sal_Bool bValid = sal_True;
 
         while( bValid && (nCharIndex < nCharCount) )
         {
-            USHORT nDigit1 = 0;
-            USHORT nDigit2 = 0;
-            BOOL bIsDec1 = FALSE;
-            BOOL bIsDec2 = FALSE;
+            sal_uInt16 nDigit1 = 0;
+            sal_uInt16 nDigit2 = 0;
+            sal_Bool bIsDec1 = sal_False;
+            sal_Bool bIsDec2 = sal_False;
             bValid = lcl_GetArabicValue( aRoman.GetChar( nCharIndex ), nDigit1, bIsDec1 );
             if( bValid && (nCharIndex + 1 < nCharCount) )
                 bValid = lcl_GetArabicValue( aRoman.GetChar( nCharIndex + 1 ), nDigit2, bIsDec2 );
@@ -2525,24 +2525,24 @@ void ScInterpreter::ScArabic()
             {
                 if( nDigit1 >= nDigit2 )
                 {
-                    nValue = sal::static_int_cast<USHORT>( nValue + nDigit1 );
+                    nValue = sal::static_int_cast<sal_uInt16>( nValue + nDigit1 );
                     nValidRest %= (nDigit1 * (bIsDec1 ? 5 : 2));
                     bValid = (nValidRest >= nDigit1);
                     if( bValid )
-                        nValidRest = sal::static_int_cast<USHORT>( nValidRest - nDigit1 );
+                        nValidRest = sal::static_int_cast<sal_uInt16>( nValidRest - nDigit1 );
                     nCharIndex++;
                 }
                 else if( nDigit1 * 2 != nDigit2 )
                 {
-                    USHORT nDiff = nDigit2 - nDigit1;
-                    nValue = sal::static_int_cast<USHORT>( nValue + nDiff );
+                    sal_uInt16 nDiff = nDigit2 - nDigit1;
+                    nValue = sal::static_int_cast<sal_uInt16>( nValue + nDiff );
                     bValid = (nValidRest >= nDiff);
                     if( bValid )
                         nValidRest = nDigit1 - 1;
                     nCharIndex += 2;
                 }
                 else
-                    bValid = FALSE;
+                    bValid = sal_False;
             }
         }
         if( bValid )
@@ -2556,7 +2556,7 @@ void ScInterpreter::ScArabic()
 void ScInterpreter::ScHyperLink()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScHyperLink" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1, 2 ) )
     {
         double fVal = 0.0;
@@ -2585,7 +2585,7 @@ void ScInterpreter::ScHyperLink()
                         nResultType = SC_MATVAL_EMPTY;
                     else
                     {
-                        USHORT nErr = GetCellErrCode( pCell );
+                        sal_uInt16 nErr = GetCellErrCode( pCell );
                         if (nErr)
                             SetError( nErr);
                         else if (HasCellValueData( pCell))
@@ -2638,7 +2638,7 @@ void ScInterpreter::ScHyperLink()
 }
 
 
-BOOL lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
+sal_Bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
 {
     struct ConvertInfo
     {
@@ -2672,14 +2672,14 @@ BOOL lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec )
         {
             rfRate = aConvertTable[i].fRate;
             rnDec  = aConvertTable[i].nDec;
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 void ScInterpreter::ScEuroConvert()
 {   //Value, FromUnit, ToUnit[, FullPrecision, [TriangulationPrecision]]
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 3, 5 ) )
     {
         double nPrecision = 0.0;
@@ -2692,7 +2692,7 @@ void ScInterpreter::ScEuroConvert()
                 return;
             }
         }
-        BOOL bFullPrecision = FALSE;
+        sal_Bool bFullPrecision = sal_False;
         if ( nParamCount >= 4 )
             bFullPrecision = GetBool();
         String aToUnit( GetString() );
@@ -2863,7 +2863,7 @@ void lclAppendBlock( ByteString& rText, sal_Int32 nValue )
 void ScInterpreter::ScBahtText()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBahtText" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 1 ) )
     {
         double fValue = GetDouble();
@@ -2932,7 +2932,7 @@ void ScInterpreter::ScBahtText()
 void ScInterpreter::ScGetPivotData()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGetPivotData" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
 
     if ( MustHaveParamCount( nParamCount, 2, 30 ) )
     {
@@ -2959,14 +2959,14 @@ void ScInterpreter::ScGetPivotData()
         {
             // new syntax: separate name/value pairs
 
-            USHORT nFilterCount = nParamCount / 2 - 1;
+            sal_uInt16 nFilterCount = nParamCount / 2 - 1;
             aFilters.resize( nFilterCount );
 
-            USHORT i = nFilterCount;
+            sal_uInt16 i = nFilterCount;
             while( i-- > 0 )
             {
                 //! should allow numeric constraint values
-                aFilters[i].mbValIsStr = TRUE;
+                aFilters[i].mbValIsStr = sal_True;
                 aFilters[i].maValStr = GetString();
                 
                 aFilters[i].maFieldName = GetString();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 912d52ac3..19a87a1b1 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -211,7 +211,7 @@ double ScInterpreter::integralPhi(double x)
     return 0.5 * ::rtl::math::erfc(-x * 0.7071067811865475); // * 1/sqrt(2)
 }
 
-double ScInterpreter::taylor(double* pPolynom, USHORT nMax, double x)
+double ScInterpreter::taylor(double* pPolynom, sal_uInt16 nMax, double x)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::taylor" );
     double nVal = pPolynom[nMax];
@@ -250,7 +250,7 @@ double ScInterpreter::gauss(double x)
     double asympt[] = { -1.0, 1.0, -3.0, 15.0, -105.0 };
 
     double xAbs = fabs(x);
-    USHORT xShort = (USHORT)::rtl::math::approxFloor(xAbs);
+    sal_uInt16 xShort = (sal_uInt16)::rtl::math::approxFloor(xAbs);
     double nVal = 0.0;
     if (xShort == 0)
         nVal = taylor(t0, 11, (xAbs * xAbs)) * xAbs;
@@ -683,7 +683,7 @@ double ScInterpreter::GetTDist(double T, double fDF)
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetTDist" );
     return 0.5 * GetBetaDist(fDF/(fDF+T*T), fDF/2.0, 0.5);
 /*
-    USHORT DF = (USHORT) fDF;
+    sal_uInt16 DF = (sal_uInt16) fDF;
     double A = T / sqrt(DF);
     double B = 1.0 + A*A;
     double R;
@@ -693,7 +693,7 @@ double ScInterpreter::GetTDist(double T, double fDF)
     {
         double S0 = A/(2.0 * sqrt(B));
         double C0 = S0;
-        for (USHORT i = 2; i <= DF-2; i+=2)
+        for (sal_uInt16 i = 2; i <= DF-2; i+=2)
         {
             C0 *= (1.0 - 1.0/(double)i)/B;
             S0 += C0;
@@ -704,7 +704,7 @@ double ScInterpreter::GetTDist(double T, double fDF)
     {
         double S1 = A / (B * F_PI);
         double C1 = S1;
-        for (USHORT i = 3; i <= DF-2; i+=2)
+        for (sal_uInt16 i = 3; i <= DF-2; i+=2)
         {
             C1 *= (1.0 - 1.0/(double)i)/B;
             S1 += C1;
@@ -779,7 +779,7 @@ double ScInterpreter::GetChiSqDistPDF(double fX, double fDF)
 
 void ScInterpreter::ScChiSqDist()
 {
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 2, 3 ) )
         return;
     double fX;
@@ -1069,7 +1069,7 @@ double ScInterpreter::GetBetaDist(double fXin, double fAlpha, double fBeta)
 
   void ScInterpreter::ScBetaDist()
   {
-      BYTE nParamCount = GetByte();
+      sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 6 ) ) // expanded, see #i91547#
           return;
     double fLowerBound, fUpperBound;
@@ -1205,7 +1205,7 @@ void ScInterpreter::ScVariationen()
         else
         {
             double nVal = n;
-            for (ULONG i = (ULONG)k-1; i >= 1; i--)
+            for (sal_uLong i = (sal_uLong)k-1; i >= 1; i--)
                 nVal *= n-(double)i;
             PushDouble(nVal);
         }
@@ -1229,7 +1229,7 @@ void ScInterpreter::ScVariationen2()
 void ScInterpreter::ScB()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScB" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 4 ) )
         return ;
     if (nParamCount == 3)
@@ -1250,16 +1250,16 @@ void ScInterpreter::ScB()
                     PushNoValue();
                 else
                 {
-                    ULONG max = (ULONG) (n - x);
-                    for (ULONG i = 0; i < max && fFactor > 0.0; i++)
+                    sal_uLong max = (sal_uLong) (n - x);
+                    for (sal_uLong i = 0; i < max && fFactor > 0.0; i++)
                         fFactor *= (n-i)/(i+1)*q/p;
                     PushDouble(fFactor);
                 }
             }
             else
             {
-                ULONG max = (ULONG) x;
-                for (ULONG i = 0; i < max && fFactor > 0.0; i++)
+                sal_uLong max = (sal_uLong) x;
+                for (sal_uLong i = 0; i < max && fFactor > 0.0; i++)
                     fFactor *= (n-i)/(i+1)*p/q;
                 PushDouble(fFactor);
             }
@@ -1294,16 +1294,16 @@ void ScInterpreter::ScB()
                 else
                 {
                     double fSum = 0.0;
-                    ULONG max;
-                    if (xe < (ULONG) n)
-                        max = (ULONG) (n-xe)-1;
+                    sal_uLong max;
+                    if (xe < (sal_uLong) n)
+                        max = (sal_uLong) (n-xe)-1;
                     else
                         max = 0;
-                    ULONG i;
+                    sal_uLong i;
                     for (i = 0; i < max && fFactor > 0.0; i++)
                         fFactor *= (n-i)/(i+1)*q/p;
-                    if (xs < (ULONG) n)
-                        max = (ULONG) (n-xs);
+                    if (xs < (sal_uLong) n)
+                        max = (sal_uLong) (n-xs);
                     else
                         fSum = fFactor;
                     for (; i < max && fFactor > 0.0; i++)
@@ -1316,25 +1316,25 @@ void ScInterpreter::ScB()
             }
             else
             {
-                ULONG max;
+                sal_uLong max;
                 double fSum;
-                if ( (ULONG) xs == 0)
+                if ( (sal_uLong) xs == 0)
                 {
                     fSum = fFactor;
                     max = 0;
                 }
                 else
                 {
-                    max = (ULONG) xs-1;
+                    max = (sal_uLong) xs-1;
                     fSum = 0.0;
                 }
-                ULONG i;
+                sal_uLong i;
                 for (i = 0; i < max && fFactor > 0.0; i++)
                     fFactor *= (n-i)/(i+1)*p/q;
-                if ((ULONG)xe == 0)                     // beide 0
+                if ((sal_uLong)xe == 0)                     // beide 0
                     fSum = fFactor;
                 else
-                    max = (ULONG) xe;
+                    max = (sal_uLong) xe;
                 for (; i < max && fFactor > 0.0; i++)
                 {
                     fFactor *= (n-i)/(i+1)*p/q;
@@ -1383,16 +1383,16 @@ void ScInterpreter::ScBinomDist()
                     PushNoValue();
                 else
                 {
-                    ULONG max = (ULONG) (n - x);
-                    for (ULONG i = 0; i < max && fFactor > 0.0; i++)
+                    sal_uLong max = (sal_uLong) (n - x);
+                    for (sal_uLong i = 0; i < max && fFactor > 0.0; i++)
                         fFactor *= (n-i)/(i+1)*q/p;
                     PushDouble(fFactor);
                 }
             }
             else
             {
-                ULONG max = (ULONG) x;
-                for (ULONG i = 0; i < max && fFactor > 0.0; i++)
+                sal_uLong max = (sal_uLong) x;
+                for (sal_uLong i = 0; i < max && fFactor > 0.0; i++)
                     fFactor *= (n-i)/(i+1)*p/q;
                 PushDouble(fFactor);
             }
@@ -1413,8 +1413,8 @@ void ScInterpreter::ScBinomDist()
                     else
                     {
                         fSum = 1.0 - fFactor;
-                        ULONG max = (ULONG) (n - x) - 1;
-                        for (ULONG i = 0; i < max && fFactor > 0.0; i++)
+                        sal_uLong max = (sal_uLong) (n - x) - 1;
+                        for (sal_uLong i = 0; i < max && fFactor > 0.0; i++)
                         {
                             fFactor *= (n-i)/(i+1)*q/p;
                             fSum -= fFactor;
@@ -1428,8 +1428,8 @@ void ScInterpreter::ScBinomDist()
                 else
                 {
                     fSum = fFactor;
-                    ULONG max = (ULONG) x;
-                    for (ULONG i = 0; i < max && fFactor > 0.0; i++)
+                    sal_uLong max = (sal_uLong) x;
+                    for (sal_uLong i = 0; i < max && fFactor > 0.0; i++)
                     {
                         fFactor *= (n-i)/(i+1)*p/q;
                         fSum += fFactor;
@@ -1462,8 +1462,8 @@ void ScInterpreter::ScCritBinom()
                     PushNoValue();
                 else
                 {
-                    double fSum = 1.0 - fFactor; ULONG max = (ULONG) n;
-                    ULONG i;
+                    double fSum = 1.0 - fFactor; sal_uLong max = (sal_uLong) n;
+                    sal_uLong i;
 
                     for ( i = 0; i < max && fSum >= alpha; i++)
                     {
@@ -1475,8 +1475,8 @@ void ScInterpreter::ScCritBinom()
             }
             else
             {
-                double fSum = fFactor; ULONG max = (ULONG) n;
-                ULONG i;
+                double fSum = fFactor; sal_uLong max = (sal_uLong) n;
+                sal_uLong i;
 
                 for ( i = 0; i < max && fSum < alpha; i++)
                 {
@@ -1513,7 +1513,7 @@ void ScInterpreter::ScNegBinomDist()
 void ScInterpreter::ScNormDist()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScNormDist" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 4))
         return;
     bool bCumulative = nParamCount == 4 ? GetBool() : true;
@@ -1534,7 +1534,7 @@ void ScInterpreter::ScNormDist()
 void ScInterpreter::ScLogNormDist() //expanded, see #i100119#
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogNormDist" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 1, 4)) 
         return;
     bool bCumulative = nParamCount == 4 ? GetBool() : true; // cumulative
@@ -1675,7 +1675,7 @@ void ScInterpreter::ScWeibull()
 void ScInterpreter::ScPoissonDist()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPoissonDist" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 2, 3 ) )
     {
         bool bCumulative = (nParamCount == 3 ? GetBool() : true); // default cumulative
@@ -1977,7 +1977,7 @@ void ScInterpreter::ScHypGeomDist()
 void ScInterpreter::ScGammaDist()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGammaDist" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 4 ) )
         return;
     double bCumulative;
@@ -2097,7 +2097,7 @@ public:
 void ScInterpreter::ScBetaInv()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScBetaInv" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 5 ) )
         return;
     double fP, fA, fB, fAlpha, fBeta;
@@ -2289,7 +2289,7 @@ void ScInterpreter::ScConfidence()
 void ScInterpreter::ScZTest()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScZTest" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 2, 3 ) )
         return;
     double sigma = 0.0, mue, x;
@@ -2340,7 +2340,7 @@ void ScInterpreter::ScZTest()
             while (nParam-- > 0)
             {
                 ScRange aRange;
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 PopDoubleRef( aRange, nParam, nRefInList);
                 ScValueIterator aValIter(pDok, aRange, glSubTotal);
                 if (aValIter.GetFirst(fVal, nErr))
@@ -2405,7 +2405,7 @@ void ScInterpreter::ScZTest()
             PushDouble(0.5 - gauss((mue-x)*sqrt(rValCount)/sigma));
     }
 }
-bool ScInterpreter::CalculateTest(BOOL _bTemplin
+bool ScInterpreter::CalculateTest(sal_Bool _bTemplin
                                   ,const SCSIZE nC1, const SCSIZE nC2,const SCSIZE nR1,const SCSIZE nR2
                                   ,const ScMatrixRef& pMat1,const ScMatrixRef& pMat2
                                   ,double& fT,double& fF)
@@ -2538,11 +2538,11 @@ void ScInterpreter::ScTTest()
     }
     else if (fTyp == 2.0)
     {
-        CalculateTest(FALSE,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF);
+        CalculateTest(sal_False,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF);
     }
     else if (fTyp == 3.0)
     {
-        CalculateTest(TRUE,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF);
+        CalculateTest(sal_True,nC1, nC2,nR1, nR2,pMat1,pMat2,fT,fF);
     }
 
     else
@@ -2795,7 +2795,7 @@ void ScInterpreter::ScHarMean()
             case formula::svDoubleRef :
             case svRefList :
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 PopDoubleRef( aRange, nParamCount, nRefInList);
                 double nCellVal;
                 ScValueIterator aValIter(pDok, aRange, glSubTotal);
@@ -2916,7 +2916,7 @@ void ScInterpreter::ScGeoMean()
             case formula::svDoubleRef :
             case svRefList :
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 PopDoubleRef( aRange, nParamCount, nRefInList);
                 double nCellVal;
                 ScValueIterator aValIter(pDok, aRange, glSubTotal);
@@ -3050,7 +3050,7 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std::
             case svRefList :
             {
                 PopDoubleRef( aRange, nParamCount, nRefInList);
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 ScValueIterator aValIter(pDok, aRange);
                 if (aValIter.GetFirst(fVal, nErr))
                 {
@@ -3172,7 +3172,7 @@ double ScInterpreter::GetMedian( vector<double> & rArray )
 void ScInterpreter::ScMedian()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMedian" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCountMin( nParamCount, 1 )  )
         return;
     vector<double> aArray;
@@ -3246,7 +3246,7 @@ void ScInterpreter::ScQuartile()
 void ScInterpreter::ScModalValue()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScModalValue" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCountMin( nParamCount, 1 ) )
         return;
     vector<double> aSortArray;
@@ -3289,7 +3289,7 @@ void ScInterpreter::ScModalValue()
     }
 }
 
-void ScInterpreter::CalculateSmallLarge(BOOL bSmall)
+void ScInterpreter::CalculateSmallLarge(sal_Bool bSmall)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateSmallLarge" );
     if ( !MustHaveParamCount( GetByte(), 2 )  )
@@ -3323,19 +3323,19 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall)
 void ScInterpreter::ScLarge()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLarge" );
-    CalculateSmallLarge(FALSE);   
+    CalculateSmallLarge(sal_False);   
 }
 
 void ScInterpreter::ScSmall()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSmall" );
-    CalculateSmallLarge(TRUE);
+    CalculateSmallLarge(sal_True);
 }
 
 void ScInterpreter::ScPercentrank()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPercentrank" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 2 ) )
         return;
 #if 0
@@ -3425,7 +3425,7 @@ void ScInterpreter::ScTrimMean()
         PushNoValue();
     else
     {
-        ULONG nIndex = (ULONG) ::rtl::math::approxFloor(alpha*(double)nSize);
+        sal_uLong nIndex = (sal_uLong) ::rtl::math::approxFloor(alpha*(double)nSize);
         if (nIndex % 2 != 0)
             nIndex--;
         nIndex /= 2;
@@ -3437,7 +3437,7 @@ void ScInterpreter::ScTrimMean()
     }
 }
 
-void ScInterpreter::GetNumberSequenceArray( BYTE nParamCount, vector<double>& rArray )
+void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double>& rArray )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetSortArray" );
     ScAddress aAdr;
@@ -3471,7 +3471,7 @@ void ScInterpreter::GetNumberSequenceArray( BYTE nParamCount, vector<double>& rA
                 nCellCount *= aRange.aEnd.Row() - aRange.aStart.Row() + 1;
                 rArray.reserve( rArray.size() + nCellCount);
 
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 double fCellVal;
                 ScValueIterator aValIter(pDok, aRange);
                 if (aValIter.GetFirst( fCellVal, nErr))
@@ -3519,7 +3519,7 @@ void ScInterpreter::GetNumberSequenceArray( BYTE nParamCount, vector<double>& rA
         PopError();
 }
 
-void ScInterpreter::GetSortArray( BYTE nParamCount, vector<double>& rSortArray, vector<long>* pIndexOrder )
+void ScInterpreter::GetSortArray( sal_uInt8 nParamCount, vector<double>& rSortArray, vector<long>* pIndexOrder )
 {
     GetNumberSequenceArray( nParamCount, rSortArray);
 
@@ -3614,16 +3614,16 @@ void ScInterpreter::QuickSort( vector<double>& rSortArray, vector<long>* pIndexO
 void ScInterpreter::ScRank()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRank" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 2, 3 ) )
         return;
-    BOOL bDescending;
+    sal_Bool bDescending;
     if (nParamCount == 3)
         bDescending = GetBool();
     else
-        bDescending = FALSE;
+        bDescending = sal_False;
     double fCount = 1.0;
-    BOOL bValid = FALSE;
+    sal_Bool bValid = sal_False;
     switch (GetStackType())
     {
         case formula::svDouble    :
@@ -3631,7 +3631,7 @@ void ScInterpreter::ScRank()
             double x = GetDouble();
             double fVal = GetDouble();
             if (x == fVal)
-                bValid = TRUE;
+                bValid = sal_True;
             break;
         }
         case svSingleRef :
@@ -3644,7 +3644,7 @@ void ScInterpreter::ScRank()
             {
                 double x = GetCellValue( aAdr, pCell );
                 if (x == fVal)
-                    bValid = TRUE;
+                    bValid = sal_True;
             }
             break;
         }
@@ -3656,9 +3656,9 @@ void ScInterpreter::ScRank()
             size_t nRefInList = 0;
             while (nParam-- > 0)
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 // Preserve stack until all RefList elements are done!
-                USHORT nSaveSP = sp;
+                sal_uInt16 nSaveSP = sp;
                 PopDoubleRef( aRange, nParam, nRefInList);
                 if (nParam)
                     --sp;   // simulate pop
@@ -3670,7 +3670,7 @@ void ScInterpreter::ScRank()
                 if (aValIter.GetFirst(nCellVal, nErr))
                 {
                     if (nCellVal == fVal)
-                        bValid = TRUE;
+                        bValid = sal_True;
                     else if ((!bDescending && nCellVal > fVal) ||
                             (bDescending && nCellVal < fVal) )
                         fCount++;
@@ -3678,7 +3678,7 @@ void ScInterpreter::ScRank()
                     while ((nErr == 0) && aValIter.GetNext(nCellVal, nErr))
                     {
                         if (nCellVal == fVal)
-                            bValid = TRUE;
+                            bValid = sal_True;
                         else if ((!bDescending && nCellVal > fVal) ||
                                 (bDescending && nCellVal < fVal) )
                             fCount++;
@@ -3701,7 +3701,7 @@ void ScInterpreter::ScRank()
                     {
                         double x = pMat->GetDouble(i);
                         if (x == fVal)
-                            bValid = TRUE;
+                            bValid = sal_True;
                         else if ((!bDescending && x > fVal) ||
                                     (bDescending && x < fVal) )
                             fCount++;
@@ -3714,7 +3714,7 @@ void ScInterpreter::ScRank()
                         {
                             double x = pMat->GetDouble(i);
                             if (x == fVal)
-                                bValid = TRUE;
+                                bValid = sal_True;
                             else if ((!bDescending && x > fVal) ||
                                         (bDescending && x < fVal) )
                                 fCount++;
@@ -3734,10 +3734,10 @@ void ScInterpreter::ScRank()
 void ScInterpreter::ScAveDev()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAveDev" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCountMin( nParamCount, 1 ) )
         return;
-    USHORT SaveSP = sp;
+    sal_uInt16 SaveSP = sp;
     double nMiddle = 0.0;
     double rVal = 0.0;
     double rValCount = 0.0;
@@ -3767,7 +3767,7 @@ void ScInterpreter::ScAveDev()
             case formula::svDoubleRef :
             case svRefList :
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 double nCellVal;
                 PopDoubleRef( aRange, nParam, nRefInList);
                 ScValueIterator aValIter(pDok, aRange);
@@ -3844,7 +3844,7 @@ void ScInterpreter::ScAveDev()
             case formula::svDoubleRef :
             case svRefList :
             {
-                USHORT nErr = 0;
+                sal_uInt16 nErr = 0;
                 double nCellVal;
                 PopDoubleRef( aRange, nParam, nRefInList);
                 ScValueIterator aValIter(pDok, aRange);
@@ -3898,7 +3898,7 @@ void ScInterpreter::ScDevSq()
 void ScInterpreter::ScProbability()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScProbability" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 3, 4 ) )
         return;
     double fUp, fLo;
@@ -3930,7 +3930,7 @@ void ScInterpreter::ScProbability()
         {
             double fSum = 0.0;
             double fRes = 0.0;
-            BOOL bStop = FALSE;
+            sal_Bool bStop = sal_False;
             double fP, fW;
             SCSIZE nCount1 = nC1 * nR1;
             for ( SCSIZE i = 0; i < nCount1 && !bStop; i++ )
@@ -3940,7 +3940,7 @@ void ScInterpreter::ScProbability()
                     fP = pMatP->GetDouble(i);
                     fW = pMatW->GetDouble(i);
                     if (fP < 0.0 || fP > 1.0)
-                        bStop = TRUE;
+                        bStop = sal_True;
                     else
                     {
                         fSum += fP;
@@ -3969,15 +3969,15 @@ void ScInterpreter::ScCorrel()
 void ScInterpreter::ScCovar()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCovar" );
-    CalculatePearsonCovar(FALSE,FALSE);
+    CalculatePearsonCovar(sal_False,sal_False);
 }
 
 void ScInterpreter::ScPearson() 
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPearson" );
-    CalculatePearsonCovar(TRUE,FALSE);
+    CalculatePearsonCovar(sal_True,sal_False);
 }
-void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy) 
+void ScInterpreter::CalculatePearsonCovar(sal_Bool _bPearson,sal_Bool _bStexy) 
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculatePearsonCovar" );
     if ( !MustHaveParamCount( GetByte(), 2 ) )
@@ -4088,9 +4088,9 @@ void ScInterpreter::ScRSQ()
 void ScInterpreter::ScSTEXY()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSTEXY" );
-    CalculatePearsonCovar(TRUE,TRUE);    
+    CalculatePearsonCovar(sal_True,sal_True);    
 }
-void ScInterpreter::CalculateSlopeIntercept(BOOL bSlope)
+void ScInterpreter::CalculateSlopeIntercept(sal_Bool bSlope)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateSlopeIntercept" );
     if ( !MustHaveParamCount( GetByte(), 2 ) )
@@ -4165,13 +4165,13 @@ void ScInterpreter::CalculateSlopeIntercept(BOOL bSlope)
 void ScInterpreter::ScSlope()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSlope" );
-    CalculateSlopeIntercept(TRUE);
+    CalculateSlopeIntercept(sal_True);
 }
 
 void ScInterpreter::ScIntercept()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIntercept" );
-    CalculateSlopeIntercept(FALSE);
+    CalculateSlopeIntercept(sal_False);
 }
 
 void ScInterpreter::ScForecast()
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index d248211fa..c7cc3b011 100755
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -136,31 +136,31 @@ void ScInterpreter::ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab )
 }
 
 
-BOOL ScInterpreter::IsTableOpInRange( const ScRange& rRange )
+sal_Bool ScInterpreter::IsTableOpInRange( const ScRange& rRange )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::IsTableOpInRange" );
     if ( rRange.aStart == rRange.aEnd )
-        return FALSE;   // not considered to be a range in TableOp sense
+        return sal_False;   // not considered to be a range in TableOp sense
 
     // we can't replace a single cell in a range
     ScInterpreterTableOpParams* pTOp = pDok->aTableOpList.First();
     while (pTOp)
     {
         if ( rRange.In( pTOp->aOld1 ) )
-            return TRUE;
+            return sal_True;
         if ( rRange.In( pTOp->aOld2 ) )
-            return TRUE;
+            return sal_True;
         pTOp = pDok->aTableOpList.Next();
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-ULONG ScInterpreter::GetCellNumberFormat( const ScAddress& rPos, const ScBaseCell* pCell)
+sal_uLong ScInterpreter::GetCellNumberFormat( const ScAddress& rPos, const ScBaseCell* pCell)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetCellNumberFormat" );
-    ULONG nFormat;
-    USHORT nErr;
+    sal_uLong nFormat;
+    sal_uInt16 nErr;
     if ( pCell )
     {
         if ( pCell->GetCellType() == CELLTYPE_FORMULA )
@@ -190,7 +190,7 @@ double ScInterpreter::GetValueCellValue( const ScAddress& rPos, const ScValueCel
     double fVal = pCell->GetValue();
     if ( bCalcAsShown && fVal != 0.0 )
     {
-        ULONG nFormat = pDok->GetNumberFormat( rPos );
+        sal_uLong nFormat = pDok->GetNumberFormat( rPos );
         fVal = pDok->RoundValueAsShown( fVal, nFormat );
     }
     return fVal;
@@ -382,9 +382,9 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
                                     ::rtl::math::pow10Exp( nUnit[fraction],
                                         static_cast<int>( -ceil( log10( static_cast<double>( nUnit[fraction]))))));
                             fValue = (bDate ? GetDateSerial( 
-                                        sal::static_int_cast<INT16>(nUnit[year]), 
-                                        sal::static_int_cast<INT16>(nUnit[month]), 
-                                        sal::static_int_cast<INT16>(nUnit[day]), 
+                                        sal::static_int_cast<sal_Int16>(nUnit[year]), 
+                                        sal::static_int_cast<sal_Int16>(nUnit[month]), 
+                                        sal::static_int_cast<sal_Int16>(nUnit[day]), 
                                         true) : 0.0);
                             fValue += ((nUnit[hour] * 3600) + (nUnit[minute] * 60) + nUnit[second] + fFraction) / 86400.0;
                         }
@@ -404,7 +404,7 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
 double ScInterpreter::GetCellValue( const ScAddress& rPos, const ScBaseCell* pCell )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetCellValue" );
-    USHORT nErr = nGlobalError;
+    sal_uInt16 nErr = nGlobalError;
     nGlobalError = 0;
     double nVal = GetCellValueOrZero( rPos, pCell );
     if ( !nGlobalError || nGlobalError == errCellNoValue )
@@ -425,7 +425,7 @@ double ScInterpreter::GetCellValueOrZero( const ScAddress& rPos, const ScBaseCel
             case CELLTYPE_FORMULA:
             {
                 ScFormulaCell* pFCell = (ScFormulaCell*) pCell;
-                USHORT nErr = pFCell->GetErrCode();
+                sal_uInt16 nErr = pFCell->GetErrCode();
                 if( !nErr )
                 {
                     if (pFCell->IsValue())
@@ -492,7 +492,7 @@ double ScInterpreter::GetCellValueOrZero( const ScAddress& rPos, const ScBaseCel
 void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetCellString" );
-    USHORT nErr = 0;
+    sal_uInt16 nErr = 0;
     if (pCell)
     {
         switch (pCell->GetCellType())
@@ -510,7 +510,7 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
                 if (pFCell->IsValue())
                 {
                     double fVal = pFCell->GetValue();
-                    ULONG nIndex = pFormatter->GetStandardFormat(
+                    sal_uLong nIndex = pFormatter->GetStandardFormat(
                                         NUMBERFORMAT_NUMBER,
                                         ScGlobal::eLnge);
                     pFormatter->GetInputLineString(fVal, nIndex, rStr);
@@ -522,7 +522,7 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
             case CELLTYPE_VALUE:
             {
                 double fVal = ((ScValueCell*) pCell)->GetValue();
-                ULONG nIndex = pFormatter->GetStandardFormat(
+                sal_uLong nIndex = pFormatter->GetStandardFormat(
                                         NUMBERFORMAT_NUMBER,
                                         ScGlobal::eLnge);
                 pFormatter->GetInputLineString(fVal, nIndex, rStr);
@@ -539,29 +539,29 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
 }
 
 
-BOOL ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
-                            SCCOL nCol2, SCROW nRow2, SCTAB nTab2, BYTE* pCellArr)
+sal_Bool ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+                            SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CreateDoubleArr" );
 
-    // Old Add-Ins are hard limited to USHORT values.
+    // Old Add-Ins are hard limited to sal_uInt16 values.
 #if MAXCOLCOUNT_DEFINE > USHRT_MAX
 #error Add check for columns > USHRT_MAX!
 #endif
     if (nRow1 > USHRT_MAX || nRow2 > USHRT_MAX)
-        return FALSE;
-
-    USHORT nCount = 0;
-    USHORT* p = (USHORT*) pCellArr;
-    *p++ = static_cast<USHORT>(nCol1);
-    *p++ = static_cast<USHORT>(nRow1);
-    *p++ = static_cast<USHORT>(nTab1);
-    *p++ = static_cast<USHORT>(nCol2);
-    *p++ = static_cast<USHORT>(nRow2);
-    *p++ = static_cast<USHORT>(nTab2);
-    USHORT* pCount = p;
+        return sal_False;
+
+    sal_uInt16 nCount = 0;
+    sal_uInt16* p = (sal_uInt16*) pCellArr;
+    *p++ = static_cast<sal_uInt16>(nCol1);
+    *p++ = static_cast<sal_uInt16>(nRow1);
+    *p++ = static_cast<sal_uInt16>(nTab1);
+    *p++ = static_cast<sal_uInt16>(nCol2);
+    *p++ = static_cast<sal_uInt16>(nRow2);
+    *p++ = static_cast<sal_uInt16>(nTab2);
+    sal_uInt16* pCount = p;
     *p++ = 0;
-    USHORT nPos = 14;
+    sal_uInt16 nPos = 14;
     SCTAB nTab = nTab1;
     ScAddress aAdr;
     while (nTab <= nTab2)
@@ -578,9 +578,9 @@ BOOL ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                 ScBaseCell* pCell = pDok->GetCell( aAdr );
                 if (pCell)
                 {
-                    USHORT  nErr = 0;
+                    sal_uInt16  nErr = 0;
                     double  nVal = 0.0;
-                    BOOL    bOk = TRUE;
+                    sal_Bool    bOk = sal_True;
                     switch ( pCell->GetCellType() )
                     {
                         case CELLTYPE_VALUE :
@@ -593,23 +593,23 @@ BOOL ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                 nVal = ((ScFormulaCell*)pCell)->GetValue();
                             }
                             else
-                                bOk = FALSE;
+                                bOk = sal_False;
                             break;
                         default :
-                            bOk = FALSE;
+                            bOk = sal_False;
                             break;
                     }
                     if (bOk)
                     {
-                        if ((nPos + (4 * sizeof(USHORT)) + sizeof(double)) > MAXARRSIZE)
-                            return FALSE;
-                        *p++ = static_cast<USHORT>(nCol);
-                        *p++ = static_cast<USHORT>(nRow);
-                        *p++ = static_cast<USHORT>(nTab);
+                        if ((nPos + (4 * sizeof(sal_uInt16)) + sizeof(double)) > MAXARRSIZE)
+                            return sal_False;
+                        *p++ = static_cast<sal_uInt16>(nCol);
+                        *p++ = static_cast<sal_uInt16>(nRow);
+                        *p++ = static_cast<sal_uInt16>(nTab);
                         *p++ = nErr;
                         memcpy( p, &nVal, sizeof(double));
                         nPos += 8 + sizeof(double);
-                        p = (USHORT*) ( pCellArr + nPos );
+                        p = (sal_uInt16*) ( pCellArr + nPos );
                         nCount++;
                     }
                 }
@@ -620,34 +620,34 @@ BOOL ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
         nTab++;
     }
     *pCount = nCount;
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+sal_Bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                     SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
-                                    BYTE* pCellArr)
+                                    sal_uInt8* pCellArr)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CreateStringArr" );
 
-    // Old Add-Ins are hard limited to USHORT values.
+    // Old Add-Ins are hard limited to sal_uInt16 values.
 #if MAXCOLCOUNT_DEFINE > USHRT_MAX
 #error Add check for columns > USHRT_MAX!
 #endif
     if (nRow1 > USHRT_MAX || nRow2 > USHRT_MAX)
-        return FALSE;
-
-    USHORT nCount = 0;
-    USHORT* p = (USHORT*) pCellArr;
-    *p++ = static_cast<USHORT>(nCol1);
-    *p++ = static_cast<USHORT>(nRow1);
-    *p++ = static_cast<USHORT>(nTab1);
-    *p++ = static_cast<USHORT>(nCol2);
-    *p++ = static_cast<USHORT>(nRow2);
-    *p++ = static_cast<USHORT>(nTab2);
-    USHORT* pCount = p;
+        return sal_False;
+
+    sal_uInt16 nCount = 0;
+    sal_uInt16* p = (sal_uInt16*) pCellArr;
+    *p++ = static_cast<sal_uInt16>(nCol1);
+    *p++ = static_cast<sal_uInt16>(nRow1);
+    *p++ = static_cast<sal_uInt16>(nTab1);
+    *p++ = static_cast<sal_uInt16>(nCol2);
+    *p++ = static_cast<sal_uInt16>(nRow2);
+    *p++ = static_cast<sal_uInt16>(nTab2);
+    sal_uInt16* pCount = p;
     *p++ = 0;
-    USHORT nPos = 14;
+    sal_uInt16 nPos = 14;
     SCTAB nTab = nTab1;
     while (nTab <= nTab2)
     {
@@ -662,8 +662,8 @@ BOOL ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                 if (pCell)
                 {
                     String  aStr;
-                    USHORT  nErr = 0;
-                    BOOL    bOk = TRUE;
+                    sal_uInt16  nErr = 0;
+                    sal_Bool    bOk = sal_True;
                     switch ( pCell->GetCellType() )
                     {
                         case CELLTYPE_STRING :
@@ -679,10 +679,10 @@ BOOL ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                 ((ScFormulaCell*)pCell)->GetString(aStr);
                             }
                             else
-                                bOk = FALSE;
+                                bOk = sal_False;
                             break;
                         default :
-                            bOk = FALSE;
+                            bOk = sal_False;
                             break;
                     }
                     if (bOk)
@@ -690,26 +690,26 @@ BOOL ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                         ByteString aTmp( aStr, osl_getThreadTextEncoding() );
                         // In case the xub_StrLen will be longer than USHORT
                         // one day, and room for pad byte check.
-                        if ( aTmp.Len() > ((USHORT)(~0)) - 2 )
-                            return FALSE;
+                        if ( aTmp.Len() > ((sal_uInt16)(~0)) - 2 )
+                            return sal_False;
                         // Append a 0-pad-byte if string length is not even
-                        //! MUST be USHORT and not xub_StrLen
-                        USHORT nStrLen = (USHORT) aTmp.Len();
-                        USHORT nLen = ( nStrLen + 2 ) & ~1;
-
-                        if (((ULONG)nPos + (5 * sizeof(USHORT)) + nLen) > MAXARRSIZE)
-                            return FALSE;
-                        *p++ = static_cast<USHORT>(nCol);
-                        *p++ = static_cast<USHORT>(nRow);
-                        *p++ = static_cast<USHORT>(nTab);
+                        //! MUST be sal_uInt16 and not xub_StrLen
+                        sal_uInt16 nStrLen = (sal_uInt16) aTmp.Len();
+                        sal_uInt16 nLen = ( nStrLen + 2 ) & ~1;
+
+                        if (((sal_uLong)nPos + (5 * sizeof(sal_uInt16)) + nLen) > MAXARRSIZE)
+                            return sal_False;
+                        *p++ = static_cast<sal_uInt16>(nCol);
+                        *p++ = static_cast<sal_uInt16>(nRow);
+                        *p++ = static_cast<sal_uInt16>(nTab);
                         *p++ = nErr;
                         *p++ = nLen;
                         memcpy( p, aTmp.GetBuffer(), nStrLen + 1);
                         nPos += 10 + nStrLen + 1;
-                        BYTE* q = ( pCellArr + nPos );
+                        sal_uInt8* q = ( pCellArr + nPos );
                         if( !nStrLen & 1 )
                             *q++ = 0, nPos++;
-                        p = (USHORT*) ( pCellArr + nPos );
+                        p = (sal_uInt16*) ( pCellArr + nPos );
                         nCount++;
                     }
                 }
@@ -720,34 +720,34 @@ BOOL ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
         nTab++;
     }
     *pCount = nCount;
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
+sal_Bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                   SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
-                                  BYTE* pCellArr)
+                                  sal_uInt8* pCellArr)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CreateCellArr" );
 
-    // Old Add-Ins are hard limited to USHORT values.
+    // Old Add-Ins are hard limited to sal_uInt16 values.
 #if MAXCOLCOUNT_DEFINE > USHRT_MAX
 #error Add check for columns > USHRT_MAX!
 #endif
     if (nRow1 > USHRT_MAX || nRow2 > USHRT_MAX)
-        return FALSE;
-
-    USHORT nCount = 0;
-    USHORT* p = (USHORT*) pCellArr;
-    *p++ = static_cast<USHORT>(nCol1);
-    *p++ = static_cast<USHORT>(nRow1);
-    *p++ = static_cast<USHORT>(nTab1);
-    *p++ = static_cast<USHORT>(nCol2);
-    *p++ = static_cast<USHORT>(nRow2);
-    *p++ = static_cast<USHORT>(nTab2);
-    USHORT* pCount = p;
+        return sal_False;
+
+    sal_uInt16 nCount = 0;
+    sal_uInt16* p = (sal_uInt16*) pCellArr;
+    *p++ = static_cast<sal_uInt16>(nCol1);
+    *p++ = static_cast<sal_uInt16>(nRow1);
+    *p++ = static_cast<sal_uInt16>(nTab1);
+    *p++ = static_cast<sal_uInt16>(nCol2);
+    *p++ = static_cast<sal_uInt16>(nRow2);
+    *p++ = static_cast<sal_uInt16>(nTab2);
+    sal_uInt16* pCount = p;
     *p++ = 0;
-    USHORT nPos = 14;
+    sal_uInt16 nPos = 14;
     SCTAB nTab = nTab1;
     ScAddress aAdr;
     while (nTab <= nTab2)
@@ -764,11 +764,11 @@ BOOL ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                 ScBaseCell* pCell = pDok->GetCell( aAdr );
                 if (pCell)
                 {
-                    USHORT  nErr = 0;
-                    USHORT  nType = 0; // 0 = Zahl; 1 = String
+                    sal_uInt16  nErr = 0;
+                    sal_uInt16  nType = 0; // 0 = Zahl; 1 = String
                     double  nVal = 0.0;
                     String  aStr;
-                    BOOL    bOk = TRUE;
+                    sal_Bool    bOk = sal_True;
                     switch ( pCell->GetCellType() )
                     {
                         case CELLTYPE_STRING :
@@ -790,23 +790,23 @@ BOOL ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                                 ((ScFormulaCell*)pCell)->GetString(aStr);
                             break;
                         default :
-                            bOk = FALSE;
+                            bOk = sal_False;
                             break;
                     }
                     if (bOk)
                     {
-                        if ((nPos + (5 * sizeof(USHORT))) > MAXARRSIZE)
-                            return FALSE;
-                        *p++ = static_cast<USHORT>(nCol);
-                        *p++ = static_cast<USHORT>(nRow);
-                        *p++ = static_cast<USHORT>(nTab);
+                        if ((nPos + (5 * sizeof(sal_uInt16))) > MAXARRSIZE)
+                            return sal_False;
+                        *p++ = static_cast<sal_uInt16>(nCol);
+                        *p++ = static_cast<sal_uInt16>(nRow);
+                        *p++ = static_cast<sal_uInt16>(nTab);
                         *p++ = nErr;
                         *p++ = nType;
                         nPos += 10;
                         if (nType == 0)
                         {
                             if ((nPos + sizeof(double)) > MAXARRSIZE)
-                                return FALSE;
+                                return sal_False;
                             memcpy( p, &nVal, sizeof(double));
                             nPos += sizeof(double);
                         }
@@ -815,23 +815,23 @@ BOOL ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                             ByteString aTmp( aStr, osl_getThreadTextEncoding() );
                             // In case the xub_StrLen will be longer than USHORT
                             // one day, and room for pad byte check.
-                            if ( aTmp.Len() > ((USHORT)(~0)) - 2 )
-                                return FALSE;
+                            if ( aTmp.Len() > ((sal_uInt16)(~0)) - 2 )
+                                return sal_False;
                             // Append a 0-pad-byte if string length is not even
-                            //! MUST be USHORT and not xub_StrLen
-                            USHORT nStrLen = (USHORT) aTmp.Len();
-                            USHORT nLen = ( nStrLen + 2 ) & ~1;
-                            if ( ((ULONG)nPos + 2 + nLen) > MAXARRSIZE)
-                                return FALSE;
+                            //! MUST be sal_uInt16 and not xub_StrLen
+                            sal_uInt16 nStrLen = (sal_uInt16) aTmp.Len();
+                            sal_uInt16 nLen = ( nStrLen + 2 ) & ~1;
+                            if ( ((sal_uLong)nPos + 2 + nLen) > MAXARRSIZE)
+                                return sal_False;
                             *p++ = nLen;
                             memcpy( p, aTmp.GetBuffer(), nStrLen + 1);
                             nPos += 2 + nStrLen + 1;
-                            BYTE* q = ( pCellArr + nPos );
+                            sal_uInt8* q = ( pCellArr + nPos );
                             if( !nStrLen & 1 )
                                 *q++ = 0, nPos++;
                         }
                         nCount++;
-                        p = (USHORT*) ( pCellArr + nPos );
+                        p = (sal_uInt16*) ( pCellArr + nPos );
                     }
                 }
                 nCol++;
@@ -841,7 +841,7 @@ BOOL ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
         nTab++;
     }
     *pCount = nCount;
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -957,7 +957,7 @@ void ScInterpreter::PushTempToken( const FormulaToken& r )
 
 
 void ScInterpreter::PushCellResultToken( bool bDisplayEmptyAsString,
-        const ScAddress & rAddress, short * pRetTypeExpr, ULONG * pRetIndexExpr )
+        const ScAddress & rAddress, short * pRetTypeExpr, sal_uLong * pRetIndexExpr )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushCellResultToken" );
     ScBaseCell* pCell = pDok->GetCell( rAddress);
@@ -969,7 +969,7 @@ void ScInterpreter::PushCellResultToken( bool bDisplayEmptyAsString,
         PushTempToken( new ScEmptyCellToken( bInherited, bDisplayEmptyAsString));
         return;
     }
-    USHORT nErr;
+    sal_uInt16 nErr;
     if ((nErr = pCell->GetErrorCode()) != 0)
     {
         PushError( nErr);
@@ -1219,7 +1219,7 @@ void ScInterpreter::PopSingleRef( ScAddress& rAdr )
 void ScInterpreter::DoubleRefToVars( const ScToken* p,
         SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
         SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
-        BOOL bDontCheckForTableOp )
+        sal_Bool bDontCheckForTableOp )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DoubleRefToVars" );
     const ScComplexRefData& rCRef = p->GetDoubleRef();
@@ -1272,7 +1272,7 @@ ScDBRangeBase* ScInterpreter::PopDoubleRef()
 
 void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
                                  SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
-                                 BOOL bDontCheckForTableOp )
+                                 sal_Bool bDontCheckForTableOp )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDoubleRef" );
     if( sp )
@@ -1298,7 +1298,7 @@ void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
 
 
 void ScInterpreter::DoubleRefToRange( const ScComplexRefData & rCRef,
-        ScRange & rRange, BOOL bDontCheckForTableOp )
+        ScRange & rRange, sal_Bool bDontCheckForTableOp )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DoubleRefToRange" );
     SCCOL nCol;
@@ -1363,7 +1363,7 @@ void ScInterpreter::PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRe
 }
 
 
-void ScInterpreter::PopDoubleRef( ScRange& rRange, BOOL bDontCheckForTableOp )
+void ScInterpreter::PopDoubleRef( ScRange& rRange, sal_Bool bDontCheckForTableOp )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDoubleRef" );
     if( sp )
@@ -1387,7 +1387,7 @@ void ScInterpreter::PopDoubleRef( ScRange& rRange, BOOL bDontCheckForTableOp )
 }
 
 
-BOOL ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr )
+sal_Bool ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PopDoubleRefOrSingleRef" );
     switch ( GetStackType() )
@@ -1395,21 +1395,21 @@ BOOL ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr )
         case svDoubleRef :
         {
             ScRange aRange;
-            PopDoubleRef( aRange, TRUE );
+            PopDoubleRef( aRange, sal_True );
             return DoubleRefToPosSingleRef( aRange, rAdr );
         }
         //break;
         case svSingleRef :
         {
             PopSingleRef( rAdr );
-            return TRUE;
+            return sal_True;
         }
         //break;
         default:
             PopError();
             SetError( errNoRef );
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1439,10 +1439,10 @@ ScTokenMatrixMap* ScInterpreter::CreateTokenMatrixMap()
 bool ScInterpreter::ConvertMatrixParameters()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ConvertMatrixParameters" );
-    USHORT nParams = pCur->GetParamCount();
+    sal_uInt16 nParams = pCur->GetParamCount();
     DBG_ASSERT( nParams <= sp, "ConvertMatrixParameters: stack/param count mismatch");
     SCSIZE nJumpCols = 0, nJumpRows = 0;
-    for ( USHORT i=1; i <= nParams && i <= sp; ++i )
+    for ( sal_uInt16 i=1; i <= nParams && i <= sp; ++i )
     {
         FormulaToken* p = pStack[ sp - i ];
         if ( p->GetOpCode() != ocPush )
@@ -1547,7 +1547,7 @@ bool ScInterpreter::ConvertMatrixParameters()
             pJumpMat->SetAllJumps( 1.0, nStart, nNext, nStop);
             // pop parameters and store in ScJumpMatrix, push in JumpMatrix()
             ScTokenVec* pParams = new ScTokenVec( nParams);
-            for ( USHORT i=1; i <= nParams && sp > 0; ++i )
+            for ( sal_uInt16 i=1; i <= nParams && sp > 0; ++i )
             {
                 FormulaToken* p = pStack[ --sp ];
                 p->IncRef();
@@ -1681,7 +1681,7 @@ void ScInterpreter::PushMatrix(ScMatrix* pMat)
 }
 
 
-void ScInterpreter::PushError( USHORT nError )
+void ScInterpreter::PushError( sal_uInt16 nError )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::PushError" );
     SetError( nError );     // only sets error if not already set
@@ -1723,7 +1723,7 @@ void ScInterpreter::PushNoValue()
 }
 
 
-BOOL ScInterpreter::IsMissing()
+sal_Bool ScInterpreter::IsMissing()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::IsMissing" );
     return sp && pStack[sp - 1]->GetType() == svMissing;
@@ -1766,7 +1766,7 @@ StackVar ScInterpreter::GetStackType()
 }
 
 
-StackVar ScInterpreter::GetStackType( BYTE nParam )
+StackVar ScInterpreter::GetStackType( sal_uInt8 nParam )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetStackType" );
     StackVar eRes;
@@ -1782,17 +1782,17 @@ StackVar ScInterpreter::GetStackType( BYTE nParam )
 }
 
 
-BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr )
+sal_Bool ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::DoubleRefToPosSingleRef" );
     // Check for a singleton first - no implicit intersection for them.
     if( rRange.aStart == rRange.aEnd )
     {
         rAdr = rRange.aStart;
-        return TRUE;
+        return sal_True;
     }
 
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
 
     if ( pJumpMatrix )
     {
@@ -1827,13 +1827,13 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
         nRow = rRange.aStart.Row();
         if ( nRow == rRange.aEnd.Row() )
         {
-            bOk = TRUE;
+            bOk = sal_True;
             nCol = nMyCol;
         }
         else if ( nTab != nMyTab && nTab == rRange.aEnd.Tab()
                 && rRange.aStart.Row() <= nMyRow && nMyRow <= rRange.aEnd.Row() )
         {
-            bOk = TRUE;
+            bOk = sal_True;
             nCol = nMyCol;
             nRow = nMyRow;
         }
@@ -1843,13 +1843,13 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
         nCol = rRange.aStart.Col();
         if ( nCol == rRange.aEnd.Col() )
         {
-            bOk = TRUE;
+            bOk = sal_True;
             nRow = nMyRow;
         }
         else if ( nTab != nMyTab && nTab == rRange.aEnd.Tab()
                 && rRange.aStart.Col() <= nMyCol && nMyCol <= rRange.aEnd.Col() )
         {
-            bOk = TRUE;
+            bOk = sal_True;
             nCol = nMyCol;
             nRow = nMyRow;
         }
@@ -1861,7 +1861,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
         else if ( nTab <= nMyTab && nMyTab <= rRange.aEnd.Tab() )
             nTab = nMyTab;
         else
-            bOk = FALSE;
+            bOk = sal_False;
         if ( bOk )
             rAdr.Set( nCol, nRow, nTab );
     }
@@ -1975,7 +1975,7 @@ const String& ScInterpreter::GetString()
         case svDouble:
         {
             double fVal = PopDouble();
-            ULONG nIndex = pFormatter->GetStandardFormat(
+            sal_uLong nIndex = pFormatter->GetStandardFormat(
                                     NUMBERFORMAT_NUMBER,
                                     ScGlobal::eLnge);
             pFormatter->GetInputLineString(fVal, nIndex, aTempStr);
@@ -2102,7 +2102,7 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( double& rDouble,
 void ScInterpreter::ScDBGet()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBGet" );
-    BOOL bMissingField = FALSE;
+    sal_Bool bMissingField = sal_False;
     auto_ptr<ScDBQueryParamBase> pQueryParam( GetDBParams(bMissingField) );
     if (!pQueryParam.get())
     {
@@ -2139,8 +2139,8 @@ void ScInterpreter::ScDBGet()
 void ScInterpreter::ScExternal()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScExternal" );
-    USHORT nIndex;
-    BYTE nParamCount = GetByte();
+    sal_uInt16 nIndex;
+    sal_uInt8 nParamCount = GetByte();
     String aUnoName;
     String aFuncName( ScGlobal::pCharClass->upper( pCur->GetExternal() ) );
     if (ScGlobal::GetFuncCollection()->SearchFunc(aFuncName, nIndex))
@@ -2152,7 +2152,7 @@ void ScInterpreter::ScExternal()
             void*       ppParam[MAXFUNCPARAM];
             double      nVal[MAXFUNCPARAM];
             sal_Char*   pStr[MAXFUNCPARAM];
-            BYTE*       pCellArr[MAXFUNCPARAM];
+            sal_uInt8*       pCellArr[MAXFUNCPARAM];
             short       i;
 
             for (i = 0; i < MAXFUNCPARAM; i++)
@@ -2197,7 +2197,7 @@ void ScInterpreter::ScExternal()
                             SCROW nRow2;
                             SCTAB nTab2;
                             PopDoubleRef(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-                            pCellArr[i-1] = new BYTE[MAXARRSIZE];
+                            pCellArr[i-1] = new sal_uInt8[MAXARRSIZE];
                             if (!CreateDoubleArr(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, pCellArr[i-1]))
                                 SetError(errCodeOverflow);
                             else
@@ -2213,7 +2213,7 @@ void ScInterpreter::ScExternal()
                             SCROW nRow2;
                             SCTAB nTab2;
                             PopDoubleRef(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-                            pCellArr[i-1] = new BYTE[MAXARRSIZE];
+                            pCellArr[i-1] = new sal_uInt8[MAXARRSIZE];
                             if (!CreateStringArr(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, pCellArr[i-1]))
                                 SetError(errCodeOverflow);
                             else
@@ -2229,7 +2229,7 @@ void ScInterpreter::ScExternal()
                             SCROW nRow2;
                             SCTAB nTab2;
                             PopDoubleRef(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-                            pCellArr[i-1] = new BYTE[MAXARRSIZE];
+                            pCellArr[i-1] = new sal_uInt8[MAXARRSIZE];
                             if (!CreateCellArr(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, pCellArr[i-1]))
                                 SetError(errCodeOverflow);
                             else
@@ -2282,7 +2282,7 @@ void ScInterpreter::ScExternal()
                     double nErg = 0.0;
                     ppParam[0] = &nErg;
                     pFuncData->Call(ppParam);
-                    ULONG nHandle = ULONG( nErg );
+                    sal_uLong nHandle = sal_uLong( nErg );
                     if ( nHandle >= 65536 )
                     {
                         ScAddInAsync* pAs = ScAddInAsync::Get( nHandle );
@@ -2334,9 +2334,9 @@ void ScInterpreter::ScExternal()
             PushIllegalParameter();
         }
     }
-    else if ( ( aUnoName = ScGlobal::GetAddInCollection()->FindFunction(aFuncName, FALSE) ).Len()  )
+    else if ( ( aUnoName = ScGlobal::GetAddInCollection()->FindFunction(aFuncName, sal_False) ).Len()  )
     {
-        //  bLocalFirst=FALSE in FindFunction, cFunc should be the stored internal name
+        //  bLocalFirst=sal_False in FindFunction, cFunc should be the stored internal name
 
         ScUnoAddInCall aCall( *ScGlobal::GetAddInCollection(), aUnoName, nParamCount );
 
@@ -2362,7 +2362,7 @@ void ScInterpreter::ScExternal()
             --nPar;     // 0 .. (nParamCount-1)
 
             ScAddInArgumentType eType = aCall.GetArgType( nPar );
-            BYTE nStackType = sal::static_int_cast<BYTE>( GetStackType() );
+            sal_uInt8 nStackType = sal::static_int_cast<sal_uInt8>( GetStackType() );
 
             uno::Any aParam;
             switch (eType)
@@ -2373,7 +2373,7 @@ void ScInterpreter::ScExternal()
                         double fInt = (fVal >= 0.0) ? ::rtl::math::approxFloor( fVal ) :
                                                       ::rtl::math::approxCeil( fVal );
                         if ( fInt >= LONG_MIN && fInt <= LONG_MAX )
-                            aParam <<= (INT32)fInt;
+                            aParam <<= (sal_Int32)fInt;
                         else
                             SetError(errIllegalArgument);
                     }
@@ -2399,9 +2399,9 @@ void ScInterpreter::ScExternal()
                                                               ::rtl::math::approxCeil( fVal );
                                 if ( fInt >= LONG_MIN && fInt <= LONG_MAX )
                                 {
-                                    INT32 nIntVal = (long)fInt;
-                                    uno::Sequence<INT32> aInner( &nIntVal, 1 );
-                                    uno::Sequence< uno::Sequence<INT32> > aOuter( &aInner, 1 );
+                                    sal_Int32 nIntVal = (long)fInt;
+                                    uno::Sequence<sal_Int32> aInner( &nIntVal, 1 );
+                                    uno::Sequence< uno::Sequence<sal_Int32> > aOuter( &aInner, 1 );
                                     aParam <<= aOuter;
                                 }
                                 else
@@ -2695,7 +2695,7 @@ void ScInterpreter::ScMacro()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMacro" );
     SbxBase::ResetError();
 
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     String aMacro( pCur->GetExternal() );
 
     SfxObjectShell* pDocSh = pDok->GetDocumentShell();
@@ -2707,9 +2707,6 @@ void ScInterpreter::ScMacro()
 
     //  keine Sicherheitsabfrage mehr vorneweg (nur CheckMacroWarn), das passiert im CallBasic
 
-    SfxApplication* pSfxApp = SFX_APP();
-    pSfxApp->EnterBasicCall();              // Dok-Basic anlegen etc.
-
     //  Wenn das Dok waehrend eines Basic-Calls geladen wurde,
     //  ist das Sbx-Objekt evtl. nicht angelegt (?)
 //  pDocSh->GetSbxObject();
@@ -2722,7 +2719,6 @@ void ScInterpreter::ScMacro()
     if( !pVar || pVar->GetType() == SbxVOID || !pVar->ISA(SbMethod) )
     {
         PushError( errNoMacro );
-        pSfxApp->LeaveBasicCall();
         return;
     }
 
@@ -2744,11 +2740,11 @@ void ScInterpreter::ScMacro()
     //  Parameter-Array zusammenbauen
 
     SbxArrayRef refPar = new SbxArray;
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     for( short i = nParamCount; i && bOk ; i-- )
     {
-        SbxVariable* pPar = refPar->Get( (USHORT) i );
-        BYTE nStackType = sal::static_int_cast<BYTE>( GetStackType() );
+        SbxVariable* pPar = refPar->Get( (sal_uInt16) i );
+        sal_uInt8 nStackType = sal::static_int_cast<sal_uInt8>( GetStackType() );
         switch( nStackType )
         {
             case svDouble:
@@ -2776,7 +2772,7 @@ void ScInterpreter::ScMacro()
                 if( nTab1 != nTab2 )
                 {
                     SetError( errIllegalParameter );
-                    bOk = FALSE;
+                    bOk = sal_False;
                 }
                 else
                 {
@@ -2787,7 +2783,7 @@ void ScInterpreter::ScMacro()
                     for( SCROW nRow = nRow1; bOk && nRow <= nRow2; nRow++ )
                     {
                         aAdr.SetRow( nRow );
-                        INT32 nIdx[ 2 ];
+                        sal_Int32 nIdx[ 2 ];
                         nIdx[ 0 ] = nRow-nRow1+1;
                         for( SCCOL nCol = nCol1; bOk && nCol <= nCol2; nCol++ )
                         {
@@ -2809,15 +2805,15 @@ void ScInterpreter::ScMacro()
                 {
                     pMat->GetDimensions(nC, nR);
                     SbxDimArrayRef refArray = new SbxDimArray;
-                    refArray->AddDim32( 1, static_cast<INT32>(nR) );
-                    refArray->AddDim32( 1, static_cast<INT32>(nC) );
+                    refArray->AddDim32( 1, static_cast<sal_Int32>(nR) );
+                    refArray->AddDim32( 1, static_cast<sal_Int32>(nC) );
                     for( SCSIZE nMatRow = 0; nMatRow < nR; nMatRow++ )
                     {
-                        INT32 nIdx[ 2 ];
-                        nIdx[ 0 ] = static_cast<INT32>(nMatRow+1);
+                        sal_Int32 nIdx[ 2 ];
+                        nIdx[ 0 ] = static_cast<sal_Int32>(nMatRow+1);
                         for( SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++ )
                         {
-                            nIdx[ 1 ] = static_cast<INT32>(nMatCol+1);
+                            nIdx[ 1 ] = static_cast<sal_Int32>(nMatCol+1);
                             SbxVariable* p = refArray->Get32( nIdx );
                             if (pMat->IsString(nMatCol, nMatRow))
                                 p->PutString( pMat->GetString(nMatCol, nMatRow) );
@@ -2833,7 +2829,7 @@ void ScInterpreter::ScMacro()
             break;
             default:
                 SetError( errIllegalParameter );
-                bOk = FALSE;
+                bOk = sal_False;
         }
     }
     if( bOk )
@@ -2841,7 +2837,7 @@ void ScInterpreter::ScMacro()
         pDok->LockTable( aPos.Tab() );
         SbxVariableRef refRes = new SbxVariable;
         pDok->IncMacroInterpretLevel();
-        ErrCode eRet = pDocSh->CallBasic( aMacroStr, aBasicStr, NULL, refPar, refRes );
+        ErrCode eRet = pDocSh->CallBasic( aMacroStr, aBasicStr, refPar, refRes );
         pDok->DecMacroInterpretLevel();
         pDok->UnlockTable( aPos.Tab() );
 
@@ -2859,7 +2855,7 @@ void ScInterpreter::ScMacro()
             short nDim = pDimArray->GetDims();
             if ( 1 <= nDim && nDim <= 2 )
             {
-                INT32 nCs, nCe, nRs, nRe;
+                sal_Int32 nCs, nCe, nRs, nRe;
                 SCSIZE nC, nR;
                 SCCOL nColIdx;
                 SCROW nRowIdx;
@@ -2888,13 +2884,13 @@ void ScInterpreter::ScMacro()
                     SbxDataType eType;
                     for ( SCSIZE j=0; j < nR; j++ )
                     {
-                        INT32 nIdx[ 2 ];
+                        sal_Int32 nIdx[ 2 ];
                         // bei eindimensionalem array( cols ) wird nIdx[1]
                         // von SbxDimArray::Get ignoriert
-                        nIdx[ nRowIdx ] = nRs + static_cast<INT32>(j);
+                        nIdx[ nRowIdx ] = nRs + static_cast<sal_Int32>(j);
                         for ( SCSIZE i=0; i < nC; i++ )
                         {
-                            nIdx[ nColIdx ] = nCs + static_cast<INT32>(i);
+                            nIdx[ nColIdx ] = nCs + static_cast<sal_Int32>(i);
                             pV = pDimArray->Get32( nIdx );
                             eType = pV->GetType();
                             if ( eType >= SbxINTEGER && eType <= SbxDOUBLE )
@@ -2914,19 +2910,17 @@ void ScInterpreter::ScMacro()
         else
             PushString( refRes->GetString() );
     }
-
-    pSfxApp->LeaveBasicCall();
 }
 
 
-BOOL ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
+sal_Bool ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::SetSbxVariable" );
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     ScBaseCell* pCell = pDok->GetCell( rPos );
     if (pCell)
     {
-        USHORT nErr;
+        sal_uInt16 nErr;
         double nVal;
         switch( pCell->GetCellType() )
         {
@@ -2965,7 +2959,7 @@ BOOL ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
                     }
                 }
                 else
-                    SetError( nErr ), bOk = FALSE;
+                    SetError( nErr ), bOk = sal_False;
                 break;
             default :
                 pVar->PutDouble( 0.0 );
@@ -2980,7 +2974,7 @@ BOOL ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
 void ScInterpreter::ScTableOp()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTableOp" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if (nParamCount != 3 && nParamCount != 5)
     {
         PushIllegalParameter();
@@ -2996,15 +2990,15 @@ void ScInterpreter::ScTableOp()
     PopSingleRef( pTableOp->aOld1 );
     PopSingleRef( pTableOp->aFormulaPos );
 
-    pTableOp->bValid = TRUE;
+    pTableOp->bValid = sal_True;
     pDok->aTableOpList.Insert( pTableOp );
     pDok->IncInterpreterTableOpLevel();
 
-    BOOL bReuseLastParams = (pDok->aLastTableOpParams == *pTableOp);
+    sal_Bool bReuseLastParams = (pDok->aLastTableOpParams == *pTableOp);
     if ( bReuseLastParams )
     {
         pTableOp->aNotifiedFormulaPos = pDok->aLastTableOpParams.aNotifiedFormulaPos;
-        pTableOp->bRefresh = TRUE;
+        pTableOp->bRefresh = sal_True;
         for ( ::std::vector< ScAddress >::const_iterator iBroadcast(
                     pTableOp->aNotifiedFormulaPos.begin() );
                 iBroadcast != pTableOp->aNotifiedFormulaPos.end();
@@ -3021,7 +3015,7 @@ void ScInterpreter::ScTableOp()
         if ( nParamCount == 5 )
             pDok->SetTableOpDirty( pTableOp->aOld2 );
     }
-    pTableOp->bCollectNotifications = FALSE;
+    pTableOp->bCollectNotifications = sal_False;
 
     ScBaseCell* pFCell = pDok->GetCell( pTableOp->aFormulaPos );
     if ( pFCell && pFCell->GetCellType() == CELLTYPE_FORMULA )
@@ -3077,7 +3071,7 @@ void ScInterpreter::ScErrCell()
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScErrCell" );
     double fErrNum = GetDouble();
-    PushError((USHORT) fErrNum);
+    PushError((sal_uInt16) fErrNum);
 }
 */
 
@@ -3126,7 +3120,7 @@ void ScInterpreter::ScColRowNameAuto()
                             (SCROW&) aRefData.Ref1.nRow,
                             (SCCOL&) aRefData.Ref2.nCol,
                             (SCROW&) aRefData.Ref2.nRow,
-                            TRUE, false );
+                            sal_True, false );
         // DataArea im Ursprung begrenzen
         aRefData.Ref1.nCol = nStartCol;
         aRefData.Ref1.nRow = nStartRow;
@@ -3266,7 +3260,7 @@ void ScInterpreter::ScExternalRef()
 
 void ScInterpreter::ScTTT()
 {   // Temporaerer Test-Tanz, zum auspropieren von Funktionen etc.
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     // do something, nParamCount bei Pops runterzaehlen!
 
     // Stack aufraeumen
@@ -3293,11 +3287,11 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc,
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTTT" );
 //  pStack = new ScToken*[ MAXSTACK ];
 
-    BYTE cMatFlag = pMyFormulaCell->GetMatrixFlag();
+    sal_uInt8 cMatFlag = pMyFormulaCell->GetMatrixFlag();
     bMatrixFormula = ( cMatFlag == MM_FORMULA || cMatFlag == MM_FAKE );
     if (!bGlobalStackInUse)
     {
-        bGlobalStackInUse = TRUE;
+        bGlobalStackInUse = sal_True;
         if (!pGlobalStack)
             pGlobalStack = new ScTokenStack;
         pStackObj = pGlobalStack;
@@ -3314,7 +3308,7 @@ ScInterpreter::~ScInterpreter()
 //  delete pStack;
 
     if ( pStackObj == pGlobalStack )
-        bGlobalStackInUse = FALSE;
+        bGlobalStackInUse = sal_False;
     else
         delete pStackObj;
     if (pTokenMatrixMap)
@@ -3334,10 +3328,10 @@ StackVar ScInterpreter::Interpret()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Interpret" );
     short nRetTypeExpr = NUMBERFORMAT_UNDEFINED;
-    ULONG nRetIndexExpr = 0;
-    USHORT nErrorFunction = 0;
-    USHORT nErrorFunctionCount = 0;
-    USHORT nStackBase;
+    sal_uLong nRetIndexExpr = 0;
+    sal_uInt16 nErrorFunction = 0;
+    sal_uInt16 nErrorFunctionCount = 0;
+    sal_uInt16 nStackBase;
 
     nGlobalError = 0;
     nStackBase = sp = maxsp = 0;
@@ -3346,7 +3340,7 @@ StackVar ScInterpreter::Interpret()
     nFuncFmtIndex = nCurFmtIndex = nRetFmtIndex = 0;
     xResult = NULL;
     pJumpMatrix = NULL;
-    glSubTotal = FALSE;
+    glSubTotal = sal_False;
     ScTokenMatrixMap::const_iterator aTokenMatrixMapIter;
 
     // Once upon a time we used to have FP exceptions on, and there was a
@@ -3538,28 +3532,28 @@ StackVar ScInterpreter::Interpret()
                 case ocGetTime          : ScGetTime();                  break;
                 case ocGetDiffDate      : ScGetDiffDate();              break;
                 case ocGetDiffDate360   : ScGetDiffDate360();           break;
-                case ocMin              : ScMin( FALSE );               break;
-                case ocMinA             : ScMin( TRUE );                break;
-                case ocMax              : ScMax( FALSE );               break;
-                case ocMaxA             : ScMax( TRUE );                break;
+                case ocMin              : ScMin( sal_False );               break;
+                case ocMinA             : ScMin( sal_True );                break;
+                case ocMax              : ScMax( sal_False );               break;
+                case ocMaxA             : ScMax( sal_True );                break;
                 case ocSum              : ScSum();                      break;
                 case ocProduct          : ScProduct();                  break;
                 case ocNPV              : ScNPV();                      break;
                 case ocIRR              : ScIRR();                      break;
                 case ocMIRR             : ScMIRR();                     break;
                 case ocISPMT            : ScISPMT();                    break;
-                case ocAverage          : ScAverage( FALSE );           break;
-                case ocAverageA         : ScAverage( TRUE );            break;
+                case ocAverage          : ScAverage( sal_False );           break;
+                case ocAverageA         : ScAverage( sal_True );            break;
                 case ocCount            : ScCount();                    break;
                 case ocCount2           : ScCount2();                   break;
-                case ocVar              : ScVar( FALSE );               break;
-                case ocVarA             : ScVar( TRUE );                break;
-                case ocVarP             : ScVarP( FALSE );              break;
-                case ocVarPA            : ScVarP( TRUE );               break;
-                case ocStDev            : ScStDev( FALSE );             break;
-                case ocStDevA           : ScStDev( TRUE );              break;
-                case ocStDevP           : ScStDevP( FALSE );            break;
-                case ocStDevPA          : ScStDevP( TRUE );             break;
+                case ocVar              : ScVar( sal_False );               break;
+                case ocVarA             : ScVar( sal_True );                break;
+                case ocVarP             : ScVarP( sal_False );              break;
+                case ocVarPA            : ScVarP( sal_True );               break;
+                case ocStDev            : ScStDev( sal_False );             break;
+                case ocStDevA           : ScStDev( sal_True );              break;
+                case ocStDevP           : ScStDevP( sal_False );            break;
+                case ocStDevPA          : ScStDevP( sal_True );             break;
                 case ocBW               : ScBW();                       break;
                 case ocDIA              : ScDIA();                      break;
                 case ocGDA              : ScGDA();                      break;
@@ -3766,7 +3760,7 @@ StackVar ScInterpreter::Interpret()
         do
         {
             bGotResult = false;
-            BYTE nLevel = 0;
+            sal_uInt8 nLevel = 0;
             if ( GetStackType( ++nLevel ) == svJumpMatrix )
                 ;   // nothing
             else if ( GetStackType( ++nLevel ) == svJumpMatrix )
@@ -3896,7 +3890,7 @@ StackVar ScInterpreter::Interpret()
                             if (ScMatrix::IsNonValueType( nMatValType))
                             {
                                 if ( xMat->IsEmptyPath( 0, 0))
-                                {   // result of empty FALSE jump path
+                                {   // result of empty sal_False jump path
                                     FormulaTokenRef xRes = new FormulaDoubleToken( 0.0);
                                     PushTempToken( new ScMatrixCellResultToken( xMat, xRes));
                                     nRetTypeExpr = NUMBERFORMAT_LOGICAL;
@@ -3911,7 +3905,7 @@ StackVar ScInterpreter::Interpret()
                             }
                             else
                             {
-                                USHORT nErr = GetDoubleErrorValue( pMatVal->fVal);
+                                sal_uInt16 nErr = GetDoubleErrorValue( pMatVal->fVal);
                                 FormulaTokenRef xRes;
                                 if (nErr)
                                     xRes = new FormulaErrorToken( nErr);
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index e342a8986..0c710cea7 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -152,7 +152,7 @@ void ScInterpreter::ScGCD()
                 case svDoubleRef :
                 case svRefList :
                 {
-                    USHORT nErr = 0;
+                    sal_uInt16 nErr = 0;
                     PopDoubleRef( aRange, nParamCount, nRefInList);
                     double nCellVal;
                     ScValueIterator aValIter(pDok, aRange, glSubTotal);
@@ -241,7 +241,7 @@ void ScInterpreter:: ScLCM()
                 case svDoubleRef :
                 case svRefList :
                 {
-                    USHORT nErr = 0;
+                    sal_uInt16 nErr = 0;
                     PopDoubleRef( aRange, nParamCount, nRefInList);
                     double nCellVal;
                     ScValueIterator aValIter(pDok, aRange, glSubTotal);
@@ -547,7 +547,7 @@ void ScInterpreter::ScMatValue()
                 ScBaseCell* pCell = GetCell( aAdr );
                 if (pCell && pCell->GetCellType() == CELLTYPE_FORMULA)
                 {
-                    USHORT nErrCode = ((ScFormulaCell*)pCell)->GetErrCode();
+                    sal_uInt16 nErrCode = ((ScFormulaCell*)pCell)->GetErrCode();
                     if (nErrCode != 0)
                         PushError( nErrCode);
                     else
@@ -846,7 +846,7 @@ void ScInterpreter::ScMatDet()
         }
         SCSIZE nC, nR;
         pMat->GetDimensions(nC, nR);
-        if ( nC != nR || nC == 0 || (ULONG) nC * nC > ScMatrix::GetElementsMax() )
+        if ( nC != nR || nC == 0 || (sal_uLong) nC * nC > ScMatrix::GetElementsMax() )
             PushIllegalArgument();
         else
         {
@@ -893,7 +893,7 @@ void ScInterpreter::ScMatInv()
         }
         SCSIZE nC, nR;
         pMat->GetDimensions(nC, nR);
-        if ( nC != nR || nC == 0 || (ULONG) nC * nC > ScMatrix::GetElementsMax() )
+        if ( nC != nR || nC == 0 || (sal_uLong) nC * nC > ScMatrix::GetElementsMax() )
             PushIllegalArgument();
         else
         {
@@ -1118,7 +1118,7 @@ ScMatrixRef ScInterpreter::MatConcat(ScMatrix* pMat1, ScMatrix* pMat2)
         {
             for (j = 0; j < nMinR; j++)
             {
-                USHORT nErr = pMat1->GetErrorIfNotString( i, j);
+                sal_uInt16 nErr = pMat1->GetErrorIfNotString( i, j);
                 if (!nErr)
                     nErr = pMat2->GetErrorIfNotString( i, j);
                 if (nErr)
@@ -1167,9 +1167,9 @@ void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt2 )
 void ScInterpreter::ScAdd()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScAdd" );
-    CalculateAddSub(FALSE);
+    CalculateAddSub(sal_False);
 }
-void ScInterpreter::CalculateAddSub(BOOL _bSub)
+void ScInterpreter::CalculateAddSub(sal_Bool _bSub)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateAddSub" );
     ScMatrixRef pMat1 = NULL;
@@ -1178,7 +1178,7 @@ void ScInterpreter::CalculateAddSub(BOOL _bSub)
     short nFmt1, nFmt2;
     nFmt1 = nFmt2 = NUMBERFORMAT_UNDEFINED;
     short nFmtCurrencyType = nCurFmtType;
-    ULONG nFmtCurrencyIndex = nCurFmtIndex;
+    sal_uLong nFmtCurrencyIndex = nCurFmtIndex;
     short nFmtPercentType = nCurFmtType;
     if ( GetStackType() == svMatrix )
         pMat2 = GetMatrix();
@@ -1244,18 +1244,18 @@ void ScInterpreter::CalculateAddSub(BOOL _bSub)
     else if (pMat1 || pMat2)
     {
         double fVal;
-        BOOL bFlag;
+        sal_Bool bFlag;
         ScMatrixRef pMat = pMat1;
         if (!pMat)
         {
             fVal = fVal1;
             pMat = pMat2;
-            bFlag = TRUE;           // double - Matrix
+            bFlag = sal_True;           // double - Matrix
         }
         else
         {
             fVal = fVal2;
-            bFlag = FALSE;          // Matrix - double
+            bFlag = sal_False;          // Matrix - double
         }
         SCSIZE nC, nR;
         pMat->GetDimensions(nC, nR);
@@ -1329,18 +1329,18 @@ void ScInterpreter::ScAmpersand()
     else if (pMat1 || pMat2)
     {
         String sStr;
-        BOOL bFlag;
+        sal_Bool bFlag;
         ScMatrixRef pMat = pMat1;
         if (!pMat)
         {
             sStr = sStr1;
             pMat = pMat2;
-            bFlag = TRUE;           // double - Matrix
+            bFlag = sal_True;           // double - Matrix
         }
         else
         {
             sStr = sStr2;
-            bFlag = FALSE;          // Matrix - double
+            bFlag = sal_False;          // Matrix - double
         }
         SCSIZE nC, nR;
         pMat->GetDimensions(nC, nR);
@@ -1357,7 +1357,7 @@ void ScInterpreter::ScAmpersand()
             {
                 for ( SCSIZE i = 0; i < nCount; i++ )
                 {
-                    USHORT nErr = pMat->GetErrorIfNotString( i);
+                    sal_uInt16 nErr = pMat->GetErrorIfNotString( i);
                     if (nErr)
                         pResMat->PutError( nErr, i);
                     else
@@ -1372,7 +1372,7 @@ void ScInterpreter::ScAmpersand()
             {
                 for ( SCSIZE i = 0; i < nCount; i++ )
                 {
-                    USHORT nErr = pMat->GetErrorIfNotString( i);
+                    sal_uInt16 nErr = pMat->GetErrorIfNotString( i);
                     if (nErr)
                         pResMat->PutError( nErr, i);
                     else
@@ -1399,7 +1399,7 @@ void ScInterpreter::ScAmpersand()
 void ScInterpreter::ScSub()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSub" );
-    CalculateAddSub(TRUE);
+    CalculateAddSub(sal_True);
 }
 
 void ScInterpreter::ScMul()
@@ -1409,7 +1409,7 @@ void ScInterpreter::ScMul()
     ScMatrixRef pMat2 = NULL;
     double fVal1 = 0.0, fVal2 = 0.0;
     short nFmtCurrencyType = nCurFmtType;
-    ULONG nFmtCurrencyIndex = nCurFmtIndex;
+    sal_uLong nFmtCurrencyIndex = nCurFmtIndex;
     if ( GetStackType() == svMatrix )
         pMat2 = GetMatrix();
     else
@@ -1488,7 +1488,7 @@ void ScInterpreter::ScDiv()
     ScMatrixRef pMat2 = NULL;
     double fVal1 = 0.0, fVal2 = 0.0;
     short nFmtCurrencyType = nCurFmtType;
-    ULONG nFmtCurrencyIndex = nCurFmtIndex;
+    sal_uLong nFmtCurrencyIndex = nCurFmtIndex;
     short nFmtCurrencyType2 = NUMBERFORMAT_UNDEFINED;
     if ( GetStackType() == svMatrix )
         pMat2 = GetMatrix();
@@ -1523,18 +1523,18 @@ void ScInterpreter::ScDiv()
     else if (pMat1 || pMat2)
     {
         double fVal;
-        BOOL bFlag;
+        sal_Bool bFlag;
         ScMatrixRef pMat = pMat1;
         if (!pMat)
         {
             fVal = fVal1;
             pMat = pMat2;
-            bFlag = TRUE;           // double - Matrix
+            bFlag = sal_True;           // double - Matrix
         }
         else
         {
             fVal = fVal2;
-            bFlag = FALSE;          // Matrix - double
+            bFlag = sal_False;          // Matrix - double
         }
         SCSIZE nC, nR;
         pMat->GetDimensions(nC, nR);
@@ -1605,18 +1605,18 @@ void ScInterpreter::ScPow()
     else if (pMat1 || pMat2)
     {
         double fVal;
-        BOOL bFlag;
+        sal_Bool bFlag;
         ScMatrixRef pMat = pMat1;
         if (!pMat)
         {
             fVal = fVal1;
             pMat = pMat2;
-            bFlag = TRUE;           // double - Matrix
+            bFlag = sal_True;           // double - Matrix
         }
         else
         {
             fVal = fVal2;
-            bFlag = FALSE;          // Matrix - double
+            bFlag = sal_False;          // Matrix - double
         }
         SCSIZE nC, nR;
         pMat->GetDimensions(nC, nR);
@@ -1650,7 +1650,7 @@ void ScInterpreter::ScPow()
 void ScInterpreter::ScSumProduct()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumProduct" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 1, 30 ) )
         return;
 
@@ -1668,7 +1668,7 @@ void ScInterpreter::ScSumProduct()
     pMat2->GetDimensions(nC, nR);
     pMat = pMat2;
     MatrixMul aMul;
-    for (USHORT i = 1; i < nParamCount; i++)
+    for (sal_uInt16 i = 1; i < nParamCount; i++)
     {
         pMat1 = GetMatrix();
         if (!pMat1)
@@ -1704,9 +1704,9 @@ void ScInterpreter::ScSumProduct()
 void ScInterpreter::ScSumX2MY2()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumX2MY2" );
-    CalculateSumX2MY2SumX2DY2(FALSE);
+    CalculateSumX2MY2SumX2DY2(sal_False);
 }
-void ScInterpreter::CalculateSumX2MY2SumX2DY2(BOOL _bSumX2DY2)
+void ScInterpreter::CalculateSumX2MY2SumX2DY2(sal_Bool _bSumX2DY2)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateSumX2MY2SumX2DY2" );
     if ( !MustHaveParamCount( GetByte(), 2 ) )
@@ -1750,7 +1750,7 @@ void ScInterpreter::CalculateSumX2MY2SumX2DY2(BOOL _bSumX2DY2)
 void ScInterpreter::ScSumX2DY2()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSumX2DY2" );
-    CalculateSumX2MY2SumX2DY2(TRUE);
+    CalculateSumX2MY2SumX2DY2(sal_True);
 }
 
 void ScInterpreter::ScSumXMY2()
@@ -1852,15 +1852,15 @@ void ScInterpreter::ScFrequency()
     PushMatrix(pResMat);
 }
 
-BOOL ScInterpreter::RGetVariances( ScMatrix* pV, ScMatrix* pX,
-        SCSIZE nC, SCSIZE nR, BOOL bSwapColRow, BOOL bZeroConstant )
+sal_Bool ScInterpreter::RGetVariances( ScMatrix* pV, ScMatrix* pX,
+        SCSIZE nC, SCSIZE nR, sal_Bool bSwapColRow, sal_Bool bZeroConstant )
 {   // multiple Regression: Varianzen der Koeffizienten
-    // bSwapColRow==TRUE : Koeffizienten in Zeilen statt Spalten angeordnet
+    // bSwapColRow==sal_True : Koeffizienten in Zeilen statt Spalten angeordnet
     SCSIZE i, j, k;
     double sum;
     ScMatrixRef pC = GetNewMat(nC, nC);
     if ( !pC )
-        return FALSE;
+        return sal_False;
     // X transformiert mit X multipziert, X'X Matrix
     if ( !bZeroConstant )
     {   // in der X-Designmatrix existiert ein gedachtes X0j==1
@@ -1931,17 +1931,17 @@ BOOL ScInterpreter::RGetVariances( ScMatrix* pV, ScMatrix* pX,
         }
     }
     // X'X Inverse
-    BOOL bOk = TRUE;
-    USHORT nErr = nGlobalError;
+    sal_Bool bOk = sal_True;
+    sal_uInt16 nErr = nGlobalError;
     PushMatrix(pC);
-    BYTE nTmp = cPar;
+    sal_uInt8 nTmp = cPar;
     cPar = 1;
     ScMatInv();
     cPar = nTmp;
     if ( nGlobalError )
     {
         nGlobalError = nErr;
-        bOk = FALSE;
+        bOk = sal_False;
     }
     else
     {
@@ -1957,7 +1957,7 @@ BOOL ScInterpreter::RGetVariances( ScMatrix* pV, ScMatrix* pX,
     return bOk;
 }
 // -----------------------------------------------------------------------------
-void ScInterpreter::Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef& pQ,ScMatrixRef& pV,ScMatrixRef& pMatX,BOOL bConstant,SCSIZE N,SCSIZE M,BYTE nCase)
+void ScInterpreter::Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef& pQ,ScMatrixRef& pV,ScMatrixRef& pMatX,sal_Bool bConstant,SCSIZE N,SCSIZE M,sal_uInt8 nCase)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::RGetVariances" );
     // pE[0]    := Sigma i=1...n (Yi)
@@ -2000,7 +2000,7 @@ void ScInterpreter::Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef&
             pResMat->PutDouble(sqrt(fSE2), 1, 2);
             // sen...se1 (Standardfehler der Koeffizienten mn...m1)
             // seb (Standardfehler der Konstanten b)
-            if ( RGetVariances( pV, pMatX, M+1, N, nCase != 2, FALSE ) )
+            if ( RGetVariances( pV, pMatX, M+1, N, nCase != 2, sal_False ) )
             {
                 for (i = 0; i < M+1; i++)
                     pResMat->PutDouble( sqrt(fSE2 * pV->GetDouble(i)), M-i, 1 );
@@ -2031,7 +2031,7 @@ void ScInterpreter::Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef&
         {
             double fSE2 = fSQR/(N-M);
             pResMat->PutDouble(sqrt(fSE2), 1, 2);
-            if ( RGetVariances( pV, pMatX, M, N, nCase != 2, TRUE ) )
+            if ( RGetVariances( pV, pMatX, M, N, nCase != 2, sal_True ) )
             {
                 for (i = 0; i < M; i++)
                     pResMat->PutDouble( sqrt(fSE2 * pV->GetDouble(i)), M-i-1, 1 );
@@ -2054,9 +2054,9 @@ void ScInterpreter::Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef&
 void ScInterpreter::ScRGP()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRGP" );
-    CalulateRGPRKP(FALSE);
+    CalulateRGPRKP(sal_False);
 }
-bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY)
+bool ScInterpreter::CheckMatrix(sal_Bool _bLOG,sal_Bool _bTrendGrowth,sal_uInt8& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY)
 {    
     nCX = 0;
     nCY = 0;
@@ -2154,21 +2154,21 @@ bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE
     }
     return true;
 }
-void ScInterpreter::CalulateRGPRKP(BOOL _bRKP)
+void ScInterpreter::CalulateRGPRKP(sal_Bool _bRKP)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CheckMatrix" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 1, 4 ) )
         return;
-    BOOL bConstant, bStats;
+    sal_Bool bConstant, bStats;
     if (nParamCount == 4)
         bStats = GetBool();
     else
-        bStats = FALSE;
+        bStats = sal_False;
     if (nParamCount >= 3)
         bConstant = GetBool();
     else
-        bConstant = TRUE;
+        bConstant = sal_True;
     ScMatrixRef pMatX;
     ScMatrixRef pMatY;
     if (nParamCount >= 2)
@@ -2181,11 +2181,11 @@ void ScInterpreter::CalulateRGPRKP(BOOL _bRKP)
         PushIllegalParameter();
         return;
     } // if (!pMatY)
-    BYTE nCase;                         // 1 = normal, 2,3 = mehrfach
+    sal_uInt8 nCase;                         // 1 = normal, 2,3 = mehrfach
     SCSIZE nCX, nCY;
     SCSIZE nRX, nRY;
     SCSIZE M = 0, N = 0;
-    if ( !CheckMatrix(_bRKP,FALSE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) )
+    if ( !CheckMatrix(_bRKP,sal_False,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) )
         return;
     
     ScMatrixRef pResMat;
@@ -2356,10 +2356,10 @@ void ScInterpreter::CalulateRGPRKP(BOOL _bRKP)
 void ScInterpreter::ScRKP()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRKP" );
-    CalulateRGPRKP(TRUE);
+    CalulateRGPRKP(sal_True);
 }
 // -----------------------------------------------------------------------------
-bool ScInterpreter::Calculate4(BOOL _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,BOOL bConstant,SCSIZE N,SCSIZE M)
+bool ScInterpreter::Calculate4(sal_Bool _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,sal_Bool bConstant,SCSIZE N,SCSIZE M)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Calculate4" );
     pQ->PutDouble((double)N, 0, 0);
@@ -2412,7 +2412,7 @@ bool ScInterpreter::Calculate4(BOOL _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,B
     return true;
 }
 
-ScMatrixRef ScInterpreter::Calculate2(const BOOL bConstant,const SCSIZE M ,const SCSIZE N,ScMatrixRef& pMatX,ScMatrixRef& pMatY,BYTE nCase)
+ScMatrixRef ScInterpreter::Calculate2(const sal_Bool bConstant,const SCSIZE M ,const SCSIZE N,ScMatrixRef& pMatX,ScMatrixRef& pMatY,sal_uInt8 nCase)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Calculate2" );
     SCSIZE i, j, k;
@@ -2553,19 +2553,19 @@ bool ScInterpreter::Calculate3(const SCSIZE M ,ScMatrixRef& pQ)
 void ScInterpreter::ScTrend()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTrend" );
-    CalculateTrendGrowth(FALSE);
+    CalculateTrendGrowth(sal_False);
 }
-void ScInterpreter::CalculateTrendGrowth(BOOL _bGrowth)
+void ScInterpreter::CalculateTrendGrowth(sal_Bool _bGrowth)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateTrendGrowth" );
-    BYTE nParamCount = GetByte();
+    sal_uInt8 nParamCount = GetByte();
     if ( !MustHaveParamCount( nParamCount, 1, 4 ) )
         return;
-    BOOL bConstant;
+    sal_Bool bConstant;
     if (nParamCount == 4)
         bConstant = GetBool();
     else
-        bConstant = TRUE;
+        bConstant = sal_True;
     ScMatrixRef pMatX;
     ScMatrixRef pMatY;
     ScMatrixRef pMatNewX;
@@ -2584,11 +2584,11 @@ void ScInterpreter::CalculateTrendGrowth(BOOL _bGrowth)
         return;
     } // if (!pMatY)
 
-    BYTE nCase;                         // 1 = normal, 2,3 = mehrfach
+    sal_uInt8 nCase;                         // 1 = normal, 2,3 = mehrfach
     SCSIZE nCX, nCY;
     SCSIZE nRX, nRY;
     SCSIZE M = 0, N = 0;
-    if ( !CheckMatrix(_bGrowth,TRUE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) )
+    if ( !CheckMatrix(_bGrowth,sal_True,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) )
         return;
     
     
@@ -2719,7 +2719,7 @@ void ScInterpreter::CalculateTrendGrowth(BOOL _bGrowth)
 void ScInterpreter::ScGrowth()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGrowth" );
-    CalculateTrendGrowth(TRUE);
+    CalculateTrendGrowth(sal_True);
 }
 
 void ScInterpreter::ScMatRef()
@@ -2748,7 +2748,7 @@ void ScInterpreter::ScMatRef()
                 if (ScMatrix::IsNonValueType( nMatValType))
                 {
                     if (ScMatrix::IsEmptyPathType( nMatValType))
-                    {   // result of empty FALSE jump path
+                    {   // result of empty sal_False jump path
                         nFuncFmtType = NUMBERFORMAT_LOGICAL;
                         PushInt(0);
                     }
@@ -2772,7 +2772,7 @@ void ScInterpreter::ScMatRef()
         else
         {
             // If not a result matrix, obtain the cell value.
-            USHORT nErr = pCell->GetErrCode();
+            sal_uInt16 nErr = pCell->GetErrCode();
             if (nErr)
                 PushError( nErr );
             else if( pCell->IsValue() )
diff --git a/sc/source/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx
index 21b25ca6f..01b6b6e9b 100644
--- a/sc/source/core/tool/navicfg.cxx
+++ b/sc/source/core/tool/navicfg.cxx
@@ -50,7 +50,7 @@ ScNavipiCfg::ScNavipiCfg() :
 
 //------------------------------------------------------------------------
 
-void ScNavipiCfg::SetListMode(USHORT nNew)
+void ScNavipiCfg::SetListMode(sal_uInt16 nNew)
 {
     if ( nListMode != nNew )
     {
@@ -59,7 +59,7 @@ void ScNavipiCfg::SetListMode(USHORT nNew)
     }
 }
 
-void ScNavipiCfg::SetDragMode(USHORT nNew)
+void ScNavipiCfg::SetDragMode(sal_uInt16 nNew)
 {
     if ( nDragMode != nNew )
     {
@@ -68,7 +68,7 @@ void ScNavipiCfg::SetDragMode(USHORT nNew)
     }
 }
 
-void ScNavipiCfg::SetRootType(USHORT nNew)
+void ScNavipiCfg::SetRootType(sal_uInt16 nNew)
 {
     if ( nRootType != nNew )
     {
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 28a2cb7de..a3ec80e37 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -39,7 +39,7 @@
 //------------------------------------------------------------------
 
 // static
-BOOL ScOptionsUtil::IsMetricSystem()
+sal_Bool ScOptionsUtil::IsMetricSystem()
 {
     //!	which language should be used here - system language or installed office language?
 
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 89206e5ba..cacbcb92b 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -239,7 +239,7 @@ void ScParameterClassification::Init()
                     if ( pRun->aData.nParam[j] )
                     {
                         eLast = pRun->aData.nParam[j];
-                        pRun->nMinParams = sal::static_int_cast<BYTE>( j+1 );
+                        pRun->nMinParams = sal::static_int_cast<sal_uInt8>( j+1 );
                     }
                     else
                         pRun->aData.nParam[j] = eLast;
@@ -252,7 +252,7 @@ void ScParameterClassification::Init()
                     if ( !pRun->aData.nParam[j] )
                     {
                         if ( j == 0 || pRun->aData.nParam[j-1] != Bounds )
-                            pRun->nMinParams = sal::static_int_cast<BYTE>( j );
+                            pRun->nMinParams = sal::static_int_cast<sal_uInt8>( j );
                         pRun->aData.nParam[j] = Bounds;
                     }
                 }
@@ -285,7 +285,7 @@ void ScParameterClassification::Exit()
 
 
 ScParameterClassification::Type ScParameterClassification::GetParameterType(
-        const formula::FormulaToken* pToken, USHORT nParameter)
+        const formula::FormulaToken* pToken, sal_uInt16 nParameter)
 {
     OpCode eOp = pToken->GetOpCode();
     switch ( eOp )
@@ -319,11 +319,11 @@ ScParameterClassification::Type ScParameterClassification::GetParameterType(
 
 ScParameterClassification::Type
 ScParameterClassification::GetExternalParameterType( const formula::FormulaToken* pToken,
-        USHORT nParameter)
+        sal_uInt16 nParameter)
 {
     Type eRet = Unknown;
     // similar to ScInterpreter::ScExternal()
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     String aUnoName;
     String aFuncName( ScGlobal::pCharClass->upper( pToken->GetExternal()));
     if ( ScGlobal::GetFuncCollection()->SearchFunc( aFuncName, nIndex) )
@@ -347,7 +347,7 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken
         }
     }
     else if ( (aUnoName = ScGlobal::GetAddInCollection()->FindFunction(
-                    aFuncName, FALSE)).Len() )
+                    aFuncName, sal_False)).Len() )
     {
         // the relevant parts of ScUnoAddInCall without having to create one
         const ScUnoAddInFuncData* pFuncData =
@@ -405,7 +405,7 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource()
             continue;   // not an internal opcode or already done
 
         RunData* pRun = &pData[ pDesc->nFIndex ];
-        USHORT nArgs = pDesc->GetSuppressedArgCount();
+        sal_uInt16 nArgs = pDesc->GetSuppressedArgCount();
         if ( nArgs >= VAR_ARGS )
         {
             nArgs -= VAR_ARGS - 1;
@@ -419,7 +419,7 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource()
             nArgs = CommonData::nMaxParams;
             pRun->aData.bRepeatLast = true;
         }
-        pRun->nMinParams = static_cast< BYTE >( nArgs );
+        pRun->nMinParams = static_cast< sal_uInt8 >( nArgs );
         for ( size_t j=0; j < nArgs; ++j )
         {
             pRun->aData.nParam[j] = Value;
@@ -464,7 +464,7 @@ void ScParameterClassification::GenerateDocumentation()
             ByteString aStr( xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8);
             aStr += "(";
             formula::FormulaByteToken aToken( eOp);
-            BYTE nParams = GetMinimumParameters( eOp);
+            sal_uInt8 nParams = GetMinimumParameters( eOp);
             // preset parameter count according to opcode value, with some
             // special handling
             if ( eOp < SC_OPCODE_STOP_DIV )
@@ -515,7 +515,7 @@ void ScParameterClassification::GenerateDocumentation()
             if ( nParams != aToken.GetParamCount() )
                 fprintf( stdout, "(parameter count differs, token ParamCount: %d  classification: %d) ",
                         aToken.GetParamCount(), nParams);
-            for ( USHORT j=0; j < nParams; ++j )
+            for ( sal_uInt16 j=0; j < nParams; ++j )
             {
                 if ( j > 0 )
                     aStr += ",";
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index e952b9e01..8e961b64c 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -63,8 +63,8 @@ ScPrintOptions::~ScPrintOptions()
 
 void ScPrintOptions::SetDefaults()
 {
-    bSkipEmpty = TRUE;
-    bAllSheets = FALSE;
+    bSkipEmpty = sal_True;
+    bAllSheets = sal_False;
 }
 
 const ScPrintOptions& ScPrintOptions::operator=( const ScPrintOptions& rCpy )
@@ -87,11 +87,11 @@ int ScPrintOptions::operator!=( const ScPrintOptions& rOpt ) const
 
 // -----------------------------------------------------------------------
 
-//UNUSED2008-05  ScTpPrintItem::ScTpPrintItem( USHORT nWhichP ) : SfxPoolItem( nWhichP )
+//UNUSED2008-05  ScTpPrintItem::ScTpPrintItem( sal_uInt16 nWhichP ) : SfxPoolItem( nWhichP )
 //UNUSED2008-05  {
 //UNUSED2008-05  }
 
-ScTpPrintItem::ScTpPrintItem( USHORT nWhichP, const ScPrintOptions& rOpt ) :
+ScTpPrintItem::ScTpPrintItem( sal_uInt16 nWhichP, const ScPrintOptions& rOpt ) :
     SfxPoolItem ( nWhichP ),
     theOptions	( rOpt )
 {
diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx
index 39650d786..53bb9cc9e 100644
--- a/sc/source/core/tool/prnsave.cxx
+++ b/sc/source/core/tool/prnsave.cxx
@@ -49,7 +49,7 @@
 ScPrintSaverTab::ScPrintSaverTab() :
     mpRepeatCol(NULL),
     mpRepeatRow(NULL),
-    mbEntireSheet(FALSE)
+    mbEntireSheet(sal_False)
 {
 }
 
@@ -59,7 +59,7 @@ ScPrintSaverTab::~ScPrintSaverTab()
     delete mpRepeatRow;
 }
 
-void ScPrintSaverTab::SetAreas( const ScRangeVec& rRanges, BOOL bEntireSheet )
+void ScPrintSaverTab::SetAreas( const ScRangeVec& rRanges, sal_Bool bEntireSheet )
 {
     maPrintRanges = rRanges;
     mbEntireSheet = bEntireSheet;
@@ -73,12 +73,12 @@ void ScPrintSaverTab::SetRepeat( const ScRange* pCol, const ScRange* pRow )
     mpRepeatRow = pRow ? new ScRange(*pRow) : NULL;
 }
 
-inline BOOL PtrEqual( const ScRange* p1, const ScRange* p2 )
+inline sal_Bool PtrEqual( const ScRange* p1, const ScRange* p2 )
 {
     return ( !p1 && !p2 ) || ( p1 && p2 && *p1 == *p2 );
 }
 
-BOOL ScPrintSaverTab::operator==( const ScPrintSaverTab& rCmp ) const
+sal_Bool ScPrintSaverTab::operator==( const ScPrintSaverTab& rCmp ) const
 {
     return
         PtrEqual( mpRepeatCol, rCmp.mpRepeatCol ) &&
@@ -117,14 +117,14 @@ const ScPrintSaverTab& ScPrintRangeSaver::GetTabData(SCTAB nTab) const
     return pData[nTab];
 }
 
-BOOL ScPrintRangeSaver::operator==( const ScPrintRangeSaver& rCmp ) const
+sal_Bool ScPrintRangeSaver::operator==( const ScPrintRangeSaver& rCmp ) const
 {
-    BOOL bEqual = ( nTabCount == rCmp.nTabCount );
+    sal_Bool bEqual = ( nTabCount == rCmp.nTabCount );
     if (bEqual)
         for (SCTAB i=0; i<nTabCount; i++)
             if (!(pData[i]==rCmp.pData[i]))
             {
-                bEqual = FALSE;
+                bEqual = sal_False;
                 break;
             }
     return bEqual;
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index 10d824251..544b9efdc 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -51,18 +51,18 @@ using namespace com::sun::star;
 
 static ScProgress theDummyInterpretProgress;
 SfxProgress*	ScProgress::pGlobalProgress = NULL;
-ULONG			ScProgress::nGlobalRange = 0;
-ULONG			ScProgress::nGlobalPercent = 0;
-BOOL			ScProgress::bGlobalNoUserBreak = TRUE;
+sal_uLong			ScProgress::nGlobalRange = 0;
+sal_uLong			ScProgress::nGlobalPercent = 0;
+sal_Bool			ScProgress::bGlobalNoUserBreak = sal_True;
 ScProgress*		ScProgress::pInterpretProgress = &theDummyInterpretProgress;
 ScProgress*		ScProgress::pOldInterpretProgress = NULL;
-ULONG			ScProgress::nInterpretProgress = 0;
-BOOL			ScProgress::bAllowInterpretProgress = TRUE;
+sal_uLong			ScProgress::nInterpretProgress = 0;
+sal_Bool			ScProgress::bAllowInterpretProgress = sal_True;
 ScDocument*		ScProgress::pInterpretDoc;
-BOOL			ScProgress::bIdleWasDisabled = FALSE;
+sal_Bool			ScProgress::bIdleWasDisabled = sal_False;
 
 
-BOOL lcl_IsHiddenDocument( SfxObjectShell* pObjSh )
+sal_Bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh )
 {
     if (pObjSh)
     {
@@ -71,12 +71,12 @@ BOOL lcl_IsHiddenDocument( SfxObjectShell* pObjSh )
         {
             SfxItemSet* pSet = pMed->GetItemSet();
             const SfxPoolItem* pItem;
-            if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_HIDDEN, TRUE, &pItem ) &&
+            if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_HIDDEN, sal_True, &pItem ) &&
                         ((const SfxBoolItem*)pItem)->GetValue() )
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 bool lcl_HasControllersLocked( SfxObjectShell& rObjSh )
@@ -88,7 +88,7 @@ bool lcl_HasControllersLocked( SfxObjectShell& rObjSh )
 }
 
 ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText,
-                        ULONG nRange, BOOL bAllDocs, BOOL bWait )
+                        sal_uLong nRange, sal_Bool bAllDocs, sal_Bool bWait )
 {
 
     if ( pGlobalProgress || SfxProgress::GetActiveProgress( NULL ) )
@@ -128,7 +128,7 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText,
         pGlobalProgress = pProgress;
         nGlobalRange = nRange;
         nGlobalPercent = 0;
-        bGlobalNoUserBreak = TRUE;
+        bGlobalNoUserBreak = sal_True;
     }
 }
 
@@ -147,13 +147,13 @@ ScProgress::~ScProgress()
         pGlobalProgress = NULL;
         nGlobalRange = 0;
         nGlobalPercent = 0;
-        bGlobalNoUserBreak = TRUE;
+        bGlobalNoUserBreak = sal_True;
     }
 }
 
 // static
 
-void ScProgress::CreateInterpretProgress( ScDocument* pDoc, BOOL bWait )
+void ScProgress::CreateInterpretProgress( ScDocument* pDoc, sal_Bool bWait )
 {
     if ( bAllowInterpretProgress )
     {
@@ -163,14 +163,14 @@ void ScProgress::CreateInterpretProgress( ScDocument* pDoc, BOOL bWait )
         {
             nInterpretProgress = 1;
             bIdleWasDisabled = pDoc->IsIdleDisabled();
-            pDoc->DisableIdle( TRUE );
+            pDoc->DisableIdle( sal_True );
             // Interpreter may be called in many circumstances, also if another
             // progress bar is active, for example while adapting row heights.
             // Keep the dummy interpret progress.
             if ( !pGlobalProgress )
                 pInterpretProgress = new ScProgress( pDoc->GetDocumentShell(),
                     ScGlobal::GetRscString( STR_PROGRESS_CALCULATING ),
-                    pDoc->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE, FALSE, bWait );
+                    pDoc->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE, sal_False, bWait );
             pInterpretDoc = pDoc;
         }
     }
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index 7b129e646..ce43e046e 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -42,7 +42,7 @@ using ::std::vector;
 ScQueryParamBase::ScQueryParamBase()
 {
     Resize( MAXQUERY );
-    for (USHORT i=0; i<MAXQUERY; i++)
+    for (sal_uInt16 i=0; i<MAXQUERY; i++)
         maEntries[i].Clear();
 }
 
@@ -108,7 +108,7 @@ void ScQueryParamBase::FillInExcelSyntax(String& aCellStr, SCSIZE nIndex)
 
         ScQueryEntry& rEntry = GetEntry(nIndex);
 
-        rEntry.bDoQuery = TRUE;
+        rEntry.bDoQuery = sal_True;
         // Operatoren herausfiltern
         if (aCellStr.GetChar(0) == '<')
         {
@@ -213,11 +213,11 @@ void ScQueryParam::Clear()
     nCol1=nCol2 = 0;
     nRow1=nRow2 = 0;
     nTab = SCTAB_MAX;
-    bHasHeader = bCaseSens = bRegExp = bMixedComparison = FALSE;
-    bInplace = bByRow = bDuplicate = TRUE;
+    bHasHeader = bCaseSens = bRegExp = bMixedComparison = sal_False;
+    bInplace = bByRow = bDuplicate = sal_True;
 
     Resize( MAXQUERY );
-    for (USHORT i=0; i<MAXQUERY; i++)
+    for (sal_uInt16 i=0; i<MAXQUERY; i++)
         maEntries[i].Clear();
 
     ClearDestParams();
@@ -259,9 +259,9 @@ ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
 
 //------------------------------------------------------------------------
 
-BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
+sal_Bool ScQueryParam::operator==( const ScQueryParam& rOther ) const
 {
-    BOOL bEqual = FALSE;
+    sal_Bool bEqual = sal_False;
 
     // Anzahl der Queries gleich?
     SCSIZE nUsed      = 0;
@@ -291,7 +291,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
         && (nDestCol    == rOther.nDestCol)
         && (nDestRow    == rOther.nDestRow) )
     {
-        bEqual = TRUE;
+        bEqual = sal_True;
         for ( SCSIZE i=0; i<nUsed && bEqual; i++ )
             bEqual = maEntries[i] == rOther.maEntries[i];
     }
@@ -317,7 +317,7 @@ void ScQueryParam::MoveToDest()
         for (size_t i=0; i<n; i++)
             maEntries[i].nField += nDifX;
 
-        bInplace = TRUE;
+        bInplace = sal_True;
     }
     else
     {
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 6bd25c53a..eeffc0f1a 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -58,7 +58,7 @@ void ScRangeList::RemoveAll()
     Clear();
 }
 
-USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask,
+sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 nMask,
                            formula::FormulaGrammar::AddressConvention eConv,
                            sal_Unicode cDelimiter )
 {
@@ -68,7 +68,7 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask,
             cDelimiter = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
 
         nMask |= SCA_VALID;				// falls das jemand vergessen sollte
-        USHORT nResult = (USHORT)~0;	// alle Bits setzen
+        sal_uInt16 nResult = (sal_uInt16)~0;	// alle Bits setzen
         ScRange	aRange;
         String aOne;
         SCTAB nTab = 0;
@@ -79,8 +79,8 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask,
         }
         else
             nTab = 0;
-        USHORT nTCount = rStr.GetTokenCount( cDelimiter );
-        for ( USHORT i=0; i<nTCount; i++ )
+        sal_uInt16 nTCount = rStr.GetTokenCount( cDelimiter );
+        for ( sal_uInt16 i=0; i<nTCount; i++ )
         {
             aOne = rStr.GetToken( i, cDelimiter );
             // FIXME : broken for Lotus
@@ -91,7 +91,7 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask,
                 aOne += aStrTmp;
             }
             aRange.aStart.SetTab( nTab );	// Default Tab wenn nicht angegeben
-            USHORT nRes = aRange.Parse( aOne, pDoc, eConv );
+            sal_uInt16 nRes = aRange.Parse( aOne, pDoc, eConv );
             if ( (nRes & nMask) == nMask )
                 Append( aRange );
             nResult &= nRes;		// alle gemeinsamen Bits bleiben erhalten
@@ -103,7 +103,7 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask,
 }
 
 
-void ScRangeList::Format( String& rStr, USHORT nFlags, ScDocument* pDoc,
+void ScRangeList::Format( String& rStr, sal_uInt16 nFlags, ScDocument* pDoc,
                           formula::FormulaGrammar::AddressConvention eConv,
                           sal_Unicode cDelimiter ) const
 {
@@ -112,8 +112,8 @@ void ScRangeList::Format( String& rStr, USHORT nFlags, ScDocument* pDoc,
     if (!cDelimiter)
         cDelimiter = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
 
-    ULONG nCnt = Count();
-    for ( ULONG nIdx = 0; nIdx < nCnt; nIdx++ )
+    sal_uLong nCnt = Count();
+    for ( sal_uLong nIdx = 0; nIdx < nCnt; nIdx++ )
     {
         String aStr;
         GetObject( nIdx )->Format( aStr, nFlags, pDoc, eConv );
@@ -124,7 +124,7 @@ void ScRangeList::Format( String& rStr, USHORT nFlags, ScDocument* pDoc,
 }
 
 
-void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
+void ScRangeList::Join( const ScRange& r, sal_Bool bIsInList )
 {
     if ( !Count() )
     {
@@ -138,31 +138,31 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
     SCROW nRow2 = r.aEnd.Row();
     SCTAB nTab2 = r.aEnd.Tab();
     ScRangePtr pOver = (ScRangePtr) &r;		// fies aber wahr wenn bInList
-    ULONG nOldPos = 0;
+    sal_uLong nOldPos = 0;
     if ( bIsInList )
     {	// merken um ggbf. zu loeschen bzw. wiederherzustellen
         nOldPos = GetPos( pOver );
     }
-    BOOL bJoinedInput = FALSE;
+    sal_Bool bJoinedInput = sal_False;
     for ( ScRangePtr p = First(); p && pOver; p = Next() )
     {
         if ( p == pOver )
             continue;			// derselbe, weiter mit dem naechsten
-        BOOL bJoined = FALSE;
+        sal_Bool bJoined = sal_False;
         if ( p->In( r ) )
         {	// Range r in Range p enthalten oder identisch
             if ( bIsInList )
-                bJoined = TRUE;		// weg mit Range r
+                bJoined = sal_True;		// weg mit Range r
             else
             {	// das war's dann
-                bJoinedInput = TRUE;	// nicht anhaengen
+                bJoinedInput = sal_True;	// nicht anhaengen
                 break;	// for
             }
         }
         else if ( r.In( *p ) )
         {	// Range p in Range r enthalten, r zum neuen Range machen
             *p = r;
-            bJoined = TRUE;
+            bJoined = sal_True;
         }
         if ( !bJoined && p->aStart.Tab() == nTab1 && p->aEnd.Tab() == nTab2 )
         {	// 2D
@@ -171,12 +171,12 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
                 if ( p->aStart.Row() == nRow2+1 )
                 {	// oben
                     p->aStart.SetRow( nRow1 );
-                    bJoined = TRUE;
+                    bJoined = sal_True;
                 }
                 else if ( p->aEnd.Row() == nRow1-1 )
                 {	// unten
                     p->aEnd.SetRow( nRow2 );
-                    bJoined = TRUE;
+                    bJoined = sal_True;
                 }
             }
             else if ( p->aStart.Row() == nRow1 && p->aEnd.Row() == nRow2 )
@@ -184,12 +184,12 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
                 if ( p->aStart.Col() == nCol2+1 )
                 {	// links
                     p->aStart.SetCol( nCol1 );
-                    bJoined = TRUE;
+                    bJoined = sal_True;
                 }
                 else if ( p->aEnd.Col() == nCol1-1 )
                 {	// rechts
                     p->aEnd.SetCol( nCol2 );
-                    bJoined = TRUE;
+                    bJoined = sal_True;
                 }
             }
         }
@@ -203,8 +203,8 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
                 if ( nOldPos )
                     nOldPos--;			// Seek richtig aufsetzen
             }
-            bJoinedInput = TRUE;
-            Join( *p, TRUE );			// rekursiv!
+            bJoinedInput = sal_True;
+            Join( *p, sal_True );			// rekursiv!
         }
     }
     if ( bIsInList )
@@ -214,31 +214,31 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
 }
 
 
-BOOL ScRangeList::operator==( const ScRangeList& r ) const
+sal_Bool ScRangeList::operator==( const ScRangeList& r ) const
 {
     if ( this == &r )
-        return TRUE;				// identische Referenz
+        return sal_True;				// identische Referenz
     if ( Count() != r.Count() )
-        return FALSE;
-    ULONG nCnt = Count();
-    for ( ULONG nIdx = 0; nIdx < nCnt; nIdx++ )
+        return sal_False;
+    sal_uLong nCnt = Count();
+    for ( sal_uLong nIdx = 0; nIdx < nCnt; nIdx++ )
     {
         if ( *GetObject( nIdx ) != *r.GetObject( nIdx ) )
-            return FALSE;			// auch andere Reihenfolge ist ungleich
+            return sal_False;			// auch andere Reihenfolge ist ungleich
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScRangeList::operator!=( const ScRangeList& r ) const
+sal_Bool ScRangeList::operator!=( const ScRangeList& r ) const
 {
     return !operator==( r );
 }
 
-BOOL ScRangeList::UpdateReference( UpdateRefMode eUpdateRefMode,
+sal_Bool ScRangeList::UpdateReference( UpdateRefMode eUpdateRefMode,
                                     ScDocument* pDoc, const ScRange& rWhere,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     if ( Count() )
     {
         SCCOL nCol1;
@@ -263,7 +263,7 @@ BOOL ScRangeList::UpdateReference( UpdateRefMode eUpdateRefMode,
                     theCol1, theRow1, theTab1, theCol2, theRow2, theTab2 )
                     != UR_NOTHING )
             {
-                bChanged = TRUE;
+                bChanged = sal_True;
                 pR->aStart.Set( theCol1, theRow1, theTab1 );
                 pR->aEnd.Set( theCol2, theRow2, theTab2 );
             }
@@ -275,8 +275,8 @@ BOOL ScRangeList::UpdateReference( UpdateRefMode eUpdateRefMode,
 
 ScRange* ScRangeList::Find( const ScAddress& rAdr ) const
 {
-    ULONG nListCount = Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nListCount = Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
     {
         ScRange* pR = GetObject( j );
         if ( pR->In( rAdr ) )
@@ -290,8 +290,8 @@ ScRangeList::ScRangeList( const ScRangeList& rList ) :
     ScRangeListBase(),
     SvRefBase()
 {
-    ULONG nListCount = rList.Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nListCount = rList.Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
         Append( *rList.GetObject( j ) );
 }
 
@@ -300,46 +300,46 @@ ScRangeList& ScRangeList::operator=(const ScRangeList& rList)
 {
     RemoveAll();
 
-    ULONG nListCount = rList.Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nListCount = rList.Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
         Append( *rList.GetObject( j ) );
 
     return *this;
 }
 
 
-BOOL ScRangeList::Intersects( const ScRange& rRange ) const
+sal_Bool ScRangeList::Intersects( const ScRange& rRange ) const
 {
-    ULONG nListCount = Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nListCount = Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
         if ( GetObject(j)->Intersects( rRange ) )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScRangeList::In( const ScRange& rRange ) const
+sal_Bool ScRangeList::In( const ScRange& rRange ) const
 {
-    ULONG nListCount = Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nListCount = Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
         if ( GetObject(j)->In( rRange ) )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 
-ULONG ScRangeList::GetCellCount() const
+sal_uLong ScRangeList::GetCellCount() const
 {
-    ULONG nCellCount = 0;
-    ULONG nListCount = Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nCellCount = 0;
+    sal_uLong nListCount = Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
     {
         ScRange* pR = GetObject( j );
-        nCellCount += ULONG(pR->aEnd.Col() - pR->aStart.Col() + 1)
-            * ULONG(pR->aEnd.Row() - pR->aStart.Row() + 1)
-            * ULONG(pR->aEnd.Tab() - pR->aStart.Tab() + 1);
+        nCellCount += sal_uLong(pR->aEnd.Col() - pR->aStart.Col() + 1)
+            * sal_uLong(pR->aEnd.Row() - pR->aStart.Row() + 1)
+            * sal_uLong(pR->aEnd.Tab() - pR->aStart.Tab() + 1);
     }
     return nCellCount;
 }
@@ -354,7 +354,7 @@ ScRangePairList::~ScRangePairList()
 }
 
 
-void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
+void ScRangePairList::Join( const ScRangePair& r, sal_Bool bIsInList )
 {
     if ( !Count() )
     {
@@ -370,17 +370,17 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
     SCROW nRow2 = r1.aEnd.Row();
     SCTAB nTab2 = r1.aEnd.Tab();
     ScRangePair* pOver = (ScRangePair*) &r;		// fies aber wahr wenn bInList
-    ULONG nOldPos = 0;
+    sal_uLong nOldPos = 0;
     if ( bIsInList )
     {	// merken um ggbf. zu loeschen bzw. wiederherzustellen
         nOldPos = GetPos( pOver );
     }
-    BOOL bJoinedInput = FALSE;
+    sal_Bool bJoinedInput = sal_False;
     for ( ScRangePair* p = First(); p && pOver; p = Next() )
     {
         if ( p == pOver )
             continue;			// derselbe, weiter mit dem naechsten
-        BOOL bJoined = FALSE;
+        sal_Bool bJoined = sal_False;
         ScRange& rp1 = p->GetRange(0);
         ScRange& rp2 = p->GetRange(1);
         if ( rp2 == r2 )
@@ -388,17 +388,17 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
             if ( rp1.In( r1 ) )
             {	// RangePair r in RangePair p enthalten oder identisch
                 if ( bIsInList )
-                    bJoined = TRUE;		// weg mit RangePair r
+                    bJoined = sal_True;		// weg mit RangePair r
                 else
                 {	// das war's dann
-                    bJoinedInput = TRUE;	// nicht anhaengen
+                    bJoinedInput = sal_True;	// nicht anhaengen
                     break;	// for
                 }
             }
             else if ( r1.In( rp1 ) )
             {	// RangePair p in RangePair r enthalten, r zum neuen RangePair machen
                 *p = r;
-                bJoined = TRUE;
+                bJoined = sal_True;
             }
         }
         if ( !bJoined && rp1.aStart.Tab() == nTab1 && rp1.aEnd.Tab() == nTab2
@@ -414,14 +414,14 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
                 {	// oben
                     rp1.aStart.SetRow( nRow1 );
                     rp2.aStart.SetRow( r2.aStart.Row() );
-                    bJoined = TRUE;
+                    bJoined = sal_True;
                 }
                 else if ( rp1.aEnd.Row() == nRow1-1
                   && rp2.aEnd.Row() == r2.aStart.Row()-1 )
                 {	// unten
                     rp1.aEnd.SetRow( nRow2 );
                     rp2.aEnd.SetRow( r2.aEnd.Row() );
-                    bJoined = TRUE;
+                    bJoined = sal_True;
                 }
             }
             else if ( rp1.aStart.Row() == nRow1 && rp1.aEnd.Row() == nRow2
@@ -433,14 +433,14 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
                 {	// links
                     rp1.aStart.SetCol( nCol1 );
                     rp2.aStart.SetCol( r2.aStart.Col() );
-                    bJoined = TRUE;
+                    bJoined = sal_True;
                 }
                 else if ( rp1.aEnd.Col() == nCol1-1
                   && rp2.aEnd.Col() == r2.aEnd.Col()-1 )
                 {	// rechts
                     rp1.aEnd.SetCol( nCol2 );
                     rp2.aEnd.SetCol( r2.aEnd.Col() );
-                    bJoined = TRUE;
+                    bJoined = sal_True;
                 }
             }
         }
@@ -454,8 +454,8 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
                 if ( nOldPos )
                     nOldPos--;			// Seek richtig aufsetzen
             }
-            bJoinedInput = TRUE;
-            Join( *p, TRUE );			// rekursiv!
+            bJoinedInput = sal_True;
+            Join( *p, sal_True );			// rekursiv!
         }
     }
     if ( bIsInList )
@@ -465,27 +465,27 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
 }
 
 
-BOOL ScRangePairList::operator==( const ScRangePairList& r ) const
+sal_Bool ScRangePairList::operator==( const ScRangePairList& r ) const
 {
     if ( this == &r )
-        return TRUE;				// identische Referenz
+        return sal_True;				// identische Referenz
     if ( Count() != r.Count() )
-        return FALSE;
-    ULONG nCnt = Count();
-    for ( ULONG nIdx = 0; nIdx < nCnt; nIdx++ )
+        return sal_False;
+    sal_uLong nCnt = Count();
+    for ( sal_uLong nIdx = 0; nIdx < nCnt; nIdx++ )
     {
         if ( *GetObject( nIdx ) != *r.GetObject( nIdx ) )
-            return FALSE;			// auch andere Reihenfolge ist ungleich
+            return sal_False;			// auch andere Reihenfolge ist ungleich
     }
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode,
+sal_Bool ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode,
                                     ScDocument* pDoc, const ScRange& rWhere,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
     if ( Count() )
     {
         SCCOL nCol1;
@@ -497,7 +497,7 @@ BOOL ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode,
         rWhere.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
         for ( ScRangePair* pR = First(); pR; pR = Next() )
         {
-            for ( USHORT j=0; j<2; j++ )
+            for ( sal_uInt16 j=0; j<2; j++ )
             {
                 ScRange& rRange = pR->GetRange(j);
                 SCCOL theCol1;
@@ -513,7 +513,7 @@ BOOL ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode,
                         theCol1, theRow1, theTab1, theCol2, theRow2, theTab2 )
                         != UR_NOTHING )
                 {
-                    bChanged = TRUE;
+                    bChanged = sal_True;
                     rRange.aStart.Set( theCol1, theRow1, theTab1 );
                     rRange.aEnd.Set( theCol2, theRow2, theTab2 );
                 }
@@ -528,8 +528,8 @@ void ScRangePairList::DeleteOnTab( SCTAB nTab )
 {
     // Delete entries that have the labels (first range) on nTab
 
-    ULONG nListCount = Count();
-    ULONG nPos = 0;
+    sal_uLong nListCount = Count();
+    sal_uLong nPos = 0;
     while ( nPos < nListCount )
     {
         ScRangePair* pR = GetObject( nPos );
@@ -548,8 +548,8 @@ void ScRangePairList::DeleteOnTab( SCTAB nTab )
 
 ScRangePair* ScRangePairList::Find( const ScAddress& rAdr ) const
 {
-    ULONG nListCount = Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nListCount = Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
     {
         ScRangePair* pR = GetObject( j );
         if ( pR->GetRange(0).In( rAdr ) )
@@ -561,8 +561,8 @@ ScRangePair* ScRangePairList::Find( const ScAddress& rAdr ) const
 
 ScRangePair* ScRangePairList::Find( const ScRange& rRange ) const
 {
-    ULONG nListCount = Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nListCount = Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
     {
         ScRangePair* pR = GetObject( j );
         if ( pR->GetRange(0) == rRange )
@@ -575,8 +575,8 @@ ScRangePair* ScRangePairList::Find( const ScRange& rRange ) const
 ScRangePairList* ScRangePairList::Clone() const
 {
     ScRangePairList* pNew = new ScRangePairList;
-    ULONG nListCount = Count();
-    for ( ULONG j = 0; j < nListCount; j++ )
+    sal_uLong nListCount = Count();
+    for ( sal_uLong j = 0; j < nListCount; j++ )
     {
         pNew->Append( *GetObject( j ) );
     }
@@ -670,15 +670,15 @@ ScRangePairList_QsortNameCompare( const void* p1, const void* p2 )
 }
 
 
-ScRangePair** ScRangePairList::CreateNameSortedArray( ULONG& nListCount,
+ScRangePair** ScRangePairList::CreateNameSortedArray( sal_uLong& nListCount,
         ScDocument* pDoc ) const
 {
     nListCount = Count();
     DBG_ASSERT( nListCount * sizeof(ScRangePairNameSort) <= (size_t)~0x1F,
         "ScRangePairList::CreateNameSortedArray nListCount * sizeof(ScRangePairNameSort) > (size_t)~0x1F" );
     ScRangePairNameSort* pSortArray = (ScRangePairNameSort*)
-        new BYTE [ nListCount * sizeof(ScRangePairNameSort) ];
-    ULONG j;
+        new sal_uInt8 [ nListCount * sizeof(ScRangePairNameSort) ];
+    sal_uLong j;
     for ( j=0; j < nListCount; j++ )
     {
         pSortArray[j].pPair = GetObject( j );
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 8ac76763f..9c5706855 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -55,8 +55,8 @@ using namespace formula;
 
 // Interner ctor fuer das Suchen nach einem Index
 
-ScRangeData::ScRangeData( USHORT n )
-           : pCode( NULL ), nIndex( n ), bModified( FALSE ), mnMaxRow(-1), mnMaxCol(-1)
+ScRangeData::ScRangeData( sal_uInt16 n )
+           : pCode( NULL ), nIndex( n ), bModified( sal_False ), mnMaxRow(-1), mnMaxCol(-1)
 {}
 
 ScRangeData::ScRangeData( ScDocument* pDok,
@@ -72,7 +72,7 @@ ScRangeData::ScRangeData( ScDocument* pDok,
                 eType		( nType ),
                 pDoc		( pDok ),
                 nIndex		( 0 ),
-                bModified	( FALSE ),
+                bModified	( sal_False ),
                 mnMaxRow    (-1),
                 mnMaxCol    (-1)
 {
@@ -120,7 +120,7 @@ ScRangeData::ScRangeData( ScDocument* pDok,
                 eType		( nType ),
                 pDoc		( pDok ),
                 nIndex		( 0 ),
-                bModified	( FALSE ),
+                bModified	( sal_False ),
                 mnMaxRow    (-1),
                 mnMaxCol    (-1)
 {
@@ -157,13 +157,13 @@ ScRangeData::ScRangeData( ScDocument* pDok,
                 eType		( RT_NAME ),
                 pDoc		( pDok ),
                 nIndex		( 0 ),
-                bModified	( FALSE ),
+                bModified	( sal_False ),
                 mnMaxRow    (-1),
                 mnMaxCol    (-1)
 {
     ScSingleRefData aRefData;
     aRefData.InitAddress( rTarget );
-    aRefData.SetFlag3D( TRUE );
+    aRefData.SetFlag3D( sal_True );
     pCode->AddSingleReference( aRefData );
     ScCompiler aComp( pDoc, aPos, *pCode );
     aComp.SetGrammar(pDoc->GetGrammar());
@@ -259,15 +259,15 @@ void ScRangeData::UpdateReference(	UpdateRefMode eUpdateRefMode,
                                     const ScRange& r,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
     pCode->Reset();
     if( pCode->GetNextReference() )
     {
-        BOOL bSharedFormula = ((eType & RT_SHARED) == RT_SHARED);
+        sal_Bool bSharedFormula = ((eType & RT_SHARED) == RT_SHARED);
         ScCompiler aComp( pDoc, aPos, *pCode );
         aComp.SetGrammar(pDoc->GetGrammar());
-        const BOOL bRelRef = aComp.UpdateNameReference( eUpdateRefMode, r,
+        const sal_Bool bRelRef = aComp.UpdateNameReference( eUpdateRefMode, r,
                                                     nDx, nDy, nDz,
                                                     bChanged, bSharedFormula);
         if (bSharedFormula)
@@ -285,7 +285,7 @@ void ScRangeData::UpdateReference(	UpdateRefMode eUpdateRefMode,
 
 void ScRangeData::UpdateTranspose( const ScRange& rSource, const ScAddress& rDest )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
     ScToken* t;
     pCode->Reset();
@@ -303,7 +303,7 @@ void ScRangeData::UpdateTranspose( const ScRange& rSource, const ScAddress& rDes
                     (!rRef.Ref2.IsFlag3D() || !rRef.Ref2.IsTabRel()))))
             {
                 if ( ScRefUpdate::UpdateTranspose( pDoc, rSource, rDest, rRef ) != UR_NOTHING )
-                    bChanged = TRUE;
+                    bChanged = sal_True;
             }
         }
     }
@@ -313,7 +313,7 @@ void ScRangeData::UpdateTranspose( const ScRange& rSource, const ScAddress& rDes
 
 void ScRangeData::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
     ScToken* t;
     pCode->Reset();
@@ -331,7 +331,7 @@ void ScRangeData::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY )
                     (!rRef.Ref2.IsFlag3D() || !rRef.Ref2.IsTabRel()))))
             {
                 if ( ScRefUpdate::UpdateGrow( rArea,nGrowX,nGrowY, rRef ) != UR_NOTHING )
-                    bChanged = TRUE;
+                    bChanged = sal_True;
             }
         }
     }
@@ -339,29 +339,29 @@ void ScRangeData::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY )
     bModified = bChanged;			// muss direkt hinterher ausgewertet werden
 }
 
-BOOL ScRangeData::operator== (const ScRangeData& rData) const		// fuer Undo
+sal_Bool ScRangeData::operator== (const ScRangeData& rData) const		// fuer Undo
 {
     if ( nIndex	!= rData.nIndex	||
          aName	!= rData.aName	||
          aPos	!= rData.aPos	||
-         eType	!= rData.eType     ) return FALSE;
+         eType	!= rData.eType     ) return sal_False;
 
-    USHORT nLen = pCode->GetLen();
-    if ( nLen != rData.pCode->GetLen() ) return FALSE;
+    sal_uInt16 nLen = pCode->GetLen();
+    if ( nLen != rData.pCode->GetLen() ) return sal_False;
 
     FormulaToken** ppThis = pCode->GetArray();
     FormulaToken** ppOther = rData.pCode->GetArray();
 
-    for ( USHORT i=0; i<nLen; i++ )
+    for ( sal_uInt16 i=0; i<nLen; i++ )
         if ( ppThis[i] != ppOther[i] && !(*ppThis[i] == *ppOther[i]) )
-            return FALSE;
+            return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
-//UNUSED2009-05 BOOL ScRangeData::IsRangeAtCursor( const ScAddress& rPos, BOOL bStartOnly ) const
+//UNUSED2009-05 sal_Bool ScRangeData::IsRangeAtCursor( const ScAddress& rPos, sal_Bool bStartOnly ) const
 //UNUSED2009-05 {
-//UNUSED2009-05     BOOL bRet = FALSE;
+//UNUSED2009-05     sal_Bool bRet = sal_False;
 //UNUSED2009-05     ScRange aRange;
 //UNUSED2009-05     if ( IsReference(aRange) )
 //UNUSED2009-05     {
@@ -373,24 +373,24 @@ BOOL ScRangeData::operator== (const ScRangeData& rData) const		// fuer Undo
 //UNUSED2009-05     return bRet;
 //UNUSED2009-05 }
 
-BOOL ScRangeData::IsRangeAtBlock( const ScRange& rBlock ) const
+sal_Bool ScRangeData::IsRangeAtBlock( const ScRange& rBlock ) const
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ScRange aRange;
     if ( IsReference(aRange) )
         bRet = ( rBlock == aRange );
     return bRet;
 }
 
-BOOL ScRangeData::IsReference( ScRange& rRange ) const
+sal_Bool ScRangeData::IsReference( ScRange& rRange ) const
 {
     if ( (eType & ( RT_ABSAREA | RT_REFAREA | RT_ABSPOS )) && pCode )
         return pCode->IsReference( rRange );
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScRangeData::IsReference( ScRange& rRange, const ScAddress& rPos ) const
+sal_Bool ScRangeData::IsReference( ScRange& rRange, const ScAddress& rPos ) const
 {
     if ( (eType & ( RT_ABSAREA | RT_REFAREA | RT_ABSPOS ) ) && pCode )
     {
@@ -401,37 +401,37 @@ BOOL ScRangeData::IsReference( ScRange& rRange, const ScAddress& rPos ) const
         return pTemp->IsReference( rRange );
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScRangeData::IsValidReference( ScRange& rRange ) const
+sal_Bool ScRangeData::IsValidReference( ScRange& rRange ) const
 {
     if ( (eType & ( RT_ABSAREA | RT_REFAREA | RT_ABSPOS ) ) && pCode )
         return pCode->IsValidReference( rRange );
 
-    return FALSE;
+    return sal_False;
 }
 
-void ScRangeData::UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable)
+void ScRangeData::UpdateTabRef(SCTAB nOldTable, sal_uInt16 nFlag, SCTAB nNewTable)
 {
     pCode->Reset();
     if( pCode->GetNextReference() )
     {
         ScRangeData* pRangeData = NULL;     // must not be dereferenced
-        BOOL bChanged;
+        sal_Bool bChanged;
         ScCompiler aComp( pDoc, aPos, *pCode);
         aComp.SetGrammar(pDoc->GetGrammar());
         switch (nFlag)
         {
             case 1:										// einfache InsertTab (doc.cxx)
-                pRangeData = aComp.UpdateInsertTab(nOldTable, TRUE );	// und CopyTab (doc2.cxx)
+                pRangeData = aComp.UpdateInsertTab(nOldTable, sal_True );	// und CopyTab (doc2.cxx)
                 break;
             case 2:										// einfaches delete (doc.cxx)
-                pRangeData = aComp.UpdateDeleteTab(nOldTable, FALSE, TRUE, bChanged);
+                pRangeData = aComp.UpdateDeleteTab(nOldTable, sal_False, sal_True, bChanged);
                 break;
             case 3:										// move (doc2.cxx)
             {
-                pRangeData = aComp.UpdateMoveTab(nOldTable, nNewTable, TRUE );
+                pRangeData = aComp.UpdateMoveTab(nOldTable, nNewTable, sal_True );
             }
                 break;
             default:
@@ -494,18 +494,18 @@ void ScRangeData::MakeValidName( String& rName )		// static
     }
 }
 
-BOOL ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc )
+sal_Bool ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc )
 {
     /* XXX If changed, sc/source/filter/ftools/ftools.cxx 
      * ScfTools::ConvertToScDefinedName needs to be changed too. */
     xub_StrLen nPos = 0;
     xub_StrLen nLen = rName.Len();
     if ( !nLen || !ScCompiler::IsCharFlagAllConventions( rName, nPos++, SC_COMPILER_C_CHAR_NAME ) )
-        return FALSE;
+        return sal_False;
     while ( nPos < nLen )
     {
         if ( !ScCompiler::IsCharFlagAllConventions( rName, nPos++, SC_COMPILER_C_NAME ) )
-            return FALSE;
+            return sal_False;
     }
     ScAddress aAddr;
     ScRange aRange;
@@ -515,9 +515,9 @@ BOOL ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc )
         // Don't check Parse on VALID, any partial only VALID may result in 
         // #REF! during compile later!
         if (aRange.Parse( rName, pDoc, details) || aAddr.Parse( rName, pDoc, details))
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void ScRangeData::SetMaxRow(SCROW nRow)
@@ -541,15 +541,15 @@ SCCOL ScRangeData::GetMaxCol() const
 }
 
 
-USHORT ScRangeData::GetErrCode()
+sal_uInt16 ScRangeData::GetErrCode()
 {
     return pCode ? pCode->GetCodeError() : 0;
 }
 
-BOOL ScRangeData::HasReferences() const
+sal_Bool ScRangeData::HasReferences() const
 {
     pCode->Reset();
-    return BOOL( pCode->GetNextReference() != NULL );
+    return sal_Bool( pCode->GetNextReference() != NULL );
 }
 
 // bei TransferTab von einem in ein anderes Dokument anpassen,
@@ -690,7 +690,7 @@ ScRangeName::ScRangeName(const ScRangeName& rScRangeName, ScDocument* pDocument)
                 pDoc ( pDocument ),
                 nSharedMaxIndex (rScRangeName.nSharedMaxIndex)
 {
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ((ScRangeData*)At(i))->SetDocument(pDocument);
         ((ScRangeData*)At(i))->SetIndex(((ScRangeData*)rScRangeName.At(i))->GetIndex());
@@ -699,63 +699,63 @@ ScRangeName::ScRangeName(const ScRangeName& rScRangeName, ScDocument* pDocument)
 
 short ScRangeName::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
 {
-    USHORT i1 = ((ScRangeData*)pKey1)->GetIndex();
-    USHORT i2 = ((ScRangeData*)pKey2)->GetIndex();
+    sal_uInt16 i1 = ((ScRangeData*)pKey1)->GetIndex();
+    sal_uInt16 i2 = ((ScRangeData*)pKey2)->GetIndex();
     return (short) i1 - (short) i2;
 }
 
-BOOL ScRangeName::SearchNameUpper( const String& rUpperName, USHORT& rIndex ) const
+sal_Bool ScRangeName::SearchNameUpper( const String& rUpperName, sal_uInt16& rIndex ) const
 {
     // SearchNameUpper must be called with an upper-case search string
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while (i < nCount)
     {
         if ( ((*this)[i])->GetUpperName() == rUpperName )
         {
             rIndex = i;
-            return TRUE;
+            return sal_True;
         }
         i++;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScRangeName::SearchName( const String& rName, USHORT& rIndex ) const
+sal_Bool ScRangeName::SearchName( const String& rName, sal_uInt16& rIndex ) const
 {
     if ( nCount > 0 )
         return SearchNameUpper( ScGlobal::pCharClass->upper( rName ), rIndex );
     else
-        return FALSE;
+        return sal_False;
 }
 
 void ScRangeName::UpdateReference(	UpdateRefMode eUpdateRefMode,
                                     const ScRange& rRange,
                                     SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         ((ScRangeData*)pItems[i])->UpdateReference(eUpdateRefMode, rRange,
                                                    nDx, nDy, nDz);
 }
 
 void ScRangeName::UpdateTranspose( const ScRange& rSource, const ScAddress& rDest )
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         ((ScRangeData*)pItems[i])->UpdateTranspose( rSource, rDest );
 }
 
 void ScRangeName::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY )
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         ((ScRangeData*)pItems[i])->UpdateGrow( rArea, nGrowX, nGrowY );
 }
 
-BOOL ScRangeName::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
+sal_Bool ScRangeName::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
 {
     return *(ScRangeData*)pKey1 == *(ScRangeData*)pKey2;
 }
 
-BOOL ScRangeName::Insert(ScDataObject* pScDataObject)
+sal_Bool ScRangeName::Insert(ScDataObject* pScDataObject)
 {
     if (!((ScRangeData*)pScDataObject)->GetIndex())		// schon gesetzt?
     {
@@ -767,12 +767,12 @@ BOOL ScRangeName::Insert(ScDataObject* pScDataObject)
 
 // Suche nach einem freien Index
 
-USHORT ScRangeName::GetEntryIndex()
+sal_uInt16 ScRangeName::GetEntryIndex()
 {
-    USHORT nLast = 0;
-    for ( USHORT i = 0; i < nCount; i++ )
+    sal_uInt16 nLast = 0;
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
-        USHORT nIdx = ((ScRangeData*)pItems[i])->GetIndex();
+        sal_uInt16 nIdx = ((ScRangeData*)pItems[i])->GetIndex();
         if( nIdx > nLast )
         {
             nLast = nIdx;
@@ -781,21 +781,21 @@ USHORT ScRangeName::GetEntryIndex()
     return nLast + 1;
 }
 
-ScRangeData* ScRangeName::FindIndex( USHORT nIndex )
+ScRangeData* ScRangeName::FindIndex( sal_uInt16 nIndex )
 {
     ScRangeData aDataObj( nIndex );
-    USHORT n;
+    sal_uInt16 n;
     if( Search( &aDataObj, n ) )
         return (*this)[ n ];
     else
         return NULL;
 }
 
-//UNUSED2009-05 ScRangeData* ScRangeName::GetRangeAtCursor( const ScAddress& rPos, BOOL bStartOnly ) const
+//UNUSED2009-05 ScRangeData* ScRangeName::GetRangeAtCursor( const ScAddress& rPos, sal_Bool bStartOnly ) const
 //UNUSED2009-05 {
 //UNUSED2009-05     if ( pItems )
 //UNUSED2009-05     {
-//UNUSED2009-05         for ( USHORT i = 0; i < nCount; i++ )
+//UNUSED2009-05         for ( sal_uInt16 i = 0; i < nCount; i++ )
 //UNUSED2009-05             if ( ((ScRangeData*)pItems[i])->IsRangeAtCursor( rPos, bStartOnly ) )
 //UNUSED2009-05                 return (ScRangeData*)pItems[i];
 //UNUSED2009-05     }
@@ -806,16 +806,16 @@ ScRangeData* ScRangeName::GetRangeAtBlock( const ScRange& rBlock ) const
 {
     if ( pItems )
     {
-        for ( USHORT i = 0; i < nCount; i++ )
+        for ( sal_uInt16 i = 0; i < nCount; i++ )
             if ( ((ScRangeData*)pItems[i])->IsRangeAtBlock( rBlock ) )
                 return (ScRangeData*)pItems[i];
     }
     return NULL;
 }
 
-void ScRangeName::UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable)
+void ScRangeName::UpdateTabRef(SCTAB nOldTable, sal_uInt16 nFlag, SCTAB nNewTable)
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         ((ScRangeData*)pItems[i])->UpdateTabRef(nOldTable, nFlag, nNewTable);
 }
 
diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx
index 6eeaa5ef8..791b093a6 100644
--- a/sc/source/core/tool/rangeseq.cxx
+++ b/sc/source/core/tool/rangeseq.cxx
@@ -56,7 +56,7 @@ long lcl_DoubleToLong( double fVal )
         return 0;		// out of range
 }
 
-BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange )
+sal_Bool ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange )
 {
     SCTAB nTab = rRange.aStart.Tab();
     SCCOL nStartCol = rRange.aStart.Col();
@@ -64,12 +64,12 @@ BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, const S
     long nColCount = rRange.aEnd.Col() + 1 - rRange.aStart.Col();
     long nRowCount = rRange.aEnd.Row() + 1 - rRange.aStart.Row();
 
-    uno::Sequence< uno::Sequence<INT32> > aRowSeq( nRowCount );
-    uno::Sequence<INT32>* pRowAry = aRowSeq.getArray();
+    uno::Sequence< uno::Sequence<sal_Int32> > aRowSeq( nRowCount );
+    uno::Sequence<sal_Int32>* pRowAry = aRowSeq.getArray();
     for (long nRow = 0; nRow < nRowCount; nRow++)
     {
-        uno::Sequence<INT32> aColSeq( nColCount );
-        INT32* pColAry = aColSeq.getArray();
+        uno::Sequence<sal_Int32> aColSeq( nColCount );
+        sal_Int32* pColAry = aColSeq.getArray();
         for (long nCol = 0; nCol < nColCount; nCol++)
             pColAry[nCol] = lcl_DoubleToLong( pDoc->GetValue(
                 ScAddress( (SCCOL)(nStartCol+nCol), (SCROW)(nStartRow+nRow), nTab ) ) );
@@ -78,25 +78,25 @@ BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, const S
     }
 
     rAny <<= aRowSeq;
-    return TRUE;		//!	check for errors
+    return sal_True;		//!	check for errors
 }
 
 
-BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, const ScMatrix* pMatrix )
+sal_Bool ScRangeToSequence::FillLongArray( uno::Any& rAny, const ScMatrix* pMatrix )
 {
     if (!pMatrix)
-        return FALSE;
+        return sal_False;
 
     SCSIZE nColCount;
     SCSIZE nRowCount;
     pMatrix->GetDimensions( nColCount, nRowCount );
 
-    uno::Sequence< uno::Sequence<INT32> > aRowSeq( static_cast<sal_Int32>(nRowCount) );
-    uno::Sequence<INT32>* pRowAry = aRowSeq.getArray();
+    uno::Sequence< uno::Sequence<sal_Int32> > aRowSeq( static_cast<sal_Int32>(nRowCount) );
+    uno::Sequence<sal_Int32>* pRowAry = aRowSeq.getArray();
     for (SCSIZE nRow = 0; nRow < nRowCount; nRow++)
     {
-        uno::Sequence<INT32> aColSeq( static_cast<sal_Int32>(nColCount) );
-        INT32* pColAry = aColSeq.getArray();
+        uno::Sequence<sal_Int32> aColSeq( static_cast<sal_Int32>(nColCount) );
+        sal_Int32* pColAry = aColSeq.getArray();
         for (SCSIZE nCol = 0; nCol < nColCount; nCol++)
             if ( pMatrix->IsString( nCol, nRow ) )
                 pColAry[nCol] = 0;
@@ -107,12 +107,12 @@ BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, const ScMatrix* pMatrix )
     }
 
     rAny <<= aRowSeq;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScRangeToSequence::FillDoubleArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange )
+sal_Bool ScRangeToSequence::FillDoubleArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange )
 {
     SCTAB nTab = rRange.aStart.Tab();
     SCCOL nStartCol = rRange.aStart.Col();
@@ -134,14 +134,14 @@ BOOL ScRangeToSequence::FillDoubleArray( uno::Any& rAny, ScDocument* pDoc, const
     }
 
     rAny <<= aRowSeq;
-    return TRUE;		//!	check for errors
+    return sal_True;		//!	check for errors
 }
 
 
-BOOL ScRangeToSequence::FillDoubleArray( uno::Any& rAny, const ScMatrix* pMatrix )
+sal_Bool ScRangeToSequence::FillDoubleArray( uno::Any& rAny, const ScMatrix* pMatrix )
 {
     if (!pMatrix)
-        return FALSE;
+        return sal_False;
 
     SCSIZE nColCount;
     SCSIZE nRowCount;
@@ -163,12 +163,12 @@ BOOL ScRangeToSequence::FillDoubleArray( uno::Any& rAny, const ScMatrix* pMatrix
     }
 
     rAny <<= aRowSeq;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange )
+sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange )
 {
     SCTAB nTab = rRange.aStart.Tab();
     SCCOL nStartCol = rRange.aStart.Col();
@@ -193,15 +193,15 @@ BOOL ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, const
     }
 
     rAny <<= aRowSeq;
-    return TRUE;		//!	check for errors
+    return sal_True;		//!	check for errors
 }
 
 
-BOOL ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMatrix,
+sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMatrix,
                                             SvNumberFormatter* pFormatter )
 {
     if (!pMatrix)
-        return FALSE;
+        return sal_False;
 
     SCSIZE nColCount;
     SCSIZE nRowCount;
@@ -234,7 +234,7 @@ BOOL ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMatrix
     }
 
     rAny <<= aRowSeq;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -253,8 +253,8 @@ double lcl_GetValueFromCell( ScBaseCell& rCell )
     return 0;
 }
 
-BOOL ScRangeToSequence::FillMixedArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange,
-                                        BOOL bAllowNV )
+sal_Bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange,
+                                        sal_Bool bAllowNV )
 {
     SCTAB nTab = rRange.aStart.Tab();
     SCCOL nStartCol = rRange.aStart.Col();
@@ -263,7 +263,7 @@ BOOL ScRangeToSequence::FillMixedArray( uno::Any& rAny, ScDocument* pDoc, const
     long nRowCount = rRange.aEnd.Row() + 1 - rRange.aStart.Row();
 
     String aDocStr;
-    BOOL bHasErrors = FALSE;
+    sal_Bool bHasErrors = sal_False;
 
     uno::Sequence< uno::Sequence<uno::Any> > aRowSeq( nRowCount );
     uno::Sequence<uno::Any>* pRowAry = aRowSeq.getArray();
@@ -283,7 +283,7 @@ BOOL ScRangeToSequence::FillMixedArray( uno::Any& rAny, ScDocument* pDoc, const
                         ((ScFormulaCell*)pCell)->GetErrCode() != 0 )
                 {
                     // if NV is allowed, leave empty for errors
-                    bHasErrors = TRUE;
+                    bHasErrors = sal_True;
                 }
                 else if ( pCell->HasValueData() )
                     rElement <<= (double) lcl_GetValueFromCell( *pCell );
@@ -301,10 +301,10 @@ BOOL ScRangeToSequence::FillMixedArray( uno::Any& rAny, ScDocument* pDoc, const
 }
 
 
-BOOL ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMatrix, bool bDataTypes )
+sal_Bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMatrix, bool bDataTypes )
 {
     if (!pMatrix)
-        return FALSE;
+        return sal_False;
 
     SCSIZE nColCount;
     SCSIZE nRowCount;
@@ -339,7 +339,7 @@ BOOL ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMatrix,
     }
 
     rAny <<= aRowSeq;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -458,7 +458,7 @@ ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::An
 
 //------------------------------------------------------------------------
 
-BOOL ScByteSequenceToString::GetString( String& rString, const uno::Any& rAny,
+sal_Bool ScByteSequenceToString::GetString( String& rString, const uno::Any& rAny,
                                         sal_uInt16 nEncoding )
 {
     uno::Sequence<sal_Int8> aSeq;
@@ -467,9 +467,9 @@ BOOL ScByteSequenceToString::GetString( String& rString, const uno::Any& rAny,
         rString = String( (const sal_Char*)aSeq.getConstArray(),
                             (xub_StrLen)aSeq.getLength(), nEncoding );
         rString.EraseTrailingChars( (sal_Unicode) 0 );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 97f55d401..9abe4b8f2 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-BOOL ScRangeUtil::MakeArea( const String&	rAreaStr,
+sal_Bool ScRangeUtil::MakeArea( const String&	rAreaStr,
                             ScArea&			rArea,
                             ScDocument*		pDoc,
                             SCTAB			nTab,
@@ -63,9 +63,9 @@ BOOL ScRangeUtil::MakeArea( const String&	rAreaStr,
     // BROKEN BROKEN BROKEN
     // but it is only used in the consolidate dialog.  Ignore for now.
 
-    BOOL		nSuccess	= FALSE;
-    USHORT		nPointPos	= rAreaStr.Search('.');
-    USHORT		nColonPos	= rAreaStr.Search(':');
+    sal_Bool		nSuccess	= sal_False;
+    sal_uInt16		nPointPos	= rAreaStr.Search('.');
+    sal_uInt16		nColonPos	= rAreaStr.Search(':');
     String		aStrArea( rAreaStr );
     ScRefAddress	startPos;
     ScRefAddress	endPos;
@@ -96,7 +96,7 @@ void ScRangeUtil::CutPosString( const String&	theAreaStr,
     // BROKEN BROKEN BROKEN
     // but it is only used in the consolidate dialog.  Ignore for now.
 
-    USHORT	nColonPos = theAreaStr.Search(':');
+    sal_uInt16	nColonPos = theAreaStr.Search(':');
 
     if ( nColonPos != STRING_NOTFOUND )
         aPosStr = theAreaStr.Copy( 0, nColonPos ); // ':' nicht mitkopieren
@@ -108,16 +108,16 @@ void ScRangeUtil::CutPosString( const String&	theAreaStr,
 
 //------------------------------------------------------------------------
 
-BOOL ScRangeUtil::IsAbsTabArea( const String& 	rAreaStr,
+sal_Bool ScRangeUtil::IsAbsTabArea( const String& 	rAreaStr,
                                 ScDocument*		pDoc,
                                 ScArea***		pppAreas,
-                                USHORT*			pAreaCount,
-                                BOOL            /* bAcceptCellRef */,
+                                sal_uInt16*			pAreaCount,
+                                sal_Bool            /* bAcceptCellRef */,
                                 ScAddress::Details const & rDetails ) const
 {
     DBG_ASSERT( pDoc, "Kein Dokument uebergeben!" );
     if ( !pDoc )
-        return FALSE;
+        return sal_False;
 
     // BROKEN BROKEN BROKEN
     // but it is only used in the consolidate dialog.  Ignore for now.
@@ -125,7 +125,7 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& 	rAreaStr,
     /*
      * Erwartet wird ein String der Form
      *		"$Tabelle1.$A$1:$Tabelle3.$D$17"
-     * Wenn bAcceptCellRef == TRUE ist, wird auch ein String der Form
+     * Wenn bAcceptCellRef == sal_True ist, wird auch ein String der Form
      *		"$Tabelle1.$A$1"
      * akzeptiert.
      *
@@ -134,7 +134,7 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& 	rAreaStr,
      * wieder geloescht werden muss!
      */
 
-    BOOL	bStrOk = FALSE;
+    sal_Bool	bStrOk = sal_False;
     String	aTempAreaStr(rAreaStr);
     String	aStartPosStr;
     String	aEndPosStr;
@@ -145,7 +145,7 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& 	rAreaStr,
         aTempAreaStr.Append(rAreaStr);
     }
 
-    USHORT	 nColonPos = aTempAreaStr.Search(':');
+    sal_uInt16	 nColonPos = aTempAreaStr.Search(':');
 
     if (   STRING_NOTFOUND != nColonPos
         && STRING_NOTFOUND != aTempAreaStr.Search('.') )
@@ -160,23 +160,23 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& 	rAreaStr,
         {
             if ( ConvertSingleRef( pDoc, aEndPosStr, aStartPos.Tab(), aEndPos, rDetails ) )
             {
-                aStartPos.SetRelCol( FALSE );
-                aStartPos.SetRelRow( FALSE );
-                aStartPos.SetRelTab( FALSE );
-                aEndPos.SetRelCol( FALSE );
-                aEndPos.SetRelRow( FALSE );
-                aEndPos.SetRelTab( FALSE );
+                aStartPos.SetRelCol( sal_False );
+                aStartPos.SetRelRow( sal_False );
+                aStartPos.SetRelTab( sal_False );
+                aEndPos.SetRelCol( sal_False );
+                aEndPos.SetRelRow( sal_False );
+                aEndPos.SetRelTab( sal_False );
 
-                bStrOk = TRUE;
+                bStrOk = sal_True;
 
                 if ( pppAreas && pAreaCount ) // Array zurueckgegeben?
                 {
                     SCTAB		nStartTab	= aStartPos.Tab();
                     SCTAB		nEndTab		= aEndPos.Tab();
-                    USHORT		nTabCount	= static_cast<USHORT>(nEndTab-nStartTab+1);
+                    sal_uInt16		nTabCount	= static_cast<sal_uInt16>(nEndTab-nStartTab+1);
                     ScArea** 	theAreas	= new ScArea*[nTabCount];
                     SCTAB		nTab		= 0;
-                    USHORT		i			= 0;
+                    sal_uInt16		i			= 0;
                     ScArea		theArea( 0, aStartPos.Col(), aStartPos.Row(),
                                             aEndPos.Col(), aEndPos.Row() );
 
@@ -199,7 +199,7 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& 	rAreaStr,
 
 //------------------------------------------------------------------------
 
-BOOL ScRangeUtil::IsAbsArea( const String&	rAreaStr,
+sal_Bool ScRangeUtil::IsAbsArea( const String&	rAreaStr,
                              ScDocument*	pDoc,
                              SCTAB			nTab,
                              String*		pCompleteStr,
@@ -207,7 +207,7 @@ BOOL ScRangeUtil::IsAbsArea( const String&	rAreaStr,
                              ScRefAddress*	pEndPos,
                              ScAddress::Details const & rDetails ) const
 {
-    BOOL		bIsAbsArea = FALSE;
+    sal_Bool		bIsAbsArea = sal_False;
     ScRefAddress	startPos;
     ScRefAddress	endPos;
 
@@ -215,12 +215,12 @@ BOOL ScRangeUtil::IsAbsArea( const String&	rAreaStr,
 
     if ( bIsAbsArea )
     {
-        startPos.SetRelCol( FALSE );
-        startPos.SetRelRow( FALSE );
-        startPos.SetRelTab( FALSE );
-        endPos  .SetRelCol( FALSE );
-        endPos  .SetRelRow( FALSE );
-        endPos  .SetRelTab( FALSE );
+        startPos.SetRelCol( sal_False );
+        startPos.SetRelRow( sal_False );
+        startPos.SetRelTab( sal_False );
+        endPos  .SetRelCol( sal_False );
+        endPos  .SetRelRow( sal_False );
+        endPos  .SetRelTab( sal_False );
 
         if ( pCompleteStr )
         {
@@ -241,20 +241,20 @@ BOOL ScRangeUtil::IsAbsArea( const String&	rAreaStr,
 
 //------------------------------------------------------------------------
 
-BOOL ScRangeUtil::IsAbsPos( const String&	rPosStr,
+sal_Bool ScRangeUtil::IsAbsPos( const String&	rPosStr,
                             ScDocument*		pDoc,
                             SCTAB			nTab,
                             String*			pCompleteStr,
                             ScRefAddress*	pPosTripel,
                             ScAddress::Details const & rDetails ) const
 {
-    BOOL		bIsAbsPos = FALSE;
+    sal_Bool		bIsAbsPos = sal_False;
     ScRefAddress	thePos;
 
     bIsAbsPos = ConvertSingleRef( pDoc, rPosStr, nTab, thePos, rDetails ); 
-    thePos.SetRelCol( FALSE );
-    thePos.SetRelRow( FALSE );
-    thePos.SetRelTab( FALSE );
+    thePos.SetRelCol( sal_False );
+    thePos.SetRelRow( sal_False );
+    thePos.SetRelTab( sal_False );
 
     if ( bIsAbsPos )
     {
@@ -269,7 +269,7 @@ BOOL ScRangeUtil::IsAbsPos( const String&	rPosStr,
 
 //------------------------------------------------------------------------
 
-BOOL ScRangeUtil::MakeRangeFromName	(
+sal_Bool ScRangeUtil::MakeRangeFromName	(
     const String&	rName,
     ScDocument*		pDoc,
     SCTAB			nCurTab,
@@ -277,7 +277,7 @@ BOOL ScRangeUtil::MakeRangeFromName	(
     RutlNameScope 	eScope,
     ScAddress::Details const & rDetails ) const
 {
-    BOOL bResult=FALSE;
+    sal_Bool bResult=sal_False;
     ScRangeUtil		aRangeUtil;
     SCTAB nTab = 0;
     SCCOL nColStart = 0;
@@ -288,7 +288,7 @@ BOOL ScRangeUtil::MakeRangeFromName	(
     if( eScope==RUTL_NAMES )
     {
         ScRangeName& rRangeNames = *(pDoc->GetRangeName());
-        USHORT		 nAt		 = 0;
+        sal_uInt16		 nAt		 = 0;
 
         if ( rRangeNames.SearchName( rName, nAt ) )
         {
@@ -307,7 +307,7 @@ BOOL ScRangeUtil::MakeRangeFromName	(
                 nRowStart  = aStartPos.Row();
                 nColEnd    = aEndPos.Col();
                 nRowEnd    = aEndPos.Row();
-                bResult	   = TRUE;
+                bResult	   = sal_True;
             }
             else
             {
@@ -319,7 +319,7 @@ BOOL ScRangeUtil::MakeRangeFromName	(
                     nTab	   = aStartPos.Tab();
                     nColStart  = nColEnd = aStartPos.Col();
                     nRowStart  = nRowEnd = aStartPos.Row();
-                    bResult	   = TRUE;
+                    bResult	   = sal_True;
                 }
             }
         }
@@ -327,7 +327,7 @@ BOOL ScRangeUtil::MakeRangeFromName	(
     else if( eScope==RUTL_DBASE )
     {
         ScDBCollection&	rDbNames = *(pDoc->GetDBCollection());
-        USHORT		 	nAt = 0;
+        sal_uInt16		 	nAt = 0;
 
         if ( rDbNames.SearchName( rName, nAt ) )
         {
@@ -335,7 +335,7 @@ BOOL ScRangeUtil::MakeRangeFromName	(
 
             pData->GetArea( nTab, nColStart, nRowStart,
                                   nColEnd,	 nRowEnd );
-            bResult = TRUE;
+            bResult = sal_True;
         }
     }
     else
@@ -910,7 +910,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
             ScAddress::ExternalInfo aExtInfo1, aExtInfo2;
             ScAddress aCell1, aCell2;
             rtl::OUString aBuf;
-            USHORT nRet = aCell1.Parse(aBeginCell, pDoc, FormulaGrammar::CONV_OOO, &aExtInfo1);
+            sal_uInt16 nRet = aCell1.Parse(aBeginCell, pDoc, FormulaGrammar::CONV_OOO, &aExtInfo1);
             if ((nRet & SCA_VALID) != SCA_VALID)
                 // first cell is invalid.
                 continue;
@@ -938,7 +938,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
             // Chart always saves ranges using CONV_OOO convention.
             ScAddress::ExternalInfo aExtInfo;
             ScAddress aCell;
-            USHORT nRet = aCell.Parse(aToken, pDoc, ::formula::FormulaGrammar::CONV_OOO, &aExtInfo);
+            sal_uInt16 nRet = aCell.Parse(aToken, pDoc, ::formula::FormulaGrammar::CONV_OOO, &aExtInfo);
             if ((nRet & SCA_VALID) != SCA_VALID)
                 continue;
 
@@ -990,7 +990,7 @@ ScArea& ScArea::operator=( const ScArea& r )
 
 //------------------------------------------------------------------------
 
-BOOL ScArea::operator==( const ScArea& r ) const
+sal_Bool ScArea::operator==( const ScArea& r ) const
 {
     return (   (nTab		== r.nTab)
             && (nColStart	== r.nColStart)
@@ -1007,10 +1007,10 @@ ScAreaNameIterator::ScAreaNameIterator( ScDocument* pDoc ) :
     pRangeName = pDoc->GetRangeName();
     pDBCollection = pDoc->GetDBCollection();
     nPos = 0;
-    bFirstPass = TRUE;
+    bFirstPass = sal_True;
 }
 
-BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange )
+sal_Bool ScAreaNameIterator::Next( String& rName, ScRange& rRange )
 {
     for (;;)
     {
@@ -1022,12 +1022,12 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange )
                 if ( pData && pData->IsValidReference(rRange) )
                 {
                     rName = pData->GetName();
-                    return TRUE;							// gefunden
+                    return sal_True;							// gefunden
                 }
             }
             else
             {
-                bFirstPass = FALSE;
+                bFirstPass = sal_False;
                 nPos = 0;
             }
         }
@@ -1040,11 +1040,11 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange )
                 {
                     pData->GetArea( rRange );
                     rName = pData->GetName();
-                    return TRUE;							// gefunden
+                    return sal_True;							// gefunden
                 }
             }
             else
-                return FALSE;								// gibt nichts mehr
+                return sal_False;								// gibt nichts mehr
         }
     }
 }
diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx
index 0207a9b02..e9003f01b 100644
--- a/sc/source/core/tool/rechead.cxx
+++ b/sc/source/core/tool/rechead.cxx
@@ -46,12 +46,12 @@ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) :
 {
     sal_uInt32 nDataSize;
     rStream >> nDataSize;
-    ULONG nDataPos = rStream.Tell();
+    sal_uLong nDataPos = rStream.Tell();
     nTotalEnd = nDataPos + nDataSize;
     nEntryEnd = nTotalEnd;
 
     rStream.SeekRel(nDataSize);
-    USHORT nID;
+    sal_uInt16 nID;
     rStream >> nID;
     if (nID != SCID_SIZES)
     {
@@ -67,7 +67,7 @@ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) :
     {
         sal_uInt32 nSizeTableLen;
         rStream >> nSizeTableLen;
-        pBuf = new BYTE[nSizeTableLen];
+        pBuf = new sal_uInt8[nSizeTableLen];
         rStream.Read( pBuf, nSizeTableLen );
         pMemStream = new SvMemoryStream( (char*)pBuf, nSizeTableLen, STREAM_READ );
     }
@@ -92,7 +92,7 @@ ScMultipleReadHeader::~ScMultipleReadHeader()
 
 void ScMultipleReadHeader::EndEntry()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
     DBG_ASSERT( nPos <= nEntryEnd, "zuviel gelesen" );
     if ( nPos != nEntryEnd )
     {
@@ -106,7 +106,7 @@ void ScMultipleReadHeader::EndEntry()
 
 void ScMultipleReadHeader::StartEntry()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
     sal_uInt32 nEntrySize;
     (*pMemStream) >> nEntrySize;
 
@@ -114,9 +114,9 @@ void ScMultipleReadHeader::StartEntry()
     DBG_ASSERT( nEntryEnd <= nTotalEnd, "zuviele Eintraege gelesen" );
 }
 
-ULONG ScMultipleReadHeader::BytesLeft() const
+sal_uLong ScMultipleReadHeader::BytesLeft() const
 {
-    ULONG nReadEnd = rStream.Tell();
+    sal_uLong nReadEnd = rStream.Tell();
     if (nReadEnd <= nEntryEnd)
         return nEntryEnd-nReadEnd;
 
@@ -139,16 +139,16 @@ ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nD
 
 ScMultipleWriteHeader::~ScMultipleWriteHeader()
 {
-    ULONG nDataEnd = rStream.Tell();
+    sal_uLong nDataEnd = rStream.Tell();
 
-    rStream << (USHORT) SCID_SIZES;
+    rStream << (sal_uInt16) SCID_SIZES;
     rStream << static_cast<sal_uInt32>(aMemStream.Tell());
     rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
 
     if ( nDataEnd - nDataPos != nDataSize )					// Default getroffen?
     {
         nDataSize = nDataEnd - nDataPos;
-        ULONG nPos = rStream.Tell();
+        sal_uLong nPos = rStream.Tell();
         rStream.Seek(nDataPos-sizeof(sal_uInt32));
         rStream << nDataSize;								// Groesse am Anfang eintragen
         rStream.Seek(nPos);
@@ -157,13 +157,13 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader()
 
 void ScMultipleWriteHeader::EndEntry()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
     aMemStream << static_cast<sal_uInt32>(nPos - nEntryStart);
 }
 
 void ScMultipleWriteHeader::StartEntry()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
     nEntryStart = nPos;
 }
 
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index bc739e2d1..8ac062940 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -66,19 +66,19 @@ void ScSingleRefData::CalcAbsIfRel( const ScAddress& rPos )
     {
         nCol = nRelCol + rPos.Col();
         if ( !VALIDCOL( nCol ) )
-            Flags.bColDeleted = TRUE;
+            Flags.bColDeleted = sal_True;
     }
     if ( Flags.bRowRel )
     {
         nRow = nRelRow + rPos.Row();
         if ( !VALIDROW( nRow ) )
-            Flags.bRowDeleted = TRUE;
+            Flags.bRowDeleted = sal_True;
     }
     if ( Flags.bTabRel )
     {
         nTab = nRelTab + rPos.Tab();
         if ( !VALIDTAB( nTab ) )
-            Flags.bTabDeleted = TRUE;
+            Flags.bTabDeleted = sal_True;
     }
 }
 
@@ -87,62 +87,62 @@ void ScSingleRefData::CalcAbsIfRel( const ScAddress& rPos )
 //UNUSED2008-05      switch ( rBools.bRelCol )
 //UNUSED2008-05      {
 //UNUSED2008-05          case SR_DELETED :
-//UNUSED2008-05              Flags.bColRel = TRUE;           // der war verlorengegangen
-//UNUSED2008-05              Flags.bColDeleted = TRUE;
+//UNUSED2008-05              Flags.bColRel = sal_True;           // der war verlorengegangen
+//UNUSED2008-05              Flags.bColDeleted = sal_True;
 //UNUSED2008-05              break;
 //UNUSED2008-05          case SR_ABSOLUTE :
-//UNUSED2008-05              Flags.bColRel = FALSE;
-//UNUSED2008-05              Flags.bColDeleted = FALSE;
+//UNUSED2008-05              Flags.bColRel = sal_False;
+//UNUSED2008-05              Flags.bColDeleted = sal_False;
 //UNUSED2008-05              break;
 //UNUSED2008-05          case SR_RELABS :
 //UNUSED2008-05          case SR_RELATIVE :
 //UNUSED2008-05          default:
-//UNUSED2008-05              Flags.bColRel = TRUE;
-//UNUSED2008-05              Flags.bColDeleted = FALSE;
+//UNUSED2008-05              Flags.bColRel = sal_True;
+//UNUSED2008-05              Flags.bColDeleted = sal_False;
 //UNUSED2008-05      }
 //UNUSED2008-05      switch ( rBools.bRelRow )
 //UNUSED2008-05      {
 //UNUSED2008-05          case SR_DELETED :
-//UNUSED2008-05              Flags.bRowRel = TRUE;           // der war verlorengegangen
-//UNUSED2008-05              Flags.bRowDeleted = TRUE;
+//UNUSED2008-05              Flags.bRowRel = sal_True;           // der war verlorengegangen
+//UNUSED2008-05              Flags.bRowDeleted = sal_True;
 //UNUSED2008-05              break;
 //UNUSED2008-05          case SR_ABSOLUTE :
-//UNUSED2008-05              Flags.bRowRel = FALSE;
-//UNUSED2008-05              Flags.bRowDeleted = FALSE;
+//UNUSED2008-05              Flags.bRowRel = sal_False;
+//UNUSED2008-05              Flags.bRowDeleted = sal_False;
 //UNUSED2008-05              break;
 //UNUSED2008-05          case SR_RELABS :
 //UNUSED2008-05          case SR_RELATIVE :
 //UNUSED2008-05          default:
-//UNUSED2008-05              Flags.bRowRel = TRUE;
-//UNUSED2008-05              Flags.bRowDeleted = FALSE;
+//UNUSED2008-05              Flags.bRowRel = sal_True;
+//UNUSED2008-05              Flags.bRowDeleted = sal_False;
 //UNUSED2008-05      }
 //UNUSED2008-05      switch ( rBools.bRelTab )
 //UNUSED2008-05      {
 //UNUSED2008-05          case SR_DELETED :
-//UNUSED2008-05              Flags.bTabRel = TRUE;           // der war verlorengegangen
-//UNUSED2008-05              Flags.bTabDeleted = TRUE;
+//UNUSED2008-05              Flags.bTabRel = sal_True;           // der war verlorengegangen
+//UNUSED2008-05              Flags.bTabDeleted = sal_True;
 //UNUSED2008-05              break;
 //UNUSED2008-05          case SR_ABSOLUTE :
-//UNUSED2008-05              Flags.bTabRel = FALSE;
-//UNUSED2008-05              Flags.bTabDeleted = FALSE;
+//UNUSED2008-05              Flags.bTabRel = sal_False;
+//UNUSED2008-05              Flags.bTabDeleted = sal_False;
 //UNUSED2008-05              break;
 //UNUSED2008-05          case SR_RELABS :
 //UNUSED2008-05          case SR_RELATIVE :
 //UNUSED2008-05          default:
-//UNUSED2008-05              Flags.bTabRel = TRUE;
-//UNUSED2008-05              Flags.bTabDeleted = FALSE;
+//UNUSED2008-05              Flags.bTabRel = sal_True;
+//UNUSED2008-05              Flags.bTabDeleted = sal_False;
 //UNUSED2008-05      }
-//UNUSED2008-05      Flags.bFlag3D = (rBools.bOldFlag3D & SRF_3D ? TRUE : FALSE);
-//UNUSED2008-05      Flags.bRelName = (rBools.bOldFlag3D & SRF_RELNAME ? TRUE : FALSE);
+//UNUSED2008-05      Flags.bFlag3D = (rBools.bOldFlag3D & SRF_3D ? sal_True : sal_False);
+//UNUSED2008-05      Flags.bRelName = (rBools.bOldFlag3D & SRF_RELNAME ? sal_True : sal_False);
 //UNUSED2008-05      if ( !Flags.bFlag3D )
-//UNUSED2008-05          Flags.bTabRel = TRUE;   // ist bei einigen aelteren Dokumenten nicht gesetzt
+//UNUSED2008-05          Flags.bTabRel = sal_True;   // ist bei einigen aelteren Dokumenten nicht gesetzt
 //UNUSED2008-05  }
 //UNUSED2008-05  
 //UNUSED2008-05  
 //UNUSED2008-05  /*
 //UNUSED2008-05   bis Release 3.1 sah Store so aus
 //UNUSED2008-05  
-//UNUSED2008-05      BYTE n = ( ( r.bOldFlag3D & 0x03 ) << 6 )   // RelName, 3D
+//UNUSED2008-05      sal_uInt8 n = ( ( r.bOldFlag3D & 0x03 ) << 6 )   // RelName, 3D
 //UNUSED2008-05              | ( ( r.bRelTab & 0x03 ) << 4 )     // Relative, RelAbs
 //UNUSED2008-05              | ( ( r.bRelRow & 0x03 ) << 2 )
 //UNUSED2008-05              |   ( r.bRelCol & 0x03 );
@@ -160,9 +160,9 @@ void ScSingleRefData::CalcAbsIfRel( const ScAddress& rPos )
 //UNUSED2008-05   Aber immer noch nCol > MAXCOL und gut sollte sein..
 //UNUSED2008-05   */
 //UNUSED2008-05  
-//UNUSED2008-05  BYTE ScSingleRefData::CreateStoreByteFromFlags() const
+//UNUSED2008-05  sal_uInt8 ScSingleRefData::CreateStoreByteFromFlags() const
 //UNUSED2008-05  {
-//UNUSED2008-05      return (BYTE)(
+//UNUSED2008-05      return (sal_uInt8)(
 //UNUSED2008-05            ( (Flags.bRelName     & 0x01) << 7 )
 //UNUSED2008-05          | ( (Flags.bFlag3D      & 0x01) << 6 )
 //UNUSED2008-05          | ( (Flags.bTabDeleted  & 0x01) << 5 )
@@ -175,7 +175,7 @@ void ScSingleRefData::CalcAbsIfRel( const ScAddress& rPos )
 //UNUSED2008-05  }
 //UNUSED2008-05  
 //UNUSED2008-05  
-//UNUSED2008-05  void ScSingleRefData::CreateFlagsFromLoadByte( BYTE n )
+//UNUSED2008-05  void ScSingleRefData::CreateFlagsFromLoadByte( sal_uInt8 n )
 //UNUSED2008-05  {
 //UNUSED2008-05      Flags.bColRel       = (n & 0x01 );
 //UNUSED2008-05      Flags.bColDeleted   = ( (n >> 1) & 0x01 );
@@ -188,7 +188,7 @@ void ScSingleRefData::CalcAbsIfRel( const ScAddress& rPos )
 //UNUSED2008-05  }
 
 
-BOOL ScSingleRefData::operator==( const ScSingleRefData& r ) const
+sal_Bool ScSingleRefData::operator==( const ScSingleRefData& r ) const
 {
     return bFlags == r.bFlags &&
         (Flags.bColRel ? nRelCol == r.nRelCol : nCol == r.nCol) &&
@@ -206,8 +206,8 @@ static void lcl_putInOrder( ScSingleRefData & rRef1, ScSingleRefData & rRef2 )
     SCCOL nCol1, nCol2;
     SCROW nRow1, nRow2;
     SCTAB nTab1, nTab2;
-    BOOL bTmp;
-    BYTE nRelState1, nRelState2;
+    sal_Bool bTmp;
+    sal_uInt8 nRelState1, nRelState2;
     if ( rRef1.Flags.bRelName )
         nRelState1 =
             ((rRef1.Flags.bTabRel & 0x01) << 2)
@@ -288,8 +288,8 @@ static void lcl_putInOrder( ScSingleRefData & rRef1, ScSingleRefData & rRef2 )
         rRef1.Flags.bTabDeleted = rRef2.Flags.bTabDeleted;
         rRef2.Flags.bTabDeleted = bTmp;
     }
-    rRef1.Flags.bRelName = ( nRelState1 ? TRUE : FALSE );
-    rRef2.Flags.bRelName = ( nRelState2 ? TRUE : FALSE );
+    rRef1.Flags.bRelName = ( nRelState1 ? sal_True : sal_False );
+    rRef2.Flags.bRelName = ( nRelState2 ? sal_True : sal_False );
 }
 
 
diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index 5e30e1665..c6b53d4c8 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -48,20 +48,20 @@ const sal_Unicode __FAR_DATA ScRefFinder::pDelimiters[] = {
 
 // =======================================================================
 
-inline BOOL IsText( sal_Unicode c )
+inline sal_Bool IsText( sal_Unicode c )
 {
     return !ScGlobal::UnicodeStrChr( ScRefFinder::pDelimiters, c );
 }
 
-inline BOOL IsText( BOOL& bQuote, sal_Unicode c )
+inline sal_Bool IsText( sal_Bool& bQuote, sal_Unicode c )
 {
     if ( c == '\'' )
     {
         bQuote = !bQuote;
-        return TRUE;
+        return sal_True;
     }
     if ( bQuote )
-        return TRUE;
+        return sal_True;
     return IsText( c );
 }
 
@@ -78,9 +78,9 @@ ScRefFinder::~ScRefFinder()
 {
 }
 
-USHORT lcl_NextFlags( USHORT nOld )
+sal_uInt16 lcl_NextFlags( sal_uInt16 nOld )
 {
-    USHORT nNew = nOld & 7;					// die drei Abs-Flags
+    sal_uInt16 nNew = nOld & 7;					// die drei Abs-Flags
     nNew = ( nNew - 1 ) & 7;				// weiterzaehlen
 
     if (!(nOld & SCA_TAB_3D))
@@ -124,7 +124,7 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos )
         while ( nEStart <= nEndPos && !IsText(pSource[nEStart]) )
             ++nEStart;
 
-        BOOL bQuote = FALSE;
+        sal_Bool bQuote = sal_False;
         xub_StrLen nEEnd = nEStart;
         while ( nEEnd <= nEndPos && IsText(bQuote,pSource[nEEnd]) )
             ++nEEnd;
@@ -134,10 +134,10 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos )
 
         //	Test, ob aExpr eine Referenz ist
 
-        USHORT nResult = aAddr.Parse( aExpr, pDoc, pDoc->GetAddressConvention() );
+        sal_uInt16 nResult = aAddr.Parse( aExpr, pDoc, pDoc->GetAddressConvention() );
         if ( nResult & SCA_VALID )
         {
-            USHORT nFlags = lcl_NextFlags( nResult );
+            sal_uInt16 nFlags = lcl_NextFlags( nResult );
             aAddr.Format( aExpr, nFlags, pDoc, pDoc->GetAddressConvention() );
 
             xub_StrLen nAbsStart = nStartPos+aResult.Len()+aSep.Len();
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index af8e54e06..97af9442a 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -39,7 +39,7 @@ ScRefreshTimerProtector::ScRefreshTimerProtector( ScRefreshTimerControl * const
 {
     if ( ppControl && *ppControl )
     {
-        (*ppControl)->SetAllowRefresh( FALSE );
+        (*ppControl)->SetAllowRefresh( sal_False );
         // wait for any running refresh in another thread to finnish
         ::vos::OGuard aGuard( (*ppControl)->GetMutex() );
     }
@@ -54,9 +54,9 @@ ScRefreshTimer::~ScRefreshTimer()
 }
 
 
-void ScRefreshTimer::SetRefreshDelay( ULONG nSeconds )
+void ScRefreshTimer::SetRefreshDelay( sal_uLong nSeconds )
 {
-    BOOL bActive = IsActive();
+    sal_Bool bActive = IsActive();
     if ( bActive && !nSeconds )
         Stop();
     SetTimeout( nSeconds * 1000 );
diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index b89e9fe2f..85a5369e7 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -71,7 +71,7 @@ void ScRefTokenHelper::compileRangeRepresentation(
 
         // There MUST be exactly one reference per range token and nothing
         // else, and it MUST be a valid reference, not some #REF!
-        USHORT nLen = pArray->GetLen();
+        sal_uInt16 nLen = pArray->GetLen();
         if (!nLen)
             continue;   // Should a missing range really be allowed?
         if (nLen != 1)
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index 2a5e297a8..b9448f8be 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -41,9 +41,9 @@
 //------------------------------------------------------------------------
 
 template< typename R, typename S, typename U >
-BOOL lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask )
+sal_Bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask )
 {
-    BOOL bCut = FALSE;
+    sal_Bool bCut = sal_False;
     if ( rRef >= nStart )
         rRef = sal::static_int_cast<R>( rRef + nDelta );
     else if ( nDelta < 0 && rRef >= nStart + nDelta )
@@ -51,20 +51,20 @@ BOOL lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask )
     if ( rRef < 0 )
     {
         rRef = 0;
-        bCut = TRUE;
+        bCut = sal_True;
     }
     else if ( rRef > nMask )
     {
         rRef = nMask;
-        bCut = TRUE;
+        bCut = sal_True;
     }
     return bCut;
 }
 
 template< typename R, typename S, typename U >
-BOOL lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask )
+sal_Bool lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask )
 {
-    BOOL bCut = FALSE;
+    sal_Bool bCut = sal_False;
     if ( rRef >= nStart )
         rRef = sal::static_int_cast<R>( rRef + nDelta );
     else if ( nDelta < 0 && rRef >= nStart + nDelta )
@@ -72,23 +72,23 @@ BOOL lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask )
     if ( rRef < 0 )
     {
         rRef = 0;
-        bCut = TRUE;
+        bCut = sal_True;
     }
     else if ( rRef > nMask )
     {
         rRef = nMask;
-        bCut = TRUE;
+        bCut = sal_True;
     }
     return bCut;
 }
 
 template< typename R, typename S, typename U >
-BOOL lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta )
+sal_Bool lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta )
 {
     if ( rRef >= nStart && rRef <= nEnd )
     {
         rRef = sal::static_int_cast<R>( rRef + nDelta );
-        return TRUE;
+        return sal_True;
     }
 
     if ( nDelta > 0 )					// nach hinten schieben
@@ -99,7 +99,7 @@ BOOL lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta )
                 rRef = sal::static_int_cast<R>( rRef + nDelta );    // in the moved range
             else
                 rRef -= nEnd - nStart + 1;		// nachruecken
-            return TRUE;
+            return sal_True;
         }
     }
     else								// nach vorne schieben
@@ -110,27 +110,27 @@ BOOL lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta )
                 rRef = sal::static_int_cast<R>( rRef + nDelta );    // in the moved range
             else
                 rRef += nEnd - nStart + 1;		// nachruecken
-            return TRUE;
+            return sal_True;
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 template< typename R, typename S, typename U >
-BOOL lcl_MoveItCut( R& rRef, S nDelta, U nMask )
+sal_Bool lcl_MoveItCut( R& rRef, S nDelta, U nMask )
 {
-    BOOL bCut = FALSE;
+    sal_Bool bCut = sal_False;
     rRef = sal::static_int_cast<R>( rRef + nDelta );
     if ( rRef < 0 )
     {
         rRef = 0;
-        bCut = TRUE;
+        bCut = sal_True;
     }
     else if ( rRef > nMask )
     {
         rRef = nMask;
-        bCut = TRUE;
+        bCut = sal_True;
     }
     return bCut;
 }
@@ -146,14 +146,14 @@ void lcl_MoveItWrap( R& rRef, S nDelta, U nMask )
 }
 
 template< typename R, typename S, typename U >
-BOOL lcl_MoveRefPart( R& rRef1Val, BOOL& rRef1Del, BOOL bDo1,
-                      R& rRef2Val, BOOL& rRef2Del, BOOL bDo2,
+sal_Bool lcl_MoveRefPart( R& rRef1Val, sal_Bool& rRef1Del, sal_Bool bDo1,
+                      R& rRef2Val, sal_Bool& rRef2Del, sal_Bool bDo2,
                       U nStart, U nEnd, S nDelta, U nMask )
 {
     if ( nDelta )
     {
-        BOOL bDel, bCut1, bCut2;
-        bDel = bCut1 = bCut2 = FALSE;
+        sal_Bool bDel, bCut1, bCut2;
+        bDel = bCut1 = bCut2 = sal_False;
         S n;
         if (bDo1 && bDo2)
         {
@@ -162,14 +162,14 @@ BOOL lcl_MoveRefPart( R& rRef1Val, BOOL& rRef1Del, BOOL bDo1,
                 n = nStart + nDelta;
                 if ( n <= rRef1Val && rRef1Val < nStart
                   && n <= rRef2Val && rRef2Val < nStart )
-                    bDel = TRUE;
+                    bDel = sal_True;
             }
             else
             {
                 n = nEnd + nDelta;
                 if ( nEnd < rRef1Val && rRef1Val <= n
                   && nEnd < rRef2Val && rRef2Val <= n )
-                    bDel = TRUE;
+                    bDel = sal_True;
             }
         }
         if ( bDel )
@@ -195,15 +195,15 @@ BOOL lcl_MoveRefPart( R& rRef1Val, BOOL& rRef1Del, BOOL bDo1,
             }
         }
         if ( bDel || (bCut1 && bCut2) )
-            rRef1Del = rRef2Del = TRUE;
+            rRef1Del = rRef2Del = sal_True;
         return bDel || bCut1 || bCut2 || rRef1Del || rRef2Del;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 template< typename R, typename S, typename U >
-BOOL IsExpand( R n1, R n2, U nStart, S nD )
+sal_Bool IsExpand( R n1, R n2, U nStart, S nD )
 {	//! vor normalem Move...
     return
         nD > 0 			// Insert
@@ -217,7 +217,7 @@ BOOL IsExpand( R n1, R n2, U nStart, S nD )
 
 template< typename R, typename S, typename U >
 void Expand( R& n1, R& n2, U nStart, S nD )
-{	//! nach normalem Move..., nur wenn IsExpand vorher TRUE war!
+{	//! nach normalem Move..., nur wenn IsExpand vorher sal_True war!
     //! erst das Ende
     if ( n2 + 1 == nStart )
     {	// am Ende
@@ -229,19 +229,19 @@ void Expand( R& n1, R& n2, U nStart, S nD )
 }
 
 
-BOOL lcl_IsWrapBig( INT32 nRef, INT32 nDelta )
+sal_Bool lcl_IsWrapBig( sal_Int32 nRef, sal_Int32 nDelta )
 {
     if ( nRef > 0 && nDelta > 0 )
         return nRef + nDelta <= 0;
     else if ( nRef < 0 && nDelta < 0 )
         return nRef + nDelta >= 0;
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL lcl_MoveBig( INT32& rRef, INT32 nStart, INT32 nDelta )
+sal_Bool lcl_MoveBig( sal_Int32& rRef, sal_Int32 nStart, sal_Int32 nDelta )
 {
-    BOOL bCut = FALSE;
+    sal_Bool bCut = sal_False;
     if ( rRef >= nStart )
     {
         if ( nDelta > 0 )
@@ -254,9 +254,9 @@ BOOL lcl_MoveBig( INT32& rRef, INT32 nStart, INT32 nDelta )
     return bCut;
 }
 
-BOOL lcl_MoveItCutBig( INT32& rRef, INT32 nDelta )
+sal_Bool lcl_MoveItCutBig( sal_Int32& rRef, sal_Int32 nDelta )
 {
-    BOOL bCut = lcl_IsWrapBig( rRef, nDelta );
+    sal_Bool bCut = lcl_IsWrapBig( rRef, nDelta );
     rRef += nDelta;
     return bCut;
 }
@@ -278,15 +278,15 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo
     SCROW oldRow2 = theRow2;
     SCTAB oldTab2 = theTab2;
 
-    BOOL bCut1, bCut2;
+    sal_Bool bCut1, bCut2;
 
     if (eUpdateRefMode == URM_INSDEL)
     {
-        BOOL bExpand = pDoc->IsExpandRefs();
+        sal_Bool bExpand = pDoc->IsExpandRefs();
         if ( nDx && (theRow1 >= nRow1) && (theRow2 <= nRow2) &&
                     (theTab1 >= nTab1) && (theTab2 <= nTab2) )
         {
-            BOOL bExp = (bExpand && IsExpand( theCol1, theCol2, nCol1, nDx ));
+            sal_Bool bExp = (bExpand && IsExpand( theCol1, theCol2, nCol1, nDx ));
             bCut1 = lcl_MoveStart( theCol1, nCol1, nDx, MAXCOL );
             bCut2 = lcl_MoveEnd( theCol2, nCol1, nDx, MAXCOL );
             if ( theCol2 < theCol1 )
@@ -305,7 +305,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo
         if ( nDy && (theCol1 >= nCol1) && (theCol2 <= nCol2) &&
                     (theTab1 >= nTab1) && (theTab2 <= nTab2) )
         {
-            BOOL bExp = (bExpand && IsExpand( theRow1, theRow2, nRow1, nDy ));
+            sal_Bool bExp = (bExpand && IsExpand( theRow1, theRow2, nRow1, nDy ));
             bCut1 = lcl_MoveStart( theRow1, nRow1, nDy, MAXROW );
             bCut2 = lcl_MoveEnd( theRow2, nRow1, nDy, MAXROW );
             if ( theRow2 < theRow1 )
@@ -326,7 +326,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo
         {
             SCsTAB nMaxTab = pDoc->GetTableCount() - 1;
             nMaxTab = sal::static_int_cast<SCsTAB>(nMaxTab + nDz);      // adjust to new count
-            BOOL bExp = (bExpand && IsExpand( theTab1, theTab2, nTab1, nDz ));
+            sal_Bool bExp = (bExpand && IsExpand( theTab1, theTab2, nTab1, nDz ));
             bCut1 = lcl_MoveStart( theTab1, nTab1, nDz, static_cast<SCTAB>(nMaxTab) );
             bCut2 = lcl_MoveEnd( theTab2, nTab1, nDz, static_cast<SCTAB>(nMaxTab) );
             if ( theTab2 < theTab1 )
@@ -406,18 +406,18 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo
 // Referenzen koennen auch ausserhalb des Dokuments liegen!
 // Ganze Spalten/Zeilen (nInt32Min..nInt32Max) bleiben immer solche!
 ScRefUpdateRes ScRefUpdate::Update( UpdateRefMode eUpdateRefMode,
-        const ScBigRange& rWhere, INT32 nDx, INT32 nDy, INT32 nDz,
+        const ScBigRange& rWhere, sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz,
         ScBigRange& rWhat )
 {
     ScRefUpdateRes eRet = UR_NOTHING;
     const ScBigRange aOldRange( rWhat );
 
-    INT32 nCol1, nRow1, nTab1, nCol2, nRow2, nTab2;
-    INT32 theCol1, theRow1, theTab1, theCol2, theRow2, theTab2;
+    sal_Int32 nCol1, nRow1, nTab1, nCol2, nRow2, nTab2;
+    sal_Int32 theCol1, theRow1, theTab1, theCol2, theRow2, theTab2;
     rWhere.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
     rWhat.GetVars( theCol1, theRow1, theTab1, theCol2, theRow2, theTab2 );
 
-    BOOL bCut1, bCut2;
+    sal_Bool bCut1, bCut2;
 
     if (eUpdateRefMode == URM_INSDEL)
     {
@@ -512,11 +512,11 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
 
     if( eMode == URM_INSDEL )
     {
-        BOOL bExpand = pDoc->IsExpandRefs();
+        sal_Bool bExpand = pDoc->IsExpandRefs();
 
         const ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
-        BOOL bInDeleteUndo =
-            ( pChangeTrack ? pChangeTrack->IsInDeleteUndo() : FALSE );
+        sal_Bool bInDeleteUndo =
+            ( pChangeTrack ? pChangeTrack->IsInDeleteUndo() : sal_False );
 
         SCCOL oldCol1 = rRef.Ref1.nCol;
         SCROW oldRow1 = rRef.Ref1.nRow;
@@ -525,12 +525,12 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
         SCROW oldRow2 = rRef.Ref2.nRow;
         SCTAB oldTab2 = rRef.Ref2.nTab;
 
-        BOOL bRef1ColDel = rRef.Ref1.IsColDeleted();
-        BOOL bRef2ColDel = rRef.Ref2.IsColDeleted();
-        BOOL bRef1RowDel = rRef.Ref1.IsRowDeleted();
-        BOOL bRef2RowDel = rRef.Ref2.IsRowDeleted();
-        BOOL bRef1TabDel = rRef.Ref1.IsTabDeleted();
-        BOOL bRef2TabDel = rRef.Ref2.IsTabDeleted();
+        sal_Bool bRef1ColDel = rRef.Ref1.IsColDeleted();
+        sal_Bool bRef2ColDel = rRef.Ref2.IsColDeleted();
+        sal_Bool bRef1RowDel = rRef.Ref1.IsRowDeleted();
+        sal_Bool bRef2RowDel = rRef.Ref2.IsRowDeleted();
+        sal_Bool bRef1TabDel = rRef.Ref1.IsTabDeleted();
+        sal_Bool bRef2TabDel = rRef.Ref2.IsTabDeleted();
 
         if( nDx &&
             ((rRef.Ref1.nRow >= nRow1
@@ -540,11 +540,11 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
            && rRef.Ref2.nTab <= nTab2) || (bRef1TabDel || bRef2TabDel))
            )
         {
-            BOOL bExp = (bExpand && !bInDeleteUndo && IsExpand( rRef.Ref1.nCol,
+            sal_Bool bExp = (bExpand && !bInDeleteUndo && IsExpand( rRef.Ref1.nCol,
                 rRef.Ref2.nCol, nCol1, nDx ));
-            BOOL bDo1 = (eWhat == ScRefUpdate::ALL || (eWhat ==
+            sal_Bool bDo1 = (eWhat == ScRefUpdate::ALL || (eWhat ==
                         ScRefUpdate::ABSOLUTE && !rRef.Ref1.IsColRel()));
-            BOOL bDo2 = (eWhat == ScRefUpdate::ALL || (eWhat ==
+            sal_Bool bDo2 = (eWhat == ScRefUpdate::ALL || (eWhat ==
                         ScRefUpdate::ABSOLUTE && !rRef.Ref2.IsColRel()));
             if ( lcl_MoveRefPart( rRef.Ref1.nCol, bRef1ColDel, bDo1,
                                   rRef.Ref2.nCol, bRef2ColDel, bDo2,
@@ -555,17 +555,17 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
                 {
                     if ( bRef1ColDel && nCol1 <= rRef.Ref1.nCol &&
                             rRef.Ref1.nCol <= nCol1 + nDx )
-                        rRef.Ref1.SetColDeleted( FALSE );
+                        rRef.Ref1.SetColDeleted( sal_False );
                     if ( bRef2ColDel && nCol1 <= rRef.Ref2.nCol &&
                             rRef.Ref2.nCol <= nCol1 + nDx )
-                        rRef.Ref2.SetColDeleted( FALSE );
+                        rRef.Ref2.SetColDeleted( sal_False );
                 }
                 else
                 {
                     if ( bRef1ColDel )
-                        rRef.Ref1.SetColDeleted( TRUE );
+                        rRef.Ref1.SetColDeleted( sal_True );
                     if ( bRef2ColDel )
-                        rRef.Ref2.SetColDeleted( TRUE );
+                        rRef.Ref2.SetColDeleted( sal_True );
                 }
             }
             if ( bExp )
@@ -582,11 +582,11 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
            && rRef.Ref2.nTab <= nTab2) || (bRef1TabDel || bRef2TabDel))
            )
         {
-            BOOL bExp = (bExpand && !bInDeleteUndo && IsExpand( rRef.Ref1.nRow,
+            sal_Bool bExp = (bExpand && !bInDeleteUndo && IsExpand( rRef.Ref1.nRow,
                 rRef.Ref2.nRow, nRow1, nDy ));
-            BOOL bDo1 = (eWhat == ScRefUpdate::ALL || (eWhat ==
+            sal_Bool bDo1 = (eWhat == ScRefUpdate::ALL || (eWhat ==
                         ScRefUpdate::ABSOLUTE && !rRef.Ref1.IsRowRel()));
-            BOOL bDo2 = (eWhat == ScRefUpdate::ALL || (eWhat ==
+            sal_Bool bDo2 = (eWhat == ScRefUpdate::ALL || (eWhat ==
                         ScRefUpdate::ABSOLUTE && !rRef.Ref2.IsRowRel()));
             if ( lcl_MoveRefPart( rRef.Ref1.nRow, bRef1RowDel, bDo1,
                                 rRef.Ref2.nRow, bRef2RowDel, bDo2,
@@ -597,17 +597,17 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
                 {
                     if ( bRef1RowDel && nRow1 <= rRef.Ref1.nRow &&
                             rRef.Ref1.nRow <= nRow1 + nDy )
-                        rRef.Ref1.SetRowDeleted( FALSE );
+                        rRef.Ref1.SetRowDeleted( sal_False );
                     if ( bRef2RowDel && nRow1 <= rRef.Ref2.nRow &&
                             rRef.Ref2.nRow <= nRow1 + nDy )
-                        rRef.Ref2.SetRowDeleted( FALSE );
+                        rRef.Ref2.SetRowDeleted( sal_False );
                 }
                 else
                 {
                     if ( bRef1RowDel )
-                        rRef.Ref1.SetRowDeleted( TRUE );
+                        rRef.Ref1.SetRowDeleted( sal_True );
                     if ( bRef2RowDel )
-                        rRef.Ref2.SetRowDeleted( TRUE );
+                        rRef.Ref2.SetRowDeleted( sal_True );
                 }
             }
             if ( bExp )
@@ -624,12 +624,12 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
            && rRef.Ref2.nRow <= nRow2) || (bRef1RowDel || bRef2RowDel))
            )
         {
-            BOOL bExp = (bExpand && !bInDeleteUndo && IsExpand( rRef.Ref1.nTab,
+            sal_Bool bExp = (bExpand && !bInDeleteUndo && IsExpand( rRef.Ref1.nTab,
                 rRef.Ref2.nTab, nTab1, nDz ));
             SCTAB nMaxTab = pDoc->GetTableCount() - 1;
-            BOOL bDo1 = (eWhat == ScRefUpdate::ALL || (eWhat ==
+            sal_Bool bDo1 = (eWhat == ScRefUpdate::ALL || (eWhat ==
                         ScRefUpdate::ABSOLUTE && !rRef.Ref1.IsTabRel()));
-            BOOL bDo2 = (eWhat == ScRefUpdate::ALL || (eWhat ==
+            sal_Bool bDo2 = (eWhat == ScRefUpdate::ALL || (eWhat ==
                         ScRefUpdate::ABSOLUTE && !rRef.Ref2.IsTabRel()));
             if ( lcl_MoveRefPart( rRef.Ref1.nTab, bRef1TabDel, bDo1,
                                   rRef.Ref2.nTab, bRef2TabDel, bDo2,
@@ -640,17 +640,17 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
                 {
                     if ( bRef1TabDel && nTab1 <= rRef.Ref1.nTab &&
                             rRef.Ref1.nTab <= nTab1 + nDz )
-                        rRef.Ref1.SetTabDeleted( FALSE );
+                        rRef.Ref1.SetTabDeleted( sal_False );
                     if ( bRef2TabDel && nTab1 <= rRef.Ref2.nTab &&
                             rRef.Ref2.nTab <= nTab1 + nDz )
-                        rRef.Ref2.SetTabDeleted( FALSE );
+                        rRef.Ref2.SetTabDeleted( sal_False );
                 }
                 else
                 {
                     if ( bRef1TabDel )
-                        rRef.Ref1.SetTabDeleted( TRUE );
+                        rRef.Ref1.SetTabDeleted( sal_True );
                     if ( bRef2TabDel )
-                        rRef.Ref2.SetTabDeleted( TRUE );
+                        rRef.Ref2.SetTabDeleted( sal_True );
                 }
             }
             if ( bExp )
@@ -684,12 +684,12 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
               && rRef.Ref2.nRow <= nRow2-nDy
               && rRef.Ref2.nTab <= nTab2-nDz )
             {
-                eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, TRUE );		// immer verschieben
+                eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, sal_False, sal_True );		// immer verschieben
             }
             else if ( nDz && r.In( rPos ) )
             {
-                rRef.Ref1.SetFlag3D( TRUE );
-                rRef.Ref2.SetFlag3D( TRUE );
+                rRef.Ref1.SetFlag3D( sal_True );
+                rRef.Ref2.SetFlag3D( sal_True );
                 eRet = UR_UPDATED;
                 if (eWhat != ScRefUpdate::ABSOLUTE)
                     rRef.CalcRelFromAbs( rPos );
@@ -698,7 +698,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
                 rRef.CalcRelFromAbs( rPos );
         }
         else if( eMode == URM_COPY && r.In( rPos ) )
-            eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, FALSE );		// nur relative
+            eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, sal_False, sal_False );		// nur relative
             // sollte nicht mehr verwendet werden muessen
         else if (eWhat != ScRefUpdate::ABSOLUTE)
             rRef.CalcRelFromAbs( rPos );
@@ -709,7 +709,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
 
 ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos,
                                   SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-                                  ScComplexRefData& rRef, BOOL bWrap, BOOL bAbsolute )
+                                  ScComplexRefData& rRef, sal_Bool bWrap, sal_Bool bAbsolute )
 {
     ScRefUpdateRes eRet = UR_NOTHING;
 
@@ -720,10 +720,10 @@ ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos,
     SCROW oldRow2 = rRef.Ref2.nRow;
     SCTAB oldTab2 = rRef.Ref2.nTab;
 
-    BOOL bCut1, bCut2;
+    sal_Bool bCut1, bCut2;
     if ( nDx )
     {
-        bCut1 = bCut2 = FALSE;
+        bCut1 = bCut2 = sal_False;
         if( bAbsolute || rRef.Ref1.IsColRel() )
         {
             if( bWrap )
@@ -742,13 +742,13 @@ ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos,
             eRet = UR_UPDATED;
         if ( bCut1 && bCut2 )
         {
-            rRef.Ref1.SetColDeleted( TRUE );
-            rRef.Ref2.SetColDeleted( TRUE );
+            rRef.Ref1.SetColDeleted( sal_True );
+            rRef.Ref2.SetColDeleted( sal_True );
         }
     }
     if ( nDy )
     {
-        bCut1 = bCut2 = FALSE;
+        bCut1 = bCut2 = sal_False;
         if( bAbsolute || rRef.Ref1.IsRowRel() )
         {
             if( bWrap )
@@ -767,13 +767,13 @@ ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos,
             eRet = UR_UPDATED;
         if ( bCut1 && bCut2 )
         {
-            rRef.Ref1.SetRowDeleted( TRUE );
-            rRef.Ref2.SetRowDeleted( TRUE );
+            rRef.Ref1.SetRowDeleted( sal_True );
+            rRef.Ref2.SetRowDeleted( sal_True );
         }
     }
     if ( nDz )
     {
-        bCut1 = bCut2 = FALSE;
+        bCut1 = bCut2 = sal_False;
         SCsTAB nMaxTab = (SCsTAB) pDoc->GetTableCount() - 1;
         if( bAbsolute || rRef.Ref1.IsTabRel() )
         {
@@ -795,8 +795,8 @@ ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos,
             eRet = UR_UPDATED;
         if ( bCut1 && bCut2 )
         {
-            rRef.Ref1.SetTabDeleted( TRUE );
-            rRef.Ref2.SetTabDeleted( TRUE );
+            rRef.Ref1.SetTabDeleted( sal_True );
+            rRef.Ref2.SetTabDeleted( sal_True );
         }
     }
 
@@ -912,11 +912,11 @@ ScRefUpdateRes ScRefUpdate::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCRO
     //	in Y-Richtung darf die Ref auch eine Zeile weiter unten anfangen,
     //	falls ein Bereich Spaltenkoepfe enthaelt
 
-    BOOL bUpdateX = ( nGrowX &&
+    sal_Bool bUpdateX = ( nGrowX &&
             rRef.Ref1.nCol == rArea.aStart.Col() && rRef.Ref2.nCol == rArea.aEnd.Col() &&
             rRef.Ref1.nRow >= rArea.aStart.Row() && rRef.Ref2.nRow <= rArea.aEnd.Row() &&
             rRef.Ref1.nTab >= rArea.aStart.Tab() && rRef.Ref2.nTab <= rArea.aEnd.Tab() );
-    BOOL bUpdateY = ( nGrowY &&
+    sal_Bool bUpdateY = ( nGrowY &&
             rRef.Ref1.nCol >= rArea.aStart.Col() && rRef.Ref2.nCol <= rArea.aEnd.Col() &&
             ( rRef.Ref1.nRow == rArea.aStart.Row() || rRef.Ref1.nRow == rArea.aStart.Row()+1 ) &&
                 rRef.Ref2.nRow == rArea.aEnd.Row() &&
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 96fca9077..a402bddca 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -100,15 +100,15 @@ ScMatrix* ScMatrix::CloneAndExtend( SCSIZE nNewCols, SCSIZE nNewRows ) const
     return pScMat;
 }
 
-void ScMatrix::SetErrorAtInterpreter( USHORT nError ) const
+void ScMatrix::SetErrorAtInterpreter( sal_uInt16 nError ) const
 {
     if ( pErrorInterpreter )
         pErrorInterpreter->SetError( nError);
 }
 
 //
-//	File format: USHORT columns, USHORT rows, (columns*rows) entries:
-//	BYTE type ( CELLTYPE_NONE, CELLTYPE_VALUE, CELLTYPE_STRING ); nothing, double or String
+//	File format: sal_uInt16 columns, sal_uInt16 rows, (columns*rows) entries:
+//	sal_uInt8 type ( CELLTYPE_NONE, CELLTYPE_VALUE, CELLTYPE_STRING ); nothing, double or String
 //
 
 ScMatrix::ScMatrix(SvStream& /* rStream */)
@@ -117,8 +117,8 @@ ScMatrix::ScMatrix(SvStream& /* rStream */)
 {
 #if SC_ROWLIMIT_STREAM_ACCESS 
 #error address types changed!
-    USHORT nC;
-    USHORT nR;
+    sal_uInt16 nC;
+    sal_uInt16 nR;
 
     rStream >> nC;
     rStream >> nR;
@@ -133,7 +133,7 @@ ScMatrix::ScMatrix(SvStream& /* rStream */)
     SCSIZE nReadCount = (SCSIZE) nC * nR;
     for (SCSIZE i=0; i<nReadCount; i++)
     {
-        BYTE nType;
+        sal_uInt8 nType;
         rStream >> nType;
         if ( nType == CELLTYPE_VALUE )
         {
@@ -173,34 +173,34 @@ void ScMatrix::Store(SvStream& /* rStream */) const
 #if SC_ROWLIMIT_STREAM_ACCESS 
 #error address types changed!
     SCSIZE nCount = nColCount * nRowCount;
-    // Don't store matrix with more than USHORT max elements, old versions
-    // might get confused in loops for(USHORT i=0; i<nC*nR; i++)
-    if ( !pMat || nCount > ((USHORT)(~0)) )
+    // Don't store matrix with more than sal_uInt16 max elements, old versions
+    // might get confused in loops for(sal_uInt16 i=0; i<nC*nR; i++)
+    if ( !pMat || nCount > ((sal_uInt16)(~0)) )
     {
         DBG_ASSERT( pMat, "ScMatrix::Store: pMat == NULL" );
         // We can't store a 0 dimension because old versions rely on some
         // matrix being present, e.g. DDE link results, and old versions didn't
         // create a matrix if dimension was 0. Store an error result.
-        rStream << (USHORT) 1;
-        rStream << (USHORT) 1;
-        rStream << (BYTE) CELLTYPE_VALUE;
+        rStream << (sal_uInt16) 1;
+        rStream << (sal_uInt16) 1;
+        rStream << (sal_uInt8) CELLTYPE_VALUE;
         double fVal;
         ::rtl::math::setNan( &fVal );
         rStream << fVal;
         return;
     }
 
-    rStream << (USHORT) nColCount;
+    rStream << (sal_uInt16) nColCount;
 #if SC_ROWLIMIT_MORE_THAN_32K
     #error row32k
 #endif
-    rStream << (USHORT) nRowCount;
+    rStream << (sal_uInt16) nRowCount;
 
     String aMatStr;
     rtl_TextEncoding eCharSet = rStream.GetStreamCharSet();
     for (SCSIZE i=0; i<nCount; i++)
     {
-        BYTE nType = CELLTYPE_VALUE;
+        sal_uInt8 nType = CELLTYPE_VALUE;
         if ( mnValType && IsNonValueType( mnValType[i]))
         {
             if ( pMat[i].pS )
@@ -234,8 +234,8 @@ void ScMatrix::ResetIsString()
         }
     }
     else
-        mnValType = new BYTE[nCount];
-    memset( mnValType, 0, nCount * sizeof( BYTE ) );
+        mnValType = new sal_uInt8[nCount];
+    memset( mnValType, 0, nCount * sizeof( sal_uInt8 ) );
     mnNonValue = 0;
 }
 
@@ -289,7 +289,7 @@ void ScMatrix::PutString(const String& rStr, SCSIZE nIndex)
     mnValType[nIndex] = SC_MATVAL_STRING;
 }
 
-void ScMatrix::PutStringEntry( const String* pStr, BYTE bFlag, SCSIZE nIndex )
+void ScMatrix::PutStringEntry( const String* pStr, sal_uInt8 bFlag, SCSIZE nIndex )
 {
     DBG_ASSERT( bFlag, "ScMatrix::PutStringEntry: bFlag == 0" );
     if (mnValType == NULL)
@@ -299,7 +299,7 @@ void ScMatrix::PutStringEntry( const String* pStr, BYTE bFlag, SCSIZE nIndex )
     String* pS = pMat[nIndex].pS;
     pMat[nIndex].fVal = 0.0;
     // An EMPTY or EMPTYPATH entry must not have a string pointer therefor.
-    DBG_ASSERT( (((bFlag & SC_MATVAL_EMPTY) == SC_MATVAL_EMPTY) && !pStr) || TRUE,
+    DBG_ASSERT( (((bFlag & SC_MATVAL_EMPTY) == SC_MATVAL_EMPTY) && !pStr) || sal_True,
             "ScMatrix::PutStringEntry: pStr passed through EMPTY entry");
     if ( IsNonValueType( mnValType[nIndex]) && pS )
     {
@@ -398,7 +398,7 @@ void ScMatrix::PutBoolean( bool bVal, SCSIZE nIndex)
     pMat[nIndex].fVal = bVal ? 1. : 0.;
 }
 
-USHORT ScMatrix::GetError( SCSIZE nC, SCSIZE nR) const
+sal_uInt16 ScMatrix::GetError( SCSIZE nC, SCSIZE nR) const
 {
     if (ValidColRowOrReplicated( nC, nR ))
         return GetError( CalcOffset( nC, nR) );
@@ -446,8 +446,8 @@ String ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nIndex) const
     if (IsString( nIndex))
     {
         if (IsEmptyPath( nIndex))
-        {   // result of empty FALSE jump path
-            ULONG nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_LOGICAL,
+        {   // result of empty sal_False jump path
+            sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_LOGICAL,
                     ScGlobal::eLnge);
             String aStr;
             Color* pColor = NULL;
@@ -457,7 +457,7 @@ String ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nIndex) const
         return GetString( nIndex );
     }
 
-    USHORT nError = GetError( nIndex);
+    sal_uInt16 nError = GetError( nIndex);
     if (nError)
     {
         SetErrorAtInterpreter( nError);
@@ -465,7 +465,7 @@ String ScMatrix::GetString( SvNumberFormatter& rFormatter, SCSIZE nIndex) const
     }
 
     double fVal= GetDouble( nIndex);
-    ULONG nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_NUMBER,
+    sal_uLong nKey = rFormatter.GetStandardFormat( NUMBERFORMAT_NUMBER,
             ScGlobal::eLnge);
     String aStr;
     rFormatter.GetInputLineString( fVal, nKey, aStr);
diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx
index 15d85de5c..5d328cafb 100644
--- a/sc/source/core/tool/subtotal.cxx
+++ b/sc/source/core/tool/subtotal.cxx
@@ -36,14 +36,14 @@
 
 // -----------------------------------------------------------------------
 
-BOOL SubTotal::SafePlus(double& fVal1, double fVal2)
+sal_Bool SubTotal::SafePlus(double& fVal1, double fVal2)
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SAL_MATH_FPEXCEPTIONS_OFF();
     fVal1 += fVal2;
     if (!::rtl::math::isFinite(fVal1))
     {
-        bOk = FALSE;
+        bOk = sal_False;
         if (fVal2 > 0.0)
             fVal1 = DBL_MAX;
         else
@@ -53,28 +53,28 @@ BOOL SubTotal::SafePlus(double& fVal1, double fVal2)
 }
 
 
-BOOL SubTotal::SafeMult(double& fVal1, double fVal2)
+sal_Bool SubTotal::SafeMult(double& fVal1, double fVal2)
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SAL_MATH_FPEXCEPTIONS_OFF();
     fVal1 *= fVal2;
     if (!::rtl::math::isFinite(fVal1))
     {
-        bOk = FALSE;
+        bOk = sal_False;
         fVal1 = DBL_MAX;
     }
     return bOk;
 }
 
 
-BOOL SubTotal::SafeDiv(double& fVal1, double fVal2)
+sal_Bool SubTotal::SafeDiv(double& fVal1, double fVal2)
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SAL_MATH_FPEXCEPTIONS_OFF();
     fVal1 /= fVal2;
     if (!::rtl::math::isFinite(fVal1))
     {
-        bOk = FALSE;
+        bOk = sal_False;
         fVal1 = DBL_MAX;
     }
     return bOk;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 66665b0ea..2bcc78b81 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -119,19 +119,19 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 )
 // ScRawToken size is FixMembers + MAXSTRLEN + ~4 ~= 1036
 IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken, 8, 4 )
 // Some ScDoubleRawToken, FixMembers + sizeof(double) ~= 16
-const USHORT nMemPoolDoubleRawToken = 0x0400 / sizeof(ScDoubleRawToken);
+const sal_uInt16 nMemPoolDoubleRawToken = 0x0400 / sizeof(ScDoubleRawToken);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRawToken, nMemPoolDoubleRawToken, nMemPoolDoubleRawToken )
 
 // Need a whole bunch of ScSingleRefToken
-const USHORT nMemPoolSingleRefToken = (0x4000 - 64) / sizeof(ScSingleRefToken);
+const sal_uInt16 nMemPoolSingleRefToken = (0x4000 - 64) / sizeof(ScSingleRefToken);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken, nMemPoolSingleRefToken, nMemPoolSingleRefToken )
 // Need quite a lot of ScDoubleRefToken
-const USHORT nMemPoolDoubleRefToken = (0x2000 - 64) / sizeof(ScDoubleRefToken);
+const sal_uInt16 nMemPoolDoubleRefToken = (0x2000 - 64) / sizeof(ScDoubleRefToken);
 IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken, nMemPoolDoubleRefToken, nMemPoolDoubleRefToken )
 
 // --- helpers --------------------------------------------------------------
 
-inline BOOL lcl_IsReference( OpCode eOp, StackVar eType )
+inline sal_Bool lcl_IsReference( OpCode eOp, StackVar eType )
 {
     return
         (eOp == ocPush && (eType == svSingleRef || eType == svDoubleRef))
@@ -230,7 +230,7 @@ void ScRawToken::SetDouble(double rVal)
     nRefCnt = 0;
 }
 
-void ScRawToken::SetName( USHORT n )
+void ScRawToken::SetName( sal_uInt16 n )
 {
     eOp    = ocName;
     eType  = svIndex;
@@ -323,13 +323,13 @@ void ScRawToken::SetExternal( const sal_Unicode* pStr )
     nRefCnt = 0;
 }
 
-USHORT lcl_ScRawTokenOffset()
+sal_uInt16 lcl_ScRawTokenOffset()
 {
     // offset of sbyte in ScRawToken
     // offsetof(ScRawToken, sbyte) gives a warning with gcc, because ScRawToken is no POD
 
     ScRawToken aToken;
-    return static_cast<USHORT>( reinterpret_cast<char*>(&aToken.sbyte) - reinterpret_cast<char*>(&aToken) );
+    return static_cast<sal_uInt16>( reinterpret_cast<char*>(&aToken.sbyte) - reinterpret_cast<char*>(&aToken) );
 }
 
 ScRawToken* ScRawToken::Clone() const
@@ -344,8 +344,8 @@ ScRawToken* ScRawToken::Clone() const
     }
     else
     {
-        static USHORT nOffset = lcl_ScRawTokenOffset();     // offset of sbyte
-        USHORT n = nOffset;
+        static sal_uInt16 nOffset = lcl_ScRawTokenOffset();     // offset of sbyte
+        sal_uInt16 n = nOffset;
 
         if (eOp == ocExternalRef)
         {
@@ -367,24 +367,24 @@ ScRawToken* ScRawToken::Clone() const
                 case svSep:         break;
                 case svByte:        n += sizeof(ScRawToken::sbyte); break;
                 case svDouble:      n += sizeof(double); break;
-                case svString:      n = sal::static_int_cast<USHORT>( n + GetStrLenBytes( cStr ) + GetStrLenBytes( 1 ) ); break;
+                case svString:      n = sal::static_int_cast<sal_uInt16>( n + GetStrLenBytes( cStr ) + GetStrLenBytes( 1 ) ); break;
                 case svSingleRef:
                 case svDoubleRef:   n += sizeof(aRef); break;
                 case svMatrix:      n += sizeof(ScMatrix*); break;
-                case svIndex:       n += sizeof(USHORT); break;
+                case svIndex:       n += sizeof(sal_uInt16); break;
                 case svJump:        n += nJump[ 0 ] * 2 + 2; break;
-                case svExternal:    n = sal::static_int_cast<USHORT>( n + GetStrLenBytes( cStr+1 ) + GetStrLenBytes( 2 ) ); break;
+                case svExternal:    n = sal::static_int_cast<sal_uInt16>( n + GetStrLenBytes( cStr+1 ) + GetStrLenBytes( 2 ) ); break;
                 default:
                 {
                     DBG_ERROR1( "unknown ScRawToken::Clone() type %d", int(eType));
                 }
             }
         }
-        p = (ScRawToken*) new BYTE[ n ];
-        memcpy( p, this, n * sizeof(BYTE) );
+        p = (ScRawToken*) new sal_uInt8[ n ];
+        memcpy( p, this, n * sizeof(sal_uInt8) );
     }
     p->nRefCnt = 0;
-    p->bRaw = FALSE;
+    p->bRaw = sal_False;
     return p;
 }
 
@@ -473,7 +473,7 @@ void ScRawToken::Delete()
                 delete (ScDoubleRawToken*) this;    // FixedMemPool ScDoubleRawToken
             break;
             default:
-                delete [] (BYTE*) this;
+                delete [] (sal_uInt8*) this;
         }
     }
 }
@@ -501,14 +501,14 @@ ScToken::~ScToken()
 }
 
 //  TextEqual: if same formula entered (for optimization in sort)
-BOOL ScToken::TextEqual( const FormulaToken& _rToken ) const
+sal_Bool ScToken::TextEqual( const FormulaToken& _rToken ) const
 {
     if ( eType == svSingleRef || eType == svDoubleRef )
     {
         //  in relative Refs only compare relative parts
 
         if ( eType != _rToken.GetType() || GetOpCode() != _rToken.GetOpCode() )
-            return FALSE;
+            return sal_False;
 
         const ScToken& rToken = static_cast<const ScToken&>(_rToken);
         ScComplexRefData aTemp1;
@@ -549,24 +549,24 @@ BOOL ScToken::TextEqual( const FormulaToken& _rToken ) const
 }
 
 
-BOOL ScToken::Is3DRef() const
+sal_Bool ScToken::Is3DRef() const
 {
     switch ( eType )
     {
         case svDoubleRef :
             if ( GetSingleRef2().IsFlag3D() )
-                return TRUE;
+                return sal_True;
         //! fallthru
         case svSingleRef :
             if ( GetSingleRef().IsFlag3D() )
-                return TRUE;
+                return sal_True;
             break;
         default:
         {
             // added to avoid warnings
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 // static
@@ -791,7 +791,7 @@ void                    ScSingleRefToken::CalcAbsIfRel( const ScAddress& rPos )
                             { aSingleRef.CalcAbsIfRel( rPos ); }
 void                    ScSingleRefToken::CalcRelFromAbs( const ScAddress& rPos )
                             { aSingleRef.CalcRelFromAbs( rPos ); }
-BOOL ScSingleRefToken::operator==( const FormulaToken& r ) const
+sal_Bool ScSingleRefToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && aSingleRef == static_cast<const ScToken&>(r).GetSingleRef();
 }
@@ -807,7 +807,7 @@ void                    ScDoubleRefToken::CalcAbsIfRel( const ScAddress& rPos )
                             { aDoubleRef.CalcAbsIfRel( rPos ); }
 void                    ScDoubleRefToken::CalcRelFromAbs( const ScAddress& rPos )
                             { aDoubleRef.CalcRelFromAbs( rPos ); }
-BOOL ScDoubleRefToken::operator==( const FormulaToken& r ) const
+sal_Bool ScDoubleRefToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && aDoubleRef == static_cast<const ScToken&>(r).GetDoubleRef();
 }
@@ -825,7 +825,7 @@ void                    ScRefListToken::CalcRelFromAbs( const ScAddress& rPos )
     for (ScRefList::iterator it( aRefList.begin()); it != aRefList.end(); ++it)
         (*it).CalcRelFromAbs( rPos);
 }
-BOOL ScRefListToken::operator==( const FormulaToken& r ) const
+sal_Bool ScRefListToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && &aRefList == static_cast<const ScToken&>(r).GetRefList();
 }
@@ -833,7 +833,7 @@ BOOL ScRefListToken::operator==( const FormulaToken& r ) const
 
 const ScMatrix* ScMatrixToken::GetMatrix() const        { return pMatrix; }
 ScMatrix*       ScMatrixToken::GetMatrix()              { return pMatrix; }
-BOOL ScMatrixToken::operator==( const FormulaToken& r ) const
+sal_Bool ScMatrixToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && pMatrix == static_cast<const ScToken&>(r).GetMatrix();
 }
@@ -860,7 +860,7 @@ ScExternalSingleRefToken::~ScExternalSingleRefToken()
 {
 }
 
-USHORT ScExternalSingleRefToken::GetIndex() const
+sal_uInt16 ScExternalSingleRefToken::GetIndex() const
 {
     return mnFileId;
 }
@@ -890,7 +890,7 @@ void ScExternalSingleRefToken::CalcRelFromAbs( const ScAddress& rPos )
     maSingleRef.CalcRelFromAbs( rPos );
 }
 
-BOOL ScExternalSingleRefToken::operator ==( const FormulaToken& r ) const
+sal_Bool ScExternalSingleRefToken::operator ==( const FormulaToken& r ) const
 {
     if (!FormulaToken::operator==(r))
         return false;
@@ -926,7 +926,7 @@ ScExternalDoubleRefToken::~ScExternalDoubleRefToken()
 {
 }
 
-USHORT ScExternalDoubleRefToken::GetIndex() const
+sal_uInt16 ScExternalDoubleRefToken::GetIndex() const
 {
     return mnFileId;
 }
@@ -976,7 +976,7 @@ void ScExternalDoubleRefToken::CalcRelFromAbs( const ScAddress& rPos )
     maDoubleRef.CalcRelFromAbs( rPos );
 }
 
-BOOL ScExternalDoubleRefToken::operator ==( const FormulaToken& r ) const
+sal_Bool ScExternalDoubleRefToken::operator ==( const FormulaToken& r ) const
 {
     if (!ScToken::operator==(r))
         return false;
@@ -1008,7 +1008,7 @@ ScExternalNameToken::ScExternalNameToken( const ScExternalNameToken& r ) :
 
 ScExternalNameToken::~ScExternalNameToken() {}
 
-USHORT ScExternalNameToken::GetIndex() const
+sal_uInt16 ScExternalNameToken::GetIndex() const
 {
     return mnFileId;
 }
@@ -1018,7 +1018,7 @@ const String& ScExternalNameToken::GetString() const
     return maName;
 }
 
-BOOL ScExternalNameToken::operator==( const FormulaToken& r ) const
+sal_Bool ScExternalNameToken::operator==( const FormulaToken& r ) const
 {
     if ( !FormulaToken::operator==(r) )
         return false;
@@ -1044,7 +1044,7 @@ BOOL ScExternalNameToken::operator==( const FormulaToken& r ) const
 // ============================================================================
 
 ScJumpMatrix* ScJumpMatrixToken::GetJumpMatrix() const  { return pJumpMatrix; }
-BOOL ScJumpMatrixToken::operator==( const FormulaToken& r ) const
+sal_Bool ScJumpMatrixToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && pJumpMatrix == static_cast<const ScToken&>(r).GetJumpMatrix();
 }
@@ -1059,7 +1059,7 @@ const String &  ScEmptyCellToken::GetString() const
     static  String              aDummyString;
     return aDummyString; 
 }
-BOOL ScEmptyCellToken::operator==( const FormulaToken& r ) const
+sal_Bool ScEmptyCellToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) &&
         bInherited == static_cast< const ScEmptyCellToken & >(r).IsInherited() &&
@@ -1076,7 +1076,7 @@ ScMatrix* ScMatrixCellResultToken::GetMatrix()
 {
     return const_cast<ScMatrix*>(xMatrix.operator->());
 }
-BOOL ScMatrixCellResultToken::operator==( const FormulaToken& r ) const
+sal_Bool ScMatrixCellResultToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) &&
         xUpperLeft == static_cast<const ScMatrixCellResultToken &>(r).xUpperLeft &&
@@ -1084,7 +1084,7 @@ BOOL ScMatrixCellResultToken::operator==( const FormulaToken& r ) const
 }
 
 
-BOOL ScMatrixFormulaCellToken::operator==( const FormulaToken& r ) const
+sal_Bool ScMatrixFormulaCellToken::operator==( const FormulaToken& r ) const
 {
     const ScMatrixFormulaCellToken* p = dynamic_cast<const ScMatrixFormulaCellToken*>(&r);
     return p && ScMatrixCellResultToken::operator==( r ) &&
@@ -1136,7 +1136,7 @@ void ScMatrixFormulaCellToken::SetUpperLeftDouble( double f )
 
 double          ScHybridCellToken::GetDouble() const    { return fDouble; }
 const String &  ScHybridCellToken::GetString() const    { return aString; }
-BOOL ScHybridCellToken::operator==( const FormulaToken& r ) const
+sal_Bool ScHybridCellToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) &&
         fDouble == r.GetDouble() && aString == r.GetString() &&
@@ -1270,9 +1270,9 @@ bool ScTokenArray::AddFormulaToken(const com::sun::star::sheet::FormulaToken& _a
     }
     return bError;
 }
-BOOL ScTokenArray::ImplGetReference( ScRange& rRange, BOOL bValidOnly ) const
+sal_Bool ScTokenArray::ImplGetReference( ScRange& rRange, sal_Bool bValidOnly ) const
 {
-    BOOL bIs = FALSE;
+    sal_Bool bIs = sal_False;
     if ( pCode && nLen == 1 )
     {
         const FormulaToken* pToken = pCode[0];
@@ -1298,14 +1298,14 @@ BOOL ScTokenArray::ImplGetReference( ScRange& rRange, BOOL bValidOnly ) const
     return bIs;
 }
 
-BOOL ScTokenArray::IsReference( ScRange& rRange ) const
+sal_Bool ScTokenArray::IsReference( ScRange& rRange ) const
 {
-    return ImplGetReference( rRange, FALSE );
+    return ImplGetReference( rRange, sal_False );
 }
 
-BOOL ScTokenArray::IsValidReference( ScRange& rRange ) const
+sal_Bool ScTokenArray::IsValidReference( ScRange& rRange ) const
 {
-    return ImplGetReference( rRange, TRUE );
+    return ImplGetReference( rRange, sal_True );
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -1345,7 +1345,7 @@ ScTokenArray* ScTokenArray::Clone() const
     {
         pp = p->pCode = new FormulaToken*[ nLen ];
         memcpy( pp, pCode, nLen * sizeof( ScToken* ) );
-        for( USHORT i = 0; i < nLen; i++, pp++ )
+        for( sal_uInt16 i = 0; i < nLen; i++, pp++ )
         {
             *pp = (*pp)->Clone();
             (*pp)->IncRef();
@@ -1355,14 +1355,14 @@ ScTokenArray* ScTokenArray::Clone() const
     {
         pp = p->pRPN = new FormulaToken*[ nRPN ];
         memcpy( pp, pRPN, nRPN * sizeof( ScToken* ) );
-        for( USHORT i = 0; i < nRPN; i++, pp++ )
+        for( sal_uInt16 i = 0; i < nRPN; i++, pp++ )
         {
             FormulaToken* t = *pp;
             if( t->GetRef() > 1 )
             {
                 FormulaToken** p2 = pCode;
-                USHORT nIdx = 0xFFFF;
-                for( USHORT j = 0; j < nLen; j++, p2++ )
+                sal_uInt16 nIdx = 0xFFFF;
+                for( sal_uInt16 j = 0; j < nLen; j++, p2++ )
                 {
                     if( *p2 == t )
                     {
@@ -1569,7 +1569,7 @@ FormulaToken* ScTokenArray::MergeArray( )
         pCode[i] = NULL;
         t->DecRef();
     }
-    nLen = USHORT( nStart );
+    nLen = sal_uInt16( nStart );
     return AddMatrix( pArray );
 }
 
@@ -1578,7 +1578,7 @@ FormulaToken* ScTokenArray::MergeRangeReference( const ScAddress & rPos )
 {
     if (!pCode || !nLen)
         return NULL;
-    USHORT nIdx = nLen;
+    sal_uInt16 nIdx = nLen;
     FormulaToken *p1, *p2, *p3;      // ref, ocRange, ref
     // The actual types are checked in ExtendRangeReference().
     if (((p3 = PeekPrev(nIdx)) != 0) &&
@@ -1647,7 +1647,7 @@ FormulaToken* ScTokenArray::AddColRowName( const ScSingleRefData& rRef )
     return Add( new ScSingleRefToken( rRef, ocColRowName ) );
 }
 
-BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
+sal_Bool ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
         const ScAddress& rPos, ScDirection eDir )
 {
     SCCOL nCol = 0;
@@ -1658,40 +1658,40 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
             if ( rPos.Row() < MAXROW )
                 nRow = (nExtend = rPos.Row()) + 1;
             else
-                return FALSE;
+                return sal_False;
         break;
         case DIR_RIGHT :
             if ( rPos.Col() < MAXCOL )
                 nCol = static_cast<SCCOL>(nExtend = rPos.Col()) + 1;
             else
-                return FALSE;
+                return sal_False;
         break;
         case DIR_TOP :
             if ( rPos.Row() > 0 )
                 nRow = (nExtend = rPos.Row()) - 1;
             else
-                return FALSE;
+                return sal_False;
         break;
         case DIR_LEFT :
             if ( rPos.Col() > 0 )
                 nCol = static_cast<SCCOL>(nExtend = rPos.Col()) - 1;
             else
-                return FALSE;
+                return sal_False;
         break;
         default:
             DBG_ERRORFILE( "unknown Direction" );
-            return FALSE;
+            return sal_False;
     }
     if ( pRPN && nRPN )
     {
         FormulaToken* t = pRPN[nRPN-1];
         if ( t->GetType() == svByte )
         {
-            BYTE nParamCount = t->GetByte();
+            sal_uInt8 nParamCount = t->GetByte();
             if ( nParamCount && nRPN > nParamCount )
             {
-                BOOL bRet = FALSE;
-                USHORT nParam = nRPN - nParamCount - 1;
+                sal_Bool bRet = sal_False;
+                sal_uInt16 nParam = nRPN - nParamCount - 1;
                 for ( ; nParam < nRPN-1; nParam++ )
                 {
                     FormulaToken* p = pRPN[nParam];
@@ -1708,7 +1708,7 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
                                             && rRef.nRow > nExtend )
                                     {
                                         nExtend = rRef.nRow;
-                                        bRet = TRUE;
+                                        bRet = sal_True;
                                     }
                                 break;
                                 case DIR_RIGHT :
@@ -1717,7 +1717,7 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
                                             > nExtend )
                                     {
                                         nExtend = rRef.nCol;
-                                        bRet = TRUE;
+                                        bRet = sal_True;
                                     }
                                 break;
                                 case DIR_TOP :
@@ -1725,7 +1725,7 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
                                             && rRef.nRow < nExtend )
                                     {
                                         nExtend = rRef.nRow;
-                                        bRet = TRUE;
+                                        bRet = sal_True;
                                     }
                                 break;
                                 case DIR_LEFT :
@@ -1734,7 +1734,7 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
                                             < nExtend )
                                     {
                                         nExtend = rRef.nCol;
-                                        bRet = TRUE;
+                                        bRet = sal_True;
                                     }
                                 break;
                             }
@@ -1751,7 +1751,7 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
                                             && rRef.Ref2.nRow > nExtend )
                                     {
                                         nExtend = rRef.Ref2.nRow;
-                                        bRet = TRUE;
+                                        bRet = sal_True;
                                     }
                                 break;
                                 case DIR_RIGHT :
@@ -1760,7 +1760,7 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
                                             > nExtend )
                                     {
                                         nExtend = rRef.Ref2.nCol;
-                                        bRet = TRUE;
+                                        bRet = sal_True;
                                     }
                                 break;
                                 case DIR_TOP :
@@ -1768,7 +1768,7 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
                                             && rRef.Ref1.nRow < nExtend )
                                     {
                                         nExtend = rRef.Ref1.nRow;
-                                        bRet = TRUE;
+                                        bRet = sal_True;
                                     }
                                 break;
                                 case DIR_LEFT :
@@ -1777,7 +1777,7 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
                                             < nExtend )
                                     {
                                         nExtend = rRef.Ref1.nCol;
-                                        bRet = TRUE;
+                                        bRet = sal_True;
                                     }
                                 break;
                             }
@@ -1793,14 +1793,14 @@ BOOL ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend,
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
 void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos,
         const ScAddress& rNewPos )
 {
-    for ( USHORT j=0; j<nLen; ++j )
+    for ( sal_uInt16 j=0; j<nLen; ++j )
     {
         switch ( pCode[j]->GetType() )
         {
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 7905159e5..5a50fc66d 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -102,8 +102,8 @@ void ScUnitConverterData::BuildIndexString( String& rStr,
 #define CFGSTR_UNIT_TO		"ToUnit"
 #define CFGSTR_UNIT_FACTOR	"Factor"
 
-ScUnitConverter::ScUnitConverter( USHORT nInit, USHORT nDeltaP ) :
-        ScStrCollection( nInit, nDeltaP, FALSE )
+ScUnitConverter::ScUnitConverter( sal_uInt16 nInit, sal_uInt16 nDeltaP ) :
+        ScStrCollection( nInit, nDeltaP, sal_False )
 {
     //	read from configuration - "convert.ini" is no longer used
     //!	config item as member to allow change of values
@@ -161,18 +161,18 @@ ScUnitConverter::ScUnitConverter( USHORT nInit, USHORT nDeltaP ) :
     }
 }
 
-BOOL ScUnitConverter::GetValue( double& fValue, const String& rFromUnit,
+sal_Bool ScUnitConverter::GetValue( double& fValue, const String& rFromUnit,
                 const String& rToUnit ) const
 {
     ScUnitConverterData aSearch( rFromUnit, rToUnit );
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     if ( Search( &aSearch, nIndex ) )
     {
         fValue = ((const ScUnitConverterData*)(At( nIndex )))->GetValue();
-        return TRUE;
+        return sal_True;
     }
     fValue = 1.0;
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index aeef03325..c9f67a94b 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -49,12 +49,12 @@
 void ScUserListData::InitTokens()
 {
     sal_Unicode cSep = ScGlobal::cListDelimiter;
-    nTokenCount = (USHORT) aStr.GetTokenCount(cSep);
+    nTokenCount = (sal_uInt16) aStr.GetTokenCount(cSep);
     if (nTokenCount)
     {
         pSubStrings = new String[nTokenCount];
         pUpperSub   = new String[nTokenCount];
-        for (USHORT i=0; i<nTokenCount; i++)
+        for (sal_uInt16 i=0; i<nTokenCount; i++)
         {
             pUpperSub[i] = pSubStrings[i] = aStr.GetToken((xub_StrLen)i,cSep);
             ScGlobal::pCharClass->toUpper(pUpperSub[i]);
@@ -92,19 +92,19 @@ void ScUserListData::SetString( const String& rStr )
     InitTokens();
 }
 
-USHORT ScUserListData::GetSubCount() const
+sal_uInt16 ScUserListData::GetSubCount() const
 {
     return nTokenCount;
 }
 
-BOOL ScUserListData::GetSubIndex(const String& rSubStr, USHORT& rIndex) const
+sal_Bool ScUserListData::GetSubIndex(const String& rSubStr, sal_uInt16& rIndex) const
 {
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<nTokenCount; i++)
         if (rSubStr == pSubStrings[i])
         {
             rIndex = i;
-            return TRUE;
+            return sal_True;
         }
 
     String aUpStr = rSubStr;
@@ -113,13 +113,13 @@ BOOL ScUserListData::GetSubIndex(const String& rSubStr, USHORT& rIndex) const
         if (aUpStr == pUpperSub[i])
         {
             rIndex = i;
-            return TRUE;
+            return sal_True;
         }
 
-    return FALSE;
+    return sal_False;
 }
 
-String ScUserListData::GetSubStr(USHORT nIndex) const
+String ScUserListData::GetSubStr(sal_uInt16 nIndex) const
 {
     if (nIndex < nTokenCount)
         return pSubStrings[nIndex];
@@ -129,10 +129,10 @@ String ScUserListData::GetSubStr(USHORT nIndex) const
 
 StringCompare ScUserListData::Compare(const String& rSubStr1, const String& rSubStr2) const
 {
-    USHORT nIndex1;
-    USHORT nIndex2;
-    BOOL bFound1 = GetSubIndex(rSubStr1, nIndex1);
-    BOOL bFound2 = GetSubIndex(rSubStr2, nIndex2);
+    sal_uInt16 nIndex1;
+    sal_uInt16 nIndex2;
+    sal_Bool bFound1 = GetSubIndex(rSubStr1, nIndex1);
+    sal_Bool bFound2 = GetSubIndex(rSubStr2, nIndex2);
     if (bFound1)
     {
         if (bFound2)
@@ -155,10 +155,10 @@ StringCompare ScUserListData::Compare(const String& rSubStr1, const String& rSub
 
 StringCompare ScUserListData::ICompare(const String& rSubStr1, const String& rSubStr2) const
 {
-    USHORT nIndex1;
-    USHORT nIndex2;
-    BOOL bFound1 = GetSubIndex(rSubStr1, nIndex1);
-    BOOL bFound2 = GetSubIndex(rSubStr2, nIndex2);
+    sal_uInt16 nIndex1;
+    sal_uInt16 nIndex2;
+    sal_Bool bFound1 = GetSubIndex(rSubStr1, nIndex1);
+    sal_Bool bFound2 = GetSubIndex(rSubStr2, nIndex2);
     if (bFound1)
     {
         if (bFound2)
@@ -179,7 +179,7 @@ StringCompare ScUserListData::ICompare(const String& rSubStr1, const String& rSu
         return (StringCompare) ScGlobal::GetpTransliteration()->compareString( rSubStr1, rSubStr2 );
 }
 
-ScUserList::ScUserList(USHORT nLim, USHORT nDel) :
+ScUserList::ScUserList(sal_uInt16 nLim, sal_uInt16 nDel) :
     ScCollection	( nLim, nDel )
 {
     using namespace ::com::sun::star;
@@ -253,24 +253,24 @@ ScDataObject* ScUserList::Clone() const
 
 ScUserListData* ScUserList::GetData(const String& rSubStr) const
 {
-    USHORT	nIndex;
-    USHORT	i = 0;
+    sal_uInt16	nIndex;
+    sal_uInt16	i = 0;
     for (i=0; i < nCount; i++)
         if (((ScUserListData*)pItems[i])->GetSubIndex(rSubStr, nIndex))
             return (ScUserListData*)pItems[i];
     return NULL;
 }
 
-BOOL ScUserList::operator==( const ScUserList& r ) const
+sal_Bool ScUserList::operator==( const ScUserList& r ) const
 {
-    BOOL bEqual = (nCount == r.nCount);
+    sal_Bool bEqual = (nCount == r.nCount);
 
     if ( bEqual )
     {
         ScUserListData* pMyData    = NULL;
         ScUserListData* pOtherData = NULL;
 
-        for ( USHORT i=0; i<nCount && bEqual; i++)
+        for ( sal_uInt16 i=0; i<nCount && bEqual; i++)
         {
             pMyData    = (ScUserListData*)At(i);
             pOtherData = (ScUserListData*)r.At(i);
@@ -284,14 +284,14 @@ BOOL ScUserList::operator==( const ScUserList& r ) const
 }
 
 
-BOOL ScUserList::HasEntry( const String& rStr ) const
+sal_Bool ScUserList::HasEntry( const String& rStr ) const
 {
-    for ( USHORT i=0; i<nCount; i++)
+    for ( sal_uInt16 i=0; i<nCount; i++)
     {
         const ScUserListData* pMyData = (ScUserListData*) At(i);
         if ( pMyData->aStr == rStr )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 518f713b6..62241e8f3 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -52,7 +52,7 @@ using namespace com::sun::star::uno;
 
 TYPEINIT1(ScTpViewItem,	SfxPoolItem);
 
-#define SC_VERSION ((USHORT)302)
+#define SC_VERSION ((sal_uInt16)302)
 
 
 //========================================================================
@@ -151,7 +151,7 @@ void ScViewOptions::SetDefaults()
     aOptArr[ VOPT_FORMULAS	  ] =
     aOptArr[ VOPT_SYNTAX	  ] =
     aOptArr[ VOPT_HELPLINES   ] =
-    aOptArr[ VOPT_BIGHANDLES  ] = FALSE;
+    aOptArr[ VOPT_BIGHANDLES  ] = sal_False;
     aOptArr[ VOPT_NOTES		  ] =
     aOptArr[ VOPT_NULLVALS	  ] =
     aOptArr[ VOPT_VSCROLL	  ] =
@@ -163,7 +163,7 @@ void ScViewOptions::SetDefaults()
     aOptArr[ VOPT_ANCHOR	  ] =
     aOptArr[ VOPT_PAGEBREAKS  ] =
     aOptArr[ VOPT_SOLIDHANDLES] =
-    aOptArr[ VOPT_CLIPMARKS	  ] = TRUE;
+    aOptArr[ VOPT_CLIPMARKS	  ] = sal_True;
 
     aModeArr[VOBJ_TYPE_OLE ]  =
     aModeArr[VOBJ_TYPE_CHART] =
@@ -189,7 +189,7 @@ Color ScViewOptions::GetGridColor( String* pStrName ) const
 
 const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy )
 {
-    USHORT i;
+    sal_uInt16 i;
 
     for ( i=0; i<MAX_OPT; i++ )	 aOptArr [i] = rCpy.aOptArr[i];
     for ( i=0; i<MAX_TYPE; i++ ) aModeArr[i] = rCpy.aModeArr[i];
@@ -205,8 +205,8 @@ const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy )
 
 int ScViewOptions::operator==( const ScViewOptions& rOpt ) const
 {
-    BOOL	bEqual = TRUE;
-    USHORT	i;
+    sal_Bool	bEqual = sal_True;
+    sal_uInt16	i;
 
     for ( i=0; i<MAX_OPT && bEqual; i++ )  bEqual = (aOptArr [i] == rOpt.aOptArr[i]);
     for ( i=0; i<MAX_TYPE && bEqual; i++ ) bEqual = (aModeArr[i] == rOpt.aModeArr[i]);
@@ -220,7 +220,7 @@ int ScViewOptions::operator==( const ScViewOptions& rOpt ) const
 
 //------------------------------------------------------------------------
 
-SvxGridItem* ScViewOptions::CreateGridItem( USHORT nId /* = SID_ATTR_GRID_OPTIONS */ ) const
+SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OPTIONS */ ) const
 {
     SvxGridItem* pItem = new SvxGridItem( nId );
 
@@ -242,13 +242,13 @@ SvxGridItem* ScViewOptions::CreateGridItem( USHORT nId /* = SID_ATTR_GRID_OPTION
 //      ScTpViewItem - Daten fuer die ViewOptions-TabPage
 //========================================================================
 
-//UNUSED2008-05  ScTpViewItem::ScTpViewItem( USHORT nWhichP ) : SfxPoolItem( nWhichP )
+//UNUSED2008-05  ScTpViewItem::ScTpViewItem( sal_uInt16 nWhichP ) : SfxPoolItem( nWhichP )
 //UNUSED2008-05  {
 //UNUSED2008-05  }
 
 //------------------------------------------------------------------------
 
-ScTpViewItem::ScTpViewItem( USHORT nWhichP, const ScViewOptions& rOpt )
+ScTpViewItem::ScTpViewItem( sal_uInt16 nWhichP, const ScViewOptions& rOpt )
     :   SfxPoolItem ( nWhichP ),
         theOptions	( rOpt )
 {
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index ba286d36b..d549180ed 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -54,7 +54,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat) :
 {
 }
 
-ScNumFormatAbbrev::ScNumFormatAbbrev(ULONG nFormat,
+ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uLong nFormat,
                                      SvNumberFormatter& rFormatter)
 {
     PutFormatIndex(nFormat, rFormatter);
@@ -62,7 +62,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(ULONG nFormat,
 
 void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet )
 {
-    USHORT nSysLang, nLang;
+    sal_uInt16 nSysLang, nLang;
     rStream.ReadByteString( sFormatstring, eByteStrSet );
     rStream >> nSysLang >> nLang;
     eLnge = (LanguageType) nLang;
@@ -74,10 +74,10 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet )
 void ScNumFormatAbbrev::Save( SvStream& rStream, CharSet eByteStrSet ) const
 {
     rStream.WriteByteString( sFormatstring, eByteStrSet );
-    rStream << (USHORT) eSysLnge << (USHORT) eLnge;
+    rStream << (sal_uInt16) eSysLnge << (sal_uInt16) eLnge;
 }
 
-void ScNumFormatAbbrev::PutFormatIndex(ULONG nFormat,
+void ScNumFormatAbbrev::PutFormatIndex(sal_uLong nFormat,
                                        SvNumberFormatter& rFormatter)
 {
     const SvNumberformat* pFormat = rFormatter.GetEntry(nFormat);
@@ -96,10 +96,10 @@ void ScNumFormatAbbrev::PutFormatIndex(ULONG nFormat,
     }
 }
 
-ULONG ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter)
+sal_uLong ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter)
 {
     short nType;
-    BOOL bNewInserted;
+    sal_Bool bNewInserted;
     xub_StrLen nCheckPos;
     return rFormatter.GetIndexPuttingAndConverting( sFormatstring, eLnge,
             eSysLnge, nType, bNewInserted, nCheckPos);
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 965324d4e..82e1387ce 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -47,7 +47,7 @@
 #include "ftools.hxx"
 
 FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc,
-    const ScAddress& rOutPos, const CharSet eNach, UINT32 nDifOption )
+    const ScAddress& rOutPos, const CharSet eNach, sal_uInt32 nDifOption )
 {
     SCCOL		nEndCol;
     SCROW		nEndRow;
@@ -62,7 +62,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* p
 
 
 FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
-    const ScRange&rRange, const CharSet eCharSet, UINT32 nDifOption )
+    const ScRange&rRange, const CharSet eCharSet, sal_uInt32 nDifOption )
 {
     DBG_ASSERT( rRange.aStart <= rRange.aEnd, "*ScExportDif(): Range unsortiert!" );
     DBG_ASSERTWARNING( rRange.aStart.Tab() == rRange.aEnd.Tab(),
@@ -75,11 +75,11 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
     sal_Unicode cStrDelim('"');
     ByteString aStrDelimEncoded;    // only used if not Unicode
     UniString aStrDelimDecoded;     // only used if context encoding
-    BOOL bContextOrNotAsciiEncoding;
+    sal_Bool bContextOrNotAsciiEncoding;
     if ( eCharSet == RTL_TEXTENCODING_UNICODE )
     {
         rOut.StartWritingUnicodeText();
-        bContextOrNotAsciiEncoding = FALSE;
+        bContextOrNotAsciiEncoding = sal_False;
     }
     else
     {
@@ -95,7 +95,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
                 aStrDelimDecoded = String( aStrDelimEncoded, eCharSet );
         }
         else
-            bContextOrNotAsciiEncoding = FALSE;
+            bContextOrNotAsciiEncoding = sal_False;
     }
 
     const sal_Char*		p2DoubleQuotes_LF = "\"\"\n";
@@ -116,7 +116,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
 
     double				fVal;
 
-    const BOOL			bPlain = ( nDifOption == SC_DIFOPT_PLAIN );
+    const sal_Bool			bPlain = ( nDifOption == SC_DIFOPT_PLAIN );
 
     ScProgress          aPrgrsBar( pDoc->GetDocumentShell(), ScGlobal::GetRscString( STR_LOAD_DOC ), nNumRows );
 
@@ -184,7 +184,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
                             fVal = ( ( ScValueCell * ) pAkt )->GetValue();
                             aOS += String( ::rtl::math::doubleToUString(
                                         fVal, rtl_math_StringFormat_G, 14, '.',
-                                        TRUE));
+                                        sal_True));
                         }
                         else
                         {
@@ -212,7 +212,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
                                 fVal = ( ( ScFormulaCell * ) pAkt )->GetValue();
                                 aOS += String( ::rtl::math::doubleToUString(
                                             fVal, rtl_math_StringFormat_G, 14,
-                                            '.', TRUE));
+                                            '.', sal_True));
                             }
                             else
                             {
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index f39e14c4e..23e08b602 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -61,20 +61,20 @@ const sal_Unicode pKey1_0[]     = { '1', ',', '0', 0 };
 
 
 FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos,
-                        const CharSet eVon, UINT32 nDifOption )
+                        const CharSet eVon, sal_uInt32 nDifOption )
 {
     DifParser	aDifParser( rIn, nDifOption, *pDoc, eVon );
 
-    const BOOL	bPlain = aDifParser.IsPlain();
+    const sal_Bool	bPlain = aDifParser.IsPlain();
 
     SCTAB		nBaseTab = rInsPos.Tab();
 
     TOPIC		eTopic = T_UNKNOWN;
-    BOOL		bSyntErrWarn = FALSE;
-    BOOL		bOverflowWarn = FALSE;
+    sal_Bool		bSyntErrWarn = sal_False;
+    sal_Bool		bOverflowWarn = sal_False;
 
     String&	    rData = aDifParser.aData;
-    BOOL		bData = FALSE;
+    sal_Bool		bData = sal_False;
 
     SCCOL		nNumCols = 0;
     SCROW		nNumRows = 0;
@@ -96,7 +96,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
             case T_TABLE:
             {
                 if( aDifParser.nVector != 0 || aDifParser.nVal != 1 )
-                    bSyntErrWarn = TRUE;
+                    bSyntErrWarn = sal_True;
                 if( bData )
                     pDoc->RenameTab( nBaseTab, rData );
             }
@@ -104,7 +104,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
             case T_VECTORS:
             {
                 if( aDifParser.nVector != 0 )
-                    bSyntErrWarn = TRUE;
+                    bSyntErrWarn = sal_True;
                 if( aDifParser.nVal > MAXCOL + 1 )
                     nNumCols = SCCOL_MAX;
                 else
@@ -114,7 +114,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
             case T_TUPLES:
             {
                 if( aDifParser.nVector != 0 )
-                    bSyntErrWarn = TRUE;
+                    bSyntErrWarn = sal_True;
                 if( aDifParser.nVal > MAXROW + 1 )
                     nNumRows = SCROW_MAX;
                 else
@@ -124,7 +124,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
             case T_DATA:
             {
                 if( aDifParser.nVector != 0 || aDifParser.nVal != 0 )
-                    bSyntErrWarn = TRUE;
+                    bSyntErrWarn = sal_True;
             }
                 break;
             case T_LABEL:
@@ -204,10 +204,10 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
                             pCell = new ScStringCell( aTmp );
                         }
 
-                        pDoc->PutCell( nColCnt, nRowCnt, nBaseTab, pCell, ( BOOL ) TRUE );
+                        pDoc->PutCell( nColCnt, nRowCnt, nBaseTab, pCell, ( sal_Bool ) sal_True );
                     }
                     else
-                        bOverflowWarn = TRUE;
+                        bOverflowWarn = sal_True;
 
                     nColCnt++;
                     break;
@@ -220,11 +220,11 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
                         if( rData.Len() > 0 )
                         {
                             pDoc->PutCell( nColCnt, nRowCnt, nBaseTab,
-                                ScBaseCell::CreateTextCell( rData, pDoc ), ( BOOL ) TRUE );
+                                ScBaseCell::CreateTextCell( rData, pDoc ), ( sal_Bool ) sal_True );
                         }
                     }
                     else
-                        bOverflowWarn = TRUE;
+                        bOverflowWarn = sal_True;
 
                     nColCnt++;
                     break;
@@ -254,7 +254,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
 }
 
 
-DifParser::DifParser( SvStream& rNewIn, const UINT32 nOption, ScDocument& rDoc, CharSet e ) :
+DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rDoc, CharSet e ) :
     rIn( rNewIn )
 {
     eCharSet = e;
@@ -345,8 +345,8 @@ TOPIC DifParser::GetNextTopic( void )
             case S_START:
             {
                 const sal_Unicode*	pRef;
-                UINT16			nCnt = 0;
-                BOOL			bSearch = TRUE;
+                sal_uInt16			nCnt = 0;
+                sal_Bool			bSearch = sal_True;
 
                 pRef = ppKeys[ nCnt ];
 
@@ -355,14 +355,14 @@ TOPIC DifParser::GetNextTopic( void )
                     if( aLine == pRef )
                     {
                         eRet = pTopics[ nCnt ];
-                        bSearch = FALSE;
+                        bSearch = sal_False;
                     }
                     else
                     {
                         nCnt++;
                         pRef = ppKeys[ nCnt ];
                         if( !*pRef )
-                            bSearch = FALSE;
+                            bSearch = sal_False;
                     }
                 }
 
@@ -626,7 +626,7 @@ DATASET	DifParser::GetNextDataset( void )
 }
 
 
-const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRet )
+const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet )
 {
     // eat leading whitespace, not specified, but seen in the wild
     while (*pStart == ' ' || *pStart == '\t')
@@ -635,7 +635,7 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRe
     sal_Unicode		cAkt = *pStart;
 
     if( IsNumber( cAkt ) )
-        rRet = ( UINT32 ) ( cAkt - '0' );
+        rRet = ( sal_uInt32 ) ( cAkt - '0' );
     else
         return NULL;
 
@@ -645,7 +645,7 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRe
     while( IsNumber( cAkt ) && rRet < ( 0xFFFFFFFF / 10 ) )
     {
         rRet *= 10;
-        rRet += ( UINT32 ) ( cAkt - '0' );
+        rRet += ( sal_uInt32 ) ( cAkt - '0' );
 
         pStart++;
         cAkt = *pStart;
@@ -655,18 +655,18 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRe
 }
 
 
-BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
+sal_Bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
     {
     double					fNewVal = 0.0;
-    BOOL					bNeg = FALSE;
+    sal_Bool					bNeg = sal_False;
     double                  fFracPos = 1.0;
-    INT32					nExp = 0;
-    BOOL					bExpNeg = FALSE;
-    BOOL					bExpOverflow = FALSE;
-    static const UINT16		nExpLimit = 4096;	// ACHTUNG: muss genauer ermittelt werden!
+    sal_Int32					nExp = 0;
+    sal_Bool					bExpNeg = sal_False;
+    sal_Bool					bExpOverflow = sal_False;
+    static const sal_uInt16		nExpLimit = 4096;	// ACHTUNG: muss genauer ermittelt werden!
 
     sal_Unicode				cAkt;
-    BOOL					bRet = FALSE;
+    sal_Bool					bRet = sal_False;
 
     enum STATE { S_FIRST, S_PRE, S_POST, S_EXP_FIRST, S_EXP, S_END, S_FINDEND };
 
@@ -727,7 +727,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
                             eS = S_EXP;
                             break;
                         case 0x00:				// IsNumberEnding( cAkt )
-                            bRet = TRUE;		// no
+                            bRet = sal_True;		// no
                         default:				// break!
                             eS = S_END;
                     }
@@ -748,7 +748,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
                             eS = S_EXP_FIRST;
                             break;
                         case 0x00:				// IsNumberEnding( cAkt )
-                            bRet = TRUE;		// no
+                            bRet = sal_True;		// no
                         default:				// break!
                             eS = S_END;
                     }
@@ -760,7 +760,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
                     if( nExp < nExpLimit )
                     {
                         nExp *= 10;
-                        nExp += ( UINT16 ) ( cAkt - '0' );
+                        nExp += ( sal_uInt16 ) ( cAkt - '0' );
                     }
                     eS = S_EXP;
                 }
@@ -784,11 +784,11 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
                     if( nExp < ( 0xFFFF / 10 ) )
                     {
                         nExp *= 10;
-                        nExp += ( UINT16 ) ( cAkt - '0' );
+                        nExp += ( sal_uInt16 ) ( cAkt - '0' );
                     }
                     else
                     {
-                        bExpOverflow = TRUE;
+                        bExpOverflow = sal_True;
                         eS = S_FINDEND;
                     }
                 }
@@ -801,7 +801,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
             case S_FINDEND:
                 if( IsNumberEnding( cAkt ) )
                 {
-                    bRet = TRUE;		// damit sinnvoll weitergeparst werden kann
+                    bRet = sal_True;		// damit sinnvoll weitergeparst werden kann
                     eS = S_END;
                 }
                 break;
@@ -868,7 +868,7 @@ void DifColumn::SetLogical( SCROW nRow )
 }
 
 
-void DifColumn::SetNumFormat( SCROW nRow, const UINT32 nNumFormat )
+void DifColumn::SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat )
 {
     DBG_ASSERT( ValidRow(nRow), "*DifColumn::SetNumFormat(): Row zu gross!" );
 
@@ -894,7 +894,7 @@ void DifColumn::SetNumFormat( SCROW nRow, const UINT32 nNumFormat )
 }
 
 
-void DifColumn::NewEntry( const SCROW nPos, const UINT32 nNumFormat )
+void DifColumn::NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat )
 {
     pAkt = new ENTRY;
     pAkt->nStart = pAkt->nEnd = nPos;
@@ -938,7 +938,7 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab )
 }
 
 
-DifAttrCache::DifAttrCache( const BOOL bNewPlain )
+DifAttrCache::DifAttrCache( const sal_Bool bNewPlain )
 {
     bPlain = bNewPlain;
     ppCols = new DifColumn *[ MAXCOL + 1 ];
@@ -957,7 +957,7 @@ DifAttrCache::~DifAttrCache()
 }
 
 
-void DifAttrCache::SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat )
+void DifAttrCache::SetNumFormat( const SCCOL nCol, const SCROW nRow, const sal_uInt32 nNumFormat )
 {
     DBG_ASSERT( ValidCol(nCol), "-DifAttrCache::SetNumFormat(): Col zu gross!" );
     DBG_ASSERT( !bPlain, "*DifAttrCache::SetNumFormat(): sollte nicht Plain sein!" );
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index b62ebea9d..c6fa3afc7 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -282,7 +282,7 @@ void XclImpColRowSettings::ConvertHiddenFlags( SCTAB nScTab )
     // hide the columns
     for( SCCOL nScCol = 0; nScCol <= MAXCOL; ++nScCol )
         if( ::get_flag( maColFlags[ nScCol ], EXC_COLROW_HIDDEN ) )
-            rDoc.ShowCol( nScCol, nScTab, FALSE );
+            rDoc.ShowCol( nScCol, nScTab, sal_False );
 
     // #i38093# rows hidden by filter need extra flag
     SCROW nFirstFilterScRow = SCROW_MAX;
@@ -304,7 +304,7 @@ void XclImpColRowSettings::ConvertHiddenFlags( SCTAB nScTab )
         if( ::get_flag( maRowFlags[ nScRow ], EXC_COLROW_HIDDEN ) )
         {
             // hide the row
-            rDoc.ShowRow( nScRow, nScTab, FALSE );
+            rDoc.ShowRow( nScRow, nScTab, sal_False );
             // #i38093# rows hidden by filter need extra flag
             if( (nFirstFilterScRow <= nScRow) && (nScRow <= nLastFilterScRow) )
                 rDoc.SetRowFiltered(nScRow, nScRow, nScTab, true);
@@ -313,6 +313,6 @@ void XclImpColRowSettings::ConvertHiddenFlags( SCTAB nScTab )
 
     // #i47438# if default row format is hidden, hide remaining rows
     if( ::get_flag( mnDefRowFlags, EXC_DEFROW_HIDDEN ) && (mnLastScRow < MAXROW) )
-        rDoc.ShowRows( mnLastScRow + 1, MAXROW, nScTab, FALSE );
+        rDoc.ShowRows( mnLastScRow + 1, MAXROW, nScTab, sal_False );
 }
 
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index ca7a5fb82..afb65a04c 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -196,8 +196,8 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
     SCTAB	nC;
     String	aTmpString;
     SCTAB  nScTabCount     = rTabInfo.GetScTabCount();
-    UINT16  nExcTabCount    = rTabInfo.GetXclTabCount();
-    UINT16  nCodenames      = static_cast< UINT16 >( GetExtDocOptions().GetCodeNameCount() );
+    sal_uInt16  nExcTabCount    = rTabInfo.GetXclTabCount();
+    sal_uInt16  nCodenames      = static_cast< sal_uInt16 >( GetExtDocOptions().GetCodeNameCount() );
 
     SfxObjectShell* pShell = GetDocShell();
     sal_uInt16 nWriteProtHash = pShell ? pShell->GetModifyPasswordHash() : 0;
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 159e88f97..fcb846f10 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -144,7 +144,7 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
     SotStorageStreamRef xStrgStrm;
     if( SotStorage::IsStorageFile( pMedStrm ) )
     {
-        xRootStrg = new SotStorage( pMedStrm, FALSE );
+        xRootStrg = new SotStorage( pMedStrm, sal_False );
         if( xRootStrg->GetError() )
             xRootStrg = 0;
     }
@@ -217,10 +217,10 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
 
 
 static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument,
-        SvStream* pMedStrm, BOOL bBiff8, CharSet eNach )
+        SvStream* pMedStrm, sal_Bool bBiff8, CharSet eNach )
 {
     // try to open an OLE storage
-    SotStorageRef xRootStrg = new SotStorage( pMedStrm, FALSE );
+    SotStorageRef xRootStrg = new SotStorage( pMedStrm, sal_False );
     if( xRootStrg->GetError() ) return eERR_OPEN;
 
     // create BIFF dependent strings
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index cf22c81a3..e8cae6ee8 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -45,8 +45,8 @@
 
 using ::std::vector;
 
-const UINT16 ExcelToSc::nRowMask = 0x3FFF;
-const UINT16 ExcelToSc::nLastInd = 399;
+const sal_uInt16 ExcelToSc::nRowMask = 0x3FFF;
+const sal_uInt16 ExcelToSc::nLastInd = 399;
 
 
 
@@ -54,16 +54,16 @@ const UINT16 ExcelToSc::nLastInd = 399;
 void ImportExcel::Formula25()
 {
     XclAddress aXclPos;
-    UINT16  nXF = 0, nFormLen;
+    sal_uInt16  nXF = 0, nFormLen;
     double	fCurVal;
-    BYTE	nAttr0, nFlag0;
-    BOOL	bShrFmla;
+    sal_uInt8	nAttr0, nFlag0;
+    sal_Bool	bShrFmla;
 
     aIn >> aXclPos;
 
     if( GetBiff() == EXC_BIFF2 )
     {//						BIFF2
-        BYTE nDummy;
+        sal_uInt8 nDummy;
 
         aIn.Ignore( 3 );
 
@@ -71,7 +71,7 @@ void ImportExcel::Formula25()
         aIn.Ignore( 1 );
         aIn >> nDummy;
         nFormLen = nDummy;
-        bShrFmla = FALSE;
+        bShrFmla = sal_False;
         nAttr0 = 0x01;	// Always calculate
     }
     else
@@ -99,9 +99,9 @@ void ImportExcel::Formula3()
 void ImportExcel::Formula4()
 {
     XclAddress aXclPos;
-    UINT16  nXF, nFormLen;
+    sal_uInt16  nXF, nFormLen;
     double	fCurVal;
-    BYTE	nFlag0;
+    sal_uInt8	nFlag0;
 
     aIn >> aXclPos >> nXF >> fCurVal >> nFlag0;
     aIn.Ignore( 1 );
@@ -109,12 +109,12 @@ void ImportExcel::Formula4()
 
     nLastXF = nXF;
 
-    Formula( aXclPos, nXF, nFormLen, fCurVal, FALSE );
+    Formula( aXclPos, nXF, nFormLen, fCurVal, sal_False );
 }
 
 
 void ImportExcel::Formula( const XclAddress& rXclPos,
-    UINT16 nXF, UINT16 nFormLen, double& rCurVal, BOOL bShrFmla )
+    sal_uInt16 nXF, sal_uInt16 nFormLen, double& rCurVal, sal_Bool bShrFmla )
 {
     ConvErr eErr = ConvOK;
 
@@ -123,14 +123,14 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
     {
         // jetzt steht Lesemarke auf Formel, Laenge in nFormLen
         const ScTokenArray* pErgebnis = 0;
-        BOOL				bConvert;
+        sal_Bool				bConvert;
 
         pFormConv->Reset( aScPos );
 
         if( bShrFmla )
             bConvert = !pFormConv->GetShrFmla( pErgebnis, maStrm, nFormLen );
         else
-            bConvert = TRUE;
+            bConvert = sal_True;
 
         if( bConvert )
             eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
@@ -140,7 +140,7 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
         if( pErgebnis )
         {
             pZelle = new ScFormulaCell( pD, aScPos, pErgebnis );
-            pD->PutCell( aScPos.Col(), aScPos.Row(), aScPos.Tab(), pZelle, (BOOL)TRUE );
+            pD->PutCell( aScPos.Col(), aScPos.Row(), aScPos.Tab(), pZelle, (sal_Bool)sal_True );
         }
         else
         {
@@ -201,23 +201,23 @@ void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis )
 ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
 {
     RootData&       rR = GetOldRoot();
-    BYTE			nOp, nLen, nByte;
-    UINT16          nUINT16;
-    INT16			nINT16;
+    sal_uInt8			nOp, nLen, nByte;
+    sal_uInt16          nUINT16;
+    sal_Int16			nINT16;
     double			fDouble;
     String			aString;
-    BOOL			bError = FALSE;
-    BOOL			bArrayFormula = FALSE;
+    sal_Bool			bError = sal_False;
+    sal_Bool			bArrayFormula = sal_False;
     TokenId			nMerk0;
-    const BOOL		bRangeName = eFT == FT_RangeName;
-    const BOOL		bSharedFormula = eFT == FT_SharedFormula;
-    const BOOL		bRNorSF = bRangeName || bSharedFormula;
+    const sal_Bool		bRangeName = eFT == FT_RangeName;
+    const sal_Bool		bSharedFormula = eFT == FT_SharedFormula;
+    const sal_Bool		bRNorSF = bRangeName || bSharedFormula;
 
     ScSingleRefData		aSRD;
     ScComplexRefData		aCRD;
     ExtensionTypeVec    aExtensions;
 
-    bExternName = FALSE;
+    bExternName = sal_False;
 
     if( eStatus != ConvOK )
     {
@@ -255,7 +255,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
 
                 aIn.Ignore( nUINT16 );
 
-                bArrayFormula = TRUE;
+                bArrayFormula = sal_True;
                 break;
             case 0x03: // Addition								[312 264]
                 aStack >> nMerk0;
@@ -374,8 +374,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                 break;
             case 0x19: // Special Attribute						[327 279]
             {
-                UINT16	nData, nFakt;
-                BYTE	nOpt;
+                sal_uInt16	nData, nFakt;
+                sal_uInt8	nOpt;
 
                 aIn >> nOpt;
 
@@ -545,7 +545,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                 aSRD.nCol = static_cast<SCsCOL>(nByte);
                 aSRD.nRow = nUINT16 & 0x3FFF;
                 aSRD.nRelTab = 0;
-                aSRD.SetTabRel( TRUE );
+                aSRD.SetTabRel( sal_True );
                 aSRD.SetFlag3D( bRangeName );
 
                 ExcRelToScRel( nUINT16, nByte, aSRD, bRangeName );
@@ -556,8 +556,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                     case 0x6A:
                     case 0x2A: // Deleted Cell Reference	 	[323 273]
                         // no information which part is deleted, set both
-                        aSRD.SetColDeleted( TRUE );
-                        aSRD.SetRowDeleted( TRUE );
+                        aSRD.SetColDeleted( sal_True );
+                        aSRD.SetRowDeleted( sal_True );
                 }
 
                 aStack << aPool.Store( aSRD );
@@ -569,16 +569,16 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
             case 0x6B:
             case 0x2B: // Deleted Area Refernce					[323 273]
             {
-                UINT16			nRowFirst, nRowLast;
-                UINT8			nColFirst, nColLast;
+                sal_uInt16			nRowFirst, nRowLast;
+                sal_uInt8			nColFirst, nColLast;
                 ScSingleRefData&	rSRef1 = aCRD.Ref1;
                 ScSingleRefData&	rSRef2 = aCRD.Ref2;
 
                 aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
 
                 rSRef1.nRelTab = rSRef2.nRelTab = 0;
-                rSRef1.SetTabRel( TRUE );
-                rSRef2.SetTabRel( TRUE );
+                rSRef1.SetTabRel( sal_True );
+                rSRef2.SetTabRel( sal_True );
                 rSRef1.SetFlag3D( bRangeName );
                 rSRef2.SetFlag3D( bRangeName );
 
@@ -596,10 +596,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                     case 0x6B:
                     case 0x2B: // Deleted Area Refernce			[323 273]
                         // no information which part is deleted, set all
-                        rSRef1.SetColDeleted( TRUE );
-                        rSRef1.SetRowDeleted( TRUE );
-                        rSRef2.SetColDeleted( TRUE );
-                        rSRef2.SetRowDeleted( TRUE );
+                        rSRef1.SetColDeleted( sal_True );
+                        rSRef1.SetRowDeleted( sal_True );
+                        rSRef2.SetColDeleted( sal_True );
+                        rSRef2.SetRowDeleted( sal_True );
                 }
 
                 aStack << aPool.Store( aCRD );
@@ -627,7 +627,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                 aIn >> nUINT16 >> nByte;	// >> Attribute, Row >> Col
 
                 aSRD.nRelTab = 0;
-                aSRD.SetTabRel( TRUE );
+                aSRD.SetTabRel( sal_True );
                 aSRD.SetFlag3D( bRangeName );
 
                 ExcRelToScRel( nUINT16, nByte, aSRD, bRNorSF );
@@ -639,12 +639,12 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
             case 0x6D:
             case 0x2D: // Area Reference Within a Name			[324    ]
             {	   // Area Reference Within a Shared Formula[    274]
-                UINT16					nRowFirst, nRowLast;
-                UINT8					nColFirst, nColLast;
+                sal_uInt16					nRowFirst, nRowLast;
+                sal_uInt8					nColFirst, nColLast;
 
                 aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0;
-                aCRD.Ref1.SetTabRel( TRUE );
-                aCRD.Ref2.SetTabRel( TRUE );
+                aCRD.Ref1.SetTabRel( sal_True );
+                aCRD.Ref2.SetTabRel( sal_True );
                 aCRD.Ref1.SetFlag3D( bRangeName );
                 aCRD.Ref2.SetFlag3D( bRangeName );
 
@@ -692,12 +692,12 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                 {
                     const ExtName* pExtName = rR.pExtNameBuff->GetNameByIndex( nINT16, nUINT16 );
                     if( pExtName && pExtName->IsDDE() &&
-                        rR.pExtSheetBuff->IsLink( ( UINT16 ) nINT16 ) )
+                        rR.pExtSheetBuff->IsLink( ( sal_uInt16 ) nINT16 ) )
                     {
                         String			aAppl, aExtDoc;
                         TokenId			nPar1, nPar2;
 
-                        rR.pExtSheetBuff->GetLink( ( UINT16 ) nINT16 , aAppl, aExtDoc );
+                        rR.pExtSheetBuff->GetLink( ( sal_uInt16 ) nINT16 , aAppl, aExtDoc );
                         nPar1 = aPool.Store( aAppl );
                         nPar2 = aPool.Store( aExtDoc );
                         nMerk0 = aPool.Store( pExtName->aName );
@@ -722,9 +722,9 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
             case 0x7C:
             case 0x3C: // Deleted 3-D Cell Reference			[    277]
             {
-                UINT16			nTabFirst, nTabLast, nRow;
-                INT16			nExtSheet;
-                BYTE			nCol;
+                sal_uInt16			nTabFirst, nTabLast, nRow;
+                sal_Int16			nExtSheet;
+                sal_uInt8			nCol;
 
                 aIn >> nExtSheet;
                 aIn.Ignore( 8 );
@@ -748,8 +748,8 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                 if( nExtSheet <= 0 )
                 {	// in aktuellem Workbook
                     aSRD.nTab = static_cast<SCTAB>(nTabFirst);
-                    aSRD.SetFlag3D( TRUE );
-                    aSRD.SetTabRel( FALSE );
+                    aSRD.SetFlag3D( sal_True );
+                    aSRD.SetTabRel( sal_False );
 
                     ExcRelToScRel( nRow, nCol, aSRD, bRangeName );
 
@@ -759,11 +759,11 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                         case 0x7C:
                         case 0x3C: // Deleted 3-D Cell Reference	[    277]
                             // no information which part is deleted, set both
-                            aSRD.SetColDeleted( TRUE );
-                            aSRD.SetRowDeleted( TRUE );
+                            aSRD.SetColDeleted( sal_True );
+                            aSRD.SetRowDeleted( sal_True );
                     }
                     if ( !ValidTab(static_cast<SCTAB>(nTabFirst)) )
-                        aSRD.SetTabDeleted( TRUE );
+                        aSRD.SetTabDeleted( sal_True );
 
                     if( nTabLast != nTabFirst )
                     {
@@ -785,9 +785,9 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
             case 0x7D:
             case 0x3D: // Deleted 3-D Area Reference			[    277]
             {
-                UINT16		nTabFirst, nTabLast, nRowFirst, nRowLast;
-                INT16		nExtSheet;
-                BYTE		nColFirst, nColLast;
+                sal_uInt16		nTabFirst, nTabLast, nRowFirst, nRowLast;
+                sal_Int16		nExtSheet;
+                sal_uInt8		nColFirst, nColLast;
 
                 aIn >> nExtSheet;
                 aIn.Ignore( 8 );
@@ -818,10 +818,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
 
                     rR1.nTab = static_cast<SCTAB>(nTabFirst);
                     rR2.nTab = static_cast<SCTAB>(nTabLast);
-                    rR1.SetFlag3D( TRUE );
-                    rR1.SetTabRel( FALSE );
+                    rR1.SetFlag3D( sal_True );
+                    rR1.SetTabRel( sal_False );
                     rR2.SetFlag3D( nTabFirst != nTabLast );
-                    rR2.SetTabRel( FALSE );
+                    rR2.SetTabRel( sal_False );
 
                     ExcRelToScRel( nRowFirst, nColFirst, aCRD.Ref1, bRangeName );
                     ExcRelToScRel( nRowLast, nColLast, aCRD.Ref2, bRangeName );
@@ -837,21 +837,21 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
                         case 0x7D:
                         case 0x3D: // Deleted 3-D Area Reference	[    277]
                                // no information which part is deleted, set all
-                            rR1.SetColDeleted( TRUE );
-                            rR1.SetRowDeleted( TRUE );
-                            rR2.SetColDeleted( TRUE );
-                            rR2.SetRowDeleted( TRUE );
+                            rR1.SetColDeleted( sal_True );
+                            rR1.SetRowDeleted( sal_True );
+                            rR2.SetColDeleted( sal_True );
+                            rR2.SetRowDeleted( sal_True );
                     }
                     if ( !ValidTab(static_cast<SCTAB>(nTabFirst)) )
-                        rR1.SetTabDeleted( TRUE );
+                        rR1.SetTabDeleted( sal_True );
                     if ( !ValidTab(static_cast<SCTAB>(nTabLast)) )
-                        rR2.SetTabDeleted( TRUE );
+                        rR2.SetTabDeleted( sal_True );
 
                     aStack << aPool.Store( aCRD );
                 }//ENDE in aktuellem Workbook
             }
                 break;
-            default: bError = TRUE;
+            default: bError = sal_True;
         }
         bError |= !aIn.IsValid();
     }
@@ -901,21 +901,21 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
 ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, const FORMULA_TYPE eFT )
 {
     RootData&       rR = GetOldRoot();
-    BYTE			nOp, nLen;
+    sal_uInt8			nOp, nLen;
     sal_Size        nIgnore;
-    UINT16			nUINT16;
-    UINT8			nByte;
-    BOOL			bError = FALSE;
-    BOOL			bArrayFormula = FALSE;
-    const BOOL		bRangeName = eFT == FT_RangeName;
-    const BOOL		bSharedFormula = eFT == FT_SharedFormula;
-    const BOOL		bRNorSF = bRangeName || bSharedFormula;
+    sal_uInt16			nUINT16;
+    sal_uInt8			nByte;
+    sal_Bool			bError = sal_False;
+    sal_Bool			bArrayFormula = sal_False;
+    const sal_Bool		bRangeName = eFT == FT_RangeName;
+    const sal_Bool		bSharedFormula = eFT == FT_SharedFormula;
+    const sal_Bool		bRNorSF = bRangeName || bSharedFormula;
 
     ScSingleRefData	aSRD;
     ScComplexRefData	aCRD;
     aCRD.Ref1.nTab = aCRD.Ref2.nTab = aEingPos.Tab();
 
-    bExternName = FALSE;
+    bExternName = sal_False;
 
     if( eStatus != ConvOK )
     {
@@ -942,7 +942,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
             case 0x01: // Array Formula							[325    ]
                        // Array Formula or Shared Formula		[    277]
                 nIgnore = (meBiff == EXC_BIFF2) ? 3 : 4;
-                bArrayFormula = TRUE;
+                bArrayFormula = sal_True;
                 break;
             case 0x02: // Data Table							[325 277]
                 nIgnore = (meBiff == EXC_BIFF2) ? 3 : 4;
@@ -974,8 +974,8 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
                 break;
             case 0x19: // Special Attribute						[327 279]
             {
-                UINT16 nData, nFakt;
-                BYTE nOpt;
+                sal_uInt16 nData, nFakt;
+                sal_uInt8 nOpt;
 
                 aIn >> nOpt;
 
@@ -1061,7 +1061,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
                 aSRD.nCol = static_cast<SCsCOL>(nByte);
                 aSRD.nRow = nUINT16 & 0x3FFF;
                 aSRD.nRelTab = 0;
-                aSRD.SetTabRel( TRUE );
+                aSRD.SetTabRel( sal_True );
                 aSRD.SetFlag3D( bRangeName );
 
                 ExcRelToScRel( nUINT16, nByte, aSRD, bRangeName );
@@ -1072,16 +1072,16 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
             case 0x65:
             case 0x25: // Area Reference						[320 270]
             {
-                UINT16			nRowFirst, nRowLast;
-                UINT8			nColFirst, nColLast;
+                sal_uInt16			nRowFirst, nRowLast;
+                sal_uInt8			nColFirst, nColLast;
                 ScSingleRefData	&rSRef1 = aCRD.Ref1;
                 ScSingleRefData	&rSRef2 = aCRD.Ref2;
 
                 aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
 
                 rSRef1.nRelTab = rSRef2.nRelTab = 0;
-                rSRef1.SetTabRel( TRUE );
-                rSRef2.SetTabRel( TRUE );
+                rSRef1.SetTabRel( sal_True );
+                rSRef2.SetTabRel( sal_True );
                 rSRef1.SetFlag3D( bRangeName );
                 rSRef2.SetFlag3D( bRangeName );
 
@@ -1125,7 +1125,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
                 aIn >> nUINT16 >> nByte;	// >> Attribute, Row >> Col
 
                 aSRD.nRelTab = 0;
-                aSRD.SetTabRel( TRUE );
+                aSRD.SetTabRel( sal_True );
                 aSRD.SetFlag3D( bRangeName );
 
                 ExcRelToScRel( nUINT16, nByte, aSRD, bRNorSF );
@@ -1137,12 +1137,12 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
             case 0x6D:
             case 0x2D: // Area Reference Within a Name			[324    ]
             {	   // Area Reference Within a Shared Formula[    274]
-                UINT16					nRowFirst, nRowLast;
-                UINT8					nColFirst, nColLast;
+                sal_uInt16					nRowFirst, nRowLast;
+                sal_uInt8					nColFirst, nColLast;
 
                 aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0;
-                aCRD.Ref1.SetTabRel( TRUE );
-                aCRD.Ref2.SetTabRel( TRUE );
+                aCRD.Ref1.SetTabRel( sal_True );
+                aCRD.Ref2.SetTabRel( sal_True );
                 aCRD.Ref1.SetFlag3D( bRangeName );
                 aCRD.Ref2.SetFlag3D( bRangeName );
 
@@ -1184,9 +1184,9 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
             case 0x7A:
             case 0x3A: // 3-D Cell Reference					[    275]
             {
-                UINT16			nTabFirst, nTabLast, nRow;
-                INT16			nExtSheet;
-                BYTE			nCol;
+                sal_uInt16			nTabFirst, nTabLast, nRow;
+                sal_Int16			nExtSheet;
+                sal_uInt8			nCol;
 
                 aIn >> nExtSheet;
                 aIn.Ignore( 8 );
@@ -1210,10 +1210,10 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
 
                 if( nExtSheet <= 0 )
                 {// in aktuellem Workbook
-                    BOOL b3D = ( static_cast<SCTAB>(nTabFirst) != aEingPos.Tab() ) || bRangeName;
+                    sal_Bool b3D = ( static_cast<SCTAB>(nTabFirst) != aEingPos.Tab() ) || bRangeName;
                     aSRD.nTab = static_cast<SCTAB>(nTabFirst);
                     aSRD.SetFlag3D( b3D );
-                    aSRD.SetTabRel( FALSE );
+                    aSRD.SetTabRel( sal_False );
 
                     ExcRelToScRel( nRow, nCol, aSRD, bRangeName );
 
@@ -1225,7 +1225,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
                         aCRD.Ref2.nTab = static_cast<SCTAB>(nTabLast);
                         b3D = ( static_cast<SCTAB>(nTabLast) != aEingPos.Tab() );
                         aCRD.Ref2.SetFlag3D( b3D );
-                        aCRD.Ref2.SetTabRel( FALSE );
+                        aCRD.Ref2.SetTabRel( sal_False );
                         rRangeList.Append( aCRD );
                     }
                     else
@@ -1238,9 +1238,9 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
             case 0x7B:
             case 0x3B: // 3-D Area Reference					[    276]
             {
-                UINT16		nTabFirst, nTabLast, nRowFirst, nRowLast;
-                INT16		nExtSheet;
-                BYTE		nColFirst, nColLast;
+                sal_uInt16		nTabFirst, nTabLast, nRowFirst, nRowLast;
+                sal_Int16		nExtSheet;
+                sal_uInt8		nColFirst, nColLast;
 
                 aIn >> nExtSheet;
                 aIn.Ignore( 8 );
@@ -1272,9 +1272,9 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
                     rR1.nTab = static_cast<SCTAB>(nTabFirst);
                     rR2.nTab = static_cast<SCTAB>(nTabLast);
                     rR1.SetFlag3D( ( static_cast<SCTAB>(nTabFirst) != aEingPos.Tab() ) || bRangeName );
-                    rR1.SetTabRel( FALSE );
+                    rR1.SetTabRel( sal_False );
                     rR2.SetFlag3D( ( static_cast<SCTAB>(nTabLast) != aEingPos.Tab() ) || bRangeName );
-                    rR2.SetTabRel( FALSE );
+                    rR2.SetTabRel( sal_False );
 
                     ExcRelToScRel( nRowFirst, nColFirst, aCRD.Ref1, bRangeName );
                     ExcRelToScRel( nRowLast, nColLast, aCRD.Ref2, bRangeName );
@@ -1298,7 +1298,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
             case 0x3D: // Deleted 3-D Area Reference			[    277]
                 nIgnore = 20;
                 break;
-            default: bError = TRUE;
+            default: bError = sal_True;
         }
         bError |= !aIn.IsValid();
 
@@ -1329,11 +1329,11 @@ ConvErr ExcelToSc::ConvertExternName( const ScTokenArray*& /*rpArray*/, XclImpSt
     return ConvErrNi;
 }
 
-BOOL ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen )
+sal_Bool ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen )
 {
     DBG_ASSERT_BIFF( GetBiff() == EXC_BIFF5 );
     if( GetBiff() != EXC_BIFF5 )
-        return FALSE;
+        return sal_False;
 
     sal_uInt8 nOp;
     sal_uInt16 nRow1, nRow2;
@@ -1518,8 +1518,8 @@ BOOL ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Si
                 break;
             case 0x19: // Special Attribute                     [327 279]
             {
-                BYTE nOpt;
-                UINT16 nData;
+                sal_uInt8 nOpt;
+                sal_uInt16 nData;
                 rStrm >> nOpt >> nData;
                 if( nOpt & 0x04 )
                     nSeek = nData * 2 + 2;
@@ -1537,7 +1537,7 @@ BOOL ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Si
 void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCount )
 {
     TokenId					eParam[ 256 ];
-    INT32					nLauf;
+    sal_Int32					nLauf;
 
     if( eId == ocCeil || eId == ocFloor )
     {
@@ -1574,10 +1574,10 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo
     if( nAnz > 0 )
     {
         // attention: 0 = last parameter, nAnz-1 = first parameter
-        INT16 nNull = -1;		// skip this parameter
-        INT16 nSkipEnd = -1;	// skip all parameters <= nSkipEnd
+        sal_Int16 nNull = -1;		// skip this parameter
+        sal_Int16 nSkipEnd = -1;	// skip all parameters <= nSkipEnd
 
-        INT16 nLast = nAnz - 1;
+        sal_Int16 nLast = nAnz - 1;
 
         // Funktionen, bei denen Parameter wegfallen muessen
         if( eId == ocPercentrank && nAnz == 3 )
@@ -1586,13 +1586,13 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo
         // Joost-Spezialfaelle
         else if( eId == ocIf )
         {
-            UINT16			nNullParam = 0;
+            sal_uInt16			nNullParam = 0;
             for( nLauf = 0 ; nLauf < nAnz ; nLauf++ )
             {
                 if( aPool.IsSingleOp( eParam[ nLauf ], ocMissing ) )
                 {
                     if( !nNullParam )
-                        nNullParam = (UINT16) aPool.Store( ( double ) 0.0 );
+                        nNullParam = (sal_uInt16) aPool.Store( ( double ) 0.0 );
                     eParam[ nLauf ] = nNullParam;
                 }
             }
@@ -1601,7 +1601,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo
         // FIXME: ideally we'd want to import all missing args, but this
         // conflicts with lots of fn's understanding of nParams - we need
         // a function table, and pre-call argument normalisation 1st.
-        INT16 nLastRemovable = nLast - nMinParamCount;
+        sal_Int16 nLastRemovable = nLast - nMinParamCount;
 
         // #84453# skip missing parameters at end of parameter list
         while( nSkipEnd < nLastRemovable &&
@@ -1628,36 +1628,36 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo
 }
 
 
-void ExcelToSc::ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData &rSRD, const BOOL bName )
+void ExcelToSc::ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData &rSRD, const sal_Bool bName )
 {
     if( bName )
     {
         // C O L
         if( nRow & 0x4000 )
         {//															rel Col
-            rSRD.SetColRel( TRUE );
-            rSRD.nRelCol = static_cast<SCsCOL>(static_cast<INT8>(nCol));
+            rSRD.SetColRel( sal_True );
+            rSRD.nRelCol = static_cast<SCsCOL>(static_cast<sal_Int8>(nCol));
         }
         else
         {//															abs Col
-            rSRD.SetColRel( FALSE );
+            rSRD.SetColRel( sal_False );
             rSRD.nCol = static_cast<SCCOL>(nCol);
         }
 
         // R O W
         if( nRow & 0x8000 )
         {//															rel Row
-            rSRD.SetRowRel( TRUE );
+            rSRD.SetRowRel( sal_True );
             if( nRow & 0x2000 )	// Bit 13 gesetzt?
                 //												-> Row negativ
-                rSRD.nRelRow = static_cast<SCsROW>(static_cast<INT16>(nRow | 0xC000));
+                rSRD.nRelRow = static_cast<SCsROW>(static_cast<sal_Int16>(nRow | 0xC000));
             else
                 //												-> Row positiv
                 rSRD.nRelRow = static_cast<SCsROW>(nRow & nRowMask);
         }
         else
         {//															abs Row
-            rSRD.SetRowRel( FALSE );
+            rSRD.SetRowRel( sal_False );
             rSRD.nRow = static_cast<SCROW>(nRow & nRowMask);
         }
 
@@ -1691,7 +1691,7 @@ void ExcelToSc::ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData &rSRD, c
 
 const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType )
 {
-    UINT16					nError;
+    sal_uInt16					nError;
     aPool.Reset();
     aStack.Reset();
 
@@ -1733,13 +1733,13 @@ const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType )
 
 // if a shared formula was found, stream seeks to first byte after <nFormulaLen>,
 // else stream pointer stays unchanged
-BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn, sal_Size nFormulaLen )
+sal_Bool ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn, sal_Size nFormulaLen )
 {
-    BYTE			nOp;
-    BOOL			bRet = TRUE;
+    sal_uInt8			nOp;
+    sal_Bool			bRet = sal_True;
 
     if( nFormulaLen == 0 )
-        bRet = FALSE;
+        bRet = sal_False;
     else
     {
         aIn.PushPosition();
@@ -1748,17 +1748,17 @@ BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn,
 
         if( nOp == 0x01 )	// Shared Formula		[    277]
         {
-            UINT16 nCol, nRow;
+            sal_uInt16 nCol, nRow;
 
             aIn >> nRow >> nCol;
 
             aStack << aPool.Store( GetOldRoot().pShrfmlaBuff->Find(
                 ScAddress( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), GetCurrScTab() ) ) );
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else
-            bRet = FALSE;
+            bRet = sal_False;
 
         aIn.PopPosition();
     }
@@ -1776,26 +1776,26 @@ BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn,
 
 
 #if 0
-BOOL ExcelToSc::SetCurVal( ScFormulaCell &rCell, double &rfCurVal )
+sal_Bool ExcelToSc::SetCurVal( ScFormulaCell &rCell, double &rfCurVal )
 {
-    UINT16	nInd;
-    BYTE	nType;
-    BYTE	nVal;
-    BOOL	bString = FALSE;
+    sal_uInt16	nInd;
+    sal_uInt8	nType;
+    sal_uInt8	nVal;
+    sal_Bool	bString = sal_False;
 
 #ifdef OSL_BIGENDIAN
     // Code fuer alle anstaendigen Prozessoren
-    nType = *( ( ( BYTE * ) &rfCurVal ) + 7 );
-    nVal = *( ( ( BYTE * ) &rfCurVal ) + 5 );
-    nInd = *( ( UINT16 * ) &rfCurVal );
+    nType = *( ( ( sal_uInt8 * ) &rfCurVal ) + 7 );
+    nVal = *( ( ( sal_uInt8 * ) &rfCurVal ) + 5 );
+    nInd = *( ( sal_uInt16 * ) &rfCurVal );
 #else
     // fuer Schund-Prozessoren
-    nType = *( ( BYTE * ) &rfCurVal );
-    nVal = *( ( ( BYTE * ) &rfCurVal ) + 2 );
-    nInd = *( ( ( UINT16 * ) &rfCurVal ) + 3 );
+    nType = *( ( sal_uInt8 * ) &rfCurVal );
+    nVal = *( ( ( sal_uInt8 * ) &rfCurVal ) + 2 );
+    nInd = *( ( ( sal_uInt16 * ) &rfCurVal ) + 3 );
 #endif
 
-    if( ( UINT16 ) ~nInd )
+    if( ( sal_uInt16 ) ~nInd )
         // Wert ist Float
         rCell.SetHybridDouble( rfCurVal );
     else
@@ -1803,7 +1803,7 @@ BOOL ExcelToSc::SetCurVal( ScFormulaCell &rCell, double &rfCurVal )
         switch( nType )
         {
             case 0:		// String
-                bString = TRUE;
+                bString = sal_True;
                 break;
             case 1:		// Bool
                 if( nVal )
@@ -1825,7 +1825,7 @@ BOOL ExcelToSc::SetCurVal( ScFormulaCell &rCell, double &rfCurVal )
 
 void ExcelToSc::SetError( ScFormulaCell &rCell, const ConvErr eErr )
 {
-    UINT16	nInd;
+    sal_uInt16	nInd;
 
     switch( eErr )
     {
@@ -1864,8 +1864,8 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, XclImpStream& aIn )
 {
     // printf( "inline array;\n" );
 
-    BYTE        nByte;
-    UINT16      nUINT16;
+    sal_uInt8        nByte;
+    sal_uInt16      nUINT16;
     double      fDouble;
     String      aString;
     ScMatrix*   pMatrix;
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index c50151c21..6530f0cc4 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -62,7 +62,7 @@ ExcelToSc8::~ExcelToSc8()
 {
 }
 
-bool ExcelToSc8::GetExternalFileIdFromXti( UINT16 nIxti, sal_uInt16& rFileId ) const
+bool ExcelToSc8::GetExternalFileIdFromXti( sal_uInt16 nIxti, sal_uInt16& rFileId ) const
 {
     const String* pFileUrl = rLinkMan.GetSupbookUrl(nIxti);
     if (!pFileUrl || pFileUrl->Len() == 0 || !GetDocShell())
@@ -75,7 +75,7 @@ bool ExcelToSc8::GetExternalFileIdFromXti( UINT16 nIxti, sal_uInt16& rFileId ) c
     return true;
 }
 
-bool ExcelToSc8::Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo )
+bool ExcelToSc8::Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo )
 {
     rFirstTab = rLastTab = 0;
     rExtInfo.mbExternal = !rLinkMan.IsSelfRef(nIxti);
@@ -96,16 +96,16 @@ bool ExcelToSc8::Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLas
 // otherwise it will seek to the first byte past additional content after <nFormulaLen>
 ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
 {
-    BYTE					nOp, nLen, nByte;
-    UINT16                  nUINT16;
+    sal_uInt8					nOp, nLen, nByte;
+    sal_uInt16                  nUINT16;
     double					fDouble;
     String					aString;
-    BOOL					bError = FALSE;
-    BOOL					bArrayFormula = FALSE;
+    sal_Bool					bError = sal_False;
+    sal_Bool					bArrayFormula = sal_False;
     TokenId					nMerk0;
-    const BOOL				bRangeName = eFT == FT_RangeName;
-    const BOOL				bSharedFormula = eFT == FT_SharedFormula;
-    const BOOL				bRNorSF = bRangeName || bSharedFormula;
+    const sal_Bool				bRangeName = eFT == FT_RangeName;
+    const sal_Bool				bSharedFormula = eFT == FT_SharedFormula;
+    const sal_Bool				bRNorSF = bRangeName || bSharedFormula;
 
     ScSingleRefData			aSRD;
     ScComplexRefData			aCRD;
@@ -142,7 +142,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x02: // Data Table							[325 277]
                 aIn.Ignore( 4 );
 
-                bArrayFormula = TRUE;
+                bArrayFormula = sal_True;
                 break;
             case 0x03: // Addition								[312 264]
                 aStack >> nMerk0;
@@ -261,8 +261,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                 break;
             case 0x18:											// natural language formula
                 {
-                UINT8	nEptg;
-                UINT16	nCol, nRow;
+                sal_uInt8	nEptg;
+                sal_uInt16	nCol, nRow;
                 aIn >> nEptg;
                 switch( nEptg )
                 {							//	name		size	ext		type
@@ -280,9 +280,9 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                         aSRD.InitAddress( ScAddress( static_cast<SCCOL>(nCol & 0xFF), static_cast<SCROW>(nRow), aEingPos.Tab() ) );
 
                         if( nEptg == 0x02 || nEptg == 0x06 )
-                            aSRD.SetRowRel( TRUE );
+                            aSRD.SetRowRel( sal_True );
                         else
-                            aSRD.SetColRel( TRUE );
+                            aSRD.SetColRel( sal_True );
 
                         aSRD.CalcRelFromAbs( aEingPos );
 
@@ -294,7 +294,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
 
                         aSRD.InitAddress( ScAddress( static_cast<SCCOL>(nCol & 0xFF), static_cast<SCROW>(nRow), aEingPos.Tab() ) );
 
-                        aSRD.SetColRel( TRUE );
+                        aSRD.SetColRel( sal_True );
 
                         aSRD.CalcRelFromAbs( aEingPos );
 
@@ -329,8 +329,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                 break;
             case 0x19: // Special Attribute						[327 279]
             {
-                UINT16 nData, nFakt;
-                BYTE nOpt;
+                sal_uInt16 nData, nFakt;
+                sal_uInt8 nOpt;
 
                 aIn >> nOpt >> nData;
                 nFakt = 2;
@@ -448,14 +448,14 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x6A:
             case 0x2A: // Deleted Cell Reference				[323 273]
             {
-                UINT16			nCol, nRow;
+                sal_uInt16			nCol, nRow;
 
                 aIn >> nRow >> nCol;
 
                 aSRD.nCol = static_cast<SCCOL>(nCol);
                 aSRD.nRow = nRow & 0x3FFF;
                 aSRD.nRelTab = 0;
-                aSRD.SetTabRel( TRUE );
+                aSRD.SetTabRel( sal_True );
                 aSRD.SetFlag3D( bRangeName );
 
                 ExcRelToScRel8( nRow, nCol, aSRD, bRangeName );
@@ -466,8 +466,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                     case 0x6A:
                     case 0x2A: // Deleted Cell Reference	 	[323 273]
                         // no information which part is deleted, set both
-                        aSRD.SetColDeleted( TRUE );
-                        aSRD.SetRowDeleted( TRUE );
+                        aSRD.SetColDeleted( sal_True );
+                        aSRD.SetRowDeleted( sal_True );
                 }
 
                 aStack << aPool.Store( aSRD );
@@ -480,16 +480,16 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x6B:
             case 0x2B: // Deleted Area Refernce					[323 273]
             {
-                UINT16			nRowFirst, nRowLast;
-                UINT16			nColFirst, nColLast;
+                sal_uInt16			nRowFirst, nRowLast;
+                sal_uInt16			nColFirst, nColLast;
                 ScSingleRefData	&rSRef1 = aCRD.Ref1;
                 ScSingleRefData	&rSRef2 = aCRD.Ref2;
 
                 aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
 
                 rSRef1.nRelTab = rSRef2.nRelTab = 0;
-                rSRef1.SetTabRel( TRUE );
-                rSRef2.SetTabRel( TRUE );
+                rSRef1.SetTabRel( sal_True );
+                rSRef2.SetTabRel( sal_True );
                 rSRef1.SetFlag3D( bRangeName );
                 rSRef2.SetFlag3D( bRangeName );
 
@@ -507,10 +507,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                     case 0x6B:
                     case 0x2B: // Deleted Area Refernce			[323 273]
                         // no information which part is deleted, set all
-                        rSRef1.SetColDeleted( TRUE );
-                        rSRef1.SetRowDeleted( TRUE );
-                        rSRef2.SetColDeleted( TRUE );
-                        rSRef2.SetRowDeleted( TRUE );
+                        rSRef1.SetColDeleted( sal_True );
+                        rSRef1.SetRowDeleted( sal_True );
+                        rSRef2.SetColDeleted( sal_True );
+                        rSRef2.SetRowDeleted( sal_True );
                 }
 
                 aStack << aPool.Store( aCRD );
@@ -546,12 +546,12 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x2C: // Cell Reference Within a Name			[323    ]
                        // Cell Reference Within a Shared Formula[    273]
             {
-                UINT16		nRow, nCol;
+                sal_uInt16		nRow, nCol;
 
                 aIn >> nRow >> nCol;
 
                 aSRD.nRelTab = 0;
-                aSRD.SetTabRel( TRUE );
+                aSRD.SetTabRel( sal_True );
                 aSRD.SetFlag3D( bRangeName );
 
                 ExcRelToScRel8( nRow, nCol, aSRD, bRNorSF );
@@ -563,12 +563,12 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x6D:
             case 0x2D: // Area Reference Within a Name			[324    ]
             {	   // Area Reference Within a Shared Formula[    274]
-                UINT16					nRowFirst, nRowLast;
-                UINT16					nColFirst, nColLast;
+                sal_uInt16					nRowFirst, nRowLast;
+                sal_uInt16					nColFirst, nColLast;
 
                 aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0;
-                aCRD.Ref1.SetTabRel( TRUE );
-                aCRD.Ref2.SetTabRel( TRUE );
+                aCRD.Ref1.SetTabRel( sal_True );
+                aCRD.Ref2.SetTabRel( sal_True );
                 aCRD.Ref1.SetFlag3D( bRangeName );
                 aCRD.Ref2.SetFlag3D( bRangeName );
 
@@ -702,7 +702,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x7C:
             case 0x3C: // Deleted 3-D Cell Reference			[    277]
             {
-                UINT16 nIxti, nRw, nGrbitCol;
+                sal_uInt16 nIxti, nRw, nGrbitCol;
                 SCTAB nTabFirst, nTabLast;
 
                 aIn >> nIxti >> nRw >> nGrbitCol;
@@ -716,8 +716,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                 }
 
                 aSRD.nTab = nTabFirst;
-                aSRD.SetFlag3D( TRUE );
-                aSRD.SetTabRel( FALSE );
+                aSRD.SetFlag3D( sal_True );
+                aSRD.SetTabRel( sal_False );
 
                 ExcRelToScRel8( nRw, nGrbitCol, aSRD, bRangeName );
 
@@ -727,8 +727,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                     case 0x7C:
                     case 0x3C: // Deleted 3-D Cell Reference	[    277]
                         // no information which part is deleted, set both
-                        aSRD.SetColDeleted( TRUE );
-                        aSRD.SetRowDeleted( TRUE );
+                        aSRD.SetColDeleted( sal_True );
+                        aSRD.SetRowDeleted( sal_True );
                 }
 
                 if (aExtInfo.mbExternal)
@@ -751,7 +751,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                 else
                 {
                     if ( !ValidTab(nTabFirst))
-                        aSRD.SetTabDeleted( TRUE );
+                        aSRD.SetTabDeleted( sal_True );
 
                     if( nTabLast != nTabFirst )
                     {
@@ -772,7 +772,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
             case 0x7D:
             case 0x3D: // Deleted 3-D Area Reference			[    277]
             {
-                UINT16 nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2;
+                sal_uInt16 nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2;
                 SCTAB nTabFirst, nTabLast;
                 aIn >> nIxti >> nRw1 >> nRw2 >> nGrbitCol1 >> nGrbitCol2;
 
@@ -789,10 +789,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
 
                 rR1.nTab = nTabFirst;
                 rR2.nTab = nTabLast;
-                rR1.SetFlag3D( TRUE );
-                rR1.SetTabRel( FALSE );
+                rR1.SetFlag3D( sal_True );
+                rR1.SetTabRel( sal_False );
                 rR2.SetFlag3D( nTabFirst != nTabLast );
-                rR2.SetTabRel( FALSE );
+                rR2.SetTabRel( sal_False );
 
                 ExcRelToScRel8( nRw1, nGrbitCol1, aCRD.Ref1, bRangeName );
                 ExcRelToScRel8( nRw2, nGrbitCol2, aCRD.Ref2, bRangeName );
@@ -808,10 +808,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                     case 0x7D:
                     case 0x3D: // Deleted 3-D Area Reference	[    277]
                         // no information which part is deleted, set all
-                        rR1.SetColDeleted( TRUE );
-                        rR1.SetRowDeleted( TRUE );
-                        rR2.SetColDeleted( TRUE );
-                        rR2.SetRowDeleted( TRUE );
+                        rR1.SetColDeleted( sal_True );
+                        rR1.SetRowDeleted( sal_True );
+                        rR2.SetColDeleted( sal_True );
+                        rR2.SetRowDeleted( sal_True );
                 }
 
                 if (aExtInfo.mbExternal)
@@ -821,15 +821,15 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
                 else
                 {
                     if ( !ValidTab(nTabFirst) )
-                        rR1.SetTabDeleted( TRUE );
+                        rR1.SetTabDeleted( sal_True );
                     if ( !ValidTab(nTabLast) )
-                        rR2.SetTabDeleted( TRUE );
+                        rR2.SetTabDeleted( sal_True );
 
                     aStack << aPool.Store( aCRD );
                 }
             }
                 break;
-            default: bError = TRUE;
+            default: bError = sal_True;
         }
         bError |= !aIn.IsValid();
     }
@@ -873,17 +873,17 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
 // stream seeks to first byte after <nFormulaLen>
 ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, const FORMULA_TYPE eFT )
 {
-    BYTE					nOp, nLen;//, nByte;
-    BOOL					bError = FALSE;
-    BOOL					bArrayFormula = FALSE;
-    const BOOL				bRangeName = eFT == FT_RangeName;
-    const BOOL				bSharedFormula = eFT == FT_SharedFormula;
-    const BOOL				bRNorSF = bRangeName || bSharedFormula;
+    sal_uInt8					nOp, nLen;//, nByte;
+    sal_Bool					bError = sal_False;
+    sal_Bool					bArrayFormula = sal_False;
+    const sal_Bool				bRangeName = eFT == FT_RangeName;
+    const sal_Bool				bSharedFormula = eFT == FT_SharedFormula;
+    const sal_Bool				bRNorSF = bRangeName || bSharedFormula;
 
     ScSingleRefData			aSRD;
     ScComplexRefData			aCRD;
 
-    bExternName = FALSE;
+    bExternName = sal_False;
 
     if( eStatus != ConvOK )
     {
@@ -910,7 +910,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
                        // Array Formula or Shared Formula		[    277]
                 aIn.Ignore( 4 );
 
-                bArrayFormula = TRUE;
+                bArrayFormula = sal_True;
                 break;
             case 0x02: // Data Table							[325 277]
                 aIn.Ignore( 4 );
@@ -943,8 +943,8 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
                 break;
             case 0x19: // Special Attribute						[327 279]
             {
-                UINT16 nData, nFakt;
-                BYTE nOpt;
+                sal_uInt16 nData, nFakt;
+                sal_uInt8 nOpt;
 
                 aIn >> nOpt >> nData;
                 nFakt = 2;
@@ -990,14 +990,14 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
             case 0x64:
             case 0x24: // Cell Reference						[319 270]
             {
-                UINT16			nCol, nRow;
+                sal_uInt16			nCol, nRow;
 
                 aIn >> nRow >> nCol;
 
                 aSRD.nCol = static_cast<SCCOL>(nCol);
                 aSRD.nRow = nRow & 0x3FFF;
                 aSRD.nRelTab = 0;
-                aSRD.SetTabRel( TRUE );
+                aSRD.SetTabRel( sal_True );
                 aSRD.SetFlag3D( bRangeName );
 
                 ExcRelToScRel8( nRow, nCol, aSRD, bRangeName );
@@ -1009,16 +1009,16 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
             case 0x65:
             case 0x25: // Area Reference						[320 270]
             {
-                UINT16			nRowFirst, nRowLast;
-                UINT16			nColFirst, nColLast;
+                sal_uInt16			nRowFirst, nRowLast;
+                sal_uInt16			nColFirst, nColLast;
                 ScSingleRefData	&rSRef1 = aCRD.Ref1;
                 ScSingleRefData	&rSRef2 = aCRD.Ref2;
 
                 aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
 
                 rSRef1.nRelTab = rSRef2.nRelTab = 0;
-                rSRef1.SetTabRel( TRUE );
-                rSRef2.SetTabRel( TRUE );
+                rSRef1.SetTabRel( sal_True );
+                rSRef2.SetTabRel( sal_True );
                 rSRef1.SetFlag3D( bRangeName );
                 rSRef2.SetFlag3D( bRangeName );
 
@@ -1064,12 +1064,12 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
             case 0x2C: // Cell Reference Within a Name			[323    ]
                        // Cell Reference Within a Shared Formula[    273]
             {
-                UINT16		nRow, nCol;
+                sal_uInt16		nRow, nCol;
 
                 aIn >> nRow >> nCol;
 
                 aSRD.nRelTab = 0;
-                aSRD.SetTabRel( TRUE );
+                aSRD.SetTabRel( sal_True );
                 aSRD.SetFlag3D( bRangeName );
 
                 ExcRelToScRel8( nRow, nCol, aSRD, bRNorSF );
@@ -1081,12 +1081,12 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
             case 0x6D:
             case 0x2D: // Area Reference Within a Name			[324    ]
             {	   // Area Reference Within a Shared Formula[    274]
-                UINT16					nRowFirst, nRowLast;
-                UINT16					nColFirst, nColLast;
+                sal_uInt16					nRowFirst, nRowLast;
+                sal_uInt16					nColFirst, nColLast;
 
                 aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0;
-                aCRD.Ref1.SetTabRel( TRUE );
-                aCRD.Ref2.SetTabRel( TRUE );
+                aCRD.Ref1.SetTabRel( sal_True );
+                aCRD.Ref2.SetTabRel( sal_True );
                 aCRD.Ref1.SetFlag3D( bRangeName );
                 aCRD.Ref2.SetFlag3D( bRangeName );
 
@@ -1123,7 +1123,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
             case 0x7A:
             case 0x3A: // 3-D Cell Reference					[    275]
             {
-                UINT16			nIxti, nRw, nGrbitCol;
+                sal_uInt16			nIxti, nRw, nGrbitCol;
 
                 aIn >> nIxti >> nRw >> nGrbitCol;
 
@@ -1131,8 +1131,8 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
                 if( rLinkMan.GetScTabRange( nFirstScTab, nLastScTab, nIxti ) )
                 {
                     aSRD.nTab = nFirstScTab;
-                    aSRD.SetFlag3D( TRUE );
-                    aSRD.SetTabRel( FALSE );
+                    aSRD.SetFlag3D( sal_True );
+                    aSRD.SetTabRel( sal_False );
 
                     ExcRelToScRel8( nRw, nGrbitCol, aSRD, bRangeName );
 
@@ -1153,7 +1153,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
             case 0x7B:
             case 0x3B: // 3-D Area Reference					[    276]
             {
-                UINT16			nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2;
+                sal_uInt16			nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2;
 
                 aIn >> nIxti >> nRw1 >> nRw2 >> nGrbitCol1 >> nGrbitCol2;
 
@@ -1165,10 +1165,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
 
                     rR1.nTab = nFirstScTab;
                     rR2.nTab = nLastScTab;
-                    rR1.SetFlag3D( TRUE );
-                    rR1.SetTabRel( FALSE );
+                    rR1.SetFlag3D( sal_True );
+                    rR1.SetTabRel( sal_False );
                     rR2.SetFlag3D( nFirstScTab != nLastScTab );
-                    rR2.SetTabRel( FALSE );
+                    rR2.SetTabRel( sal_False );
 
                     ExcRelToScRel8( nRw1, nGrbitCol1, aCRD.Ref1, bRangeName );
                     ExcRelToScRel8( nRw2, nGrbitCol2, aCRD.Ref2, bRangeName );
@@ -1193,7 +1193,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
                 aIn.Ignore( 10 );
                 break;
             default:
-                bError = TRUE;
+                bError = sal_True;
         }
         bError |= !aIn.IsValid();
     }
@@ -1363,11 +1363,11 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea
     return eRet;
 }
 
-void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD, const BOOL bName )
+void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nC, ScSingleRefData &rSRD, const sal_Bool bName )
 {
-    const BOOL		bColRel = ( nC & 0x4000 ) != 0;
-    const BOOL		bRowRel = ( nC & 0x8000 ) != 0;
-    const UINT8		nCol = static_cast<UINT8>(nC);
+    const sal_Bool		bColRel = ( nC & 0x4000 ) != 0;
+    const sal_Bool		bRowRel = ( nC & 0x8000 ) != 0;
+    const sal_uInt8		nCol = static_cast<sal_uInt8>(nC);
 
     rSRD.SetColRel( bColRel );
     rSRD.SetRowRel( bRowRel );
@@ -1377,7 +1377,7 @@ void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD,
         // C O L
         if( bColRel )
             //															rel Col
-            rSRD.nRelCol = static_cast<SCsCOL>(static_cast<INT8>(nC));
+            rSRD.nRelCol = static_cast<SCsCOL>(static_cast<sal_Int8>(nC));
         else
             //															abs Col
             rSRD.nCol = static_cast<SCCOL>(nCol);
@@ -1385,7 +1385,7 @@ void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD,
         // R O W
         if( bRowRel )
             //															rel Row
-            rSRD.nRelRow = static_cast<SCsROW>(static_cast<INT16>(nRow));
+            rSRD.nRelRow = static_cast<SCsROW>(static_cast<sal_Int16>(nRow));
         else
             //															abs Row
             rSRD.nRow = Min( static_cast<SCROW>(nRow), MAXROW);
@@ -1418,12 +1418,12 @@ void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD,
 
 
 // stream seeks to first byte after <nLen>
-BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
+sal_Bool ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
 {
-    UINT8					nOp;
-    UINT16					nRow1, nRow2, nCol1, nCol2;
+    sal_uInt8					nOp;
+    sal_uInt16					nRow1, nRow2, nCol1, nCol2;
     SCTAB                                   nTab1, nTab2;
-    UINT16					nIxti;
+    sal_uInt16					nIxti;
 
     sal_Size nSeek;
 
@@ -1563,7 +1563,7 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
                 break;
             case 0x17: // String Constant						[314 266]
             {
-                UINT8 nStrLen;
+                sal_uInt8 nStrLen;
                 aIn >> nStrLen;
                 aIn.IgnoreUniString( nStrLen );     // reads Grbit even if nLen==0
                 nSeek = 0;
@@ -1571,8 +1571,8 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
                 break;
             case 0x19: // Special Attribute						[327 279]
             {
-                UINT16	nData;
-                UINT8	nOpt;
+                sal_uInt16	nData;
+                sal_uInt8	nOpt;
                 aIn >> nOpt >> nData;
                 if( nOpt & 0x04 )
                 {// nFakt -> Bytes oder Words ueberlesen	AttrChoose
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index b8ae9df6a..58c465f36 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -159,8 +159,8 @@ void ImportExcel8::Iteration( void )
 
 void ImportExcel8::Boundsheet( void )
 {
-    UINT8			nLen;
-    UINT16			nGrbit;
+    sal_uInt8			nLen;
+    sal_uInt16			nGrbit;
 
     aIn.DisableDecryption();
     maSheetOffsets.push_back( aIn.ReaduInt32() );
@@ -178,7 +178,7 @@ void ImportExcel8::Boundsheet( void )
     }
 
     if( ( nGrbit & 0x0001 ) || ( nGrbit & 0x0002 ) )
-        pD->SetVisible( nScTab, FALSE );
+        pD->SetVisible( nScTab, sal_False );
 
     if( !pD->RenameTab( nScTab, aName ) )
     {
@@ -192,7 +192,7 @@ void ImportExcel8::Boundsheet( void )
 
 void ImportExcel8::Scenman( void )
 {
-    UINT16				nLastDispl;
+    sal_uInt16				nLastDispl;
 
     aIn.Ignore( 4 );
     aIn >> nLastDispl;
@@ -210,8 +210,8 @@ void ImportExcel8::Scenario( void )
 void ImportExcel8::Labelsst( void )
 {
     XclAddress aXclPos;
-    UINT16 nXF;
-    UINT32  nSst;
+    sal_uInt16 nXF;
+    sal_uInt32  nSst;
 
     aIn >> aXclPos >> nXF >> nSst;
 
@@ -382,10 +382,10 @@ XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRan
         ExcRoot( pRoot ),
         pCurrDBData(NULL),
         nFirstEmpty( 0 ),
-        bActive( FALSE ),
-        bHasConflict( FALSE ),
-        bCriteria( FALSE ),
-        bAutoOrAdvanced(FALSE),
+        bActive( sal_False ),
+        bHasConflict( sal_False ),
+        bCriteria( sal_False ),
+        bAutoOrAdvanced(sal_False),
         aFilterName(rName)
 {
     aParam.nCol1 = rRange.aStart.Col();
@@ -394,7 +394,7 @@ XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRan
     aParam.nCol2 = rRange.aEnd.Col();
     aParam.nRow2 = rRange.aEnd.Row();
 
-    aParam.bInplace = TRUE;
+    aParam.bInplace = sal_True;
 
 }
 
@@ -402,7 +402,7 @@ void XclImpAutoFilterData::CreateFromDouble( String& rStr, double fVal )
 {
     rStr += String( ::rtl::math::doubleToUString( fVal,
                 rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), TRUE));
+                ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), sal_True));
 }
 
 void XclImpAutoFilterData::SetCellAttribs()
@@ -410,7 +410,7 @@ void XclImpAutoFilterData::SetCellAttribs()
     ScDocument& rDoc = pExcRoot->pIR->GetDoc();
     for ( SCCOL nCol = StartCol(); nCol <= EndCol(); nCol++ )
     {
-        INT16 nFlag = ((ScMergeFlagAttr*) rDoc.GetAttr( nCol, StartRow(), Tab(), ATTR_MERGE_FLAG ))->GetValue();
+        sal_Int16 nFlag = ((ScMergeFlagAttr*) rDoc.GetAttr( nCol, StartRow(), Tab(), ATTR_MERGE_FLAG ))->GetValue();
         rDoc.ApplyAttr( nCol, StartRow(), Tab(), ScMergeFlagAttr( nFlag | SC_MF_AUTO) );
     }
 }
@@ -420,7 +420,7 @@ void XclImpAutoFilterData::InsertQueryParam()
     if( pCurrDBData && !bHasConflict )
     {
         ScRange	aAdvRange;
-        BOOL	bHasAdv = pCurrDBData->GetAdvancedQuerySource( aAdvRange );
+        sal_Bool	bHasAdv = pCurrDBData->GetAdvancedQuerySource( aAdvRange );
         if( bHasAdv )
             pExcRoot->pIR->GetDoc().CreateQueryParam( aAdvRange.aStart.Col(),
                 aAdvRange.aStart.Row(), aAdvRange.aEnd.Col(), aAdvRange.aEnd.Row(),
@@ -431,7 +431,7 @@ void XclImpAutoFilterData::InsertQueryParam()
             pCurrDBData->SetAdvancedQuerySource( &aAdvRange );
         else
         {
-            pCurrDBData->SetAutoFilter( TRUE );
+            pCurrDBData->SetAutoFilter( sal_True );
             SetCellAttribs();
         }
     }
@@ -471,14 +471,14 @@ static void ExcelQueryToOooQuery( ScQueryEntry& rEntry )
 
 void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
 {
-    UINT16 nCol, nFlags;
+    sal_uInt16 nCol, nFlags;
     rStrm >> nCol >> nFlags;
 
     ScQueryConnect  eConn       = ::get_flagvalue( nFlags, EXC_AFFLAG_ANDORMASK, SC_OR, SC_AND );
-    BOOL            bTop10      = ::get_flag( nFlags, EXC_AFFLAG_TOP10 );
-    BOOL            bTopOfTop10 = ::get_flag( nFlags, EXC_AFFLAG_TOP10TOP );
-    BOOL            bPercent    = ::get_flag( nFlags, EXC_AFFLAG_TOP10PERC );
-    UINT16			nCntOfTop10	= nFlags >> 7;
+    sal_Bool            bTop10      = ::get_flag( nFlags, EXC_AFFLAG_TOP10 );
+    sal_Bool            bTopOfTop10 = ::get_flag( nFlags, EXC_AFFLAG_TOP10TOP );
+    sal_Bool            bPercent    = ::get_flag( nFlags, EXC_AFFLAG_TOP10PERC );
+    sal_uInt16			nCntOfTop10	= nFlags >> 7;
     SCSIZE			nCount		= aParam.GetEntryCount();
 
     if( bTop10 )
@@ -486,8 +486,8 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
         if( nFirstEmpty < nCount )
         {
             ScQueryEntry& aEntry = aParam.GetEntry( nFirstEmpty );
-            aEntry.bDoQuery = TRUE;
-            aEntry.bQueryByString = TRUE;
+            aEntry.bDoQuery = sal_True;
+            aEntry.bQueryByString = sal_True;
             aEntry.nField = static_cast<SCCOLROW>(StartCol() + static_cast<SCCOL>(nCol));
             aEntry.eOp = bTopOfTop10 ?
                 (bPercent ? SC_TOPPERC : SC_TOPVAL) : (bPercent ? SC_BOTPERC : SC_BOTVAL);
@@ -500,12 +500,12 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
     }
     else
     {
-        UINT8	nE, nType, nOper, nBoolErr, nVal;
-        INT32   nRK;
+        sal_uInt8	nE, nType, nOper, nBoolErr, nVal;
+        sal_Int32   nRK;
         double	fVal;
-        BOOL	bIgnore;
+        sal_Bool	bIgnore;
 
-        UINT8	nStrLen[ 2 ]	= { 0, 0 };
+        sal_uInt8	nStrLen[ 2 ]	= { 0, 0 };
         ScQueryEntry *pQueryEntries[ 2 ] = { NULL, NULL };
 
         for( nE = 0; nE < 2; nE++ )
@@ -514,7 +514,7 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
             {
                 ScQueryEntry& aEntry = aParam.GetEntry( nFirstEmpty );
                 pQueryEntries[ nE ] = &aEntry;
-                bIgnore = FALSE;
+                bIgnore = sal_False;
 
                 rStrm >> nType >> nOper;
                 switch( nOper )
@@ -562,21 +562,21 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
                         rStrm >> nBoolErr >> nVal;
                         rStrm.Ignore( 6 );
                         aEntry.pStr->Assign( String::CreateFromInt32( (sal_Int32) nVal ) );
-                        bIgnore = (BOOL) nBoolErr;
+                        bIgnore = (sal_Bool) nBoolErr;
                     break;
                     case EXC_AFTYPE_EMPTY:
-                        aEntry.bQueryByString = FALSE;
+                        aEntry.bQueryByString = sal_False;
                         aEntry.nVal = SC_EMPTYFIELDS;
                         aEntry.eOp = SC_EQUAL;
                     break;
                     case EXC_AFTYPE_NOTEMPTY:
-                        aEntry.bQueryByString = FALSE;
+                        aEntry.bQueryByString = sal_False;
                         aEntry.nVal = SC_NONEMPTYFIELDS;
                         aEntry.eOp = SC_EQUAL;
                     break;
                     default:
                         rStrm.Ignore( 8 );
-                        bIgnore = TRUE;
+                        bIgnore = sal_True;
                 }
 
                 /*  #i39464# conflict, if two conditions of one column are 'OR'ed,
@@ -586,11 +586,11 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
                     'A1 AND (B1 OR B2)' in this case, but Calc would do
                     '(A1 AND B1) OR B2' instead. */
                 if( (nFirstEmpty > 1) && nE && (eConn == SC_OR) && !bIgnore )
-                    bHasConflict = TRUE;
+                    bHasConflict = sal_True;
                 if( !bHasConflict && !bIgnore )
                 {
-                    aEntry.bDoQuery = TRUE;
-                    aEntry.bQueryByString = TRUE;
+                    aEntry.bDoQuery = sal_True;
+                    aEntry.bQueryByString = sal_True;
                     aEntry.nField = static_cast<SCCOLROW>(StartCol() + static_cast<SCCOL>(nCol));
                     aEntry.eConnect = nE ? eConn : SC_AND;
                     nFirstEmpty++;
@@ -615,10 +615,10 @@ void XclImpAutoFilterData::SetAdvancedRange( const ScRange* pRange )
     if (pRange)
     {
         aCriteriaRange = *pRange;
-        bCriteria = TRUE;
+        bCriteria = sal_True;
     }
     else
-        bCriteria = FALSE;
+        bCriteria = sal_False;
 }
 
 void XclImpAutoFilterData::SetExtractPos( const ScAddress& rAddr )
@@ -626,11 +626,11 @@ void XclImpAutoFilterData::SetExtractPos( const ScAddress& rAddr )
     aParam.nDestCol = rAddr.Col();
     aParam.nDestRow = rAddr.Row();
     aParam.nDestTab = rAddr.Tab();
-    aParam.bInplace = FALSE;
-    aParam.bDestPers = TRUE;
+    aParam.bInplace = sal_False;
+    aParam.bDestPers = sal_True;
 }
 
-void XclImpAutoFilterData::Apply( const BOOL bUseUnNamed )
+void XclImpAutoFilterData::Apply( const sal_Bool bUseUnNamed )
 {
     CreateScDBData(bUseUnNamed);
 
@@ -642,7 +642,7 @@ void XclImpAutoFilterData::Apply( const BOOL bUseUnNamed )
 //        SCROW nRow1 = StartRow();
 //        SCROW nRow2 = EndRow();
 //        size_t nRows = nRow2 - nRow1 + 1;
-//        boost::scoped_array<BYTE> pFlags( new BYTE[nRows]);
+//        boost::scoped_array<sal_uInt8> pFlags( new sal_uInt8[nRows]);
 //        pExcRoot->pDoc->GetRowFlagsArray( Tab()).FillDataArray( nRow1, nRow2,
 //                pFlags.get());
 //        for (size_t j=0; j<nRows; ++j)
@@ -654,7 +654,7 @@ void XclImpAutoFilterData::Apply( const BOOL bUseUnNamed )
     }
 }
 
-void XclImpAutoFilterData::CreateScDBData( const BOOL bUseUnNamed )
+void XclImpAutoFilterData::CreateScDBData( const sal_Bool bUseUnNamed )
 {
 
     // Create the ScDBData() object if the AutoFilter is activated
@@ -693,7 +693,7 @@ void XclImpAutoFilterData::EnableRemoveFilter()
     if( !bActive && bAutoOrAdvanced )
     {
         ScQueryEntry& aEntry = aParam.GetEntry( nFirstEmpty );
-        aEntry.bDoQuery = TRUE;
+        aEntry.bDoQuery = sal_True;
         ++nFirstEmpty;
     }
 
@@ -702,7 +702,7 @@ void XclImpAutoFilterData::EnableRemoveFilter()
     // inside the advanced range
 }
 
-void XclImpAutoFilterData::AmendAFName(const BOOL bUseUnNamed)
+void XclImpAutoFilterData::AmendAFName(const sal_Bool bUseUnNamed)
 {
     // If-and-only-if we have one AF filter then
     // use the Calc "unnamed" range name. Calc
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index ab3eeadd9..324550f5c 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -102,7 +102,7 @@ using ::com::sun::star::uno::Sequence;
 using ::rtl::OString;
 
 //--------------------------------------------------------- class ExcDummy_00 -
-const BYTE		ExcDummy_00::pMyData[] = {
+const sal_uInt8		ExcDummy_00::pMyData[] = {
     0x5c, 0x00, 0x20, 0x00, 0x04, 'C',  'a',  'l',  'c',    // WRITEACCESS
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
     0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
@@ -111,20 +111,20 @@ const BYTE		ExcDummy_00::pMyData[] = {
 const sal_Size ExcDummy_00::nMyLen = sizeof( ExcDummy_00::pMyData );
 
 //-------------------------------------------------------- class ExcDummy_04x -
-const BYTE		ExcDummy_040::pMyData[] = {
+const sal_uInt8		ExcDummy_040::pMyData[] = {
     0x40, 0x00, 0x02, 0x00, 0x00, 0x00,						// BACKUP
     0x8d, 0x00, 0x02, 0x00, 0x00, 0x00,						// HIDEOBJ
 };
 const sal_Size ExcDummy_040::nMyLen = sizeof( ExcDummy_040::pMyData );
 
-const BYTE		ExcDummy_041::pMyData[] = {
+const sal_uInt8		ExcDummy_041::pMyData[] = {
     0x0e, 0x00, 0x02, 0x00, 0x01, 0x00,						// PRECISION
     0xda, 0x00, 0x02, 0x00, 0x00, 0x00						// BOOKBOOL
 };
 const sal_Size ExcDummy_041::nMyLen = sizeof( ExcDummy_041::pMyData );
 
 //-------------------------------------------------------- class ExcDummy_02a -
-const BYTE      ExcDummy_02a::pMyData[] = {
+const sal_uInt8      ExcDummy_02a::pMyData[] = {
     0x0d, 0x00, 0x02, 0x00, 0x01, 0x00,						// CALCMODE
     0x0c, 0x00, 0x02, 0x00, 0x64, 0x00,						// CALCCOUNT
     0x0f, 0x00, 0x02, 0x00, 0x01, 0x00,						// REFMODE
@@ -160,7 +160,7 @@ void ExcEmptyRec::Save( XclExpStream& /*rStrm*/ )
 }
 
 
-UINT16 ExcEmptyRec::GetNum() const
+sal_uInt16 ExcEmptyRec::GetNum() const
 {
     return 0;
 }
@@ -198,7 +198,7 @@ void ExcDummyRec::Save( XclExpStream& rStrm )
 }
 
 
-UINT16 ExcDummyRec::GetNum( void ) const
+sal_uInt16 ExcDummyRec::GetNum( void ) const
 {
     return 0x0000;
 }
@@ -209,7 +209,7 @@ UINT16 ExcDummyRec::GetNum( void ) const
 
 void ExcBoolRecord::SaveCont( XclExpStream& rStrm )
 {
-    rStrm << (UINT16)(bVal ? 0x0001 : 0x0000);
+    rStrm << (sal_uInt16)(bVal ? 0x0001 : 0x0000);
 }
 
 
@@ -246,7 +246,7 @@ void ExcBof::SaveCont( XclExpStream& rStrm )
 }
 
 
-UINT16 ExcBof::GetNum( void ) const
+sal_uInt16 ExcBof::GetNum( void ) const
 {
     return 0x0809;
 }
@@ -275,7 +275,7 @@ void ExcBofW::SaveCont( XclExpStream& rStrm )
 
 
 
-UINT16 ExcBofW::GetNum( void ) const
+sal_uInt16 ExcBofW::GetNum( void ) const
 {
     return 0x0809;
 }
@@ -291,7 +291,7 @@ sal_Size ExcBofW::GetLen( void ) const
 
 //-------------------------------------------------------------- class ExcEof -
 
-UINT16 ExcEof::GetNum( void ) const
+sal_uInt16 ExcEof::GetNum( void ) const
 {
     return 0x000A;
 }
@@ -312,7 +312,7 @@ sal_Size ExcDummy_00::GetLen( void ) const
 }
 
 
-const BYTE* ExcDummy_00::GetData( void ) const
+const sal_uInt8* ExcDummy_00::GetData( void ) const
 {
     return pMyData;
 }
@@ -327,7 +327,7 @@ sal_Size ExcDummy_040::GetLen( void ) const
 }
 
 
-const BYTE* ExcDummy_040::GetData( void ) const
+const sal_uInt8* ExcDummy_040::GetData( void ) const
 {
     return pMyData;
 }
@@ -341,7 +341,7 @@ sal_Size ExcDummy_041::GetLen( void ) const
 }
 
 
-const BYTE* ExcDummy_041::GetData( void ) const
+const sal_uInt8* ExcDummy_041::GetData( void ) const
 {
     return pMyData;
 }
@@ -353,11 +353,11 @@ const BYTE* ExcDummy_041::GetData( void ) const
 Exc1904::Exc1904( ScDocument& rDoc )
 {
     Date* pDate = rDoc.GetFormatTable()->GetNullDate();
-    bVal = pDate ? (*pDate == Date( 1, 1, 1904 )) : FALSE;
+    bVal = pDate ? (*pDate == Date( 1, 1, 1904 )) : sal_False;
 }
 
 
-UINT16 Exc1904::GetNum( void ) const
+sal_uInt16 Exc1904::GetNum( void ) const
 {
     return 0x0022;
 }
@@ -401,7 +401,7 @@ void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm )
 }
 
 
-UINT16 ExcBundlesheetBase::GetNum( void ) const
+sal_uInt16 ExcBundlesheetBase::GetNum( void ) const
 {
     return 0x0085;
 }
@@ -421,7 +421,7 @@ ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) :
 void ExcBundlesheet::SaveCont( XclExpStream& rStrm )
 {
     nOwnPos = rStrm.GetSvStreamPos();
-    rStrm	<< (UINT32)	0x00000000				// dummy (stream position of the sheet)
+    rStrm	<< (sal_uInt32)	0x00000000				// dummy (stream position of the sheet)
             << nGrbit;
     rStrm.WriteByteString( aName );				// 8 bit length, max 255 chars
 }
@@ -440,7 +440,7 @@ sal_Size ExcDummy_02a::GetLen( void ) const
     return nMyLen;
 }
 
-const BYTE* ExcDummy_02a::GetData( void ) const
+const sal_uInt8* ExcDummy_02a::GetData( void ) const
 {
     return pMyData;
 }
@@ -573,7 +573,7 @@ sal_Size ExcFilterCondition::GetTextBytes() const
     return pText ? (1 + pText->GetBufferSize()) : 0;
 }
 
-void ExcFilterCondition::SetCondition( UINT8 nTp, UINT8 nOp, double fV, String* pT )
+void ExcFilterCondition::SetCondition( sal_uInt8 nTp, sal_uInt8 nOp, double fV, String* pT )
 {
     nType = nTp;
     nOper = nOp;
@@ -593,17 +593,17 @@ void ExcFilterCondition::Save( XclExpStream& rStrm )
         break;
         case EXC_AFTYPE_STRING:
             DBG_ASSERT( pText, "ExcFilterCondition::Save() -- pText is NULL!" );
-            rStrm << (UINT32)0 << (UINT8) pText->Len() << (UINT16)0 << (UINT8)0;
+            rStrm << (sal_uInt32)0 << (sal_uInt8) pText->Len() << (sal_uInt16)0 << (sal_uInt8)0;
         break;
         case EXC_AFTYPE_BOOLERR:
-            rStrm << (UINT8)0 << (UINT8)((fVal != 0) ? 1 : 0) << (UINT32)0 << (UINT16)0;
+            rStrm << (sal_uInt8)0 << (sal_uInt8)((fVal != 0) ? 1 : 0) << (sal_uInt32)0 << (sal_uInt16)0;
         break;
         default:
-            rStrm << (UINT32)0 << (UINT32)0;
+            rStrm << (sal_uInt32)0 << (sal_uInt32)0;
     }
 }
 
-static const char* lcl_GetOperator( UINT8 nOper )
+static const char* lcl_GetOperator( sal_uInt8 nOper )
 {
     switch( nOper )
     {
@@ -618,7 +618,7 @@ static const char* lcl_GetOperator( UINT8 nOper )
     }
 }
 
-static OString lcl_GetValue( UINT8 nType, double fVal, XclExpString* pStr )
+static OString lcl_GetValue( sal_uInt8 nType, double fVal, XclExpString* pStr )
 {
     switch( nType )
     {
@@ -652,7 +652,7 @@ void ExcFilterCondition::SaveText( XclExpStream& rStrm )
 
 // ----------------------------------------------------------------------------
 
-XclExpAutofilter::XclExpAutofilter( const XclExpRoot& rRoot, UINT16 nC ) :
+XclExpAutofilter::XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ) :
     XclExpRecord( EXC_ID_AUTOFILTER, 24 ),
     XclExpRoot( rRoot ),
     nCol( nC ),
@@ -660,13 +660,13 @@ XclExpAutofilter::XclExpAutofilter( const XclExpRoot& rRoot, UINT16 nC ) :
 {
 }
 
-BOOL XclExpAutofilter::AddCondition( ScQueryConnect eConn, UINT8 nType, UINT8 nOp,
-                                    double fVal, String* pText, BOOL bSimple )
+sal_Bool XclExpAutofilter::AddCondition( ScQueryConnect eConn, sal_uInt8 nType, sal_uInt8 nOp,
+                                    double fVal, String* pText, sal_Bool bSimple )
 {
     if( !aCond[ 1 ].IsEmpty() )
-        return FALSE;
+        return sal_False;
 
-    UINT16 nInd = aCond[ 0 ].IsEmpty() ? 0 : 1;
+    sal_uInt16 nInd = aCond[ 0 ].IsEmpty() ? 0 : 1;
 
     if( nInd == 1 )
         nFlags |= (eConn == SC_OR) ? EXC_AFFLAG_OR : EXC_AFFLAG_AND;
@@ -677,12 +677,12 @@ BOOL XclExpAutofilter::AddCondition( ScQueryConnect eConn, UINT8 nType, UINT8 nO
 
     AddRecSize( aCond[ nInd ].GetTextBytes() );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
+sal_Bool XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
 {
-    BOOL	bConflict = FALSE;
+    sal_Bool	bConflict = sal_False;
     String	sText;
 
     if( rEntry.pStr )
@@ -712,23 +712,23 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
         }
     }
 
-    BOOL bLen = sText.Len() > 0;
+    sal_Bool bLen = sText.Len() > 0;
 
     // empty/nonempty fields
     if( !bLen && (rEntry.nVal == SC_EMPTYFIELDS) )
-        bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_EMPTY, EXC_AFOPER_NONE, 0.0, NULL, TRUE );
+        bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_EMPTY, EXC_AFOPER_NONE, 0.0, NULL, sal_True );
     else if( !bLen && (rEntry.nVal == SC_NONEMPTYFIELDS) )
-        bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_NOTEMPTY, EXC_AFOPER_NONE, 0.0, NULL, TRUE );
+        bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_NOTEMPTY, EXC_AFOPER_NONE, 0.0, NULL, sal_True );
     // other conditions
     else
     {
         double	fVal	= 0.0;
         sal_uInt32	nIndex	= 0;
-        BOOL    bIsNum  = bLen ? GetFormatter().IsNumberFormat( sText, nIndex, fVal ) : TRUE;
+        sal_Bool    bIsNum  = bLen ? GetFormatter().IsNumberFormat( sText, nIndex, fVal ) : sal_True;
         String*	pText	= bIsNum ? NULL : &sText;
 
         // top10 flags
-        UINT16 nNewFlags = 0x0000;
+        sal_uInt16 nNewFlags = 0x0000;
         switch( rEntry.eOp )
         {
             case SC_TOPVAL:
@@ -745,7 +745,7 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
             break;
             default:;
         }
-        BOOL bNewTop10 = ::get_flag( nNewFlags, EXC_AFFLAG_TOP10 );
+        sal_Bool bNewTop10 = ::get_flag( nNewFlags, EXC_AFFLAG_TOP10 );
 
         bConflict = HasTop10() && bNewTop10;
         if( !bConflict )
@@ -754,13 +754,13 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
             {
                 if( fVal < 0 )		fVal = 0;
                 if( fVal >= 501 )	fVal = 500;
-                nFlags |= (nNewFlags | (UINT16)(fVal) << 7);
+                nFlags |= (nNewFlags | (sal_uInt16)(fVal) << 7);
             }
             // normal condition
             else
             {
-                UINT8 nType = bIsNum ? EXC_AFTYPE_DOUBLE : EXC_AFTYPE_STRING;
-                UINT8 nOper = EXC_AFOPER_NONE;
+                sal_uInt8 nType = bIsNum ? EXC_AFTYPE_DOUBLE : EXC_AFTYPE_STRING;
+                sal_uInt8 nOper = EXC_AFOPER_NONE;
 
                 switch( rEntry.eOp )
                 {
@@ -841,9 +841,9 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
     XclExpNameManager& rNameMgr = GetNameManager();
 
     // search for first DB-range with filter
-    UINT16		nIndex	= 0;
-    BOOL		bFound	= FALSE;
-    BOOL		bAdvanced = FALSE;
+    sal_uInt16		nIndex	= 0;
+    sal_Bool		bFound	= sal_False;
+    sal_Bool		bAdvanced = sal_False;
     ScDBData*	pData	= NULL;
     ScRange		aAdvRange;
     while( (nIndex < rDBColl.GetCount()) && !bFound )
@@ -896,9 +896,9 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
         // AutoFilter
         else
         {
-            BOOL	bConflict	= FALSE;
-            BOOL	bContLoop	= TRUE;
-            BOOL	bHasOr		= FALSE;
+            sal_Bool	bConflict	= sal_False;
+            sal_Bool	bContLoop	= sal_True;
+            sal_Bool	bHasOr		= sal_False;
             SCCOLROW nFirstField = aParam.GetEntry( 0 ).nField;
 
             // create AUTOFILTER records for filtered columns
@@ -960,12 +960,12 @@ XclExpAutofilter* ExcAutoFilterRecs::GetByCol( SCCOL nCol )
     return xFilter.get();
 }
 
-BOOL ExcAutoFilterRecs::IsFiltered( SCCOL nCol )
+sal_Bool ExcAutoFilterRecs::IsFiltered( SCCOL nCol )
 {
     for( size_t nPos = 0, nSize = maFilterList.GetSize(); nPos < nSize; ++nPos )
         if( maFilterList.GetRecord( nPos )->GetCol() == static_cast<sal_uInt16>(nCol) )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 void ExcAutoFilterRecs::AddObjRecs()
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index c6a5e5e24..b0fda1d4f 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -98,9 +98,9 @@ XclImpOutlineBuffer::XclImpOutlineBuffer( SCSIZE nNewSize )
     DBG_ASSERT( nNewSize > 0, "-OutlineBuffer::Ctor: nNewSize == 0!" );
 
     nSize = nNewSize + 1;
-    pLevel = new BYTE[ nSize ];
-    pOuted = new BOOL[ nSize ];
-    pHidden = new BOOL[ nSize ];
+    pLevel = new sal_uInt8[ nSize ];
+    pOuted = new sal_Bool[ nSize ];
+    pHidden = new sal_Bool[ nSize ];
     pOutlineArray = NULL;
 
     Reset();
@@ -115,7 +115,7 @@ XclImpOutlineBuffer::~XclImpOutlineBuffer()
 }
 
 
-void XclImpOutlineBuffer::SetLevel( SCSIZE nIndex, BYTE nVal, BOOL bOuted, BOOL bHidden )
+void XclImpOutlineBuffer::SetLevel( SCSIZE nIndex, sal_uInt8 nVal, sal_Bool bOuted, sal_Bool bHidden )
 {
     if( nIndex < nSize )
     {
@@ -143,28 +143,28 @@ void XclImpOutlineBuffer::MakeScOutline( void )
     if( !pOutlineArray || !HasOutline() )
         return;
 
-    const UINT16	nNumLev			= 8;
-    BOOL			bPreOutedLevel	= FALSE;
-    BYTE			nCurrLevel		= 0;
-    BOOL			bMakeHidden[ nNumLev ];
-    BOOL			bMakeVisible[ nNumLev + 1 ];
+    const sal_uInt16	nNumLev			= 8;
+    sal_Bool			bPreOutedLevel	= sal_False;
+    sal_uInt8			nCurrLevel		= 0;
+    sal_Bool			bMakeHidden[ nNumLev ];
+    sal_Bool			bMakeVisible[ nNumLev + 1 ];
 
     sal_uInt16 nLevel;
     for( nLevel = 0; nLevel < nNumLev; ++nLevel )
-        bMakeHidden[ nLevel ] = FALSE;
+        bMakeHidden[ nLevel ] = sal_False;
     for( nLevel = 0; nLevel <= nNumLev; ++nLevel )
-        bMakeVisible[ nLevel ] = TRUE;
+        bMakeVisible[ nLevel ] = sal_True;
     if( nLast < (nSize - 1) )
         nLast++;
 
     // search for hidden attributes at end of level, move them to begin
     if( bButtonNormal )
     {
-        for( BYTE nWorkLevel = 1; nWorkLevel <= nMaxLevel; nWorkLevel++ )
+        for( sal_uInt8 nWorkLevel = 1; nWorkLevel <= nMaxLevel; nWorkLevel++ )
         {
-            UINT16	nStartPos       = 0;
-            BYTE    nCurrLevel2 = 0;
-            BYTE	nPrevLevel	= 0;
+            sal_uInt16	nStartPos       = 0;
+            sal_uInt8    nCurrLevel2 = 0;
+            sal_uInt8	nPrevLevel	= 0;
 
             for( SCSIZE nC = 0 ; nC <= nLast ; nC++ )
             {
@@ -177,10 +177,10 @@ void XclImpOutlineBuffer::MakeScOutline( void )
                     if( pOuted[ nC ] && pHidden[ nStartPos ] )
                     {
                         if( nStartPos )
-                            pOuted[ nStartPos - 1 ] = TRUE;
+                            pOuted[ nStartPos - 1 ] = sal_True;
                         else
-                            bPreOutedLevel = TRUE;
-                        pOuted[ nC ] = FALSE;
+                            bPreOutedLevel = sal_True;
+                        pOuted[ nC ] = sal_False;
                     }
                 }
             }
@@ -190,16 +190,16 @@ void XclImpOutlineBuffer::MakeScOutline( void )
         bPreOutedLevel = pHidden[ 0 ];
 
     // generate SC outlines
-    UINT16	nPrevC;
-    UINT16	nStart[ nNumLev ];
-    BOOL	bDummy;
-    BOOL	bPrevOuted	= bPreOutedLevel;
-    BOOL	bCurrHidden = FALSE;
-    BOOL	bPrevHidden = FALSE;
+    sal_uInt16	nPrevC;
+    sal_uInt16	nStart[ nNumLev ];
+    sal_Bool	bDummy;
+    sal_Bool	bPrevOuted	= bPreOutedLevel;
+    sal_Bool	bCurrHidden = sal_False;
+    sal_Bool	bPrevHidden = sal_False;
 
     for( SCSIZE nC = 0; nC <= nLast; nC++ )
     {
-        BYTE nWorkLevel = pLevel[ nC ];
+        sal_uInt8 nWorkLevel = pLevel[ nC ];
 
         nPrevC      = static_cast< sal_uInt16 >( nC ? nC - 1 : 0 );
         bPrevHidden	= bCurrHidden;
@@ -217,9 +217,9 @@ void XclImpOutlineBuffer::MakeScOutline( void )
         // close levels
         while( nWorkLevel < nCurrLevel )
         {
-            BOOL bLastLevel		= (nWorkLevel == (nCurrLevel - 1));
-            BOOL bRealHidden	= (bMakeHidden[ nCurrLevel ] && bPrevHidden );
-            BOOL bRealVisible	= (bMakeVisible[ nCurrLevel ] ||
+            sal_Bool bLastLevel		= (nWorkLevel == (nCurrLevel - 1));
+            sal_Bool bRealHidden	= (bMakeHidden[ nCurrLevel ] && bPrevHidden );
+            sal_Bool bRealVisible	= (bMakeVisible[ nCurrLevel ] ||
                                     (!bCurrHidden && bLastLevel));
 
             pOutlineArray->Insert( nStart[ nCurrLevel ], nPrevC , bDummy,
@@ -232,8 +232,8 @@ void XclImpOutlineBuffer::MakeScOutline( void )
 }
 
 
-void XclImpOutlineBuffer::SetLevelRange( SCSIZE nF, SCSIZE nL, BYTE nVal,
-                                    BOOL bOuted, BOOL bHidden )
+void XclImpOutlineBuffer::SetLevelRange( SCSIZE nF, SCSIZE nL, sal_uInt8 nVal,
+                                    sal_Bool bOuted, sal_Bool bHidden )
 {
     DBG_ASSERT( nF <= nL, "+OutlineBuffer::SetLevelRange(): Last < First!" );
 
@@ -242,10 +242,10 @@ void XclImpOutlineBuffer::SetLevelRange( SCSIZE nF, SCSIZE nL, BYTE nVal,
         if( nL > nLast )
             nLast = nL;
 
-        BYTE*	pLevelCount;
-        BYTE*	pLast;
-        BOOL*	pOutedCount;
-        BOOL*	pHiddenCount;
+        sal_uInt8*	pLevelCount;
+        sal_uInt8*	pLast;
+        sal_Bool*	pOutedCount;
+        sal_Bool*	pHiddenCount;
 
         pLevelCount = &pLevel[ nF ];
         pLast = &pLevel[ nL ];
@@ -270,7 +270,7 @@ void XclImpOutlineBuffer::Reset( void )
     for( SCSIZE nC = 0 ; nC < nSize ; nC++  )
     {
         pLevel[ nC ] = 0;
-        pOuted[ nC ] = pHidden[ nC ] = FALSE;
+        pOuted[ nC ] = pHidden[ nC ] = sal_False;
     }
     nLast = 0;
     nMaxLevel = 0;
@@ -280,7 +280,7 @@ void XclImpOutlineBuffer::Reset( void )
 //___________________________________________________________________
 
 
-ExcScenarioCell::ExcScenarioCell( const UINT16 nC, const UINT16 nR ) : nCol( nC ), nRow( nR )
+ExcScenarioCell::ExcScenarioCell( const sal_uInt16 nC, const sal_uInt16 nR ) : nCol( nC ), nRow( nR )
 {
 }
 
@@ -300,8 +300,8 @@ void ExcScenarioCell::SetValue( const String& r )
 
 ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR->GetCurrScTab() )
 {
-    UINT16			nCref;
-    UINT8			nName, nComment;
+    sal_uInt16			nCref;
+    sal_uInt8			nName, nComment;
 
     rIn >> nCref;
     rIn >> nProtected;
@@ -324,8 +324,8 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR
     else
         pComment = new String;
 
-    UINT16			n = nCref;
-    UINT16			nC, nR;
+    sal_uInt16			n = nCref;
+    sal_uInt16			nC, nR;
     while( n )
     {
         rIn >> nR >> nC;
@@ -365,24 +365,24 @@ ExcScenario::~ExcScenario()
 }
 
 
-void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast )
+void ExcScenario::Apply( const XclImpRoot& rRoot, const sal_Bool bLast )
 {
     ScDocument&         r = rRoot.GetDoc();
     ExcScenarioCell*	p = EXCSCFIRST();
     String				aSzenName( *pName );
-    UINT16				nNewTab = nTab + 1;
+    sal_uInt16				nNewTab = nTab + 1;
 
     if( !r.InsertTab( nNewTab, aSzenName ) )
         return;
 
-    r.SetScenario( nNewTab, TRUE );
+    r.SetScenario( nNewTab, sal_True );
     // #112621# do not show scenario frames
     r.SetScenarioData( nNewTab, *pComment, COL_LIGHTGRAY, /*SC_SCENARIO_SHOWFRAME|*/SC_SCENARIO_COPYALL|(nProtected ? SC_SCENARIO_PROTECT : 0) );
 
     while( p )
     {
-        UINT16			nCol = p->nCol;
-        UINT16			nRow = p->nRow;
+        sal_uInt16			nCol = p->nCol;
+        sal_uInt16			nRow = p->nRow;
         String			aVal = p->GetValue();
 
         r.ApplyFlagsTab( nCol, nRow, nCol, nRow, nNewTab, SC_MF_SCENARIO );
@@ -393,7 +393,7 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast )
     }
 
     if( bLast )
-        r.SetActiveScenario( nNewTab, TRUE );
+        r.SetActiveScenario( nNewTab, sal_True );
 
     // #111896# modify what the Active tab is set to if the new
     // scenario tab occurs before the active tab.
@@ -421,12 +421,12 @@ ExcScenarioList::~ExcScenarioList()
 void ExcScenarioList::Apply( const XclImpRoot& rRoot )
 {
     ExcScenario*	p = _Last();
-    UINT16			n = ( UINT16 ) Count();
+    sal_uInt16			n = ( sal_uInt16 ) Count();
 
     while( p )
     {
         n--;
-        p->Apply( rRoot, ( BOOL ) ( n == nLastScenario ) );
+        p->Apply( rRoot, ( sal_Bool ) ( n == nLastScenario ) );
         p = _Prev();
     }
 }
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index b0b87d2cf..c4774dda3 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -97,7 +97,7 @@ FltError ExportBiff5::Write()
     if( pDocShell && xRootStrg.Is() && bWriteBasicStrg )
     {
         SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg, bWriteBasicCode, bWriteBasicStrg );
-        ULONG nErr = aBasicImport.SaveOrDelMSVBAStorage( TRUE, EXC_STORAGE_VBA_PROJECT );
+        sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT );
         if( nErr != ERRCODE_NONE )
             pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
     }
@@ -186,7 +186,7 @@ FltError ExportXml2007::Write()
     if( pDocShell && xRootStrg.Is() && bWriteBasicStrg )
     {
         SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg, bWriteBasicCode, bWriteBasicStrg );
-        ULONG nErr = aBasicImport.SaveOrDelMSVBAStorage( TRUE, EXC_STORAGE_VBA_PROJECT );
+        sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( sal_True, EXC_STORAGE_VBA_PROJECT );
         if( nErr != ERRCODE_NONE )
             pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
     }
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index 84b2f6c3a..91716b8c2 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -48,11 +48,11 @@
 #include "patattr.hxx"
 #include "ftools.hxx"
 
-const UINT16	LotusFontBuffer::nSize = 8;
+const sal_uInt16	LotusFontBuffer::nSize = 8;
 
-void LotusFontBuffer::Fill( const UINT8 nIndex, SfxItemSet& rItemSet )
+void LotusFontBuffer::Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet )
 {
-    UINT8	nIntIndex = nIndex & 0x07;
+    sal_uInt8	nIntIndex = nIndex & 0x07;
 
     ENTRY*	pAkt = pData + nIntIndex;
 
@@ -93,7 +93,7 @@ void LotusFontBuffer::Fill( const UINT8 nIndex, SfxItemSet& rItemSet )
 }
 
 
-void LotusFontBuffer::SetName( const UINT16 nIndex, const String& rName )
+void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const String& rName )
 {
     DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetName(): Array zu klein!" );
     if( nIndex < nSize )
@@ -107,15 +107,15 @@ void LotusFontBuffer::SetName( const UINT16 nIndex, const String& rName )
 }
 
 
-void LotusFontBuffer::SetHeight( const UINT16 nIndex, const UINT16 nHeight )
+void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeight )
 {
     DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array zu klein!" );
     if( nIndex < nSize )
-        pData[ nIndex ].Height( *( new SvxFontHeightItem( ( ULONG ) nHeight * 20, 100, ATTR_FONT_HEIGHT ) ) );
+        pData[ nIndex ].Height( *( new SvxFontHeightItem( ( sal_uLong ) nHeight * 20, 100, ATTR_FONT_HEIGHT ) ) );
 }
 
 
-void LotusFontBuffer::SetType( const UINT16 nIndex, const UINT16 nType )
+void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType )
 {
     DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetType(): Array zu klein!" );
     if( nIndex < nSize )
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index 3b165e599..4c535812f 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -54,10 +54,10 @@ _ScRangeListTabs::_ScRangeListTabs( void )
 {
     ppTabLists = new _ScRangeList*[ MAXTAB + 1 ];
 
-    for( UINT16 n = 0 ; n <= MAXTAB ; n++ )
+    for( sal_uInt16 n = 0 ; n <= MAXTAB ; n++ )
         ppTabLists[ n ] = NULL;
 
-    bHasRanges = FALSE;
+    bHasRanges = sal_False;
     pAct = NULL;
     nAct = 0;
 }
@@ -67,7 +67,7 @@ _ScRangeListTabs::~_ScRangeListTabs()
 {
     if( bHasRanges )
     {
-        for( UINT16 n = 0 ; n <= MAXTAB ; n++ )
+        for( sal_uInt16 n = 0 ; n <= MAXTAB ; n++ )
         {
             if( ppTabLists[ n ] )
                 delete ppTabLists[ n ];
@@ -78,7 +78,7 @@ _ScRangeListTabs::~_ScRangeListTabs()
 }
 
 
-void _ScRangeListTabs::Append( ScSingleRefData a, const BOOL b )
+void _ScRangeListTabs::Append( ScSingleRefData a, const sal_Bool b )
 {
     if( b )
     {
@@ -96,7 +96,7 @@ void _ScRangeListTabs::Append( ScSingleRefData a, const BOOL b )
         DBG_ASSERT( ValidTab(a.nTab), "-_ScRangeListTabs::Append(): Luegen haben kurze Abstuerze!" );
     }
 
-    bHasRanges = TRUE;
+    bHasRanges = sal_True;
 
     if( a.nTab >= 0 )
     {
@@ -110,7 +110,7 @@ void _ScRangeListTabs::Append( ScSingleRefData a, const BOOL b )
 }
 
 
-void _ScRangeListTabs::Append( ScComplexRefData a, const BOOL b )
+void _ScRangeListTabs::Append( ScComplexRefData a, const sal_Bool b )
 {
     if( b )
     {
@@ -156,7 +156,7 @@ void _ScRangeListTabs::Append( ScComplexRefData a, const BOOL b )
             "+_ScRangeListTabs::Append(): 3D-Ranges werden in SC nicht unterstuetzt!" );
     }
 
-    bHasRanges = TRUE;
+    bHasRanges = sal_True;
 
     if( a.Ref1.nTab >= 0 )
     {
@@ -170,7 +170,7 @@ void _ScRangeListTabs::Append( ScComplexRefData a, const BOOL b )
 }
 
 
-const ScRange* _ScRangeListTabs::First( const UINT16 n )
+const ScRange* _ScRangeListTabs::First( const sal_uInt16 n )
 {
     DBG_ASSERT( ValidTab(n), "-_ScRangeListTabs::First(): Und tschuessssssss!" );
 
@@ -200,7 +200,7 @@ const ScRange* _ScRangeListTabs::Next( void )
 
 
 
-ConverterBase::ConverterBase( UINT16 nNewBuffer ) :
+ConverterBase::ConverterBase( sal_uInt16 nNewBuffer ) :
     aEingPos( 0, 0, 0 ),
     eStatus( ConvOK ),
     nBufferSize( nNewBuffer )
@@ -224,7 +224,7 @@ void ConverterBase::Reset()
 
 
 
-ExcelConverterBase::ExcelConverterBase( UINT16 nNewBuffer ) :
+ExcelConverterBase::ExcelConverterBase( sal_uInt16 nNewBuffer ) :
     ConverterBase( nNewBuffer )
 {
 }
@@ -248,7 +248,7 @@ void ExcelConverterBase::Reset()
 
 
 
-LotusConverterBase::LotusConverterBase( SvStream &rStr, UINT16 nNewBuffer ) :
+LotusConverterBase::LotusConverterBase( SvStream &rStr, sal_uInt16 nNewBuffer ) :
     ConverterBase( nNewBuffer ),
     aIn( rStr ),
     nBytesLeft( 0 )
@@ -259,14 +259,14 @@ LotusConverterBase::~LotusConverterBase()
 {
 }
 
-//UNUSED2008-05  void LotusConverterBase::Reset( INT32 nLen, const ScAddress& rEingPos )
+//UNUSED2008-05  void LotusConverterBase::Reset( sal_Int32 nLen, const ScAddress& rEingPos )
 //UNUSED2008-05  {
 //UNUSED2008-05      ConverterBase::Reset();
 //UNUSED2008-05      nBytesLeft = nLen;
 //UNUSED2008-05      aEingPos = rEingPos;
 //UNUSED2008-05  }
 //UNUSED2008-05  
-//UNUSED2008-05  void LotusConverterBase::Reset( INT32 nLen )
+//UNUSED2008-05  void LotusConverterBase::Reset( sal_Int32 nLen )
 //UNUSED2008-05  {
 //UNUSED2008-05      ConverterBase::Reset();
 //UNUSED2008-05      nBytesLeft = nLen;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index b4483910f..db8f65bb1 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -145,7 +145,7 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ):
     // ab Biff8
     pFormConv = pExcRoot->pFmlaConverter = new ExcelToSc( GetRoot() );
 
-    bTabTruncated = FALSE;
+    bTabTruncated = sal_False;
 
     // Excel-Dokument per Default auf 31.12.1899, entspricht Excel-Einstellungen mit 1.1.1900
     ScDocOptions aOpt = pD->GetDocOptions();
@@ -154,9 +154,9 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ):
     pD->GetFormatTable()->ChangeNullDate( 30, 12, 1899 );
 
     ScDocOptions aDocOpt( pD->GetDocOptions() );
-    aDocOpt.SetIgnoreCase( TRUE );              // always in Excel
-    aDocOpt.SetFormulaRegexEnabled( FALSE );    // regular expressions? what's that?
-    aDocOpt.SetLookUpColRowNames( FALSE );      // default: no natural language refs
+    aDocOpt.SetIgnoreCase( sal_True );              // always in Excel
+    aDocOpt.SetFormulaRegexEnabled( sal_False );    // regular expressions? what's that?
+    aDocOpt.SetLookUpColRowNames( sal_False );      // default: no natural language refs
     pD->SetDocOptions( aDocOpt );
 }
 
@@ -181,7 +181,7 @@ void ImportExcel::ReadFileSharing()
     if( (nRecommendReadOnly != 0) || (nPasswordHash != 0) )
     {
         if( SfxItemSet* pItemSet = GetMedium().GetItemSet() )
-            pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, TRUE ) );
+            pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
             
         if( SfxObjectShell* pShell = GetDocShell() )
         {
@@ -382,7 +382,7 @@ void ImportExcel::Window1()
 
 void ImportExcel::Row25( void )
 {
-    UINT16	nRow, nRowHeight;
+    sal_uInt16	nRow, nRowHeight;
 
     aIn >> nRow;
     aIn.Ignore( 4 );   // Mic und Mac ueberspringen
@@ -398,7 +398,7 @@ void ImportExcel::Row25( void )
         }
         else
         {// -------------------- BIFF5
-            UINT16	nGrbit;
+            sal_uInt16	nGrbit;
 
             aIn.Ignore( 2 );   // reserved
             aIn >> nGrbit;
@@ -467,8 +467,8 @@ void ImportExcel:: WinProtection( void )
 
 void ImportExcel::Columndefault( void )
 {// Default Cell Attributes
-    UINT16	nColMic, nColMac;
-    BYTE	nOpt0;
+    sal_uInt16	nColMic, nColMac;
+    sal_uInt8	nOpt0;
 
     aIn >> nColMic >> nColMac;
 
@@ -478,9 +478,9 @@ void ImportExcel::Columndefault( void )
     nColMac--;
 
     if( nColMac > MAXCOL )
-        nColMac = static_cast<UINT16>(MAXCOL);
+        nColMac = static_cast<sal_uInt16>(MAXCOL);
 
-    for( UINT16 nCol = nColMic ; nCol <= nColMac ; nCol++ )
+    for( sal_uInt16 nCol = nColMic ; nCol <= nColMac ; nCol++ )
     {
         aIn >> nOpt0;
         aIn.Ignore( 2 );   // nur 0. Attribut-Byte benutzt
@@ -493,8 +493,8 @@ void ImportExcel::Columndefault( void )
 
 void ImportExcel::Array25( void )
 {
-    UINT16		nFirstRow, nLastRow, nFormLen;
-    BYTE		nFirstCol, nLastCol;
+    sal_uInt16		nFirstRow, nLastRow, nFormLen;
+    sal_uInt8		nFirstCol, nLastCol;
 
     aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol;
 
@@ -532,7 +532,7 @@ void ImportExcel::Array25( void )
 
 void ImportExcel::Rec1904( void )
 {
-    UINT16	n1904;
+    sal_uInt16	n1904;
 
     aIn >> n1904;
 
@@ -548,12 +548,12 @@ void ImportExcel::Rec1904( void )
 
 void ImportExcel::Externname25( void )
 {
-    UINT32		nRes;
-    UINT16		nOpt;
+    sal_uInt32		nRes;
+    sal_uInt16		nOpt;
 
     aIn >> nOpt >> nRes;
 
-    String aName( aIn.ReadByteString( FALSE ) );
+    String aName( aIn.ReadByteString( sal_False ) );
 
     if( ( nOpt & 0x0001 ) || ( ( nOpt & 0xFFFE ) == 0x0000 ) )
     {// external name
@@ -573,16 +573,16 @@ void ImportExcel::Externname25( void )
 
 void ImportExcel::Colwidth( void )
 {// Column Width
-    BYTE	nColFirst, nColLast;
-    UINT16	nColWidth;
+    sal_uInt8	nColFirst, nColLast;
+    sal_uInt16	nColWidth;
 
     aIn >> nColFirst >> nColLast >> nColWidth;
 
 //! TODO: add a check for the unlikely case of changed MAXCOL (-> XclImpAddressConverter)
 //   if( nColLast > MAXCOL )
-//       nColLast = static_cast<UINT16>(MAXCOL);
+//       nColLast = static_cast<sal_uInt16>(MAXCOL);
 
-    USHORT nScWidth = XclTools::GetScColumnWidth( nColWidth, GetCharWidth() );
+    sal_uInt16 nScWidth = XclTools::GetScColumnWidth( nColWidth, GetCharWidth() );
     pColRowBuff->SetWidthRange( nColFirst, nColLast, nScWidth );
 }
 
@@ -641,7 +641,7 @@ void ImportExcel::DefColWidth( void )
     long nFontHt = GetFontBuffer().GetAppFontData().mnHeight;
     fDefWidth += XclTools::GetXclDefColWidthCorrection( nFontHt );
 
-    USHORT nScWidth = XclTools::GetScColumnWidth( limit_cast< sal_uInt16 >( fDefWidth ), GetCharWidth() );
+    sal_uInt16 nScWidth = XclTools::GetScColumnWidth( limit_cast< sal_uInt16 >( fDefWidth ), GetCharWidth() );
     pColRowBuff->SetDefWidth( nScWidth );
 }
 
@@ -653,8 +653,8 @@ void ImportExcel::Builtinfmtcnt( void )
 
 void ImportExcel::Colinfo( void )
 {// Column Formatting Information
-    UINT16	nColFirst, nColLast, nColWidth, nXF;
-    UINT16	nOpt;
+    sal_uInt16	nColFirst, nColLast, nColWidth, nXF;
+    sal_uInt16	nOpt;
 
     aIn >> nColFirst >> nColLast >> nColWidth >> nXF >> nOpt;
 
@@ -662,7 +662,7 @@ void ImportExcel::Colinfo( void )
         return;
 
     if( nColLast > MAXCOL )
-        nColLast = static_cast<UINT16>(MAXCOL);
+        nColLast = static_cast<sal_uInt16>(MAXCOL);
 
     bool bHidden = ::get_flag( nOpt, EXC_COLINFO_HIDDEN );
     bool bCollapsed = ::get_flag( nOpt, EXC_COLINFO_COLLAPSED );
@@ -672,7 +672,7 @@ void ImportExcel::Colinfo( void )
     if( bHidden )
         pColRowBuff->HideColRange( nColFirst, nColLast );
 
-    USHORT nScWidth = XclTools::GetScColumnWidth( nColWidth, GetCharWidth() );
+    sal_uInt16 nScWidth = XclTools::GetScColumnWidth( nColWidth, GetCharWidth() );
     pColRowBuff->SetWidthRange( nColFirst, nColLast, nScWidth );
     pColRowBuff->SetDefaultXF( nColFirst, nColLast, nXF );
 }
@@ -680,7 +680,7 @@ void ImportExcel::Colinfo( void )
 
 void ImportExcel::Wsbool( void )
 {
-    UINT16 nFlags;
+    sal_uInt16 nFlags;
     aIn >> nFlags;
 
     pRowOutlineBuff->SetButtonMode( ::get_flag( nFlags, EXC_WSBOOL_ROWBELOW ) );
@@ -692,7 +692,7 @@ void ImportExcel::Wsbool( void )
 
 void ImportExcel::Boundsheet( void )
 {
-    UINT16 nGrbit = 0;
+    sal_uInt16 nGrbit = 0;
 
     if( GetBiff() == EXC_BIFF5 )
     {
@@ -702,7 +702,7 @@ void ImportExcel::Boundsheet( void )
         aIn >> nGrbit;
     }
 
-    String aName( aIn.ReadByteString( FALSE ) );
+    String aName( aIn.ReadByteString( sal_False ) );
 
     SCTAB nScTab = static_cast< SCTAB >( nBdshtTab );
     if( nScTab > 0 )
@@ -712,7 +712,7 @@ void ImportExcel::Boundsheet( void )
     }
 
     if( ( nGrbit & 0x0001 ) || ( nGrbit & 0x0002 ) )
-        pD->SetVisible( nScTab, FALSE );
+        pD->SetVisible( nScTab, sal_False );
 
     if( !pD->RenameTab( nScTab, aName ) )
     {
@@ -746,7 +746,7 @@ void ImportExcel::ReadUsesElfs()
     if( maStrm.ReaduInt16() != 0 )
     {
         ScDocOptions aDocOpt = GetDoc().GetDocOptions();
-        aDocOpt.SetLookUpColRowNames( TRUE );
+        aDocOpt.SetLookUpColRowNames( sal_True );
         GetDoc().SetDocOptions( aDocOpt );
     }
 }
@@ -754,7 +754,7 @@ void ImportExcel::ReadUsesElfs()
 
 void ImportExcel::Hideobj( void )
 {
-    UINT16		nHide;
+    sal_uInt16		nHide;
     ScVObjMode	eOle, eChart, eDraw;
 
     aIn >> nHide;
@@ -795,15 +795,15 @@ void ImportExcel::Bundleheader( void )
 
 void ImportExcel::Standardwidth( void )
 {
-    USHORT nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() );
-    pColRowBuff->SetDefWidth( nScWidth, TRUE );
+    sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() );
+    pColRowBuff->SetDefWidth( nScWidth, sal_True );
 }
 
 
 void ImportExcel::Shrfmla( void )
 {
-    UINT16				nFirstRow, nLastRow, nLenExpr;
-    BYTE				nFirstCol, nLastCol;
+    sal_uInt16				nFirstRow, nLastRow, nLenExpr;
+    sal_uInt8				nFirstCol, nLastCol;
 
     aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol;
     aIn.Ignore( 2 );
@@ -829,8 +829,8 @@ void ImportExcel::Shrfmla( void )
 void ImportExcel::Mulrk( void )
 {
     XclAddress aXclPos;
-    UINT16  nXF;
-    INT32   nRkNum;
+    sal_uInt16  nXF;
+    sal_Int32   nRkNum;
 
     aIn >> aXclPos;
 
@@ -851,7 +851,7 @@ void ImportExcel::Mulrk( void )
 void ImportExcel::Mulblank( void )
 {
     XclAddress aXclPos;
-    UINT16  nXF;
+    sal_uInt16  nXF;
 
     aIn >> aXclPos;
 
@@ -927,7 +927,7 @@ void ImportExcel::Olesize( void )
 
 void ImportExcel::Row34( void )
 {
-    UINT16	nRow, nRowHeight, nGrbit, nXF;
+    sal_uInt16	nRow, nRowHeight, nGrbit, nXF;
 
     aIn >> nRow;
     aIn.Ignore( 4 );   // Mic und Mac ueberspringen
@@ -974,8 +974,8 @@ void ImportExcel::Bof3( void )
 
 void ImportExcel::Array34( void )
 {
-    UINT16					nFirstRow, nLastRow, nFormLen;
-    BYTE					nFirstCol, nLastCol;
+    sal_uInt16					nFirstRow, nLastRow, nFormLen;
+    sal_uInt8					nFirstCol, nLastCol;
 
     aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol;
     aIn.Ignore( (GetBiff() >= EXC_BIFF5) ? 6 : 2 );
@@ -1017,10 +1017,10 @@ void ImportExcel::Defrowheight345( void )
 
 void ImportExcel::TableOp( void )
 {
-    UINT16 nFirstRow, nLastRow;
-    UINT8 nFirstCol, nLastCol;
-    UINT16 nGrbit;
-    UINT16 nInpRow, nInpCol, nInpRow2, nInpCol2;
+    sal_uInt16 nFirstRow, nLastRow;
+    sal_uInt8 nFirstCol, nLastCol;
+    sal_uInt16 nGrbit;
+    sal_uInt16 nInpRow, nInpCol, nInpRow2, nInpCol2;
 
     aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol >> nGrbit
         >> nInpRow >> nInpCol >> nInpRow2 >> nInpCol2;
@@ -1031,50 +1031,50 @@ void ImportExcel::TableOp( void )
         {
             ScTabOpParam aTabOpParam;
             aTabOpParam.nMode = (nGrbit & EXC_TABLEOP_BOTH) ? 2 : ((nGrbit & EXC_TABLEOP_ROW) ? 1 : 0 );
-            USHORT nCol = nFirstCol - 1;
-            USHORT nRow = nFirstRow - 1;
+            sal_uInt16 nCol = nFirstCol - 1;
+            sal_uInt16 nRow = nFirstRow - 1;
             SCTAB nTab = GetCurrScTab();
             switch( aTabOpParam.nMode )
             {
                 case 0:		// COL
                     aTabOpParam.aRefFormulaCell.Set(
                             static_cast<SCCOL>(nFirstCol),
-                            static_cast<SCROW>(nFirstRow - 1), nTab, FALSE,
-                            FALSE, FALSE );
+                            static_cast<SCROW>(nFirstRow - 1), nTab, sal_False,
+                            sal_False, sal_False );
                     aTabOpParam.aRefFormulaEnd.Set(
                             static_cast<SCCOL>(nLastCol),
-                            static_cast<SCROW>(nFirstRow - 1), nTab, FALSE,
-                            FALSE, FALSE );
+                            static_cast<SCROW>(nFirstRow - 1), nTab, sal_False,
+                            sal_False, sal_False );
                     aTabOpParam.aRefColCell.Set( static_cast<SCCOL>(nInpCol),
-                            static_cast<SCROW>(nInpRow), nTab, FALSE, FALSE,
-                            FALSE );
+                            static_cast<SCROW>(nInpRow), nTab, sal_False, sal_False,
+                            sal_False );
                     nRow++;
                 break;
                 case 1:		// ROW
                     aTabOpParam.aRefFormulaCell.Set(
                             static_cast<SCCOL>(nFirstCol - 1),
-                            static_cast<SCROW>(nFirstRow), nTab, FALSE, FALSE,
-                            FALSE );
+                            static_cast<SCROW>(nFirstRow), nTab, sal_False, sal_False,
+                            sal_False );
                     aTabOpParam.aRefFormulaEnd.Set(
                             static_cast<SCCOL>(nFirstCol - 1),
-                            static_cast<SCROW>(nLastRow), nTab, FALSE, FALSE,
-                            FALSE );
+                            static_cast<SCROW>(nLastRow), nTab, sal_False, sal_False,
+                            sal_False );
                     aTabOpParam.aRefRowCell.Set( static_cast<SCCOL>(nInpCol),
-                            static_cast<SCROW>(nInpRow), nTab, FALSE, FALSE,
-                            FALSE );
+                            static_cast<SCROW>(nInpRow), nTab, sal_False, sal_False,
+                            sal_False );
                     nCol++;
                 break;
                 case 2:		// TWO-INPUT
                     aTabOpParam.aRefFormulaCell.Set(
                             static_cast<SCCOL>(nFirstCol - 1),
-                            static_cast<SCROW>(nFirstRow - 1), nTab, FALSE,
-                            FALSE, FALSE );
+                            static_cast<SCROW>(nFirstRow - 1), nTab, sal_False,
+                            sal_False, sal_False );
                     aTabOpParam.aRefRowCell.Set( static_cast<SCCOL>(nInpCol),
-                            static_cast<SCROW>(nInpRow), nTab, FALSE, FALSE,
-                            FALSE );
+                            static_cast<SCROW>(nInpRow), nTab, sal_False, sal_False,
+                            sal_False );
                     aTabOpParam.aRefColCell.Set( static_cast<SCCOL>(nInpCol2),
-                            static_cast<SCROW>(nInpRow2), nTab, FALSE, FALSE,
-                            FALSE );
+                            static_cast<SCROW>(nInpRow2), nTab, sal_False, sal_False,
+                            sal_False );
                 break;
             }
 
@@ -1087,7 +1087,7 @@ void ImportExcel::TableOp( void )
     }
     else
     {
-        bTabTruncated = TRUE;
+        bTabTruncated = sal_True;
         GetTracer().TraceInvalidRow(GetCurrScTab(), nLastRow, MAXROW);
     }
 }
@@ -1114,7 +1114,7 @@ void ImportExcel::Bof4( void )
 void ImportExcel::Bof5( void )
 {
     //POST:	eDateiTyp = Typ der zu lesenden Datei
-    UINT16		nSubType, nVers;
+    sal_uInt16		nSubType, nVers;
     BiffTyp		eDatei;
 
     maStrm.DisableDecryption();
@@ -1170,7 +1170,7 @@ void ImportExcel::NeueTabelle( void )
 }
 
 
-const ScTokenArray* ImportExcel::ErrorToFormula( BYTE bErrOrVal, BYTE nError, double& rVal )
+const ScTokenArray* ImportExcel::ErrorToFormula( sal_uInt8 bErrOrVal, sal_uInt8 nError, double& rVal )
 {
     return pFormConv->GetBoolErr( XclTools::ErrorToEnum( rVal, bErrOrVal, nError ) );
 }
@@ -1253,7 +1253,7 @@ void ImportExcel::PostDocLoad( void )
     {
         for( SCTAB n = 0 ; n < nLast ; n++ )
         {
-            p = pExcRoot->pPrintRanges->First( static_cast<UINT16>(n) );
+            p = pExcRoot->pPrintRanges->First( static_cast<sal_uInt16>(n) );
             if( p )
             {
                 DBG_ASSERT( pExcRoot->pPrintRanges->GetActList(),
@@ -1279,27 +1279,27 @@ void ImportExcel::PostDocLoad( void )
     {
         for( SCTAB n = 0 ; n < nLast ; n++ )
         {
-            p = pExcRoot->pPrintTitles->First( static_cast<UINT16>(n) );
+            p = pExcRoot->pPrintTitles->First( static_cast<sal_uInt16>(n) );
             if( p )
             {
                 DBG_ASSERT( pExcRoot->pPrintTitles->GetActList(),
                     "-ImportExcel::PostDocLoad(): Imaginaere Tabelle gefunden!" );
 
-                BOOL	bRowVirgin = TRUE;
-                BOOL	bColVirgin = TRUE;
+                sal_Bool	bRowVirgin = sal_True;
+                sal_Bool	bColVirgin = sal_True;
 
                 while( p )
                 {
                     if( p->aStart.Col() == 0 && p->aEnd.Col() == MAXCOL && bRowVirgin )
                     {
                         pD->SetRepeatRowRange( n, p );
-                        bRowVirgin = FALSE;
+                        bRowVirgin = sal_False;
                     }
 
                     if( p->aStart.Row() == 0 && p->aEnd.Row() == MAXROW && bColVirgin )
                     {
                         pD->SetRepeatColRange( n, p );
-                        bColVirgin = FALSE;
+                        bColVirgin = sal_False;
                     }
 
                     p = pExcRoot->pPrintTitles->Next();
@@ -1324,10 +1324,10 @@ XclImpOutlineDataBuffer::~XclImpOutlineDataBuffer()
 
 void XclImpOutlineDataBuffer::Convert()
 {
-    mxColOutlineBuff->SetOutlineArray( GetDoc().GetOutlineTable( mnScTab, TRUE )->GetColArray() );
+    mxColOutlineBuff->SetOutlineArray( GetDoc().GetOutlineTable( mnScTab, sal_True )->GetColArray() );
     mxColOutlineBuff->MakeScOutline();
 
-    mxRowOutlineBuff->SetOutlineArray( GetDoc().GetOutlineTable( mnScTab, TRUE )->GetRowArray() );
+    mxRowOutlineBuff->SetOutlineArray( GetDoc().GetOutlineTable( mnScTab, sal_True )->GetRowArray() );
     mxRowOutlineBuff->MakeScOutline();
 
     mxColRowBuff->ConvertHiddenFlags( mnScTab );
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 81676152a..4b8d08f37 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -44,16 +44,16 @@
 #include "xiroot.hxx"
 
 
-UINT32 StringHashEntry::MakeHashCode( const String& r )
+sal_uInt32 StringHashEntry::MakeHashCode( const String& r )
 {
-    register UINT32					n = 0;
+    register sal_uInt32					n = 0;
     const sal_Unicode*				pAkt = r.GetBuffer();
     register sal_Unicode			cAkt = *pAkt;
 
     while( cAkt )
     {
         n *= 70;
-        n += ( UINT32 ) cAkt;
+        n += ( sal_uInt32 ) cAkt;
         pAkt++;
         cAkt = *pAkt;
     }
@@ -86,14 +86,14 @@ void NameBuffer::operator <<( const String &rNewString )
 
 
 #ifdef DBG_UTIL
-UINT16	nShrCnt;
+sal_uInt16	nShrCnt;
 #endif
 
 
 size_t ShrfmlaBuffer::ScAddressHashFunc::operator() (const ScAddress &addr) const
 {
     // Use something simple, it is just a hash.
-    return static_cast< UINT16 >( addr.Row() ) | (static_cast< UINT8 >( addr.Col() ) << 16);
+    return static_cast< sal_uInt16 >( addr.Row() ) | (static_cast< sal_uInt8 >( addr.Col() ) << 16);
 }
 
 const size_t nBase = 16384; // Range~ und Shared~ Dingens mit jeweils der Haelfte Ids
@@ -127,15 +127,15 @@ void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
     const ScAddress& rMaxPos = pExcRoot->pIR->GetMaxPos();
     pData->SetMaxCol(rMaxPos.Col());
     pData->SetMaxRow(rMaxPos.Row());
-    pData->SetIndex( static_cast< USHORT >( mnCurrIdx ) );
+    pData->SetIndex( static_cast< sal_uInt16 >( mnCurrIdx ) );
     pExcRoot->pIR->GetNamedRanges().Insert( pData );
-    index_hash[rRange.aStart] = static_cast< USHORT >( mnCurrIdx );
+    index_hash[rRange.aStart] = static_cast< sal_uInt16 >( mnCurrIdx );
     index_list.push_front (rRange);
     ++mnCurrIdx;
 }
 
 
-USHORT ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
+sal_uInt16 ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
 {
     ShrfmlaHash::const_iterator hash = index_hash.find (aAddr);
     if (hash != index_hash.end())
@@ -145,8 +145,8 @@ USHORT ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
     unsigned int ind = nBase;
     for (ShrfmlaList::const_iterator ptr = index_list.end(); ptr != index_list.begin() ; ind++)
         if ((--ptr)->In (aAddr))
-            return static_cast< USHORT >( ind );
-    return static_cast< USHORT >( mnCurrIdx );
+            return static_cast< sal_uInt16 >( ind );
+    return static_cast< sal_uInt16 >( mnCurrIdx );
 }
 
 
@@ -180,7 +180,7 @@ ExtSheetBuffer::~ExtSheetBuffer()
 }
 
 
-sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const BOOL bSWB )
+sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const sal_Bool bSWB )
 {
     List::Insert( new Cont( rFPAN, rTN, bSWB ), LIST_APPEND );
     // return 1-based index of EXTERNSHEET
@@ -188,21 +188,21 @@ sal_Int16 ExtSheetBuffer::Add( const String& rFPAN, const String& rTN, const BOO
 }
 
 
-BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
+sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex )
 {
     DBG_ASSERT( nExcIndex,
         "*ExtSheetBuffer::GetScTabIndex(): Sheet-Index == 0!" );
 
     nExcIndex--;
     Cont*		pCur = ( Cont * ) List::GetObject( nExcIndex );
-    UINT16&		rTabNum = pCur->nTabNum;
+    sal_uInt16&		rTabNum = pCur->nTabNum;
 
     if( pCur )
     {
         if( rTabNum < 0xFFFD )
         {
             rScIndex = rTabNum;
-            return TRUE;
+            return sal_True;
         }
 
         if( rTabNum == 0xFFFF )
@@ -212,8 +212,8 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
             {// Tabelle ist im selben Workbook!
                 if( pExcRoot->pIR->GetDoc().GetTable( pCur->aTab, nNewTabNum ) )
                 {
-                    rScIndex = rTabNum = static_cast<UINT16>(nNewTabNum);
-                    return TRUE;
+                    rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum);
+                    return sal_True;
                 }
                 else
                     rTabNum = 0xFFFD;
@@ -227,8 +227,8 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
                     String		aTabName( ScGlobal::GetDocTabName( aURL, pCur->aTab ) );
                     if( pExcRoot->pIR->GetDoc().LinkExternalTab( nNewTabNum, aTabName, aURL, pCur->aTab ) )
                     {
-                        rScIndex = rTabNum = static_cast<UINT16>(nNewTabNum);
-                        return TRUE;
+                        rScIndex = rTabNum = static_cast<sal_uInt16>(nNewTabNum);
+                        return sal_True;
                     }
                     else
                         rTabNum = 0xFFFE;		// Tabelle einmal nicht angelegt -> wird
@@ -241,11 +241,11 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ExtSheetBuffer::IsLink( const UINT16 nExcIndex ) const
+sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const
 {
     DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index muss >0 sein!" );
     Cont*	pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
@@ -253,11 +253,11 @@ BOOL ExtSheetBuffer::IsLink( const UINT16 nExcIndex ) const
     if( pRet )
         return pRet->bLink;
     else
-        return FALSE;
+        return sal_False;
 }
 
 
-BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDoc ) const
+sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, String& rAppl, String& rDoc ) const
 {
     DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index muss >0 sein!" );
     Cont*	pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
@@ -266,10 +266,10 @@ BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDo
     {
         rAppl = pRet->aFile;
         rDoc = pRet->aTab;
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 
@@ -288,13 +288,13 @@ void ExtSheetBuffer::Reset( void )
 
 
 
-BOOL ExtName::IsDDE( void ) const
+sal_Bool ExtName::IsDDE( void ) const
 {
     return ( nFlags & 0x0001 ) != 0;
 }
 
 
-BOOL ExtName::IsOLE( void ) const
+sal_Bool ExtName::IsOLE( void ) const
 {
     return ( nFlags & 0x0002 ) != 0;
 }
@@ -313,7 +313,7 @@ void ExtNameBuff::AddDDE( const String& rName, sal_Int16 nRefIdx )
 }
 
 
-void ExtNameBuff::AddOLE( const String& rName, sal_Int16 nRefIdx, UINT32 nStorageId )
+void ExtNameBuff::AddOLE( const String& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId )
 {
     ExtName aNew( rName, 0x0002 );
     aNew.nStorageId = nStorageId;
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 4b2834873..cc0e3f9ff 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -89,9 +89,9 @@ FltError ImportExcel::Read( void )
     Zustand				eAkt = Z_BiffNull, ePrev = Z_BiffNull;
 
     FltError			eLastErr = eERR_OK;
-    UINT16				nOpcode;
-    UINT16              nBofLevel = 0;
-    BOOL                bBiff4Workbook = FALSE;
+    sal_uInt16				nOpcode;
+    sal_uInt16              nBofLevel = 0;
+    sal_Bool                bBiff4Workbook = sal_False;
 
     DBG_ASSERT( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" );
 
@@ -189,7 +189,7 @@ FltError ImportExcel::Read( void )
                                 else if( pExcRoot->eDateiTyp == Biff4W )
                                 {
                                     eAkt = Z_Biff4W;
-                                    bBiff4Workbook = TRUE;
+                                    bBiff4Workbook = sal_True;
                                 }
                             break;
                             case EXC_BIFF5:
@@ -722,7 +722,7 @@ FltError ImportExcel::Read( void )
                             break;
                             case Biff5V:
                             default:
-                                pD->SetVisible( GetCurrScTab(), FALSE );
+                                pD->SetVisible( GetCurrScTab(), sal_False );
                                 ePrev = eAkt;
                                 eAkt = Z_Biffn0;
                         }
@@ -782,7 +782,7 @@ FltError ImportExcel8::Read( void )
 {
 #if EXC_INCL_DUMPER
     {
-        Biff8RecDumper aDumper( GetRoot(), TRUE );
+        Biff8RecDumper aDumper( GetRoot(), sal_True );
         if( aDumper.Dump( aIn ) )
             return ERRCODE_ABORT;
     }
@@ -1053,7 +1053,7 @@ FltError ImportExcel8::Read( void )
                             case Biff8V:    // VB module
                             default:
                                 // TODO: do not create a sheet in the Calc document
-                                pD->SetVisible( GetCurrScTab(), FALSE );
+                                pD->SetVisible( GetCurrScTab(), sal_False );
                                 XclTools::SkipSubStream( maStrm );
                                 IncCurrScTab();
                         }
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 0f364ba53..b12af1da7 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -40,10 +40,10 @@
 
 #include <stdio.h> // printf
 
-const UINT16	TokenPool::nScTokenOff = 8192;
+const sal_uInt16	TokenPool::nScTokenOff = 8192;
 
 
-TokenStack::TokenStack( UINT16 nNewSize )
+TokenStack::TokenStack( sal_uInt16 nNewSize )
 {
     pStack = new TokenId[ nNewSize ];
 
@@ -69,17 +69,17 @@ TokenStack::~TokenStack()
 
 TokenPool::TokenPool( void )
 {
-    UINT16	nLauf = nScTokenOff;
+    sal_uInt16	nLauf = nScTokenOff;
 
     // Sammelstelle fuer Id-Folgen
     nP_Id = 256;
-    pP_Id = new UINT16[ nP_Id ];
+    pP_Id = new sal_uInt16[ nP_Id ];
 
     // Sammelstelle fuer Ids
     nElement = 32;
-    pElement = new UINT16[ nElement ];
+    pElement = new sal_uInt16[ nElement ];
     pType = new E_TYPE[ nElement ];
-    pSize = new UINT16[ nElement ];
+    pSize = new sal_uInt16[ nElement ];
     nP_IdLast = 0;
 
     // Sammelstelle fuer Strings
@@ -94,7 +94,7 @@ TokenPool::TokenPool( void )
 
     // Sammelstelle fuer error codes
     nP_Err = 8;
-    pP_Err = new USHORT[ nP_Err ];
+    pP_Err = new sal_uInt16[ nP_Err ];
 
     // Sammelstellen fuer Referenzen
     nP_RefTr = 32;
@@ -122,7 +122,7 @@ TokenPool::TokenPool( void )
 
 TokenPool::~TokenPool()
 {
-    UINT16	n;
+    sal_uInt16	n;
 
     delete[] pP_Id;
     delete[] pElement;
@@ -172,8 +172,8 @@ TokenPool::~TokenPool()
 
 void TokenPool::GrowString( void )
 {
-    UINT16		nP_StrNew = nP_Str * 2;
-    UINT16		nL;
+    sal_uInt16		nP_StrNew = nP_Str * 2;
+    sal_uInt16		nL;
 
     String**	ppP_StrNew = new String *[ nP_StrNew ];
 
@@ -191,11 +191,11 @@ void TokenPool::GrowString( void )
 
 void TokenPool::GrowDouble( void )
 {
-    UINT16		nP_DblNew = nP_Dbl * 2;
+    sal_uInt16		nP_DblNew = nP_Dbl * 2;
 
     double*		pP_DblNew = new double[ nP_DblNew ];
 
-    for( UINT16 nL = 0 ; nL < nP_Dbl ; nL++ )
+    for( sal_uInt16 nL = 0 ; nL < nP_Dbl ; nL++ )
         pP_DblNew[ nL ] = pP_Dbl[ nL ];
 
     nP_Dbl = nP_DblNew;
@@ -207,11 +207,11 @@ void TokenPool::GrowDouble( void )
 
 //UNUSED2009-05 void TokenPool::GrowError( void )
 //UNUSED2009-05 {
-//UNUSED2009-05     UINT16      nP_ErrNew = nP_Err * 2;
+//UNUSED2009-05     sal_uInt16      nP_ErrNew = nP_Err * 2;
 //UNUSED2009-05 
-//UNUSED2009-05     USHORT*     pP_ErrNew = new USHORT[ nP_ErrNew ];
+//UNUSED2009-05     sal_uInt16*     pP_ErrNew = new sal_uInt16[ nP_ErrNew ];
 //UNUSED2009-05 
-//UNUSED2009-05     for( UINT16 nL = 0 ; nL < nP_Err ; nL++ )
+//UNUSED2009-05     for( sal_uInt16 nL = 0 ; nL < nP_Err ; nL++ )
 //UNUSED2009-05         pP_ErrNew[ nL ] = pP_Err[ nL ];
 //UNUSED2009-05 
 //UNUSED2009-05     nP_Err = nP_ErrNew;
@@ -223,8 +223,8 @@ void TokenPool::GrowDouble( void )
 
 void TokenPool::GrowTripel( void )
 {
-    UINT16			nP_RefTrNew = nP_RefTr * 2;
-    UINT16			nL;
+    sal_uInt16			nP_RefTrNew = nP_RefTr * 2;
+    sal_uInt16			nL;
 
     ScSingleRefData**	ppP_RefTrNew = new ScSingleRefData *[ nP_RefTrNew ];
 
@@ -242,11 +242,11 @@ void TokenPool::GrowTripel( void )
 
 void TokenPool::GrowId( void )
 {
-    UINT16	nP_IdNew = nP_Id * 2;
+    sal_uInt16	nP_IdNew = nP_Id * 2;
 
-    UINT16*	pP_IdNew = new UINT16[ nP_IdNew ];
+    sal_uInt16*	pP_IdNew = new sal_uInt16[ nP_IdNew ];
 
-    for( UINT16 nL = 0 ; nL < nP_Id ; nL++ )
+    for( sal_uInt16 nL = 0 ; nL < nP_Id ; nL++ )
         pP_IdNew[ nL ] = pP_Id[ nL ];
 
     nP_Id = nP_IdNew;
@@ -258,13 +258,13 @@ void TokenPool::GrowId( void )
 
 void TokenPool::GrowElement( void )
 {
-    UINT16	nElementNew = nElement * 2;
+    sal_uInt16	nElementNew = nElement * 2;
 
-    UINT16*	pElementNew = new UINT16[ nElementNew ];
+    sal_uInt16*	pElementNew = new sal_uInt16[ nElementNew ];
     E_TYPE*	pTypeNew = new E_TYPE[ nElementNew ];
-    UINT16*	pSizeNew = new UINT16[ nElementNew ];
+    sal_uInt16*	pSizeNew = new sal_uInt16[ nElementNew ];
 
-    for( UINT16 nL = 0 ; nL < nElement ; nL++ )
+    for( sal_uInt16 nL = 0 ; nL < nElement ; nL++ )
     {
         pElementNew[ nL ] = pElement[ nL ];
         pTypeNew[ nL ] = pType[ nL ];
@@ -284,7 +284,7 @@ void TokenPool::GrowElement( void )
 
 void TokenPool::GrowExt( void )
 {
-    UINT16		nNewSize = nP_Ext * 2;
+    sal_uInt16		nNewSize = nP_Ext * 2;
 
     EXTCONT**	ppNew = new EXTCONT*[ nNewSize ];
 
@@ -299,7 +299,7 @@ void TokenPool::GrowExt( void )
 
 void TokenPool::GrowNlf( void )
 {
-    UINT16		nNewSize = nP_Nlf * 2;
+    sal_uInt16		nNewSize = nP_Nlf * 2;
 
     NLFCONT**	ppNew = new NLFCONT*[ nNewSize ];
 
@@ -314,7 +314,7 @@ void TokenPool::GrowNlf( void )
 
 void TokenPool::GrowMatrix( void )
 {
-    UINT16      nNewSize = nP_Matrix * 2;
+    sal_uInt16      nNewSize = nP_Matrix * 2;
 
     ScMatrix**  ppNew = new ScMatrix*[ nNewSize ];
 
@@ -326,7 +326,7 @@ void TokenPool::GrowMatrix( void )
     nP_Matrix = nNewSize;
 }
 
-void TokenPool::GetElement( const UINT16 nId )
+void TokenPool::GetElement( const sal_uInt16 nId )
 {
     DBG_ASSERT( nId < nElementAkt, "*TokenPool::GetElement(): Id zu gross!?" );
 
@@ -353,7 +353,7 @@ void TokenPool::GetElement( const UINT16 nId )
 #endif
                 break;
             case T_RefC:
-                pScToken->AddSingleReference( *ppP_RefTr[ pElement[ (UINT16) nId ] ] );
+                pScToken->AddSingleReference( *ppP_RefTr[ pElement[ (sal_uInt16) nId ] ] );
                 break;
             case T_RefA:
                 {
@@ -368,7 +368,7 @@ void TokenPool::GetElement( const UINT16 nId )
                 break;
             case T_Ext:
                 {
-                UINT16			n = pElement[ nId ];
+                sal_uInt16			n = pElement[ nId ];
                 EXTCONT*		p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL;
 
                 if( p )
@@ -382,7 +382,7 @@ void TokenPool::GetElement( const UINT16 nId )
                 break;
             case T_Nlf:
                 {
-                UINT16			n = pElement[ nId ];
+                sal_uInt16			n = pElement[ nId ];
                 NLFCONT*		p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL;
 
                 if( p )
@@ -391,7 +391,7 @@ void TokenPool::GetElement( const UINT16 nId )
                 break;
             case T_Matrix:
                 {
-                UINT16          n = pElement[ nId ];
+                sal_uInt16          n = pElement[ nId ];
                 ScMatrix*       p = ( n < nP_Matrix )? ppP_Matrix[ n ] : NULL;
 
                 if( p )
@@ -400,7 +400,7 @@ void TokenPool::GetElement( const UINT16 nId )
                 break;
             case T_ExtName:
             {
-                UINT16 n = pElement[nId];
+                sal_uInt16 n = pElement[nId];
                 if (n < maExtNames.size())
                 {
                     const ExtName& r = maExtNames[n];
@@ -409,7 +409,7 @@ void TokenPool::GetElement( const UINT16 nId )
             }
             case T_ExtRefC:
             {
-                UINT16 n = pElement[nId];
+                sal_uInt16 n = pElement[nId];
                 if (n < maExtCellRefs.size())
                 {
                     const ExtCellRef& r = maExtCellRefs[n];
@@ -418,7 +418,7 @@ void TokenPool::GetElement( const UINT16 nId )
             }
             case T_ExtRefA:
             {
-                UINT16 n = pElement[nId];
+                sal_uInt16 n = pElement[nId];
                 if (n < maExtAreaRefs.size())
                 {
                     const ExtAreaRef& r = maExtAreaRefs[n];
@@ -433,7 +433,7 @@ void TokenPool::GetElement( const UINT16 nId )
 }
 
 
-void TokenPool::GetElementRek( const UINT16 nId )
+void TokenPool::GetElementRek( const sal_uInt16 nId )
 {
 #ifdef DBG_UTIL
     nRek++;
@@ -445,8 +445,8 @@ void TokenPool::GetElementRek( const UINT16 nId )
     DBG_ASSERT( pType[ nId ] == T_Id, "-TokenPool::GetElementRek(): nId nicht Id-Folge!" );
 
 
-    UINT16		nAnz = pSize[ nId ];
-    UINT16*		pAkt = &pP_Id[ pElement[ nId ] ];
+    sal_uInt16		nAnz = pSize[ nId ];
+    sal_uInt16*		pAkt = &pP_Id[ pElement[ nId ] ];
     for( ; nAnz > 0 ; nAnz--, pAkt++ )
     {
         if( *pAkt < nScTokenOff )
@@ -483,7 +483,7 @@ void TokenPool::GetElementRek( const UINT16 nId )
                     break;
                 case T_Ext:
                     {
-                    UINT16		n = pElement[ *pAkt ];
+                    sal_uInt16		n = pElement[ *pAkt ];
                     EXTCONT*	p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL;
 
                     if( p )
@@ -492,7 +492,7 @@ void TokenPool::GetElementRek( const UINT16 nId )
                     break;
                 case T_Nlf:
                     {
-                    UINT16		n = pElement[ *pAkt ];
+                    sal_uInt16		n = pElement[ *pAkt ];
                     NLFCONT*	p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL;
 
                     if( p )
@@ -501,7 +501,7 @@ void TokenPool::GetElementRek( const UINT16 nId )
                     break;
                 case T_Matrix:
                     {
-                    UINT16          n = pElement[ *pAkt ];
+                    sal_uInt16          n = pElement[ *pAkt ];
                     ScMatrix*       p = ( n < nP_Matrix )? ppP_Matrix[ n ] : NULL;
 
                     if( p )
@@ -510,7 +510,7 @@ void TokenPool::GetElementRek( const UINT16 nId )
                     break;
                 case T_ExtName:
                 {
-                    UINT16 n = pElement[*pAkt];
+                    sal_uInt16 n = pElement[*pAkt];
                     if (n < maExtNames.size())
                     {
                         const ExtName& r = maExtNames[n];
@@ -519,7 +519,7 @@ void TokenPool::GetElementRek( const UINT16 nId )
                 }
                 case T_ExtRefC:
                 {
-                    UINT16 n = pElement[*pAkt];
+                    sal_uInt16 n = pElement[*pAkt];
                     if (n < maExtCellRefs.size())
                     {
                         const ExtCellRef& r = maExtCellRefs[n];
@@ -528,7 +528,7 @@ void TokenPool::GetElementRek( const UINT16 nId )
                 }
                 case T_ExtRefA:
                 {
-                    UINT16 n = pElement[*pAkt];
+                    sal_uInt16 n = pElement[*pAkt];
                     if (n < maExtAreaRefs.size())
                     {
                         const ExtAreaRef& r = maExtAreaRefs[n];
@@ -590,7 +590,7 @@ const TokenId TokenPool::Store( const double& rDouble )
 }
 
 
-const TokenId TokenPool::Store( const UINT16 nIndex )
+const TokenId TokenPool::Store( const sal_uInt16 nIndex )
 {
     if( nElementAkt >= nElement )
         GrowElement();
@@ -626,7 +626,7 @@ const TokenId TokenPool::Store( const String& rString )
 
     DBG_ASSERT( sizeof( xub_StrLen ) <= 2, "*TokenPool::Store(): StrLen doesn't match!" );
 
-    pSize[ nElementAkt ] = ( UINT16 ) ppP_Str[ nP_StrAkt ]->Len();
+    pSize[ nElementAkt ] = ( sal_uInt16 ) ppP_Str[ nP_StrAkt ]->Len();
 
     nElementAkt++;
     nP_StrAkt++;
@@ -765,7 +765,7 @@ const TokenId TokenPool::StoreExtName( sal_uInt16 nFileId, const String& rName )
     if ( nElementAkt >= nElement )
         GrowElement();
 
-    pElement[nElementAkt] = static_cast<UINT16>(maExtNames.size());
+    pElement[nElementAkt] = static_cast<sal_uInt16>(maExtNames.size());
     pType[nElementAkt] = T_ExtName;
     
     maExtNames.push_back(ExtName());
@@ -783,7 +783,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName
     if ( nElementAkt >= nElement )
         GrowElement();
 
-    pElement[nElementAkt] = static_cast<UINT16>(maExtCellRefs.size());
+    pElement[nElementAkt] = static_cast<sal_uInt16>(maExtCellRefs.size());
     pType[nElementAkt] = T_ExtRefC;
     
     maExtCellRefs.push_back(ExtCellRef());
@@ -802,7 +802,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName
     if ( nElementAkt >= nElement )
         GrowElement();
 
-    pElement[nElementAkt] = static_cast<UINT16>(maExtAreaRefs.size());
+    pElement[nElementAkt] = static_cast<sal_uInt16>(maExtAreaRefs.size());
     pType[nElementAkt] = T_ExtRefA;
     
     maExtAreaRefs.push_back(ExtAreaRef());
@@ -825,9 +825,9 @@ void TokenPool::Reset( void )
 }
 
 
-BOOL TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const
+sal_Bool TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const
 {
-    UINT16 nId = (UINT16) rId;
+    sal_uInt16 nId = (sal_uInt16) rId;
     if( nId && nId <= nElementAkt )
     {// existent?
         nId--;
@@ -835,7 +835,7 @@ BOOL TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const
         {// Tokenfolge?
             if( pSize[ nId ] == 1 )
             {// GENAU 1 Token
-                UINT16	nSecId = pP_Id[ pElement[ nId ] ];
+                sal_uInt16	nSecId = pP_Id[ pElement[ nId ] ];
                 if( nSecId >= nScTokenOff )
                 {// Default-Token?
                     return ( DefTokenId ) ( nSecId - nScTokenOff ) == eId;	// Gesuchter?
@@ -844,14 +844,14 @@ BOOL TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
 const String* TokenPool::GetExternal( const TokenId& rId ) const
 {
     const String*   p = NULL;
-    UINT16 n = (UINT16) rId;
+    sal_uInt16 n = (sal_uInt16) rId;
     if( n && n <= nElementAkt )
     {
         n--;
@@ -866,7 +866,7 @@ const String* TokenPool::GetExternal( const TokenId& rId ) const
 //UNUSED2008-05  const String* TokenPool::GetString( const TokenId& r ) const
 //UNUSED2008-05  {
 //UNUSED2008-05      const String*   p = NULL;
-//UNUSED2008-05      UINT16 n = (UINT16) r;
+//UNUSED2008-05      sal_uInt16 n = (sal_uInt16) r;
 //UNUSED2008-05      if( n && n <= nElementAkt )
 //UNUSED2008-05      {
 //UNUSED2008-05          n--;
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 4295aca21..ad71dcfd9 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -39,6 +39,9 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
+#include <com/sun/star/chart/TimeInterval.hpp>
+#include <com/sun/star/chart/TimeUnit.hpp>
+#include <com/sun/star/chart/XAxisSupplier.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/XDiagramPositioning.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
@@ -169,6 +172,56 @@ bool lclIsAutoAnyOrGetScaledValue( double& rfValue, const Any& rAny, bool bLogSc
     return bIsAuto;
 }
 
+sal_uInt16 lclGetTimeValue( const XclExpRoot& rRoot, double fSerialDate, sal_uInt16 nTimeUnit )
+{
+    DateTime aDateTime = rRoot.GetDateTimeFromDouble( fSerialDate );
+    switch( nTimeUnit )
+    {
+        case EXC_CHDATERANGE_DAYS:
+            return ::limit_cast< sal_uInt16, double >( fSerialDate, 0, SAL_MAX_UINT16 );
+        case EXC_CHDATERANGE_MONTHS:
+            return ::limit_cast< sal_uInt16, sal_uInt16 >( 12 * (aDateTime.GetYear() - rRoot.GetBaseYear()) + aDateTime.GetMonth() - 1, 0, SAL_MAX_INT16 );
+        case EXC_CHDATERANGE_YEARS:
+            return ::limit_cast< sal_uInt16, sal_uInt16 >( aDateTime.GetYear() - rRoot.GetBaseYear(), 0, SAL_MAX_INT16 );
+        default:
+            OSL_ENSURE( false, "lclGetTimeValue - unexpected time unit" );
+    }
+    return ::limit_cast< sal_uInt16, double >( fSerialDate, 0, SAL_MAX_UINT16 );
+}
+
+bool lclConvertTimeValue( const XclExpRoot& rRoot, sal_uInt16& rnValue, const Any& rAny, sal_uInt16 nTimeUnit )
+{
+    double fSerialDate = 0;
+    bool bAuto = lclIsAutoAnyOrGetValue( fSerialDate, rAny );
+    if( !bAuto )
+        rnValue = lclGetTimeValue( rRoot, fSerialDate, nTimeUnit );
+    return bAuto;
+}
+
+sal_uInt16 lclGetTimeUnit( sal_Int32 nApiTimeUnit )
+{
+    switch( nApiTimeUnit )
+    {
+        case cssc::TimeUnit::DAY:   return EXC_CHDATERANGE_DAYS;
+        case cssc::TimeUnit::MONTH: return EXC_CHDATERANGE_MONTHS;
+        case cssc::TimeUnit::YEAR:  return EXC_CHDATERANGE_YEARS;
+        default:                    OSL_ENSURE( false, "lclGetTimeUnit - unexpected time unit" );
+    }
+    return EXC_CHDATERANGE_DAYS;
+}
+
+bool lclConvertTimeInterval( sal_uInt16 rnValue, sal_uInt16& rnTimeUnit, const Any& rAny )
+{
+    cssc::TimeInterval aInterval;
+    bool bAuto = lclIsAutoAnyOrGetValue( aInterval, rAny );
+    if( !bAuto )
+    {
+        rnValue = ::limit_cast< sal_uInt16, sal_Int32 >( aInterval.Number, 1, SAL_MAX_UINT16 );
+        rnTimeUnit = lclGetTimeUnit( aInterval.TimeUnit );
+    }
+    return bAuto;
+}
+
 } // namespace
 
 // Common =====================================================================
@@ -1269,7 +1322,7 @@ bool XclExpChText::ConvertDataLabel( const ScfPropertySet& rPropSet,
         sal_uInt16 nLabelPos = EXC_CHTEXT_POS_AUTO;
         if( rPropSet.GetProperty( nPlacement, EXC_CHPROP_LABELPLACEMENT ) )
         {
-            using namespace ::com::sun::star::chart::DataLabelPlacement;
+            using namespace cssc::DataLabelPlacement;
             if( nPlacement == rTypeInfo.mnDefaultLabelPos )
             {
                 nLabelPos = EXC_CHTEXT_POS_DEFAULT;
@@ -1489,7 +1542,7 @@ void XclExpCh3dDataFormat::Convert( const ScfPropertySet& rPropSet )
     sal_Int32 nApiType(0);
     if( rPropSet.GetProperty( nApiType, EXC_CHPROP_GEOMETRY3D ) )
     {
-        using namespace ::com::sun::star::chart2::DataPointGeometry3D;
+        using namespace cssc2::DataPointGeometry3D;
         switch( nApiType )
         {
             case CUBOID:
@@ -2246,7 +2299,7 @@ void XclExpChLegend::Convert( const ScfPropertySet& rPropSet )
                 used by this property (in the RelativePosition.Anchor member)
                 it cannot be used to calculate the position easily. For this,
                 the Chart1 API will be used instead. */
-            Reference< ::com::sun::star::chart::XChartDocument > xChart1Doc( GetChartDocument(), UNO_QUERY_THROW );
+            Reference< cssc::XChartDocument > xChart1Doc( GetChartDocument(), UNO_QUERY_THROW );
             Reference< XShape > xChart1Legend( xChart1Doc->getLegend(), UNO_SET_THROW );
             // coordinates in CHLEGEND record written but not used by Excel
             mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_CHARTSIZE, EXC_CHFRAMEPOS_PARENT ) );
@@ -2348,9 +2401,9 @@ void XclExpChTypeGroup::ConvertType(
 
     // spline - TODO: get from single series (#i66858#)
     ScfPropertySet aTypeProp( xChartType );
-    ::com::sun::star::chart2::CurveStyle eCurveStyle;
+    cssc2::CurveStyle eCurveStyle;
     bool bSpline = aTypeProp.GetProperty( eCurveStyle, EXC_CHPROP_CURVESTYLE ) &&
-        (eCurveStyle != ::com::sun::star::chart2::CurveStyle_LINES);
+        (eCurveStyle != cssc2::CurveStyle_LINES);
 
     // extended type info
     maTypeInfo.Set( maType.GetTypeInfo(), b3dChart, bSpline );
@@ -2546,16 +2599,53 @@ XclExpChLabelRange::XclExpChLabelRange( const XclExpChRoot& rRoot ) :
 {
 }
 
-void XclExpChLabelRange::Convert( const ScaleData& rScaleData, bool bMirrorOrient )
+void XclExpChLabelRange::Convert( const ScaleData& rScaleData, const ScfPropertySet& rChart1Axis, bool bMirrorOrient )
 {
+    /*  Base time unit (using the property 'ExplicitTimeIncrement' from the old
+        chart API allows to detect axis type (date axis, if property exists),
+        and to receive the base time unit currently used in case the base time
+        unit is set to 'automatic'. */
+    cssc::TimeIncrement aTimeIncrement;
+    if( rChart1Axis.GetProperty( aTimeIncrement, EXC_CHPROP_EXPTIMEINCREMENT ) )
+    {
+        // property exists -> this is a date axis currently
+        ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_DATEAXIS );
+
+        // automatic base time unit, if the UNO Any 'rScaleData.TimeIncrement.TimeResolution' does not contain a valid value...
+        bool bAutoBase = !rScaleData.TimeIncrement.TimeResolution.has< cssc::TimeIncrement >();
+        ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOBASE, bAutoBase );
+
+        // ...but get the current base time unit from the property of the old chart API
+        sal_Int32 nApiTimeUnit = 0;
+        bool bValidBaseUnit = aTimeIncrement.TimeResolution >>= nApiTimeUnit;
+        DBG_ASSERT( bValidBaseUnit, "XclExpChLabelRange::Convert - cannot ghet base time unit" );
+        maDateData.mnBaseUnit = bValidBaseUnit ? lclGetTimeUnit( nApiTimeUnit ) : EXC_CHDATERANGE_DAYS;
+
+        /*  Min/max values depend on base time unit, they specify the number of
+            days, months, or years starting from null date. */
+        bool bAutoMin = lclConvertTimeValue( GetRoot(), maDateData.mnMinDate, rScaleData.Minimum, maDateData.mnBaseUnit );
+        ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMIN, bAutoMin );
+        bool bAutoMax = lclConvertTimeValue( GetRoot(), maDateData.mnMaxDate, rScaleData.Maximum, maDateData.mnBaseUnit );
+        ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMAX, bAutoMax );
+    }
+
+    // automatic axis type detection
+    ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTODATE, rScaleData.AutoDateAxis );
+
+    // increment
+    bool bAutoMajor = lclConvertTimeInterval( maDateData.mnMajorStep, maDateData.mnMajorUnit, rScaleData.TimeIncrement.MajorTimeInterval );
+    ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMAJOR, bAutoMajor );
+    bool bAutoMinor = lclConvertTimeInterval( maDateData.mnMinorStep, maDateData.mnMinorUnit, rScaleData.TimeIncrement.MinorTimeInterval );
+    ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMINOR, bAutoMinor );
+
     // origin
     double fOrigin = 0.0;
     if( !lclIsAutoAnyOrGetValue( fOrigin, rScaleData.Origin ) )
-        maData.mnCross = limit_cast< sal_uInt16 >( fOrigin, 1, 31999 );
+        maLabelData.mnCross = limit_cast< sal_uInt16 >( fOrigin, 1, 31999 );
 
     // reverse order
-    if( (rScaleData.Orientation == ::com::sun::star::chart2::AxisOrientation_REVERSE) != bMirrorOrient )
-        ::set_flag( maData.mnFlags, EXC_CHLABELRANGE_REVERSE );
+    if( (rScaleData.Orientation == cssc2::AxisOrientation_REVERSE) != bMirrorOrient )
+        ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_REVERSE );
 }
 
 void XclExpChLabelRange::ConvertAxisPosition( const ScfPropertySet& rPropSet )
@@ -2564,19 +2654,55 @@ void XclExpChLabelRange::ConvertAxisPosition( const ScfPropertySet& rPropSet )
     rPropSet.GetProperty( eAxisPos, EXC_CHPROP_CROSSOVERPOSITION );
     double fCrossingPos = 1.0;
     rPropSet.GetProperty( fCrossingPos, EXC_CHPROP_CROSSOVERVALUE );
+
+    bool bDateAxis = ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_DATEAXIS );
     switch( eAxisPos )
     {
-        case cssc::ChartAxisPosition_ZERO:  maData.mnCross = 1;                                                     break;
-        case cssc::ChartAxisPosition_START: maData.mnCross = 1;                                                     break;
-        case cssc::ChartAxisPosition_END:   ::set_flag( maData.mnFlags, EXC_CHLABELRANGE_MAXCROSS );                break;
-        case cssc::ChartAxisPosition_VALUE: maData.mnCross = limit_cast< sal_uInt16 >( fCrossingPos, 1, 31999 );    break;
-        default:                            maData.mnCross = 1;
+        case cssc::ChartAxisPosition_ZERO:
+        case cssc::ChartAxisPosition_START:
+            maLabelData.mnCross = 1;
+            ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOCROSS );
+        break;
+        case cssc::ChartAxisPosition_END:
+            ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_MAXCROSS );
+        break;
+        case cssc::ChartAxisPosition_VALUE:
+            maLabelData.mnCross = limit_cast< sal_uInt16 >( fCrossingPos, 1, 31999 );
+            ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOCROSS, false );
+            if( bDateAxis )
+                maDateData.mnCross = lclGetTimeValue( GetRoot(), fCrossingPos, maDateData.mnBaseUnit );
+        break;
+        default:
+            maLabelData.mnCross = 1;
+            ::set_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOCROSS );
+    }
+}
+
+void XclExpChLabelRange::Save( XclExpStream& rStrm )
+{
+    // the CHLABELRANGE record
+    XclExpRecord::Save( rStrm );
+    
+    // the CHDATERANGE record with date axis settings (BIFF8 only)
+    if( GetBiff() == EXC_BIFF8 )
+    {
+        rStrm.StartRecord( EXC_ID_CHDATERANGE, 18 );
+        rStrm   << maDateData.mnMinDate
+                << maDateData.mnMaxDate
+                << maDateData.mnMajorStep
+                << maDateData.mnMajorUnit
+                << maDateData.mnMinorStep
+                << maDateData.mnMinorUnit
+                << maDateData.mnBaseUnit
+                << maDateData.mnCross
+                << maDateData.mnFlags;
+        rStrm.EndRecord();
     }
 }
 
 void XclExpChLabelRange::WriteBody( XclExpStream& rStrm )
 {
-    rStrm << maData.mnCross << maData.mnLabelFreq << maData.mnTickFreq << maData.mnFlags;
+    rStrm << maLabelData.mnCross << maLabelData.mnLabelFreq << maLabelData.mnTickFreq << maLabelData.mnFlags;
 }
 
 // ----------------------------------------------------------------------------
@@ -2661,7 +2787,7 @@ namespace {
 
 sal_uInt8 lclGetXclTickPos( sal_Int32 nApiTickmarks )
 {
-    using namespace ::com::sun::star::chart2::TickmarkStyle;
+    using namespace cssc2::TickmarkStyle;
     sal_uInt8 nXclTickPos = 0;
     ::set_flag( nXclTickPos, EXC_CHTICK_INSIDE,  ::get_flag( nApiTickmarks, INNER ) );
     ::set_flag( nXclTickPos, EXC_CHTICK_OUTSIDE, ::get_flag( nApiTickmarks, OUTER ) );
@@ -2764,6 +2890,30 @@ Reference< XAxis > lclGetApiAxis( Reference< XCoordinateSystem > xCoordSystem,
     return xAxis;
 }
 
+Reference< cssc::XAxis > lclGetApiChart1Axis( Reference< XChartDocument > xChartDoc,
+        sal_Int32 nApiAxisDim, sal_Int32 nApiAxesSetIdx )
+{
+    Reference< cssc::XAxis > xChart1Axis;
+    try
+    {
+        Reference< cssc::XChartDocument > xChart1Doc( xChartDoc, UNO_QUERY_THROW );
+        Reference< cssc::XAxisSupplier > xChart1AxisSupp( xChart1Doc->getDiagram(), UNO_QUERY_THROW );
+        switch( nApiAxesSetIdx )
+        {
+            case EXC_CHART_AXESSET_PRIMARY:
+                xChart1Axis = xChart1AxisSupp->getAxis( nApiAxisDim );
+            break;
+            case EXC_CHART_AXESSET_SECONDARY:
+                xChart1Axis = xChart1AxisSupp->getSecondaryAxis( nApiAxisDim );
+            break;
+        }
+    }
+    catch( Exception& )
+    {
+    }
+    return xChart1Axis;
+}
+
 } // namespace
 
 XclExpChAxis::XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType ) :
@@ -2786,7 +2936,8 @@ void XclExpChAxis::SetRotation( sal_uInt16 nRotation )
         mxTick->SetRotation( nRotation );
 }
 
-void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossingAxis, const XclChExtTypeInfo& rTypeInfo )
+void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossingAxis,
+        Reference< cssc::XAxis > xChart1Axis, const XclChExtTypeInfo& rTypeInfo )
 {
     ScfPropertySet aAxisProp( xAxis );
     bool bCategoryAxis = ((GetAxisType() == EXC_CHAXIS_X) && rTypeInfo.mbCategoryAxis) || (GetAxisType() == EXC_CHAXIS_Z);
@@ -2806,8 +2957,11 @@ void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossi
         mxLabelRange.reset( new XclExpChLabelRange( GetChRoot() ) );
         mxLabelRange->SetTicksBetweenCateg( rTypeInfo.mbTicksBetweenCateg );
         if( xAxis.is() )
+        {
+            ScfPropertySet aChart1AxisProp( xChart1Axis );
             // #i71684# radar charts have reversed rotation direction
-            mxLabelRange->Convert( xAxis->getScaleData(), (GetAxisType() == EXC_CHAXIS_X) && (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_RADAR) );
+            mxLabelRange->Convert( xAxis->getScaleData(), aChart1AxisProp, (GetAxisType() == EXC_CHAXIS_X) && (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_RADAR) );
+        }
         // get position of crossing axis on this axis from passed axis object
         if( aCrossingProp.Is() )
             mxLabelRange->ConvertAxisPosition( aCrossingProp );
@@ -2935,7 +3089,7 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
             bool b3dChart = xCoordSystem.is() && (xCoordSystem->getDimension() == 3);
 
             // percent charts
-            namespace ApiAxisType = ::com::sun::star::chart2::AxisType;
+            namespace ApiAxisType = cssc2::AxisType;
             Reference< XAxis > xApiYAxis = lclGetApiAxis( xCoordSystem, EXC_CHART_AXIS_Y, nApiAxesSetIdx );
             bool bPercent = xApiYAxis.is() && (xApiYAxis->getScaleData().AxisType == ApiAxisType::PERCENT);
 
@@ -3042,8 +3196,8 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
     // inner and outer plot area position and size
     try
     {
-        Reference< ::com::sun::star::chart::XChartDocument > xChart1Doc( GetChartDocument(), UNO_QUERY_THROW );
-        Reference< ::com::sun::star::chart::XDiagramPositioning > xPositioning( xChart1Doc->getDiagram(), UNO_QUERY_THROW );
+        Reference< cssc::XChartDocument > xChart1Doc( GetChartDocument(), UNO_QUERY_THROW );
+        Reference< cssc::XDiagramPositioning > xPositioning( xChart1Doc->getDiagram(), UNO_QUERY_THROW );
         // set manual flag in chart data
         if( !xPositioning->isAutomaticDiagramPositioning() )
             GetChartData().SetManualPlotArea();
@@ -3110,7 +3264,8 @@ void XclExpChAxesSet::ConvertAxis(
     sal_Int32 nApiAxesSetIdx = GetApiAxesSetIndex();
     Reference< XAxis > xAxis = lclGetApiAxis( xCoordSystem, nApiAxisDim, nApiAxesSetIdx );
     Reference< XAxis > xCrossingAxis = lclGetApiAxis( xCoordSystem, nCrossingAxisDim, nApiAxesSetIdx );
-    rxChAxis->Convert( xAxis, xCrossingAxis, rTypeInfo );
+    Reference< cssc::XAxis > xChart1Axis = lclGetApiChart1Axis( GetChartDocument(), nApiAxisDim, nApiAxesSetIdx );
+    rxChAxis->Convert( xAxis, xCrossingAxis, xChart1Axis, rTypeInfo );
 
     // create and convert axis title
     Reference< XTitled > xTitled( xAxis, UNO_QUERY );
@@ -3173,7 +3328,7 @@ XclExpChChart::XclExpChChart( const XclExpRoot& rRoot,
         sal_Int32 nMissingValues = 0;
         if( aDiaProp.GetProperty( nMissingValues, EXC_CHPROP_MISSINGVALUETREATMENT ) )
         {
-            using namespace ::com::sun::star::chart::MissingValueTreatment;
+            using namespace cssc::MissingValueTreatment;
             switch( nMissingValues )
             {
                 case LEAVE_GAP: maProps.mnEmptyMode = EXC_CHPROPS_EMPTY_SKIP;           break;
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 480394bc3..ea312dd89 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -362,14 +362,14 @@ void XclExpMergedcells::Save( XclExpStream& rStrm )
 
 void XclExpMergedcells::SaveXml( XclExpXmlStream& rStrm )
 {
-    ULONG nCount = maMergedRanges.Count();
+    sal_uLong nCount = maMergedRanges.Count();
     if( !nCount )
         return;
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
     rWorksheet->startElement( XML_mergeCells,
             XML_count,  OString::valueOf( (sal_Int32) nCount ).getStr(),
             FSEND );
-    for( ULONG i = 0; i < nCount; ++i )
+    for( sal_uLong i = 0; i < nCount; ++i )
     {
         if( const ScRange* pRange = maMergedRanges.GetObject( i ) )
         {
@@ -821,7 +821,7 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat
     GetAddressConverter().ConvertRangeList( maXclRanges, aScRanges, true );
     if( !maXclRanges.empty() )
     {
-        for( USHORT nIndex = 0, nCount = rCondFormat.Count(); nIndex < nCount; ++nIndex )
+        for( sal_uInt16 nIndex = 0, nCount = rCondFormat.Count(); nIndex < nCount; ++nIndex )
             if( const ScCondFormatEntry* pEntry = rCondFormat.GetEntry( nIndex ) )
                 maCFList.AppendNewRecord( new XclExpCF( GetRoot(), *pEntry ) );
         aScRanges.Format( msSeqRef, SCA_VALID, NULL, formula::FormulaGrammar::CONV_XL_A1 );
@@ -964,7 +964,7 @@ const char* lcl_GetOperatorType( sal_uInt32 nFlags )
 
 // ----------------------------------------------------------------------------
 
-XclExpDV::XclExpDV( const XclExpRoot& rRoot, ULONG nScHandle ) :
+XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
     XclExpRecord( EXC_ID_DV ),
     XclExpRoot( rRoot ),
     mnFlags( 0 ),
@@ -974,7 +974,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, ULONG nScHandle ) :
     {
         // prompt box - empty string represented by single NUL character
         String aTitle, aText;
-        bool bShowPrompt = (pValData->GetInput( aTitle, aText ) == TRUE);
+        bool bShowPrompt = (pValData->GetInput( aTitle, aText ) == sal_True);
         if( aTitle.Len() )
             maPromptTitle.Assign( aTitle );
         else
@@ -986,7 +986,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, ULONG nScHandle ) :
 
         // error box - empty string represented by single NUL character
         ScValidErrorStyle eScErrorStyle;
-        bool bShowError = (pValData->GetErrMsg( aTitle, aText, eScErrorStyle ) == TRUE);
+        bool bShowError = (pValData->GetErrMsg( aTitle, aText, eScErrorStyle ) == sal_True);
         if( aTitle.Len() )
             maErrorTitle.Assign( aTitle );
         else
@@ -1189,7 +1189,7 @@ XclExpDval::~XclExpDval()
 {
 }
 
-void XclExpDval::InsertCellRange( const ScRange& rRange, ULONG nScHandle )
+void XclExpDval::InsertCellRange( const ScRange& rRange, sal_uLong nScHandle )
 {
     if( GetBiff() == EXC_BIFF8 )
     {
@@ -1234,7 +1234,7 @@ void XclExpDval::SaveXml( XclExpXmlStream& rStrm )
     rWorksheet->endElement( XML_dataValidations );
 }
 
-XclExpDV& XclExpDval::SearchOrCreateDv( ULONG nScHandle )
+XclExpDV& XclExpDval::SearchOrCreateDv( sal_uLong nScHandle )
 {
     // test last found record
     if( mxLastFoundDV.get() && (mxLastFoundDV->GetScHandle() == nScHandle) )
@@ -1247,7 +1247,7 @@ XclExpDV& XclExpDval::SearchOrCreateDv( ULONG nScHandle )
         size_t nFirstPos = 0;
         size_t nLastPos = maDVList.GetSize() - 1;
         bool bLoop = true;
-        ULONG nCurrScHandle = ::std::numeric_limits< ULONG >::max();
+        sal_uLong nCurrScHandle = ::std::numeric_limits< sal_uLong >::max();
         while( (nFirstPos <= nLastPos) && bLoop )
         {
             nCurrPos = (nFirstPos + nLastPos) / 2;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index df4340afc..74420b251 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -390,10 +390,10 @@ XclExpOcxControlObj::XclExpOcxControlObj( XclExpObjectManager& rObjMgr, Referenc
     ScfPropertySet aCtrlProp( XclControlHelper::GetControlModel( xShape ) );
 
     // OBJ record flags
-    SetLocked( TRUE );
+    SetLocked( sal_True );
     SetPrintable( aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "Printable" ) ) );
-    SetAutoFill( FALSE );
-    SetAutoLine( FALSE );
+    SetAutoFill( sal_False );
+    SetAutoLine( sal_False );
 
     // fill DFF property set
     mrEscherEx.OpenContainer( ESCHER_SpContainer );
@@ -534,10 +534,10 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rObjMgr, Referenc
         return;
 
     // OBJ record flags
-    SetLocked( TRUE );
+    SetLocked( sal_True );
     SetPrintable( aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "Printable" ) ) );
-    SetAutoFill( FALSE );
-    SetAutoLine( FALSE );
+    SetAutoFill( sal_False );
+    SetAutoLine( sal_False );
 
     // fill DFF property set
     mrEscherEx.OpenContainer( ESCHER_SpContainer );
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 4305bab5e..5ffe667a4 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -522,7 +522,7 @@ XclTokenArrayRef XclExpFmlaCompImpl::CreateFormula( XclFormulaType eType,
     if( mxData->mbOk )
     {
         XclExpScToken aTokData( GetNextToken() );
-        USHORT nScError = rScTokArr.GetCodeError();
+        sal_uInt16 nScError = rScTokArr.GetCodeError();
         if( (nScError != 0) && (!aTokData.Is() || (aTokData.GetOpCode() == ocStop)) )
         {
             // #i50253# convert simple ocStop token to error code formula (e.g. =#VALUE!)
@@ -1334,7 +1334,7 @@ void XclExpFmlaCompImpl::ProcessMatrix( const XclExpScToken& rTokData )
                         AppendExt( static_cast< sal_uInt8 >( pMatVal->GetBoolean() ? 1 : 0 ) );
                         AppendExt( 0, 7 );
                     }
-                    else if( USHORT nErr = pMatVal->GetError() )
+                    else if( sal_uInt16 nErr = pMatVal->GetError() )
                     {
                         AppendExt( EXC_CACHEDVAL_ERROR );
                         AppendExt( XclTools::GetXclErrorCode( nErr ) );
@@ -1827,7 +1827,7 @@ void XclExpFmlaCompImpl::ConvertRefData(
         if( bTruncMaxCol && (rnScCol == mnMaxScCol) )
             rnScCol = mnMaxAbsCol;
         else if( (rnScCol < 0) || (rnScCol > mnMaxAbsCol) )
-            rRefData.SetColDeleted( TRUE );
+            rRefData.SetColDeleted( sal_True );
         rXclPos.mnCol = static_cast< sal_uInt16 >( rnScCol ) & mnMaxColMask;
 
         // convert row index
@@ -1835,7 +1835,7 @@ void XclExpFmlaCompImpl::ConvertRefData(
         if( bTruncMaxRow && (rnScRow == mnMaxScRow) )
             rnScRow = mnMaxAbsRow;
         else if( (rnScRow < 0) || (rnScRow > mnMaxAbsRow) )
-            rRefData.SetRowDeleted( TRUE );
+            rRefData.SetRowDeleted( sal_True );
         rXclPos.mnRow = static_cast< sal_uInt16 >( rnScRow ) & mnMaxRowMask;
     }
     else
@@ -2003,7 +2003,7 @@ void XclExpFmlaCompImpl::ProcessExternalCellRef( const XclExpScToken& rTokData )
         ConvertRefData( aRefData, aXclPos, false, false, false );
 
         // store external cell contents in CRN records
-        USHORT nFileId = rTokData.mpScToken->GetIndex();
+        sal_uInt16 nFileId = rTokData.mpScToken->GetIndex();
         const String& rTabName = rTokData.mpScToken->GetString();
         if( mxData->mrCfg.mbFromCell && mxData->mpScBasePos )
             mxData->mpLinkMgr->StoreCell( nFileId, rTabName, aRefData );
@@ -2039,7 +2039,7 @@ void XclExpFmlaCompImpl::ProcessExternalRangeRef( const XclExpScToken& rTokData
         ConvertRefData( aRefData, aXclRange, false );
 
         // store external cell contents in CRN records
-        USHORT nFileId = rTokData.mpScToken->GetIndex();
+        sal_uInt16 nFileId = rTokData.mpScToken->GetIndex();
         const String& rTabName = rTokData.mpScToken->GetString();
         if( mxData->mrCfg.mbFromCell && mxData->mpScBasePos )
             mxData->mpLinkMgr->StoreCellRange( nFileId, rTabName, aRefData );
@@ -2098,7 +2098,7 @@ void XclExpFmlaCompImpl::ProcessExternalName( const XclExpScToken& rTokData )
     if( mxData->mpLinkMgr )
     {
         ScExternalRefManager& rExtRefMgr = *GetDoc().GetExternalRefManager();
-        USHORT nFileId = rTokData.mpScToken->GetIndex();
+        sal_uInt16 nFileId = rTokData.mpScToken->GetIndex();
         const String& rName = rTokData.mpScToken->GetString();
         ScExternalRefCache::TokenArrayRef xArray = rExtRefMgr.getRangeNameTokens( nFileId, rName );
         if( xArray.get() )
@@ -2543,11 +2543,11 @@ void lclInitOwnTab( ScSingleRefData& rRef, const ScAddress& rScPos, SCTAB nCurrS
     if( b3DRefOnly )
     {
         // no reduction to 2D reference, if global link manager is used
-        rRef.SetFlag3D( TRUE );
+        rRef.SetFlag3D( sal_True );
     }
     else if( rScPos.Tab() == nCurrScTab )
     {
-        rRef.SetTabRel( TRUE );
+        rRef.SetTabRel( sal_True );
         rRef.nRelTab = 0;
     }
 }
@@ -2613,14 +2613,14 @@ XclTokenArrayRef XclExpFormulaCompiler::CreateFormula( XclFormulaType eType, con
 
 XclTokenArrayRef XclExpFormulaCompiler::CreateFormula( XclFormulaType eType, const ScRangeList& rScRanges )
 {
-    ULONG nCount = rScRanges.Count();
+    sal_uLong nCount = rScRanges.Count();
     if( nCount == 0 )
         return XclTokenArrayRef();
 
     ScTokenArray aScTokArr;
     SCTAB nCurrScTab = GetCurrScTab();
     bool b3DRefOnly = mxImpl->Is3DRefOnly( eType );
-    for( ULONG nIdx = 0; nIdx < nCount; ++nIdx )
+    for( sal_uLong nIdx = 0; nIdx < nCount; ++nIdx )
     {
         if( nIdx > 0 )
             aScTokArr.AddOpCode( ocUnion );
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index a8ef7eb6e..846487127 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -266,7 +266,7 @@ bool XclExpAddressConverter::ConvertRange( XclRange& rXclRange,
 
 //UNUSED2008-05  bool XclExpAddressConverter::CheckRangeList( const ScRangeList& rScRanges, bool bWarn )
 //UNUSED2008-05  {
-//UNUSED2008-05      for( ULONG nIdx = 0, nSize = rScRanges.Count(); nIdx < nSize; ++nIdx )
+//UNUSED2008-05      for( sal_uLong nIdx = 0, nSize = rScRanges.Count(); nIdx < nSize; ++nIdx )
 //UNUSED2008-05          if( const ScRange* pScRange = rScRanges.GetObject( nIdx ) )
 //UNUSED2008-05              if( !CheckRange( *pScRange, bWarn ) )
 //UNUSED2008-05                  return false;
@@ -275,7 +275,7 @@ bool XclExpAddressConverter::ConvertRange( XclRange& rXclRange,
 
 void XclExpAddressConverter::ValidateRangeList( ScRangeList& rScRanges, bool bWarn )
 {
-    ULONG nIdx = rScRanges.Count();
+    sal_uLong nIdx = rScRanges.Count();
     while( nIdx )
     {
         --nIdx; // backwards to keep nIdx valid
@@ -289,7 +289,7 @@ void XclExpAddressConverter::ConvertRangeList( XclRangeList& rXclRanges,
         const ScRangeList& rScRanges, bool bWarn )
 {
     rXclRanges.clear();
-    for( ULONG nPos = 0, nCount = rScRanges.Count(); nPos < nCount; ++nPos )
+    for( sal_uLong nPos = 0, nCount = rScRanges.Count(); nPos < nCount; ++nPos )
     {
         if( const ScRange* pScRange = rScRanges.GetObject( nPos ) )
         {
@@ -496,7 +496,7 @@ XclExpStringRef lclCreateFormattedString(
             {
                 // test if the character is a text field
                 const SfxPoolItem* pItem;
-                if( aEditSet.GetItemState( EE_FEATURE_FIELD, FALSE, &pItem ) == SFX_ITEM_SET )
+                if( aEditSet.GetItemState( EE_FEATURE_FIELD, sal_False, &pItem ) == SFX_ITEM_SET )
                 {
                     const SvxFieldData* pField = static_cast< const SvxFieldItem* >( pItem )->GetField();
                     if( const SvxURLField* pUrlField = PTR_CAST( SvxURLField, pField ) )
@@ -609,8 +609,8 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
     {
         // formatted cell
         ScEditEngineDefaulter& rEE = rRoot.GetEditEngine();
-        BOOL bOldUpdateMode = rEE.GetUpdateMode();
-        rEE.SetUpdateMode( TRUE );
+        sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
+        rEE.SetUpdateMode( sal_True );
         // default items
         const SfxItemSet& rItemSet = pCellAttr ? pCellAttr->GetItemSet() : rRoot.GetDoc().GetDefPattern()->GetItemSet();
         SfxItemSet* pEEItemSet = new SfxItemSet( rEE.GetEmptyItemSet() );
@@ -639,8 +639,8 @@ XclExpStringRef XclExpStringHelper::CreateString(
     if( const OutlinerParaObject* pParaObj = rTextObj.GetOutlinerParaObject() )
     {
         EditEngine& rEE = rRoot.GetDrawEditEngine();
-        BOOL bOldUpdateMode = rEE.GetUpdateMode();
-        rEE.SetUpdateMode( TRUE );
+        sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
+        rEE.SetUpdateMode( sal_True );
         // create the string
         rEE.SetText( pParaObj->GetTextObject() );
         xString = lclCreateFormattedString( rRoot, rEE, 0, nFlags, nMaxLen );
@@ -667,8 +667,8 @@ XclExpStringRef XclExpStringHelper::CreateString(
 {
     XclExpStringRef xString;
     EditEngine& rEE = rRoot.GetDrawEditEngine();
-    BOOL bOldUpdateMode = rEE.GetUpdateMode();
-    rEE.SetUpdateMode( TRUE );
+    sal_Bool bOldUpdateMode = rEE.GetUpdateMode();
+    rEE.SetUpdateMode( sal_True );
     rEE.SetText( rEditObj );
     xString = lclCreateFormattedString( rRoot, rEE, 0, nFlags, nMaxLen );
     rEE.SetUpdateMode( bOldUpdateMode );
@@ -727,8 +727,8 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
     SfxItemSet aItemSet( *GetDoc().GetPool(), ATTR_PATTERN_START, ATTR_PATTERN_END );
 
     // edit engine
-    BOOL bOldUpdateMode = mrEE.GetUpdateMode();
-    mrEE.SetUpdateMode( TRUE );
+    sal_Bool bOldUpdateMode = mrEE.GetUpdateMode();
+    mrEE.SetUpdateMode( sal_True );
     mrEE.SetText( *pTextObj );
 
     // font information
@@ -948,7 +948,7 @@ bool lclConvertToDos( String& rUrl, const String& rBasePath, bool bSaveRelUrl )
             bool bLoop = true;
             while( bLoop && ((nPos = aDosBase.Search( '\\', nStartSearch )) != STRING_NOTFOUND) )
             {
-                bLoop = (TRUE == aDosBase.Equals( aDosUrl, 0, nPos + 1 ));
+                bLoop = (sal_True == aDosBase.Equals( aDosUrl, 0, nPos + 1 ));
                 if( bLoop )
                 {
                     aDosBase.Erase( 0, nPos + 1 );
@@ -1124,7 +1124,7 @@ void XclExpCachedMatrix::Save( XclExpStream& rStrm ) const
                 rStrm << EXC_CACHEDVAL_BOOL << nBool;
                 rStrm.WriteZeroBytes( 7 );
             }
-            else if( USHORT nScError = pMatVal->GetError() )
+            else if( sal_uInt16 nScError = pMatVal->GetError() )
             {
                 sal_Int8 nError ( XclTools::GetXclErrorCode( nScError ) );
                 rStrm.SetSliceSize( 9 );
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 645abc25b..d33cf33d7 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1068,7 +1068,7 @@ sal_uInt16 XclExpExtNameBuffer::InsertDde(
     sal_uInt16 nIndex = GetIndex( rItem );
     if( nIndex == 0 )
     {
-        USHORT nPos;
+        sal_uInt16 nPos;
         if( GetDoc().FindDdeLink( rApplic, rTopic, rItem, SC_DDE_IGNOREMODE, nPos ) )
         {
             // create the leading 'StdDocumentName' EXTERNNAME record
@@ -1162,7 +1162,7 @@ void XclExpCrn::WriteDouble( XclExpStream& rStrm, double fValue )
 {
     if( ::rtl::math::isNan( fValue ) )
     {
-        USHORT nScError = static_cast< USHORT >( reinterpret_cast< const sal_math_Double* >( &fValue )->nan_parts.fraction_lo );
+        sal_uInt16 nScError = static_cast< sal_uInt16 >( reinterpret_cast< const sal_math_Double* >( &fValue )->nan_parts.fraction_lo );
         WriteError( rStrm, XclTools::GetXclErrorCode( nScError ) );
     }
     else
@@ -1283,7 +1283,7 @@ void XclExpXct::Save( XclExpStream& rStrm )
         ::std::pair< SCCOL, SCCOL > aColRange = mxCacheTable->getColRange( nScRow );
         for( SCCOL nScCol = aColRange.first; bValid && (nScCol < aColRange.second); ++nScCol )
         {
-            if( maUsedCells.IsCellMarked( nScCol, nScRow, TRUE ) )
+            if( maUsedCells.IsCellMarked( nScCol, nScRow, sal_True ) )
             {
                 sal_uInt32 nScNumFmt = 0;
                 ScExternalRefCache::TokenRef xToken = mxCacheTable->getCell( nScCol, nScRow, &nScNumFmt );
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index bcf208f00..aa20e3ebf 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -136,9 +136,9 @@ public:
     void                Initialize();
 
     /** Inserts the Calc name with the passed index and returns the Excel NAME index. */
-    sal_uInt16          InsertName( USHORT nScNameIdx );
+    sal_uInt16          InsertName( sal_uInt16 nScNameIdx );
     /** Inserts the Calc database range with the passed index and returns the Excel NAME index. */
-    sal_uInt16          InsertDBRange( USHORT nScDBRangeIdx );
+    sal_uInt16          InsertDBRange( sal_uInt16 nScDBRangeIdx );
 
     /** Inserts a new built-in defined name. */
     sal_uInt16          InsertBuiltInName( sal_Unicode cBuiltIn, XclTokenArrayRef xTokArr, SCTAB nScTab );
@@ -165,11 +165,11 @@ public:
 private:
     typedef XclExpRecordList< XclExpName >      XclExpNameList;
     typedef XclExpNameList::RecordRefType       XclExpNameRef;
-    typedef ::std::map< USHORT, sal_uInt16 >    XclExpIndexMap;
+    typedef ::std::map< sal_uInt16, sal_uInt16 >    XclExpIndexMap;
 
 private:
     /** Finds the index of a NAME record from the passed Calc index in the specified map. */
-    sal_uInt16          FindNameIdx( const XclExpIndexMap& rMap, USHORT nScIdx ) const;
+    sal_uInt16          FindNameIdx( const XclExpIndexMap& rMap, sal_uInt16 nScIdx ) const;
     /** Returns the index of an existing built-in NAME record with the passed definition, otherwise 0. */
     sal_uInt16          FindBuiltInNameIdx( const String& rName,
                             const XclTokenArray& rTokArr, bool bDBRange ) const;
@@ -378,7 +378,7 @@ void XclExpNameManagerImpl::Initialize()
     CreateDatabaseNames();
 }
 
-sal_uInt16 XclExpNameManagerImpl::InsertName( USHORT nScNameIdx )
+sal_uInt16 XclExpNameManagerImpl::InsertName( sal_uInt16 nScNameIdx )
 {
     sal_uInt16 nNameIdx = FindNameIdx( maNameMap, nScNameIdx );
     if( nNameIdx == 0 )
@@ -387,7 +387,7 @@ sal_uInt16 XclExpNameManagerImpl::InsertName( USHORT nScNameIdx )
     return nNameIdx;
 }
 
-sal_uInt16 XclExpNameManagerImpl::InsertDBRange( USHORT nScDBRangeIdx )
+sal_uInt16 XclExpNameManagerImpl::InsertDBRange( sal_uInt16 nScDBRangeIdx )
 {
     sal_uInt16 nNameIdx = FindNameIdx( maDBRangeMap, nScDBRangeIdx );
     if( nNameIdx == 0 )
@@ -482,7 +482,7 @@ void XclExpNameManagerImpl::SaveXml( XclExpXmlStream& rStrm )
 
 // private --------------------------------------------------------------------
 
-sal_uInt16 XclExpNameManagerImpl::FindNameIdx( const XclExpIndexMap& rMap, USHORT nScIdx ) const
+sal_uInt16 XclExpNameManagerImpl::FindNameIdx( const XclExpIndexMap& rMap, sal_uInt16 nScIdx ) const
 {
     XclExpIndexMap::const_iterator aIt = rMap.find( nScIdx );
     return (aIt == rMap.end()) ? 0 : aIt->second;
@@ -628,7 +628,7 @@ void XclExpNameManagerImpl::CreateBuiltInNames()
             if( rDoc.HasPrintRange() )
             {
                 ScRangeList aRangeList;
-                for( USHORT nIdx = 0, nCount = rDoc.GetPrintRangeCount( nScTab ); nIdx < nCount; ++nIdx )
+                for( sal_uInt16 nIdx = 0, nCount = rDoc.GetPrintRangeCount( nScTab ); nIdx < nCount; ++nIdx )
                 {
                     ScRange aRange( *rDoc.GetPrintRange( nScTab, nIdx ) );
                     // Calc document does not care about sheet index in print ranges
@@ -672,7 +672,7 @@ void XclExpNameManagerImpl::CreateBuiltInNames()
 void XclExpNameManagerImpl::CreateUserNames()
 {
     const ScRangeName& rNamedRanges = GetNamedRanges();
-    for( USHORT nNameIdx = 0, nNameCount = rNamedRanges.GetCount(); nNameIdx < nNameCount; ++nNameIdx )
+    for( sal_uInt16 nNameIdx = 0, nNameCount = rNamedRanges.GetCount(); nNameIdx < nNameCount; ++nNameIdx )
     {
         const ScRangeData* pRangeData = rNamedRanges[ nNameIdx ];
         DBG_ASSERT( rNamedRanges[ nNameIdx ], "XclExpNameManagerImpl::CreateUserNames - missing defined name" );
@@ -685,7 +685,7 @@ void XclExpNameManagerImpl::CreateUserNames()
 void XclExpNameManagerImpl::CreateDatabaseNames()
 {
     const ScDBCollection& rDBRanges = GetDatabaseRanges();
-    for( USHORT nDBIdx = 0, nDBCount = rDBRanges.GetCount(); nDBIdx < nDBCount; ++nDBIdx )
+    for( sal_uInt16 nDBIdx = 0, nDBCount = rDBRanges.GetCount(); nDBIdx < nDBCount; ++nDBIdx )
     {
         const ScDBData* pDBData = rDBRanges[ nDBIdx ];
         DBG_ASSERT( pDBData, "XclExpNameManagerImpl::CreateDatabaseNames - missing database range" );
@@ -712,12 +712,12 @@ void XclExpNameManager::Initialize()
     mxImpl->Initialize();
 }
 
-sal_uInt16 XclExpNameManager::InsertName( USHORT nScNameIdx )
+sal_uInt16 XclExpNameManager::InsertName( sal_uInt16 nScNameIdx )
 {
     return mxImpl->InsertName( nScNameIdx );
 }
 
-sal_uInt16 XclExpNameManager::InsertDBRange( USHORT nScDBRangeIdx )
+sal_uInt16 XclExpNameManager::InsertDBRange( sal_uInt16 nScDBRangeIdx )
 {
     return mxImpl->InsertDBRange( nScDBRangeIdx );
 }
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 83ab0f883..92800e787 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -922,7 +922,7 @@ String lclGetDataFieldCaption( const String& rFieldName, GeneralFunction eFunc )
 {
     String aCaption;
 
-    USHORT nResIdx = 0;
+    sal_uInt16 nResIdx = 0;
     using namespace ::com::sun::star::sheet;
     switch( eFunc )
     {
@@ -1281,7 +1281,7 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
                 maFieldList.AppendNewRecord( new XclExpPTField( *this, nFieldIdx ) );
 
             const List& rDimList = pSaveData->GetDimensions();
-            ULONG nDimIdx, nDimCount = rDimList.Count();
+            sal_uLong nDimIdx, nDimCount = rDimList.Count();
 
             /*  2)  First process all data dimensions, they are needed for extended
                     settings of row/column/page fields (sorting/auto show). */
@@ -1714,7 +1714,7 @@ XclExpPivotTableManager::XclExpPivotTableManager( const XclExpRoot& rRoot ) :
 void XclExpPivotTableManager::CreatePivotTables()
 {
     if( ScDPCollection* pDPColl = GetDoc().GetDPCollection() )
-        for( USHORT nDPObj = 0, nCount = pDPColl->GetCount(); nDPObj < nCount; ++nDPObj )
+        for( sal_uInt16 nDPObj = 0, nCount = pDPColl->GetCount(); nDPObj < nCount; ++nDPObj )
             if( ScDPObject* pDPObj = (*pDPColl)[ nDPObj ] )
                 if( const XclExpPivotCache* pPCache = CreatePivotCache( *pDPObj ) )
                     maPTableList.AppendNewRecord( new XclExpPivotTable( GetRoot(), *pDPObj, *pPCache ) );
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 5e37dbd88..424e02458 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -821,7 +821,7 @@ void XclExpPalette::WriteBody( XclExpStream& rStrm )
 
 namespace {
 
-typedef ::std::pair< USHORT, sal_Int16 > WhichAndScript;
+typedef ::std::pair< sal_uInt16, sal_Int16 > WhichAndScript;
 
 sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet,
         const WhichAndScript& rWAS1, const WhichAndScript& rWAS2, const WhichAndScript& rWAS3 )
@@ -885,7 +885,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet,
         nScript = GetFirstUsedScript( rRoot, rItemSet );
 
     // convert to core script type constants
-    BYTE nScScript = SCRIPTTYPE_LATIN;
+    sal_uInt8 nScScript = SCRIPTTYPE_LATIN;
     switch( nScript )
     {
         case ApiScriptType::LATIN:      nScScript = SCRIPTTYPE_LATIN;   break;
@@ -902,14 +902,14 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet,
 
 /*static*/ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript, bool bDeep )
 {
-    static const USHORT pnCommonIds[] = {
+    static const sal_uInt16 pnCommonIds[] = {
         ATTR_FONT_UNDERLINE, ATTR_FONT_CROSSEDOUT, ATTR_FONT_CONTOUR,
         ATTR_FONT_SHADOWED, ATTR_FONT_COLOR, ATTR_FONT_LANGUAGE, 0 };
-    static const USHORT pnLatinIds[] = {
+    static const sal_uInt16 pnLatinIds[] = {
         ATTR_FONT, ATTR_FONT_HEIGHT, ATTR_FONT_WEIGHT, ATTR_FONT_POSTURE, 0 };
-    static const USHORT pnAsianIds[] = {
+    static const sal_uInt16 pnAsianIds[] = {
         ATTR_CJK_FONT, ATTR_CJK_FONT_HEIGHT, ATTR_CJK_FONT_WEIGHT, ATTR_CJK_FONT_POSTURE, 0 };
-    static const USHORT pnComplexIds[] = {
+    static const sal_uInt16 pnComplexIds[] = {
         ATTR_CTL_FONT, ATTR_CTL_FONT_HEIGHT, ATTR_CTL_FONT_WEIGHT, ATTR_CTL_FONT_POSTURE, 0 };
 
     bool bUsed = ScfTools::CheckItems( rItemSet, pnCommonIds, bDeep );
@@ -1197,8 +1197,8 @@ size_t XclExpFontBuffer::Find( const XclFontData& rFontData )
 /** Predicate for search algorithm. */
 struct XclExpNumFmtPred
 {
-    ULONG               mnScNumFmt;
-    inline explicit     XclExpNumFmtPred( ULONG nScNumFmt ) : mnScNumFmt( nScNumFmt ) {}
+    sal_uLong               mnScNumFmt;
+    inline explicit     XclExpNumFmtPred( sal_uLong nScNumFmt ) : mnScNumFmt( nScNumFmt ) {}
     inline bool         operator()( const XclExpNumFmt& rFormat ) const
                             { return rFormat.mnScNumFmt == mnScNumFmt; }
 };
@@ -1236,7 +1236,7 @@ XclExpNumFmtBuffer::~XclExpNumFmtBuffer()
     delete[] mpKeywordTable;
 }
 
-sal_uInt16 XclExpNumFmtBuffer::Insert( ULONG nScNumFmt )
+sal_uInt16 XclExpNumFmtBuffer::Insert( sal_uLong nScNumFmt )
 {
     XclExpNumFmtVec::const_iterator aIt =
         ::std::find_if( maFormatMap.begin(), maFormatMap.end(), XclExpNumFmtPred( nScNumFmt ) );
@@ -1393,7 +1393,7 @@ bool XclExpCellAlign::FillFromItemSet(
             bUsed |= ScfTools::CheckItem( rItemSet, ATTR_INDENT, bStyle );
 
             // shrink to fit
-            mbShrink = GETITEMVALUE( rItemSet, SfxBoolItem, ATTR_SHRINKTOFIT, BOOL );
+            mbShrink = GETITEMVALUE( rItemSet, SfxBoolItem, ATTR_SHRINKTOFIT, sal_Bool );
             bUsed |= ScfTools::CheckItem( rItemSet, ATTR_SHRINKTOFIT, bStyle );
 
             // CTL text direction
@@ -1409,7 +1409,7 @@ bool XclExpCellAlign::FillFromItemSet(
             bUsed |= ScfTools::CheckItem( rItemSet, ATTR_VER_JUSTIFY, bStyle );
 
             // stacked/rotation
-            bool bStacked = GETITEMVALUE( rItemSet, SfxBoolItem, ATTR_STACKED, BOOL );
+            bool bStacked = GETITEMVALUE( rItemSet, SfxBoolItem, ATTR_STACKED, sal_Bool );
             bUsed |= ScfTools::CheckItem( rItemSet, ATTR_STACKED, bStyle );
             if( bStacked )
             {
@@ -1900,7 +1900,7 @@ void XclExpXFId::ConvertXFIndex( const XclExpRoot& rRoot )
 
 XclExpXF::XclExpXF(
         const XclExpRoot& rRoot, const ScPatternAttr& rPattern, sal_Int16 nScript,
-        ULONG nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak ) :
+        sal_uLong nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak ) :
     XclXFBase( true ),
     XclExpRoot( rRoot )
 {
@@ -1928,7 +1928,7 @@ XclExpXF::XclExpXF( const XclExpRoot& rRoot, bool bCellXF ) :
 }
 
 bool XclExpXF::Equals( const ScPatternAttr& rPattern,
-        ULONG nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak ) const
+        sal_uLong nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak ) const
 {
     return IsCellXF() && (mpItemSet == &rPattern.GetItemSet()) &&
         (!bForceLineBreak || maAlignment.mbLineBreak) &&
@@ -1965,7 +1965,7 @@ void XclExpXF::InitDefault()
 }
 
 void XclExpXF::Init( const SfxItemSet& rItemSet, sal_Int16 nScript,
-        ULONG nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak, bool bDefStyle )
+        sal_uLong nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak, bool bDefStyle )
 {
     InitDefault();
     mpItemSet = &rItemSet;
@@ -1987,7 +1987,7 @@ void XclExpXF::Init( const SfxItemSet& rItemSet, sal_Int16 nScript,
 
     // number format
     mnScNumFmt = (nForceScNumFmt == NUMBERFORMAT_ENTRY_NOT_FOUND) ?
-        GETITEMVALUE( rItemSet, SfxUInt32Item, ATTR_VALUE_FORMAT, ULONG ) : nForceScNumFmt;
+        GETITEMVALUE( rItemSet, SfxUInt32Item, ATTR_VALUE_FORMAT, sal_uLong ) : nForceScNumFmt;
     mnXclNumFmt = GetNumFmtBuffer().Insert( mnScNumFmt );
     mbFmtUsed = ScfTools::CheckItem( rItemSet, ATTR_VALUE_FORMAT, IsStyleXF() );
 
@@ -2349,7 +2349,7 @@ sal_uInt32 XclExpXFBuffer::InsertWithFont( const ScPatternAttr* pPattern, sal_In
     return InsertCellXF( pPattern, nScript, NUMBERFORMAT_ENTRY_NOT_FOUND, nForceXclFont, bForceLineBreak );
 }
 
-sal_uInt32 XclExpXFBuffer::InsertWithNumFmt( const ScPatternAttr* pPattern, sal_Int16 nScript, ULONG nForceScNumFmt, bool bForceLineBreak )
+sal_uInt32 XclExpXFBuffer::InsertWithNumFmt( const ScPatternAttr* pPattern, sal_Int16 nScript, sal_uLong nForceScNumFmt, bool bForceLineBreak )
 {
     return InsertCellXF( pPattern, nScript, nForceScNumFmt, EXC_FONT_NOTFOUND, bForceLineBreak );
 }
@@ -2608,7 +2608,7 @@ void XclExpXFBuffer::SaveXFXml( XclExpXmlStream& rStrm, XclExpXF& rXF )
 }
 
 sal_uInt32 XclExpXFBuffer::FindXF( const ScPatternAttr& rPattern,
-        ULONG nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak ) const
+        sal_uLong nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak ) const
 {
     for( size_t nPos = 0, nSize = maXFList.GetSize(); nPos < nSize; ++nPos )
         if( maXFList.GetRecord( nPos )->Equals( rPattern, nForceScNumFmt, nForceXclFont, bForceLineBreak ) )
@@ -2633,7 +2633,7 @@ sal_uInt32 XclExpXFBuffer::FindBuiltInXF( sal_uInt8 nStyleId, sal_uInt8 nLevel )
 }
 
 sal_uInt32 XclExpXFBuffer::InsertCellXF( const ScPatternAttr* pPattern, sal_Int16 nScript,
-        ULONG nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak )
+        sal_uLong nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak )
 {
     const ScPatternAttr* pDefPattern = GetDoc().GetDefPattern();
     if( !pPattern )
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 41c2f7690..c02d68ea2 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -813,12 +813,12 @@ XclExpFormulaCell::XclExpFormulaCell(
         XclExpNumFmtBuffer& rNumFmtBfr = rRoot.GetNumFmtBuffer();
 
         // current cell number format
-        ULONG nScNumFmt = pPattern ?
-            GETITEMVALUE( pPattern->GetItemSet(), SfxUInt32Item, ATTR_VALUE_FORMAT, ULONG ) :
+        sal_uLong nScNumFmt = pPattern ?
+            GETITEMVALUE( pPattern->GetItemSet(), SfxUInt32Item, ATTR_VALUE_FORMAT, sal_uLong ) :
             rNumFmtBfr.GetStandardFormat();
 
         // alternative number format passed to XF buffer
-        ULONG nAltScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND;
+        sal_uLong nAltScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND;
         /*  #73420# Xcl doesn't know Boolean number formats, we write
             "TRUE";"FALSE" (language dependent). Don't do it for automatic
             formula formats, because Excel gets them right. */
@@ -917,7 +917,7 @@ void XclExpFormulaCell::Save( XclExpStream& rStrm )
         mxStringRec->Save( rStrm );
 }
 
-static const char* lcl_GetErrorString( USHORT nScErrCode )
+static const char* lcl_GetErrorString( sal_uInt16 nScErrCode )
 {
     sal_uInt8 nXclErrCode = XclTools::GetXclErrorCode( nScErrCode );
     switch( nXclErrCode )
@@ -940,7 +940,7 @@ static void lcl_GetFormulaInfo( ScFormulaCell& rCell, const char** pType, OUStri
         case NUMBERFORMAT_NUMBER:
         {
             // either value or error code
-            USHORT nScErrCode = rCell.GetErrCode();
+            sal_uInt16 nScErrCode = rCell.GetErrCode();
             if( nScErrCode )
             {
                 *pType = "e";
@@ -1036,7 +1036,7 @@ void XclExpFormulaCell::WriteContents( XclExpStream& rStrm )
         case NUMBERFORMAT_NUMBER:
         {
             // either value or error code
-            USHORT nScErrCode = mrScFmlaCell.GetErrCode();
+            sal_uInt16 nScErrCode = mrScFmlaCell.GetErrCode();
             if( nScErrCode )
                 rStrm << EXC_FORMULA_RES_ERROR << sal_uInt8( 0 )
                       << XclTools::GetXclErrorCode( nScErrCode )
@@ -1402,7 +1402,7 @@ XclExpOutlineBuffer::XclExpOutlineBuffer( const XclExpRoot& rRoot, bool bRows )
         mpScOLArray = bRows ? pOutlineTable->GetRowArray() : pOutlineTable->GetColArray();
 
     if( mpScOLArray )
-        for( USHORT nLevel = 0; nLevel < SC_OL_MAXDEPTH; ++nLevel )
+        for( sal_uInt16 nLevel = 0; nLevel < SC_OL_MAXDEPTH; ++nLevel )
             if( ScOutlineEntry* pEntry = mpScOLArray->GetEntryByPos( nLevel, 0 ) )
                 maLevelInfos[ nLevel ].mnScEndPos = pEntry->GetEnd();
 }
@@ -1412,7 +1412,7 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos )
     if( mpScOLArray )
     {
         // find open level index for passed position
-        USHORT nNewOpenScLevel = 0; // new open level (0-based Calc index)
+        sal_uInt16 nNewOpenScLevel = 0; // new open level (0-based Calc index)
         sal_uInt8 nNewLevel = 0;    // new open level (1-based Excel index)
 
         if( mpScOLArray->FindTouchedLevel( nScPos, nScPos, nNewOpenScLevel ) )
@@ -1423,7 +1423,7 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos )
         if( nNewLevel >= mnCurrLevel )
         {
             // new level(s) opened, or no level closed - update all level infos
-            for( USHORT nScLevel = 0; nScLevel <= nNewOpenScLevel; ++nScLevel )
+            for( sal_uInt16 nScLevel = 0; nScLevel <= nNewOpenScLevel; ++nScLevel )
             {
                 /*  In each level: check if a new group is started (there may be
                     neighbored groups without gap - therefore check ALL levels). */
@@ -1441,8 +1441,8 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos )
         {
             // level(s) closed - check if any of the closed levels are collapsed
             // Calc uses 0-based level indexes
-            USHORT nOldOpenScLevel = mnCurrLevel - 1;
-            for( USHORT nScLevel = nNewOpenScLevel + 1; !mbCurrCollapse && (nScLevel <= nOldOpenScLevel); ++nScLevel )
+            sal_uInt16 nOldOpenScLevel = mnCurrLevel - 1;
+            for( sal_uInt16 nScLevel = nNewOpenScLevel + 1; !mbCurrCollapse && (nScLevel <= nOldOpenScLevel); ++nScLevel )
                 mbCurrCollapse = maLevelInfos[ nScLevel ].mbHidden;
         }
 
@@ -1597,7 +1597,7 @@ XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot,
         rDoc.GetMostUsedPattern( nScCol, 0, nLastScRow, nScTab ), GetDefApiScript() );
 
     // column width
-    USHORT nScWidth = rDoc.GetColWidth( nScCol, nScTab );
+    sal_uInt16 nScWidth = rDoc.GetColWidth( nScCol, nScTab );
     mnWidth = XclTools::GetXclColumnWidth( nScWidth, GetCharWidth() );
 
     // column flags
@@ -1824,8 +1824,8 @@ XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt16 nXclRow,
 
     // *** Row flags *** ------------------------------------------------------
 
-    BYTE nRowFlags = GetDoc().GetRowFlags( nScRow, nScTab );
-    bool bUserHeight = ::get_flag< BYTE >( nRowFlags, CR_MANUALSIZE );
+    sal_uInt8 nRowFlags = GetDoc().GetRowFlags( nScRow, nScTab );
+    bool bUserHeight = ::get_flag< sal_uInt8 >( nRowFlags, CR_MANUALSIZE );
     bool bHidden = GetDoc().RowHidden(nScRow, nScTab);
     ::set_flag( mnFlags, EXC_ROW_UNSYNCED, bUserHeight );
     ::set_flag( mnFlags, EXC_ROW_HIDDEN, bHidden );
@@ -2410,7 +2410,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
                 // try to create a Boolean cell
                 if( pPattern && ((fValue == 0.0) || (fValue == 1.0)) )
                 {
-                    ULONG nScNumFmt = GETITEMVALUE( pPattern->GetItemSet(), SfxUInt32Item, ATTR_VALUE_FORMAT, ULONG );
+                    sal_uLong nScNumFmt = GETITEMVALUE( pPattern->GetItemSet(), SfxUInt32Item, ATTR_VALUE_FORMAT, sal_uLong );
                     if( rFormatter.GetType( nScNumFmt ) == NUMBERFORMAT_LOGICAL )
                         xCell.reset( new XclExpBooleanCell(
                             GetRoot(), aXclPos, pPattern, nMergeBaseXFId, fValue != 0.0 ) );
@@ -2510,7 +2510,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
             // data validation
             if( ScfTools::CheckItem( rItemSet, ATTR_VALIDDATA, false ) )
             {
-                ULONG nScHandle = GETITEMVALUE( rItemSet, SfxUInt32Item, ATTR_VALIDDATA, ULONG );
+                sal_uLong nScHandle = GETITEMVALUE( rItemSet, SfxUInt32Item, ATTR_VALIDDATA, sal_uLong );
                 ScRange aScRange( aScPos );
                 aScRange.aEnd.SetCol( nLastScCol );
                 mxDval->InsertCellRange( aScRange, nScHandle );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index c4f44862c..d0bfcad52 100755..100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -43,6 +43,8 @@
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
+#include <com/sun/star/chart/TimeInterval.hpp>
+#include <com/sun/star/chart/TimeUnit.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/XDiagramPositioning.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
@@ -147,13 +149,12 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclChRectangle& rRect )
     return rStrm >> rRect.mnX >> rRect.mnY >> rRect.mnWidth >> rRect.mnHeight;
 }
 
-template< typename Type >
-void lclSetValueOrClearAny( Any& rAny, const Type& rValue, bool bClear )
+inline void lclSetValueOrClearAny( Any& rAny, double fValue, bool bClear )
 {
     if( bClear )
         rAny.clear();
     else
-        rAny <<= rValue;
+        rAny <<= fValue;
 }
 
 void lclSetExpValueOrClearAny( Any& rAny, double fValue, bool bLogScale, bool bClear )
@@ -163,6 +164,50 @@ void lclSetExpValueOrClearAny( Any& rAny, double fValue, bool bLogScale, bool bC
     lclSetValueOrClearAny( rAny, fValue, bClear );
 }
 
+double lclGetSerialDay( const XclImpRoot& rRoot, sal_uInt16 nValue, sal_uInt16 nTimeUnit )
+{
+    switch( nTimeUnit )
+    {
+        case EXC_CHDATERANGE_DAYS:
+            return nValue;
+        case EXC_CHDATERANGE_MONTHS:
+            return rRoot.GetDoubleFromDateTime( Date( 1, static_cast< sal_uInt16 >( 1 + nValue % 12 ), static_cast< sal_uInt16 >( rRoot.GetBaseYear() + nValue / 12 ) ) );
+        case EXC_CHDATERANGE_YEARS:
+            return rRoot.GetDoubleFromDateTime( Date( 1, 1, static_cast< sal_uInt16 >( rRoot.GetBaseYear() + nValue ) ) );
+        default:
+            OSL_ENSURE( false, "lclGetSerialDay - unexpected time unit" );
+    }
+    return nValue;
+}
+
+void lclConvertTimeValue( const XclImpRoot& rRoot, Any& rAny, sal_uInt16 nValue, bool bAuto, sal_uInt16 nTimeUnit )
+{
+    if( bAuto )
+        rAny.clear();
+    else
+        rAny <<= lclGetSerialDay( rRoot, nValue, nTimeUnit );
+}
+
+sal_Int32 lclGetApiTimeUnit( sal_uInt16 nTimeUnit )
+{
+    switch( nTimeUnit )
+    {
+        case EXC_CHDATERANGE_DAYS:      return cssc::TimeUnit::DAY;
+        case EXC_CHDATERANGE_MONTHS:    return cssc::TimeUnit::MONTH;
+        case EXC_CHDATERANGE_YEARS:     return cssc::TimeUnit::YEAR;
+        default:                        OSL_ENSURE( false, "lclGetApiTimeUnit - unexpected time unit" );
+    }
+    return cssc::TimeUnit::DAY;
+}
+
+void lclConvertTimeInterval( Any& rInterval, sal_uInt16 nValue, bool bAuto, sal_uInt16 nTimeUnit )
+{
+    if( bAuto || (nValue == 0) )
+        rInterval.clear();
+    else
+        rInterval <<= cssc::TimeInterval( nValue, lclGetApiTimeUnit( nTimeUnit ) );
+}
+
 } // namespace
 
 // Common =====================================================================
@@ -2828,20 +2873,60 @@ XclImpChLabelRange::XclImpChLabelRange( const XclImpChRoot& rRoot ) :
 
 void XclImpChLabelRange::ReadChLabelRange( XclImpStream& rStrm )
 {
-    rStrm >> maData.mnCross >> maData.mnLabelFreq >> maData.mnTickFreq >> maData.mnFlags;
+    rStrm >> maLabelData.mnCross >> maLabelData.mnLabelFreq >> maLabelData.mnTickFreq >> maLabelData.mnFlags;
+}
+
+void XclImpChLabelRange::ReadChDateRange( XclImpStream& rStrm )
+{
+    rStrm   >> maDateData.mnMinDate
+            >> maDateData.mnMaxDate
+            >> maDateData.mnMajorStep
+            >> maDateData.mnMajorUnit
+            >> maDateData.mnMinorStep
+            >> maDateData.mnMinorUnit
+            >> maDateData.mnBaseUnit
+            >> maDateData.mnCross
+            >> maDateData.mnFlags;
 }
 
 void XclImpChLabelRange::Convert( ScfPropertySet& rPropSet, ScaleData& rScaleData, bool bMirrorOrient ) const
 {
-    // do not overlap text unless all labels are visible
-    rPropSet.SetBoolProperty( EXC_CHPROP_TEXTOVERLAP, maData.mnLabelFreq == 1 );
-    // do not break text into several lines unless all labels are visible
-    rPropSet.SetBoolProperty( EXC_CHPROP_TEXTBREAK, maData.mnLabelFreq == 1 );
-    // do not stagger labels in two lines
-    rPropSet.SetProperty( EXC_CHPROP_ARRANGEORDER, cssc::ChartAxisArrangeOrderType_SIDE_BY_SIDE );
+    // automatic axis type detection
+    rScaleData.AutoDateAxis = ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTODATE );
+
+    // the flag EXC_CHDATERANGE_DATEAXIS specifies whether this is a date axis
+    if( ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_DATEAXIS ) )
+    {
+        /*  Chart2 requires axis type CATEGORY for automatic category/date axis
+            (even if it is a date axis currently). */
+        rScaleData.AxisType = rScaleData.AutoDateAxis ? cssc2::AxisType::CATEGORY : cssc2::AxisType::DATE;
+        rScaleData.Scaling.set( ScfApiHelper::CreateInstance( SERVICE_CHART2_LINEARSCALING ), UNO_QUERY );
+        /*  Min/max values depend on base time unit, they specify the number of
+            days, months, or years starting from null date. */
+        lclConvertTimeValue( GetRoot(), rScaleData.Minimum, maDateData.mnMinDate, ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMIN ), maDateData.mnBaseUnit );
+        lclConvertTimeValue( GetRoot(), rScaleData.Maximum, maDateData.mnMaxDate, ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMAX ), maDateData.mnBaseUnit );
+        // increment
+        cssc::TimeIncrement& rTimeIncrement = rScaleData.TimeIncrement;
+        lclConvertTimeInterval( rTimeIncrement.MajorTimeInterval, maDateData.mnMajorStep, ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMAJOR ), maDateData.mnMajorUnit );
+        lclConvertTimeInterval( rTimeIncrement.MinorTimeInterval, maDateData.mnMinorStep, ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOMINOR ), maDateData.mnMinorUnit );
+        // base unit
+        if( ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOBASE ) )
+            rTimeIncrement.TimeResolution.clear();
+        else
+            rTimeIncrement.TimeResolution <<= lclGetApiTimeUnit( maDateData.mnBaseUnit );
+    }
+    else
+    {
+        // do not overlap text unless all labels are visible
+        rPropSet.SetBoolProperty( EXC_CHPROP_TEXTOVERLAP, maLabelData.mnLabelFreq == 1 );
+        // do not break text into several lines unless all labels are visible
+        rPropSet.SetBoolProperty( EXC_CHPROP_TEXTBREAK, maLabelData.mnLabelFreq == 1 );
+        // do not stagger labels in two lines
+        rPropSet.SetProperty( EXC_CHPROP_ARRANGEORDER, cssc::ChartAxisArrangeOrderType_SIDE_BY_SIDE );
+    }
 
     // reverse order
-    bool bReverse = ::get_flag( maData.mnFlags, EXC_CHLABELRANGE_REVERSE ) != bMirrorOrient;
+    bool bReverse = ::get_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_REVERSE ) != bMirrorOrient;
     rScaleData.Orientation = bReverse ? cssc2::AxisOrientation_REVERSE : cssc2::AxisOrientation_MATHEMATICAL;
 
     //! TODO #i58731# show n-th category
@@ -2853,13 +2938,29 @@ void XclImpChLabelRange::ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3d
         does not move the Y axis in 3D charts, regardless of actual settings.
         But: the Y axis has to be moved to "end", if the X axis is mirrored,
         to keep it at the left end of the chart. */
-    bool bMaxCross = ::get_flag( maData.mnFlags, b3dChart ? EXC_CHLABELRANGE_REVERSE : EXC_CHLABELRANGE_MAXCROSS );
+    bool bMaxCross = ::get_flag( maLabelData.mnFlags, b3dChart ? EXC_CHLABELRANGE_REVERSE : EXC_CHLABELRANGE_MAXCROSS );
     cssc::ChartAxisPosition eAxisPos = bMaxCross ? cssc::ChartAxisPosition_END : cssc::ChartAxisPosition_VALUE;
     rPropSet.SetProperty( EXC_CHPROP_CROSSOVERPOSITION, eAxisPos );
 
-    // crossing position
-    double fCrossingPos = b3dChart ? 1.0 : maData.mnCross;
-    rPropSet.SetProperty( EXC_CHPROP_CROSSOVERVALUE, fCrossingPos );
+    // crossing position (depending on axis type text/date)
+    if( ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_DATEAXIS ) )
+    {
+        bool bAutoCross = ::get_flag( maDateData.mnFlags, EXC_CHDATERANGE_AUTOCROSS );
+        /*  Crossing position value depends on base time unit, it specifies the
+            number of days, months, or years from null date. Note that Excel
+            2007/2010 write broken BIFF8 files, they always stores the number
+            of days cregardless of the base time unit (and they are reading it
+            the same way, thus wrongly displaying files written by Excel
+            97-2003). This filter sticks to the correct behaviour of Excel
+            97-2003. */
+        double fCrossingPos = bAutoCross ? 1.0 : lclGetSerialDay( GetRoot(), maDateData.mnCross, maDateData.mnBaseUnit );
+        rPropSet.SetProperty( EXC_CHPROP_CROSSOVERVALUE, fCrossingPos );
+    }
+    else
+    {
+        double fCrossingPos = b3dChart ? 1.0 : maLabelData.mnCross;
+        rPropSet.SetProperty( EXC_CHPROP_CROSSOVERVALUE, fCrossingPos );
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -2900,6 +3001,7 @@ void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) co
     Sequence< SubIncrement >& rSubIncrementSeq = rIncrementData.SubIncrements;
     rSubIncrementSeq.realloc( 1 );
     Any& rIntervalCount = rSubIncrementSeq[ 0 ].IntervalCount;
+    rIntervalCount.clear();
     if( bLogScale )
     {
         if( !bAutoMinor )
@@ -2907,14 +3009,12 @@ void XclImpChValueRange::Convert( ScaleData& rScaleData, bool bMirrorOrient ) co
     }
     else
     {
-        sal_Int32 nCount = 0;
         if( !bAutoMajor && !bAutoMinor && (0.0 < maData.mfMinorStep) && (maData.mfMinorStep <= maData.mfMajorStep) )
         {
             double fCount = maData.mfMajorStep / maData.mfMinorStep + 0.5;
-            if( fCount < 1001.0 )
-                nCount = static_cast< sal_Int32 >( fCount );
+            if( (1.0 <= fCount) && (fCount < 1001.0) )
+                rIntervalCount <<= static_cast< sal_Int32 >( fCount );
         }
-        lclSetValueOrClearAny( rIntervalCount, nCount, nCount == 0 );
     }
 
     // reverse order
@@ -3035,6 +3135,11 @@ void XclImpChAxis::ReadSubRecord( XclImpStream& rStrm )
             mxLabelRange.reset( new XclImpChLabelRange( GetChRoot() ) );
             mxLabelRange->ReadChLabelRange( rStrm );
         break;
+        case EXC_ID_CHDATERANGE:
+            if( !mxLabelRange )
+                mxLabelRange.reset( new XclImpChLabelRange( GetChRoot() ) );
+            mxLabelRange->ReadChDateRange( rStrm );
+        break;
         case EXC_ID_CHVALUERANGE:
             mxValueRange.reset( new XclImpChValueRange( GetChRoot() ) );
             mxValueRange->ReadChValueRange( rStrm );
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 15b08afde..79defab23 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -639,7 +639,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
 
     if( !mxScCondFmt.get() )
     {
-        ULONG nKey = 0;
+        sal_uLong nKey = 0;
         mxScCondFmt.reset( new ScConditionalFormat( nKey, GetDocPtr() ) );
     }
 
@@ -654,7 +654,7 @@ void XclImpCondFormat::Apply()
     {
         ScDocument& rDoc = GetDoc();
 
-        ULONG nKey = rDoc.AddCondFormat( *mxScCondFmt );
+        sal_uLong nKey = rDoc.AddCondFormat( *mxScCondFmt );
         ScPatternAttr aPattern( rDoc.GetPool() );
         aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nKey ) );
 
@@ -851,7 +851,7 @@ void XclImpValidation::ReadDV( XclImpStream& rStrm )
                     aValidData.ResetError();
 
                 // set the handle ID
-                ULONG nHandle = rDoc.AddValidationEntry( aValidData );
+                sal_uLong nHandle = rDoc.AddValidationEntry( aValidData );
                 ScPatternAttr aPattern( rDoc.GetPool() );
                 aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_VALIDDATA, nHandle ) );
 
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 2106ac197..12b2aff0c 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -471,7 +471,7 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb
 #ifdef ISSUE66550_HLINK_FOR_SHAPES
     if( mbSimpleMacro && ((maMacroName.Len() > 0) || (maHyperlink.getLength() > 0)) )
     {
-        if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
+        if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, sal_True ) )
         {
             pInfo->SetMacro( XclTools::GetSbMacroUrl( maMacroName, GetDocShell() ) );
             pInfo->SetHlink( maHyperlink );
@@ -479,7 +479,7 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb
     }
 #else
     if( mbSimpleMacro && (maMacroName.Len() > 0) )
-        if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
+        if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, sal_True ) )
             pInfo->SetMacro( XclTools::GetSbMacroUrl( maMacroName, GetDocShell() ) );
 #endif
 
@@ -565,9 +565,9 @@ void XclImpDrawObjBase::ConvertLineStyle( SdrObject& rSdrObj, const XclObjLineDa
         rSdrObj.SetMergedItem( XLineColorItem( EMPTY_STRING, GetPalette().GetColor( rLineData.mnColorIdx ) ) );
         rSdrObj.SetMergedItem( XLineJointItem( XLINEJOINT_MITER ) );
 
-        ULONG nDotLen = ::std::max< ULONG >( 70 * rLineData.mnWidth, 35 );
-        ULONG nDashLen = 3 * nDotLen;
-        ULONG nDist = 2 * nDotLen;
+        sal_uLong nDotLen = ::std::max< sal_uLong >( 70 * rLineData.mnWidth, 35 );
+        sal_uLong nDashLen = 3 * nDotLen;
+        sal_uLong nDist = 2 * nDotLen;
 
         switch( rLineData.mnStyle )
         {
@@ -663,7 +663,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
                 aMemStrm << sal_uInt32( pnPattern[ nIdx ] ); // 32-bit little-endian
             aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
             Bitmap aBitmap;
-            aBitmap.Read( aMemStrm, FALSE );
+            aBitmap.Read( aMemStrm, sal_False );
             XOBitmap aXOBitmap( aBitmap );
             aXOBitmap.Bitmap2Array();
             aXOBitmap.SetBitmapType( XBITMAP_8X8 );
@@ -681,7 +681,7 @@ void XclImpDrawObjBase::ConvertFrameStyle( SdrObject& rSdrObj, sal_uInt16 nFrame
 {
     if( ::get_flag( nFrameFlags, EXC_OBJ_FRAME_SHADOW ) )
     {
-        rSdrObj.SetMergedItem( SdrShadowItem( TRUE ) );
+        rSdrObj.SetMergedItem( SdrShadowItem( sal_True ) );
         rSdrObj.SetMergedItem( SdrShadowXDistItem( 35 ) );
         rSdrObj.SetMergedItem( SdrShadowYDistItem( 35 ) );
         rSdrObj.SetMergedItem( SdrShadowColorItem( EMPTY_STRING, GetPalette().GetColor( EXC_COLOR_WINDOWTEXT ) ) );
@@ -1077,13 +1077,13 @@ SdrObject* XclImpLineObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re
         {
             xSdrObj->SetMergedItem( XLineStartItem( EMPTY_STRING, aArrowPolyPoly ) );
             xSdrObj->SetMergedItem( XLineStartWidthItem( nWidth ) );
-            xSdrObj->SetMergedItem( XLineStartCenterItem( FALSE ) );
+            xSdrObj->SetMergedItem( XLineStartCenterItem( sal_False ) );
         }
         if( bLineEnd )
         {
             xSdrObj->SetMergedItem( XLineEndItem( EMPTY_STRING, aArrowPolyPoly ) );
             xSdrObj->SetMergedItem( XLineEndWidthItem( nWidth ) );
-            xSdrObj->SetMergedItem( XLineEndCenterItem( FALSE ) );
+            xSdrObj->SetMergedItem( XLineEndCenterItem( sal_False ) );
         }
     }
     rDffConv.Progress();
@@ -1368,10 +1368,10 @@ SdrObject* XclImpTextObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re
     OUString aRectType = CREATE_OUSTRING( "rectangle" );
     xSdrObj->MergeDefaultAttributes( &aRectType );
     ConvertRectStyle( *xSdrObj );
-    BOOL bAutoSize = ::get_flag( maTextData.maData.mnFlags, EXC_OBJ_TEXT_AUTOSIZE );
+    sal_Bool bAutoSize = ::get_flag( maTextData.maData.mnFlags, EXC_OBJ_TEXT_AUTOSIZE );
     xSdrObj->SetMergedItem( SdrTextAutoGrowWidthItem( bAutoSize ) );
     xSdrObj->SetMergedItem( SdrTextAutoGrowHeightItem( bAutoSize ) );
-    xSdrObj->SetMergedItem( SdrTextWordWrapItem( TRUE ) );
+    xSdrObj->SetMergedItem( SdrTextWordWrapItem( sal_True ) );
     rDffConv.Progress();
     return xSdrObj.release();
 }
@@ -3067,15 +3067,15 @@ XclImpSimpleDffConverter::~XclImpSimpleDffConverter()
 {
 }
 
-FASTBOOL XclImpSimpleDffConverter::GetColorFromPalette( USHORT nIndex, Color& rColor ) const
+FASTBOOL XclImpSimpleDffConverter::GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const
 {
     ColorData nColor = GetPalette().GetColorData( static_cast< sal_uInt16 >( nIndex ) );
 
     if( nColor == COL_AUTO )
-        return FALSE;
+        return sal_False;
 
     rColor.SetColor( nColor );
-    return TRUE;
+    return sal_True;
 }
 
 // ----------------------------------------------------------------------------
@@ -3205,7 +3205,7 @@ SdrObject* XclImpDffConverter::CreateSdrObject( const XclImpTbxObjBase& rTbxObj,
         ::com::sun::star::awt::Size aDummySize;
         Reference< XShape > xShape;
         XclImpDffConvData& rConvData = GetConvData();
-        if( rConvData.mxCtrlForm.is() && InsertControl( xFormComp, aDummySize, &xShape, TRUE ) )
+        if( rConvData.mxCtrlForm.is() && InsertControl( xFormComp, aDummySize, &xShape, sal_True ) )
         {
             xSdrObj.reset( rTbxObj.CreateSdrObjectFromShape( xShape, rAnchorRect ) );
             // try to attach a macro to the control
@@ -3241,7 +3241,7 @@ SdrObject* XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicObj,
                 mxCtlsStrm->Seek( rPicObj.GetCtlsStreamPos() );
                 // read from mxCtlsStrm into xShape, insert the control model into the form
                 Reference< XShape > xShape;
-                if( GetConvData().mxCtrlForm.is() && ReadOCXExcelKludgeStream( mxCtlsStrm, &xShape, TRUE ) )
+                if( GetConvData().mxCtrlForm.is() && ReadOCXExcelKludgeStream( mxCtlsStrm, &xShape, sal_True ) )
                     xSdrObj.reset( rPicObj.CreateSdrObjectFromShape( xShape, rAnchorRect ) );
             }
             catch( Exception& )
@@ -3405,14 +3405,14 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO
     return xSdrObj.release();
 }
 
-ULONG XclImpDffConverter::Calc_nBLIPPos( ULONG /*nOrgVal*/, ULONG nStreamPos ) const
+sal_uLong XclImpDffConverter::Calc_nBLIPPos( sal_uLong /*nOrgVal*/, sal_uLong nStreamPos ) const
 {
     return nStreamPos + 4;
 }
 
 sal_Bool XclImpDffConverter::InsertControl( const Reference< XFormComponent >& rxFormComp,
         const ::com::sun::star::awt::Size& /*rSize*/, Reference< XShape >* pxShape,
-        BOOL /*bFloatingCtrl*/ )
+        sal_Bool /*bFloatingCtrl*/ )
 {
     if( GetDocShell() ) try
     {
@@ -3832,7 +3832,7 @@ void XclImpDrawing::ReadBmp( Graphic& rGraphic, const XclImpRoot& rRoot, XclImpS
     // import the graphic from memory stream
     aMemStrm.Seek( STREAM_SEEK_TO_BEGIN );
     Bitmap aBitmap;
-    if( aBitmap.Read( aMemStrm, FALSE ) )   // read DIB without file header
+    if( aBitmap.Read( aMemStrm, sal_False ) )   // read DIB without file header
         rGraphic = aBitmap;
 }
 
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index ad04a1f39..d1793fc00 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -837,7 +837,7 @@ XclImpCachedValue::~XclImpCachedValue()
 {
 }
 
-USHORT XclImpCachedValue::GetScError() const
+sal_uInt16 XclImpCachedValue::GetScError() const
 {
     return (mnType == EXC_CACHEDVAL_ERROR) ? XclTools::GetScErrorCode( mnBoolErr ) : 0;
 }
@@ -877,7 +877,7 @@ ScMatrixRef XclImpCachedMatrix::CreateScMatrix() const
 {
     ScMatrixRef xScMatrix;
     DBG_ASSERT( mnScCols * mnScRows == maValueList.Count(), "XclImpCachedMatrix::CreateScMatrix - element count mismatch" );
-    if( mnScCols && mnScRows && static_cast< ULONG >( mnScCols * mnScRows ) <= maValueList.Count() )
+    if( mnScCols && mnScRows && static_cast< sal_uLong >( mnScCols * mnScRows ) <= maValueList.Count() )
     {
         xScMatrix = new ScMatrix( mnScCols, mnScRows );
         const XclImpCachedValue* pValue = maValueList.First();
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 9cef1f96d..47308499a 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -143,7 +143,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
     // find an unused name
     String aOrigName( maScName );
     sal_Int32 nCounter = 0;
-    USHORT nDummy;
+    sal_uInt16 nDummy;
     while( rRangeNames.SearchName( maScName, nDummy ) )
         maScName.Assign( aOrigName ).Append( ' ' ).Append( String::CreateFromInt32( ++nCounter ) );
 
@@ -232,7 +232,7 @@ XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
 
 void XclImpNameManager::ReadName( XclImpStream& rStrm )
 {
-    ULONG nCount = maNameList.Count();
+    sal_uLong nCount = maNameList.Count();
     if( nCount < 0xFFFF )
         maNameList.Append( new XclImpName( rStrm, static_cast< sal_uInt16 >( nCount + 1 ) ) );
 }
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index df39312ba..f93aa2cef 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -966,7 +966,7 @@ void XclImpPTField::ConvertRowColField( ScDPSaveData& rSaveData ) const
     DBG_ASSERT( maFieldInfo.mnAxes & EXC_SXVD_AXIS_ROWCOL, "XclImpPTField::ConvertRowColField - no row/column field" );
     // special data orientation field?
     if( maFieldInfo.mnCacheIdx == EXC_SXIVD_DATA )
-        rSaveData.GetDataLayoutDimension()->SetOrientation( static_cast< USHORT >( maFieldInfo.GetApiOrient( EXC_SXVD_AXIS_ROWCOL ) ) );
+        rSaveData.GetDataLayoutDimension()->SetOrientation( static_cast< sal_uInt16 >( maFieldInfo.GetApiOrient( EXC_SXVD_AXIS_ROWCOL ) ) );
     else
         ConvertRCPField( rSaveData );
 }
@@ -1067,7 +1067,7 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con
     ScDPSaveDimension& rSaveDim = *rSaveData.GetNewDimensionByName( rFieldName );
 
     // orientation
-    rSaveDim.SetOrientation( static_cast< USHORT >( maFieldInfo.GetApiOrient( EXC_SXVD_AXIS_ROWCOLPAGE ) ) );
+    rSaveDim.SetOrientation( static_cast< sal_uInt16 >( maFieldInfo.GetApiOrient( EXC_SXVD_AXIS_ROWCOLPAGE ) ) );
 
     // general field info
     ConvertFieldInfo( rSaveDim );
@@ -1141,7 +1141,7 @@ void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const Xcl
             rSaveDim.SetLayoutName( *pVisName );
 
     // aggregation function
-    rSaveDim.SetFunction( static_cast< USHORT >( rDataInfo.GetApiAggFunc() ) );
+    rSaveDim.SetFunction( static_cast< sal_uInt16 >( rDataInfo.GetApiAggFunc() ) );
 
     // result field reference
     sal_Int32 nRefType = rDataInfo.GetApiRefType();
@@ -1354,7 +1354,7 @@ void XclImpPivotTable::Convert()
 
     aSaveData.SetRowGrand( ::get_flag( maPTInfo.mnFlags, EXC_SXVIEW_ROWGRAND ) );
     aSaveData.SetColumnGrand( ::get_flag( maPTInfo.mnFlags, EXC_SXVIEW_COLGRAND ) );
-    aSaveData.SetFilterButton( FALSE );
+    aSaveData.SetFilterButton( sal_False );
     aSaveData.SetDrillDown( ::get_flag( maPTExtInfo.mnFlags, EXC_SXEX_DRILLDOWN ) );
 
     // *** fields ***
@@ -1417,7 +1417,7 @@ void XclImpPivotTable::Convert()
     pDPObj->SetSaveData( aSaveData );
     pDPObj->SetSheetDesc( aDesc );
     pDPObj->SetOutRange( aOutRange );
-    pDPObj->SetAlive( TRUE );
+    pDPObj->SetAlive( sal_True );
     pDPObj->SetHeaderLayout( maPTViewEx9Info.mnGridLayout == 0 );
 
     GetDoc().GetDPCollection()->InsertNewTable(pDPObj);
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index d72d90099..fbaf4aca8 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -610,7 +610,7 @@ void XclImpNumFmtBuffer::CreateScFormats()
     }
 }
 
-ULONG XclImpNumFmtBuffer::GetScFormat( sal_uInt16 nXclNumFmt ) const
+sal_uLong XclImpNumFmtBuffer::GetScFormat( sal_uInt16 nXclNumFmt ) const
 {
     XclImpIndexMap::const_iterator aIt = maIndexMap.find( nXclNumFmt );
     return (aIt != maIndexMap.end()) ? aIt->second : NUMBERFORMAT_ENTRY_NOT_FOUND;
@@ -618,17 +618,17 @@ ULONG XclImpNumFmtBuffer::GetScFormat( sal_uInt16 nXclNumFmt ) const
 
 void XclImpNumFmtBuffer::FillToItemSet( SfxItemSet& rItemSet, sal_uInt16 nXclNumFmt, bool bSkipPoolDefs ) const
 {
-    ULONG nScNumFmt = GetScFormat( nXclNumFmt );
+    sal_uLong nScNumFmt = GetScFormat( nXclNumFmt );
     if( nScNumFmt == NUMBERFORMAT_ENTRY_NOT_FOUND )
         nScNumFmt = GetStdScNumFmt();
     FillScFmtToItemSet( rItemSet, nScNumFmt, bSkipPoolDefs );
 }
 
-void XclImpNumFmtBuffer::FillScFmtToItemSet( SfxItemSet& rItemSet, ULONG nScNumFmt, bool bSkipPoolDefs ) const
+void XclImpNumFmtBuffer::FillScFmtToItemSet( SfxItemSet& rItemSet, sal_uLong nScNumFmt, bool bSkipPoolDefs ) const
 {
     DBG_ASSERT( nScNumFmt != NUMBERFORMAT_ENTRY_NOT_FOUND, "XclImpNumFmtBuffer::FillScFmtToItemSet - invalid number format" );
     ScfTools::PutItem( rItemSet, SfxUInt32Item( ATTR_VALUE_FORMAT, nScNumFmt ), bSkipPoolDefs );
-    if( rItemSet.GetItemState( ATTR_VALUE_FORMAT, FALSE ) == SFX_ITEM_SET )
+    if( rItemSet.GetItemState( ATTR_VALUE_FORMAT, sal_False ) == SFX_ITEM_SET )
         ScGlobal::AddLanguage( rItemSet, GetFormatter() );
 }
 
@@ -1196,7 +1196,7 @@ const ScPatternAttr& XclImpXF::CreatePattern( bool bSkipPoolDefs )
 
 void XclImpXF::ApplyPattern(
         SCCOL nScCol1, SCROW nScRow1, SCCOL nScCol2, SCROW nScRow2,
-        SCTAB nScTab, ULONG nForceScNumFmt )
+        SCTAB nScTab, sal_uLong nForceScNumFmt )
 {
     // force creation of cell style and hard formatting, do it here to have mpStyleSheet
     const ScPatternAttr& rPattern = CreatePattern();
@@ -1466,7 +1466,7 @@ void XclImpXFBuffer::ApplyPattern(
     if( XclImpXF* pXF = GetXF( rXFIndex.GetXFIndex() ) )
     {
         // #108770# set 'Standard' number format for all Boolean cells
-        ULONG nForceScNumFmt = rXFIndex.IsBoolCell() ? GetNumFmtBuffer().GetStdScNumFmt() : NUMBERFORMAT_ENTRY_NOT_FOUND;
+        sal_uLong nForceScNumFmt = rXFIndex.IsBoolCell() ? GetNumFmtBuffer().GetStdScNumFmt() : NUMBERFORMAT_ENTRY_NOT_FOUND;
         pXF->ApplyPattern( nScCol1, nScRow1, nScCol2, nScRow2, nScTab, nForceScNumFmt );
     }
 }
@@ -1523,7 +1523,7 @@ void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex )
 {
     XclImpXFRange* pPrevRange;
     XclImpXFRange* pNextRange;
-    ULONG nNextIndex;
+    sal_uLong nNextIndex;
 
     Find( pPrevRange, pNextRange, nNextIndex, nScRow );
 
@@ -1538,7 +1538,7 @@ void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex )
 
             SCROW nFirstScRow = pPrevRange->mnScRow1;
             SCROW nLastScRow = pPrevRange->mnScRow2;
-            ULONG nIndex = nNextIndex - 1;
+            sal_uLong nIndex = nNextIndex - 1;
             XclImpXFRange* pThisRange = pPrevRange;
             pPrevRange = nIndex ? maIndexList.GetObject( nIndex - 1 ) : 0;
 
@@ -1587,7 +1587,7 @@ void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex )
 
 void XclImpXFRangeColumn::Find(
         XclImpXFRange*& rpPrevRange, XclImpXFRange*& rpNextRange,
-        ULONG& rnNextIndex, SCROW nScRow ) const
+        sal_uLong& rnNextIndex, SCROW nScRow ) const
 {
 
     // test whether list is empty
@@ -1623,8 +1623,8 @@ void XclImpXFRangeColumn::Find(
     // loop: find range entries before and after new row
     // break the loop if there is no more range between first and last -or-
     // if rpPrevRange contains nScRow (rpNextRange will never contain nScRow)
-    ULONG nPrevIndex = 0;
-    ULONG nMidIndex;
+    sal_uLong nPrevIndex = 0;
+    sal_uLong nMidIndex;
     rnNextIndex = maIndexList.Count() - 1;
     XclImpXFRange* pMidRange;
     while( ((rnNextIndex - nPrevIndex) > 1) && (rpPrevRange->mnScRow2 < nScRow) )
@@ -1652,7 +1652,7 @@ void XclImpXFRangeColumn::Find(
     }
 }
 
-void XclImpXFRangeColumn::TryConcatPrev( ULONG nIndex )
+void XclImpXFRangeColumn::TryConcatPrev( sal_uLong nIndex )
 {
     if( !nIndex )
         return;
@@ -1748,7 +1748,7 @@ void XclImpXFRangeBuffer::SetColumnDefXF( SCCOL nScCol, sal_uInt16 nXFIndex )
     maColumns[ nIndex ]->SetDefaultXF( XclImpXFIndex( nXFIndex ) );
 }
 
-void XclImpXFRangeBuffer::SetBorderLine( const ScRange& rRange, SCTAB nScTab, USHORT nLine )
+void XclImpXFRangeBuffer::SetBorderLine( const ScRange& rRange, SCTAB nScTab, sal_uInt16 nLine )
 {
     SCCOL nFromScCol = (nLine == BOX_LINE_RIGHT) ? rRange.aEnd.Col() : rRange.aStart.Col();
     SCROW nFromScRow = (nLine == BOX_LINE_BOTTOM) ? rRange.aEnd.Row() : rRange.aStart.Row();
diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx
index bd47a0222..636c619a5 100644
--- a/sc/source/filter/excel/xiview.cxx
+++ b/sc/source/filter/excel/xiview.cxx
@@ -226,8 +226,8 @@ void XclImpTabViewSettings::Finalize()
 
     // sheet flags
     if( maData.mbMirrored )
-        // do not call this function with FALSE, it would mirror away all drawing objects
-        rDoc.SetLayoutRTL( nScTab, TRUE );
+        // do not call this function with sal_False, it would mirror away all drawing objects
+        rDoc.SetLayoutRTL( nScTab, sal_True );
     rTabSett.mbSelected = maData.mbSelected || bDisplayed;
 
     // first visible cell in top-left pane and in additional pane(s)
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index ead167999..eaedd858d 100755
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -329,6 +329,24 @@ XclChLabelRange::XclChLabelRange() :
 
 // ----------------------------------------------------------------------------
 
+XclChDateRange::XclChDateRange() :
+    mnMinDate( 0 ),
+    mnMaxDate( 0 ),
+    mnMajorStep( 0 ),
+    mnMajorUnit( EXC_CHDATERANGE_DAYS ),
+    mnMinorStep( 0 ),
+    mnMinorUnit( EXC_CHDATERANGE_DAYS ),
+    mnBaseUnit( EXC_CHDATERANGE_DAYS ),
+    mnCross( 0 ),
+    mnFlags( EXC_CHDATERANGE_AUTOMIN | EXC_CHDATERANGE_AUTOMAX |
+        EXC_CHDATERANGE_AUTOMAJOR | EXC_CHDATERANGE_AUTOMINOR |
+        EXC_CHDATERANGE_AUTOBASE | EXC_CHDATERANGE_AUTOCROSS |
+        EXC_CHDATERANGE_AUTODATE )
+{
+}
+
+// ----------------------------------------------------------------------------
+
 XclChValueRange::XclChValueRange() :
     mfMin( 0.0 ),
     mfMax( 0.0 ),
@@ -336,7 +354,8 @@ XclChValueRange::XclChValueRange() :
     mfMinorStep( 0.0 ),
     mfCross( 0.0 ),
     mnFlags( EXC_CHVALUERANGE_AUTOMIN | EXC_CHVALUERANGE_AUTOMAX |
-        EXC_CHVALUERANGE_AUTOMAJOR | EXC_CHVALUERANGE_AUTOMINOR | EXC_CHVALUERANGE_AUTOCROSS | EXC_CHVALUERANGE_BIT8 )
+        EXC_CHVALUERANGE_AUTOMAJOR | EXC_CHVALUERANGE_AUTOMINOR |
+        EXC_CHVALUERANGE_AUTOCROSS | EXC_CHVALUERANGE_BIT8 )
 {
 }
 
@@ -1055,17 +1074,17 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
 {
     if( rEscherFmt.mxItemSet.is() )
     {
-        if( const XFillStyleItem* pStyleItem = static_cast< const XFillStyleItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLSTYLE, FALSE ) ) )
+        if( const XFillStyleItem* pStyleItem = static_cast< const XFillStyleItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLSTYLE, sal_False ) ) )
         {
             switch( pStyleItem->GetValue() )
             {
                 case XFILL_SOLID:
                     // #i84812# Excel 2007 writes Escher properties for solid fill
-                    if( const XFillColorItem* pColorItem = static_cast< const XFillColorItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLCOLOR, FALSE ) ) )
+                    if( const XFillColorItem* pColorItem = static_cast< const XFillColorItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLCOLOR, sal_False ) ) )
                     {
                         namespace cssd = ::com::sun::star::drawing;
                         // get solid transparence too
-                        const XFillTransparenceItem* pTranspItem = static_cast< const XFillTransparenceItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLTRANSPARENCE, FALSE ) );
+                        const XFillTransparenceItem* pTranspItem = static_cast< const XFillTransparenceItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLTRANSPARENCE, sal_False ) );
                         sal_uInt16 nTransp = pTranspItem ? pTranspItem->GetValue() : 0;
                         ScfPropSetHelper& rAreaHlp = GetAreaHelper( ePropMode );
                         rAreaHlp.InitializeWrite();
@@ -1074,7 +1093,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
                     }
                 break;
                 case XFILL_GRADIENT:
-                    if( const XFillGradientItem* pGradItem = static_cast< const XFillGradientItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLGRADIENT, FALSE ) ) )
+                    if( const XFillGradientItem* pGradItem = static_cast< const XFillGradientItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLGRADIENT, sal_False ) ) )
                     {
                         Any aGradientAny;
                         if( pGradItem->QueryValue( aGradientAny, MID_FILLGRADIENT ) )
@@ -1092,7 +1111,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
                     }
                 break;
                 case XFILL_BITMAP:
-                    if( const XFillBitmapItem* pBmpItem = static_cast< const XFillBitmapItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLBITMAP, FALSE ) ) )
+                    if( const XFillBitmapItem* pBmpItem = static_cast< const XFillBitmapItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLBITMAP, sal_False ) ) )
                     {
                         Any aBitmapAny;
                         if( pBmpItem->QueryValue( aBitmapAny, MID_GRAFURL ) )
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index fb55a9e67..ba6c313a8 100755
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -600,7 +600,7 @@ void XclTokenArrayIterator::Init()
 
 void XclTokenArrayIterator::Init( const ScTokenArray& rScTokArr, bool bSkipSpaces )
 {
-    USHORT nTokArrLen = rScTokArr.GetLen();
+    sal_uInt16 nTokArrLen = rScTokArr.GetLen();
     mppScTokenBeg = static_cast< const FormulaToken* const* >( nTokArrLen ? rScTokArr.GetArray() : 0 );
     mppScTokenEnd = mppScTokenBeg ? (mppScTokenBeg + nTokArrLen) : 0;
     mppScToken = (mppScTokenBeg != mppScTokenEnd) ? mppScTokenBeg : 0;
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 7ad19b9a3..c8d01bc01 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -326,6 +326,12 @@ DateTime XclRoot::GetNullDate() const
     return *GetFormatter().GetNullDate();
 }
 
+sal_uInt16 XclRoot::GetBaseYear() const
+{
+    // return 1904 for 1904-01-01, and 1900 for 1899-12-30
+    return (GetNullDate().GetYear() == 1904) ? 1904 : 1900;
+}
+
 double XclRoot::GetDoubleFromDateTime( const DateTime& rDateTime ) const
 {
     double fValue = rDateTime - GetNullDate();
@@ -352,8 +358,8 @@ ScEditEngineDefaulter& XclRoot::GetEditEngine() const
         ScEditEngineDefaulter& rEE = *mrData.mxEditEngine;
         rEE.SetRefMapMode( MAP_100TH_MM );
         rEE.SetEditTextObjectPool( GetDoc().GetEditPool() );
-        rEE.SetUpdateMode( FALSE );
-        rEE.EnableUndo( FALSE );
+        rEE.SetUpdateMode( sal_False );
+        rEE.EnableUndo( sal_False );
         rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS );
     }
     return *mrData.mxEditEngine;
@@ -363,11 +369,11 @@ ScHeaderEditEngine& XclRoot::GetHFEditEngine() const
 {
     if( !mrData.mxHFEditEngine.get() )
     {
-        mrData.mxHFEditEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool(), TRUE ) );
+        mrData.mxHFEditEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True ) );
         ScHeaderEditEngine& rEE = *mrData.mxHFEditEngine;
         rEE.SetRefMapMode( MAP_TWIP );  // headers/footers use twips as default metric
-        rEE.SetUpdateMode( FALSE );
-        rEE.EnableUndo( FALSE );
+        rEE.SetUpdateMode( sal_False );
+        rEE.EnableUndo( sal_False );
         rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS );
 
         // set Calc header/footer defaults
@@ -390,8 +396,8 @@ EditEngine& XclRoot::GetDrawEditEngine() const
         mrData.mxDrawEditEng.reset( new EditEngine( &GetDoc().GetDrawLayer()->GetItemPool() ) );
         EditEngine& rEE = *mrData.mxDrawEditEng;
         rEE.SetRefMapMode( MAP_100TH_MM );
-        rEE.SetUpdateMode( FALSE );
-        rEE.EnableUndo( FALSE );
+        rEE.SetUpdateMode( sal_False );
+        rEE.EnableUndo( sal_False );
         rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS );
     }
     return *mrData.mxDrawEditEng;
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index e1e41082d..798119cb5 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -215,7 +215,7 @@ sal_uInt8 XclTools::GetXclOrientFromRot( sal_uInt16 nXclRot )
     return EXC_ORIENT_NONE;
 }
 
-sal_uInt8 XclTools::GetXclErrorCode( USHORT nScError )
+sal_uInt8 XclTools::GetXclErrorCode( sal_uInt16 nScError )
 {
     using namespace ScErrorCodes;
     switch( nScError )
@@ -240,7 +240,7 @@ sal_uInt8 XclTools::GetXclErrorCode( USHORT nScError )
     return EXC_ERR_NA;
 }
 
-USHORT XclTools::GetScErrorCode( sal_uInt8 nXclError )
+sal_uInt16 XclTools::GetScErrorCode( sal_uInt8 nXclError )
 {
     using namespace ScErrorCodes;
     switch( nXclError )
@@ -328,13 +328,13 @@ sal_Int32 XclTools::GetHmmFromTwips( sal_Int32 nTwips )
     return GetHmmFromInch( GetInchFromTwips( nTwips ) );
 }
 
-USHORT XclTools::GetScColumnWidth( sal_uInt16 nXclWidth, long nScCharWidth )
+sal_uInt16 XclTools::GetScColumnWidth( sal_uInt16 nXclWidth, long nScCharWidth )
 {
     double fScWidth = static_cast< double >( nXclWidth ) / 256.0 * nScCharWidth + 0.5;
-    return limit_cast< USHORT >( fScWidth );
+    return limit_cast< sal_uInt16 >( fScWidth );
 }
 
-sal_uInt16 XclTools::GetXclColumnWidth( USHORT nScWidth, long nScCharWidth )
+sal_uInt16 XclTools::GetXclColumnWidth( sal_uInt16 nScWidth, long nScCharWidth )
 {
     double fXclWidth = static_cast< double >( nScWidth ) * 256.0 / nScCharWidth + 0.5;
     return limit_cast< sal_uInt16 >( fXclWidth );
diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index 643f3b186..d0916ac14 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -52,7 +52,7 @@ ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, const String& rText )
     Init( pDocShell );
 }
 
-ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, USHORT nResId ) :
+ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId ) :
     maText( ScGlobal::GetRscString( nResId ) )
 {
     Init( pDocShell );
@@ -101,7 +101,7 @@ void ScfProgressBar::SetCurrSegment( ScfProgressSegment* pSegment )
         {
             // System progress has an internal limit of ULONG_MAX/100.
             mnSysProgressScale = 1;
-            ULONG nSysTotalSize = static_cast< ULONG >( mnTotalSize );
+            sal_uLong nSysTotalSize = static_cast< sal_uLong >( mnTotalSize );
             while( nSysTotalSize >= ULONG_MAX / 100 )
             {
                 nSysTotalSize /= 2;
@@ -137,7 +137,7 @@ void ScfProgressBar::IncreaseProgressBar( sal_Size nDelta )
         if( nNewPos >= mnNextUnitPos )
         {
             mnNextUnitPos = nNewPos + mnUnitSize;
-            mxSysProgress->SetState( static_cast< ULONG >( nNewPos / mnSysProgressScale ) );
+            mxSysProgress->SetState( static_cast< sal_uLong >( nNewPos / mnSysProgressScale ) );
         }
     }
     else
@@ -213,7 +213,7 @@ ScfSimpleProgressBar::ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDoc
     Init( nSize );
 }
 
-ScfSimpleProgressBar::ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, USHORT nResId ) :
+ScfSimpleProgressBar::ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ) :
     maProgress( pDocShell, nResId )
 {
     Init( nSize );
@@ -234,7 +234,7 @@ void ScfSimpleProgressBar::Init( sal_Size nSize )
 //UNUSED2008-05      Init( pDocShell, rText );
 //UNUSED2008-05  }
 
-ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, USHORT nResId ) :
+ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, sal_uInt16 nResId ) :
     mrStrm( rStrm )
 {
     Init( pDocShell, ScGlobal::GetRscString( nResId ) );
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 8f0d26f7e..d82169bf2 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -206,15 +206,15 @@ SotStorageStreamRef ScfTools::OpenStorageStreamWrite( SotStorageRef xStrg, const
 
 // *** item handling *** ------------------------------------------------------
 
-bool ScfTools::CheckItem( const SfxItemSet& rItemSet, USHORT nWhichId, bool bDeep )
+bool ScfTools::CheckItem( const SfxItemSet& rItemSet, sal_uInt16 nWhichId, bool bDeep )
 {
     return rItemSet.GetItemState( nWhichId, bDeep ) == SFX_ITEM_SET;
 }
 
-bool ScfTools::CheckItems( const SfxItemSet& rItemSet, const USHORT* pnWhichIds, bool bDeep )
+bool ScfTools::CheckItems( const SfxItemSet& rItemSet, const sal_uInt16* pnWhichIds, bool bDeep )
 {
     DBG_ASSERT( pnWhichIds, "ScfTools::CheckItems - no which id list" );
-    for( const USHORT* pnWhichId = pnWhichIds; *pnWhichId != 0; ++pnWhichId )
+    for( const sal_uInt16* pnWhichId = pnWhichIds; *pnWhichId != 0; ++pnWhichId )
         if( CheckItem( rItemSet, *pnWhichId, bDeep ) )
             return true;
     return false;
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index d5f0d3cd1..5aa1bb0e0 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -108,20 +108,20 @@ const static sal_Char __FAR_DATA sMyEndComment[]	= " -->";
 const static sal_Char __FAR_DATA sFontFamily[]		= "font-family:";
 const static sal_Char __FAR_DATA sFontSize[]		= "font-size:";
 
-const USHORT __FAR_DATA ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] =
+const sal_uInt16 __FAR_DATA ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] =
 {
     HTMLFONTSZ1_DFLT, HTMLFONTSZ2_DFLT, HTMLFONTSZ3_DFLT, HTMLFONTSZ4_DFLT,
     HTMLFONTSZ5_DFLT, HTMLFONTSZ6_DFLT, HTMLFONTSZ7_DFLT
 };
 
-USHORT ScHTMLExport::nFontSize[SC_HTML_FONTSIZES] = { 0 };
+sal_uInt16 ScHTMLExport::nFontSize[SC_HTML_FONTSIZES] = { 0 };
 
 const char* __FAR_DATA ScHTMLExport::pFontSizeCss[SC_HTML_FONTSIZES] =
 {
     "xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"
 };
 
-const USHORT ScHTMLExport::nCellSpacing = 0;
+const sal_uInt16 ScHTMLExport::nCellSpacing = 0;
 const sal_Char __FAR_DATA ScHTMLExport::sIndentSource[nIndentMax+1] =
     "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
 
@@ -131,7 +131,7 @@ const sal_Char __FAR_DATA ScHTMLExport::sIndentSource[nIndentMax+1] =
 #define OUT_PROLOGUE()		(rStrm << sHTML30_Prologue << ScExportBase::sNewLine \
                                 << ScExportBase::sNewLine)
 #define TAG_ON( tag )		HTMLOutFuncs::Out_AsciiTag( rStrm, tag )
-#define TAG_OFF( tag )		HTMLOutFuncs::Out_AsciiTag( rStrm, tag, FALSE )
+#define TAG_OFF( tag )		HTMLOutFuncs::Out_AsciiTag( rStrm, tag, sal_False )
 #define OUT_STR( str )      HTMLOutFuncs::Out_String( rStrm, str, eDestEnc, &aNonConvertibleChars )
 #define OUT_STR_NO_CONV( str )  HTMLOutFuncs::Out_String( rStrm, str, eDestEnc )
 #define OUT_LF()			rStrm << ScExportBase::sNewLine << GetIndentStr()
@@ -155,7 +155,7 @@ const sal_Char __FAR_DATA ScHTMLExport::sIndentSource[nIndentMax+1] =
 //========================================================================
 
 FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const String& rBaseURL, ScDocument* pDoc,
-        const ScRange& rRange, const CharSet /*eNach*/, BOOL bAll,
+        const ScRange& rRange, const CharSet /*eNach*/, sal_Bool bAll,
         const String& rStreamPath, String& rNonConvertibleChars )
 {
     ScHTMLExport aEx( rStrm, rBaseURL, pDoc, rRange, bAll, rStreamPath );
@@ -236,7 +236,7 @@ void lcl_AppendHTMLColorTripel( ByteString& rStr, const Color& rColor )
 
 ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const String& rBaseURL, ScDocument* pDocP,
                             const ScRange& rRangeP,
-                            BOOL bAllP, const String& rStreamPathP ) :
+                            sal_Bool bAllP, const String& rStreamPathP ) :
     ScExportBase( rStrmP, pDocP, rRangeP ),
     aBaseURL( rBaseURL ),
     aStreamPath( rStreamPathP ),
@@ -246,10 +246,10 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const String& rBaseURL, ScDocument
     nUsedTables( 0 ),
     nIndent( 0 ),
     bAll( bAllP ),
-    bTabHasGraphics( FALSE ),
+    bTabHasGraphics( sal_False ),
     bCalcAsShown( pDocP->GetDocOptions().IsCalcAsShown() ),
-    bTableDataWidth( TRUE ),
-    bTableDataHeight( TRUE )
+    bTableDataWidth( sal_True ),
+    bTableDataHeight( sal_True )
 {
     strcpy( sIndent, sIndentSource );       // #100211# - checked
     sIndent[0] = 0;
@@ -258,9 +258,9 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const String& rBaseURL, ScDocument
     SvxHtmlOptions* pHtmlOptions = SvxHtmlOptions::Get();
     eDestEnc = (pDoc->IsClipOrUndo() ? RTL_TEXTENCODING_UTF8 : pHtmlOptions->GetTextEncoding());
     bCopyLocalFileToINet = pHtmlOptions->IsSaveGraphicsLocal();
-    for ( USHORT j=0; j < SC_HTML_FONTSIZES; j++ )
+    for ( sal_uInt16 j=0; j < SC_HTML_FONTSIZES; j++ )
     {
-        USHORT nSize = pHtmlOptions->GetFontSize( j );
+        sal_uInt16 nSize = pHtmlOptions->GetFontSize( j );
         // remember in Twips, like our SvxFontHeightItem
         if ( nSize )
             nFontSize[j] = nSize * 20;
@@ -298,10 +298,10 @@ ScHTMLExport::~ScHTMLExport()
 }
 
 
-USHORT ScHTMLExport::GetFontSizeNumber( USHORT nHeight )
+sal_uInt16 ScHTMLExport::GetFontSizeNumber( sal_uInt16 nHeight )
 {
-    USHORT nSize = 1;
-    for ( USHORT j=SC_HTML_FONTSIZES-1; j>0; j-- )
+    sal_uInt16 nSize = 1;
+    for ( sal_uInt16 j=SC_HTML_FONTSIZES-1; j>0; j-- )
     {
         if( nHeight > (nFontSize[j] + nFontSize[j-1]) / 2 )
         {	// der naechstgelegene
@@ -312,18 +312,18 @@ USHORT ScHTMLExport::GetFontSizeNumber( USHORT nHeight )
     return nSize;
 }
 
-const char* ScHTMLExport::GetFontSizeCss( USHORT nHeight )
+const char* ScHTMLExport::GetFontSizeCss( sal_uInt16 nHeight )
 {
-    USHORT nSize = GetFontSizeNumber( nHeight );
+    sal_uInt16 nSize = GetFontSizeNumber( nHeight );
     return pFontSizeCss[ nSize-1 ];
 }
 
 
-USHORT ScHTMLExport::ToPixel( USHORT nVal )
+sal_uInt16 ScHTMLExport::ToPixel( sal_uInt16 nVal )
 {
     if( nVal )
     {
-        nVal = (USHORT)pAppWin->LogicToPixel(
+        nVal = (sal_uInt16)pAppWin->LogicToPixel(
                     Size( nVal, nVal ), MapMode( MAP_TWIP ) ).Width();
         if( !nVal )		// wo ein Twip ist sollte auch ein Pixel sein
             nVal = 1;
@@ -345,7 +345,7 @@ Size ScHTMLExport::MMToPixel( const Size& rSize )
 }
 
 
-ULONG ScHTMLExport::Write()
+sal_uLong ScHTMLExport::Write()
 {
     rStrm << '<' << OOO_STRING_SVTOOLS_HTML_doctype << ' ' << OOO_STRING_SVTOOLS_HTML_doctype32 << '>'
         << sNewLine << sNewLine;
@@ -422,7 +422,7 @@ void ScHTMLExport::WriteHeader()
         }
     }
     rStrm << "; " << sFontSize
-        << GetFontSizeCss( ( USHORT ) aHTMLStyle.nFontHeight ) << " }";
+        << GetFontSizeCss( ( sal_uInt16 ) aHTMLStyle.nFontHeight ) << " }";
     OUT_LF();
     rStrm << sMyEndComment;
     IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_style );
@@ -492,7 +492,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
                         ScGlobal::GetScriptedWhichID(
                             aHTMLStyle.nDefaultScriptType, ATTR_FONT_HEIGHT
                             )))).GetHeight();
-        aHTMLStyle.nFontSizeNumber = GetFontSizeNumber( static_cast< USHORT >( aHTMLStyle.nFontHeight ) );
+        aHTMLStyle.nFontSizeNumber = GetFontSizeNumber( static_cast< sal_uInt16 >( aHTMLStyle.nFontHeight ) );
     }
 
     // Page style sheet printer settings, e.g. for background graphics.
@@ -507,7 +507,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
     {
         const SvxBrushItem* pBrushItem = (const SvxBrushItem*)&rSet.Get( ATTR_BACKGROUND );
         aHTMLStyle.aBackgroundColor = pBrushItem->GetColor();
-        aHTMLStyle.bInitialized = TRUE;
+        aHTMLStyle.bInitialized = sal_True;
     }
     return rSet;
 }
@@ -561,7 +561,7 @@ void ScHTMLExport::WriteBody()
             {
                 // Grafik als (JPG-)File speichern
                 aGrfNm = aStreamPath;
-                USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm,
+                sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm,
                     CREATE_STRING( "JPG" ), XOUTBMP_USE_NATIVE_IF_POSSIBLE );
                 if( !nErr )		// fehlerhaft, da ist nichts auszugeben
                 {
@@ -701,7 +701,7 @@ void ScHTMLExport::WriteTables()
         // FRAME=VOID, we do the styling of the cells in <TD>
         (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_frame) += '=') += OOO_STRING_SVTOOLS_HTML_TF_void;
 
-        bTabHasGraphics = bTabAlignedLeft = FALSE;
+        bTabHasGraphics = bTabAlignedLeft = sal_False;
         if ( bAll && pDrawLayer )
             PrepareGraphics( pDrawLayer, nTab, nStartCol, nStartRow,
                 nEndCol, nEndRow );
@@ -753,7 +753,7 @@ void ScHTMLExport::WriteTables()
         IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tbody );
         // At least old (3.x, 4.x?) Netscape doesn't follow <TABLE COLS=n> and
         // <COL WIDTH=x> specified, but needs a width at every column.
-        bTableDataWidth = TRUE;     // widths in first row
+        bTableDataWidth = sal_True;     // widths in first row
         bool bHasHiddenRows = pDoc->HasHiddenRows(nStartRow, nEndRow, nTab);
         for ( SCROW nRow=nStartRow; nRow<=nEndRow; nRow++ )
         {
@@ -765,7 +765,7 @@ void ScHTMLExport::WriteTables()
             }
 
             IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tablerow );
-            bTableDataHeight = TRUE;  // height at every first cell of each row
+            bTableDataHeight = sal_True;  // height at every first cell of each row
             for ( SCCOL nCol2=nStartCol; nCol2<=nEndCol; nCol2++ )
             {
                 if ( pDoc->ColHidden(nCol2, nTab) )
@@ -774,9 +774,9 @@ void ScHTMLExport::WriteTables()
                 if ( nCol2 == nEndCol )
                     IncIndent(-1);
                 WriteCell( nCol2, nRow, nTab );
-                bTableDataHeight = FALSE;
+                bTableDataHeight = sal_False;
             }
-            bTableDataWidth = FALSE;    // widths only in first row
+            bTableDataWidth = sal_False;    // widths only in first row
 
             if ( nRow == nEndRow )
                 IncIndent(-1);
@@ -837,9 +837,9 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     }
 
     ScBaseCell* pCell = pDoc->GetCell( aPos );
-    ULONG nFormat = pAttr->GetNumberFormat( pFormatter );
-    BOOL bValueData;
-    BYTE nScriptType;
+    sal_uLong nFormat = pAttr->GetNumberFormat( pFormatter );
+    sal_Bool bValueData;
+    sal_uInt8 nScriptType;
     if ( pCell )
     {
         bValueData = pCell->HasValueData();
@@ -847,7 +847,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     }
     else
     {
-        bValueData = FALSE;
+        bValueData = sal_False;
         nScriptType = 0;
     }
     if ( nScriptType == 0 )
@@ -872,15 +872,15 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     }
 
     const sal_Char* pChar;
-    USHORT nWidthPixel;
-    USHORT nHeightPixel;
+    sal_uInt16 nWidthPixel;
+    sal_uInt16 nHeightPixel;
 
     const ScMergeAttr& rMergeAttr = (const ScMergeAttr&) pAttr->GetItem( ATTR_MERGE, pCondItemSet );
     if ( pGraphEntry || rMergeAttr.IsMerged() )
     {
         SCCOL nC, jC;
         SCROW nR;
-        ULONG v;
+        sal_uLong v;
         if ( pGraphEntry )
             nC = Max( SCCOL(pGraphEntry->aRange.aEnd.Col() - nCol + 1),
                 SCCOL(rMergeAttr.GetColMerge()) );
@@ -892,7 +892,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
             nC = nC + nCol;
             for ( jC=nCol, v=0; jC<nC; jC++ )
                 v += pDoc->GetColWidth( jC, nTab );
-            nWidthPixel = ToPixel( static_cast< USHORT >( v ) );
+            nWidthPixel = ToPixel( static_cast< sal_uInt16 >( v ) );
         }
         else
             nWidthPixel = ToPixel( pDoc->GetColWidth( nCol, nTab ) );
@@ -907,7 +907,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
             (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_rowspan) += '=') += ByteString::CreateFromInt32( nR );
             nR += nRow;
             v = pDoc->GetRowHeight( nRow, nR-1, nTab );
-            nHeightPixel = ToPixel( static_cast< USHORT >( v ) );
+            nHeightPixel = ToPixel( static_cast< sal_uInt16 >( v ) );
         }
         else
             nHeightPixel = ToPixel( pDoc->GetRowHeight( nRow, nTab ) );
@@ -960,26 +960,26 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     else
         aBgColor = rBrushItem.GetColor();
 
-    BOOL bBold			= ( WEIGHT_BOLD		<= rWeightItem.GetWeight() );
-    BOOL bItalic		= ( ITALIC_NONE		!= rPostureItem.GetPosture() );
-    BOOL bUnderline		= ( UNDERLINE_NONE	!= rUnderlineItem.GetLineStyle() );
-    BOOL bSetFontColor	= ( COL_AUTO		!= rColorItem.GetValue().GetColor() );	// #97650# default is AUTO now
+    sal_Bool bBold			= ( WEIGHT_BOLD		<= rWeightItem.GetWeight() );
+    sal_Bool bItalic		= ( ITALIC_NONE		!= rPostureItem.GetPosture() );
+    sal_Bool bUnderline		= ( UNDERLINE_NONE	!= rUnderlineItem.GetLineStyle() );
+    sal_Bool bSetFontColor	= ( COL_AUTO		!= rColorItem.GetValue().GetColor() );	// #97650# default is AUTO now
 #if 0
 // keine StyleSheet-Fontangaben: hart fuer jede Zelle
-    BOOL bSetFontName	= TRUE;
-    USHORT nSetFontSizeNumber = GetFontSizeNumber( (USHORT)rFontHeightItem.GetHeight() );
+    sal_Bool bSetFontName	= sal_True;
+    sal_uInt16 nSetFontSizeNumber = GetFontSizeNumber( (sal_uInt16)rFontHeightItem.GetHeight() );
 #else
-    BOOL bSetFontName	= ( aHTMLStyle.aFontFamilyName	!= rFontItem.GetFamilyName() );
-    USHORT nSetFontSizeNumber = 0;
-    UINT32 nFontHeight = rFontHeightItem.GetHeight();
+    sal_Bool bSetFontName	= ( aHTMLStyle.aFontFamilyName	!= rFontItem.GetFamilyName() );
+    sal_uInt16 nSetFontSizeNumber = 0;
+    sal_uInt32 nFontHeight = rFontHeightItem.GetHeight();
     if ( nFontHeight != aHTMLStyle.nFontHeight )
     {
-        nSetFontSizeNumber = GetFontSizeNumber( (USHORT) nFontHeight );
+        nSetFontSizeNumber = GetFontSizeNumber( (sal_uInt16) nFontHeight );
         if ( nSetFontSizeNumber == aHTMLStyle.nFontSizeNumber )
             nSetFontSizeNumber = 0;   // no difference, don't set
     }
 #endif
-    BOOL bSetFont = (bSetFontColor || bSetFontName || nSetFontSizeNumber);
+    sal_Bool bSetFont = (bSetFontColor || bSetFontName || nSetFontSizeNumber);
 
     //! TODO: we could entirely use CSS1 here instead, but that would exclude
     //! Netscape 3.0 and Netscape 4.x without JavaScript enabled.
@@ -1100,7 +1100,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     }
 
     String aStrOut;
-    BOOL bFieldText = FALSE;
+    sal_Bool bFieldText = sal_False;
     if ( pCell )
     {	// cell content
         Color* pColor;
@@ -1159,51 +1159,51 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
 }
 
 
-BOOL ScHTMLExport::WriteFieldText( const ScEditCell* pCell )
+sal_Bool ScHTMLExport::WriteFieldText( const ScEditCell* pCell )
 {
-    BOOL bFields = FALSE;
+    sal_Bool bFields = sal_False;
     const EditTextObject* pData;
     pCell->GetData( pData );
     // text and anchor of URL fields, Doc-Engine is a ScFieldEditEngine
     EditEngine& rEngine = pDoc->GetEditEngine();
     rEngine.SetText( *pData );
-    USHORT nParas = rEngine.GetParagraphCount();
+    sal_uInt16 nParas = rEngine.GetParagraphCount();
     if ( nParas )
     {
         ESelection aSel( 0, 0, nParas-1, rEngine.GetTextLen( nParas-1 ) );
         SfxItemSet aSet( rEngine.GetAttribs( aSel ) );
-        SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE );
+        SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, sal_False );
         if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
-            bFields = TRUE;
+            bFields = sal_True;
     }
     if ( bFields )
     {
-        BOOL bOldUpdateMode = rEngine.GetUpdateMode();
-        rEngine.SetUpdateMode( TRUE );		// no portions if not formatted
-        for ( USHORT nPar=0; nPar < nParas; nPar++ )
+        sal_Bool bOldUpdateMode = rEngine.GetUpdateMode();
+        rEngine.SetUpdateMode( sal_True );		// no portions if not formatted
+        for ( sal_uInt16 nPar=0; nPar < nParas; nPar++ )
         {
             if ( nPar > 0 )
                 TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak );
             SvUShorts aPortions;
             rEngine.GetPortions( nPar, aPortions );
-            USHORT nCnt = aPortions.Count();
-            USHORT nStart = 0;
-            for ( USHORT nPos = 0; nPos < nCnt; nPos++ )
+            sal_uInt16 nCnt = aPortions.Count();
+            sal_uInt16 nStart = 0;
+            for ( sal_uInt16 nPos = 0; nPos < nCnt; nPos++ )
             {
-                USHORT nEnd = aPortions.GetObject( nPos );
+                sal_uInt16 nEnd = aPortions.GetObject( nPos );
                 ESelection aSel( nPar, nStart, nPar, nEnd );
-                BOOL bUrl = FALSE;
+                sal_Bool bUrl = sal_False;
                 // fields are single characters
                 if ( nEnd == nStart+1 )
                 {
                     const SfxPoolItem* pItem;
                     SfxItemSet aSet = rEngine.GetAttribs( aSel );
-                    if ( aSet.GetItemState( EE_FEATURE_FIELD, FALSE, &pItem ) == SFX_ITEM_ON )
+                    if ( aSet.GetItemState( EE_FEATURE_FIELD, sal_False, &pItem ) == SFX_ITEM_ON )
                     {
                         const SvxFieldData* pField = ((const SvxFieldItem*)pItem)->GetField();
                         if ( pField && pField->ISA(SvxURLField) )
                         {
-                            bUrl = TRUE;
+                            bUrl = sal_True;
                             const SvxURLField*	pURLField = (const SvxURLField*)pField;
 //							String				aFieldText = rEngine.GetText( aSel );
                             rStrm << '<' << OOO_STRING_SVTOOLS_HTML_anchor << ' ' << OOO_STRING_SVTOOLS_HTML_O_href << "=\"";
@@ -1225,10 +1225,10 @@ BOOL ScHTMLExport::WriteFieldText( const ScEditCell* pCell )
 }
 
 
-BOOL ScHTMLExport::CopyLocalFileToINet( String& rFileNm,
-        const String& rTargetNm, BOOL bFileToFile )
+sal_Bool ScHTMLExport::CopyLocalFileToINet( String& rFileNm,
+        const String& rTargetNm, sal_Bool bFileToFile )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     INetURLObject aFileUrl, aTargetUrl;
     aFileUrl.SetSmartURL( rFileNm );
     aTargetUrl.SetSmartURL( rTargetNm );
@@ -1241,11 +1241,11 @@ BOOL ScHTMLExport::CopyLocalFileToINet( String& rFileNm,
         if( pSrcArr )
         {
             // wurde die Datei schon verschoben
-            USHORT nPos;
+            sal_uInt16 nPos;
             if( pSrcArr->Seek_Entry( &rFileNm, &nPos ))
             {
                 rFileNm = *(*pDestArr)[ nPos ];
-                return TRUE;
+                return sal_True;
             }
         }
         else
@@ -1272,7 +1272,7 @@ BOOL ScHTMLExport::CopyLocalFileToINet( String& rFileNm,
         else
         {
             SfxMedium aMedium( *pDest, STREAM_WRITE | STREAM_SHARE_DENYNONE,
-                                FALSE );
+                                sal_False );
 
             // temp. File anlegen
     //		aMedium.DownLoad();
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index f1d661730..1842404ca 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -64,7 +64,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
         SdrPage* pDrawPage = pDrawLayer->GetPage( static_cast<sal_uInt16>(nTab) );
         if ( pDrawPage )
         {
-            bTabHasGraphics = TRUE;
+            bTabHasGraphics = sal_True;
             FillGraphList( pDrawPage, nTab,
                 nStartCol, nStartRow, nEndCol, nEndRow );
             for ( ScHTMLGraphEntry* pE = aGraphList.First(); pE;
@@ -72,7 +72,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
             {
                 if ( !pE->bInCell )
                 {	// nicht alle in Zellen: einige neben Tabelle
-                    bTabAlignedLeft = TRUE;
+                    bTabAlignedLeft = sal_True;
                     break;
                 }
             }
@@ -84,7 +84,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
 void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab,
         SCCOL nStartCol, SCROW nStartRow,	SCCOL nEndCol, SCROW nEndRow )
 {
-    ULONG	nObjCount = pPage->GetObjCount();
+    sal_uLong	nObjCount = pPage->GetObjCount();
     if ( nObjCount )
     {
         Rectangle aRect;
@@ -109,7 +109,7 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab,
                 SCCOL nCol2 = aR.aEnd.Col();
                 SCROW nRow2 = aR.aEnd.Row();
                 // All cells empty under object?
-                BOOL bInCell = (pDoc->GetEmptyLinesInBlock(
+                sal_Bool bInCell = (pDoc->GetEmptyLinesInBlock(
                     nCol1, nRow1, nTab, nCol2, nRow2, nTab, DIR_TOP )
                     == static_cast< SCSIZE >( nRow2 - nRow1 ));    // rows-1 !
                 if ( bInCell )
@@ -155,11 +155,11 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
         {
             const SdrGrafObj* pSGO = (SdrGrafObj*)pObject;
             const SdrGrafObjGeoData* pGeo = (SdrGrafObjGeoData*)pSGO->GetGeoData();
-            USHORT nMirrorCase = (pGeo->aGeo.nDrehWink == 18000 ?
+            sal_uInt16 nMirrorCase = (pGeo->aGeo.nDrehWink == 18000 ?
                     ( pGeo->bMirrored ? 3 : 4 ) : ( pGeo->bMirrored ? 2 : 1 ));
-            BOOL bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) );
-            BOOL bVMirr = ( ( nMirrorCase == 3 ) || ( nMirrorCase == 4 ) );
-            ULONG nXOutFlags = 0;
+            sal_Bool bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) );
+            sal_Bool bVMirr = ( ( nMirrorCase == 3 ) || ( nMirrorCase == 4 ) );
+            sal_uLong nXOutFlags = 0;
             if ( bHMirr )
                 nXOutFlags |= XOUTBMP_MIRROR_HORZ;
             if ( bVMirr )
@@ -168,7 +168,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
             if ( pSGO->IsLinkedGraphic() )
                 aLinkName = pSGO->GetFileName();
             WriteImage( aLinkName, pSGO->GetGraphic(), aOpt, nXOutFlags );
-            pE->bWritten = TRUE;
+            pE->bWritten = sal_True;
         }
         break;
         case OBJ_OLE2:
@@ -178,7 +178,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
             {
                 String aLinkName;
                 WriteImage( aLinkName, *pGraphic, aOpt );
-                pE->bWritten = TRUE;
+                pE->bWritten = sal_True;
             }
         }
         break;
@@ -188,14 +188,14 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
                 pDoc->GetDrawLayer(), pObject ) );
             String aLinkName;
             WriteImage( aLinkName, aGraph, aOpt );
-            pE->bWritten = TRUE;
+            pE->bWritten = sal_True;
         }
     }
 }
 
 
 void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf,
-            const ByteString& rImgOptions, ULONG nXOutFlags )
+            const ByteString& rImgOptions, sal_uLong nXOutFlags )
 {
     // embeddete Grafik -> via WriteGraphic schreiben
     if( !rLinkName.Len() )
@@ -205,7 +205,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf,
             // Grafik als (JPG-)File speichern
             String aGrfNm( aStreamPath );
             nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE;
-            USHORT nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm,
+            sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm,
                 CREATE_STRING( "JPG" ), nXOutFlags );
             if( !nErr )		// sonst fehlerhaft, da ist nichts auszugeben
             {
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 83d0ea32b..caf3ca174 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -60,23 +60,23 @@
 //------------------------------------------------------------------------
 
 FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const String& rBaseURL, ScDocument *pDoc,
-        ScRange& rRange, double nOutputFactor, BOOL bCalcWidthHeight, SvNumberFormatter* pFormatter,
+        ScRange& rRange, double nOutputFactor, sal_Bool bCalcWidthHeight, SvNumberFormatter* pFormatter,
         bool bConvertDate )
 {
     ScHTMLImport aImp( pDoc, rBaseURL, rRange, bCalcWidthHeight );
     FltError nErr = (FltError) aImp.Read( rStream, rBaseURL );
     ScRange aR = aImp.GetRange();
     rRange.aEnd = aR.aEnd;
-    aImp.WriteToDocument( TRUE, nOutputFactor, pFormatter, bConvertDate );
+    aImp.WriteToDocument( sal_True, nOutputFactor, pFormatter, bConvertDate );
     return nErr;
 }
 
-ScEEAbsImport *ScFormatFilterPluginImpl::CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight )
+ScEEAbsImport *ScFormatFilterPluginImpl::CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, sal_Bool bCalcWidthHeight )
 {
     return new ScHTMLImport( pDocP, rBaseURL, rRange, bCalcWidthHeight );
 }
 
-ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight ) :
+ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, sal_Bool bCalcWidthHeight ) :
     ScEEImport( pDocP, rRange )
 {
     Size aPageSize;
@@ -136,7 +136,7 @@ void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const String& rName, const
 }
 
 void ScHTMLImport::WriteToDocument( 
-    BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
+    sal_Bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
 {
     ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, bConvertDate );
 
@@ -207,7 +207,7 @@ void ScHTMLImport::WriteToDocument(
         if( pTable->GetTableName().Len() )
         {
             String aName( ScfTools::GetNameFromHTMLName( pTable->GetTableName() ) );
-            USHORT nPos;
+            sal_uInt16 nPos;
             if( !mpDoc->GetRangeName()->SearchName( aName, nPos ) )
                 InsertRangeName( mpDoc, aName, aNewRange );
         }
@@ -233,9 +233,9 @@ String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrig
         String aToken( rOrigName.GetToken( 0, ';', nStringIx ) );
         if( pRangeNames && ScfTools::IsHTMLTablesName( aToken ) )
         {	// build list with all HTML tables
-            ULONG nIndex = 1;
-            USHORT nPos;
-            BOOL bLoop = TRUE;
+            sal_uLong nIndex = 1;
+            sal_uInt16 nPos;
+            sal_Bool bLoop = sal_True;
             while( bLoop )
             {
                 aToken = ScfTools::GetNameFromHTMLIndex( nIndex++ );
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 64733eb69..272dba80b 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -69,7 +69,7 @@
 using namespace ::com::sun::star;
 
 
-SV_IMPL_VARARR_SORT( ScHTMLColOffset, ULONG );
+SV_IMPL_VARARR_SORT( ScHTMLColOffset, sal_uLong );
 
 
 // ============================================================================
@@ -111,10 +111,10 @@ ScHTMLLayoutParser::ScHTMLLayoutParser( EditEngine* pEditP, const String& rBaseU
         nColOffsetStart(0),
         nMetaCnt(0),
         nOffsetTolerance( SC_HTML_OFFSET_TOLERANCE_SMALL ),
-        bTabInTabCell( FALSE ),
-        bFirstRow( TRUE ),
-        bInCell( FALSE ),
-        bInTitle( FALSE )
+        bTabInTabCell( sal_False ),
+        bFirstRow( sal_True ),
+        bInCell( sal_False ),
+        bInTitle( sal_False )
 {
     MakeColNoRef( pLocalColOffset, 0, 0, 0, 0 );
     MakeColNoRef( pColOffset, 0, 0, 0, 0 );
@@ -145,13 +145,13 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
 }
 
 
-ULONG ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL )
+sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL )
 {
     Link aOldLink = pEdit->GetImportHdl();
     pEdit->SetImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) );
 
     SfxObjectShell* pObjSh = mpDoc->GetDocumentShell();
-    BOOL bLoading = pObjSh && pObjSh->IsLoading();
+    sal_Bool bLoading = pObjSh && pObjSh->IsLoading();
 
     SvKeyValueIteratorRef xValues;
     SvKeyValueIterator* pAttributes = NULL;
@@ -174,17 +174,17 @@ ULONG ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL )
         }
     }
 
-    ULONG nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes );
+    sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes );
 
     pEdit->SetImportHdl( aOldLink );
     // Spaltenbreiten erzeugen
     Adjust();
     OutputDevice* pDefaultDev = Application::GetDefaultDevice();
-    USHORT nCount = pColOffset->Count();
-    const ULONG* pOff = (const ULONG*) pColOffset->GetData();
-    ULONG nOff = *pOff++;
+    sal_uInt16 nCount = pColOffset->Count();
+    const sal_uLong* pOff = (const sal_uLong*) pColOffset->GetData();
+    sal_uLong nOff = *pOff++;
     Size aSize;
-    for ( USHORT j = 1; j < nCount; j++, pOff++ )
+    for ( sal_uInt16 j = 1; j < nCount; j++, pOff++ )
     {
         aSize.Width() = *pOff - nOff;
         aSize = pDefaultDev->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
@@ -242,61 +242,61 @@ void ScHTMLLayoutParser::NextRow( ImportInfo* pInfo )
         nRowMax = nRowCnt;
     nColCnt = nColCntStart;
     nColOffset = nColOffsetStart;
-    bFirstRow = FALSE;
+    bFirstRow = sal_False;
 }
 
 
-BOOL ScHTMLLayoutParser::SeekOffset( ScHTMLColOffset* pOffset, USHORT nOffset,
-        SCCOL* pCol, USHORT nOffsetTol )
+sal_Bool ScHTMLLayoutParser::SeekOffset( ScHTMLColOffset* pOffset, sal_uInt16 nOffset,
+        SCCOL* pCol, sal_uInt16 nOffsetTol )
 {
     DBG_ASSERT( pOffset, "ScHTMLLayoutParser::SeekOffset - illegal call" );
-    USHORT nPos;
-    BOOL bFound = pOffset->Seek_Entry( nOffset, &nPos );
+    sal_uInt16 nPos;
+    sal_Bool bFound = pOffset->Seek_Entry( nOffset, &nPos );
     *pCol = static_cast<SCCOL>(nPos);
     if ( bFound )
-        return TRUE;
-    USHORT nCount = pOffset->Count();
+        return sal_True;
+    sal_uInt16 nCount = pOffset->Count();
     if ( !nCount )
-        return FALSE;
+        return sal_False;
     // nPos ist Einfuegeposition, da liegt der Naechsthoehere (oder auch nicht)
     if ( nPos < nCount && (((*pOffset)[nPos] - nOffsetTol) <= nOffset) )
-        return TRUE;
+        return sal_True;
     // nicht kleiner als alles andere? dann mit Naechstniedrigerem vergleichen
     else if ( nPos && (((*pOffset)[nPos-1] + nOffsetTol) >= nOffset) )
     {
         (*pCol)--;
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-void ScHTMLLayoutParser::MakeCol( ScHTMLColOffset* pOffset, USHORT& nOffset,
-        USHORT& nWidth, USHORT nOffsetTol, USHORT nWidthTol )
+void ScHTMLLayoutParser::MakeCol( ScHTMLColOffset* pOffset, sal_uInt16& nOffset,
+        sal_uInt16& nWidth, sal_uInt16 nOffsetTol, sal_uInt16 nWidthTol )
 {
     DBG_ASSERT( pOffset, "ScHTMLLayoutParser::MakeCol - illegal call" );
     SCCOL nPos;
     if ( SeekOffset( pOffset, nOffset, &nPos, nOffsetTol ) )
-        nOffset = (USHORT)(*pOffset)[nPos];
+        nOffset = (sal_uInt16)(*pOffset)[nPos];
     else
         pOffset->Insert( nOffset );
     if ( nWidth )
     {
         if ( SeekOffset( pOffset, nOffset + nWidth, &nPos, nWidthTol ) )
-            nWidth = (USHORT)(*pOffset)[nPos] - nOffset;
+            nWidth = (sal_uInt16)(*pOffset)[nPos] - nOffset;
         else
             pOffset->Insert( nOffset + nWidth );
     }
 }
 
 
-void ScHTMLLayoutParser::MakeColNoRef( ScHTMLColOffset* pOffset, USHORT nOffset,
-        USHORT nWidth, USHORT nOffsetTol, USHORT nWidthTol )
+void ScHTMLLayoutParser::MakeColNoRef( ScHTMLColOffset* pOffset, sal_uInt16 nOffset,
+        sal_uInt16 nWidth, sal_uInt16 nOffsetTol, sal_uInt16 nWidthTol )
 {
     DBG_ASSERT( pOffset, "ScHTMLLayoutParser::MakeColNoRef - illegal call" );
     SCCOL nPos;
     if ( SeekOffset( pOffset, nOffset, &nPos, nOffsetTol ) )
-        nOffset = (USHORT)(*pOffset)[nPos];
+        nOffset = (sal_uInt16)(*pOffset)[nPos];
     else
         pOffset->Insert( nOffset );
     if ( nWidth )
@@ -307,31 +307,31 @@ void ScHTMLLayoutParser::MakeColNoRef( ScHTMLColOffset* pOffset, USHORT nOffset,
 }
 
 
-void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, USHORT& nOldOffset,
-            USHORT& nNewOffset, USHORT nOffsetTol )
+void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, sal_uInt16& nOldOffset,
+            sal_uInt16& nNewOffset, sal_uInt16 nOffsetTol )
 {
     DBG_ASSERT( pOffset, "ScHTMLLayoutParser::ModifyOffset - illegal call" );
     SCCOL nPos;
     if ( !SeekOffset( pOffset, nOldOffset, &nPos, nOffsetTol ) )
     {
         if ( SeekOffset( pOffset, nNewOffset, &nPos, nOffsetTol ) )
-            nNewOffset = (USHORT)(*pOffset)[nPos];
+            nNewOffset = (sal_uInt16)(*pOffset)[nPos];
         else
             pOffset->Insert( nNewOffset );
         return ;
     }
-    nOldOffset = (USHORT)(*pOffset)[nPos];
+    nOldOffset = (sal_uInt16)(*pOffset)[nPos];
     SCCOL nPos2;
     if ( SeekOffset( pOffset, nNewOffset, &nPos2, nOffsetTol ) )
     {
-        nNewOffset = (USHORT)(*pOffset)[nPos2];
+        nNewOffset = (sal_uInt16)(*pOffset)[nPos2];
         return ;
     }
-    ULONG* pData = ((ULONG*) pOffset->GetData()) + nPos;        //! QAD
+    sal_uLong* pData = ((sal_uLong*) pOffset->GetData()) + nPos;        //! QAD
     long nDiff = nNewOffset - nOldOffset;
     if ( nDiff < 0 )
     {
-        const ULONG* pStop = pOffset->GetData();
+        const sal_uLong* pStop = pOffset->GetData();
         do
         {
             *pData += nDiff;
@@ -339,7 +339,7 @@ void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, USHORT& nOldOff
     }
     else
     {
-        const ULONG* pStop = pOffset->GetData() + pOffset->Count();
+        const sal_uLong* pStop = pOffset->GetData() + pOffset->Count();
         do
         {
             *pData += nDiff;
@@ -348,17 +348,17 @@ void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, USHORT& nOldOff
 }
 
 
-void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, BOOL bJoin )
+void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, sal_Bool bJoin )
 {
     if ( ValidCol(pE->nCol) )
     {   // wuerde sonst bei ScAddress falschen Wert erzeugen, evtl. Endlosschleife!
-        BOOL bBadCol = FALSE;
-        BOOL bAgain;
+        sal_Bool bBadCol = sal_False;
+        sal_Bool bAgain;
         ScRange aRange( pE->nCol, pE->nRow, 0,
             pE->nCol + pE->nColOverlap - 1, pE->nRow + pE->nRowOverlap - 1, 0 );
         do
         {
-            bAgain = FALSE;
+            bAgain = sal_False;
             for ( ScRange* pR = xLockedList->First(); pR; pR = xLockedList->Next() )
             {
                 if ( pR->Intersects( aRange ) )
@@ -366,10 +366,10 @@ void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, BOOL bJoin )
                     pE->nCol = pR->aEnd.Col() + 1;
                     SCCOL nTmp = pE->nCol + pE->nColOverlap - 1;
                     if ( pE->nCol > MAXCOL || nTmp > MAXCOL )
-                        bBadCol = TRUE;
+                        bBadCol = sal_True;
                     else
                     {
-                        bAgain = TRUE;
+                        bAgain = sal_True;
                         aRange.aStart.SetCol( pE->nCol );
                         aRange.aEnd.SetCol( nTmp );
                     }
@@ -390,11 +390,11 @@ void ScHTMLLayoutParser::Adjust()
     xLockedList->Clear();
     ScHTMLAdjustStack aStack;
     ScHTMLAdjustStackEntry* pS;
-    USHORT nTab = 0;
+    sal_uInt16 nTab = 0;
     SCCOL nLastCol = SCCOL_MAX;
     SCROW nNextRow = 0;
     SCROW nCurRow = 0;
-    USHORT nPageWidth = (USHORT) aPageSize.Width();
+    sal_uInt16 nPageWidth = (sal_uInt16) aPageSize.Width();
     Table* pTab = NULL;
     for ( ScEEParseEntry* pE = pList->First(); pE; pE = pList->Next() )
     {
@@ -419,7 +419,7 @@ void ScHTMLLayoutParser::Adjust()
             else
                 nCurRow = nNextRow = pE->nRow;
             SCROW nR;
-            if ( pTab && ((nR = (SCROW)(ULONG)pTab->Get( nCurRow )) != 0) )
+            if ( pTab && ((nR = (SCROW)(sal_uLong)pTab->Get( nCurRow )) != 0) )
                 nNextRow += nR;
             else
                 nNextRow++;
@@ -435,7 +435,7 @@ void ScHTMLLayoutParser::Adjust()
             pTab = (pTables ? (Table*) pTables->Get( nTab ) : NULL);
             // neuer Zeilenabstand
             SCROW nR;
-            if ( pTab && ((nR = (SCROW)(ULONG)pTab->Get( nCurRow )) != 0) )
+            if ( pTab && ((nR = (SCROW)(sal_uLong)pTab->Get( nCurRow )) != 0) )
                 nNextRow = nCurRow + nR;
             else
                 nNextRow = nCurRow + 1;
@@ -449,7 +449,7 @@ void ScHTMLLayoutParser::Adjust()
                 SCROW nRowSpan = pE->nRowOverlap;
                 for ( SCROW j=0; j < nRowSpan; j++ )
                 {   // aus merged Zeilen resultierendes RowSpan
-                    SCROW nRows = (SCROW)(ULONG)pTab->Get( nRow+j );
+                    SCROW nRows = (SCROW)(sal_uLong)pTab->Get( nRow+j );
                     if ( nRows > 1 )
                     {
                         pE->nRowOverlap += nRows - 1;
@@ -466,18 +466,18 @@ void ScHTMLLayoutParser::Adjust()
         // echte Col
         SeekOffset( pColOffset, pE->nOffset, &pE->nCol, nOffsetTolerance );
         SCCOL nColBeforeSkip = pE->nCol;
-        SkipLocked( pE, FALSE );
+        SkipLocked( pE, sal_False );
         if ( pE->nCol != nColBeforeSkip )
         {
             SCCOL nCount = (SCCOL)pColOffset->Count();
             if ( nCount <= pE->nCol )
             {
-                pE->nOffset = (USHORT) (*pColOffset)[nCount-1];
+                pE->nOffset = (sal_uInt16) (*pColOffset)[nCount-1];
                 MakeCol( pColOffset, pE->nOffset, pE->nWidth, nOffsetTolerance, nOffsetTolerance );
             }
             else
             {
-                pE->nOffset = (USHORT) (*pColOffset)[pE->nCol];
+                pE->nOffset = (sal_uInt16) (*pColOffset)[pE->nCol];
             }
         }
         SCCOL nPos;
@@ -503,7 +503,7 @@ void ScHTMLLayoutParser::Adjust()
 }
 
 
-USHORT ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE )
+sal_uInt16 ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE )
 {
     if ( pE->nWidth )
         return pE->nWidth;
@@ -511,7 +511,7 @@ USHORT ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE )
                 nColCntStart + pE->nColOverlap),
             static_cast<sal_Int32>( pLocalColOffset->Count() - 1));
     SCCOL nPos = (nTmp < 0 ? 0 : static_cast<SCCOL>(nTmp));
-    USHORT nOff2 = (USHORT) (*pLocalColOffset)[nPos];
+    sal_uInt16 nOff2 = (sal_uInt16) (*pLocalColOffset)[nPos];
     if ( pE->nOffset < nOff2 )
         return nOff2 - pE->nOffset;
     return 0;
@@ -523,26 +523,26 @@ void ScHTMLLayoutParser::SetWidths()
     ScEEParseEntry* pE;
     SCCOL nCol;
     if ( !nTableWidth )
-        nTableWidth = (USHORT) aPageSize.Width();
+        nTableWidth = (sal_uInt16) aPageSize.Width();
     SCCOL nColsPerRow = nMaxCol - nColCntStart;
     if ( nColsPerRow <= 0 )
         nColsPerRow = 1;
     if ( pLocalColOffset->Count() <= 2 )
     {   // nur PageSize, es gab keine Width-Angabe
-        USHORT nWidth = nTableWidth / static_cast<USHORT>(nColsPerRow);
-        USHORT nOff = nColOffsetStart;
-        pLocalColOffset->Remove( (USHORT)0, pLocalColOffset->Count() );
+        sal_uInt16 nWidth = nTableWidth / static_cast<sal_uInt16>(nColsPerRow);
+        sal_uInt16 nOff = nColOffsetStart;
+        pLocalColOffset->Remove( (sal_uInt16)0, pLocalColOffset->Count() );
         for ( nCol = 0; nCol <= nColsPerRow; ++nCol, nOff = nOff + nWidth )
         {
             MakeColNoRef( pLocalColOffset, nOff, 0, 0, 0 );
         }
-        nTableWidth = (USHORT)((*pLocalColOffset)[pLocalColOffset->Count() -1 ] - (*pLocalColOffset)[0]);
+        nTableWidth = (sal_uInt16)((*pLocalColOffset)[pLocalColOffset->Count() -1 ] - (*pLocalColOffset)[0]);
         pE = pList->Seek( nFirstTableCell );
         while ( pE )
         {
             if ( pE->nTab == nTable )
             {
-                pE->nOffset = (USHORT) (*pLocalColOffset)[pE->nCol - nColCntStart];
+                pE->nOffset = (sal_uInt16) (*pLocalColOffset)[pE->nCol - nColCntStart];
                 pE->nWidth = 0;     // to be recalculated later
             }
             pE = pList->Next();
@@ -554,10 +554,10 @@ void ScHTMLLayoutParser::SetWidths()
         // #36350# wieso eigentlich kein pE ?!?
         if ( pE )
         {
-            USHORT* pOffsets = new USHORT[ nColsPerRow+1 ];
-            memset( pOffsets, 0, (nColsPerRow+1) * sizeof(USHORT) );
-            USHORT* pWidths = new USHORT[ nColsPerRow ];
-            memset( pWidths, 0, nColsPerRow * sizeof(USHORT) );
+            sal_uInt16* pOffsets = new sal_uInt16[ nColsPerRow+1 ];
+            memset( pOffsets, 0, (nColsPerRow+1) * sizeof(sal_uInt16) );
+            sal_uInt16* pWidths = new sal_uInt16[ nColsPerRow ];
+            memset( pWidths, 0, nColsPerRow * sizeof(sal_uInt16) );
             pOffsets[0] = nColOffsetStart;
             while ( pE )
             {
@@ -573,8 +573,8 @@ void ScHTMLLayoutParser::SetWidths()
                         }
                         else
                         {   // try to find a single undefined width
-                            USHORT nTotal = 0;
-                            BOOL bFound = FALSE;
+                            sal_uInt16 nTotal = 0;
+                            sal_Bool bFound = sal_False;
                             SCCOL nHere = 0;
                             SCCOL nStop = Min( static_cast<SCCOL>(nCol + pE->nColOverlap), nColsPerRow );
                             for ( ; nCol < nStop; nCol++ )
@@ -585,10 +585,10 @@ void ScHTMLLayoutParser::SetWidths()
                                 {
                                     if ( bFound )
                                     {
-                                        bFound = FALSE;
+                                        bFound = sal_False;
                                         break;  // for
                                     }
-                                    bFound = TRUE;
+                                    bFound = sal_True;
                                     nHere = nCol;
                                 }
                             }
@@ -599,8 +599,8 @@ void ScHTMLLayoutParser::SetWidths()
                 }
                 pE = pList->Next();
             }
-            USHORT nWidths = 0;
-            USHORT nUnknown = 0;
+            sal_uInt16 nWidths = 0;
+            sal_uInt16 nUnknown = 0;
             for ( nCol = 0; nCol < nColsPerRow; nCol++ )
             {
                 if ( pWidths[nCol] )
@@ -610,7 +610,7 @@ void ScHTMLLayoutParser::SetWidths()
             }
             if ( nUnknown )
             {
-                USHORT nW = ((nWidths < nTableWidth) ?
+                sal_uInt16 nW = ((nWidths < nTableWidth) ?
                     ((nTableWidth - nWidths) / nUnknown) :
                     (nTableWidth / nUnknown));
                 for ( nCol = 0; nCol < nColsPerRow; nCol++ )
@@ -623,7 +623,7 @@ void ScHTMLLayoutParser::SetWidths()
             {
                 pOffsets[nCol] = pOffsets[nCol-1] + pWidths[nCol-1];
             }
-            pLocalColOffset->Remove( (USHORT)0, pLocalColOffset->Count() );
+            pLocalColOffset->Remove( (sal_uInt16)0, pLocalColOffset->Count() );
             for ( nCol = 0; nCol <= nColsPerRow; nCol++ )
             {
                 MakeColNoRef( pLocalColOffset, pOffsets[nCol], 0, 0, 0 );
@@ -655,7 +655,7 @@ void ScHTMLLayoutParser::SetWidths()
     }
     if ( pLocalColOffset->Count() )
     {
-        USHORT nMax = (USHORT) (*pLocalColOffset)[pLocalColOffset->Count() - 1];
+        sal_uInt16 nMax = (sal_uInt16) (*pLocalColOffset)[pLocalColOffset->Count() - 1];
         if ( aPageSize.Width() < nMax )
             aPageSize.Width() = nMax;
     }
@@ -690,12 +690,12 @@ void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE )
         nCol = pE->nCol - nColCntStart;
         SCCOL nCount = static_cast<SCCOL>(pLocalColOffset->Count());
         if ( nCol < nCount )
-            nColOffset = (USHORT) (*pLocalColOffset)[nCol];
+            nColOffset = (sal_uInt16) (*pLocalColOffset)[nCol];
         else
-            nColOffset = (USHORT) (*pLocalColOffset)[nCount - 1];
+            nColOffset = (sal_uInt16) (*pLocalColOffset)[nCount - 1];
     }
     pE->nOffset = nColOffset;
-    USHORT nWidth = GetWidth( pE );
+    sal_uInt16 nWidth = GetWidth( pE );
     MakeCol( pLocalColOffset, pE->nOffset, nWidth, nOffsetTolerance, nOffsetTolerance );
     if ( pE->nWidth )
         pE->nWidth = nWidth;
@@ -707,17 +707,17 @@ void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE )
 
 void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo )
 {
-    bInCell = FALSE;
+    bInCell = sal_False;
     if ( bTabInTabCell )
     {   // in TableOff vom Stack geholt
-        bTabInTabCell = FALSE;
+        bTabInTabCell = sal_False;
         if ( pList->GetPos( pActEntry ) == LIST_ENTRY_NOTFOUND )
             delete pActEntry;
         NewActEntry( pList->Last() );   // neuer freifliegender pActEntry
         return ;
     }
     if ( pActEntry->nTab == 0 )
-        pActEntry->nWidth = (USHORT) aPageSize.Width();
+        pActEntry->nWidth = (sal_uInt16) aPageSize.Width();
     Colonize( pActEntry );
     nColCnt = pActEntry->nCol + pActEntry->nColOverlap;
     if ( nMaxCol < nColCnt )
@@ -742,7 +742,7 @@ void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo )
         rSel.nEndPara = rSel.nStartPara;
     }
     if ( rSel.HasRange() )
-        pActEntry->aItemSet.Put( SfxBoolItem( ATTR_LINEBREAK, TRUE ) );
+        pActEntry->aItemSet.Put( SfxBoolItem( ATTR_LINEBREAK, sal_True ) );
     pList->Insert( pActEntry, LIST_APPEND );
     NewActEntry( pActEntry );   // neuer freifliegender pActEntry
 }
@@ -754,9 +754,9 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo )
     static ESelection aDebugSel;
     static String aDebugStr;
     static SvFileStream* pDebugStrm = NULL;
-    static ULONG nDebugStrmPos = 0;
-    static ULONG nDebugCount = 0;
-    static ULONG nDebugCountAll = 0;
+    static sal_uLong nDebugStrmPos = 0;
+    static sal_uLong nDebugCount = 0;
+    static sal_uLong nDebugCountAll = 0;
     static const sal_Char* sDebugState[15] = {
                     "RTFIMP_START", "RTFIMP_END",
                     "RTFIMP_NEXTTOKEN", "RTFIMP_UNKNOWNATTR",
@@ -800,7 +800,7 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo )
         SvFileStream& rS = *pDebugStrm;
         rS.WriteNumber( nDebugCountAll ); rS << ".: ";
         rS.WriteNumber( nDebugCount ); rS << ". State: ";
-        rS.WriteNumber( (USHORT) pInfo->eState );
+        rS.WriteNumber( (sal_uInt16) pInfo->eState );
         rS << ' ' << sDebugState[pInfo->eState] << endl;
         rS << "SPar,SPos EPar,EPos: ";
         rS.WriteNumber( aDebugSel.nStartPara ); rS << ',';
@@ -865,9 +865,9 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo )
                 // If text remains: create paragraph, without calling CloseEntry().
                 if( bInCell )   // #108269# ...but only in opened table cells.
                 {
-                    bInCell = FALSE;
+                    bInCell = sal_False;
                     NextRow( pInfo );
-                    bInCell = TRUE;
+                    bInCell = sal_True;
                 }
                 CloseEntry( pInfo );
             }
@@ -930,11 +930,11 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo )
         DBG_ERROR( "Dummbatz-Dok! <TH> oder <TD> ohne vorheriges <TABLE>" );
         TableOn( pInfo );
     }
-    bInCell = TRUE;
-    BOOL bHorJustifyCenterTH = (pInfo->nToken == HTML_TABLEHEADER_ON);
+    bInCell = sal_True;
+    sal_Bool bHorJustifyCenterTH = (pInfo->nToken == HTML_TABLEHEADER_ON);
     const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions();
-    USHORT nArrLen = pOptions->Count();
-    for ( USHORT i = 0; i < nArrLen; i++ )
+    sal_uInt16 nArrLen = pOptions->Count();
+    for ( sal_uInt16 i = 0; i < nArrLen; i++ )
     {
         const HTMLOption* pOption = (*pOptions)[i];
         switch( pOption->GetToken() )
@@ -951,7 +951,7 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo )
             break;
             case HTML_O_ALIGN:
             {
-                bHorJustifyCenterTH = FALSE;
+                bHorJustifyCenterTH = sal_False;
                 SvxCellHorJustify eVal;
                 const String& rOptVal = pOption->GetString();
                 if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL )
@@ -1044,25 +1044,25 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo )
 
     if ( ++nTableLevel > 1 )
     {   // Table in Table
-        USHORT nTmpColOffset = nColOffset;  // wird in Colonize noch angepasst
+        sal_uInt16 nTmpColOffset = nColOffset;  // wird in Colonize noch angepasst
         Colonize( pActEntry );
         aTableStack.Push( new ScHTMLTableStackEntry(
             pActEntry, xLockedList, pLocalColOffset, nFirstTableCell,
             nColCnt, nRowCnt, nColCntStart, nMaxCol, nTable,
             nTableWidth, nColOffset, nColOffsetStart,
             bFirstRow ) );
-        USHORT nLastWidth = nTableWidth;
+        sal_uInt16 nLastWidth = nTableWidth;
         nTableWidth = GetWidth( pActEntry );
         if ( nTableWidth == nLastWidth && nMaxCol - nColCntStart > 1 )
         {   // es muss mehr als einen geben, also kann dieser nicht alles sein
-            nTableWidth = nLastWidth / static_cast<USHORT>((nMaxCol - nColCntStart));
+            nTableWidth = nLastWidth / static_cast<sal_uInt16>((nMaxCol - nColCntStart));
         }
         nLastWidth = nTableWidth;
         if ( pInfo->nToken == HTML_TABLE_ON )
         {   // es kann auch TD oder TH sein, wenn es vorher kein TABLE gab
             const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions();
-            USHORT nArrLen = pOptions->Count();
-            for ( USHORT i = 0; i < nArrLen; i++ )
+            sal_uInt16 nArrLen = pOptions->Count();
+            for ( sal_uInt16 i = 0; i < nArrLen; i++ )
             {
                 const HTMLOption* pOption = (*pOptions)[i];
                 switch( pOption->GetToken() )
@@ -1081,15 +1081,15 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo )
                 }
             }
         }
-        bInCell = FALSE;
+        bInCell = sal_False;
         if ( bTabInTabCell && !(nTableWidth < nLastWidth) )
         {   // mehrere Tabellen in einer Zelle, untereinander
-            bTabInTabCell = FALSE;
+            bTabInTabCell = sal_False;
             NextRow( pInfo );
         }
         else
         {   // in dieser Zelle geht's los, oder nebeneinander
-            bTabInTabCell = FALSE;
+            bTabInTabCell = sal_False;
             nColCntStart = nColCnt;
             nColOffset = nTmpColOffset;
             nColOffsetStart = nColOffset;
@@ -1119,8 +1119,8 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo )
         if ( pInfo->nToken == HTML_TABLE_ON )
         {   // es kann auch TD oder TH sein, wenn es vorher kein TABLE gab
             const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions();
-            USHORT nArrLen = pOptions->Count();
-            for ( USHORT i = 0; i < nArrLen; i++ )
+            sal_uInt16 nArrLen = pOptions->Count();
+            for ( sal_uInt16 i = 0; i < nArrLen; i++ )
             {
                 const HTMLOption* pOption = (*pOptions)[i];
                 switch( pOption->GetToken() )
@@ -1141,7 +1141,7 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo )
         }
     }
     nTable = ++nMaxTable;
-    bFirstRow = TRUE;
+    bFirstRow = sal_True;
     nFirstTableCell = pList->Count();
 
     pLocalColOffset = new ScHTMLColOffset;
@@ -1170,7 +1170,7 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
             if ( nRows > 1 )
             {   // Groesse der Tabelle an dieser Position eintragen
                 SCROW nRow = pS->nRowCnt;
-                USHORT nTab = pS->nTable;
+                sal_uInt16 nTab = pS->nTable;
                 if ( !pTables )
                     pTables = new Table;
                 // Hoehen der aeusseren Table
@@ -1210,8 +1210,8 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
                     {   // aussen
                         for ( SCROW j=0; j < nRowSpan; j++ )
                         {
-                            ULONG nRowKey = nRow + j;
-                            SCROW nR = (SCROW)(ULONG)pTab1->Get( nRowKey );
+                            sal_uLong nRowKey = nRow + j;
+                            SCROW nR = (SCROW)(sal_uLong)pTab1->Get( nRowKey );
                             if ( !nR )
                                 pTab1->Insert( nRowKey, (void*) nRowsPerRow1 );
                             else if ( nRowsPerRow1 > nR )
@@ -1224,7 +1224,7 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
                                 nR += nAdd;
                                 if ( (nR % nRows) == 0 )
                                 {   // nur wenn abbildbar
-                                    SCROW nR2 = (SCROW)(ULONG)pTab1->Get( nRowKey+1 );
+                                    SCROW nR2 = (SCROW)(sal_uLong)pTab1->Get( nRowKey+1 );
                                     if ( nR2 > nAdd )
                                     {   // nur wenn wirklich Platz
                                         pTab1->Replace( nRowKey, (void*) nR );
@@ -1244,8 +1244,8 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
                         }
                         for ( SCROW j=0; j < nRows; j++ )
                         {
-                            ULONG nRowKey = nRow + j;
-                            SCROW nR = (SCROW)(ULONG)pTab2->Get( nRowKey );
+                            sal_uLong nRowKey = nRow + j;
+                            SCROW nR = (SCROW)(sal_uLong)pTab2->Get( nRowKey );
                             if ( !nR )
                                 pTab2->Insert( nRowKey, (void*) nRowsPerRow2 );
                             else if ( nRowsPerRow2 > nR )
@@ -1261,10 +1261,10 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
                 pE->nWidth = nTableWidth;
             else if ( pE->nWidth < nTableWidth )
             {
-                USHORT nOldOffset = pE->nOffset + pE->nWidth;
-                USHORT nNewOffset = pE->nOffset + nTableWidth;
+                sal_uInt16 nOldOffset = pE->nOffset + pE->nWidth;
+                sal_uInt16 nNewOffset = pE->nOffset + nTableWidth;
                 ModifyOffset( pS->pLocalColOffset, nOldOffset, nNewOffset, nOffsetTolerance );
-                USHORT nTmp = nNewOffset - pE->nOffset - pE->nWidth;
+                sal_uInt16 nTmp = nNewOffset - pE->nOffset - pE->nWidth;
                 pE->nWidth = nNewOffset - pE->nOffset;
                 pS->nTableWidth = pS->nTableWidth + nTmp;
                 if ( pS->nColOffset >= nOldOffset )
@@ -1292,8 +1292,8 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo )
             pActEntry = pE;
             delete pS;
         }
-        bTabInTabCell = TRUE;
-        bInCell = TRUE;
+        bTabInTabCell = sal_True;
+        bInCell = sal_True;
     }
     else
     {   // einfache Table beendet
@@ -1320,8 +1320,8 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
     ScHTMLImage* pImage = new ScHTMLImage;
     pIL->Insert( pImage, LIST_APPEND );
     const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions();
-    USHORT nArrLen = pOptions->Count();
-    for ( USHORT i = 0; i < nArrLen; i++ )
+    sal_uInt16 nArrLen = pOptions->Count();
+    for ( sal_uInt16 i = 0; i < nArrLen; i++ )
     {
         const HTMLOption* pOption = (*pOptions)[i];
         switch( pOption->GetToken() )
@@ -1369,7 +1369,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
         return ;
     }
 
-    USHORT nFormat;
+    sal_uInt16 nFormat;
     Graphic* pGraphic = new Graphic;
     GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();
     if ( GRFILTER_OK != GraphicFilter::LoadGraphic( pImage->aURL, pImage->aFilterName,
@@ -1380,7 +1380,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
     }
     if ( !pActEntry->bHasGraphic )
     {   // discard any ALT text in this cell if we have any image
-        pActEntry->bHasGraphic = TRUE;
+        pActEntry->bHasGraphic = sal_True;
         pActEntry->aAltText.Erase();
     }
     pImage->aFilterName = pFilter->GetImportFormatName( nFormat );
@@ -1412,15 +1412,15 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo )
 void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo )
 {
     const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions();
-    USHORT nArrLen = pOptions->Count();
-    for ( USHORT i = 0; i < nArrLen; i++ )
+    sal_uInt16 nArrLen = pOptions->Count();
+    for ( sal_uInt16 i = 0; i < nArrLen; i++ )
     {
         const HTMLOption* pOption = (*pOptions)[i];
         switch( pOption->GetToken() )
         {
             case HTML_O_WIDTH:
             {
-                USHORT nVal = GetWidthPixel( pOption );
+                sal_uInt16 nVal = GetWidthPixel( pOption );
                 MakeCol( pLocalColOffset, nColOffset, nVal, 0, 0 );
                 nColOffset = nColOffset + nVal;
             }
@@ -1430,13 +1430,13 @@ void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo )
 }
 
 
-USHORT ScHTMLLayoutParser::GetWidthPixel( const HTMLOption* pOption )
+sal_uInt16 ScHTMLLayoutParser::GetWidthPixel( const HTMLOption* pOption )
 {
     const String& rOptVal = pOption->GetString();
     if ( rOptVal.Search('%') != STRING_NOTFOUND )
     {   // Prozent
-        USHORT nW = (nTableWidth ? nTableWidth : (USHORT) aPageSize.Width());
-        return (USHORT)((pOption->GetNumber() * nW) / 100);
+        sal_uInt16 nW = (nTableWidth ? nTableWidth : (sal_uInt16) aPageSize.Width());
+        return (sal_uInt16)((pOption->GetNumber() * nW) / 100);
     }
     else
     {
@@ -1446,7 +1446,7 @@ USHORT ScHTMLLayoutParser::GetWidthPixel( const HTMLOption* pOption )
             return 0;
         }
         else
-            return (USHORT)pOption->GetNumber();    // Pixel
+            return (sal_uInt16)pOption->GetNumber();    // Pixel
     }
 }
 
@@ -1454,8 +1454,8 @@ USHORT ScHTMLLayoutParser::GetWidthPixel( const HTMLOption* pOption )
 void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo )
 {
     const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions();
-    USHORT nArrLen = pOptions->Count();
-    for ( USHORT i = 0; i < nArrLen; i++ )
+    sal_uInt16 nArrLen = pOptions->Count();
+    for ( sal_uInt16 i = 0; i < nArrLen; i++ )
     {
         const HTMLOption* pOption = (*pOptions)[i];
         switch( pOption->GetToken() )
@@ -1470,7 +1470,7 @@ void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo )
 }
 
 
-BOOL ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo )
+sal_Bool ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo )
 {
     ESelection& rSel = pActEntry->aSel;
     return rSel.nStartPara == rSel.nEndPara &&
@@ -1484,8 +1484,8 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo )
     if ( IsAtBeginningOfText( pInfo ) )
     {   // nur am Anfang des Textes, gilt dann fuer gesamte Zelle
         const HTMLOptions* pOptions = ((HTMLParser*)pInfo->pParser)->GetOptions();
-        USHORT nArrLen = pOptions->Count();
-        for ( USHORT i = 0; i < nArrLen; i++ )
+        sal_uInt16 nArrLen = pOptions->Count();
+        for ( sal_uInt16 i = 0; i < nArrLen; i++ )
         {
             const HTMLOption* pOption = (*pOptions)[i];
             switch( pOption->GetToken() )
@@ -1511,7 +1511,7 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo )
                 break;
                 case HTML_O_SIZE :
                 {
-                    USHORT nSize = (USHORT) pOption->GetNumber();
+                    sal_uInt16 nSize = (sal_uInt16) pOption->GetNumber();
                     if ( nSize == 0 )
                         nSize = 1;
                     else if ( nSize > SC_HTML_FONTSIZES )
@@ -1535,7 +1535,7 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo )
 
 void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
 {
-    BOOL bSetLastToken = TRUE;
+    sal_Bool bSetLastToken = sal_True;
     switch ( pInfo->nToken )
     {
         case HTML_META:
@@ -1550,7 +1550,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
         break;
         case HTML_TITLE_ON:
         {
-            bInTitle = TRUE;
+            bInTitle = sal_True;
             aString.Erase();
         }
         break;
@@ -1566,7 +1566,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
                     uno::UNO_QUERY_THROW);
                 xDPS->getDocumentProperties()->setTitle(aString);
             }
-            bInTitle = FALSE;
+            bInTitle = sal_False;
         }
         break;
         case HTML_TABLE_ON:
@@ -1583,7 +1583,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
         {
             if ( bInCell )
                 CloseEntry( pInfo );
-            // bInCell nicht TRUE setzen, das macht TableDataOn
+            // bInCell nicht sal_True setzen, das macht TableDataOn
             pActEntry->aItemSet.Put(
                 SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT) );
         }   // fall thru
@@ -1697,7 +1697,7 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
         break;
         default:
         {   // nLastToken nicht setzen!
-            bSetLastToken = FALSE;
+            bSetLastToken = sal_False;
         }
     }
     if ( bSetLastToken )
@@ -2800,7 +2800,7 @@ ScHTMLQueryParser::~ScHTMLQueryParser()
 {
 }
 
-ULONG ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL  )
+sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL  )
 {
     SvKeyValueIteratorRef xValues;
     SvKeyValueIterator* pAttributes = 0;
@@ -2828,7 +2828,7 @@ ULONG ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL  )
 
     Link aOldLink = pEdit->GetImportHdl();
     pEdit->SetImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
-    ULONG nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
+    sal_uLong nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
     pEdit->SetImportHdl( aOldLink );
 
     mxGlobTable->Recalc();
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 24b723ef9..3a57bc273 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -57,7 +57,7 @@ public:
 
     inline const sal_uInt8*		GetGUID() const { return aGUID; }
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -93,7 +93,7 @@ private:
 
 public:
                                 XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab );
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -106,7 +106,7 @@ private:
     virtual void				SaveCont( XclExpStream& rStrm );
 
 public:
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -119,7 +119,7 @@ private:
     virtual void				SaveCont( XclExpStream& rStrm );
 
 public:
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -132,7 +132,7 @@ private:
     virtual void				SaveCont( XclExpStream& rStrm );
 
 public:
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -145,7 +145,7 @@ private:
     virtual void				SaveCont( XclExpStream& rStrm );
 
 public:
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -158,7 +158,7 @@ private:
     virtual void				SaveCont( XclExpStream& rStrm );
 
 public:
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -168,13 +168,13 @@ public:
 class XclExpChTrEmpty : public ExcRecord
 {
 private:
-    UINT16						nRecNum;
+    sal_uInt16						nRecNum;
 
 public:
-    inline						XclExpChTrEmpty( UINT16 nNum ) : nRecNum( nNum ) {}
+    inline						XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {}
     virtual						~XclExpChTrEmpty();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -189,7 +189,7 @@ private:
 public:
     virtual						~XclExpChTr0x0195();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -208,7 +208,7 @@ public:
     inline						XclExpChTr0x0194( const ScChangeTrack& rChangeTrack );
     virtual						~XclExpChTr0x0194();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -236,7 +236,7 @@ public:
     inline void					SetGUID( const sal_uInt8* pGUID )	{ memcpy( aGUID, pGUID, 16 ); }
     inline void					SetCount( sal_uInt32 nNew )			{ nCount = nNew; }
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -259,7 +259,7 @@ public:
                                     const sal_uInt8* pGUID );
     virtual						~XclExpChTrInfo();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -335,7 +335,7 @@ public:
 
     void						Copy( const XclExpChTrTabIdBuffer& rBuffer );
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -479,7 +479,7 @@ public:
                                     const XclExpChTrTabIdBuffer& rTabIdBuffer );
     virtual						~XclExpChTrCellContent();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetActionByteCount() const;
 };
 
@@ -506,7 +506,7 @@ public:
                                     ScChangeTrack& rChangeTrack );
     virtual						~XclExpChTrInsert();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetActionByteCount() const;
 };
 
@@ -528,7 +528,7 @@ public:
                                     const XclExpChTrTabIdBuffer& rTabIdBuffer );
     virtual						~XclExpChTrInsertTab();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetActionByteCount() const;
 };
 
@@ -553,7 +553,7 @@ public:
                                     ScChangeTrack& rChangeTrack );
     virtual						~XclExpChTrMoveRange();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetActionByteCount() const;
 };
 
@@ -569,7 +569,7 @@ public:
                                 XclExpChTr0x014A( const XclExpChTrInsert& rAction );
     virtual						~XclExpChTr0x014A();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetActionByteCount() const;
 };
 
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx
index 32eae1706..da1980b3f 100644
--- a/sc/source/filter/inc/XclImpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx
@@ -179,7 +179,7 @@ class XclImpChTrFmlConverter : public ExcelToSc8
 private:
     XclImpChangeTrack&			rChangeTrack;
 
-    virtual bool                Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo );
+    virtual bool                Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo );
 
 public:
     inline						XclImpChTrFmlConverter(
diff --git a/sc/source/filter/inc/decl.h b/sc/source/filter/inc/decl.h
index 91e251af0..693ee2870 100644
--- a/sc/source/filter/inc/decl.h
+++ b/sc/source/filter/inc/decl.h
@@ -38,7 +38,7 @@ typedef sal_Char STRING16[ 16 ];
 typedef sal_Char STRING14[ 14 ];
 typedef sal_Char STRING8[ 8 ];
 typedef sal_Char STRING6[ 6 ];
-typedef USHORT USHORT4[ 4 ];
+typedef sal_uInt16 USHORT4[ 4 ];
 //typedef unsigned short USHORT4[ 4 ];
 #endif
 
diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index f0efb122b..2a3512c83 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -71,42 +71,42 @@ class DifParser
 public:
     String			    aData;
     double				fVal;
-    UINT32				nVector;
-    UINT32				nVal;
-    UINT32				nNumFormat;
+    sal_uInt32				nVector;
+    sal_uInt32				nVal;
+    sal_uInt32				nNumFormat;
     CharSet				eCharSet;
 private:
     SvNumberFormatter*	pNumFormatter;
     SvStream&			rIn;
-    BOOL				bPlain;
+    sal_Bool				bPlain;
     String              aLookAheadLine;
 
     bool                ReadNextLine( String& rStr );
     bool                LookAhead();
     DATASET             GetNumberDataset( const sal_Unicode* pPossibleNumericData );
-    static inline BOOL	IsBOT( const sal_Unicode* pRef );
-    static inline BOOL	IsEOD( const sal_Unicode* pRef );
-    static inline BOOL	Is1_0( const sal_Unicode* pRef );
+    static inline sal_Bool	IsBOT( const sal_Unicode* pRef );
+    static inline sal_Bool	IsEOD( const sal_Unicode* pRef );
+    static inline sal_Bool	Is1_0( const sal_Unicode* pRef );
 public:
-                        DifParser( SvStream&, const UINT32 nOption, ScDocument&, CharSet );
+                        DifParser( SvStream&, const sal_uInt32 nOption, ScDocument&, CharSet );
 
     TOPIC				GetNextTopic( void );
 
     DATASET				GetNextDataset( void );
 
-    const sal_Unicode*  ScanIntVal( const sal_Unicode* pStart, UINT32& rRet );
-    BOOL				ScanFloatVal( const sal_Unicode* pStart );
+    const sal_Unicode*  ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet );
+    sal_Bool				ScanFloatVal( const sal_Unicode* pStart );
 
-    inline BOOL			IsNumber( const sal_Unicode cChar );
-    inline BOOL			IsNumberEnding( const sal_Unicode cChar );
+    inline sal_Bool			IsNumber( const sal_Unicode cChar );
+    inline sal_Bool			IsNumberEnding( const sal_Unicode cChar );
 
-    static inline BOOL	IsV( const sal_Unicode* pRef );
+    static inline sal_Bool	IsV( const sal_Unicode* pRef );
 
-    inline BOOL			IsPlain( void ) const;
+    inline sal_Bool			IsPlain( void ) const;
 };
 
 
-inline BOOL	DifParser::IsBOT( const sal_Unicode* pRef )
+inline sal_Bool	DifParser::IsBOT( const sal_Unicode* pRef )
 {
     return	(	pRef[ 0 ] == pKeyBOT[0] &&
                 pRef[ 1 ] == pKeyBOT[1] &&
@@ -115,7 +115,7 @@ inline BOOL	DifParser::IsBOT( const sal_Unicode* pRef )
 }
 
 
-inline BOOL	DifParser::IsEOD( const sal_Unicode* pRef )
+inline sal_Bool	DifParser::IsEOD( const sal_Unicode* pRef )
 {
     return	(	pRef[ 0 ] == pKeyEOD[0] &&
                 pRef[ 1 ] == pKeyEOD[1] &&
@@ -124,7 +124,7 @@ inline BOOL	DifParser::IsEOD( const sal_Unicode* pRef )
 }
 
 
-inline BOOL	DifParser::Is1_0( const sal_Unicode* pRef )
+inline sal_Bool	DifParser::Is1_0( const sal_Unicode* pRef )
 {
     return	(	pRef[ 0 ] == pKey1_0[0] &&
                 pRef[ 1 ] == pKey1_0[1] &&
@@ -133,26 +133,26 @@ inline BOOL	DifParser::Is1_0( const sal_Unicode* pRef )
 }
 
 
-inline BOOL	DifParser::IsV( const sal_Unicode* pRef )
+inline sal_Bool	DifParser::IsV( const sal_Unicode* pRef )
 {
     return	(	pRef[ 0 ] == pKeyV[0] &&
                 pRef[ 1 ] == pKeyV[1]	);
 }
 
 
-inline BOOL DifParser::IsNumber( const sal_Unicode cChar )
+inline sal_Bool DifParser::IsNumber( const sal_Unicode cChar )
 {
     return ( cChar >= '0' && cChar <= '9' );
 }
 
 
-inline BOOL DifParser::IsNumberEnding( const sal_Unicode cChar )
+inline sal_Bool DifParser::IsNumberEnding( const sal_Unicode cChar )
 {
     return ( cChar == 0x00 );
 }
 
 
-inline BOOL DifParser::IsPlain( void ) const
+inline sal_Bool DifParser::IsPlain( void ) const
 {
     return bPlain;
 }
@@ -170,7 +170,7 @@ private:
     friend class DifAttrCache;
     struct ENTRY
     {
-        UINT32			nNumFormat;
+        sal_uInt32			nNumFormat;
 
         SCROW			nStart;
         SCROW			nEnd;
@@ -181,8 +181,8 @@ private:
     inline				DifColumn( void );
                         ~DifColumn();
     void				SetLogical( SCROW nRow );
-    void				SetNumFormat( SCROW nRow, const UINT32 nNumFormat );
-    void				NewEntry( const SCROW nPos, const UINT32 nNumFormat );
+    void				SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat );
+    void				NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat );
     void				Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& );
     void				Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab );
 public:		// geht niemanden etwas an...
@@ -201,12 +201,12 @@ class DifAttrCache
 {
 private:
     DifColumn**			ppCols;
-    BOOL				bPlain;
+    sal_Bool				bPlain;
 public:
-                        DifAttrCache( const BOOL bPlain );
+                        DifAttrCache( const sal_Bool bPlain );
                         ~DifAttrCache();
     inline void			SetLogical( const SCCOL nCol, const SCROW nRow );
-    void				SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat );
+    void				SetNumFormat( const SCCOL nCol, const SCROW nRow, const sal_uInt32 nNumFormat );
     void				Apply( ScDocument&, SCTAB nTab );
 };
 
diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx
index 6e8817133..390391603 100644
--- a/sc/source/filter/inc/eeimport.hxx
+++ b/sc/source/filter/inc/eeimport.hxx
@@ -49,7 +49,7 @@ protected:
     ScTabEditEngine*    mpEngine;
     Table*              mpRowHeights;
 
-    BOOL                GraphicSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
+    sal_Bool                GraphicSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                      ScEEParseEntry* );
     void                InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab,
                                        ScEEParseEntry* );
@@ -57,9 +57,9 @@ public:
     ScEEImport( ScDocument* pDoc, const ScRange& rRange );
     virtual ~ScEEImport();
 
-    virtual ULONG    Read( SvStream& rStream, const String& rBaseURL );
+    virtual sal_uLong    Read( SvStream& rStream, const String& rBaseURL );
     virtual ScRange  GetRange() { return maRange; }
-    virtual void     WriteToDocument( BOOL bSizeColsRows = FALSE,
+    virtual void     WriteToDocument( sal_Bool bSizeColsRows = sal_False,
                                       double nOutputFactor = 1.0,
                                       SvNumberFormatter* pFormatter = NULL,
                                       bool bConvertDate = true );
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index 2a06cbc31..7bb597fbb 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -69,28 +69,28 @@ struct ScEEParseEntry
     ScHTMLImageList*	pImageList;		// Grafiken in dieser Zelle
     SCCOL				nCol;			// relativ zum Beginn des Parse
     SCROW				nRow;
-    USHORT				nTab;			// HTML TableInTable
-    USHORT				nTwips;         // RTF ColAdjust etc.
+    sal_uInt16				nTab;			// HTML TableInTable
+    sal_uInt16				nTwips;         // RTF ColAdjust etc.
     SCCOL				nColOverlap;	// merged cells wenn >1
     SCROW				nRowOverlap;	// merged cells wenn >1
-    USHORT				nOffset;		// HTML PixelOffset
-    USHORT				nWidth;			// HTML PixelWidth
-    BOOL				bHasGraphic;	// HTML any image loaded
-    bool                bEntirePara;    // TRUE = use entire paragraph, false = use selection
+    sal_uInt16				nOffset;		// HTML PixelOffset
+    sal_uInt16				nWidth;			// HTML PixelWidth
+    sal_Bool				bHasGraphic;	// HTML any image loaded
+    bool                bEntirePara;    // sal_True = use entire paragraph, false = use selection
 
                         ScEEParseEntry( SfxItemPool* pPool ) :
                             aItemSet( *pPool ), pValStr( NULL ),
                             pNumStr( NULL ), pName( NULL ), pImageList( NULL ),
                             nCol(SCCOL_MAX), nRow(SCROW_MAX), nTab(0),
                             nColOverlap(1), nRowOverlap(1),
-                            nOffset(0), nWidth(0), bHasGraphic(FALSE), bEntirePara(true)
+                            nOffset(0), nWidth(0), bHasGraphic(sal_False), bEntirePara(true)
                             {}
                         ScEEParseEntry( const SfxItemSet& rItemSet ) :
                             aItemSet( rItemSet ), pValStr( NULL ),
                             pNumStr( NULL ), pName( NULL ), pImageList( NULL ),
                             nCol(SCCOL_MAX), nRow(SCROW_MAX), nTab(0),
                             nColOverlap(1), nRowOverlap(1),
-                            nOffset(0), nWidth(0), bHasGraphic(FALSE), bEntirePara(true)
+                            nOffset(0), nWidth(0), bHasGraphic(sal_False), bEntirePara(true)
                             {}
                         ~ScEEParseEntry()
                             {
@@ -137,11 +137,11 @@ public:
                         ScEEParser( EditEngine* );
     virtual				~ScEEParser();
 
-    virtual ULONG       Read( SvStream&, const String& rBaseURL ) = 0;
+    virtual sal_uLong       Read( SvStream&, const String& rBaseURL ) = 0;
 
     void				GetDimensions( SCCOL& nCols, SCROW& nRows ) const
                             { nCols = nColMax; nRows = nRowMax; }
-    ULONG				Count() const	{ return pList->Count(); }
+    sal_uLong				Count() const	{ return pList->Count(); }
     ScEEParseEntry*		First() const	{ return pList->First(); }
     ScEEParseEntry*		Next() const	{ return pList->Next(); }
     Table*				GetColWidths() const { return pColWidths; }
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index a05305d80..4be379e53 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -60,9 +60,9 @@ private:
     XclExpCellTableRef          mxCellTable;
 
     SCTAB                       mnScTab;    // table number SC document
-    UINT16						nExcTab;	// table number Excel document
-    UINT16						nAktRow;	// fuer'n Iterator
-    UINT16						nAktCol;
+    sal_uInt16						nExcTab;	// table number Excel document
+    sal_uInt16						nAktRow;	// fuer'n Iterator
+    sal_uInt16						nAktCol;
 
     NameBuffer*                 pTabNames;
 
diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx
index ab96e6387..713f06074 100644
--- a/sc/source/filter/inc/excform.hxx
+++ b/sc/source/filter/inc/excform.hxx
@@ -43,9 +43,9 @@ protected:
     enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA };
     typedef ::std::vector< ExtensionType >          ExtensionTypeVec;
 
-    BOOL				bExternName;	// wenn External Name gefunden wurde
-    static const UINT16	nRowMask;
-    static const UINT16	nLastInd;		// letzter Index fuer Excel->SC-
+    sal_Bool				bExternName;	// wenn External Name gefunden wurde
+    static const sal_uInt16	nRowMask;
+    static const sal_uInt16	nLastInd;		// letzter Index fuer Excel->SC-
                                         // Token Umsetzung
     XclFunctionProvider maFuncProv;
     const XclBiff       meBiff;
@@ -53,7 +53,7 @@ protected:
     // ---------------------------------------------------------------
     void				DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs, sal_uInt8 mnMinParamCount = 0 );
 
-    void				ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData&, const BOOL bName );
+    void				ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData&, const sal_Bool bName );
 
 public:
                         ExcelToSc( const XclImpRoot& rRoot );
@@ -66,20 +66,20 @@ public:
     virtual ConvErr     ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
                                            const String& rUrl, const ::std::vector<String>& rTabNames );
 
-    virtual BOOL        GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen );
+    virtual sal_Bool        GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen );
 
     void				GetDummy( const ScTokenArray*& );
     const ScTokenArray* GetBoolErr( XclBoolError );
-    BOOL                GetShrFmla( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen );
+    sal_Bool                GetShrFmla( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen );
 
 #if 0
-                            // return = TRUE -> String-Record folgt!
-    static BOOL			SetCurVal( ScFormulaCell& rCell, double& rCurVal );
+                            // return = sal_True -> String-Record folgt!
+    static sal_Bool			SetCurVal( ScFormulaCell& rCell, double& rCurVal );
 #endif
     static void			SetError( ScFormulaCell& rCell, const ConvErr eErr );
 
-    static inline BOOL	IsComplColRange( const UINT16 nCol1, const UINT16 nCol2 );
-    static inline BOOL	IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 );
+    static inline sal_Bool	IsComplColRange( const sal_uInt16 nCol1, const sal_uInt16 nCol2 );
+    static inline sal_Bool	IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 );
 
     void				SetComplCol( ScComplexRefData& );
     void				SetComplRow( ScComplexRefData& );
@@ -93,13 +93,13 @@ public:
 };
 
 
-inline BOOL ExcelToSc::IsComplColRange( const UINT16 nCol1, const UINT16 nCol2 )
+inline sal_Bool ExcelToSc::IsComplColRange( const sal_uInt16 nCol1, const sal_uInt16 nCol2 )
 {
     return ( nCol1 == 0x00 ) && ( nCol2 == 0xFF );
 }
 
 
-inline BOOL ExcelToSc::IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 )
+inline sal_Bool ExcelToSc::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 )
 {
     return ( ( nRow1 & 0x3FFF ) == 0x0000 ) && ( ( nRow2 & 0x3FFF ) == 0x3FFF );
 }
@@ -124,12 +124,12 @@ public:
 private:
     const XclImpLinkManager&    rLinkMan;
 
-    void                ExcRelToScRel8( UINT16 nRow, UINT16 nCol, ScSingleRefData&,
-                            const BOOL bName );
+    void                ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nCol, ScSingleRefData&,
+                            const sal_Bool bName );
 
-    bool                GetExternalFileIdFromXti( UINT16 nIxti, sal_uInt16& rFileId ) const;
+    bool                GetExternalFileIdFromXti( sal_uInt16 nIxti, sal_uInt16& rFileId ) const;
 
-    virtual bool        Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo );
+    virtual bool        Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo );
 
 public:
                         ExcelToSc8( const XclImpRoot& rRoot );
@@ -142,13 +142,13 @@ public:
     virtual ConvErr     ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
                                            const String& rUrl, const ::std::vector<String>& rTabNames );
 
-    static inline BOOL	IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 );
+    static inline sal_Bool	IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 );
 
-    virtual BOOL        GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen );
+    virtual sal_Bool        GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen );
 };
 
 
-inline BOOL ExcelToSc8::IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 )
+inline sal_Bool ExcelToSc8::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 )
 {
     return ( nRow1 == 0x0000 ) && ( nRow2 == 0xFFFF );
 }
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index d3cca163d..e3698ab53 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -73,7 +73,7 @@ protected:
     void					Labelsst( void );				// 0xFD
 
     void					Hlink( void );					// 0x01B8
-    void					Codename( BOOL bWBGlobals );	// 0x01BA
+    void					Codename( sal_Bool bWBGlobals );	// 0x01BA
     void                    SheetProtection( void );        // 0x0867
 
     virtual void            EndSheet( void );
@@ -94,17 +94,17 @@ private:
     ScDBData*					pCurrDBData;
     ScQueryParam				aParam;
     SCSIZE						nFirstEmpty;
-    BOOL						bActive;
-    BOOL						bHasConflict;
-    BOOL                        bCriteria;
-    BOOL                        bAutoOrAdvanced;
+    sal_Bool						bActive;
+    sal_Bool						bHasConflict;
+    sal_Bool                        bCriteria;
+    sal_Bool                        bAutoOrAdvanced;
     ScRange                     aCriteriaRange;
     String                      aFilterName;
 
     void						CreateFromDouble( String& rStr, double fVal );
     void						SetCellAttribs();
     void						InsertQueryParam();
-    void						AmendAFName(const BOOL bUseUnNamed);
+    void						AmendAFName(const sal_Bool bUseUnNamed);
 
 protected:
 public:
@@ -123,12 +123,12 @@ public:
 
     void						ReadAutoFilter( XclImpStream& rStrm );
 
-    inline void					Activate()			{ bActive = TRUE; }
+    inline void					Activate()			{ bActive = sal_True; }
     void                        SetAdvancedRange( const ScRange* pRange );
     void						SetExtractPos( const ScAddress& rAddr );
-    inline void                 SetAutoOrAdvanced()  { bAutoOrAdvanced = TRUE; }
-    void						Apply( const BOOL bUseUnNamed = FALSE );
-    void                        CreateScDBData( const BOOL bUseUnNamed );
+    inline void                 SetAutoOrAdvanced()  { bAutoOrAdvanced = sal_True; }
+    void						Apply( const sal_Bool bUseUnNamed = sal_False );
+    void                        CreateScDBData( const sal_Bool bUseUnNamed );
     void                        EnableRemoveFilter();
 };
 
@@ -138,7 +138,7 @@ class XclImpAutoFilterBuffer : private List
 private:
     using                       List::Insert;
 
-    UINT16                      nAFActiveCount;
+    sal_uInt16                      nAFActiveCount;
 
     inline XclImpAutoFilterData* _First()	{ return (XclImpAutoFilterData*) List::First(); }
     inline XclImpAutoFilterData* _Next()	{ return (XclImpAutoFilterData*) List::Next(); }
@@ -158,7 +158,7 @@ public:
 
     XclImpAutoFilterData*		GetByTab( SCTAB nTab );
     inline void                 IncrementActiveAF() { nAFActiveCount++; }
-    inline BOOL                 UseUnNamed() { return nAFActiveCount == 1; }
+    inline sal_Bool                 UseUnNamed() { return nAFActiveCount == 1; }
 };
 
 #endif
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index 1f7acfd78..22c2ce0f4 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -73,7 +73,7 @@ class ExcRecord : public XclExpRecord
 public:
     virtual void			Save( XclExpStream& rStrm );
 
-    virtual UINT16			GetNum() const = 0;
+    virtual sal_uInt16			GetNum() const = 0;
     virtual sal_Size        GetLen() const = 0;
 
 protected:
@@ -93,7 +93,7 @@ private:
 protected:
 public:
     virtual void			Save( XclExpStream& rStrm );
-    virtual UINT16			GetNum() const;
+    virtual sal_uInt16			GetNum() const;
     virtual sal_Size        GetLen() const;
 };
 
@@ -113,7 +113,7 @@ public:
     inline ExcRecord*		Next( void )				{ return ( ExcRecord* ) List::Next(); }
 
     inline void				Append( ExcRecord* pNew )	{ if( pNew ) List::Insert( pNew, LIST_APPEND ); }
-    inline const ExcRecord*	Get( UINT32 nNum ) const	{ return ( ExcRecord* ) List::GetObject( nNum ); }
+    inline const ExcRecord*	Get( sal_uInt32 nNum ) const	{ return ( ExcRecord* ) List::GetObject( nNum ); }
 
     virtual void			Save( XclExpStream& rStrm );
 };
@@ -126,13 +126,13 @@ class ExcDummyRec : public ExcRecord
 protected:
 public:
     virtual void			Save( XclExpStream& rStrm );
-    virtual UINT16			GetNum() const;
-    virtual	const BYTE*		GetData() const = 0;	// byte data must contain header and body
+    virtual sal_uInt16			GetNum() const;
+    virtual	const sal_uInt8*		GetData() const = 0;	// byte data must contain header and body
 };
 
 
 //------------------------------------------------------- class ExcBoolRecord -
-// stores BOOL as 16bit val ( 0x0000 | 0x0001 )
+// stores sal_Bool as 16bit val ( 0x0000 | 0x0001 )
 
 class ExcBoolRecord : public ExcRecord
 {
@@ -140,12 +140,12 @@ private:
     virtual void			SaveCont( XclExpStream& rStrm );
 
 protected:
-    BOOL					bVal;
+    sal_Bool					bVal;
 
-    inline					ExcBoolRecord() : bVal( FALSE ) {}
+    inline					ExcBoolRecord() : bVal( sal_False ) {}
 
 public:
-    inline					ExcBoolRecord( const BOOL bDefault ) : bVal( bDefault )	{}
+    inline					ExcBoolRecord( const sal_Bool bDefault ) : bVal( bDefault )	{}
 
     virtual sal_Size        GetLen( void ) const;
 };
@@ -157,10 +157,10 @@ class ExcBof_Base : public ExcRecord
 {
 private:
 protected:
-    UINT16					nDocType;
-    UINT16					nVers;
-    UINT16					nRupBuild;
-    UINT16					nRupYear;
+    sal_uInt16					nDocType;
+    sal_uInt16					nVers;
+    sal_uInt16					nRupBuild;
+    sal_uInt16					nRupYear;
 public:
                             ExcBof_Base( void );
 };
@@ -176,7 +176,7 @@ private:
 public:
                             ExcBof( void );
 
-    virtual UINT16			GetNum( void ) const;
+    virtual sal_uInt16			GetNum( void ) const;
     virtual sal_Size        GetLen( void ) const;
 };
 
@@ -191,7 +191,7 @@ private:
 public:
                             ExcBofW( void );
 
-    virtual UINT16			GetNum( void ) const;
+    virtual sal_uInt16			GetNum( void ) const;
     virtual sal_Size        GetLen( void ) const;
 };
 
@@ -202,7 +202,7 @@ class ExcEof : public ExcRecord
 {
 private:
 public:
-    virtual UINT16			GetNum( void ) const;
+    virtual sal_uInt16			GetNum( void ) const;
     virtual sal_Size        GetLen( void ) const;
 };
 
@@ -213,11 +213,11 @@ public:
 class ExcDummy_00 : public ExcDummyRec
 {
 private:
-    static const BYTE		pMyData[];
+    static const sal_uInt8		pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen( void ) const;
-    virtual	const BYTE*		GetData( void ) const;
+    virtual	const sal_uInt8*		GetData( void ) const;
 };
 
 // EXC_ID_WINDOWPROTECTION
@@ -256,11 +256,11 @@ private:
 class ExcDummy_040 : public ExcDummyRec
 {
 private:
-    static const BYTE		pMyData[];
+    static const sal_uInt8		pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen( void ) const;
-    virtual	const BYTE*		GetData( void ) const;
+    virtual	const sal_uInt8*		GetData( void ) const;
 };
 
 
@@ -268,11 +268,11 @@ public:
 class ExcDummy_041 : public ExcDummyRec
 {
 private:
-    static const BYTE		pMyData[];
+    static const sal_uInt8		pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen( void ) const;
-    virtual	const BYTE*		GetData( void ) const;
+    virtual	const sal_uInt8*		GetData( void ) const;
 };
 
 
@@ -282,7 +282,7 @@ class Exc1904 : public ExcBoolRecord
 {
 public:
                             Exc1904( ScDocument& rDoc );
-    virtual UINT16			GetNum( void ) const;
+    virtual sal_uInt16			GetNum( void ) const;
 
     virtual void            SaveXml( XclExpXmlStream& rStrm );
 };
@@ -295,7 +295,7 @@ class ExcBundlesheetBase : public ExcRecord
 protected:
     sal_Size                nStrPos;
     sal_Size                nOwnPos;    // Position NACH # und Len
-    UINT16					nGrbit;
+    sal_uInt16					nGrbit;
     SCTAB                   nTab;
 
                             ExcBundlesheetBase();
@@ -306,7 +306,7 @@ public:
     inline void             SetStreamPos( sal_Size nNewStrPos ) { nStrPos = nNewStrPos; }
     void					UpdateStreamPos( XclExpStream& rStrm );
 
-    virtual UINT16			GetNum() const;
+    virtual sal_uInt16			GetNum() const;
 };
 
 
@@ -329,11 +329,11 @@ public:
 class ExcDummy_02a : public ExcDummyRec
 {
 private:
-    static const BYTE		pMyData[];
+    static const sal_uInt8		pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen( void ) const;
-    virtual	const BYTE*		GetData( void ) const;
+    virtual	const sal_uInt8*		GetData( void ) const;
 };
 
 
@@ -395,8 +395,8 @@ private:
 class ExcFilterCondition
 {
 private:
-    UINT8					nType;
-    UINT8					nOper;
+    sal_uInt8					nType;
+    sal_uInt8					nOper;
     double					fVal;
     XclExpString*           pText;
 
@@ -405,11 +405,11 @@ public:
                             ExcFilterCondition();
                             ~ExcFilterCondition();
 
-    inline BOOL				IsEmpty() const 	{ return (nType == EXC_AFTYPE_NOTUSED); }
-    inline BOOL				HasEqual() const	{ return (nOper == EXC_AFOPER_EQUAL); }
-    ULONG					GetTextBytes() const;
+    inline sal_Bool				IsEmpty() const 	{ return (nType == EXC_AFTYPE_NOTUSED); }
+    inline sal_Bool				HasEqual() const	{ return (nOper == EXC_AFOPER_EQUAL); }
+    sal_uLong					GetTextBytes() const;
 
-    void					SetCondition( UINT8 nTp, UINT8 nOp, double fV, String* pT );
+    void					SetCondition( sal_uInt8 nTp, sal_uInt8 nOp, double fV, String* pT );
 
     void					Save( XclExpStream& rStrm );
     void					SaveXml( XclExpXmlStream& rStrm );
@@ -421,25 +421,25 @@ public:
 class XclExpAutofilter : public XclExpRecord, protected XclExpRoot
 {
 private:
-    UINT16					nCol;
-    UINT16					nFlags;
+    sal_uInt16					nCol;
+    sal_uInt16					nFlags;
     ExcFilterCondition		aCond[ 2 ];
 
-    BOOL					AddCondition( ScQueryConnect eConn, UINT8 nType,
-                                UINT8 nOp, double fVal, String* pText,
-                                BOOL bSimple = FALSE );
+    sal_Bool					AddCondition( ScQueryConnect eConn, sal_uInt8 nType,
+                                sal_uInt8 nOp, double fVal, String* pText,
+                                sal_Bool bSimple = sal_False );
 
     virtual void            WriteBody( XclExpStream& rStrm );
 
 protected:
 public:
-                            XclExpAutofilter( const XclExpRoot& rRoot, UINT16 nC );
+                            XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC );
 
-    inline UINT16			GetCol() const			{ return nCol; }
-    inline BOOL				HasCondition() const	{ return !aCond[ 0 ].IsEmpty(); }
-    inline BOOL             HasTop10() const        { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); }
+    inline sal_uInt16			GetCol() const			{ return nCol; }
+    inline sal_Bool				HasCondition() const	{ return !aCond[ 0 ].IsEmpty(); }
+    inline sal_Bool             HasTop10() const        { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); }
 
-    BOOL                    AddEntry( const ScQueryEntry& rEntry );
+    sal_Bool                    AddEntry( const ScQueryEntry& rEntry );
 
     virtual void            SaveXml( XclExpXmlStream& rStrm );
 };
@@ -461,7 +461,7 @@ public:
 
 private:
     XclExpAutofilter*   GetByCol( SCCOL nCol ); // always 0-based
-    BOOL                IsFiltered( SCCOL nCol );
+    sal_Bool                IsFiltered( SCCOL nCol );
 
 private:
     typedef XclExpRecordList< XclExpAutofilter >    XclExpAutofilterList;
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index e90aa921d..a2dabcb5f 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -45,10 +45,10 @@ class ExcScenarioCell
 private:
     String						aValue;
 public:
-    const UINT16				nCol;
-    const UINT16				nRow;
+    const sal_uInt16				nCol;
+    const sal_uInt16				nRow;
 
-                                ExcScenarioCell( const UINT16 nC, const UINT16 nR );
+                                ExcScenarioCell( const sal_uInt16 nC, const sal_uInt16 nR );
     void						SetValue( const String& rVal );
     inline const String&		GetValue( void ) const;
 };
@@ -64,11 +64,11 @@ protected:
     String*						pName;
     String*						pComment;
     String*						pUserName;
-    UINT8						nProtected;
+    sal_uInt8						nProtected;
 
-    const UINT16				nTab;
+    const sal_uInt16				nTab;
 
-    void                        Apply( const XclImpRoot& rRoot, const BOOL bLast = FALSE );
+    void                        Apply( const XclImpRoot& rRoot, const sal_Bool bLast = sal_False );
 public:
                                 ExcScenario( XclImpStream& rIn, const RootData& rRoot );
     virtual						~ExcScenario();
@@ -80,7 +80,7 @@ public:
 class ExcScenarioList : protected List
 {
 private:
-    UINT16						nLastScenario;
+    sal_uInt16						nLastScenario;
     inline ExcScenario*			_First( void )	{ return ( ExcScenario* ) List::First(); }
     inline ExcScenario*			_Next( void )	{ return ( ExcScenario* ) List::Next(); }
     inline ExcScenario*			_Last( void )	{ return ( ExcScenario* ) List::Last(); }
@@ -92,7 +92,7 @@ public:
 
     inline void					Append( ExcScenario* pNew );
 
-    inline void					SetLast( const UINT16 nIndex4Last );
+    inline void					SetLast( const sal_uInt16 nIndex4Last );
 
     inline const ExcScenario*	First( void );
     inline const ExcScenario*	Next( void );
@@ -137,7 +137,7 @@ inline const ExcScenario* ExcScenarioList::Next( void )
 }
 
 
-inline void ExcScenarioList::SetLast( const UINT16 n )
+inline void ExcScenarioList::SetLast( const sal_uInt16 n )
 {
     nLastScenario = n;
 }
diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx
index a115c7b6e..45b60fbf2 100644
--- a/sc/source/filter/inc/exp_op.hxx
+++ b/sc/source/filter/inc/exp_op.hxx
@@ -63,7 +63,7 @@ public:
 class ExportWK1 : public ExportTyp
 {
 private:
-    BYTE				GenFormByte( const ScPatternAttr& );
+    sal_uInt8				GenFormByte( const ScPatternAttr& );
     void				Bof();
     void				Eof();
     void				Calcmode();
@@ -73,10 +73,10 @@ private:
     void				Dimensions();
     void				Window1();
     void				Colw();
-    void				Blank( const UINT16 nC, const UINT16 nR, const ScPatternAttr& );
-    void				Number( const UINT16 nC, const UINT16 nR, const double f, const ScPatternAttr& );
-    void				Label( const UINT16 nC, const UINT16 nR, const String&, const ScPatternAttr& );
-    void				Formula( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& );
+    void				Blank( const sal_uInt16 nC, const sal_uInt16 nR, const ScPatternAttr& );
+    void				Number( const sal_uInt16 nC, const sal_uInt16 nR, const double f, const ScPatternAttr& );
+    void				Label( const sal_uInt16 nC, const sal_uInt16 nR, const String&, const ScPatternAttr& );
+    void				Formula( const sal_uInt16 nC, const sal_uInt16 nR, const ScFormulaCell*, const ScPatternAttr& );
     void				Protect();
     void				Footer();
     void				Header();
@@ -84,14 +84,14 @@ private:
     void				Labelfmt();
     void				Calccount();
     void				Cursorw12();
-    void				WKString( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& );
+    void				WKString( const sal_uInt16 nC, const sal_uInt16 nR, const ScFormulaCell*, const ScPatternAttr& );
     void				Snrange();
     void				Hidcol();
     void				Cpi();
 public:
 
-    static  const USHORT    WK1MAXCOL;
-    static  const USHORT    WK1MAXROW;
+    static  const sal_uInt16    WK1MAXCOL;
+    static  const sal_uInt16    WK1MAXROW;
 
     inline 				ExportWK1( SvStream& r, ScDocument* p, CharSet e ) :
                             ExportTyp( r, p, e ) {};
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index cd41a7619..f633cc02e 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -59,19 +59,19 @@ public:
     virtual				~ScExportBase();
 
                         // Hidden Cols/Rows an den Raendern trimmen,
-                        // return: TRUE wenn Bereich vorhanden
+                        // return: sal_True wenn Bereich vorhanden
                         // Start/End/Col/Row muessen gueltige Ausgangswerte sein
-    BOOL				TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
+    sal_Bool				TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
                             SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const;
 
                         // Ausgabebereich einer Tabelle ermitteln,
                         // Hidden Cols/Rows an den Raendern beruecksichtigt,
-                        // return: TRUE wenn Bereich vorhanden
-    BOOL				GetDataArea( SCTAB nTab, SCCOL& nStartCol,
+                        // return: sal_True wenn Bereich vorhanden
+    sal_Bool				GetDataArea( SCTAB nTab, SCCOL& nStartCol,
                             SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const;
 
                         // Tabelle nicht vorhanden oder leer
-    BOOL				IsEmptyTable( SCTAB nTab ) const;
+    sal_Bool				IsEmptyTable( SCTAB nTab ) const;
 
     ScFieldEditEngine&	GetEditEngine() const;
 
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index 53a08ec84..e1df0e9f1 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -84,7 +84,7 @@ public:
     inline void				Append( const ScComplexRefData& rCRD );
 
     using                   List::Count;
-    inline BOOL				HasRanges( void ) const;
+    inline sal_Bool				HasRanges( void ) const;
 
     inline const ScRange*	First( void );
     inline const ScRange*	Next( void );
@@ -103,7 +103,7 @@ inline void _ScRangeList::Append( ScRange* p )
 }
 
 
-inline BOOL _ScRangeList::HasRanges( void ) const
+inline sal_Bool _ScRangeList::HasRanges( void ) const
 {
     return Count() > 0;
 }
@@ -143,27 +143,27 @@ class _ScRangeListTabs
 {
 private:
 protected:
-    BOOL						bHasRanges;
+    sal_Bool						bHasRanges;
     _ScRangeList**				ppTabLists;
     _ScRangeList*				pAct;
-    UINT16						nAct;
+    sal_uInt16						nAct;
 public:
                                 _ScRangeListTabs( void );
     virtual						~_ScRangeListTabs();
 
-    void						Append( ScSingleRefData aSRD, const BOOL bLimit = TRUE );
-    void						Append( ScComplexRefData aCRD, const BOOL bLimit = TRUE );
+    void						Append( ScSingleRefData aSRD, const sal_Bool bLimit = sal_True );
+    void						Append( ScComplexRefData aCRD, const sal_Bool bLimit = sal_True );
 
-    inline BOOL					HasRanges( void ) const;
+    inline sal_Bool					HasRanges( void ) const;
 
-    const ScRange*				First( const UINT16 nTab = 0 );
+    const ScRange*				First( const sal_uInt16 nTab = 0 );
     const ScRange*				Next( void );
 //		const ScRange*				NextContinue( void );
     inline const _ScRangeList*	GetActList( void ) const;
 };
 
 
-inline BOOL _ScRangeListTabs::HasRanges( void ) const
+inline sal_Bool _ScRangeListTabs::HasRanges( void ) const
 {
     return bHasRanges;
 }
@@ -185,9 +185,9 @@ protected:
     ScAddress           aEingPos;
     ConvErr             eStatus;
     sal_Char*			pBuffer;		// Universal-Puffer
-    UINT16				nBufferSize;	// ...und seine Groesse
+    sal_uInt16				nBufferSize;	// ...und seine Groesse
 
-                        ConverterBase( UINT16 nNewBuffer );
+                        ConverterBase( sal_uInt16 nNewBuffer );
     virtual				~ConverterBase();
 
     void				Reset();
@@ -204,7 +204,7 @@ public:
 class ExcelConverterBase : public ConverterBase
 {
 protected:
-                        ExcelConverterBase( UINT16 nNewBuffer );
+                        ExcelConverterBase( sal_uInt16 nNewBuffer );
     virtual				~ExcelConverterBase();
 
 public:
@@ -223,25 +223,25 @@ class LotusConverterBase : public ConverterBase
 {
 protected:
     SvStream&			aIn;
-    INT32				nBytesLeft;
+    sal_Int32				nBytesLeft;
 
     inline void			Ignore( const long nSeekRel );
     inline void			Read( sal_Char& nByte );
-    inline void			Read( BYTE& nByte );
-    inline void			Read( UINT16& nUINT16 );
-    inline void			Read( INT16& nINT16 );
+    inline void			Read( sal_uInt8& nByte );
+    inline void			Read( sal_uInt16& nUINT16 );
+    inline void			Read( sal_Int16& nINT16 );
     inline void			Read( double& fDouble );
-        inline void                     Read( UINT32& nUINT32 );
+        inline void                     Read( sal_uInt32& nUINT32 );
 
-                        LotusConverterBase( SvStream& rStr, UINT16 nNewBuffer );
+                        LotusConverterBase( SvStream& rStr, sal_uInt16 nNewBuffer );
     virtual				~LotusConverterBase();
 
 public:
-//UNUSED2008-05  void                Reset( INT32 nLen );
-//UNUSED2008-05  void                Reset( INT32 nLen, const ScAddress& rEingPos );
+//UNUSED2008-05  void                Reset( sal_Int32 nLen );
+//UNUSED2008-05  void                Reset( sal_Int32 nLen, const ScAddress& rEingPos );
     void                Reset( const ScAddress& rEingPos );
 
-    virtual ConvErr		Convert( const ScTokenArray*& rpErg, INT32& nRest,
+    virtual ConvErr		Convert( const ScTokenArray*& rpErg, sal_Int32& nRest,
                                     const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
 
 protected:
@@ -261,19 +261,19 @@ inline void LotusConverterBase::Read( sal_Char& nByte )
     nBytesLeft--;
 }
 
-inline void LotusConverterBase::Read( BYTE& nByte )
+inline void LotusConverterBase::Read( sal_uInt8& nByte )
 {
     aIn >> nByte;
     nBytesLeft--;
 }
 
-inline void LotusConverterBase::Read( UINT16& nUINT16 )
+inline void LotusConverterBase::Read( sal_uInt16& nUINT16 )
 {
     aIn >> nUINT16;
     nBytesLeft -= 2;
 }
 
-inline void LotusConverterBase::Read( INT16& nINT16 )
+inline void LotusConverterBase::Read( sal_Int16& nINT16 )
 {
     aIn >> nINT16;
     nBytesLeft -= 2;
@@ -285,7 +285,7 @@ inline void LotusConverterBase::Read( double& fDouble )
     nBytesLeft -= 8;
 }
 
-inline void LotusConverterBase::Read( UINT32& nUINT32 )
+inline void LotusConverterBase::Read( sal_uInt32& nUINT32 )
 {
     aIn >> nUINT32;
     nBytesLeft -= 4;
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index 56f0182f9..74caa34fd 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -114,7 +114,7 @@ class ScfProgressBar : ScfNoCopy
 {
 public:
     explicit            ScfProgressBar( SfxObjectShell* pDocShell, const String& rText );
-    explicit            ScfProgressBar( SfxObjectShell* pDocShell, USHORT nResId );
+    explicit            ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId );
     virtual             ~ScfProgressBar();
 
     /** Adds a new segment to the progress bar.
@@ -199,7 +199,7 @@ class ScfSimpleProgressBar
 {
 public:
     explicit            ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, const String& rText );
-    explicit            ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, USHORT nResId );
+    explicit            ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId );
 
     /** Set progress bar to the specified position. */
     inline void         ProgressAbs( sal_Size nPos ) { maProgress.ProgressAbs( nPos ); }
@@ -221,7 +221,7 @@ class ScfStreamProgressBar
 {
 public:
 //UNUSED2008-05  explicit            ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText );
-    explicit            ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, USHORT nResId = STR_LOAD_DOC );
+    explicit            ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, sal_uInt16 nResId = STR_LOAD_DOC );
 
     /** Sets the progress bar to the current stream position. */
     void                Progress();
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index 57050bbb0..8c6b1f940 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -312,11 +312,11 @@ public:
 
     /** Returns true, if the passed item set contains the item.
         @param bDeep  true = Searches in parent item sets too. */
-    static bool         CheckItem( const SfxItemSet& rItemSet, USHORT nWhichId, bool bDeep );
+    static bool         CheckItem( const SfxItemSet& rItemSet, sal_uInt16 nWhichId, bool bDeep );
     /** Returns true, if the passed item set contains at least one of the items.
         @param pnWhichIds  Zero-terminated array of Which-IDs.
         @param bDeep  true = Searches in parent item sets too. */
-    static bool         CheckItems( const SfxItemSet& rItemSet, const USHORT* pnWhichIds, bool bDeep );
+    static bool         CheckItems( const SfxItemSet& rItemSet, const sal_uInt16* pnWhichIds, bool bDeep );
 
     /** Puts the item into the passed item set.
         @descr  The item will be put into the item set, if bSkipPoolDef is false,
@@ -327,7 +327,7 @@ public:
         @param bSkipPoolDef  true = Do not put item if it is equal to pool default; false = Always put the item. */
     static void         PutItem(
                             SfxItemSet& rItemSet, const SfxPoolItem& rItem,
-                            USHORT nWhichId, bool bSkipPoolDef );
+                            sal_uInt16 nWhichId, bool bSkipPoolDef );
 
     /** Puts the item into the passed item set.
         @descr  The item will be put into the item set, if bSkipPoolDef is false,
@@ -420,7 +420,7 @@ typedef ::std::vector< String >                     ScfStringVec;
 template< typename Type > class ScfDelList
 {
 public:
-    inline explicit     ScfDelList( USHORT nInitSize = 16, USHORT nResize = 16 ) :
+    inline explicit     ScfDelList( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ) :
                             maList( nInitSize, nResize ) {}
     /** Creates a deep copy of the passed list (copy-constructs all contained objects). */
     inline explicit     ScfDelList( const ScfDelList& rSrc ) { *this = rSrc; }
@@ -429,23 +429,23 @@ public:
     /** Creates a deep copy of the passed list (copy-constructs all contained objects). */
     ScfDelList&         operator=( const ScfDelList& rSrc );
 
-    inline void         Insert( Type* pObj, ULONG nIndex )      { if( pObj ) maList.Insert( pObj, nIndex ); }
+    inline void         Insert( Type* pObj, sal_uLong nIndex )      { if( pObj ) maList.Insert( pObj, nIndex ); }
     inline void         Append( Type* pObj )                    { if( pObj ) maList.Insert( pObj, LIST_APPEND ); }
     /** Removes the object without deletion. */
-    inline Type*        Remove( ULONG nIndex )                  { return static_cast< Type* >( maList.Remove( nIndex ) ); }
+    inline Type*        Remove( sal_uLong nIndex )                  { return static_cast< Type* >( maList.Remove( nIndex ) ); }
     /** Removes and deletes the object. */
-    inline void         Delete( ULONG nIndex )                  { delete Remove( nIndex ); }
+    inline void         Delete( sal_uLong nIndex )                  { delete Remove( nIndex ); }
     /** Exchanges the contained object with the passed, returns the old. */
-    inline Type*        Exchange( Type* pObj, ULONG nIndex )    { return static_cast< Type* >( maList.Replace( pObj, nIndex ) ); }
+    inline Type*        Exchange( Type* pObj, sal_uLong nIndex )    { return static_cast< Type* >( maList.Replace( pObj, nIndex ) ); }
     /** Replaces (deletes) the contained object. */
-    inline void         Replace( Type* pObj, ULONG nIndex )     { delete Exchange( pObj, nIndex ); }
+    inline void         Replace( Type* pObj, sal_uLong nIndex )     { delete Exchange( pObj, nIndex ); }
 
     void                Clear();
-    inline ULONG        Count() const                           { return maList.Count(); }
+    inline sal_uLong        Count() const                           { return maList.Count(); }
     inline bool         Empty() const                           { return maList.Count() == 0; }
 
     inline Type*        GetCurObject() const                    { return static_cast< Type* >( maList.GetCurObject() ); }
-    inline ULONG        GetCurPos() const                       { return maList.GetCurPos(); }
+    inline sal_uLong        GetCurPos() const                       { return maList.GetCurPos(); }
     inline Type*        GetObject( sal_uInt32 nIndex ) const    { return static_cast< Type* >( maList.GetObject( nIndex ) ); }
 
     inline Type*        First() const                           { return static_cast< Type* >( maList.First() ); }
@@ -487,7 +487,7 @@ template< typename Type >
 class ScfDelStack : private ScfDelList< Type >
 {
 public:
-    inline              ScfDelStack( USHORT nInitSize = 16, USHORT nResize = 16 ) :
+    inline              ScfDelStack( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ) :
                             ScfDelList< Type >( nInitSize, nResize ) {}
 
     inline void         Push( Type* pObj )      { Append( pObj ); }
@@ -515,14 +515,14 @@ class ScFormatFilterPluginImpl : public ScFormatFilterPlugin {
         // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren
     virtual FltError ScImportStarCalc10( SvStream&, ScDocument* );
     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
-                 const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL );
+                 const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL );
     virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange );
     virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, 
-                                   double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, 
+                                   double nOutputFactor = 1.0, sal_Bool bCalcWidthHeight = sal_True, 
                                    SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true );
 
     virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange );
-    virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight );
+    virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScRange& rRange, sal_Bool bCalcWidthHeight );
     virtual String         GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName );
 
     // various export filters
@@ -531,10 +531,10 @@ class ScFormatFilterPluginImpl : public ScFormatFilterPlugin {
 #endif
     virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, CharSet eDest );
     virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const CharSet eDest,
-                                 UINT32 nDifOption = SC_DIFOPT_EXCEL );
+                                 sal_uInt32 nDifOption = SC_DIFOPT_EXCEL );
     virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest,
-                 UINT32 nDifOption = SC_DIFOPT_EXCEL );
-    virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, BOOL bAll,
+                 sal_uInt32 nDifOption = SC_DIFOPT_EXCEL );
+    virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, sal_Bool bAll,
                   const String& rStreamPath, String& rNonConvertibleChars );
     virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest );
 };
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 444ce48ef..743f59e57 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -51,10 +51,10 @@ struct ScHTMLStyle
 {	// Defaults aus StyleSheet
     Color				aBackgroundColor;
     String 				aFontFamilyName;
-    UINT32				nFontHeight;		// Item-Value
-    USHORT              nFontSizeNumber;    // HTML value 1-7
-    BYTE                nDefaultScriptType; // Font values are valid for the default script type
-    BOOL                bInitialized;
+    sal_uInt32				nFontHeight;		// Item-Value
+    sal_uInt16              nFontSizeNumber;    // HTML value 1-7
+    sal_uInt8                nDefaultScriptType; // Font values are valid for the default script type
+    sal_Bool                bInitialized;
 
     ScHTMLStyle() : nFontHeight(0), nFontSizeNumber(2), nDefaultScriptType(0),
         bInitialized(0) {}
@@ -77,13 +77,13 @@ struct ScHTMLGraphEntry
     Size				aSize;			// Groesse in Pixeln
     Size				aSpace;			// Spacing in Pixeln
     SdrObject*			pObject;
-    BOOL				bInCell;		// ob in Zelle ausgegeben wird
-    BOOL				bWritten;
+    sal_Bool				bInCell;		// ob in Zelle ausgegeben wird
+    sal_Bool				bWritten;
 
     ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange,
-        const Size& rSize, 	BOOL bIn, const Size& rSpace ) :
+        const Size& rSize, 	sal_Bool bIn, const Size& rSpace ) :
         aRange( rRange ), aSize( rSize ), aSpace( rSpace ),
-        pObject( pObj ), bInCell( bIn ), bWritten( FALSE ) {}
+        pObject( pObj ), bInCell( bIn ), bWritten( sal_False ) {}
 };
 
 DECLARE_LIST( ScHTMLGraphList, ScHTMLGraphEntry* )
@@ -94,11 +94,11 @@ const short nIndentMax = 23;
 class ScHTMLExport : public ScExportBase
 {
     // default HtmlFontSz[1-7]
-    static const USHORT	nDefaultFontSize[SC_HTML_FONTSIZES];
+    static const sal_uInt16	nDefaultFontSize[SC_HTML_FONTSIZES];
     // HtmlFontSz[1-7] in s*3.ini [user]
-    static USHORT		nFontSize[SC_HTML_FONTSIZES];
+    static sal_uInt16		nFontSize[SC_HTML_FONTSIZES];
     static const char*	pFontSizeCss[SC_HTML_FONTSIZES];
-    static const USHORT	nCellSpacing;
+    static const sal_uInt16	nCellSpacing;
     static const sal_Char __FAR_DATA sIndentSource[];
 
     ScHTMLGraphList		aGraphList;
@@ -114,13 +114,13 @@ class ScHTMLExport : public ScExportBase
     SCTAB				nUsedTables;
     short				nIndent;
     sal_Char			sIndent[nIndentMax+1];
-    BOOL				bAll;			// ganzes Dokument
-    BOOL				bTabHasGraphics;
-    BOOL				bTabAlignedLeft;
-    BOOL				bCalcAsShown;
-    BOOL				bCopyLocalFileToINet;
-    BOOL                bTableDataWidth;
-    BOOL                bTableDataHeight;
+    sal_Bool				bAll;			// ganzes Dokument
+    sal_Bool				bTabHasGraphics;
+    sal_Bool				bTabAlignedLeft;
+    sal_Bool				bCalcAsShown;
+    sal_Bool				bCopyLocalFileToINet;
+    sal_Bool                bTableDataWidth;
+    sal_Bool                bTableDataHeight;
 
     const SfxItemSet&	PageDefaults( SCTAB nTab );
 
@@ -132,16 +132,16 @@ class ScHTMLExport : public ScExportBase
     void				WriteGraphEntry( ScHTMLGraphEntry* );
     void                WriteImage( String& rLinkName,
                                     const Graphic&, const ByteString& rImgOptions,
-                                    ULONG nXOutFlags = 0 );
+                                    sal_uLong nXOutFlags = 0 );
                             // nXOutFlags fuer XOutBitmap::WriteGraphic
 
                         // write to stream if and only if URL fields in edit cell
-    BOOL				WriteFieldText( const ScEditCell* pCell );
+    sal_Bool				WriteFieldText( const ScEditCell* pCell );
 
                         // kopiere ggfs. eine lokale Datei ins Internet
-    BOOL 				CopyLocalFileToINet( String& rFileNm,
-                            const String& rTargetNm, BOOL bFileToFile = FALSE );
-    BOOL				HasCId() { return aCId.Len() > 0; }
+    sal_Bool 				CopyLocalFileToINet( String& rFileNm,
+                            const String& rTargetNm, sal_Bool bFileToFile = sal_False );
+    sal_Bool				HasCId() { return aCId.Len() > 0; }
     void				MakeCIdURL( String& rURL );
 
     void				PrepareGraphics( ScDrawLayer*, SCTAB nTab,
@@ -154,18 +154,18 @@ class ScHTMLExport : public ScExportBase
     void				BorderToStyle( ByteString& rOut, const char* pBorderName,
                                        const SvxBorderLine* pLine, bool& bInsertSemicolon );
 
-    USHORT				GetFontSizeNumber( USHORT nHeight );
-    const char*			GetFontSizeCss( USHORT nHeight );
-    USHORT				ToPixel( USHORT nTwips );
+    sal_uInt16				GetFontSizeNumber( sal_uInt16 nHeight );
+    const char*			GetFontSizeCss( sal_uInt16 nHeight );
+    sal_uInt16				ToPixel( sal_uInt16 nTwips );
     Size				MMToPixel( const Size& r100thMMSize );
     void				IncIndent( short nVal );
     const sal_Char*			GetIndentStr() { return sIndent; }
 
 public:
                         ScHTMLExport( SvStream&, const String&, ScDocument*, const ScRange&,
-                                        BOOL bAll, const String& aStreamPath );
+                                        sal_Bool bAll, const String& aStreamPath );
     virtual				~ScHTMLExport();
-    ULONG               Write();
+    sal_uLong               Write();
     const String&       GetNonConvertibleChars() const
                             { return aNonConvertibleChars; }
 };
diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx
index 9625fff3d..ae560c13f 100644
--- a/sc/source/filter/inc/htmlimp.hxx
+++ b/sc/source/filter/inc/htmlimp.hxx
@@ -38,11 +38,11 @@ private:
     static void			InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange );
 
 public:
-    ScHTMLImport( ScDocument* pDoc, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight = TRUE );
+    ScHTMLImport( ScDocument* pDoc, const String& rBaseURL, const ScRange& rRange, sal_Bool bCalcWidthHeight = sal_True );
     virtual ~ScHTMLImport();
     const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; }
 
-    virtual void		WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, 
+    virtual void		WriteToDocument( sal_Bool bSizeColsRows = sal_False, double nOutputFactor = 1.0, 
                                          SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true );
 
     static String		GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName );
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index 20e84eedb..d63c262cf 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -41,8 +41,8 @@
 const sal_uInt32 SC_HTML_FONTSIZES = 7;        // wie Export, HTML-Options
 
 // Pixel tolerance for SeekOffset and related.
-const USHORT SC_HTML_OFFSET_TOLERANCE_SMALL = 1;    // single table
-const USHORT SC_HTML_OFFSET_TOLERANCE_LARGE = 10;   // nested
+const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_SMALL = 1;    // single table
+const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_LARGE = 10;   // nested
 
 // ============================================================================
 // BASE class for HTML parser classes
@@ -61,7 +61,7 @@ public:
     explicit                    ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc );
     virtual                     ~ScHTMLParser();
 
-    virtual ULONG		        Read( SvStream& rStrm, const String& rBaseURL  ) = 0;
+    virtual sal_uLong		        Read( SvStream& rStrm, const String& rBaseURL  ) = 0;
 
     /** Returns the "global table" which contains the entire HTML document. */
     virtual const ScHTMLTable*  GetGlobalTable() const = 0;
@@ -70,30 +70,30 @@ public:
 
 // ============================================================================
 
-SV_DECL_VARARR_SORT( ScHTMLColOffset, ULONG, 16, 4)
+SV_DECL_VARARR_SORT( ScHTMLColOffset, sal_uLong, 16, 4)
 
 struct ScHTMLTableStackEntry
 {
     ScRangeListRef		xLockedList;
     ScEEParseEntry*		pCellEntry;
     ScHTMLColOffset*	pLocalColOffset;
-    ULONG				nFirstTableCell;
+    sal_uLong				nFirstTableCell;
     SCCOL				nColCnt;
     SCROW				nRowCnt;
     SCCOL				nColCntStart;
     SCCOL				nMaxCol;
-    USHORT				nTable;
-    USHORT				nTableWidth;
-    USHORT				nColOffset;
-    USHORT				nColOffsetStart;
-    BOOL				bFirstRow;
+    sal_uInt16				nTable;
+    sal_uInt16				nTableWidth;
+    sal_uInt16				nColOffset;
+    sal_uInt16				nColOffsetStart;
+    sal_Bool				bFirstRow;
                         ScHTMLTableStackEntry( ScEEParseEntry* pE,
                                 const ScRangeListRef& rL, ScHTMLColOffset* pTO,
-                                ULONG nFTC,
+                                sal_uLong nFTC,
                                 SCCOL nCol, SCROW nRow,
-                                SCCOL nStart, SCCOL nMax, USHORT nTab,
-                                USHORT nTW, USHORT nCO, USHORT nCOS,
-                                BOOL bFR )
+                                SCCOL nStart, SCCOL nMax, sal_uInt16 nTab,
+                                sal_uInt16 nTW, sal_uInt16 nCO, sal_uInt16 nCOS,
+                                sal_Bool bFR )
                             : xLockedList( rL ), pCellEntry( pE ),
                             pLocalColOffset( pTO ),
                             nFirstTableCell( nFTC ),
@@ -138,23 +138,23 @@ private:
     Table*				pTables;
     ScHTMLColOffset*	pColOffset;
     ScHTMLColOffset*	pLocalColOffset;	// je Table
-    ULONG				nFirstTableCell;	// je Table
+    sal_uLong				nFirstTableCell;	// je Table
     short				nTableLevel;
-    USHORT				nTable;
-    USHORT				nMaxTable;
+    sal_uInt16				nTable;
+    sal_uInt16				nMaxTable;
     SCCOL				nColCntStart;		// erste Col je Table
     SCCOL				nMaxCol;			// je Table
-    USHORT				nTableWidth;		// je Table
-    USHORT				nColOffset;			// aktuell, Pixel
-    USHORT				nColOffsetStart;	// Startwert je Table, in Pixel
-    USHORT				nMetaCnt;			// fuer ParseMetaOptions
-    USHORT              nOffsetTolerance;   // for use with SeekOffset and related
-    BOOL				bCalcWidthHeight;	// TRUE: calculate real column width
+    sal_uInt16				nTableWidth;		// je Table
+    sal_uInt16				nColOffset;			// aktuell, Pixel
+    sal_uInt16				nColOffsetStart;	// Startwert je Table, in Pixel
+    sal_uInt16				nMetaCnt;			// fuer ParseMetaOptions
+    sal_uInt16              nOffsetTolerance;   // for use with SeekOffset and related
+    sal_Bool				bCalcWidthHeight;	// TRUE: calculate real column width
                                             // FALSE: 1 html-col = 1 sc-col
-    BOOL				bTabInTabCell;
-    BOOL				bFirstRow;			// je Table, ob in erster Zeile
-    BOOL				bInCell;
-    BOOL				bInTitle;
+    sal_Bool				bTabInTabCell;
+    sal_Bool				bFirstRow;			// je Table, ob in erster Zeile
+    sal_Bool				bInCell;
+    sal_Bool				bInTitle;
 
     DECL_LINK( HTMLImportHdl, ImportInfo* );
     void				NewActEntry( ScEEParseEntry* );
@@ -162,24 +162,24 @@ private:
     void 				ProcToken( ImportInfo* );
     void 				CloseEntry( ImportInfo* );
     void				NextRow(  ImportInfo*  );
-    void				SkipLocked( ScEEParseEntry*, BOOL bJoin = TRUE );
-    static BOOL 		SeekOffset( ScHTMLColOffset*, USHORT nOffset,
-                                    SCCOL* pCol, USHORT nOffsetTol );
-    static void			MakeCol( ScHTMLColOffset*, USHORT& nOffset,
-                                USHORT& nWidth, USHORT nOffsetTol,
-                                USHORT nWidthTol );
-    static void			MakeColNoRef( ScHTMLColOffset*, USHORT nOffset,
-                                USHORT nWidth, USHORT nOffsetTol,
-                                USHORT nWidthTol );
-    static void 		ModifyOffset( ScHTMLColOffset*, USHORT& nOldOffset,
-                                    USHORT& nNewOffset, USHORT nOffsetTol );
+    void				SkipLocked( ScEEParseEntry*, sal_Bool bJoin = sal_True );
+    static sal_Bool 		SeekOffset( ScHTMLColOffset*, sal_uInt16 nOffset,
+                                    SCCOL* pCol, sal_uInt16 nOffsetTol );
+    static void			MakeCol( ScHTMLColOffset*, sal_uInt16& nOffset,
+                                sal_uInt16& nWidth, sal_uInt16 nOffsetTol,
+                                sal_uInt16 nWidthTol );
+    static void			MakeColNoRef( ScHTMLColOffset*, sal_uInt16 nOffset,
+                                sal_uInt16 nWidth, sal_uInt16 nOffsetTol,
+                                sal_uInt16 nWidthTol );
+    static void 		ModifyOffset( ScHTMLColOffset*, sal_uInt16& nOldOffset,
+                                    sal_uInt16& nNewOffset, sal_uInt16 nOffsetTol );
     void				Colonize( ScEEParseEntry* );
-    USHORT				GetWidth( ScEEParseEntry* );
+    sal_uInt16				GetWidth( ScEEParseEntry* );
     void				SetWidths();
     void				Adjust();
 
-    USHORT				GetWidthPixel( const HTMLOption* );
-    BOOL				IsAtBeginningOfText( ImportInfo* );
+    sal_uInt16				GetWidthPixel( const HTMLOption* );
+    sal_Bool				IsAtBeginningOfText( ImportInfo* );
 
     void				TableOn( ImportInfo* );
     void                ColOn( ImportInfo* );
@@ -195,7 +195,7 @@ private:
 public:
                         ScHTMLLayoutParser( EditEngine*, const String& rBaseURL, const Size& aPageSize, ScDocument* );
     virtual             ~ScHTMLLayoutParser();
-    virtual ULONG       Read( SvStream&, const String& rBaseURL  );
+    virtual sal_uLong       Read( SvStream&, const String& rBaseURL  );
     virtual const ScHTMLTable*  GetGlobalTable() const;
 };
 
@@ -587,7 +587,7 @@ public:
     explicit            ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc );
     virtual             ~ScHTMLQueryParser();
 
-    virtual ULONG       Read( SvStream& rStrm, const String& rBaseURL  );
+    virtual sal_uLong       Read( SvStream& rStrm, const String& rBaseURL  );
 
     /** Returns the "global table" which contains the entire HTML document. */
     virtual const ScHTMLTable* GetGlobalTable() const;
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 3775d4ea0..825b87f12 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -110,12 +110,12 @@ protected:
     XclImpOutlineListBuffer* pOutlineListBuffer;
 
     sal_Int16               mnLastRefIdx;
-    UINT16					nIxfeIndex;			// merkt sich Angabe im IXFE-Record
-    UINT16					nLastXF;			// letzter XF in Formula-Record
+    sal_uInt16					nIxfeIndex;			// merkt sich Angabe im IXFE-Record
+    sal_uInt16					nLastXF;			// letzter XF in Formula-Record
     SCTAB					nBdshtTab;			// Counter fuer Boundsheet
     ScFormulaCell*			pLastFormCell;		// fuer String-Records
 
-    BOOL					bTabTruncated;		// wenn Bereichsueberschreitung zum
+    sal_Bool					bTabTruncated;		// wenn Bereichsueberschreitung zum
                                                 //	Abschneiden von Zellen fuehrt
 
     // Record-Funktionen
@@ -182,12 +182,12 @@ protected:
 
     // ---------------------------------------------------------------
     void                    Formula( const XclAddress& rXclPos,
-                                UINT16 nXF, UINT16 nFormLen, double &rCurVal, BOOL bShrFmla );
+                                sal_uInt16 nXF, sal_uInt16 nFormLen, double &rCurVal, sal_Bool bShrFmla );
                                             // 		-> excform.cxx
 
     virtual void            EndSheet( void );
     void					NeueTabelle( void );
-    const ScTokenArray*		ErrorToFormula( BYTE bErrOrVal, BYTE nError,
+    const ScTokenArray*		ErrorToFormula( sal_uInt8 bErrOrVal, sal_uInt8 nError,
                                 double& rVal );
 
     virtual void            AdjustRowHeight();
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 302decc30..0adffeada 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -46,24 +46,24 @@ class LotAttrTable;
 
 struct LotAttrWK3
 {
-    UINT8					nFont;
-    UINT8					nLineStyle;
-    UINT8					nFontCol;
-    UINT8					nBack;
+    sal_uInt8					nFont;
+    sal_uInt8					nLineStyle;
+    sal_uInt8					nFontCol;
+    sal_uInt8					nBack;
 
-    inline BOOL				HasStyles( void );
-    inline BOOL				IsCentered( void );
+    inline sal_Bool				HasStyles( void );
+    inline sal_Bool				IsCentered( void );
 };
 
 
-inline BOOL LotAttrWK3::HasStyles( void )
+inline sal_Bool LotAttrWK3::HasStyles( void )
 {
     return ( nFont || nLineStyle || nFontCol || ( nBack & 0x7F ) );
                     // !! ohne Center-Bit!!
 }
 
 
-inline BOOL LotAttrWK3::IsCentered( void )
+inline sal_Bool LotAttrWK3::IsCentered( void )
 {
     return ( nBack & 0x80 );
 }
@@ -77,7 +77,7 @@ private:
     struct ENTRY
     {
         ScPatternAttr*	pPattAttr;
-        UINT32			nHash0;
+        sal_uInt32			nHash0;
 
         inline			ENTRY( const ScPatternAttr& r )			{ pPattAttr = new ScPatternAttr( r ); }
 
@@ -85,9 +85,9 @@ private:
 
         inline			~ENTRY()								{ delete pPattAttr; }
 
-        inline BOOL		operator ==( const ENTRY& r ) const		{ return nHash0 == r.nHash0; }
+        inline sal_Bool		operator ==( const ENTRY& r ) const		{ return nHash0 == r.nHash0; }
 
-        inline BOOL		operator ==( const UINT32& r ) const	{ return nHash0 == r; }
+        inline sal_Bool		operator ==( const sal_uInt32& r ) const	{ return nHash0 == r; }
     };
 
     ScDocumentPool*		pDocPool;
@@ -96,16 +96,16 @@ private:
     SvxColorItem*		pWhite;
     Color*				pColTab;
 
-    inline static void	MakeHash( const LotAttrWK3& rAttr, UINT32& rOut )
+    inline static void	MakeHash( const LotAttrWK3& rAttr, sal_uInt32& rOut )
                         {
-                            ( ( UINT8* ) &rOut )[ 0 ] = rAttr.nFont & 0x7F;
-                            ( ( UINT8* ) &rOut )[ 1 ] = rAttr.nLineStyle;
-                            ( ( UINT8* ) &rOut )[ 2 ] = rAttr.nFontCol;
-                            ( ( UINT8* ) &rOut )[ 3 ] = rAttr.nBack;
+                            ( ( sal_uInt8* ) &rOut )[ 0 ] = rAttr.nFont & 0x7F;
+                            ( ( sal_uInt8* ) &rOut )[ 1 ] = rAttr.nLineStyle;
+                            ( ( sal_uInt8* ) &rOut )[ 2 ] = rAttr.nFontCol;
+                            ( ( sal_uInt8* ) &rOut )[ 3 ] = rAttr.nBack;
                         }
-    static void			LotusToScBorderLine( UINT8 nLine, SvxBorderLine& );
-    const SvxColorItem&	GetColorItem( const UINT8 nLotIndex ) const;
-    const Color&		GetColor( const UINT8 nLotIndex ) const;
+    static void			LotusToScBorderLine( sal_uInt8 nLine, SvxBorderLine& );
+    const SvxColorItem&	GetColorItem( const sal_uInt8 nLotIndex ) const;
+    const Color&		GetColor( const sal_uInt8 nLotIndex ) const;
 public:
                         LotAttrCache( void );
                         ~LotAttrCache();
@@ -127,7 +127,7 @@ private:
 public:
                                 ~LotAttrCol( void );
     void						SetAttr( const SCROW nRow, const ScPatternAttr& );
-    void						Apply( const SCCOL nCol, const SCTAB nTab, const BOOL bClear = TRUE );
+    void						Apply( const SCCOL nCol, const SCTAB nTab, const sal_Bool bClear = sal_True );
     void						Clear( void );
 };
 
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index 8f9bd3572..b3902d47a 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -48,7 +48,7 @@ private:
         SvxFontItem*		pFont;
         SvxFontHeightItem*	pHeight;
         SvxColorItem*		pColor;
-        INT32				nType;		// < 0 -> undefiniert
+        sal_Int32				nType;		// < 0 -> undefiniert
         inline				ENTRY( void )
                             {
                                 pTmpName = NULL;
@@ -93,17 +93,17 @@ private:
                                     delete pColor;
                                 pColor = &rNew;
                             }
-        inline void			Type( const UINT16 nNew )		{ nType = nNew; }
+        inline void			Type( const sal_uInt16 nNew )		{ nType = nNew; }
     };
 
     ENTRY					pData[ 8 ];
-    const static UINT16		nSize;
+    const static sal_uInt16		nSize;
     void					MakeFont( ENTRY* pEntry );
 public:
-    void					Fill( const UINT8 nIndex, SfxItemSet& rItemSet );
-    void					SetName( const UINT16 nIndex, const String& rName );
-    void					SetHeight( const UINT16 nIndex, const UINT16 nHeight );
-    void					SetType( const UINT16 nIndex, const UINT16 nType );
+    void					Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet );
+    void					SetName( const sal_uInt16 nIndex, const String& rName );
+    void					SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeight );
+    void					SetType( const sal_uInt16 nIndex, const sal_uInt16 nType );
 };
 
 
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index 198fe0a3f..9a0d2ac9e 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -78,18 +78,18 @@ private:
     TokenId				nSubToken;	// ~
     TokenId				n0Token;	// '0.0';
     // ---------------------------------------------------------------
-    static FUNC_TYPE	IndexToType( BYTE );
-    static DefTokenId	IndexToToken( BYTE );
-    static FUNC_TYPE	IndexToTypeWK123( BYTE );
-    static DefTokenId	IndexToTokenWK123( BYTE );
-    void				DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName );
-    void				LotusRelToScRel( UINT16 nCol, UINT16 nRow,
+    static FUNC_TYPE	IndexToType( sal_uInt8 );
+    static DefTokenId	IndexToToken( sal_uInt8 );
+    static FUNC_TYPE	IndexToTypeWK123( sal_uInt8 );
+    static DefTokenId	IndexToTokenWK123( sal_uInt8 );
+    void				DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtName );
+    void				LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow,
                             ScSingleRefData& rSRD );
-    BOOL				bWK3;		// alternative Codeumsetzung statt fuer < WK1
-        BOOL                            bWK123;         // alternative for 123
+    sal_Bool				bWK3;		// alternative Codeumsetzung statt fuer < WK1
+        sal_Bool                            bWK123;         // alternative for 123
     // -------------------------------------------------------------------
-    void				ReadSRD( ScSingleRefData& rSRD, BYTE nFlags );
-    inline void			ReadCRD( ScComplexRefData& rCRD, BYTE nFlags );
+    void				ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nFlags );
+    inline void			ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nFlags );
     void				IncToken( TokenId &rParam );
                         // ACHTUNG: hier wird die aktuelle Token-Kette im Pool
                         // mit '(<rParam>)+1' fortgeschrieben und mit
@@ -99,8 +99,8 @@ private:
     void				NegToken( TokenId& rParam );
                         // ACHTUNG: wie ~, nur wird '-(<rParam>)' gebildet
 public:
-                        LotusToSc( SvStream& aStr, CharSet eSrc, BOOL b );
-    virtual ConvErr		Convert( const ScTokenArray*& rpErg, INT32& nRest,
+                        LotusToSc( SvStream& aStr, CharSet eSrc, sal_Bool b );
+    virtual ConvErr		Convert( const ScTokenArray*& rpErg, sal_Int32& nRest,
                                     const FORMULA_TYPE eFT = FT_CellFormula );
 
     void                Reset( const ScAddress& rEingPos );
@@ -111,7 +111,7 @@ private:
 };
 
 
-inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, BYTE nRelBit )
+inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit )
 {
     // erster Teil
     ReadSRD( rCRD.Ref1, nRelBit );
@@ -123,7 +123,7 @@ inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, BYTE nRelBit )
 
 inline void LotusToSc::SetWK3( void )
 {
-        bWK3 = TRUE;
+        bWK3 = sal_True;
 }
 
 
diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx
index 01df31162..75839e5c9 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -47,45 +47,45 @@ private:
     SvStream*			pIn;			// benoetigt wegen multiplem Read()!
     LotusFontBuffer*	pFontBuff;
     LotusToSc			aConv;
-    UINT16              nTab;           // z.Zt. bearbeitete Tabelle
-    INT32				nExtTab;
+    sal_uInt16              nTab;           // z.Zt. bearbeitete Tabelle
+    sal_Int32				nExtTab;
     // -------------------------------------------------------------------
     // in WK?-Datei
     void				Bof( void );						// 0x0000	00
-    BOOL				BofFm3( void );						// 0x0000	00
-    void				Columnwidth( UINT16 nRecLen );		// 0x0007	07
-    void				Hiddencolumn( UINT16 nRecLen );		// 0x0008	08
+    sal_Bool				BofFm3( void );						// 0x0000	00
+    void				Columnwidth( sal_uInt16 nRecLen );		// 0x0007	07
+    void				Hiddencolumn( sal_uInt16 nRecLen );		// 0x0008	08
     void				Userrange( void );					// 0x0009	09
     void				Errcell( void );					// 0x0014	20
     void				Nacell( void );						// 0x0015	21
     void				Labelcell( void );					// 0x0016	22
     void				Numbercell( void );					// 0x0017	23
     void				Smallnumcell( void );				// 0x0018	24
-    ScFormulaCell*		Formulacell( UINT16 nRecLen );		// 0x0019	25
+    ScFormulaCell*		Formulacell( sal_uInt16 nRecLen );		// 0x0019	25
     void				Formulastring( ScFormulaCell& );	// 0x001a	26
                                                             // 0x001b	27 special
     void				NamedSheet( void );					//			14000
-    void				RowPresentation( UINT16 nRecLen );	//			 2007
+    void				RowPresentation( sal_uInt16 nRecLen );	//			 2007
 
     // -------------------------------------------------------------------
     // in FM?-Datei
     void				Font_Face( void );					// 174
     void				Font_Type( void );					// 176
     void				Font_Ysize( void );					// 177
-    void				_Row( const UINT16 nRecLen );		// 197 ?
+    void				_Row( const sal_uInt16 nRecLen );		// 197 ?
     // -------------------------------------------------------------------
     inline void			Read( ScAddress& );
     inline void			Read( ScRange& );
         // fuer Addresses/Ranges im Format Row(16)/Tab(8)/Col(8)
     inline void			Read( sal_Char& );
-    inline void			Read( BYTE& );
-    inline void			Read( UINT16& );
-    inline void			Read( INT16& );
-    inline void			Read( UINT32& );
+    inline void			Read( sal_uInt8& );
+    inline void			Read( sal_uInt16& );
+    inline void			Read( sal_Int16& );
+    inline void			Read( sal_uInt32& );
     inline void			Read( double& );					// 10-Byte-IEEE lesen
     inline void			Read( LotAttrWK3& );
     void				Read( String& );					// 0-terminierten String einlesen
-    inline void			Skip( const UINT16 nNumBytes );
+    inline void			Skip( const sal_uInt16 nNumBytes );
     // -------------------------------------------------------------------
 public:
                         ImportLotus( SvStream&, ScDocument*, CharSet eSrc );
@@ -99,10 +99,10 @@ public:
 
 inline void ImportLotus::Read( ScAddress& rAddr )
 {
-    UINT16 nRow;
+    sal_uInt16 nRow;
     *pIn >> nRow;
     rAddr.SetRow( static_cast<SCROW>(nRow) );
-    BYTE nByte;
+    sal_uInt8 nByte;
     *pIn >> nByte;
     rAddr.SetTab( static_cast<SCTAB>(nByte) );
     *pIn >> nByte;
@@ -123,25 +123,25 @@ inline void ImportLotus::Read( sal_Char& r )
 }
 
 
-inline void ImportLotus::Read( BYTE& r )
+inline void ImportLotus::Read( sal_uInt8& r )
 {
     *pIn >> r;
 }
 
 
-inline void ImportLotus::Read( UINT16& r )
+inline void ImportLotus::Read( sal_uInt16& r )
 {
     *pIn >> r;
 }
 
 
-inline void ImportLotus::Read( INT16& r )
+inline void ImportLotus::Read( sal_Int16& r )
 {
     *pIn >> r;
 }
 
 
-inline void ImportLotus::Read( UINT32& r )
+inline void ImportLotus::Read( sal_uInt32& r )
 {
     *pIn >> r;
 }
@@ -159,7 +159,7 @@ inline void ImportLotus::Read( LotAttrWK3& r )
 }
 
 
-inline void ImportLotus::Skip( const UINT16 n )
+inline void ImportLotus::Skip( const sal_uInt16 n )
 {
     pIn->SeekRel( n );
 }
diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx
index a1515007e..106afd7e9 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -35,14 +35,14 @@
 
 class LotusRangeList;
 
-typedef UINT16	LR_ID;
+typedef sal_uInt16	LR_ID;
 #define ID_FAIL	0xFFFF
 
 class LotusRange
 {
     friend class LotusRangeList;
 private:
-    UINT32				nHash;
+    sal_uInt32				nHash;
     SCCOL				nColStart;
     SCROW				nRowStart;
     SCCOL				nColEnd;
@@ -56,9 +56,9 @@ public:
                         LotusRange( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
                         LotusRange( const LotusRange& );
     inline LotusRange	&operator =( const LotusRange& );
-    inline BOOL			operator ==( const LotusRange& ) const;
-    inline BOOL			operator !=( const LotusRange& ) const;
-    inline BOOL			IsSingle( void ) const;
+    inline sal_Bool			operator ==( const LotusRange& ) const;
+    inline sal_Bool			operator !=( const LotusRange& ) const;
+    inline sal_Bool			IsSingle( void ) const;
 };
 
 
@@ -84,7 +84,7 @@ inline LotusRange &LotusRange::operator =( const LotusRange& rCpy )
 }
 
 
-inline BOOL LotusRange::operator ==( const LotusRange& rRef ) const
+inline sal_Bool LotusRange::operator ==( const LotusRange& rRef ) const
 {
     return ( nHash == rRef.nHash && nColStart == rRef.nColStart &&
         nRowStart == rRef.nRowStart && nColEnd == rRef.nColEnd &&
@@ -92,7 +92,7 @@ inline BOOL LotusRange::operator ==( const LotusRange& rRef ) const
 }
 
 
-inline BOOL LotusRange::operator !=( const LotusRange& rRef ) const
+inline sal_Bool LotusRange::operator !=( const LotusRange& rRef ) const
 {
     return ( nHash != rRef.nHash || nColStart != rRef.nColStart ||
         nRowStart != rRef.nRowStart || nColEnd != rRef.nColEnd ||
@@ -100,7 +100,7 @@ inline BOOL LotusRange::operator !=( const LotusRange& rRef ) const
 }
 
 
-inline BOOL LotusRange::IsSingle( void ) const
+inline sal_Bool LotusRange::IsSingle( void ) const
 {
     return ( nColStart == nColEnd && nRowStart == nRowEnd );
 }
@@ -119,9 +119,9 @@ private:
 public:
                         LotusRangeList( void );
                         ~LotusRangeList( void );
-    inline UINT16		GetIndex( SCCOL nCol, SCROW nRow );
-    inline UINT16		GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
-    UINT16				GetIndex( const LotusRange& );
+    inline sal_uInt16		GetIndex( SCCOL nCol, SCROW nRow );
+    inline sal_uInt16		GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
+    sal_uInt16				GetIndex( const LotusRange& );
     inline void			Append( SCCOL nCol, SCROW nRow, const String& );
     inline void			Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE, const String& );
     void				Append( LotusRange* pLR, const String& rName );
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index ddf928ef5..023185a22 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -50,16 +50,16 @@ class StringHashEntry
 private:
     friend class NameBuffer;
     String			aString;
-    UINT32			nHash;
+    sal_uInt32			nHash;
 
-    static UINT32	MakeHashCode( const String& );
+    static sal_uInt32	MakeHashCode( const String& );
 public:
     inline			StringHashEntry( const String& );
     inline			StringHashEntry( void );
     inline void		operator =(	const sal_Char* );
     inline void		operator =(	const String& );
     inline void		operator =( const StringHashEntry& );
-    inline BOOL		operator ==( const StringHashEntry& ) const;
+    inline sal_Bool		operator ==( const StringHashEntry& ) const;
 };
 
 
@@ -95,7 +95,7 @@ inline void StringHashEntry::operator =( const StringHashEntry& r )
 }
 
 
-inline BOOL StringHashEntry::operator ==( const StringHashEntry& r ) const
+inline sal_Bool StringHashEntry::operator ==( const StringHashEntry& r ) const
 {
     return ( nHash == r.nHash && aString ==  r.aString );
 }
@@ -105,16 +105,16 @@ inline BOOL StringHashEntry::operator ==( const StringHashEntry& r ) const
 class NameBuffer : private List, public ExcRoot
 {
 private:
-    UINT16					nBase;		// Index-Basis
+    sal_uInt16					nBase;		// Index-Basis
 public:
 //    inline                  NameBuffer( void );   //#94039# prevent empty rootdata
     inline					NameBuffer( RootData* );
-    inline					NameBuffer( RootData*, UINT16 nNewBase );
+    inline					NameBuffer( RootData*, sal_uInt16 nNewBase );
 
     virtual					~NameBuffer();
-    inline const String*	Get( UINT16 nIndex );
-    inline UINT16			GetLastIndex( void );
-    inline void				SetBase( UINT16 nNewBase = 0 );
+    inline const String*	Get( sal_uInt16 nIndex );
+    inline sal_uInt16			GetLastIndex( void );
+    inline void				SetBase( sal_uInt16 nNewBase = 0 );
     void					operator <<( const String& rNewString );
 };
 
@@ -131,13 +131,13 @@ inline NameBuffer::NameBuffer( RootData* p ) : ExcRoot( p )
 }
 
 
-inline NameBuffer::NameBuffer( RootData* p, UINT16 nNewBase ) : ExcRoot( p )
+inline NameBuffer::NameBuffer( RootData* p, sal_uInt16 nNewBase ) : ExcRoot( p )
 {
     nBase = nNewBase;
 }
 
 
-inline const String* NameBuffer::Get( UINT16 n )
+inline const String* NameBuffer::Get( sal_uInt16 n )
 {
     if( n < nBase )
         return NULL;
@@ -153,15 +153,15 @@ inline const String* NameBuffer::Get( UINT16 n )
 }
 
 
-inline UINT16 NameBuffer::GetLastIndex( void )
+inline sal_uInt16 NameBuffer::GetLastIndex( void )
 {
     DBG_ASSERT( Count() + nBase <= 0xFFFF, "*NameBuffer::GetLastIndex(): Ich hab' die Nase voll!" );
 
-    return ( UINT16 ) ( Count() + nBase );
+    return ( sal_uInt16 ) ( Count() + nBase );
 }
 
 
-inline void NameBuffer::SetBase( UINT16 nNewBase )
+inline void NameBuffer::SetBase( sal_uInt16 nNewBase )
 {
     nBase = nNewBase;
 }
@@ -175,7 +175,7 @@ class ShrfmlaBuffer : public ExcRoot
     {
         size_t operator() (const ScAddress &addr) const;
     };
-    typedef std::hash_map <ScAddress, USHORT, ScAddressHashFunc> ShrfmlaHash;
+    typedef std::hash_map <ScAddress, sal_uInt16, ScAddressHashFunc> ShrfmlaHash;
     typedef	std::list <ScRange>									 ShrfmlaList;
 
     ShrfmlaHash	 index_hash;
@@ -187,7 +187,7 @@ public:
     virtual					~ShrfmlaBuffer();
     void                    Clear();
     void					Store( const ScRange& rRange, const ScTokenArray& );
-    USHORT                  Find (const ScAddress & rAddress ) const;
+    sal_uInt16                  Find (const ScAddress & rAddress ) const;
 
     static String			CreateName( const ScRange& );
     };
@@ -203,9 +203,9 @@ private:
         StringHashEntry		aStrHashEntry;
         ScComplexRefData		aScComplexRefDataRel;
         String				aScAbsName;
-        UINT16				nAbsInd;		// == 0 -> noch keine Abs-Name!
-        UINT16				nRelInd;
-        BOOL				bSingleRef;
+        sal_uInt16				nAbsInd;		// == 0 -> noch keine Abs-Name!
+        sal_uInt16				nRelInd;
+        sal_Bool				bSingleRef;
                             ENTRY( const String& rName, const String& rScName, const ScComplexRefData& rCRD ) :
                                 aStrHashEntry( rName ),
                                 aScComplexRefDataRel( rCRD ),
@@ -217,14 +217,14 @@ private:
         };
 
     ScTokenArray*			pScTokenArray;
-    UINT16					nIntCount;
+    sal_uInt16					nIntCount;
 public:
                             RangeNameBufferWK3( void );
     virtual					~RangeNameBufferWK3();
     void					Add( const String& rName, const ScComplexRefData& rCRD );
     inline void				Add( const String& rName, const ScRange& aScRange );
-    BOOL					FindRel( const String& rRef, UINT16& rIndex );
-    BOOL					FindAbs( const String& rRef, UINT16& rIndex );
+    sal_Bool					FindRel( const String& rRef, sal_uInt16& rIndex );
+    sal_Bool					FindAbs( const String& rRef, sal_uInt16& rIndex );
 };
 
 
@@ -236,27 +236,27 @@ inline void RangeNameBufferWK3::Add( const String& rName, const ScRange& aScRang
 
     pSRD = &aCRD.Ref1;
     pScAddr = &aScRange.aStart;
-    pSRD->SetFlag3D( TRUE );
+    pSRD->SetFlag3D( sal_True );
     pSRD->nCol = pScAddr->Col();
     pSRD->nRow = pScAddr->Row();
     pSRD->nTab = pScAddr->Tab();
 
     // zunaechst ALLE Refs nur absolut
-    pSRD->SetColRel( FALSE );
-    pSRD->SetRowRel( FALSE );
-    pSRD->SetTabRel( FALSE );
+    pSRD->SetColRel( sal_False );
+    pSRD->SetRowRel( sal_False );
+    pSRD->SetTabRel( sal_False );
 
     pSRD = &aCRD.Ref2;
     pScAddr = &aScRange.aEnd;
-    pSRD->SetFlag3D( TRUE );
+    pSRD->SetFlag3D( sal_True );
     pSRD->nCol = pScAddr->Col();
     pSRD->nRow = pScAddr->Row();
     pSRD->nTab = pScAddr->Tab();
 
     // zunaechst ALLE Refs nur absolut
-    pSRD->SetColRel( FALSE );
-    pSRD->SetRowRel( FALSE );
-    pSRD->SetTabRel( FALSE );
+    pSRD->SetColRel( sal_False );
+    pSRD->SetRowRel( sal_False );
+    pSRD->SetTabRel( sal_False );
 
     Add( rName, aCRD );
 }
@@ -271,26 +271,26 @@ private:
         {
         String		aFile;
         String		aTab;
-        UINT16		nTabNum;	// 0xFFFF -> noch nicht angelegt
+        sal_uInt16		nTabNum;	// 0xFFFF -> noch nicht angelegt
                                 // 0xFFFE -> versucht anzulegen, ging aber schief
                                 // 0xFFFD -> soll im selben Workbook sein, findet's aber nicht
-        BOOL		bSWB;
-        BOOL		bLink;
+        sal_Bool		bSWB;
+        sal_Bool		bLink;
                     Cont( const String& rFilePathAndName, const String& rTabName ) :
                         aFile( rFilePathAndName ),
                         aTab( rTabName )
                     {
                         nTabNum = 0xFFFF;	// -> Tabelle noch nicht erzeugt
-                        bSWB = bLink = FALSE;
+                        bSWB = bLink = sal_False;
                     }
                     Cont( const String& rFilePathAndName, const String& rTabName,
-                        const BOOL bSameWB ) :
+                        const sal_Bool bSameWB ) :
                         aFile( rFilePathAndName ),
                         aTab( rTabName )
                     {
                         nTabNum = 0xFFFF;	// -> Tabelle noch nicht erzeugt
                         bSWB = bSameWB;
-                        bLink = FALSE;
+                        bLink = sal_False;
                     }
         };
 public:
@@ -298,11 +298,11 @@ public:
     virtual			~ExtSheetBuffer();
 
     sal_Int16       Add( const String& rFilePathAndName,
-                        const String& rTabName, const BOOL bSameWorkbook = FALSE );
+                        const String& rTabName, const sal_Bool bSameWorkbook = sal_False );
 
-    BOOL			GetScTabIndex( UINT16 nExcSheetIndex, UINT16& rIn_LastTab_Out_ScIndex );
-    BOOL			IsLink( const UINT16 nExcSheetIndex ) const;
-    BOOL			GetLink( const UINT16 nExcSheetIndex, String &rAppl, String &rDoc ) const;
+    sal_Bool			GetScTabIndex( sal_uInt16 nExcSheetIndex, sal_uInt16& rIn_LastTab_Out_ScIndex );
+    sal_Bool			IsLink( const sal_uInt16 nExcSheetIndex ) const;
+    sal_Bool			GetLink( const sal_uInt16 nExcSheetIndex, String &rAppl, String &rDoc ) const;
 
     void			Reset( void );
 };
@@ -318,13 +318,13 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p )
 struct ExtName
 {
     String			aName;
-    UINT32			nStorageId;
-    UINT16			nFlags;
+    sal_uInt32			nStorageId;
+    sal_uInt16			nFlags;
 
     inline          ExtName( const String& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {}
 
-    BOOL			IsDDE( void ) const;
-    BOOL            IsOLE( void ) const;
+    sal_Bool			IsDDE( void ) const;
+    sal_Bool            IsOLE( void ) const;
 };
 
 
@@ -336,7 +336,7 @@ public:
     explicit        ExtNameBuff( const XclImpRoot& rRoot );
 
     void            AddDDE( const String& rName, sal_Int16 nRefIdx );
-    void            AddOLE( const String& rName, sal_Int16 nRefIdx, UINT32 nStorageId );
+    void            AddOLE( const String& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId );
     void            AddName( const String& rName, sal_Int16 nRefIdx );
 
     const ExtName*  GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameIdx ) const;
diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h
index 8bcf8abd8..0f42085c3 100644
--- a/sc/source/filter/inc/op.h
+++ b/sc/source/filter/inc/op.h
@@ -33,38 +33,38 @@
 
 // OP-Code-Funktionen
 class SvStream;
-void NI( SvStream &aStream, USHORT nLaenge );
-void OP_BOF( SvStream &aStream, USHORT nLaenge );
-void OP_EOF( SvStream &aStream, USHORT nLaenge );
-void OP_Integer( SvStream &aStream, USHORT nLaenge );
-void OP_Number( SvStream &aStream, USHORT nLaenge );
-void OP_Label( SvStream &aStream, USHORT nLaenge );
-//UNUSED2009-05 void OP_Text( SvStream &aStream, USHORT nLaenge );		// WK3
-void OP_Integer3( SvStream &aStream, USHORT nLaenge );	// WK3
-void OP_Number3( SvStream &aStream, USHORT nLaenge );	// WK3
-void OP_Formula( SvStream &aStream, USHORT nLaenge );
-void OP_Formula3( SvStream &aStream, USHORT nLaenge );	// WK3
-void OP_ColumnWidth( SvStream &aStream, USHORT nLaenge );
-void OP_NamedRange( SvStream &aStream, USHORT nLaenge );
-void OP_SymphNamedRange( SvStream &aStream, USHORT nLaenge );
-void OP_Footer( SvStream &aStream, USHORT nLaenge );
-void OP_Header( SvStream &aStream, USHORT nLaenge );
-void OP_Margins( SvStream &aStream, USHORT nLaenge );
-void OP_HiddenCols( SvStream &aStream, USHORT nLaenge );
-void OP_Window1( SvStream &aStream, USHORT nLaenge );
-void OP_Blank( SvStream &aStream, USHORT nLaenge );
+void NI( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_BOF( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_EOF( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Integer( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Number( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Label( SvStream &aStream, sal_uInt16 nLaenge );
+//UNUSED2009-05 void OP_Text( SvStream &aStream, sal_uInt16 nLaenge );		// WK3
+void OP_Integer3( SvStream &aStream, sal_uInt16 nLaenge );	// WK3
+void OP_Number3( SvStream &aStream, sal_uInt16 nLaenge );	// WK3
+void OP_Formula( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Formula3( SvStream &aStream, sal_uInt16 nLaenge );	// WK3
+void OP_ColumnWidth( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_NamedRange( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_SymphNamedRange( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Footer( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Header( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Margins( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_HiddenCols( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Window1( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Blank( SvStream &aStream, sal_uInt16 nLaenge );
 // Lotus 123 bits.
-void OP_BOF123( SvStream &aStream, USHORT nLaenge );
-void OP_EOF123( SvStream &aStream, USHORT nLaenge );
-void OP_Number123( SvStream &aStream, USHORT nLaenge );
-void OP_Label123( SvStream &aStream, USHORT nLaenge );
-void OP_Formula123( SvStream &aStream, USHORT nLaenge );
-void OP_IEEENumber123(SvStream& r, UINT16 n);
-void OP_Note123(SvStream &aStream, USHORT nLaenge);
-void OP_CreatePattern123(SvStream &aStream, USHORT nLaenge);
-void OP_SheetName123( SvStream &rStream, USHORT nLength );
-void OP_HorAlign123(BYTE nAlignPattern, SfxItemSet& rPattern /*  const ScPatternAttr& rPattern*/  );
-void OP_VerAlign123(BYTE nAlignPattern, SfxItemSet& rPattern /*  const ScPatternAttr& rPattern*/  );
+void OP_BOF123( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_EOF123( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Number123( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Label123( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_Formula123( SvStream &aStream, sal_uInt16 nLaenge );
+void OP_IEEENumber123(SvStream& r, sal_uInt16 n);
+void OP_Note123(SvStream &aStream, sal_uInt16 nLaenge);
+void OP_CreatePattern123(SvStream &aStream, sal_uInt16 nLaenge);
+void OP_SheetName123( SvStream &rStream, sal_uInt16 nLength );
+void OP_HorAlign123(sal_uInt8 nAlignPattern, SfxItemSet& rPattern /*  const ScPatternAttr& rPattern*/  );
+void OP_VerAlign123(sal_uInt8 nAlignPattern, SfxItemSet& rPattern /*  const ScPatternAttr& rPattern*/  );
 void OP_ApplyPatternArea123(SvStream& r);
 
 #endif
diff --git a/sc/source/filter/inc/optab.h b/sc/source/filter/inc/optab.h
index cb579b94e..50dd641e5 100644
--- a/sc/source/filter/inc/optab.h
+++ b/sc/source/filter/inc/optab.h
@@ -28,7 +28,7 @@
 #ifndef SC_OPTAB_H
 #define SC_OPTAB_H
 
-typedef void ( *OPCODE_FKT )( SvStream &aStream, USHORT nLaenge );
+typedef void ( *OPCODE_FKT )( SvStream &aStream, sal_uInt16 nLaenge );
 
 #define FKT_LIMIT	101
 
diff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxx
index 036a55f85..d15d1d18f 100644
--- a/sc/source/filter/inc/otlnbuff.hxx
+++ b/sc/source/filter/inc/otlnbuff.hxx
@@ -36,39 +36,39 @@ class XclImpOutlineBuffer
 {
     // -> exctools.cxx
     private:
-        BYTE*			pLevel;
-        BOOL*			pOuted;
-        BOOL*			pHidden;
+        sal_uInt8*			pLevel;
+        sal_Bool*			pOuted;
+        sal_Bool*			pHidden;
         SCSIZE			nSize;
         SCSIZE			nLast;
-        BYTE			nMaxLevel;
+        sal_uInt8			nMaxLevel;
         ScOutlineArray*	pOutlineArray;
-        BOOL			bButtonNormal;	// TRUE -> right / under
+        sal_Bool			bButtonNormal;	// sal_True -> right / under
     public:
                         XclImpOutlineBuffer( SCSIZE nNewSize );
                         ~XclImpOutlineBuffer();
-        void			SetLevel( SCSIZE nIndex, BYTE nVal, BOOL bOuted, BOOL bHidden );
+        void			SetLevel( SCSIZE nIndex, sal_uInt8 nVal, sal_Bool bOuted, sal_Bool bHidden );
         void			SetOutlineArray( ScOutlineArray* pOArray );
         void			Reset( void );
         void			MakeScOutline( void );
-        void			SetLevelRange( SCSIZE nF, SCSIZE nL, BYTE nVal,
-                            BOOL bOuted, BOOL bHidden );
+        void			SetLevelRange( SCSIZE nF, SCSIZE nL, sal_uInt8 nVal,
+                            sal_Bool bOuted, sal_Bool bHidden );
 
-        inline BOOL		HasOutline( void ) const;
+        inline sal_Bool		HasOutline( void ) const;
 
-        inline void		SetButtonMode( const BOOL bRightOrUnder );
+        inline void		SetButtonMode( const sal_Bool bRightOrUnder );
 };
 
 
 
 
-inline BOOL XclImpOutlineBuffer::HasOutline( void ) const
+inline sal_Bool XclImpOutlineBuffer::HasOutline( void ) const
 {
     return nMaxLevel > 0;
 }
 
 
-inline void XclImpOutlineBuffer::SetButtonMode( const BOOL b )
+inline void XclImpOutlineBuffer::SetButtonMode( const sal_Bool b )
 {
     bButtonNormal = b;
 }
diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx
index 562724ffb..907b9e924 100644
--- a/sc/source/filter/inc/rtfexp.hxx
+++ b/sc/source/filter/inc/rtfexp.hxx
@@ -33,7 +33,7 @@
 
 class ScRTFExport : public ScExportBase
 {
-    ULONG*				pCellX;		// kumulierte Zellbreiten einer Tabelle
+    sal_uLong*				pCellX;		// kumulierte Zellbreiten einer Tabelle
 
     void				WriteTab( SCTAB nTab );
     void				WriteRow( SCTAB nTab, SCROW nRow );
@@ -44,7 +44,7 @@ public:
                         ScRTFExport( SvStream&, ScDocument*, const ScRange& );
     virtual				~ScRTFExport();
 
-    ULONG 				Write();
+    sal_uLong 				Write();
 };
 
 
diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx
index 6b8289e41..5f5c4893a 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -36,7 +36,7 @@ struct ScRTFCellDefault
 {
     SfxItemSet			aItemSet;
     SCCOL				nCol;
-    USHORT				nTwips;         // rechter Rand der Zelle
+    sal_uInt16				nTwips;         // rechter Rand der Zelle
     SCCOL				nColOverlap;	// MergeCell wenn >1, merged cells wenn 0
 
                         ScRTFCellDefault( SfxItemPool* pPool ) :
@@ -45,8 +45,8 @@ struct ScRTFCellDefault
 
 DECLARE_LIST( ScRTFDefaultList, ScRTFCellDefault* )
 // Remove: (const unsigned short &) not sufficiently different from (unsigned short)
-// deswegen ULONG, typedef bringt's auch nicht :-(
-SV_DECL_VARARR_SORT( ScRTFColTwips, ULONG, 16, 4)
+// deswegen sal_uLong, typedef bringt's auch nicht :-(
+SV_DECL_VARARR_SORT( ScRTFColTwips, sal_uLong, 16, 4)
 
 #else		// SC_RTFPARSE_CXX
 
@@ -67,22 +67,22 @@ private:
     ScRTFCellDefault*	pInsDefault;
     ScRTFCellDefault*	pActDefault;
     ScRTFCellDefault*	pDefMerge;
-    ULONG				nStartAdjust;
-    USHORT				nLastWidth;
-    BOOL				bNewDef;
+    sal_uLong				nStartAdjust;
+    sal_uInt16				nLastWidth;
+    sal_Bool				bNewDef;
 
     DECL_LINK( RTFImportHdl, ImportInfo* );
     inline void			NextRow();
     void				EntryEnd( ScEEParseEntry*, const ESelection& );
     void 				ProcToken( ImportInfo* );
     void				ColAdjust();
-    BOOL				SeekTwips( USHORT nTwips, SCCOL* pCol );
+    sal_Bool				SeekTwips( sal_uInt16 nTwips, SCCOL* pCol );
     void				NewCellRow( ImportInfo* );
 
 public:
                         ScRTFParser( EditEngine* );
     virtual				~ScRTFParser();
-    virtual ULONG       Read( SvStream&, const String& rBaseURL );
+    virtual sal_uLong       Read( SvStream&, const String& rBaseURL );
 };
 
 
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index 5f72600ed..13b77ed52 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -187,37 +187,37 @@
 // Datum/Uhrzeit
 struct Sc10DateTime
 {
-    USHORT		Year;
-    USHORT		Month;
-    USHORT		Day;
-    USHORT		Hour;
-    USHORT		Min;
-    USHORT		Sec;
+    sal_uInt16		Year;
+    sal_uInt16		Month;
+    sal_uInt16		Day;
+    sal_uInt16		Hour;
+    sal_uInt16		Min;
+    sal_uInt16		Sec;
 };
 
 // ZahlenFormate
 struct Sc10ValueFormat
 {
-    BYTE		Format;			// Zahl, Waehrung, Prozent etc.
-    BYTE		Info;			// Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat
+    sal_uInt8		Format;			// Zahl, Waehrung, Prozent etc.
+    sal_uInt8		Info;			// Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat
 };
 
 // Fontbeschreibung
 struct Sc10LogFont
 {
-    INT16		lfHeight;
-    INT16		lfWidth;
-    INT16		lfEscapement;
-    INT16		lfOrientation;
-    INT16		lfWeight;
-    BYTE		lfItalic;
-    BYTE		lfUnderline;
-    BYTE		lfStrikeOut;
-    BYTE		lfCharSet;
-    BYTE		lfOutPrecision;
-    BYTE		lfClipPrecision;
-    BYTE		lfQuality;
-    BYTE		lfPitchAndFamily;
+    sal_Int16		lfHeight;
+    sal_Int16		lfWidth;
+    sal_Int16		lfEscapement;
+    sal_Int16		lfOrientation;
+    sal_Int16		lfWeight;
+    sal_uInt8		lfItalic;
+    sal_uInt8		lfUnderline;
+    sal_uInt8		lfStrikeOut;
+    sal_uInt8		lfCharSet;
+    sal_uInt8		lfOutPrecision;
+    sal_uInt8		lfClipPrecision;
+    sal_uInt8		lfQuality;
+    sal_uInt8		lfPitchAndFamily;
     sal_Char	lfFaceName[32];
 
     int operator==( const Sc10LogFont& rData ) const;
@@ -226,51 +226,51 @@ struct Sc10LogFont
 // RGB-Frabwerte
 struct Sc10Color
 {
-    BYTE		Dummy;
-    BYTE		Blue;
-    BYTE		Green;
-    BYTE		Red;
+    sal_uInt8		Dummy;
+    sal_uInt8		Blue;
+    sal_uInt8		Green;
+    sal_uInt8		Red;
     int operator==( const Sc10Color& rColor ) const;
 };
 
 // Blockbeschreibung
 struct Sc10BlockRect
 {
-    INT16		x1;
-    INT16		y1;
-    INT16		x2;
-    INT16		y2;
+    sal_Int16		x1;
+    sal_Int16		y1;
+    sal_Int16		x2;
+    sal_Int16		y2;
 };
 
 // Datenbank-Bereich
 struct Sc10DataBaseRec
 {
     sal_Char		Name[32];
-    INT16			Tab;
+    sal_Int16			Tab;
     Sc10BlockRect	Block;
-    BYTE			RowHeader;
-    INT16			SortField0;
-    BYTE			SortUpOrder0;
-    INT16			SortField1;
-    BYTE			SortUpOrder1;
-    INT16			SortField2;
-    BYTE			SortUpOrder2;
-    BYTE			IncludeFormat;
-    INT16			QueryField0;
-    INT16			QueryOp0;
-    BYTE			QueryByString0;
+    sal_uInt8			RowHeader;
+    sal_Int16			SortField0;
+    sal_uInt8			SortUpOrder0;
+    sal_Int16			SortField1;
+    sal_uInt8			SortUpOrder1;
+    sal_Int16			SortField2;
+    sal_uInt8			SortUpOrder2;
+    sal_uInt8			IncludeFormat;
+    sal_Int16			QueryField0;
+    sal_Int16			QueryOp0;
+    sal_uInt8			QueryByString0;
     sal_Char		QueryString0[64];
     double			QueryValue0;
-    INT16			QueryConnect1;
-    INT16			QueryField1;
-    INT16			QueryOp1;
-    BYTE			QueryByString1;
+    sal_Int16			QueryConnect1;
+    sal_Int16			QueryField1;
+    sal_Int16			QueryOp1;
+    sal_uInt8			QueryByString1;
     sal_Char		QueryString1[64];
     double   		QueryValue1;
-    INT16			QueryConnect2;
-    INT16			QueryField2;
-    INT16			QueryOp2;
-    BYTE			QueryByString2;
+    sal_Int16			QueryConnect2;
+    sal_Int16			QueryField2;
+    sal_Int16			QueryOp2;
+    sal_uInt8			QueryByString2;
     sal_Char		QueryString2[64];
     double   		QueryValue2;
 };
@@ -280,15 +280,15 @@ struct Sc10HeadFootLine
 {
     sal_Char		Title[128];
     Sc10LogFont		LogFont;
-    BYTE			HorJustify;
-    BYTE			VerJustify;
-    USHORT			Raster;
-    USHORT			Frame;
+    sal_uInt8			HorJustify;
+    sal_uInt8			VerJustify;
+    sal_uInt16			Raster;
+    sal_uInt16			Frame;
     Sc10Color		TextColor;
     Sc10Color		BackColor;
     Sc10Color		RasterColor;
-    USHORT			FrameColor; // Nibble Codierte Farben link oben rechts unten
-    USHORT			Reserved;
+    sal_uInt16			FrameColor; // Nibble Codierte Farben link oben rechts unten
+    sal_uInt16			Reserved;
 
     int operator==( const Sc10HeadFootLine& rData ) const;
 };
@@ -298,31 +298,31 @@ struct Sc10PageFormat
 {
     Sc10HeadFootLine	HeadLine;
     Sc10HeadFootLine	FootLine;
-    INT16				Orientation;
-    INT16				Width;
-    INT16				Height;
-    INT16				NonPrintableX;
-    INT16				NonPrintableY;
-    INT16				Left;
-    INT16				Top;
-    INT16				Right;
-    INT16				Bottom;
-    INT16				Head;
-    INT16				Foot;
-    BYTE				HorCenter;
-    BYTE				VerCenter;
-    BYTE				PrintGrid;
-    BYTE				PrintColRow;
-    BYTE				PrintNote;
-    BYTE				TopBottomDir;
+    sal_Int16				Orientation;
+    sal_Int16				Width;
+    sal_Int16				Height;
+    sal_Int16				NonPrintableX;
+    sal_Int16				NonPrintableY;
+    sal_Int16				Left;
+    sal_Int16				Top;
+    sal_Int16				Right;
+    sal_Int16				Bottom;
+    sal_Int16				Head;
+    sal_Int16				Foot;
+    sal_uInt8				HorCenter;
+    sal_uInt8				VerCenter;
+    sal_uInt8				PrintGrid;
+    sal_uInt8				PrintColRow;
+    sal_uInt8				PrintNote;
+    sal_uInt8				TopBottomDir;
     sal_Char			PrintAreaName[32];
     Sc10BlockRect		PrintArea;
     sal_Char			PrnZoom[6]; // Pascal 6 Byte Realzahl
-    USHORT				FirstPageNo;
-    INT16				RowRepeatStart;
-    INT16				RowRepeatEnd;
-    INT16				ColRepeatStart;
-    INT16				ColRepeatEnd;
+    sal_uInt16				FirstPageNo;
+    sal_Int16				RowRepeatStart;
+    sal_Int16				RowRepeatEnd;
+    sal_Int16				ColRepeatStart;
+    sal_Int16				ColRepeatEnd;
     sal_Char			Reserved[26];
 
     int operator==( const Sc10PageFormat& rData ) const;
@@ -332,23 +332,23 @@ struct Sc10PageFormat
 struct Sc10TableProtect
 {
     sal_Char	PassWord[16];
-    USHORT		Flags;
-    BYTE		Protect;
+    sal_uInt16		Flags;
+    sal_uInt8		Protect;
 };
 
 // Documentschutz
 struct Sc10SheetProtect
 {
     sal_Char	PassWord[16];
-    USHORT		Flags;
-    BYTE		Protect;
+    sal_uInt16		Flags;
+    sal_uInt8		Protect;
 };
 
 // Dateikopf StarCalc 1.0 Datei
 struct Sc10FileHeader
 {
     sal_Char	CopyRight[30];
-    USHORT		Version;
+    sal_uInt16		Version;
     sal_Char	Reserved[32];
 };
 
@@ -390,29 +390,29 @@ struct Sc10FileInfo
 struct Sc10EditStateInfo
 {
     // Cursor Position
-    USHORT		CarretX;
-    USHORT		CarretY;
-    USHORT		CarretZ;
+    sal_uInt16		CarretX;
+    sal_uInt16		CarretY;
+    sal_uInt16		CarretZ;
     // Linke obere Ecke der Tabelle im Fenster
-    USHORT		DeltaX;
-    USHORT		DeltaY;
-    USHORT		DeltaZ;
+    sal_uInt16		DeltaX;
+    sal_uInt16		DeltaY;
+    sal_uInt16		DeltaZ;
     // Ueberfluessig in StarCalc 3.0
-    BYTE		DataBaseMode;
+    sal_uInt8		DataBaseMode;
     sal_Char	Reserved[51];
 };
 
 // Attribut-Eintrag
 struct Sc10ColData
 {
-    USHORT		Row;
-    USHORT		Value;
+    sal_uInt16		Row;
+    sal_uInt16		Value;
 };
 
 // ZellAttribut-Beschreibung
 struct Sc10ColAttr
 {
-    USHORT			Count;
+    sal_uInt16			Count;
     Sc10ColData*	pData;
 
     Sc10ColAttr() : pData(NULL) {}
@@ -421,18 +421,18 @@ struct Sc10ColAttr
 // GraphHeader
 struct Sc10GraphHeader
 {
-    BYTE		Typ;			// Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object)
-    INT16		CarretX;		// ZellPosition der Grafik
-    INT16		CarretY;
-    INT16		CarretZ;
-    INT32		x;				// x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege)
-    INT32		y;
-    INT32		w;				// w,h Breite und Hoehe in Pixel
-    INT32		h;
-    BYTE		IsRelPos;		// Ist die Position relativ zur Zelle oder absolute in der Tabelle
-    BYTE		DoPrint;		// Soll die Grafik ausgedruckt werden
-    USHORT		FrameType;		// Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick)
-    BYTE		IsTransparent;	// Soll der Hintergrund gezeichnet werden
+    sal_uInt8		Typ;			// Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object)
+    sal_Int16		CarretX;		// ZellPosition der Grafik
+    sal_Int16		CarretY;
+    sal_Int16		CarretZ;
+    sal_Int32		x;				// x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege)
+    sal_Int32		y;
+    sal_Int32		w;				// w,h Breite und Hoehe in Pixel
+    sal_Int32		h;
+    sal_uInt8		IsRelPos;		// Ist die Position relativ zur Zelle oder absolute in der Tabelle
+    sal_uInt8		DoPrint;		// Soll die Grafik ausgedruckt werden
+    sal_uInt16		FrameType;		// Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick)
+    sal_uInt8		IsTransparent;	// Soll der Hintergrund gezeichnet werden
     Sc10Color	FrameColor;		// Umrandungsfarbe als RGB-Wert
     Sc10Color	BackColor;		// Hintergrundfarbe als RGB-Wert
     sal_Char	Reserved[32];	// Na was wohl
@@ -442,50 +442,50 @@ struct Sc10GraphHeader
 struct Sc10ImageHeader
 {
     sal_Char    FileName[128];  // Dateiname des urspruenglich eingefuegten Bildes
-    INT16	Typ;				// Typ der Grafik (Bitmap oder Metafile)
-    BYTE	Linked;				// Kann nicht vorkommen
-    INT16	x1;					// Urspruengliche Groesse der Grafik (nur fuer Metafiles)
-    INT16	y1;
-    INT16	x2;
-    INT16	y2;
+    sal_Int16	Typ;				// Typ der Grafik (Bitmap oder Metafile)
+    sal_uInt8	Linked;				// Kann nicht vorkommen
+    sal_Int16	x1;					// Urspruengliche Groesse der Grafik (nur fuer Metafiles)
+    sal_Int16	y1;
+    sal_Int16	x2;
+    sal_Int16	y2;
     sal_uInt32 Size;				// Groesse der Grafik in BYTES
 };
 
 // ChartHeader
 struct Sc10ChartHeader
 {
-    INT16	MM;					// Meatfile Struktur MapMode, Breite, Hoehe
-    INT16	xExt;
-    INT16	yExt;
+    sal_Int16	MM;					// Meatfile Struktur MapMode, Breite, Hoehe
+    sal_Int16	xExt;
+    sal_Int16	yExt;
     sal_uInt32 Size;				// Groesse der Grafik in BYTES
 };
 
 // ChartSheetData
 struct Sc10ChartSheetData
 {
-    BYTE		HasTitle;		// Hat das Chart Daten aus der Tabell fuer einen Titel
-    INT16		TitleX;			// Zellposition des Titels
-    INT16		TitleY;
-    BYTE		HasSubTitle;	// Hat das Chart Daten aus der Tabell fuer einen Untertitel
-    INT16		SubTitleX;		// Zellposition des Untertitels
-    INT16		SubTitleY;
-    BYTE		HasLeftTitle;	// Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel
-    INT16		LeftTitleX;		// Zellposition des Linken-Titels
-    INT16		LeftTitleY;
-    BYTE		HasLegend;		// Hat das Chart Daten aus der Tabelle fuer eine Legende
-    INT16		LegendX1;		// Zellen der Legende
-    INT16		LegendY1;
-    INT16		LegendX2;
-    INT16		LegendY2;
-    BYTE		HasLabel;		// Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung
-    INT16		LabelX1;		// Zellen der Achsbeschriftung
-    INT16		LabelY1;
-    INT16		LabelX2;
-    INT16		LabelY2;
-    INT16		DataX1;			// Zellen der Daten
-    INT16		DataY1;
-    INT16		DataX2;
-    INT16		DataY2;
+    sal_uInt8		HasTitle;		// Hat das Chart Daten aus der Tabell fuer einen Titel
+    sal_Int16		TitleX;			// Zellposition des Titels
+    sal_Int16		TitleY;
+    sal_uInt8		HasSubTitle;	// Hat das Chart Daten aus der Tabell fuer einen Untertitel
+    sal_Int16		SubTitleX;		// Zellposition des Untertitels
+    sal_Int16		SubTitleY;
+    sal_uInt8		HasLeftTitle;	// Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel
+    sal_Int16		LeftTitleX;		// Zellposition des Linken-Titels
+    sal_Int16		LeftTitleY;
+    sal_uInt8		HasLegend;		// Hat das Chart Daten aus der Tabelle fuer eine Legende
+    sal_Int16		LegendX1;		// Zellen der Legende
+    sal_Int16		LegendY1;
+    sal_Int16		LegendX2;
+    sal_Int16		LegendY2;
+    sal_uInt8		HasLabel;		// Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung
+    sal_Int16		LabelX1;		// Zellen der Achsbeschriftung
+    sal_Int16		LabelY1;
+    sal_Int16		LabelX2;
+    sal_Int16		LabelY2;
+    sal_Int16		DataX1;			// Zellen der Daten
+    sal_Int16		DataY1;
+    sal_Int16		DataX2;
+    sal_Int16		DataY2;
     sal_Char	Reserved[64];
 };
 
@@ -504,29 +504,29 @@ typedef sal_Char Sc10ChartText[30];
 
 struct Sc10ChartTypeData
 {
-    INT16			NumSets;
-    INT16			NumPoints;
-    INT16			DrawMode;
-    INT16			GraphType;
-    INT16			GraphStyle;
+    sal_Int16			NumSets;
+    sal_Int16			NumPoints;
+    sal_Int16			DrawMode;
+    sal_Int16			GraphType;
+    sal_Int16			GraphStyle;
     sal_Char		GraphTitle[80];
     sal_Char		BottomTitle[80];
-    INT16			SymbolData[256];
-    INT16			ColorData[256];
-    INT16			ThickLines[256];
-    INT16			PatternData[256];
-    INT16			LinePatternData[256];
-    INT16			NumGraphStyles[11];
-    INT16			ShowLegend;
+    sal_Int16			SymbolData[256];
+    sal_Int16			ColorData[256];
+    sal_Int16			ThickLines[256];
+    sal_Int16			PatternData[256];
+    sal_Int16			LinePatternData[256];
+    sal_Int16			NumGraphStyles[11];
+    sal_Int16			ShowLegend;
     Sc10ChartText	LegendText[256];
-    INT16			ExplodePie;
-    INT16			FontUse;
-    INT16			FontFamily[5];
-    INT16			FontStyle[5];
-    INT16			FontSize[5];
-    INT16			GridStyle;
-    INT16			Labels;
-    INT16			LabelEvery;
+    sal_Int16			ExplodePie;
+    sal_Int16			FontUse;
+    sal_Int16			FontFamily[5];
+    sal_Int16			FontStyle[5];
+    sal_Int16			FontSize[5];
+    sal_Int16			GridStyle;
+    sal_Int16			Labels;
+    sal_Int16			LabelEvery;
     Sc10ChartText	LabelText[50];
     sal_Char		LeftTitle[80];
     sal_Char		Reserved[4646];
@@ -537,9 +537,9 @@ struct Sc10ChartTypeData
 class Sc10FontData : public ScDataObject
 {
 public:
-    INT16				Height;
-    BYTE				CharSet;
-    BYTE				PitchAndFamily;
+    sal_Int16				Height;
+    sal_uInt8				CharSet;
+    sal_uInt8				PitchAndFamily;
     sal_Char			FaceName[32];
 
                         Sc10FontData( const Sc10FontData& rData ) :
@@ -560,11 +560,11 @@ public:
 class Sc10FontCollection : public ScCollection
 {
 protected:
-    ULONG nError;
+    sal_uLong nError;
 public:
                         Sc10FontCollection( SvStream& rStream );
-    ULONG				GetError() { return nError; }
-    Sc10FontData*		At(USHORT nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); }
+    sal_uLong				GetError() { return nError; }
+    Sc10FontData*		At(sal_uInt16 nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); }
 private:
     using               ScCollection::At;
 };
@@ -596,11 +596,11 @@ public :
 class Sc10NameCollection : public ScCollection
 {
 protected:
-    ULONG				nError;
+    sal_uLong				nError;
 public:
                         Sc10NameCollection(SvStream& rStream);
-ULONG					GetError() { return nError; }
-Sc10NameData*			At(USHORT nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); }
+sal_uLong					GetError() { return nError; }
+Sc10NameData*			At(sal_uInt16 nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); }
 private:
     using               ScCollection::At;
 };
@@ -613,14 +613,14 @@ public:
     sal_Char			Name[32];
     Sc10ValueFormat		ValueFormat;
     Sc10LogFont			LogFont;
-    USHORT				Attr;
-    USHORT				Justify;
-    USHORT				Frame;
-    USHORT				Raster;
-    USHORT				nColor;
-    USHORT				FrameColor;
-    USHORT				Flags;
-    USHORT				FormatFlags;
+    sal_uInt16				Attr;
+    sal_uInt16				Justify;
+    sal_uInt16				Frame;
+    sal_uInt16				Raster;
+    sal_uInt16				nColor;
+    sal_uInt16				FrameColor;
+    sal_uInt16				Flags;
+    sal_uInt16				FormatFlags;
     sal_Char			Reserved[8];
 
                         Sc10PatternData(const Sc10PatternData& rData) :
@@ -649,11 +649,11 @@ virtual ScDataObject*		Clone() const { return new Sc10PatternData(*this); }
 class Sc10PatternCollection : public ScCollection
 {
 protected:
-    ULONG				nError;
+    sal_uLong				nError;
 public:
                         Sc10PatternCollection(SvStream& rStream);
-    ULONG				GetError() { return nError; }
-    Sc10PatternData*	At(USHORT nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); }
+    sal_uLong				GetError() { return nError; }
+    Sc10PatternData*	At(sal_uInt16 nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); }
 private:
     using               ScCollection::At;
 };
@@ -679,12 +679,12 @@ virtual ScDataObject*		Clone() const { return new Sc10DataBaseData(*this); }
 class Sc10DataBaseCollection : public ScCollection
 {
 protected:
-    ULONG				nError;
+    sal_uLong				nError;
     sal_Char			ActName[32];
 public:
                         Sc10DataBaseCollection(SvStream& rStream);
-    ULONG				GetError() { return nError; }
-    Sc10DataBaseData*	At(USHORT nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); }
+    sal_uLong				GetError() { return nError; }
+    Sc10DataBaseData*	At(sal_uInt16 nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); }
 private:
     using               ScCollection::At;
 };
@@ -705,8 +705,8 @@ class Sc10PageCollection : public ScCollection
 {
 public:
                         Sc10PageCollection() : ScCollection(1,1) {};
-    Sc10PageData*		At(USHORT nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); }
-    USHORT              InsertFormat( const Sc10PageFormat& rData );
+    Sc10PageData*		At(sal_uInt16 nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); }
+    sal_uInt16              InsertFormat( const Sc10PageFormat& rData );
     void				PutToDoc( ScDocument* pDoc );
 private:
     using               ScCollection::At;
@@ -729,8 +729,8 @@ class Sc10Import
     Sc10NameCollection*		pNameCollection;
     Sc10PatternCollection*	pPatternCollection;
     Sc10DataBaseCollection*	pDataBaseCollection;
-    ULONG                   nError;
-    INT16					TabCount;
+    sal_uLong                   nError;
+    sal_Int16					TabCount;
     SCTAB					nShowTab;
     ScViewOptions			aSc30ViewOpt;
     ScfStreamProgressBar*   pPrgrsBar;
@@ -739,7 +739,7 @@ public:
                               Sc10Import( SvStream& rStr, ScDocument* pDocument );
                               ~Sc10Import();
 
-    ULONG					Import();
+    sal_uLong					Import();
     void					LoadFileHeader();
     void					LoadFileInfo();
     void					LoadEditStateInfo();
@@ -756,7 +756,7 @@ public:
     void					LoadCol(SCCOL Col, SCTAB Tab);
     void					LoadColAttr(SCCOL Col, SCTAB Tab);
     void					LoadAttr(Sc10ColAttr& rAttr);
-    void					ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey);
+    void					ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& nKey);
     void					LoadObjects();
 };
 
diff --git a/sc/source/filter/inc/scfobj.hxx b/sc/source/filter/inc/scfobj.hxx
index 4a1aad12e..972f03dad 100644
--- a/sc/source/filter/inc/scfobj.hxx
+++ b/sc/source/filter/inc/scfobj.hxx
@@ -37,7 +37,7 @@ class Sc10InsertObject
 {
 public:
     static void InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rectangle& rRect,
-                                SCTAB nSrcTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2 );
+                                SCTAB nSrcTab, sal_uInt16 nX1, sal_uInt16 nY1, sal_uInt16 nX2, sal_uInt16 nY2 );
 };
 
 
diff --git a/sc/source/filter/inc/scmem.h b/sc/source/filter/inc/scmem.h
index 4b25ede59..1f097f121 100644
--- a/sc/source/filter/inc/scmem.h
+++ b/sc/source/filter/inc/scmem.h
@@ -30,7 +30,7 @@
 
 #include <tools/solar.h>
 
-BOOL MemNew( void );
+sal_Bool MemNew( void );
 void MemDelete( void );
 
 #endif
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index d0972786c..5d19f828d 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -36,26 +36,26 @@
 #include <vector>
 
 typedef OpCode DefTokenId;
-// in PRODUCT version: ambiguity between OpCode (being USHORT) and UINT16
+// in PRODUCT version: ambiguity between OpCode (being sal_uInt16) and UINT16
 // Unfortunately a typedef is just a dumb alias and not a real type ...
-//typedef UINT16 TokenId;
+//typedef sal_uInt16 TokenId;
 struct TokenId
 {
-        UINT16			nId;
+        sal_uInt16			nId;
 
                         TokenId() : nId( 0 ) {}
-                        TokenId( UINT16 n ) : nId( n ) {}
+                        TokenId( sal_uInt16 n ) : nId( n ) {}
                         TokenId( const TokenId& r ) : nId( r.nId ) {}
     inline	TokenId&	operator =( const TokenId& r ) { nId = r.nId; return *this; }
-    inline	TokenId&	operator =( UINT16 n ) { nId = n; return *this; }
-    inline				operator UINT16&() { return nId; }
-    inline				operator const UINT16&() const { return nId; }
-    inline	BOOL		operator <( UINT16 n ) const { return nId < n; }
-    inline	BOOL		operator >( UINT16 n ) const { return nId > n; }
-    inline	BOOL		operator <=( UINT16 n ) const { return nId <= n; }
-    inline	BOOL		operator >=( UINT16 n ) const { return nId >= n; }
-    inline	BOOL		operator ==( UINT16 n ) const { return nId == n; }
-    inline	BOOL		operator !=( UINT16 n ) const { return nId != n; }
+    inline	TokenId&	operator =( sal_uInt16 n ) { nId = n; return *this; }
+    inline				operator sal_uInt16&() { return nId; }
+    inline				operator const sal_uInt16&() const { return nId; }
+    inline	sal_Bool		operator <( sal_uInt16 n ) const { return nId < n; }
+    inline	sal_Bool		operator >( sal_uInt16 n ) const { return nId > n; }
+    inline	sal_Bool		operator <=( sal_uInt16 n ) const { return nId <= n; }
+    inline	sal_Bool		operator >=( sal_uInt16 n ) const { return nId >= n; }
+    inline	sal_Bool		operator ==( sal_uInt16 n ) const { return nId == n; }
+    inline	sal_Bool		operator !=( sal_uInt16 n ) const { return nId != n; }
 };
 
 
@@ -92,25 +92,25 @@ class TokenPool
     // Ausgabe Id = 0 -> Fehlerfall
     private:
         String**					ppP_Str;	// Pool fuer Strings
-        UINT16						nP_Str;		// ...mit Groesse
-        UINT16						nP_StrAkt;	// ...und Schreibmarke
+        sal_uInt16						nP_Str;		// ...mit Groesse
+        sal_uInt16						nP_StrAkt;	// ...und Schreibmarke
 
         double*						pP_Dbl;		// Pool fuer Doubles
-        UINT16						nP_Dbl;
-        UINT16						nP_DblAkt;
+        sal_uInt16						nP_Dbl;
+        sal_uInt16						nP_DblAkt;
 
-        USHORT*                     pP_Err;     // Pool for error codes
-        UINT16                      nP_Err;
-        UINT16                      nP_ErrAkt;
+        sal_uInt16*                     pP_Err;     // Pool for error codes
+        sal_uInt16                      nP_Err;
+        sal_uInt16                      nP_ErrAkt;
 
         ScSingleRefData**				ppP_RefTr;	// Pool fuer Referenzen
-        UINT16						nP_RefTr;
-        UINT16						nP_RefTrAkt;
+        sal_uInt16						nP_RefTr;
+        sal_uInt16						nP_RefTrAkt;
 
-        UINT16*						pP_Id;		// Pool fuer Id-Folgen
-        UINT16						nP_Id;
-        UINT16						nP_IdAkt;
-        UINT16						nP_IdLast;	// letzter Folgen-Beginn
+        sal_uInt16*						pP_Id;		// Pool fuer Id-Folgen
+        sal_uInt16						nP_Id;
+        sal_uInt16						nP_IdAkt;
+        sal_uInt16						nP_IdLast;	// letzter Folgen-Beginn
 
         struct	EXTCONT
         {
@@ -120,8 +120,8 @@ class TokenPool
                                         eId( e ), aText( r ){}
         };
         EXTCONT**					ppP_Ext;
-        UINT16						nP_Ext;
-        UINT16						nP_ExtAkt;
+        sal_uInt16						nP_Ext;
+        sal_uInt16						nP_ExtAkt;
 
         struct	NLFCONT
         {
@@ -129,12 +129,12 @@ class TokenPool
                                     NLFCONT( const ScSingleRefData& r ) : aRef( r )	{}
         };
         NLFCONT**					ppP_Nlf;
-        UINT16						nP_Nlf;
-        UINT16						nP_NlfAkt;
+        sal_uInt16						nP_Nlf;
+        sal_uInt16						nP_NlfAkt;
 
         ScMatrix**					ppP_Matrix;		// Pool fuer Matricies
-        UINT16						nP_Matrix;
-        UINT16						nP_MatrixAkt;
+        sal_uInt16						nP_Matrix;
+        sal_uInt16						nP_MatrixAkt;
 
         /** for storage of external names */
         struct ExtName
@@ -162,15 +162,15 @@ class TokenPool
         };
         ::std::vector<ExtAreaRef>   maExtAreaRefs;
 
-        UINT16*						pElement;	// Array mit Indizes fuer Elemente
+        sal_uInt16*						pElement;	// Array mit Indizes fuer Elemente
         E_TYPE*						pType;		// ...mit Typ-Info
-        UINT16*						pSize;		// ...mit Laengenangabe (Anz. UINT16)
-        UINT16						nElement;
-        UINT16						nElementAkt;
+        sal_uInt16*						pSize;		// ...mit Laengenangabe (Anz. sal_uInt16)
+        sal_uInt16						nElement;
+        sal_uInt16						nElementAkt;
 
-        static const UINT16			nScTokenOff;// Offset fuer SC-Token
+        static const sal_uInt16			nScTokenOff;// Offset fuer SC-Token
 #ifdef DBG_UTIL
-        UINT16						nRek;		// Rekursionszaehler
+        sal_uInt16						nRek;		// Rekursionszaehler
 #endif
         ScTokenArray*				pScToken;	// Tokenbastler
 
@@ -183,8 +183,8 @@ class TokenPool
         void						GrowExt( void );
         void						GrowNlf( void );
         void						GrowMatrix( void );
-        void						GetElement( const UINT16 nId );
-        void						GetElementRek( const UINT16 nId );
+        void						GetElement( const sal_uInt16 nId );
+        void						GetElementRek( const sal_uInt16 nId );
     public:
                                     TokenPool( void );
                                     ~TokenPool();
@@ -195,11 +195,11 @@ class TokenPool
         inline void					operator >>( TokenStack& rStack );
         inline const TokenId		Store( void );
         const TokenId				Store( const double& rDouble );
-//UNUSED2008-05  const TokenId               StoreError( USHORT nError );
+//UNUSED2008-05  const TokenId               StoreError( sal_uInt16 nError );
 
                                     // nur fuer Range-Names
-        const TokenId				Store( const UINT16 nIndex );
-        inline const TokenId		Store( const INT16 nWert );
+        const TokenId				Store( const sal_uInt16 nIndex );
+        inline const TokenId		Store( const sal_Int16 nWert );
         const TokenId				Store( const String& rString );
         const TokenId				Store( const ScSingleRefData& rTr );
         const TokenId				Store( const ScComplexRefData& rTr );
@@ -216,7 +216,7 @@ class TokenPool
         inline const ScTokenArray*	operator []( const TokenId nId );
         void						Reset( void );
         inline E_TYPE				GetType( const TokenId& nId ) const;
-        BOOL						IsSingleOp( const TokenId& nId, const DefTokenId eId ) const;
+        sal_Bool						IsSingleOp( const TokenId& nId, const DefTokenId eId ) const;
         const String*               GetExternal( const TokenId& nId ) const;
 //UNUSED2008-05  const String*               GetString( const TokenId& nId ) const;
         ScMatrix*					GetMatrix( unsigned int n ) const;
@@ -231,10 +231,10 @@ class TokenStack
 {
     private:
         TokenId*					pStack;		// Stack als Array
-        UINT16						nPos;		// Schreibmarke
-        UINT16						nSize;		// Erster Index ausserhalb des Stacks
+        sal_uInt16						nPos;		// Schreibmarke
+        sal_uInt16						nSize;		// Erster Index ausserhalb des Stacks
     public:
-                                    TokenStack( UINT16 nNewSize = 1024 );
+                                    TokenStack( sal_uInt16 nNewSize = 1024 );
                                     ~TokenStack();
         inline TokenStack&			operator <<( const TokenId nNewId );
         inline void					operator >>( TokenId &rId );
@@ -304,14 +304,14 @@ inline TokenPool& TokenPool::operator <<( const TokenId nId )
 {
     // POST: nId's werden hintereinander im Pool unter einer neuen Id
     //		 abgelegt. Vorgang wird mit >> oder Store() abgeschlossen
-    // nId -> ( UINT16 ) nId - 1;
-    DBG_ASSERT( ( UINT16 ) nId < nScTokenOff,
+    // nId -> ( sal_uInt16 ) nId - 1;
+    DBG_ASSERT( ( sal_uInt16 ) nId < nScTokenOff,
         "-TokenPool::operator <<: TokenId im DefToken-Bereich!" );
 
     if( nP_IdAkt >= nP_Id )
         GrowId();
 
-    pP_Id[ nP_IdAkt ] = ( ( UINT16 ) nId ) - 1;
+    pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) nId ) - 1;
     nP_IdAkt++;
 
     return *this;
@@ -320,13 +320,13 @@ inline TokenPool& TokenPool::operator <<( const TokenId nId )
 
 inline TokenPool& TokenPool::operator <<( const DefTokenId eId )
 {
-    DBG_ASSERT( ( UINT32 ) eId + nScTokenOff < 0xFFFF,
+    DBG_ASSERT( ( sal_uInt32 ) eId + nScTokenOff < 0xFFFF,
         "-TokenPool::operator<<: enmum zu gross!" );
 
     if( nP_IdAkt >= nP_Id )
         GrowId();
 
-    pP_Id[ nP_IdAkt ] = ( ( UINT16 ) eId ) + nScTokenOff;
+    pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) eId ) + nScTokenOff;
     nP_IdAkt++;
 
     return *this;
@@ -338,7 +338,7 @@ inline TokenPool& TokenPool::operator <<( TokenStack& rStack )
     if( nP_IdAkt >= nP_Id )
         GrowId();
 
-    pP_Id[ nP_IdAkt ] = ( ( UINT16 ) rStack.Get() ) - 1;
+    pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) rStack.Get() ) - 1;
     nP_IdAkt++;
 
     return *this;
@@ -361,7 +361,7 @@ inline const TokenId TokenPool::Store( void )
 }
 
 
-inline const TokenId TokenPool::Store( const INT16 nWert )
+inline const TokenId TokenPool::Store( const sal_Int16 nWert )
 {
     return Store( ( double ) nWert );
 }
@@ -382,7 +382,7 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId )
 #ifdef DBG_UTIL
         nRek = 0;
 #endif
-        GetElement( ( UINT16 ) nId - 1 );
+        GetElement( ( sal_uInt16 ) nId - 1 );
     }
 
     return pScToken;
@@ -393,7 +393,7 @@ inline E_TYPE TokenPool::GetType( const TokenId& rId ) const
 {
     E_TYPE nRet;
 
-    UINT16 nId = (UINT16) rId - 1;
+    sal_uInt16 nId = (sal_uInt16) rId - 1;
 
     if( nId < nElementAkt )
         nRet = pType[ nId ] ;
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index d7055b51e..2e0f78a3e 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -32,22 +32,22 @@
 #include <document.hxx>
 
 // Defaultwerte
-const BYTE	nDezStd = 0;		// Dezimalstellen fuer Standard-Zellen
-const BYTE	nDezFloat = 2;	//        "         "  Float-Zellen
+const sal_uInt8	nDezStd = 0;		// Dezimalstellen fuer Standard-Zellen
+const sal_uInt8	nDezFloat = 2;	//        "         "  Float-Zellen
 
 void		PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString );
 
-void		SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt );
+void		SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt8 nFormat, sal_uInt8 nSt );
 
 void		InitPage( void );
 
 String		DosToSystem( sal_Char *pSource );
 
-double		SnumToDouble( INT16 nVal );
+double		SnumToDouble( sal_Int16 nVal );
 
-double          Snum32ToDouble( UINT32 nValue );
+double          Snum32ToDouble( sal_uInt32 nValue );
 
-typedef UINT16 StampTyp;
+typedef sal_uInt16 StampTyp;
 
 #define MAKE_STAMP(nF,nS) ((nS&0x0F)+((nF&0x7F)*16))
             // Bit 0...3  = Bit 0...3 von Stellenzahl
@@ -65,24 +65,24 @@ public:
                         pAttr = NULL;
                     }
 
-                    FormIdent( BYTE nFormat, BYTE nSt, SfxUInt32Item& rAttr )
+                    FormIdent( sal_uInt8 nFormat, sal_uInt8 nSt, SfxUInt32Item& rAttr )
                     {
                         nStamp = MAKE_STAMP( nFormat, nSt );
                         pAttr = &rAttr;
                     }
 
-                    FormIdent( BYTE nFormat, BYTE nSt )
+                    FormIdent( sal_uInt8 nFormat, sal_uInt8 nSt )
                     {
                         nStamp = MAKE_STAMP( nFormat, nSt );
                         pAttr = NULL;
                     }
 
-    BOOL			operator ==( const FormIdent& rComp ) const
+    sal_Bool			operator ==( const FormIdent& rComp ) const
                     {
                         return ( nStamp == rComp.nStamp );
                     }
 
-    BOOL			operator ==( const StampTyp& rStamp ) const
+    sal_Bool			operator ==( const StampTyp& rStamp ) const
                     {
                         return ( nStamp == rStamp );
                     }
@@ -97,7 +97,7 @@ public:
                         return pAttr;
                     }
 
-    void			SetStamp( BYTE nFormat, BYTE nSt )
+    void			SetStamp( sal_uInt8 nFormat, sal_uInt8 nSt )
                     {
                         nStamp = MAKE_STAMP( nFormat, nSt );
                     }
@@ -113,27 +113,27 @@ class FormCache
 {
 private:
     FormIdent			aIdents[ __nSize ];	//gepufferte Formate
-    BOOL				bValid[ __nSize ];
+    sal_Bool				bValid[ __nSize ];
     FormIdent			aCompareIdent;		// zum Vergleichen
-    BYTE				nDefaultFormat;		// Defaultformat der Datei
+    sal_uInt8				nDefaultFormat;		// Defaultformat der Datei
     SvNumberFormatter*	pFormTable;			// Value-Format-Table-Anker
     StampTyp			nIndex;
     LanguageType		eLanguage;			// Systemsprache
 
-    SfxUInt32Item*		NewAttr( BYTE nFormat, BYTE nSt );
+    SfxUInt32Item*		NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt );
 public:
-                        FormCache( ScDocument*, BYTE nNewDefaultFormat = 0xFF );
+                        FormCache( ScDocument*, sal_uInt8 nNewDefaultFormat = 0xFF );
                         ~FormCache();
 
-    inline const SfxUInt32Item*	GetAttr( BYTE nFormat, BYTE nSt );
-    void				SetDefaultFormat( BYTE nD = 0xFF )
+    inline const SfxUInt32Item*	GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt );
+    void				SetDefaultFormat( sal_uInt8 nD = 0xFF )
                         {
                             nDefaultFormat = nD;
                         }
 };
 
 
-inline const SfxUInt32Item* FormCache::GetAttr( BYTE nFormat, BYTE nSt )
+inline const SfxUInt32Item* FormCache::GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
 {
     // PREC:	nFormat = Lotus-Format-Byte
     //			nSt = Stellenzahl
@@ -153,7 +153,7 @@ inline const SfxUInt32Item* FormCache::GetAttr( BYTE nFormat, BYTE nSt )
         DBG_ASSERT( pAttr, "FormCache::GetAttr(): Nix Speicherus" );
 
         aIdents[ nIndex ] = FormIdent( nFormat, nSt, *pAttr );
-        bValid[ nIndex ] = TRUE;
+        bValid[ nIndex ] = sal_True;
 
         pRet = pAttr;
     }
diff --git a/sc/source/filter/inc/xcl97dum.hxx b/sc/source/filter/inc/xcl97dum.hxx
index 8f46b55a7..b957c93f1 100644
--- a/sc/source/filter/inc/xcl97dum.hxx
+++ b/sc/source/filter/inc/xcl97dum.hxx
@@ -35,55 +35,55 @@
 class ExcDummy8_00a : public ExcDummyRec
 {
 private:
-    static const BYTE       pMyData[];
+    static const sal_uInt8       pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen() const;
-    virtual const BYTE*     GetData() const;
+    virtual const sal_uInt8*     GetData() const;
 };
 
 
 class ExcDummy8_00b : public ExcDummyRec
 {
 private:
-    static const BYTE       pMyData[];
+    static const sal_uInt8       pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen() const;
-    virtual const BYTE*     GetData() const;
+    virtual const sal_uInt8*     GetData() const;
 };
 
 
 class ExcDummy8_040 : public ExcDummyRec
 {
 private:
-    static const BYTE       pMyData[];
+    static const sal_uInt8       pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen() const;
-    virtual const BYTE*     GetData() const;
+    virtual const sal_uInt8*     GetData() const;
 };
 
 
 class ExcDummy8_041 : public ExcDummyRec
 {
 private:
-    static const BYTE       pMyData[];
+    static const sal_uInt8       pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen() const;
-    virtual const BYTE*     GetData() const;
+    virtual const sal_uInt8*     GetData() const;
 };
 
 
 class ExcDummy8_02 : public ExcDummyRec
 {
 private:
-    static const BYTE       pMyData[];
+    static const sal_uInt8       pMyData[];
     static const sal_Size   nMyLen;
 public:
     virtual sal_Size        GetLen() const;
-    virtual const BYTE*     GetData() const;
+    virtual const sal_uInt8*     GetData() const;
 };
 
 
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index e40e3f101..5c699d6ba 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -103,7 +103,7 @@ public:
     virtual EscherExHostAppData* StartShape(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape,
                             const Rectangle* pChildAnchor );
-    virtual	void				EndShape( UINT16 nShapeType, UINT32 nShapeID );
+    virtual	void				EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID );
     virtual	EscherExHostAppData*	EnterAdditionalTextGroup();
 
                                 /// Flush and merge PicStream into EscherStream
@@ -141,7 +141,7 @@ private:
         XclEscherHostAppData*   pCurrAppData;
         XclEscherClientData*    pTheClientData; // always the same
         XclEscherClientTextbox* pAdditionalText;
-        USHORT                  nAdditionalText;
+        sal_uInt16                  nAdditionalText;
     sal_uInt32          mnNextKey;
     bool                mbIsRootDff;
 };
@@ -151,13 +151,13 @@ private:
 class XclEscherHostAppData : public EscherExHostAppData
 {
 private:
-        BOOL				bStackedGroup;
+        sal_Bool				bStackedGroup;
 
 public:
-                                XclEscherHostAppData() : bStackedGroup( FALSE )
+                                XclEscherHostAppData() : bStackedGroup( sal_False )
                                     {}
-    inline	void				SetStackedGroup( BOOL b )	{ bStackedGroup = b; }
-    inline	BOOL				IsStackedGroup() const	{ return bStackedGroup; }
+    inline	void				SetStackedGroup( sal_Bool b )	{ bStackedGroup = b; }
+    inline	sal_Bool				IsStackedGroup() const	{ return bStackedGroup; }
 };
 
 
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 5f4e7f4a0..aa15fc0e1 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -48,7 +48,7 @@ public:
 
     /// return: 1-based ObjId
     ///! count>=0xFFFF: Obj will be deleted, return 0
-    UINT16              Add( XclObj* );
+    sal_uInt16              Add( XclObj* );
 
     inline XclExpMsoDrawing* GetMsodrawingPerSheet() { return pMsodrawingPerSheet; }
 
@@ -77,9 +77,9 @@ protected:
         XclExpMsoDrawing*   pClientTextbox;
         XclTxo*				pTxo;
         sal_uInt16          mnObjType;
-        UINT16				nObjId;
-        UINT16				nGrbit;
-        BOOL				bFirstOnSheet;
+        sal_uInt16				nObjId;
+        sal_uInt16				nGrbit;
+        sal_Bool				bFirstOnSheet;
 
         bool                    mbOwnEscher;    /// true = Escher part created on the fly.
 
@@ -99,19 +99,19 @@ public:
 
     inline sal_uInt16           GetObjType() const { return mnObjType; }
 
-    inline	void				SetId( UINT16 nId )	{ nObjId = nId; }
+    inline	void				SetId( sal_uInt16 nId )	{ nObjId = nId; }
 
-    inline	void				SetLocked( BOOL b )
+    inline	void				SetLocked( sal_Bool b )
                                     { b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; }
-    inline	void				SetPrintable( BOOL b )
+    inline	void				SetPrintable( sal_Bool b )
                                     { b ? nGrbit |= 0x0010 : nGrbit &= ~0x0010; }
-    inline	void				SetAutoFill( BOOL b )
+    inline	void				SetAutoFill( sal_Bool b )
                                     { b ? nGrbit |= 0x2000 : nGrbit &= ~0x2000; }
-    inline	void				SetAutoLine( BOOL b )
+    inline	void				SetAutoLine( sal_Bool b )
                                     { b ? nGrbit |= 0x4000 : nGrbit &= ~0x4000; }
 
                                 // set corresponding Excel object type in OBJ/ftCmo
-            void				SetEscherShapeType( UINT16 nType );
+            void				SetEscherShapeType( sal_uInt16 nType );
     inline  void                SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; }
 
     /** If set to true, this object has created its own escher data.
@@ -156,13 +156,13 @@ public:
 class XclObjDropDown : public XclObj
 {
 private:
-    BOOL						bIsFiltered;
+    sal_Bool						bIsFiltered;
 
     virtual void                WriteSubRecs( XclExpStream& rStrm );
 
 protected:
 public:
-                                XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, BOOL bFilt );
+                                XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, sal_Bool bFilt );
     virtual						~XclObjDropDown();
 };
 
@@ -183,7 +183,7 @@ public:
 
     virtual	void				Save( XclExpStream& rStrm );
 
-    virtual	UINT16				GetNum() const;
+    virtual	sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 
 private:
@@ -236,15 +236,15 @@ public:
 class ExcBof8_Base : public ExcBof_Base
 {
 protected:
-        UINT32				nFileHistory;		// bfh
-        UINT32				nLowestBiffVer;		// sfo
+        sal_uInt32				nFileHistory;		// bfh
+        sal_uInt32				nLowestBiffVer;		// sfo
 
     virtual	void				SaveCont( XclExpStream& rStrm );
 
 public:
                                 ExcBof8_Base();
 
-    virtual	UINT16				GetNum() const;
+    virtual	sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -294,7 +294,7 @@ public:
 class XclObproj : public ExcRecord
 {
 public:
-    virtual	UINT16				GetNum() const;
+    virtual	sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -309,7 +309,7 @@ private:
 public:
                                 XclCodename( const String& );
 
-    virtual	UINT16				GetNum() const;
+    virtual	sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -322,13 +322,13 @@ public:
 class ExcEScenarioCell
 {
 private:
-    UINT16						nCol;
-    UINT16						nRow;
+    sal_uInt16						nCol;
+    sal_uInt16						nRow;
     XclExpString                sText;
 
 protected:
 public:
-                                ExcEScenarioCell( UINT16 nC, UINT16 nR, const String& rTxt );
+                                ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const String& rTxt );
 
     inline sal_Size             GetStringBytes()
                                     { return sText.GetSize(); }
@@ -348,12 +348,12 @@ private:
     XclExpString                sName;
     XclExpString                sComment;
     XclExpString                sUserName;
-    UINT8                       nProtected;
+    sal_uInt8                       nProtected;
 
     inline ExcEScenarioCell*	_First()	{ return (ExcEScenarioCell*) List::First(); }
     inline ExcEScenarioCell*	_Next()		{ return (ExcEScenarioCell*) List::Next(); }
 
-    BOOL						Append( UINT16 nCol, UINT16 nRow, const String& rTxt );
+    sal_Bool						Append( sal_uInt16 nCol, sal_uInt16 nRow, const String& rTxt );
 
     virtual void				SaveCont( XclExpStream& rStrm );
 
@@ -362,7 +362,7 @@ public:
                                 ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab );
     virtual						~ExcEScenario();
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 
     virtual void                SaveXml( XclExpXmlStream& rStrm );
@@ -373,7 +373,7 @@ public:
 class ExcEScenarioManager : public ExcRecord, private List
 {
 private:
-    UINT16						nActive;
+    sal_uInt16						nActive;
 
     inline ExcEScenario*		_First()	{ return (ExcEScenario*) List::First(); }
     inline ExcEScenario*		_Next()		{ return (ExcEScenario*) List::Next(); }
@@ -391,7 +391,7 @@ public:
     virtual void				Save( XclExpStream& rStrm );
     virtual void                SaveXml( XclExpXmlStream& rStrm );
 
-    virtual UINT16				GetNum() const;
+    virtual sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 };
 
@@ -417,13 +417,13 @@ private:
 class XclCalccount : public ExcRecord
 {
 private:
-    UINT16						nCount;
+    sal_uInt16						nCount;
 protected:
     virtual void				SaveCont( XclExpStream& rStrm );
 public:
                                 XclCalccount( const ScDocument& );
 
-    virtual	UINT16				GetNum() const;
+    virtual	sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 
     virtual void                SaveXml( XclExpXmlStream& rStrm );
@@ -435,13 +435,13 @@ public:
 class XclIteration : public ExcRecord
 {
 private:
-    UINT16						nIter;
+    sal_uInt16						nIter;
 protected:
     virtual void				SaveCont( XclExpStream& rStrm );
 public:
                                 XclIteration( const ScDocument& );
 
-    virtual	UINT16				GetNum() const;
+    virtual	sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 
     virtual void                SaveXml( XclExpXmlStream& rStrm );
@@ -459,7 +459,7 @@ protected:
 public:
                                 XclDelta( const ScDocument& );
 
-    virtual	UINT16				GetNum() const;
+    virtual	sal_uInt16				GetNum() const;
     virtual sal_Size            GetLen() const;
 
     virtual void                SaveXml( XclExpXmlStream& rStrm );
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index 2bcdb996d..13489f1e4 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -47,6 +47,10 @@ namespace com { namespace sun { namespace star {
     {
         class XModel;
     }
+    namespace chart
+    {
+        class XAxis;
+    }
     namespace chart2
     {
         struct ScaleData;
@@ -1011,18 +1015,21 @@ public:
     explicit            XclExpChLabelRange( const XclExpChRoot& rRoot );
 
     /** Converts category axis scaling settings. */
-    void                Convert( const ::com::sun::star::chart2::ScaleData& rScaleData, bool bMirrorOrient );
+    void                Convert( const ::com::sun::star::chart2::ScaleData& rScaleData,
+                            const ScfPropertySet& rChart1Axis, bool bMirrorOrient );
     /** Converts position settings of a crossing axis at this axis. */
     void                ConvertAxisPosition( const ScfPropertySet& rPropSet );
     /** Sets flag for tickmark position between categories or on categories. */
     inline void         SetTicksBetweenCateg( bool bTicksBetween )
-                            { ::set_flag( maData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); }
+                            { ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); }
 
 private:
+    virtual void        Save( XclExpStream& rStrm );
     virtual void        WriteBody( XclExpStream& rStrm );
 
 private:
-    XclChLabelRange     maData;             /// Contents of the CHLABELRANGE record.
+    XclChLabelRange     maLabelData;        /// Contents of the CHLABELRANGE record.
+    XclChDateRange      maDateData;         /// Contents of the CHDATERANGE record.
 };
 
 typedef ScfRef< XclExpChLabelRange > XclExpChLabelRangeRef;
@@ -1085,6 +1092,7 @@ class XclExpChAxis : public XclExpChGroupBase, public XclExpChFontBase
 public:
     typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >  XDiagramRef;
     typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >     XAxisRef;
+    typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis >      XChart1AxisRef;
 
 public:
     explicit            XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType );
@@ -1095,7 +1103,8 @@ public:
     virtual void        SetRotation( sal_uInt16 nRotation );
 
     /** Converts formatting and scaling settings from the passed axis. */
-    void                Convert( XAxisRef xAxis, XAxisRef xCrossingAxis, const XclChExtTypeInfo& rTypeInfo );
+    void                Convert( XAxisRef xAxis, XAxisRef xCrossingAxis,
+                            XChart1AxisRef xChart1Axis, const XclChExtTypeInfo& rTypeInfo );
     /** Converts and writes 3D wall/floor properties from the passed diagram. */
     void                ConvertWall( XDiagramRef xDiagram );
 
diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 47838149f..25336a2e5 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -244,11 +244,11 @@ class ScValidationData;
 class XclExpDV : public XclExpRecord, protected XclExpRoot
 {
 public:
-    explicit            XclExpDV( const XclExpRoot& rRoot, ULONG nScHandle );
+    explicit            XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle );
     virtual             ~XclExpDV();
 
     /** Returns the core handle of the validation data. */
-    inline ULONG        GetScHandle() const { return mnScHandle; }
+    inline sal_uLong        GetScHandle() const { return mnScHandle; }
 
     /** Inserts a new cell range into the cell range list. */
     void                InsertCellRange( const ScRange& rPos );
@@ -275,7 +275,7 @@ private:
     XclTokenArrayRef    mxTokArr2;      /// Formula for second condition.
     ::rtl::OUString     msFormula2;     /// OOXML Formula for second condition.
     sal_uInt32          mnFlags;        /// Miscellaneous flags.
-    ULONG               mnScHandle;     /// The core handle for quick list search.
+    sal_uLong               mnScHandle;     /// The core handle for quick list search.
 };
 
 // ----------------------------------------------------------------------------
@@ -288,7 +288,7 @@ public:
     virtual             ~XclExpDval();
 
     /** Inserts the cell range into the range list of the DV record with the specified handle. */
-    void                InsertCellRange( const ScRange& rRange, ULONG nScHandle );
+    void                InsertCellRange( const ScRange& rRange, sal_uLong nScHandle );
 
     /** Writes the DVAL record and the DV record list. */
     virtual void        Save( XclExpStream& rStrm );
@@ -296,7 +296,7 @@ public:
 
 private:
     /** Searches for or creates a XclExpDV record object with the specified handle. */
-    XclExpDV&           SearchOrCreateDv( ULONG nScHandle );
+    XclExpDV&           SearchOrCreateDv( sal_uLong nScHandle );
 
     /** Writes the body of the DVAL record. */
     virtual void        WriteBody( XclExpStream& rStrm );
diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx
index d80b51faf..e03216807 100644
--- a/sc/source/filter/inc/xename.hxx
+++ b/sc/source/filter/inc/xename.hxx
@@ -49,9 +49,9 @@ public:
     void                Initialize();
 
     /** Inserts the Calc name with the passed index and returns the Excel NAME index. */
-    sal_uInt16          InsertName( USHORT nScNameIdx );
+    sal_uInt16          InsertName( sal_uInt16 nScNameIdx );
     /** Inserts the Calc database range with the passed index and returns the Excel NAME index. */
-    sal_uInt16          InsertDBRange( USHORT nScDBRangeIdx );
+    sal_uInt16          InsertDBRange( sal_uInt16 nScDBRangeIdx );
 
 //UNUSED2009-05 /** Inserts a new built-in defined name. */
 //UNUSED2009-05 sal_uInt16          InsertBuiltInName( sal_Unicode cBuiltIn, XclTokenArrayRef xTokArr, SCTAB nScTab );
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index 6e1f7e7df..d2b99edfa 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -257,7 +257,7 @@ typedef XclExpValueRecord< double >         XclExpDoubleRecord;
 // ----------------------------------------------------------------------------
 
 /** Record which contains a Boolean value.
-    @descr  The value is stored as 16-bit value: 0x0000 = FALSE, 0x0001 = TRUE. */
+    @descr  The value is stored as 16-bit value: 0x0000 = sal_False, 0x0001 = TRUE. */
 class XclExpBoolRecord : public XclExpRecord
 {
 public:
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index 81caa30b1..39c0c4c87 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -275,10 +275,10 @@ private:
 /** Stores a core number format index with corresponding Excel format index. */
 struct XclExpNumFmt
 {
-    ULONG               mnScNumFmt;     /// Core index of the number format.
+    sal_uLong               mnScNumFmt;     /// Core index of the number format.
     sal_uInt16          mnXclNumFmt;    /// Resulting Excel format index.
 
-    inline explicit     XclExpNumFmt( ULONG nScNumFmt, sal_uInt16 nXclNumFmt ) :
+    inline explicit     XclExpNumFmt( sal_uLong nScNumFmt, sal_uInt16 nXclNumFmt ) :
                             mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ) {}
 };
 
@@ -294,12 +294,12 @@ public:
     virtual             ~XclExpNumFmtBuffer();
 
     /** Returns the core index of the current standard number format. */
-    inline ULONG        GetStandardFormat() const { return mnStdFmt; }
+    inline sal_uLong        GetStandardFormat() const { return mnStdFmt; }
 
     /** Inserts a number format into the format buffer.
         @param nScNumFmt  The core index of the number format.
         @return  The resulting Excel format index. */
-    sal_uInt16          Insert( ULONG nScNumFmt );
+    sal_uInt16          Insert( sal_uLong nScNumFmt );
 
     /** Writes all FORMAT records contained in this buffer. */
     virtual void        Save( XclExpStream& rStrm );
@@ -321,7 +321,7 @@ private:
     SvNumberFormatterPtr mxFormatter;   /// Special number formatter for conversion.
     XclExpNumFmtVec     maFormatMap;    /// Maps core formats to Excel indexes.
     NfKeywordTablePtr   mpKeywordTable; /// Replacement table.
-    ULONG               mnStdFmt;       /// Key for standard number format.
+    sal_uLong               mnStdFmt;       /// Key for standard number format.
     sal_uInt16          mnXclOffset;    /// Offset to first user defined format.
 };
 
@@ -477,7 +477,7 @@ public:
                             const XclExpRoot& rRoot,
                             const ScPatternAttr& rPattern,
                             sal_Int16 nScript,
-                            ULONG nScForceNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND,
+                            sal_uLong nScForceNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND,
                             sal_uInt16 nForceXclFont = EXC_FONT_NOTFOUND,
                             bool bForceLineBreak = false );
     /** Constructs a style XF record from the passed cell style sheet. */
@@ -498,7 +498,7 @@ public:
         @descr  Searches for cell XFs only. */
     bool                Equals(
                             const ScPatternAttr& rPattern,
-                            ULONG nScForceNumFmt,
+                            sal_uLong nScForceNumFmt,
                             sal_uInt16 nForceXclFont,
                             bool bForceLineBreak ) const;
 
@@ -527,7 +527,7 @@ protected:  // access for XclExpDefaultXF
     XclExpCellBorder    maBorder;           /// Border line style.
     XclExpCellArea      maArea;             /// Background area style.
     sal_uInt32          mnParentXFId;       /// XF ID of parent XF record.
-    ULONG               mnScNumFmt;         /// Calc number format index.
+    sal_uLong               mnScNumFmt;         /// Calc number format index.
     sal_uInt16          mnXclFont;          /// Excel font index.
     sal_uInt16          mnXclNumFmt;        /// Excel number format index.
     sal_Int32           mnBorderId;         /// OOXML Border Index
@@ -543,7 +543,7 @@ private:
     void                Init(
                             const SfxItemSet& rItemSet,
                             sal_Int16 nScript,
-                            ULONG nForceScNumFmt,
+                            sal_uLong nForceScNumFmt,
                             sal_uInt16 nForceXclFont,
                             bool bForceLineBreak,
                             bool bDefStyle );
@@ -667,7 +667,7 @@ public:
         @return  A unique XF record ID. */
     sal_uInt32          InsertWithNumFmt(
                             const ScPatternAttr* pPattern, sal_Int16 nScript,
-                            ULONG nForceScNumFmt,
+                            sal_uLong nForceScNumFmt,
                             bool bForceLineBreak );
     /** Inserts the passed cell style. Creates a style XF record and a STYLE record.
         @return  A unique XF record ID. */
@@ -700,7 +700,7 @@ private:
 
 private:
     /** Returns the XF ID of the cell XF containing the passed format. */
-    sal_uInt32          FindXF( const ScPatternAttr& rPattern, ULONG nForceScNumFmt,
+    sal_uInt32          FindXF( const ScPatternAttr& rPattern, sal_uLong nForceScNumFmt,
                             sal_uInt16 nForceXclFont, bool bForceLineBreak ) const;
     /** Returns the XF ID of the style XF containing the passed style. */
     sal_uInt32          FindXF( const SfxStyleSheetBase& rStyleSheet ) const;
@@ -711,7 +711,7 @@ private:
     /** Tries to find the XF record containing the passed format or inserts a new record.
         @return  The XF record ID. */
     sal_uInt32          InsertCellXF( const ScPatternAttr* pPattern, sal_Int16 nScript,
-                            ULONG nForceScNumFmt,
+                            sal_uLong nForceScNumFmt,
                             sal_uInt16 nForceXclFont, bool bForceLineBreak );
     /** Inserts the passed cell style. Creates a style XF record and a STYLE record.
         @return  The XF record ID. */
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 72e5d8c12..8e4ce1f0a 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -1134,13 +1134,16 @@ public:
     explicit            XclImpChLabelRange( const XclImpChRoot& rRoot );
     /** Reads the CHLABELRANGE record (category axis scaling properties). */
     void                ReadChLabelRange( XclImpStream& rStrm );
+    /** Reads the CHDATERANGE record (date axis scaling properties). */
+    void                ReadChDateRange( XclImpStream& rStrm );
     /** Converts category axis scaling settings. */
     void                Convert( ScfPropertySet& rPropSet, ScaleData& rScaleData, bool bMirrorOrient ) const;
     /** Converts position settings of this axis at a crossing axis. */
     void                ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3dChart ) const;
 
 private:
-    XclChLabelRange     maData;             /// Contents of the CHLABELRANGE record.
+    XclChLabelRange     maLabelData;        /// Contents of the CHLABELRANGE record.
+    XclChDateRange      maDateData;         /// Contents of the CHDATERANGE record.
 };
 
 typedef ScfRef< XclImpChLabelRange > XclImpChLabelRangeRef;
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index b845207f3..19500cd2f 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -973,7 +973,7 @@ public:
 
 protected:
     /** Returns a color from the Excel color palette. */
-    virtual FASTBOOL    GetColorFromPalette( USHORT nIndex, Color& rColor ) const;
+    virtual FASTBOOL    GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const;
 };
 
 // ----------------------------------------------------------------------------
@@ -1034,7 +1034,7 @@ private:
                             Rectangle& rTextRect,
                             SdrObject* pOldSdrObj = 0 );
     /** Returns the BLIP stream position, based on the passed DFF stream position. */
-    virtual ULONG       Calc_nBLIPPos( ULONG nOrgVal, ULONG nStreamPos ) const;
+    virtual sal_uLong       Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const;
 
     // virtual functions of SvxMSConvertOCXControls
 
@@ -1045,7 +1045,7 @@ private:
                             const ::com::sun::star::awt::Size& rSize,
                             ::com::sun::star::uno::Reference<
                                 ::com::sun::star::drawing::XShape >* pxShape,
-                            BOOL bFloatingCtrl );
+                            sal_Bool bFloatingCtrl );
 
 private:
     /** Data per registered drawing manager, will be stacked for recursive calls. */
diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index 05412c306..6b6387625 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -328,7 +328,7 @@ public:
     /** Returns the cached Calc error code, if this value has Error type, else 0. */
     inline sal_uInt8    GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; }
     /** Returns the cached Calc error code, if this value has Error type, else 0. */
-    USHORT              GetScError() const;
+    sal_uInt16              GetScError() const;
     /** Returns the token array if this is a Boolean value or error value, else 0. */
     inline const ScTokenArray* GetBoolErrFmla() const { return mxTokArr.get(); }
 
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index a5fba6f0d..fe4d90a78 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -228,7 +228,7 @@ public:
     void                CreateScFormats();
 
     /** Returns the format key with the passed Excel index or NUMBERFORMAT_ENTRY_NOT_FOUND on error. */
-    ULONG               GetScFormat( sal_uInt16 nXclNumFmt ) const;
+    sal_uLong               GetScFormat( sal_uInt16 nXclNumFmt ) const;
 
     /** Fills an Excel number format to the passed item set.
         @param rItemSet  The destination item set.
@@ -242,11 +242,11 @@ public:
         @param nScNumFmt  The Calc number formatter index of the format.
         @param bSkipPoolDefs  true = Do not put items equal to pool default; false = Put all items. */
     void                FillScFmtToItemSet(
-                            SfxItemSet& rItemSet, ULONG nScNumFmt,
+                            SfxItemSet& rItemSet, sal_uLong nScNumFmt,
                             bool bSkipPoolDefs = false ) const;
 
 private:
-    typedef ::std::map< sal_uInt16, ULONG > XclImpIndexMap;
+    typedef ::std::map< sal_uInt16, sal_uLong > XclImpIndexMap;
 
     XclImpIndexMap      maIndexMap;     /// Maps Excel format indexes to Calc formats.
     sal_uInt16          mnNextXclIdx;   /// Index counter for BIFF2-BIFF4.
@@ -416,7 +416,7 @@ public:
                             SCCOL nScCol1, SCROW nScRow1,
                             SCCOL nScCol2, SCROW nScRow2,
                             SCTAB nScTab,
-                            ULONG nForceScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND );
+                            sal_uLong nForceScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND );
 
 private:
     void                ReadXF2( XclImpStream& rStrm );
@@ -598,13 +598,13 @@ private:
     void                Find(
                             XclImpXFRange*& rpPrevRange,
                             XclImpXFRange*& rpNextRange,
-                            ULONG& rnNextIndex,
+                            sal_uLong& rnNextIndex,
                             SCROW nScRow ) const;
 
     /** Tries to concatenate a range with its predecessor.
         @descr  The ranges must have the same XF index and must not have a gap.
         The resulting range has the index nIndex-1. */
-    void                TryConcatPrev( ULONG nIndex );
+    void                TryConcatPrev( sal_uLong nIndex );
 
 private:
     ScfDelList< XclImpXFRange > maIndexList;    /// The list of XF index range.
@@ -663,7 +663,7 @@ private:
         @param nLine
         BOX_LINE_RIGHT = copy most-right border of top row;
         BOX_LINE_BOTTOM = copy most-bottom border of first column. */
-    void                SetBorderLine( const ScRange& rRange, SCTAB nScTab, USHORT nLine );
+    void                SetBorderLine( const ScRange& rRange, SCTAB nScTab, sal_uInt16 nLine );
 
 private:
     typedef ScfRef< XclImpXFRangeColumn >           XclImpXFRangeColumnRef;
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index f039c74ae..1b7ff6531 100755
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -101,6 +101,7 @@ class XclRoot;
 #define EXC_CHPROP_ERRORBARX                CREATE_OUSTRING( "ErrorBarX" )
 #define EXC_CHPROP_ERRORBARY                CREATE_OUSTRING( "ErrorBarY" )
 #define EXC_CHPROP_EXPANSION                CREATE_OUSTRING( "Expansion" )
+#define EXC_CHPROP_EXPTIMEINCREMENT         CREATE_OUSTRING( "ExplicitTimeIncrement" )
 #define EXC_CHPROP_FILLBITMAPMODE           CREATE_OUSTRING( "FillBitmapMode" )
 #define EXC_CHPROP_FILLSTYLE                CREATE_OUSTRING( "FillStyle" )
 #define EXC_CHPROP_GAPWIDTHSEQ              CREATE_OUSTRING( "GapwidthSequence" )
@@ -721,6 +722,23 @@ const sal_uInt8 EXC_CH3DDATAFORMAT_TRUNC        = 2;        /// Shart top, trunc
 
 const sal_uInt16 EXC_ID_CHPIEEXT                = 0x1061;
 
+// (0x1062) CHDATERANGE -------------------------------------------------------
+
+const sal_uInt16 EXC_ID_CHDATERANGE             = 0x1062;
+
+const sal_uInt16 EXC_CHDATERANGE_AUTOMIN        = 0x0001;
+const sal_uInt16 EXC_CHDATERANGE_AUTOMAX        = 0x0002;
+const sal_uInt16 EXC_CHDATERANGE_AUTOMAJOR      = 0x0004;
+const sal_uInt16 EXC_CHDATERANGE_AUTOMINOR      = 0x0008;
+const sal_uInt16 EXC_CHDATERANGE_DATEAXIS       = 0x0010;
+const sal_uInt16 EXC_CHDATERANGE_AUTOBASE       = 0x0020;
+const sal_uInt16 EXC_CHDATERANGE_AUTOCROSS      = 0x0040;   /// Other axis crosses at own maximum.
+const sal_uInt16 EXC_CHDATERANGE_AUTODATE       = 0x0080;   /// Recognize date/text automatically.
+
+const sal_uInt16 EXC_CHDATERANGE_DAYS           = 0;
+const sal_uInt16 EXC_CHDATERANGE_MONTHS         = 1;
+const sal_uInt16 EXC_CHDATERANGE_YEARS          = 2;
+
 // (0x1066) CHESCHERFORMAT ----------------------------------------------------
 
 const sal_uInt16 EXC_ID_CHESCHERFORMAT          = 0x1066;
@@ -1054,6 +1072,23 @@ struct XclChLabelRange
 
 // ----------------------------------------------------------------------------
 
+struct XclChDateRange
+{
+    sal_uInt16          mnMinDate;          /// Minimum value on axis.
+    sal_uInt16          mnMaxDate;          /// Maximum value on axis.
+    sal_uInt16          mnMajorStep;        /// Distance for major grid lines.
+    sal_uInt16          mnMajorUnit;        /// Time unit for major step.
+    sal_uInt16          mnMinorStep;        /// Distance for minor grid lines.
+    sal_uInt16          mnMinorUnit;        /// Time unit for minor step.
+    sal_uInt16          mnBaseUnit;         /// Time unit for axis values.
+    sal_uInt16          mnCross;            /// Crossing position of other axis.
+    sal_uInt16          mnFlags;            /// Additional flags.
+
+    explicit            XclChDateRange();
+};
+
+// ----------------------------------------------------------------------------
+
 struct XclChValueRange
 {
     double              mfMin;              /// Minimum value on axis.
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index df83df2ab..ffcd064ab 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -111,8 +111,8 @@ const sal_uInt8 EXC_TOKID_AREAERR3D         = 0x1D;     /// Deleted 3D area refe
 
 const sal_uInt16 EXC_TOK_STR_MAXLEN         = 255;      /// Maximum string length of a tStr token.
 
-const sal_uInt8 EXC_TOK_BOOL_FALSE          = 0;        /// FALSE value of a tBool token.
-const sal_uInt8 EXC_TOK_BOOL_TRUE           = 1;        /// TRUE value of a tBool token.
+const sal_uInt8 EXC_TOK_BOOL_FALSE          = 0;        /// sal_False value of a tBool token.
+const sal_uInt8 EXC_TOK_BOOL_TRUE           = 1;        /// sal_True value of a tBool token.
 
 const sal_uInt8 EXC_TOK_ATTR_VOLATILE       = 0x01;     /// Volatile function.
 const sal_uInt8 EXC_TOK_ATTR_IF             = 0x02;     /// Start of true condition in IF function.
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index b79218c94..433024010 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -633,7 +633,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTItemInfo& rInfo );
 
 // General field settings =====================================================
 
-typedef ::std::vector< USHORT > XclPTSubtotalVec;
+typedef ::std::vector< sal_uInt16 > XclPTSubtotalVec;
 
 /** Contains data for a pivot table field (SXVD record). */
 struct XclPTFieldInfo : public XclPTVisNameInfo
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 3a273711e..4153b2dd4 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -239,6 +239,8 @@ public:
     SvNumberFormatter&  GetFormatter() const;
     /** Returns the null date of the current number formatter. */
     DateTime            GetNullDate() const;
+    /** Returns the base year depending on the current null date (1900 or 1904). */
+    sal_uInt16          GetBaseYear() const;
     /** Converts a date/time value to a floating-point value. */
     double              GetDoubleFromDateTime( const DateTime& rDateTime ) const;
     /** Converts a floating-point value to a date/time value. */
diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index b7d08570e..296e5be53 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -464,7 +464,7 @@ public:
     explicit            XclNumFmtBuffer( const XclRoot& rRoot );
 
     /** Returns the core index of the current standard number format. */
-    inline ULONG        GetStdScNumFmt() const { return mnStdScNumFmt; }
+    inline sal_uLong        GetStdScNumFmt() const { return mnStdScNumFmt; }
 
 protected:
     typedef ::std::map< sal_uInt16, XclNumFmt > XclNumFmtMap;
@@ -487,7 +487,7 @@ private:
 
     XclNumFmtMap        maFmtMap;       /// Map containing all default and user-defined formats.
     LanguageType        meSysLang;      /// Current system language.
-    ULONG               mnStdScNumFmt;  /// Calc format key for standard number format.
+    sal_uLong               mnStdScNumFmt;  /// Calc format key for standard number format.
 };
 
 // Cell formatting data (XF) ==================================================
diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx
index 72bb876a7..65b2be123 100644
--- a/sc/source/filter/inc/xltools.hxx
+++ b/sc/source/filter/inc/xltools.hxx
@@ -119,9 +119,9 @@ public:
     static sal_uInt8    GetXclOrientFromRot( sal_uInt16 nXclRot );
 
     /** Converts a Calc error code to an Excel error code. */
-    static sal_uInt8    GetXclErrorCode( USHORT nScError );
+    static sal_uInt8    GetXclErrorCode( sal_uInt16 nScError );
     /** Converts an Excel error code to a Calc error code. */
-    static USHORT       GetScErrorCode( sal_uInt8 nXclError );
+    static sal_uInt16       GetScErrorCode( sal_uInt8 nXclError );
 
     /** Converts the passed BIFF error to a double containing the respective Calc error code. */
     static double       ErrorToDouble( sal_uInt8 nXclError );
@@ -148,10 +148,10 @@ public:
 
     /** Returns the Calc column width (twips) for the passed Excel width.
         @param nScCharWidth  Width of the '0' character in Calc (twips). */
-    static USHORT       GetScColumnWidth( sal_uInt16 nXclWidth, long nScCharWidth );
+    static sal_uInt16       GetScColumnWidth( sal_uInt16 nXclWidth, long nScCharWidth );
     /** Returns the Excel column width for the passed Calc width (twips).
         @param nScCharWidth  Width of the '0' character in Calc (twips). */
-    static sal_uInt16   GetXclColumnWidth( USHORT nScWidth, long nScCharWidth );
+    static sal_uInt16   GetXclColumnWidth( sal_uInt16 nScWidth, long nScCharWidth );
 
     /** Returns a correction value to convert column widths from/to default column widths.
         @param nXclDefFontHeight  Excel height of application default font. */
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index 8961bb4ad..6836d36d4 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -152,7 +152,7 @@ struct XclTabViewData
     bool                mbShowZeros;        /// true = Show zero value zells.
     bool                mbShowOutline;      /// true = Show outlines.
     Color               maTabBgColor;       /// Tab Color default = (COL_AUTO )
-    bool                IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
+    bool                IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? sal_True : sal_False; };
     sal_uInt32          mnTabBgColorId;         /// pallette color id
 
     explicit            XclTabViewData();
diff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxx
index 88d61793c..ac94c4835 100644
--- a/sc/source/filter/lotus/expop.cxx
+++ b/sc/source/filter/lotus/expop.cxx
@@ -41,10 +41,10 @@
 #include "exp_op.hxx"
 
 #if ENABLE_LOTUS123_EXPORT
-const USHORT ExportWK1::WK1MAXCOL = 255;
-const USHORT ExportWK1::WK1MAXROW = 8191;
+const sal_uInt16 ExportWK1::WK1MAXCOL = 255;
+const sal_uInt16 ExportWK1::WK1MAXROW = 8191;
 
-BYTE ExportWK1::GenFormByte( const ScPatternAttr& /*aAttr*/ )
+sal_uInt8 ExportWK1::GenFormByte( const ScPatternAttr& /*aAttr*/ )
 {
     return 0xFF;
 }
@@ -52,41 +52,41 @@ BYTE ExportWK1::GenFormByte( const ScPatternAttr& /*aAttr*/ )
 
 inline void ExportWK1::Bof()
 {	// (0x00)
-    aOut << ( USHORT ) 0x00 << ( USHORT ) 2 << ( USHORT ) 0x0406;   // Version 1-2-3/2, Symhony/1.1
+    aOut << ( sal_uInt16 ) 0x00 << ( sal_uInt16 ) 2 << ( sal_uInt16 ) 0x0406;   // Version 1-2-3/2, Symhony/1.1
 }
 
 
 inline void ExportWK1::Eof()
 {	// (0x01)
-    aOut << ( USHORT ) 0x01 << ( USHORT ) 0;
+    aOut << ( sal_uInt16 ) 0x01 << ( sal_uInt16 ) 0;
 }
 
 
 inline void ExportWK1::Calcmode()
 {	// (0x02)
     // Calculationmode = automatic
-    aOut << ( USHORT ) 0x02 << ( USHORT ) 1 << ( BYTE ) 0xFF;
+    aOut << ( sal_uInt16 ) 0x02 << ( sal_uInt16 ) 1 << ( sal_uInt8 ) 0xFF;
 }
 
 
 inline void ExportWK1::Calcorder()
 {	// (0x03)
     // order = natural
-    aOut << ( USHORT ) 0x03 << ( USHORT ) 1 << ( BYTE ) 0x00;
+    aOut << ( sal_uInt16 ) 0x03 << ( sal_uInt16 ) 1 << ( sal_uInt8 ) 0x00;
 }
 
 
 inline void ExportWK1::Split()
 {	// (0x04)
     // not split
-    aOut << ( USHORT ) 0x04 << ( USHORT ) 1 << ( BYTE ) 0x00;
+    aOut << ( sal_uInt16 ) 0x04 << ( sal_uInt16 ) 1 << ( sal_uInt8 ) 0x00;
 }
 
 
 inline void ExportWK1::Sync()
 {	// (0x05)
     // not synchronized
-    aOut << ( USHORT ) 0x05 << ( USHORT ) 1 << ( BYTE ) 0x00;
+    aOut << ( sal_uInt16 ) 0x05 << ( sal_uInt16 ) 1 << ( sal_uInt8 ) 0x00;
 }
 
 
@@ -94,13 +94,13 @@ inline void ExportWK1::Dimensions()
 {	// (0x06)
     SCCOL nEndCol;
     SCROW nEndRow;
-    aOut << ( USHORT ) 0x06 << ( USHORT ) 8 << ( USHORT ) 0 << ( USHORT ) 0;        // Starting Col/Row
+    aOut << ( sal_uInt16 ) 0x06 << ( sal_uInt16 ) 8 << ( sal_uInt16 ) 0 << ( sal_uInt16 ) 0;        // Starting Col/Row
     pD->GetPrintArea( 0, nEndCol, nEndRow );
 #if SC_ROWLIMIT_MORE_THAN_64K
 #error row limit 64k
 #endif
-    USHORT nCol = static_cast<USHORT>(nEndCol);
-    USHORT nRow = static_cast<USHORT>(nEndRow);
+    sal_uInt16 nCol = static_cast<sal_uInt16>(nEndCol);
+    sal_uInt16 nRow = static_cast<sal_uInt16>(nEndRow);
     DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Dimensions(): Col > WK1MAXCOL" );
     DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Dimensions(): Row > WK1MAXROW" );
     aOut << nCol << nRow;   // Ending Col/Row
@@ -109,57 +109,57 @@ inline void ExportWK1::Dimensions()
 
 inline void ExportWK1::Window1()
 {	// (0x07)
-    aOut << ( USHORT ) 0x07 << ( USHORT ) 32
-        << ( USHORT ) 0 << ( USHORT ) 0 // Cursor Col/Row
-        << ( BYTE ) 0xFF                // Format: protected, special, default
-        << ( BYTE ) 0                   // Dummy
-        << ( USHORT ) 9                 // Default column width
-        << ( USHORT ) 8 << ( USHORT ) 14// Number of cols/rows on screen
-        << ( USHORT ) 0 << ( USHORT ) 0 // Left col / top row
+    aOut << ( sal_uInt16 ) 0x07 << ( sal_uInt16 ) 32
+        << ( sal_uInt16 ) 0 << ( sal_uInt16 ) 0 // Cursor Col/Row
+        << ( sal_uInt8 ) 0xFF                // Format: protected, special, default
+        << ( sal_uInt8 ) 0                   // Dummy
+        << ( sal_uInt16 ) 9                 // Default column width
+        << ( sal_uInt16 ) 8 << ( sal_uInt16 ) 14// Number of cols/rows on screen
+        << ( sal_uInt16 ) 0 << ( sal_uInt16 ) 0 // Left col / top row
                                         // Rest aus Doku-Beispiel
-        << ( USHORT ) 0 << ( USHORT ) 0 // Number of title cols / rows
-        << ( USHORT ) 0 << ( USHORT ) 0 // Left title col / top title row
-        << ( USHORT ) 0x0004 << ( USHORT ) 0x0004// Top-left col / row
-        << ( USHORT ) 0x0048            // Number of cols in window
-        << ( USHORT ) 0x00;             // Dummy
+        << ( sal_uInt16 ) 0 << ( sal_uInt16 ) 0 // Number of title cols / rows
+        << ( sal_uInt16 ) 0 << ( sal_uInt16 ) 0 // Left title col / top title row
+        << ( sal_uInt16 ) 0x0004 << ( sal_uInt16 ) 0x0004// Top-left col / row
+        << ( sal_uInt16 ) 0x0048            // Number of cols in window
+        << ( sal_uInt16 ) 0x00;             // Dummy
 }
 
 
 inline void ExportWK1::Colw()
 {	// (0x08)
     // ACHTUNG: muss nach Window1 und vor hidden cols record kommen!
-    USHORT	nWidth;
-    BYTE	nWidthSpaces;
-    for( USHORT nCol = 0 ; nCol < 256 ; nCol++ )
+    sal_uInt16	nWidth;
+    sal_uInt8	nWidthSpaces;
+    for( sal_uInt16 nCol = 0 ; nCol < 256 ; nCol++ )
     {
         nWidth = pD->GetColWidth( static_cast<SCCOL>(nCol), 0 );
-        nWidthSpaces = ( BYTE ) ( nWidth / TWIPS_PER_CHAR );
-        aOut << ( USHORT ) 0x08 << ( USHORT ) 3 << nCol << nWidthSpaces;
+        nWidthSpaces = ( sal_uInt8 ) ( nWidth / TWIPS_PER_CHAR );
+        aOut << ( sal_uInt16 ) 0x08 << ( sal_uInt16 ) 3 << nCol << nWidthSpaces;
     }
 }
 
 
-void ExportWK1::Blank( const USHORT nCol, const USHORT nRow, const ScPatternAttr& aAttr )
+void ExportWK1::Blank( const sal_uInt16 nCol, const sal_uInt16 nRow, const ScPatternAttr& aAttr )
 {	// (0x0C)
     // PREC:    nCol <= WK1MAXCOL, nRow <= WK1MAXROW
     DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Blank(): Col > WK1MAXCOL" );
     DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Blank(): Row > WK1MAXROW" );
 
-    aOut << ( USHORT ) 0x0C << ( USHORT ) 5 << GenFormByte( aAttr ) << nCol << nRow;
+    aOut << ( sal_uInt16 ) 0x0C << ( sal_uInt16 ) 5 << GenFormByte( aAttr ) << nCol << nRow;
 }
 
 
-void ExportWK1::Number( const USHORT nCol, const USHORT nRow, const double fWert, const ScPatternAttr &aAttr )
+void ExportWK1::Number( const sal_uInt16 nCol, const sal_uInt16 nRow, const double fWert, const ScPatternAttr &aAttr )
 {	// (0x0E)
     // PREC:    nCol <= WK1MAXCOL, nRow <= WK1MAXROW
     DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Number(): Col > WK1MAXCOL" );
     DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Number(): Row > WK1MAXROW" );
 
-    aOut << ( USHORT ) 0x0E << ( USHORT ) 13 << GenFormByte( aAttr ) << nCol << nRow << fWert;
+    aOut << ( sal_uInt16 ) 0x0E << ( sal_uInt16 ) 13 << GenFormByte( aAttr ) << nCol << nRow << fWert;
 }
 
 
-void ExportWK1::Label( const USHORT nCol, const USHORT nRow, const String& rStr, const ScPatternAttr& aAttr )
+void ExportWK1::Label( const sal_uInt16 nCol, const sal_uInt16 nRow, const String& rStr, const ScPatternAttr& aAttr )
 {	// (0x0F)
     // PREC:    nCol <= WK1MAXCOL, nRow <= WK1MAXROW
     DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Label(): Col > WK1MAXCOL" );
@@ -167,7 +167,7 @@ void ExportWK1::Label( const USHORT nCol, const USHORT nRow, const String& rStr,
 
     ByteString	aStr( rStr, eZielChar );
 
-    USHORT		nLaenge = 7;         // Anzahl Bytes vor String+Nullbyte am Ende + Alignment-Char
+    sal_uInt16		nLaenge = 7;         // Anzahl Bytes vor String+Nullbyte am Ende + Alignment-Char
 
     xub_StrLen	nAnz = aStr.Len();
 
@@ -175,24 +175,24 @@ void ExportWK1::Label( const USHORT nCol, const USHORT nRow, const String& rStr,
     if( nAnz > 240 )            // max. 240 Zeichen im String
         nAnz = 240;
 
-    nLaenge = nLaenge + ( USHORT ) nAnz;            // + Stringlaenge
+    nLaenge = nLaenge + ( sal_uInt16 ) nAnz;            // + Stringlaenge
 
-    aOut << ( USHORT ) 0x0F << nLaenge << GenFormByte( aAttr ) << nCol << nRow << ( sal_Char ) '\'';
+    aOut << ( sal_uInt16 ) 0x0F << nLaenge << GenFormByte( aAttr ) << nCol << nRow << ( sal_Char ) '\'';
                     // ACHTUNG: ZUNAECHST NUR LEFT ALIGNMENT
 
     aOut.Write( aStr.GetBuffer(), nAnz );
 
-    aOut << ( BYTE ) 0x00;      // ...und Nullterminator anhaengen
+    aOut << ( sal_uInt8 ) 0x00;      // ...und Nullterminator anhaengen
 }
 
 
-void ExportWK1::Formula( const USHORT nCol, const USHORT nRow, const ScFormulaCell* pFC, const ScPatternAttr& aAttr )
+void ExportWK1::Formula( const sal_uInt16 nCol, const sal_uInt16 nRow, const ScFormulaCell* pFC, const ScPatternAttr& aAttr )
 {	// (0x10)
     // PREC:    nCol <= WK1MAXCOL, nRow <= WK1MAXROW
     DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Formula(): Col > WK1MAXCOL" );
     DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Formula(): Row > WK1MAXROW" );
 
-    USHORT	nLaenge = 15;    // Bytes bis Formel
+    sal_uInt16	nLaenge = 15;    // Bytes bis Formel
     double	fErgebnis;
 
     // zunaechst nur Dummy-Angaben (Formel := Ergebnis der Berechnung )
@@ -200,72 +200,72 @@ void ExportWK1::Formula( const USHORT nCol, const USHORT nRow, const ScFormulaCe
 
     fErgebnis = ( ( ScFormulaCell* ) pFC )->GetValue();
 
-    aOut << ( USHORT ) 0x10 << ( USHORT ) nLaenge
+    aOut << ( sal_uInt16 ) 0x10 << ( sal_uInt16 ) nLaenge
         << GenFormByte( aAttr ) << nCol << nRow
         << fErgebnis
-        << ( USHORT ) 9+1               // Dummy-Formula-Size
-        << ( BYTE ) 0x00                // constant, floating point
+        << ( sal_uInt16 ) 9+1               // Dummy-Formula-Size
+        << ( sal_uInt8 ) 0x00                // constant, floating point
         << fErgebnis
-        << ( BYTE ) 0x03;               // return
+        << ( sal_uInt8 ) 0x03;               // return
 }
 
 
 inline void ExportWK1::Protect()
 {	// (0x24)
     //Global protection off
-    aOut << ( USHORT ) 0x24 << ( USHORT ) 1 << ( BYTE ) 0x00;
+    aOut << ( sal_uInt16 ) 0x24 << ( sal_uInt16 ) 1 << ( sal_uInt8 ) 0x00;
 }
 
 
 inline void ExportWK1::Footer()
 {	// (0x25)
     // zunaechst nur leerer C-String
-    aOut << ( USHORT ) 0x25 << ( USHORT ) 242 << ( sal_Char ) '\'';   // linksbuendiger leerer String
+    aOut << ( sal_uInt16 ) 0x25 << ( sal_uInt16 ) 242 << ( sal_Char ) '\'';   // linksbuendiger leerer String
     for( short nLauf = 0 ; nLauf < 241 ; nLauf++ )
-        aOut << ( BYTE ) 0x00;
+        aOut << ( sal_uInt8 ) 0x00;
 }
 
 
 inline void ExportWK1::Header()
 {	// (0x26)
     // zunaechst nur leerer C-String
-    aOut << ( USHORT ) 0x26 << ( USHORT ) 242 << ( sal_Char ) '\'';   // linksbuendiger leerer String
+    aOut << ( sal_uInt16 ) 0x26 << ( sal_uInt16 ) 242 << ( sal_Char ) '\'';   // linksbuendiger leerer String
     for( short nLauf = 0 ; nLauf < 241 ; nLauf++ )
-        aOut << ( BYTE ) 0x00;
+        aOut << ( sal_uInt8 ) 0x00;
 }
 
 
 inline void ExportWK1::Margins()
 {	// (0x28)
-    aOut << ( USHORT ) 0x28 << ( USHORT ) 10
-        << ( USHORT ) 4 << ( USHORT ) 76    // Left/right margin
-        << ( USHORT ) 66                    // Page length
-        << ( USHORT ) 2 << ( USHORT ) 2;    // Top/Bottom margin
+    aOut << ( sal_uInt16 ) 0x28 << ( sal_uInt16 ) 10
+        << ( sal_uInt16 ) 4 << ( sal_uInt16 ) 76    // Left/right margin
+        << ( sal_uInt16 ) 66                    // Page length
+        << ( sal_uInt16 ) 2 << ( sal_uInt16 ) 2;    // Top/Bottom margin
 }
 
 
 inline void ExportWK1::Labelfmt()
 {	// (0x29)
     // Global label alignment = left
-    aOut << ( USHORT ) 0x29 << ( USHORT ) 1 << ( BYTE ) 0x27;
+    aOut << ( sal_uInt16 ) 0x29 << ( sal_uInt16 ) 1 << ( sal_uInt8 ) 0x27;
 }
 
 
 inline void ExportWK1::Calccount()
 {	// (0x2F)
     // Iteration count = 16 (oder so aehnlich)
-    aOut << ( USHORT ) 0x2F << ( USHORT ) 1 << ( BYTE ) 16;
+    aOut << ( sal_uInt16 ) 0x2F << ( sal_uInt16 ) 1 << ( sal_uInt8 ) 16;
 }
 
 
 inline void ExportWK1::Cursorw12()
 {	// (0x31)
     // Cursor location in window 1
-    aOut << ( USHORT ) 0x31 << ( USHORT ) 1 << ( BYTE ) 1;
+    aOut << ( sal_uInt16 ) 0x31 << ( sal_uInt16 ) 1 << ( sal_uInt8 ) 1;
 }
 
 
-void ExportWK1::WKString( const USHORT /*nCol*/, const USHORT /*nRow*/, const ScFormulaCell* /*pFC*/, const ScPatternAttr& /*aAttr*/ )
+void ExportWK1::WKString( const sal_uInt16 /*nCol*/, const sal_uInt16 /*nRow*/, const ScFormulaCell* /*pFC*/, const ScPatternAttr& /*aAttr*/ )
 {	// (0x33)
     // PREC:    nCol <= WK1MAXCOL, nRow <= WK1MAXROW
 /*  DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Label(): Col > WK1MAXCOL" );
@@ -274,37 +274,37 @@ void ExportWK1::WKString( const USHORT /*nCol*/, const USHORT /*nRow*/, const Sc
     String aStr;
     ( ( ScFormulaCell * ) pFC )->GetString( aStr );     // Formeltext zunaechst so belassen
 
-    USHORT nLaenge = 6;         // Anzahl Bytes vor String+Nullbyte am Ende
+    sal_uInt16 nLaenge = 6;         // Anzahl Bytes vor String+Nullbyte am Ende
 
-    USHORT nAnz = aStr.Len();
+    sal_uInt16 nAnz = aStr.Len();
 
     if( nAnz > 240 )            // max. 240 Zeichen im String
         nAnz = 240;
 
     nLaenge += nAnz;            // + Stringlaenge
 
-    aOut << ( USHORT ) 0x33 << nLaenge
+    aOut << ( sal_uInt16 ) 0x33 << nLaenge
         << GenFormByte( aAttr ) << nCol << nRow;
 
     // Zeichenweise String ausgeben
-    for( USHORT nLauf = 0 ; nLauf < nAnz ; nLauf++ )
+    for( sal_uInt16 nLauf = 0 ; nLauf < nAnz ; nLauf++ )
         aOut << aStr[ nLauf ];
 
-    aOut << ( BYTE ) 0x00;      // ...und Nullterminator anhaengen
+    aOut << ( sal_uInt8 ) 0x00;      // ...und Nullterminator anhaengen
 */
     }
 
 
 inline void ExportWK1::Snrange()
 {	// (0x47)
-    //aOut << ( USHORT ) 0x47 << ( USHORT ) x
+    //aOut << ( sal_uInt16 ) 0x47 << ( sal_uInt16 ) x
 /*  ScRangeName *pRanges = pD->GetRangeName();
     ScRangeData *pData;
     String aName;
 
-    USHORT nAnz = pRanges->GetCount();
+    sal_uInt16 nAnz = pRanges->GetCount();
 
-    for( USHORT nLauf = 0 ; nLauf < nAnz ; nLauf++ )
+    for( sal_uInt16 nLauf = 0 ; nLauf < nAnz ; nLauf++ )
         {
         pData = pRanges[ nLauf ];
 
@@ -317,7 +317,7 @@ inline void ExportWK1::Hidcol()
 {	// (0x64)
     sal_uInt32 nHide = 0x00000000;   // ...niemand ist versteckt
 
-    aOut << ( USHORT ) 0x64 << ( USHORT ) 32;
+    aOut << ( sal_uInt16 ) 0x64 << ( sal_uInt16 ) 32;
 
     for( int nLauf = 0 ; nLauf < 8 ; nLauf++ )
         aOut << nHide;          // 8 * 32 Bits = 256
@@ -326,7 +326,7 @@ inline void ExportWK1::Hidcol()
 
 inline void ExportWK1::Cpi()
 {	// (0x96)
-    //aOut << ( USHORT ) 0x96 << ( USHORT ) x;
+    //aOut << ( sal_uInt16 ) 0x96 << ( sal_uInt16 ) x;
 }
 
 
@@ -354,7 +354,7 @@ FltError ExportWK1::Write()
     // Zellen-Bemachung
     ScDocumentIterator		aIter( pD, 0, 0 );
     ScBaseCell*				pCell;
-    USHORT					nCol, nRow;
+    sal_uInt16					nCol, nRow;
     SCTAB					nTab;
     const ScPatternAttr*	pPatAttr;
 
@@ -369,8 +369,8 @@ FltError ExportWK1::Write()
 #if SC_ROWLIMIT_MORE_THAN_64K
 #error row limit 64k
 #endif
-            nCol = static_cast<USHORT>(nScCol);
-            nRow = static_cast<USHORT>(nScRow);
+            nCol = static_cast<sal_uInt16>(nScCol);
+            nRow = static_cast<sal_uInt16>(nScRow);
 
             switch( pCell->GetCellType() )
             {
@@ -398,7 +398,7 @@ FltError ExportWK1::Write()
                 case CELLTYPE_NONE:
                     break;
                 default:
-                    DBG_ASSERT( FALSE, "ExportWK1::Write(): unbekannter Celltype!" );
+                    DBG_ASSERT( sal_False, "ExportWK1::Write(): unbekannter Celltype!" );
             }
         }
         while( aIter.GetNext() );
diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index 7a5a633ac..0e219cd9a 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -53,7 +53,7 @@
 #include "op.h"
 
 // Konstanten ------------------------------------------------------------
-const UINT16		nBOF = 0x0000;
+const sal_uInt16		nBOF = 0x0000;
 
 
 
@@ -61,8 +61,8 @@ const UINT16		nBOF = 0x0000;
 extern WKTYP		eTyp;	// Typ der gerade in bearbeitung befindlichen Datei
 WKTYP				eTyp;
 
-extern BOOL			bEOF;			// zeigt Ende der Datei
-BOOL				bEOF;
+extern sal_Bool			bEOF;			// zeigt Ende der Datei
+sal_Bool				bEOF;
 
 extern CharSet		eCharNach;		// Zeichenkonvertierung von->nach
 CharSet				eCharNach;
@@ -87,7 +87,7 @@ extern long			nDateiLaenge;	// -> datei.cpp, ...der gerade offenen Datei
 LOTUS_ROOT*			pLotusRoot = NULL;
 
 
-std::map<UINT16, ScPatternAttr> aLotusPatternPool;
+std::map<sal_uInt16, ScPatternAttr> aLotusPatternPool;
 
 static FltError
 generate_Opcodes( SvStream& aStream, ScDocument& rDoc,
@@ -118,12 +118,12 @@ generate_Opcodes( SvStream& aStream, ScDocument& rDoc,
     aStream.Seek( STREAM_SEEK_TO_BEGIN );
     while( !bEOF && !aStream.IsEof() && (aStream.Tell() < nStrmSize) )
     {
-        UINT16 nOpcode, nLength;
+        sal_uInt16 nOpcode, nLength;
 
         aStream >> nOpcode >> nLength;
         aPrgrsBar.Progress();
         if( nOpcode == LOTUS_EOF )
-        bEOF = TRUE;
+        bEOF = sal_True;
 
         else if( nOpcode == LOTUS_FILEPASSWD )
         return eERR_FILEPASSWD;
@@ -167,7 +167,7 @@ WKTYP ScanVersion( SvStream& aStream )
 {
     // PREC:    pWKDatei:   Zeiger auf offene Datei
     // POST:    return:     Typ der Datei
-    UINT16			nOpcode, nVersNr, nRecLen;
+    sal_uInt16			nOpcode, nVersNr, nRecLen;
 
     // erstes Byte muss wegen BOF zwingend 0 sein!
     aStream >> nOpcode;
@@ -224,7 +224,7 @@ FltError ScImportLotus123old( SvStream& aStream, ScDocument* pDocument, CharSet
     // Zeiger auf Dokument global machen
     pDoc = pDocument;
 
-    bEOF = FALSE;
+    bEOF = sal_False;
 
     eCharVon = eSrc;
 
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index 2253e513d..4e7917abb 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -48,9 +48,9 @@
 
 
 
-void LotAttrCache::LotusToScBorderLine( UINT8 nLine, SvxBorderLine& aBL )
+void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, SvxBorderLine& aBL )
 {
-    static const UINT16 pPara[ 4 ][ 3 ] =
+    static const sal_uInt16 pPara[ 4 ][ 3 ] =
     {
         { 0,0,0 },
         { DEF_LINE_WIDTH_1, 0, 0 },
@@ -69,7 +69,7 @@ void LotAttrCache::LotusToScBorderLine( UINT8 nLine, SvxBorderLine& aBL )
 }
 
 
-const SvxColorItem& LotAttrCache::GetColorItem( const UINT8 nLotIndex ) const
+const SvxColorItem& LotAttrCache::GetColorItem( const sal_uInt8 nLotIndex ) const
 {
     DBG_ASSERT( nLotIndex > 0 && nLotIndex < 7,
         "-LotAttrCache::GetColorItem(): so nicht!" );
@@ -78,7 +78,7 @@ const SvxColorItem& LotAttrCache::GetColorItem( const UINT8 nLotIndex ) const
 }
 
 
-const Color& LotAttrCache::GetColor( const UINT8 nLotIndex ) const
+const Color& LotAttrCache::GetColor( const sal_uInt8 nLotIndex ) const
 {
     // Farbe <-> Index passt fuer Background, nicht aber fuer Fonts (0 <-> 7)!
     DBG_ASSERT( nLotIndex < 8, "*LotAttrCache::GetColor(): Index > 7!" );
@@ -122,7 +122,7 @@ LotAttrCache::~LotAttrCache()
         pAkt = ( ENTRY* ) List::Next();
     }
 
-    for( UINT16 nCnt = 0 ; nCnt < 6 ; nCnt++ )
+    for( sal_uInt16 nCnt = 0 ; nCnt < 6 ; nCnt++ )
         delete ppColorItems[ nCnt ];
 
     delete pBlack;
@@ -134,7 +134,7 @@ LotAttrCache::~LotAttrCache()
 
 const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
 {
-    UINT32	nRefHash;
+    sal_uInt32	nRefHash;
     ENTRY*	pAkt = ( ENTRY* ) List::First();
 
     MakeHash( rAttr, nRefHash );
@@ -156,7 +156,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
 
     pLotusRoot->pFontBuff->Fill( rAttr.nFont, rItemSet );
 
-    UINT8 nLine = rAttr.nLineStyle;
+    sal_uInt8 nLine = rAttr.nLineStyle;
     if( nLine )
     {
         SvxBoxItem		aBox( ATTR_BORDER );
@@ -178,7 +178,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
         rItemSet.Put( aBox );
     }
 
-    UINT8				nFontCol = rAttr.nFontCol & 0x07;
+    sal_uInt8				nFontCol = rAttr.nFontCol & 0x07;
     if( nFontCol )
     {
         // nFontCol > 0
@@ -188,7 +188,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
             rItemSet.Put( *pWhite );
     }
 
-    UINT8 nBack = rAttr.nBack & 0x1F;
+    sal_uInt8 nBack = rAttr.nBack & 0x1F;
     if( nBack )
         rItemSet.Put( SvxBrushItem( GetColor( nBack & 0x07 ), ATTR_BACKGROUND ) );
 
@@ -239,7 +239,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr )
 }
 
 
-void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const BOOL /*bClear*/ )
+void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const sal_Bool /*bClear*/ )
 {
     ScDocument*		pDoc = pLotusRoot->pDoc;
     ENTRY*			pAkt = ( ENTRY* ) List::First();
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 4320d0805..19b7cb47d 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -45,21 +45,21 @@
 
 extern WKTYP				eTyp;
 
-static const sal_Char*		GetAddInName( const UINT8 nIndex );
+static const sal_Char*		GetAddInName( const sal_uInt8 nIndex );
 
 static DefTokenId			lcl_KnownAddIn( const ByteString& sTest );
 
-//extern double decipher_Number123( UINT32 nValue );
+//extern double decipher_Number123( sal_uInt32 nValue );
 
 
-void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
+void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtString )
 {
     TokenId						eParam[ 256 ];
-    INT32						nLauf;
+    sal_Int32						nLauf;
     TokenId						nMerk0, nMerk1;
 
-    BOOL						bAddIn = FALSE;
-    BOOL						bNeg = FALSE;
+    sal_Bool						bAddIn = sal_False;
+    sal_Bool						bNeg = sal_False;
 
     DBG_ASSERT( nAnz < 128, "-LotusToSc::DoFunc(): Neee! -so viel kann ich nicht!" );
 
@@ -88,7 +88,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
 
         if( eOc == ocNoName )
         {
-            bAddIn = TRUE;
+            bAddIn = sal_True;
             nMerk0 = aPool.Store( eOc, String( t, eSrcChar ) );
 
             aPool << nMerk0;
@@ -165,10 +165,10 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
 
     if( nAnz > 0 )
     {
-        INT16 nNull = -1;	// gibt einen auszulassenden Parameter an
+        sal_Int16 nNull = -1;	// gibt einen auszulassenden Parameter an
             // ACHTUNG: 0 ist der letzte Parameter, nAnz-1 der erste
 
-        INT16 nLast = nAnz - 1;
+        sal_Int16 nLast = nAnz - 1;
 
         if( eOc == ocRMZ )
         {	// Extrawurst ocRMZ letzter Parameter negiert!
@@ -222,12 +222,12 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
 }
 
 
-void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD )
+void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefData& rSRD )
 {
     // Col-Bemachung
     if( nCol & 0x8000 )
     {
-        rSRD.SetColRel( TRUE );
+        rSRD.SetColRel( sal_True );
         if( nCol & 0x0080 )
             nCol |= 0xFF00;
         else
@@ -237,14 +237,14 @@ void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD
     }
     else
     {
-        rSRD.SetColRel( FALSE );
+        rSRD.SetColRel( sal_False );
         rSRD.nCol = static_cast< SCsCOL >( nCol & 0x00FF );
     }
 
     // Row-Bemachung
     if( nRow & 0x8000 )
     {
-        rSRD.SetRowRel( TRUE );
+        rSRD.SetRowRel( sal_True );
         // vorzeichenrichtige Erweiterung
         switch( eTyp )
         {
@@ -271,7 +271,7 @@ void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD
     }
     else
     {
-        rSRD.SetRowRel( FALSE );
+        rSRD.SetRowRel( sal_False );
         switch( eTyp )
         {
             // 5432 1098 7654 3210
@@ -301,16 +301,16 @@ void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD
 }
 
 
-void LotusToSc::ReadSRD( ScSingleRefData& rSRD, BYTE nRelBit )
+void LotusToSc::ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nRelBit )
 {
-    BYTE			nTab, nCol;
-    UINT16			nRow;
+    sal_uInt8			nTab, nCol;
+    sal_uInt16			nRow;
 
     Read( nRow );
     Read( nTab );
     Read( nCol );
 
-    BOOL b3D = ( static_cast< SCTAB >( nTab ) != aEingPos.Tab() );
+    sal_Bool b3D = ( static_cast< SCTAB >( nTab ) != aEingPos.Tab() );
 
     rSRD.SetColRel( ( nRelBit & 0x01 ) != 0 );
     rSRD.nCol = static_cast< SCsCOL >( nCol );
@@ -364,27 +364,27 @@ void LotusToSc::Reset( const ScAddress& rEingPos )
 }
 
 
-LotusToSc::LotusToSc( SvStream &rStream, CharSet e, BOOL b ) :
+LotusToSc::LotusToSc( SvStream &rStream, CharSet e, sal_Bool b ) :
     LotusConverterBase( rStream, 128 )
 {
     eSrcChar = e;
-    bWK3 = FALSE;
+    bWK3 = sal_False;
     bWK123 = b;
 }
 
 
-typedef FUNC_TYPE ( FuncType1 ) ( BYTE );
-typedef DefTokenId ( FuncType2 ) ( BYTE );
+typedef FUNC_TYPE ( FuncType1 ) ( sal_uInt8 );
+typedef DefTokenId ( FuncType2 ) ( sal_uInt8 );
 
 
-ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
+ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
     const FORMULA_TYPE /*eFT*/ )
 {
-    BYTE				nOc;
-    BYTE				nAnz;
-    BYTE				nRelBits;
-    UINT16				nStrLen;
-    UINT16				nRngIndex;
+    sal_uInt8				nOc;
+    sal_uInt8				nAnz;
+    sal_uInt8				nRelBits;
+    sal_uInt16				nStrLen;
+    sal_uInt16				nRngIndex;
     FUNC_TYPE			eType = FT_NOP;
     TokenId				nMerk0;
     DefTokenId			eOc;
@@ -418,10 +418,10 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
         pIndexToType = IndexToType;
         pIndexToToken = IndexToToken;
 
-        rR.SetTabRel( TRUE );
+        rR.SetTabRel( sal_True );
         rR.nTab = aEingPos.Tab();
         rR.nRelTab = 0;
-        rR.SetFlag3D( FALSE );
+        rR.SetFlag3D( sal_False );
     }
 
     aCRD.Ref2 = rR;
@@ -479,7 +479,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
                 break;
             case FT_Variable:
             {
-                UINT16	nCol, nRow;
+                sal_uInt16	nCol, nRow;
                 Read( nCol );
                 Read( nRow );
 
@@ -495,7 +495,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
                         // kein Range dazu
                         nNewId = aPool.Store( rR );
                     else
-                        nNewId = aPool.Store( ( UINT16 ) nId );
+                        nNewId = aPool.Store( ( sal_uInt16 ) nId );
                 }
 
                 aStack << nNewId;
@@ -503,7 +503,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
                 break;
             case FT_Range:
             {
-                UINT16	nColS, nRowS, nColE, nRowE;
+                sal_uInt16	nColS, nRowS, nColE, nRowE;
                 Read( nColS );
                 Read( nRowS );
                 Read( nColE );
@@ -523,7 +523,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
                         // kein Range dazu
                         nNewId = aPool.Store( aCRD );
                     else
-                        nNewId = aPool.Store( ( UINT16 ) nId );
+                        nNewId = aPool.Store( ( sal_uInt16 ) nId );
                 }
 
                 aStack << nNewId;
@@ -535,7 +535,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
                 break;
             case FT_ConstInt:
             {
-                INT16	nVal;
+                sal_Int16	nVal;
                 Read( nVal );
                 aStack << aPool.Store( ( double ) nVal );
             }
@@ -633,7 +633,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
             case FT_Snum:
                     if ( bWK123 )
                 {
-                         UINT32   nValue;
+                         sal_uInt32   nValue;
 
                          Read( nValue );
                      double  fValue = Snum32ToDouble( nValue );
@@ -641,7 +641,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
                 }
                 else
                 {
-                        INT16 nVal;
+                        sal_Int16 nVal;
                         Read( nVal );
                         aStack << aPool.Store( SnumToDouble( nVal ) );
                 }
@@ -665,7 +665,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
 }
 
 
-FUNC_TYPE LotusToSc::IndexToType( BYTE nIndex )
+FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
 {
     static const FUNC_TYPE pType[ 256 ] =
     {						// Code Bezeichnung
@@ -930,7 +930,7 @@ FUNC_TYPE LotusToSc::IndexToType( BYTE nIndex )
 }
 
 
-DefTokenId LotusToSc::IndexToToken( BYTE nIndex )
+DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
 {
     static const DefTokenId pToken[ 256 ] =
     {						// Code Bezeichnung
@@ -1196,7 +1196,7 @@ DefTokenId LotusToSc::IndexToToken( BYTE nIndex )
 }
 
 
-FUNC_TYPE LotusToSc::IndexToTypeWK123( BYTE nIndex )
+FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
 {
     static const FUNC_TYPE pType[ 256 ] =
     {						// Code Bezeichnung
@@ -1461,7 +1461,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( BYTE nIndex )
 }
 
 
-DefTokenId LotusToSc::IndexToTokenWK123( BYTE nIndex )
+DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
 {
     static const DefTokenId pToken[ 256 ] =
     {						// Code Bezeichnung
@@ -1729,7 +1729,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( BYTE nIndex )
 
 
 
-const sal_Char* GetAddInName( const UINT8 n )
+const sal_Char* GetAddInName( const sal_uInt8 n )
 {
     static const sal_Char*	pNames[ 256 ] =
     {
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 5a13a0a74..1ea8ee007 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -54,7 +54,7 @@ static vos:: OMutex 		aLotImpSemaphore;
 ImportLotus::ImportLotus( SvStream& aStream, ScDocument* pDoc, CharSet eQ ) :
     ImportTyp( pDoc, eQ ),
     pIn( &aStream ),
-    aConv( *pIn, eQ, FALSE )
+    aConv( *pIn, eQ, sal_False )
 {
     // good point to start locking of import lotus
     aLotImpSemaphore.acquire();
@@ -91,8 +91,8 @@ ImportLotus::~ImportLotus()
 
 void ImportLotus::Bof( void )
 {
-    UINT16	nFileCode, nFileSub, nSaveCnt;
-    BYTE	nMajorId, nMinorId, nFlags;
+    sal_uInt16	nFileCode, nFileSub, nSaveCnt;
+    sal_uInt8	nMajorId, nMinorId, nFlags;
 
     Read( nFileCode );
     Read( nFileSub );
@@ -117,9 +117,9 @@ void ImportLotus::Bof( void )
 }
 
 
-BOOL ImportLotus::BofFm3( void )
+sal_Bool ImportLotus::BofFm3( void )
 {
-    UINT16	nFileCode, nFileSub;
+    sal_uInt16	nFileCode, nFileSub;
 
     Read( nFileCode );
     Read( nFileSub );
@@ -128,12 +128,12 @@ BOOL ImportLotus::BofFm3( void )
 }
 
 
-void ImportLotus::Columnwidth( UINT16 nRecLen )
+void ImportLotus::Columnwidth( sal_uInt16 nRecLen )
 {
     DBG_ASSERT( nRecLen >= 4, "*ImportLotus::Columnwidth(): Record zu kurz!" );
 
-    BYTE    nLTab, nWindow2;
-    UINT16	nCnt = ( nRecLen - 4 ) / 2;
+    sal_uInt8    nLTab, nWindow2;
+    sal_uInt16	nCnt = ( nRecLen - 4 ) / 2;
 
     Read( nLTab );
     Read( nWindow2 );
@@ -145,14 +145,14 @@ void ImportLotus::Columnwidth( UINT16 nRecLen )
     {
         Skip( 2 );
 
-        BYTE	nCol, nSpaces;
+        sal_uInt8	nCol, nSpaces;
 
         while( nCnt )
         {
             Read( nCol );
             Read( nSpaces );
             // ACHTUNG: Korrekturfaktor nach 'Augenmass' ermittelt!
-            pD->SetColWidth( static_cast<SCCOL> (nCol), static_cast<SCTAB> (nLTab), ( UINT16 ) ( TWIPS_PER_CHAR * 1.28 * nSpaces ) );
+            pD->SetColWidth( static_cast<SCCOL> (nCol), static_cast<SCTAB> (nLTab), ( sal_uInt16 ) ( TWIPS_PER_CHAR * 1.28 * nSpaces ) );
 
             nCnt--;
         }
@@ -160,12 +160,12 @@ void ImportLotus::Columnwidth( UINT16 nRecLen )
 }
 
 
-void ImportLotus::Hiddencolumn( UINT16 nRecLen )
+void ImportLotus::Hiddencolumn( sal_uInt16 nRecLen )
 {
     DBG_ASSERT( nRecLen >= 4, "*ImportLotus::Hiddencolumn(): Record zu kurz!" );
 
-    BYTE    nLTab, nWindow2;
-    UINT16	nCnt = ( nRecLen - 4 ) / 2;
+    sal_uInt8    nLTab, nWindow2;
+    sal_uInt16	nCnt = ( nRecLen - 4 ) / 2;
 
     Read( nLTab );
     Read( nWindow2 );
@@ -174,7 +174,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen )
     {
         Skip( 2 );
 
-        BYTE	nCol;
+        sal_uInt8	nCol;
 
         while( nCnt )
         {
@@ -189,7 +189,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen )
 
 void ImportLotus::Userrange( void )
 {
-    UINT16		nRangeType;
+    sal_uInt16		nRangeType;
     ScRange		aScRange;
     sal_Char*	pBuffer = new sal_Char[ 32 ];
 
@@ -212,7 +212,7 @@ void ImportLotus::Errcell( void )
 
     Read( aA );
 
-    pD->PutCell( aA.Col(), aA.Row(), aA.Tab(), new ScStringCell( CREATE_STRING( "#ERR!" ) ), (BOOL)TRUE );
+    pD->PutCell( aA.Col(), aA.Row(), aA.Tab(), new ScStringCell( CREATE_STRING( "#ERR!" ) ), (sal_Bool)sal_True );
 }
 
 
@@ -222,7 +222,7 @@ void ImportLotus::Nacell( void )
 
     Read( aA );
 
-    pD->PutCell( aA.Col(), aA.Row(), aA.Tab(), new ScStringCell( CREATE_STRING( "#NA!" ) ), (BOOL)TRUE );
+    pD->PutCell( aA.Col(), aA.Row(), aA.Tab(), new ScStringCell( CREATE_STRING( "#NA!" ) ), (sal_Bool)sal_True );
 }
 
 
@@ -238,7 +238,7 @@ void ImportLotus::Labelcell( void )
 
 //	aLabel.Convert( pLotusRoot->eCharsetQ );
 
-    pD->PutCell( aA.Col(), aA.Row(), aA.Tab(), new ScStringCell( aLabel ), (BOOL)TRUE );
+    pD->PutCell( aA.Col(), aA.Row(), aA.Tab(), new ScStringCell( aLabel ), (sal_Bool)sal_True );
 }
 
 
@@ -251,24 +251,24 @@ void ImportLotus::Numbercell( void )
     Read( fVal );
 
     pD->PutCell( aAddr.Col(), aAddr.Row(), aAddr.Tab(),
-        new ScValueCell( fVal ), (BOOL)TRUE );
+        new ScValueCell( fVal ), (sal_Bool)sal_True );
     }
 
 
 void ImportLotus::Smallnumcell( void )
     {
     ScAddress	aAddr;
-    INT16		nVal;
+    sal_Int16		nVal;
 
     Read( aAddr );
     Read( nVal );
 
     pD->PutCell( aAddr.Col(), aAddr.Row(), aAddr.Tab(),
-        new ScValueCell( SnumToDouble( nVal ) ), ( BOOL ) TRUE );
+        new ScValueCell( SnumToDouble( nVal ) ), ( sal_Bool ) sal_True );
     }
 
 
-ScFormulaCell *ImportLotus::Formulacell( UINT16 n )
+ScFormulaCell *ImportLotus::Formulacell( sal_uInt16 n )
     {
     DBG_ASSERT( pIn, "-ImportLotus::Formulacell(): Null-Stream -> Rums!" );
 
@@ -280,7 +280,7 @@ ScFormulaCell *ImportLotus::Formulacell( UINT16 n )
     n -= 14;
 
     const ScTokenArray*	pErg;
-    INT32				nRest = n;
+    sal_Int32				nRest = n;
 
     aConv.Reset( aAddr );
     aConv.SetWK3();
@@ -290,7 +290,7 @@ ScFormulaCell *ImportLotus::Formulacell( UINT16 n )
 
     pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
 
-    pD->PutCell( aAddr.Col(), aAddr.Row(), aAddr.Tab(), pZelle, (BOOL)TRUE );
+    pD->PutCell( aAddr.Col(), aAddr.Row(), aAddr.Tab(), pZelle, (sal_Bool)sal_True );
 
     return NULL;
     }
@@ -302,13 +302,13 @@ void ImportLotus::Read( String &r )
 }
 
 
-void ImportLotus::RowPresentation( UINT16 nRecLen )
+void ImportLotus::RowPresentation( sal_uInt16 nRecLen )
 {
     DBG_ASSERT( nRecLen > 4, "*ImportLotus::RowPresentation(): Record zu kurz!" );
 
-    BYTE    nLTab, nFlags;
-    UINT16	nRow, nHeight;
-    UINT16	nCnt = ( nRecLen - 4 ) / 8;
+    sal_uInt8    nLTab, nFlags;
+    sal_uInt16	nRow, nHeight;
+    sal_uInt16	nCnt = ( nRecLen - 4 ) / 8;
 
     Read( nLTab );
     Skip( 1 );
@@ -339,7 +339,7 @@ void ImportLotus::RowPresentation( UINT16 nRecLen )
 
 void ImportLotus::NamedSheet( void )
 {
-    UINT16  nLTab;
+    sal_uInt16  nLTab;
     String	aName;
 
     Read( nLTab );
@@ -354,7 +354,7 @@ void ImportLotus::NamedSheet( void )
 
 void ImportLotus::Font_Face( void )
 {
-    BYTE	nNum;
+    sal_uInt8	nNum;
     String	aName;
 
     Read( nNum );
@@ -372,9 +372,9 @@ void ImportLotus::Font_Face( void )
 
 void ImportLotus::Font_Type( void )
 {
-    static const UINT16 nAnz = 8;
-    UINT16				nCnt;
-    UINT16				nType;
+    static const sal_uInt16 nAnz = 8;
+    sal_uInt16				nCnt;
+    sal_uInt16				nType;
 
     for( nCnt = 0 ; nCnt < nAnz ; nCnt++ )
     {
@@ -386,9 +386,9 @@ void ImportLotus::Font_Type( void )
 
 void ImportLotus::Font_Ysize( void )
 {
-    static const UINT16	nAnz = 8;
-    UINT16				nCnt;
-    UINT16				nSize;
+    static const sal_uInt16	nAnz = 8;
+    sal_uInt16				nCnt;
+    sal_uInt16				nSize;
 
     for( nCnt = 0 ; nCnt < nAnz ; nCnt++ )
     {
@@ -398,18 +398,18 @@ void ImportLotus::Font_Ysize( void )
 }
 
 
-void ImportLotus::_Row( const UINT16 nRecLen )
+void ImportLotus::_Row( const sal_uInt16 nRecLen )
     {
     DBG_ASSERT( nExtTab >= 0, "*ImportLotus::_Row(): Kann hier nicht sein!" );
 
-    UINT16			nRow;
-    UINT16			nHeight;
-    UINT16			nCntDwn = ( nRecLen - 4 ) / 5;
+    sal_uInt16			nRow;
+    sal_uInt16			nHeight;
+    sal_uInt16			nCntDwn = ( nRecLen - 4 ) / 5;
     SCCOL			nColCnt = 0;
-    UINT8			nRepeats;
+    sal_uInt8			nRepeats;
     LotAttrWK3		aAttr;
 
-    BOOL			bCenter = FALSE;
+    sal_Bool			bCenter = sal_False;
     SCCOL           nCenterStart = 0, nCenterEnd = 0;
 
     Read( nRow );
@@ -445,7 +445,7 @@ void ImportLotus::_Row( const UINT16 nRecLen )
                 }
             else
                 {// ganz neue Center
-                bCenter = TRUE;
+                bCenter = sal_True;
                 nCenterStart = nColCnt;
                 }
             nCenterEnd = nColCnt + static_cast<SCCOL>(nRepeats);
@@ -455,7 +455,7 @@ void ImportLotus::_Row( const UINT16 nRecLen )
             if( bCenter )
                 {// evtl. alte Center bemachen
                 pD->DoMerge( static_cast<SCTAB> (nExtTab), nCenterStart, static_cast<SCROW> (nRow), nCenterEnd, static_cast<SCROW> (nRow) );
-                bCenter = FALSE;
+                bCenter = sal_False;
                 }
             }
 
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index cfbc530a9..fa8fd049b 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -56,10 +56,10 @@ FltError ImportLotus::Read()
         S_END			// Import finished
     };
 
-    UINT16			nOp;
-    UINT16			nSubType;
-    UINT16			nRecLen;
-    UINT32			nNextRec = 0UL;
+    sal_uInt16			nOp;
+    sal_uInt16			nSubType;
+    sal_uInt16			nRecLen;
+    sal_uInt32			nNextRec = 0UL;
     FltError		eRet = eERR_OK;
 //	ScFormulaCell	*pLastFormCell;
 
@@ -245,10 +245,10 @@ FltError ImportLotus::Read( SvStream& rIn )
 {
     pIn = &rIn;
 
-    BOOL			bRead = TRUE;
-    UINT16			nOp;
-    UINT16			nRecLen;
-    UINT32			nNextRec = 0UL;
+    sal_Bool			bRead = sal_True;
+    sal_uInt16			nOp;
+    sal_uInt16			nRecLen;
+    sal_uInt32			nNextRec = 0UL;
     FltError		eRet = eERR_OK;
 
     nTab = 0;
@@ -264,7 +264,7 @@ FltError ImportLotus::Read( SvStream& rIn )
         *pIn >> nOp >> nRecLen;
 
         if( pIn->IsEof() )
-            bRead = FALSE;
+            bRead = sal_False;
         else
         {
             nNextRec += nRecLen + 4;
@@ -274,13 +274,13 @@ FltError ImportLotus::Read( SvStream& rIn )
                 case 0x0000:							// BOF
                 if( nRecLen != 26 || !BofFm3() )
                 {
-                    bRead = FALSE;
+                    bRead = sal_False;
                     eRet = eERR_FORMAT;
                 }
                 break;
 
                 case 0x0001:							// EOF
-                    bRead = FALSE;
+                    bRead = sal_False;
                     DBG_ASSERT( nTab == 0,
                         "-ImportLotus::Read( SvStream& ): Zweimal EOF nicht erlaubt" );
                     nTab++;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 2e7b5c9ca..779391882 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -45,7 +45,7 @@ extern FltError ScImportLotus123old( SvStream&, ScDocument*, CharSet eSrc );
 FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocument* pDocument, CharSet eSrc )
 {
         ScFilterOptions aFilterOpt;
-    BOOL bWithWK3 = aFilterOpt.GetWK3Flag();
+    sal_Bool bWithWK3 = aFilterOpt.GetWK3Flag();
 
     SvStream*			pStream = rMedium.GetInStream();
 
@@ -86,7 +86,7 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum
     {// versuchen *.FM3-File zu laden
         INetURLObject aURL( rMedium.GetURLObject() );
         aURL.setExtension( CREATE_STRING( "FM3" ) );
-        SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_STD_READ, TRUE );
+        SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_STD_READ, sal_True );
         pStream = aMedium.GetInStream();
         if ( pStream )
         {
diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx
index f158d845c..c5238e9ce 100644
--- a/sc/source/filter/lotus/memory.cxx
+++ b/sc/source/filter/lotus/memory.cxx
@@ -53,8 +53,8 @@ sal_Char*				pPuffer;					// -> flt_xxx.cxx
 sal_Char*				pDummy1;					// -> flt_xxx.cxx, ScanVersion()
 sal_Char*				pDummy2;					// -> tool.cxx, CreateTable()
 
-extern BYTE*			pFormelBuffer;				// -> tool.cxx, fuer OP_Formula()
-BYTE*					pFormelBuffer;
+extern sal_uInt8*			pFormelBuffer;				// -> tool.cxx, fuer OP_Formula()
+sal_uInt8*					pFormelBuffer;
 
 extern FormCache*		pValueFormCache;			// -> tool.cxx
 
@@ -70,8 +70,8 @@ sal_Char*				pAnsi;
 #endif
 sal_Char*				pErgebnis;					// -> op.cxx
 
-extern BOOL				bFormInit;					// -> tool.cxx, fuer GetFormHandle()
-BOOL					bFormInit;
+extern sal_Bool				bFormInit;					// -> tool.cxx, fuer GetFormHandle()
+sal_Bool					bFormInit;
 
 extern SvxHorJustifyItem	*pAttrRight, *pAttrLeft, *pAttrCenter,
                             *pAttrRepeat, *pAttrStandard;	// -> tool.cxx, fuer GetFormAttr()
@@ -79,7 +79,7 @@ extern ScProtectionAttr*	pAttrUnprot;   // -> tool.cxx, fuer PutFormString()
 
 
 
-BOOL MemNew( void )
+sal_Bool MemNew( void )
 {
     pPuffer = new sal_Char [ 32L*1024L ];
 
@@ -98,20 +98,20 @@ BOOL MemNew( void )
 
     pPar = new sal_Char *[ nMaxPar ];
 
-    pFormelBuffer = new BYTE[ 4096 ];
+    pFormelBuffer = new sal_uInt8[ 4096 ];
 
     pValueFormCache = new FormCache( pDoc );
 
     // fuer tool.cxx::PutFormString()
-    pAttrUnprot = new ScProtectionAttr( TRUE );
+    pAttrUnprot = new ScProtectionAttr( sal_True );
     pAttrRight = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_RIGHT, ATTR_HOR_JUSTIFY );
     pAttrLeft = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, ATTR_HOR_JUSTIFY );
     pAttrCenter = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY );
     pAttrRepeat = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_REPEAT, ATTR_HOR_JUSTIFY );
     pAttrStandard = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY );
-    bFormInit = TRUE;
+    bFormInit = sal_True;
 
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index a3d6fd5e3..db834ec4b 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -80,57 +80,57 @@
 extern sal_Char*	pAnsi;			// -> memory.cxx, Puffer zum Umwandeln von OEM->ANSI
 extern sal_Char*	pErgebnis;		// -> memory.cxx, Ergebnispuffer
 extern WKTYP		eTyp;			// -> filter.cxx, aktueller Dateityp
-extern BOOL			bEOF;			// -> filter.cxx, zeigt Dateiende an
+extern sal_Bool			bEOF;			// -> filter.cxx, zeigt Dateiende an
 extern sal_Char*	pPuffer0;		// -> memory.cxx
 extern sal_Char*	pPuffer1;
-extern BYTE			nDefaultFormat;	// -> tool.cxx, Default-Zellenformat
+extern sal_uInt8			nDefaultFormat;	// -> tool.cxx, Default-Zellenformat
 extern ScDocument*	pDoc;			// -> filter.cxx, Aufhaenger zum Dokumentzugriff
-extern BYTE*		pFormelBuffer;	// -> memory.cxx, fuer
+extern sal_uInt8*		pFormelBuffer;	// -> memory.cxx, fuer
 extern CharSet		eCharVon;       // -> filter.cxx, character set specified
 
-static UINT16		nDefWidth = ( UINT16 ) ( TWIPS_PER_CHAR * 10 );
+static sal_uInt16		nDefWidth = ( sal_uInt16 ) ( TWIPS_PER_CHAR * 10 );
 
-extern std::map<UINT16, ScPatternAttr> aLotusPatternPool;
+extern std::map<sal_uInt16, ScPatternAttr> aLotusPatternPool;
 
-void NI( SvStream& r, UINT16 n )
+void NI( SvStream& r, sal_uInt16 n )
 {
     r.SeekRel( n );
 }
 
 
-void OP_BOF( SvStream& r, UINT16 /*n*/ )
+void OP_BOF( SvStream& r, sal_uInt16 /*n*/ )
 {
     r.SeekRel( 2 );        // Versionsnummer ueberlesen
 }
 
 
-void OP_EOF( SvStream& /*r*/, UINT16 /*n*/ )
+void OP_EOF( SvStream& /*r*/, sal_uInt16 /*n*/ )
 {
-    bEOF = TRUE;
+    bEOF = sal_True;
 }
 
 
-void OP_Integer( SvStream& r, UINT16 /*n*/ )
+void OP_Integer( SvStream& r, sal_uInt16 /*n*/ )
 {
-    BYTE			nFormat;
-    UINT16			nCol, nRow;
+    sal_uInt8			nFormat;
+    sal_uInt16			nCol, nRow;
     SCTAB			nTab = 0;
-    INT16			nValue;
+    sal_Int16			nValue;
 
     r >> nFormat >> nCol >> nRow >> nValue;
 
     ScValueCell*	pZelle = new ScValueCell( ( double ) nValue );
-    pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( BOOL ) TRUE );
+    pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( sal_Bool ) sal_True );
 
     // 0 Stellen nach'm Komma!
     SetFormat( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, nFormat, 0 );
 }
 
 
-void OP_Number( SvStream& r, UINT16 /*n*/ )
+void OP_Number( SvStream& r, sal_uInt16 /*n*/ )
 {
-    BYTE			nFormat;
-    UINT16			nCol, nRow;
+    sal_uInt8			nFormat;
+    sal_uInt16			nCol, nRow;
     SCTAB			nTab = 0;
     double			fValue;
 
@@ -138,16 +138,16 @@ void OP_Number( SvStream& r, UINT16 /*n*/ )
 
     fValue = ::rtl::math::round( fValue, 15 );
     ScValueCell*	pZelle = new ScValueCell( fValue );
-    pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( BOOL ) TRUE );
+    pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( sal_Bool ) sal_True );
 
     SetFormat( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, nFormat, nDezFloat );
 }
 
 
-void OP_Label( SvStream& r, UINT16 n )
+void OP_Label( SvStream& r, sal_uInt16 n )
 {
-    BYTE			nFormat;
-    UINT16			nCol, nRow;
+    sal_uInt8			nFormat;
+    sal_uInt16			nCol, nRow;
     SCTAB			nTab = 0;
 
     r >> nFormat >> nCol >> nRow;
@@ -168,10 +168,10 @@ void OP_Label( SvStream& r, UINT16 n )
 }
 
 
-//UNUSED2009-05 void OP_Text( SvStream& r, UINT16 n )        // WK3
+//UNUSED2009-05 void OP_Text( SvStream& r, sal_uInt16 n )        // WK3
 //UNUSED2009-05 {
-//UNUSED2009-05     UINT16          nRow;
-//UNUSED2009-05     BYTE            nCol, nTab;
+//UNUSED2009-05     sal_uInt16          nRow;
+//UNUSED2009-05     sal_uInt8            nCol, nTab;
 //UNUSED2009-05     sal_Char        pText[ 256 ];
 //UNUSED2009-05 
 //UNUSED2009-05     r >> nRow >> nTab >> nCol;
@@ -184,10 +184,10 @@ void OP_Label( SvStream& r, UINT16 n )
 //UNUSED2009-05 }
 
 
-void OP_Formula( SvStream& r, UINT16 /*n*/ )
+void OP_Formula( SvStream& r, sal_uInt16 /*n*/ )
 {
-    BYTE				nFormat;
-    UINT16				nCol, nRow, nFormulaSize;
+    sal_uInt8				nFormat;
+    sal_uInt16				nCol, nRow, nFormulaSize;
     SCTAB			        nTab = 0;
 
     r >> nFormat >> nCol >> nRow;
@@ -195,10 +195,10 @@ void OP_Formula( SvStream& r, UINT16 /*n*/ )
     r >> nFormulaSize;
 
     const ScTokenArray*	pErg;
-    INT32				nBytesLeft = nFormulaSize;
+    sal_Int32				nBytesLeft = nFormulaSize;
     ScAddress			aAddress( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab );
 
-    LotusToSc			aConv( r, pLotusRoot->eCharsetQ, FALSE );
+    LotusToSc			aConv( r, pLotusRoot->eCharsetQ, sal_False );
     aConv.Reset( aAddress );
     aConv.Convert( pErg, nBytesLeft );
 
@@ -206,24 +206,24 @@ void OP_Formula( SvStream& r, UINT16 /*n*/ )
 
     pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
 
-    pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( BOOL ) TRUE );
+    pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( sal_Bool ) sal_True );
 
     // nFormat = Standard -> Nachkommastellen wie Float
     SetFormat( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, nFormat, nDezFloat );
 }
 
 
-void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ )
+void OP_ColumnWidth( SvStream& r, sal_uInt16 /*n*/ )
 {
-    UINT16				nCol, nBreite;
-    BYTE				nWidthSpaces;
+    sal_uInt16				nCol, nBreite;
+    sal_uInt8				nWidthSpaces;
     SCTAB			        nTab = 0;
 
     r >> nCol >> nWidthSpaces;
 
     if( nWidthSpaces )
         // Annahme: 10cpi-Zeichensatz
-        nBreite = ( UINT16 ) ( TWIPS_PER_CHAR * nWidthSpaces );
+        nBreite = ( sal_uInt16 ) ( TWIPS_PER_CHAR * nWidthSpaces );
     else
     {
         pDoc->SetColHidden(static_cast<SCCOL>(nCol), static_cast<SCCOL>(nCol), 0, true);
@@ -234,10 +234,10 @@ void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ )
 }
 
 
-void OP_NamedRange( SvStream& r, UINT16 /*n*/ )
+void OP_NamedRange( SvStream& r, sal_uInt16 /*n*/ )
     {
     // POST:    waren Koordinaten ungueltig, wird nicht gespeichert
-    UINT16				nColSt, nRowSt, nColEnd, nRowEnd;
+    sal_uInt16				nColSt, nRowSt, nColEnd, nRowEnd;
     sal_Char			cPuffer[ 32 ];
 
     r.Read( cPuffer, 16 );
@@ -267,11 +267,11 @@ void OP_NamedRange( SvStream& r, UINT16 /*n*/ )
 }
 
 
-void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ )
+void OP_SymphNamedRange( SvStream& r, sal_uInt16 /*n*/ )
 {
     // POST:    waren Koordinaten ungueltig, wird nicht gespeichert
-    UINT16				nColSt, nRowSt, nColEnd, nRowEnd;
-    BYTE				nType;
+    sal_uInt16				nColSt, nRowSt, nColEnd, nRowEnd;
+    sal_uInt8				nType;
     sal_Char*			pName;
     sal_Char			cPuffer[ 32 ];
 
@@ -303,29 +303,29 @@ void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ )
 }
 
 
-void OP_Footer( SvStream& r, UINT16 n )
+void OP_Footer( SvStream& r, sal_uInt16 n )
 {
     r.SeekRel( n );
 }
 
 
-void OP_Header( SvStream& r, UINT16 n )
+void OP_Header( SvStream& r, sal_uInt16 n )
 {
     r.SeekRel( n );
 }
 
 
-void OP_Margins( SvStream& r, UINT16 n )
+void OP_Margins( SvStream& r, sal_uInt16 n )
 {
     r.SeekRel( n );
 }
 
 
-void OP_HiddenCols( SvStream& r, UINT16 /*n*/ )
+void OP_HiddenCols( SvStream& r, sal_uInt16 /*n*/ )
 {
-    UINT16		nByte, nBit;
+    sal_uInt16		nByte, nBit;
     SCCOL		nCount;
-    BYTE		nAkt;
+    sal_uInt8		nAkt;
     nCount = 0;
 
     for( nByte = 0 ; nByte < 32 ; nByte++ ) // 32 Bytes mit ...
@@ -344,7 +344,7 @@ void OP_HiddenCols( SvStream& r, UINT16 /*n*/ )
 }
 
 
-void OP_Window1( SvStream& r, UINT16 n )
+void OP_Window1( SvStream& r, sal_uInt16 n )
 {
     r.SeekRel( 4 );    // Cursor Pos ueberspringen
 
@@ -356,7 +356,7 @@ void OP_Window1( SvStream& r, UINT16 n )
 
     r.SeekRel( n - 8 );  // und den Rest ueberspringen
 
-    nDefWidth = ( UINT16 ) ( TWIPS_PER_CHAR * nDefWidth );
+    nDefWidth = ( sal_uInt16 ) ( TWIPS_PER_CHAR * nDefWidth );
 
     // statt Defaulteinstellung in SC alle Cols zu Fuss setzen
     for( SCCOL nCol = 0 ; nCol <= MAXCOL ; nCol++ )
@@ -364,30 +364,30 @@ void OP_Window1( SvStream& r, UINT16 n )
 }
 
 
-void OP_Blank( SvStream& r, UINT16 /*n*/ )
+void OP_Blank( SvStream& r, sal_uInt16 /*n*/ )
 {
-    UINT16		nCol, nRow;
-    BYTE		nFormat;
+    sal_uInt16		nCol, nRow;
+    sal_uInt8		nFormat;
     r >> nFormat >> nCol >> nRow;
 
     SetFormat( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), 0, nFormat, nDezFloat );
 }
 
-void OP_BOF123( SvStream& r, UINT16 /*n*/ )
+void OP_BOF123( SvStream& r, sal_uInt16 /*n*/ )
 {
     r.SeekRel( 26 );
 }
 
 
-void OP_EOF123( SvStream& /*r*/, UINT16 /*n*/ )
+void OP_EOF123( SvStream& /*r*/, sal_uInt16 /*n*/ )
 {
-    bEOF = TRUE;
+    bEOF = sal_True;
 }
 
-void OP_Label123( SvStream& r, UINT16 n )
+void OP_Label123( SvStream& r, sal_uInt16 n )
 {
-    BYTE      nTab, nCol;
-    UINT16    nRow;
+    sal_uInt8      nTab, nCol;
+    sal_uInt16    nRow;
     r >> nRow >> nTab >> nCol;
     n -= 4;
 
@@ -400,32 +400,32 @@ void OP_Label123( SvStream& r, UINT16 n )
     delete []pText;
 }
 
-void OP_Number123( SvStream& r, UINT16 /*n*/ )
+void OP_Number123( SvStream& r, sal_uInt16 /*n*/ )
 {
-    BYTE    nCol,nTab;
-    UINT16  nRow;
-    UINT32   nValue;
+    sal_uInt8    nCol,nTab;
+    sal_uInt16  nRow;
+    sal_uInt32   nValue;
 
     r >> nRow >> nTab >> nCol >> nValue;
     double fValue = Snum32ToDouble( nValue );
 
     ScValueCell *pCell = new ScValueCell( fValue );
-    pDoc->PutCell( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab), pCell, (BOOL) TRUE );
+    pDoc->PutCell( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab), pCell, (sal_Bool) sal_True );
 }
 
-void OP_Formula123( SvStream& r, UINT16 n )
+void OP_Formula123( SvStream& r, sal_uInt16 n )
 {
-    BYTE nCol,nTab;
-    UINT16 nRow;
+    sal_uInt8 nCol,nTab;
+    sal_uInt16 nRow;
 
     r >> nRow >> nTab >> nCol;
     r.SeekRel( 8 );    // Result- jump over
 
     const ScTokenArray*	pErg;
-    INT32				nBytesLeft = n - 12;
+    sal_Int32				nBytesLeft = n - 12;
     ScAddress			aAddress( nCol, nRow, nTab );
 
-    LotusToSc			aConv( r, pLotusRoot->eCharsetQ, TRUE );
+    LotusToSc			aConv( r, pLotusRoot->eCharsetQ, sal_True );
     aConv.Reset( aAddress );
     aConv.Convert( pErg, nBytesLeft );
 
@@ -433,25 +433,25 @@ void OP_Formula123( SvStream& r, UINT16 n )
 
     pCell->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
 
-    pDoc->PutCell( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab), pCell, (BOOL) TRUE );
+    pDoc->PutCell( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab), pCell, (sal_Bool) sal_True );
 }
 
-void OP_IEEENumber123( SvStream& r, UINT16 /*n*/ )
+void OP_IEEENumber123( SvStream& r, sal_uInt16 /*n*/ )
 {
-    BYTE nCol,nTab;
-    UINT16 nRow;
+    sal_uInt8 nCol,nTab;
+    sal_uInt16 nRow;
     double dValue;
 
     r >> nRow >> nTab >> nCol >> dValue;
 
     ScValueCell *pCell = new ScValueCell(dValue);
-    pDoc->PutCell( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab), pCell, (BOOL) TRUE );
+    pDoc->PutCell( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab), pCell, (sal_Bool) sal_True );
 }
 
-void OP_Note123( SvStream& r, UINT16 n)
+void OP_Note123( SvStream& r, sal_uInt16 n)
 {
-    BYTE      nTab, nCol;
-    UINT16    nRow;
+    sal_uInt8      nTab, nCol;
+    sal_uInt16    nRow;
     r >> nRow >> nTab >> nCol;
     n -= 4;
 
@@ -466,7 +466,7 @@ void OP_Note123( SvStream& r, UINT16 n)
     ScNoteUtil::CreateNoteFromString( *pDoc, aPos, aNoteText, false, false );
 }
 
-void OP_HorAlign123( BYTE nAlignPattern, SfxItemSet& rPatternItemSet )
+void OP_HorAlign123( sal_uInt8 nAlignPattern, SfxItemSet& rPatternItemSet )
 {
 //      pre:  Pattern is stored in the last 3 bites of the 21st byte
 //      post: Appropriate Horizontal Alignement is set in rPattern according to the bit pattern.
@@ -499,7 +499,7 @@ void OP_HorAlign123( BYTE nAlignPattern, SfxItemSet& rPatternItemSet )
       }
 }
 
-void OP_VerAlign123( BYTE nAlignPattern,SfxItemSet& rPatternItemSet  )
+void OP_VerAlign123( sal_uInt8 nAlignPattern,SfxItemSet& rPatternItemSet  )
 {
 //      pre:  Pattern is stored in the last 3 bites of the 22nd byte
 //      post: Appropriate Verticle Alignement is set in rPattern according to the bit pattern.
@@ -528,9 +528,9 @@ void OP_VerAlign123( BYTE nAlignPattern,SfxItemSet& rPatternItemSet  )
     }
 }
 
-void OP_CreatePattern123( SvStream& r, UINT16 n)
+void OP_CreatePattern123( SvStream& r, sal_uInt16 n)
 {
-    UINT16 nCode,nPatternId;
+    sal_uInt16 nCode,nPatternId;
 
     ScPatternAttr aPattern(pDoc->GetPool());
     SfxItemSet& rItemSet = aPattern.GetItemSet();
@@ -542,8 +542,8 @@ void OP_CreatePattern123( SvStream& r, UINT16 n)
     {
         r >> nPatternId;
 
-        BYTE Hor_Align, Ver_Align, temp;
-        BOOL bIsBold,bIsUnderLine,bIsItalics;
+        sal_uInt8 Hor_Align, Ver_Align, temp;
+        sal_Bool bIsBold,bIsUnderLine,bIsItalics;
 
         r.SeekRel(12);
 
@@ -570,13 +570,13 @@ void OP_CreatePattern123( SvStream& r, UINT16 n)
         r >> Ver_Align;
         OP_VerAlign123( Ver_Align, rItemSet );
 
-        aLotusPatternPool.insert( std::map<UINT16, ScPatternAttr>::value_type( nPatternId, aPattern ) );
+        aLotusPatternPool.insert( std::map<sal_uInt16, ScPatternAttr>::value_type( nPatternId, aPattern ) );
         n = n - 20;
     }
     r.SeekRel(n);
 }
 
-void OP_SheetName123( SvStream& rStream, USHORT nLength )
+void OP_SheetName123( SvStream& rStream, sal_uInt16 nLength )
 {
     if (nLength <= 4)
     {
@@ -594,7 +594,7 @@ void OP_SheetName123( SvStream& rStream, USHORT nLength )
 
     ::std::vector<sal_Char> sSheetName;
     sSheetName.reserve(nLength-4);
-    for (USHORT i = 4; i < nLength; ++i)
+    for (sal_uInt16 i = 4; i < nLength; ++i)
     {
         sal_Char c;
         rStream >> c;
@@ -610,8 +610,8 @@ void OP_SheetName123( SvStream& rStream, USHORT nLength )
 
 void OP_ApplyPatternArea123( SvStream& rStream )
 {
-    UINT16 nOpcode, nLength;
-    UINT16 nCol = 0, nColCount = 0, nRow = 0, nRowCount = 0, nTab = 0, nData, nTabCount = 0, nLevel = 0;
+    sal_uInt16 nOpcode, nLength;
+    sal_uInt16 nCol = 0, nColCount = 0, nRow = 0, nRowCount = 0, nTab = 0, nData, nTabCount = 0, nLevel = 0;
 
     do
     {
@@ -662,7 +662,7 @@ void OP_ApplyPatternArea123( SvStream& rStream )
                     rStream.SeekRel( nLength - 2 );
                     for( int i = 0; i < nTabCount; i++)
                     {
-                        std::map<UINT16, ScPatternAttr>::iterator loc = aLotusPatternPool.find( nData );
+                        std::map<sal_uInt16, ScPatternAttr>::iterator loc = aLotusPatternPool.find( nData );
 
                         // #126338# apparently, files with invalid index occur in the wild -> don't crash then
                         DBG_ASSERT( loc != aLotusPatternPool.end(), "invalid format index" );
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 595152316..830d9e6dc 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -60,10 +60,10 @@ extern sal_Char*			pDummy2;		// -> memory.cxx
 extern ScDocument*			pDoc;			// -> filter.cxx, Aufhaenger zum Dokumentzugriff
 extern CharSet				eCharNach;		// -> filter.cxx, Zeichenkonvertierung von->nach
 
-extern BOOL					bFormInit;		// -> memory.cxx, fuer GetFormHandle()
+extern sal_Bool					bFormInit;		// -> memory.cxx, fuer GetFormHandle()
 
 //--------------------------------------------------------- GLOBALE VARIABLEN -
-BYTE						nDefaultFormat;	// -> op.cpp, Standard-Zellenformat
+sal_uInt8						nDefaultFormat;	// -> op.cpp, Standard-Zellenformat
 
 extern SvxHorJustifyItem	*pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard;
 extern ScProtectionAttr*	pAttrUnprot;
@@ -121,14 +121,14 @@ void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString )
     {
         pDoc->ApplyAttr( nCol, nRow, nTab, *pJustify );
         ScStringCell*	pZelle = new ScStringCell( String( pString, pLotusRoot->eCharsetQ ) );
-        pDoc->PutCell( nCol, nRow, nTab, pZelle, ( BOOL ) TRUE );
+        pDoc->PutCell( nCol, nRow, nTab, pZelle, ( sal_Bool ) sal_True );
     }
 }
 
 
 
 
-void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt )
+void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt8 nFormat, sal_uInt8 nSt )
 {
     //  PREC:   nSt = Standard-Dezimalstellenanzahl
     pDoc->ApplyAttr( nCol, nRow, nTab, *( pValueFormCache->GetAttr( nFormat, nSt ) ) );
@@ -146,7 +146,7 @@ void InitPage( void )
 }
 
 
-double SnumToDouble( INT16 nVal )
+double SnumToDouble( sal_Int16 nVal )
 {
     const double pFacts[ 8 ] = {
         5000.0,
@@ -163,15 +163,15 @@ double SnumToDouble( INT16 nVal )
     if( nVal & 0x0001 )
     {
         fVal = pFacts[ ( nVal >> 1 ) & 0x0007 ];
-        fVal *= ( INT16 ) ( nVal >> 4 );
+        fVal *= ( sal_Int16 ) ( nVal >> 4 );
     }
     else
-        fVal = ( INT16 ) ( nVal >> 1 );
+        fVal = ( sal_Int16 ) ( nVal >> 1 );
 
     return fVal;
 }
 
-double Snum32ToDouble( UINT32 nValue )
+double Snum32ToDouble( sal_uInt32 nValue )
 {
     double fValue, temp;
 
@@ -191,36 +191,36 @@ double Snum32ToDouble( UINT32 nValue )
 }
 
 
-FormCache::FormCache( ScDocument* pDoc1, BYTE nNewDefaultFormat )
+FormCache::FormCache( ScDocument* pDoc1, sal_uInt8 nNewDefaultFormat )
 {	// Default-Format ist 'Default'
     nDefaultFormat = nNewDefaultFormat;
     pFormTable = pDoc1->GetFormatTable();
-    for( UINT16 nC = 0 ; nC < __nSize ; nC++ )
-        bValid[ nC ] = FALSE;
+    for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ )
+        bValid[ nC ] = sal_False;
     eLanguage = ScGlobal::eLnge;
 }
 
 
 FormCache::~FormCache()
 {
-    for( UINT16 nC = 0 ; nC < __nSize ; nC++ )
+    for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ )
         delete aIdents[ nC ].GetAttr();
 }
 
 
-SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
+SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
 {
     // neues Format erzeugen
-    BYTE		nL, nH; // Low-/High-Nibble
-    BYTE		nForm = nFormat;
+    sal_uInt8		nL, nH; // Low-/High-Nibble
+    sal_uInt8		nForm = nFormat;
     String		aFormString;
     const sal_Char* pFormString = 0;
-    INT16		eType = NUMBERFORMAT_ALL;
-    UINT32      nIndex1;
-    UINT32		nHandle;
-    BOOL		bDefault = FALSE;
+    sal_Int16		eType = NUMBERFORMAT_ALL;
+    sal_uInt32      nIndex1;
+    sal_uInt32		nHandle;
+    sal_Bool		bDefault = sal_False;
     //void GenerateFormat( aFormString, eType, COUNTRY_SYSTEM, LANGUAGE_SYSTEM,
-    //  BOOL bThousand, BOOL IsRed, UINT16 nPrecision, UINT16 nAnzLeading );
+    //  sal_Bool bThousand, sal_Bool IsRed, sal_uInt16 nPrecision, sal_uInt16 nAnzLeading );
 
     if( nForm == 0xFF ) // Default-Format?
         nForm = nDefaultFormat;
@@ -237,49 +237,49 @@ SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
             nIndex1 = pFormTable->GetStandardFormat(
                 NUMBERFORMAT_NUMBER, eLanguage );
             pFormTable->GenerateFormat( aFormString, nIndex1,
-                eLanguage, FALSE, FALSE, nL, 1 );
+                eLanguage, sal_False, sal_False, nL, 1 );
             break;
         case 0x01:  // Exponentdarstellung (scientific notation)
             //fExponent;nL;
             nIndex1 = pFormTable->GetStandardFormat(
                 NUMBERFORMAT_SCIENTIFIC, eLanguage );
             pFormTable->GenerateFormat( aFormString, nIndex1,
-                eLanguage, FALSE, FALSE, nL, 1 );
+                eLanguage, sal_False, sal_False, nL, 1 );
             break;
         case 0x02:  // Waehrungsdarstellung (currency)
             //fMoney;nL;
             nIndex1 = pFormTable->GetStandardFormat(
                 NUMBERFORMAT_CURRENCY, eLanguage );
             pFormTable->GenerateFormat( aFormString, nIndex1,
-                eLanguage, FALSE, FALSE, nL, 1 );
+                eLanguage, sal_False, sal_False, nL, 1 );
             break;
         case 0x03:  // Prozent
             //fPercent;nL;
             nIndex1 = pFormTable->GetStandardFormat(
                 NUMBERFORMAT_PERCENT, eLanguage );
             pFormTable->GenerateFormat( aFormString, nIndex1,
-                eLanguage, FALSE, FALSE, nL, 1 );
+                eLanguage, sal_False, sal_False, nL, 1 );
             break;
         case 0x04:  // Komma
             //fStandard;nL;
             nIndex1 = pFormTable->GetStandardFormat(
                 NUMBERFORMAT_NUMBER, eLanguage );
             pFormTable->GenerateFormat( aFormString, nIndex1,
-                eLanguage, TRUE, FALSE, nL, 1 );
+                eLanguage, sal_True, sal_False, nL, 1 );
             break;
         case 0x05:  // frei
             //fStandard;nL;
             nIndex1 = pFormTable->GetStandardFormat(
                 NUMBERFORMAT_NUMBER, eLanguage );
             pFormTable->GenerateFormat( aFormString, nIndex1,
-                eLanguage, FALSE, FALSE, nL, 1 );
+                eLanguage, sal_False, sal_False, nL, 1 );
             break;
         case 0x06:  // frei
             //fStandard;nL;
             nIndex1 = pFormTable->GetStandardFormat(
                 NUMBERFORMAT_NUMBER, eLanguage );
             pFormTable->GenerateFormat( aFormString, nIndex1,
-                eLanguage, FALSE, FALSE, nL, 1 );
+                eLanguage, sal_False, sal_False, nL, 1 );
             nIndex1 = 0;
             break;
         case 0x07:  // Spezialformat
@@ -290,14 +290,14 @@ SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
                     nIndex1 = pFormTable->GetStandardFormat(
                         NUMBERFORMAT_NUMBER, eLanguage );
                     pFormTable->GenerateFormat( aFormString, nIndex1,
-                        eLanguage, FALSE, TRUE, nSt, 1 );
+                        eLanguage, sal_False, sal_True, nSt, 1 );
                     break;
                 case 0x01:  // generelles Format
                     //fStandard;nSt;
                     nIndex1 = pFormTable->GetStandardFormat(
                         NUMBERFORMAT_NUMBER, eLanguage );
                     pFormTable->GenerateFormat( aFormString, nIndex1,
-                        eLanguage, FALSE, FALSE, nSt, 1 );
+                        eLanguage, sal_False, sal_False, nSt, 1 );
                     break;
                 case 0x02:  // Datum: Tag, Monat, Jahr
                     //fDate;dfDayMonthYearLong;
@@ -320,7 +320,7 @@ SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
                     pFormString = "@";
                     break;
                 case 0x06:  // versteckt
-                    //wFlag |= paHideAll;bSetFormat = FALSE;
+                    //wFlag |= paHideAll;bSetFormat = sal_False;
                     eType = NUMBERFORMAT_NUMBER;
                     pFormString = "";
                     break;
@@ -334,33 +334,33 @@ SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
                     eType = NUMBERFORMAT_TIME;
                     pFormString = "HH:MM";
                     break;
-                case 0x09:  // Date, intern INT32 1
+                case 0x09:  // Date, intern sal_Int32 1
                     //fDate;dfDayMonthYearLong;
                     eType = NUMBERFORMAT_DATE;
                     pFormString = "TT.MM.JJJJ";
                     break;
-                case 0x0A:  // Date, intern INT32 2
+                case 0x0A:  // Date, intern sal_Int32 2
                     //fDate;dfDayMonthYearLong;
                     eType = NUMBERFORMAT_DATE;
                     pFormString = "TT.MM.JJJJ";
                     break;
-                case 0x0B:  // Time, intern INT32 1
+                case 0x0B:  // Time, intern sal_Int32 1
                     //fTime;tfHourMinSec24;
                     eType = NUMBERFORMAT_TIME;
                     pFormString = "HH:MM:SS";
                     break;
-                case 0x0C:  // Time, intern INT32 2
+                case 0x0C:  // Time, intern sal_Int32 2
                     //fTime;tfHourMinSec24;
                     eType = NUMBERFORMAT_TIME;
                     pFormString = "HH:MM:SS";
                     break;
                 case 0x0F:  // Standardeinstellung
                     //fStandard;nSt;
-                    bDefault = TRUE;
+                    bDefault = sal_True;
                     break;
                 default:
                     //fStandard;nSt;
-                    bDefault = TRUE;
+                    bDefault = sal_True;
                     break;
             }
             break;
@@ -369,7 +369,7 @@ SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
             nIndex1 = pFormTable->GetStandardFormat(
                 NUMBERFORMAT_NUMBER, eLanguage );
             pFormTable->GenerateFormat( aFormString, nIndex1,
-                eLanguage, FALSE, FALSE, nL, 1 );
+                eLanguage, sal_False, sal_False, nL, 1 );
             nIndex1 = 0;
             break;
     }
@@ -386,7 +386,7 @@ SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
         pFormTable->PutEntry( aFormString, nDummy, eType, nHandle, eLanguage );
     }
 
-    return new SfxUInt32Item( ATTR_VALUE_FORMAT, ( UINT32 ) nHandle );
+    return new SfxUInt32Item( ATTR_VALUE_FORMAT, ( sal_uInt32 ) nHandle );
 }
 
 
@@ -400,10 +400,10 @@ void LotusRange::MakeHash( void )
     //                   ********       nColE
     //     ****************             nRowS
     // ****************                 nRowE
-    nHash =  static_cast<UINT32>(nColStart);
-    nHash += static_cast<UINT32>(nColEnd) << 6;
-    nHash += static_cast<UINT32>(nRowStart) << 12;
-    nHash += static_cast<UINT32>(nRowEnd ) << 16;
+    nHash =  static_cast<sal_uInt32>(nColStart);
+    nHash += static_cast<sal_uInt32>(nColEnd) << 6;
+    nHash += static_cast<sal_uInt32>(nRowStart) << 12;
+    nHash += static_cast<sal_uInt32>(nRowEnd ) << 16;
 }
 
 
@@ -445,17 +445,17 @@ LotusRangeList::LotusRangeList( void )
 
     pSingRef = &aComplRef.Ref1;
     pSingRef->nTab = pSingRef->nRelTab = 0;
-    pSingRef->SetColRel( FALSE );
-    pSingRef->SetRowRel( FALSE );
-    pSingRef->SetTabRel( TRUE );
-    pSingRef->SetFlag3D( FALSE );
+    pSingRef->SetColRel( sal_False );
+    pSingRef->SetRowRel( sal_False );
+    pSingRef->SetTabRel( sal_True );
+    pSingRef->SetFlag3D( sal_False );
 
     pSingRef = &aComplRef.Ref2;
     pSingRef->nTab = pSingRef->nRelTab = 0;
-    pSingRef->SetColRel( FALSE );
-    pSingRef->SetRowRel( FALSE );
-    pSingRef->SetTabRel( TRUE );
-    pSingRef->SetFlag3D( FALSE );
+    pSingRef->SetColRel( sal_False );
+    pSingRef->SetRowRel( sal_False );
+    pSingRef->SetTabRel( sal_True );
+    pSingRef->SetFlag3D( sal_False );
 }
 
 
@@ -559,12 +559,12 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rC
     if( rRef1.nCol == rRef2.nCol && rRef1.nRow == rRef2.nRow && rRef1.nTab == rRef2.nTab )
     {
         pScTokenArray->AddSingleReference( rCRD.Ref1 );
-        pInsert->bSingleRef = TRUE;
+        pInsert->bSingleRef = sal_True;
     }
     else
     {
         pScTokenArray->AddDoubleReference( rCRD );
-        pInsert->bSingleRef = FALSE;
+        pInsert->bSingleRef = sal_False;
     }
 
     ScRangeData*		pData = new ScRangeData( pLotusRoot->pDoc, aScName, *pScTokenArray );
@@ -577,7 +577,7 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rC
 }
 
 
-BOOL RangeNameBufferWK3::FindRel( const String& rRef, UINT16& rIndex )
+sal_Bool RangeNameBufferWK3::FindRel( const String& rRef, sal_uInt16& rIndex )
 {
     StringHashEntry		aRef( rRef );
 
@@ -588,16 +588,16 @@ BOOL RangeNameBufferWK3::FindRel( const String& rRef, UINT16& rIndex )
         if( aRef == pFind->aStrHashEntry )
         {
             rIndex = pFind->nRelInd;
-            return TRUE;
+            return sal_True;
         }
         pFind = ( ENTRY* ) List::Next();
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex )
+sal_Bool RangeNameBufferWK3::FindAbs( const String& rRef, sal_uInt16& rIndex )
 {
     String				aTmp( rRef );
     StringHashEntry		aRef( aTmp.Erase( 0, 1 ) );	// ohne '$' suchen!
@@ -616,18 +616,18 @@ BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex )
                 ScSingleRefData*		pRef = &pFind->aScComplexRefDataRel.Ref1;
                 pScTokenArray->Clear();
 
-                pRef->SetColRel( FALSE );
-                pRef->SetRowRel( FALSE );
-                pRef->SetTabRel( TRUE );
+                pRef->SetColRel( sal_False );
+                pRef->SetRowRel( sal_False );
+                pRef->SetTabRel( sal_True );
 
                 if( pFind->bSingleRef )
                     pScTokenArray->AddSingleReference( *pRef );
                 else
                 {
                     pRef = &pFind->aScComplexRefDataRel.Ref2;
-                    pRef->SetColRel( FALSE );
-                    pRef->SetRowRel( FALSE );
-                    pRef->SetTabRel( TRUE );
+                    pRef->SetColRel( sal_False );
+                    pRef->SetRowRel( sal_False );
+                    pRef->SetTabRel( sal_True );
                     pScTokenArray->AddDoubleReference( pFind->aScComplexRefDataRel );
                 }
 
@@ -640,12 +640,12 @@ BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex )
                 pLotusRoot->pScRangeName->Insert( pData );
             }
 
-            return TRUE;
+            return sal_True;
         }
         pFind = ( ENTRY* ) List::Next();
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 07576e63f..bc3f650ca 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -68,7 +68,7 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pSt
                 readString( aLabel, getLength() - 7 );
                 nStyle = nStyle >> 3;
                 pStyle->SetFormat( pDoc, nCol, nRow, nTab, nStyle );
-                pDoc->PutCell( nCol, nRow, nTab, ScBaseCell::CreateTextCell( aLabel, pDoc ), (BOOL) TRUE );
+                pDoc->PutCell( nCol, nRow, nTab, ScBaseCell::CreateTextCell( aLabel, pDoc ), (sal_Bool) sal_True );
                 }
                 break;
 
@@ -88,7 +88,7 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pSt
                 ScValueCell* pInteger = new ScValueCell( ( double ) nValue );
                 nStyle = nStyle >> 3;
                 pStyle->SetFormat( pDoc, nCol, nRow, nTab, nStyle );
-                pDoc->PutCell(nCol ,nRow, nTab ,pInteger,(BOOL) TRUE);
+                pDoc->PutCell(nCol ,nRow, nTab ,pInteger,(sal_Bool) sal_True);
                 }
                 break;
 
@@ -98,7 +98,7 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pSt
                 ScValueCell* pFloat = new ScValueCell( nValue );
                 nStyle = nStyle >> 3;
                 pStyle->SetFormat( pDoc, nCol, nRow, nTab, nStyle );
-                pDoc->PutCell( nCol, nRow, nTab, pFloat, (BOOL) TRUE );
+                pDoc->PutCell( nCol, nRow, nTab, pFloat, (sal_Bool) sal_True );
                 }
                 break;
 
@@ -117,7 +117,7 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pSt
                     nStyle = nStyle >> 3;
                     pFormula->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
                     pStyle->SetFormat( pDoc, nCol, nRow, nTab, nStyle );
-                    pDoc->PutCell( nCol, nRow, nTab, pFormula, ( BOOL ) TRUE );
+                    pDoc->PutCell( nCol, nRow, nTab, pFormula, ( sal_Bool ) sal_True );
                 }
                 }
                 break;
@@ -145,7 +145,7 @@ FltError ScQProReader::import( ScDocument *pDoc )
     sal_uInt16 nVersion;
     sal_uInt16 i = 1, j = 1;
     SCTAB nTab = 0;
-    SetEof( FALSE );
+    SetEof( sal_False );
 
     if( !recordsLeft() )
         return eERR_OPEN;
@@ -168,7 +168,7 @@ FltError ScQProReader::import( ScDocument *pDoc )
                         String aName;
                         aName.Append( sal_Unicode( 'A' + nTab ) );
                         if (!nTab)
-                            pDoc->RenameTab( nTab, aName, FALSE, FALSE);
+                            pDoc->RenameTab( nTab, aName, sal_False, sal_False);
                         else
                             pDoc->InsertTab( nTab, aName );
                     }
@@ -178,7 +178,7 @@ FltError ScQProReader::import( ScDocument *pDoc )
                 break;
 
             case 0x0001: // End of file
-                SetEof( TRUE );
+                SetEof( sal_True );
                 break;
 
             case 0x00ce:{ // Attribute cell
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 0d5d0624c..539b0a1d5 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -39,44 +39,44 @@
 
 void QProToSc::ReadSRD( ScSingleRefData& rSRD, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 nRelBit )
 {
-    UINT16 nTmp = nRelBit & 0x1fff;
+    sal_uInt16 nTmp = nRelBit & 0x1fff;
     rSRD.InitAddress( ScAddress( nCol, (~nTmp + 1), 0 ) );
     if( nRelBit & 0x4000 )
     {
         rSRD.nRelCol = nCol;
-        rSRD.SetColRel( TRUE );
+        rSRD.SetColRel( sal_True );
     }
     else
     {
         rSRD.nCol = nCol;
-        rSRD.SetColRel( FALSE );
+        rSRD.SetColRel( sal_False );
     }
     if( nRelBit & 0x2000 )
     {
         rSRD.nRelRow = (~nTmp + 1);
-        rSRD.nRelRow = (INT16)(nTmp << 3);
+        rSRD.nRelRow = (sal_Int16)(nTmp << 3);
         rSRD.nRelRow /= 8;
-        rSRD.SetRowRel( TRUE );
+        rSRD.SetRowRel( sal_True );
     }
     else
     {
         rSRD.nRow = nTmp;
-        rSRD.SetRowRel( FALSE );
+        rSRD.SetRowRel( sal_False );
     }
     if( nRelBit & 0x8000 )
     {
         rSRD.nRelTab = nPage;
-        rSRD.SetTabRel( TRUE );
+        rSRD.SetTabRel( sal_True );
         // absolute tab needed in caller for comparison in case of DoubleRef
         rSRD.nTab = aEingPos.Tab() + nPage;
     }
     else
     {
         rSRD.nTab = nPage;
-        rSRD.SetTabRel( FALSE );
+        rSRD.SetTabRel( sal_False );
     }
     if (rSRD.nTab != aEingPos.Tab())
-        rSRD.SetFlag3D( TRUE);
+        rSRD.SetFlag3D( sal_True);
 }
 
 QProToSc::QProToSc( SvStream& rStream, const ScAddress& rRefPos ) :
@@ -89,15 +89,15 @@ QProToSc::QProToSc( SvStream& rStream, const ScAddress& rRefPos ) :
 void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString )
 {
     TokenId  eParam[ nBufSize ];
-    INT32    nCount;
+    sal_Int32    nCount;
     TokenId  nPush, nPush1;
 
-    BOOL bAddIn = FALSE;
-    BOOL bNeg = FALSE;
+    sal_Bool bAddIn = sal_False;
+    sal_Bool bNeg = sal_False;
 
     if( eOc == ocNoName )
     {
-        bAddIn = TRUE;
+        bAddIn = sal_True;
         if( pExtString )
         {
             ByteString s;
@@ -150,8 +150,8 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
 
     if( nArgs> 0 )
     {
-        INT16 nNull = -1;
-        INT16 nLast = nArgs- 1;
+        sal_Int16 nNull = -1;
+        sal_Int16 nLast = nArgs- 1;
 
         if( eOc == ocZGZ )
             aPool << eParam[ 2 ] << ocSep << eParam[ 1 ] << ocSep << eParam[ 0 ];
@@ -325,7 +325,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con
                 // Sheet name of second corner is not displayed if identical
                 if (aCRD.Ref1.IsFlag3D() && aCRD.Ref1.nTab == aCRD.Ref2.nTab &&
                         aCRD.Ref1.IsTabRel() == aCRD.Ref2.IsTabRel())
-                    aCRD.Ref2.SetFlag3D( FALSE);
+                    aCRD.Ref2.SetFlag3D( sal_False);
                 aStack << aPool.Store( aCRD );
                 break;
 
diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx
index 8e1b13bbf..b709e2e0d 100644
--- a/sc/source/filter/qpro/qprostyle.cxx
+++ b/sc/source/filter/qpro/qprostyle.cxx
@@ -137,13 +137,13 @@ void ScQProStyle::SetFormat( ScDocument *pDoc, sal_uInt8 nCol, sal_uInt16 nRow,
     if( nTmp & 0x80 )
     {
         SfxBoolItem aWrapItem( ATTR_LINEBREAK );
-        aWrapItem.SetValue( TRUE );
+        aWrapItem.SetValue( sal_True );
         rItemSet.Put( aWrapItem );
     }
 
     // Font Attributes
     sal_uInt16 nTmpFnt = maFontRecord[ maFont[ nStyle ] ];
-    BOOL bIsBold, bIsItalic, bIsUnderLine, bIsStrikeThrough;
+    sal_Bool bIsBold, bIsItalic, bIsUnderLine, bIsStrikeThrough;
 
     bIsBold = ( nTmpFnt & 0x0001 ) != 0;
     bIsItalic = ( nTmpFnt & 0x0002 ) != 0;
@@ -158,7 +158,7 @@ void ScQProStyle::SetFormat( ScDocument *pDoc, sal_uInt8 nCol, sal_uInt16 nRow,
         rItemSet.Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) );
 
     if (maFontHeight[ maFont [ nStyle ] ])
-        rItemSet.Put( SvxFontHeightItem( (ULONG) (20 * maFontHeight[ maFont[ nStyle ] ] ), 100, ATTR_FONT_HEIGHT ) );
+        rItemSet.Put( SvxFontHeightItem( (sal_uLong) (20 * maFontHeight[ maFont[ nStyle ] ] ), 100, ATTR_FONT_HEIGHT ) );
 
     String fntName = maFontType[ maFont[ nStyle ] ];
     rItemSet.Put( SvxFontItem( FAMILY_SYSTEM, fntName, EMPTY_STRING, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ) );
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 0bc43ca66..3dea36661 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -83,8 +83,8 @@ ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange& rRange ) :
     const ScPatternAttr* pPattern = mpDoc->GetPattern(
         maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() );
     mpEngine = new ScTabEditEngine( *pPattern, mpDoc->GetEditPool() );
-    mpEngine->SetUpdateMode( FALSE );
-    mpEngine->EnableUndo( FALSE );
+    mpEngine->SetUpdateMode( sal_False );
+    mpEngine->EnableUndo( sal_False );
 }
 
 
@@ -97,9 +97,9 @@ ScEEImport::~ScEEImport()
 }
 
 
-ULONG ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
+sal_uLong ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
 {
-    ULONG nErr = mpParser->Read( rStream, rBaseURL );
+    sal_uLong nErr = mpParser->Read( rStream, rBaseURL );
 
     SCCOL nEndCol;
     SCROW nEndRow;
@@ -126,11 +126,11 @@ ULONG ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
 }
 
 
-void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
+void ScEEImport::WriteToDocument( sal_Bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
 {
     ScProgress* pProgress = new ScProgress( mpDoc->GetDocumentShell(),
         ScGlobal::GetRscString( STR_LOAD_DOC ), mpParser->Count() );
-    ULONG nProgress = 0;
+    sal_uLong nProgress = 0;
 
     SCCOL nStartCol, nEndCol;
         SCROW nStartRow, nEndRow;
@@ -145,7 +145,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
     nOverlapRowMax = 0;
     nMergeColAdd = 0;
     nLastMergedRow = SCROW_MAX;
-    BOOL bHasGraphics = FALSE;
+    sal_Bool bHasGraphics = sal_False;
     ScEEParseEntry* pE;
     if (!pFormatter)
         pFormatter = mpDoc->GetFormatTable();
@@ -190,28 +190,28 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
                 aSet.ClearItem( EE_PARA_JUST );
 
             // Testen, ob einfacher String ohne gemischte Attribute
-            BOOL bSimple = ( pE->aSel.nStartPara == pE->aSel.nEndPara );
-            for (USHORT nId = EE_CHAR_START; nId <= EE_CHAR_END && bSimple; nId++)
+            sal_Bool bSimple = ( pE->aSel.nStartPara == pE->aSel.nEndPara );
+            for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END && bSimple; nId++)
             {
                 const SfxPoolItem* pItem = 0;
-                SfxItemState eState = aSet.GetItemState( nId, TRUE, &pItem );
+                SfxItemState eState = aSet.GetItemState( nId, sal_True, &pItem );
                 if (eState == SFX_ITEM_DONTCARE)
-                    bSimple = FALSE;
+                    bSimple = sal_False;
                 else if (eState == SFX_ITEM_SET)
                 {
                     if ( nId == EE_CHAR_ESCAPEMENT )		// Hoch-/Tiefstellen immer ueber EE
                     {
                         if ( (SvxEscapement)((const SvxEscapementItem*)pItem)->GetEnumValue()
                                 != SVX_ESCAPEMENT_OFF )
-                            bSimple = FALSE;
+                            bSimple = sal_False;
                     }
                 }
             }
             if ( bSimple )
             {	//	Feldbefehle enthalten?
-                SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE );
+                SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, sal_False );
                 if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
-                    bSimple = FALSE;
+                    bSimple = sal_False;
             }
 
             // HTML
@@ -241,43 +241,43 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
             if ( rESet.Count() )
             {
                 const SfxPoolItem* pItem;
-                if ( rESet.GetItemState( ATTR_BACKGROUND, FALSE, &pItem) == SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_BACKGROUND, sal_False, &pItem) == SFX_ITEM_SET )
                     rSet.Put( *pItem );
-                if ( rESet.GetItemState( ATTR_BORDER, FALSE, &pItem) == SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_BORDER, sal_False, &pItem) == SFX_ITEM_SET )
                     rSet.Put( *pItem );
-                if ( rESet.GetItemState( ATTR_SHADOW, FALSE, &pItem) == SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_SHADOW, sal_False, &pItem) == SFX_ITEM_SET )
                     rSet.Put( *pItem );
                 // HTML
-                if ( rESet.GetItemState( ATTR_HOR_JUSTIFY, FALSE, &pItem) == SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_HOR_JUSTIFY, sal_False, &pItem) == SFX_ITEM_SET )
                     rSet.Put( *pItem );
-                if ( rESet.GetItemState( ATTR_VER_JUSTIFY, FALSE, &pItem) == SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_VER_JUSTIFY, sal_False, &pItem) == SFX_ITEM_SET )
                     rSet.Put( *pItem );
-                if ( rESet.GetItemState( ATTR_LINEBREAK, FALSE, &pItem) == SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_LINEBREAK, sal_False, &pItem) == SFX_ITEM_SET )
                     rSet.Put( *pItem );
-                if ( rESet.GetItemState( ATTR_FONT_COLOR, FALSE, &pItem) == SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_FONT_COLOR, sal_False, &pItem) == SFX_ITEM_SET )
                     rSet.Put( *pItem );
-                if ( rESet.GetItemState( ATTR_FONT_UNDERLINE, FALSE, &pItem) == SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_FONT_UNDERLINE, sal_False, &pItem) == SFX_ITEM_SET )
                     rSet.Put( *pItem );
                 // HTML LATIN/CJK/CTL script type dependent
                 const SfxPoolItem* pFont;
-                if ( rESet.GetItemState( ATTR_FONT, FALSE, &pFont) != SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_FONT, sal_False, &pFont) != SFX_ITEM_SET )
                     pFont = 0;
                 const SfxPoolItem* pHeight;
-                if ( rESet.GetItemState( ATTR_FONT_HEIGHT, FALSE, &pHeight) != SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_FONT_HEIGHT, sal_False, &pHeight) != SFX_ITEM_SET )
                     pHeight = 0;
                 const SfxPoolItem* pWeight;
-                if ( rESet.GetItemState( ATTR_FONT_WEIGHT, FALSE, &pWeight) != SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_FONT_WEIGHT, sal_False, &pWeight) != SFX_ITEM_SET )
                     pWeight = 0;
                 const SfxPoolItem* pPosture;
-                if ( rESet.GetItemState( ATTR_FONT_POSTURE, FALSE, &pPosture) != SFX_ITEM_SET )
+                if ( rESet.GetItemState( ATTR_FONT_POSTURE, sal_False, &pPosture) != SFX_ITEM_SET )
                     pPosture = 0;
                 if ( pFont || pHeight || pWeight || pPosture )
                 {
                     String aStr( mpEngine->GetText( pE->aSel ) );
-                    BYTE nScriptType = mpDoc->GetStringScriptType( aStr );
-                    const BYTE nScripts[3] = { SCRIPTTYPE_LATIN,
+                    sal_uInt8 nScriptType = mpDoc->GetStringScriptType( aStr );
+                    const sal_uInt8 nScripts[3] = { SCRIPTTYPE_LATIN,
                         SCRIPTTYPE_ASIAN, SCRIPTTYPE_COMPLEX };
-                    for ( BYTE i=0; i<3; ++i )
+                    for ( sal_uInt8 i=0; i<3; ++i )
                     {
                         if ( nScriptType & nScripts[i] )
                         {
@@ -324,7 +324,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
             const ScStyleSheet* pStyleSheet =
                 mpDoc->GetPattern( nCol, nRow, nTab )->GetStyleSheet();
             aAttr.SetStyleSheet( (ScStyleSheet*)pStyleSheet );
-            mpDoc->SetPattern( nCol, nRow, nTab, aAttr, TRUE );
+            mpDoc->SetPattern( nCol, nRow, nTab, aAttr, sal_True );
 
             // Daten eintragen
             if (bSimple)
@@ -393,7 +393,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
                 bHasGraphics |= GraphicSize( nCol, nRow, nTab, pE );
             if ( pE->pName )
             {	// Anchor Name => RangeName
-                USHORT nIndex;
+                sal_uInt16 nIndex;
                 if ( !pRangeNames->SearchName( *pE->pName, nIndex ) )
                 {
                     ScRangeData* pData = new ScRangeData( mpDoc, *pE->pName,
@@ -414,7 +414,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
             pProgress->SetState( nProgress, nEndCol - nStartCol + 1 );
             for ( SCCOL nCol = nStartCol; nCol <= nEndCol; nCol++ )
             {
-                USHORT nWidth = (USHORT)(ULONG) pColWidths->Get( nCol );
+                sal_uInt16 nWidth = (sal_uInt16)(sal_uLong) pColWidths->Get( nCol );
                 if ( nWidth )
                     mpDoc->SetColWidth( nCol, nTab, nWidth );
                 pProgress->SetState( ++nProgress );
@@ -428,13 +428,13 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
         double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom;
         VirtualDevice aVirtDev;
         mpDoc->SetOptimalHeight( 0, nEndRow, 0,
-            static_cast< USHORT >( ScGlobal::nLastRowHeightExtra ), &aVirtDev,
-            nPPTX, nPPTY, aZoom, aZoom, FALSE );
+            static_cast< sal_uInt16 >( ScGlobal::nLastRowHeightExtra ), &aVirtDev,
+            nPPTX, nPPTY, aZoom, aZoom, sal_False );
         if ( mpRowHeights->Count() )
         {
             for ( SCROW nRow = nStartRow; nRow <= nEndRow; nRow++ )
             {
-                USHORT nHeight = (USHORT)(ULONG) mpRowHeights->Get( nRow );
+                sal_uInt16 nHeight = (sal_uInt16)(sal_uLong) mpRowHeights->Get( nRow );
                 if ( nHeight > mpDoc->GetRowHeight( nRow, nTab ) )
                     mpDoc->SetRowHeight( nRow, nTab, nHeight );
             }
@@ -458,13 +458,13 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
 }
 
 
-BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/,
+sal_Bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/,
         ScEEParseEntry* pE )
 {
     ScHTMLImageList* pIL = pE->pImageList;
     if ( !pIL || !pIL->Count() )
-        return FALSE;
-    BOOL bHasGraphics = FALSE;
+        return sal_False;
+    sal_Bool bHasGraphics = sal_False;
     OutputDevice* pDefaultDev = Application::GetDefaultDevice();
     long nWidth, nHeight;
     nWidth = nHeight = 0;
@@ -472,7 +472,7 @@ BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/,
     for ( ScHTMLImage* pI = pIL->First(); pI; pI = pIL->Next() )
     {
         if ( pI->pGraphic )
-            bHasGraphics = TRUE;
+            bHasGraphics = sal_True;
         Size aSizePix = pI->aSize;
         aSizePix.Width() += 2 * pI->aSpace.X();
         aSizePix.Height() += 2 * pI->aSpace.Y();
diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx
index a849fb962..2e46b8403 100644
--- a/sc/source/filter/rtf/expbase.cxx
+++ b/sc/source/filter/rtf/expbase.cxx
@@ -63,16 +63,16 @@ ScExportBase::~ScExportBase()
 }
 
 
-BOOL ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol,
+sal_Bool ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol,
             SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const
 {
     pDoc->GetDataStart( nTab, nStartCol, nStartRow );
-    pDoc->GetPrintArea( nTab, nEndCol, nEndRow, TRUE );
+    pDoc->GetPrintArea( nTab, nEndCol, nEndRow, sal_True );
     return TrimDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
 }
 
 
-BOOL ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
+sal_Bool ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
             SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const
 {
     SCCOL nLastCol;
@@ -87,10 +87,10 @@ BOOL ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
 }
 
 
-BOOL ScExportBase::IsEmptyTable( SCTAB nTab ) const
+sal_Bool ScExportBase::IsEmptyTable( SCTAB nTab ) const
 {
     if ( !pDoc->HasTable( nTab ) || !pDoc->IsVisible( nTab ) )
-        return TRUE;
+        return sal_True;
     SCCOL nStartCol, nEndCol;
     SCROW nStartRow, nEndRow;
     return !GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 7b8ba5c26..bb3105523 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -68,7 +68,7 @@ FltError ScFormatFilterPluginImpl::ScExportRTF( SvStream& rStrm, ScDocument* pDo
 ScRTFExport::ScRTFExport( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP )
             :
             ScExportBase( rStrmP, pDocP, rRangeP ),
-            pCellX( new ULONG[ MAXCOL+2 ] )
+            pCellX( new sal_uLong[ MAXCOL+2 ] )
 {
 }
 
@@ -79,7 +79,7 @@ ScRTFExport::~ScRTFExport()
 }
 
 
-ULONG ScRTFExport::Write()
+sal_uLong ScRTFExport::Write()
 {
     rStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
     rStrm << OOO_STRING_SVTOOLS_RTF_ANSI << sNewLine;
@@ -106,10 +106,10 @@ ULONG ScRTFExport::Write()
     // hier kaeme die colortbl
 
     // stylesheet
-    UINT32 nFontHeight =
+    sal_uInt32 nFontHeight =
         ((const SvxFontHeightItem&)(rSetPara.Get( ATTR_FONT_HEIGHT ))).GetHeight();
     rStrm << '{' << OOO_STRING_SVTOOLS_RTF_STYLESHEET
-        << '{' << OOO_STRING_SVTOOLS_RTF_FS << String( UINT32(nFontHeight / TWIPS_PER_POINT) ).GetStr()
+        << '{' << OOO_STRING_SVTOOLS_RTF_FS << String( sal_uInt32(nFontHeight / TWIPS_PER_POINT) ).GetStr()
             << ' ' << pStyleSheet->GetName().GetStr() << ";}"
         << '}' << sNewLine;
 */
@@ -133,7 +133,7 @@ void ScRTFExport::WriteTab( SCTAB nTab )
     rStrm << '{' << sNewLine;
     if ( pDoc->HasTable( nTab ) )
     {
-        memset( &pCellX[0], 0, (MAXCOL+2) * sizeof(ULONG) );
+        memset( &pCellX[0], 0, (MAXCOL+2) * sizeof(sal_uLong) );
         SCCOL nCol;
         SCCOL nEndCol = aRange.aEnd.Col();
         for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -191,7 +191,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
     }
     rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << sNewLine;
 
-    ULONG nStrmPos = rStrm.Tell();
+    sal_uLong nStrmPos = rStrm.Tell();
     for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
     {
         WriteCell( nTab, nRow, nCol );
@@ -218,18 +218,18 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
 
     ScBaseCell* pCell;
     pDoc->GetCell( nCol, nRow, nTab, pCell );
-    BOOL bValueData;
+    sal_Bool bValueData;
     String aContent;
     if ( pCell )
     {
         switch ( pCell->GetCellType() )
         {
             case CELLTYPE_NOTE :
-                bValueData = FALSE;
+                bValueData = sal_False;
             break;		// nix
             case CELLTYPE_EDIT :
             {
-                bValueData = FALSE;
+                bValueData = sal_False;
                 EditEngine& rEngine = GetEditEngine();
                 const EditTextObject* pObj;
                 ((const ScEditCell*)pCell)->GetData( pObj );
@@ -243,17 +243,17 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
             default:
             {
                 bValueData = pCell->HasValueData();
-                ULONG nFormat = pAttr->GetNumberFormat( pFormatter );
+                sal_uLong nFormat = pAttr->GetNumberFormat( pFormatter );
                 Color* pColor;
                 ScCellFormat::GetString( pCell, nFormat, aContent, &pColor, *pFormatter );
             }
         }
     }
     else
-        bValueData = FALSE;
+        bValueData = sal_False;
 
-    BOOL bResetPar, bResetAttr;
-    bResetPar = bResetAttr = FALSE;
+    sal_Bool bResetPar, bResetAttr;
+    bResetPar = bResetAttr = sal_False;
 
     const SvxHorJustifyItem&	rHorJustifyItem	= (const SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY );
     const SvxWeightItem&		rWeightItem		= (const SvxWeightItem&)    pAttr->GetItem( ATTR_FONT_WEIGHT );
@@ -278,17 +278,17 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
 
     if ( rWeightItem.GetWeight() >= WEIGHT_BOLD )
     {	// bold
-        bResetAttr = TRUE;
+        bResetAttr = sal_True;
         rStrm << OOO_STRING_SVTOOLS_RTF_B;
     }
     if ( rPostureItem.GetPosture() != ITALIC_NONE )
     {	// italic
-        bResetAttr = TRUE;
+        bResetAttr = sal_True;
         rStrm << OOO_STRING_SVTOOLS_RTF_I;
     }
     if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE )
     {	// underline
-        bResetAttr = TRUE;
+        bResetAttr = sal_True;
         rStrm << OOO_STRING_SVTOOLS_RTF_UL;
     }
 
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index f6e660348..297c353b5 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -52,7 +52,7 @@
 
 
 
-SV_IMPL_VARARR_SORT( ScRTFColTwips, ULONG );
+SV_IMPL_VARARR_SORT( ScRTFColTwips, sal_uLong );
 
 
 
@@ -62,9 +62,9 @@ ScRTFParser::ScRTFParser( EditEngine* pEditP ) :
         pColTwips( new ScRTFColTwips ),
         pActDefault( NULL ),
         pDefMerge( NULL ),
-        nStartAdjust( (ULONG)~0 ),
+        nStartAdjust( (sal_uLong)~0 ),
         nLastWidth(0),
-        bNewDef( FALSE )
+        bNewDef( sal_False )
 {
     // RTF default FontSize 12Pt
     long nMM = OutputDevice::LogicToLogic( 12, MAP_POINT, MAP_100TH_MM );
@@ -84,11 +84,11 @@ ScRTFParser::~ScRTFParser()
 }
 
 
-ULONG ScRTFParser::Read( SvStream& rStream, const String& rBaseURL )
+sal_uLong ScRTFParser::Read( SvStream& rStream, const String& rBaseURL )
 {
     Link aOldLink = pEdit->GetImportHdl();
     pEdit->SetImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );
-    ULONG nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF );
+    sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF );
     if ( nLastToken == RTF_PAR )
     {
         ScEEParseEntry* pE = pList->Last();
@@ -127,33 +127,33 @@ inline void ScRTFParser::NextRow()
 }
 
 
-BOOL ScRTFParser::SeekTwips( USHORT nTwips, SCCOL* pCol )
+sal_Bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol )
 {
-    USHORT nPos;
-    BOOL bFound = pColTwips->Seek_Entry( nTwips, &nPos );
+    sal_uInt16 nPos;
+    sal_Bool bFound = pColTwips->Seek_Entry( nTwips, &nPos );
     *pCol = static_cast<SCCOL>(nPos);
     if ( bFound )
-        return TRUE;
-    USHORT nCount = pColTwips->Count();
+        return sal_True;
+    sal_uInt16 nCount = pColTwips->Count();
     if ( !nCount )
-        return FALSE;
+        return sal_False;
     SCCOL nCol = *pCol;
     // nCol ist Einfuegeposition, da liegt der Naechsthoehere (oder auch nicht)
     if ( nCol < static_cast<SCCOL>(nCount) && (((*pColTwips)[nCol] - SC_RTFTWIPTOL) <= nTwips) )
-        return TRUE;
+        return sal_True;
     // nicht kleiner als alles andere? dann mit Naechstniedrigerem vergleichen
     else if ( nCol != 0 && (((*pColTwips)[nCol-1] + SC_RTFTWIPTOL) >= nTwips) )
     {
         (*pCol)--;
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
 void ScRTFParser::ColAdjust()
 {
-    if ( nStartAdjust != (ULONG)~0 )
+    if ( nStartAdjust != (sal_uLong)~0 )
     {
         SCCOL nCol = 0;
         ScEEParseEntry* pE;
@@ -176,8 +176,8 @@ void ScRTFParser::ColAdjust()
                 nColMax = nCol;
             pE = pList->Next();
         }
-        nStartAdjust = (ULONG)~0;
-        pColTwips->Remove( (USHORT)0, pColTwips->Count() );
+        nStartAdjust = (sal_uLong)~0;
+        pColTwips->Remove( (sal_uInt16)0, pColTwips->Count() );
     }
 }
 
@@ -233,7 +233,7 @@ void ScRTFParser::NewCellRow( ImportInfo* /*pInfo*/ )
     if ( bNewDef )
     {
         ScRTFCellDefault* pD;
-        bNewDef = FALSE;
+        bNewDef = sal_False;
         // rechts nicht buendig? => neue Tabelle
         if ( nLastWidth
           && ((pD = pDefaultList->Last()) != 0) && pD->nTwips != nLastWidth )
@@ -321,7 +321,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
         break;
         case RTF_CELLX:			// closes cell default
         {
-            bNewDef = TRUE;
+            bNewDef = sal_True;
             pInsDefault->nCol = nColCnt;
             pInsDefault->nTwips = pInfo->nTokenValue;	// rechter Zellenrand
             pDefaultList->Insert( pInsDefault, LIST_APPEND );
@@ -360,7 +360,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
                 pActEntry->aItemSet.Set( pActDefault->aItemSet );
                 EntryEnd( pActEntry, pInfo->aSelection );
 
-                if ( nStartAdjust == (ULONG)~0 )
+                if ( nStartAdjust == (sal_uLong)~0 )
                     nStartAdjust = pList->Count();
                 pList->Insert( pActEntry, LIST_APPEND );
                 NewActEntry( pActEntry );	// neuer freifliegender pActEntry
@@ -404,11 +404,11 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
             {
                 case RTF_SHADINGDEF:
                     ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(
-                        pInfo->nToken, pInsDefault->aItemSet, TRUE );
+                        pInfo->nToken, pInsDefault->aItemSet, sal_True );
                 break;
                 case RTF_BRDRDEF:
                     ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(
-                        pInfo->nToken, pInsDefault->aItemSet, TRUE );
+                        pInfo->nToken, pInsDefault->aItemSet, sal_True );
                 break;
             }
         }
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index d4a1f3d52..b59385792 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -126,7 +126,7 @@ void lcl_ReadRGB(SvStream& rStream, Sc10Color& rColor)
 
 void lcl_ReadPalette(SvStream& rStream, Sc10Color* pPalette)
 {
-    for (USHORT i = 0; i < 16; i++)
+    for (sal_uInt16 i = 0; i < 16; i++)
         lcl_ReadRGB(rStream, pPalette[i]);
 }
 
@@ -295,7 +295,7 @@ void lcl_ReadChartTypeData(SvStream& rStream, Sc10ChartTypeData& rTypeData)
     rStream >> rTypeData.GraphStyle;
     rStream.Read(&rTypeData.GraphTitle, sizeof(rTypeData.GraphTitle));
     rStream.Read(&rTypeData.BottomTitle, sizeof(rTypeData.BottomTitle));
-    USHORT i;
+    sal_uInt16 i;
     for (i = 0; i < 256; i++)
         rStream >> rTypeData.SymbolData[i];
     for (i = 0; i < 256; i++)
@@ -366,7 +366,7 @@ double lcl_PascalToDouble(sal_Char* tp6)
 }
 
 
-void lcl_ChangeColor( USHORT nIndex, Color& rColor )
+void lcl_ChangeColor( sal_uInt16 nIndex, Color& rColor )
 {
     ColorData aCol;
 
@@ -393,7 +393,7 @@ void lcl_ChangeColor( USHORT nIndex, Color& rColor )
     rColor.SetColor( aCol );
 }
 
-String lcl_MakeOldPageStyleFormatName( USHORT i )
+String lcl_MakeOldPageStyleFormatName( sal_uInt16 i )
 {
     String	aName = ScGlobal::GetRscString( STR_PAGESTYLE );
     aName.AppendAscii( " " );
@@ -412,7 +412,7 @@ Sc10FontData::Sc10FontData(SvStream& rStream)
     rStream >> Height;
     rStream >> CharSet;
     rStream >> PitchAndFamily;
-    USHORT nLen;
+    sal_uInt16 nLen;
     rStream >> nLen;
     rStream.Read(FaceName, nLen);
 }
@@ -422,13 +422,13 @@ Sc10FontCollection::Sc10FontCollection(SvStream& rStream) :
     ScCollection (4, 4),
     nError     (0)
 {
-  USHORT ID;
+  sal_uInt16 ID;
   rStream >> ID;
   if (ID == FontID)
   {
-    USHORT nAnz;
+    sal_uInt16 nAnz;
     rStream >> nAnz;
-    for (USHORT i=0; (i < nAnz) && (nError == 0); i++)
+    for (sal_uInt16 i=0; (i < nAnz) && (nError == 0); i++)
     {
       Insert(new Sc10FontData(rStream));
       nError = rStream.GetError();
@@ -449,7 +449,7 @@ Sc10FontCollection::Sc10FontCollection(SvStream& rStream) :
 
 Sc10NameData::Sc10NameData(SvStream& rStream)
 {
-    BYTE nLen;
+    sal_uInt8 nLen;
     rStream >> nLen;
     rStream.Read(Name, sizeof(Name) - 1);
     Name[nLen] = 0;
@@ -465,13 +465,13 @@ Sc10NameCollection::Sc10NameCollection(SvStream& rStream) :
     ScCollection (4, 4),
     nError     (0)
 {
-  USHORT ID;
+  sal_uInt16 ID;
   rStream >> ID;
   if (ID == NameID)
   {
-    USHORT nAnz;
+    sal_uInt16 nAnz;
     rStream >> nAnz;
-    for (USHORT i=0; (i < nAnz) && (nError == 0); i++)
+    for (sal_uInt16 i=0; (i < nAnz) && (nError == 0); i++)
     {
       Insert(new Sc10NameData(rStream));
       nError = rStream.GetError();
@@ -513,13 +513,13 @@ Sc10PatternCollection::Sc10PatternCollection(SvStream& rStream) :
   ScCollection (4, 4),
   nError     (0)
 {
-  USHORT ID;
+  sal_uInt16 ID;
   rStream >> ID;
   if (ID == PatternID)
   {
-    USHORT nAnz;
+    sal_uInt16 nAnz;
     rStream >> nAnz;
-    for (USHORT i=0; (i < nAnz) && (nError == 0); i++)
+    for (sal_uInt16 i=0; (i < nAnz) && (nError == 0); i++)
     {
       Insert(new Sc10PatternData(rStream));
       nError = rStream.GetError();
@@ -579,14 +579,14 @@ Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream) :
   ScCollection (4, 4),
   nError     (0)
 {
-  USHORT ID;
+  sal_uInt16 ID;
   rStream >> ID;
   if (ID == DataBaseID)
   {
     rStream.Read(ActName, sizeof(ActName));
-    USHORT nAnz;
+    sal_uInt16 nAnz;
     rStream >> nAnz;
-    for (USHORT i=0; (i < nAnz) && (nError == 0); i++)
+    for (sal_uInt16 i=0; (i < nAnz) && (nError == 0); i++)
     {
       Insert(new Sc10DataBaseData(rStream));
       nError = rStream.GetError();
@@ -673,9 +673,9 @@ int Sc10PageFormat::operator==( const Sc10PageFormat& rData ) const
 }
 
 
-USHORT Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData )
+sal_uInt16 Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData )
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         if (At(i)->aPageFormat == rData)
             return i;
 
@@ -685,15 +685,15 @@ USHORT Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData )
 }
 
 
-static inline UINT8 GetMixedCol( const UINT8 nB, const UINT8 nF, const UINT16 nFak )
+static inline sal_uInt8 GetMixedCol( const sal_uInt8 nB, const sal_uInt8 nF, const sal_uInt16 nFak )
 {
-    INT32		nT = nB - nF;
-                nT *= ( INT32 ) nFak;
+    sal_Int32		nT = nB - nF;
+                nT *= ( sal_Int32 ) nFak;
                 nT /= 0xFFFF;
                 nT += nF;
-    return ( UINT8 ) nT;
+    return ( sal_uInt8 ) nT;
 }
-static inline Color GetMixedColor( const Color& rFore, const Color& rBack, UINT16 nFact )
+static inline Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt16 nFact )
 {
     return Color(	GetMixedCol( rBack.GetRed(), rFore.GetRed(), nFact ),
                     GetMixedCol( rBack.GetGreen(), rFore.GetGreen(), nFact ),
@@ -707,7 +707,7 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
     EditEngine aEditEngine( pDoc->GetEnginePool() );
     EditTextObject* pEmptyObject = aEditEngine.CreateTextObject();
 
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         Sc10PageFormat* pPage = &At(i)->aPageFormat;
 
@@ -730,7 +730,7 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
 
         SfxItemSet* pSet = &pSheet->GetItemSet();
 
-        for (USHORT nHeadFoot=0; nHeadFoot<2; nHeadFoot++)
+        for (sal_uInt16 nHeadFoot=0; nHeadFoot<2; nHeadFoot++)
         {
             Sc10HeadFootLine* pHeadFootLine = nHeadFoot ? &pPage->FootLine : &pPage->HeadLine;
 
@@ -805,11 +805,11 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
             nColor = pHeadFootLine->RasterColor;
             Color aRColor( nColor.Red, nColor.Green, nColor.Blue );
 
-            UINT16 nFact;
-            BOOL		bSwapCol = FALSE;
+            sal_uInt16 nFact;
+            sal_Bool		bSwapCol = sal_False;
             switch (pHeadFootLine->Raster)
             {
-               case raNone:		nFact = 0xffff; bSwapCol = TRUE; break;
+               case raNone:		nFact = 0xffff; bSwapCol = sal_True; break;
                case raGray12:	nFact = (0xffff / 100) * 12;	break;
                case raGray25:	nFact = (0xffff / 100) * 25;	break;
                case raGray50:	nFact = (0xffff / 100) * 50;	break;
@@ -823,14 +823,14 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
 
             if (pHeadFootLine->Frame != 0)
             {
-              USHORT nLeft = 0;
-              USHORT nTop = 0;
-              USHORT nRight = 0;
-              USHORT nBottom = 0;
-              USHORT fLeft   = (pHeadFootLine->Frame & 0x000F);
-              USHORT fTop    = (pHeadFootLine->Frame & 0x00F0) / 0x0010;
-              USHORT fRight  = (pHeadFootLine->Frame & 0x0F00) / 0x0100;
-              USHORT fBottom = (pHeadFootLine->Frame & 0xF000) / 0x1000;
+              sal_uInt16 nLeft = 0;
+              sal_uInt16 nTop = 0;
+              sal_uInt16 nRight = 0;
+              sal_uInt16 nBottom = 0;
+              sal_uInt16 fLeft   = (pHeadFootLine->Frame & 0x000F);
+              sal_uInt16 fTop    = (pHeadFootLine->Frame & 0x00F0) / 0x0010;
+              sal_uInt16 fRight  = (pHeadFootLine->Frame & 0x0F00) / 0x0100;
+              sal_uInt16 fBottom = (pHeadFootLine->Frame & 0xF000) / 0x1000;
               if (fLeft > 1)
                 nLeft = 50;
               else if (fLeft > 0)
@@ -851,10 +851,10 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
               Color  ColorTop(COL_BLACK);
               Color  ColorRight(COL_BLACK);
               Color  ColorBottom(COL_BLACK);
-              USHORT cLeft   = (pHeadFootLine->FrameColor & 0x000F);
-              USHORT cTop    = (pHeadFootLine->FrameColor & 0x00F0) >> 4;
-              USHORT cRight  = (pHeadFootLine->FrameColor & 0x0F00) >> 8;
-              USHORT cBottom = (pHeadFootLine->FrameColor & 0xF000) >> 12;
+              sal_uInt16 cLeft   = (pHeadFootLine->FrameColor & 0x000F);
+              sal_uInt16 cTop    = (pHeadFootLine->FrameColor & 0x00F0) >> 4;
+              sal_uInt16 cRight  = (pHeadFootLine->FrameColor & 0x0F00) >> 8;
+              sal_uInt16 cBottom = (pHeadFootLine->FrameColor & 0xF000) >> 12;
               lcl_ChangeColor(cLeft, ColorLeft);
               lcl_ChangeColor(cTop, ColorTop);
               lcl_ChangeColor(cRight, ColorRight);
@@ -884,9 +884,9 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
             else
                 aSetItemItemSet.Put( SvxSizeItem( ATTR_PAGE_SIZE, Size( 0, pPage->Bottom - pPage->Foot ) ) );
 
-            aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_ON, TRUE ));
-            aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_DYNAMIC, FALSE ));
-            aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_SHARED, TRUE ));
+            aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_ON, sal_True ));
+            aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_DYNAMIC, sal_False ));
+            aSetItemItemSet.Put(SfxBoolItem( ATTR_PAGE_SHARED, sal_True ));
 
             pSet->Put( SvxSetItem( nHeadFoot ? ATTR_PAGE_FOOTERSET : ATTR_PAGE_HEADERSET,
                                     aSetItemItemSet ) );
@@ -944,7 +944,7 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
         pSet->Put( ScViewObjectModeItem( ATTR_PAGE_OBJECTS,  VOBJ_MODE_SHOW ) );
         pSet->Put( ScViewObjectModeItem( ATTR_PAGE_DRAWINGS, VOBJ_MODE_SHOW ) );
         pSet->Put( SfxUInt16Item( ATTR_PAGE_SCALE,
-                                  (UINT16)( lcl_PascalToDouble( pPage->PrnZoom ) * 100 ) ) );
+                                  (sal_uInt16)( lcl_PascalToDouble( pPage->PrnZoom ) * 100 ) ) );
         pSet->Put( SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 1 ) );
 
         pSet->Put( SvxSizeItem( ATTR_PAGE_SIZE, Size( pPage->Width, pPage->Height ) ) );
@@ -994,7 +994,7 @@ Sc10Import::~Sc10Import()
 }
 
 
-ULONG Sc10Import::Import()
+sal_uLong Sc10Import::Import()
 {
     pPrgrsBar = new ScfStreamProgressBar( rStream, pDoc->GetDocumentShell() );
 
@@ -1095,10 +1095,10 @@ void Sc10Import::LoadProtect()
 
 void Sc10Import::LoadViewColRowBar()
 {
-    BYTE ViewColRowBar;
+    sal_uInt8 ViewColRowBar;
     rStream >> ViewColRowBar;
     nError = rStream.GetError();
-    aSc30ViewOpt.SetOption( VOPT_HEADER, (BOOL)ViewColRowBar );
+    aSc30ViewOpt.SetOption( VOPT_HEADER, (sal_Bool)ViewColRowBar );
 }
 
 
@@ -1142,7 +1142,7 @@ void Sc10Import::ImportNameCollection()
 {
     ScRangeName*		pRN = pDoc->GetRangeName();
 
-    for (USHORT i = 0; i < pNameCollection->GetCount(); i++)
+    for (sal_uInt16 i = 0; i < pNameCollection->GetCount(); i++)
     {
         Sc10NameData*	pName = pNameCollection->At( i );
         pRN->Insert( new ScRangeData(	pDoc,
@@ -1156,7 +1156,7 @@ void Sc10Import::LoadPatternCollection()
 {
     pPatternCollection = new Sc10PatternCollection( rStream );
     ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
-    for( USHORT i = 0 ; i < pPatternCollection->GetCount() ; i++ )
+    for( sal_uInt16 i = 0 ; i < pPatternCollection->GetCount() ; i++ )
     {
         Sc10PatternData* pPattern = pPatternCollection->At( i );
         String aName( pPattern->Name, DEFCHARSET );
@@ -1207,10 +1207,10 @@ void Sc10Import::LoadPatternCollection()
             // Ausrichtung
             if( ( pPattern->FormatFlags & pfJustify ) == pfJustify )
             {
-                USHORT HorJustify = ( pPattern->Justify & 0x000F );
-                USHORT VerJustify = ( pPattern->Justify & 0x00F0 ) >> 4;
-                USHORT OJustify   = ( pPattern->Justify & 0x0F00 ) >> 8;
-                USHORT EJustify   = ( pPattern->Justify & 0xF000 ) >> 12;
+                sal_uInt16 HorJustify = ( pPattern->Justify & 0x000F );
+                sal_uInt16 VerJustify = ( pPattern->Justify & 0x00F0 ) >> 4;
+                sal_uInt16 OJustify   = ( pPattern->Justify & 0x0F00 ) >> 8;
+                sal_uInt16 EJustify   = ( pPattern->Justify & 0xF000 ) >> 12;
                 if( HorJustify != 0 )
                     switch( HorJustify )
                     {
@@ -1239,13 +1239,13 @@ void Sc10Import::LoadPatternCollection()
                     }
 
                 if( ( OJustify & ojWordBreak ) == ojWordBreak )
-                    rItemSet.Put( SfxBoolItem( TRUE ) );
+                    rItemSet.Put( SfxBoolItem( sal_True ) );
                 if( ( OJustify & ojBottomTop ) == ojBottomTop )
                     rItemSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) );
                 else if( ( OJustify & ojTopBottom ) == ojTopBottom )
                     rItemSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) );
 
-                INT16 Margin = Max( ( USHORT ) 20, ( USHORT ) ( EJustify * 20 ) );
+                sal_Int16 Margin = Max( ( sal_uInt16 ) 20, ( sal_uInt16 ) ( EJustify * 20 ) );
 //				if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) ||
 //					( ( OJustify & ojBottomTop ) == ojBottomTop ) )
 // vielleicht so?
@@ -1260,14 +1260,14 @@ void Sc10Import::LoadPatternCollection()
             {
                 if( pPattern->Frame != 0 )
                 {
-                    USHORT	nLeft	= 0;
-                    USHORT	nTop	= 0;
-                    USHORT	nRight	= 0;
-                    USHORT	nBottom	= 0;
-                    USHORT	fLeft	= ( pPattern->Frame & 0x000F );
-                    USHORT	fTop	= ( pPattern->Frame & 0x00F0 ) / 0x0010;
-                    USHORT	fRight	= ( pPattern->Frame & 0x0F00 ) / 0x0100;
-                    USHORT	fBottom	= ( pPattern->Frame & 0xF000 ) / 0x1000;
+                    sal_uInt16	nLeft	= 0;
+                    sal_uInt16	nTop	= 0;
+                    sal_uInt16	nRight	= 0;
+                    sal_uInt16	nBottom	= 0;
+                    sal_uInt16	fLeft	= ( pPattern->Frame & 0x000F );
+                    sal_uInt16	fTop	= ( pPattern->Frame & 0x00F0 ) / 0x0010;
+                    sal_uInt16	fRight	= ( pPattern->Frame & 0x0F00 ) / 0x0100;
+                    sal_uInt16	fBottom	= ( pPattern->Frame & 0xF000 ) / 0x1000;
 
                     if( fLeft > 1 )
                         nLeft = 50;
@@ -1294,10 +1294,10 @@ void Sc10Import::LoadPatternCollection()
                     Color	ColorRight( COL_BLACK );
                     Color	ColorBottom( COL_BLACK );
 
-                    USHORT	cLeft	= ( pPattern->FrameColor & 0x000F );
-                    USHORT	cTop	= ( pPattern->FrameColor & 0x00F0 ) >> 4;
-                    USHORT	cRight	= ( pPattern->FrameColor & 0x0F00 ) >> 8;
-                    USHORT	cBottom	= ( pPattern->FrameColor & 0xF000 ) >> 12;
+                    sal_uInt16	cLeft	= ( pPattern->FrameColor & 0x000F );
+                    sal_uInt16	cTop	= ( pPattern->FrameColor & 0x00F0 ) >> 4;
+                    sal_uInt16	cRight	= ( pPattern->FrameColor & 0x0F00 ) >> 8;
+                    sal_uInt16	cBottom	= ( pPattern->FrameColor & 0xF000 ) >> 12;
 
                     lcl_ChangeColor( cLeft, ColorLeft );
                     lcl_ChangeColor( cTop, ColorTop );
@@ -1327,8 +1327,8 @@ void Sc10Import::LoadPatternCollection()
             {
                 if( pPattern->Raster != 0 )
                 {
-                    USHORT nBColor = ( pPattern->nColor & 0x00F0 ) >> 4;
-                    USHORT nRColor = ( pPattern->nColor & 0x0F00 ) >> 8;
+                    sal_uInt16 nBColor = ( pPattern->nColor & 0x00F0 ) >> 4;
+                    sal_uInt16 nRColor = ( pPattern->nColor & 0x0F00 ) >> 8;
                     Color aBColor( COL_BLACK );
 
                     lcl_ChangeColor( nBColor, aBColor );
@@ -1340,12 +1340,12 @@ void Sc10Import::LoadPatternCollection()
 
                     Color aRColor( COL_BLACK );
                     lcl_ChangeColor( nRColor, aRColor );
-                    UINT16 nFact;
-                    BOOL		bSwapCol = FALSE;
-                    BOOL		bSetItem = TRUE;
+                    sal_uInt16 nFact;
+                    sal_Bool		bSwapCol = sal_False;
+                    sal_Bool		bSetItem = sal_True;
                     switch (pPattern->Raster)
                     {
-                       case raNone:		nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break;
+                       case raNone:		nFact = 0xffff; bSwapCol = sal_True; bSetItem = (nBColor > 0); break;
                        case raGray12:	nFact = (0xffff / 100) * 12;	break;
                        case raGray25:	nFact = (0xffff / 100) * 25;	break;
                        case raGray50:	nFact = (0xffff / 100) * 50;	break;
@@ -1365,19 +1365,19 @@ void Sc10Import::LoadPatternCollection()
             if( ( pPattern->ValueFormat.Format != 0 ) &&
                 ( ( pPattern->FormatFlags & pfValue ) == pfValue ) )
             {
-                ULONG nKey = 0;
+                sal_uLong nKey = 0;
                 ChangeFormat( pPattern->ValueFormat.Format, pPattern->ValueFormat.Info, nKey );
-                rItemSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, ( UINT32 ) nKey ) );
+                rItemSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, ( sal_uInt32 ) nKey ) );
             }
 
             // Zellattribute (Schutz, Versteckt...)
             if( ( pPattern->Flags != 0 ) &&
                 ( ( pPattern->FormatFlags & pfProtection ) == pfProtection ) )
             {
-                BOOL bProtect  = ( ( pPattern->Flags & paProtect ) == paProtect );
-                BOOL bHFormula = ( ( pPattern->Flags & paHideFormula ) == paHideFormula );
-                BOOL bHCell    = ( ( pPattern->Flags & paHideAll ) == paHideAll );
-                BOOL bHPrint   = ( ( pPattern->Flags & paHidePrint ) == paHidePrint );
+                sal_Bool bProtect  = ( ( pPattern->Flags & paProtect ) == paProtect );
+                sal_Bool bHFormula = ( ( pPattern->Flags & paHideFormula ) == paHideFormula );
+                sal_Bool bHCell    = ( ( pPattern->Flags & paHideAll ) == paHideAll );
+                sal_Bool bHPrint   = ( ( pPattern->Flags & paHidePrint ) == paHidePrint );
                 rItemSet.Put( ScProtectionAttr( bProtect, bHFormula, bHCell, bHPrint ) );
             }
         } // if Style != 0
@@ -1388,7 +1388,7 @@ void Sc10Import::LoadPatternCollection()
 void Sc10Import::LoadDataBaseCollection()
 {
     pDataBaseCollection = new Sc10DataBaseCollection(rStream);
-    for( USHORT i = 0 ; i < pDataBaseCollection->GetCount() ; i++ )
+    for( sal_uInt16 i = 0 ; i < pDataBaseCollection->GetCount() ; i++ )
     {
         Sc10DataBaseData* pOldData = pDataBaseCollection->At(i);
         ScDBData* pNewData = new ScDBData( SC10TOSTRING( pOldData->DataBaseRec.Name ),
@@ -1397,8 +1397,8 @@ void Sc10Import::LoadDataBaseCollection()
                                     ( SCROW ) pOldData->DataBaseRec.Block.y1,
                                     ( SCCOL ) pOldData->DataBaseRec.Block.x2,
                                     ( SCROW ) pOldData->DataBaseRec.Block.y2,
-                                    TRUE,
-                                    ( BOOL) pOldData->DataBaseRec.RowHeader );
+                                    sal_True,
+                                    ( sal_Bool) pOldData->DataBaseRec.RowHeader );
         pDoc->GetDBCollection()->Insert( pNewData );
     }
 }
@@ -1408,31 +1408,31 @@ void Sc10Import::LoadTables()
 {
     Sc10PageCollection aPageCollection;
 
-    INT16 nTabCount;
+    sal_Int16 nTabCount;
     rStream >> nTabCount;
-    for (INT16 Tab = 0; (Tab < nTabCount) && (nError == 0); Tab++)
+    for (sal_Int16 Tab = 0; (Tab < nTabCount) && (nError == 0); Tab++)
     {
         Sc10PageFormat   PageFormat;
-        INT16            DataBaseIndex;
+        sal_Int16            DataBaseIndex;
         Sc10TableProtect TabProtect;
-        INT16            TabNo;
+        sal_Int16            TabNo;
         sal_Char             TabName[128];
-        USHORT           Display;
-        BYTE             Visible;
-        USHORT           ID;
-        USHORT           DataCount;
-        USHORT           DataStart;
-        USHORT           DataEnd;
-        USHORT           DataValue;
-        USHORT           Count;
-        USHORT           i;
+        sal_uInt16           Display;
+        sal_uInt8             Visible;
+        sal_uInt16           ID;
+        sal_uInt16           DataCount;
+        sal_uInt16           DataStart;
+        sal_uInt16           DataEnd;
+        sal_uInt16           DataValue;
+        sal_uInt16           Count;
+        sal_uInt16           i;
         String           aStr;	// Universal-Konvertierungs-String
 
 
         //rStream.Read(&PageFormat, sizeof(PageFormat));
         lcl_ReadPageFormat(rStream, PageFormat);
 
-        USHORT nAt = aPageCollection.InsertFormat(PageFormat);
+        sal_uInt16 nAt = aPageCollection.InsertFormat(PageFormat);
         String aPageName = lcl_MakeOldPageStyleFormatName( nAt );
 
         pPrgrsBar->Progress();
@@ -1449,7 +1449,7 @@ void Sc10Import::LoadTables()
 
         rStream >> TabNo;
 
-        BYTE nLen;
+        sal_uInt8 nLen;
         rStream >> nLen;
         rStream.Read(TabName, sizeof(TabName) - 1);
         TabName[nLen] = 0;
@@ -1457,7 +1457,7 @@ void Sc10Import::LoadTables()
         //----------------------------------------------------------
         rStream >> Display;
 
-        if ( Tab == (INT16)nShowTab )
+        if ( Tab == (sal_Int16)nShowTab )
         {
             ScVObjMode	eObjMode = VOBJ_MODE_SHOW;
 
@@ -1465,10 +1465,10 @@ void Sc10Import::LoadTables()
             aSc30ViewOpt.SetOption( VOPT_NULLVALS,	  IS_SET(dfZerro,Display) );
             aSc30ViewOpt.SetOption( VOPT_SYNTAX,	  IS_SET(dfSyntax,Display) );
             aSc30ViewOpt.SetOption( VOPT_NOTES,		  IS_SET(dfNoteMark,Display) );
-            aSc30ViewOpt.SetOption( VOPT_VSCROLL,	  TRUE );
-            aSc30ViewOpt.SetOption( VOPT_HSCROLL,	  TRUE );
-            aSc30ViewOpt.SetOption( VOPT_TABCONTROLS, TRUE );
-            aSc30ViewOpt.SetOption( VOPT_OUTLINER,	  TRUE );
+            aSc30ViewOpt.SetOption( VOPT_VSCROLL,	  sal_True );
+            aSc30ViewOpt.SetOption( VOPT_HSCROLL,	  sal_True );
+            aSc30ViewOpt.SetOption( VOPT_TABCONTROLS, sal_True );
+            aSc30ViewOpt.SetOption( VOPT_OUTLINER,	  sal_True );
             aSc30ViewOpt.SetOption( VOPT_GRID,		  IS_SET(dfGrid,Display) );
 
             // VOPT_HEADER wird in LoadViewColRowBar() gesetzt
@@ -1487,13 +1487,13 @@ void Sc10Import::LoadTables()
 
     /*	wofuer wird das benoetigt? Da in SC 1.0 die Anzeigeflags pro Tabelle gelten und nicht pro View
         Dieses Flag in die ViewOptions eintragen bei Gelegenheit, Sollte der Stephan Olk machen
-        USHORT nDisplayMask = 0xFFFF;
-        USHORT nDisplayValue = 0;
+        sal_uInt16 nDisplayMask = 0xFFFF;
+        sal_uInt16 nDisplayValue = 0;
         if (Tab == 0)
             nDisplayValue = Display;
         else
         {
-            USHORT nDiff = Display ^ nDisplayValue;
+            sal_uInt16 nDiff = Display ^ nDisplayValue;
             nDisplayMask &= ~nDiff;
         }
     */
@@ -1504,13 +1504,13 @@ void Sc10Import::LoadTables()
         if (nError != 0) return;
 
         if (TabNo == 0)
-            pDoc->RenameTab(static_cast<SCTAB> (TabNo), SC10TOSTRING( TabName ), FALSE);
+            pDoc->RenameTab(static_cast<SCTAB> (TabNo), SC10TOSTRING( TabName ), sal_False);
         else
             pDoc->InsertTab(SC_TAB_APPEND, SC10TOSTRING( TabName ) );
 
         pDoc->SetPageStyle( static_cast<SCTAB>(Tab), aPageName );
 
-        if (Visible == 0) pDoc->SetVisible(static_cast<SCTAB> (TabNo), FALSE);
+        if (Visible == 0) pDoc->SetVisible(static_cast<SCTAB> (TabNo), sal_False);
 
         // ColWidth
         rStream >> ID;
@@ -1638,13 +1638,13 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
 {
     LoadColAttr(Col, Tab);
 
-    USHORT CellCount;
-    BYTE   CellType;
-    USHORT Row;
+    sal_uInt16 CellCount;
+    sal_uInt8   CellType;
+    sal_uInt16 Row;
     rStream >> CellCount;
     SCROW nScCount = static_cast< SCROW >( CellCount );
     if (nScCount > MAXROW) nError = errUnknownFormat;
-    for (USHORT i = 0; (i < CellCount) && (nError == 0); i++)
+    for (sal_uInt16 i = 0; (i < CellCount) && (nError == 0); i++)
     {
         rStream >> CellType;
         rStream >> Row;
@@ -1656,7 +1656,7 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
                 case ctValue :
                 {
                     const SfxPoolItem* pValueFormat = pDoc->GetAttr(Col, static_cast<SCROW> (Row), Tab, ATTR_VALUE_FORMAT);
-                    ULONG nFormat = ((SfxUInt32Item*)pValueFormat)->GetValue();
+                    sal_uLong nFormat = ((SfxUInt32Item*)pValueFormat)->GetValue();
                     double Value = ScfTools::ReadLongDouble(rStream);
                     //rStream.Read(&Value, sizeof(Value));
 
@@ -1671,7 +1671,7 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
                 }
                 case ctString :
                 {
-                    BYTE Len;
+                    sal_uInt8 Len;
                     sal_Char s[256];
                     rStream >> Len;
                     rStream.Read(s, Len);
@@ -1683,7 +1683,7 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
                 case ctFormula :
                 {
                     /*double Value =*/ ScfTools::ReadLongDouble(rStream);
-                    BYTE Len;
+                    sal_uInt8 Len;
                     sal_Char s[256];
                     //rStream.Read(&Value, sizeof(Value));
                     rStream >> Len;
@@ -1692,7 +1692,7 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
                     s[Len + 1] = 0;
                     ScFormulaCell* pCell = new ScFormulaCell( pDoc, ScAddress( Col, static_cast<SCROW> (Row), Tab ) );
                     pCell->SetHybridFormula( SC10TOSTRING( s ),formula::FormulaGrammar::GRAM_NATIVE );
-                    pDoc->PutCell( Col, static_cast<SCROW> (Row), Tab, pCell, (BOOL)TRUE );
+                    pDoc->PutCell( Col, static_cast<SCROW> (Row), Tab, pCell, (sal_Bool)sal_True );
                     break;
                 }
                 case ctNote :
@@ -1701,7 +1701,7 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
                     nError = errUnknownFormat;
                     break;
             }
-            USHORT NoteLen;
+            sal_uInt16 NoteLen;
             rStream >> NoteLen;
             if (NoteLen != 0)
             {
@@ -1747,9 +1747,9 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
     {
         SCROW nStart;
         SCROW nEnd;
-        USHORT i;
-        UINT16 nLimit;
-        UINT16 nValue1;
+        sal_uInt16 i;
+        sal_uInt16 nLimit;
+        sal_uInt16 nValue1;
         Sc10ColData *pColData;
 
         // Font (Name, Groesse)
@@ -1844,10 +1844,10 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
         if ((nStart <= nEnd) && (nValue1))
         {
             ScPatternAttr aScPattern(pDoc->GetPool());
-            USHORT HorJustify = (nValue1 & 0x000F);
-            USHORT VerJustify = (nValue1 & 0x00F0) >> 4;
-            USHORT OJustify   = (nValue1 & 0x0F00) >> 8;
-            USHORT EJustify   = (nValue1 & 0xF000) >> 12;
+            sal_uInt16 HorJustify = (nValue1 & 0x000F);
+            sal_uInt16 VerJustify = (nValue1 & 0x00F0) >> 4;
+            sal_uInt16 OJustify   = (nValue1 & 0x0F00) >> 8;
+            sal_uInt16 EJustify   = (nValue1 & 0xF000) >> 12;
 
             switch (HorJustify)
             {
@@ -1876,13 +1876,13 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
             }
 
             if (OJustify & ojWordBreak)
-                aScPattern.GetItemSet().Put(SfxBoolItem(TRUE));
+                aScPattern.GetItemSet().Put(SfxBoolItem(sal_True));
             if (OJustify & ojBottomTop)
                 aScPattern.GetItemSet().Put(SfxInt32Item(ATTR_ROTATE_VALUE,9000));
             else if (OJustify & ojTopBottom)
                 aScPattern.GetItemSet().Put(SfxInt32Item(ATTR_ROTATE_VALUE,27000));
 
-            INT16 Margin = Max((USHORT)20, (USHORT)(EJustify * 20));
+            sal_Int16 Margin = Max((sal_uInt16)20, (sal_uInt16)(EJustify * 20));
             if (((OJustify & ojBottomTop) == ojBottomTop) || ((OJustify & ojBottomTop) == ojBottomTop))
                 aScPattern.GetItemSet().Put(SvxMarginItem(20, Margin, 20, Margin, ATTR_MARGIN));
             else
@@ -1892,15 +1892,15 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
     nStart = nEnd + 1;
     }
     // Umrandung
-    BOOL			bEnd = FALSE;
-    USHORT			nColorIndex = 0;
-    USHORT			nFrameIndex = 0;
+    sal_Bool			bEnd = sal_False;
+    sal_uInt16			nColorIndex = 0;
+    sal_uInt16			nFrameIndex = 0;
 
     // Special Fix...
-    const UINT32	nHelpMeStart = 100;
-    UINT32			nHelpMe = nHelpMeStart;
-    USHORT			nColorIndexOld = nColorIndex;
-    USHORT			nFrameIndexOld = nColorIndex;
+    const sal_uInt32	nHelpMeStart = 100;
+    sal_uInt32			nHelpMe = nHelpMeStart;
+    sal_uInt16			nColorIndexOld = nColorIndex;
+    sal_uInt16			nFrameIndexOld = nColorIndex;
 
     nEnd = 0;
     nStart = 0;
@@ -1908,15 +1908,15 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
     {
         pColData = &aFrame.pData[ nFrameIndex ];
 
-        USHORT	nValue	= pColData->Value;
-        USHORT	nLeft	= 0;
-        USHORT	nTop	= 0;
-        USHORT	nRight	= 0;
-        USHORT	nBottom	= 0;
-        USHORT	fLeft	= ( nValue & 0x000F );
-        USHORT	fTop	= ( nValue & 0x00F0 ) >> 4;
-        USHORT	fRight	= ( nValue & 0x0F00 ) >> 8;
-        USHORT	fBottom	= ( nValue & 0xF000 ) >> 12;
+        sal_uInt16	nValue	= pColData->Value;
+        sal_uInt16	nLeft	= 0;
+        sal_uInt16	nTop	= 0;
+        sal_uInt16	nRight	= 0;
+        sal_uInt16	nBottom	= 0;
+        sal_uInt16	fLeft	= ( nValue & 0x000F );
+        sal_uInt16	fTop	= ( nValue & 0x00F0 ) >> 4;
+        sal_uInt16	fRight	= ( nValue & 0x0F00 ) >> 8;
+        sal_uInt16	fBottom	= ( nValue & 0xF000 ) >> 12;
 
         if( fLeft > 1 )
             nLeft = 50;
@@ -1942,12 +1942,12 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
         Color	ColorTop( COL_BLACK );
         Color	ColorRight( COL_BLACK );
         Color	ColorBottom( COL_BLACK );
-        USHORT	nFrmColVal	= aFrameColor.pData[ nColorIndex ].Value;
+        sal_uInt16	nFrmColVal	= aFrameColor.pData[ nColorIndex ].Value;
         SCROW	nFrmColRow	= static_cast<SCROW>(aFrameColor.pData[ nColorIndex ].Row);
-        USHORT	cLeft		= ( nFrmColVal & 0x000F );
-        USHORT	cTop		= ( nFrmColVal & 0x00F0 ) >> 4;
-        USHORT	cRight		= ( nFrmColVal & 0x0F00 ) >> 8;
-        USHORT	cBottom		= ( nFrmColVal & 0xF000 ) >> 12;
+        sal_uInt16	cLeft		= ( nFrmColVal & 0x000F );
+        sal_uInt16	cTop		= ( nFrmColVal & 0x00F0 ) >> 4;
+        sal_uInt16	cRight		= ( nFrmColVal & 0x0F00 ) >> 8;
+        sal_uInt16	cBottom		= ( nFrmColVal & 0xF000 ) >> 12;
 
         lcl_ChangeColor( cLeft, ColorLeft );
         lcl_ChangeColor( cTop, ColorTop );
@@ -2018,20 +2018,20 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
     // ACHTUNG: Code bis hier ueberarbeitet ... jetzt hab' ich keinen Bock mehr! (GT)
 
     // Hintergrund (Farbe, Raster)
-    USHORT		nRasterIndex = 0;
-    bEnd		= FALSE;
+    sal_uInt16		nRasterIndex = 0;
+    bEnd		= sal_False;
     nColorIndex	= 0;
     nEnd		= 0;
     nStart		= 0;
 
     // Special Fix...
     nHelpMe		= nHelpMeStart;
-    USHORT		nRasterIndexOld = nRasterIndex;
+    sal_uInt16		nRasterIndexOld = nRasterIndex;
 
     while( !bEnd && nHelpMe )
     {
-        USHORT	nBColor = ( aColor.pData[ nColorIndex ].Value & 0x00F0 ) >> 4;
-        USHORT	nRColor = ( aColor.pData[ nColorIndex ].Value & 0x0F00 ) >> 8;
+        sal_uInt16	nBColor = ( aColor.pData[ nColorIndex ].Value & 0x00F0 ) >> 4;
+        sal_uInt16	nRColor = ( aColor.pData[ nColorIndex ].Value & 0x0F00 ) >> 8;
         Color	aBColor( COL_BLACK );
 
         lcl_ChangeColor( nBColor, aBColor );
@@ -2047,12 +2047,12 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
 
         ScPatternAttr aScPattern( pDoc->GetPool() );
 
-        UINT16 nFact;
-        BOOL		bSwapCol = FALSE;
-        BOOL		bSetItem = TRUE;
+        sal_uInt16 nFact;
+        sal_Bool		bSwapCol = sal_False;
+        sal_Bool		bSetItem = sal_True;
         switch ( aRaster.pData[ nRasterIndex ].Value )
         {
-        case raNone:		nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break;
+        case raNone:		nFact = 0xffff; bSwapCol = sal_True; bSetItem = (nBColor > 0); break;
         case raGray12:	nFact = (0xffff / 100) * 12;	break;
         case raGray25:	nFact = (0xffff / 100) * 25;	break;
         case raGray50:	nFact = (0xffff / 100) * 50;	break;
@@ -2116,12 +2116,12 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
         nValue1 = pColData->Value;
         if ((nStart <= nEnd) && (nValue1))
         {
-            ULONG  nKey    = 0;
-            USHORT nFormat = (nValue1 & 0x00FF);
-            USHORT nInfo   = (nValue1 & 0xFF00) >> 8;
+            sal_uLong  nKey    = 0;
+            sal_uInt16 nFormat = (nValue1 & 0x00FF);
+            sal_uInt16 nInfo   = (nValue1 & 0xFF00) >> 8;
             ChangeFormat(nFormat, nInfo, nKey);
             ScPatternAttr aScPattern(pDoc->GetPool());
-            aScPattern.GetItemSet().Put(SfxUInt32Item(ATTR_VALUE_FORMAT, (UINT32)nKey));
+            aScPattern.GetItemSet().Put(SfxUInt32Item(ATTR_VALUE_FORMAT, (sal_uInt32)nKey));
             pDoc->ApplyPatternAreaTab(Col, nStart, Col, nEnd, Tab, aScPattern);
         }
         nStart = nEnd + 1;
@@ -2135,10 +2135,10 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
         nEnd = static_cast<SCROW>(aFlag.pData[i].Row);
         if ((nStart <= nEnd) && (aFlag.pData[i].Value != 0))
         {
-            BOOL bProtect  = ((aFlag.pData[i].Value & paProtect) == paProtect);
-            BOOL bHFormula = ((aFlag.pData[i].Value & paHideFormula) == paHideFormula);
-            BOOL bHCell    = ((aFlag.pData[i].Value & paHideAll) == paHideAll);
-            BOOL bHPrint   = ((aFlag.pData[i].Value & paHidePrint) == paHidePrint);
+            sal_Bool bProtect  = ((aFlag.pData[i].Value & paProtect) == paProtect);
+            sal_Bool bHFormula = ((aFlag.pData[i].Value & paHideFormula) == paHideFormula);
+            sal_Bool bHCell    = ((aFlag.pData[i].Value & paHideAll) == paHideAll);
+            sal_Bool bHPrint   = ((aFlag.pData[i].Value & paHidePrint) == paHidePrint);
             ScPatternAttr aScPattern(pDoc->GetPool());
             aScPattern.GetItemSet().Put(ScProtectionAttr(bProtect, bHFormula, bHCell, bHPrint));
             pDoc->ApplyPatternAreaTab(Col, nStart, Col, nEnd, Tab, aScPattern);
@@ -2155,7 +2155,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
         nEnd = static_cast<SCROW>(aPattern.pData[i].Row);
         if ((nStart <= nEnd) && (aPattern.pData[i].Value != 0))
         {
-            USHORT nPatternIndex = (aPattern.pData[i].Value & 0x00FF) - 1;
+            sal_uInt16 nPatternIndex = (aPattern.pData[i].Value & 0x00FF) - 1;
             Sc10PatternData* pPattern = pPatternCollection->At(nPatternIndex);
             if (pPattern != NULL)
             {
@@ -2189,7 +2189,7 @@ void Sc10Import::LoadAttr(Sc10ColAttr& rAttr)
   rAttr.pData = new Sc10ColData[rAttr.Count];
   if (rAttr.pData != NULL)
   {
-    for (USHORT i = 0; i < rAttr.Count; i++)
+    for (sal_uInt16 i = 0; i < rAttr.Count; i++)
     {
       rStream >> rAttr.pData[i].Row;
       rStream >> rAttr.pData[i].Value;
@@ -2202,7 +2202,7 @@ void Sc10Import::LoadAttr(Sc10ColAttr& rAttr)
 }
 
 
-void Sc10Import::ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey)
+void Sc10Import::ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& nKey)
 {
   // Achtung: Die Formate werden nur auf die StarCalc 3.0 internen Formate gemappt
   //          Korrekterweise muessten zum Teil neue Formate erzeugt werden (sollte Stephan sich ansehen)
@@ -2347,7 +2347,7 @@ void Sc10Import::ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey)
 
 void Sc10Import::LoadObjects()
 {
-  USHORT ID;
+  sal_uInt16 ID;
   rStream >> ID;
   if (rStream.IsEof()) return;
   if (ID == ObjectID)
@@ -2371,17 +2371,17 @@ void Sc10Import::LoadObjects()
     //-----------------------------------
 #endif
 
-    USHORT nAnz;
+    sal_uInt16 nAnz;
     rStream >> nAnz;
     sal_Char Reserved[32];
     rStream.Read(Reserved, sizeof(Reserved));
     nError = rStream.GetError();
     if ((nAnz > 0) && (nError == 0))
     {
-      BYTE ObjectType;
+      sal_uInt8 ObjectType;
       Sc10GraphHeader GraphHeader;
-      BOOL IsOleObject = FALSE; // Achtung dies ist nur ein Notnagel
-      for (USHORT i = 0; (i < nAnz) && (nError == 0) && !rStream.IsEof() && !IsOleObject; i++)
+      sal_Bool IsOleObject = sal_False; // Achtung dies ist nur ein Notnagel
+      for (sal_uInt16 i = 0; (i < nAnz) && (nError == 0) && !rStream.IsEof() && !IsOleObject; i++)
       {
         rStream >> ObjectType;
         //rStream.Read(&GraphHeader, sizeof(GraphHeader));
@@ -2437,7 +2437,7 @@ void Sc10Import::LoadObjects()
         {
           case otOle :
            // Achtung hier muss sowas wie OleLoadFromStream passieren
-           IsOleObject = TRUE;
+           IsOleObject = sal_True;
            break;
           case otImage :
           {
diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx
index 5f8fc3fc8..fcee1c914 100644
--- a/sc/source/filter/starcalc/scfobj.cxx
+++ b/sc/source/filter/starcalc/scfobj.cxx
@@ -59,7 +59,7 @@ using namespace com::sun::star;
 //==================================================================
 
 void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rectangle& rRect,
-                                SCTAB nSrcTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2 )
+                                SCTAB nSrcTab, sal_uInt16 nX1, sal_uInt16 nY1, sal_uInt16 nX2, sal_uInt16 nY2 )
 {
     //	wenn Chart nicht installiert ist, darf nicht auf SCH_MOD zugegriffen werden!
     if ( !SvtModuleOptions().IsChart() )
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 6ec372cd1..d9b98c219 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -103,7 +103,7 @@ void XclExpUserBView::SaveCont( XclExpStream& rStrm )
         rStrm << sUsername;
 }
 
-UINT16 XclExpUserBView::GetNum() const
+sal_uInt16 XclExpUserBView::GetNum() const
 {
     return 0x01A9;
 }
@@ -120,7 +120,7 @@ XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack )
     sal_uInt8 aGUID[ 16 ];
     sal_Bool bValidGUID = sal_False;
     const ScStrCollection& rStrColl = rChangeTrack.GetUserCollection();
-    for( USHORT nIndex = 0; nIndex < rStrColl.GetCount(); nIndex++ )
+    for( sal_uInt16 nIndex = 0; nIndex < rStrColl.GetCount(); nIndex++ )
     {
         const StrData* pStrData = (const StrData*) rStrColl.At( nIndex );
         lcl_GenerateGUID( aGUID, bValidGUID );
@@ -167,7 +167,7 @@ void XclExpUsersViewBegin::SaveCont( XclExpStream& rStrm )
             << (sal_Int16)	-1;
 }
 
-UINT16 XclExpUsersViewBegin::GetNum() const
+sal_uInt16 XclExpUsersViewBegin::GetNum() const
 {
     return 0x01AA;
 }
@@ -184,7 +184,7 @@ void XclExpUsersViewEnd::SaveCont( XclExpStream& rStrm )
     rStrm << (sal_uInt16) 0x0001;
 }
 
-UINT16 XclExpUsersViewEnd::GetNum() const
+sal_uInt16 XclExpUsersViewEnd::GetNum() const
 {
     return 0x01AB;
 }
@@ -201,7 +201,7 @@ void XclExpChTr0x0191::SaveCont( XclExpStream& rStrm )
     rStrm << (sal_uInt16) 0x0000;
 }
 
-UINT16 XclExpChTr0x0191::GetNum() const
+sal_uInt16 XclExpChTr0x0191::GetNum() const
 {
     return 0x0191;
 }
@@ -219,7 +219,7 @@ void XclExpChTr0x0198::SaveCont( XclExpStream& rStrm )
             << (sal_uInt16) 0x0000;
 }
 
-UINT16 XclExpChTr0x0198::GetNum() const
+sal_uInt16 XclExpChTr0x0198::GetNum() const
 {
     return 0x0198;
 }
@@ -237,7 +237,7 @@ void XclExpChTr0x0192::SaveCont( XclExpStream& rStrm )
     rStrm.WriteZeroBytes( 510 );
 }
 
-UINT16 XclExpChTr0x0192::GetNum() const
+sal_uInt16 XclExpChTr0x0192::GetNum() const
 {
     return 0x0192;
 }
@@ -254,7 +254,7 @@ void XclExpChTr0x0197::SaveCont( XclExpStream& rStrm )
     rStrm << (sal_uInt16) 0x0000;
 }
 
-UINT16 XclExpChTr0x0197::GetNum() const
+sal_uInt16 XclExpChTr0x0197::GetNum() const
 {
     return 0x0197;
 }
@@ -270,7 +270,7 @@ XclExpChTrEmpty::~XclExpChTrEmpty()
 {
 }
 
-UINT16 XclExpChTrEmpty::GetNum() const
+sal_uInt16 XclExpChTrEmpty::GetNum() const
 {
     return nRecNum;
 }
@@ -291,7 +291,7 @@ void XclExpChTr0x0195::SaveCont( XclExpStream& rStrm )
     rStrm.WriteZeroBytes( 162 );
 }
 
-UINT16 XclExpChTr0x0195::GetNum() const
+sal_uInt16 XclExpChTr0x0195::GetNum() const
 {
     return 0x0195;
 }
@@ -315,7 +315,7 @@ void XclExpChTr0x0194::SaveCont( XclExpStream& rStrm )
     lcl_WriteFixedString( rStrm, sUsername, 147 );
 }
 
-UINT16 XclExpChTr0x0194::GetNum() const
+sal_uInt16 XclExpChTr0x0194::GetNum() const
 {
     return 0x0194;
 }
@@ -344,7 +344,7 @@ void XclExpChTrHeader::SaveCont( XclExpStream& rStrm )
             << (sal_uInt16) 0x001E;
 }
 
-UINT16 XclExpChTrHeader::GetNum() const
+sal_uInt16 XclExpChTrHeader::GetNum() const
 {
     return 0x0196;
 }
@@ -374,7 +374,7 @@ void XclExpChTrInfo::SaveCont( XclExpStream& rStrm )
             << (sal_uInt16)	0x0002;
 }
 
-UINT16 XclExpChTrInfo::GetNum() const
+sal_uInt16 XclExpChTrInfo::GetNum() const
 {
     return 0x0138;
 }
@@ -497,7 +497,7 @@ void XclExpChTrTabId::SaveCont( XclExpStream& rStrm )
             rStrm << nIndex;
 }
 
-UINT16 XclExpChTrTabId::GetNum() const
+sal_uInt16 XclExpChTrTabId::GetNum() const
 {
     return 0x013D;
 }
@@ -813,7 +813,7 @@ void XclExpChTrCellContent::SaveActionData( XclExpStream& rStrm ) const
         pNewData->Write( rStrm, rIdBuffer );
 }
 
-UINT16 XclExpChTrCellContent::GetNum() const
+sal_uInt16 XclExpChTrCellContent::GetNum() const
 {
     return 0x013B;
 }
@@ -891,7 +891,7 @@ void XclExpChTrInsert::CompleteSaveAction( XclExpStream& rStrm ) const
         XclExpChTrEmpty( 0x0151 ).Save( rStrm );
 }
 
-UINT16 XclExpChTrInsert::GetNum() const
+sal_uInt16 XclExpChTrInsert::GetNum() const
 {
     return 0x0137;
 }
@@ -928,7 +928,7 @@ void XclExpChTrInsertTab::SaveActionData( XclExpStream& rStrm ) const
     rStrm.WriteZeroBytes( 133 );
 }
 
-UINT16 XclExpChTrInsertTab::GetNum() const
+sal_uInt16 XclExpChTrInsertTab::GetNum() const
 {
     return 0x014D;
 }
@@ -984,7 +984,7 @@ void XclExpChTrMoveRange::CompleteSaveAction( XclExpStream& rStrm ) const
     XclExpChTrEmpty( 0x014F ).Save( rStrm );
 }
 
-UINT16 XclExpChTrMoveRange::GetNum() const
+sal_uInt16 XclExpChTrMoveRange::GetNum() const
 {
     return 0x0140;
 }
@@ -1015,7 +1015,7 @@ void XclExpChTr0x014A::SaveActionData( XclExpStream& rStrm ) const
     Write2DRange( rStrm, aRange );
 }
 
-UINT16 XclExpChTr0x014A::GetNum() const
+sal_uInt16 XclExpChTr0x014A::GetNum() const
 {
     return 0x014A;
 }
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index d9f6150c3..41f84343f 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -63,7 +63,7 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStrea
     if( xInStrm.Is() )
     {
         xInStrm->Seek( STREAM_SEEK_TO_END );
-        ULONG nStreamLen = xInStrm->Tell();
+        sal_uLong nStreamLen = xInStrm->Tell();
         if( (xInStrm->GetErrorCode() == ERRCODE_NONE) && (nStreamLen != STREAM_SEEK_TO_END) )
         {
             xInStrm->Seek( STREAM_SEEK_TO_BEGIN );
@@ -72,7 +72,7 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStrea
             pChangeTrack = new ScChangeTrack( GetDocPtr() );
 
             sOldUsername = pChangeTrack->GetUser();
-            pChangeTrack->SetUseFixDateTime( TRUE );
+            pChangeTrack->SetUseFixDateTime( sal_True );
 
             ReadRecords();
         }
@@ -114,7 +114,7 @@ void XclImpChangeTrack::DoInsertRange( const ScRange& rRange )
 
 void XclImpChangeTrack::DoDeleteRange( const ScRange& rRange )
 {
-    ULONG nFirst, nLast;
+    sal_uLong nFirst, nLast;
     pChangeTrack->AppendDeleteRange( rRange, NULL, nFirst, nLast );
     DoAcceptRejectAction( nFirst, nLast );
 }
@@ -207,7 +207,7 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres
     // read the formula, 3D tab refs from extended data
     const ScTokenArray* pArray = NULL;
     aFmlConv.Reset( rPosition );
-    BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK);	// JEG : Check This
+    sal_Bool bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK);	// JEG : Check This
     rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : NULL;
     pStrm->Ignore( 1 );
 }
@@ -294,7 +294,7 @@ void XclImpChangeTrack::ReadChTrInsert()
         else
             aRange.aEnd.SetCol( MAXCOL );
 
-        BOOL bValid = pStrm->IsValid();
+        sal_Bool bValid = pStrm->IsValid();
         if( FoundNestedMode() )
             ReadNestedRecords();
 
@@ -396,7 +396,7 @@ void XclImpChangeTrack::ReadChTrMoveRange()
         aSourceRange.aStart.SetTab( ReadTabNum() );
         aSourceRange.aEnd.SetTab( aSourceRange.aStart.Tab() );
 
-        BOOL bValid = pStrm->IsValid();
+        sal_Bool bValid = pStrm->IsValid();
         if( FoundNestedMode() )
             ReadNestedRecords();
 
@@ -475,13 +475,13 @@ void XclImpChangeTrack::Apply()
     if( pChangeTrack )
     {
         pChangeTrack->SetUser( sOldUsername );
-        pChangeTrack->SetUseFixDateTime( FALSE );
+        pChangeTrack->SetUseFixDateTime( sal_False );
 
         GetDoc().SetChangeTrack( pChangeTrack );
         pChangeTrack = NULL;
 
         ScChangeViewSettings aSettings;
-        aSettings.SetShowChanges( TRUE );
+        aSettings.SetShowChanges( sal_True );
         GetDoc().SetChangeViewSettings( aSettings );
     }
 }
@@ -494,7 +494,7 @@ XclImpChTrFmlConverter::~XclImpChTrFmlConverter()
 }
 
 // virtual, called from ExcToSc8::Convert()
-bool XclImpChTrFmlConverter::Read3DTabReference( UINT16 /*nIxti*/, SCTAB& rFirstTab, SCTAB& rLastTab, 
+bool XclImpChTrFmlConverter::Read3DTabReference( sal_uInt16 /*nIxti*/, SCTAB& rFirstTab, SCTAB& rLastTab, 
                                                  ExternalTabInfo& rExtInfo )
 {
     return rChangeTrack.Read3DTabRefInfo( rFirstTab, rLastTab, rExtInfo );
diff --git a/sc/source/filter/xcl97/xcl97dum.cxx b/sc/source/filter/xcl97/xcl97dum.cxx
index 015d7a003..a91e75d4b 100644
--- a/sc/source/filter/xcl97/xcl97dum.cxx
+++ b/sc/source/filter/xcl97/xcl97dum.cxx
@@ -38,7 +38,7 @@
 
 // ... (8+) := neu in Biff8, ... (8*) := anders in Biff8
 
-const BYTE ExcDummy8_00a::pMyData[] = {
+const sal_uInt8 ExcDummy8_00a::pMyData[] = {
     0xe1, 0x00, 0x02, 0x00,	0xb0, 0x04,						// INTERFACEHDR
     0xc1, 0x00, 0x02, 0x00, 0x00, 0x00,						// MMS
     0xe2, 0x00, 0x00, 0x00,									// INTERFACEEND
@@ -64,13 +64,13 @@ const sal_Size ExcDummy8_00a::nMyLen = sizeof(ExcDummy8_00a::pMyData);
 
                                                             // TABID (8+): ExcTabid
 
-const BYTE ExcDummy8_00b::pMyData[] = {
+const sal_uInt8 ExcDummy8_00b::pMyData[] = {
     0x9c, 0x00, 0x02, 0x00, 0x0e, 0x00						// FNGROUPCOUNT
 };
 const sal_Size ExcDummy8_00b::nMyLen = sizeof(ExcDummy8_00b::pMyData);
 
 
-const BYTE ExcDummy8_040::pMyData[] = {
+const sal_uInt8 ExcDummy8_040::pMyData[] = {
     0xaf, 0x01, 0x02, 0x00, 0x00, 0x00,						// PROT4REV (8+)
     0xbc, 0x01, 0x02, 0x00, 0x00, 0x00,						// PROT4REVPASS (8+)
 //	0x3d, 0x00, 0x12, 0x00, 0xe0, 0x01, 0x5a, 0x00, 0xcf,	// WINDOW1
@@ -82,7 +82,7 @@ const BYTE ExcDummy8_040::pMyData[] = {
 const sal_Size ExcDummy8_040::nMyLen = sizeof(ExcDummy8_040::pMyData);
 
 
-const BYTE ExcDummy8_041::pMyData[] = {
+const sal_uInt8 ExcDummy8_041::pMyData[] = {
     0xb7, 0x01, 0x02, 0x00, 0x00, 0x00,						// REFRESHALL (8+)
     0xda, 0x00, 0x02, 0x00, 0x00, 0x00						// BOOKBOOL
 };
@@ -90,7 +90,7 @@ const sal_Size ExcDummy8_041::nMyLen = sizeof(ExcDummy8_041::pMyData);
 
 
 
-const BYTE ExcDummy8_02::pMyData[] = {
+const sal_uInt8 ExcDummy8_02::pMyData[] = {
     0x5f, 0x00, 0x02, 0x00, 0x01, 0x00                      // SAVERECALC
     };
 const sal_Size ExcDummy8_02::nMyLen = sizeof(ExcDummy8_02::pMyData);
@@ -104,7 +104,7 @@ sal_Size ExcDummy8_00a::GetLen() const
 }
 
 
-const BYTE* ExcDummy8_00a::GetData() const
+const sal_uInt8* ExcDummy8_00a::GetData() const
 {
     return pMyData;
 }
@@ -117,7 +117,7 @@ sal_Size ExcDummy8_00b::GetLen() const
 }
 
 
-const BYTE* ExcDummy8_00b::GetData() const
+const sal_uInt8* ExcDummy8_00b::GetData() const
 {
     return pMyData;
 }
@@ -130,7 +130,7 @@ sal_Size ExcDummy8_040::GetLen() const
 }
 
 
-const BYTE* ExcDummy8_040::GetData() const
+const sal_uInt8* ExcDummy8_040::GetData() const
 {
     return pMyData;
 }
@@ -143,7 +143,7 @@ sal_Size ExcDummy8_041::GetLen() const
 }
 
 
-const BYTE* ExcDummy8_041::GetData() const
+const sal_uInt8* ExcDummy8_041::GetData() const
 {
     return pMyData;
 }
@@ -156,7 +156,7 @@ sal_Size ExcDummy8_02::GetLen() const
 }
 
 
-const BYTE* ExcDummy8_02::GetData() const
+const sal_uInt8* ExcDummy8_02::GetData() const
 {
     return pMyData;
 }
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index b7e5de855..adb03377d 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -196,12 +196,12 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
 {
     if ( nAdditionalText )
         nAdditionalText++;
-    BOOL bInGroup = ( pCurrXclObj != NULL );
+    sal_Bool bInGroup = ( pCurrXclObj != NULL );
     if ( bInGroup )
     {	// stacked recursive group object
         if ( !pCurrAppData->IsStackedGroup() )
         {   //! UpdateDffFragmentEnd only once
-            pCurrAppData->SetStackedGroup( TRUE );
+            pCurrAppData->SetStackedGroup( sal_True );
             UpdateDffFragmentEnd();
         }
     }
@@ -307,12 +307,12 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
         }
     }
     if ( !pCurrXclObj )
-        pCurrAppData->SetDontWriteShape( TRUE );
+        pCurrAppData->SetDontWriteShape( sal_True );
     return pCurrAppData;
 }
 
 
-void XclEscherEx::EndShape( UINT16 nShapeType, UINT32 nShapeID )
+void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID )
 {
     // own escher data created? -> never delete such objects
     bool bOwnEscher = pCurrXclObj && pCurrXclObj->IsOwnEscher();
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index f8be09d80..7556b4a38 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -110,13 +110,13 @@ XclExpObjList::~XclExpObjList()
     delete pSolverContainer;
 }
 
-UINT16 XclExpObjList::Add( XclObj* pObj )
+sal_uInt16 XclExpObjList::Add( XclObj* pObj )
 {
     DBG_ASSERT( Count() < 0xFFFF, "XclExpObjList::Add: too much for Xcl" );
     if ( Count() < 0xFFFF )
     {
         Insert( pObj, LIST_APPEND );
-        UINT16 nCnt = (UINT16) Count();
+        sal_uInt16 nCnt = (sal_uInt16) Count();
         pObj->SetId( nCnt );
         return nCnt;
     }
@@ -190,7 +190,7 @@ void XclObj::ImplWriteAnchor( const XclExpRoot& /*rRoot*/, const SdrObject* pSdr
     }
 }
 
-void XclObj::SetEscherShapeType( UINT16 nType )
+void XclObj::SetEscherShapeType( sal_uInt16 nType )
 {
 //2do: what about the other defined ot... types?
     switch ( nType )
@@ -321,7 +321,7 @@ void XclObjComment::ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle&
                 // If the Colour is the same as the 'ToolTip' System colour then
                 // use the default rather than the explicit colour value. This will
                 // be incorrect where user has chosen to use this colour explicity.
-                Color aColor = Color( (BYTE)nValue, (BYTE)( nValue >> 8 ), (BYTE)( nValue >> 16 ) );
+                Color aColor = Color( (sal_uInt8)nValue, (sal_uInt8)( nValue >> 8 ), (sal_uInt8)( nValue >> 16 ) );
                 const StyleSettings& rSett = Application::GetSettings().GetStyleSettings();
                 if(aColor == rSett.GetHelpColor().GetColor())
                 {
@@ -376,14 +376,14 @@ void XclObjComment::Save( XclExpStream& rStrm )
 
 // --- class XclObjDropDown ------------------------------------------
 
-XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, BOOL bFilt ) :
+XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, sal_Bool bFilt ) :
     XclObj( rObjMgr, EXC_OBJTYPE_DROPDOWN, true ),
     bIsFiltered( bFilt )
 {
-    SetLocked( TRUE );
-    SetPrintable( FALSE );
-    SetAutoFill( TRUE );
-    SetAutoLine( FALSE );
+    SetLocked( sal_True );
+    SetPrintable( sal_False );
+    SetAutoFill( sal_True );
+    SetAutoLine( sal_False );
     nGrbit |= 0x0100;	// undocumented
     mrEscherEx.OpenContainer( ESCHER_SpContainer );
     mrEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT );
@@ -421,7 +421,7 @@ void XclObjDropDown::WriteSubRecs( XclExpStream& rStrm )
     ::insert_value( nDropDownFlags, EXC_OBJ_DROPDOWN_SIMPLE, 0, 2 );
     ::set_flag( nDropDownFlags, EXC_OBJ_DROPDOWN_FILTERED, bIsFiltered );
     rStrm.StartRecord( EXC_ID_OBJLBSDATA, 16 );
-    rStrm   << (UINT32)0 << (UINT16)0 << (UINT16)0x0301 << (UINT16)0
+    rStrm   << (sal_uInt32)0 << (sal_uInt16)0 << (sal_uInt16)0x0301 << (sal_uInt16)0
             << nDropDownFlags << sal_uInt16( 20 ) << sal_uInt16( 130 );
     rStrm.EndRecord();
 }
@@ -512,7 +512,7 @@ XclTxo::XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObje
         {
             SfxItemSet aSet( rEditObj.GetParaAttribs( 0));
             const SfxPoolItem* pItem = NULL;
-            if( aSet.GetItemState( EE_PARA_JUST, TRUE, &pItem ) == SFX_ITEM_SET )
+            if( aSet.GetItemState( EE_PARA_JUST, sal_True, &pItem ) == SFX_ITEM_SET )
             {
                 SvxAdjust eEEAlign = static_cast< const SvxAdjustItem& >( *pItem ).GetAdjust();
                 pCaption->SetMergedItem( SvxAdjustItem( eEEAlign, EE_PARA_JUST ) );
@@ -572,7 +572,7 @@ void XclTxo::Save( XclExpStream& rStrm )
     }
 }
 
-UINT16 XclTxo::GetNum() const
+sal_uInt16 XclTxo::GetNum() const
 {
     return EXC_ID_TXO;
 }
@@ -599,9 +599,9 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
 {
     // write only as embedded, not linked
     String			aStorageName( RTL_CONSTASCII_USTRINGPARAM( "MBD" ) );
-    sal_Char		aBuf[ sizeof(UINT32) * 2 + 1 ];
+    sal_Char		aBuf[ sizeof(sal_uInt32) * 2 + 1 ];
     // FIXME Eeek! Is this just a way to get a unique id?
-    UINT32			nPictureId = UINT32(sal_uIntPtr(this) >> 2);
+    sal_uInt32			nPictureId = sal_uInt32(sal_uIntPtr(this) >> 2);
     sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) );        // #100211# - checked
     aStorageName.AppendAscii( aBuf );
     SotStorageRef    xOleStg = pRootStorage->OpenSotStorage( aStorageName,
@@ -613,7 +613,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
         {
             // set version to "old" version, because it must be
             // saved in MS notation.
-            UINT32					nFl = 0;
+            sal_uInt32					nFl = 0;
             SvtFilterOptions*		pFltOpts = SvtFilterOptions::Get();
             if( pFltOpts )
             {
@@ -635,7 +635,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
 
             // OBJCF subrecord, undocumented as usual
             rStrm.StartRecord( EXC_ID_OBJCF, 2 );
-            rStrm << UINT16(0x0002);
+            rStrm << sal_uInt16(0x0002);
             rStrm.EndRecord();
 
             // OBJFLAGS subrecord, undocumented as usual
@@ -647,9 +647,9 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
 
             // OBJPICTFMLA subrecord, undocumented as usual
             XclExpString aName( xOleStg->GetUserName() );
-            UINT16 nPadLen = (UINT16)(aName.GetSize() & 0x01);
-            UINT16 nFmlaLen = static_cast< sal_uInt16 >( 12 + aName.GetSize() + nPadLen );
-            UINT16 nSubRecLen = nFmlaLen + 6;
+            sal_uInt16 nPadLen = (sal_uInt16)(aName.GetSize() & 0x01);
+            sal_uInt16 nFmlaLen = static_cast< sal_uInt16 >( 12 + aName.GetSize() + nPadLen );
+            sal_uInt16 nSubRecLen = nFmlaLen + 6;
 
             rStrm.StartRecord( EXC_ID_OBJPICTFMLA, nSubRecLen );
             rStrm   << nFmlaLen
@@ -685,7 +685,7 @@ void XclObjAny::WriteSubRecs( XclExpStream& rStrm )
 {
     if( mnObjType == EXC_OBJTYPE_GROUP )
         // ftGmo subrecord
-        rStrm << EXC_ID_OBJGMO << UINT16(2) << UINT16(0);
+        rStrm << EXC_ID_OBJGMO << sal_uInt16(2) << sal_uInt16(0);
 }
 
 void XclObjAny::Save( XclExpStream& rStrm )
@@ -719,7 +719,7 @@ void ExcBof8_Base::SaveCont( XclExpStream& rStrm )
 }
 
 
-UINT16 ExcBof8_Base::GetNum() const
+sal_uInt16 ExcBof8_Base::GetNum() const
 {
     return 0x0809;
 }
@@ -809,7 +809,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm )
 
 // --- class XclObproj -----------------------------------------------
 
-UINT16 XclObproj::GetNum() const
+sal_uInt16 XclObproj::GetNum() const
 {
     return 0x00D3;
 }
@@ -834,7 +834,7 @@ void XclCodename::SaveCont( XclExpStream& rStrm )
 }
 
 
-UINT16 XclCodename::GetNum() const
+sal_uInt16 XclCodename::GetNum() const
 {
     return 0x01BA;
 }
@@ -849,7 +849,7 @@ sal_Size XclCodename::GetLen() const
 
 // ---- Scenarios ----------------------------------------------------
 
-ExcEScenarioCell::ExcEScenarioCell( UINT16 nC, UINT16 nR, const String& rTxt ) :
+ExcEScenarioCell::ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const String& rTxt ) :
         nCol( nC ),
         nRow( nR ),
         sText( rTxt, EXC_STR_DEFAULT, 255 )
@@ -885,7 +885,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
     String	sTmpName;
     String	sTmpComm;
     Color	aDummyCol;
-    USHORT	nFlags;
+    sal_uInt16	nFlags;
 
     ScDocument& rDoc = rRoot.GetDoc();
     rDoc.GetName( nTab, sTmpName );
@@ -905,13 +905,13 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
     if( !pRList )
         return;
 
-    BOOL	bContLoop = TRUE;
+    sal_Bool	bContLoop = sal_True;
     SCROW	nRow;
     SCCOL	nCol;
     String	sText;
     double	fVal;
 
-    for( UINT32 nRange = 0; (nRange < pRList->Count()) && bContLoop; nRange++ )
+    for( sal_uInt32 nRange = 0; (nRange < pRList->Count()) && bContLoop; nRange++ )
     {
         const ScRange* pRange = pRList->GetObject( nRange );
         for( nRow = pRange->aStart.Row(); (nRow <= pRange->aEnd.Row()) && bContLoop; nRow++ )
@@ -924,7 +924,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
                             rtl_math_StringFormat_Automatic,
                             rtl_math_DecimalPlaces_Max,
                             ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0),
-                            TRUE );
+                            sal_True );
                 }
                 else
                     rDoc.GetString( nCol, nRow, nTab, sText );
@@ -940,25 +940,25 @@ ExcEScenario::~ExcEScenario()
         delete pCell;
 }
 
-BOOL ExcEScenario::Append( UINT16 nCol, UINT16 nRow, const String& rTxt )
+sal_Bool ExcEScenario::Append( sal_uInt16 nCol, sal_uInt16 nRow, const String& rTxt )
 {
     if( List::Count() == EXC_SCEN_MAXCELL )
-        return FALSE;
+        return sal_False;
 
     ExcEScenarioCell* pCell = new ExcEScenarioCell( nCol, nRow, rTxt );
     List::Insert( pCell, LIST_APPEND );
     nRecLen += 6 + pCell->GetStringBytes();        // 4 bytes address, 2 bytes ifmt
-    return TRUE;
+    return sal_True;
 }
 
 void ExcEScenario::SaveCont( XclExpStream& rStrm )
 {
-    rStrm	<< (UINT16) List::Count()		// number of cells
+    rStrm	<< (sal_uInt16) List::Count()		// number of cells
             << nProtected		            // fProtection
-            << (UINT8) 0					// fHidden
-            << (UINT8) sName.Len()          // length of scen name
-            << (UINT8) sComment.Len()       // length of comment
-            << (UINT8) sUserName.Len();     // length of user name
+            << (sal_uInt8) 0					// fHidden
+            << (sal_uInt8) sName.Len()          // length of scen name
+            << (sal_uInt8) sComment.Len()       // length of comment
+            << (sal_uInt8) sUserName.Len();     // length of user name
     sName.WriteFlagField( rStrm );
     sName.WriteBuffer( rStrm );
 
@@ -976,7 +976,7 @@ void ExcEScenario::SaveCont( XclExpStream& rStrm )
     rStrm.WriteZeroBytes( 2 * List::Count() );  // date format
 }
 
-UINT16 ExcEScenario::GetNum() const
+sal_uInt16 ExcEScenario::GetNum() const
 {
     return 0x00AF;
 }
@@ -1035,10 +1035,10 @@ ExcEScenarioManager::~ExcEScenarioManager()
 
 void ExcEScenarioManager::SaveCont( XclExpStream& rStrm )
 {
-    rStrm	<< (UINT16) List::Count()		// number of scenarios
+    rStrm	<< (sal_uInt16) List::Count()		// number of scenarios
             << nActive						// active scen
             << nActive						// last displayed
-            << (UINT16) 0;					// reference areas
+            << (sal_uInt16) 0;					// reference areas
 }
 
 void ExcEScenarioManager::Save( XclExpStream& rStrm )
@@ -1068,7 +1068,7 @@ void ExcEScenarioManager::SaveXml( XclExpXmlStream& rStrm )
     rWorkbook->endElement( XML_scenarios );
 }
 
-UINT16 ExcEScenarioManager::GetNum() const
+sal_uInt16 ExcEScenarioManager::GetNum() const
 {
     return 0x00AE;
 }
@@ -1161,7 +1161,7 @@ XclCalccount::XclCalccount( const ScDocument& rDoc )
 }
 
 
-UINT16 XclCalccount::GetNum() const
+sal_uInt16 XclCalccount::GetNum() const
 {
     return 0x000C;
 }
@@ -1195,7 +1195,7 @@ XclIteration::XclIteration( const ScDocument& rDoc )
 }
 
 
-UINT16 XclIteration::GetNum() const
+sal_uInt16 XclIteration::GetNum() const
 {
     return 0x0011;
 }
@@ -1230,7 +1230,7 @@ XclDelta::XclDelta( const ScDocument& rDoc )
 }
 
 
-UINT16 XclDelta::GetNum() const
+sal_uInt16 XclDelta::GetNum() const
 {
     return 0x0010;
 }
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index de4213b5c..b8e0590df 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -49,7 +49,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
@@ -117,7 +117,7 @@ ScXMLCalculationSettingsContext::~ScXMLCalculationSettingsContext()
 {
 }
 
-SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -167,7 +167,7 @@ void ScXMLCalculationSettingsContext::EndElement()
 }
 
 ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -200,7 +200,7 @@ ScXMLNullDateContext::~ScXMLNullDateContext()
 {
 }
 
-SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -215,7 +215,7 @@ void ScXMLNullDateContext::EndElement()
 }
 
 ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -258,7 +258,7 @@ ScXMLIterationContext::~ScXMLIterationContext()
 {
 }
 
-SvXMLImportContext *ScXMLIterationContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLIterationContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
index 6f59f42a0..18634405a 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
@@ -49,14 +49,14 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLCalculationSettingsContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLCalculationSettingsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -73,14 +73,14 @@ class ScXMLNullDateContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLNullDateContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet);
 
     virtual ~ScXMLNullDateContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -93,14 +93,14 @@ class ScXMLIterationContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLIterationContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet);
 
     virtual ~ScXMLIterationContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index 9df815a66..fc295a9bc 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -54,7 +54,7 @@ ScMyImpCellRangeSource::ScMyImpCellRangeSource() :
 
 ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
         ScXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& xAttrList,
         ScMyImpCellRangeSource* pCellRangeSource ) :
@@ -70,7 +70,7 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( nIndex ));
         const OUString& sValue(xAttrList->getValueByIndex( nIndex ));
         OUString aLocalName;
-        USHORT nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
         {
@@ -120,7 +120,7 @@ ScXMLCellRangeSourceContext::~ScXMLCellRangeSourceContext()
 }
 
 SvXMLImportContext *ScXMLCellRangeSourceContext::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList>& /* xAttrList */ )
 {
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
index 46ef4b907..9de6432e1 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
@@ -60,7 +60,7 @@ private:
 public:
                                 ScXMLCellRangeSourceContext(
                                     ScXMLImport& rImport,
-                                    USHORT nPrfx,
+                                    sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                     ScMyImpCellRangeSource* pCellRangeSource
@@ -68,7 +68,7 @@ public:
     virtual						~ScXMLCellRangeSourceContext();
 
     virtual SvXMLImportContext*	CreateChildContext(
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
                                     );
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 5e10ad9c7..c4b127d82 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -464,10 +464,10 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S
 
     // #97286# old files didn't store 100th seconds, enable again
     if ( aInfo.aDateTime.HundredthSeconds )
-        pTrack->SetTime100thSeconds( TRUE );
+        pTrack->SetTime100thSeconds( sal_True );
 
     StrData aStrData( aInfo.sUser );
-    USHORT nPos;
+    sal_uInt16 nPos;
     if ( pTrack->GetUserCollection().Search( &aStrData, nPos ) )
     {
         const StrData* pUser = static_cast<const StrData*>( pTrack->GetUserCollection().At( nPos ) );
@@ -835,7 +835,7 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc)
     {
         pTrack = new ScChangeTrack(pDoc, aUsers);
         // #97286# old files didn't store 100th seconds, disable until encountered
-        pTrack->SetTime100thSeconds( FALSE );
+        pTrack->SetTime100thSeconds( sal_False );
 
         ScMyActions::iterator aItr(aActions.begin());
         ScMyActions::iterator aEndItr(aActions.end());
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index 0cd0dc5b9..2ce1f6971 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -48,7 +48,7 @@ using namespace xmloff::token;
 
 ScXMLConsolidationContext::ScXMLConsolidationContext(
         ScXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -67,7 +67,7 @@ ScXMLConsolidationContext::ScXMLConsolidationContext(
         const rtl::OUString& sAttrName	(xAttrList->getNameByIndex( nIndex ));
         const rtl::OUString& sValue		(xAttrList->getValueByIndex( nIndex ));
         OUString aLocalName;
-        USHORT nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
         {
@@ -99,7 +99,7 @@ ScXMLConsolidationContext::~ScXMLConsolidationContext()
 }
 
 SvXMLImportContext *ScXMLConsolidationContext::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList>& /* xAttrList */ )
 {
@@ -117,12 +117,12 @@ void ScXMLConsolidationContext::EndElement()
         aConsParam.eFunction = eFunction;
 
         sal_Bool bError = sal_False;
-        USHORT nCount = (USHORT) Min( ScRangeStringConverter::GetTokenCount( sSourceList ), (sal_Int32)0xFFFF );
+        sal_uInt16 nCount = (sal_uInt16) Min( ScRangeStringConverter::GetTokenCount( sSourceList ), (sal_Int32)0xFFFF );
         ScArea** ppAreas = nCount ? new ScArea*[ nCount ] : NULL;
         if( ppAreas )
         {
             sal_Int32 nOffset = 0;
-            USHORT nIndex;
+            sal_uInt16 nIndex;
             for( nIndex = 0; nIndex < nCount; ++nIndex )
             {
                 ppAreas[ nIndex ] = new ScArea;
@@ -141,13 +141,13 @@ void ScXMLConsolidationContext::EndElement()
             delete[] ppAreas;
         }
 
-        aConsParam.bByCol = aConsParam.bByRow = FALSE;
+        aConsParam.bByCol = aConsParam.bByRow = sal_False;
         if( IsXMLToken(sUseLabel, XML_COLUMN ) )
-            aConsParam.bByCol = TRUE;
+            aConsParam.bByCol = sal_True;
         else if( IsXMLToken( sUseLabel, XML_ROW ) )
-            aConsParam.bByRow = TRUE;
+            aConsParam.bByRow = sal_True;
         else if( IsXMLToken( sUseLabel, XML_BOTH ) )
-            aConsParam.bByCol = aConsParam.bByRow = TRUE;
+            aConsParam.bByCol = aConsParam.bByRow = sal_True;
 
         aConsParam.bReferenceData = bLinkToSource;
 
diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx
index 619951cef..82844abe3 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.hxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.hxx
@@ -54,14 +54,14 @@ protected:
 public:
                                 ScXMLConsolidationContext(
                                     ScXMLImport& rImport,
-                                    USHORT nPrfx,
+                                    sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
                                     );
     virtual						~ScXMLConsolidationContext();
 
     virtual SvXMLImportContext*	CreateChildContext(
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
                                     );
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index 51fe5bb25..ce4f4b54f 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -48,7 +48,7 @@ using ::rtl::OUString;
 //------------------------------------------------------------------
 
 ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
@@ -63,7 +63,7 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext()
     GetScImport().UnlockSolarMutex();
 }
 
-SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -84,7 +84,7 @@ void ScXMLDDELinksContext::EndElement()
 }
 
 ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
@@ -106,7 +106,7 @@ ScXMLDDELinkContext::~ScXMLDDELinkContext()
 {
 }
 
-SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -202,12 +202,12 @@ void ScXMLDDELinkContext::EndElement()
             ++aItr;
         }
 
-        GetScImport().GetDocument()->SetDdeLinkResultMatrix( static_cast< USHORT >( nPosition ), pMatrix );
+        GetScImport().GetDocument()->SetDdeLinkResultMatrix( static_cast< sal_uInt16 >( nPosition ), pMatrix );
     }
 }
 
 ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -224,7 +224,7 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport,
         const rtl::OUString& sAttrName	(xAttrList->getNameByIndex( nIndex ));
         const rtl::OUString& sValue		(xAttrList->getValueByIndex( nIndex ));
         OUString aLocalName;
-        USHORT nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if (nPrefix == XML_NAMESPACE_OFFICE)
         {
@@ -251,7 +251,7 @@ ScXMLDDESourceContext::~ScXMLDDESourceContext()
 {
 }
 
-SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -267,7 +267,7 @@ void ScXMLDDESourceContext::EndElement()
 }
 
 ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
@@ -282,7 +282,7 @@ ScXMLDDETableContext::~ScXMLDDETableContext()
 {
 }
 
-SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -308,7 +308,7 @@ void ScXMLDDETableContext::EndElement()
 }
 
 ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -326,7 +326,7 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
         const rtl::OUString& sAttrName	(xAttrList->getNameByIndex( nIndex ));
         const rtl::OUString& sValue		(xAttrList->getValueByIndex( nIndex ));
         OUString aLocalName;
-        USHORT nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if (nPrefix == XML_NAMESPACE_TABLE)
             if (IsXMLToken(aLocalName, XML_NUMBER_COLUMNS_REPEATED))
@@ -339,7 +339,7 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext()
 {
 }
 
-SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -354,7 +354,7 @@ void ScXMLDDEColumnContext::EndElement()
 }
 
 ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -372,7 +372,7 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport,
         const rtl::OUString& sAttrName	(xAttrList->getNameByIndex( nIndex ));
         const rtl::OUString& sValue		(xAttrList->getValueByIndex( nIndex ));
         OUString aLocalName;
-        USHORT nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if (nPrefix == XML_NAMESPACE_TABLE)
             if (IsXMLToken(aLocalName, XML_NUMBER_ROWS_REPEATED))
@@ -385,7 +385,7 @@ ScXMLDDERowContext::~ScXMLDDERowContext()
 {
 }
 
-SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -408,7 +408,7 @@ void ScXMLDDERowContext::EndElement()
 }
 
 ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -431,7 +431,7 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport,
         const rtl::OUString& sAttrName	(xAttrList->getNameByIndex( nIndex ));
         const rtl::OUString& sTempValue	(xAttrList->getValueByIndex( nIndex ));
         OUString aLocalName;
-        USHORT nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         if (nPrefix == XML_NAMESPACE_OFFICE)
         {
@@ -467,7 +467,7 @@ ScXMLDDECellContext::~ScXMLDDECellContext()
 {
 }
 
-SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx
index 57ddb4812..629f01800 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.hxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.hxx
@@ -39,14 +39,14 @@ class ScXMLDDELinksContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLDDELinksContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLDDELinksContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -79,14 +79,14 @@ class ScXMLDDELinkContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLDDELinkContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLDDELinkContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -111,7 +111,7 @@ class ScXMLDDESourceContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLDDESourceContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -119,7 +119,7 @@ public:
 
     virtual ~ScXMLDDESourceContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -134,7 +134,7 @@ class ScXMLDDETableContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLDDETableContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -142,7 +142,7 @@ public:
 
     virtual ~ScXMLDDETableContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -157,7 +157,7 @@ class ScXMLDDEColumnContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLDDEColumnContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -165,7 +165,7 @@ public:
 
     virtual ~ScXMLDDEColumnContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -181,7 +181,7 @@ class ScXMLDDERowContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLDDERowContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -189,7 +189,7 @@ public:
 
     virtual ~ScXMLDDERowContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -211,7 +211,7 @@ class ScXMLDDECellContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLDDECellContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -219,7 +219,7 @@ public:
 
     virtual ~ScXMLDDECellContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx
index d834606b1..be44f5035 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -83,7 +83,7 @@ sal_Bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp )
 
 ScXMLDetectiveContext::ScXMLDetectiveContext(
         ScXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         ScMyImpDetectiveObjVec* pNewDetectiveObjVec ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -96,7 +96,7 @@ ScXMLDetectiveContext::~ScXMLDetectiveContext()
 }
 
 SvXMLImportContext *ScXMLDetectiveContext::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList>& xAttrList )
 {
@@ -127,7 +127,7 @@ void ScXMLDetectiveContext::EndElement()
 
 ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
         ScXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& xAttrList,
         ScMyImpDetectiveObjVec* pNewDetectiveObjVec ):
@@ -146,7 +146,7 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
         const rtl::OUString& sAttrName	(xAttrList->getNameByIndex( nIndex ));
         const rtl::OUString& sValue		(xAttrList->getValueByIndex( nIndex ));
         OUString aLocalName;
-        USHORT nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
         {
@@ -179,7 +179,7 @@ ScXMLDetectiveHighlightedContext::~ScXMLDetectiveHighlightedContext()
 }
 
 SvXMLImportContext *ScXMLDetectiveHighlightedContext::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList>& /* xAttrList */ )
 {
@@ -209,7 +209,7 @@ void ScXMLDetectiveHighlightedContext::EndElement()
 
 ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
         ScXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -226,7 +226,7 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
         const rtl::OUString& sAttrName	(xAttrList->getNameByIndex( nIndex ));
         const rtl::OUString& sValue		(xAttrList->getValueByIndex( nIndex ));
         OUString aLocalName;
-        USHORT nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+        sal_uInt16 nPrefix		= GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
         {
@@ -250,7 +250,7 @@ ScXMLDetectiveOperationContext::~ScXMLDetectiveOperationContext()
 }
 
 SvXMLImportContext *ScXMLDetectiveOperationContext::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList>& /* xAttrList */ )
 {
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx
index 0d4991784..94c0d1ad8 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -96,14 +96,14 @@ private:
 public:
                                 ScXMLDetectiveContext(
                                     ScXMLImport& rImport,
-                                    USHORT nPrfx,
+                                    sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
                                     ScMyImpDetectiveObjVec* pNewDetectiveObjVec
                                     );
     virtual						~ScXMLDetectiveContext();
 
     virtual SvXMLImportContext*	CreateChildContext(
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
                                     );
@@ -126,7 +126,7 @@ private:
 public:
                                 ScXMLDetectiveHighlightedContext(
                                     ScXMLImport& rImport,
-                                    USHORT nPrfx,
+                                    sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                                     ScMyImpDetectiveObjVec* pNewDetectiveObjVec
@@ -134,7 +134,7 @@ public:
     virtual						~ScXMLDetectiveHighlightedContext();
 
     virtual SvXMLImportContext*	CreateChildContext(
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
                                     );
@@ -156,14 +156,14 @@ private:
 public:
                                 ScXMLDetectiveOperationContext(
                                     ScXMLImport& rImport,
-                                    USHORT nPrfx,
+                                    sal_uInt16 nPrfx,
                                     const ::rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
                                     );
     virtual						~ScXMLDetectiveOperationContext();
 
     virtual SvXMLImportContext*	CreateChildContext(
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
                                     );
diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx
index 57033a66e..080d1a06f 100644
--- a/sc/source/filter/xml/XMLEmptyContext.cxx
+++ b/sc/source/filter/xml/XMLEmptyContext.cxx
@@ -38,7 +38,7 @@
 //------------------------------------------------------------------
 
 ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName) :
     SvXMLImportContext( rImport, nPrfx, rLName )
 {
@@ -48,7 +48,7 @@ ScXMLEmptyContext::~ScXMLEmptyContext()
 {
 }
 
-SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx
index e2c994731..e3d8609b0 100644
--- a/sc/source/filter/xml/XMLEmptyContext.hxx
+++ b/sc/source/filter/xml/XMLEmptyContext.hxx
@@ -41,12 +41,12 @@ class ScXMLEmptyContext : public SvXMLImportContext
 
 public:
 
-    ScXMLEmptyContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName);
 
     virtual ~ScXMLEmptyContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx
index ef8457825..806e12665 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -102,7 +102,7 @@ void ScXMLExportDDELinks::WriteTable(const sal_Int32 nPos)
 {
     const ScMatrix* pMatrix(NULL);
     if (rExport.GetDocument())
-        pMatrix = rExport.GetDocument()->GetDdeLinkResultMatrix( static_cast<USHORT>(nPos) );
+        pMatrix = rExport.GetDocument()->GetDdeLinkResultMatrix( static_cast<sal_uInt16>(nPos) );
     if (pMatrix)
     {
         SCSIZE nuCol;
@@ -132,7 +132,7 @@ void ScXMLExportDDELinks::WriteTable(const sal_Int32 nPos)
             {
                 ScMatValType nType = SC_MATVAL_VALUE;
                 const ScMatrixValue* pMatVal = pMatrix->Get( static_cast<SCSIZE>(nColumn), static_cast<SCSIZE>(nRow), nType );
-                BOOL bIsString = ScMatrix::IsNonValueType( nType);
+                sal_Bool bIsString = ScMatrix::IsNonValueType( nType);
 
                 if (nColumn == 0)
                 {
@@ -196,7 +196,7 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference<sheet::XSpreadsheetDocume
                             rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DDE_TOPIC, xDDELink->getTopic());
                             rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DDE_ITEM, xDDELink->getItem());
                             rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_AUTOMATIC_UPDATE, XML_TRUE);
-                            BYTE nMode;
+                            sal_uInt8 nMode;
                             if (rExport.GetDocument() &&
                                 rExport.GetDocument()->GetDdeLinkMode(nDDELink, nMode))
                             {
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index 20f0792d4..975633d08 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -102,7 +102,7 @@ void ScMyShapeResizer::CreateChartListener(ScDocument* pDoc,
         //if we have the flat filter we need to set the dirty flag thus the visible charts get repainted
         //otherwise the charts keep their first visual representation which was created at a moment where the calc itself was not loaded completly and is incorect therefor
         if( (rImport.getImportFlags() & IMPORT_ALL) == IMPORT_ALL )
-            pCL->SetDirty( TRUE );
+            pCL->SetDirty( sal_True );
         else
         {
             // #i104899# If a formula cell is already dirty, further changes aren't propagated.
@@ -136,7 +136,7 @@ void ScMyShapeResizer::GetNewShapeSizePos(ScDocument* pDoc, const Rectangle& rSt
                                           sal_Int32& rEndX, sal_Int32& rEndY) const
 {
     awt::Point aRefPoint;
-    BOOL bNegativePage(pDoc->IsNegativePage(rEndCell.Sheet));
+    sal_Bool bNegativePage(pDoc->IsNegativePage(rEndCell.Sheet));
     if (bNegativePage)
         aRefPoint.X = rStartRect.Right();
     else
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx
index 06bc7a423..2040579c4 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star;
 //------------------------------------------------------------------
 
 ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
@@ -55,7 +55,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext()
 {
 }
 
-SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx
index f11e8c186..449ccc0ce 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.hxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.hxx
@@ -37,14 +37,14 @@ class ScXMLTableShapesContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLTableShapesContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLTableShapesContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 1f589b451..79b541511 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -48,7 +48,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
@@ -100,7 +100,7 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext()
 {
 }
 
-SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -127,9 +127,9 @@ void ScXMLTableSourceContext::EndElement()
 
                 aFileString = ScGlobal::GetAbsDocName( aFileString, pDoc->GetDocumentShell() );
                 if ( !aFilterString.Len() )
-                    ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, FALSE, FALSE );
+                    ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, sal_False, sal_False );
 
-                BYTE nLinkMode = SC_LINK_NONE;
+                sal_uInt8 nLinkMode = SC_LINK_NONE;
                 if ( nMode == sheet::SheetLinkMode_NORMAL )
                     nLinkMode = SC_LINK_NORMAL;
                 else if ( nMode == sheet::SheetLinkMode_VALUE )
diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx
index 43a21d88d..10205806a 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.hxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.hxx
@@ -45,14 +45,14 @@ class ScXMLTableSourceContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLTableSourceContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLTableSourceContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx
index 08498ee9e..b79795324 100644
--- a/sc/source/filter/xml/XMLTextPContext.cxx
+++ b/sc/source/filter/xml/XMLTextPContext.cxx
@@ -48,7 +48,7 @@ class ScXMLTextTContext : public SvXMLImportContext
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 public:
-    ScXMLTextTContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTextTContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -59,7 +59,7 @@ public:
 
 
 ScXMLTextTContext::ScXMLTextTContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -91,7 +91,7 @@ ScXMLTextTContext::~ScXMLTextTContext()
 //------------------------------------------------------------------
 
 ScXMLTextPContext::ScXMLTextPContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
@@ -128,7 +128,7 @@ void ScXMLTextPContext::AddSpaces(sal_Int32 nSpaceCount)
     pContentBuffer->appendAscii(pChars, nSpaceCount);
 }
 
-SvXMLImportContext *ScXMLTextPContext::CreateChildContext( USHORT nTempPrefix,
+SvXMLImportContext *ScXMLTextPContext::CreateChildContext( sal_uInt16 nTempPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList )
diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx
index 4936f7b63..533264ae7 100644
--- a/sc/source/filter/xml/XMLTextPContext.hxx
+++ b/sc/source/filter/xml/XMLTextPContext.hxx
@@ -42,14 +42,14 @@ class ScXMLTextPContext : public SvXMLImportContext
     rtl::OUString				sLName;
     rtl::OUString               sSimpleContent;     // copy of the first Character call's argument
     rtl::OUStringBuffer*        pContentBuffer;     // used if there's more than one string
-    USHORT						nPrefix;
+    sal_uInt16						nPrefix;
     sal_Bool					bIsOwn;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLTextPContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -57,7 +57,7 @@ public:
 
     virtual ~ScXMLTextPContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index d94d9571e..37707b61e 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -62,13 +62,13 @@ class ScXMLChangeInfoContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLChangeInfoContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLChangeInfoContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -86,13 +86,13 @@ class ScXMLBigRangeContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLBigRangeContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScBigRange& rBigRange);
     virtual ~ScXMLBigRangeContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -125,13 +125,13 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLCellContentDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLCellContentDeletionContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -149,13 +149,13 @@ class ScXMLDependenceContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLDependenceContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLDependenceContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -173,13 +173,13 @@ class ScXMLDependingsContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLDependingsContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLDependingsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -197,13 +197,13 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLChangeDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLChangeDeletionContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -221,13 +221,13 @@ class ScXMLDeletionsContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLDeletionsContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLDeletionsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -246,14 +246,14 @@ class ScXMLChangeTextPContext : public SvXMLImportContext
     rtl::OUStringBuffer			sText;
     ScXMLChangeCellContext*		pChangeCellContext;
     SvXMLImportContext*			pTextPContext;
-    USHORT						nPrefix;
+    sal_uInt16						nPrefix;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
 
-    ScXMLChangeTextPContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                        const ::rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -261,7 +261,7 @@ public:
 
     virtual ~ScXMLChangeTextPContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -293,7 +293,7 @@ class ScXMLChangeCellContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLChangeCellContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScBaseCell*& rOldCell, rtl::OUString& sAddress,
@@ -303,7 +303,7 @@ public:
                                       sal_uInt8& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows);
     virtual ~ScXMLChangeCellContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -337,13 +337,13 @@ class ScXMLPreviousContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLPreviousContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLPreviousContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -362,13 +362,13 @@ class ScXMLContentChangeContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLContentChangeContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLContentChangeContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -385,13 +385,13 @@ class ScXMLInsertionContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLInsertionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLInsertionContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -408,13 +408,13 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLInsertionCutOffContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLInsertionCutOffContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -431,13 +431,13 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLMovementCutOffContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLMovementCutOffContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -454,13 +454,13 @@ class ScXMLCutOffsContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLCutOffsContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLCutOffsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -477,13 +477,13 @@ class ScXMLDeletionContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLDeletionContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -502,13 +502,13 @@ class ScXMLMovementContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLMovementContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLMovementContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -525,13 +525,13 @@ class ScXMLRejectionContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLRejectionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLRejectionContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -541,7 +541,7 @@ public:
 //------------------------------------------------------------------
 
 ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                               ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -579,7 +579,7 @@ ScXMLTrackedChangesContext::~ScXMLTrackedChangesContext()
     GetScImport().UnlockSolarMutex();
 }
 
-SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -621,7 +621,7 @@ void ScXMLTrackedChangesContext::EndElement()
 }
 
 ScXMLChangeInfoContext::ScXMLChangeInfoContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -635,7 +635,7 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext(  ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -657,7 +657,7 @@ ScXMLChangeInfoContext::~ScXMLChangeInfoContext()
 {
 }
 
-SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -696,7 +696,7 @@ void ScXMLChangeInfoContext::EndElement()
 }
 
 ScXMLBigRangeContext::ScXMLBigRangeContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScBigRange& rTempBigRange ) :
@@ -720,7 +720,7 @@ ScXMLBigRangeContext::ScXMLBigRangeContext(  ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -769,7 +769,7 @@ ScXMLBigRangeContext::~ScXMLBigRangeContext()
 {
 }
 
-SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -782,7 +782,7 @@ void ScXMLBigRangeContext::EndElement()
 }
 
 ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper) :
@@ -802,7 +802,7 @@ ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext(  ScXMLImport&
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -818,7 +818,7 @@ ScXMLCellContentDeletionContext::~ScXMLCellContentDeletionContext()
 {
 }
 
-SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -858,7 +858,7 @@ void ScXMLCellContentDeletionContext::EndElement()
 }
 
 ScXMLDependenceContext::ScXMLDependenceContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -871,7 +871,7 @@ ScXMLDependenceContext::ScXMLDependenceContext(  ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -888,7 +888,7 @@ ScXMLDependenceContext::~ScXMLDependenceContext()
 {
 }
 
-SvXMLImportContext *ScXMLDependenceContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDependenceContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -901,7 +901,7 @@ void ScXMLDependenceContext::EndElement()
 }
 
 ScXMLDependingsContext::ScXMLDependingsContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                             const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -915,7 +915,7 @@ ScXMLDependingsContext::~ScXMLDependingsContext()
 {
 }
 
-SvXMLImportContext *ScXMLDependingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDependingsContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -940,7 +940,7 @@ void ScXMLDependingsContext::EndElement()
 }
 
 ScXMLChangeDeletionContext::ScXMLChangeDeletionContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -953,7 +953,7 @@ ScXMLChangeDeletionContext::ScXMLChangeDeletionContext(  ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -970,7 +970,7 @@ ScXMLChangeDeletionContext::~ScXMLChangeDeletionContext()
 {
 }
 
-SvXMLImportContext *ScXMLChangeDeletionContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLChangeDeletionContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -983,7 +983,7 @@ void ScXMLChangeDeletionContext::EndElement()
 }
 
 ScXMLDeletionsContext::ScXMLDeletionsContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                             const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -997,7 +997,7 @@ ScXMLDeletionsContext::~ScXMLDeletionsContext()
 {
 }
 
-SvXMLImportContext *ScXMLDeletionsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDeletionsContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1023,7 +1023,7 @@ void ScXMLDeletionsContext::EndElement()
 }
 
 ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
@@ -1045,7 +1045,7 @@ ScXMLChangeTextPContext::~ScXMLChangeTextPContext()
         delete pTextPContext;
 }
 
-SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( USHORT nTempPrefix,
+SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTempPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList )
@@ -1061,7 +1061,7 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( USHORT nTempPre
             const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
             const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
             rtl::OUString aLocalName;
-            USHORT nPrfx(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+            sal_uInt16 nPrfx(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                                 sAttrName, &aLocalName ));
             if ((nPrfx == XML_NAMESPACE_TEXT) && (IsXMLToken(aLocalName, XML_C)))
                 nRepeat = sValue.toInt32();
@@ -1112,7 +1112,7 @@ void ScXMLChangeTextPContext::EndElement()
 }
 
 ScXMLChangeCellContext::ScXMLChangeCellContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScBaseCell*& rTempOldCell, rtl::OUString& rAddress,
@@ -1138,7 +1138,7 @@ ScXMLChangeCellContext::ScXMLChangeCellContext(  ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1216,7 +1216,7 @@ ScXMLChangeCellContext::~ScXMLChangeCellContext()
 {
 }
 
-SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1329,7 +1329,7 @@ void ScXMLChangeCellContext::EndElement()
 }
 
 ScXMLPreviousContext::ScXMLPreviousContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1348,7 +1348,7 @@ ScXMLPreviousContext::ScXMLPreviousContext(  ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1364,7 +1364,7 @@ ScXMLPreviousContext::~ScXMLPreviousContext()
 {
 }
 
-SvXMLImportContext *ScXMLPreviousContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLPreviousContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1388,7 +1388,7 @@ void ScXMLPreviousContext::EndElement()
 }
 
 ScXMLContentChangeContext::ScXMLContentChangeContext(  ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1404,7 +1404,7 @@ ScXMLContentChangeContext::ScXMLContentChangeContext(  ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1438,7 +1438,7 @@ ScXMLContentChangeContext::~ScXMLContentChangeContext()
 {
 }
 
-SvXMLImportContext *ScXMLContentChangeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLContentChangeContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1480,7 +1480,7 @@ void ScXMLContentChangeContext::EndElement()
 }
 
 ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1500,7 +1500,7 @@ ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1554,7 +1554,7 @@ ScXMLInsertionContext::~ScXMLInsertionContext()
 {
 }
 
-SvXMLImportContext *ScXMLInsertionContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLInsertionContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1585,7 +1585,7 @@ void ScXMLInsertionContext::EndElement()
 }
 
 ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1599,7 +1599,7 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1622,7 +1622,7 @@ ScXMLInsertionCutOffContext::~ScXMLInsertionCutOffContext()
 {
 }
 
-SvXMLImportContext *ScXMLInsertionCutOffContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLInsertionCutOffContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -1635,7 +1635,7 @@ void ScXMLInsertionCutOffContext::EndElement()
 }
 
 ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1652,7 +1652,7 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1686,7 +1686,7 @@ ScXMLMovementCutOffContext::~ScXMLMovementCutOffContext()
 {
 }
 
-SvXMLImportContext *ScXMLMovementCutOffContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLMovementCutOffContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -1699,7 +1699,7 @@ void ScXMLMovementCutOffContext::EndElement()
 }
 
 ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                             const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1713,7 +1713,7 @@ ScXMLCutOffsContext::~ScXMLCutOffsContext()
 {
 }
 
-SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1739,7 +1739,7 @@ void ScXMLCutOffsContext::EndElement()
 }
 
 ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1759,7 +1759,7 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1818,7 +1818,7 @@ ScXMLDeletionContext::~ScXMLDeletionContext()
 {
 }
 
-SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1855,7 +1855,7 @@ void ScXMLDeletionContext::EndElement()
 }
 
 ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1871,7 +1871,7 @@ ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1905,7 +1905,7 @@ ScXMLMovementContext::~ScXMLMovementContext()
 {
 }
 
-SvXMLImportContext *ScXMLMovementContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLMovementContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1941,7 +1941,7 @@ void ScXMLMovementContext::EndElement()
 }
 
 ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                             ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
@@ -1957,7 +1957,7 @@ ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1991,7 +1991,7 @@ ScXMLRejectionContext::~ScXMLRejectionContext()
 {
 }
 
-SvXMLImportContext *ScXMLRejectionContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLRejectionContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
index 5e8b6f94d..955be3158 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
@@ -45,13 +45,13 @@ class ScXMLTrackedChangesContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLTrackedChangesContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
                                       ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
     virtual ~ScXMLTrackedChangesContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index 80c4edb0a..67f5a0043 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -58,7 +58,7 @@ ScXMLAnnotationData::~ScXMLAnnotationData()
 //------------------------------------------------------------------
 
 ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                                       ScXMLAnnotationData& rAnnotationData,
@@ -86,7 +86,7 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -136,7 +136,7 @@ void ScXMLAnnotationContext::StartElement(const com::sun::star::uno::Reference<
         pShapeContext->StartElement(xAttrList);
 }
 
-SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index ea6cfad80..b942ded89 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -75,7 +75,7 @@ class ScXMLAnnotationContext : public SvXMLImportContext
 {
 public:
 
-    ScXMLAnnotationContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -84,7 +84,7 @@ public:
 
     virtual ~ScXMLAnnotationContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 29775dedd..b0d7f3ee1 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -72,7 +72,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
-                                              USHORT nPrfx,
+                                              sal_uInt16 nPrfx,
                                                    const ::rtl::OUString& rLName,
                                               const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -112,7 +112,7 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -130,7 +130,7 @@ ScXMLBodyContext::~ScXMLBodyContext()
 {
 }
 
-SvXMLImportContext *ScXMLBodyContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -151,13 +151,13 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( USHORT nPrefix,
     switch( rTokenMap.Get( nPrefix, rLocalName ) )
     {
 //	case XML_TOK_TEXT_H:
-//		bHeading = TRUE;
+//		bHeading = sal_True;
 //	case XML_TOK_TEXT_P:
 //		pContext = new SwXMLParaContext( GetSwImport(),nPrefix, rLocalName,
 //										 xAttrList, bHeading );
 //		break;
 //	case XML_TOK_TEXT_ORDERED_LIST:
-//		bOrdered = TRUE;
+//		bOrdered = sal_True;
 //	case XML_TOK_TEXT_UNORDERED_LIST:
 //		pContext = new SwXMLListBlockContext( GetSwImport(),nPrefix, rLocalName,
 //											  xAttrList, bOrdered );
diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx
index e279431f8..6a727f830 100644
--- a/sc/source/filter/xml/xmlbodyi.hxx
+++ b/sc/source/filter/xml/xmlbodyi.hxx
@@ -45,11 +45,11 @@ class ScXMLBodyContext : public SvXMLImportContext
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 
 public:
-    ScXMLBodyContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName,
+    ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
     virtual ~ScXMLBodyContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                                     const ::rtl::OUString& rLocalName,
                                                     const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index a443a2ccb..344a98a4d 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -99,7 +99,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -313,7 +313,7 @@ void ScXMLTableRowCellContext::SetCursorOnTextImport(const rtl::OUString& rOUTem
     }
 }
 
-SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -947,7 +947,7 @@ void ScXMLTableRowCellContext::EndElement()
                                             // #i56027# This is about setting simple text, not edit cells,
                                             // so ProgressBarIncrement must be called with bEditCell = FALSE.
                                             // Formatted text that is put into the cell by the child context
-                                            // is handled below (bIsEmpty is TRUE then).
+                                            // is handled below (bIsEmpty is sal_True then).
                                             if (bDoIncrement || bHasTextImport)
                                                 rXMLImport.ProgressBarIncrement(sal_False);
                                         }
@@ -1022,7 +1022,7 @@ void ScXMLTableRowCellContext::EndElement()
                     else
                     {
                         // #i56027# If the child context put formatted text into the cell,
-                        // bIsEmpty is TRUE and ProgressBarIncrement has to be called
+                        // bIsEmpty is sal_True and ProgressBarIncrement has to be called
                         // with bEditCell = TRUE.
                         if (bHasTextImport)
                             rXMLImport.ProgressBarIncrement(sal_True);
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index 7e2a40fce..77eb7da4d 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -103,7 +103,7 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
 
 public:
 
-    ScXMLTableRowCellContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                        const ::rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -111,7 +111,7 @@ public:
 
     virtual ~ScXMLTableRowCellContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 3a43a42aa..928709142 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -58,7 +58,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) :
@@ -107,7 +107,7 @@ ScXMLTableColContext::~ScXMLTableColContext()
 {
 }
 
-SvXMLImportContext *ScXMLTableColContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -198,7 +198,7 @@ void ScXMLTableColContext::EndElement()
 }
 
 ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -240,7 +240,7 @@ ScXMLTableColsContext::~ScXMLTableColsContext()
 {
 }
 
-SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx
index 97decb94d..8e15956bd 100644
--- a/sc/source/filter/xml/xmlcoli.hxx
+++ b/sc/source/filter/xml/xmlcoli.hxx
@@ -44,14 +44,14 @@ class ScXMLTableColContext : public SvXMLImportContext
 
 public:
 
-    ScXMLTableColContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                        const ::rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     virtual ~ScXMLTableColContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -74,7 +74,7 @@ class ScXMLTableColsContext : public SvXMLImportContext
 
 public:
 
-    ScXMLTableColsContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                        const ::rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -82,7 +82,7 @@ public:
 
     virtual ~ScXMLTableColsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index 2f424ef52..7408304ab 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -47,7 +47,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
@@ -62,7 +62,7 @@ ScXMLContentContext::~ScXMLContentContext()
 {
 }
 
-SvXMLImportContext *ScXMLContentContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -78,7 +78,7 @@ SvXMLImportContext *ScXMLContentContext::CreateChildContext( USHORT nPrefix,
             const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
             const rtl::OUString& sAttrValue(xAttrList->getValueByIndex( i ));
             rtl::OUString aLocalName;
-            USHORT nPrfx = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+            sal_uInt16 nPrfx = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                                 sAttrName, &aLocalName );
             if ((nPrfx == XML_NAMESPACE_TEXT) && IsXMLToken(aLocalName, XML_C))
                 nRepeat = sAttrValue.toInt32();
diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx
index ae1aa404f..3efc2c31c 100644
--- a/sc/source/filter/xml/xmlconti.hxx
+++ b/sc/source/filter/xml/xmlconti.hxx
@@ -42,7 +42,7 @@ class ScXMLContentContext : public SvXMLImportContext
 
 public:
 
-    ScXMLContentContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                        const ::rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -50,7 +50,7 @@ public:
 
     virtual ~ScXMLContentContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 6b9179b8c..4098c25af 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -78,14 +78,14 @@ class ScXMLContentValidationContext : public SvXMLImportContext
 
 public:
 
-    ScXMLContentValidationContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLContentValidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLContentValidationContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -111,7 +111,7 @@ class ScXMLHelpMessageContext : public SvXMLImportContext
 
 public:
 
-    ScXMLHelpMessageContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -119,7 +119,7 @@ public:
 
     virtual ~ScXMLHelpMessageContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -142,7 +142,7 @@ class ScXMLErrorMessageContext : public SvXMLImportContext
 
 public:
 
-    ScXMLErrorMessageContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -150,7 +150,7 @@ public:
 
     virtual ~ScXMLErrorMessageContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -170,7 +170,7 @@ class ScXMLErrorMacroContext : public SvXMLImportContext
 
 public:
 
-    ScXMLErrorMacroContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -178,7 +178,7 @@ public:
 
     virtual ~ScXMLErrorMacroContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -188,7 +188,7 @@ public:
 //------------------------------------------------------------------
 
 ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
@@ -201,7 +201,7 @@ ScXMLContentValidationsContext::~ScXMLContentValidationsContext()
 {
 }
 
-SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -227,7 +227,7 @@ void ScXMLContentValidationsContext::EndElement()
 }
 
 ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
@@ -243,7 +243,7 @@ ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImpo
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -286,7 +286,7 @@ ScXMLContentValidationContext::~ScXMLContentValidationContext()
 {
 }
 
-SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -493,7 +493,7 @@ void ScXMLContentValidationContext::SetErrorMacro(const sal_Bool bExecute)
 }
 
 ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -511,7 +511,7 @@ ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -531,7 +531,7 @@ ScXMLHelpMessageContext::~ScXMLHelpMessageContext()
 {
 }
 
-SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -563,7 +563,7 @@ void ScXMLHelpMessageContext::EndElement()
 }
 
 ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -582,7 +582,7 @@ ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -605,7 +605,7 @@ ScXMLErrorMessageContext::~ScXMLErrorMessageContext()
 {
 }
 
-SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -637,7 +637,7 @@ void ScXMLErrorMessageContext::EndElement()
 }
 
 ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -653,7 +653,7 @@ ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -673,7 +673,7 @@ ScXMLErrorMacroContext::~ScXMLErrorMacroContext()
 {
 }
 
-SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx
index 443efc9cc..be5eb6e00 100644
--- a/sc/source/filter/xml/xmlcvali.hxx
+++ b/sc/source/filter/xml/xmlcvali.hxx
@@ -43,14 +43,14 @@ class ScXMLContentValidationsContext : public SvXMLImportContext
 
 public:
 
-    ScXMLContentValidationsContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLContentValidationsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index d9b1f6b4e..916d896c5 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -70,7 +70,7 @@ using ::rtl::OUString;
 //------------------------------------------------------------------
 
 ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
@@ -85,7 +85,7 @@ ScXMLDataPilotTablesContext::~ScXMLDataPilotTablesContext()
     GetScImport().UnlockSolarMutex();
 }
 
-SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -117,7 +117,7 @@ ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() :
     mbVisible(true) {}
 
 ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
@@ -147,7 +147,7 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -231,7 +231,7 @@ ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext()
     delete pDPDimSaveData;
 }
 
-SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -337,7 +337,7 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas
         //	mark the new one as duplicate
         if ( !pDim->IsDataLayout() &&
                 pDPSave->GetExistingDimensionByName(pDim->GetName()) )
-            pDim->SetDupFlag( TRUE );
+            pDim->SetDupFlag( sal_True );
 
         if (!pDim->IsDataLayout())
         {
@@ -501,7 +501,7 @@ void ScXMLDataPilotTableContext::SetGrandTotal(
 }
 
 ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -515,7 +515,7 @@ ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -544,7 +544,7 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext()
 {
 }
 
-SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -562,7 +562,7 @@ void ScXMLDPSourceSQLContext::EndElement()
 }
 
 ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -576,7 +576,7 @@ ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -600,7 +600,7 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext()
 {
 }
 
-SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -618,7 +618,7 @@ void ScXMLDPSourceTableContext::EndElement()
 }
 
 ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -632,7 +632,7 @@ ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -656,7 +656,7 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext()
 {
 }
 
-SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -674,7 +674,7 @@ void ScXMLDPSourceQueryContext::EndElement()
 }
 
 ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -688,7 +688,7 @@ ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -727,7 +727,7 @@ ScXMLSourceServiceContext::~ScXMLSourceServiceContext()
 {
 }
 
-SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -750,7 +750,7 @@ ScXMLImport& ScXMLDataPilotGrandTotalContext::GetScImport()
 }
 
 ScXMLDataPilotGrandTotalContext::ScXMLDataPilotGrandTotalContext(
-    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList,
+    ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList,
     ScXMLDataPilotTableContext* pTableContext ) :
     SvXMLImportContext( rImport, nPrefix, rLName ),
     mpTableContext(pTableContext),
@@ -765,7 +765,7 @@ ScXMLDataPilotGrandTotalContext::ScXMLDataPilotGrandTotalContext(
         const OUString& rAttrValue = xAttrList->getValueByIndex(i);
 
         OUString aLocalName;
-        USHORT nLocalPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
+        sal_uInt16 nLocalPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(rAttrName, &aLocalName);
         switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
         {
             case XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY:
@@ -794,7 +794,7 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext()
 }
 
 SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( 
-    USHORT /*nPrefix*/, const ::rtl::OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ )
+    sal_uInt16 /*nPrefix*/, const ::rtl::OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ )
 {
     return NULL;
 }
@@ -820,7 +820,7 @@ void ScXMLDataPilotGrandTotalContext::EndElement()
 }
 
 ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -834,7 +834,7 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -856,7 +856,7 @@ ScXMLSourceCellRangeContext::~ScXMLSourceCellRangeContext()
 {
 }
 
-SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -882,7 +882,7 @@ void ScXMLSourceCellRangeContext::EndElement()
 }
 
 ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -911,7 +911,7 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -969,7 +969,7 @@ ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1079,7 +1079,7 @@ void ScXMLDataPilotFieldContext::EndElement()
     }
 }
 
-ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, USHORT nPrfx,
+ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const uno::Reference<xml::sax::XAttributeList>& xAttrList,
                         ScXMLDataPilotFieldContext* pDataPilotField) :
@@ -1092,7 +1092,7 @@ ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLI
     {
         rtl::OUString sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue(xAttrList->getValueByIndex( i ));
 
@@ -1146,7 +1146,7 @@ ScXMLDataPilotFieldReferenceContext::~ScXMLDataPilotFieldReferenceContext()
 }
 
 ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1160,7 +1160,7 @@ ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1179,7 +1179,7 @@ ScXMLDataPilotLevelContext::~ScXMLDataPilotLevelContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1216,7 +1216,7 @@ void ScXMLDataPilotLevelContext::EndElement()
 {
 }
 
-ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, USHORT nPrfx,
+ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1230,7 +1230,7 @@ ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport&
     {
         rtl::OUString sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue(xAttrList->getValueByIndex( i ));
 
@@ -1267,7 +1267,7 @@ ScXMLDataPilotDisplayInfoContext::~ScXMLDataPilotDisplayInfoContext()
 {
 }
 
-ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, USHORT nPrfx,
+ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1281,7 +1281,7 @@ ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImpo
     {
         rtl::OUString sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue(xAttrList->getValueByIndex( i ));
 
@@ -1316,7 +1316,7 @@ ScXMLDataPilotSortInfoContext::~ScXMLDataPilotSortInfoContext()
 {
 }
 
-ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, USHORT nPrfx,
+ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1330,7 +1330,7 @@ ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& r
     {
         rtl::OUString sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue(xAttrList->getValueByIndex( i ));
 
@@ -1361,7 +1361,7 @@ ScXMLDataPilotLayoutInfoContext::~ScXMLDataPilotLayoutInfoContext()
 }
 
 ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
@@ -1379,7 +1379,7 @@ ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1433,7 +1433,7 @@ void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName)
 }
 
 ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1447,7 +1447,7 @@ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImpo
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1471,7 +1471,7 @@ ScXMLDataPilotSubTotalContext::~ScXMLDataPilotSubTotalContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -1489,7 +1489,7 @@ void ScXMLDataPilotSubTotalContext::EndElement()
 }
 
 ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
@@ -1504,7 +1504,7 @@ ScXMLDataPilotMembersContext::~ScXMLDataPilotMembersContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1530,7 +1530,7 @@ void ScXMLDataPilotMembersContext::EndElement()
 }
 
 ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1547,7 +1547,7 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -1582,7 +1582,7 @@ ScXMLDataPilotMemberContext::~ScXMLDataPilotMemberContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -1609,7 +1609,7 @@ void ScXMLDataPilotMemberContext::EndElement()
 }
 
 ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1631,7 +1631,7 @@ ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport,
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -1708,7 +1708,7 @@ ScXMLDataPilotGroupsContext::~ScXMLDataPilotGroupsContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotGroupsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotGroupsContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1732,7 +1732,7 @@ void ScXMLDataPilotGroupsContext::EndElement()
 }
 
 ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1745,7 +1745,7 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport,
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
         
@@ -1761,7 +1761,7 @@ ScXMLDataPilotGroupContext::~ScXMLDataPilotGroupContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -1786,7 +1786,7 @@ void ScXMLDataPilotGroupContext::EndElement()
 }
 
 ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -1799,7 +1799,7 @@ ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport&
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -1815,7 +1815,7 @@ ScXMLDataPilotGroupMemberContext::~ScXMLDataPilotGroupMemberContext()
 {
 }
 
-SvXMLImportContext *ScXMLDataPilotGroupMemberContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDataPilotGroupMemberContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index e136fb2d0..64ff3dd58 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -62,14 +62,14 @@ class ScXMLDataPilotTablesContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotTablesContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLDataPilotTablesContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -132,14 +132,14 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotTableContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLDataPilotTableContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -178,7 +178,7 @@ class ScXMLDPSourceSQLContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDPSourceSQLContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -186,7 +186,7 @@ public:
 
     virtual ~ScXMLDPSourceSQLContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -203,7 +203,7 @@ class ScXMLDPSourceTableContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDPSourceTableContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -211,7 +211,7 @@ public:
 
     virtual ~ScXMLDPSourceTableContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -228,7 +228,7 @@ class ScXMLDPSourceQueryContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDPSourceQueryContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -236,7 +236,7 @@ public:
 
     virtual ~ScXMLDPSourceQueryContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -253,7 +253,7 @@ class ScXMLSourceServiceContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSourceServiceContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -261,7 +261,7 @@ public:
 
     virtual ~ScXMLSourceServiceContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -282,14 +282,14 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext
     
 public:
     ScXMLDataPilotGrandTotalContext( 
-        ScXMLImport& rImport, USHORT nPrefix, const ::rtl::OUString& rLName,
+        ScXMLImport& rImport, sal_uInt16 nPrefix, const ::rtl::OUString& rLName,
         const ::com::sun::star::uno::Reference< 
             ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
         ScXMLDataPilotTableContext* pTableContext );
 
     virtual ~ScXMLDataPilotGrandTotalContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -306,7 +306,7 @@ class ScXMLSourceCellRangeContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSourceCellRangeContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -314,7 +314,7 @@ public:
 
     virtual ~ScXMLSourceCellRangeContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -357,7 +357,7 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotFieldContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -365,7 +365,7 @@ public:
 
     virtual ~ScXMLDataPilotFieldContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -405,7 +405,7 @@ class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -423,7 +423,7 @@ class ScXMLDataPilotLevelContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotLevelContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -431,7 +431,7 @@ public:
 
     virtual ~ScXMLDataPilotLevelContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -448,7 +448,7 @@ class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -466,7 +466,7 @@ class ScXMLDataPilotSortInfoContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -484,7 +484,7 @@ class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -508,7 +508,7 @@ public:
 
     ScXMLDataPilotFieldContext* GetDataPilotField() { return pDataPilotField; }
 
-    ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -516,7 +516,7 @@ public:
 
     virtual ~ScXMLDataPilotSubTotalsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -535,7 +535,7 @@ class ScXMLDataPilotSubTotalContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -543,7 +543,7 @@ public:
 
     virtual ~ScXMLDataPilotSubTotalContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -560,7 +560,7 @@ class ScXMLDataPilotMembersContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotMembersContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -568,7 +568,7 @@ public:
 
     virtual ~ScXMLDataPilotMembersContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -591,7 +591,7 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotMemberContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -599,7 +599,7 @@ public:
 
     virtual ~ScXMLDataPilotMemberContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -616,7 +616,7 @@ class ScXMLDataPilotGroupsContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotGroupsContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -624,7 +624,7 @@ public:
 
     virtual ~ScXMLDataPilotGroupsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -644,7 +644,7 @@ class ScXMLDataPilotGroupContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotGroupContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -652,7 +652,7 @@ public:
 
     virtual ~ScXMLDataPilotGroupContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -673,7 +673,7 @@ class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -681,7 +681,7 @@ public:
 
     virtual ~ScXMLDataPilotGroupMemberContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 035a08927..9d989cf60 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -71,7 +71,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
@@ -86,7 +86,7 @@ ScXMLDatabaseRangesContext::~ScXMLDatabaseRangesContext()
     GetScImport().UnlockSolarMutex();
 }
 
-SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -115,7 +115,7 @@ void ScXMLDatabaseRangesContext::EndElement()
 }
 
 ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
@@ -153,7 +153,7 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -220,7 +220,7 @@ ScXMLDatabaseRangeContext::~ScXMLDatabaseRangeContext()
 {
 }
 
-SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -445,7 +445,7 @@ void ScXMLDatabaseRangeContext::EndElement()
 }
 
 ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -459,7 +459,7 @@ ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -489,7 +489,7 @@ ScXMLSourceSQLContext::~ScXMLSourceSQLContext()
 {
 }
 
-SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -518,7 +518,7 @@ void ScXMLSourceSQLContext::EndElement()
 }
 
 ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -532,7 +532,7 @@ ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -557,7 +557,7 @@ ScXMLSourceTableContext::~ScXMLSourceTableContext()
 {
 }
 
-SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -586,7 +586,7 @@ void ScXMLSourceTableContext::EndElement()
 }
 
 ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -600,7 +600,7 @@ ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -625,7 +625,7 @@ ScXMLSourceQueryContext::~ScXMLSourceQueryContext()
 {
 }
 
-SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -654,7 +654,7 @@ void ScXMLSourceQueryContext::EndElement()
 }
 
 ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -668,7 +668,7 @@ ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport,
     {
         rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         rtl::OUString sValue = xAttrList->getValueByIndex( i );
 
@@ -686,7 +686,7 @@ ScXMLConResContext::~ScXMLConResContext()
 {
 }
 
-SvXMLImportContext *ScXMLConResContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLConResContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -704,7 +704,7 @@ void ScXMLConResContext::EndElement()
 }
 
 ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -718,7 +718,7 @@ ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -747,7 +747,7 @@ ScXMLSubTotalRulesContext::~ScXMLSubTotalRulesContext()
 {
 }
 
-SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -782,7 +782,7 @@ void ScXMLSubTotalRulesContext::EndElement()
 }
 
 ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -797,7 +797,7 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -848,7 +848,7 @@ ScXMLSortGroupsContext::~ScXMLSortGroupsContext()
 {
 }
 
-SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -866,7 +866,7 @@ void ScXMLSortGroupsContext::EndElement()
 }
 
 ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -880,7 +880,7 @@ ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -899,7 +899,7 @@ ScXMLSubTotalRuleContext::~ScXMLSubTotalRuleContext()
 {
 }
 
-SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -930,7 +930,7 @@ void ScXMLSubTotalRuleContext::EndElement()
 }
 
 ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -944,7 +944,7 @@ ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -968,7 +968,7 @@ ScXMLSubTotalFieldContext::~ScXMLSubTotalFieldContext()
 {
 }
 
-SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index 703ea3160..8ef967585 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -47,14 +47,14 @@ class ScXMLDatabaseRangesContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDatabaseRangesContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLDatabaseRangesContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -111,14 +111,14 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDatabaseRangeContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDatabaseRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLDatabaseRangeContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -159,7 +159,7 @@ class ScXMLSourceSQLContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSourceSQLContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -167,7 +167,7 @@ public:
 
     virtual ~ScXMLSourceSQLContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -185,7 +185,7 @@ class ScXMLSourceTableContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSourceTableContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -193,7 +193,7 @@ public:
 
     virtual ~ScXMLSourceTableContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -211,7 +211,7 @@ class ScXMLSourceQueryContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSourceQueryContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -219,7 +219,7 @@ public:
 
     virtual ~ScXMLSourceQueryContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -236,7 +236,7 @@ class ScXMLConResContext : public SvXMLImportContext
 
 public:
 
-    ScXMLConResContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -244,7 +244,7 @@ public:
 
     virtual ~ScXMLConResContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -261,7 +261,7 @@ class ScXMLSubTotalRulesContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSubTotalRulesContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -269,7 +269,7 @@ public:
 
     virtual ~ScXMLSubTotalRulesContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -286,7 +286,7 @@ class ScXMLSortGroupsContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSortGroupsContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -294,7 +294,7 @@ public:
 
     virtual ~ScXMLSortGroupsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -312,7 +312,7 @@ class ScXMLSubTotalRuleContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSubTotalRuleContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -320,7 +320,7 @@ public:
 
     virtual ~ScXMLSubTotalRuleContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -343,7 +343,7 @@ class ScXMLSubTotalFieldContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSubTotalFieldContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -351,7 +351,7 @@ public:
 
     virtual ~ScXMLSubTotalFieldContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 6a247dd27..f13e8e6ab 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -914,7 +914,7 @@ void ScXMLExport::GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp )
             sal_uInt32 nCount(pOpList->Count());
             for( sal_uInt32 nIndex = 0; nIndex < nCount; ++nIndex )
             {
-                ScDetOpData* pDetData(pOpList->GetObject( static_cast<USHORT>(nIndex) ));
+                ScDetOpData* pDetData(pOpList->GetObject( static_cast<sal_uInt16>(nIndex) ));
                 if( pDetData )
                 {
                     const ScAddress& rDetPos = pDetData->GetPos();
@@ -1479,11 +1479,11 @@ void ScXMLExport::FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRow
     sal_Int32 nDepth(pFields->GetDepth());
     for(sal_Int32 i = 0; i < nDepth; ++i)
     {
-        sal_Int32 nFields = pFields->GetCount(static_cast<USHORT>(i));
+        sal_Int32 nFields = pFields->GetCount(static_cast<sal_uInt16>(i));
         for (sal_Int32 j = 0; j < nFields; ++j)
         {
             ScMyColumnRowGroup aGroup;
-            ScOutlineEntry* pEntry(pFields->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
+            ScOutlineEntry* pEntry(pFields->GetEntry(static_cast<sal_uInt16>(i), static_cast<sal_uInt16>(j)));
             aGroup.nField = pEntry->GetStart();
             aGroup.nLevel = static_cast<sal_Int16>(i);
             aGroup.bDisplay = !(pEntry->IsHidden());
@@ -1916,7 +1916,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
     exportDataStyles();
 
     aStylesExp.exportStyleFamily(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellStyles")),
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, FALSE, XML_STYLE_FAMILY_TABLE_CELL);
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)), xCellStylesExportPropertySetMapper, sal_False, XML_STYLE_FAMILY_TABLE_CELL);
 
     SvXMLExport::_ExportStyles(bUsed);
 }
@@ -3086,7 +3086,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
                         xShapeProps->getPropertyValue( sPersistName ) >>= aChartName;
                         ScRange aEmptyRange;
                         ScChartListener aSearcher( aChartName, pDoc, aEmptyRange );
-                        USHORT nIndex = 0;
+                        sal_uInt16 nIndex = 0;
                         ScChartListenerCollection* pCollection = pDoc->GetChartListenerCollection();
                         if ( pCollection && pCollection->Search( &aSearcher, nIndex ) )
                         {
@@ -3156,7 +3156,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
 //BM 					}
 //BM 					if(pChartListener)
 //BM 					{
-//BM 						USHORT nIndex(0);
+//BM 						sal_uInt16 nIndex(0);
 //BM 						pChartListener->SetString( sName );
 //BM 						if ( GetDocument() && GetDocument()->GetChartListenerCollection()->Search( pChartListener, nIndex ) )
 //BM 						{
@@ -3213,7 +3213,7 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell)
         awt::Point aPoint;
         Rectangle aRec = pDoc->GetMMRect(static_cast<SCCOL>(rMyCell.aCellAddress.Column), static_cast<SCROW>(rMyCell.aCellAddress.Row),
             static_cast<SCCOL>(rMyCell.aCellAddress.Column), static_cast<SCROW>(rMyCell.aCellAddress.Row), static_cast<SCTAB>(rMyCell.aCellAddress.Sheet));
-        BOOL bNegativePage(pDoc->IsNegativePage(rMyCell.aCellAddress.Sheet));
+        sal_Bool bNegativePage(pDoc->IsNegativePage(rMyCell.aCellAddress.Sheet));
         if (bNegativePage)
             aPoint.X = aRec.Right();
         else
@@ -4519,10 +4519,10 @@ sal_Bool SAL_CALL ScXMLExport::filter( const ::com::sun::star::uno::Sequence< ::
 {
     ScUnoGuard aGuard;
     if (pDoc)
-        pDoc->DisableIdle(TRUE);
+        pDoc->DisableIdle(sal_True);
     sal_Bool bReturn(SvXMLExport::filter(aDescriptor));
     if (pDoc)
-        pDoc->DisableIdle(FALSE);
+        pDoc->DisableIdle(sal_False);
     return bReturn;
 }
 
@@ -4531,7 +4531,7 @@ void SAL_CALL ScXMLExport::cancel()
 {
     ScUnoGuard aGuard;
     if (pDoc)
-        pDoc->DisableIdle(FALSE);
+        pDoc->DisableIdle(sal_False);
     SvXMLExport::cancel();
 }
 
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx
index e91f02185..b89e2f4d8 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -55,7 +55,7 @@ using ::com::sun::star::xml::sax::XAttributeList;
 // ============================================================================
 
 ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext(
-    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName,
+    ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName,
     const Reference<XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) :
     SvXMLImportContext( rImport, nPrefix, rLName ),
     mrScImport(rImport),
@@ -92,7 +92,7 @@ ScXMLExternalRefTabSourceContext::~ScXMLExternalRefTabSourceContext()
 }
 
 SvXMLImportContext* ScXMLExternalRefTabSourceContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& /*xAttrList*/ )
+    sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& /*xAttrList*/ )
 {
     return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
 }
@@ -138,7 +138,7 @@ void ScXMLExternalRefTabSourceContext::EndElement()
 // ============================================================================
 
 ScXMLExternalRefRowsContext::ScXMLExternalRefRowsContext(
-    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName,
+    ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName,
     const Reference<XAttributeList>& /* xAttrList */, ScXMLExternalTabData& rRefInfo ) :
     SvXMLImportContext( rImport, nPrefix, rLName ),
     mrScImport(rImport),
@@ -151,7 +151,7 @@ ScXMLExternalRefRowsContext::~ScXMLExternalRefRowsContext()
 }
 
 SvXMLImportContext* ScXMLExternalRefRowsContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList )
+    sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList )
 {
     // #i101319# row elements inside group, rows or header-rows
     // are treated like row elements directly in the table element
@@ -181,7 +181,7 @@ void ScXMLExternalRefRowsContext::EndElement()
 // ============================================================================
 
 ScXMLExternalRefRowContext::ScXMLExternalRefRowContext(
-    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName,
+    ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName,
     const Reference<XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) :
     SvXMLImportContext( rImport, nPrefix, rLName ),
     mrScImport(rImport),
@@ -215,7 +215,7 @@ ScXMLExternalRefRowContext::~ScXMLExternalRefRowContext()
 }
 
 SvXMLImportContext* ScXMLExternalRefRowContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList )
+    sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList )
 {
     const SvXMLTokenMap& rTokenMap = mrScImport.GetTableRowElemTokenMap();
     sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName);
@@ -258,7 +258,7 @@ void ScXMLExternalRefRowContext::EndElement()
 // ============================================================================
 
 ScXMLExternalRefCellContext::ScXMLExternalRefCellContext(
-    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName,
+    ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName,
     const Reference<XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) :
     SvXMLImportContext( rImport, nPrefix, rLName ),
     mrScImport(rImport),
@@ -365,7 +365,7 @@ ScXMLExternalRefCellContext::~ScXMLExternalRefCellContext()
 }
 
 SvXMLImportContext* ScXMLExternalRefCellContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList )
+    sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList )
 {
     const SvXMLTokenMap& rTokenMap = mrScImport.GetTableRowCellElemTokenMap();
     sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName);
@@ -407,7 +407,7 @@ void ScXMLExternalRefCellContext::SetCellString(const OUString& rStr)
 // ============================================================================
 
 ScXMLExternalRefCellTextContext::ScXMLExternalRefCellTextContext(
-    ScXMLImport& rImport, USHORT nPrefix, const OUString& rLName,
+    ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName,
     const Reference<XAttributeList>& /*xAttrList*/,
     ScXMLExternalRefCellContext& rParent ) :
     SvXMLImportContext( rImport, nPrefix, rLName ),
@@ -421,7 +421,7 @@ ScXMLExternalRefCellTextContext::~ScXMLExternalRefCellTextContext()
 }
 
 SvXMLImportContext* ScXMLExternalRefCellTextContext::CreateChildContext(
-    USHORT nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& /*xAttrList*/ )
+    sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& /*xAttrList*/ )
 {
     return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
 }
diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx
index 6e17c1d92..baebc7de1 100644
--- a/sc/source/filter/xml/xmlexternaltabi.hxx
+++ b/sc/source/filter/xml/xmlexternaltabi.hxx
@@ -37,7 +37,7 @@ struct ScXMLExternalTabData;
 class ScXMLExternalRefTabSourceContext : public SvXMLImportContext
 {
 public:
-    ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, USHORT nPrefix,
+    ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_uInt16 nPrefix,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -45,7 +45,7 @@ public:
 
     virtual ~ScXMLExternalRefTabSourceContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -66,7 +66,7 @@ private:
 class ScXMLExternalRefRowsContext : public SvXMLImportContext
 {
 public:
-    ScXMLExternalRefRowsContext( ScXMLImport& rImport, USHORT nPrefix,
+    ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_uInt16 nPrefix,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -74,7 +74,7 @@ public:
 
     virtual ~ScXMLExternalRefRowsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -90,7 +90,7 @@ private:
 class ScXMLExternalRefRowContext : public SvXMLImportContext
 {
 public:
-    ScXMLExternalRefRowContext( ScXMLImport& rImport, USHORT nPrefix,
+    ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_uInt16 nPrefix,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -98,7 +98,7 @@ public:
 
     virtual ~ScXMLExternalRefRowContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -115,7 +115,7 @@ private:
 class ScXMLExternalRefCellContext : public SvXMLImportContext
 {
 public:
-    ScXMLExternalRefCellContext( ScXMLImport& rImport, USHORT nPrefix,
+    ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_uInt16 nPrefix,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -123,7 +123,7 @@ public:
 
     virtual ~ScXMLExternalRefCellContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -149,7 +149,7 @@ private:
 class ScXMLExternalRefCellTextContext : public SvXMLImportContext
 {
 public:
-    ScXMLExternalRefCellTextContext( ScXMLImport& rImport, USHORT nPrefix,
+    ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_uInt16 nPrefix,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -157,7 +157,7 @@ public:
 
     virtual ~ScXMLExternalRefCellTextContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index a58d9c96a..473465799 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -48,7 +48,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -71,7 +71,7 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -113,7 +113,7 @@ ScXMLFilterContext::~ScXMLFilterContext()
 {
 }
 
-SvXMLImportContext *ScXMLFilterContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -167,7 +167,7 @@ void ScXMLFilterContext::EndElement()
 }
 
 ScXMLAndContext::ScXMLAndContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
@@ -182,7 +182,7 @@ ScXMLAndContext::~ScXMLAndContext()
 {
 }
 
-SvXMLImportContext *ScXMLAndContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLAndContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -217,7 +217,7 @@ void ScXMLAndContext::EndElement()
 }
 
 ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
@@ -232,7 +232,7 @@ ScXMLOrContext::~ScXMLOrContext()
 {
 }
 
-SvXMLImportContext *ScXMLOrContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLOrContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -268,7 +268,7 @@ void ScXMLOrContext::EndElement()
 }
 
 ScXMLConditionContext::ScXMLConditionContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -285,7 +285,7 @@ ScXMLConditionContext::ScXMLConditionContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -324,7 +324,7 @@ ScXMLConditionContext::~ScXMLConditionContext()
 {
 }
 
-SvXMLImportContext *ScXMLConditionContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -411,7 +411,7 @@ void ScXMLConditionContext::EndElement()
 //==========================================================================
 
 ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -435,7 +435,7 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -477,7 +477,7 @@ ScXMLDPFilterContext::~ScXMLDPFilterContext()
 {
 }
 
-SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -543,7 +543,7 @@ void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField)
 }
 
 ScXMLDPAndContext::ScXMLDPAndContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
@@ -558,7 +558,7 @@ ScXMLDPAndContext::~ScXMLDPAndContext()
 {
 }
 
-SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -593,7 +593,7 @@ void ScXMLDPAndContext::EndElement()
 }
 
 ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
@@ -608,7 +608,7 @@ ScXMLDPOrContext::~ScXMLDPOrContext()
 {
 }
 
-SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -644,7 +644,7 @@ void ScXMLDPOrContext::EndElement()
 }
 
 ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -661,7 +661,7 @@ ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -700,7 +700,7 @@ ScXMLDPConditionContext::~ScXMLDPConditionContext()
 {
 }
 
-SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index b9626675a..72f7e41db 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -65,7 +65,7 @@ class ScXMLFilterContext : public SvXMLImportContext
 
 public:
 
-    ScXMLFilterContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -73,7 +73,7 @@ public:
 
     virtual ~ScXMLFilterContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -100,7 +100,7 @@ class ScXMLAndContext : public SvXMLImportContext
 
 public:
 
-    ScXMLAndContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -108,7 +108,7 @@ public:
 
     virtual ~ScXMLAndContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -125,7 +125,7 @@ class ScXMLOrContext : public SvXMLImportContext
 
 public:
 
-    ScXMLOrContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -133,7 +133,7 @@ public:
 
     virtual ~ScXMLOrContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -156,7 +156,7 @@ class ScXMLConditionContext : public SvXMLImportContext
 
 public:
 
-    ScXMLConditionContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -164,7 +164,7 @@ public:
 
     virtual ~ScXMLConditionContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -199,7 +199,7 @@ class ScXMLDPFilterContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDPFilterContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -207,7 +207,7 @@ public:
 
     virtual ~ScXMLDPFilterContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -233,7 +233,7 @@ class ScXMLDPAndContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDPAndContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -241,7 +241,7 @@ public:
 
     virtual ~ScXMLDPAndContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -258,7 +258,7 @@ class ScXMLDPOrContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDPOrContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -266,7 +266,7 @@ public:
 
     virtual ~ScXMLDPOrContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -289,7 +289,7 @@ class ScXMLDPConditionContext : public SvXMLImportContext
 
 public:
 
-    ScXMLDPConditionContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -297,7 +297,7 @@ public:
 
     virtual ~ScXMLDPConditionContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index ba146bace..f212fa2fa 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -262,17 +262,17 @@ protected:
 public:
 
     ScXMLDocContext_Impl( ScXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference<xml::sax::XAttributeList>& xAttrList );
     virtual ~ScXMLDocContext_Impl();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
         const rtl::OUString& rLocalName,
         const uno::Reference<xml::sax::XAttributeList>& xAttrList );
 };
 
-ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, USHORT nPrfx,
+ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx,
                                            const OUString& rLName,
                                            const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */ ) :
 SvXMLImportContext( rImport, nPrfx, rLName )
@@ -290,7 +290,7 @@ class ScXMLFlatDocContext_Impl
 {
 public:
     ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport,
-        USHORT i_nPrefix, const OUString & i_rLName,
+        sal_uInt16 i_nPrefix, const OUString & i_rLName,
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList,
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
         const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder);
@@ -298,12 +298,12 @@ public:
     virtual ~ScXMLFlatDocContext_Impl();
 
     virtual SvXMLImportContext *CreateChildContext(
-        USHORT i_nPrefix, const OUString& i_rLocalName,
+        sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList);
 };
 
 ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport,
-                                                   USHORT i_nPrefix, const OUString & i_rLName,
+                                                   sal_uInt16 i_nPrefix, const OUString & i_rLName,
                                                    const uno::Reference<xml::sax::XAttributeList>& i_xAttrList,
                                                    const uno::Reference<document::XDocumentProperties>& i_xDocProps,
                                                    const uno::Reference<xml::sax::XDocumentHandler>& i_xDocBuilder) :
@@ -318,7 +318,7 @@ ScXMLFlatDocContext_Impl::~ScXMLFlatDocContext_Impl() { }
 
 
 SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext(
-    USHORT i_nPrefix, const OUString& i_rLocalName,
+    sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
 {
     // behave like meta base class iff we encounter office:meta
@@ -369,7 +369,7 @@ SvXMLImportContext *ScXMLBodyContext_Impl::CreateChildContext(
     return GetScImport().CreateBodyContext( rLocalName, xAttrList );
 }
 
-SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix,
                                                              const rtl::OUString& rLocalName,
                                                              const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
@@ -1599,7 +1599,7 @@ const SvXMLTokenMap& ScXMLImport::GetConsolidationAttrTokenMap()
 }
 
 
-SvXMLImportContext *ScXMLImport::CreateContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix,
                                                const OUString& rLocalName,
                                                const uno::Reference<xml::sax::XAttributeList>& xAttrList )
 {
@@ -1864,7 +1864,7 @@ ScXMLImport::~ScXMLImport() throw()
 
 // ---------------------------------------------------------------------
 
-SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
                                                         const uno::Reference<xml::sax::XAttributeList>& xAttrList)
 {
     SvXMLImportContext *pContext = NULL;
@@ -2067,7 +2067,7 @@ void ScXMLImport::ExamineDefaultStyle()
                     aDecSep = aLocaleData.getNumDecimalSep();
                 }
 
-                BYTE nScript = pDoc->GetStringScriptType( aDecSep );
+                sal_uInt8 nScript = pDoc->GetStringScriptType( aDecSep );
                 if ( nScript == 0 || nScript == SCRIPTTYPE_LATIN )
                     bLatinDefaultStyle = sal_True;
             }
@@ -2848,7 +2848,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
             SCTAB nTabCount = pDoc->GetTableCount();
             for (SCTAB nTab=0; nTab<nTabCount; ++nTab)
                 if (!pSheetData->IsSheetBlocked( nTab ))
-                    pDoc->SetStreamValid( nTab, TRUE );
+                    pDoc->SetStreamValid( nTab, sal_True );
         }
 
         aTables.UpdateRowHeights();
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index a09b877e3..b2f0057a2 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -785,7 +785,7 @@ protected:
 
     // This method is called after the namespace map has been updated, but
     // before a context for the current element has been pushed.
-    virtual SvXMLImportContext *CreateContext(USHORT nPrefix,
+    virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix,
                                       const ::rtl::OUString& rLocalName,
                                       const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -804,7 +804,7 @@ public:
     //     the root element (i.e. office:document-meta)
     SvXMLImportContext *CreateMetaContext(
                                     const ::rtl::OUString& rLocalName );
-    SvXMLImportContext *CreateFontDeclsContext(const USHORT nPrefix, const ::rtl::OUString& rLocalName,
+    SvXMLImportContext *CreateFontDeclsContext(const sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
                                      const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList);
     SvXMLImportContext *CreateScriptContext(
                                     const ::rtl::OUString& rLocalName );
@@ -834,7 +834,7 @@ public:
 //	SvI18NMap& GetI18NMap() { return *pI18NMap; }
 
 //	inline const SvXMLImportItemMapper& GetParaItemMapper() const;
-//	SvXMLImportContext *CreateParaItemImportContext( USHORT nPrefix,
+//	SvXMLImportContext *CreateParaItemImportContext( sal_uInt16 nPrefix,
 //								  const ::rtl::OUString& rLocalName,
 //								  const ::com::sun::star::uno::Reference<
 //									::com::sun::star::xml::sax::XAttributeList& xAttrList,
@@ -1031,7 +1031,7 @@ public:
             The value of the processed formula attribute.
 
         @param bRestrictToExternalNmsp
-            If set to TRUE, only namespaces of external formula grammars will
+            If set to sal_True, only namespaces of external formula grammars will
             be recognized. Internal namespace prefixes (e.g. 'oooc:' or 'of:'
             will be considered to be part of the formula, e.g. an expression
             with range operator.
diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx
index 1bdc12bbb..688894b4a 100644
--- a/sc/source/filter/xml/xmllabri.cxx
+++ b/sc/source/filter/xml/xmllabri.cxx
@@ -44,7 +44,7 @@ using namespace xmloff::token;
 
 ScXMLLabelRangesContext::ScXMLLabelRangesContext(
         ScXMLImport& rImport,
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& /* xAttrList */ ):
     SvXMLImportContext( rImport, nPrefix, rLName )
@@ -58,7 +58,7 @@ ScXMLLabelRangesContext::~ScXMLLabelRangesContext()
 }
 
 SvXMLImportContext* ScXMLLabelRangesContext::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& xAttrList )
 {
@@ -86,7 +86,7 @@ void ScXMLLabelRangesContext::EndElement()
 
 ScXMLLabelRangeContext::ScXMLLabelRangeContext(
         ScXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -100,7 +100,7 @@ ScXMLLabelRangeContext::ScXMLLabelRangeContext(
         const rtl::OUString& sAttrName	(xAttrList->getNameByIndex( nIndex ));
         const rtl::OUString& sValue		(xAttrList->getValueByIndex( nIndex ));
         OUString	aLocalName;
-        USHORT		nPrefix		(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ));
+        sal_uInt16		nPrefix		(GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ));
 
         switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
         {
@@ -122,7 +122,7 @@ ScXMLLabelRangeContext::~ScXMLLabelRangeContext()
 }
 
 SvXMLImportContext* ScXMLLabelRangeContext::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& /* xAttrList */ )
 {
diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx
index 7cb40b8ef..2f52d3c8d 100644
--- a/sc/source/filter/xml/xmllabri.hxx
+++ b/sc/source/filter/xml/xmllabri.hxx
@@ -43,14 +43,14 @@ private:
 public:
                                 ScXMLLabelRangesContext(
                                     ScXMLImport& rImport,
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
                                     );
     virtual						~ScXMLLabelRangesContext();
 
     virtual SvXMLImportContext*	CreateChildContext(
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
                                     );
@@ -73,14 +73,14 @@ private:
 public:
                                 ScXMLLabelRangeContext(
                                     ScXMLImport& rImport,
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
                                     );
     virtual						~ScXMLLabelRangeContext();
 
     virtual SvXMLImportContext*	CreateChildContext(
-                                    USHORT nPrefix,
+                                    sal_uInt16 nPrefix,
                                     const ::rtl::OUString& rLocalName,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
                                     );
diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx
index 09db7dc4f..c9bded267 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star;
 //------------------------------------------------------------------
 
 ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
@@ -60,7 +60,7 @@ ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( ScXMLImport& rImport
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName );
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -78,7 +78,7 @@ ScXMLNamedExpressionsContext::~ScXMLNamedExpressionsContext()
     GetScImport().UnlockSolarMutex();
 }
 
-SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -115,7 +115,7 @@ void ScXMLNamedExpressionsContext::EndElement()
 }
 
 ScXMLNamedRangeContext::ScXMLNamedRangeContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
@@ -133,7 +133,7 @@ ScXMLNamedRangeContext::ScXMLNamedRangeContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -169,7 +169,7 @@ ScXMLNamedRangeContext::~ScXMLNamedRangeContext()
 {
 }
 
-SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
@@ -186,7 +186,7 @@ void ScXMLNamedRangeContext::EndElement()
 }
 
 ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
@@ -199,7 +199,7 @@ ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -232,7 +232,7 @@ ScXMLNamedExpressionContext::~ScXMLNamedExpressionContext()
 {
 }
 
-SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx
index bf112f24f..9da37352d 100644
--- a/sc/source/filter/xml/xmlnexpi.hxx
+++ b/sc/source/filter/xml/xmlnexpi.hxx
@@ -39,14 +39,14 @@ class ScXMLNamedExpressionsContext : public SvXMLImportContext
 
 public:
 
-    ScXMLNamedExpressionsContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLNamedExpressionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLNamedExpressionsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -61,14 +61,14 @@ class ScXMLNamedRangeContext : public SvXMLImportContext
 
 public:
 
-    ScXMLNamedRangeContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLNamedRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLNamedRangeContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -83,14 +83,14 @@ class ScXMLNamedExpressionContext : public SvXMLImportContext
 
 public:
 
-    ScXMLNamedExpressionContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLNamedExpressionContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList);
 
     virtual ~ScXMLNamedExpressionContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index d99e9f6e0..7856b45ac 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -64,7 +64,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) :
@@ -121,7 +121,7 @@ ScXMLTableRowContext::~ScXMLTableRowContext()
 {
 }
 
-SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -171,6 +171,7 @@ void ScXMLTableRowContext::EndElement()
     sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet();
     sal_Int32 nCurrentRow(rXMLImport.GetTables().GetCurrentRow());
     uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet());
+    ScDocument* pDoc = rXMLImport.GetDocument();
     if(xSheet.is())
     {
         sal_Int32 nFirstRow(nCurrentRow - nRepeatedRows + 1);
@@ -218,10 +219,18 @@ void ScXMLTableRowContext::EndElement()
                         bVisible = sal_False;
                         bFiltered = sal_True;
                     }
-                    if (!bVisible)
-                        xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible));
-                    if (bFiltered)
-                        xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered));
+
+                    // #i116164# call SetRowHidden/SetRowFiltered directly, so the tree doesn't have to be rebuilt
+                    // to compare with existing hidden flags.
+                    if (!bVisible && pDoc)
+                        pDoc->SetRowHidden((SCROW)nFirstRow, (SCROW)nCurrentRow, (SCTAB)nSheet, true);
+                    if (bFiltered && pDoc)
+                        pDoc->SetRowFiltered((SCROW)nFirstRow, (SCROW)nCurrentRow, (SCTAB)nSheet, true);
+
+                    //if (!bVisible)
+                    //    xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible));
+                    //if (bFiltered)
+                    //    xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered));
                 }
             }
         }
@@ -229,7 +238,7 @@ void ScXMLTableRowContext::EndElement()
 }
 
 ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -272,7 +281,7 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext()
 {
 }
 
-SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx
index efa8f7e4d..b0b0a47ab 100644
--- a/sc/source/filter/xml/xmlrowi.hxx
+++ b/sc/source/filter/xml/xmlrowi.hxx
@@ -44,14 +44,14 @@ class ScXMLTableRowContext : public SvXMLImportContext
 
 public:
 
-    ScXMLTableRowContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                        const ::rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     virtual ~ScXMLTableRowContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -74,7 +74,7 @@ class ScXMLTableRowsContext : public SvXMLImportContext
 
 public:
 
-    ScXMLTableRowsContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                        const ::rtl::OUString& rLName,
                        const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -82,7 +82,7 @@ public:
 
     virtual ~ScXMLTableRowsContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx
index 0670667e5..47b265514 100644
--- a/sc/source/filter/xml/xmlsceni.cxx
+++ b/sc/source/filter/xml/xmlsceni.cxx
@@ -53,7 +53,7 @@ using ::rtl::OUString;
 
 ScXMLTableScenarioContext::ScXMLTableScenarioContext(
         ScXMLImport& rImport,
-        USHORT nPrfx,
+        sal_uInt16 nPrfx,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& xAttrList ):
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -72,7 +72,7 @@ ScXMLTableScenarioContext::ScXMLTableScenarioContext(
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -134,7 +134,7 @@ ScXMLTableScenarioContext::~ScXMLTableScenarioContext()
 }
 
 SvXMLImportContext *ScXMLTableScenarioContext::CreateChildContext(
-        USHORT nPrefix,
+        sal_uInt16 nPrefix,
         const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList >& /* xAttrList */ )
 {
@@ -147,8 +147,8 @@ void ScXMLTableScenarioContext::EndElement()
     ScDocument*	pDoc(GetScImport().GetDocument());
     if (pDoc)
     {
-        pDoc->SetScenario( nCurrTable, TRUE );
-        USHORT nFlags( 0 );
+        pDoc->SetScenario( nCurrTable, sal_True );
+        sal_uInt16 nFlags( 0 );
         if( bDisplayBorder )
             nFlags |= SC_SCENARIO_SHOWFRAME;
         if( bCopyBack )
diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx
index 39a045f7b..a3a3e92fc 100644
--- a/sc/source/filter/xml/xmlsceni.hxx
+++ b/sc/source/filter/xml/xmlsceni.hxx
@@ -52,14 +52,14 @@ private:
 
 public:
 
-    ScXMLTableScenarioContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableScenarioContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
     virtual ~ScXMLTableScenarioContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index c998202c0..ceb71b76c 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -53,7 +53,7 @@ using namespace xmloff::token;
 //------------------------------------------------------------------
 
 ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -75,7 +75,7 @@ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -119,7 +119,7 @@ ScXMLSortContext::~ScXMLSortContext()
 {
 }
 
-SvXMLImportContext *ScXMLSortContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSortContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -219,7 +219,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl
 }
 
 ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -235,7 +235,7 @@ ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport,
     {
         const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
         rtl::OUString aLocalName;
-        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+        sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                             sAttrName, &aLocalName ));
         const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -264,7 +264,7 @@ ScXMLSortByContext::~ScXMLSortByContext()
 {
 }
 
-SvXMLImportContext *ScXMLSortByContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLSortByContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx
index 6d69ccb2a..147fc671c 100644
--- a/sc/source/filter/xml/xmlsorti.hxx
+++ b/sc/source/filter/xml/xmlsorti.hxx
@@ -56,7 +56,7 @@ class ScXMLSortContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSortContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -64,7 +64,7 @@ public:
 
     virtual ~ScXMLSortContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -87,7 +87,7 @@ class ScXMLSortByContext : public SvXMLImportContext
 
 public:
 
-    ScXMLSortByContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -95,7 +95,7 @@ public:
 
     virtual ~ScXMLSortByContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index bde6633dc..c42fda593 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -606,9 +606,9 @@ void ScMyTables::UpdateRowHeights()
             {
                 const SdrPage* pPage = pDrawLayer ? pDrawLayer->GetPage(nTab) : NULL;
                 if ( nTab == nVisible || ( pPage && pPage->GetObjCount() != 0 ) )
-                    aUpdateSheets.SelectTable( nTab, TRUE );
+                    aUpdateSheets.SelectTable( nTab, sal_True );
                 else
-                    pDoc->SetPendingRowHeights( nTab, TRUE );
+                    pDoc->SetPendingRowHeights( nTab, sal_True );
             }
 
             if (aUpdateSheets.GetSelectCount())
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index aa3f3430d..a24a60dfe 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -144,7 +144,7 @@ ScXMLExternalTabData::ScXMLExternalTabData() :
 //------------------------------------------------------------------
 
 ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
-                                      USHORT nPrfx,
+                                      sal_uInt16 nPrfx,
                                       const ::rtl::OUString& rLName,
                                       const ::com::sun::star::uno::Reference<
                                       ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -171,7 +171,7 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
         {
             const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
             rtl::OUString aLocalName;
-            USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
+            sal_uInt16 nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
                                                 sAttrName, &aLocalName ));
             const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
 
@@ -232,7 +232,7 @@ ScXMLTableContext::~ScXMLTableContext()
 {
 }
 
-SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
                                             const ::rtl::OUString& rLName,
                                             const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -372,24 +372,24 @@ void ScXMLTableContext::EndElement()
             sal_Int32 i;
             for (i = 0; i < nDepth; ++i)
             {
-                sal_Int32 nCount(pColArray->GetCount(static_cast<USHORT>(i)));
+                sal_Int32 nCount(pColArray->GetCount(static_cast<sal_uInt16>(i)));
                 for (sal_Int32 j = 0; j < nCount; ++j)
                 {
-                    ScOutlineEntry* pEntry(pColArray->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
+                    ScOutlineEntry* pEntry(pColArray->GetEntry(static_cast<sal_uInt16>(i), static_cast<sal_uInt16>(j)));
                     if (pEntry->IsHidden())
-                        pColArray->SetVisibleBelow(static_cast<USHORT>(i), static_cast<USHORT>(j), sal_False);
+                        pColArray->SetVisibleBelow(static_cast<sal_uInt16>(i), static_cast<sal_uInt16>(j), sal_False);
                 }
             }
             ScOutlineArray* pRowArray(pOutlineTable->GetRowArray());
             nDepth = pRowArray->GetDepth();
             for (i = 0; i < nDepth; ++i)
             {
-                sal_Int32 nCount(pRowArray->GetCount(static_cast<USHORT>(i)));
+                sal_Int32 nCount(pRowArray->GetCount(static_cast<sal_uInt16>(i)));
                 for (sal_Int32 j = 0; j < nCount; ++j)
                 {
-                    ScOutlineEntry* pEntry(pRowArray->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
+                    ScOutlineEntry* pEntry(pRowArray->GetEntry(static_cast<sal_uInt16>(i), static_cast<sal_uInt16>(j)));
                     if (pEntry->IsHidden())
-                        pRowArray->SetVisibleBelow(static_cast<USHORT>(i), static_cast<USHORT>(j), sal_False);
+                        pRowArray->SetVisibleBelow(static_cast<sal_uInt16>(i), static_cast<sal_uInt16>(j), sal_False);
                 }
             }
         }
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index 8dd3b3efe..110525371 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -58,7 +58,7 @@ class ScXMLTableContext : public SvXMLImportContext
 
 public:
 
-    ScXMLTableContext( ScXMLImport& rImport, USHORT nPrfx,
+    ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
                         const ::rtl::OUString& rLName,
                         const ::com::sun::star::uno::Reference<
                                         ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -67,7 +67,7 @@ public:
 
     virtual ~ScXMLTableContext();
 
-    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
+    virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                      const ::rtl::OUString& rLocalName,
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 3695e4156..479b855a8 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -800,7 +800,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
                 SCTAB nTabCount = rDoc.GetTableCount();
                 for (SCTAB nTab=0; nTab<nTabCount; nTab++)
                     if (rDoc.IsStreamValid(nTab))
-                        rDoc.SetStreamValid(nTab, FALSE);
+                        rDoc.SetStreamValid(nTab, sal_False);
             }
         }
         else
@@ -942,7 +942,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
 
         if( xStorage.is() )
         {
-            pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_WRITE, FALSE );
+            pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_WRITE, sal_False );
             xGrfContainer = pGraphicHelper;
         }
 
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index bb7b0eac0..0e1c208a7 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -179,7 +179,7 @@ Rectangle ScAccessibleCell::GetBoundingBox(void) const
         mpViewShell->GetViewData()->GetMergeSizePixel(
             maCellAddress.Col(), maCellAddress.Row(), nSizeX, nSizeY);
         aCellRect.SetSize(Size(nSizeX, nSizeY));
-        aCellRect.SetPos(mpViewShell->GetViewData()->GetScrPos(maCellAddress.Col(), maCellAddress.Row(), meSplitPos, TRUE));
+        aCellRect.SetPos(mpViewShell->GetViewData()->GetScrPos(maCellAddress.Col(), maCellAddress.Row(), meSplitPos, sal_True));
 
         Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos);
         if (pWindow)
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 666d88f6b..02ac960df 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -278,7 +278,7 @@ sal_Bool SAL_CALL
         {
             ScDocShell* pDocShell = (ScDocShell*) mpDoc->GetDocumentShell();
             ScDocFunc aFunc(*pDocShell);
-            bResult = aFunc.PutCell( maCellAddress, new ScValueCell(fValue), TRUE );
+            bResult = aFunc.PutCell( maCellAddress, new ScValueCell(fValue), sal_True );
         }
     }
     return bResult;
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 85c44fe3a..711e62e55 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -362,7 +362,7 @@ void ScChildrenShapes::SetDrawBroadcaster()
         SfxBroadcaster* pDrawBC = mpViewShell->GetViewData()->GetDocument()->GetDrawBroadcaster();
         if (pDrawBC)
         {
-            StartListening(*pDrawBC, TRUE);
+            StartListening(*pDrawBC, sal_True);
 
             maShapeTreeInfo.SetModelBroadcaster( new ScDrawModelBroadcaster(mpViewShell->GetViewData()->GetDocument()->GetDrawLayer()) );
             maShapeTreeInfo.SetSdrView(mpViewShell->GetViewData()->GetScDrawView());
@@ -1246,7 +1246,7 @@ ScAccessibleDocument::ScAccessibleDocument(
         if( pWin )
         {
             pWin->AddChildEventListener( LINK( this, ScAccessibleDocument, WindowChildEventListener ));
-            USHORT nCount =   pWin->GetChildCount();
+            sal_uInt16 nCount =   pWin->GetChildCount();
             for( sal_uInt16 i=0; i < nCount; ++i )
             {
                 Window *pChildWin = pWin->GetChild( i );
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 60a0b46a7..085811c00 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -772,7 +772,7 @@ void ScShapeChilds::SetDrawBroadcaster()
     {
         SfxBroadcaster* pDrawBC = mpViewShell->GetDocument()->GetDrawBroadcaster();
         if (pDrawBC)
-            StartListening(*pDrawBC, TRUE);
+            StartListening(*pDrawBC, sal_True);
     }
 }
 
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 65d87a044..dcb5f13ca 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -104,7 +104,7 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint&
     if (rHint.ISA( SfxSimpleHint ))
     {
         const SfxSimpleHint& rRef = (const SfxSimpleHint&)rHint;
-        ULONG nId = rRef.GetId();
+        sal_uLong nId = rRef.GetId();
         if (nId == SC_HINT_ACC_VISAREACHANGED)
         {
             if (mpTextHelper)
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 98c7e5a0d..822fbfa7e 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -102,7 +102,7 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
     if (rHint.ISA( SfxSimpleHint ))
     {
         const SfxSimpleHint& rRef = (const SfxSimpleHint&)rHint;
-        ULONG nId = rRef.GetId();
+        sal_uLong nId = rRef.GetId();
         if ( nId == SFX_HINT_DATACHANGED )
         {
             //	column / row layout may change with any document change,
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 50e248466..d36925c37 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -66,7 +66,7 @@ public:
                         ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell);
     virtual				~ScViewForwarder();
 
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
     virtual Point		PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -86,7 +86,7 @@ ScViewForwarder::~ScViewForwarder()
 {
 }
 
-BOOL ScViewForwarder::IsValid() const
+sal_Bool ScViewForwarder::IsValid() const
 {
     return mpViewShell != NULL;
 }
@@ -170,7 +170,7 @@ public:
                         // <--
     virtual				~ScEditObjectViewForwarder();
 
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
     virtual Point		PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -192,7 +192,7 @@ ScEditObjectViewForwarder::~ScEditObjectViewForwarder()
 {
 }
 
-BOOL ScEditObjectViewForwarder::IsValid() const
+sal_Bool ScEditObjectViewForwarder::IsValid() const
 {
     return (mpWindow != NULL);
 }
@@ -275,7 +275,7 @@ public:
                         ScPreviewViewForwarder(ScPreviewShell* pViewShell);
     virtual				~ScPreviewViewForwarder();
 
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
     virtual Point		PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -300,7 +300,7 @@ ScPreviewViewForwarder::~ScPreviewViewForwarder()
     delete mpTableInfo;
 }
 
-BOOL ScPreviewViewForwarder::IsValid() const
+sal_Bool ScPreviewViewForwarder::IsValid() const
 {
     return mpViewShell != NULL;
 }
@@ -588,7 +588,7 @@ public:
                         ScEditViewForwarder(EditView* pEditView, Window* pWin);
     virtual				~ScEditViewForwarder();
 
-    virtual BOOL		IsValid() const;
+    virtual sal_Bool		IsValid() const;
     virtual Rectangle	GetVisArea() const;
     virtual Point		LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
     virtual Point		PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -614,7 +614,7 @@ ScEditViewForwarder::~ScEditViewForwarder()
 {
 }
 
-BOOL ScEditViewForwarder::IsValid() const
+sal_Bool ScEditViewForwarder::IsValid() const
 {
     sal_Bool bResult(sal_False);
     if (mpWindow && mpEditView)
@@ -777,7 +777,7 @@ void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             mpViewShell = NULL;						// invalid now
@@ -1092,7 +1092,7 @@ void ScAccessibleEditObjectTextData::Notify( SfxBroadcaster& rBC, const SfxHint&
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             mpWindow = NULL;
@@ -1243,12 +1243,12 @@ SvxTextForwarder* ScAccessibleEditLineTextData::GetTextForwarder()
             {
                 SfxItemPool* pEnginePool = EditEngine::CreatePool();
                 pEnginePool->FreezeIdRanges();
-                mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
+                mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, sal_True );
                 mbEditEngineCreated = sal_True;
-                //	currently, GetPortions doesn't work if UpdateMode is FALSE,
+                //	currently, GetPortions doesn't work if UpdateMode is sal_False,
                 //	this will be fixed (in EditEngine) by src600
-        //		pEditEngine->SetUpdateMode( FALSE );
-                mpEditEngine->EnableUndo( FALSE );
+        //		pEditEngine->SetUpdateMode( sal_False );
+                mpEditEngine->EnableUndo( sal_False );
                 mpEditEngine->SetRefMapMode( MAP_100TH_MM );
                 mpForwarder = new SvxEditEngineForwarder(*mpEditEngine);
 
@@ -1363,7 +1363,7 @@ void ScAccessiblePreviewCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             mpViewShell = NULL;						// invalid now
@@ -1456,7 +1456,7 @@ void ScAccessiblePreviewHeaderCellTextData::Notify( SfxBroadcaster& rBC, const S
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             mpViewShell = NULL;						// invalid now
@@ -1485,12 +1485,12 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
         {
             SfxItemPool* pEnginePool = EditEngine::CreatePool();
             pEnginePool->FreezeIdRanges();
-            pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
+            pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, sal_True );
         }
-        //	currently, GetPortions doesn't work if UpdateMode is FALSE,
+        //	currently, GetPortions doesn't work if UpdateMode is sal_False,
         //	this will be fixed (in EditEngine) by src600
-//		pEditEngine->SetUpdateMode( FALSE );
-        pEditEngine->EnableUndo( FALSE );
+//		pEditEngine->SetUpdateMode( sal_False );
+        pEditEngine->EnableUndo( sal_False );
         if (pDocShell)
             pEditEngine->SetRefDevice(pDocShell->GetRefDevice());
         else
@@ -1520,7 +1520,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
         pEditEngine->SetText( maText );
     }
 
-    bDataValid = TRUE;
+    bDataValid = sal_True;
 
     if (pEditEngine)
         pEditEngine->SetNotifyHdl( LINK(this, ScAccessibleCellTextData, NotifyHdl) );
@@ -1599,7 +1599,7 @@ void ScAccessibleHeaderTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             mpViewShell = NULL;// invalid now
@@ -1616,9 +1616,9 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
     {
         SfxItemPool* pEnginePool = EditEngine::CreatePool();
         pEnginePool->FreezeIdRanges();
-        ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, TRUE );
+        ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, sal_True );
 
-        pHdrEngine->EnableUndo( FALSE );
+        pHdrEngine->EnableUndo( sal_False );
         pHdrEngine->SetRefMapMode( MAP_TWIP );
 
         //	default font must be set, independently of document
@@ -1716,7 +1716,7 @@ void ScAccessibleNoteTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             mpViewShell = NULL;// invalid now
@@ -1740,12 +1740,12 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
         {
             SfxItemPool* pEnginePool = EditEngine::CreatePool();
             pEnginePool->FreezeIdRanges();
-            mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
+            mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, sal_True );
         }
-        //	currently, GetPortions doesn't work if UpdateMode is FALSE,
+        //	currently, GetPortions doesn't work if UpdateMode is sal_False,
         //	this will be fixed (in EditEngine) by src600
-//		pEditEngine->SetUpdateMode( FALSE );
-        mpEditEngine->EnableUndo( FALSE );
+//		pEditEngine->SetUpdateMode( sal_False );
+        mpEditEngine->EnableUndo( sal_False );
         if (mpDocSh)
             mpEditEngine->SetRefDevice(mpDocSh->GetRefDevice());
         else
@@ -1775,7 +1775,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
         mpEditEngine->SetText( msText );
     }
 
-    mbDataValid = TRUE;
+    mbDataValid = sal_True;
 
     if (mpEditEngine)
         mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleCellTextData, NotifyHdl) );
@@ -1801,7 +1801,7 @@ class ScCsvViewForwarder : public SvxViewForwarder
 public:
     explicit                    ScCsvViewForwarder( Window* pWindow, const Rectangle& rBoundBox );
 
-    virtual BOOL                IsValid() const;
+    virtual sal_Bool                IsValid() const;
     virtual Rectangle           GetVisArea() const;
     virtual Point               LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
     virtual Point               PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -1815,7 +1815,7 @@ ScCsvViewForwarder::ScCsvViewForwarder( Window* pWindow, const Rectangle& rBound
 {
 }
 
-BOOL ScCsvViewForwarder::IsValid() const
+sal_Bool ScCsvViewForwarder::IsValid() const
 {
     return mpWindow != NULL;
 }
@@ -1863,7 +1863,7 @@ void ScAccessibleCsvTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if( nId == SFX_HINT_DYING )
         {
             mpWindow = NULL;
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index 8a55721e0..45f805b5f 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -73,8 +73,8 @@ SdrOle2Obj* ScClient::GetDrawObj()
     SdrOle2Obj* pOle2Obj = NULL;
     String aName = GetViewShell()->GetObjectShell()->GetEmbeddedObjectContainer().GetEmbeddedObjectName( xObj );
 
-    USHORT nPages = pModel->GetPageCount();
-    for (USHORT nPNr=0; nPNr<nPages && !pOle2Obj; nPNr++)
+    sal_uInt16 nPages = pModel->GetPageCount();
+    for (sal_uInt16 nPNr=0; nPNr<nPages && !pOle2Obj; nPNr++)
     {
         SdrPage* pPage = pModel->GetPage(nPNr);
         SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS );
@@ -114,7 +114,7 @@ void __EXPORT ScClient::RequestNewObjectArea( Rectangle& aLogicRect )
             aLogicRect.SetPos( aOldRect.TopLeft() );
     }
 
-    USHORT nTab = pViewSh->GetViewData()->GetTabNo();
+    sal_uInt16 nTab = pViewSh->GetViewData()->GetTabNo();
     SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(static_cast<sal_Int16>(nTab)));
     if ( pPage && aLogicRect != aOldRect )
     {
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 2f228aadf..320f589b8 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -100,12 +100,12 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
     pModel( pClipModel ),
     aObjDesc( rDesc ),
     pBookmark( NULL ),
-    bGraphic( FALSE ),
-    bGrIsBit( FALSE ),
-    bOleObj( FALSE ),
+    bGraphic( sal_False ),
+    bGrIsBit( sal_False ),
+    bOleObj( sal_False ),
     pDragSourceView( NULL ),
     nDragSourceFlags( 0 ),
-    bDragWasInternal( FALSE ),
+    bDragWasInternal( sal_False ),
     nSourceDocID( 0 )
 {
     //
@@ -123,7 +123,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
             //  OLE object
             //
 
-            UINT16 nSdrObjKind = pObject->GetObjIdentifier();
+            sal_uInt16 nSdrObjKind = pObject->GetObjIdentifier();
             if (nSdrObjKind == OBJ_OLE2)
             {
                 // if object has no persistence it must be copied as a part of document
@@ -131,7 +131,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
                 {
                     uno::Reference< embed::XEmbedPersist > xPersObj( ((SdrOle2Obj*)pObject)->GetObjRef(), uno::UNO_QUERY );
                     if ( xPersObj.is() && xPersObj->hasEntry() )
-                        bOleObj = TRUE;
+                        bOleObj = sal_True;
                 }
                 catch( uno::Exception& )
                 {}
@@ -144,9 +144,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
 
             if (nSdrObjKind == OBJ_GRAF)
             {
-                bGraphic = TRUE;
+                bGraphic = sal_True;
                 if ( ((SdrGrafObj*)pObject)->GetGraphic().GetType() == GRAPHIC_BITMAP )
-                    bGrIsBit = TRUE;
+                    bGrIsBit = sal_True;
             }
 
             //
@@ -286,9 +286,9 @@ ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* )
     return pObj;
 }
 
-BOOL lcl_HasOnlyControls( SdrModel* pModel )
+sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
 {
-    BOOL bOnlyControls = FALSE;         // default if there are no objects
+    sal_Bool bOnlyControls = sal_False;         // default if there are no objects
 
     if ( pModel )
     {
@@ -299,12 +299,12 @@ BOOL lcl_HasOnlyControls( SdrModel* pModel )
             SdrObject* pObj = aIter.Next();
             if ( pObj )
             {
-                bOnlyControls = TRUE;   // only set if there are any objects at all
+                bOnlyControls = sal_True;   // only set if there are any objects at all
                 while ( pObj )
                 {
                     if (!pObj->ISA(SdrUnoObj))
                     {
-                        bOnlyControls = FALSE;
+                        bOnlyControls = sal_False;
                         break;
                     }
                     pObj = aIter.Next();
@@ -403,7 +403,7 @@ sal_Bool ScDrawTransferObj::GetData( const ::com::sun::star::datatransfer::DataF
 
         if( aOleData.GetTransferable().is() && aOleData.HasFormat( rFlavor ) )
         {
-            ULONG nOldSwapMode = 0;
+            sal_uLong nOldSwapMode = 0;
 
             if( pModel )
             {
@@ -439,9 +439,9 @@ sal_Bool ScDrawTransferObj::GetData( const ::com::sun::star::datatransfer::DataF
             DBG_ASSERT( pPv, "pPv not there..." );
             aView.MarkAllObj( pPv );
             if ( nFormat == SOT_FORMAT_GDIMETAFILE )
-                bOK = SetGDIMetaFile( aView.GetAllMarkedMetaFile( TRUE ), rFlavor );
+                bOK = SetGDIMetaFile( aView.GetAllMarkedMetaFile( sal_True ), rFlavor );
             else
-                bOK = SetBitmap( aView.GetAllMarkedBitmap( TRUE ), rFlavor );
+                bOK = SetBitmap( aView.GetAllMarkedBitmap( sal_True ), rFlavor );
         }
         else if ( nFormat == SOT_FORMATSTR_ID_SVXB )
         {
@@ -596,7 +596,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse
 
                     // mba: no relative ULRs for clipboard!
                     SfxMedium aMedium( xWorkStore, String() );
-                    bRet = pEmbObj->DoSaveObjectAs( aMedium, FALSE );
+                    bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False );
                     pEmbObj->DoSaveCompleted();
 
                     uno::Reference< embed::XTransactedObject > xTransact( xWorkStore, uno::UNO_QUERY );
@@ -611,7 +611,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse
                         delete pSrcStm;
                     }
 
-                    bRet = TRUE;
+                    bRet = sal_True;
 
                     xWorkStore->dispose();
                     xWorkStore = uno::Reference < embed::XStorage >();
@@ -670,8 +670,8 @@ void lcl_InitMarks( SdrMarkView& rDest, const SdrMarkView& rSource, SCTAB nTab )
     DBG_ASSERT(pDestPV,"PageView ?");
 
     const SdrMarkList& rMarkList = rSource.GetMarkedObjectList();
-    ULONG nCount = rMarkList.GetMarkCount();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = rMarkList.GetMarkCount();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         SdrMark* pMark = rMarkList.GetMark(i);
         SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -700,14 +700,14 @@ void ScDrawTransferObj::SetDragSourceObj( SdrObject* pObj, SCTAB nTab )
     //! add as listener with document, delete pDragSourceView if document gone
 }
 
-void ScDrawTransferObj::SetDragSourceFlags( USHORT nFlags )
+void ScDrawTransferObj::SetDragSourceFlags( sal_uInt16 nFlags )
 {
     nDragSourceFlags = nFlags;
 }
 
 void ScDrawTransferObj::SetDragWasInternal()
 {
-    bDragWasInternal = TRUE;
+    bDragWasInternal = sal_True;
 }
 
 SdrOle2Obj* ScDrawTransferObj::GetSingleObject()
@@ -773,7 +773,7 @@ void ScDrawTransferObj::InitDocShell()
         pDocSh->SetVisArea( aDestArea );
 
         ScViewOptions aViewOpt( pDestDoc->GetViewOptions() );
-        aViewOpt.SetOption( VOPT_GRID, FALSE );
+        aViewOpt.SetOption( VOPT_GRID, sal_False );
         pDestDoc->SetViewOptions( aViewOpt );
 
         ScViewData aViewData( pDocSh, NULL );
@@ -781,7 +781,7 @@ void ScDrawTransferObj::InitDocShell()
         aViewData.SetScreen( aDestArea );
         aViewData.SetCurX( 0 );
         aViewData.SetCurY( 0 );
-        pDocSh->UpdateOle(&aViewData, TRUE);
+        pDocSh->UpdateOle(&aViewData, sal_True);
     }
 }
 
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 685ea3978..7d9ea8465 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -97,8 +97,8 @@ using namespace formula;
 
 // STATIC DATA -----------------------------------------------------------
 
-BOOL ScInputHandler::bOptLoaded = FALSE;			// App-Optionen ausgewertet
-BOOL ScInputHandler::bAutoComplete = FALSE;			// wird in KeyInput gesetzt
+sal_Bool ScInputHandler::bOptLoaded = sal_False;			// App-Optionen ausgewertet
+sal_Bool ScInputHandler::bAutoComplete = sal_False;			// wird in KeyInput gesetzt
 
 //	delimiters (in addition to ScEditUtil) needed for range finder:
 //	only characters that are allowed in formulas next to references
@@ -106,7 +106,7 @@ BOOL ScInputHandler::bAutoComplete = FALSE;			// wird in KeyInput gesetzt
 
 static const sal_Char __FAR_DATA pMinDelimiters[] = " !\"";
 
-extern USHORT nEditAdjust;		//! Member an ViewData
+extern sal_uInt16 nEditAdjust;		//! Member an ViewData
 
 //==================================================================
 
@@ -142,7 +142,7 @@ void ScInputHandler::InitRangeFinder( const String& rFormula )
     xub_StrLen nLen = rFormula.Len();
     xub_StrLen nPos = 0;
     xub_StrLen nStart = 0;
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     ScRange aRange;
     while ( nPos < nLen && nCount < RANGEFIND_MAX )
     {
@@ -180,7 +180,7 @@ handle_r1c1:
         {
             String aTest = rFormula.Copy( nStart, nPos-nStart );
             const ScAddress::Details aAddrDetails( pDoc, aCursorPos );
-            USHORT nFlags = aRange.ParseAny( aTest, pDoc, aAddrDetails );
+            sal_uInt16 nFlags = aRange.ParseAny( aTest, pDoc, aAddrDetails );
             if ( nFlags & SCA_VALID )
             {
                 //	Tabelle setzen, wenn nicht angegeben
@@ -193,13 +193,13 @@ handle_r1c1:
                 {
                     // #i73766# if a single ref was parsed, set the same "abs" flags for ref2,
                     // so Format doesn't output a double ref because of different flags.
-                    USHORT nAbsFlags = nFlags & ( SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE );
+                    sal_uInt16 nAbsFlags = nFlags & ( SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE );
                     nFlags |= nAbsFlags << 4;
                 }
 
                 if (!nCount)
                 {
-                    pEngine->SetUpdateMode( FALSE );
+                    pEngine->SetUpdateMode( sal_False );
                     pRangeFindList = new ScRangeFindList( pDocSh->GetTitle() );
                 }
 
@@ -220,7 +220,7 @@ handle_r1c1:
 
     if (nCount)
     {
-        pEngine->SetUpdateMode( TRUE );
+        pEngine->SetUpdateMode( sal_True );
 
         pDocSh->Broadcast( SfxSimpleHint( SC_HINT_SHOWRANGEFINDER ) );
     }
@@ -240,7 +240,7 @@ void lcl_Replace( EditView* pView, const String& rNewStr, const ESelection& rOld
 
         //	Dummy-InsertText fuer Update und Paint
         //	dafuer muss oben die Selektion aufgehoben werden (vor QuickInsertText)
-        pView->InsertText( EMPTY_STRING, FALSE );
+        pView->InsertText( EMPTY_STRING, sal_False );
 
         xub_StrLen nLen = pEngine->GetTextLen(0);
         ESelection aSel( 0, nLen, 0, nLen );
@@ -248,7 +248,7 @@ void lcl_Replace( EditView* pView, const String& rNewStr, const ESelection& rOld
     }
 }
 
-void ScInputHandler::UpdateRange( USHORT nIndex, const ScRange& rNew )
+void ScInputHandler::UpdateRange( sal_uInt16 nIndex, const ScRange& rNew )
 {
     ScTabViewShell* pDocView = pRefViewSh ? pRefViewSh : pActiveViewSh;
     if ( pDocView && pRangeFindList && nIndex < pRangeFindList->Count() )
@@ -270,17 +270,17 @@ void ScInputHandler::UpdateRange( USHORT nIndex, const ScRange& rNew )
         lcl_Replace( pTopView, aNewStr, aOldSel );
         lcl_Replace( pTableView, aNewStr, aOldSel );
 
-        bInRangeUpdate = TRUE;
+        bInRangeUpdate = sal_True;
         DataChanged();
-        bInRangeUpdate = FALSE;
+        bInRangeUpdate = sal_False;
 
         long nDiff = aNewStr.Len() - (long)(nOldEnd-nOldStart);
 
         pData->aRef = rNew;
         pData->nSelEnd = (xub_StrLen)(pData->nSelEnd + nDiff);
 
-        USHORT nCount = (USHORT) pRangeFindList->Count();
-        for (USHORT i=nIndex+1; i<nCount; i++)
+        sal_uInt16 nCount = (sal_uInt16) pRangeFindList->Count();
+        for (sal_uInt16 i=nIndex+1; i<nCount; i++)
         {
             ScRangeFindData* pNext = pRangeFindList->GetObject( i );
             pNext->nSelStart = (xub_StrLen)(pNext->nSelStart + nDiff);
@@ -299,7 +299,7 @@ void ScInputHandler::DeleteRangeFinder()
     if ( pRangeFindList && pPaintView )
     {
         ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell();
-        pRangeFindList->SetHidden(TRUE);
+        pRangeFindList->SetHidden(sal_True);
         pDocSh->Broadcast( SfxSimpleHint( SC_HINT_SHOWRANGEFINDER ) );	// wegnehmen
         DELETEZ(pRangeFindList);
     }
@@ -375,7 +375,7 @@ xub_StrLen lcl_MatchParenthesis( const String& rStr, xub_StrLen nPos )
     const sal_Unicode* p0 = rStr.GetBuffer();
     register const sal_Unicode* p;
     const sal_Unicode* p1;
-    USHORT nQuotes = 0;
+    sal_uInt16 nQuotes = 0;
     if ( nPos < nLen / 2 )
     {
         p = p0;
@@ -392,11 +392,11 @@ xub_StrLen lcl_MatchParenthesis( const String& rStr, xub_StrLen nPos )
             nQuotes++;
     }
     // Odd number of quotes that we find ourselves in a string
-    BOOL bLookInString = ((nQuotes % 2) != 0);
-    BOOL bInString = bLookInString;
+    sal_Bool bLookInString = ((nQuotes % 2) != 0);
+    sal_Bool bInString = bLookInString;
     p = p0 + nPos;
     p1 = (nDir < 0 ? p0 : p0 + nLen) ;
-    USHORT nLevel = 1;
+    sal_uInt16 nLevel = 1;
     while ( p != p1 && nLevel )
     {
         p += nDir;
@@ -434,23 +434,23 @@ ScInputHandler::ScInputHandler()
         pTipVisibleSecParent( NULL ),
         nTipVisibleSec( 0 ),
         nAutoPos( SCPOS_INVALID ),
-        bUseTab( FALSE ),
-        bTextValid( TRUE ),
+        bUseTab( sal_False ),
+        bTextValid( sal_True ),
         nFormSelStart( 0 ),
         nFormSelEnd( 0 ),
         nAutoPar( 0 ),
         eMode( SC_INPUT_NONE ),
-        bModified( FALSE ),
-        bSelIsRef( FALSE ),
-        bFormulaMode( FALSE ),
-        bInRangeUpdate( FALSE ),
-        bParenthesisShown( FALSE ),
-        bCreatingFuncView( FALSE ),
-        bInEnterHandler( FALSE ),
-        bCommandErrorShown( FALSE ),
-        bInOwnChange( FALSE ),
-        bProtected( FALSE ),
-        bCellHasPercentFormat( FALSE ),
+        bModified( sal_False ),
+        bSelIsRef( sal_False ),
+        bFormulaMode( sal_False ),
+        bInRangeUpdate( sal_False ),
+        bParenthesisShown( sal_False ),
+        bCreatingFuncView( sal_False ),
+        bInEnterHandler( sal_False ),
+        bCommandErrorShown( sal_False ),
+        bInOwnChange( sal_False ),
+        bProtected( sal_False ),
+        bCellHasPercentFormat( sal_False ),
         nValidation( 0 ),
         eAttrAdjust( SVX_HOR_JUSTIFY_STANDARD ),
         aScaleX( 1,1 ),
@@ -458,7 +458,7 @@ ScInputHandler::ScInputHandler()
         pRefViewSh( NULL ),
         pLastPattern( NULL ),
         pEditDefaults( NULL ),
-        bLastIsSymbol( FALSE ),
+        bLastIsSymbol( sal_False ),
         pLastState( NULL ),
         pDelayTimer( NULL ),
         pRangeFindList( NULL )
@@ -513,7 +513,7 @@ void ScInputHandler::UpdateRefDevice()
     if (!pEngine)
         return;
 
-    BOOL bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg();
+    sal_Bool bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg();
     if ( bTextWysiwyg && pActiveViewSh )
         pEngine->SetRefDevice( pActiveViewSh->GetViewData()->GetDocument()->GetPrinter() );
     else
@@ -540,7 +540,7 @@ void ScInputHandler::ImplCreateEditEngine()
             pEngine = new ScFieldEditEngine( pDoc->GetEnginePool(), pDoc->GetEditPool() );
         }
         else
-            pEngine = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE );
+            pEngine = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, sal_True );
         pEngine->SetWordDelimiters( ScEditUtil::ModifyDelimiters( pEngine->GetWordDelimiters() ) );
         UpdateRefDevice();		// also sets MapMode
         pEngine->SetPaperSize( Size( 1000000, 1000000 ) );
@@ -553,12 +553,12 @@ void ScInputHandler::ImplCreateEditEngine()
 
 void ScInputHandler::UpdateAutoCorrFlag()
 {
-    ULONG nCntrl = pEngine->GetControlWord();
-    ULONG nOld = nCntrl;
+    sal_uLong nCntrl = pEngine->GetControlWord();
+    sal_uLong nOld = nCntrl;
 
     //	don't use pLastPattern here (may be invalid because of AutoStyle)
 
-    BOOL bDisable = bLastIsSymbol || bFormulaMode;
+    sal_Bool bDisable = bLastIsSymbol || bFormulaMode;
     if ( bDisable )
         nCntrl &= ~EE_CNTRL_AUTOCORRECT;
     else
@@ -568,12 +568,12 @@ void ScInputHandler::UpdateAutoCorrFlag()
         pEngine->SetControlWord(nCntrl);
 }
 
-void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab )
+void ScInputHandler::UpdateSpellSettings( sal_Bool bFromStartTab )
 {
     if ( pActiveViewSh )
     {
         ScViewData* pViewData = pActiveViewSh->GetViewData();
-        BOOL bOnlineSpell = pViewData->GetDocument()->GetDocOptions().IsAutoSpell();
+        sal_Bool bOnlineSpell = pViewData->GetDocument()->GetDocOptions().IsAutoSpell();
 
         //	SetDefaultLanguage is independent of the language attributes,
         //	ScGlobal::GetEditDefaultLanguage is always used.
@@ -586,8 +586,8 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab )
 
         if ( bFromStartTab || eMode != SC_INPUT_NONE )
         {
-            ULONG nCntrl = pEngine->GetControlWord();
-            ULONG nOld = nCntrl;
+            sal_uLong nCntrl = pEngine->GetControlWord();
+            sal_uLong nOld = nCntrl;
             if( bOnlineSpell )
                 nCntrl |= EE_CNTRL_ONLINESPELLING;
             else
@@ -606,7 +606,7 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab )
             pEngine->SetKernAsianPunctuation( pDoc->GetAsianKerning() );
             pEngine->SetDefaultHorizontalTextDirection(
                 (EEHorizontalTextDirection)pDoc->GetEditTextDirection( pViewData->GetTabNo() ) );
-            pEngine->SetFirstWordCapitalization( FALSE );
+            pEngine->SetFirstWordCapitalization( sal_False );
         }
 
         //	language is set separately, so the speller is needed only if online
@@ -617,7 +617,7 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab )
             pEngine->SetSpeller( xXSpellChecker1 );
         }
 
-        BOOL bHyphen = pLastPattern && ((const SfxBoolItem&)pLastPattern->GetItem(ATTR_HYPHENATE)).GetValue();
+        sal_Bool bHyphen = pLastPattern && ((const SfxBoolItem&)pLastPattern->GetItem(ATTR_HYPHENATE)).GetValue();
         if ( bHyphen ) {
             com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() );
             pEngine->SetHyphenator( xXHyphenator );
@@ -652,16 +652,16 @@ void ScInputHandler::GetFormulaData()
         //		wie in ScPosWnd::FillFunctions (inputwin.cxx)
         
         const ScAppOptions& rOpt = SC_MOD()->GetAppOptions();
-        USHORT nMRUCount = rOpt.GetLRUFuncListCount();
-        const USHORT* pMRUList = rOpt.GetLRUFuncList();
+        sal_uInt16 nMRUCount = rOpt.GetLRUFuncListCount();
+        const sal_uInt16* pMRUList = rOpt.GetLRUFuncList();
         const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
-        ULONG nListCount = pFuncList->GetCount();
+        sal_uLong nListCount = pFuncList->GetCount();
         if (pMRUList)
         {
-            for (USHORT i=0; i<nMRUCount; i++)
+            for (sal_uInt16 i=0; i<nMRUCount; i++)
             {
-                USHORT nId = pMRUList[i];
-                for (ULONG j=0; j<nListCount; j++)
+                sal_uInt16 nId = pMRUList[i];
+                for (sal_uLong j=0; j<nListCount; j++)
                 {
                     const ScFuncDesc* pDesc = pFuncList->GetFunction( j );
                     if ( pDesc->nFIndex == nId && pDesc->pFuncName )
@@ -676,7 +676,7 @@ void ScInputHandler::GetFormulaData()
                 }
             }
         }
-        for(ULONG i=0;i<nListCount;i++)
+        for(sal_uLong i=0;i<nListCount;i++)
         {
             const ScFuncDesc* pDesc = pFuncList->GetFunction( i );
             if ( pDesc->pFuncName )
@@ -743,7 +743,7 @@ void ScInputHandler::ShowTipCursor()
 
     if ( bFormulaMode && pActiveView && pFormulaDataPara && pEngine->GetParagraphCount() == 1 )
     {
-        String aFormula = pEngine->GetText( (USHORT) 0 );
+        String aFormula = pEngine->GetText( (sal_uInt16) 0 );
         ESelection aSel = pActiveView->GetSelection();
         aSel.Adjust();
         xub_StrLen  nLeftParentPos = 0;
@@ -758,8 +758,8 @@ void ScInputHandler::ShowTipCursor()
             xub_StrLen  nArgPos = 0;
             const IFunctionDescription* ppFDesc;
             ::std::vector< ::rtl::OUString> aArgs;
-            USHORT	    nArgs;
-            BOOL  bFound = FALSE;
+            sal_uInt16	    nArgs;
+            sal_Bool  bFound = sal_False;
             FormulaHelper aHelper(ScGlobal::GetStarCalcFunctionMgr());
 
             while( !bFound )
@@ -771,32 +771,32 @@ void ScInputHandler::ShowTipCursor()
                     sal_Unicode c = ( nLeftParentPos > 0 ) ? aSelText.GetChar( nLeftParentPos-1 ) : 0;
                     if( !((c >= 'A' && c<= 'Z') || (c>= 'a' && c<= 'z' )) )
                         continue;
-                    nNextFStart = aHelper.GetFunctionStart( aSelText, nLeftParentPos, TRUE);
-                    if( aHelper.GetNextFunc( aSelText, FALSE, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) )
+                    nNextFStart = aHelper.GetFunctionStart( aSelText, nLeftParentPos, sal_True);
+                    if( aHelper.GetNextFunc( aSelText, sal_False, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) )
                     {
                         if( ppFDesc->getFunctionName().getLength() )
                         {
                             nArgPos = aHelper.GetArgStart( aSelText, nNextFStart, 0 );
-                            nArgs = static_cast<USHORT>(ppFDesc->getParameterCount());
-
-                            USHORT nActive = 0;
-                            USHORT nCount = 0;
-                            USHORT nCountSemicolon = 0;
-                            USHORT nCountDot = 0;
-                            USHORT nStartPosition = 0;
-                            USHORT nEndPosition = 0;
-                            BOOL   bFlag = FALSE;
+                            nArgs = static_cast<sal_uInt16>(ppFDesc->getParameterCount());
+
+                            sal_uInt16 nActive = 0;
+                            sal_uInt16 nCount = 0;
+                            sal_uInt16 nCountSemicolon = 0;
+                            sal_uInt16 nCountDot = 0;
+                            sal_uInt16 nStartPosition = 0;
+                            sal_uInt16 nEndPosition = 0;
+                            sal_Bool   bFlag = sal_False;
                             String aNew;
-                            USHORT nParAutoPos = SCPOS_INVALID;
-                            if( pFormulaDataPara->FindText( ppFDesc->getFunctionName(), aNew, nParAutoPos, FALSE ) )
+                            sal_uInt16 nParAutoPos = SCPOS_INVALID;
+                            if( pFormulaDataPara->FindText( ppFDesc->getFunctionName(), aNew, nParAutoPos, sal_False ) )
                             {
-                                for( USHORT i=0; i < nArgs; i++ )
+                                for( sal_uInt16 i=0; i < nArgs; i++ )
                                 {
                                     xub_StrLen nLength = static_cast<xub_StrLen>(aArgs[i].getLength());
                                     if( nArgPos <= aSelText.Len()-1 )
                                     {
                                         nActive = i+1;
-                                        bFlag = TRUE;
+                                        bFlag = sal_True;
                                     }
                                     nArgPos+=nLength+1;
                                 }
@@ -807,7 +807,7 @@ void ScInputHandler::ShowTipCursor()
 
                                     if( !nCountSemicolon )
                                     {
-                                        for( USHORT i = 0; i < aNew.Len(); i++ )
+                                        for( sal_uInt16 i = 0; i < aNew.Len(); i++ )
                                         {
                                             sal_Unicode cNext = aNew.GetChar( i );
                                             if( cNext == '(' )
@@ -818,7 +818,7 @@ void ScInputHandler::ShowTipCursor()
                                     }
                                     else if( !nCountDot )
                                     {
-                                        for( USHORT i = 0; i < aNew.Len(); i++ )
+                                        for( sal_uInt16 i = 0; i < aNew.Len(); i++ )
                                         {
                                             sal_Unicode cNext = aNew.GetChar( i );
                                             if( cNext == '(' )
@@ -839,7 +839,7 @@ void ScInputHandler::ShowTipCursor()
                                     }
                                     else
                                     {
-                                        for( USHORT i = 0; i < aNew.Len(); i++ )
+                                        for( sal_uInt16 i = 0; i < aNew.Len(); i++ )
                                         {
                                             sal_Unicode cNext = aNew.GetChar( i );
                                             if( cNext == '(' )
@@ -867,13 +867,13 @@ void ScInputHandler::ShowTipCursor()
                                     {
                                         aNew.Insert( 0x25BA, nStartPosition );
                                         ShowTipBelow( aNew );
-                                        bFound = TRUE;
+                                        bFound = sal_True;
                                     }
                                 }
                                 else
                                 {
                                     ShowTipBelow( aNew );
-                                    bFound = TRUE;
+                                    bFound = sal_True;
                                 }
                             }
                         }
@@ -881,21 +881,21 @@ void ScInputHandler::ShowTipCursor()
                 }
                 else
                 {
-                    USHORT nPosition = 0;
+                    sal_uInt16 nPosition = 0;
                     String aText = pEngine->GetWord( 0, aSel.nEndPos-1 );
                     if( aText.GetChar( aSel.nEndPos-1 ) == '=' )
                     {
                         break;
                     }
                     String aNew;
-                    USHORT nParAutoPos = SCPOS_INVALID;
+                    sal_uInt16 nParAutoPos = SCPOS_INVALID;
                     nPosition = aText.Len()+1;
-                    if( pFormulaDataPara->FindText( aText, aNew, nParAutoPos, FALSE ) )
+                    if( pFormulaDataPara->FindText( aText, aNew, nParAutoPos, sal_False ) )
                     {
                         if( aFormula.GetChar( nPosition ) =='(' )
                         {
                             ShowTipBelow( aNew );
-                            bFound = TRUE;
+                            bFound = sal_True;
                         }
                         else 
                             break;
@@ -926,7 +926,7 @@ void ScInputHandler::ShowTip( const String& rText )
         aPos = pTipVisibleParent->OutputToScreenPixel( aPos );
         Rectangle aRect( aPos, aPos );
 
-        USHORT nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM;
+        sal_uInt16 nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM;
         nTipVisible = Help::ShowTip(pTipVisibleParent, aRect, rText, nAlign);
         pTipVisibleParent->AddEventListener( LINK( this, ScInputHandler, ShowHideTipVisibleParentListener ) );
     }
@@ -950,7 +950,7 @@ void ScInputHandler::ShowTipBelow( const String& rText )
         }
         aPos = pTipVisibleSecParent->OutputToScreenPixel( aPos );
         Rectangle aRect( aPos, aPos );
-        USHORT nAlign = QUICKHELP_LEFT | QUICKHELP_TOP | QUICKHELP_NOEVADEPOINTER;
+        sal_uInt16 nAlign = QUICKHELP_LEFT | QUICKHELP_TOP | QUICKHELP_NOEVADEPOINTER;
         nTipVisibleSec = Help::ShowTip(pTipVisibleSecParent, aRect, rText, nAlign);
         pTipVisibleSecParent->AddEventListener( LINK( this, ScInputHandler, ShowHideTipVisibleSecParentListener ) );
     }
@@ -966,7 +966,7 @@ void ScInputHandler::UseFormulaData()
     //	Formeln duerfen nur 1 Absatz haben
     if ( pActiveView && pFormulaData && pEngine->GetParagraphCount() == 1 )
     {
-        String aTotal = pEngine->GetText( (USHORT) 0 );
+        String aTotal = pEngine->GetText( (sal_uInt16) 0 );
         ESelection aSel = pActiveView->GetSelection();
         aSel.Adjust();
 
@@ -989,15 +989,15 @@ void ScInputHandler::UseFormulaData()
             xub_StrLen  nArgPos = 0;
             const IFunctionDescription* ppFDesc;
             ::std::vector< ::rtl::OUString> aArgs;
-            USHORT	    nArgs;
-            BOOL  bFound = FALSE;
+            sal_uInt16	    nArgs;
+            sal_Bool  bFound = sal_False;
 
             String aText = pEngine->GetWord( 0, aSel.nEndPos-1 );
             if ( aText.Len() )
             {
                 String aNew;
                 nAutoPos = SCPOS_INVALID;
-                if ( pFormulaData->FindText( aText, aNew, nAutoPos, FALSE ) )
+                if ( pFormulaData->FindText( aText, aNew, nAutoPos, sal_False ) )
                 {
                     ShowTip( aNew );
                     aAutoSearch = aText;
@@ -1016,32 +1016,32 @@ void ScInputHandler::UseFormulaData()
                 sal_Unicode c = ( nLeftParentPos > 0 ) ? aFormula.GetChar( nLeftParentPos-1 ) : 0;
                 if( !((c >= 'A' && c<= 'Z') || (c>= 'a' && c<= 'z') ) )
                     continue;
-                nNextFStart = aHelper.GetFunctionStart( aFormula, nLeftParentPos, TRUE);
-                if( aHelper.GetNextFunc( aFormula, FALSE, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) )
+                nNextFStart = aHelper.GetFunctionStart( aFormula, nLeftParentPos, sal_True);
+                if( aHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) )
                 {
                     if( ppFDesc->getFunctionName().getLength() )
                     {
                         nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 0 );
-                        nArgs = static_cast<USHORT>(ppFDesc->getParameterCount());
-
-                        USHORT nActive = 0;
-                        USHORT nCount = 0;
-                        USHORT nCountSemicolon = 0;
-                        USHORT nCountDot = 0;
-                        USHORT nStartPosition = 0;
-                        USHORT nEndPosition = 0;
-                        BOOL   bFlag = FALSE;
+                        nArgs = static_cast<sal_uInt16>(ppFDesc->getParameterCount());
+
+                        sal_uInt16 nActive = 0;
+                        sal_uInt16 nCount = 0;
+                        sal_uInt16 nCountSemicolon = 0;
+                        sal_uInt16 nCountDot = 0;
+                        sal_uInt16 nStartPosition = 0;
+                        sal_uInt16 nEndPosition = 0;
+                        sal_Bool   bFlag = sal_False;
                         String aNew;
-                        USHORT nParAutoPos = SCPOS_INVALID;
-                        if( pFormulaDataPara->FindText( ppFDesc->getFunctionName(), aNew, nParAutoPos, FALSE ) )
+                        sal_uInt16 nParAutoPos = SCPOS_INVALID;
+                        if( pFormulaDataPara->FindText( ppFDesc->getFunctionName(), aNew, nParAutoPos, sal_False ) )
                         {
-                            for( USHORT i=0; i < nArgs; i++ )
+                            for( sal_uInt16 i=0; i < nArgs; i++ )
                             {
                                 xub_StrLen nLength = static_cast<xub_StrLen>(aArgs[i].getLength());
                                 if( nArgPos <= aFormula.Len()-1 )
                                 {
                                     nActive = i+1;
-                                    bFlag = TRUE;
+                                    bFlag = sal_True;
                                 }
                                 nArgPos+=nLength+1;
                             }
@@ -1052,7 +1052,7 @@ void ScInputHandler::UseFormulaData()
                                 
                                if( !nCountSemicolon )
                                {
-                                    for( USHORT i = 0; i < aNew.Len(); i++ )
+                                    for( sal_uInt16 i = 0; i < aNew.Len(); i++ )
                                     {
                                         sal_Unicode cNext = aNew.GetChar( i );
                                         if( cNext == '(' )
@@ -1063,7 +1063,7 @@ void ScInputHandler::UseFormulaData()
                                 }
                                 else if( !nCountDot )
                                 {
-                                    for( USHORT i = 0; i < aNew.Len(); i++ )
+                                    for( sal_uInt16 i = 0; i < aNew.Len(); i++ )
                                     {
                                         sal_Unicode cNext = aNew.GetChar( i );
                                         if( cNext == '(' )
@@ -1084,7 +1084,7 @@ void ScInputHandler::UseFormulaData()
                                 }
                                 else
                                 {
-                                    for( USHORT i = 0; i < aNew.Len(); i++ )
+                                    for( sal_uInt16 i = 0; i < aNew.Len(); i++ )
                                     {
                                         sal_Unicode cNext = aNew.GetChar( i );
                                         if( cNext == '(' )
@@ -1112,13 +1112,13 @@ void ScInputHandler::UseFormulaData()
                                 {
                                     aNew.Insert( 0x25BA, nStartPosition );
                                     ShowTipBelow( aNew );
-                                    bFound = TRUE;
+                                    bFound = sal_True;
                                 }
                             }
                             else
                             {
                                 ShowTipBelow( aNew );
-                                bFound = TRUE;
+                                bFound = sal_True;
                             }
                         }
                     }
@@ -1128,7 +1128,7 @@ void ScInputHandler::UseFormulaData()
     }
 }
 
-void ScInputHandler::NextFormulaEntry( BOOL bBack )
+void ScInputHandler::NextFormulaEntry( sal_Bool bBack )
 {
     EditView* pActiveView = pTopView ? pTopView : pTableView;
     if ( pActiveView && pFormulaData )
@@ -1144,7 +1144,7 @@ void ScInputHandler::NextFormulaEntry( BOOL bBack )
         pActiveView->ShowCursor();
 }
 
-void lcl_CompleteFunction( EditView* pView, const String& rInsert, BOOL& rParInserted )
+void lcl_CompleteFunction( EditView* pView, const String& rInsert, sal_Bool& rParInserted )
 {
     if (pView)
     {
@@ -1156,7 +1156,7 @@ void lcl_CompleteFunction( EditView* pView, const String& rInsert, BOOL& rParIns
 
         String aInsStr = rInsert;
         xub_StrLen nInsLen = aInsStr.Len();
-        BOOL bDoParen = ( nInsLen > 1 && aInsStr.GetChar(nInsLen-2) == '('
+        sal_Bool bDoParen = ( nInsLen > 1 && aInsStr.GetChar(nInsLen-2) == '('
                                       && aInsStr.GetChar(nInsLen-1) == ')' );
         if ( bDoParen )
         {
@@ -1165,16 +1165,16 @@ void lcl_CompleteFunction( EditView* pView, const String& rInsert, BOOL& rParIns
             //	#39393#).
 
             ESelection aWordSel = pView->GetSelection();
-            String aOld = pView->GetEditEngine()->GetText((USHORT)0);
+            String aOld = pView->GetEditEngine()->GetText((sal_uInt16)0);
             sal_Unicode cNext = aOld.GetChar(aWordSel.nEndPos);
             if ( cNext == '(' )
             {
-                bDoParen = FALSE;
+                bDoParen = sal_False;
                 aInsStr.Erase( nInsLen - 2 );	// Klammern weglassen
             }
         }
 
-        pView->InsertText( aInsStr, FALSE );
+        pView->InsertText( aInsStr, sal_False );
 
         if ( bDoParen )							// Cursor zwischen die Klammern setzen
         {
@@ -1183,7 +1183,7 @@ void lcl_CompleteFunction( EditView* pView, const String& rInsert, BOOL& rParIns
             --aSel.nEndPos;
             pView->SetSelection(aSel);
 
-            rParInserted = TRUE;
+            rParInserted = sal_True;
         }
     }
 }
@@ -1196,7 +1196,7 @@ void ScInputHandler::PasteFunctionData()
         if (pData)
         {
             String aInsert = pData->GetString();
-            BOOL bParInserted = FALSE;
+            sal_Bool bParInserted = sal_False;
 
             DataChanging(); 						// kann nicht neu sein
             lcl_CompleteFunction( pTopView, aInsert, bParInserted );
@@ -1235,7 +1235,7 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
         // wenn ein Name eigentlich als Bereich in die Gesamt-Formel
         // eingefuegt wird, bei der Einzeldarstellung aber als
         // single-Zellbezug interpretiert wird
-        BOOL bColRowName = pCell->HasColRowName();
+        sal_Bool bColRowName = pCell->HasColRowName();
         if ( bColRowName )
         {
             // ColRowName im RPN-Code?
@@ -1249,10 +1249,10 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
                 pCell = new ScFormulaCell( pDoc, rPos, aBraced );
             }
             else
-                bColRowName = FALSE;
+                bColRowName = sal_False;
         }
 
-        USHORT nErrCode = pCell->GetErrCode();
+        sal_uInt16 nErrCode = pCell->GetErrCode();
         if ( nErrCode == 0 )
         {
             SvNumberFormatter& aFormatter = *(pDoc->GetFormatTable());
@@ -1260,7 +1260,7 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
             if ( pCell->IsValue() )
             {
                 double n = pCell->GetValue();
-                ULONG nFormat = aFormatter.GetStandardFormat( n, 0,
+                sal_uLong nFormat = aFormatter.GetStandardFormat( n, 0,
                                 pCell->GetFormatType(), ScGlobal::eLnge );
                 aFormatter.GetInputLineString( n, nFormat, aValue );
                 //!	display OutputString but insert InputLineString
@@ -1270,7 +1270,7 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
                 String aStr;
 
                 pCell->GetString( aStr );
-                ULONG nFormat = aFormatter.GetStandardFormat(
+                sal_uLong nFormat = aFormatter.GetStandardFormat(
                                 pCell->GetFormatType(), ScGlobal::eLnge);
                 aFormatter.GetOutputString( aStr, nFormat,
                                             aValue, &pColor );
@@ -1300,7 +1300,7 @@ void ScInputHandler::FormulaPreview()
     {
         String aPart = pActiveView->GetSelected();
         if (!aPart.Len())
-            aPart = pEngine->GetText((USHORT)0);
+            aPart = pEngine->GetText((sal_uInt16)0);
         ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocShell()->GetDocument();
         aValue = lcl_Calculate( aPart, pDoc, aCursorPos );
     }
@@ -1363,9 +1363,9 @@ void ScInputHandler::PasteManualTip()
             }
         }
         if ( pTopView )
-            pTopView->InsertText( aInsert, TRUE );
+            pTopView->InsertText( aInsert, sal_True );
         if ( pTableView )
-            pTableView->InsertText( aInsert, TRUE );
+            pTableView->InsertText( aInsert, sal_True );
 
         DataChanged();
     }
@@ -1383,7 +1383,7 @@ void ScInputHandler::AutoParAdded()
     ++nAutoPar;		//	closing parenthesis can be overwritten
 }
 
-BOOL ScInputHandler::CursorAtClosingPar()
+sal_Bool ScInputHandler::CursorAtClosingPar()
 {
     //	test if the cursor is before a closing parenthesis
 
@@ -1393,11 +1393,11 @@ BOOL ScInputHandler::CursorAtClosingPar()
     {
         ESelection aSel = pActiveView->GetSelection();
         xub_StrLen nPos = aSel.nStartPos;
-        String aFormula = pEngine->GetText((USHORT)0);
+        String aFormula = pEngine->GetText((sal_uInt16)0);
         if ( nPos < aFormula.Len() && aFormula.GetChar(nPos) == ')' )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 void ScInputHandler::SkipClosingPar()
@@ -1440,11 +1440,11 @@ void ScInputHandler::GetColData()
         else
         {
             pColumnData = new TypedScStrCollection;
-            pColumnData->SetCaseSensitive( TRUE );		// equal strings are handled in FindText
+            pColumnData->SetCaseSensitive( sal_True );		// equal strings are handled in FindText
         }
 
         pDoc->GetDataEntries( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(),
-                                *pColumnData, TRUE );
+                                *pColumnData, sal_True );
     }
 }
 
@@ -1458,7 +1458,7 @@ void ScInputHandler::UseColData()			// beim Tippen
         ESelection aSel = pActiveView->GetSelection();
         aSel.Adjust();
 
-        USHORT nParCnt = pEngine->GetParagraphCount();
+        sal_uInt16 nParCnt = pEngine->GetParagraphCount();
         if ( aSel.nEndPara+1 == nParCnt )
         {
             xub_StrLen nParLen = pEngine->GetTextLen( aSel.nEndPara );
@@ -1469,7 +1469,7 @@ void ScInputHandler::UseColData()			// beim Tippen
                 {
                     String aNew;
                     nAutoPos = SCPOS_INVALID;	// nix
-                    if ( pColumnData->FindText( aText, aNew, nAutoPos, FALSE ) )
+                    if ( pColumnData->FindText( aText, aNew, nAutoPos, sal_False ) )
                     {
                         //	#45434# durch dBase Import etc. koennen Umbrueche im String sein,
                         //	das wuerde hier mehrere Absaetze ergeben -> nicht gut
@@ -1480,7 +1480,7 @@ void ScInputHandler::UseColData()			// beim Tippen
                         //!	genaue Ersetzung im EnterHandler !!!
 
                         // ein Space zwischen Absaetzen:
-                        ULONG nEdLen = pEngine->GetTextLen() + nParCnt - 1;
+                        sal_uLong nEdLen = pEngine->GetTextLen() + nParCnt - 1;
                         String aIns = aNew.Copy( (xub_StrLen)nEdLen );
 
                         //	selection must be "backwards", so the cursor stays behind the last
@@ -1491,12 +1491,12 @@ void ScInputHandler::UseColData()			// beim Tippen
                         //	when editing in input line, apply to both edit views
                         if ( pTableView )
                         {
-                            pTableView->InsertText( aIns, FALSE );
+                            pTableView->InsertText( aIns, sal_False );
                             pTableView->SetSelection( aSelection );
                         }
                         if ( pTopView )
                         {
-                            pTopView->InsertText( aIns, FALSE );
+                            pTopView->InsertText( aIns, sal_False );
                             pTopView->SetSelection( aSelection );
                         }
 
@@ -1508,11 +1508,11 @@ void ScInputHandler::UseColData()			// beim Tippen
                             //	verschlucken, wenn noch etwas kommt
 
                             String aDummy;
-                            USHORT nNextPos = nAutoPos;
-                            bUseTab = pColumnData->FindText( aText, aDummy, nNextPos, FALSE );
+                            sal_uInt16 nNextPos = nAutoPos;
+                            bUseTab = pColumnData->FindText( aText, aDummy, nNextPos, sal_False );
                         }
                         else
-                            bUseTab = TRUE;
+                            bUseTab = sal_True;
                     }
                 }
             }
@@ -1520,7 +1520,7 @@ void ScInputHandler::UseColData()			// beim Tippen
     }
 }
 
-void ScInputHandler::NextAutoEntry( BOOL bBack )
+void ScInputHandler::NextAutoEntry( sal_Bool bBack )
 {
     EditView* pActiveView = pTopView ? pTopView : pTableView;
     if ( pActiveView && pColumnData )
@@ -1531,7 +1531,7 @@ void ScInputHandler::NextAutoEntry( BOOL bBack )
 
             ESelection aSel = pActiveView->GetSelection();
             aSel.Adjust();
-            USHORT nParCnt = pEngine->GetParagraphCount();
+            sal_uInt16 nParCnt = pEngine->GetParagraphCount();
             if ( aSel.nEndPara+1 == nParCnt && aSel.nStartPara == aSel.nEndPara )
             {
                 String aText = GetEditText(pEngine);
@@ -1542,7 +1542,7 @@ void ScInputHandler::NextAutoEntry( BOOL bBack )
                     String aNew;
                     if ( pColumnData->FindText( aAutoSearch, aNew, nAutoPos, bBack ) )
                     {
-                        bInOwnChange = TRUE;		// disable ModifyHdl (reset below)
+                        bInOwnChange = sal_True;		// disable ModifyHdl (reset below)
 
                         lcl_RemoveLineEnd( aNew );
                         String aIns = aNew.Copy( aAutoSearch.Len() );
@@ -1551,7 +1551,7 @@ void ScInputHandler::NextAutoEntry( BOOL bBack )
                         if ( pTableView )
                         {
                             pTableView->DeleteSelected();
-                            pTableView->InsertText( aIns, FALSE );
+                            pTableView->InsertText( aIns, sal_False );
                             pTableView->SetSelection( ESelection(
                                                         aSel.nEndPara, aSel.nStartPos + aIns.Len(),
                                                         aSel.nEndPara, aSel.nStartPos ) );
@@ -1559,13 +1559,13 @@ void ScInputHandler::NextAutoEntry( BOOL bBack )
                         if ( pTopView )
                         {
                             pTopView->DeleteSelected();
-                            pTopView->InsertText( aIns, FALSE );
+                            pTopView->InsertText( aIns, sal_False );
                             pTopView->SetSelection( ESelection(
                                                         aSel.nEndPara, aSel.nStartPos + aIns.Len(),
                                                         aSel.nEndPara, aSel.nStartPos ) );
                         }
 
-                        bInOwnChange = FALSE;
+                        bInOwnChange = sal_False;
                     }
                     else
                     {
@@ -1594,7 +1594,7 @@ void ScInputHandler::UpdateParenthesis()
 
     //!	Klammer-Hervorhebung einzeln abschaltbar ????
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if ( bFormulaMode && eMode != SC_INPUT_TOP )
     {
         if ( pTableView && !pTableView->HasSelection() )		// Selektion ist immer unten
@@ -1605,7 +1605,7 @@ void ScInputHandler::UpdateParenthesis()
                 //	Das Zeichen links vom Cursor wird angeschaut
 
                 xub_StrLen nPos = aSel.nStartPos - 1;
-                String aFormula = pEngine->GetText((USHORT)0);
+                String aFormula = pEngine->GetText((sal_uInt16)0);
                 sal_Unicode c = aFormula.GetChar(nPos);
                 if ( c == '(' || c == ')' )
                 {
@@ -1619,8 +1619,8 @@ void ScInputHandler::UpdateParenthesis()
                         if (bParenthesisShown)
                         {
                             //	alte Hervorhebung wegnehmen
-                            USHORT nCount = pEngine->GetParagraphCount();
-                            for (USHORT i=0; i<nCount; i++)
+                            sal_uInt16 nCount = pEngine->GetParagraphCount();
+                            for (sal_uInt16 i=0; i<nCount; i++)
                                 pEngine->QuickRemoveCharAttribs( i, EE_CHAR_WEIGHT );
                         }
 
@@ -1630,9 +1630,9 @@ void ScInputHandler::UpdateParenthesis()
                         pEngine->QuickSetAttribs( aSet, aSelOther );
 
                         //	Dummy-InsertText fuer Update und Paint (Selektion ist leer)
-                        pTableView->InsertText( EMPTY_STRING, FALSE );
+                        pTableView->InsertText( EMPTY_STRING, sal_False );
 
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
                 }
             }
@@ -1646,8 +1646,8 @@ void ScInputHandler::UpdateParenthesis()
 
     if ( bParenthesisShown && !bFound && pTableView )
     {
-        USHORT nCount = pEngine->GetParagraphCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pEngine->GetParagraphCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
             pTableView->RemoveCharAttribs( i, EE_CHAR_WEIGHT );
     }
 
@@ -1669,12 +1669,12 @@ void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) 	// wird synchron au
         //	Trotzdem wird immerhin der Editmodus beendet
 
         EnterHandler();
-        bFormulaMode = FALSE;
+        bFormulaMode = sal_False;
         pRefViewSh = NULL;
         SFX_APP()->Broadcast( SfxSimpleHint( FID_REFMODECHANGED ) );
         SC_MOD()->SetRefInputHdl(NULL);
         if (pInputWin)
-            pInputWin->SetFormulaMode(FALSE);
+            pInputWin->SetFormulaMode(sal_False);
         UpdateAutoCorrFlag();
     }
 
@@ -1703,11 +1703,11 @@ void ScInputHandler::UpdateActiveView()
                 pActiveViewSh->GetWindowByPos( pActiveViewSh->GetViewData()->GetEditActivePart() ) :
                 NULL;
 
-    USHORT nCount = pEngine->GetViewCount();
+    sal_uInt16 nCount = pEngine->GetViewCount();
     if (nCount > 0)
     {
         pTableView = pEngine->GetView(0);
-        for (USHORT i=1; i<nCount; i++)
+        for (sal_uInt16 i=1; i<nCount; i++)
         {
             EditView* pThis = pEngine->GetView(i);
             Window* pWin = pThis->GetWindow();
@@ -1724,7 +1724,7 @@ void ScInputHandler::UpdateActiveView()
         pTopView = NULL;
 }
 
-void ScInputHandler::StopInputWinEngine( BOOL bAll )
+void ScInputHandler::StopInputWinEngine( sal_Bool bAll )
 {
     if (pInputWin)
         pInputWin->StopEditEngine( bAll );
@@ -1742,9 +1742,9 @@ void ScInputHandler::ForgetLastPattern()
 {
     pLastPattern = NULL;
     if ( !pLastState && pActiveViewSh )
-        pActiveViewSh->UpdateInputHandler( TRUE );		// Status neu holen
+        pActiveViewSh->UpdateInputHandler( sal_True );		// Status neu holen
     else
-        NotifyChange( pLastState, TRUE );
+        NotifyChange( pLastState, sal_True );
 }
 
 void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
@@ -1754,7 +1754,7 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
     {
         case SVX_HOR_JUSTIFY_STANDARD:
             {
-                BOOL bNumber = FALSE;
+                sal_Bool bNumber = sal_False;
                 if (cTyped)										// neu angefangen
                     bNumber = (cTyped>='0' && cTyped<='9');		// nur Ziffern sind Zahlen
                 else if ( pActiveViewSh )
@@ -1779,7 +1779,7 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
             break;
     }
 
-    BOOL bAsianVertical = pLastPattern &&
+    sal_Bool bAsianVertical = pLastPattern &&
         ((const SfxBoolItem&)pLastPattern->GetItem( ATTR_STACKED )).GetValue() &&
         ((const SfxBoolItem&)pLastPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue();
     if ( bAsianVertical )
@@ -1791,7 +1791,7 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
     pEditDefaults->Put( SvxAdjustItem( eSvxAdjust, EE_PARA_JUST ) );
     pEngine->SetDefaults( *pEditDefaults );
 
-    nEditAdjust = sal::static_int_cast<USHORT>(eSvxAdjust);     //! set at ViewData or with PostEditView
+    nEditAdjust = sal::static_int_cast<sal_uInt16>(eSvxAdjust);     //! set at ViewData or with PostEditView
 
     pEngine->SetVertical( bAsianVertical );
 }
@@ -1800,15 +1800,15 @@ void ScInputHandler::RemoveAdjust()
 {
     //	harte Ausrichtungs-Attribute loeschen
 
-    BOOL bUndo = pEngine->IsUndoEnabled();
+    sal_Bool bUndo = pEngine->IsUndoEnabled();
     if ( bUndo )
-        pEngine->EnableUndo( FALSE );
+        pEngine->EnableUndo( sal_False );
 
     //	RemoveParaAttribs removes all paragraph attributes, including EE_PARA_JUST
 #if 0
-    BOOL bChange = FALSE;
-    USHORT nCount = pEngine->GetParagraphCount();
-    for (USHORT i=0; i<nCount; i++)
+    sal_Bool bChange = sal_False;
+    sal_uInt16 nCount = pEngine->GetParagraphCount();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         const SfxItemSet& rOld = pEngine->GetParaAttribs( i );
         if ( rOld.GetItemState( EE_PARA_JUST ) == SFX_ITEM_SET )
@@ -1816,7 +1816,7 @@ void ScInputHandler::RemoveAdjust()
             SfxItemSet aNew( rOld );
             aNew.ClearItem( EE_PARA_JUST );
             pEngine->SetParaAttribs( i, aNew );
-            bChange = TRUE;
+            bChange = sal_True;
         }
     }
 #endif
@@ -1826,14 +1826,14 @@ void ScInputHandler::RemoveAdjust()
     pEngine->RemoveParaAttribs();
 
     if ( bUndo )
-        pEngine->EnableUndo( TRUE );
+        pEngine->EnableUndo( sal_True );
 
     // ER 31.08.00  Only called in EnterHandler, don't change view anymore.
 #if 0
     if (bChange)
     {
         EditView* pActiveView = pTopView ? pTopView : pTableView;
-        pActiveView->ShowCursor( FALSE, TRUE );
+        pActiveView->ShowCursor( sal_False, sal_True );
     }
 #endif
 }
@@ -1842,23 +1842,23 @@ void ScInputHandler::RemoveRangeFinder()
 {
     //	pRangeFindList und Farben loeschen
 
-    pEngine->SetUpdateMode(FALSE);
-    USHORT nCount = pEngine->GetParagraphCount();	// koennte gerade neu eingefuegt worden sein
-    for (USHORT i=0; i<nCount; i++)
+    pEngine->SetUpdateMode(sal_False);
+    sal_uInt16 nCount = pEngine->GetParagraphCount();	// koennte gerade neu eingefuegt worden sein
+    for (sal_uInt16 i=0; i<nCount; i++)
         pEngine->QuickRemoveCharAttribs( i, EE_CHAR_COLOR );
-    pEngine->SetUpdateMode(TRUE);
+    pEngine->SetUpdateMode(sal_True);
 
     EditView* pActiveView = pTopView ? pTopView : pTableView;
-    pActiveView->ShowCursor( FALSE, TRUE );
+    pActiveView->ShowCursor( sal_False, sal_True );
 
     DeleteRangeFinder();		// loescht die Liste und die Markierungen auf der Tabelle
 }
 
-BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
+sal_Bool ScInputHandler::StartTable( sal_Unicode cTyped, sal_Bool bFromCommand )
 {
-    // returns TRUE if a new edit mode was started
+    // returns sal_True if a new edit mode was started
 
-    BOOL bNewTable = FALSE;
+    sal_Bool bNewTable = sal_False;
 
     if (!bModified && ValidCol(aCursorPos.Col()))
     {
@@ -1880,7 +1880,7 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
             if ( aTester.IsEditable() )
             {
                 // UpdateMode is enabled again in ScViewData::SetEditEngine (and not needed otherwise)
-                pEngine->SetUpdateMode( FALSE );
+                pEngine->SetUpdateMode( sal_False );
 
                 //	Attribute in EditEngine uebernehmen
 
@@ -1894,18 +1894,18 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
                     const SfxItemSet& rAttrSet = pPattern->GetItemSet();
                     const SfxPoolItem* pItem;
 
-                    if ( SFX_ITEM_SET == rAttrSet.GetItemState( ATTR_VALUE_FORMAT, TRUE, &pItem ) )
+                    if ( SFX_ITEM_SET == rAttrSet.GetItemState( ATTR_VALUE_FORMAT, sal_True, &pItem ) )
                     {
-                        ULONG nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
+                        sal_uLong nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
                         bCellHasPercentFormat = ( NUMBERFORMAT_PERCENT ==
                                                   pDoc->GetFormatTable()->GetType( nFormat ) );
                     }
                     else
-                        bCellHasPercentFormat = FALSE; // Default: kein Prozent
+                        bCellHasPercentFormat = sal_False; // Default: kein Prozent
 
                     //	Gueltigkeit angegeben?
 
-                    if ( SFX_ITEM_SET == rAttrSet.GetItemState( ATTR_VALIDDATA, TRUE, &pItem ) )
+                    if ( SFX_ITEM_SET == rAttrSet.GetItemState( ATTR_VALIDDATA, sal_True, &pItem ) )
                         nValidation = ((const SfxUInt32Item*)pItem)->GetValue();
                     else
                         nValidation = 0;
@@ -1931,7 +1931,7 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
                     Color aBackCol = ((const SvxBrushItem&)
                                     pPattern->GetItem( ATTR_BACKGROUND )).GetColor();
                     ScModule* pScMod = SC_MOD();
-                    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+                    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
                     if ( aBackCol.GetTransparency() > 0 ||
                             Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
                         aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
@@ -1952,7 +1952,7 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
                 //	UpdateSpellSettings enables online spelling if needed
                 //	-> also call if attributes are unchanged
 
-                UpdateSpellSettings( TRUE );	// uses pLastPattern
+                UpdateSpellSettings( sal_True );	// uses pLastPattern
 
                 //	Edit-Engine fuellen
 
@@ -1961,7 +1961,7 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
                 {
                     pEngine->SetText(aCurrentText);
                     aStr = aCurrentText;
-                    bTextValid = FALSE;
+                    bTextValid = sal_False;
                     aCurrentText.Erase();
                 }
                 else
@@ -1988,13 +1988,13 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
                      !cTyped && !bCreatingFuncView )
                     InitRangeFinder(aStr);				// Formel wird editiert -> RangeFinder
 
-                bNewTable = TRUE;		//	-> PostEditView-Aufruf
+                bNewTable = sal_True;		//	-> PostEditView-Aufruf
             }
             else
             {
-                bProtected = TRUE;
+                bProtected = sal_True;
                 eMode = SC_INPUT_NONE;
-                StopInputWinEngine( TRUE );
+                StopInputWinEngine( sal_True );
                 UpdateFormulaMode();
                 if ( pActiveViewSh && ( !bFromCommand || !bCommandErrorShown ) )
                 {
@@ -2003,7 +2003,7 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
                     //	Set the flag before showing the error message because the command handler
                     //	for the next IME command may be called when showing the dialog.
                     if ( bFromCommand )
-                        bCommandErrorShown = TRUE;
+                        bCommandErrorShown = sal_True;
 
                     pActiveViewSh->GetActiveWin()->GrabFocus();
                     pActiveViewSh->ErrorMessage(aTester.GetMessageId());
@@ -2023,7 +2023,7 @@ void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel )
     DBG_ASSERT( rSel.nStartPara==0 && rSel.nEndPara==0, "SetTopSelection: Para != 0" );
 
     EditEngine* pEngine = pEditView->GetEditEngine();
-    USHORT nCount = pEngine->GetParagraphCount();
+    sal_uInt16 nCount = pEngine->GetParagraphCount();
     if (nCount > 1)
     {
         xub_StrLen nParLen = pEngine->GetTextLen(rSel.nStartPara);
@@ -2082,17 +2082,17 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG )
     return 0;
 }
 
-BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand )		// return TRUE = new view created
+sal_Bool ScInputHandler::DataChanging( sal_Unicode cTyped, sal_Bool bFromCommand )		// return sal_True = new view created
 {
-    bInOwnChange = TRUE;				// disable ModifyHdl (reset in DataChanged)
+    bInOwnChange = sal_True;				// disable ModifyHdl (reset in DataChanged)
 
     if ( eMode == SC_INPUT_NONE )
         return StartTable( cTyped, bFromCommand );
     else
-        return FALSE;
+        return sal_False;
 }
 
-void ScInputHandler::DataChanged( BOOL bFromTopNotify )
+void ScInputHandler::DataChanged( sal_Bool bFromTopNotify )
 {
     ImplCreateEditEngine();
 
@@ -2103,7 +2103,7 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
     {
         //	table EditEngine is formatted below, input line needs formatting after paste
         //	#i20282# not when called from the input line's modify handler
-        pTopView->GetEditEngine()->QuickFormatDoc( TRUE );
+        pTopView->GetEditEngine()->QuickFormatDoc( sal_True );
 
         //	#i23720# QuickFormatDoc hides the cursor, but can't show it again because it
         //	can't safely access the EditEngine's current view, so the cursor has to be
@@ -2111,8 +2111,8 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
         pTopView->ShowCursor();
     }
 
-    bModified = TRUE;
-    bSelIsRef = FALSE;
+    bModified = sal_True;
+    bSelIsRef = sal_False;
 
     if ( pRangeFindList && !bInRangeUpdate )
         RemoveRangeFinder();					// Attribute und Markierung loeschen
@@ -2144,7 +2144,7 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
     {
         ScViewData* pViewData = pActiveViewSh->GetViewData();
 
-        BOOL bNeedGrow = ( nEditAdjust != SVX_ADJUST_LEFT );		// rechtsbuendig immer
+        sal_Bool bNeedGrow = ( nEditAdjust != SVX_ADJUST_LEFT );		// rechtsbuendig immer
         if (!bNeedGrow)
         {
                 //	Cursor vor dem Ende?
@@ -2165,8 +2165,8 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
     }
 
     UpdateFormulaMode();
-    bTextValid = FALSE;			// Aenderungen sind nur in der Edit-Engine
-    bInOwnChange = FALSE;
+    bTextValid = sal_False;			// Aenderungen sind nur in der Edit-Engine
+    bInOwnChange = sal_False;
 }
 
 void ScInputHandler::UpdateFormulaMode()
@@ -2174,19 +2174,19 @@ void ScInputHandler::UpdateFormulaMode()
     SfxApplication* pSfxApp = SFX_APP();
 
     if ( pEngine->GetParagraphCount() == 1 &&
-         ( pEngine->GetText((USHORT)0).GetChar(0) == '=' ||
-           pEngine->GetText((USHORT)0).GetChar(0) == '+' ||
-           pEngine->GetText((USHORT)0).GetChar(0) == '-' ) &&
+         ( pEngine->GetText((sal_uInt16)0).GetChar(0) == '=' ||
+           pEngine->GetText((sal_uInt16)0).GetChar(0) == '+' ||
+           pEngine->GetText((sal_uInt16)0).GetChar(0) == '-' ) &&
          !bProtected )
     {
         if (!bFormulaMode)
         {
-            bFormulaMode = TRUE;
+            bFormulaMode = sal_True;
             pRefViewSh = pActiveViewSh;
             pSfxApp->Broadcast( SfxSimpleHint( FID_REFMODECHANGED ) );
             SC_MOD()->SetRefInputHdl(this);
             if (pInputWin)
-                pInputWin->SetFormulaMode(TRUE);
+                pInputWin->SetFormulaMode(sal_True);
 
             if ( bAutoComplete )
                 GetFormulaData();
@@ -2200,12 +2200,12 @@ void ScInputHandler::UpdateFormulaMode()
         if (bFormulaMode)
         {
             ShowRefFrame();
-            bFormulaMode = FALSE;
+            bFormulaMode = sal_False;
             pRefViewSh = NULL;
             pSfxApp->Broadcast( SfxSimpleHint( FID_REFMODECHANGED ) );
             SC_MOD()->SetRefInputHdl(NULL);
             if (pInputWin)
-                pInputWin->SetFormulaMode(FALSE);
+                pInputWin->SetFormulaMode(sal_False);
             UpdateAutoCorrFlag();
         }
     }
@@ -2219,13 +2219,13 @@ void ScInputHandler::ShowRefFrame()
     ScTabViewShell* pVisibleSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
     if ( pRefViewSh && pRefViewSh != pVisibleSh )
     {
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         SfxViewFrame* pRefFrame = pRefViewSh->GetViewFrame();
         SfxViewFrame* pOneFrame = SfxViewFrame::GetFirst();
         while ( pOneFrame && !bFound )
         {
             if ( pOneFrame == pRefFrame )
-                bFound = TRUE;
+                bFound = sal_True;
             pOneFrame = SfxViewFrame::GetNext( *pOneFrame );
         }
 
@@ -2298,35 +2298,35 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
     if (bProtected)
     {
         eMode = SC_INPUT_NONE;
-        StopInputWinEngine( TRUE );
+        StopInputWinEngine( sal_True );
         if (pActiveViewSh)
             pActiveViewSh->GetActiveWin()->GrabFocus();
         return;
     }
 
-    bInOwnChange = TRUE;				// disable ModifyHdl (reset below)
+    bInOwnChange = sal_True;				// disable ModifyHdl (reset below)
 
     ScInputMode eOldMode = eMode;
     eMode = eNewMode;
     if (eOldMode == SC_INPUT_TOP && eNewMode != eOldMode)
-        StopInputWinEngine( FALSE );
+        StopInputWinEngine( sal_False );
 
     if (eMode==SC_INPUT_TOP || eMode==SC_INPUT_TABLE)
     {
         if (eOldMode == SC_INPUT_NONE)		// not when switching between modes
         {
-            if (StartTable(0, FALSE))		// 0 = look at existing document content for text or number
+            if (StartTable(0, sal_False))		// 0 = look at existing document content for text or number
             {
                 if (pActiveViewSh)
                     pActiveViewSh->GetViewData()->GetDocShell()->PostEditView( pEngine, aCursorPos );
             }
         }
 
-        USHORT nPara    = pEngine->GetParagraphCount()-1;
+        sal_uInt16 nPara    = pEngine->GetParagraphCount()-1;
         xub_StrLen nLen = pEngine->GetText(nPara).Len();
-        USHORT nCount   = pEngine->GetViewCount();
+        sal_uInt16 nCount   = pEngine->GetViewCount();
 
-        for (USHORT i=0; i<nCount; i++)
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             if ( eMode == SC_INPUT_TABLE && eOldMode == SC_INPUT_TOP )
             {
@@ -2337,7 +2337,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
                 pEngine->GetView(i)->
                     SetSelection( ESelection( nPara, nLen, nPara, nLen ) );
             }
-            pEngine->GetView(i)->ShowCursor(FALSE);
+            pEngine->GetView(i)->ShowCursor(sal_False);
         }
     }
 
@@ -2345,34 +2345,34 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
     if (eMode==SC_INPUT_TABLE || eMode==SC_INPUT_TYPE)
     {
         if (pTableView)
-            pTableView->SetEditEngineUpdateMode(TRUE);
+            pTableView->SetEditEngineUpdateMode(sal_True);
     }
     else
     {
         if (pTopView)
-            pTopView->SetEditEngineUpdateMode(TRUE);
+            pTopView->SetEditEngineUpdateMode(sal_True);
     }
 
     if (eNewMode != eOldMode)
         UpdateFormulaMode();
 
-    bInOwnChange = FALSE;
+    bInOwnChange = sal_False;
 }
 
 //----------------------------------------------------------------------------------------
 
-//	lcl_IsNumber - TRUE, wenn nur Ziffern (dann keine Autokorrektur)
+//	lcl_IsNumber - sal_True, wenn nur Ziffern (dann keine Autokorrektur)
 
-BOOL lcl_IsNumber(const String& rString)
+sal_Bool lcl_IsNumber(const String& rString)
 {
     xub_StrLen nLen = rString.Len();
     for (xub_StrLen i=0; i<nLen; i++)
     {
         sal_Unicode c = rString.GetChar(i);
         if ( c < '0' || c > '9' )
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void lcl_SelectionToEnd( EditView* pView )
@@ -2380,7 +2380,7 @@ void lcl_SelectionToEnd( EditView* pView )
     if ( pView )
     {
         EditEngine* pEngine = pView->GetEditEngine();
-        USHORT nParCnt = pEngine->GetParagraphCount();
+        sal_uInt16 nParCnt = pEngine->GetParagraphCount();
         if ( nParCnt == 0 )
             nParCnt = 1;
         ESelection aSel( nParCnt-1, pEngine->GetTextLen(nParCnt-1) );   // empty selection, cursor at the end
@@ -2388,24 +2388,24 @@ void lcl_SelectionToEnd( EditView* pView )
     }
 }
 
-void ScInputHandler::EnterHandler( BYTE nBlockMode )
+void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
 {
     //	#62806# Bei Makro-Aufrufen fuer Gueltigkeit kann Tod und Teufel passieren,
     //	darum dafuer sorgen, dass EnterHandler nicht verschachtelt gerufen wird:
 
     if (bInEnterHandler) return;
-    bInEnterHandler = TRUE;
-    bInOwnChange = TRUE;				// disable ModifyHdl (reset below)
+    bInEnterHandler = sal_True;
+    bInOwnChange = sal_True;				// disable ModifyHdl (reset below)
 
     ImplCreateEditEngine();
 
-    BOOL bMatrix = ( nBlockMode == SC_ENTER_MATRIX );
+    sal_Bool bMatrix = ( nBlockMode == SC_ENTER_MATRIX );
 
     SfxApplication*	pSfxApp		= SFX_APP();
     EditTextObject* pObject		= NULL;
     ScPatternAttr*	pCellAttrs	= NULL;
-    BOOL			bAttrib		= FALSE;	// Formatierung vorhanden ?
-    BOOL			bForget		= FALSE;	// wegen Gueltigkeit streichen ?
+    sal_Bool			bAttrib		= sal_False;	// Formatierung vorhanden ?
+    sal_Bool			bForget		= sal_False;	// wegen Gueltigkeit streichen ?
 
     String aString = GetEditText(pEngine);
     EditView* pActiveView = pTopView ? pTopView : pTableView;
@@ -2438,7 +2438,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
         {
             // #i67990# don't use pLastPattern in EnterHandler
             const ScPatternAttr* pPattern = pDoc->GetPattern( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab() );
-            BOOL bOk = pData->IsDataValid( aString, *pPattern, aCursorPos );
+            sal_Bool bOk = pData->IsDataValid( aString, *pPattern, aCursorPos );
 
             if (!bOk)
             {
@@ -2450,7 +2450,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
 
                 Window* pParent = Application::GetDefDialogParent();
                 if ( pData->DoError( pParent, aString, aCursorPos ) )
-                    bForget = TRUE;					// Eingabe nicht uebernehmen
+                    bForget = sal_True;					// Eingabe nicht uebernehmen
             }
         }
     }
@@ -2467,12 +2467,12 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
             // or an invalid action - normal cell input is always aborted
 
             pActiveViewSh->DataPilotInput( aCursorPos, aString );
-            bForget = TRUE;
+            bForget = sal_True;
         }
     }
 
     pEngine->CompleteOnlineSpelling();
-    BOOL bSpellErrors = !bFormulaMode && pEngine->HasOnlineSpellErrors();
+    sal_Bool bSpellErrors = !bFormulaMode && pEngine->HasOnlineSpellErrors();
     if ( bSpellErrors )
     {
         //	#i3820# If the spell checker flags numerical input as error,
@@ -2489,7 +2489,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
             double nVal;
             if ( pFormatter->IsNumberFormat( aString, nFormat, nVal ) )
             {
-                bSpellErrors = FALSE;		// ignore the spelling errors
+                bSpellErrors = sal_False;		// ignore the spelling errors
             }
         }
     }
@@ -2497,11 +2497,11 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
     //	After RemoveAdjust, the EditView must not be repainted (has wrong font size etc).
     //	SetUpdateMode must come after CompleteOnlineSpelling.
     //	The view is hidden in any case below (Broadcast).
-    pEngine->SetUpdateMode( FALSE );
+    pEngine->SetUpdateMode( sal_False );
 
     if ( bModified && !bForget )			// was wird eingeben (Text/Objekt) ?
     {
-        USHORT nParCnt = pEngine->GetParagraphCount();
+        sal_uInt16 nParCnt = pEngine->GetParagraphCount();
         if ( nParCnt == 0 )
             nParCnt = 1;
         ESelection aSel( 0, 0, nParCnt-1, pEngine->GetTextLen(nParCnt-1) );
@@ -2513,9 +2513,9 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
         if ( pActiveViewSh )
         {
             SfxItemSet* pCommonAttrs = NULL;
-            for (USHORT nId = EE_CHAR_START; nId <= EE_CHAR_END; nId++)
+            for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END; nId++)
             {
-                SfxItemState eState = aOldAttribs.GetItemState( nId, FALSE, &pItem );
+                SfxItemState eState = aOldAttribs.GetItemState( nId, sal_False, &pItem );
                 if ( eState == SFX_ITEM_SET &&
                         nId != EE_CHAR_ESCAPEMENT && nId != EE_CHAR_PAIRKERNING &&
                         nId != EE_CHAR_KERNING && nId != EE_CHAR_XMLATTRIBS &&
@@ -2543,14 +2543,14 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
         //	check if EditObject is needed
 
         if ( bSpellErrors || nParCnt > 1 )
-            bAttrib = TRUE;
+            bAttrib = sal_True;
         else
         {
-            for (USHORT nId = EE_CHAR_START; nId <= EE_CHAR_END && !bAttrib; nId++)
+            for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END && !bAttrib; nId++)
             {
-                SfxItemState eState = aOldAttribs.GetItemState( nId, FALSE, &pItem );
+                SfxItemState eState = aOldAttribs.GetItemState( nId, sal_False, &pItem );
                 if (eState == SFX_ITEM_DONTCARE)
-                    bAttrib = TRUE;
+                    bAttrib = sal_True;
                 else if (eState == SFX_ITEM_SET)
                 {
                     //	keep same items in EditEngine as in ScEditAttrTester
@@ -2558,34 +2558,34 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
                          nId == EE_CHAR_KERNING || nId == EE_CHAR_XMLATTRIBS )
                     {
                         if ( *pItem != pEditDefaults->Get(nId) )
-                            bAttrib = TRUE;
+                            bAttrib = sal_True;
                     }
                 }
             }
 
             //	Feldbefehle enthalten?
 
-            SfxItemState eFieldState = aOldAttribs.GetItemState( EE_FEATURE_FIELD, FALSE );
+            SfxItemState eFieldState = aOldAttribs.GetItemState( EE_FEATURE_FIELD, sal_False );
             if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
-                bAttrib = TRUE;
+                bAttrib = sal_True;
 
             //	not converted characters?
 
-            SfxItemState eConvState = aOldAttribs.GetItemState( EE_FEATURE_NOTCONV, FALSE );
+            SfxItemState eConvState = aOldAttribs.GetItemState( EE_FEATURE_NOTCONV, sal_False );
             if ( eConvState == SFX_ITEM_DONTCARE || eConvState == SFX_ITEM_SET )
-                bAttrib = TRUE;
+                bAttrib = sal_True;
 
             //	Formeln immer als Formeln erkennen (#38309#)
             //	(der Test vorher ist trotzdem noetig wegen Zell-Attributen)
         }
 
         if (bMatrix)
-            bAttrib = FALSE;
+            bAttrib = sal_False;
 
         if (bAttrib)
         {
-            ULONG nCtrl = pEngine->GetControlWord();
-            ULONG nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
+            sal_uLong nCtrl = pEngine->GetControlWord();
+            sal_uLong nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
             if ( ( nCtrl & EE_CNTRL_ALLOWBIGOBJS ) != nWantBig )
                 pEngine->SetControlWord( (nCtrl & ~EE_CNTRL_ALLOWBIGOBJS) | nWantBig );
             pObject = pEngine->CreateTextObject();
@@ -2597,7 +2597,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
 
             //!	effizienter in der Liste suchen (ScUserList, nur einmal ToUpper)
 
-            USHORT nIndex;
+            sal_uInt16 nIndex;
             ScUserListData* pData = ScGlobal::GetUserList()->GetData(aString);
             if ( pData && pData->GetSubIndex( aString, nIndex ) )
                 aString = pData->GetSubStr( nIndex );
@@ -2619,23 +2619,23 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
             pExecuteSh->ActiveGrabFocus();
         }
 
-        bFormulaMode = FALSE;
+        bFormulaMode = sal_False;
         pSfxApp->Broadcast( SfxSimpleHint( FID_REFMODECHANGED ) );
         SC_MOD()->SetRefInputHdl(NULL);
         if (pInputWin)
-            pInputWin->SetFormulaMode(FALSE);
+            pInputWin->SetFormulaMode(sal_False);
         UpdateAutoCorrFlag();
     }
     pRefViewSh = NULL;			// auch ohne FormulaMode wegen Funktions-AP
     DeleteRangeFinder();
     ResetAutoPar();
 
-    BOOL bOldMod = bModified;
+    sal_Bool bOldMod = bModified;
 
-    bModified = FALSE;
-    bSelIsRef = FALSE;
+    bModified = sal_False;
+    bSelIsRef = sal_False;
     eMode 	  = SC_INPUT_NONE;
-    StopInputWinEngine( TRUE );
+    StopInputWinEngine( sal_True );
 
     // #123344# Text input (through number formats) or ApplySelectionPattern modify
     // the cell's attributes, so pLastPattern is no longer valid
@@ -2682,7 +2682,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
         {
             SfxBindings& rBindings = pExecuteSh->GetViewFrame()->GetBindings();
 
-            USHORT nId = FID_INPUTLINE_ENTER;
+            sal_uInt16 nId = FID_INPUTLINE_ENTER;
             if ( nBlockMode == SC_ENTER_BLOCK )
                 nId = FID_INPUTLINE_BLOCK;
             else if ( nBlockMode == SC_ENTER_MATRIX )
@@ -2706,7 +2706,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
     if ( bOldMod && pExecuteSh && pCellAttrs && !bForget )
     {
         //	mit Eingabe zusammenfassen ?
-        pExecuteSh->ApplySelectionPattern( *pCellAttrs, TRUE, TRUE );
+        pExecuteSh->ApplySelectionPattern( *pCellAttrs, sal_True, sal_True );
         pExecuteSh->AdjustBlockHeight();
     }
 
@@ -2719,17 +2719,17 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
     nFormSelStart = nFormSelEnd = 0;
     aFormText.Erase();
 
-    bInOwnChange = FALSE;
-    bInEnterHandler = FALSE;
+    bInOwnChange = sal_False;
+    bInEnterHandler = sal_False;
 }
 
 void ScInputHandler::CancelHandler()
 {
-    bInOwnChange = TRUE;				// disable ModifyHdl (reset below)
+    bInOwnChange = sal_True;				// disable ModifyHdl (reset below)
 
     ImplCreateEditEngine();
 
-    bModified = FALSE;
+    bModified = sal_False;
 
     //	don't rely on ShowRefFrame switching the active view synchronously
     //	execute the function directly on the correct view's bindings instead
@@ -2744,11 +2744,11 @@ void ScInputHandler::CancelHandler()
             pExecuteSh->SetTabNo(aCursorPos.Tab());
             pExecuteSh->ActiveGrabFocus();
         }
-        bFormulaMode = FALSE;
+        bFormulaMode = sal_False;
         SFX_APP()->Broadcast( SfxSimpleHint( FID_REFMODECHANGED ) );
         SC_MOD()->SetRefInputHdl(NULL);
         if (pInputWin)
-            pInputWin->SetFormulaMode(FALSE);
+            pInputWin->SetFormulaMode(sal_False);
         UpdateAutoCorrFlag();
     }
     pRefViewSh = NULL;			// auch ohne FormulaMode wegen Funktions-AP
@@ -2756,7 +2756,7 @@ void ScInputHandler::CancelHandler()
     ResetAutoPar();
 
     eMode = SC_INPUT_NONE;
-    StopInputWinEngine( TRUE );
+    StopInputWinEngine( sal_True );
     if (pExecuteSh)
         pExecuteSh->StopEditShell();
 
@@ -2764,17 +2764,17 @@ void ScInputHandler::CancelHandler()
     pEngine->SetText(String());
 
     if ( !pLastState && pExecuteSh )
-        pExecuteSh->UpdateInputHandler( TRUE );		// Status neu holen
+        pExecuteSh->UpdateInputHandler( sal_True );		// Status neu holen
     else
-        NotifyChange( pLastState, TRUE );
+        NotifyChange( pLastState, sal_True );
 
     nFormSelStart = nFormSelEnd = 0;
     aFormText.Erase();
 
-    bInOwnChange = FALSE;
+    bInOwnChange = sal_False;
 }
 
-BOOL ScInputHandler::IsModalMode( SfxObjectShell* pDocSh )
+sal_Bool ScInputHandler::IsModalMode( SfxObjectShell* pDocSh )
 {
     //	Referenzen auf unbenanntes Dokument gehen nicht
 
@@ -2794,9 +2794,9 @@ void ScInputHandler::AddRefEntry()
 
     RemoveSelection();
     if (pTableView)
-        pTableView->InsertText( cSep, FALSE );
+        pTableView->InsertText( cSep, sal_False );
     if (pTopView)
-        pTopView->InsertText( cSep, FALSE );
+        pTopView->InsertText( cSep, sal_False );
 
     DataChanged();
 }
@@ -2805,7 +2805,7 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc )
 {
     HideTip();
 
-    BOOL bOtherDoc = ( pRefViewSh &&
+    sal_Bool bOtherDoc = ( pRefViewSh &&
                         pRefViewSh->GetViewData()->GetDocument() != pDoc );
     if (bOtherDoc)
         if (!pDoc->GetDocumentShell()->HasName())
@@ -2885,17 +2885,17 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc )
     if (pTableView || pTopView)
     {
         if (pTableView)
-            pTableView->InsertText( aRefStr, TRUE );
+            pTableView->InsertText( aRefStr, sal_True );
         if (pTopView)
-            pTopView->InsertText( aRefStr, TRUE );
+            pTopView->InsertText( aRefStr, sal_True );
 
         DataChanged();
     }
 
-    bSelIsRef = TRUE;
+    bSelIsRef = sal_True;
 }
 
-void ScInputHandler::InsertFunction( const String& rFuncName, BOOL bAddPar )
+void ScInputHandler::InsertFunction( const String& rFuncName, sal_Bool bAddPar )
 {
     if ( eMode == SC_INPUT_NONE )
     {
@@ -2915,7 +2915,7 @@ void ScInputHandler::InsertFunction( const String& rFuncName, BOOL bAddPar )
 
     if (pTableView)
     {
-        pTableView->InsertText( aText, FALSE );
+        pTableView->InsertText( aText, sal_False );
         if (bAddPar)
         {
             ESelection aSel = pTableView->GetSelection();
@@ -2926,7 +2926,7 @@ void ScInputHandler::InsertFunction( const String& rFuncName, BOOL bAddPar )
     }
     if (pTopView)
     {
-        pTopView->InsertText( aText, FALSE );
+        pTopView->InsertText( aText, sal_False );
         if (bAddPar)
         {
             ESelection aSel = pTopView->GetSelection();
@@ -2971,51 +2971,51 @@ void ScInputHandler::ClearText()
     DataChanged();
 }
 
-BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE */ )
+sal_Bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, sal_Bool bStartEdit /* = sal_False */ )
 {
     if (!bOptLoaded)
     {
         bAutoComplete = SC_MOD()->GetAppOptions().GetAutoComplete();
-        bOptLoaded = TRUE;
+        bOptLoaded = sal_True;
     }
 
     KeyCode aCode = rKEvt.GetKeyCode();
-    USHORT nModi  = aCode.GetModifier();
-    BOOL bShift   = aCode.IsShift();
-    BOOL bControl = aCode.IsMod1();
-    BOOL bAlt	  = aCode.IsMod2();
-    USHORT nCode  = aCode.GetCode();
+    sal_uInt16 nModi  = aCode.GetModifier();
+    sal_Bool bShift   = aCode.IsShift();
+    sal_Bool bControl = aCode.IsMod1();
+    sal_Bool bAlt	  = aCode.IsMod2();
+    sal_uInt16 nCode  = aCode.GetCode();
     sal_Unicode nChar = rKEvt.GetCharCode();
 
     //	Alt-Return is accepted, everything else with ALT, or CTRL-TAB are not:
     if (( bAlt && !bControl && nCode != KEY_RETURN ) ||
             ( bControl && aCode.GetCode() == KEY_TAB ))
-        return FALSE;
+        return sal_False;
 
-    BOOL bInputLine = ( eMode==SC_INPUT_TOP );
+    sal_Bool bInputLine = ( eMode==SC_INPUT_TOP );
 
-    BOOL bUsed = FALSE;
-    BOOL bSkip = FALSE;
-    BOOL bDoEnter = FALSE;
+    sal_Bool bUsed = sal_False;
+    sal_Bool bSkip = sal_False;
+    sal_Bool bDoEnter = sal_False;
 
     switch ( nCode )
     {
         case KEY_RETURN:
             if (bControl && !bShift && !bInputLine)
-                bDoEnter = TRUE;
+                bDoEnter = sal_True;
             else if ( nModi == 0 && nTipVisible && pFormulaData && nAutoPos != SCPOS_INVALID )
             {
                 PasteFunctionData();
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             else if ( nModi == 0 && nTipVisible && aManualTip.Len() )
             {
                 PasteManualTip();
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             else
             {
-                BYTE nMode = SC_ENTER_NORMAL;
+                sal_uInt8 nMode = SC_ENTER_NORMAL;
                 if ( bShift && bControl )
                     nMode = SC_ENTER_MATRIX;
                 else if ( bAlt )
@@ -3025,7 +3025,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
                 if (pActiveViewSh)
                     pActiveViewSh->MoveCursorEnter( bShift && !bControl );
 
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             break;
         case KEY_TAB:
@@ -3052,33 +3052,33 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
                     if (pActiveViewSh)
                         pActiveViewSh->FindNextUnprot( bShift );
                 }
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             break;
         case KEY_ESCAPE:
             if ( nTipVisible )
             {
                 HideTip();
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             else if( nTipVisibleSec )
             {
                 HideTipBelow();
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             else if (eMode != SC_INPUT_NONE)
             {
                 CancelHandler();
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             else
-                bSkip = TRUE;
+                bSkip = sal_True;
             break;
         case KEY_F2:
             if ( !bShift && !bControl && !bAlt && eMode == SC_INPUT_TABLE )
             {
                 eMode = SC_INPUT_TYPE;
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             break;
     }
@@ -3086,8 +3086,8 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
     //	Cursortasten nur ausfuehren, wenn schon im Edit-Modus
     //	z.B. wegen Shift-Ctrl-PageDn (ist nicht als Accelerator definiert)
 
-    BOOL bCursorKey = EditEngine::DoesKeyMoveCursor(rKEvt);
-    BOOL bInsKey = ( nCode == KEY_INSERT && !nModi );	// Insert wie Cursortasten behandeln
+    sal_Bool bCursorKey = EditEngine::DoesKeyMoveCursor(rKEvt);
+    sal_Bool bInsKey = ( nCode == KEY_INSERT && !nModi );	// Insert wie Cursortasten behandeln
     if ( !bUsed && !bSkip && ( bDoEnter || EditEngine::DoesKeyChangeText(rKEvt) ||
                     ( eMode != SC_INPUT_NONE && ( bCursorKey || bInsKey ) ) ) )
     {
@@ -3097,14 +3097,14 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
         if (bSelIsRef)
         {
             RemoveSelection();
-            bSelIsRef = FALSE;
+            bSelIsRef = sal_False;
         }
 
         UpdateActiveView();
-        BOOL bNewView = DataChanging( nChar );
+        sal_Bool bNewView = DataChanging( nChar );
 
         if (bProtected)								// Zelle geschuetzt?
-            bUsed = TRUE;							// Key-Event nicht weiterleiten
+            bUsed = sal_True;							// Key-Event nicht weiterleiten
         else										// Aenderungen erlaubt
         {
             if (bNewView )							// neu anlegen
@@ -3141,37 +3141,37 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
 
             if (pTableView || pTopView)
             {
-//				pActiveView->SetEditEngineUpdateMode(TRUE); 		//! gibt Muell !!!!
+//				pActiveView->SetEditEngineUpdateMode(sal_True); 		//! gibt Muell !!!!
 
                 if (bDoEnter)
                 {
                     if (pTableView)
                         if( pTableView->PostKeyEvent( KeyEvent( CHAR_CR, KeyCode(KEY_RETURN) ) ) )
-                            bUsed = TRUE;
+                            bUsed = sal_True;
                     if (pTopView)
                         if( pTopView->PostKeyEvent( KeyEvent( CHAR_CR, KeyCode(KEY_RETURN) ) ) )
-                            bUsed = TRUE;
+                            bUsed = sal_True;
                 }
                 else if ( nAutoPar && nChar == ')' && CursorAtClosingPar() )
                 {
                     SkipClosingPar();
-                    bUsed = TRUE;
+                    bUsed = sal_True;
                 }
                 else
                 {
                     if (pTableView)
                         if ( pTableView->PostKeyEvent( rKEvt ) )
-                            bUsed = TRUE;
+                            bUsed = sal_True;
                     if (pTopView)
                         if ( pTopView->PostKeyEvent( rKEvt ) )
-                            bUsed = TRUE;
+                            bUsed = sal_True;
                 }
 
                 //	Auto-Eingabe:
 
                 if ( bUsed && bAutoComplete )
                 {
-                    bUseTab = FALSE;
+                    bUseTab = sal_False;
                     nAutoPos = SCPOS_INVALID;						// do not search further
 
                     KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction();
@@ -3213,9 +3213,9 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
     return bUsed;
 }
 
-BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
+sal_Bool ScInputHandler::InputCommand( const CommandEvent& rCEvt, sal_Bool bForce )
 {
-    BOOL bUsed = FALSE;
+    sal_Bool bUsed = sal_False;
 
     if ( rCEvt.GetCommand() == COMMAND_CURSORPOS )
     {
@@ -3230,7 +3230,7 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
                     pTableView->Command( rCEvt );
                 else if (pTopView)						// call only once
                     pTopView->Command( rCEvt );
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
         }
     }
@@ -3241,7 +3241,7 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
             if (!bOptLoaded)
             {
                 bAutoComplete = SC_MOD()->GetAppOptions().GetAutoComplete();
-                bOptLoaded = TRUE;
+                bOptLoaded = sal_True;
             }
 
             HideTip();
@@ -3250,14 +3250,14 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
             if ( bSelIsRef )
             {
                 RemoveSelection();
-                bSelIsRef = FALSE;
+                bSelIsRef = sal_False;
             }
 
             UpdateActiveView();
-            BOOL bNewView = DataChanging( 0, TRUE );
+            sal_Bool bNewView = DataChanging( 0, sal_True );
 
             if (bProtected)								// cell protected
-                bUsed = TRUE;							// event is used
+                bUsed = sal_True;							// event is used
             else										// changes allowed
             {
                 if (bNewView)							// create new edit view
@@ -3290,7 +3290,7 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
                     if (pTopView)
                         pTopView->Command( rCEvt );
 
-                    bUsed = TRUE;
+                    bUsed = sal_True;
 
                     if ( rCEvt.GetCommand() == COMMAND_ENDEXTTEXTINPUT )
                     {
@@ -3317,26 +3317,26 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
 }
 
 void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
-                                   BOOL bForce, ScTabViewShell* pSourceSh,
-                                   BOOL bStopEditing)
+                                   sal_Bool bForce, ScTabViewShell* pSourceSh,
+                                   sal_Bool bStopEditing)
 {
     //	#62806# Wenn der Aufruf aus einem Makro-Aufruf im EnterHandler kommt,
     //	gleich abbrechen und nicht den Status durcheinander bringen
     if (bInEnterHandler)
         return;
 
-    BOOL bRepeat = (pState == pLastState);
+    sal_Bool bRepeat = (pState == pLastState);
     if (!bRepeat && pState && pLastState)
-        bRepeat = sal::static_int_cast<BOOL>(*pState == *pLastState);
+        bRepeat = sal::static_int_cast<sal_Bool>(*pState == *pLastState);
     if (bRepeat && !bForce)
         return;
 
-    bInOwnChange = TRUE;				// disable ModifyHdl (reset below)
+    bInOwnChange = sal_True;				// disable ModifyHdl (reset below)
 
     if ( pState && !pLastState )		// wieder enablen
-        bForce = TRUE;
+        bForce = sal_True;
 
-    BOOL bHadObject = pLastState && pLastState->GetEditData();
+    sal_Bool bHadObject = pLastState && pLastState->GetEditData();
 
     //! Before EditEngine gets eventually created (so it gets the right pools)
     if ( pSourceSh )
@@ -3358,7 +3358,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
 
         if ( pState )
         {
-            BOOL bIgnore = FALSE;
+            sal_Bool bIgnore = sal_False;
 
             //	hier auch fremde Referenzeingabe beruecksichtigen (z.B. Funktions-AP),
             //	FormEditData falls gerade von der Hilfe auf Calc umgeschaltet wird:
@@ -3373,7 +3373,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
                             EnterHandler();
                     }
                     else
-                        bIgnore = TRUE;
+                        bIgnore = sal_True;
                 }
 
                 if ( !bIgnore /* || bRepeat */ )
@@ -3382,16 +3382,16 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
                     const ScAddress& 		rEPos	= pState->GetEndPos();
                     const EditTextObject*	pData	= pState->GetEditData();
                     String					aString = pState->GetString();
-                    BOOL					bTxtMod = FALSE;
+                    sal_Bool					bTxtMod = sal_False;
                     ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell();
                     ScDocument* pDoc = pDocSh->GetDocument();
 
                     aCursorPos	= pState->GetPos();
 
                     if ( pData /* || bRepeat */ )
-                        bTxtMod = TRUE;
+                        bTxtMod = sal_True;
                     else if ( bHadObject )
-                        bTxtMod = TRUE;
+                        bTxtMod = sal_True;
                     else if ( bTextValid )
                         bTxtMod = ( aString != aCurrentText );
                     else
@@ -3404,13 +3404,13 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
                             pEngine->SetText( *pData );
                             aString = GetEditText(pEngine);
                             lcl_RemoveTabs(aString);
-                            bTextValid = FALSE;
+                            bTextValid = sal_False;
                             aCurrentText.Erase();
                         }
                         else
                         {
                             aCurrentText = aString;
-                            bTextValid = TRUE;				//! erst nur als String merken
+                            bTextValid = sal_True;				//! erst nur als String merken
                         }
 
                         if ( pInputWin )
@@ -3431,7 +3431,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
 
                         if ( !aPosStr.Len() )			// kein Name -> formatieren
                         {
-                            USHORT nFlags = 0;
+                            sal_uInt16 nFlags = 0;
                             if( aAddrDetails.eConv == formula::FormulaGrammar::CONV_XL_R1C1 )
                                 nFlags |= SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE;
                             if ( rSPos != rEPos )
@@ -3455,19 +3455,19 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
                     //	Online spelling is turned back on in StartTable, after setting
                     //	the right language from cell attributes.
 
-                    ULONG nCntrl = pEngine->GetControlWord();
+                    sal_uLong nCntrl = pEngine->GetControlWord();
                     if ( nCntrl & EE_CNTRL_ONLINESPELLING )
                         pEngine->SetControlWord( nCntrl & ~EE_CNTRL_ONLINESPELLING );
 
-                    bModified = FALSE;
-                    bSelIsRef = FALSE;
-                    bProtected = FALSE;
-                    bCommandErrorShown = FALSE;
+                    bModified = sal_False;
+                    bSelIsRef = sal_False;
+                    bProtected = sal_False;
+                    bCommandErrorShown = sal_False;
                 }
             }
         }
 
-//		bProtected = FALSE;
+//		bProtected = sal_False;
 
         if ( pInputWin)
         {
@@ -3507,7 +3507,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
 
     HideTip();
     HideTipBelow();
-    bInOwnChange = FALSE;
+    bInOwnChange = sal_False;
 }
 
 void ScInputHandler::UpdateCellAdjust( SvxCellHorJustify eJust )
@@ -3544,13 +3544,13 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer )
             {
                 if ( pInputWin)
                 {
-                    pInputWin->EnableButtons( FALSE );
+                    pInputWin->EnableButtons( sal_False );
                     pInputWin->Disable();
                 }
             }
             else if ( !bFormulaMode )	// #39210# Formel auch z.B. bei Hilfe behalten
             {
-                bInOwnChange = TRUE;	// disable ModifyHdl (reset below)
+                bInOwnChange = sal_True;	// disable ModifyHdl (reset below)
 
                 pActiveViewSh = NULL;
                 pEngine->SetText( EMPTY_STRING );
@@ -3561,7 +3561,7 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer )
                     pInputWin->Disable();
                 }
 
-                bInOwnChange = FALSE;
+                bInOwnChange = sal_False;
             }
         }
     }
@@ -3578,20 +3578,20 @@ void ScInputHandler::InputSelection( EditView* pView )
     ResetAutoPar();
 }
 
-void ScInputHandler::InputChanged( EditView* pView, BOOL bFromNotify )
+void ScInputHandler::InputChanged( EditView* pView, sal_Bool bFromNotify )
 {
     ESelection aSelection = pView->GetSelection();
 
     UpdateActiveView();
 
     // #i20282# DataChanged needs to know if this is from the input line's modify handler
-    BOOL bFromTopNotify = ( bFromNotify && pView == pTopView );
+    sal_Bool bFromTopNotify = ( bFromNotify && pView == pTopView );
 
-    BOOL bNewView = DataChanging();						//!	kann das hier ueberhaupt sein?
+    sal_Bool bNewView = DataChanging();						//!	kann das hier ueberhaupt sein?
     aCurrentText = pView->GetEditEngine()->GetText();	// auch den String merken
     pEngine->SetText( aCurrentText );
     DataChanged( bFromTopNotify );
-    bTextValid = TRUE;		// wird in DataChanged auf FALSE gesetzt
+    bTextValid = sal_True;		// wird in DataChanged auf sal_False gesetzt
 
     if ( pActiveViewSh )
     {
@@ -3611,7 +3611,7 @@ const String& ScInputHandler::GetEditString()
     if (pEngine)
     {
         aCurrentText = pEngine->GetText();		// immer neu aus Engine
-        bTextValid = TRUE;
+        bTextValid = sal_True;
     }
 
     return aCurrentText;
@@ -3626,16 +3626,16 @@ Size ScInputHandler::GetTextSize()
     return aSize;
 }
 
-BOOL ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
+sal_Bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if (pEngine)
     {
         //	Feldbefehle enthalten?
 
-        USHORT nParCnt = pEngine->GetParagraphCount();
+        sal_uInt16 nParCnt = pEngine->GetParagraphCount();
         SfxItemSet aSet = pEngine->GetAttribs( ESelection(0,0,nParCnt,0) );
-        SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE );
+        SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, sal_False );
         if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
         {
             //	Inhalt kopieren
@@ -3646,20 +3646,20 @@ BOOL ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
 
             //	Attribute loeschen
 
-            for (USHORT i=0; i<nParCnt; i++)
+            for (sal_uInt16 i=0; i<nParCnt; i++)
                 rDestEngine.QuickRemoveCharAttribs( i );
 
             //	Absaetze zusammenfassen
 
             while ( nParCnt > 1 )
             {
-                xub_StrLen nLen = rDestEngine.GetTextLen( (USHORT)0 );
+                xub_StrLen nLen = rDestEngine.GetTextLen( (sal_uInt16)0 );
                 ESelection aSel( 0,nLen, 1,0 );
                 rDestEngine.QuickInsertText( ' ', aSel );		// Umbruch durch Space ersetzen
                 --nParCnt;
             }
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     return bRet;
@@ -3693,9 +3693,9 @@ EditView* ScInputHandler::GetFuncEditView()
     {
         if ( eMode != SC_INPUT_TABLE )
         {
-            bCreatingFuncView = TRUE;		// RangeFinder nicht anzeigen
+            bCreatingFuncView = sal_True;		// RangeFinder nicht anzeigen
             SetMode( SC_INPUT_TABLE );
-            bCreatingFuncView = FALSE;
+            bCreatingFuncView = sal_False;
             if ( pTableView )
                 pTableView->GetEditEngine()->SetText( EMPTY_STRING );
         }
@@ -3724,7 +3724,7 @@ void ScInputHandler::InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd )
     if (pView)
         pView->SetSelection( ESelection(0,nStart, 0,nEnd) );
 
-    bModified = TRUE;
+    bModified = sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -3747,13 +3747,13 @@ void ScInputHandler::InputReplaceSelection( const String& rStr )
     EditView* pView = GetFuncEditView();
     if (pView)
     {
-        pView->SetEditEngineUpdateMode( FALSE );
-//		pView->InsertText( rStr, TRUE );
+        pView->SetEditEngineUpdateMode( sal_False );
+//		pView->InsertText( rStr, sal_True );
         pView->GetEditEngine()->SetText( aFormText );
         pView->SetSelection( ESelection(0,nFormSelStart, 0,nFormSelEnd) );
-        pView->SetEditEngineUpdateMode( TRUE );
+        pView->SetEditEngineUpdateMode( sal_True );
     }
-    bModified = TRUE;
+    bModified = sal_True;
 }
 
 //------------------------------------------------------------------------
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 765dc8de3..3c618c863 100755
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -100,7 +100,7 @@ enum ScNameInputType
 SFX_IMPL_CHILDWINDOW(ScInputWindowWrapper,FID_INPUTLINE_STATUS)
 
 ScInputWindowWrapper::ScInputWindowWrapper( Window*          pParentP,
-                                            USHORT			 nId,
+                                            sal_uInt16			 nId,
                                             SfxBindings*	 pBindings,
                                             SfxChildWinInfo* /* pInfo */ )
     :   SfxChildWindow( pParentP, nId )
@@ -148,7 +148,7 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
         aTextCancel		( ScResId( SCSTR_QHELP_BTNCANCEL ) ),
         aTextSum		( ScResId( SCSTR_QHELP_BTNSUM ) ),
         aTextEqual		( ScResId( SCSTR_QHELP_BTNEQUAL ) ),
-        bIsOkCancelMode ( FALSE )
+        bIsOkCancelMode ( sal_False )
 {
     ScModule*		 pScMod  = SC_MOD();
     SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
@@ -165,7 +165,7 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
     }
     DBG_ASSERT( pViewSh, "no view shell for input window" );
 
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
 
     // Positionsfenster, 3 Buttons, Eingabefenster
     InsertWindow    ( 1, &aWndPos, 0,								      0 );
@@ -197,7 +197,7 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
     aWndPos		.Show();
     aTextWindow	.Show();
 
-    pInputHdl = SC_MOD()->GetInputHdl( pViewSh, FALSE );    // use own handler even if ref-handler is set
+    pInputHdl = SC_MOD()->GetInputHdl( pViewSh, sal_False );    // use own handler even if ref-handler is set
     if (pInputHdl)
         pInputHdl->SetInputWindow( this );
 
@@ -220,14 +220,14 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
             pInputHdl->SetMode( SC_INPUT_TABLE );		// Focus kommt eh nach unten
     }
     else if ( pViewSh )
-        pViewSh->UpdateInputHandler( TRUE ); // unbedingtes Update
+        pViewSh->UpdateInputHandler( sal_True ); // unbedingtes Update
 
     pImgMgr->RegisterToolBox( this );
 }
 
 __EXPORT ScInputWindow::~ScInputWindow()
 {
-    BOOL bDown = ( ScGlobal::pSysLocale == NULL );    // after Clear?
+    sal_Bool bDown = ( ScGlobal::pSysLocale == NULL );    // after Clear?
 
     //	if any view's input handler has a pointer to this input window, reset it
     //	(may be several ones, #74522#)
@@ -243,7 +243,7 @@ __EXPORT ScInputWindow::~ScInputWindow()
             if ( pHdl && pHdl->GetInputWindow() == this )
             {
                 pHdl->SetInputWindow( NULL );
-                pHdl->StopInputWinEngine( FALSE );  // #125841# reset pTopView pointer
+                pHdl->StopInputWinEngine( sal_False );  // #125841# reset pTopView pointer
             }
             pSh = SfxViewShell::GetNext( *pSh, &aScType );
         }
@@ -371,13 +371,13 @@ void __EXPORT ScInputWindow::Select()
                     if ( rMark.IsMarked() || rMark.IsMultiMarked() )
                     {
                         ScRangeList aMarkRangeList;
-                        rMark.FillRangeListWithMarks( &aMarkRangeList, FALSE );
+                        rMark.FillRangeListWithMarks( &aMarkRangeList, sal_False );
                         ScDocument* pDoc = pViewSh->GetViewData()->GetDocument();
 
                         // check if one of the marked ranges is empty
                         bool bEmpty = false;
-                        const ULONG nCount = aMarkRangeList.Count();
-                        for ( ULONG i = 0; i < nCount; ++i )
+                        const sal_uLong nCount = aMarkRangeList.Count();
+                        for ( sal_uLong i = 0; i < nCount; ++i )
                         {
                             const ScRange aRange( *aMarkRangeList.GetObject( i ) );
                             if ( pDoc->IsBlockEmpty( aRange.aStart.Tab(),
@@ -392,7 +392,7 @@ void __EXPORT ScInputWindow::Select()
                         if ( bEmpty )
                         {
                             ScRangeList aRangeList;
-                            const BOOL bDataFound = pViewSh->GetAutoSumArea( aRangeList );
+                            const sal_Bool bDataFound = pViewSh->GetAutoSumArea( aRangeList );
                             if ( bDataFound )
                             {
                                 const sal_Bool bSubTotal( UseSubTotal( &aRangeList ) );
@@ -402,14 +402,14 @@ void __EXPORT ScInputWindow::Select()
                         else
                         {
                             const sal_Bool bSubTotal( UseSubTotal( &aMarkRangeList ) );
-                            for ( ULONG i = 0; i < nCount; ++i )
+                            for ( sal_uLong i = 0; i < nCount; ++i )
                             {
                                 const ScRange aRange( *aMarkRangeList.GetObject( i ) );
                                 const bool bSetCursor = ( i == nCount - 1 ? true : false );
                                 const bool bContinue = ( i != 0  ? true : false );
                                 if ( !pViewSh->AutoSum( aRange, bSubTotal, bSetCursor, bContinue ) )
                                 {
-                                    pViewSh->MarkRange( aRange, FALSE, FALSE );
+                                    pViewSh->MarkRange( aRange, sal_False, sal_False );
                                     pViewSh->SetCursor( aRange.aEnd.Col(), aRange.aEnd.Row() );
                                     const ScRangeList aRangeList;
                                     const String aFormula = pViewSh->GetAutoSumFormula( aRangeList, bSubTotal );
@@ -422,7 +422,7 @@ void __EXPORT ScInputWindow::Select()
                     else									// nur in Eingabezeile einfuegen
                     {
                         ScRangeList aRangeList;
-                        const BOOL bDataFound = pViewSh->GetAutoSumArea( aRangeList );
+                        const sal_Bool bDataFound = pViewSh->GetAutoSumArea( aRangeList );
                         const sal_Bool bSubTotal( UseSubTotal( &aRangeList ) );
                         const String aFormula = pViewSh->GetAutoSumFormula( aRangeList, bSubTotal );
                         SetFuncString( aFormula );
@@ -472,7 +472,7 @@ void __EXPORT ScInputWindow::Select()
                     pView->SetSelection( ESelection(0,1, 0,1) );
                     pScMod->InputChanged(pView);
                     SetOkCancelMode();
-                    pView->SetEditEngineUpdateMode(TRUE);
+                    pView->SetEditEngineUpdateMode(sal_True);
                 }
             }
             break;
@@ -493,7 +493,7 @@ void __EXPORT ScInputWindow::Resize()
     aTextWindow.Invalidate();
 }
 
-void ScInputWindow::SetFuncString( const String& rString, BOOL bDoEdit )
+void ScInputWindow::SetFuncString( const String& rString, sal_Bool bDoEdit )
 {
     //!	new method at ScModule to query if function autopilot is open
     SfxViewFrame* pViewFrm = SfxViewFrame::Current();
@@ -521,7 +521,7 @@ void ScInputWindow::SetFuncString( const String& rString, BOOL bDoEdit )
             if ( bDoEdit )
                 SetOkCancelMode();			// nicht, wenn gleich hinterher Enter/Cancel
 
-            pView->SetEditEngineUpdateMode(TRUE);
+            pView->SetEditEngineUpdateMode(sal_True);
         }
     }
 }
@@ -553,7 +553,7 @@ void ScInputWindow::SetOkCancelMode()
     SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
     if (!bIsOkCancelMode)
     {
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+        sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
 
         RemoveItem( 3 ); // SID_INPUT_SUM und SID_INPUT_EQUAL entfernen
         RemoveItem( 3 );
@@ -563,7 +563,7 @@ void ScInputWindow::SetOkCancelMode()
         SetHelpId	( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
         SetItemText	( SID_INPUT_OK,		aTextOk );
         SetHelpId	( SID_INPUT_OK,		HID_INSWIN_OK );
-        bIsOkCancelMode = TRUE;
+        bIsOkCancelMode = sal_True;
     }
 }
 
@@ -577,7 +577,7 @@ void ScInputWindow::SetSumAssignMode()
     SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
     if (bIsOkCancelMode)
     {
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+        sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
 
         // SID_INPUT_CANCEL, und SID_INPUT_OK entfernen
         RemoveItem( 3 );
@@ -588,13 +588,13 @@ void ScInputWindow::SetSumAssignMode()
         SetHelpId	( SID_INPUT_SUM,   HID_INSWIN_SUMME );
         SetItemText	( SID_INPUT_EQUAL, aTextEqual );
         SetHelpId	( SID_INPUT_EQUAL, HID_INSWIN_FUNC );
-        bIsOkCancelMode = FALSE;
+        bIsOkCancelMode = sal_False;
 
-        SetFormulaMode(FALSE);		// kein editieren -> keine Formel
+        SetFormulaMode(sal_False);		// kein editieren -> keine Formel
     }
 }
 
-void ScInputWindow::SetFormulaMode( BOOL bSet )
+void ScInputWindow::SetFormulaMode( sal_Bool bSet )
 {
     aWndPos.SetFormulaMode(bSet);
     aTextWindow.SetFormulaMode(bSet);
@@ -625,7 +625,7 @@ String __EXPORT ScInputWindow::GetText() const
 //UNUSED2008-05      return aTextWindow.GetEditView();
 //UNUSED2008-05  }
 
-BOOL ScInputWindow::IsInputActive()
+sal_Bool ScInputWindow::IsInputActive()
 {
     return aTextWindow.IsInputActive();
 }
@@ -640,7 +640,7 @@ void ScInputWindow::MakeDialogEditView()
     aTextWindow.MakeDialogEditView();
 }
 
-void ScInputWindow::StopEditEngine( BOOL bAll )
+void ScInputWindow::StopEditEngine( sal_Bool bAll )
 {
     aTextWindow.StopEditEngine( bAll );
 }
@@ -678,7 +678,7 @@ void ScInputWindow::PosGrabFocus()
     aWndPos.GrabFocus();
 }
 
-void ScInputWindow::EnableButtons( BOOL bEnable )
+void ScInputWindow::EnableButtons( sal_Bool bEnable )
 {
     //	when enabling buttons, always also enable the input window itself
     if ( bEnable && !IsEnabled() )
@@ -705,7 +705,7 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
         ScModule*		 pScMod  = SC_MOD();
         SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+        sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
         // IMAGE macro uses pScMod, pImgMgr, bHC
 
         SetItemImage( SID_INPUT_FUNCTION, IMAGE( SID_INPUT_FUNCTION ) );
@@ -733,11 +733,11 @@ ScTextWnd::ScTextWnd( Window* pParent )
         DragSourceHelper( this ),
         pEditEngine	 ( NULL ),
         pEditView	 ( NULL ),
-        bIsInsertMode( TRUE ),
-        bFormulaMode ( FALSE ),
-        bInputMode   ( FALSE )
+        bIsInsertMode( sal_True ),
+        bFormulaMode ( sal_False ),
+        bInputMode   ( sal_False )
 {
-    EnableRTL( FALSE );		// #106269# EditEngine can't be used with VCL EnableRTL
+    EnableRTL( sal_False );		// #106269# EditEngine can't be used with VCL EnableRTL
 
     bIsRTL = GetSettings().GetLayoutRTL();
 
@@ -751,7 +751,7 @@ ScTextWnd::ScTextWnd( Window* pParent )
     Color aBgColor= rStyleSettings.GetWindowColor();
     Color aTxtColor= rStyleSettings.GetWindowTextColor();
 
-    aTextFont.SetTransparent ( TRUE );
+    aTextFont.SetTransparent ( sal_True );
     aTextFont.SetFillColor   ( aBgColor );
     //aTextFont.SetColor		 ( COL_FIELDTEXT );
     aTextFont.SetColor		 (aTxtColor);
@@ -841,7 +841,7 @@ void __EXPORT ScTextWnd::MouseButtonDown( const MouseEvent& rMEvt )
 
     if (pEditView)
     {
-        pEditView->SetEditEngineUpdateMode( TRUE );
+        pEditView->SetEditEngineUpdateMode( sal_True );
         pEditView->MouseButtonDown( rMEvt );
     }
 }
@@ -864,8 +864,8 @@ void __EXPORT ScTextWnd::MouseButtonUp( const MouseEvent& rMEvt )
 
 void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt )
 {
-    bInputMode = TRUE;
-    USHORT nCommand = rCEvt.GetCommand();
+    bInputMode = sal_True;
+    sal_uInt16 nCommand = rCEvt.GetCommand();
     if ( pEditView /* && ( nCommand == COMMAND_STARTDRAG || nCommand == COMMAND_VOICE ) */ )
     {
         ScModule* pScMod = SC_MOD();
@@ -875,9 +875,9 @@ void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt )
         // already set in StartEditEngine when the EditEngine is created
 
         // #63263# verhindern, dass die EditView beim View-Umschalten wegkommt
-        pScMod->SetInEditCommand( TRUE );
+        pScMod->SetInEditCommand( sal_True );
         pEditView->Command( rCEvt );
-        pScMod->SetInEditCommand( FALSE );
+        pScMod->SetInEditCommand( sal_False );
 
         //	#48929# COMMAND_STARTDRAG heiss noch lange nicht, dass der Inhalt geaendert wurde
         //	darum in dem Fall kein InputChanged
@@ -921,14 +921,14 @@ void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt )
     else
         Window::Command(rCEvt);		//	sonst soll sich die Basisklasse drum kuemmern...
 
-    bInputMode = FALSE;
+    bInputMode = sal_False;
 }
 
 void ScTextWnd::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
 {
     if ( pEditView )
     {
-        CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, TRUE );
+        CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, sal_True );
         pEditView->Command( aDragEvent );
 
         //	handling of d&d to different view (CancelHandler) can't be done here,
@@ -938,24 +938,24 @@ void ScTextWnd::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
 
 void __EXPORT ScTextWnd::KeyInput(const KeyEvent& rKEvt)
 {
-    bInputMode = TRUE;
+    bInputMode = sal_True;
     if (!SC_MOD()->InputKeyEvent( rKEvt ))
     {
-        BOOL bUsed = FALSE;
+        sal_Bool bUsed = sal_False;
         ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
         if ( pViewSh )
             bUsed = pViewSh->SfxKeyInput(rKEvt);	// nur Acceleratoren, keine Eingabe
         if (!bUsed)
             Window::KeyInput( rKEvt );
     }
-    bInputMode = FALSE;
+    bInputMode = sal_False;
 }
 
 void __EXPORT ScTextWnd::GetFocus()
 {
     ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
     if ( pViewSh )
-        pViewSh->SetFormShellAtTop( FALSE );     // focus in input line -> FormShell no longer on top
+        pViewSh->SetFormShellAtTop( sal_False );     // focus in input line -> FormShell no longer on top
 }
 
 void __EXPORT ScTextWnd::LoseFocus()
@@ -972,7 +972,7 @@ String __EXPORT ScTextWnd::GetText() const
         return GetTextString();
 }
 
-void ScTextWnd::SetFormulaMode( BOOL bSet )
+void ScTextWnd::SetFormulaMode( sal_Bool bSet )
 {
     if ( bSet != bFormulaMode )
     {
@@ -985,8 +985,8 @@ void ScTextWnd::UpdateAutoCorrFlag()
 {
     if ( pEditEngine )
     {
-        ULONG nControl = pEditEngine->GetControlWord();
-        ULONG nOld = nControl;
+        sal_uLong nControl = pEditEngine->GetControlWord();
+        sal_uLong nOld = nControl;
         if ( bFormulaMode )
             nControl &= ~EE_CNTRL_AUTOCORRECT;		// keine Autokorrektur in Formeln
         else
@@ -1023,7 +1023,7 @@ void lcl_ModifyRTLDefaults( SfxItemSet& rSet )
     //rSet.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) );
 
     //	PaperSize width is limited to USHRT_MAX in RTL mode (because of EditEngine's
-    //	USHORT values in EditLine), so the text may be wrapped and line spacing must be
+    //	sal_uInt16 values in EditLine), so the text may be wrapped and line spacing must be
     //	increased to not see the beginning of the next line.
     SvxLineSpacingItem aItem( SVX_LINESPACE_TWO_LINES, EE_PARA_SBL );
     aItem.SetPropLineSpace( 200 );
@@ -1057,11 +1057,11 @@ void ScTextWnd::StartEditEngine()
             pNew = new ScFieldEditEngine( pDoc->GetEnginePool(), pDoc->GetEditPool() );
         }
         else
-            pNew = new ScFieldEditEngine( EditEngine::CreatePool(),	NULL, TRUE );
-        pNew->SetExecuteURL( FALSE );
+            pNew = new ScFieldEditEngine( EditEngine::CreatePool(),	NULL, sal_True );
+        pNew->SetExecuteURL( sal_False );
         pEditEngine = pNew;
 
-        pEditEngine->SetUpdateMode( FALSE );
+        pEditEngine->SetUpdateMode( sal_False );
         pEditEngine->SetPaperSize( Size( bIsRTL ? USHRT_MAX : THESIZE, 300 ) );
         pEditEngine->SetWordDelimiters(
                         ScEditUtil::ModifyDelimiters( pEditEngine->GetWordDelimiters() ) );
@@ -1073,7 +1073,7 @@ void ScTextWnd::StartEditEngine()
             pEditEngine->SetFontInfoInItemSet( *pSet, aTextFont );
             lcl_ExtendEditFontAttribs( *pSet );
             // turn off script spacing to match DrawText output
-            pSet->Put( SvxScriptSpaceItem( FALSE, EE_PARA_ASIANCJKSPACING ) );
+            pSet->Put( SvxScriptSpaceItem( sal_False, EE_PARA_ASIANCJKSPACING ) );
             if ( bIsRTL )
                 lcl_ModifyRTLDefaults( *pSet );
             pEditEngine->SetDefaults( pSet );
@@ -1082,12 +1082,12 @@ void ScTextWnd::StartEditEngine()
         //	#57254# Wenn in der Zelle URL-Felder enthalten sind, muessen die auch in
         //	die Eingabezeile uebernommen werden, weil sonst die Positionen nicht stimmen.
 
-        BOOL bFilled = FALSE;
+        sal_Bool bFilled = sal_False;
         ScInputHandler* pHdl = SC_MOD()->GetInputHdl();
         if ( pHdl )			//!	Testen, ob's der richtige InputHdl ist?
             bFilled = pHdl->GetTextAndFields( *pEditEngine );
 
-        pEditEngine->SetUpdateMode( TRUE );
+        pEditEngine->SetUpdateMode( sal_True );
 
         //	aString ist die Wahrheit...
         if ( bFilled && pEditEngine->GetText() == aString )
@@ -1099,7 +1099,7 @@ void ScTextWnd::StartEditEngine()
         pEditView->SetInsertMode(bIsInsertMode);
 
         // Text aus Clipboard wird als ASCII einzeilig uebernommen
-        ULONG n = pEditView->GetControlWord();
+        sal_uLong n = pEditView->GetControlWord();
         pEditView->SetControlWord( n | EV_CNTRL_SINGLELINEPASTE	);
 
         pEditEngine->InsertView( pEditView, EE_APPEND );
@@ -1120,7 +1120,7 @@ void ScTextWnd::StartEditEngine()
         if ( pObjSh && pObjSh->ISA(ScDocShell) )
         {
             ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument();	// any document
-            BYTE nScript = pDoc->GetStringScriptType( aString );
+            sal_uInt8 nScript = pDoc->GetStringScriptType( aString );
             if ( nScript & SCRIPTTYPE_COMPLEX )
                 Invalidate();
         }
@@ -1143,13 +1143,13 @@ IMPL_LINK(ScTextWnd, NotifyHdl, EENotify*, EMPTYARG)
         //	while an InputHandler method is modifying the EditEngine content
 
         if ( pHdl && !pHdl->IsInOwnChange() )
-            pHdl->InputChanged( pEditView, TRUE );	// #i20282# InputChanged must know if called from modify handler
+            pHdl->InputChanged( pEditView, sal_True );	// #i20282# InputChanged must know if called from modify handler
     }
 
     return 0;
 }
 
-void ScTextWnd::StopEditEngine( BOOL bAll )
+void ScTextWnd::StopEditEngine( sal_Bool bAll )
 {
     if (pEditView)
     {
@@ -1162,7 +1162,7 @@ void ScTextWnd::StopEditEngine( BOOL bAll )
             pScMod->InputSelection( pEditView );
         aString = pEditEngine->GetText();
         bIsInsertMode = pEditView->IsInsertMode();
-        BOOL bSelection = pEditView->HasSelection();
+        sal_Bool bSelection = pEditView->HasSelection();
         pEditEngine->SetModifyHdl(Link());
         DELETEZ(pEditView);
         DELETEZ(pEditEngine);
@@ -1183,7 +1183,7 @@ void ScTextWnd::SetTextString( const String& rNewString )
 {
     if ( rNewString != aString )
     {
-        bInputMode = TRUE;
+        bInputMode = sal_True;
 
         //	Position der Aenderung suchen, nur Rest painten
 
@@ -1193,14 +1193,14 @@ void ScTextWnd::SetTextString( const String& rNewString )
 
         if (!pEditEngine)
         {
-            BOOL bPaintAll;
+            sal_Bool bPaintAll;
             if ( bIsRTL )
-                bPaintAll = TRUE;
+                bPaintAll = sal_True;
             else
             {
                 //	test if CTL script type is involved
-                BYTE nOldScript = 0;
-                BYTE nNewScript = 0;
+                sal_uInt8 nOldScript = 0;
+                sal_uInt8 nNewScript = 0;
                 SfxObjectShell* pObjSh = SfxObjectShell::Current();
                 if ( pObjSh && pObjSh->ISA(ScDocShell) )
                 {
@@ -1242,7 +1242,7 @@ void ScTextWnd::SetTextString( const String& rNewString )
                 if (nDifPos)
                     nInvPos += GetTextWidth(aString,0,nDifPos);
 
-                USHORT nFlags = 0;
+                sal_uInt16 nFlags = 0;
                 if ( nDifPos == aString.Len() )			// only new characters appended
                     nFlags = INVALIDATE_NOERASE;		// then background is already clear
 
@@ -1261,7 +1261,7 @@ void ScTextWnd::SetTextString( const String& rNewString )
         if (!maAccTextDatas.empty())
             maAccTextDatas.back()->TextChanged();
 
-        bInputMode = FALSE;
+        bInputMode = sal_False;
     }
 }
 
@@ -1270,7 +1270,7 @@ const String& ScTextWnd::GetTextString() const
     return aString;
 }
 
-BOOL ScTextWnd::IsInputActive()
+sal_Bool ScTextWnd::IsInputActive()
 {
     return HasFocus();
 }
@@ -1292,11 +1292,11 @@ void ScTextWnd::MakeDialogEditView()
         pNew = new ScFieldEditEngine( pDoc->GetEnginePool(), pDoc->GetEditPool() );
     }
     else
-        pNew = new ScFieldEditEngine( EditEngine::CreatePool(),	NULL, TRUE );
-    pNew->SetExecuteURL( FALSE );
+        pNew = new ScFieldEditEngine( EditEngine::CreatePool(),	NULL, sal_True );
+    pNew->SetExecuteURL( sal_False );
     pEditEngine = pNew;
 
-    pEditEngine->SetUpdateMode( FALSE );
+    pEditEngine->SetUpdateMode( sal_False );
     pEditEngine->SetWordDelimiters( pEditEngine->GetWordDelimiters() += '=' );
     pEditEngine->SetPaperSize( Size( bIsRTL ? USHRT_MAX : THESIZE, 300 ) );
 
@@ -1306,7 +1306,7 @@ void ScTextWnd::MakeDialogEditView()
     if ( bIsRTL )
         lcl_ModifyRTLDefaults( *pSet );
     pEditEngine->SetDefaults( pSet );
-    pEditEngine->SetUpdateMode( TRUE );
+    pEditEngine->SetUpdateMode( sal_True );
 
     pEditView	= new EditView( pEditEngine, this );
     pEditEngine->InsertView( pEditView, EE_APPEND );
@@ -1381,7 +1381,7 @@ ScPosWnd::ScPosWnd( Window* pParent ) :
     ComboBox	( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ),
     pAccel		( NULL ),
     nTipVisible ( 0 ),
-    bFormulaMode( FALSE )
+    bFormulaMode( sal_False )
 {
     Size aSize( GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:GW99999")) ),
                 GetTextHeight() );
@@ -1403,7 +1403,7 @@ __EXPORT ScPosWnd::~ScPosWnd()
     delete pAccel;
 }
 
-void ScPosWnd::SetFormulaMode( BOOL bSet )
+void ScPosWnd::SetFormulaMode( sal_Bool bSet )
 {
     if ( bSet != bFormulaMode )
     {
@@ -1439,12 +1439,12 @@ void ScPosWnd::FillRangeNames()
         //	per Hand sortieren, weil Funktionen nicht sortiert werden:
 
         ScRangeName* pRangeNames = pDoc->GetRangeName();
-        USHORT nCount = pRangeNames->GetCount();
+        sal_uInt16 nCount = pRangeNames->GetCount();
         if ( nCount > 0 )
         {
-            USHORT nValidCount = 0;
+            sal_uInt16 nValidCount = 0;
             ScRange aDummy;
-            USHORT i;
+            sal_uInt16 i;
             for ( i=0; i<nCount; i++ )
             {
                 ScRangeData* pData = (*pRangeNames)[i];
@@ -1454,7 +1454,7 @@ void ScPosWnd::FillRangeNames()
             if ( nValidCount )
             {
                 ScRangeData** ppSortArray = new ScRangeData* [ nValidCount ];
-                USHORT j;
+                sal_uInt16 j;
                 for ( i=0, j=0; i<nCount; i++ )
                 {
                     ScRangeData* pData = (*pRangeNames)[i];
@@ -1483,16 +1483,16 @@ void ScPosWnd::FillFunctions()
 
     String aFirstName;
     const ScAppOptions& rOpt = SC_MOD()->GetAppOptions();
-    USHORT nMRUCount = rOpt.GetLRUFuncListCount();
-    const USHORT* pMRUList = rOpt.GetLRUFuncList();
+    sal_uInt16 nMRUCount = rOpt.GetLRUFuncListCount();
+    const sal_uInt16* pMRUList = rOpt.GetLRUFuncList();
     if (pMRUList)
     {
         const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
-        ULONG nListCount = pFuncList->GetCount();
-        for (USHORT i=0; i<nMRUCount; i++)
+        sal_uLong nListCount = pFuncList->GetCount();
+        for (sal_uInt16 i=0; i<nMRUCount; i++)
         {
-            USHORT nId = pMRUList[i];
-            for (ULONG j=0; j<nListCount; j++)
+            sal_uInt16 nId = pMRUList[i];
+            for (sal_uLong j=0; j<nListCount; j++)
             {
                 const ScFuncDesc* pDesc = pFuncList->GetFunction( j );
                 if ( pDesc->nFIndex == nId && pDesc->pFuncName )
@@ -1522,13 +1522,13 @@ void __EXPORT ScPosWnd::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
         if ( rHint.ISA(SfxSimpleHint) )
         {
-            ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
+            sal_uLong nHintId = ((SfxSimpleHint&)rHint).GetId();
             if ( nHintId == SC_HINT_AREAS_CHANGED || nHintId == SC_HINT_NAVIGATOR_UPDATEALL)
                 FillRangeNames();
         }
         else if ( rHint.ISA(SfxEventHint) )
         {
-            ULONG nEventId = ((SfxEventHint&)rHint).GetEventId();
+            sal_uLong nEventId = ((SfxEventHint&)rHint).GetEventId();
             if ( nEventId == SFX_EVENT_ACTIVATEDOC )
                 FillRangeNames();
         }
@@ -1602,7 +1602,7 @@ void ScPosWnd::Modify()
         // determine the action that would be taken for the current input
 
         ScNameInputType eType = lcl_GetInputType( GetText() );      // uses current view
-        USHORT nStrId = 0;
+        sal_uInt16 nStrId = 0;
         switch ( eType )
         {
             case SC_NAME_INPUT_CELL:
@@ -1644,7 +1644,7 @@ void ScPosWnd::Modify()
             Rectangle aRect( aPos, aPos );
 
             String aText = ScGlobal::GetRscString( nStrId );
-            USHORT nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM;
+            sal_uInt16 nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM;
             nTipVisible = Help::ShowTip(pWin, aRect, aText, nAlign);
         }
     }
@@ -1697,7 +1697,7 @@ void ScPosWnd::DoEnter()
                 ScNameInputType eType = lcl_GetInputType( aText );
                 if ( eType == SC_NAME_INPUT_BAD_NAME || eType == SC_NAME_INPUT_BAD_SELECTION )
                 {
-                    USHORT nId = ( eType == SC_NAME_INPUT_BAD_NAME ) ? STR_NAME_ERROR_NAME : STR_NAME_ERROR_SELECTION;
+                    sal_uInt16 nId = ( eType == SC_NAME_INPUT_BAD_NAME ) ? STR_NAME_ERROR_NAME : STR_NAME_ERROR_SELECTION;
                     pViewSh->ErrorMessage( nId );
                 }
                 else if ( eType == SC_NAME_INPUT_DEFINE )
@@ -1707,7 +1707,7 @@ void ScPosWnd::DoEnter()
                     ScDocument* pDoc = pDocShell->GetDocument();
                     ScRangeName* pNames = pDoc->GetRangeName();
                     ScRange aSelection;
-                    USHORT nIndex = 0;
+                    sal_uInt16 nIndex = 0;
                     if ( pNames && !pNames->SearchName( aText, nIndex ) &&
                             (pViewData->GetSimpleArea( aSelection ) == SC_MARK_SIMPLE) )
                     {
@@ -1719,8 +1719,8 @@ void ScPosWnd::DoEnter()
                         if ( aNewRanges.Insert(pNew) )
                         {
                             ScDocFunc aFunc(*pDocShell);
-                            aFunc.ModifyRangeNames( aNewRanges, FALSE );
-                            pViewSh->UpdateInputHandler(TRUE);
+                            aFunc.ModifyRangeNames( aNewRanges, sal_False );
+                            pViewSh->UpdateInputHandler(sal_True);
                         }
                         else
                             delete pNew;        // shouldn't happen
@@ -1731,7 +1731,7 @@ void ScPosWnd::DoEnter()
                     // for all selection types, excecute the SID_CURRENTCELL slot
 
                     SfxStringItem aPosItem( SID_CURRENTCELL, aText );
-                    SfxBoolItem aUnmarkItem( FN_PARAM_1, TRUE );        // remove existing selection
+                    SfxBoolItem aUnmarkItem( FN_PARAM_1, sal_True );        // remove existing selection
 
                     pViewSh->GetViewData()->GetDispatcher().Execute( SID_CURRENTCELL,
                                         SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index 75e1c9b48..d69850698 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -66,11 +66,11 @@ ScMessagePool::ScMessagePool()
     aGlobalQueryItem		( ScQueryItem			( SCITEM_QUERYDATA, NULL, NULL ) ),
     aGlobalSubTotalItem		( ScSubTotalItem		( SCITEM_SUBTDATA, NULL, NULL ) ),
     aGlobalConsolidateItem	( ScConsolidateItem		( SCITEM_CONSOLIDATEDATA, NULL ) ),
-    aGlobalPivotItem		( ScPivotItem			( SCITEM_PIVOTDATA, NULL, NULL, FALSE ) ),
+    aGlobalPivotItem		( ScPivotItem			( SCITEM_PIVOTDATA, NULL, NULL, sal_False ) ),
     aGlobalSolveItem		( ScSolveItem			( SCITEM_SOLVEDATA, NULL ) ),
     aGlobalUserListItem		( ScUserListItem		( SCITEM_USERLIST ) ),
     //
-    aPrintWarnItem      	( SfxBoolItem			( SCITEM_PRINTWARN, FALSE ) )
+    aPrintWarnItem      	( SfxBoolItem			( SCITEM_PRINTWARN, sal_False ) )
 {
     ppPoolDefaults = new SfxPoolItem*[MSGPOOL_END - MSGPOOL_START + 1];
 
@@ -98,7 +98,7 @@ __EXPORT ScMessagePool::~ScMessagePool()
     Delete();
     SetSecondaryPool( NULL );		// before deleting defaults (accesses defaults)
 
-    for ( USHORT i=0; i <= MSGPOOL_END-MSGPOOL_START; i++ )
+    for ( sal_uInt16 i=0; i <= MSGPOOL_END-MSGPOOL_START; i++ )
         SetRefCount( *ppPoolDefaults[i], 0 );
 
     delete[] ppPoolDefaults;
@@ -107,7 +107,7 @@ __EXPORT ScMessagePool::~ScMessagePool()
 }
 
 
-SfxMapUnit __EXPORT ScMessagePool::GetMetric( USHORT nWhich ) const
+SfxMapUnit __EXPORT ScMessagePool::GetMetric( sal_uInt16 nWhich ) const
 {
     //	eigene Attribute: Twips, alles andere 1/100 mm
 
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index 50c2bfd15..8dbf3451d 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -44,7 +44,7 @@ static ColorData aColNames[SC_RANGECOLORS] =
 
 ScRangeFindList::ScRangeFindList(const String& rName) :
     aDocName( rName ),
-    bHidden( FALSE )
+    bHidden( sal_False )
 {
 }
 
@@ -58,7 +58,7 @@ ScRangeFindList::~ScRangeFindList()
     }
 }
 
-ColorData ScRangeFindList::GetColorName( USHORT nIndex )		// static
+ColorData ScRangeFindList::GetColorName( sal_uInt16 nIndex )		// static
 {
     return aColNames[nIndex % SC_RANGECOLORS];
 }
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index fc1ffce6e..d87bad6d7 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -135,11 +135,11 @@
 //UNUSED2008-05  
 //UNUSED2008-05  class ScLibOptions : public utl::ConfigItem
 //UNUSED2008-05  {
-//UNUSED2008-05      BOOL        bWK3Flag;
+//UNUSED2008-05      sal_Bool        bWK3Flag;
 //UNUSED2008-05  
 //UNUSED2008-05  public:
 //UNUSED2008-05                  ScLibOptions();
-//UNUSED2008-05      BOOL        GetWK3Flag() const          { return bWK3Flag; }
+//UNUSED2008-05      sal_Bool        GetWK3Flag() const          { return bWK3Flag; }
 //UNUSED2008-05  };
 //UNUSED2008-05  
 //UNUSED2008-05  #define CFGPATH_LIBFILTER		"Office.Calc/Filter/Import/Lotus123"
@@ -147,7 +147,7 @@
 //UNUSED2008-05  
 //UNUSED2008-05  ScLibOptions::ScLibOptions() :
 //UNUSED2008-05      ConfigItem( rtl::OUString::createFromAscii( CFGPATH_LIBFILTER ) ),
-//UNUSED2008-05      bWK3Flag( FALSE )
+//UNUSED2008-05      bWK3Flag( sal_False )
 //UNUSED2008-05  {
 //UNUSED2008-05      com::sun::star::uno::Sequence<rtl::OUString> aNames(1);
 //UNUSED2008-05      aNames[0] = rtl::OUString::createFromAscii( ENTRYSTR_WK3 );
@@ -158,7 +158,7 @@
 
 //------------------------------------------------------------------
 
-ScResId::ScResId( USHORT nId ) :
+ScResId::ScResId( sal_uInt16 nId ) :
     ResId( nId, *SC_MOD()->GetResMgr() )
 {
 }
@@ -265,7 +265,7 @@ void ScDLL::Init()
     ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod );
 
     // common SFX controller
-    ::sfx2::TaskPaneWrapper::RegisterChildWindow( FALSE, pMod );
+    ::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pMod );
 
     // Svx-StatusBar-Controller
     SvxInsertStatusBarControl		::RegisterControl(SID_ATTR_INSERT,		pMod);
@@ -291,39 +291,39 @@ void ScDLL::Init()
     ScInputWindowWrapper		::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK);
     ScNavigatorDialogWrapper    ::RegisterChildWindowContext(
             sal::static_int_cast<sal_uInt16>(ScTabViewShell::GetInterfaceId()), pMod);
-    ScSolverDlgWrapper			::RegisterChildWindow(FALSE, pMod);
-    ScOptSolverDlgWrapper       ::RegisterChildWindow(FALSE, pMod);
-    ScNameDlgWrapper			::RegisterChildWindow(FALSE, pMod);
-    ScPivotLayoutWrapper		::RegisterChildWindow(FALSE, pMod);
-    ScTabOpDlgWrapper			::RegisterChildWindow(FALSE, pMod);
-    ScFilterDlgWrapper			::RegisterChildWindow(FALSE, pMod);
-    ScSpecialFilterDlgWrapper	::RegisterChildWindow(FALSE, pMod);
-    ScDbNameDlgWrapper			::RegisterChildWindow(FALSE, pMod);
-    ScConsolidateDlgWrapper		::RegisterChildWindow(FALSE, pMod);
-    ScPrintAreasDlgWrapper		::RegisterChildWindow(FALSE, pMod);
-    ScCondFormatDlgWrapper		::RegisterChildWindow(FALSE, pMod);
-    ScColRowNameRangesDlgWrapper::RegisterChildWindow(FALSE, pMod);
-    ScFormulaDlgWrapper			::RegisterChildWindow(FALSE, pMod);
+    ScSolverDlgWrapper			::RegisterChildWindow(sal_False, pMod);
+    ScOptSolverDlgWrapper       ::RegisterChildWindow(sal_False, pMod);
+    ScNameDlgWrapper			::RegisterChildWindow(sal_False, pMod);
+    ScPivotLayoutWrapper		::RegisterChildWindow(sal_False, pMod);
+    ScTabOpDlgWrapper			::RegisterChildWindow(sal_False, pMod);
+    ScFilterDlgWrapper			::RegisterChildWindow(sal_False, pMod);
+    ScSpecialFilterDlgWrapper	::RegisterChildWindow(sal_False, pMod);
+    ScDbNameDlgWrapper			::RegisterChildWindow(sal_False, pMod);
+    ScConsolidateDlgWrapper		::RegisterChildWindow(sal_False, pMod);
+    ScPrintAreasDlgWrapper		::RegisterChildWindow(sal_False, pMod);
+    ScCondFormatDlgWrapper		::RegisterChildWindow(sal_False, pMod);
+    ScColRowNameRangesDlgWrapper::RegisterChildWindow(sal_False, pMod);
+    ScFormulaDlgWrapper			::RegisterChildWindow(sal_False, pMod);
 
     // First docking Window for Calc
-    ScFunctionChildWindow		::RegisterChildWindow(FALSE, pMod);
+    ScFunctionChildWindow		::RegisterChildWindow(sal_False, pMod);
 
     // Redlining- Window
-    ScAcceptChgDlgWrapper		::RegisterChildWindow(FALSE, pMod);
-    ScSimpleRefDlgWrapper       ::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_ALWAYSAVAILABLE|SFX_CHILDWIN_NEVERHIDE );
-    ScHighlightChgDlgWrapper	::RegisterChildWindow(FALSE, pMod);
-
-    SvxSearchDialogWrapper      ::RegisterChildWindow(FALSE, pMod);
-    SvxHlinkDlgWrapper          ::RegisterChildWindow(FALSE, pMod);
-    SvxFontWorkChildWindow		::RegisterChildWindow(FALSE, pMod);
-    SvxHyperlinkDlgWrapper		::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_FORCEDOCK);
-    SvxIMapDlgChildWindow		::RegisterChildWindow(FALSE, pMod);
-    GalleryChildWindow			::RegisterChildWindow(FALSE, pMod);
-    ScSpellDialogChildWindow    ::RegisterChildWindow(FALSE, pMod);
-    ::avmedia::MediaPlayer		::RegisterChildWindow(FALSE, pMod);
+    ScAcceptChgDlgWrapper		::RegisterChildWindow(sal_False, pMod);
+    ScSimpleRefDlgWrapper       ::RegisterChildWindow(sal_False, pMod, SFX_CHILDWIN_ALWAYSAVAILABLE|SFX_CHILDWIN_NEVERHIDE );
+    ScHighlightChgDlgWrapper	::RegisterChildWindow(sal_False, pMod);
+
+    SvxSearchDialogWrapper      ::RegisterChildWindow(sal_False, pMod);
+    SvxHlinkDlgWrapper          ::RegisterChildWindow(sal_False, pMod);
+    SvxFontWorkChildWindow		::RegisterChildWindow(sal_False, pMod);
+    SvxHyperlinkDlgWrapper		::RegisterChildWindow(sal_False, pMod, SFX_CHILDWIN_FORCEDOCK);
+    SvxIMapDlgChildWindow		::RegisterChildWindow(sal_False, pMod);
+    GalleryChildWindow			::RegisterChildWindow(sal_False, pMod);
+    ScSpellDialogChildWindow    ::RegisterChildWindow(sal_False, pMod);
+    ::avmedia::MediaPlayer		::RegisterChildWindow(sal_False, pMod);
 
     //<!--Added by PengYunQuan for Validity Cell Range Picker
-    ScValidityRefChildWin::RegisterChildWindow(FALSE, pMod);
+    ScValidityRefChildWin::RegisterChildWindow(sal_False, pMod);
     //-->Added by PengYunQuan for Validity Cell Range Picker
         
     //	Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
@@ -346,7 +346,7 @@ void ScDLL::Init()
     // ::com::sun::star::form::component::Form-Objekt-Factory eintragen
     FmFormObjFactory();
 
-    pMod->PutItem( SfxUInt16Item( SID_ATTR_METRIC, sal::static_int_cast<UINT16>(pMod->GetAppOptions().GetAppMetric()) ) );
+    pMod->PutItem( SfxUInt16Item( SID_ATTR_METRIC, sal::static_int_cast<sal_uInt16>(pMod->GetAppOptions().GetAppMetric()) ) );
 
     //	StarOne Services are now handled in the registry
 }
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 65ebb1ea1..064f7d1ff 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -58,7 +58,6 @@
 #include <vcl/status.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/macrconf.hxx>
 #include <sfx2/printer.hxx>
 #include <editeng/langitem.hxx>
 #include <svtools/colorcfg.hxx>
@@ -122,7 +121,7 @@
 #define SC_IDLE_STEP	75
 #define SC_IDLE_COUNT	50
 
-static USHORT nIdleCount = 0;
+static sal_uInt16 nIdleCount = 0;
 
 //------------------------------------------------------------------
 
@@ -137,7 +136,7 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) )
 //------------------------------------------------------------------
 
 ScModule::ScModule( SfxObjectFactory* pFact ) :
-    SfxModule( SfxApplication::CreateResManager( "sc" ), FALSE, pFact, NULL ),
+    SfxModule( SfxApplication::CreateResManager( "sc" ), sal_False, pFact, NULL ),
     pSelTransfer( NULL ),
     pMessagePool( NULL ),
     pRefInputHandler( NULL ),
@@ -156,9 +155,9 @@ ScModule::ScModule( SfxObjectFactory* pFact ) :
     pSvxErrorHdl( NULL ),
     pFormEditData( NULL ),
     nCurRefDlgId( 0 ),
-    bIsWaterCan( FALSE ),
-    bIsInEditCommand( FALSE ),
-    bIsInExecuteDrop( FALSE ),
+    bIsWaterCan( sal_False ),
+    bIsInEditCommand( sal_False ),
+    bIsInExecuteDrop( sal_False ),
     mbIsInSharedDocLoading( false ),
     mbIsInSharedDocSaving( false )
 {
@@ -221,10 +220,10 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
         if ( ScDetectiveFunc::IsColorsInitialized() )
         {
             const svtools::ColorConfig& rColors = GetColorConfig();
-            BOOL bArrows =
+            sal_Bool bArrows =
                 ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVE).nColor ||
                   ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVEERROR).nColor );
-            BOOL bComments =
+            sal_Bool bComments =
                 ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor );
             if ( bArrows || bComments )
             {
@@ -329,7 +328,7 @@ void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.ISA(SfxSimpleHint) )
     {
-        ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
+        sal_uLong nHintId = ((SfxSimpleHint&)rHint).GetId();
         if ( nHintId == SFX_HINT_DEINITIALIZING )
         {
             //	ConfigItems must be removed before ConfigManager
@@ -383,7 +382,7 @@ void ScModule::Execute( SfxRequest& rReq )
     SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL;
 
     const SfxItemSet*	pReqArgs	= rReq.GetArgs();
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
 
     switch ( nSlot )
     {
@@ -391,27 +390,21 @@ void ScModule::Execute( SfxRequest& rReq )
             {
                 String aMacroName =
                     String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Template.Samples.ShowStyles"));
-                SfxApplication* pApp = SFX_APP();
-                pApp->EnterBasicCall();
-                pApp->GetMacroConfig()->Call( NULL, aMacroName, pApp->GetBasicManager() );
-                pApp->LeaveBasicCall();
+                SfxApplication::CallAppBasic( aMacroName );
             }
             break;
         case SID_EURO_CONVERTER:
             {
                 String aMacroName =
                     String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Euro.ConvertRun.Main"));
-                SfxApplication* pApp = SFX_APP();
-                pApp->EnterBasicCall();
-                pApp->GetMacroConfig()->Call( NULL, aMacroName, pApp->GetBasicManager() );
-                pApp->LeaveBasicCall();
+                SfxApplication::CallAppBasic( aMacroName );
             }
             break;
         case SID_AUTOSPELL_CHECK:
             {
-                BOOL bSet;
+                sal_Bool bSet;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, TRUE, &pItem ) )
+                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, sal_True, &pItem ) )
                     bSet = ((const SfxBoolItem*)pItem)->GetValue();
                 else
                 {						//	Toggle
@@ -432,7 +425,7 @@ void ScModule::Execute( SfxRequest& rReq )
         case SID_ATTR_METRIC:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, TRUE, &pItem ) )
+                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, sal_True, &pItem ) )
                 {
                     FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue();
                     switch( eUnit )
@@ -462,7 +455,7 @@ void ScModule::Execute( SfxRequest& rReq )
         case FID_AUTOCOMPLETE:
             {
                 ScAppOptions aNewOpts( GetAppOptions() );
-                BOOL bNew = !aNewOpts.GetAutoComplete();
+                sal_Bool bNew = !aNewOpts.GetAutoComplete();
                 aNewOpts.SetAutoComplete( bNew );
                 SetAppOptions( aNewOpts );
                 ScInputHandler::SetAutoComplete( bNew );
@@ -475,7 +468,7 @@ void ScModule::Execute( SfxRequest& rReq )
         case SID_DETECTIVE_AUTO:
             {
                 ScAppOptions aNewOpts( GetAppOptions() );
-                BOOL bNew = !aNewOpts.GetDetectiveAuto();
+                sal_Bool bNew = !aNewOpts.GetDetectiveAuto();
                 SFX_REQUEST_ARG( rReq, pAuto, SfxBoolItem, SID_DETECTIVE_AUTO, sal_False );
                 if ( pAuto )
                     bNew = pAuto->GetValue();
@@ -516,7 +509,7 @@ void ScModule::Execute( SfxRequest& rReq )
         case SID_ATTR_CHAR_CTL_LANGUAGE:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( GetPool().GetWhich(nSlot), TRUE, &pItem ) )
+                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( GetPool().GetWhich(nSlot), sal_True, &pItem ) )
                 {
                     ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
                     ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL;
@@ -590,7 +583,7 @@ void ScModule::Execute( SfxRequest& rReq )
 void ScModule::GetState( SfxItemSet& rSet )
 {
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch ( nWhich )
@@ -605,17 +598,17 @@ void ScModule::GetState( SfxItemSet& rSet )
                 rSet.Put( SfxUInt16Item( nWhich, GetAppOptions().GetStatusFunc() ) );
                 break;
             case SID_ATTR_METRIC:
-                rSet.Put( SfxUInt16Item( nWhich, sal::static_int_cast<UINT16>(GetAppOptions().GetAppMetric()) ) );
+                rSet.Put( SfxUInt16Item( nWhich, sal::static_int_cast<sal_uInt16>(GetAppOptions().GetAppMetric()) ) );
                 break;
             case SID_AUTOSPELL_CHECK:
                 {
-                    BOOL bAuto;
+                    sal_Bool bAuto;
                     ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
                     if ( pDocSh )
                         bAuto = pDocSh->GetDocument()->GetDocOptions().IsAutoSpell();
                     else
                     {
-                        USHORT nDummyLang, nDummyCjk, nDummyCtl;
+                        sal_uInt16 nDummyLang, nDummyCjk, nDummyCtl;
                         GetSpellSettings( nDummyLang, nDummyCjk, nDummyCtl, bAuto );
                     }
                     rSet.Put( SfxBoolItem( nWhich, bAuto ) );
@@ -650,7 +643,7 @@ void ScModule::HideDisabledSlots( SfxItemSet& rSet )
     {
         SfxBindings& rBindings = pViewFrm->GetBindings();
         SfxWhichIter aIter( rSet );
-        for( USHORT nWhich = aIter.FirstWhich(); nWhich != 0; nWhich = aIter.NextWhich() )
+        for( sal_uInt16 nWhich = aIter.FirstWhich(); nWhich != 0; nWhich = aIter.NextWhich() )
         {
             ScViewUtil::HideDisabledSlot( rSet, rBindings, nWhich );
             // always disable the slots
@@ -778,22 +771,22 @@ const ScDocOptions& ScModule::GetDocOptions()
 #define LRU_MAX 10
 #endif
 
-void ScModule::InsertEntryToLRUList(USHORT nFIndex)
+void ScModule::InsertEntryToLRUList(sal_uInt16 nFIndex)
 {
     if(nFIndex != 0)
     {
         const ScAppOptions& rAppOpt = GetAppOptions();
-        USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX );
-        USHORT*	pLRUListIds = rAppOpt.GetLRUFuncList();
+        sal_uInt16 nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (sal_uInt16)LRU_MAX );
+        sal_uInt16*	pLRUListIds = rAppOpt.GetLRUFuncList();
 
-        USHORT	aIdxList[LRU_MAX];
-        USHORT	n = 0;
-        BOOL	bFound = FALSE;
+        sal_uInt16	aIdxList[LRU_MAX];
+        sal_uInt16	n = 0;
+        sal_Bool	bFound = sal_False;
 
         while ((n < LRU_MAX) && n<nLRUFuncCount)						// alte Liste abklappern
         {
             if (!bFound && (pLRUListIds[n]== nFIndex))
-                bFound = TRUE;											// erster! Treffer
+                bFound = sal_True;											// erster! Treffer
             else if (bFound)
                 aIdxList[n  ] = pLRUListIds[n];							// hinter Treffer kopieren
             else if ((n+1) < LRU_MAX)
@@ -815,7 +808,7 @@ void ScModule::InsertEntryToLRUList(USHORT nFIndex)
 void ScModule::RecentFunctionsChanged()
 {
     //	update function list window
-    USHORT nFuncListID = ScFunctionChildWindow::GetChildWindowId();
+    sal_uInt16 nFuncListID = ScFunctionChildWindow::GetChildWindowId();
 
     //!	notify all views
     SfxViewFrame* pViewFrm = SfxViewFrame::Current();
@@ -940,7 +933,7 @@ SvtUserOptions&  ScModule::GetUserOptions()
     return *pUserOptions;
 }
 
-USHORT ScModule::GetOptDigitLanguage()
+sal_uInt16 ScModule::GetOptDigitLanguage()
 {
     SvtCTLOptions::TextNumerals eNumerals = GetCTLOptions().GetCTLTextNumerals();
     return ( eNumerals == SvtCTLOptions::NUMERALS_ARABIC ) ? LANGUAGE_ENGLISH_US :
@@ -959,12 +952,12 @@ USHORT ScModule::GetOptDigitLanguage()
 //                      und SID_AUTOSPELL_CHECK
 //
 
-#define IS_AVAILABLE(w,item) (SFX_ITEM_SET==rOptSet.GetItemState((w),TRUE,&item))
+#define IS_AVAILABLE(w,item) (SFX_ITEM_SET==rOptSet.GetItemState((w),sal_True,&item))
 
 void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
 {
-    USHORT nOldSpellLang, nOldCjkLang, nOldCtlLang;
-    BOOL bOldAutoSpell;
+    sal_uInt16 nOldSpellLang, nOldCjkLang, nOldCtlLang;
+    sal_Bool bOldAutoSpell;
     GetSpellSettings( nOldSpellLang, nOldCjkLang, nOldCtlLang, bOldAutoSpell );
 
     if (!pAppCfg)
@@ -984,13 +977,13 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
     ScDocShell*				pDocSh  = PTR_CAST(ScDocShell, SfxObjectShell::Current());
     ScDocument*				pDoc    = pDocSh ? pDocSh->GetDocument() : NULL;
     const SfxPoolItem*		pItem	= NULL;
-    BOOL					bRepaint			= FALSE;
-    BOOL					bUpdateMarks		= FALSE;
-    BOOL					bUpdateRefDev		= FALSE;
-    BOOL					bCalcAll			= FALSE;
-    BOOL					bSaveSpellCheck		= FALSE;
-    BOOL					bSaveAppOptions		= FALSE;
-    BOOL					bSaveInputOptions	= FALSE;
+    sal_Bool					bRepaint			= sal_False;
+    sal_Bool					bUpdateMarks		= sal_False;
+    sal_Bool					bUpdateRefDev		= sal_False;
+    sal_Bool					bCalcAll			= sal_False;
+    sal_Bool					bSaveSpellCheck		= sal_False;
+    sal_Bool					bSaveAppOptions		= sal_False;
+    sal_Bool					bSaveInputOptions	= sal_False;
 
     //--------------------------------------------------------------------------
 
@@ -1002,19 +995,19 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
     {
         PutItem( *pItem );
         pAppCfg->SetAppMetric( (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue() );
-        bSaveAppOptions = TRUE;
+        bSaveAppOptions = sal_True;
     }
 
     if ( IS_AVAILABLE(SCITEM_USERLIST,pItem) )
     {
         ScGlobal::SetUserList( ((const ScUserListItem*)pItem)->GetUserList() );
-        bSaveAppOptions = TRUE;
+        bSaveAppOptions = sal_True;
     }
 
     if ( IS_AVAILABLE(SID_SC_OPT_SYNCZOOM,pItem) )
     {
         pAppCfg->SetSynchronizeZoom( static_cast<const SfxBoolItem*>(pItem)->GetValue() );
-        bSaveAppOptions = TRUE;
+        bSaveAppOptions = sal_True;
     }
 
     //============================================
@@ -1030,7 +1023,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
             ScViewData*				pViewData = pViewSh->GetViewData();
             const ScViewOptions&	rOldOpt	  = pViewData->GetOptions();
 
-            BOOL bAnchorList = ( rOldOpt.GetOption( VOPT_ANCHOR ) !=
+            sal_Bool bAnchorList = ( rOldOpt.GetOption( VOPT_ANCHOR ) !=
                                  rNewOpt.GetOption( VOPT_ANCHOR ) );
 
             if ( rOldOpt != rNewOpt )
@@ -1038,7 +1031,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
                 pViewData->SetOptions( rNewOpt );	// veraendert rOldOpt
                 pViewData->GetDocument()->SetViewOptions( rNewOpt );
                 pDocSh->SetDocumentModified();
-                bRepaint = TRUE;
+                bRepaint = sal_True;
             }
             if ( bAnchorList )
                 pViewSh->UpdateAnchorHandles();
@@ -1069,7 +1062,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
                 pViewData->SetOptions( aNewViewOpt );
                 pViewData->GetDocument()->SetViewOptions( aNewViewOpt );
                 pDocSh->SetDocumentModified();
-                bRepaint = TRUE;
+                bRepaint = sal_True;
             }
         }
         ScViewOptions aNewViewOpt ( GetViewOptions() );
@@ -1117,7 +1110,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
     // nach den eigentlichen DocOptions auch noch die TabDistance setzen
     if ( IS_AVAILABLE(SID_ATTR_DEFTABSTOP,pItem) )
     {
-        USHORT nTabDist = ((SfxUInt16Item*)pItem)->GetValue();
+        sal_uInt16 nTabDist = ((SfxUInt16Item*)pItem)->GetValue();
         ScDocOptions aOpt(GetDocOptions());
         aOpt.SetTabDistance(nTabDist);
         SetDocOptions( aOpt );
@@ -1137,7 +1130,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
 
     if ( IS_AVAILABLE(SID_AUTOSPELL_CHECK,pItem) )				// an Doc-Options
     {
-        BOOL bDoAutoSpell = ((const SfxBoolItem*)pItem)->GetValue();
+        sal_Bool bDoAutoSpell = ((const SfxBoolItem*)pItem)->GetValue();
 
         if (pDoc)
         {
@@ -1158,7 +1151,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
                 //#92038#; don't set document modified, because this flag is no longer saved
 //				pDocSh->SetDocumentModified();
 
-                bRepaint = TRUE;			//	weil HideAutoSpell evtl. ungueltig
+                bRepaint = sal_True;			//	weil HideAutoSpell evtl. ungueltig
                                             //!	alle Views painten ???
             }
         }
@@ -1166,7 +1159,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
         if ( bOldAutoSpell != bDoAutoSpell )
         {
             SetAutoSpellProperty( bDoAutoSpell );
-            bSaveSpellCheck = TRUE;
+            bSaveSpellCheck = sal_True;
         }
         if ( pDocSh )
             pDocSh->PostPaintGridAll();						// wegen Markierungen
@@ -1187,53 +1180,53 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
     if ( IS_AVAILABLE(SID_SC_INPUT_SELECTIONPOS,pItem) )
     {
         pInputCfg->SetMoveDir( ((const SfxUInt16Item*)pItem)->GetValue() );
-        bSaveInputOptions = TRUE;
+        bSaveInputOptions = sal_True;
     }
     if ( IS_AVAILABLE(SID_SC_INPUT_SELECTION,pItem) )
     {
         pInputCfg->SetMoveSelection( ((const SfxBoolItem*)pItem)->GetValue() );
-        bSaveInputOptions = TRUE;
+        bSaveInputOptions = sal_True;
     }
     if ( IS_AVAILABLE(SID_SC_INPUT_EDITMODE,pItem) )
     {
         pInputCfg->SetEnterEdit( ((const SfxBoolItem*)pItem)->GetValue() );
-        bSaveInputOptions = TRUE;
+        bSaveInputOptions = sal_True;
     }
     if ( IS_AVAILABLE(SID_SC_INPUT_FMT_EXPAND,pItem) )
     {
         pInputCfg->SetExtendFormat( ((const SfxBoolItem*)pItem)->GetValue() );
-        bSaveInputOptions = TRUE;
+        bSaveInputOptions = sal_True;
     }
     if ( IS_AVAILABLE(SID_SC_INPUT_RANGEFINDER,pItem) )
     {
         pInputCfg->SetRangeFinder( ((const SfxBoolItem*)pItem)->GetValue() );
-        bSaveInputOptions = TRUE;
+        bSaveInputOptions = sal_True;
     }
     if ( IS_AVAILABLE(SID_SC_INPUT_REF_EXPAND,pItem) )
     {
         pInputCfg->SetExpandRefs( ((const SfxBoolItem*)pItem)->GetValue() );
-        bSaveInputOptions = TRUE;
+        bSaveInputOptions = sal_True;
     }
     if ( IS_AVAILABLE(SID_SC_INPUT_MARK_HEADER,pItem) )
     {
         pInputCfg->SetMarkHeader( ((const SfxBoolItem*)pItem)->GetValue() );
-        bSaveInputOptions = TRUE;
-        bUpdateMarks = TRUE;
+        bSaveInputOptions = sal_True;
+        bUpdateMarks = sal_True;
     }
     if ( IS_AVAILABLE(SID_SC_INPUT_TEXTWYSIWYG,pItem) )
     {
-        BOOL bNew = ((const SfxBoolItem*)pItem)->GetValue();
+        sal_Bool bNew = ((const SfxBoolItem*)pItem)->GetValue();
         if ( bNew != pInputCfg->GetTextWysiwyg() )
         {
             pInputCfg->SetTextWysiwyg( bNew );
-            bSaveInputOptions = TRUE;
-            bUpdateRefDev = TRUE;
+            bSaveInputOptions = sal_True;
+            bUpdateRefDev = sal_True;
         }
     }
     if( IS_AVAILABLE( SID_SC_INPUT_REPLCELLSWARN, pItem ) )
     {
         pInputCfg->SetReplaceCellsWarn( ((const SfxBoolItem*)pItem)->GetValue() );
-        bSaveInputOptions = TRUE;
+        bSaveInputOptions = sal_True;
     }
 
     //============================================
@@ -1270,9 +1263,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
         WaitObject aWait( pDocSh->GetActiveDialogParent() );
         pDoc->CalcAll();
         if ( pViewSh )
-            pViewSh->UpdateCharts( TRUE );
+            pViewSh->UpdateCharts( sal_True );
         else
-            ScDBFunc::DoUpdateCharts( ScAddress(), pDoc, TRUE );
+            ScDBFunc::DoUpdateCharts( ScAddress(), pDoc, sal_True );
         if (pBindings)
             pBindings->Invalidate( SID_ATTR_SIZE ); //SvxPosSize-StatusControl-Update
     }
@@ -1330,7 +1323,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
 
             //	update view scale
             ScViewData* pViewData = pOneViewSh->GetViewData();
-            pOneViewSh->SetZoom( pViewData->GetZoomX(), pViewData->GetZoomY(), FALSE );
+            pOneViewSh->SetZoom( pViewData->GetZoomX(), pViewData->GetZoomY(), sal_False );
 
             //	repaint
             pOneViewSh->PaintGrid();
@@ -1350,7 +1343,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
 //
 //------------------------------------------------------------------
 
-ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, BOOL bUseRef )
+ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, sal_Bool bUseRef )
 {
     if ( pRefInputHandler && bUseRef )
         return pRefInputHandler;
@@ -1389,25 +1382,25 @@ void ScModule::SetInputMode( ScInputMode eMode )
         pHdl->SetMode( eMode );
 }
 
-BOOL ScModule::IsEditMode()
+sal_Bool ScModule::IsEditMode()
 {
     ScInputHandler* pHdl = GetInputHdl();
     return pHdl && pHdl->IsEditMode();
 }
 
-BOOL ScModule::IsInputMode()
+sal_Bool ScModule::IsInputMode()
 {
     ScInputHandler* pHdl = GetInputHdl();
     return pHdl && pHdl->IsInputMode();
 }
 
-BOOL ScModule::InputKeyEvent( const KeyEvent& rKEvt, BOOL bStartEdit )
+sal_Bool ScModule::InputKeyEvent( const KeyEvent& rKEvt, sal_Bool bStartEdit )
 {
     ScInputHandler* pHdl = GetInputHdl();
-    return ( pHdl ? pHdl->KeyInput( rKEvt, bStartEdit ) : FALSE );
+    return ( pHdl ? pHdl->KeyInput( rKEvt, bStartEdit ) : sal_False );
 }
 
-void ScModule::InputEnterHandler( BYTE nBlockMode )
+void ScModule::InputEnterHandler( sal_uInt8 nBlockMode )
 {
     if ( !SFX_APP()->IsDowning() )									// nicht beim Programmende
     {
@@ -1488,7 +1481,7 @@ String ScModule::InputGetFormulaStr()
     return aStr;
 }
 
-void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix )
+void ScModule::ActivateInputWindow( const String* pStrFormula, sal_Bool bMatrix )
 {
     ScInputHandler* pHdl = GetInputHdl();
     if ( pHdl )
@@ -1499,10 +1492,10 @@ void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix )
             // Formel uebernehmen
             if ( pWin )
             {
-                pWin->SetFuncString( *pStrFormula, FALSE );
-                // SetSumAssignMode wegen FALSE nicht noetig
+                pWin->SetFuncString( *pStrFormula, sal_False );
+                // SetSumAssignMode wegen sal_False nicht noetig
             }
-            BYTE nMode = bMatrix ? SC_ENTER_MATRIX : SC_ENTER_NORMAL;
+            sal_uInt8 nMode = bMatrix ? SC_ENTER_MATRIX : SC_ENTER_NORMAL;
             pHdl->EnterHandler( nMode );
 
             //	ohne Invalidate bleibt die Selektion stehen, wenn die Formel unveraendert ist
@@ -1514,8 +1507,8 @@ void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix )
             // Abbrechen
             if ( pWin )
             {
-                pWin->SetFuncString( EMPTY_STRING, FALSE );
-                // SetSumAssignMode wegen FALSE nicht noetig
+                pWin->SetFuncString( EMPTY_STRING, sal_False );
+                // SetSumAssignMode wegen sal_False nicht noetig
             }
             pHdl->CancelHandler();
         }
@@ -1528,7 +1521,7 @@ void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix )
 //
 //------------------------------------------------------------------
 
-void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm )
+void ScModule::SetRefDialog( sal_uInt16 nId, sal_Bool bVis, SfxViewFrame* pViewFrm )
 {
     //!	move reference dialog handling to view
     //!	(only keep function autopilot here for references to other documents)
@@ -1554,7 +1547,7 @@ void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm )
             else
             {
                 // no ScTabViewShell - possible for example from a Basic macro
-                bVis = FALSE;
+                bVis = sal_False;
                 nCurRefDlgId = 0;   // don't set nCurRefDlgId if no dialog is created
             }
 
@@ -1566,7 +1559,7 @@ void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm )
     }
 }
 
-SfxChildWindow* lcl_GetChildWinFromAnyView( USHORT nId )
+SfxChildWindow* lcl_GetChildWinFromAnyView( sal_uInt16 nId )
 {
     //	first try the current view
 
@@ -1592,12 +1585,12 @@ SfxChildWindow* lcl_GetChildWinFromAnyView( USHORT nId )
     return NULL;					// none found
 }
 
-BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh)
+sal_Bool ScModule::IsModalMode(SfxObjectShell* pDocSh)
 {
     //!	move reference dialog handling to view
     //!	(only keep function autopilot here for references to other documents)
 
-    BOOL bIsModal = FALSE;
+    sal_Bool bIsModal = sal_False;
 
     if ( nCurRefDlgId )
     {
@@ -1613,7 +1606,7 @@ BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh)
             // in 592 and above, the dialog isn't visible in other views
             //	if the dialog is open but can't be accessed, disable input
 
-            bIsModal = TRUE;
+            bIsModal = sal_True;
         }
 
         //	pChildWnd kann 0 sein, wenn der Dialog nach dem Umschalten
@@ -1629,12 +1622,12 @@ BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh)
     return bIsModal;
 }
 
-BOOL ScModule::IsTableLocked()
+sal_Bool ScModule::IsTableLocked()
 {
     //!	move reference dialog handling to view
     //!	(only keep function autopilot here for references to other documents)
 
-    BOOL bLocked = FALSE;
+    sal_Bool bLocked = sal_False;
 
     //	bisher nur bei ScAnyRefDlg
 
@@ -1644,18 +1637,18 @@ BOOL ScModule::IsTableLocked()
         if ( pChildWnd )
             bLocked = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow())->IsTableLocked();
         else
-            bLocked = TRUE;		// for other views, see IsModalMode
+            bLocked = sal_True;		// for other views, see IsModalMode
     }
 
     return bLocked;
 }
 
-BOOL ScModule::IsRefDialogOpen()
+sal_Bool ScModule::IsRefDialogOpen()
 {
     //!	move reference dialog handling to view
     //!	(only keep function autopilot here for references to other documents)
 
-    BOOL bIsOpen = FALSE;
+    sal_Bool bIsOpen = sal_False;
 
     if ( nCurRefDlgId )
     {
@@ -1663,18 +1656,18 @@ BOOL ScModule::IsRefDialogOpen()
         if ( pChildWnd )
             bIsOpen = pChildWnd->IsVisible();
         else
-            bIsOpen = TRUE;		// for other views, see IsModalMode
+            bIsOpen = sal_True;		// for other views, see IsModalMode
     }
 
     return bIsOpen;
 }
 
-BOOL ScModule::IsFormulaMode()
+sal_Bool ScModule::IsFormulaMode()
 {
     //!	move reference dialog handling to view
     //!	(only keep function autopilot here for references to other documents)
 
-    BOOL bIsFormula = FALSE;
+    sal_Bool bIsFormula = sal_False;
 
     if ( nCurRefDlgId )
     {
@@ -1693,7 +1686,7 @@ BOOL ScModule::IsFormulaMode()
     }
 
     if (bIsInEditCommand)
-        bIsFormula = TRUE;
+        bIsFormula = sal_True;
 
     return bIsFormula;
 }
@@ -1702,14 +1695,14 @@ void lcl_MarkedTabs( const ScMarkData& rMark, SCTAB& rStartTab, SCTAB& rEndTab )
 {
     if (rMark.GetSelectCount() > 1)
     {
-        BOOL bFirst = TRUE;
+        sal_Bool bFirst = sal_True;
         for (SCTAB i=0; i<=MAXTAB; i++)
             if (rMark.GetTableSelect(i))
             {
                 if (bFirst)
                     rStartTab = i;
                 rEndTab = i;
-                bFirst = FALSE;
+                bFirst = sal_False;
             }
     }
 }
@@ -1744,8 +1737,8 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc,
             IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow());
 
             //	hide the (color) selection now instead of later from LoseFocus,
-            //	don't abort the ref input that causes this call (bDoneRefMode = FALSE)
-            pRefDlg->HideReference( FALSE );
+            //	don't abort the ref input that causes this call (bDoneRefMode = sal_False)
+            pRefDlg->HideReference( sal_False );
             pRefDlg->SetReference( aNew, pDoc );
         }
     }
@@ -1813,7 +1806,7 @@ void ScModule::EndReference()
 
 void ScModule::AnythingChanged()
 {
-    ULONG nOldTime = aIdleTimer.GetTimeout();
+    sal_uLong nOldTime = aIdleTimer.GetTimeout();
     if ( nOldTime != SC_IDLE_MIN )
         aIdleTimer.SetTimeout( SC_IDLE_MIN );
 
@@ -1841,15 +1834,15 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
         return 0;
     }
 
-    BOOL bMore = FALSE;
+    sal_Bool bMore = sal_False;
     ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
     if ( pDocSh )
     {
         ScDocument* pDoc = pDocSh->GetDocument();
 
-        BOOL bLinks = pDoc->IdleCheckLinks();
-        BOOL bWidth = pDoc->IdleCalcTextWidth();
-        BOOL bSpell = pDoc->ContinueOnlineSpelling();
+        sal_Bool bLinks = pDoc->IdleCheckLinks();
+        sal_Bool bWidth = pDoc->IdleCalcTextWidth();
+        sal_Bool bSpell = pDoc->ContinueOnlineSpelling();
         if ( bSpell )
             aSpellTimer.Start();					// da ist noch was
 
@@ -1861,8 +1854,8 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
             lcl_CheckNeedsRepaint( pDocSh );
     }
 
-    ULONG nOldTime = aIdleTimer.GetTimeout();
-    ULONG nNewTime = nOldTime;
+    sal_uLong nOldTime = aIdleTimer.GetTimeout();
+    sal_uLong nNewTime = nOldTime;
     if ( bMore )
     {
         nNewTime = SC_IDLE_MIN;
@@ -1907,7 +1900,7 @@ IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG )
 }
 
     //virtuelle Methoden fuer den Optionendialog
-SfxItemSet*	 ScModule::CreateItemSet( USHORT nId )
+SfxItemSet*	 ScModule::CreateItemSet( sal_uInt16 nId )
 {
     SfxItemSet*	 pRet = 0;
     if(SID_SC_EDITOPTIONS == nId)
@@ -1951,7 +1944,7 @@ SfxItemSet*	 ScModule::CreateItemSet( USHORT nId )
         //  SFX_APP()->GetOptions( aSet );
 
         pRet->Put( SfxUInt16Item( SID_ATTR_METRIC,
-                        sal::static_int_cast<UINT16>(GetAppOptions().GetAppMetric()) ) );
+                        sal::static_int_cast<sal_uInt16>(GetAppOptions().GetAppMetric()) ) );
 
         // TP_CALC
         pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP,
@@ -2000,7 +1993,7 @@ SfxItemSet*	 ScModule::CreateItemSet( USHORT nId )
     return pRet;
 }
 
-void ScModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
+void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
 {
     if(SID_SC_EDITOPTIONS == nId)
     {
@@ -2008,7 +2001,7 @@ void ScModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
     }
 }
 
-SfxTabPage*	 ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet )
+SfxTabPage*	 ScModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
 {
     SfxTabPage* pRet = NULL;
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -2128,59 +2121,59 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo )
     return 0;
 }
 
-BOOL ScModule::RegisterRefWindow( USHORT nSlotId, Window *pWnd )
+sal_Bool ScModule::RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd )
 {
     std::list<Window*> & rlRefWindow = m_mapRefWindow[nSlotId];
 
     if( std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ) == rlRefWindow.end() )
     {
         rlRefWindow.push_back( pWnd );
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL  ScModule::UnregisterRefWindow( USHORT nSlotId, Window *pWnd )
+sal_Bool  ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd )
 {
-    std::map<USHORT, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId );
+    std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId );
 
     if( iSlot == m_mapRefWindow.end() )
-        return FALSE;
+        return sal_False;
 
     std::list<Window*> & rlRefWindow = iSlot->second;
 
     std::list<Window*>::iterator i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd );
 
     if( i == rlRefWindow.end() )
-        return FALSE;
+        return sal_False;
 
     rlRefWindow.erase( i );
 
     if( !rlRefWindow.size() )
         m_mapRefWindow.erase( nSlotId );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL  ScModule::IsAliveRefDlg( USHORT nSlotId, Window *pWnd )
+sal_Bool  ScModule::IsAliveRefDlg( sal_uInt16 nSlotId, Window *pWnd )
 {
-    std::map<USHORT, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId );
+    std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId );
 
     if( iSlot == m_mapRefWindow.end() )
-        return FALSE;
+        return sal_False;
 
     std::list<Window*> & rlRefWindow = iSlot->second;
 
     return rlRefWindow.end() != std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd );
 }
 
-Window *  ScModule::Find1RefWindow( USHORT nSlotId, Window *pWndAncestor )
+Window *  ScModule::Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor )
 {
     if (!pWndAncestor)
         return NULL;
 
-    std::map<USHORT, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId );
+    std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId );
 
     if( iSlot == m_mapRefWindow.end() )
         return NULL;
@@ -2203,7 +2196,7 @@ Window *  ScModule::Find1RefWindow( Window *pWndAncestor )
 
     while( Window *pParent = pWndAncestor->GetParent() ) pWndAncestor = pParent;
 
-    for( std::map<USHORT, std::list<Window*> >::iterator i = m_mapRefWindow.begin();
+    for( std::map<sal_uInt16, std::list<Window*> >::iterator i = m_mapRefWindow.begin();
         i!=m_mapRefWindow.end(); i++ )
         for( std::list<Window*>::iterator j = i->second.begin(); j!=i->second.end(); j++ )
             if ( pWndAncestor->IsWindowOrChild( *j, (*j)->IsSystemWindow() ) )
diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx
index 0e042cfd7..be1bcb702 100644
--- a/sc/source/ui/app/scmod2.cxx
+++ b/sc/source/ui/app/scmod2.cxx
@@ -50,8 +50,8 @@ using namespace com::sun::star;
 //------------------------------------------------------------------
 
 // static
-void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang,
-                                    BOOL& rAutoSpell )
+void ScModule::GetSpellSettings( sal_uInt16& rDefLang, sal_uInt16& rCjkLang, sal_uInt16& rCtlLang,
+                                    sal_Bool& rAutoSpell )
 {
     //	use SvtLinguConfig instead of service LinguProperties to avoid
     //	loading the linguistic component
@@ -67,7 +67,7 @@ void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCt
 }
 
 // static
-void ScModule::SetAutoSpellProperty( BOOL bSet )
+void ScModule::SetAutoSpellProperty( sal_Bool bSet )
 {
     //	use SvtLinguConfig instead of service LinguProperties to avoid
     //	loading the linguistic component
@@ -81,15 +81,15 @@ void ScModule::SetAutoSpellProperty( BOOL bSet )
 
 
 // static
-BOOL ScModule::HasThesaurusLanguage( USHORT nLang )
+sal_Bool ScModule::HasThesaurusLanguage( sal_uInt16 nLang )
 {
     if ( nLang == LANGUAGE_NONE )
-        return FALSE;
+        return sal_False;
 
     lang::Locale aLocale;
     SvxLanguageToLocale( aLocale, nLang );
 
-    BOOL bHasLang = FALSE;
+    sal_Bool bHasLang = sal_False;
     try
     {
         uno::Reference< linguistic2::XThesaurus > xThes(LinguMgr::GetThesaurus());
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index a357a128a..5b5f3f3cc 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -55,9 +55,9 @@ using namespace com::sun::star;
 
 // -----------------------------------------------------------------------
 
-BOOL lcl_IsURLButton( SdrObject* pObject )
+sal_Bool lcl_IsURLButton( SdrObject* pObject )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObject);
     if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor())
@@ -75,7 +75,7 @@ BOOL lcl_IsURLButton( SdrObject* pObject )
                 uno::Any aAny = xPropSet->getPropertyValue( sPropButtonType );
                 form::FormButtonType eTmp;
                 if ( (aAny >>= eTmp) && eTmp == form::FormButtonType_URL )
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
          }
     }
@@ -98,13 +98,13 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView
         {
             //	handle selection on drawing layer
             const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-            ULONG nMarkCount = rMarkList.GetMarkCount();
+            sal_uLong nMarkCount = rMarkList.GetMarkCount();
             if ( nMarkCount )
             {
                 if ( nMarkCount == 1 )
                 {
                     SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-                    UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+                    sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
 
                     if ( nSdrObjKind == OBJ_GRAF )
                     {
@@ -176,11 +176,11 @@ ScSelectionTransferObj::~ScSelectionTransferObj()
     DBG_ASSERT( !pView, "ScSelectionTransferObj dtor: ForgetView not called" );
 }
 
-BOOL ScSelectionTransferObj::StillValid()
+sal_Bool ScSelectionTransferObj::StillValid()
 {
     //!	check if view still has same cell selection
-    //!	(but return FALSE if data has changed inbetween)
-    return FALSE;
+    //!	(but return sal_False if data has changed inbetween)
+    return sal_False;
 }
 
 void ScSelectionTransferObj::ForgetView()
@@ -296,10 +296,10 @@ void ScSelectionTransferObj::CreateCellData()
             ScDrawLayer::SetGlobalDrawPersist(aDragShellRef);
 
             ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
-            // bApi = TRUE -> no error mesages
-            // #i18364# bStopEdit = FALSE -> don't end edit mode
+            // bApi = sal_True -> no error mesages
+            // #i18364# bStopEdit = sal_False -> don't end edit mode
             // (this may be called from pasting into the edit line)
-            BOOL bCopied = pViewData->GetView()->CopyToClip( pClipDoc, FALSE, TRUE, TRUE, FALSE );
+            sal_Bool bCopied = pViewData->GetView()->CopyToClip( pClipDoc, sal_False, sal_True, sal_True, sal_False );
 
             ScDrawLayer::SetGlobalDrawPersist(NULL);
 
@@ -332,7 +332,7 @@ void ScSelectionTransferObj::CreateCellData()
 }
 
 //!	make static member of ScDrawView
-extern void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle );
+extern void lcl_CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle );
 
 void ScSelectionTransferObj::CreateDrawData()
 {
@@ -344,7 +344,7 @@ void ScSelectionTransferObj::CreateDrawData()
         ScDrawView* pDrawView = pView->GetScDrawView();
         if ( pDrawView )
         {
-            BOOL bAnyOle, bOneOle;
+            sal_Bool bAnyOle, bOneOle;
             const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList();
             lcl_CheckOle( rMarkList, bAnyOle, bOneOle );
 
diff --git a/sc/source/ui/app/template.cxx b/sc/source/ui/app/template.cxx
index 3f49cb3a6..01cc0506c 100644
--- a/sc/source/ui/app/template.cxx
+++ b/sc/source/ui/app/template.cxx
@@ -34,7 +34,7 @@
 
 //------------------------------------------------------------------------
 
-ScTemplateDlg::ScTemplateDlg(Window * pParent, USHORT nAppResource) :
+ScTemplateDlg::ScTemplateDlg(Window * pParent, sal_uInt16 nAppResource) :
 //  SfxTemplateDlg( pParent, nAppResource )
     SfxTemplateDialog( pParent )
 {
@@ -48,9 +48,9 @@ __EXPORT ScTemplateDlg::~ScTemplateDlg()
 
 //------------------------------------------------------------------------
 
-BOOL ScTemplateDlg::New(String &rNewName)
+sal_Bool ScTemplateDlg::New(String &rNewName)
 {
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -59,9 +59,9 @@ void ScTemplateDlg::Edit(const String &)
 }
 
 
-BOOL ScTemplateDlg::Delete(const String &)
+sal_Bool ScTemplateDlg::Delete(const String &)
 {
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index be9bf5de3..ea22ea3db 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -107,7 +107,7 @@ void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCR
 
 // static
 void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPrintFactor,
-                                const ScRange& rBlock, BOOL bMetaFile )
+                                const ScRange& rBlock, sal_Bool bMetaFile )
 {
     if (!pDoc)
         return;
@@ -133,8 +133,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc
     nDragHandleX( 0 ),
     nDragHandleY( 0 ),
     nDragSourceFlags( 0 ),
-    bDragWasInternal( FALSE ),
-    bUsedForLink( FALSE ),
+    bDragWasInternal( sal_False ),
+    bUsedForLink( sal_False ),
     bUseInApi( false )
 {
     DBG_ASSERT(pDoc->IsClipboard(), "wrong document");
@@ -148,25 +148,25 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc
     SCCOL nCol2;
     SCROW nRow2;
     pDoc->GetClipStart( nCol1, nRow1 );
-    pDoc->GetClipArea( nCol2, nRow2, TRUE );	// real source area - include filtered rows
+    pDoc->GetClipArea( nCol2, nRow2, sal_True );	// real source area - include filtered rows
     nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nCol1 );
     nRow2 = sal::static_int_cast<SCROW>( nRow2 + nRow1 );
 
     SCCOL nDummy;
-    pDoc->GetClipArea( nDummy, nNonFiltered, FALSE );
+    pDoc->GetClipArea( nDummy, nNonFiltered, sal_False );
     bHasFiltered = (nNonFiltered < (nRow2 - nRow1));
     ++nNonFiltered;		// to get count instead of diff
 
     SCTAB nTab1=0;
     SCTAB nTab2=0;
-    BOOL bFirst = TRUE;
+    sal_Bool bFirst = sal_True;
     for (SCTAB i=0; i<=MAXTAB; i++)
         if (pDoc->HasTable(i))
         {
             if (bFirst)
                 nTab1 = i;
             nTab2 = i;
-            bFirst = FALSE;
+            bFirst = sal_False;
         }
     DBG_ASSERT(!bFirst, "no sheet selected");
 
@@ -306,9 +306,9 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
             //	if this transfer object was used to create a DDE link, filtered rows
             //	have to be included for subsequent calls (to be consistent with link data)
             if ( nFormat == SOT_FORMATSTR_ID_LINK )
-                bUsedForLink = TRUE;
+                bUsedForLink = sal_True;
 
-            BOOL bIncludeFiltered = pDoc->IsCutMode() || bUsedForLink;
+            sal_Bool bIncludeFiltered = pDoc->IsCutMode() || bUsedForLink;
 
             ScImportExport aObj( pDoc, aBlock );
             if ( bUsedForLink )
@@ -342,7 +342,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
             VirtualDevice aVirtDev;
             aVirtDev.SetOutputSizePixel( aVirtDev.LogicToPixel( aMMRect.GetSize(), MAP_100TH_MM ) );
 
-            PaintToDev( &aVirtDev, pDoc, 1.0, aBlock, FALSE );
+            PaintToDev( &aVirtDev, pDoc, 1.0, aBlock, sal_False );
 
             aVirtDev.SetMapMode( MapMode( MAP_PIXEL ) );
             Bitmap aBmp = aVirtDev.GetBitmap( Point(), aVirtDev.GetOutputSize() );
@@ -360,7 +360,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
             MapMode			aMapMode( pEmbObj->GetMapUnit() );
             Rectangle		aVisArea( pEmbObj->GetVisArea( ASPECT_CONTENT ) );
 
-            aVDev.EnableOutput( FALSE );
+            aVDev.EnableOutput( sal_False );
             aVDev.SetMapMode( aMapMode );
             aMtf.SetPrefSize( aVisArea.GetSize() );
             aMtf.SetPrefMapMode( aMapMode );
@@ -419,7 +419,7 @@ sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj
                     //	write old format without support for unicode characters.
                     //	Get the data from the EditEngine's transferable instead.
 
-                    USHORT nParCnt = pEngine->GetParagraphCount();
+                    sal_uInt16 nParCnt = pEngine->GetParagraphCount();
                     if ( nParCnt == 0 )
                         nParCnt = 1;
                     ESelection aSel( 0, 0, nParCnt-1, pEngine->GetTextLen(nParCnt-1) );
@@ -446,7 +446,7 @@ sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj
 
                 // mba: no relative ULRs for clipboard!
                 SfxMedium aMedium( xWorkStore, String() );
-                bRet = pEmbObj->DoSaveObjectAs( aMedium, FALSE );
+                bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False );
                 pEmbObj->DoSaveCompleted();
 
                 uno::Reference< embed::XTransactedObject > xTransact( xWorkStore, uno::UNO_QUERY );
@@ -461,7 +461,7 @@ sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj
                     delete pSrcStm;
                 }
 
-                bRet = TRUE;
+                bRet = sal_True;
 
                 xWorkStore->dispose();
                 xWorkStore = uno::Reference < embed::XStorage >();
@@ -494,8 +494,8 @@ void ScTransferObj::DragFinished( sal_Int8 nDropAction )
         {
             ScMarkData aMarkData = GetSourceMarkData();
             //	external drag&drop doesn't copy objects, so they also aren't deleted:
-            //	#105703# bApi=TRUE, don't show error messages from drag&drop
-            pSourceSh->GetDocFunc().DeleteContents( aMarkData, IDF_ALL & ~IDF_OBJECTS, TRUE, TRUE );
+            //	#105703# bApi=sal_True, don't show error messages from drag&drop
+            pSourceSh->GetDocFunc().DeleteContents( aMarkData, IDF_ALL & ~IDF_OBJECTS, sal_True, sal_True );
         }
     }
 
@@ -527,18 +527,18 @@ void ScTransferObj::SetDrawPersist( const SfxObjectShellRef& rRef )
 void ScTransferObj::SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark )
 {
     ScRangeList aRanges;
-    rMark.FillRangeListWithMarks( &aRanges, FALSE );
+    rMark.FillRangeListWithMarks( &aRanges, sal_False );
     xDragSourceRanges = new ScCellRangesObj( pSourceShell, aRanges );
 }
 
-void ScTransferObj::SetDragSourceFlags( USHORT nFlags )
+void ScTransferObj::SetDragSourceFlags( sal_uInt16 nFlags )
 {
     nDragSourceFlags = nFlags;
 }
 
 void ScTransferObj::SetDragWasInternal()
 {
-    bDragWasInternal = TRUE;
+    bDragWasInternal = sal_True;
 }
 
 void ScTransferObj::SetUseInApi( bool bSet )
@@ -570,7 +570,7 @@ ScMarkData ScTransferObj::GetSourceMarkData()
     if (pRangesObj)
     {
         const ScRangeList& rRanges = pRangesObj->GetRangeList();
-        aMarkData.MarkFromRangeList( rRanges, FALSE );
+        aMarkData.MarkFromRangeList( rRanges, sal_False );
     }
     return aMarkData;
 }
@@ -590,13 +590,13 @@ void ScTransferObj::InitDocShell()
 
         ScDocument* pDestDoc = pDocSh->GetDocument();
         ScMarkData aDestMark;
-        aDestMark.SelectTable( 0, TRUE );
+        aDestMark.SelectTable( 0, sal_True );
 
         pDestDoc->SetDocOptions( pDoc->GetDocOptions() );   // #i42666#
 
         String aTabName;
         pDoc->GetName( aBlock.aStart.Tab(), aTabName );
-        pDestDoc->RenameTab( 0, aTabName, FALSE );			// no UpdateRef (empty)
+        pDestDoc->RenameTab( 0, aTabName, sal_False );			// no UpdateRef (empty)
 
         pDestDoc->CopyStdStylesFrom( pDoc );
 
@@ -613,19 +613,19 @@ void ScTransferObj::InitDocShell()
         pDestDoc->SetLayoutRTL(0, pDoc->IsLayoutRTL(nSrcTab));
         for (nCol=nStartX; nCol<=nEndX; nCol++)
             if ( pDoc->ColHidden(nCol, nSrcTab, nLastCol) )
-                pDestDoc->ShowCol( nCol, 0, FALSE );
+                pDestDoc->ShowCol( nCol, 0, sal_False );
             else
                 pDestDoc->SetColWidth( nCol, 0, pDoc->GetColWidth( nCol, nSrcTab ) );
 
-        ScBitMaskCompressedArray< SCROW, BYTE> & rDestRowFlags =
+        ScBitMaskCompressedArray< SCROW, sal_uInt8> & rDestRowFlags =
             pDestDoc->GetRowFlagsArrayModifiable(0);
 
         for (SCROW nRow = nStartY; nRow <= nEndY; ++nRow)
         {
-            BYTE nSourceFlags = pDoc->GetRowFlags(nRow, nSrcTab);
+            sal_uInt8 nSourceFlags = pDoc->GetRowFlags(nRow, nSrcTab);
             SCROW nLastRow = -1;
             if ( pDoc->RowHidden(nRow, nSrcTab, nLastRow) )
-                pDestDoc->ShowRow( nRow, 0, FALSE );
+                pDestDoc->ShowRow( nRow, 0, sal_False );
             else
             {
                 pDestDoc->SetRowHeight( nRow, 0, pDoc->GetOriginalHeight( nRow, nSrcTab ) );
@@ -644,16 +644,16 @@ void ScTransferObj::InitDocShell()
         //	pDoc is always a Clipboard-document
 
         ScRange aDestRange( nStartX,nStartY,0, nEndX,nEndY,0 );
-        BOOL bWasCut = pDoc->IsCutMode();
+        sal_Bool bWasCut = pDoc->IsCutMode();
         if (!bWasCut)
-            pDoc->SetClipArea( aDestRange, TRUE );			// Cut
-        pDestDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL, NULL, pDoc, FALSE );
+            pDoc->SetClipArea( aDestRange, sal_True );			// Cut
+        pDestDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL, NULL, pDoc, sal_False );
         pDoc->SetClipArea( aDestRange, bWasCut );
 
         StripRefs( pDoc, nStartX,nStartY, nEndX,nEndY, pDestDoc, 0,0 );
 
         ScRange aMergeRange = aDestRange;
-        pDestDoc->ExtendMerge( aMergeRange, TRUE );
+        pDestDoc->ExtendMerge( aMergeRange, sal_True );
 
         pDoc->CopyDdeLinks( pDestDoc );			// copy values of DDE Links
 
@@ -722,7 +722,7 @@ void ScTransferObj::InitDocShell()
         //pDocSh->SvInPlaceObject::SetVisArea( aNewArea );
         pDocSh->SetVisArea( aNewArea );
 
-        pDocSh->UpdateOle(&aViewData, TRUE);
+        pDocSh->UpdateOle(&aViewData, sal_True);
 
         //!	SetDocumentModified?
         if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() )
@@ -731,7 +731,7 @@ void ScTransferObj::InitDocShell()
 }
 
 //	static
-SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle )
+SfxObjectShell* ScTransferObj::SetDrawClipDoc( sal_Bool bAnyOle )
 {
     // update ScGlobal::pDrawClipDocShellRef
 
@@ -786,14 +786,14 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
         if (pCell->GetCellType() == CELLTYPE_FORMULA)
         {
             ScFormulaCell* pFCell = (ScFormulaCell*) pCell;
-            BOOL bOut = FALSE;
+            sal_Bool bOut = sal_False;
             ScDetectiveRefIter aRefIter( pFCell );
             while ( !bOut && aRefIter.GetNextRef( aRef ) )
             {
                 if ( aRef.aStart.Tab() != nSrcTab || aRef.aEnd.Tab() != nSrcTab ||
                         aRef.aStart.Col() < nStartX || aRef.aEnd.Col() > nEndX ||
                         aRef.aStart.Row() < nStartY || aRef.aEnd.Row() > nEndY )
-                    bOut = TRUE;
+                    bOut = sal_True;
             }
             if (bOut)
             {
@@ -801,7 +801,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
                 SCROW nRow = aIter.GetRow() - nSubY;
 
                 ScBaseCell* pNew = 0;
-                USHORT nErrCode = pFCell->GetErrCode();
+                sal_uInt16 nErrCode = pFCell->GetErrCode();
                 if (nErrCode)
                 {
                     pNew = new ScStringCell( ScGlobal::GetErrorString(nErrCode) );
@@ -829,11 +829,11 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
 
                 //	number formats
 
-                ULONG nOldFormat = ((const SfxUInt32Item*)
+                sal_uLong nOldFormat = ((const SfxUInt32Item*)
                                 pDestDoc->GetAttr(nCol,nRow,nDestTab, ATTR_VALUE_FORMAT))->GetValue();
                 if ( (nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
                 {
-                    ULONG nNewFormat = pFCell->GetStandardFormat( *pFormatter,
+                    sal_uLong nNewFormat = pFCell->GetStandardFormat( *pFormatter,
                         nOldFormat );
                     pDestDoc->ApplyAttr( nCol,nRow,nDestTab,
                                 SfxUInt32Item(ATTR_VALUE_FORMAT, nNewFormat) );
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 36eab35ca..a9f66bf8a 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -57,7 +57,7 @@ TYPEINIT1(ScIndexHint,			SfxHint);
 //      ScInputStatusItem - Status-Update fuer Eingabezeile
 // -----------------------------------------------------------------------
 
-//UNUSED2008-05  ScInputStatusItem::ScInputStatusItem( USHORT nWhichP,
+//UNUSED2008-05  ScInputStatusItem::ScInputStatusItem( sal_uInt16 nWhichP,
 //UNUSED2008-05                                        SCTAB nTab,
 //UNUSED2008-05                                        SCCOL nCol, SCROW nRow,
 //UNUSED2008-05                                        SCCOL nStartCol, SCROW nStartRow,
@@ -73,7 +73,7 @@ TYPEINIT1(ScIndexHint,			SfxHint);
 //UNUSED2008-05  {
 //UNUSED2008-05  }
 
-ScInputStatusItem::ScInputStatusItem( USHORT nWhichP,
+ScInputStatusItem::ScInputStatusItem( sal_uInt16 nWhichP,
                                       const ScAddress& rCurPos,
                                       const ScAddress& rStartPos,
                                       const ScAddress& rEndPos,
@@ -132,7 +132,7 @@ SfxPoolItem* __EXPORT ScInputStatusItem::Clone( SfxItemPool * ) const
 //	ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht
 // -----------------------------------------------------------------------
 
-ScTablesHint::ScTablesHint(USHORT nNewId, SCTAB nTable1, SCTAB nTable2) :
+ScTablesHint::ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2) :
     nId( nNewId ),
     nTab1( nTable1 ),
     nTab2( nTable2 )
@@ -148,7 +148,7 @@ ScTablesHint::~ScTablesHint()
 //	ScIndexHint
 // -----------------------------------------------------------------------
 
-ScIndexHint::ScIndexHint(USHORT nNewId, USHORT nIdx) :
+ScIndexHint::ScIndexHint(sal_uInt16 nNewId, sal_uInt16 nIdx) :
     nId( nNewId ),
     nIndex( nIdx )
 {
@@ -177,7 +177,7 @@ ScEditViewHint::~ScEditViewHint()
 //      ScSortItem - Daten fuer den Sortierdialog
 // -----------------------------------------------------------------------
 
-ScSortItem::ScSortItem( USHORT              nWhichP,
+ScSortItem::ScSortItem( sal_uInt16              nWhichP,
                         ScViewData*         ptrViewData,
                         const ScSortParam*  pSortData ) :
         SfxPoolItem ( nWhichP ),
@@ -188,7 +188,7 @@ ScSortItem::ScSortItem( USHORT              nWhichP,
 
 //------------------------------------------------------------------------
 
-ScSortItem::ScSortItem( USHORT              nWhichP,
+ScSortItem::ScSortItem( sal_uInt16              nWhichP,
                         const ScSortParam*  pSortData ) :
         SfxPoolItem ( nWhichP ),
         pViewData   ( NULL )
@@ -237,7 +237,7 @@ SfxPoolItem* __EXPORT ScSortItem::Clone( SfxItemPool * ) const
 
 //------------------------------------------------------------------------
 
-sal_Bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMemberUd */ ) const
+sal_Bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const
 {
     // Return empty value as there is no useful conversion
     rVal = com::sun::star::uno::Any();
@@ -248,23 +248,23 @@ sal_Bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMember
 //      ScQueryItem - Daten fuer den Filterdialog
 // -----------------------------------------------------------------------
 
-ScQueryItem::ScQueryItem( USHORT                nWhichP,
+ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
                           ScViewData*           ptrViewData,
                           const ScQueryParam*   pQueryData ) :
         SfxPoolItem ( nWhichP ),
         pViewData   ( ptrViewData ),
-        bIsAdvanced	( FALSE )
+        bIsAdvanced	( sal_False )
 {
     if ( pQueryData ) theQueryData = *pQueryData;
 }
 
 //------------------------------------------------------------------------
 
-ScQueryItem::ScQueryItem( USHORT                nWhichP,
+ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
                           const ScQueryParam*   pQueryData ) :
         SfxPoolItem ( nWhichP ),
         pViewData   ( NULL ),
-        bIsAdvanced	( FALSE )
+        bIsAdvanced	( sal_False )
 {
     if ( pQueryData ) theQueryData = *pQueryData;
 }
@@ -291,13 +291,13 @@ void ScQueryItem::SetAdvancedQuerySource(const ScRange* pSource)
     if (pSource)
     {
         aAdvSource = *pSource;
-        bIsAdvanced = TRUE;
+        bIsAdvanced = sal_True;
     }
     else
-        bIsAdvanced = FALSE;
+        bIsAdvanced = sal_False;
 }
 
-BOOL ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const
+sal_Bool ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const
 {
     rSource = aAdvSource;
     return bIsAdvanced;
@@ -335,7 +335,7 @@ SfxPoolItem* __EXPORT ScQueryItem::Clone( SfxItemPool * ) const
 //      ScSubTotalItem - Daten fuer den Zwischenergebnisdialog
 // -----------------------------------------------------------------------
 
-ScSubTotalItem::ScSubTotalItem( USHORT                  nWhichP,
+ScSubTotalItem::ScSubTotalItem( sal_uInt16                  nWhichP,
                                 ScViewData*           	ptrViewData,
                                 const ScSubTotalParam*	pSubTotalData ) :
         SfxPoolItem ( nWhichP ),
@@ -346,7 +346,7 @@ ScSubTotalItem::ScSubTotalItem( USHORT                  nWhichP,
 
 //------------------------------------------------------------------------
 
-ScSubTotalItem::ScSubTotalItem( USHORT                  nWhichP,
+ScSubTotalItem::ScSubTotalItem( sal_uInt16                  nWhichP,
                                 const ScSubTotalParam*	pSubTotalData ) :
         SfxPoolItem ( nWhichP ),
         pViewData   ( NULL )
@@ -395,7 +395,7 @@ SfxPoolItem* __EXPORT ScSubTotalItem::Clone( SfxItemPool * ) const
 
 //------------------------------------------------------------------------
 
-sal_Bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMemberUd */ ) const
+sal_Bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const
 {
     // Return empty value as there is no useful conversion
     rVal = com::sun::star::uno::Any();
@@ -406,7 +406,7 @@ sal_Bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMe
 //      ScUserListItem - Transporter fuer den Benutzerlisten-TabPage
 // -----------------------------------------------------------------------
 
-ScUserListItem::ScUserListItem( USHORT nWhichP )
+ScUserListItem::ScUserListItem( sal_uInt16 nWhichP )
     :   SfxPoolItem ( nWhichP ),
         pUserList	( NULL )
 {
@@ -442,7 +442,7 @@ int __EXPORT ScUserListItem::operator==( const SfxPoolItem& rItem ) const
     DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
 
     const ScUserListItem& r = (const ScUserListItem&)rItem;
-    BOOL bEqual = FALSE;
+    sal_Bool bEqual = sal_False;
 
     if ( !pUserList || !(r.pUserList) )
         bEqual = ( !pUserList && !(r.pUserList) );
@@ -473,7 +473,7 @@ void ScUserListItem::SetUserList( const ScUserList& rUserList )
 // -----------------------------------------------------------------------
 
 ScConsolidateItem::ScConsolidateItem(
-                            USHORT                      nWhichP,
+                            sal_uInt16                      nWhichP,
                             const ScConsolidateParam*	pConsolidateData ) :
         SfxPoolItem ( nWhichP )
 {
@@ -524,8 +524,8 @@ SfxPoolItem* __EXPORT ScConsolidateItem::Clone( SfxItemPool * ) const
 //      ScPivotItem - Daten fuer den Pivot-Dialog
 // -----------------------------------------------------------------------
 
-ScPivotItem::ScPivotItem( USHORT nWhichP, const ScDPSaveData* pData,
-                             const ScRange* pRange, BOOL bNew ) :
+ScPivotItem::ScPivotItem( sal_uInt16 nWhichP, const ScDPSaveData* pData,
+                             const ScRange* pRange, sal_Bool bNew ) :
         SfxPoolItem ( nWhichP )
 {
     //	pSaveData must always exist
@@ -587,7 +587,7 @@ SfxPoolItem* __EXPORT ScPivotItem::Clone( SfxItemPool * ) const
 //      ScSolveItem - Daten fuer den Solver-Dialog
 // -----------------------------------------------------------------------
 
-ScSolveItem::ScSolveItem( USHORT                nWhichP,
+ScSolveItem::ScSolveItem( sal_uInt16                nWhichP,
                           const ScSolveParam*	pSolveData )
     :   SfxPoolItem ( nWhichP )
 {
@@ -637,7 +637,7 @@ SfxPoolItem* __EXPORT ScSolveItem::Clone( SfxItemPool * ) const
 //      ScTabOpItem - Daten fuer den TabOp-Dialog
 // -----------------------------------------------------------------------
 
-ScTabOpItem::ScTabOpItem( USHORT                nWhichP,
+ScTabOpItem::ScTabOpItem( sal_uInt16                nWhichP,
                           const ScTabOpParam*	pTabOpData )
     :   SfxPoolItem ( nWhichP )
 {
@@ -688,7 +688,7 @@ SfxPoolItem* __EXPORT ScTabOpItem::Clone( SfxItemPool * ) const
 //      ScCondFrmtItem - Daten fuer den Dialog bedingte Formatierung
 // -----------------------------------------------------------------------
 
-ScCondFrmtItem::ScCondFrmtItem( USHORT nWhichP,
+ScCondFrmtItem::ScCondFrmtItem( sal_uInt16 nWhichP,
 //!								const ScConditionalFormat* pCondFrmt )
                                 const ScConditionalFormat& rCondFrmt )
     :   SfxPoolItem ( nWhichP ),
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 65fa88ea0..64844b429 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -78,7 +78,7 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame*     pFrameP,
     AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 ); //CHINA001 AddTabPage( TP_NUMBER,		SvxNumberFormatTabPage::Create,	0 );
 #else
     String number = rtl::OUString::createFromAscii ("Numbers");
-    AddTabPage( TP_NUMBER, number, pFact->GetTabPageCreatorFunc (RID_SVXPAGE_NUMBERFORMAT), 0, FALSE, TAB_APPEND);
+    AddTabPage( TP_NUMBER, number, pFact->GetTabPageCreatorFunc (RID_SVXPAGE_NUMBERFORMAT), 0, sal_False, TAB_APPEND);
 #endif
     DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");//CHINA001
     AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); //CHINA001 AddTabPage( TP_FONT,		SvxCharNamePage::Create,		0 );
@@ -112,7 +112,7 @@ __EXPORT ScAttrDlg::~ScAttrDlg()
 
 // -----------------------------------------------------------------------
 
-void __EXPORT ScAttrDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
+void __EXPORT ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
 {
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001
diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx
index f8df8ed49..1f6185bfb 100644
--- a/sc/source/ui/attrdlg/condfrmt.cxx
+++ b/sc/source/ui/attrdlg/condfrmt.cxx
@@ -102,7 +102,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
         aBtnCancel			( this, ScResId( BTN_CANCEL ) ),
         aBtnHelp			( this, ScResId( BTN_HELP ) ),
         pEdActive			( NULL ),
-        bDlgLostFocus       ( FALSE ),
+        bDlgLostFocus       ( sal_False ),
 
         pDoc				( pCurDoc )
 {
@@ -187,7 +187,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
     aCond2Size2 = Size( aPos.X() - aCond2Pos2.X(), aCond2Size3.Height() );
     aCond2Size1 = Size( aPos.X() - aCond2Pos1.X(), aCond2Size3.Height() );
 
-    aCbxCond2.Check( FALSE );
+    aCbxCond2.Check( sal_False );
     aLbCond21.SelectEntryPos( 0 );
     aLbCond22.SelectEntryPos( 0 );
 
@@ -202,7 +202,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
     aCond3Size2 = Size( aPos.X() - aCond3Pos2.X(), aCond3Size3.Height() );
     aCond3Size1 = Size( aPos.X() - aCond3Pos1.X(), aCond3Size3.Height() );
 
-    aCbxCond3.Check( FALSE );
+    aCbxCond3.Check( sal_False );
     aLbCond31.SelectEntryPos( 0 );
     aLbCond32.SelectEntryPos( 0 );
 
@@ -255,7 +255,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
                 ;
             else									// via Werte
             {
-                aLbCond12.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
+                aLbCond12.SelectEntryPos( sal::static_int_cast<sal_uInt16>( eMode ) );
                 if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
                     aEdtCond12.SetText( pEntry->GetExpression( aCurPos, 1 ) );
             }
@@ -264,7 +264,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
 
         if ( pCurrentFormat->Count() > 1 )
         {
-            aCbxCond2.Check( TRUE );
+            aCbxCond2.Check( sal_True );
             pEntry= pCurrentFormat->GetEntry( 1 );
             aEdtCond21.SetText( pEntry->GetExpression( aCurPos, 0 ) );
             aLbCond2Template.SelectEntry( pEntry->GetStyle() );
@@ -279,7 +279,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
                 ;
             else									// via Werte
             {
-                aLbCond22.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
+                aLbCond22.SelectEntryPos( sal::static_int_cast<sal_uInt16>( eMode ) );
                 if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
                     aEdtCond22.SetText( pEntry->GetExpression( aCurPos, 1 ) );
             }
@@ -287,7 +287,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
 
         if ( pCurrentFormat->Count() > 2 )
         {
-            aCbxCond3.Check( TRUE );
+            aCbxCond3.Check( sal_True );
             pEntry= pCurrentFormat->GetEntry( 2 );
             aEdtCond31.SetText( pEntry->GetExpression( aCurPos, 0 ) );
             aLbCond3Template.SelectEntry( pEntry->GetStyle() );
@@ -302,7 +302,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
                 ;
             else									// via Werte
             {
-                aLbCond32.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
+                aLbCond32.SelectEntryPos( sal::static_int_cast<sal_uInt16>( eMode ) );
                 if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
                     aEdtCond32.SetText( pEntry->GetExpression( aCurPos, 1 ) );
             }
@@ -374,7 +374,7 @@ void ScConditionalFormatDlg::AddRefEntry()
 
 //----------------------------------------------------------------------------
 
-BOOL ScConditionalFormatDlg::IsRefInputMode() const
+sal_Bool ScConditionalFormatDlg::IsRefInputMode() const
 {
     return (pEdActive != NULL);
 }
@@ -386,7 +386,7 @@ void ScConditionalFormatDlg::SetActive()
 {
     if ( bDlgLostFocus )
     {
-        bDlgLostFocus = FALSE;
+        bDlgLostFocus = sal_False;
         if( pEdActive )
             pEdActive->GrabFocus();
     }
@@ -459,7 +459,7 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt
 //----------------------------------------------------------------------------
 // Zerstoert den Dialog
 
-BOOL ScConditionalFormatDlg::Close()
+sal_Bool ScConditionalFormatDlg::Close()
 {
     return DoClose( ScCondFormatDlgWrapper::GetChildWindowId() );
 }
@@ -473,7 +473,7 @@ BOOL ScConditionalFormatDlg::Close()
 
 IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG )
 {
-    BOOL bChecked = aCbxCond1.IsChecked();
+    sal_Bool bChecked = aCbxCond1.IsChecked();
 
     aLbCond11.Enable( bChecked );
     aLbCond12.Enable( bChecked );
@@ -495,7 +495,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, EMPTYARG )
 {
-    USHORT nPos = aLbCond11.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbCond11.GetSelectEntryPos();
 
     if( nPos == 0 ) // Zellwert
     {
@@ -525,7 +525,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG )
 {
     if( aLbCond12.IsVisible() )
     {
-        USHORT nPos = aLbCond12.GetSelectEntryPos();
+        sal_uInt16 nPos = aLbCond12.GetSelectEntryPos();
 
         if( nPos == 6  || nPos == 7 ) // zwischen, n. zwischen
         {
@@ -554,7 +554,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG )
 {
-    BOOL bChecked = aCbxCond2.IsChecked();
+    sal_Bool bChecked = aCbxCond2.IsChecked();
 
     aLbCond21.Enable( bChecked );
     aLbCond22.Enable( bChecked );
@@ -576,7 +576,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, EMPTYARG )
 {
-    USHORT nPos = aLbCond21.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbCond21.GetSelectEntryPos();
 
     if( nPos == 0 ) // Zellwert
     {
@@ -606,7 +606,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG )
 {
     if( aLbCond22.IsVisible() )
     {
-        USHORT nPos = aLbCond22.GetSelectEntryPos();
+        sal_uInt16 nPos = aLbCond22.GetSelectEntryPos();
 
         if( nPos == 6  || nPos == 7 ) // zwischen, n. zwischen
         {
@@ -635,7 +635,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG )
 {
-    BOOL bChecked = aCbxCond3.IsChecked();
+    sal_Bool bChecked = aCbxCond3.IsChecked();
 
     aLbCond31.Enable( bChecked );
     aLbCond32.Enable( bChecked );
@@ -657,7 +657,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, EMPTYARG )
 {
-    USHORT nPos = aLbCond31.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbCond31.GetSelectEntryPos();
 
     if( nPos == 0 ) // Zellwert
     {
@@ -687,7 +687,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond32Hdl, void *, EMPTYARG )
 {
     if( aLbCond32.IsVisible() )
     {
-        USHORT nPos = aLbCond32.GetSelectEntryPos();
+        sal_uInt16 nPos = aLbCond32.GetSelectEntryPos();
 
         if( nPos == 6  || nPos == 7 ) // zwischen, n. zwischen
         {
@@ -757,7 +757,7 @@ IMPL_LINK( ScConditionalFormatDlg, BtnHdl, PushButton*, pBtn )
         GetConditionalFormat( aCondFrmt );
         ScCondFrmtItem aOutItem( FID_CONDITIONAL_FORMAT, aCondFrmt );
 
-        SetDispatcherLock( FALSE );
+        SetDispatcherLock( sal_False );
         SwitchToDocument();
         GetBindings().GetDispatcher()->Execute( FID_CONDITIONAL_FORMAT,
                                   SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
@@ -781,7 +781,7 @@ IMPL_LINK( ScConditionalFormatDlg, NewBtnHdl, PushButton*, pBtn )
     // unlock the dispatcher so SID_STYLE_NEW can be executed
     // (SetDispatcherLock would affect all Calc documents)
     SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-    BOOL bLocked = pDisp->IsLocked();
+    sal_Bool bLocked = pDisp->IsLocked();
     if (bLocked)
         pDisp->Lock(sal_False);
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 65623e6e7..89ff4e7c6 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -119,7 +119,7 @@ IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
 
 // AbstractTabDialog_Impl begin
-void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
 {
     pDlg->SetCurPageId( nId );
 }
@@ -129,7 +129,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
     return pDlg->GetOutputItemSet();
 }
 //add by CHINA001
-const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
@@ -154,7 +154,7 @@ namespace layout
 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
 
 // AbstractTabDialog_Impl begin
-void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
 {
     pDlg->SetCurPageId( nId );
 }
@@ -164,7 +164,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
     return pDlg->GetOutputItemSet();
 }
 //add by CHINA001
-const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
@@ -205,7 +205,7 @@ void AbstractScImportAsciiDlg_Impl::SaveParameters()
 // AbstractScImportAsciiDlg_Impl end
 
 //AbstractScAutoFormatDlg_Impl begin
-USHORT AbstractScAutoFormatDlg_Impl::GetIndex() const
+sal_uInt16 AbstractScAutoFormatDlg_Impl::GetIndex() const
 {
     return pDlg->GetIndex();
 }
@@ -220,11 +220,11 @@ String AbstractScAutoFormatDlg_Impl::GetCurrFormatName()
 
 
 //AbstractScColRowLabelDlg_Impl begin
-BOOL  AbstractScColRowLabelDlg_Impl::IsCol()
+sal_Bool  AbstractScColRowLabelDlg_Impl::IsCol()
 {
     return  pDlg->IsCol();
 }
-BOOL AbstractScColRowLabelDlg_Impl::IsRow()
+sal_Bool AbstractScColRowLabelDlg_Impl::IsRow()
 {
     return pDlg->IsRow();
 }
@@ -244,12 +244,12 @@ void AbstractScDataPilotDatabaseDlg_Impl::GetValues( ScImportSourceDesc& rDesc )
 
 //AbstractScDataPilotSourceTypeDlg_Impl begin
 
-BOOL AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const
+sal_Bool AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const
 {
     return pDlg->IsDatabase();
 }
 
-BOOL AbstractScDataPilotSourceTypeDlg_Impl::IsExternal() const
+sal_Bool AbstractScDataPilotSourceTypeDlg_Impl::IsExternal() const
 {
     return pDlg->IsExternal();
 }
@@ -294,7 +294,7 @@ void AbstractScDeleteContentsDlg_Impl::DisableObjects()
 {
     pDlg->DisableObjects();
 }
-USHORT	 AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const
+sal_uInt16	 AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const
 {
     return pDlg->GetDelContentsCmdBits();
 }
@@ -332,14 +332,14 @@ String	AbstractScFillSeriesDlg_Impl::GetStartStr() const
 {
     return pDlg->GetStartStr();
 }
-void	AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(BOOL bFlag)
+void	AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(sal_Bool bFlag)
 {
     pDlg->SetEdStartValEnabled(bFlag);
 }
 //add for AbstractScFillSeriesDlg_Impl end
 
 //add for AbstractScGroupDlg_Impl begin
-BOOL AbstractScGroupDlg_Impl::GetColsChecked() const
+sal_Bool AbstractScGroupDlg_Impl::GetColsChecked() const
 {
     return pDlg->GetColsChecked();
 }
@@ -356,39 +356,39 @@ InsCellCmd  AbstractScInsertCellDlg_Impl::GetInsCellCmd() const
 
 
 //add for AbstractScInsertContentsDlg_Impl begin
-USHORT AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const
+sal_uInt16 AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const
 {
     return pDlg->GetInsContentsCmdBits();
 }
 
 
-USHORT	AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const
+sal_uInt16	AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const
 {
     return pDlg->GetFormulaCmdBits();
 }
-BOOL	AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const
+sal_Bool	AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const
 {
     return pDlg->IsSkipEmptyCells();
 }
-BOOL 	AbstractScInsertContentsDlg_Impl::IsLink() const
+sal_Bool 	AbstractScInsertContentsDlg_Impl::IsLink() const
 {
     return pDlg->IsLink();
 }
-void	AbstractScInsertContentsDlg_Impl::SetFillMode( BOOL bSet )
+void	AbstractScInsertContentsDlg_Impl::SetFillMode( sal_Bool bSet )
 {
     pDlg->SetFillMode( bSet );
 }
 
-void	AbstractScInsertContentsDlg_Impl::SetOtherDoc( BOOL bSet )
+void	AbstractScInsertContentsDlg_Impl::SetOtherDoc( sal_Bool bSet )
 {
     pDlg->SetOtherDoc( bSet );
 }
 
-BOOL 	AbstractScInsertContentsDlg_Impl::IsTranspose() const
+sal_Bool 	AbstractScInsertContentsDlg_Impl::IsTranspose() const
 {
     return pDlg->IsTranspose();
 }
-void	AbstractScInsertContentsDlg_Impl::SetChangeTrack( BOOL bSet )
+void	AbstractScInsertContentsDlg_Impl::SetChangeTrack( sal_Bool bSet )
 {
     pDlg->SetChangeTrack( bSet );
 }
@@ -405,16 +405,16 @@ InsCellCmd	AbstractScInsertContentsDlg_Impl::GetMoveMode()
 
 
 //add for AbstractScInsertTableDlg_Impl begin
-BOOL AbstractScInsertTableDlg_Impl::GetTablesFromFile()
+sal_Bool AbstractScInsertTableDlg_Impl::GetTablesFromFile()
 {
     return pDlg->GetTablesFromFile();
 }
 
-BOOL	AbstractScInsertTableDlg_Impl::GetTablesAsLink()
+sal_Bool	AbstractScInsertTableDlg_Impl::GetTablesAsLink()
 {
     return pDlg->GetTablesAsLink();
 }
-const String*	AbstractScInsertTableDlg_Impl::GetFirstTable( USHORT* pN )
+const String*	AbstractScInsertTableDlg_Impl::GetFirstTable( sal_uInt16* pN )
 {
     return pDlg->GetFirstTable( pN );
 }
@@ -422,15 +422,15 @@ ScDocShell*		AbstractScInsertTableDlg_Impl::GetDocShellTables()
 {
     return pDlg->GetDocShellTables();
 }
-BOOL	AbstractScInsertTableDlg_Impl::IsTableBefore()
+sal_Bool	AbstractScInsertTableDlg_Impl::IsTableBefore()
 {
     return pDlg->IsTableBefore();
 }
-USHORT	AbstractScInsertTableDlg_Impl::GetTableCount()
+sal_uInt16	AbstractScInsertTableDlg_Impl::GetTableCount()
 {
     return pDlg->GetTableCount();
 }
-const String*	AbstractScInsertTableDlg_Impl::GetNextTable( USHORT* pN )
+const String*	AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN )
 {
     return pDlg->GetNextTable( pN );
 }
@@ -446,7 +446,7 @@ String AbstractScSelEntryDlg_Impl::GetSelectEntry() const
 //add for AbstractScLinkedAreaDlg_Impl begin
 void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
-                                        ULONG nRefresh )
+                                        sal_uLong nRefresh )
 {
     pDlg->InitFromOldLink( rFile, rFilter, rOptions, rSource, nRefresh);
 }
@@ -467,7 +467,7 @@ String	AbstractScLinkedAreaDlg_Impl::GetSource()
 {
     return pDlg->GetSource();
 }
-ULONG	AbstractScLinkedAreaDlg_Impl::GetRefresh()
+sal_uLong	AbstractScLinkedAreaDlg_Impl::GetRefresh()
 {
     return pDlg->GetRefresh();
 }
@@ -483,31 +483,31 @@ long AbstractScMetricInputDlg_Impl::GetInputValue( FieldUnit eUnit ) const
 //add for AbstractScMetricInputDlg_Impl end
 
 //add for AbstractScMoveTableDlg_Impl begin
-USHORT AbstractScMoveTableDlg_Impl::GetSelectedDocument() const //add for ScMoveTableDlg
+sal_uInt16 AbstractScMoveTableDlg_Impl::GetSelectedDocument() const //add for ScMoveTableDlg
 {
     return pDlg->GetSelectedDocument();
 }
 
-USHORT	AbstractScMoveTableDlg_Impl::GetSelectedTable() const
+sal_uInt16	AbstractScMoveTableDlg_Impl::GetSelectedTable() const
 {
     return pDlg->GetSelectedTable();
 }
-BOOL	AbstractScMoveTableDlg_Impl::GetCopyTable() const
+sal_Bool	AbstractScMoveTableDlg_Impl::GetCopyTable() const
 {
     return pDlg->GetCopyTable();
 }
-void	AbstractScMoveTableDlg_Impl::SetCopyTable(BOOL bFla)
+void	AbstractScMoveTableDlg_Impl::SetCopyTable(sal_Bool bFla)
 {
     return pDlg->SetCopyTable( bFla );
 }
-void	AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag)
+void	AbstractScMoveTableDlg_Impl::EnableCopyTable(sal_Bool bFlag)
 {
     return pDlg->EnableCopyTable( bFlag);
 }
 //add for AbstractScMoveTableDlg_Impl end
 
 //add for AbstractScNameCreateDlg_Impl begin
-USHORT AbstractScNameCreateDlg_Impl::GetFlags() const  //add for ScNameCreateDlg
+sal_uInt16 AbstractScNameCreateDlg_Impl::GetFlags() const  //add for ScNameCreateDlg
 {
     return pDlg->GetFlags();
 }
@@ -529,7 +529,7 @@ const ScQueryItem&	 AbstractScPivotFilterDlg_Impl::GetOutputItem()  //add for Sc
 //add for AbstractScPivotFilterDlg_Impl end
 
 //add for AbstractScDPFunctionDlg_Impl begin
-USHORT AbstractScDPFunctionDlg_Impl::GetFuncMask() const //add for ScDPFunctionDlg
+sal_uInt16 AbstractScDPFunctionDlg_Impl::GetFuncMask() const //add for ScDPFunctionDlg
 {
      return pDlg->GetFuncMask();
 }
@@ -540,7 +540,7 @@ USHORT AbstractScDPFunctionDlg_Impl::GetFuncMask() const //add for ScDPFunctionD
 //add for AbstractScDPFunctionDlg_Impl end
 
 //add for AbstractScDPSubtotalDlg_Impl begin
-USHORT AbstractScDPSubtotalDlg_Impl::GetFuncMask() const //add for ScDPSubtotalDlg
+sal_uInt16 AbstractScDPSubtotalDlg_Impl::GetFuncMask() const //add for ScDPSubtotalDlg
 {
      return pDlg->GetFuncMask();
 }
@@ -574,13 +574,13 @@ String AbstractScDPShowDetailDlg_Impl::GetDimensionName() const
 
 //add for AbstractScNewScenarioDlg_Impl begin
 void AbstractScNewScenarioDlg_Impl::SetScenarioData( const String& rName, const String& rComment,
-                            const Color& rColor, USHORT nFlags )
+                            const Color& rColor, sal_uInt16 nFlags )
 {
     pDlg->SetScenarioData(rName,rComment, rColor,nFlags);
 }
 
 void AbstractScNewScenarioDlg_Impl::GetScenarioData( String& rName, String& rComment,
-                            Color& rColor, USHORT& rFlags ) const
+                            Color& rColor, sal_uInt16& rFlags ) const
 {
     pDlg->GetScenarioData( rName,rComment,rColor,rFlags);
 }
@@ -588,12 +588,12 @@ void AbstractScNewScenarioDlg_Impl::GetScenarioData( String& rName, String& rCom
 //add for AbstractScNewScenarioDlg_Impl end
 
 //add for  AbstractScShowTabDlg_Impl begin
-void AbstractScShowTabDlg_Impl::Insert( const String& rString, BOOL bSelected )  //add for ScShowTabDlg
+void AbstractScShowTabDlg_Impl::Insert( const String& rString, sal_Bool bSelected )  //add for ScShowTabDlg
 {
     pDlg->Insert( rString, bSelected);
 }
 
-USHORT	AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
+sal_uInt16	AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
 {
     return pDlg->GetSelectEntryCount();
 }
@@ -603,11 +603,11 @@ void	AbstractScShowTabDlg_Impl::SetDescription(
 {
     pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId );
 }
-USHORT  AbstractScShowTabDlg_Impl::GetSelectEntryPos(USHORT nPos) const
+sal_uInt16  AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_uInt16 nPos) const
 {
     return pDlg->GetSelectEntryPos( nPos);
 }
-String	 AbstractScShowTabDlg_Impl::GetSelectEntry(USHORT nPos) const
+String	 AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const
 {
         return pDlg->GetSelectEntry(nPos);
 }
@@ -713,8 +713,8 @@ AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( W
 
 AbstractScColRowLabelDlg *  ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent, //add for ScColRowLabelDlg
                                                                 int nId,
-                                                                BOOL bCol ,
-                                                                BOOL bRow)
+                                                                sal_Bool bCol ,
+                                                                sal_Bool bRow)
 {
     ScColRowLabelDlg* pDlg=NULL;
     switch ( nId )
@@ -739,7 +739,7 @@ VclAbstractDialog *  ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window*
                                                     const String&	rStrTitle,
                                                     const String&	rStrLabel,
                                                     int nId,
-                                                    BOOL				bColDefault)
+                                                    sal_Bool				bColDefault)
 {
     Dialog * pDlg=NULL;
     switch ( nId )
@@ -799,7 +799,7 @@ AbstractScDataPilotDatabaseDlg *  ScAbstractDialogFactory_Impl::CreateScDataPilo
 
 //add for ScDataPilotSourceTypeDlg begin
 AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( Window* pParent,
-                                                                                               BOOL bEnableExternal,
+                                                                                               sal_Bool bEnableExternal,
                                                                                                int nId )
 {
     ScDataPilotSourceTypeDlg * pDlg=NULL;
@@ -844,7 +844,7 @@ AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSe
 
 //add for ScDeleteCellDlg begin
 AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Window* pParent, int nId,
-                                                                             BOOL bDisallowCellMove )
+                                                                             sal_Bool bDisallowCellMove )
 {
     ScDeleteCellDlg * pDlg=NULL;
     switch ( nId )
@@ -865,7 +865,7 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Wi
 
 //add for ScDeleteContentsDlg begin
 AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
-                                                                 USHORT  nCheckDefaults )
+                                                                 sal_uInt16  nCheckDefaults )
 {
     ScDeleteContentsDlg * pDlg=NULL;
     switch ( nId )
@@ -893,7 +893,7 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
                                                             String			aStartStr,
                                                             double			fStep,
                                                             double			fMax,
-                                                            USHORT			nPossDir,
+                                                            sal_uInt16			nPossDir,
                                                             int nId)
 {
     ScFillSeriesDlg * pDlg=NULL;
@@ -915,10 +915,10 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
 
 //add for ScGroupDlg begin
 AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent,
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                             int nId,
-                                                            BOOL	bUnGroup ,
-                                                            BOOL	bRows   )
+                                                            sal_Bool	bUnGroup ,
+                                                            sal_Bool	bRows   )
 {
     ScGroupDlg * pDlg=NULL;
     switch ( nId )
@@ -942,7 +942,7 @@ AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Wind
 //add for ScInsertCellDlg begin
 AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
                                                                 int nId,
-                                                            BOOL bDisallowCellMove )
+                                                            sal_Bool bDisallowCellMove )
 {
     ScInsertCellDlg * pDlg=NULL;
     switch ( nId )
@@ -964,7 +964,7 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W
 //add for ScInsertContentsDlg begin
 AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window*		pParent,
                                                                                     int nId,
-                                                                                    USHORT  		nCheckDefaults,
+                                                                                    sal_uInt16  		nCheckDefaults,
                                                                                     const String*	pStrTitle )
 {
     ScInsertContentsDlg * pDlg=NULL;
@@ -1005,7 +1005,7 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg
 
 // add for ScSelEntryDlg begin
 AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent,
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                         const String& aTitle,
                                                         const String& aLbTitle,
                                                                 List& 	aEntryList,
@@ -1049,12 +1049,12 @@ AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg (
 
 //add for ScMetricInputDlg begin
 AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg (  Window*		pParent,
-                                                                USHORT		nResId,		// Ableitung fuer jeden Dialog!
+                                                                sal_uInt16		nResId,		// Ableitung fuer jeden Dialog!
                                                                 long			nCurrent,
                                                                 long			nDefault,
                                                                 int nId ,
                                                                 FieldUnit		eFUnit,
-                                                                USHORT		nDecimals,
+                                                                sal_uInt16		nDecimals,
                                                                 long			nMaximum ,
                                                                 long			nMinimum,
                                                                 long			nFirst,
@@ -1102,7 +1102,7 @@ AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(  Wi
 
 
 //add for ScNameCreateDlg begin
-AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg ( Window * pParent, USHORT nFlags, int nId )
+AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg ( Window * pParent, sal_uInt16 nFlags, int nId )
 {
     ScNameCreateDlg * pDlg=NULL;
     switch ( nId )
@@ -1123,7 +1123,7 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg (
 
 //add for ScNamePasteDlg begin
  AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Window * pParent, const ScRangeName* pList,
-                                                            int nId , BOOL bInsList )
+                                                            int nId , sal_Bool bInsList )
 {
     ScNamePasteDlg * pDlg=NULL;
     switch ( nId )
@@ -1143,7 +1143,7 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg (
 
 //add for ScPivotFilterDlg begin
 AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg ( Window* pParent,
-                                                                const SfxItemSet&	rArgSet, USHORT nSourceTab , int nId )
+                                                                const SfxItemSet&	rArgSet, sal_uInt16 nSourceTab , int nId )
 {
     ScPivotFilterDlg * pDlg=NULL;
     switch ( nId )
@@ -1229,7 +1229,7 @@ AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg(
 
 //add for ScDPShowDetailDlg begin
 AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg (
-        Window* pParent, int nId, ScDPObject& rDPObj, USHORT nOrient )
+        Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient )
 {
     if( nId == RID_SCDLG_DPSHOWDETAIL )
         return new AbstractScDPShowDetailDlg_Impl( new ScDPShowDetailDlg( pParent, rDPObj, nOrient ) );
@@ -1240,7 +1240,7 @@ AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl
 //add for ScNewScenarioDlg begin
 AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg ( Window* pParent, const String& rName,
                                                                 int nId,
-                                                                BOOL bEdit , BOOL bSheetProtected )
+                                                                sal_Bool bEdit , sal_Bool bSheetProtected )
 {
     ScNewScenarioDlg * pDlg=NULL;
     switch ( nId )
@@ -1331,12 +1331,12 @@ return 0;
 //add for ScImportOptionsDlg begin
 AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* 				pParent,
                                                                     int nId,
-                                                                    BOOL                    bAscii,
+                                                                    sal_Bool                    bAscii,
                                                                     const ScImportOptions*	pOptions,
                                                                     const String*			pStrTitle,
-                                                                    BOOL                    bMultiByte,
-                                                                    BOOL                    bOnlyDbtoolsEncodings,
-                                                                    BOOL                    bImport )
+                                                                    sal_Bool                    bMultiByte,
+                                                                    sal_Bool                    bOnlyDbtoolsEncodings,
+                                                                    sal_Bool                    bImport )
 {
     ScImportOptionsDlg * pDlg=NULL;
     switch ( nId )
@@ -1389,7 +1389,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
                                                                         const SfxItemSet&	rCoreSet,
                                                                         const String&		rPageStyle,
                                                                         int nId,
-                                                                        USHORT				nResId )
+                                                                        sal_uInt16				nResId )
 {
     SfxTabDialog* pDlg=NULL;
     switch ( nId )
@@ -1410,7 +1410,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
 //add for ScStyleDlg begin
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window*				pParent,
                                                                         SfxStyleSheetBase&	rStyleBase,
-                                                                        USHORT				nRscId,
+                                                                        sal_uInt16				nRscId,
                                                                         int nId)
 {
     SfxTabDialog* pDlg=NULL;
@@ -1544,7 +1544,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
 
 //add for ScSortDlg end
 //------------------ Factories for TabPages--------------------
-CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
+CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId )
 {
     switch ( nId )
     {
@@ -1577,7 +1577,7 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
     return 0;
 }
 
-GetTabPageRanges ScAbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId )
+GetTabPageRanges ScAbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nId )
 {
     switch ( nId )
     {
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 31a044d55..75b89ce11 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -72,7 +72,7 @@ public:												\
                      {}                             \
     virtual			~Class();               		\
     virtual short	Execute() ;
-//	virtual void	Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
+//	virtual void	Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 )
 
 #define DECL_ABSTDLG2_BASE(Class,DialogClass)        \
     DialogClass*        pDlg;                       \
@@ -124,15 +124,15 @@ class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg  //add for
 class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg  //add for ScAutoFormatDlg
 {
     DECL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl, ScAutoFormatDlg)
-    virtual USHORT GetIndex() const;
+    virtual sal_uInt16 GetIndex() const;
     virtual String GetCurrFormatName();
 };
 
 class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg  //add for ScColRowLabelDlg
 {
     DECL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl,ScColRowLabelDlg)
-    virtual BOOL IsCol();
-    virtual BOOL IsRow();
+    virtual sal_Bool IsCol();
+    virtual sal_Bool IsRow();
 };
 
 class AbstractScDataPilotDatabaseDlg_Impl  :public AbstractScDataPilotDatabaseDlg  //add for ScDataPilotDatabaseDlg
@@ -144,8 +144,8 @@ class AbstractScDataPilotDatabaseDlg_Impl  :public AbstractScDataPilotDatabaseDl
 class AbstractScDataPilotSourceTypeDlg_Impl  :public AbstractScDataPilotSourceTypeDlg  //add for ScDataPilotSourceTypeDlg
 {
     DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg)
-    virtual BOOL	IsDatabase() const;
-    virtual BOOL	IsExternal() const;
+    virtual sal_Bool	IsDatabase() const;
+    virtual sal_Bool	IsExternal() const;
 };
 
 class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg  //add for ScDataPilotServiceDlg
@@ -168,7 +168,7 @@ class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg  //a
 {
     DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
     virtual void	DisableObjects();
-    virtual USHORT	GetDelContentsCmdBits() const;
+    virtual sal_uInt16	GetDelContentsCmdBits() const;
 };
 
 class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg  //add for ScFillSeriesDlg
@@ -181,13 +181,13 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg  //add for ScF
     virtual double		GetStep() const;
     virtual double		GetMax() const;
     virtual String		GetStartStr() const;
-    virtual void		SetEdStartValEnabled(BOOL bFlag=FALSE);
+    virtual void		SetEdStartValEnabled(sal_Bool bFlag=sal_False);
 };
 
 class AbstractScGroupDlg_Impl :  public AbstractScGroupDlg  //add for ScGroupDlg
 {
     DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg)
-    virtual BOOL GetColsChecked() const;
+    virtual sal_Bool GetColsChecked() const;
 };
 
 class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg  //add for ScInsertCellDlg
@@ -199,14 +199,14 @@ class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg  //add for S
 class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg  //add for ScInsertContentsDlg
 {
     DECL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl, ScInsertContentsDlg)
-    virtual USHORT		GetInsContentsCmdBits() const;
-    virtual USHORT		GetFormulaCmdBits() const;
-    virtual BOOL		IsSkipEmptyCells() const;
-    virtual BOOL 		IsLink() const;
-    virtual void	SetFillMode( BOOL bSet );
-    virtual void	SetOtherDoc( BOOL bSet );
-    virtual BOOL 		IsTranspose() const;
-    virtual void	SetChangeTrack( BOOL bSet );
+    virtual sal_uInt16		GetInsContentsCmdBits() const;
+    virtual sal_uInt16		GetFormulaCmdBits() const;
+    virtual sal_Bool		IsSkipEmptyCells() const;
+    virtual sal_Bool 		IsLink() const;
+    virtual void	SetFillMode( sal_Bool bSet );
+    virtual void	SetOtherDoc( sal_Bool bSet );
+    virtual sal_Bool 		IsTranspose() const;
+    virtual void	SetChangeTrack( sal_Bool bSet );
     virtual void	SetCellShiftDisabled( int nDisable );
     virtual InsCellCmd	GetMoveMode();
 };
@@ -214,13 +214,13 @@ class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg  //a
 class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg  //add for ScInsertTableDlg
 {
     DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg)
-    virtual BOOL			GetTablesFromFile();
-    virtual BOOL			GetTablesAsLink();
-    virtual const String*	GetFirstTable( USHORT* pN = NULL );
+    virtual sal_Bool			GetTablesFromFile();
+    virtual sal_Bool			GetTablesAsLink();
+    virtual const String*	GetFirstTable( sal_uInt16* pN = NULL );
     virtual ScDocShell*		GetDocShellTables();
-    virtual BOOL			IsTableBefore();
-    virtual USHORT			GetTableCount();
-    virtual const String*	GetNextTable( USHORT* pN = NULL );
+    virtual sal_Bool			IsTableBefore();
+    virtual sal_uInt16			GetTableCount();
+    virtual const String*	GetNextTable( sal_uInt16* pN = NULL );
 
 };
 
@@ -236,12 +236,12 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg  //add for S
 
     virtual void			InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
-                                        ULONG nRefresh );
+                                        sal_uLong nRefresh );
     virtual String			GetURL();
     virtual String			GetFilter();		// may be empty
     virtual String			GetOptions();		// filter options
     virtual String			GetSource();		// separated by ";"
-    virtual ULONG			GetRefresh();		// 0 if disabled
+    virtual sal_uLong			GetRefresh();		// 0 if disabled
 };
 
 class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg  //add for ScMetricInputDlg
@@ -253,17 +253,17 @@ class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg  //add for
 class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg  //add for ScMoveTableDlg
 {
     DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg)
-    virtual USHORT	GetSelectedDocument		() const;
-    virtual USHORT	GetSelectedTable		() const;
-    virtual BOOL	GetCopyTable			() const;
-    virtual void	SetCopyTable			(BOOL bFlag=TRUE);
-    virtual void	EnableCopyTable			(BOOL bFlag=TRUE);
+    virtual sal_uInt16	GetSelectedDocument		() const;
+    virtual sal_uInt16	GetSelectedTable		() const;
+    virtual sal_Bool	GetCopyTable			() const;
+    virtual void	SetCopyTable			(sal_Bool bFlag=sal_True);
+    virtual void	EnableCopyTable			(sal_Bool bFlag=sal_True);
 };
 
 class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg  //add for ScNameCreateDlg
 {
     DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg)
-    virtual USHORT			GetFlags() const;
+    virtual sal_uInt16			GetFlags() const;
 };
 
 class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg  //add for ScNamePasteDlg
@@ -281,14 +281,14 @@ class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg  //add for
 class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg  //add for ScDPFunctionDlg
 {
     DECL_ABSTDLG_BASE( AbstractScDPFunctionDlg_Impl, ScDPFunctionDlg)
-    virtual USHORT GetFuncMask() const;
+    virtual sal_uInt16 GetFuncMask() const;
     virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const;
 };
 
 class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg  //add for ScDPSubtotalDlg
 {
     DECL_ABSTDLG_BASE( AbstractScDPSubtotalDlg_Impl, ScDPSubtotalDlg)
-    virtual USHORT GetFuncMask() const;
+    virtual sal_uInt16 GetFuncMask() const;
     virtual void FillLabelData( ScDPLabelData& rLabelData ) const;
 };
 
@@ -315,20 +315,20 @@ class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg  //add for
 {
     DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg )
     virtual void SetScenarioData( const String& rName, const String& rComment,
-                            const Color& rColor, USHORT nFlags );
+                            const Color& rColor, sal_uInt16 nFlags );
 
     virtual void GetScenarioData( String& rName, String& rComment,
-                            Color& rColor, USHORT& rFlags ) const;
+                            Color& rColor, sal_uInt16& rFlags ) const;
 };
 
 class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg  //add for ScShowTabDlg
 {
     DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg)
-    virtual void    Insert( const String& rString, BOOL bSelected );
-    virtual USHORT	GetSelectEntryCount() const;
+    virtual void    Insert( const String& rString, sal_Bool bSelected );
+    virtual sal_uInt16	GetSelectEntryCount() const;
     virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId );
-    virtual String	GetSelectEntry(USHORT nPos) const;
-    virtual USHORT  GetSelectEntryPos(USHORT nPos) const;
+    virtual String	GetSelectEntry(sal_uInt16 nPos) const;
+    virtual sal_uInt16  GetSelectEntryPos(sal_uInt16 nPos) const;
 };
 
 class AbstractScStringInputDlg_Impl :  public AbstractScStringInputDlg  //add for ScStringInputDlg
@@ -360,9 +360,9 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl
 class AbstractTabDialog_Impl : public SfxAbstractTabDialog
 {
     DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
-    virtual void				SetCurPageId( USHORT nId );
+    virtual void				SetCurPageId( sal_uInt16 nId );
     virtual const SfxItemSet* 	GetOutputItemSet() const;
-    virtual const USHORT*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
+    virtual const sal_uInt16*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
     virtual void				SetInputSet( const SfxItemSet* pInSet );   //add by CHINA001
         //From class Window.
     virtual void		SetText( const XubString& rStr ); //add by CHINA001
@@ -375,9 +375,9 @@ namespace layout
 class AbstractTabDialog_Impl : public SfxAbstractTabDialog
 {
     DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
-    virtual void				SetCurPageId( USHORT nId );
+    virtual void				SetCurPageId( sal_uInt16 nId );
     virtual const SfxItemSet* 	GetOutputItemSet() const;
-    virtual const USHORT*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
+    virtual const sal_uInt16*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
     virtual void				SetInputSet( const SfxItemSet* pInSet );   //add by CHINA001
         //From class Window.
     virtual void		SetText( const XubString& rStr ); //add by CHINA001
@@ -406,29 +406,29 @@ public:
                                                                 int nId);
     virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, //add for ScColRowLabelDlg
                                                                 int nId,
-                                                                BOOL bCol = FALSE,
-                                                                BOOL bRow = FALSE);
+                                                                sal_Bool bCol = sal_False,
+                                                                sal_Bool bRow = sal_False);
 
     virtual VclAbstractDialog * CreateScColOrRowDlg( Window*			pParent, //add for ScColOrRowDlg
                                                     const String&	rStrTitle,
                                                     const String&	rStrLabel,
                                                     int nId,
-                                                    BOOL				bColDefault = TRUE );
+                                                    sal_Bool				bColDefault = sal_True );
 
     virtual VclAbstractDialog * CreateScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId );
 
     virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); //add for ScDataPilotDatabaseDlg
 
-    virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg (  Window* pParent, BOOL bEnableExternal, int nId ) ; //add for ScDataPilotSourceTypeDlg
+    virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg (  Window* pParent, sal_Bool bEnableExternal, int nId ) ; //add for ScDataPilotSourceTypeDlg
 
     virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
                                                                         const com::sun::star::uno::Sequence<rtl::OUString>& rServices,
                                                                         int nId );
     virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId,
-                                                            BOOL bDisallowCellMove = FALSE ); //add for ScDeleteCellDlg
+                                                            sal_Bool bDisallowCellMove = sal_False ); //add for ScDeleteCellDlg
 
     virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
-                                                                 USHORT  nCheckDefaults = 0 );
+                                                                 sal_uInt16  nCheckDefaults = 0 );
 
     virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*		pParent, //add for ScFillSeriesDlg
                                                             ScDocument&	rDocument,
@@ -438,28 +438,28 @@ public:
                                                             String			aStartStr,
                                                             double			fStep,
                                                             double			fMax,
-                                                            USHORT			nPossDir,
+                                                            sal_uInt16			nPossDir,
                                                             int nId);
     virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                             int nId,
-                                                            BOOL	bUnGroup = FALSE,
-                                                            BOOL	bRows    = TRUE  );
+                                                            sal_Bool	bUnGroup = sal_False,
+                                                            sal_Bool	bRows    = sal_True  );
 
     virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
                                                                 int nId,
-                                                            BOOL bDisallowCellMove = FALSE );
+                                                            sal_Bool bDisallowCellMove = sal_False );
 
     virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*		pParent, //add for ScInsertContentsDlg
                                                                     int nId,
-                                                                    USHORT  		nCheckDefaults = 0,
+                                                                    sal_uInt16  		nCheckDefaults = 0,
                                                                     const String*	pStrTitle = NULL );
 
     virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData,  //add for ScInsertTableDlg
                                                                 SCTAB nTabCount, bool bFromFile, int nId);
 
     virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                         const String& aTitle,
                                                         const String& aLbTitle,
                                                                 List& 	aEntryList,
@@ -469,25 +469,25 @@ public:
                                                                 int nId);
 
     virtual AbstractScMetricInputDlg * CreateScMetricInputDlg (  Window*		pParent, //add for ScMetricInputDlg
-                                                                USHORT		nResId,		// Ableitung fuer jeden Dialog!
+                                                                sal_uInt16		nResId,		// Ableitung fuer jeden Dialog!
                                                                 long			nCurrent,
                                                                 long			nDefault,
                                                                 int nId ,
                                                                 FieldUnit		eFUnit	  = FUNIT_MM,
-                                                                USHORT		nDecimals = 2,
+                                                                sal_uInt16		nDecimals = 2,
                                                                 long			nMaximum  = 1000,
                                                                 long			nMinimum  = 0,
                                                                 long			nFirst	  = 1,
                                                                 long          nLast     = 100 );
 
     virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(  Window* pParent, int nId ); //add for ScMoveTableDlg
-    virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, USHORT nFlags, int nId ); //add for ScNameCreateDlg
+    virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, sal_uInt16 nFlags, int nId ); //add for ScNameCreateDlg
 
     virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, const ScRangeName* pList, //add for ScNamePasteDlg
-                                                            int nId , BOOL bInsList=TRUE );
+                                                            int nId , sal_Bool bInsList=sal_True );
 
     virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg
-                                                                const SfxItemSet&	rArgSet, USHORT nSourceTab , int nId );
+                                                                const SfxItemSet&	rArgSet, sal_uInt16 nSourceTab , int nId );
 
     virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId,
                                                                 const ScDPLabelDataVec& rLabelVec,
@@ -513,11 +513,11 @@ public:
 
     virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId,
                                                                 ScDPObject& rDPObj,
-                                                                USHORT nOrient );
+                                                                sal_uInt16 nOrient );
 
     virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, //add for ScNewScenarioDlg
                                                                 int nId,
-                                                                BOOL bEdit = FALSE, BOOL bSheetProtected = FALSE );
+                                                                sal_Bool bEdit = sal_False, sal_Bool bSheetProtected = sal_False );
     virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ); //add for ScShowTabDlg
 
     virtual AbstractScStringInputDlg * CreateScStringInputDlg (  Window* pParent, //add for ScStringInputDlg
@@ -536,12 +536,12 @@ public:
 
     virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* 				pParent, //add for ScImportOptionsDlg
                                                                     int nId,
-                                                                    BOOL                    bAscii = TRUE,
+                                                                    sal_Bool                    bAscii = sal_True,
                                                                     const ScImportOptions*	pOptions = NULL,
                                                                     const String*			pStrTitle = NULL,
-                                                                    BOOL                    bMultiByte = FALSE,
-                                                                    BOOL                    bOnlyDbtoolsEncodings = FALSE,
-                                                                    BOOL                    bImport = TRUE );
+                                                                    sal_Bool                    bMultiByte = sal_False,
+                                                                    sal_Bool                    bOnlyDbtoolsEncodings = sal_False,
+                                                                    sal_Bool                    bImport = sal_True );
     virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame*	 pFrame, //add for ScAttrDlg
                                                     Window*			 pParent,
                                                     const SfxItemSet* pCellAttrs,
@@ -552,11 +552,11 @@ public:
                                                     const SfxItemSet&	rCoreSet,
                                                     const String&		rPageStyle,
                                                     int nId,
-                                                    USHORT				nResId = RID_SCDLG_HFEDIT );
+                                                    sal_uInt16				nResId = RID_SCDLG_HFEDIT );
 
     virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*				pParent,//add for ScStyleDlg
                                                     SfxStyleSheetBase&	rStyleBase,
-                                                    USHORT				nRscId,
+                                                    sal_uInt16				nRscId,
                                                     int nId);
 
     virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window*				pParent, //add for ScSubTotalDlg
@@ -577,9 +577,9 @@ public:
     virtual SfxAbstractTabDialog * CreateScSortDlg( Window*			 pParent, //add for ScSortDlg
                                                     const SfxItemSet* pArgSet,int nId );
     // For TabPage
-    virtual CreateTabPage				GetTabPageCreatorFunc( USHORT nId );
+    virtual CreateTabPage				GetTabPageCreatorFunc( sal_uInt16 nId );
 
-    virtual GetTabPageRanges			GetTabPageRangesFunc( USHORT nId );
+    virtual GetTabPageRanges			GetTabPageRangesFunc( sal_uInt16 nId );
 
 };
 
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 2783ef5be..3fc4e08a2 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -43,7 +43,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-static USHORT pProtectionRanges[] =
+static sal_uInt16 pProtectionRanges[] =
 {
     SID_SCATTR_PROTECTION,
     SID_SCATTR_PROTECTION,
@@ -73,7 +73,7 @@ ScTabPageProtection::ScTabPageProtection( Window*			pParent,
     SetExchangeSupport();
 
     //	States werden in Reset gesetzt
-    bTriEnabled = bDontCare = bProtect = bHideForm = bHideCell = bHidePrint = FALSE;
+    bTriEnabled = bDontCare = bProtect = bHideForm = bHideCell = bHidePrint = sal_False;
 
     aBtnProtect.SetClickHdl(	 LINK( this, ScTabPageProtection, ButtonClickHdl ) );
     aBtnHideCell.SetClickHdl(	 LINK( this, ScTabPageProtection, ButtonClickHdl ) );
@@ -91,7 +91,7 @@ __EXPORT ScTabPageProtection::~ScTabPageProtection()
 
 //------------------------------------------------------------------------
 
-USHORT* __EXPORT ScTabPageProtection::GetRanges()
+sal_uInt16* __EXPORT ScTabPageProtection::GetRanges()
 {
     return pProtectionRanges;
 }
@@ -110,9 +110,9 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
 {
     //	Variablen initialisieren
 
-    USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION );
+    sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION );
     const ScProtectionAttr* pProtAttr = NULL;
-    SfxItemState eItemState = rCoreAttrs.GetItemState( nWhich, FALSE,
+    SfxItemState eItemState = rCoreAttrs.GetItemState( nWhich, sal_False,
                                           (const SfxPoolItem**)&pProtAttr );
 
     // handelt es sich um ein Default-Item?
@@ -127,8 +127,8 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
         //	Defaults, die erscheinen wenn ein TriState weggeklickt wird:
         //	(weil alles zusammen ein Attribut ist, kann auch nur alles zusammen
         //	auf DontCare stehen - #38543#)
-        bProtect = TRUE;
-        bHideForm = bHideCell = bHidePrint = FALSE;
+        bProtect = sal_True;
+        bHideForm = bHideCell = bHidePrint = sal_False;
     }
     else
     {
@@ -150,13 +150,13 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
 {
-    BOOL 				bAttrsChanged	= FALSE;
-    USHORT				nWhich			= GetWhich( SID_SCATTR_PROTECTION );
+    sal_Bool 				bAttrsChanged	= sal_False;
+    sal_uInt16				nWhich			= GetWhich( SID_SCATTR_PROTECTION );
     const SfxPoolItem*	pOldItem		= GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION );
     const SfxItemSet&	rOldSet			= GetItemSet();
-    SfxItemState		eItemState		= rOldSet.GetItemState( nWhich, FALSE );
+    SfxItemState		eItemState		= rOldSet.GetItemState( nWhich, sal_False );
     ScProtectionAttr	aProtAttr;
 
     if ( !bDontCare )
@@ -167,7 +167,7 @@ BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
         aProtAttr.SetHidePrint( bHidePrint );
 
         if ( bTriEnabled )
-            bAttrsChanged = TRUE;					// DontCare -> richtiger Wert
+            bAttrsChanged = sal_True;					// DontCare -> richtiger Wert
         else
             bAttrsChanged = !pOldItem || !( aProtAttr == *(const ScProtectionAttr*)pOldItem );
     }
@@ -198,11 +198,11 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox )
 {
     TriState eState = pBox->GetState();
     if ( eState == STATE_DONTKNOW )
-        bDontCare = TRUE;							// alles zusammen auf DontCare
+        bDontCare = sal_True;							// alles zusammen auf DontCare
     else
     {
-        bDontCare = FALSE;							// DontCare ueberall aus
-        BOOL bOn = ( eState == STATE_CHECK );		// ausgewaehlter Wert
+        bDontCare = sal_False;							// DontCare ueberall aus
+        sal_Bool bOn = ( eState == STATE_CHECK );		// ausgewaehlter Wert
 
         if ( pBox == &aBtnProtect )
             bProtect = bOn;
@@ -242,7 +242,7 @@ void ScTabPageProtection::UpdateButtons()
         aBtnHidePrint.SetState( bHidePrint ? STATE_CHECK : STATE_NOCHECK );
     }
 
-    BOOL bEnable = ( aBtnHideCell.GetState() != STATE_CHECK );
+    sal_Bool bEnable = ( aBtnHideCell.GetState() != STATE_CHECK );
     {
         aBtnProtect.Enable( bEnable );
         aBtnHideFormula.Enable( bEnable );
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index 4874d8ab1..867d562b4 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -70,28 +70,28 @@ void ScDDComboBoxButton::SetOptSizePixel()
 
 void ScDDComboBoxButton::Draw( const Point&	rAt,
                                const Size&	rSize,
-                               BOOL         bState,
-                               BOOL			bBtnIn  /* = FALSE */ )
+                               sal_Bool         bState,
+                               sal_Bool			bBtnIn  /* = sal_False */ )
 {
     if ( rSize.Width() == 0 || rSize.Height() == 0 )
         return;     // #i43092# rectangle with size 0 would have RECT_EMPTY as end position
 
     // save old state
-    BOOL		bHadFill   = pOut->IsFillColor();
+    sal_Bool		bHadFill   = pOut->IsFillColor();
     Color		aOldFill   = pOut->GetFillColor();
-    BOOL		bHadLine   = pOut->IsLineColor();
+    sal_Bool		bHadLine   = pOut->IsLineColor();
     Color		aOldLine   = pOut->GetLineColor();
-    BOOL		bOldEnable = pOut->IsMapModeEnabled();
+    sal_Bool		bOldEnable = pOut->IsMapModeEnabled();
 
     Size		aLogPix( 1, 1 );
     Rectangle	aBtnRect( rAt, rSize );
     Rectangle	aInnerRect = aBtnRect;
 
-    pOut->EnableMapMode( FALSE );
+    pOut->EnableMapMode( sal_False );
 
     DecorationView aDecoView( pOut);
 
-    USHORT nButtonStyle = BUTTON_DRAW_DEFAULT;
+    sal_uInt16 nButtonStyle = BUTTON_DRAW_DEFAULT;
     if( bBtnIn )	// gedrueckt?
     {
         nButtonStyle = BUTTON_DRAW_PRESSED;
@@ -129,7 +129,7 @@ void ScDDComboBoxButton::Draw( const Point&	rAt,
 //------------------------------------------------------------------------
 
 void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect,
-                                       BOOL             bState )
+                                       sal_Bool             bState )
 {
     // no need to save old line and fill color here (is restored after the call)
 
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 6dbfdc668..6a0baf704 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -306,7 +306,7 @@ IMPL_LINK( ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, void*, EMPTYARG )
 
 size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999;
 
-ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, USHORT nMenuStackLevel) :
+ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) :
     PopupMenuFloatingWindow(pParent),
     maOpenTimer(this),
     maCloseTimer(this),
@@ -1160,7 +1160,7 @@ void ScDPFieldPopupWindow::setAllMemberState(bool bSet)
 {
     size_t n = maMembers.size();
     for (size_t i = 0; i < n; ++i)
-        maChecks.CheckEntryPos(static_cast< USHORT >( i ), bSet);
+        maChecks.CheckEntryPos(static_cast< sal_uInt16 >( i ), bSet);
 }
 
 void ScDPFieldPopupWindow::selectCurrentMemberOnly(bool bSet)
@@ -1356,7 +1356,7 @@ void ScDPFieldPopupWindow::initMembers()
     for (size_t i = 0; i < n; ++i)
     {
         maChecks.InsertEntry(maMembers[i].maName);
-        maChecks.CheckEntryPos(static_cast< USHORT >( i ), maMembers[i].mbVisible);
+        maChecks.CheckEntryPos(static_cast< sal_uInt16 >( i ), maMembers[i].mbVisible);
         if (maMembers[i].mbVisible)
             ++nVisMemCount;
     }
@@ -1391,7 +1391,7 @@ void ScDPFieldPopupWindow::getResult(hash_map<OUString, bool, OUStringHash>& rRe
     size_t n = maMembers.size();
     for (size_t i = 0; i < n; ++i)
     {
-        bool bState = maChecks.IsChecked(static_cast< USHORT >( i ));
+        bool bState = maChecks.IsChecked(static_cast< sal_uInt16 >( i ));
         aResult.insert(ResultMap::value_type(maMembers[i].maName, bState));
     }
     rResult.swap(aResult);
diff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx
index 3656c6691..8eb9ca99d 100644
--- a/sc/source/ui/cctrl/popmenu.cxx
+++ b/sc/source/ui/cctrl/popmenu.cxx
@@ -41,7 +41,7 @@
 void __EXPORT ScPopupMenu::Select()
 {
     nSel = GetCurItemId();
-    bHit = TRUE;
+    bHit = sal_True;
 }
 
 
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 1676a1883..caf643f4a 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -62,7 +62,7 @@ SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item);
 //
 //------------------------------------------------------------------
 
-ScTbxInsertCtrl::ScTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx  ) :
+ScTbxInsertCtrl::ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx  ) :
         SfxToolBoxControl( nSlotId, nId, rTbx ),
         nLastSlotId(0)
 {
@@ -73,7 +73,7 @@ __EXPORT ScTbxInsertCtrl::~ScTbxInsertCtrl()
 {
 }
 
-void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eState,
+void __EXPORT ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState,
                                               const SfxPoolItem* pState )
 {
     GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SFX_ITEM_DISABLED) );
@@ -85,7 +85,7 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt
         if(pItem)
         {
             nLastSlotId = pItem->GetValue();
-            USHORT nImageId = nLastSlotId ? nLastSlotId : GetSlotId();
+            sal_uInt16 nImageId = nLastSlotId ? nLastSlotId : GetSlotId();
             rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
             aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId ));
             Image aImage = GetImage( m_xFrame, 
@@ -99,8 +99,8 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt
 
 SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow()
 {
-//    USHORT nWinResId, nTbxResId;
-    USHORT nSlotId = GetSlotId();
+//    sal_uInt16 nWinResId, nTbxResId;
+    sal_uInt16 nSlotId = GetSlotId();
     if (nSlotId == SID_TBXCTL_INSERT)
     {
         rtl::OUString aInsertBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" ));
@@ -126,7 +126,7 @@ SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow()
     WindowAlign eNewAlign = ( GetToolBox().IsHorizontal() ) ? WINDOWALIGN_LEFT : WINDOWALIGN_TOP;
     ScTbxInsertPopup *pWin = new ScTbxInsertPopup( nSlotId, eNewAlign,
                                     ScResId(nWinResId), ScResId(nTbxResId), GetBindings() );
-    pWin->StartPopupMode(&GetToolBox(), TRUE);
+    pWin->StartPopupMode(&GetToolBox(), sal_True);
     pWin->StartSelection();
     pWin->Show();
     return pWin;
@@ -139,7 +139,7 @@ SfxPopupWindowType __EXPORT ScTbxInsertCtrl::GetPopupWindowType() const
     return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
 }
 
-void __EXPORT ScTbxInsertCtrl::Select( BOOL /* bMod1 */ )
+void __EXPORT ScTbxInsertCtrl::Select( sal_Bool /* bMod1 */ )
 {
     SfxViewShell*   pCurSh( SfxViewShell::Current() );
     SfxDispatcher*  pDispatch( 0 );
@@ -161,7 +161,7 @@ void __EXPORT ScTbxInsertCtrl::Select( BOOL /* bMod1 */ )
 //
 //------------------------------------------------------------------
 
-ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign,
+ScTbxInsertPopup::ScTbxInsertPopup( sal_uInt16 nId, WindowAlign eNewAlign,
                         const ResId& rRIdWin, const ResId& rRIdTbx,
                         SfxBindings& rBindings ) :
                 SfxPopupWindow	( nId, rRIdWin, rBindings),
@@ -204,7 +204,7 @@ IMPL_LINK(ScTbxInsertPopup, TbxSelectHdl, ToolBox*, pBox)
 {
     EndPopupMode();
 
-    USHORT nLastSlotId = pBox->GetCurItemId();
+    sal_uInt16 nLastSlotId = pBox->GetCurItemId();
     SfxUInt16Item aItem( GetId(), nLastSlotId );
     SfxDispatcher* pDisp = GetBindings().GetDispatcher();
     pDisp->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L );
@@ -214,7 +214,7 @@ IMPL_LINK(ScTbxInsertPopup, TbxSelectHdl, ToolBox*, pBox)
 
 IMPL_LINK(ScTbxInsertPopup, TbxClickHdl, ToolBox*, pBox)
 {
-    USHORT nLastSlotId = pBox->GetCurItemId();
+    sal_uInt16 nLastSlotId = pBox->GetCurItemId();
     SfxUInt16Item aItem( GetId(), nLastSlotId );
     GetBindings().GetDispatcher()->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L );
     if(aTbxClickHdl.IsSet())
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 04d2d1c4e..4cf9b3fa7 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -63,8 +63,8 @@ SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem );
 // -----------------------------------------------------------------------
 
 ScZoomSliderControl::ScZoomSliderControl(
-    USHORT     nSlotId,
-    USHORT	   nId,
+    sal_uInt16     nSlotId,
+    sal_uInt16	   nId,
     ToolBox&   rTbx ) 
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
@@ -80,10 +80,10 @@ __EXPORT ScZoomSliderControl::~ScZoomSliderControl()
 
 // -----------------------------------------------------------------------
 
-void ScZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState,
+void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState,
                                        const SfxPoolItem* pState )
 {
-    USHORT                  nId	 = GetId();
+    sal_uInt16                  nId	 = GetId();
     ToolBox&                rTbx = GetToolBox();
     ScZoomSliderWnd*        pBox = (ScZoomSliderWnd*)(rTbx.GetItemWindow( nId ));
     DBG_ASSERT( pBox ,"Control not found!" );
@@ -122,19 +122,19 @@ Window* ScZoomSliderControl::CreateItemWindow( Window *pParent )
 
 struct ScZoomSliderWnd::ScZoomSliderWnd_Impl
 {
-    USHORT                   mnCurrentZoom;
-    USHORT                   mnMinZoom;
-    USHORT                   mnMaxZoom;
-    USHORT                   mnSliderCenter;
+    sal_uInt16                   mnCurrentZoom;
+    sal_uInt16                   mnMinZoom;
+    sal_uInt16                   mnMaxZoom;
+    sal_uInt16                   mnSliderCenter;
     std::vector< long >      maSnappingPointOffsets;
-    std::vector< USHORT >    maSnappingPointZooms;
+    std::vector< sal_uInt16 >    maSnappingPointZooms;
     Image                    maSliderButton;
     Image                    maIncreaseButton;
     Image                    maDecreaseButton;
     bool                     mbValuesSet;
     bool                     mbOmitPaint;
 
-    ScZoomSliderWnd_Impl( USHORT nCurrentZoom ) :
+    ScZoomSliderWnd_Impl( sal_uInt16 nCurrentZoom ) :
         mnCurrentZoom( nCurrentZoom ),
         mnMinZoom( 10 ),
         mnMaxZoom( 400 ),
@@ -167,11 +167,11 @@ const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two
 
 // -----------------------------------------------------------------------
 
-USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
+sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
 {
     Size aSliderWindowSize = GetOutputSizePixel();
     const long nControlWidth = aSliderWindowSize.Width();
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
     
     if( nOffset < nSliderXOffset )
         return mpImpl->mnMinZoom;
@@ -179,7 +179,7 @@ USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
         return mpImpl->mnMaxZoom;
 
     // check for snapping points:
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     std::vector< long >::iterator aSnappingPointIter;
     for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin();
         aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
@@ -204,7 +204,7 @@ USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
             const long nHalfSliderWidth     = nControlWidth/2 - nSliderXOffset;
             const long nZoomPerSliderPixel  = (1000 * nFirstHalfRange) / nHalfSliderWidth;
             const long nOffsetToSliderLeft  = nOffset - nSliderXOffset;
-            nRet = mpImpl->mnMinZoom + USHORT( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
+            nRet = mpImpl->mnMinZoom + sal_uInt16( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
         }
         else
         {
@@ -213,7 +213,7 @@ USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
             const long nHalfSliderWidth         = nControlWidth/2 - nSliderXOffset;
             const long nZoomPerSliderPixel      = 1000 * nSecondHalfRange / nHalfSliderWidth;
             const long nOffsetToSliderCenter    = nOffset - nControlWidth/2;
-            nRet = mpImpl->mnSliderCenter + USHORT( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
+            nRet = mpImpl->mnSliderCenter + sal_uInt16( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
         }
     }
 
@@ -228,7 +228,7 @@ USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
 
 // -----------------------------------------------------------------------
 
-long ScZoomSliderWnd::Zoom2Offset( USHORT nCurrentZoom ) const
+long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
 {
     Size aSliderWindowSize = GetOutputSizePixel();
     const long nControlWidth = aSliderWindowSize.Width();
@@ -258,14 +258,14 @@ long ScZoomSliderWnd::Zoom2Offset( USHORT nCurrentZoom ) const
 
 
 ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , USHORT nCurrentZoom ):
+                const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ):
                 Window( pParent ),
                 mpImpl( new ScZoomSliderWnd_Impl( nCurrentZoom ) ),
                 aLogicalSize( 115, 40 ),
                 m_xDispatchProvider( rDispatchProvider ),
                 m_xFrame( _xFrame )
 {
-    BOOL bIsHC                  = GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool bIsHC                  = GetSettings().GetStyleSettings().GetHighContrastMode();
     mpImpl->maSliderButton      = Image( SVX_RES( bIsHC ? RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) );
     mpImpl->maIncreaseButton    = Image( SVX_RES( bIsHC ? RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) );
     mpImpl->maDecreaseButton    = Image( SVX_RES( bIsHC ? RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) );
@@ -400,20 +400,20 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem )
        mpImpl->maSnappingPointZooms.clear();
 
        // get all snapping points:
-       std::set< USHORT > aTmpSnappingPoints;
-       for ( USHORT j = 0; j < rSnappingPoints.getLength(); ++j )
+       std::set< sal_uInt16 > aTmpSnappingPoints;
+       for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
        {
            const sal_Int32 nSnappingPoint = rSnappingPoints[j];
-           aTmpSnappingPoints.insert( (USHORT)nSnappingPoint );
+           aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
        }
 
        // remove snapping points that are to close to each other:
-       std::set< USHORT >::iterator aSnappingPointIter;
+       std::set< sal_uInt16 >::iterator aSnappingPointIter;
        long nLastOffset = 0;
 
        for ( aSnappingPointIter = aTmpSnappingPoints.begin(); aSnappingPointIter != aTmpSnappingPoints.end(); ++aSnappingPointIter )
        {
-           const USHORT nCurrent = *aSnappingPointIter;
+           const sal_uInt16 nCurrent = *aSnappingPointIter;
            const long nCurrentOffset = Zoom2Offset( nCurrent );
 
            if ( nCurrentOffset - nLastOffset >= nSnappingPointsMinDist )
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 54bc80746..3b7ef5b22 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -50,15 +50,15 @@ static const sal_Char __FAR_DATA pStrMrg[] = "MRG";
 // ============================================================================
 
 ScAsciiOptions::ScAsciiOptions() :
-    bFixedLen		( FALSE ),
+    bFixedLen		( sal_False ),
     aFieldSeps		( ';' ),
-    bMergeFieldSeps	( FALSE ),
+    bMergeFieldSeps	( sal_False ),
     bQuotedFieldAsText(false),
     bDetectSpecialNumber(false),
     cTextSep		( cDefaultTextSep ),
     eCharSet		( gsl_getSystemTextEncoding() ),
     eLang           ( LANGUAGE_SYSTEM ),
-    bCharSetSystem	( FALSE ),
+    bCharSetSystem	( sal_False ),
     nStartRow		( 1 ),
     nInfoCount		( 0 ),
     pColStart       ( NULL ),
@@ -83,8 +83,8 @@ ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) :
     if (nInfoCount)
     {
         pColStart = new xub_StrLen[nInfoCount];
-        pColFormat = new BYTE[nInfoCount];
-        for (USHORT i=0; i<nInfoCount; i++)
+        pColFormat = new sal_uInt8[nInfoCount];
+        for (sal_uInt16 i=0; i<nInfoCount; i++)
         {
             pColStart[i] = rOpt.pColStart[i];
             pColFormat[i] = rOpt.pColFormat[i];
@@ -105,7 +105,7 @@ ScAsciiOptions::~ScAsciiOptions()
 }
 
 
-void ScAsciiOptions::SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat )
+void ScAsciiOptions::SetColInfo( sal_uInt16 nCount, const xub_StrLen* pStart, const sal_uInt8* pFormat )
 {
     delete[] pColStart;
     delete[] pColFormat;
@@ -115,8 +115,8 @@ void ScAsciiOptions::SetColInfo( USHORT nCount, const xub_StrLen* pStart, const
     if (nInfoCount)
     {
         pColStart = new xub_StrLen[nInfoCount];
-        pColFormat = new BYTE[nInfoCount];
-        for (USHORT i=0; i<nInfoCount; i++)
+        pColFormat = new sal_uInt8[nInfoCount];
+        for (sal_uInt16 i=0; i<nInfoCount; i++)
         {
             pColStart[i] = pStart[i];
             pColFormat[i] = pFormat[i];
@@ -168,7 +168,7 @@ ScAsciiOptions&	ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
 }
 
 
-BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
+sal_Bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
 {
     if ( bFixedLen		 == rCmp.bFixedLen &&
          aFieldSeps		 == rCmp.aFieldSeps &&
@@ -182,14 +182,14 @@ BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
     {
         DBG_ASSERT( !nInfoCount || (pColStart && pColFormat && rCmp.pColStart && rCmp.pColFormat),
                      "0-Zeiger in ScAsciiOptions" );
-        for (USHORT i=0; i<nInfoCount; i++)
+        for (sal_uInt16 i=0; i<nInfoCount; i++)
             if ( pColStart[i] != rCmp.pColStart[i] ||
                  pColFormat[i] != rCmp.pColFormat[i] )
-                return FALSE;
+                return sal_False;
 
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //
@@ -211,18 +211,18 @@ void ScAsciiOptions::ReadFromString( const String& rString )
 
     if ( nCount >= 1 )
     {
-        bFixedLen = bMergeFieldSeps = FALSE;
+        bFixedLen = bMergeFieldSeps = sal_False;
         aFieldSeps.Erase();
 
         aToken = rString.GetToken(0,',');
         if ( aToken.EqualsAscii(pStrFix) )
-            bFixedLen = TRUE;
+            bFixedLen = sal_True;
         nSub = aToken.GetTokenCount('/');
         for ( i=0; i<nSub; i++ )
         {
             String aCode = aToken.GetToken( i, '/' );
             if ( aCode.EqualsAscii(pStrMrg) )
-                bMergeFieldSeps = TRUE;
+                bMergeFieldSeps = sal_True;
             else
             {
                 sal_Int32 nVal = aCode.ToInt32();
@@ -278,11 +278,11 @@ void ScAsciiOptions::ReadFromString( const String& rString )
         if (nInfoCount)
         {
             pColStart = new xub_StrLen[nInfoCount];
-            pColFormat = new BYTE[nInfoCount];
-            for (USHORT nInfo=0; nInfo<nInfoCount; nInfo++)
+            pColFormat = new sal_uInt8[nInfoCount];
+            for (sal_uInt16 nInfo=0; nInfo<nInfoCount; nInfo++)
             {
                 pColStart[nInfo]  = (xub_StrLen) aToken.GetToken( 2*nInfo, '/' ).ToInt32();
-                pColFormat[nInfo] = (BYTE) aToken.GetToken( 2*nInfo+1, '/' ).ToInt32();
+                pColFormat[nInfo] = (sal_uInt8) aToken.GetToken( 2*nInfo+1, '/' ).ToInt32();
             }
         }
         else
@@ -374,7 +374,7 @@ String ScAsciiOptions::WriteToString() const
         //
 
     DBG_ASSERT( !nInfoCount || (pColStart && pColFormat), "0-Zeiger in ScAsciiOptions" );
-    for (USHORT nInfo=0; nInfo<nInfoCount; nInfo++)
+    for (sal_uInt16 nInfo=0; nInfo<nInfoCount; nInfo++)
     {
         if (nInfo)
             aOutStr += '/';
@@ -413,36 +413,36 @@ void ScAsciiOptions::InterpretColumnList( const String& rString )
     //	Kommas durch Semikolon ersetzen
 
     String aSemiStr = rString;
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     do
         nPos = aSemiStr.SearchAndReplace( ',', ';', nPos );
     while ( nPos != STRING_NOTFOUND );
 
     //	Eintraege sortieren
 
-    USHORT nCount = aSemiStr.GetTokenCount();
-    USHORT* pTemp = new USHORT[nCount+1];
+    sal_uInt16 nCount = aSemiStr.GetTokenCount();
+    sal_uInt16* pTemp = new sal_uInt16[nCount+1];
     pTemp[0] = 1;									// erste Spalte faengt immer bei 1 an
-    USHORT nFound = 1;
-    USHORT i,j;
+    sal_uInt16 nFound = 1;
+    sal_uInt16 i,j;
     for (i=0; i<nCount; i++)
     {
-        USHORT nVal = (USHORT) aSemiStr.GetToken(i);
+        sal_uInt16 nVal = (sal_uInt16) aSemiStr.GetToken(i);
         if (nVal)
         {
-            BOOL bThere = FALSE;
+            sal_Bool bThere = sal_False;
             nPos = 0;
             for (j=0; j<nFound; j++)
             {
                 if ( pTemp[j] == nVal )
-                    bThere = TRUE;
+                    bThere = sal_True;
                 else if ( pTemp[j] < nVal )
                     nPos = j+1;
             }
             if ( !bThere )
             {
                 if ( nPos < nFound )
-                    memmove( &pTemp[nPos+1], &pTemp[nPos], (nFound-nPos)*sizeof(USHORT) );
+                    memmove( &pTemp[nPos+1], &pTemp[nPos], (nFound-nPos)*sizeof(sal_uInt16) );
                 pTemp[nPos] = nVal;
                 ++nFound;
             }
@@ -456,8 +456,8 @@ void ScAsciiOptions::InterpretColumnList( const String& rString )
     nInfoCount = nFound;
     if (nInfoCount)
     {
-        pColStart = new USHORT[nInfoCount];
-        pColFormat = new BYTE[nInfoCount];
+        pColStart = new sal_uInt16[nInfoCount];
+        pColFormat = new sal_uInt8[nInfoCount];
         for (i=0; i<nInfoCount; i++)
         {
             pColStart[i] = pTemp[i] - 1;
@@ -470,7 +470,7 @@ void ScAsciiOptions::InterpretColumnList( const String& rString )
         pColFormat = NULL;
     }
 
-    bFixedLen = TRUE;			// sonst macht's keinen Sinn
+    bFixedLen = sal_True;			// sonst macht's keinen Sinn
 
     //	aufraeumen
 
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 22d8318fa..8d39d67ec 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -64,7 +64,7 @@ public:
     ScAreaData()  {}
     ~ScAreaData() {}
 
-    void Set( const String& rName, const String& rArea, BOOL bDb )
+    void Set( const String& rName, const String& rArea, sal_Bool bDb )
                 {
                     aStrName  = rName;
                     aStrArea  = rArea;
@@ -73,7 +73,7 @@ public:
 
     String	aStrName;
     String	aStrArea;
-    BOOL	bIsDbArea;
+    sal_Bool	bIsDbArea;
 };
 
 
@@ -155,7 +155,7 @@ void ScConsolidateDlg::Init()
     DBG_ASSERT( pViewData && pDoc && pRangeUtil, "Error in Ctor" );
 
     String aStr;
-    USHORT i=0;
+    sal_uInt16 i=0;
 
     aEdDataArea	.SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
     aEdDestArea	.SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
@@ -221,8 +221,8 @@ void ScConsolidateDlg::Init()
 
     ScRangeName*    pRangeNames  = pDoc->GetRangeName();
     ScDBCollection* pDbNames     = pDoc->GetDBCollection();
-    const USHORT    nRangeCount  = pRangeNames ? pRangeNames->GetCount() : 0;
-    const USHORT    nDbCount	 = pDbNames	   ? pDbNames   ->GetCount() : 0;
+    const sal_uInt16    nRangeCount  = pRangeNames ? pRangeNames->GetCount() : 0;
+    const sal_uInt16    nDbCount	 = pDbNames	   ? pDbNames   ->GetCount() : 0;
 
     nAreaDataCount = nRangeCount+nDbCount;
     pAreaData	   = NULL;
@@ -233,7 +233,7 @@ void ScConsolidateDlg::Init()
 
         String aStrName;
         String aStrArea;
-        USHORT nAt = 0;
+        sal_uInt16 nAt = 0;
         ScRange aRange;
         ScAreaNameIterator aIter( pDoc );
         while ( aIter.Next( aStrName, aRange ) )
@@ -268,7 +268,7 @@ void ScConsolidateDlg::FillAreaLists()
     {
         String aString;
 
-        for ( USHORT i=0;
+        for ( sal_uInt16 i=0;
               (i<nAreaDataCount) && (pAreaData[i].aStrName.Len()>0);
               i++ )
         {
@@ -294,7 +294,7 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
             RefInputStart( pRefInputEdit );
 
         String		aStr;
-        USHORT	 	nFmt = SCR_ABS_3D;		 //!!! nCurTab fehlt noch
+        sal_uInt16	 	nFmt = SCR_ABS_3D;		 //!!! nCurTab fehlt noch
         const formula::FormulaGrammar::AddressConvention eConv = pDocP->GetAddressConvention();
 
         if ( rRef.aStart.Tab() != rRef.aEnd.Tab() )
@@ -314,7 +314,7 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScConsolidateDlg::Close()
+sal_Bool __EXPORT ScConsolidateDlg::Close()
 {
     return DoClose( ScConsolidateDlgWrapper::GetChildWindowId() );
 }
@@ -326,7 +326,7 @@ void ScConsolidateDlg::SetActive()
 {
     if ( bDlgLostFocus )
     {
-        bDlgLostFocus = FALSE;
+        bDlgLostFocus = sal_False;
 
         if ( pRefInputEdit )
         {
@@ -345,20 +345,20 @@ void ScConsolidateDlg::SetActive()
 
 void __EXPORT ScConsolidateDlg::Deactivate()
 {
-    bDlgLostFocus = TRUE;
+    bDlgLostFocus = sal_True;
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
+sal_Bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
 {
     if ( !pRangeUtil || !pDoc || !pViewData ||
          ((pEd != &aEdDataArea) && (pEd != &aEdDestArea)) )
-        return FALSE;
+        return sal_False;
 
     SCTAB	nTab	= pViewData->GetTabNo();
-    BOOL	bEditOk = FALSE;
+    sal_Bool	bEditOk = sal_False;
     String	theCompleteStr;
     const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
 
@@ -410,7 +410,7 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr )
 
 IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG )
 {
-    USHORT nDataAreaCount = aLbConsAreas.GetEntryCount();
+    sal_uInt16 nDataAreaCount = aLbConsAreas.GetEntryCount();
 
     if ( nDataAreaCount > 0 )
     {
@@ -424,7 +424,7 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG )
             ScConsolidateParam	theOutParam( theConsData );
             ScArea**			ppDataAreas = new ScArea*[nDataAreaCount];
             ScArea*				pArea;
-            USHORT				i=0;
+            sal_uInt16				i=0;
 
             for ( i=0; i<nDataAreaCount; i++ )
             {
@@ -449,7 +449,7 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG )
 
             ScConsolidateItem aOutItem( nWhichCons, &theOutParam );
 
-            SetDispatcherLock( FALSE );
+            SetDispatcherLock( sal_False );
             SwitchToDocument();
             GetBindings().GetDispatcher()->Execute( SID_CONSOLIDATE,
                                       SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
@@ -480,16 +480,16 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
         {
             String		aNewEntry( aEdDataArea.GetText() );
             ScArea**	ppAreas = NULL;
-            USHORT		nAreaCount = 0;
+            sal_uInt16		nAreaCount = 0;
             const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
 
-            if ( pRangeUtil->IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, TRUE, eConv ) )
+            if ( pRangeUtil->IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, sal_True, eConv ) )
             {
                 // IsAbsTabArea() legt ein Array von ScArea-Zeigern an,
                 // welche ebenfalls dynamisch erzeugt wurden.
                 // Diese Objekte muessen hier abgeraeumt werden.
 
-                for ( USHORT i=0; i<nAreaCount; i++ )
+                for ( sal_uInt16 i=0; i<nAreaCount; i++ )
                 {
                     String aNewArea;
 
@@ -550,7 +550,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
     else if ( (pLb == &aLbDataArea) || (pLb == &aLbDestArea) )
     {
         Edit*	pEd = (pLb == &aLbDataArea) ? &aEdDataArea : &aEdDestArea;
-        USHORT	nSelPos = pLb->GetSelectEntryPos();
+        sal_uInt16	nSelPos = pLb->GetSelectEntryPos();
 
         if (    pRangeUtil
             && (nSelPos > 0)
@@ -609,7 +609,7 @@ IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd )
 // auch noch in tpsubt bzw. ueberall, wo StarCalc-Funktionen
 // auswaehlbar sind.
 
-ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( USHORT nPos )
+ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( sal_uInt16 nPos )
 {
     switch ( nPos )
     {
@@ -632,7 +632,7 @@ ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( USHORT nPos )
 
 //----------------------------------------------------------------------------
 
-USHORT ScConsolidateDlg::FuncToLbPos( ScSubTotalFunc eFunc )
+sal_uInt16 ScConsolidateDlg::FuncToLbPos( ScSubTotalFunc eFunc )
 {
     switch ( eFunc )
     {
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 2a43cb06f..b26836916 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -76,7 +76,7 @@ struct Func_Select
 ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) :
     ScCsvControl( rParent ),
     mrColorConfig( SC_MOD()->GetColorConfig() ),
-    mpEditEngine( new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE ) ),
+    mpEditEngine( new ScEditEngineDefaulter( EditEngine::CreatePool(), sal_True ) ),
     maHeaderFont( GetFont() ),
     maColStates( 1 ),
     maTypeNames( 1 ),
@@ -235,7 +235,7 @@ void ScCsvGrid::InitFonts()
     aDefSet.Put( aComplexItem );
 
     // set Asian/Complex font size to height of character in Latin font
-    ULONG nFontHt = static_cast< ULONG >( maMonoFont.GetSize().Height() );
+    sal_uLong nFontHt = static_cast< sal_uLong >( maMonoFont.GetSize().Height() );
     aDefSet.Put( SvxFontHeightItem( nFontHt, 100, EE_CHAR_FONTHEIGHT_CJK ) );
     aDefSet.Put( SvxFontHeightItem( nFontHt, 100, EE_CHAR_FONTHEIGHT_CTL ) );
 
@@ -886,8 +886,8 @@ void ScCsvGrid::KeyInput( const KeyEvent& rKEvt )
 {
     const KeyCode& rKCode = rKEvt.GetKeyCode();
     sal_uInt16 nCode = rKCode.GetCode();
-    bool bShift = rKCode.IsShift() == TRUE;
-    bool bMod1 = rKCode.IsMod1() == TRUE;
+    bool bShift = rKCode.IsShift() == sal_True;
+    bool bMod1 = rKCode.IsMod1() == sal_True;
 
     if( !rKCode.IsMod2() )
     {
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 7b2f2f75c..696baf416 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -127,7 +127,7 @@ ScCsvRuler::~ScCsvRuler()
 // common ruler handling ------------------------------------------------------
 
 void ScCsvRuler::SetPosSizePixel(
-        long nX, long nY, long nWidth, long nHeight, USHORT nFlags )
+        long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
 {
     if( nFlags & WINDOW_POSSIZE_HEIGHT )
         nHeight = GetTextHeight() + mnSplitSize + 2;
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index c656b8239..8e9cf635c 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -124,7 +124,7 @@ ScDataPilotDatabaseDlg::~ScDataPilotDatabaseDlg()
 
 void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc )
 {
-    USHORT nSelect = aLbType.GetSelectEntryPos();
+    sal_uInt16 nSelect = aLbType.GetSelectEntryPos();
 
     rDesc.aDBName = aLbDatabase.GetSelectEntry();
     rDesc.aObject = aCbObject.GetText();
@@ -155,7 +155,7 @@ void ScDataPilotDatabaseDlg::FillObjects()
     if (!aDatabaseName.Len())
         return;
 
-    USHORT nSelect = aLbType.GetSelectEntryPos();
+    sal_uInt16 nSelect = aLbType.GetSelectEntryPos();
     if ( nSelect > DP_TYPELIST_QUERY )
         return;									// only tables and queries
 
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index f076a7c02..37f3651d9 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -43,7 +43,7 @@ using namespace com::sun::star;
 
 //-------------------------------------------------------------------------
 
-ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg( Window* pParent, BOOL bEnableExternal ) :
+ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg( Window* pParent, sal_Bool bEnableExternal ) :
     ModalDialog     ( pParent, ScResId( RID_SCDLG_DAPITYPE ) ),
     //
     aFlFrame        ( this, ScResId( FL_FRAME ) ),
@@ -66,12 +66,12 @@ ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
 {
 }
 
-BOOL ScDataPilotSourceTypeDlg::IsDatabase() const
+sal_Bool ScDataPilotSourceTypeDlg::IsDatabase() const
 {
     return aBtnDatabase.IsChecked();
 }
 
-BOOL ScDataPilotSourceTypeDlg::IsExternal() const
+sal_Bool ScDataPilotSourceTypeDlg::IsExternal() const
 {
     return aBtnExternal.IsChecked();
 }
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 2db216539..3a08a68d6 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -77,7 +77,7 @@ public:
         : rEdAssign(rEd),
           rBtnHeader(rHdr), rBtnSize(rSize), rBtnFormat(rFmt), rBtnStrip(rStrip),
           rCurArea(rArea),
-          bHeader(FALSE), bSize(FALSE), bFormat(FALSE), bDirty(FALSE) {}
+          bHeader(sal_False), bSize(sal_False), bFormat(sal_False), bDirty(sal_False) {}
     void Save();
     void Restore();
 
@@ -90,11 +90,11 @@ private:
     ScRange&	rCurArea;
     String		aStr;
     ScRange		aArea;
-    BOOL		bHeader:1;
-    BOOL		bSize:1;
-    BOOL		bFormat:1;
-    BOOL		bStrip:1;
-    BOOL		bDirty:1;
+    sal_Bool		bHeader:1;
+    sal_Bool		bSize:1;
+    sal_Bool		bFormat:1;
+    sal_Bool		bStrip:1;
+    sal_Bool		bDirty:1;
 };
 
 
@@ -109,7 +109,7 @@ void DBSaveData::Save()
     bSize   = rBtnSize.IsChecked();
     bFormat = rBtnFormat.IsChecked();
     bStrip	= rBtnStrip.IsChecked();
-    bDirty  = TRUE;
+    bDirty  = sal_True;
 }
 
 
@@ -125,7 +125,7 @@ void DBSaveData::Restore()
         rBtnSize.Check   ( bSize );
         rBtnFormat.Check ( bFormat );
         rBtnStrip.Check  ( bStrip );
-        bDirty = FALSE;
+        bDirty = sal_False;
     }
 }
 
@@ -169,7 +169,7 @@ ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         //
         pViewData		( ptrViewData ),
         pDoc			( ptrViewData->GetDocument() ),
-        bRefInputMode	( FALSE ),
+        bRefInputMode	( sal_False ),
         aAddrDetails    ( pDoc->GetAddressConvention(), 0, 0 ),
         aLocalDbCol		( *(pDoc->GetDBCollection()) )
 {
@@ -208,7 +208,7 @@ __EXPORT ScDbNameDlg::~ScDbNameDlg()
 
 void ScDbNameDlg::Init()
 {
-    aBtnHeader.Check( TRUE );		// Default: mit Spaltenkoepfen
+    aBtnHeader.Check( sal_True );		// Default: mit Spaltenkoepfen
 
     aBtnMore.AddWindow( &aFlOptions );
     aBtnMore.AddWindow( &aBtnHeader );
@@ -250,7 +250,7 @@ void ScDbNameDlg::Init()
         if ( pDBColl )
         {
             // Feststellen, ob definierter DB-Bereich markiert wurde:
-            pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab, TRUE );
+            pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab, sal_True );
             if ( pDBData )
             {
                 String		theDbName;
@@ -285,7 +285,7 @@ void ScDbNameDlg::Init()
 
     aEdAssign.SetText( theAreaStr );
     aEdName.GrabFocus();
-    bSaved=TRUE;
+    bSaved=sal_True;
     pSaveObj->Save();
     NameModifyHdl( 0 );
 }
@@ -333,7 +333,7 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
         aFTSource.Enable();
         aFTOperations.Enable();
         aBtnAdd.Enable();
-        bSaved=TRUE;
+        bSaved=sal_True;
         pSaveObj->Save();
     }
 }
@@ -341,7 +341,7 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScDbNameDlg::Close()
+sal_Bool __EXPORT ScDbNameDlg::Close()
 {
     return DoClose( ScDbNameDlgWrapper::GetChildWindowId() );
 }
@@ -363,9 +363,9 @@ void ScDbNameDlg::SetActive()
 
 void ScDbNameDlg::UpdateNames()
 {
-    USHORT	nNameCount = aLocalDbCol.GetCount();
+    sal_uInt16	nNameCount = aLocalDbCol.GetCount();
 
-    aEdName.SetUpdateMode( FALSE );
+    aEdName.SetUpdateMode( sal_False );
     //-----------------------------------------------------------
     aEdName.Clear();
     aEdAssign.SetText( EMPTY_STRING );
@@ -375,7 +375,7 @@ void ScDbNameDlg::UpdateNames()
         ScDBData*	pDbData = NULL;
         String		aString;
 
-        for ( USHORT i=0; i<nNameCount; i++ )
+        for ( sal_uInt16 i=0; i<nNameCount; i++ )
         {
             pDbData = (ScDBData*)(aLocalDbCol.At( i ));
             if ( pDbData )
@@ -393,7 +393,7 @@ void ScDbNameDlg::UpdateNames()
         aBtnRemove.Disable();
     }
     //-----------------------------------------------------------
-    aEdName.SetUpdateMode( TRUE );
+    aEdName.SetUpdateMode( sal_True );
     aEdName.Invalidate();
 }
 
@@ -402,7 +402,7 @@ void ScDbNameDlg::UpdateNames()
 void ScDbNameDlg::UpdateDBData( const String& rStrName )
 {
     String		theArea;
-    USHORT 		nAt;
+    sal_uInt16 		nAt;
     ScDBData*	pData;
 
     aLocalDbCol.SearchName( rStrName, nAt );
@@ -443,7 +443,7 @@ void ScDbNameDlg::UpdateDBData( const String& rStrName )
 //------------------------------------------------------------------------
 
 
-BOOL ScDbNameDlg::IsRefInputMode() const
+sal_Bool ScDbNameDlg::IsRefInputMode() const
 {
     return bRefInputMode;
 }
@@ -500,7 +500,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
                 ScAddress aEnd   = theCurArea.aEnd;
 
                 ScDBData* pOldEntry = NULL;
-                USHORT nFoundAt = 0;
+                sal_uInt16 nFoundAt = 0;
                 if ( aLocalDbCol.SearchName( aNewName, nFoundAt ) )
                     pOldEntry = aLocalDbCol[nFoundAt];
                 if (pOldEntry)
@@ -509,7 +509,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
 
                     pOldEntry->MoveTo( aStart.Tab(), aStart.Col(), aStart.Row(),
                                                         aEnd.Col(), aEnd.Row() );
-                    pOldEntry->SetByRow( TRUE );
+                    pOldEntry->SetByRow( sal_True );
                     pOldEntry->SetHeader( aBtnHeader.IsChecked() );
                     pOldEntry->SetDoSize( aBtnDoSize.IsChecked() );
                     pOldEntry->SetKeepFmt( aBtnKeepFmt.IsChecked() );
@@ -522,7 +522,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
                     ScDBData* pNewEntry = new ScDBData( aNewName, aStart.Tab(),
                                                         aStart.Col(), aStart.Row(),
                                                         aEnd.Col(), aEnd.Row(),
-                                                        TRUE, aBtnHeader.IsChecked() );
+                                                        sal_True, aBtnHeader.IsChecked() );
                     pNewEntry->SetDoSize( aBtnDoSize.IsChecked() );
                     pNewEntry->SetKeepFmt( aBtnKeepFmt.IsChecked() );
                     pNewEntry->SetStripData( aBtnStripData.IsChecked() );
@@ -539,13 +539,13 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
                 aBtnAdd.Disable();
                 aBtnRemove.Disable();
                 aEdAssign.SetText( EMPTY_STRING );
-                aBtnHeader.Check( TRUE );		// Default: mit Spaltenkoepfen
-                aBtnDoSize.Check( FALSE );
-                aBtnKeepFmt.Check( FALSE );
-                aBtnStripData.Check( FALSE );
+                aBtnHeader.Check( sal_True );		// Default: mit Spaltenkoepfen
+                aBtnDoSize.Check( sal_False );
+                aBtnKeepFmt.Check( sal_False );
+                aBtnStripData.Check( sal_False );
                 SetInfoStrings( NULL );		// leer
                 theCurArea = ScRange();
-                bSaved=TRUE;
+                bSaved=sal_True;
                 pSaveObj->Save();
                 NameModifyHdl( 0 );
             }
@@ -570,7 +570,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
 
 IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG )
 {
-    USHORT		 nRemoveAt = 0;
+    sal_uInt16		 nRemoveAt = 0;
     const String aStrEntry = aEdName.GetText();
 
     if ( aLocalDbCol.SearchName( aStrEntry, nRemoveAt ) )
@@ -606,12 +606,12 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG )
             aBtnRemove.Disable();
             aEdAssign.SetText( EMPTY_STRING );
             theCurArea = ScRange();
-            aBtnHeader.Check( TRUE );		// Default: mit Spaltenkoepfen
-            aBtnDoSize.Check( FALSE );
-            aBtnKeepFmt.Check( FALSE );
-            aBtnStripData.Check( FALSE );
+            aBtnHeader.Check( sal_True );		// Default: mit Spaltenkoepfen
+            aBtnDoSize.Check( sal_False );
+            aBtnKeepFmt.Check( sal_False );
+            aBtnStripData.Check( sal_False );
             SetInfoStrings( NULL );		// leer
-            bSaved=FALSE;
+            bSaved=sal_False;
             pSaveObj->Restore();
             NameModifyHdl( 0 );
         }
@@ -624,7 +624,7 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG )
 IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG )
 {
     String	theName		= aEdName.GetText();
-    BOOL	bNameFound  = (COMBOBOX_ENTRY_NOTFOUND
+    sal_Bool	bNameFound  = (COMBOBOX_ENTRY_NOTFOUND
                            != aEdName.GetEntryPos( theName ));
 
     if ( theName.Len() == 0 )
@@ -642,11 +642,11 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG )
         aFTOperations.Disable();
         aEdAssign	.Disable();
         aRbAssign	.Disable();
-        //bSaved=FALSE;
+        //bSaved=sal_False;
         //pSaveObj->Restore();
         //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
-        //SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
-        bRefInputMode = FALSE;
+        //SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
+        bRefInputMode = sal_False;
     }
     else
     {
@@ -657,7 +657,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG )
 
             if(!bSaved)
             {
-                bSaved=TRUE;
+                bSaved=sal_True;
                 pSaveObj->Save();
             }
             UpdateDBData( theName );
@@ -667,7 +667,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG )
             if ( aBtnAdd.GetText() != aStrAdd )
                 aBtnAdd.SetText( aStrAdd );
 
-            bSaved=FALSE;
+            bSaved=sal_False;
             pSaveObj->Restore();
 
             if ( aEdAssign.GetText().Len() > 0 )
@@ -699,7 +699,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG )
 
         //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
         //SFX_APPWINDOW->Enable();
-        bRefInputMode = TRUE;
+        bRefInputMode = sal_True;
     }
     return 0;
 }
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 487a0b848..7cbf3650d 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -242,21 +242,21 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent,
 {
     maLbUnits.SetHelpId( HID_SC_DPDATEGROUP_LB );
     ResStringArray aArr( ScResId( STR_UNITS ) );
-    for( USHORT nIdx = 0, nCount = sal::static_int_cast<USHORT>(aArr.Count()); nIdx < nCount; ++nIdx )
+    for( sal_uInt16 nIdx = 0, nCount = sal::static_int_cast<sal_uInt16>(aArr.Count()); nIdx < nCount; ++nIdx )
         maLbUnits.InsertEntry( aArr.GetString( nIdx ) );
 
     FreeResource();
 
-    maEdStart.SetShowDateCentury( TRUE );
-    maEdEnd.SetShowDateCentury( TRUE );
+    maEdStart.SetShowDateCentury( sal_True );
+    maEdEnd.SetShowDateCentury( sal_True );
 
     maStartHelper.SetValue( rInfo.AutoStart, rInfo.Start );
     maEndHelper.SetValue( rInfo.AutoEnd, rInfo.End );
 
     if( nDatePart == 0 )
         nDatePart = com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS;
-    for( ULONG nIdx = 0, nCount = maLbUnits.GetEntryCount(); nIdx < nCount; ++nIdx )
-        maLbUnits.CheckEntryPos( static_cast< USHORT >( nIdx ), (nDatePart & spnDateParts[ nIdx ]) != 0 );
+    for( sal_uLong nIdx = 0, nCount = maLbUnits.GetEntryCount(); nIdx < nCount; ++nIdx )
+        maLbUnits.CheckEntryPos( static_cast< sal_uInt16 >( nIdx ), (nDatePart & spnDateParts[ nIdx ]) != 0 );
 
     if( rInfo.DateValues )
     {
@@ -320,8 +320,8 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const
 
     // return listbox contents for "units" mode
     sal_Int32 nDatePart = 0;
-    for( ULONG nIdx = 0, nCount = maLbUnits.GetEntryCount(); nIdx < nCount; ++nIdx )
-        if( maLbUnits.IsChecked( static_cast< USHORT >( nIdx ) ) )
+    for( sal_uLong nIdx = 0, nCount = maLbUnits.GetEntryCount(); nIdx < nCount; ++nIdx )
+        if( maLbUnits.IsChecked( static_cast< sal_uInt16 >( nIdx ) ) )
             nDatePart |= spnDateParts[ nIdx ];
     return nDatePart;
 }
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 723cd81d1..91a214d4e 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -282,7 +282,7 @@ void ScDPFieldWindow::Redraw()
     Point			aPos0;
     Size			aSize( GetSizePixel() );
     Font			aFont( GetFont() );			// Font vom Window
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     aVirDev.SetFont( aFont );
     aVirDev.SetOutputSizePixel( aSize );
 
@@ -402,7 +402,7 @@ void ScDPFieldWindow::SetSelectionEnd()
     }
 }
 
-void ScDPFieldWindow::MoveSelection( USHORT nKeyCode, SCsCOL nDX, SCsROW nDY )
+void ScDPFieldWindow::MoveSelection( sal_uInt16 nKeyCode, SCsCOL nDX, SCsROW nDY )
 {
     size_t nNewIndex = CalcNewFieldIndex( nDX, nDY );
     if( (eType == TYPE_SELECT) && (nNewIndex == nFieldSelected) )
@@ -541,12 +541,12 @@ void __EXPORT ScDPFieldWindow::MouseMove( const MouseEvent& rMEvt )
 void __EXPORT ScDPFieldWindow::KeyInput( const KeyEvent& rKEvt )
 {
     const KeyCode& rKeyCode = rKEvt.GetKeyCode();
-    USHORT nCode = rKeyCode.GetCode();
-    BOOL bKeyEvaluated = FALSE;
+    sal_uInt16 nCode = rKeyCode.GetCode();
+    sal_Bool bKeyEvaluated = sal_False;
 
     if( rKeyCode.IsMod1() && (eType != TYPE_SELECT) )
     {
-        bKeyEvaluated = TRUE;
+        bKeyEvaluated = sal_True;
         switch( nCode )
         {
             case KEY_UP:    MoveFieldRel( 0, -1 );              break;
@@ -555,12 +555,12 @@ void __EXPORT ScDPFieldWindow::KeyInput( const KeyEvent& rKEvt )
             case KEY_RIGHT: MoveFieldRel( 1, 0 );               break;
             case KEY_HOME:  MoveField( 0 );                     break;
             case KEY_END:   MoveField( aFieldArr.size() - 1 );  break;
-            default:        bKeyEvaluated = FALSE;
+            default:        bKeyEvaluated = sal_False;
         }
     }
     else
     {
-        bKeyEvaluated = TRUE;
+        bKeyEvaluated = sal_True;
         switch( nCode )
         {
             case KEY_UP:    MoveSelection( nCode, 0, -1 );          break;
@@ -571,7 +571,7 @@ void __EXPORT ScDPFieldWindow::KeyInput( const KeyEvent& rKEvt )
             case KEY_END:   SetSelectionEnd();                      break;
             case KEY_DELETE:
                 pDlg->NotifyRemoveField( eType, nFieldSelected );   break;
-            default:        bKeyEvaluated = FALSE;
+            default:        bKeyEvaluated = sal_False;
         }
     }
 
@@ -586,7 +586,7 @@ void __EXPORT ScDPFieldWindow::GetFocus()
     if( GetGetFocusFlags() & GETFOCUS_MNEMONIC )    // move field on shortcut
         pDlg->NotifyMoveField( eType );
     else                                            // else change focus
-        pDlg->NotifyFieldFocus( eType, TRUE );
+        pDlg->NotifyFieldFocus( eType, sal_True );
 
     if (pAccessible)
     {
@@ -602,7 +602,7 @@ void __EXPORT ScDPFieldWindow::LoseFocus()
 {
     Control::LoseFocus();
     Redraw();
-    pDlg->NotifyFieldFocus( eType, FALSE );
+    pDlg->NotifyFieldFocus( eType, sal_False );
 
     if (pAccessible)
     {
@@ -695,7 +695,7 @@ const String& ScDPFieldWindow::GetFieldText( size_t nIndex ) const
 bool ScDPFieldWindow::AddField( const String& rText, const Point& rPos, size_t& rnIndex )
 {
     if ( aFieldArr.size() == nFieldSize )
-        return FALSE;
+        return sal_False;
 
     size_t nNewIndex = 0;
     if( GetFieldIndex( rPos, nNewIndex ) )
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 728bf216e..d711694d5 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -114,14 +114,14 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         pDoc			( NULL ),
         nSrcTab			( 0 ),
         nFieldCount		( 0 ),
-        bRefInputMode	( FALSE ),
+        bRefInputMode	( sal_False ),
         pTimer			( NULL )
 {
-    for (USHORT i=0; i<=MAXCOL; i++)
+    for (sal_uInt16 i=0; i<=MAXCOL; i++)
         pEntryLists[i] = NULL;
     for (SCSIZE i=0;i<MAXQUERY;i++)
     {
-         bRefreshExceptQuery[i]=FALSE; 
+         bRefreshExceptQuery[i]=sal_False; 
     }
     aBtnMore.SetMoreText( String(ScResId( SCSTR_MOREBTN_MOREOPTIONS )) );
     aBtnMore.SetLessText( String(ScResId( SCSTR_MOREBTN_FEWEROPTIONS )) );
@@ -139,7 +139,7 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
 
 __EXPORT ScFilterDlg::~ScFilterDlg()
 {
-    for (USHORT i=0; i<=MAXCOL; i++)
+    for (sal_uInt16 i=0; i<=MAXCOL; i++)
         delete pEntryLists[i];
 
     delete pOptionsMgr;
@@ -229,13 +229,13 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
     for ( SCSIZE i=0; i<4; i++ )
     {
         String	aValStr;
-        USHORT	nCondPos	 = 0;
-        USHORT	nFieldSelPos = 0;
+        sal_uInt16	nCondPos	 = 0;
+        sal_uInt16	nFieldSelPos = 0;
 
         ScQueryEntry& rEntry = theQueryData.GetEntry(i);
         if ( rEntry.bDoQuery )
         {
-            nCondPos	 = (USHORT)rEntry.eOp;
+            nCondPos	 = (sal_uInt16)rEntry.eOp;
             nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) );
             if ( rEntry.nVal == SC_EMPTYFIELDS && !rEntry.bQueryByString && *rEntry.pStr == EMPTY_STRING )
             {
@@ -255,15 +255,15 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
             nFieldSelPos = GetFieldSelPos( pViewData->GetCurX() );
             rEntry.nField = nFieldSelPos ? (theQueryData.nCol1 +
                 static_cast<SCCOL>(nFieldSelPos) - 1) : static_cast<SCCOL>(0);
-            rEntry.bDoQuery=TRUE;
-            bRefreshExceptQuery[i]=TRUE;
+            rEntry.bDoQuery=sal_True;
+            bRefreshExceptQuery[i]=sal_True;
 
         }
         aFieldLbArr[i]->SelectEntryPos( nFieldSelPos );
         aCondLbArr [i]->SelectEntryPos( nCondPos );
         aValueEdArr[i]->SetText( aValStr );
         aValueEdArr[i]->SetModifyHdl( LINK( this, ScFilterDlg, ValModifyHdl ) );
-        UpdateValueList( static_cast<USHORT>(i+1) );
+        UpdateValueList( static_cast<sal_uInt16>(i+1) );
     }
 
     aScrollBar.SetEndScrollHdl( LINK( this, ScFilterDlg, ScrollHdl ) );
@@ -276,17 +276,17 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
 
        (aLbField1.GetSelectEntryPos() != 0)
     && (aLbField2.GetSelectEntryPos() != 0)
-        ? aLbConnect2.SelectEntryPos( (USHORT)theQueryData.GetEntry(1).eConnect )  
+        ? aLbConnect2.SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(1).eConnect )  
         : aLbConnect2.SetNoSelection();
 
        (aLbField2.GetSelectEntryPos() != 0)
     && (aLbField3.GetSelectEntryPos() != 0)
-        ? aLbConnect3.SelectEntryPos( (USHORT)theQueryData.GetEntry(2).eConnect )  
+        ? aLbConnect3.SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(2).eConnect )  
         : aLbConnect3.SetNoSelection();
 
        (aLbField3.GetSelectEntryPos() != 0)
     && (aLbField4.GetSelectEntryPos() != 0)
-        ? aLbConnect4.SelectEntryPos( (USHORT)theQueryData.GetEntry(3).eConnect )  
+        ? aLbConnect4.SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(3).eConnect )  
         : aLbConnect4.SetNoSelection();
     if ( aLbField1.GetSelectEntryPos() == 0 )
     {
@@ -332,15 +332,15 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
     if(pDoc!=NULL &&
         pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable();
     // Modal-Modus einschalten
-//	SetDispatcherLock( TRUE );
+//	SetDispatcherLock( sal_True );
     //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
-//	SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+//	SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScFilterDlg::Close()
+sal_Bool __EXPORT ScFilterDlg::Close()
 {
     if (pViewData)
         pViewData->GetDocShell()->CancelAutoDBRange();
@@ -403,7 +403,7 @@ void ScFilterDlg::FillFieldLists()
         SCROW	nFirstRow	= theQueryData.nRow1;
         SCCOL	nMaxCol		= theQueryData.nCol2;
         SCCOL	col = 0;
-        USHORT	i=1;
+        sal_uInt16	i=1;
 
         for ( col=nFirstCol; col<=nMaxCol; col++ )
         {
@@ -427,13 +427,13 @@ void ScFilterDlg::FillFieldLists()
 
 //----------------------------------------------------------------------------
 
-void ScFilterDlg::UpdateValueList( USHORT nList )
+void ScFilterDlg::UpdateValueList( sal_uInt16 nList )
 {
     if ( pDoc && nList>0 && nList<=4 )
     {
         ComboBox*	pValList		= aValueEdArr[nList-1];
-        USHORT		nFieldSelPos	= aFieldLbArr[nList-1]->GetSelectEntryPos();
-        USHORT		nListPos		= 0;
+        sal_uInt16		nFieldSelPos	= aFieldLbArr[nList-1]->GetSelectEntryPos();
+        sal_uInt16		nListPos		= 0;
         String		aCurValue  		= pValList->GetText();
 
         pValList->Clear();
@@ -448,7 +448,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
             SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1;
             if (!pEntryLists[nColumn])
             {
-                USHORT nOffset = GetSliderPos();
+                sal_uInt16 nOffset = GetSliderPos();
                 SCTAB nTab		 = nSrcTab;
                 SCROW nFirstRow = theQueryData.nRow1;
                 SCROW nLastRow	 = theQueryData.nRow2;
@@ -485,10 +485,10 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
             }
 
             TypedScStrCollection* pColl = pEntryLists[nColumn];
-            USHORT nValueCount = pColl->GetCount();
+            sal_uInt16 nValueCount = pColl->GetCount();
             if ( nValueCount > 0 )
             {
-                for ( USHORT i=0; i<nValueCount; i++ )
+                for ( sal_uInt16 i=0; i<nValueCount; i++ )
                 {
                     pValList->InsertEntry( (*pColl)[i]->GetString(), nListPos );
                     nListPos++;
@@ -501,30 +501,30 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
     UpdateHdrInValueList( nList );
 }
 
-void ScFilterDlg::UpdateHdrInValueList( USHORT nList )
+void ScFilterDlg::UpdateHdrInValueList( sal_uInt16 nList )
 {
     //!	GetText / SetText ??
 
     if ( pDoc && nList>0 && nList<=4 )
     {
-        USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos();
+        sal_uInt16 nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos();
         if ( nFieldSelPos )
         {
             SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1;
             if ( pEntryLists[nColumn] )
             {
-                USHORT nPos = nHeaderPos[nColumn];
+                sal_uInt16 nPos = nHeaderPos[nColumn];
                 if ( nPos != USHRT_MAX )
                 {
                     ComboBox* pValList = aValueEdArr[nList-1];
-                    USHORT nListPos = nPos + 2;					// nach "leer" und "nicht leer"
+                    sal_uInt16 nListPos = nPos + 2;					// nach "leer" und "nicht leer"
 
                     TypedStrData* pHdrEntry = (*pEntryLists[nColumn])[nPos];
                     if ( pHdrEntry )
                     {
                         String aHdrStr = pHdrEntry->GetString();
-                        BOOL bWasThere = ( pValList->GetEntry(nListPos) == aHdrStr );
-                        BOOL bInclude = !aBtnHeader.IsChecked();
+                        sal_Bool bWasThere = ( pValList->GetEntry(nListPos) == aHdrStr );
+                        sal_Bool bInclude = !aBtnHeader.IsChecked();
 
                         if (bInclude)			// Eintrag aufnehmen
                         {
@@ -553,7 +553,7 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList )
 
 //----------------------------------------------------------------------------
 
-void ScFilterDlg::ClearValueList( USHORT nList )
+void ScFilterDlg::ClearValueList( sal_uInt16 nList )
 {
     if ( nList>0 && nList<=4 )
     {
@@ -568,10 +568,10 @@ void ScFilterDlg::ClearValueList( USHORT nList )
 
 //----------------------------------------------------------------------------
 
-USHORT ScFilterDlg::GetFieldSelPos( SCCOL nField )
+sal_uInt16 ScFilterDlg::GetFieldSelPos( SCCOL nField )
 {
     if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 )
-        return static_cast<USHORT>(nField - theQueryData.nCol1 + 1);
+        return static_cast<sal_uInt16>(nField - theQueryData.nCol1 + 1);
     else
         return 0;
 }
@@ -582,7 +582,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
 {
     ScAddress		theCopyPos;
     ScQueryParam 	theParam( theQueryData );
-    BOOL            bCopyPosOk = FALSE;
+    sal_Bool            bCopyPosOk = sal_False;
 
     if ( aBtnCopyResult.IsChecked() )
     {
@@ -592,27 +592,27 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
         if ( STRING_NOTFOUND != nColonPos )
             theCopyStr.Erase( nColonPos );
 
-        USHORT nResult = theCopyPos.Parse( theCopyStr, pDoc, pDoc->GetAddressConvention() );
+        sal_uInt16 nResult = theCopyPos.Parse( theCopyStr, pDoc, pDoc->GetAddressConvention() );
         bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) );
     }
 
     if ( aBtnCopyResult.IsChecked() && bCopyPosOk )
     {
-        theParam.bInplace   = FALSE;
+        theParam.bInplace   = sal_False;
         theParam.nDestTab	= theCopyPos.Tab();
         theParam.nDestCol	= theCopyPos.Col();
         theParam.nDestRow	= theCopyPos.Row();
     }
     else
     {
-        theParam.bInplace   = TRUE;
+        theParam.bInplace   = sal_True;
         theParam.nDestTab	= 0;
         theParam.nDestCol	= 0;
         theParam.nDestRow	= 0;
     }
 
     theParam.bHasHeader		= aBtnHeader.IsChecked();
-    theParam.bByRow			= TRUE;
+    theParam.bByRow			= sal_True;
     theParam.bDuplicate		= !aBtnUnique.IsChecked();
     theParam.bCaseSens 		= aBtnCase.IsChecked();
     theParam.bRegExp		= aBtnRegExp.IsChecked();
@@ -629,7 +629,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
 
 //----------------------------------------------------------------------------
 
-BOOL ScFilterDlg::IsRefInputMode() const
+sal_Bool ScFilterDlg::IsRefInputMode() const
 {
     return bRefInputMode;
 }
@@ -643,24 +643,24 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn )
 {
     if ( pBtn == &aBtnOk )
     {
-        BOOL bAreaInputOk = TRUE;
+        sal_Bool bAreaInputOk = sal_True;
 
         if ( aBtnCopyResult.IsChecked() )
         {
             if ( !pOptionsMgr->VerifyPosStr( aEdCopyArea.GetText() ) )
             {
                 if ( !aBtnMore.GetState() )
-                    aBtnMore.SetState( TRUE );
+                    aBtnMore.SetState( sal_True );
 
                 ERRORBOX( STR_INVALID_TABREF );
                 aEdCopyArea.GrabFocus();
-                bAreaInputOk = FALSE;
+                bAreaInputOk = sal_False;
             }
         }
 
         if ( bAreaInputOk )
         {
-            SetDispatcherLock( FALSE );
+            SetDispatcherLock( sal_False );
             SwitchToDocument();
             GetBindings().GetDispatcher()->Execute( FID_FILTER_OK,
                                       SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
@@ -686,9 +686,9 @@ IMPL_LINK( ScFilterDlg, MoreClickHdl, MoreButton*, EMPTYARG )
     else
     {
         pTimer->Stop();
-        bRefInputMode = FALSE;
+        bRefInputMode = sal_False;
         //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
-        //SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+        //SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
     }
     return 0;
 }
@@ -718,7 +718,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
      * Behandlung der Enable/Disable-Logik,
      * abhaengig davon, welche ListBox angefasst wurde:
      */
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
 
     if ( pLb == &aLbConnect1 )
     {
@@ -726,10 +726,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
         aLbCond1.Enable();
         aEdVal1.Enable();
 
-        USHORT 	nConnect1 = aLbConnect1.GetSelectEntryPos();
-        USHORT nQE = nOffset;
+        sal_uInt16 	nConnect1 = aLbConnect1.GetSelectEntryPos();
+        sal_uInt16 nQE = nOffset;
         theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect1;
-        bRefreshExceptQuery[nQE]=TRUE;
+        bRefreshExceptQuery[nQE]=sal_True;
     }
 
     else if ( pLb == &aLbConnect2 )
@@ -738,10 +738,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
         aLbCond2.Enable();
         aEdVal2.Enable();
 
-        USHORT 	nConnect2 = aLbConnect2.GetSelectEntryPos();
-        USHORT nQE = 1+nOffset;
+        sal_uInt16 	nConnect2 = aLbConnect2.GetSelectEntryPos();
+        sal_uInt16 nQE = 1+nOffset;
         theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect2;
-         bRefreshExceptQuery[nQE]=TRUE;
+         bRefreshExceptQuery[nQE]=sal_True;
     }
     else if ( pLb == &aLbConnect3 )
     {
@@ -749,10 +749,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
         aLbCond3.Enable();
         aEdVal3.Enable();
 
-        USHORT 	nConnect3 = aLbConnect3.GetSelectEntryPos();
-        USHORT nQE = 2+nOffset;
+        sal_uInt16 	nConnect3 = aLbConnect3.GetSelectEntryPos();
+        sal_uInt16 nQE = 2+nOffset;
         theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect3;
-        bRefreshExceptQuery[nQE]=TRUE;
+        bRefreshExceptQuery[nQE]=sal_True;
 
     }
     else if ( pLb == &aLbConnect4 )
@@ -761,10 +761,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
         aLbCond4.Enable();
         aEdVal4.Enable();
 
-        USHORT 	nConnect4 = aLbConnect4.GetSelectEntryPos();
-        USHORT nQE = 3+nOffset;
+        sal_uInt16 	nConnect4 = aLbConnect4.GetSelectEntryPos();
+        sal_uInt16 nQE = 3+nOffset;
         theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect4;
-        bRefreshExceptQuery[nQE]=TRUE;
+        bRefreshExceptQuery[nQE]=sal_True;
 
     }
     else if ( pLb == &aLbField1 )
@@ -797,13 +797,13 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             aEdVal2.Disable();
             aEdVal3.Disable();
             aEdVal4.Disable();
-            for (USHORT i= nOffset; i< MAXQUERY; i++)
+            for (sal_uInt16 i= nOffset; i< MAXQUERY; i++)
             {
-                theQueryData.GetEntry(i).bDoQuery = FALSE;
-                bRefreshExceptQuery[i]=FALSE; 
+                theQueryData.GetEntry(i).bDoQuery = sal_False;
+                bRefreshExceptQuery[i]=sal_False; 
                 theQueryData.GetEntry(i).nField =  static_cast<SCCOL>(0);
             }
-            bRefreshExceptQuery[nOffset] =TRUE;
+            bRefreshExceptQuery[nOffset] =sal_True;
         }
         else
         {
@@ -812,8 +812,8 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             {
                 aLbConnect2.Enable();
             }
-            theQueryData.GetEntry(nOffset).bDoQuery = TRUE;
-            USHORT 	nField	= pLb->GetSelectEntryPos();
+            theQueryData.GetEntry(nOffset).bDoQuery = sal_True;
+            sal_uInt16 	nField	= pLb->GetSelectEntryPos();
             theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
         }
     }
@@ -840,14 +840,14 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             aEdVal3.Disable();
             aEdVal4.Disable();
 
-            USHORT nTemp=nOffset+1;
-            for (USHORT i= nTemp; i< MAXQUERY; i++)
+            sal_uInt16 nTemp=nOffset+1;
+            for (sal_uInt16 i= nTemp; i< MAXQUERY; i++)
             {
-                theQueryData.GetEntry(i).bDoQuery = FALSE;
-                bRefreshExceptQuery[i]=FALSE; 
+                theQueryData.GetEntry(i).bDoQuery = sal_False;
+                bRefreshExceptQuery[i]=sal_False; 
                 theQueryData.GetEntry(i).nField =  static_cast<SCCOL>(0);
             }
-            bRefreshExceptQuery[nTemp]=TRUE; 
+            bRefreshExceptQuery[nTemp]=sal_True; 
         }
         else
         {
@@ -856,9 +856,9 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             {
                 aLbConnect3.Enable();
             }
-            USHORT 	nField	= pLb->GetSelectEntryPos();
-            USHORT nQ=1+nOffset;
-            theQueryData.GetEntry(nQ).bDoQuery = TRUE;
+            sal_uInt16 	nField	= pLb->GetSelectEntryPos();
+            sal_uInt16 nQ=1+nOffset;
+            theQueryData.GetEntry(nQ).bDoQuery = sal_True;
             theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
         }
     }
@@ -877,14 +877,14 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
             aLbCond4.Disable();
             aEdVal4.Disable();
 
-            USHORT nTemp=nOffset+2;
-            for (USHORT i= nTemp; i< MAXQUERY; i++)
+            sal_uInt16 nTemp=nOffset+2;
+            for (sal_uInt16 i= nTemp; i< MAXQUERY; i++)
             {
-                theQueryData.GetEntry(i).bDoQuery = FALSE;
-                bRefreshExceptQuery[i]=FALSE;  
+                theQueryData.GetEntry(i).bDoQuery = sal_False;
+                bRefreshExceptQuery[i]=sal_False;  
                 theQueryData.GetEntry(i).nField =  static_cast<SCCOL>(0);
             }
-            bRefreshExceptQuery[nTemp]=TRUE; 
+            bRefreshExceptQuery[nTemp]=sal_True; 
         }
         else
         {
@@ -894,9 +894,9 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
                 aLbConnect4.Enable();
             }
             
-            USHORT 	nField	= pLb->GetSelectEntryPos();
-            USHORT nQ=2+nOffset;
-            theQueryData.GetEntry(nQ).bDoQuery = TRUE;
+            sal_uInt16 	nField	= pLb->GetSelectEntryPos();
+            sal_uInt16 nQ=2+nOffset;
+            theQueryData.GetEntry(nQ).bDoQuery = sal_True;
             theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
 
         }
@@ -906,21 +906,21 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
         if ( aLbField4.GetSelectEntryPos() == 0 )
         {
             ClearValueList( 4 );
-            USHORT nTemp=nOffset+3;
-            for (USHORT i= nTemp; i< MAXQUERY; i++)
+            sal_uInt16 nTemp=nOffset+3;
+            for (sal_uInt16 i= nTemp; i< MAXQUERY; i++)
             {
-                theQueryData.GetEntry(i).bDoQuery = FALSE;
-                bRefreshExceptQuery[i]=FALSE; 
+                theQueryData.GetEntry(i).bDoQuery = sal_False;
+                bRefreshExceptQuery[i]=sal_False; 
                 theQueryData.GetEntry(i).nField =  static_cast<SCCOL>(0);
             }
-            bRefreshExceptQuery[nTemp]=TRUE; 
+            bRefreshExceptQuery[nTemp]=sal_True; 
         }
         else
         {
             UpdateValueList( 4 );
-            USHORT 	nField	= pLb->GetSelectEntryPos();
-            USHORT nQ=3+nOffset;
-            theQueryData.GetEntry(nQ).bDoQuery = TRUE;
+            sal_uInt16 	nField	= pLb->GetSelectEntryPos();
+            sal_uInt16 nQ=3+nOffset;
+            theQueryData.GetEntry(nQ).bDoQuery = sal_True;
             theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
         }
 
@@ -931,17 +931,17 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
     }
     else if ( pLb == &aLbCond2)
     {
-        USHORT nQ=1+nOffset;
+        sal_uInt16 nQ=1+nOffset;
         theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
     }
     else if ( pLb == &aLbCond3)
     {
-        USHORT nQ=2+nOffset;
+        sal_uInt16 nQ=2+nOffset;
         theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
     }
     else 
     {
-        USHORT nQ=3+nOffset;
+        sal_uInt16 nQ=3+nOffset;
         theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
     }
 
@@ -961,10 +961,10 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
 
     if ( pBox == &aBtnHeader )				// Feldlisten und Wertlisten
     {
-        USHORT nCurSel1 = aLbField1.GetSelectEntryPos();
-        USHORT nCurSel2 = aLbField2.GetSelectEntryPos();
-        USHORT nCurSel3 = aLbField3.GetSelectEntryPos();
-        USHORT nCurSel4 = aLbField4.GetSelectEntryPos();
+        sal_uInt16 nCurSel1 = aLbField1.GetSelectEntryPos();
+        sal_uInt16 nCurSel2 = aLbField2.GetSelectEntryPos();
+        sal_uInt16 nCurSel3 = aLbField3.GetSelectEntryPos();
+        sal_uInt16 nCurSel4 = aLbField4.GetSelectEntryPos();
         FillFieldLists();
         aLbField1.SelectEntryPos( nCurSel1 );
         aLbField2.SelectEntryPos( nCurSel2 );
@@ -979,7 +979,7 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
 
     if ( pBox == &aBtnCase )			// Wertlisten komplett
     {
-        for (USHORT i=0; i<=MAXCOL; i++)
+        for (sal_uInt16 i=0; i<=MAXCOL; i++)
             DELETEZ( pEntryLists[i] );
 
         UpdateValueList( 1 );		// aktueller Text wird gemerkt
@@ -996,9 +996,9 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
 
 IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
 {
-    USHORT   nOffset = GetSliderPos();
-    USHORT   i=0;
-    USHORT   nQE =i + nOffset;
+    sal_uInt16   nOffset = GetSliderPos();
+    sal_uInt16   i=0;
+    sal_uInt16   nQE =i + nOffset;
     if ( pEd )
     {
         String    aStrVal	= pEd->GetText();
@@ -1035,7 +1035,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
             pLbCond->Enable();
 
         ScQueryEntry& rEntry = theQueryData.GetEntry( nQE );
-        BOOL bDoThis = (pLbField->GetSelectEntryPos() != 0);
+        sal_Bool bDoThis = (pLbField->GetSelectEntryPos() != 0);
         rEntry.bDoQuery = bDoThis;
 
         if ( rEntry.bDoQuery || bRefreshExceptQuery[nQE] )
@@ -1044,22 +1044,22 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
             {
                 rEntry.pStr->Erase();
                 rEntry.nVal = SC_EMPTYFIELDS;
-                rEntry.bQueryByString = FALSE;
+                rEntry.bQueryByString = sal_False;
             }
             else if ( aStrVal == aStrNotEmpty )
             {
                 rEntry.pStr->Erase();
                 rEntry.nVal = SC_NONEMPTYFIELDS;
-                rEntry.bQueryByString = FALSE;
+                rEntry.bQueryByString = sal_False;
             }
             else
             {
                 *rEntry.pStr		  = aStrVal;
                 rEntry.nVal			  = 0;
-                rEntry.bQueryByString = TRUE;
+                rEntry.bQueryByString = sal_True;
             }
 
-            USHORT 	nField	= pLbField->GetSelectEntryPos();
+            sal_uInt16 	nField	= pLbField->GetSelectEntryPos();
             rEntry.nField = nField ? (theQueryData.nCol1 +
                 static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0);
            
@@ -1081,31 +1081,31 @@ IMPL_LINK( ScFilterDlg, ScrollHdl, ScrollBar*, EMPTYARG )
 
 void ScFilterDlg::SliderMoved()
 {
-    USHORT nOffset = GetSliderPos();
+    sal_uInt16 nOffset = GetSliderPos();
     RefreshEditRow( nOffset);
 }
-USHORT ScFilterDlg::GetSliderPos()
+sal_uInt16 ScFilterDlg::GetSliderPos()
 {
-    return (USHORT) aScrollBar.GetThumbPos();
+    return (sal_uInt16) aScrollBar.GetThumbPos();
 }
-void ScFilterDlg::RefreshEditRow( USHORT nOffset )
+void ScFilterDlg::RefreshEditRow( sal_uInt16 nOffset )
 {		
     if (nOffset==0) 
         aConnLbArr[0]->Hide();
     else
         aConnLbArr[0]->Show();	
 
-    for ( USHORT i=0; i<4; i++ )
+    for ( sal_uInt16 i=0; i<4; i++ )
     {
         String	aValStr;
-        USHORT	nCondPos	 = 0;
-        USHORT	nFieldSelPos = 0;
-        USHORT  nQE = i+nOffset;
+        sal_uInt16	nCondPos	 = 0;
+        sal_uInt16	nFieldSelPos = 0;
+        sal_uInt16  nQE = i+nOffset;
 
         ScQueryEntry& rEntry = theQueryData.GetEntry( nQE);
         if ( rEntry.bDoQuery || bRefreshExceptQuery[nQE] )
         {
-            nCondPos	 = (USHORT)rEntry.eOp;
+            nCondPos	 = (sal_uInt16)rEntry.eOp;
             if(rEntry.bDoQuery)
                nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) );
 
@@ -1135,9 +1135,9 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset )
                         aConnLbArr[i+1]->Enable();
                     else
                         aConnLbArr[i+1]->Disable();
-                    USHORT nQENext = nQE+1;
+                    sal_uInt16 nQENext = nQE+1;
                     if(theQueryData.GetEntry(nQENext).bDoQuery || bRefreshExceptQuery[nQENext])
-                        aConnLbArr[i+1]->SelectEntryPos( (USHORT) theQueryData.GetEntry(nQENext).eConnect );
+                        aConnLbArr[i+1]->SelectEntryPos( (sal_uInt16) theQueryData.GetEntry(nQENext).eConnect );
                     else
                         aConnLbArr[i+1]->SetNoSelection();
                 }
@@ -1150,7 +1150,7 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset )
                     aConnLbArr[i]->Disable();
 
                 if(rEntry.bDoQuery || bRefreshExceptQuery[nQE])
-                    aConnLbArr[i]->SelectEntryPos( (USHORT) rEntry.eConnect );
+                    aConnLbArr[i]->SelectEntryPos( (sal_uInt16) rEntry.eConnect );
                 else
                     aConnLbArr[i]->SetNoSelection();
             }
@@ -1181,6 +1181,6 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset )
         aFieldLbArr[i]->SelectEntryPos( nFieldSelPos );
         aCondLbArr [i]->SelectEntryPos( nCondPos );
         aValueEdArr[i]->SetText( aValStr );
-        UpdateValueList( static_cast<USHORT>(i+1) );
+        UpdateValueList( static_cast<sal_uInt16>(i+1) );
     }
 }
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 6f56fc0ff..b94ff19c9 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -98,8 +98,8 @@ ScFilterOptionsMgr::ScFilterOptionsMgr(
 
 ScFilterOptionsMgr::~ScFilterOptionsMgr()
 {
-    USHORT nEntries = rLbCopyPos.GetEntryCount();
-    USHORT i;
+    sal_uInt16 nEntries = rLbCopyPos.GetEntryCount();
+    sal_uInt16 i;
 
     for ( i=2; i<nEntries; i++ )
         delete (String*)rLbCopyPos.GetEntryData( i );
@@ -161,13 +161,13 @@ void ScFilterOptionsMgr::Init()
         String aRefStr;
         while ( aIter.Next( aName, aRange ) )
         {
-            USHORT nInsert = rLbCopyPos.InsertEntry( aName );
+            sal_uInt16 nInsert = rLbCopyPos.InsertEntry( aName );
 
             aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv );
             rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) );
         }
 
-        rBtnDestPers.Check( TRUE );			// beim Aufruf immer an
+        rBtnDestPers.Check( sal_True );			// beim Aufruf immer an
         rLbCopyPos.SelectEntryPos( 0 );
         rEdCopyPos.SetText( EMPTY_STRING );
 
@@ -214,7 +214,7 @@ void ScFilterOptionsMgr::Init()
                        rQueryData.nDestTab
                      ).Format( aString, SCA_ABS_3D, pDoc, eConv );
 
-            rBtnCopyResult.Check( TRUE );
+            rBtnCopyResult.Check( sal_True );
             rEdCopyPos.SetText( aString );
             EdPosModifyHdl( &rEdCopyPos );
             rLbCopyPos.Enable();
@@ -224,7 +224,7 @@ void ScFilterOptionsMgr::Init()
         }
         else
         {
-            rBtnCopyResult.Check( FALSE );
+            rBtnCopyResult.Check( sal_False );
             rEdCopyPos.SetText( EMPTY_STRING );
             rLbCopyPos.Disable();
             rEdCopyPos.Disable();
@@ -239,7 +239,7 @@ void ScFilterOptionsMgr::Init()
 
 //----------------------------------------------------------------------------
 
-BOOL ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const
+sal_Bool ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const
 {
     String aPosStr( rPosStr );
     xub_StrLen nColonPos = aPosStr.Search( ':' );
@@ -247,7 +247,7 @@ BOOL ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const
     if ( STRING_NOTFOUND != nColonPos )
         aPosStr.Erase( nColonPos );
 
-    USHORT nResult = ScAddress().Parse( aPosStr, pDoc, pDoc->GetAddressConvention() );
+    sal_uInt16 nResult = ScAddress().Parse( aPosStr, pDoc, pDoc->GetAddressConvention() );
 
     return ( SCA_VALID == (nResult & SCA_VALID) );
 }
@@ -263,7 +263,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbPosSelHdl, ListBox*, pLb )
     if ( pLb == &rLbCopyPos )
     {
         String aString;
-        USHORT nSelPos = rLbCopyPos.GetSelectEntryPos();
+        sal_uInt16 nSelPos = rLbCopyPos.GetSelectEntryPos();
 
         if ( nSelPos > 0 )
             aString = *(String*)rLbCopyPos.GetEntryData( nSelPos );
@@ -282,14 +282,14 @@ IMPL_LINK( ScFilterOptionsMgr, EdPosModifyHdl, Edit*, pEd )
     if ( pEd == &rEdCopyPos )
     {
         String	theCurPosStr = pEd->GetText();
-        USHORT	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+        sal_uInt16	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
 
         if ( SCA_VALID == (nResult & SCA_VALID) )
         {
             String*	pStr	= NULL;
-            BOOL	bFound	= FALSE;
-            USHORT	i		= 0;
-            USHORT	nCount	= rLbCopyPos.GetEntryCount();
+            sal_Bool	bFound	= sal_False;
+            sal_uInt16	i		= 0;
+            sal_uInt16	nCount	= rLbCopyPos.GetEntryCount();
 
             for ( i=2; i<nCount && !bFound; i++ )
             {
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index ce5874688..23ece03b2 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -44,19 +44,19 @@ static const sal_Char pStrFix[] = "FIX";
 
 ScImportOptions::ScImportOptions( const String& rStr )
 {
-    bFixedWidth = FALSE;
+    bFixedWidth = sal_False;
     nFieldSepCode = 0;
     if ( rStr.GetTokenCount(',') >= 3 )
     {
         String aToken( rStr.GetToken( 0, ',' ) );
         if( aToken.EqualsIgnoreCaseAscii( pStrFix ) )
-            bFixedWidth = TRUE;
+            bFixedWidth = sal_True;
         else
             nFieldSepCode = (sal_Unicode) aToken.ToInt32();
         nTextSepCode  = (sal_Unicode) rStr.GetToken(1,',').ToInt32();
         aStrFont	  = rStr.GetToken(2,',');
         eCharSet	  = ScGlobal::GetCharsetValue(aStrFont);
-        bSaveAsShown  = (rStr.GetToken( 3, ',' ).ToInt32() ? TRUE : FALSE);
+        bSaveAsShown  = (rStr.GetToken( 3, ',' ).ToInt32() ? sal_True : sal_False);
     }
 }
 
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 4dec09c0f..094c200a5 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -105,7 +105,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window*				pParent,
         nSrcTab			( nSourceTab ),		// ist nicht im QueryParam
         nFieldCount		( 0 )
 {
-    for (USHORT i=0; i<=MAXCOL; i++)
+    for (sal_uInt16 i=0; i<=MAXCOL; i++)
         pEntryLists[i] = NULL;
 
     Init( rArgSet );
@@ -116,7 +116,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window*				pParent,
 
 __EXPORT ScPivotFilterDlg::~ScPivotFilterDlg()
 {
-    for (USHORT i=0; i<=MAXCOL; i++)
+    for (sal_uInt16 i=0; i<=MAXCOL; i++)
         delete pEntryLists[i];
 
     if ( pOutItem )
@@ -222,12 +222,12 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
                 else if (rEntry.nVal == SC_NONEMPTYFIELDS)
                     aValStr = aStrNotEmpty;
             }
-            USHORT	nCondPos	 = (USHORT)rEntry.eOp;
-            USHORT	nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) );
+            sal_uInt16	nCondPos	 = (sal_uInt16)rEntry.eOp;
+            sal_uInt16	nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) );
 
             aFieldLbArr[i]->SelectEntryPos( nFieldSelPos );
             aCondLbArr [i]->SelectEntryPos( nCondPos );
-            UpdateValueList( static_cast<USHORT>(i+1) );
+            UpdateValueList( static_cast<sal_uInt16>(i+1) );
             aValueEdArr[i]->SetText( aValStr );
             if (aValStr == aStrEmpty || aValStr == aStrNotEmpty)
                 aCondLbArr[i]->Disable();
@@ -236,7 +236,7 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
         {
             aFieldLbArr[i]->SelectEntryPos( 0 ); // "keiner" selektieren
             aCondLbArr [i]->SelectEntryPos( 0 ); // "=" selektieren
-            UpdateValueList( static_cast<USHORT>(i) );
+            UpdateValueList( static_cast<sal_uInt16>(i) );
             aValueEdArr[i]->SetText( EMPTY_STRING );
         }
         aValueEdArr[i]->SetModifyHdl( LINK( this, ScPivotFilterDlg, ValModifyHdl ) );
@@ -246,12 +246,12 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
 
        (aLbField1.GetSelectEntryPos() != 0)
     && (aLbField2.GetSelectEntryPos() != 0)
-        ? aLbConnect1.SelectEntryPos( (USHORT)theQueryData.GetEntry(1).eConnect )
+        ? aLbConnect1.SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(1).eConnect )
         : aLbConnect1.SetNoSelection();
 
        (aLbField2.GetSelectEntryPos() != 0)
     && (aLbField3.GetSelectEntryPos() != 0)
-        ? aLbConnect2.SelectEntryPos( (USHORT)theQueryData.GetEntry(2).eConnect )
+        ? aLbConnect2.SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(2).eConnect )
         : aLbConnect2.SetNoSelection();
 
     if ( aLbField1.GetSelectEntryPos() == 0 )
@@ -302,7 +302,7 @@ void ScPivotFilterDlg::FillFieldLists()
         SCROW	nFirstRow	= theQueryData.nRow1;
         SCCOL	nMaxCol		= theQueryData.nCol2;
         SCCOL	col = 0;
-        USHORT	i=1;
+        sal_uInt16	i=1;
 
         for ( col=nFirstCol; col<=nMaxCol; col++ )
         {
@@ -324,13 +324,13 @@ void ScPivotFilterDlg::FillFieldLists()
 
 //------------------------------------------------------------------------
 
-void ScPivotFilterDlg::UpdateValueList( USHORT nList )
+void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
 {
     if ( pDoc && nList>0 && nList<=3 )
     {
         ComboBox*	pValList		= aValueEdArr[nList-1];
-        USHORT		nFieldSelPos	= aFieldLbArr[nList-1]->GetSelectEntryPos();
-        USHORT		nListPos		= 0;
+        sal_uInt16		nFieldSelPos	= aFieldLbArr[nList-1]->GetSelectEntryPos();
+        sal_uInt16		nListPos		= 0;
         String		aCurValue  		= pValList->GetText();
 
         pValList->Clear();
@@ -358,10 +358,10 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList )
             }
 
             TypedScStrCollection* pColl = pEntryLists[nColumn];
-            USHORT nValueCount = pColl->GetCount();
+            sal_uInt16 nValueCount = pColl->GetCount();
             if ( nValueCount > 0 )
             {
-                for ( USHORT i=0; i<nValueCount; i++ )
+                for ( sal_uInt16 i=0; i<nValueCount; i++ )
                 {
                     pValList->InsertEntry( (*pColl)[i]->GetString(), nListPos );
                     nListPos++;
@@ -374,7 +374,7 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList )
 
 //------------------------------------------------------------------------
 
-void ScPivotFilterDlg::ClearValueList( USHORT nList )
+void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList )
 {
     if ( nList>0 && nList<=3 )
     {
@@ -388,10 +388,10 @@ void ScPivotFilterDlg::ClearValueList( USHORT nList )
 
 //------------------------------------------------------------------------
 
-USHORT ScPivotFilterDlg::GetFieldSelPos( SCCOL nField )
+sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField )
 {
     if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 )
-        return static_cast<USHORT>(nField - theQueryData.nCol1 + 1);
+        return static_cast<sal_uInt16>(nField - theQueryData.nCol1 + 1);
     else
         return 0;
 }
@@ -401,15 +401,15 @@ USHORT ScPivotFilterDlg::GetFieldSelPos( SCCOL nField )
 const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
 {
     ScQueryParam 	theParam( theQueryData );
-    USHORT			nConnect1 = aLbConnect1.GetSelectEntryPos();
-    USHORT 			nConnect2 = aLbConnect2.GetSelectEntryPos();
+    sal_uInt16			nConnect1 = aLbConnect1.GetSelectEntryPos();
+    sal_uInt16 			nConnect2 = aLbConnect2.GetSelectEntryPos();
 
     for ( SCSIZE i=0; i<3; i++ )
     {
-        USHORT 		nField	= aFieldLbArr[i]->GetSelectEntryPos();
+        sal_uInt16 		nField	= aFieldLbArr[i]->GetSelectEntryPos();
         ScQueryOp	eOp		= (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos();
 
-        BOOL bDoThis = (aFieldLbArr[i]->GetSelectEntryPos() != 0);
+        sal_Bool bDoThis = (aFieldLbArr[i]->GetSelectEntryPos() != 0);
         theParam.GetEntry(i).bDoQuery = bDoThis;
 
         if ( bDoThis )
@@ -427,19 +427,19 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
             {
                 *rEntry.pStr	= EMPTY_STRING;
                 rEntry.nVal 	= SC_EMPTYFIELDS;
-                rEntry.bQueryByString = FALSE;
+                rEntry.bQueryByString = sal_False;
             }
             else if ( aStrVal == aStrNotEmpty )
             {
                 *rEntry.pStr	= EMPTY_STRING;
                 rEntry.nVal		= SC_NONEMPTYFIELDS;
-                rEntry.bQueryByString = FALSE;
+                rEntry.bQueryByString = sal_False;
             }
             else
             {
                 *rEntry.pStr	= aStrVal;
                 rEntry.nVal		= 0;
-                rEntry.bQueryByString = TRUE;
+                rEntry.bQueryByString = sal_True;
             }
 
             rEntry.nField	= nField ? (theQueryData.nCol1 +
@@ -455,7 +455,7 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
                                     ? (ScQueryConnect)nConnect2
                                     : SC_AND;
 
-    theParam.bInplace   = FALSE;
+    theParam.bInplace   = sal_False;
     theParam.nDestTab	= 0;	// Woher kommen diese Werte?
     theParam.nDestCol	= 0;
     theParam.nDestRow	= 0;
@@ -573,7 +573,7 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
 
     if ( pBox == &aBtnCase )					// Wertlisten
     {
-        for (USHORT i=0; i<=MAXCOL; i++)
+        for (sal_uInt16 i=0; i<=MAXCOL; i++)
             DELETEZ( pEntryLists[i] );
 
         String aCurVal1 = aEdVal1.GetText();
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index c0dfde8de..040f101ae 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -69,7 +69,7 @@ namespace {
     @return  true = The passed string list contains an empty string entry.
  */
 template< typename ListBoxType >
-bool lclFillListBox( ListBoxType& rLBox, const Sequence< OUString >& rStrings, USHORT nEmptyPos = LISTBOX_APPEND )
+bool lclFillListBox( ListBoxType& rLBox, const Sequence< OUString >& rStrings, sal_uInt16 nEmptyPos = LISTBOX_APPEND )
 {
     bool bEmpty = false;
     if( const OUString* pStr = rStrings.getConstArray() )
@@ -89,7 +89,7 @@ bool lclFillListBox( ListBoxType& rLBox, const Sequence< OUString >& rStrings, U
 }
 
 template< typename ListBoxType >
-bool lclFillListBox( ListBoxType& rLBox, const vector<ScDPLabelData::Member>& rMembers, USHORT nEmptyPos = LISTBOX_APPEND )
+bool lclFillListBox( ListBoxType& rLBox, const vector<ScDPLabelData::Member>& rMembers, sal_uInt16 nEmptyPos = LISTBOX_APPEND )
 {
     bool bEmpty = false;
     vector<ScDPLabelData::Member>::const_iterator itr = rMembers.begin(), itrEnd = rMembers.end();
@@ -108,16 +108,16 @@ bool lclFillListBox( ListBoxType& rLBox, const vector<ScDPLabelData::Member>& rM
 }
 
 /** Searches for a listbox entry, starts search at specified position. */
-USHORT lclFindListBoxEntry( const ListBox& rLBox, const String& rEntry, USHORT nStartPos )
+sal_uInt16 lclFindListBoxEntry( const ListBox& rLBox, const String& rEntry, sal_uInt16 nStartPos )
 {
-    USHORT nPos = nStartPos;
+    sal_uInt16 nPos = nStartPos;
     while( (nPos < rLBox.GetEntryCount()) && (rLBox.GetEntry( nPos ) != rEntry) )
         ++nPos;
     return (nPos < rLBox.GetEntryCount()) ? nPos : LISTBOX_ENTRY_NOTFOUND;
 }
 
 /** This table represents the order of the strings in the resource string array. */
-static const USHORT spnFunctions[] =
+static const sal_uInt16 spnFunctions[] =
 {
     PIVOT_FUNC_SUM,
     PIVOT_FUNC_COUNT,
@@ -132,12 +132,12 @@ static const USHORT spnFunctions[] =
     PIVOT_FUNC_STD_VARP
 };
 
-const USHORT SC_BASEITEM_PREV_POS = 0;
-const USHORT SC_BASEITEM_NEXT_POS = 1;
-const USHORT SC_BASEITEM_USER_POS = 2;
+const sal_uInt16 SC_BASEITEM_PREV_POS = 0;
+const sal_uInt16 SC_BASEITEM_NEXT_POS = 1;
+const sal_uInt16 SC_BASEITEM_USER_POS = 2;
 
-const USHORT SC_SORTNAME_POS = 0;
-const USHORT SC_SORTDATA_POS = 1;
+const sal_uInt16 SC_SORTNAME_POS = 0;
+const sal_uInt16 SC_SORTDATA_POS = 1;
 
 const long SC_SHOW_DEFAULT = 10;
 
@@ -180,19 +180,19 @@ ScDPFunctionListBox::ScDPFunctionListBox( Window* pParent, const ResId& rResId )
     FillFunctionNames();
 }
 
-void ScDPFunctionListBox::SetSelection( USHORT nFuncMask )
+void ScDPFunctionListBox::SetSelection( sal_uInt16 nFuncMask )
 {
     if( (nFuncMask == PIVOT_FUNC_NONE) || (nFuncMask == PIVOT_FUNC_AUTO) )
         SetNoSelection();
     else
-        for( USHORT nEntry = 0, nCount = GetEntryCount(); nEntry < nCount; ++nEntry )
+        for( sal_uInt16 nEntry = 0, nCount = GetEntryCount(); nEntry < nCount; ++nEntry )
             SelectEntryPos( nEntry, (nFuncMask & spnFunctions[ nEntry ]) != 0 );
 }
 
-USHORT ScDPFunctionListBox::GetSelection() const
+sal_uInt16 ScDPFunctionListBox::GetSelection() const
 {
-    USHORT nFuncMask = PIVOT_FUNC_NONE;
-    for( USHORT nSel = 0, nCount = GetSelectEntryCount(); nSel < nCount; ++nSel )
+    sal_uInt16 nFuncMask = PIVOT_FUNC_NONE;
+    for( sal_uInt16 nSel = 0, nCount = GetSelectEntryCount(); nSel < nCount; ++nSel )
         nFuncMask |= spnFunctions[ GetSelectEntryPos( nSel ) ];
     return nFuncMask;
 }
@@ -202,7 +202,7 @@ void ScDPFunctionListBox::FillFunctionNames()
     DBG_ASSERT( !GetEntryCount(), "ScDPFunctionListBox::FillFunctionNames - do not add texts to resource" );
     Clear();
     ResStringArray aArr( ScResId( SCSTR_DPFUNCLISTBOX ) );
-    for( USHORT nIndex = 0, nCount = sal::static_int_cast<USHORT>(aArr.Count()); nIndex < nCount; ++nIndex )
+    for( sal_uInt16 nIndex = 0, nCount = sal::static_int_cast<sal_uInt16>(aArr.Count()); nIndex < nCount; ++nIndex )
         InsertEntry( aArr.GetString( nIndex ) );
 }
 
@@ -235,7 +235,7 @@ ScDPFunctionDlg::ScDPFunctionDlg(
     Init( rLabelData, rFuncData );
 }
 
-USHORT ScDPFunctionDlg::GetFuncMask() const
+sal_uInt16 ScDPFunctionDlg::GetFuncMask() const
 {
     return maLbFunc.GetSelection();
 }
@@ -247,7 +247,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const
     aRef.ReferenceType = maLbTypeWrp.GetControlValue();
     aRef.ReferenceField = maLbBaseField.GetSelectEntry();
 
-    USHORT nBaseItemPos = maLbBaseItem.GetSelectEntryPos();
+    sal_uInt16 nBaseItemPos = maLbBaseItem.GetSelectEntryPos();
     switch( nBaseItemPos )
     {
         case SC_BASEITEM_PREV_POS:
@@ -270,7 +270,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const
 void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScDPFuncData& rFuncData )
 {
     // list box
-    USHORT nFuncMask = (rFuncData.mnFuncMask == PIVOT_FUNC_NONE) ? PIVOT_FUNC_SUM : rFuncData.mnFuncMask;
+    sal_uInt16 nFuncMask = (rFuncData.mnFuncMask == PIVOT_FUNC_NONE) ? PIVOT_FUNC_SUM : rFuncData.mnFuncMask;
     maLbFunc.SetSelection( nFuncMask );
 
     // field name
@@ -325,8 +325,8 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScDPFuncData&
             }
             else
             {
-                USHORT nStartPos = mbEmptyItem ? (SC_BASEITEM_USER_POS + 1) : SC_BASEITEM_USER_POS;
-                USHORT nPos = lclFindListBoxEntry( maLbBaseItem, rFuncData.maFieldRef.ReferenceItemName, nStartPos );
+                sal_uInt16 nStartPos = mbEmptyItem ? (SC_BASEITEM_USER_POS + 1) : SC_BASEITEM_USER_POS;
+                sal_uInt16 nPos = lclFindListBoxEntry( maLbBaseItem, rFuncData.maFieldRef.ReferenceItemName, nStartPos );
                 if( nPos >= maLbBaseItem.GetEntryCount() )
                     nPos = (maLbBaseItem.GetEntryCount() > SC_BASEITEM_USER_POS) ? SC_BASEITEM_USER_POS : SC_BASEITEM_PREV_POS;
                 maLbBaseItem.SelectEntryPos( nPos );
@@ -378,7 +378,7 @@ IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox*, pLBox )
             mbEmptyItem = lclFillListBox( maLbBaseItem, mrLabelVec[ nBasePos ].maMembers, SC_BASEITEM_USER_POS );
 
         // select base item
-        USHORT nItemPos = (maLbBaseItem.GetEntryCount() > SC_BASEITEM_USER_POS) ? SC_BASEITEM_USER_POS : SC_BASEITEM_PREV_POS;
+        sal_uInt16 nItemPos = (maLbBaseItem.GetEntryCount() > SC_BASEITEM_USER_POS) ? SC_BASEITEM_USER_POS : SC_BASEITEM_PREV_POS;
         maLbBaseItem.SelectEntryPos( nItemPos );
     }
     return 0;
@@ -417,9 +417,9 @@ ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj,
     Init( rLabelData, rFuncData );
 }
 
-USHORT ScDPSubtotalDlg::GetFuncMask() const
+sal_uInt16 ScDPSubtotalDlg::GetFuncMask() const
 {
-    USHORT nFuncMask = PIVOT_FUNC_NONE;
+    sal_uInt16 nFuncMask = PIVOT_FUNC_NONE;
 
     if( maRbAuto.IsChecked() )
         nFuncMask = PIVOT_FUNC_AUTO;
@@ -565,8 +565,8 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
     // *** HIDDEN ITEMS ***
 
     rLabelData.maMembers = maLabelData.maMembers;
-    ULONG nVisCount = maLbHide.GetEntryCount();
-    for( USHORT nPos = 0; nPos < nVisCount; ++nPos )
+    sal_uLong nVisCount = maLbHide.GetEntryCount();
+    for( sal_uInt16 nPos = 0; nPos < nVisCount; ++nPos )
         rLabelData.maMembers[nPos].mbVisible = !maLbHide.IsChecked(nPos);
 
     // *** HIERARCHY ***
@@ -591,7 +591,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou
     if( maLbSortBy.GetEntryCount() > SC_SORTDATA_POS )
         maLbSortBy.SetSeparatorPos( SC_SORTDATA_POS - 1 );
 
-    USHORT nSortPos = SC_SORTNAME_POS;
+    sal_uInt16 nSortPos = SC_SORTNAME_POS;
     if( nSortMode == DataPilotFieldSortMode::DATA )
     {
         nSortPos = lclFindListBoxEntry( maLbSortBy, maLabelData.maSortInfo.Field, SC_SORTDATA_POS );
@@ -661,7 +661,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou
         lclFillListBox( maLbHierarchy, maLabelData.maHiers );
         sal_Int32 nHier = maLabelData.mnUsedHier;
         if( (nHier < 0) || (nHier >= maLabelData.maHiers.getLength()) ) nHier = 0;
-        maLbHierarchy.SelectEntryPos( static_cast< USHORT >( nHier ) );
+        maLbHierarchy.SelectEntryPos( static_cast< sal_uInt16 >( nHier ) );
         maLbHierarchy.SetSelectHdl( LINK( this, ScDPSubtotalOptDlg, SelectHdl ) );
     }
     else
@@ -677,7 +677,7 @@ void ScDPSubtotalOptDlg::InitHideListBox()
     lclFillListBox( maLbHide, maLabelData.maMembers );
     size_t n = maLabelData.maMembers.size();
     for (size_t i = 0; i < n; ++i)
-        maLbHide.CheckEntryPos(static_cast<USHORT>(i), !maLabelData.maMembers[i].mbVisible);
+        maLbHide.CheckEntryPos(static_cast<sal_uInt16>(i), !maLabelData.maMembers[i].mbVisible);
     bool bEnable = maLbHide.GetEntryCount() > 0;
     maFlHide.Enable( bEnable );
     maLbHide.Enable( bEnable );
@@ -718,7 +718,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox )
 
 // ============================================================================
 
-ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHORT nOrient ) :
+ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) :
     ModalDialog     ( pParent, ScResId( RID_SCDLG_DPSHOWDETAIL ) ),
     maFtDims        ( this, ScResId( FT_DIMS ) ),
     maLbDims        ( this, ScResId( LB_DIMS ) ),
@@ -734,7 +734,7 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
     long nDimCount = rDPObj.GetDimCount();
     for (long nDim=0; nDim<nDimCount; nDim++)
     {
-        BOOL bIsDataLayout;
+        sal_Bool bIsDataLayout;
         sal_Int32 nDimFlags = 0;
         String aName = rDPObj.GetDimName( nDim, bIsDataLayout, &nDimFlags );
         if ( !bIsDataLayout && !rDPObj.IsDuplicated( nDim ) && ScDPObject::IsOrientationAllowed( nOrient, nDimFlags ) )
@@ -775,7 +775,7 @@ String ScDPShowDetailDlg::GetDimensionName() const
         return aSelectedName;
 
     long nDim = itr->second;
-    BOOL bIsDataLayout = false;
+    sal_Bool bIsDataLayout = false;
     return mrDPObj.GetDimName(nDim, bIsDataLayout);
 }
 
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index c62882bdc..19ebeeff3 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -147,7 +147,7 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
         aStrUndefined	( ScResId( SCSTR_UNDEFINED ) ),
         aStrNewTable	( ScResId( SCSTR_NEWTABLE ) ),
 
-        bIsDrag			( FALSE ),
+        bIsDrag			( sal_False ),
 
         pEditActive     ( NULL ),
 
@@ -159,10 +159,10 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
                                 GetViewData() ),
         pDoc			( ((ScTabViewShell*)SfxViewShell::Current())->
                                 GetViewData()->GetDocument() ),
-        bRefInputMode	( FALSE )
+        bRefInputMode	( sal_False )
 {
-    xDlgDPObject->SetAlive( TRUE );     // needed to get structure information
-    xDlgDPObject->FillOldParam( thePivotData, FALSE );
+    xDlgDPObject->SetAlive( sal_True );     // needed to get structure information
+    xDlgDPObject->FillOldParam( thePivotData, sal_False );
     xDlgDPObject->FillLabelData( thePivotData );
 
     Init();
@@ -174,8 +174,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
 
 ScDPLayoutDlg::~ScDPLayoutDlg()
 {
-    USHORT nEntries = aLbOutPos.GetEntryCount();
-    USHORT i;
+    sal_uInt16 nEntries = aLbOutPos.GetEntryCount();
+    sal_uInt16 i;
 
     for ( i=2; i<nEntries; i++ )
         delete (String*)aLbOutPos.GetEntryData( i );
@@ -209,7 +209,7 @@ void __EXPORT ScDPLayoutDlg::Init()
     aBtnOptions.SetClickHdl( LINK( this, ScDPLayoutDlg, ClickHdl ) );
 
     aFuncNameArr.reserve( FUNC_COUNT );
-    for ( USHORT i = 0; i < FUNC_COUNT; ++i )
+    for ( sal_uInt16 i = 0; i < FUNC_COUNT; ++i )
         aFuncNameArr.push_back( String( ScResId( i + 1 ) ) );
 
     aBtnMore.AddWindow( &aFlAreas );
@@ -293,7 +293,7 @@ void __EXPORT ScDPLayoutDlg::Init()
         {
             if ( !aIter.WasDBName() )		// hier keine DB-Bereiche !
             {
-                USHORT nInsert = aLbOutPos.InsertEntry( aName );
+                sal_uInt16 nInsert = aLbOutPos.InsertEntry( aName );
 
                 aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, pDoc->GetAddressConvention() );
                 aLbOutPos.SetEntryData( nInsert, new String( aRefStr ) );
@@ -340,16 +340,16 @@ void __EXPORT ScDPLayoutDlg::Init()
 
     InitFocus();
 
-//	SetDispatcherLock( TRUE ); // Modal-Modus einschalten
+//	SetDispatcherLock( sal_True ); // Modal-Modus einschalten
 
     //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
-    //SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+    //SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScDPLayoutDlg::Close()
+sal_Bool __EXPORT ScDPLayoutDlg::Close()
 {
     return DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
 }
@@ -407,7 +407,7 @@ void ScDPLayoutDlg::InitWnd( PivotField* pArr, long nCount, ScDPFieldType eType
     {
         ScDPFuncDataVec*    pInitArr = NULL;
         ScDPFieldWindow*    pInitWnd = NULL;
-        BOOL                bDataArr = FALSE;
+        sal_Bool                bDataArr = sal_False;
 
         switch ( eType )
         {
@@ -429,7 +429,7 @@ void ScDPLayoutDlg::InitWnd( PivotField* pArr, long nCount, ScDPFieldType eType
             case TYPE_DATA:
                 pInitArr = &aDataArr;
                 pInitWnd = &aWndData;
-                bDataArr = TRUE;
+                bDataArr = sal_True;
                 break;
             default:
             break;
@@ -441,7 +441,7 @@ void ScDPLayoutDlg::InitWnd( PivotField* pArr, long nCount, ScDPFieldType eType
             for ( long i=0; (i<nCount); i++ )
             {
                 SCCOL nCol = pArr[i].nCol;
-                USHORT nMask = pArr[i].nFuncMask;
+                sal_uInt16 nMask = pArr[i].nFuncMask;
 
                 if ( nCol != PIVOT_DATA_FIELD )
                 {
@@ -483,7 +483,7 @@ void ScDPLayoutDlg::InitFocus()
     if( aWndSelect.IsEmpty() )
     {
         aBtnOk.GrabFocus();
-        NotifyFieldFocus( TYPE_SELECT, FALSE );
+        NotifyFieldFocus( TYPE_SELECT, sal_False );
     }
     else
         aWndSelect.GrabFocus();
@@ -524,7 +524,7 @@ void ScDPLayoutDlg::AddField( size_t nFromIndex, ScDPFieldType eToType, const Po
     ScDPFuncDataVec*    toArr = NULL;
     ScDPFuncDataVec*    rmArr1 = NULL;
     ScDPFuncDataVec*    rmArr2 = NULL;
-    BOOL                bDataArr = FALSE;
+    sal_Bool                bDataArr = sal_False;
 
     switch ( eToType )
     {
@@ -558,7 +558,7 @@ void ScDPLayoutDlg::AddField( size_t nFromIndex, ScDPFieldType eToType, const Po
         case TYPE_DATA:
             toWnd = &aWndData;
             toArr = &aDataArr;
-            bDataArr = TRUE;
+            bDataArr = sal_True;
             break;
 
         default:
@@ -605,7 +605,7 @@ void ScDPLayoutDlg::AddField( size_t nFromIndex, ScDPFieldType eToType, const Po
         }
         else
         {
-            USHORT nMask = fData.mnFuncMask;
+            sal_uInt16 nMask = fData.mnFuncMask;
             OUString aStr = GetFuncString( nMask, rData.mbIsValue );
             
             aStr += rData.getDisplayName();
@@ -641,7 +641,7 @@ void ScDPLayoutDlg::MoveField( ScDPFieldType eFromType, size_t nFromIndex, ScDPF
         ScDPFuncDataVec*    rmArr1   = NULL;
         ScDPFuncDataVec*    rmArr2   = NULL;
         size_t              nAt      = 0;
-        BOOL                bDataArr = FALSE;
+        sal_Bool                bDataArr = sal_False;
 
         switch ( eFromType )
         {
@@ -703,7 +703,7 @@ void ScDPLayoutDlg::MoveField( ScDPFieldType eFromType, size_t nFromIndex, ScDPF
             case TYPE_DATA:
                 toWnd = &aWndData;
                 toArr = &aDataArr;
-                bDataArr = TRUE;
+                bDataArr = sal_True;
                 break;
 
             default:
@@ -757,7 +757,7 @@ void ScDPLayoutDlg::MoveField( ScDPFieldType eFromType, size_t nFromIndex, ScDPF
                     else
                     {
                         String aStr;
-                        USHORT nMask = fData.mnFuncMask;
+                        sal_uInt16 nMask = fData.mnFuncMask;
                         aStr  = GetFuncString( nMask );
                         aStr += GetLabelString( fData.mnCol );
 
@@ -781,7 +781,7 @@ void ScDPLayoutDlg::MoveField( ScDPFieldType eFromType, size_t nFromIndex, ScDPF
         size_t              nAt      = 0;
         size_t              nToIndex = 0;
         Point               aToPos;
-        BOOL                bDataArr = FALSE;
+        sal_Bool                bDataArr = sal_False;
 
         switch ( eFromType )
         {
@@ -803,7 +803,7 @@ void ScDPLayoutDlg::MoveField( ScDPFieldType eFromType, size_t nFromIndex, ScDPF
             case TYPE_DATA:
                 theWnd = &aWndData;
                 theArr = &aDataArr;
-                bDataArr = TRUE;
+                bDataArr = sal_True;
                 break;
 
             default:
@@ -838,7 +838,7 @@ void ScDPLayoutDlg::MoveField( ScDPFieldType eFromType, size_t nFromIndex, ScDPF
                 else
                 {
                     String aStr;
-                    USHORT nMask = fData.mnFuncMask;
+                    sal_uInt16 nMask = fData.mnFuncMask;
                     aStr  = GetFuncString( nMask );
                     aStr += GetLabelString( fData.mnCol );
 
@@ -887,39 +887,39 @@ void ScDPLayoutDlg::NotifyMouseButtonUp( const Point& rAt )
 {
     if ( bIsDrag )
     {
-        bIsDrag = FALSE;
+        bIsDrag = sal_False;
 
         ScDPFieldType   eDnDToType = TYPE_SELECT;
         Point           aPos = ScreenToOutputPixel( rAt );
-        BOOL            bDel = FALSE;
+        sal_Bool            bDel = sal_False;
 
         if ( aRectPage.IsInside( aPos ) )
         {
             eDnDToType = TYPE_PAGE;
-            bDel = FALSE;
+            bDel = sal_False;
         }
         else if ( aRectCol.IsInside( aPos ) )
         {
             eDnDToType = TYPE_COL;
-            bDel = FALSE;
+            bDel = sal_False;
         }
         else if ( aRectRow.IsInside( aPos ) )
         {
             eDnDToType = TYPE_ROW;
-            bDel = FALSE;
+            bDel = sal_False;
         }
         else if ( aRectData.IsInside( aPos ) )
         {
             eDnDToType = TYPE_DATA;
-            bDel = FALSE;
+            bDel = sal_False;
         }
         else if ( aRectSelect.IsInside( aPos ) )
         {
             eDnDToType = TYPE_SELECT;
-            bDel = TRUE;
+            bDel = sal_True;
         }
         else
-            bDel = TRUE;
+            bDel = sal_True;
 
         if ( bDel )
             RemoveField( eDnDFromType, nDnDFromIndex );
@@ -983,7 +983,7 @@ PointerStyle ScDPLayoutDlg::NotifyMouseMove( const Point& rAt )
 
 PointerStyle ScDPLayoutDlg::NotifyMouseButtonDown( ScDPFieldType eType, size_t nFieldIndex )
 {
-    bIsDrag		  = TRUE;
+    bIsDrag		  = sal_True;
     eDnDFromType  = eType;
     nDnDFromIndex = nFieldIndex;
     return lclGetPointerForField( eType );
@@ -1083,18 +1083,18 @@ void ScDPLayoutDlg::NotifyDoubleClick( ScDPFieldType eType, size_t nFieldIndex )
 
 //----------------------------------------------------------------------------
 
-void ScDPLayoutDlg::NotifyFieldFocus( ScDPFieldType eType, BOOL bGotFocus )
+void ScDPLayoutDlg::NotifyFieldFocus( ScDPFieldType eType, sal_Bool bGotFocus )
 {
     /*  Enable Remove/Options buttons on GetFocus in field window.
         #107616# Enable them also, if dialog is deactivated (click into document).
         The !IsActive() condition handles the case that a LoseFocus event of a
         field window would follow the Deactivate event of this dialog. */
-    BOOL bEnable = (bGotFocus || !IsActive()) && (eType != TYPE_SELECT);
+    sal_Bool bEnable = (bGotFocus || !IsActive()) && (eType != TYPE_SELECT);
 
     // #128113# The TestTool may set the focus into an empty field.
     // Then the Remove/Options buttons must be disabled.
     if ( bEnable && bGotFocus && GetFieldWindow( eType ).IsEmpty() )
-        bEnable = FALSE;
+        bEnable = sal_False;
 
     aBtnRemove.Enable( bEnable );
     aBtnOptions.Enable( bEnable );
@@ -1111,7 +1111,7 @@ void ScDPLayoutDlg::NotifyMoveField( ScDPFieldType eToType )
     {
         MoveField( eLastActiveType, rWnd.GetSelectedField(), eToType, GetFieldWindow( eToType ).GetLastPosition() );
         if( rWnd.IsEmpty() )
-            NotifyFieldFocus( eToType, TRUE );
+            NotifyFieldFocus( eToType, sal_True );
         else
             rWnd.GrabFocus();
         if( eLastActiveType == TYPE_SELECT )
@@ -1131,7 +1131,7 @@ void ScDPLayoutDlg::NotifyRemoveField( ScDPFieldType eType, size_t nFieldIndex )
 
 //----------------------------------------------------------------------------
 
-BOOL ScDPLayoutDlg::NotifyMoveSlider( USHORT nKeyCode )
+sal_Bool ScDPLayoutDlg::NotifyMoveSlider( sal_uInt16 nKeyCode )
 {
     long nOldPos = aSlider.GetThumbPos();
     switch( nKeyCode )
@@ -1154,17 +1154,17 @@ void ScDPLayoutDlg::Deactivate()
         event from field window disables Remove/Options buttons. Re-enable them here by
         simulating a GetFocus event. Event order of LoseFocus and Deactivate is not important.
         The last event will enable the buttons in both cases (see NotifyFieldFocus). */
-    NotifyFieldFocus( eLastActiveType, TRUE );
+    NotifyFieldFocus( eLastActiveType, sal_True );
 }
 
 //----------------------------------------------------------------------------
 
-BOOL ScDPLayoutDlg::Contains( ScDPFuncDataVec* pArr, SCsCOL nCol, size_t& nAt )
+sal_Bool ScDPLayoutDlg::Contains( ScDPFuncDataVec* pArr, SCsCOL nCol, size_t& nAt )
 {
     if ( !pArr )
-        return FALSE;
+        return sal_False;
 
-    BOOL	bFound	= FALSE;
+    sal_Bool	bFound	= sal_False;
     size_t  i       = 0;
 
     while ( (i<pArr->size()) && ((*pArr)[i].get() != NULL) && !bFound )
@@ -1259,14 +1259,14 @@ bool ScDPLayoutDlg::IsOrientationAllowed( SCsCOL nCol, ScDPFieldType eType )
             case TYPE_DATA:   eOrient = sheet::DataPilotFieldOrientation_DATA;   break;
             case TYPE_SELECT: eOrient = sheet::DataPilotFieldOrientation_HIDDEN; break;
         }
-        bAllowed = ScDPObject::IsOrientationAllowed( (USHORT)eOrient, pData->mnFlags );
+        bAllowed = ScDPObject::IsOrientationAllowed( (sal_uInt16)eOrient, pData->mnFlags );
     }
     return bAllowed;
 }
 
 //----------------------------------------------------------------------------
 
-String ScDPLayoutDlg::GetFuncString( USHORT& rFuncMask, BOOL bIsValue )
+String ScDPLayoutDlg::GetFuncString( sal_uInt16& rFuncMask, sal_Bool bIsValue )
 {
     String aStr;
 
@@ -1352,17 +1352,17 @@ void ScDPLayoutDlg::CalcWndSizes()
 
 //----------------------------------------------------------------------------
 
-BOOL ScDPLayoutDlg::GetPivotArrays(    PivotField*  pPageArr,
+sal_Bool ScDPLayoutDlg::GetPivotArrays(    PivotField*  pPageArr,
                                        PivotField*  pColArr,
                                        PivotField*	pRowArr,
                                        PivotField*	pDataArr,
-                                       USHORT&      rPageCount,
-                                       USHORT&      rColCount,
-                                       USHORT&      rRowCount,
-                                       USHORT&      rDataCount )
+                                       sal_uInt16&      rPageCount,
+                                       sal_uInt16&      rColCount,
+                                       sal_uInt16&      rRowCount,
+                                       sal_uInt16&      rDataCount )
 {
-    BOOL bFit = TRUE;
-    USHORT i=0;
+    sal_Bool bFit = sal_True;
+    sal_uInt16 i=0;
 
     for ( i=0; (i<aDataArr.size()) && (aDataArr[i].get() != NULL ); i++ )
         lcl_FillToPivotField( pDataArr[i], *aDataArr[i] );
@@ -1385,7 +1385,7 @@ BOOL ScDPLayoutDlg::GetPivotArrays(    PivotField*  pPageArr,
     else if ( rColCount < aColArr.size() )
         pColArr[rColCount++].nCol = PIVOT_DATA_FIELD;
     else
-        bFit = FALSE;		// kein Platz fuer Datenfeld
+        bFit = sal_False;		// kein Platz fuer Datenfeld
 
     return bFit;
 }
@@ -1393,7 +1393,7 @@ BOOL ScDPLayoutDlg::GetPivotArrays(    PivotField*  pPageArr,
 void ScDPLayoutDlg::UpdateSrcRange()
 {
     String  theCurPosStr = aEdInPos.GetText();
-    USHORT  nResult = ScRange().Parse(theCurPosStr, pDoc, pDoc->GetAddressConvention());
+    sal_uInt16  nResult = ScRange().Parse(theCurPosStr, pDoc, pDoc->GetAddressConvention());
 
     if ( SCA_VALID != (nResult & SCA_VALID) )
         // invalid source range.
@@ -1411,7 +1411,7 @@ void ScDPLayoutDlg::UpdateSrcRange()
     ScTabViewShell * pTabViewShell = pViewData->GetViewShell();
     inSheet.aSourceRange = aNewRange;
     xDlgDPObject->SetSheetDesc(inSheet);
-    xDlgDPObject->FillOldParam( thePivotData, FALSE );
+    xDlgDPObject->FillOldParam( thePivotData, sal_False );
     xDlgDPObject->FillLabelData(thePivotData);
 
     pTabViewShell->SetDialogDPObject(xDlgDPObject.get());
@@ -1512,8 +1512,8 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
 {
     String		aOutPosStr( aEdOutPos.GetText() );
     ScAddress	aAdrDest;
-    BOOL		bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1);
-    USHORT		nResult		= !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0;
+    sal_Bool		bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1);
+    sal_uInt16		nResult		= !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0;
 
     if (   bToNewTable
         || ( (aOutPosStr.Len() > 0) && (SCA_VALID == (nResult & SCA_VALID)) ) )
@@ -1526,12 +1526,12 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
         PivotFieldArr	aColFieldArr;
         PivotFieldArr	aRowFieldArr;
         PivotFieldArr	aDataFieldArr;
-        USHORT          nPageCount;
-        USHORT          nColCount;
-        USHORT          nRowCount;
-        USHORT          nDataCount;
+        sal_uInt16          nPageCount;
+        sal_uInt16          nColCount;
+        sal_uInt16          nRowCount;
+        sal_uInt16          nDataCount;
 
-        BOOL bFit = GetPivotArrays( aPageFieldArr, aColFieldArr, aRowFieldArr, aDataFieldArr,
+        sal_Bool bFit = GetPivotArrays( aPageFieldArr, aColFieldArr, aRowFieldArr, aDataFieldArr,
                                     nPageCount,    nColCount,    nRowCount,    nDataCount );
         if ( bFit )
         {
@@ -1550,13 +1550,13 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
             uno::Reference<sheet::XDimensionsSupplier> xSource = xDlgDPObject->GetSource();
 
             ScDPObject::ConvertOrientation( aSaveData, aPageFieldArr, nPageCount,
-                            sheet::DataPilotFieldOrientation_PAGE,   NULL, 0, 0, xSource, FALSE );
+                            sheet::DataPilotFieldOrientation_PAGE,   NULL, 0, 0, xSource, sal_False );
             ScDPObject::ConvertOrientation( aSaveData, aColFieldArr,  nColCount,
-                            sheet::DataPilotFieldOrientation_COLUMN, NULL, 0, 0, xSource, FALSE );
+                            sheet::DataPilotFieldOrientation_COLUMN, NULL, 0, 0, xSource, sal_False );
             ScDPObject::ConvertOrientation( aSaveData, aRowFieldArr,  nRowCount,
-                            sheet::DataPilotFieldOrientation_ROW,    NULL, 0, 0, xSource, FALSE );
+                            sheet::DataPilotFieldOrientation_ROW,    NULL, 0, 0, xSource, sal_False );
             ScDPObject::ConvertOrientation( aSaveData, aDataFieldArr, nDataCount,
-                            sheet::DataPilotFieldOrientation_DATA,   NULL, 0, 0, xSource, FALSE,
+                            sheet::DataPilotFieldOrientation_DATA,   NULL, 0, 0, xSource, sal_False,
                             aColFieldArr, nColCount, aRowFieldArr, nRowCount, aPageFieldArr, nPageCount );
 
             for( ScDPLabelDataVec::const_iterator aIt = aLabelDataArr.begin(), aEnd = aLabelDataArr.end(); aIt != aEnd; ++aIt )
@@ -1626,12 +1626,12 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
                 }
             }
 
-            USHORT nWhichPivot = SC_MOD()->GetPool().GetWhich( SID_PIVOT_TABLE );
+            sal_uInt16 nWhichPivot = SC_MOD()->GetPool().GetWhich( SID_PIVOT_TABLE );
             ScPivotItem aOutItem( nWhichPivot, &aSaveData, &aOutRange, bToNewTable );
 
-            bRefInputMode = FALSE;		// to allow deselecting when switching sheets
+            bRefInputMode = sal_False;		// to allow deselecting when switching sheets
 
-            SetDispatcherLock( FALSE );
+            SetDispatcherLock( sal_False );
             SwitchToDocument();
 
             //	#95513# don't hide the dialog before executing the slot, instead it is used as
@@ -1667,7 +1667,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
     else
     {
         if ( !aBtnMore.GetState() )
-            aBtnMore.SetState( TRUE );
+            aBtnMore.SetState( sal_True );
 
         ErrorBox( this, WinBits( WB_OK | WB_DEF_OK ),
                  ScGlobal::GetRscString( STR_INVALID_TABREF )
@@ -1693,7 +1693,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
 {
     if ( aBtnMore.GetState() )
     {
-        bRefInputMode = TRUE;
+        bRefInputMode = sal_True;
         //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
         //SFX_APPWINDOW->Enable();
         if ( aEdInPos.IsEnabled() )
@@ -1711,9 +1711,9 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
     }
     else
     {
-        bRefInputMode = FALSE;
+        bRefInputMode = sal_False;
         //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
-        //SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+        //SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
     }
     return 0;
 }
@@ -1724,14 +1724,14 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
 IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG )
 {
     String	theCurPosStr = aEdOutPos.GetText();
-    USHORT	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+    sal_uInt16	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
 
     if ( SCA_VALID == (nResult & SCA_VALID) )
     {
         String*	pStr	= NULL;
-        BOOL	bFound	= FALSE;
-        USHORT	i		= 0;
-        USHORT	nCount	= aLbOutPos.GetEntryCount();
+        sal_Bool	bFound	= sal_False;
+        sal_uInt16	i		= 0;
+        sal_uInt16	nCount	= aLbOutPos.GetEntryCount();
 
         for ( i=2; i<nCount && !bFound; i++ )
         {
@@ -1760,7 +1760,7 @@ IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG )
 IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
 {
     String	aString;
-    USHORT	nSelPos = aLbOutPos.GetSelectEntryPos();
+    sal_uInt16	nSelPos = aLbOutPos.GetSelectEntryPos();
 
     if ( nSelPos > 1 )
     {
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 709056d8d..922a8f974 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -51,7 +51,7 @@
 
 //========================================================================
 
-ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL bEdit, BOOL bSheetProtected)
+ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, sal_Bool bEdit, sal_Bool bSheetProtected)
 
     :	ModalDialog 	( pParent, ScResId( RID_SCDLG_NEWSCENARIO ) ),
         aFlName         ( this, ScResId( FL_NAME )),
@@ -85,14 +85,14 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b
             XColorTable* pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
             if (pColorTable)
             {
-                aLbColor.SetUpdateMode( FALSE );
+                aLbColor.SetUpdateMode( sal_False );
                 long nCount = pColorTable->Count();
                 for ( long n=0; n<nCount; n++ )
                 {
                     XColorEntry* pEntry = pColorTable->GetColor(n);
                     aLbColor.InsertEntry( pEntry->GetColor(), pEntry->GetName() );
                 }
-                aLbColor.SetUpdateMode( TRUE );
+                aLbColor.SetUpdateMode( sal_True );
             }
         }
     }
@@ -120,27 +120,27 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b
     FreeResource();
 
     aLbColor.SelectEntry( Color( COL_LIGHTGRAY ) );
-    aCbShowFrame.Check(TRUE);
-    //aCbPrintFrame.Check(TRUE);
-    aCbTwoWay.Check(TRUE);
-    //aCbAttrib.Check(FALSE);
-    //aCbValue.Check(FALSE);
-    aCbCopyAll.Check(FALSE);
-    aCbProtect.Check(TRUE);
+    aCbShowFrame.Check(sal_True);
+    //aCbPrintFrame.Check(sal_True);
+    aCbTwoWay.Check(sal_True);
+    //aCbAttrib.Check(sal_False);
+    //aCbValue.Check(sal_False);
+    aCbCopyAll.Check(sal_False);
+    aCbProtect.Check(sal_True);
 
     if (bIsEdit)
-        aCbCopyAll.Enable(FALSE);
+        aCbCopyAll.Enable(sal_False);
     // If the Sheet is protected then we disable the Scenario Protect input
     // and default it to true above. Note we are in 'Add' mode here as: if
     // Sheet && scenario protection are true, then we cannot edit this dialog.
     if (bSheetProtected)
-        aCbProtect.Enable(FALSE);
+        aCbProtect.Enable(sal_False);
 
     //!	die drei funktionieren noch nicht...
     /*
-    aCbPrintFrame.Enable(FALSE);
-    aCbAttrib.Enable(FALSE);
-    aCbValue.Enable(FALSE);
+    aCbPrintFrame.Enable(sal_False);
+    aCbAttrib.Enable(sal_False);
+    aCbValue.Enable(sal_False);
     */
 }
 
@@ -153,7 +153,7 @@ __EXPORT ScNewScenarioDlg::~ScNewScenarioDlg()
 //------------------------------------------------------------------------
 
 void ScNewScenarioDlg::GetScenarioData( String& rName, String& rComment,
-                                        Color& rColor, USHORT& rFlags ) const
+                                        Color& rColor, sal_uInt16& rFlags ) const
 {
     rComment = aEdComment.GetText();
     rName	 = aEdName.GetText();
@@ -162,7 +162,7 @@ void ScNewScenarioDlg::GetScenarioData( String& rName, String& rComment,
         rName = aDefScenarioName;
 
     rColor = aLbColor.GetSelectEntryColor();
-    USHORT nBits = 0;
+    sal_uInt16 nBits = 0;
     if (aCbShowFrame.IsChecked())
         nBits |= SC_SCENARIO_SHOWFRAME;
     /*
@@ -185,7 +185,7 @@ void ScNewScenarioDlg::GetScenarioData( String& rName, String& rComment,
 }
 
 void ScNewScenarioDlg::SetScenarioData( const String& rName, const String& rComment,
-                                        const Color& rColor, USHORT nFlags )
+                                        const Color& rColor, sal_uInt16 nFlags )
 {
     aEdComment.SetText(rComment);
     aEdName.SetText(rName);
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 7c4a1bbc2..dcd7fb40c 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -323,7 +323,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
     {
         Seek( 0 );
         mpDatStream->StartReadingUnicodeText( RTL_TEXTENCODING_DONTKNOW );
-        ULONG nUniPos = mpDatStream->Tell();
+        sal_uLong nUniPos = mpDatStream->Tell();
         switch (nUniPos)
         {
             case 2:
@@ -334,7 +334,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
                 break;
             case 0:
                 {
-                    UINT16 n;
+                    sal_uInt16 n;
                     *mpDatStream >> n;
                     // Assume that normal ASCII/ANSI/ISO/etc. text doesn't start with
                     // control characters except CR,LF,TAB
@@ -380,7 +380,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
 
     // *** text encoding ListBox ***
     // all encodings allowed, including Unicode, but subsets are excluded
-    aLbCharSet.FillFromTextEncodingTable( TRUE );
+    aLbCharSet.FillFromTextEncodingTable( sal_True );
     // Insert one "SYSTEM" entry for compatibility in AsciiOptions and system
     // independent document linkage.
     aLbCharSet.InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
@@ -388,7 +388,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
             gsl_getSystemTextEncoding() : ePreselectUnicode );
 
     if( nCharSet >= 0 && ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW )
-        aLbCharSet.SelectEntryPos( static_cast<USHORT>(nCharSet) );
+        aLbCharSet.SelectEntryPos( static_cast<sal_uInt16>(nCharSet) );
 
     SetSelectedCharSet();
     aLbCharSet.SetSelectHdl( LINK( this, ScImportAsciiDlg, CharSetHdl ) );
@@ -432,7 +432,7 @@ ScImportAsciiDlg::~ScImportAsciiDlg()
 
 // ----------------------------------------------------------------------------
 
-bool ScImportAsciiDlg::GetLine( ULONG nLine, String &rText )
+bool ScImportAsciiDlg::GetLine( sal_uLong nLine, String &rText )
 {
     if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream)
         return false;
@@ -441,7 +441,7 @@ bool ScImportAsciiDlg::GetLine( ULONG nLine, String &rText )
     bool bFixed = aRbFixed.IsChecked();
 
     if (!mpRowPosArray)
-        mpRowPosArray = new ULONG[ASCIIDLG_MAXROWS + 2];
+        mpRowPosArray = new sal_uLong[ASCIIDLG_MAXROWS + 2];
 
     if (!mnRowPosCount) // complete re-fresh
     {
@@ -578,7 +578,7 @@ String ScImportAsciiDlg::GetSeparators() const
 
 void ScImportAsciiDlg::SetupSeparatorCtrls()
 {
-    BOOL bEnable = aRbSeparated.IsChecked();
+    sal_Bool bEnable = aRbSeparated.IsChecked();
     aCkbTab.Enable( bEnable );
     aCkbSemicolon.Enable( bEnable );
     aCkbComma.Enable( bEnable );
@@ -698,7 +698,7 @@ IMPL_LINK( ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox*, EMPTYARG )
         maPreviewLine[i].Erase();
 
     maTableBox.Execute( CSVCMD_SETLINECOUNT, mnRowPosCount);
-    bool bMergeSep = (aCkbAsOnce.IsChecked() == TRUE);
+    bool bMergeSep = (aCkbAsOnce.IsChecked() == sal_True);
     maTableBox.SetUniStrings( maPreviewLine, maFieldSeparators, mcTextSep, bMergeSep);
 
     return 0;
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 3edb76f0b..59df08a66 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -50,7 +50,7 @@ public:
                 nIter	  ( 0 )
             {}
 
-    USHORT	GetCode( const String& rDelimiter ) const;
+    sal_uInt16	GetCode( const String& rDelimiter ) const;
     String	GetDelimiter( sal_Unicode nCode ) const;
 
     String	FirstDel()	{ nIter = 0; return theDelTab.GetToken( nIter, cSep ); }
@@ -65,7 +65,7 @@ private:
 
 //------------------------------------------------------------------------
 
-USHORT ScDelimiterTable::GetCode( const String& rDel ) const
+sal_uInt16 ScDelimiterTable::GetCode( const String& rDel ) const
 {
     sal_Unicode nCode = 0;
     xub_StrLen i = 0;
@@ -117,12 +117,12 @@ String ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const
 
 ScImportOptionsDlg::ScImportOptionsDlg(
         Window*                 pParent,
-        BOOL                    bAscii,
+        sal_Bool                    bAscii,
         const ScImportOptions*  pOptions,
         const String*           pStrTitle,
-        BOOL                    bMultiByte,
-        BOOL                    bOnlyDbtoolsEncodings,
-        BOOL                    bImport )
+        sal_Bool                    bMultiByte,
+        sal_Bool                    bOnlyDbtoolsEncodings,
+        sal_Bool                    bImport )
 
     :	ModalDialog	( pParent, ScResId( RID_SCDLG_IMPORTOPT ) ),
         aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ),
@@ -211,9 +211,9 @@ ScImportOptionsDlg::ScImportOptionsDlg(
         SetSizePixel( aWinSize );
         aCbFixed.Show();
         aCbFixed.SetClickHdl( LINK( this, ScImportOptionsDlg, FixedWidthHdl ) );
-        aCbFixed.Check( FALSE );
+        aCbFixed.Check( sal_False );
         aCbShown.Show();
-        aCbShown.Check( TRUE );
+        aCbShown.Check( sal_True );
     }
     else
     {
@@ -264,11 +264,11 @@ void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const
 
 //------------------------------------------------------------------------
 
-USHORT ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
+sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
 {
     ScDelimiterTable* pTab;
     String  aStr( rEd.GetText() );
-    USHORT  nCode;
+    sal_uInt16  nCode;
 
     if ( &rEd == &aEdTextSep )
         pTab = pTextSepTab;
@@ -284,7 +284,7 @@ USHORT ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
         nCode = pTab->GetCode( aStr );
 
         if ( nCode == 0 )
-            nCode = (USHORT)aStr.GetChar(0);
+            nCode = (sal_uInt16)aStr.GetChar(0);
     }
 
     return nCode;
@@ -296,7 +296,7 @@ IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox )
 {
     if( pCheckBox == &aCbFixed )
     {
-        BOOL bEnable = !aCbFixed.IsChecked();
+        sal_Bool bEnable = !aCbFixed.IsChecked();
         aFtFieldSep.Enable( bEnable );
         aEdFieldSep.Enable( bEnable );
         aFtTextSep.Enable( bEnable );
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 34949ae51..0d6cff1c4 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -90,7 +90,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
         pViewData		( NULL ),
         pDoc			( NULL ),
         pRefInputEdit	( NULL ),
-        bRefInputMode	( FALSE ),
+        bRefInputMode	( sal_False ),
         pTimer			( NULL )
 {
     Init( rArgSet );
@@ -110,8 +110,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
 
 __EXPORT ScSpecialFilterDlg::~ScSpecialFilterDlg()
 {
-    USHORT nEntries = aLbFilterArea.GetEntryCount();
-    USHORT i;
+    sal_uInt16 nEntries = aLbFilterArea.GetEntryCount();
+    sal_uInt16 i;
 
     for ( i=1; i<nEntries; i++ )
         delete (String*)aLbFilterArea.GetEntryData( i );
@@ -149,7 +149,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
         if(pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable();
 
         ScRangeName*	pRangeNames	= pDoc->GetRangeName();
-        const USHORT	nCount 		= pRangeNames ? pRangeNames->GetCount() : 0;
+        const sal_uInt16	nCount 		= pRangeNames ? pRangeNames->GetCount() : 0;
 
         /*
          * Aus den RangeNames des Dokumentes werden nun die
@@ -163,9 +163,9 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
         {
             String		 aString;
             ScRangeData* pData = NULL;
-            USHORT		 nInsert = 0;
+            sal_uInt16		 nInsert = 0;
 
-            for ( USHORT i=0; i<nCount; i++ )
+            for ( sal_uInt16 i=0; i<nCount; i++ )
             {
                 pData = (ScRangeData*)(pRangeNames->At( i ));
                 if ( pData )
@@ -218,19 +218,19 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
                             aStrUndefined );
 
     //	#35206# Spezialfilter braucht immer Spaltenkoepfe
-    aBtnHeader.Check(TRUE);
+    aBtnHeader.Check(sal_True);
     aBtnHeader.Disable();
 
     // Modal-Modus einschalten
-//	SetDispatcherLock( TRUE );
+//	SetDispatcherLock( sal_True );
     //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
-    //SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+    //SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScSpecialFilterDlg::Close()
+sal_Bool __EXPORT ScSpecialFilterDlg::Close()
 {
     if (pViewData)
         pViewData->GetDocShell()->CancelAutoDBRange();
@@ -303,7 +303,7 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam,
 
 //----------------------------------------------------------------------------
 
-BOOL ScSpecialFilterDlg::IsRefInputMode() const
+sal_Bool ScSpecialFilterDlg::IsRefInputMode() const
 {
     return bRefInputMode;
 }
@@ -323,8 +323,8 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
         String			theAreaStr( aEdFilterArea.GetText() );
         ScQueryParam	theOutParam( theQueryData );
         ScAddress		theAdrCopy;
-        BOOL			bEditInputOk	= TRUE;
-        BOOL			bQueryOk		= FALSE;
+        sal_Bool			bEditInputOk	= sal_True;
+        sal_Bool			bQueryOk		= sal_False;
         ScRange			theFilterArea;
         const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
 
@@ -335,28 +335,28 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
             if ( STRING_NOTFOUND != nColonPos )
                 theCopyStr.Erase( nColonPos );
 
-            USHORT nResult = theAdrCopy.Parse( theCopyStr, pDoc, eConv );
+            sal_uInt16 nResult = theAdrCopy.Parse( theCopyStr, pDoc, eConv );
 
             if ( SCA_VALID != (nResult & SCA_VALID) )
             {
                 if ( !aBtnMore.GetState() )
-                    aBtnMore.SetState( TRUE );
+                    aBtnMore.SetState( sal_True );
 
                 ERRORBOX( STR_INVALID_TABREF );
                 aEdCopyArea.GrabFocus();
-                bEditInputOk = FALSE;
+                bEditInputOk = sal_False;
             }
         }
 
         if ( bEditInputOk )
         {
-            USHORT nResult = ScRange().Parse( theAreaStr, pDoc, eConv );
+            sal_uInt16 nResult = ScRange().Parse( theAreaStr, pDoc, eConv );
 
             if ( SCA_VALID != (nResult & SCA_VALID) )
             {
                 ERRORBOX( STR_INVALID_TABREF );
                 aEdFilterArea.GrabFocus();
-                bEditInputOk = FALSE;
+                bEditInputOk = sal_False;
             }
         }
 
@@ -368,7 +368,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
              * ein ScQueryParam zu erzeugen:
              */
 
-            USHORT	nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv );
+            sal_uInt16	nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv );
 
             if ( SCA_VALID == (nResult & SCA_VALID) )
             {
@@ -377,21 +377,21 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
 
                 if ( aBtnCopyResult.IsChecked() )
                 {
-                    theOutParam.bInplace	= FALSE;
+                    theOutParam.bInplace	= sal_False;
                     theOutParam.nDestTab	= theAdrCopy.Tab();
                     theOutParam.nDestCol	= theAdrCopy.Col();
                     theOutParam.nDestRow	= theAdrCopy.Row();
                 }
                 else
                 {
-                    theOutParam.bInplace	= TRUE;
+                    theOutParam.bInplace	= sal_True;
                     theOutParam.nDestTab	= 0;
                     theOutParam.nDestCol	= 0;
                     theOutParam.nDestRow	= 0;
                 }
 
                 theOutParam.bHasHeader = aBtnHeader.IsChecked();
-                theOutParam.bByRow	   = TRUE;
+                theOutParam.bByRow	   = sal_True;
                 theOutParam.bCaseSens  = aBtnCase.IsChecked();
                 theOutParam.bRegExp	   = aBtnRegExp.IsChecked();
                 theOutParam.bDuplicate = !aBtnUnique.IsChecked();
@@ -411,7 +411,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
                 if ( bQueryOk && theOutParam.GetEntryCount() > MAXQUERY &&
                      theOutParam.GetEntry(MAXQUERY).bDoQuery )
                 {
-                    bQueryOk = FALSE;		// zu viele
+                    bQueryOk = sal_False;		// zu viele
                                             //!	andere Fehlermeldung ??
                 }
             }
@@ -419,7 +419,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
 
         if ( bQueryOk )
         {
-            SetDispatcherLock( FALSE );
+            SetDispatcherLock( sal_False );
             SwitchToDocument();
             GetBindings().GetDispatcher()->Execute( FID_FILTER_OK,
                                       SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
@@ -451,17 +451,17 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer )
         if( aEdCopyArea.HasFocus() || aRbCopyArea.HasFocus() )
         {
             pRefInputEdit = &aEdCopyArea;
-            bRefInputMode = TRUE;
+            bRefInputMode = sal_True;
         }
         else if( aEdFilterArea.HasFocus() || aRbFilterArea.HasFocus() )
         {
             pRefInputEdit = &aEdFilterArea;
-            bRefInputMode = TRUE;
+            bRefInputMode = sal_True;
         }
         else if( bRefInputMode )
         {
             pRefInputEdit = NULL;
-            bRefInputMode = FALSE;
+            bRefInputMode = sal_False;
         }
     }
 
@@ -478,7 +478,7 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb )
     if ( pLb == &aLbFilterArea )
     {
         String	aString;
-        USHORT	nSelPos = aLbFilterArea.GetSelectEntryPos();
+        sal_uInt16	nSelPos = aLbFilterArea.GetSelectEntryPos();
 
         if ( nSelPos > 0 )
             aString = *(String*)aLbFilterArea.GetEntryData( nSelPos );
@@ -499,14 +499,14 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd )
         if ( pDoc && pViewData )
         {
             String	theCurAreaStr = pEd->GetText();
-            USHORT	nResult	= ScRange().Parse( theCurAreaStr, pDoc );
+            sal_uInt16	nResult	= ScRange().Parse( theCurAreaStr, pDoc );
 
             if ( SCA_VALID == (nResult & SCA_VALID) )
             {
                 String*	pStr	= NULL;
-                BOOL	bFound	= FALSE;
-                USHORT	i		= 0;
-                USHORT	nCount	= aLbFilterArea.GetEntryCount();
+                sal_Bool	bFound	= sal_False;
+                sal_uInt16	i		= 0;
+                sal_uInt16	nCount	= aLbFilterArea.GetEntryCount();
 
                 for ( i=1; i<nCount && !bFound; i++ )
                 {
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 93ad45737..9b39032bd 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -46,8 +46,8 @@ ScSortDlg::ScSortDlg( Window*			pParent,
         SfxTabDialog( pParent,
                       ScResId( RID_SCDLG_SORT ),
                       pArgSet ),
-        bIsHeaders	( FALSE ),
-        bIsByRows	( FALSE )
+        bIsHeaders	( sal_False ),
+        bIsByRows	( sal_False )
 
 {
 #if LAYOUT_SFX_TABDIALOG_BROKEN
@@ -55,9 +55,9 @@ ScSortDlg::ScSortDlg( Window*			pParent,
     AddTabPage( TP_OPTIONS,	ScTabPageSortOptions::Create, 0 );
 #else
     String fields = rtl::OUString::createFromAscii ("fields");
-    AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND);
+    AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, sal_False, TAB_APPEND);
     String options = rtl::OUString::createFromAscii ("options");
-    AddTabPage( TP_OPTIONS,	options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
+    AddTabPage( TP_OPTIONS,	options, ScTabPageSortOptions::Create, 0, sal_False, TAB_APPEND);
 #endif    
     FreeResource();
 }
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 0a222c545..1d3b4628a 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -62,7 +62,7 @@ using namespace com::sun::star;
 
 // STATIC DATA -----------------------------------------------------------
 
-static USHORT pSortRanges[] =
+static sal_uInt16 pSortRanges[] =
 {
     SID_SORT,
     SID_SORT,
@@ -83,7 +83,7 @@ static USHORT pSortRanges[] =
  * 31.01.95:
  * Die Klasse SfxTabPage bietet mittlerweile ein Verfahren an:
  *
- * virtual BOOL HasExchangeSupport() const; -> return TRUE;
+ * virtual sal_Bool HasExchangeSupport() const; -> return sal_True;
  * virtual void ActivatePage(const SfxItemSet &);
  * virtual int	DeactivatePage(SfxItemSet * = 0);
  *
@@ -127,8 +127,8 @@ ScTabPageSortFields::ScTabPageSortFields( Window*			pParent,
                            rArgSet.Get( nWhichSort )).
                                 GetSortData() ),
         nFieldCount 	( 0 ),
-        bHasHeader		( FALSE ),
-        bSortByRows 	( FALSE )
+        bHasHeader		( sal_False ),
+        bSortByRows 	( sal_False )
 {
     Init();
     FreeResource();
@@ -179,7 +179,7 @@ void ScTabPageSortFields::Init()
 
 //------------------------------------------------------------------------
 
-USHORT* __EXPORT ScTabPageSortFields::GetRanges()
+sal_uInt16* __EXPORT ScTabPageSortFields::GetRanges()
 {
     return pSortRanges;
 }
@@ -206,7 +206,7 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
 
     if ( rSortData.bDoSort[0] )
     {
-        for ( USHORT i=0; i<3; i++ )
+        for ( sal_uInt16 i=0; i<3; i++ )
         {
             if ( rSortData.bDoSort[i] )
             {
@@ -241,7 +241,7 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
         else if( nCol > rSortData.nCol2 )
             nCol = rSortData.nCol2;
 
-        USHORT	nSort1Pos = nCol - rSortData.nCol1+1;
+        sal_uInt16	nSort1Pos = nCol - rSortData.nCol1+1;
         aLbSort1.SelectEntryPos( nSort1Pos );
         aLbSort2.SelectEntryPos( 0 );
         aLbSort3.SelectEntryPos( 0 );
@@ -262,20 +262,20 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
+sal_Bool __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
 {
     ScSortParam theSortData = rSortData;
     if (pDlg)
     {
         const SfxItemSet* pExample = pDlg->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExample && pExample->GetItemState( nWhichSort, TRUE, &pItem ) == SFX_ITEM_SET )
+        if ( pExample && pExample->GetItemState( nWhichSort, sal_True, &pItem ) == SFX_ITEM_SET )
             theSortData = ((const ScSortItem*)pItem)->GetSortData();
     }
 
-    USHORT	nSort1Pos = aLbSort1.GetSelectEntryPos();
-    USHORT	nSort2Pos = aLbSort2.GetSelectEntryPos();
-    USHORT	nSort3Pos = aLbSort3.GetSelectEntryPos();
+    sal_uInt16	nSort1Pos = aLbSort1.GetSelectEntryPos();
+    sal_uInt16	nSort2Pos = aLbSort2.GetSelectEntryPos();
+    sal_uInt16	nSort3Pos = aLbSort3.GetSelectEntryPos();
 
     DBG_ASSERT(    (nSort1Pos <= SC_MAXFIELDS)
                 && (nSort2Pos <= SC_MAXFIELDS)
@@ -320,12 +320,12 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
     {
         theSortData.bDoSort[0] =
         theSortData.bDoSort[1] =
-        theSortData.bDoSort[2] = FALSE;
+        theSortData.bDoSort[2] = sal_False;
     }
 
     rArgSet.Put( ScSortItem( SCITEM_SORTDATA, NULL, &theSortData ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -340,9 +340,9 @@ void __EXPORT ScTabPageSortFields::ActivatePage()
         if (   bHasHeader  != pDlg->GetHeaders()
             || bSortByRows != pDlg->GetByRows()   )
         {
-            USHORT	nCurSel1 = aLbSort1.GetSelectEntryPos();
-            USHORT	nCurSel2 = aLbSort2.GetSelectEntryPos();
-            USHORT	nCurSel3 = aLbSort3.GetSelectEntryPos();
+            sal_uInt16	nCurSel1 = aLbSort1.GetSelectEntryPos();
+            sal_uInt16	nCurSel2 = aLbSort2.GetSelectEntryPos();
+            sal_uInt16	nCurSel3 = aLbSort3.GetSelectEntryPos();
 
             bHasHeader	= pDlg->GetHeaders();
             bSortByRows = pDlg->GetByRows();
@@ -375,7 +375,7 @@ int __EXPORT ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
 
 // -----------------------------------------------------------------------
 
-void ScTabPageSortFields::DisableField( USHORT nField )
+void ScTabPageSortFields::DisableField( sal_uInt16 nField )
 {
     nField--;
 
@@ -390,7 +390,7 @@ void ScTabPageSortFields::DisableField( USHORT nField )
 
 // -----------------------------------------------------------------------
 
-void ScTabPageSortFields::EnableField( USHORT nField )
+void ScTabPageSortFields::EnableField( sal_uInt16 nField )
 {
     nField--;
 
@@ -423,7 +423,7 @@ void ScTabPageSortFields::FillFieldLists()
             SCCOL	nFirstSortCol	= rSortData.nCol1;
             SCROW	nFirstSortRow	= rSortData.nRow1;
             SCTAB	nTab		= pViewData->GetTabNo();
-            USHORT	i			= 1;
+            sal_uInt16	i			= 1;
 
             if ( bSortByRows )
             {
@@ -476,17 +476,17 @@ void ScTabPageSortFields::FillFieldLists()
 
 //------------------------------------------------------------------------
 
-USHORT ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField )
+sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField )
 {
-    USHORT	nFieldPos	= 0;
-    BOOL	bFound		= FALSE;
+    sal_uInt16	nFieldPos	= 0;
+    sal_Bool	bFound		= sal_False;
 
-    for ( USHORT n=1; n<nFieldCount && !bFound; n++ )
+    for ( sal_uInt16 n=1; n<nFieldCount && !bFound; n++ )
     {
         if ( nFieldArr[n] == nField )
         {
             nFieldPos = n;
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 
@@ -606,9 +606,9 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* 			pParent,
 
 __EXPORT ScTabPageSortOptions::~ScTabPageSortOptions()
 {
-    USHORT nEntries = aLbOutPos.GetEntryCount();
+    sal_uInt16 nEntries = aLbOutPos.GetEntryCount();
 
-    for ( USHORT i=1; i<nEntries; i++ )
+    for ( sal_uInt16 i=1; i<nEntries; i++ )
         delete (String*)aLbOutPos.GetEntryData( i );
 
     delete pColRes;
@@ -662,7 +662,7 @@ void ScTabPageSortOptions::Init()
         String aRefStr;
         while ( aIter.Next( aName, aRange ) )
         {
-            USHORT nInsert = aLbOutPos.InsertEntry( aName );
+            sal_uInt16 nInsert = aLbOutPos.InsertEntry( aName );
 
             aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv );
             aLbOutPos.SetEntryData( nInsert, new String( aRefStr ) );
@@ -709,13 +709,13 @@ void ScTabPageSortOptions::Init()
 
     //	get available languages
 
-    aLbLanguage.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE );
+    aLbLanguage.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, sal_False );
     aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM );
 }
 
 //------------------------------------------------------------------------
 
-USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
+sal_uInt16* __EXPORT ScTabPageSortOptions::GetRanges()
 {
     return pSortRanges;
 }
@@ -738,13 +738,13 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
 {
     if ( rSortData.bUserDef )
     {
-        aBtnSortUser.Check( TRUE );
+        aBtnSortUser.Check( sal_True );
         aLbSortUser.Enable();
         aLbSortUser.SelectEntryPos( rSortData.nUserIndex );
     }
     else
     {
-        aBtnSortUser.Check( FALSE );
+        aBtnSortUser.Check( sal_False );
         aLbSortUser.Disable();
         aLbSortUser.SelectEntryPos( 0 );
     }
@@ -775,7 +775,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
     if ( pDoc && !rSortData.bInplace )
     {
         String aStr;
-        USHORT nFormat = (rSortData.nDestTab != pViewData->GetTabNo())
+        sal_uInt16 nFormat = (rSortData.nDestTab != pViewData->GetTabNo())
                             ? SCR_ABS_3D
                             : SCR_ABS;
 
@@ -794,7 +794,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
     }
     else
     {
-        aBtnCopyResult.Check( FALSE );
+        aBtnCopyResult.Check( sal_False );
         aLbOutPos.Disable();
         aEdOutPos.Disable();
         aEdOutPos.SetText( EMPTY_STRING );
@@ -803,14 +803,14 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
+sal_Bool __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
 {
     ScSortParam theSortData = rSortData;
     if (pDlg)
     {
         const SfxItemSet* pExample = pDlg->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExample && pExample->GetItemState( nWhichSort, TRUE, &pItem ) == SFX_ITEM_SET )
+        if ( pExample && pExample->GetItemState( nWhichSort, sal_True, &pItem ) == SFX_ITEM_SET )
             theSortData = ((const ScSortItem*)pItem)->GetSortData();
     }
 
@@ -837,7 +837,7 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
     {
         uno::Sequence<rtl::OUString> aAlgos = pColWrap->listCollatorAlgorithms(
                 theSortData.aCollatorLocale );
-        USHORT nSel = aLbAlgorithm.GetSelectEntryPos();
+        sal_uInt16 nSel = aLbAlgorithm.GetSelectEntryPos();
         if ( nSel < aAlgos.getLength() )
             sAlg = aAlgos[nSel];
     }
@@ -845,7 +845,7 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
 
     rArgSet.Put( ScSortItem( SCITEM_SORTDATA, &theSortData ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -877,7 +877,7 @@ void __EXPORT ScTabPageSortOptions::ActivatePage()
 
 int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
 {
-    BOOL bPosInputOk = TRUE;
+    sal_Bool bPosInputOk = sal_True;
 
     if ( aBtnCopyResult.IsChecked() )
     {
@@ -895,7 +895,7 @@ int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
             thePos.SetTab( pViewData->GetTabNo() );
         }
 
-        USHORT nResult = thePos.Parse( thePosStr, pDoc, pDoc->GetAddressConvention() );
+        sal_uInt16 nResult = thePos.Parse( thePosStr, pDoc, pDoc->GetAddressConvention() );
 
         bPosInputOk = ( SCA_VALID == (nResult & SCA_VALID) );
 
@@ -938,9 +938,9 @@ void ScTabPageSortOptions::FillUserSortListBox()
     aLbSortUser.Clear();
     if ( pUserLists )
     {
-        USHORT nCount = pUserLists->GetCount();
+        sal_uInt16 nCount = pUserLists->GetCount();
         if ( nCount > 0 )
-            for ( USHORT i=0; i<nCount; i++ )
+            for ( sal_uInt16 i=0; i<nCount; i++ )
                 aLbSortUser.InsertEntry( (*pUserLists)[i]->GetString() );
     }
 }
@@ -984,7 +984,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
     if ( pLb == &aLbOutPos )
     {
         String	aString;
-        USHORT	nSelPos = aLbOutPos.GetSelectEntryPos();
+        sal_uInt16	nSelPos = aLbOutPos.GetSelectEntryPos();
 
         if ( nSelPos > 0 )
             aString = *(String*)aLbOutPos.GetEntryData( nSelPos );
@@ -1016,14 +1016,14 @@ void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
     if ( pEd == &aEdOutPos )
     {
         String	theCurPosStr = aEdOutPos.GetText();
-        USHORT	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+        sal_uInt16	nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
 
         if ( SCA_VALID == (nResult & SCA_VALID) )
         {
             String*	pStr	= NULL;
-            BOOL	bFound	= FALSE;
-            USHORT	i		= 0;
-            USHORT	nCount	= aLbOutPos.GetEntryCount();
+            sal_Bool	bFound	= sal_False;
+            sal_uInt16	i		= 0;
+            sal_uInt16	nCount	= aLbOutPos.GetEntryCount();
 
             for ( i=2; i<nCount && !bFound; i++ )
             {
@@ -1043,7 +1043,7 @@ void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
 
 IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG )
 {
-    aLbAlgorithm.SetUpdateMode( FALSE );
+    aLbAlgorithm.SetUpdateMode( sal_False );
     aLbAlgorithm.Clear();
 
     LanguageType eLang = aLbLanguage.GetSelectLanguage();
@@ -1052,8 +1052,8 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG )
         //	for LANGUAGE_SYSTEM no algorithm can be selected because
         //	it wouldn't necessarily exist for other languages
         //	-> leave list box empty if LANGUAGE_SYSTEM is selected
-        aFtAlgorithm.Enable( FALSE );           // nothing to select
-        aLbAlgorithm.Enable( FALSE );			// nothing to select
+        aFtAlgorithm.Enable( sal_False );           // nothing to select
+        aLbAlgorithm.Enable( sal_False );			// nothing to select
     }
     else
     {
@@ -1073,7 +1073,7 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG )
         aLbAlgorithm.Enable( nCount > 1 );		// enable only if there is a choice
     }
 
-    aLbAlgorithm.SetUpdateMode( TRUE );
+    aLbAlgorithm.SetUpdateMode( sal_True );
     return 0;
 }
 
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 54c0d5b2b..a7b348e71 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -47,7 +47,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-static USHORT pSubTotalsRanges[] =
+static sal_uInt16 pSubTotalsRanges[] =
 {
     SID_SUBTOTALS,
     SID_SUBTOTALS,
@@ -57,7 +57,7 @@ static USHORT pSubTotalsRanges[] =
 //========================================================================
 // Zwischenergebnisgruppen-Tabpage:
 
-ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId,
+ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, sal_uInt16 nResId,
                                       const SfxItemSet& rArgSet )
         :	SfxTabPage		( pParent,
                               ScResId( nResId ),
@@ -94,15 +94,15 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId,
 
 __EXPORT ScTpSubTotalGroup::~ScTpSubTotalGroup()
 {
-    USHORT	nCount = (USHORT)aLbColumns.GetEntryCount();
+    sal_uInt16	nCount = (sal_uInt16)aLbColumns.GetEntryCount();
 
     if ( nCount > 0 )
     {
-        USHORT* pData = NULL;
+        sal_uInt16* pData = NULL;
 
-        for ( USHORT i=0; i<nCount; i++ )
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
-            pData = (USHORT*)(aLbColumns.GetEntryData( i ));
+            pData = (sal_uInt16*)(aLbColumns.GetEntryData( i ));
             DBG_ASSERT( pData, "EntryData not found" );
 
             delete pData;
@@ -133,32 +133,32 @@ void ScTpSubTotalGroup::Init()
 
 //------------------------------------------------------------------------
 
-USHORT* __EXPORT ScTpSubTotalGroup::GetRanges()
+sal_uInt16* __EXPORT ScTpSubTotalGroup::GetRanges()
 {
     return pSubTotalsRanges;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ScTpSubTotalGroup::DoReset( USHORT 			nGroupNo,
+sal_Bool ScTpSubTotalGroup::DoReset( sal_uInt16 			nGroupNo,
                                  const SfxItemSet&	rArgSet  )
 {
-    USHORT nGroupIdx = 0;
+    sal_uInt16 nGroupIdx = 0;
 
     DBG_ASSERT( (nGroupNo<=3) && (nGroupNo>0), "Invalid group" );
 
     if ( (nGroupNo > 3) || (nGroupNo == 0) )
-        return FALSE;
+        return sal_False;
     else
         nGroupIdx = nGroupNo-1;
 
     //----------------------------------------------------------
 
     // #79058# first we have to clear the listboxes...
-    for ( USHORT nLbEntry = 0; nLbEntry < aLbColumns.GetEntryCount(); ++nLbEntry )
+    for ( sal_uInt16 nLbEntry = 0; nLbEntry < aLbColumns.GetEntryCount(); ++nLbEntry )
     {
-        aLbColumns.CheckEntryPos( nLbEntry, FALSE );
-        *((USHORT*)aLbColumns.GetEntryData( nLbEntry )) = 0;
+        aLbColumns.CheckEntryPos( nLbEntry, sal_False );
+        *((sal_uInt16*)aLbColumns.GetEntryData( nLbEntry )) = 0;
     }
     aLbFunctions.SelectEntryPos( 0 );
 
@@ -175,10 +175,10 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT 			nGroupNo,
 
         aLbGroup.SelectEntryPos( GetFieldSelPos( nField )+1 );
 
-        for ( USHORT i=0; i<nSubTotals; i++ )
+        for ( sal_uInt16 i=0; i<nSubTotals; i++ )
         {
-            USHORT	nCheckPos = GetFieldSelPos( pSubTotals[i] );
-            USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nCheckPos );
+            sal_uInt16	nCheckPos = GetFieldSelPos( pSubTotals[i] );
+            sal_uInt16* pFunction = (sal_uInt16*)aLbColumns.GetEntryData( nCheckPos );
 
             aLbColumns.CheckEntryPos( nCheckPos );
             *pFunction = FuncToLbPos( pFunctions[i] );
@@ -192,15 +192,15 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT 			nGroupNo,
         aLbFunctions.SelectEntryPos( 0 );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT		nGroupNo,
+sal_Bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16		nGroupNo,
                                        SfxItemSet&	rArgSet  )
 {
-    USHORT nGroupIdx = 0;
+    sal_uInt16 nGroupIdx = 0;
 
     DBG_ASSERT( (nGroupNo<=3) && (nGroupNo>0), "Invalid group" );
     DBG_ASSERT(    (aLbGroup.GetEntryCount() > 0)
@@ -214,7 +214,7 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT		nGroupNo,
         || (aLbColumns.GetEntryCount() == 0)
         || (aLbFunctions.GetEntryCount() == 0)
        )
-        return FALSE;
+        return sal_False;
     else
         nGroupIdx = nGroupNo-1;
 
@@ -226,15 +226,15 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT		nGroupNo,
     {
         const SfxItemSet* pExample = pDlg->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExample && pExample->GetItemState( nWhichSubTotals, TRUE, &pItem ) == SFX_ITEM_SET )
+        if ( pExample && pExample->GetItemState( nWhichSubTotals, sal_True, &pItem ) == SFX_ITEM_SET )
             theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData();
     }
 
     ScSubTotalFunc* pFunctions	= NULL;
     SCCOL* 		    pSubTotals	= NULL;
-    USHORT			nGroup		= aLbGroup.GetSelectEntryPos();
-    USHORT			nEntryCount = (USHORT)aLbColumns.GetEntryCount();
-    USHORT			nCheckCount = aLbColumns.GetCheckedEntryCount();
+    sal_uInt16			nGroup		= aLbGroup.GetSelectEntryPos();
+    sal_uInt16			nEntryCount = (sal_uInt16)aLbColumns.GetEntryCount();
+    sal_uInt16			nCheckCount = aLbColumns.GetCheckedEntryCount();
 
     theSubTotalData.nCol1					= rSubTotalData.nCol1;
     theSubTotalData.nRow1					= rSubTotalData.nRow1;
@@ -247,18 +247,18 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT		nGroupNo,
 
     if ( nEntryCount>0 && nCheckCount>0 && nGroup!=0 )
     {
-        USHORT nFunction	= 0;
+        sal_uInt16 nFunction	= 0;
 
         pSubTotals = new SCCOL  		[nCheckCount];
         pFunctions = new ScSubTotalFunc [nCheckCount];
 
-        for ( USHORT i=0, nCheck=0; i<nEntryCount; i++ )
+        for ( sal_uInt16 i=0, nCheck=0; i<nEntryCount; i++ )
         {
             if ( aLbColumns.IsChecked( i ) )
             {
                 DBG_ASSERT( nCheck <= nCheckCount,
                             "Range error :-(" );
-                nFunction = *((USHORT*)aLbColumns.GetEntryData( i ));
+                nFunction = *((sal_uInt16*)aLbColumns.GetEntryData( i ));
                 pSubTotals[nCheck] = nFieldArr[i];
                 pFunctions[nCheck] = LbPosToFunc( nFunction );
                 nCheck++;
@@ -276,7 +276,7 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT		nGroupNo,
     if ( pSubTotals ) delete [] pSubTotals;
     if ( pFunctions ) delete [] pFunctions;
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -292,7 +292,7 @@ void ScTpSubTotalGroup::FillListBoxes()
         SCTAB	nTab		= pViewData->GetTabNo();
         SCCOL	nMaxCol 	= rSubTotalData.nCol2;
         SCCOL	col;
-        USHORT	i=0;
+        sal_uInt16	i=0;
         String	aFieldName;
 
         aLbGroup.Clear();
@@ -312,27 +312,27 @@ void ScTpSubTotalGroup::FillListBoxes()
             nFieldArr[i] = col;
             aLbGroup.InsertEntry( aFieldName, i+1 );
             aLbColumns.InsertEntry( aFieldName, i );
-            aLbColumns.SetEntryData( i, new USHORT(0) );
+            aLbColumns.SetEntryData( i, new sal_uInt16(0) );
             i++;
         }
         // Nachtraegliche "Konstanteninitialisierung":
-        (USHORT&)nFieldCount = i;
+        (sal_uInt16&)nFieldCount = i;
     }
 }
 
 // -----------------------------------------------------------------------
 
-USHORT ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField )
+sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField )
 {
-    USHORT	nFieldPos	= 0;
-    BOOL	bFound		= FALSE;
+    sal_uInt16	nFieldPos	= 0;
+    sal_Bool	bFound		= sal_False;
 
-    for ( USHORT n=0; n<nFieldCount && !bFound; n++ )
+    for ( sal_uInt16 n=0; n<nFieldCount && !bFound; n++ )
     {
         if ( nFieldArr[n] == nField )
         {
             nFieldPos = n;
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 
@@ -341,7 +341,7 @@ USHORT ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField )
 
 // -----------------------------------------------------------------------
 
-ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( USHORT nPos )
+ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos )
 {
     switch ( nPos )
     {
@@ -365,7 +365,7 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( USHORT nPos )
 
 // -----------------------------------------------------------------------
 
-USHORT ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc )
+sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc )
 {
     switch ( eFunc )
     {
@@ -396,9 +396,9 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb )
     if (   (aLbColumns.GetEntryCount() > 0)
         && (aLbColumns.GetSelectionCount() > 0) )
     {
-        USHORT		nFunction	= aLbFunctions.GetSelectEntryPos();
-        USHORT		nColumn 	= aLbColumns.GetSelectEntryPos();
-        USHORT* 	pFunction	= (USHORT*)aLbColumns.GetEntryData( nColumn );
+        sal_uInt16		nFunction	= aLbFunctions.GetSelectEntryPos();
+        sal_uInt16		nColumn 	= aLbColumns.GetSelectEntryPos();
+        sal_uInt16* 	pFunction	= (sal_uInt16*)aLbColumns.GetEntryData( nColumn );
 
         DBG_ASSERT( pFunction, "EntryData nicht gefunden!" );
         if ( !pFunction )
@@ -412,7 +412,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb )
         {
             *pFunction = nFunction;
 //			aLbColumns.CheckEntryPos( nColumn, (nFunction != 0) );//XXX
-            aLbColumns.CheckEntryPos( nColumn, TRUE );
+            aLbColumns.CheckEntryPos( nColumn, sal_True );
         }
     }
     return 0;
@@ -428,7 +428,7 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb )
 
         if ( pEntry )
         {
-            aLbColumns.SelectEntryPos( (USHORT)aLbColumns.GetModel()->GetAbsPos( pEntry ) );
+            aLbColumns.SelectEntryPos( (sal_uInt16)aLbColumns.GetModel()->GetAbsPos( pEntry ) );
             SelectHdl( pLb );
         }
     }
@@ -485,11 +485,11 @@ void __EXPORT ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3);
 
 #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet ))
 
-BOOL __EXPORT ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); }
+sal_Bool __EXPORT ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); }
 
-BOOL __EXPORT ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); }
+sal_Bool __EXPORT ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); }
 
-BOOL __EXPORT ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); }
+sal_Bool __EXPORT ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); }
 
 #undef FILL
 
@@ -570,13 +570,13 @@ void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
 
     if ( rSubTotalData.bUserDef )
     {
-        aBtnUserDef.Check( TRUE );
+        aBtnUserDef.Check( sal_True );
         aLbUserDef.Enable();
         aLbUserDef.SelectEntryPos( rSubTotalData.nUserIndex );
     }
     else
     {
-        aBtnUserDef.Check( FALSE );
+        aBtnUserDef.Check( sal_False );
         aLbUserDef.Disable();
         aLbUserDef.SelectEntryPos( 0 );
     }
@@ -586,7 +586,7 @@ void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
+sal_Bool __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
 {
     ScSubTotalParam theSubTotalData;			// auslesen, wenn schon teilweise gefuellt
     SfxTabDialog* pDlg = GetTabDialog();
@@ -594,12 +594,12 @@ BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
     {
         const SfxItemSet* pExample = pDlg->GetExampleSet();
         const SfxPoolItem* pItem;
-        if ( pExample && pExample->GetItemState( nWhichSubTotals, TRUE, &pItem ) == SFX_ITEM_SET )
+        if ( pExample && pExample->GetItemState( nWhichSubTotals, sal_True, &pItem ) == SFX_ITEM_SET )
             theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData();
     }
 
     theSubTotalData.bPagebreak		= aBtnPagebreak.IsChecked();
-    theSubTotalData.bReplace		= TRUE;
+    theSubTotalData.bReplace		= sal_True;
     theSubTotalData.bCaseSens		= aBtnCase.IsChecked();
     theSubTotalData.bIncludePattern = aBtnFormats.IsChecked();
     theSubTotalData.bDoSort 		= aBtnSort.IsChecked();
@@ -611,7 +611,7 @@ BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
 
     rArgSet.Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -623,9 +623,9 @@ void ScTpSubTotalOptions::FillUserSortListBox()
     aLbUserDef.Clear();
     if ( pUserLists )
     {
-        USHORT nCount = pUserLists->GetCount();
+        sal_uInt16 nCount = pUserLists->GetCount();
         if ( nCount > 0 )
-            for ( USHORT i=0; i<nCount; i++ )
+            for ( sal_uInt16 i=0; i<nCount; i++ )
                 aLbUserDef.InsertEntry( (*pUserLists)[i]->GetString() );
     }
 }
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 532a16b1f..f3b9f91a5 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -59,7 +59,7 @@
 
 // ============================================================================
 
-static USHORT pValueRanges[] =
+static sal_uInt16 pValueRanges[] =
 {
     FID_VALID_MODE,	FID_VALID_ERRTEXT,
     FID_VALID_LISTTYPE, FID_VALID_LISTTYPE,
@@ -167,7 +167,7 @@ void			ScTPValidationValue::RefInputDonePostHdl()
 }
     
 
-BOOL ScValidationDlg::Close()
+sal_Bool ScValidationDlg::Close()
 {
     if( m_bOwnRefHdlr )
         if( SfxTabPage* pPage = GetTabPage( TP_VALIDATION_VALUES ) )
@@ -181,7 +181,7 @@ ScValidationDlg::~ScValidationDlg()
 {
     //<!--Added by PengYunQuan for Validity Cell Range Picker
     if( m_bOwnRefHdlr )
-        RemoveRefDlg( FALSE );
+        RemoveRefDlg( sal_False );
     //-->Added by PengYunQuan for Validity Cell Range Picker
 }
 
@@ -191,9 +191,9 @@ ScValidationDlg::~ScValidationDlg()
 namespace {
 
 /** Converts the passed ScValidationMode to the position in the list box. */
-USHORT lclGetPosFromValMode( ScValidationMode eValMode )
+sal_uInt16 lclGetPosFromValMode( ScValidationMode eValMode )
 {
-    USHORT nLbPos = SC_VALIDDLG_ALLOW_ANY;
+    sal_uInt16 nLbPos = SC_VALIDDLG_ALLOW_ANY;
     switch( eValMode )
     {
         case SC_VALID_ANY:      nLbPos = SC_VALIDDLG_ALLOW_ANY;     break;
@@ -210,7 +210,7 @@ USHORT lclGetPosFromValMode( ScValidationMode eValMode )
 }
 
 /** Converts the passed list box position to an ScValidationMode. */
-ScValidationMode lclGetValModeFromPos( USHORT nLbPos )
+ScValidationMode lclGetValModeFromPos( sal_uInt16 nLbPos )
 {
     ScValidationMode eValMode = SC_VALID_ANY;
     switch( nLbPos )
@@ -229,9 +229,9 @@ ScValidationMode lclGetValModeFromPos( USHORT nLbPos )
 }
 
 /** Converts the passed ScConditionMode to the position in the list box. */
-USHORT lclGetPosFromCondMode( ScConditionMode eCondMode )
+sal_uInt16 lclGetPosFromCondMode( ScConditionMode eCondMode )
 {
-    USHORT nLbPos = SC_VALIDDLG_DATA_EQUAL;
+    sal_uInt16 nLbPos = SC_VALIDDLG_DATA_EQUAL;
     switch( eCondMode )
     {
         case SC_COND_NONE:          // #111771# may occur in old XML files after Excel import
@@ -249,7 +249,7 @@ USHORT lclGetPosFromCondMode( ScConditionMode eCondMode )
 }
 
 /** Converts the passed list box position to an ScConditionMode. */
-ScConditionMode lclGetCondModeFromPos( USHORT nLbPos )
+ScConditionMode lclGetCondModeFromPos( sal_uInt16 nLbPos )
 {
     ScConditionMode eCondMode = SC_COND_EQUAL;
     switch( nLbPos )
@@ -389,7 +389,7 @@ SfxTabPage* ScTPValidationValue::Create( Window* pParent, const SfxItemSet& rArg
     return( new ScTPValidationValue( pParent, rArgSet ) );
 }
 
-USHORT* ScTPValidationValue::GetRanges()
+sal_uInt16* ScTPValidationValue::GetRanges()
 {
     return pValueRanges;
 }
@@ -398,38 +398,38 @@ void ScTPValidationValue::Reset( const SfxItemSet& rArgSet )
 {
     const SfxPoolItem* pItem;
 
-    USHORT nLbPos = SC_VALIDDLG_ALLOW_ANY;
-    if( rArgSet.GetItemState( FID_VALID_MODE, TRUE, &pItem ) == SFX_ITEM_SET )
+    sal_uInt16 nLbPos = SC_VALIDDLG_ALLOW_ANY;
+    if( rArgSet.GetItemState( FID_VALID_MODE, sal_True, &pItem ) == SFX_ITEM_SET )
         nLbPos = lclGetPosFromValMode( static_cast< ScValidationMode >(
             static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
     maLbAllow.SelectEntryPos( nLbPos );
 
     nLbPos = SC_VALIDDLG_DATA_EQUAL;
-    if( rArgSet.GetItemState( FID_VALID_CONDMODE, TRUE, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet.GetItemState( FID_VALID_CONDMODE, sal_True, &pItem ) == SFX_ITEM_SET )
         nLbPos = lclGetPosFromCondMode( static_cast< ScConditionMode >(
             static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
     maLbValue.SelectEntryPos( nLbPos );
 
     // *** check boxes ***
-    BOOL bCheck = TRUE;
-    if( rArgSet.GetItemState( FID_VALID_BLANK, TRUE, &pItem ) == SFX_ITEM_SET )
+    sal_Bool bCheck = sal_True;
+    if( rArgSet.GetItemState( FID_VALID_BLANK, sal_True, &pItem ) == SFX_ITEM_SET )
         bCheck = static_cast< const SfxBoolItem* >( pItem )->GetValue();
     maCbAllow.Check( bCheck );
 
     sal_Int32 nListType = ValidListType::UNSORTED;
-    if( rArgSet.GetItemState( FID_VALID_LISTTYPE, TRUE, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet.GetItemState( FID_VALID_LISTTYPE, sal_True, &pItem ) == SFX_ITEM_SET )
         nListType = static_cast< const SfxInt16Item* >( pItem )->GetValue();
     maCbShow.Check( nListType != ValidListType::INVISIBLE );
     maCbSort.Check( nListType == ValidListType::SORTEDASCENDING );
 
     // *** formulas ***
     String aFmlaStr;
-    if ( rArgSet.GetItemState( FID_VALID_VALUE1, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_VALUE1, sal_True, &pItem ) == SFX_ITEM_SET )
         aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
     SetFirstFormula( aFmlaStr );
 
     aFmlaStr.Erase();
-    if ( rArgSet.GetItemState( FID_VALID_VALUE2, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_VALUE2, sal_True, &pItem ) == SFX_ITEM_SET )
         aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
     SetSecondFormula( aFmlaStr );
 
@@ -437,21 +437,21 @@ void ScTPValidationValue::Reset( const SfxItemSet& rArgSet )
     CheckHdl( NULL );
 }
 
-BOOL ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet )
+sal_Bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet )
 {
     sal_Int16 nListType = maCbShow.IsChecked() ?
         (maCbSort.IsChecked() ? ValidListType::SORTEDASCENDING : ValidListType::UNSORTED) :
         ValidListType::INVISIBLE;
 
-    rArgSet.Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<USHORT>(
+    rArgSet.Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>(
                     lclGetValModeFromPos( maLbAllow.GetSelectEntryPos() ) ) ) );
-    rArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<USHORT>(
+    rArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>(
                     lclGetCondModeFromPos( maLbValue.GetSelectEntryPos() ) ) ) );
     rArgSet.Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) );
     rArgSet.Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) );
     rArgSet.Put( SfxBoolItem( FID_VALID_BLANK, maCbAllow.IsChecked() ) );
     rArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) );
-    return TRUE;
+    return sal_True;
 }
 
 String ScTPValidationValue::GetFirstFormula() const
@@ -597,7 +597,7 @@ void ScTPValidationValue::TidyListBoxes()
 
 IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, /*pEdit*/ )
 {
-    USHORT  nPos=maLbAllow.GetSelectEntryPos();
+    sal_uInt16  nPos=maLbAllow.GetSelectEntryPos();
     
     if ( nPos == SC_VALIDDLG_ALLOW_RANGE )
     {
@@ -625,7 +625,7 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd )
 
 IMPL_LINK( ScTPValidationValue, SelectHdl, ListBox*, EMPTYARG )
 {
-    USHORT nLbPos = maLbAllow.GetSelectEntryPos();
+    sal_uInt16 nLbPos = maLbAllow.GetSelectEntryPos();
     bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY);
     bool bRange = (nLbPos == SC_VALIDDLG_ALLOW_RANGE);
     bool bList = (nLbPos == SC_VALIDDLG_ALLOW_LIST);
@@ -721,12 +721,12 @@ void ScTPValidationHelp::Init()
 {
     //aLb.SetSelectHdl( LINK( this, ScTPValidationHelp, SelectHdl ) );
 
-    aTsbHelp.EnableTriState( FALSE );
+    aTsbHelp.EnableTriState( sal_False );
 }
 
 //------------------------------------------------------------------------
 
-USHORT* __EXPORT ScTPValidationHelp::GetRanges()
+sal_uInt16* __EXPORT ScTPValidationHelp::GetRanges()
 {
     return pValueRanges;
 }
@@ -745,17 +745,17 @@ void __EXPORT ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
 {
     const SfxPoolItem* pItem;
 
-    if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, sal_True, &pItem ) == SFX_ITEM_SET )
         aTsbHelp.SetState( ((const SfxBoolItem*)pItem)->GetValue() ? STATE_CHECK : STATE_NOCHECK );
     else
         aTsbHelp.SetState( STATE_NOCHECK );
 
-    if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, sal_True, &pItem ) == SFX_ITEM_SET )
         aEdtTitle.SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         aEdtTitle.SetText( EMPTY_STRING );
 
-    if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, sal_True, &pItem ) == SFX_ITEM_SET )
         aEdInputHelp.SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         aEdInputHelp.SetText( EMPTY_STRING );
@@ -763,13 +763,13 @@ void __EXPORT ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet )
+sal_Bool __EXPORT ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet )
 {
     rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, aTsbHelp.GetState() == STATE_CHECK ) );
     rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aEdtTitle.GetText() ) );
     rArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aEdInputHelp.GetText() ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 //========================================================================
@@ -812,14 +812,14 @@ void ScTPValidationError::Init()
     aBtnSearch.SetClickHdl( LINK( this, ScTPValidationError, ClickSearchHdl ) );
 
     aLbAction.SelectEntryPos( 0 );
-    aTsbShow.EnableTriState( FALSE );
+    aTsbShow.EnableTriState( sal_False );
 
     SelectActionHdl( NULL );
 }
 
 //------------------------------------------------------------------------
 
-USHORT* __EXPORT ScTPValidationError::GetRanges()
+sal_uInt16* __EXPORT ScTPValidationError::GetRanges()
 {
     return pValueRanges;
 }
@@ -838,22 +838,22 @@ void __EXPORT ScTPValidationError::Reset( const SfxItemSet& rArgSet )
 {
     const SfxPoolItem* pItem;
 
-    if ( rArgSet.GetItemState( FID_VALID_SHOWERR, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_SHOWERR, sal_True, &pItem ) == SFX_ITEM_SET )
         aTsbShow.SetState( ((const SfxBoolItem*)pItem)->GetValue() ? STATE_CHECK : STATE_NOCHECK );
     else
         aTsbShow.SetState( STATE_CHECK );   // #111720# check by default
 
-    if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, sal_True, &pItem ) == SFX_ITEM_SET )
         aLbAction.SelectEntryPos( ((const SfxAllEnumItem*)pItem)->GetValue() );
     else
         aLbAction.SelectEntryPos( 0 );
 
-    if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, sal_True, &pItem ) == SFX_ITEM_SET )
         aEdtTitle.SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         aEdtTitle.SetText( EMPTY_STRING );
 
-    if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, TRUE, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, sal_True, &pItem ) == SFX_ITEM_SET )
         aEdError.SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         aEdError.SetText( EMPTY_STRING );
@@ -863,14 +863,14 @@ void __EXPORT ScTPValidationError::Reset( const SfxItemSet& rArgSet )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTPValidationError::FillItemSet( SfxItemSet& rArgSet )
+sal_Bool __EXPORT ScTPValidationError::FillItemSet( SfxItemSet& rArgSet )
 {
     rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, aTsbShow.GetState() == STATE_CHECK ) );
     rArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, aLbAction.GetSelectEntryPos() ) );
     rArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, aEdtTitle.GetText() ) );
     rArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, aEdError.GetText() ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -878,7 +878,7 @@ BOOL __EXPORT ScTPValidationError::FillItemSet( SfxItemSet& rArgSet )
 IMPL_LINK( ScTPValidationError, SelectActionHdl, ListBox*, EMPTYARG )
 {
     ScValidErrorStyle eStyle = (ScValidErrorStyle) aLbAction.GetSelectEntryPos();
-    BOOL bMacro = ( eStyle == SC_VALERR_MACRO );
+    sal_Bool bMacro = ( eStyle == SC_VALERR_MACRO );
 
     aBtnSearch.Enable( bMacro );
     aFtError.Enable( !bMacro );
@@ -915,13 +915,13 @@ bool ScValidationDlg::EnterRefStatus()
 
     if( !pTabViewShell ) return false;
 
-    USHORT nId  = SLOTID;
+    sal_uInt16 nId  = SLOTID;
     SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
     SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
     if ( pWnd && pWnd->GetWindow()!= this ) pWnd = NULL;
 
-    SC_MOD()->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+    SC_MOD()->SetRefDialog( nId, pWnd ? sal_False : sal_True );
 
     return true;
 }
@@ -932,7 +932,7 @@ bool ScValidationDlg::LeaveRefStatus()
 
     if( !pTabViewShell ) return false;
 
-    USHORT nId  = SLOTID;
+    sal_uInt16 nId  = SLOTID;
     SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
     //SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
     if ( pViewFrm->GetChildWindow( nId ) )
@@ -947,14 +947,14 @@ bool ScValidationDlg::SetupRefDlg()
     if ( m_bOwnRefHdlr ) return false;
     if( EnterRefMode() )
     {
-        SetModal( FALSE );
+        SetModal( sal_False );
         return  /*SetChkShell( GetDocShell() ),*/ m_bOwnRefHdlr = true && EnterRefStatus();
     }
 
     return false;
 }
 
-bool ScValidationDlg::RemoveRefDlg( BOOL bRestoreModal /* = TRUE */ )
+bool ScValidationDlg::RemoveRefDlg( sal_Bool bRestoreModal /* = sal_True */ )
 {
     bool bVisLock = false;
     bool bFreeWindowLock = false;
@@ -975,7 +975,7 @@ bool ScValidationDlg::RemoveRefDlg( BOOL bRestoreModal /* = TRUE */ )
         m_bOwnRefHdlr = false;
 
         if( bRestoreModal )
-            SetModal( TRUE );		
+            SetModal( sal_True );		
     }
 
     if ( SfxChildWindow* pWnd = pTabVwSh->GetViewFrame()->GetChildWindow( SID_VALIDITY_REFERENCE ) )
@@ -1003,14 +1003,14 @@ void ScTPValidationValue::OnClick( Button *pBtn )
         SetupRefDlg();
 }
 
-BOOL ScValidationDlg::IsChildFocus()
+sal_Bool ScValidationDlg::IsChildFocus()
 {
     if ( const Window *pWin = Application::GetFocusWindow() )
         while( NULL != ( pWin = pWin->GetParent() ) )
             if( pWin == this )
-                return TRUE;
+                return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index b9c6b9d76..e6420cac6 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -77,7 +77,7 @@ TYPEINIT1(ScAreaLink,::sfx2::SvBaseLink);
 ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile,
                         const String& rFilter, const String& rOpt,
                         const String& rArea, const ScRange& rDest,
-                        ULONG nRefresh ) :
+                        sal_uLong nRefresh ) :
     ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE),
     ScRefreshTimer	( nRefresh ),
     pImpl           ( new AreaLink_Impl() ),
@@ -86,9 +86,9 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile,
     aOptions		(rOpt),
     aSourceArea		(rArea),
     aDestArea		(rDest),
-    bAddUndo		(TRUE),
-    bInCreate		(FALSE),
-    bDoInsert		(TRUE)
+    bAddUndo		(sal_True),
+    bInCreate		(sal_False),
+    bDoInsert		(sal_True)
 {
     DBG_ASSERT(pShell->ISA(ScDocShell), "ScAreaLink mit falscher ObjectShell");
     pImpl->m_pDocSh = static_cast< ScDocShell* >( pShell );
@@ -159,19 +159,19 @@ void __EXPORT ScAreaLink::Closed()
     // Verknuepfung loeschen: Undo
 
     ScDocument* pDoc = pImpl->m_pDocSh->GetDocument();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     if (bAddUndo && bUndo)
     {
         pImpl->m_pDocSh->GetUndoManager()->AddUndoAction( new ScUndoRemoveAreaLink( pImpl->m_pDocSh,
                                                         aFileName, aFilterName, aOptions,
                                                         aSourceArea, aDestArea, GetRefreshDelay() ) );
 
-        bAddUndo = FALSE;	// nur einmal
+        bAddUndo = sal_False;	// nur einmal
     }
 
     SCTAB nDestTab = aDestArea.aStart.Tab();
     if (pDoc->IsStreamValid(nDestTab))
-        pDoc->SetStreamValid(nDestTab, FALSE);
+        pDoc->SetStreamValid(nDestTab, sal_False);
 
     SvBaseLink::Closed();
 }
@@ -195,7 +195,7 @@ void ScAreaLink::SetSource(const String& rDoc, const String& rFlt, const String&
     SetName( aNewLinkName );
 }
 
-BOOL ScAreaLink::IsEqual( const String& rFile, const String& rFilter, const String& rOpt,
+sal_Bool ScAreaLink::IsEqual( const String& rFile, const String& rFilter, const String& rOpt,
                             const String& rSource, const ScRange& rDest ) const
 {
     return aFileName == rFile && aFilterName == rFilter && aOptions == rOpt &&
@@ -203,16 +203,16 @@ BOOL ScAreaLink::IsEqual( const String& rFile, const String& rFilter, const Stri
 }
 
 // find a range with name >rAreaName< in >pSrcDoc<, return it in >rRange<
-BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName )
+sal_Bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     ScRangeName* pNames = pSrcDoc->GetRangeName();
-    USHORT nPos;
+    sal_uInt16 nPos;
     if (pNames)			// benannte Bereiche
     {
         if (pNames->SearchName( rAreaName, nPos ))
             if ( (*pNames)[nPos]->IsValidReference( rRange ) )
-                bFound = TRUE;
+                bFound = sal_True;
     }
     if (!bFound)		// Datenbankbereiche
     {
@@ -225,39 +225,39 @@ BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin
                 SCROW nRow1, nRow2;
                 (*pDBColl)[nPos]->GetArea(nTab,nCol1,nRow1,nCol2,nRow2);
                 rRange = ScRange( nCol1,nRow1,nTab, nCol2,nRow2,nTab );
-                bFound = TRUE;
+                bFound = sal_True;
             }
     }
     if (!bFound)		// direct reference (range or cell)
     {
         ScAddress::Details aDetails(pSrcDoc->GetAddressConvention(), 0, 0);
         if ( rRange.ParseAny( rAreaName, pSrcDoc, aDetails ) & SCA_VALID )
-            bFound = TRUE;
+            bFound = sal_True;
     }
     return bFound;
 }
 
 //	ausfuehren:
 
-BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
-                            const String& rNewArea, ULONG nNewRefresh )
+sal_Bool ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
+                            const String& rNewArea, sal_uLong nNewRefresh )
 {
     //	Dokument laden - wie TabLink
 
     if (!rNewFile.Len() || !rNewFilter.Len())
-        return FALSE;
+        return sal_False;
 
     String aNewUrl( ScGlobal::GetAbsDocName( rNewFile, pImpl->m_pDocSh ) );
-    BOOL bNewUrlName = (aNewUrl != aFileName);
+    sal_Bool bNewUrlName = (aNewUrl != aFileName);
 
     const SfxFilter* pFilter = pImpl->m_pDocSh->GetFactory().GetFilterContainer()->GetFilter4FilterName(rNewFilter);
     if (!pFilter)
-        return FALSE;
+        return sal_False;
 
     ScDocument* pDoc = pImpl->m_pDocSh->GetDocument();
 
-    BOOL bUndo (pDoc->IsUndoEnabled());
-    pDoc->SetInLinkUpdate( TRUE );
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
+    pDoc->SetInLinkUpdate( sal_True );
 
     //	wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
     if ( rNewFilter != aFilterName )
@@ -268,7 +268,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
     if ( aOptions.Len() )
         pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
 
-    SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter);
+    SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, sal_False, pFilter);
 
     // aRef->DoClose() will be closed explicitly, but it is still more safe to use SfxObjectShellLock here
     ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL);
@@ -326,7 +326,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
     }
 
     //! check CanFitBlock only if bDoInsert is set?
-    BOOL bCanDo = ValidColRow( aNewRange.aEnd.Col(), aNewRange.aEnd.Row() ) &&
+    sal_Bool bCanDo = ValidColRow( aNewRange.aEnd.Col(), aNewRange.aEnd.Row() ) &&
                   pDoc->CanFitBlock( aOldRange, aNewRange );
     if (bCanDo)
     {
@@ -352,16 +352,16 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
                 {
                     pUndoDoc->InitUndo( pDoc, 0, pDoc->GetTableCount()-1 );
                     pDoc->CopyToDocument( 0,0,0,MAXCOL,MAXROW,MAXTAB,
-                                            IDF_FORMULA, FALSE, pUndoDoc );		// alle Formeln
+                                            IDF_FORMULA, sal_False, pUndoDoc );		// alle Formeln
                 }
                 else
                     pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab );				// nur Zieltabelle
-                pDoc->CopyToDocument( aOldRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc );
+                pDoc->CopyToDocument( aOldRange, IDF_ALL & ~IDF_NOTE, sal_False, pUndoDoc );
             }
             else		// ohne Einfuegen
             {
                 pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab );				// nur Zieltabelle
-                pDoc->CopyToDocument( aMaxRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc );
+                pDoc->CopyToDocument( aMaxRange, IDF_ALL & ~IDF_NOTE, sal_False, pUndoDoc );
             }
         }
 
@@ -410,7 +410,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
                     ScMarkData aDestMark;
                     aDestMark.SelectOneTable( nDestTab );
                     aDestMark.SetMarkArea( aNewTokenRange );
-                    pDoc->CopyFromClip( aNewTokenRange, aDestMark, IDF_ALL, NULL, &aClipDoc, FALSE );
+                    pDoc->CopyFromClip( aNewTokenRange, aDestMark, IDF_ALL, NULL, &aClipDoc, sal_False );
                     aNewTokenRange.aStart.SetRow( aNewTokenRange.aEnd.Row() + 2 );
                 }
             }
@@ -427,7 +427,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
         {
             pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
             pRedoDoc->InitUndo( pDoc, nDestTab, nDestTab );
-            pDoc->CopyToDocument( aNewRange, IDF_ALL & ~IDF_NOTE, FALSE, pRedoDoc );
+            pDoc->CopyToDocument( aNewRange, IDF_ALL & ~IDF_NOTE, sal_False, pRedoDoc );
 
             pImpl->m_pDocSh->GetUndoManager()->AddUndoAction(
                 new ScUndoUpdateAreaLink( pImpl->m_pDocSh,
@@ -470,7 +470,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
     }
     else
     {
-        //	CanFitBlock FALSE -> Probleme mit zusammengefassten Zellen
+        //	CanFitBlock sal_False -> Probleme mit zusammengefassten Zellen
         //						 oder Tabellengrenze erreicht!
         //!	Zellschutz ???
 
@@ -485,7 +485,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
 
     aRef->DoClose();
 
-    pDoc->SetInLinkUpdate( FALSE );
+    pDoc->SetInLinkUpdate( sal_False );
 
     if (bCanDo)
     {
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index a38eb742e..28863a0c9 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -45,28 +45,28 @@ struct ScAutoStyleInitData
 {
     ScRange	aRange;
     String	aStyle1;
-    ULONG	nTimeout;
+    sal_uLong	nTimeout;
     String	aStyle2;
 
-    ScAutoStyleInitData( const ScRange& rR, const String& rSt1, ULONG nT, const String& rSt2 ) :
+    ScAutoStyleInitData( const ScRange& rR, const String& rSt1, sal_uLong nT, const String& rSt2 ) :
         aRange(rR), aStyle1(rSt1), nTimeout(nT), aStyle2(rSt2) {}
 };
 
 struct ScAutoStyleData
 {
-    ULONG	nTimeout;
+    sal_uLong	nTimeout;
     ScRange	aRange;
     String	aStyle;
 
-    ScAutoStyleData( ULONG nT, const ScRange& rR, const String& rT ) :
+    ScAutoStyleData( sal_uLong nT, const ScRange& rR, const String& rT ) :
         nTimeout(nT), aRange(rR), aStyle(rT) {}
 };
 
 //==================================================================
 
-inline ULONG TimeNow()			// Sekunden
+inline sal_uLong TimeNow()			// Sekunden
 {
-    return (ULONG) time(0);
+    return (sal_uLong) time(0);
 }
 
 //==================================================================
@@ -81,8 +81,8 @@ ScAutoStyleList::ScAutoStyleList(ScDocShell* pShell) :
 
 ScAutoStyleList::~ScAutoStyleList()
 {
-    ULONG i;
-    ULONG nCount = aEntries.Count();
+    sal_uLong i;
+    sal_uLong nCount = aEntries.Count();
     for (i=0; i<nCount; i++)
         delete (ScAutoStyleData*) aEntries.GetObject(i);
     nCount = aInitials.Count();
@@ -95,7 +95,7 @@ ScAutoStyleList::~ScAutoStyleList()
 //	initial short delay (asynchronous call)
 
 void ScAutoStyleList::AddInitial( const ScRange& rRange, const String& rStyle1,
-                                    ULONG nTimeout, const String& rStyle2 )
+                                    sal_uLong nTimeout, const String& rStyle2 )
 {
     ScAutoStyleInitData* pNew =
         new ScAutoStyleInitData( rRange, rStyle1, nTimeout, rStyle2 );
@@ -105,8 +105,8 @@ void ScAutoStyleList::AddInitial( const ScRange& rRange, const String& rStyle1,
 
 IMPL_LINK( ScAutoStyleList, InitHdl, Timer*, EMPTYARG )
 {
-    ULONG nCount = aInitials.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = aInitials.Count();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         ScAutoStyleInitData* pData = (ScAutoStyleInitData*) aInitials.GetObject(i);
 
@@ -126,15 +126,15 @@ IMPL_LINK( ScAutoStyleList, InitHdl, Timer*, EMPTYARG )
 
 //==================================================================
 
-void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const String& rStyle )
+void ScAutoStyleList::AddEntry( sal_uLong nTimeout, const ScRange& rRange, const String& rStyle )
 {
     aTimer.Stop();
-    ULONG nNow = TimeNow();
+    sal_uLong nNow = TimeNow();
 
     //	alten Eintrag loeschen
 
-    ULONG nCount = aEntries.Count();
-    ULONG i;
+    sal_uLong nCount = aEntries.Count();
+    sal_uLong i;
     for (i=0; i<nCount; i++)
     {
         ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i);
@@ -157,7 +157,7 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
 
     //	Einfuege-Position suchen
 
-    ULONG nPos = LIST_APPEND;
+    sal_uLong nPos = LIST_APPEND;
     for (i=0; i<nCount && nPos == LIST_APPEND; i++)
         if (nTimeout <= ((ScAutoStyleData*) aEntries.GetObject(i))->nTimeout)
             nPos = i;
@@ -171,10 +171,10 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
     StartTimer(nNow);
 }
 
-void ScAutoStyleList::AdjustEntries( ULONG nDiff )	// Millisekunden
+void ScAutoStyleList::AdjustEntries( sal_uLong nDiff )	// Millisekunden
 {
-    ULONG nCount = aEntries.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i);
         if ( pData->nTimeout <= nDiff )
@@ -192,7 +192,7 @@ void ScAutoStyleList::ExecuteEntries()
         pDocSh->DoAutoStyle( pData->aRange, pData->aStyle );	//! oder Request ???
 
         delete pData;
-        aEntries.Remove((ULONG)0);
+        aEntries.Remove((sal_uLong)0);
     }
 }
 
@@ -200,8 +200,8 @@ void ScAutoStyleList::ExecuteAllNow()
 {
     aTimer.Stop();
 
-    ULONG nCount = aEntries.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i);
 
@@ -212,11 +212,11 @@ void ScAutoStyleList::ExecuteAllNow()
     aEntries.Clear();
 }
 
-void ScAutoStyleList::StartTimer( ULONG nNow )		// Sekunden
+void ScAutoStyleList::StartTimer( sal_uLong nNow )		// Sekunden
 {
     // ersten Eintrag mit Timeout != 0 suchen
 
-    ULONG nPos = 0;
+    sal_uLong nPos = 0;
     ScAutoStyleData* pData;
     while ( (pData = (ScAutoStyleData*) aEntries.GetObject(nPos)) != NULL && pData->nTimeout == 0 )
         ++nPos;
@@ -231,7 +231,7 @@ void ScAutoStyleList::StartTimer( ULONG nNow )		// Sekunden
 
 IMPL_LINK( ScAutoStyleList, TimerHdl, Timer*, EMPTYARG )
 {
-    ULONG nNow = TimeNow();
+    sal_uLong nNow = TimeNow();
     AdjustEntries(aTimer.GetTimeout());				// eingestellte Wartezeit
     ExecuteEntries();
     StartTimer(nNow);
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index ca09bc8ec..ba601238c 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -60,14 +60,14 @@
 
 // -----------------------------------------------------------------
 
-BOOL ScDBDocFunc::AddDBRange( const String& rName, const ScRange& rRange, BOOL /* bApi */ )
+sal_Bool ScDBDocFunc::AddDBRange( const String& rName, const ScRange& rRange, sal_Bool /* bApi */ )
 {
 
     ScDocShellModificator aModificator( rDocShell );
 
     ScDocument* pDoc = rDocShell.GetDocument();
     ScDBCollection* pDocColl = pDoc->GetDBCollection();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
     ScDBCollection* pUndoColl = NULL;
     if (bUndo)
@@ -80,19 +80,19 @@ BOOL ScDBDocFunc::AddDBRange( const String& rName, const ScRange& rRange, BOOL /
     // #i55926# While loading XML, formula cells only have a single string token,
     // so CompileDBFormula would never find any name (index) tokens, and would
     // unnecessarily loop through all cells.
-    BOOL bCompile = !pDoc->IsImportingXML();
+    sal_Bool bCompile = !pDoc->IsImportingXML();
 
     if ( bCompile )
-        pDoc->CompileDBFormula( TRUE );     // CreateFormulaString
-    BOOL bOk = pDocColl->Insert( pNew );
+        pDoc->CompileDBFormula( sal_True );     // CreateFormulaString
+    sal_Bool bOk = pDocColl->Insert( pNew );
     if ( bCompile )
-        pDoc->CompileDBFormula( FALSE );    // CompileFormulaString
+        pDoc->CompileDBFormula( sal_False );    // CompileFormulaString
 
     if (!bOk)
     {
         delete pNew;
         delete pUndoColl;
-        return FALSE;
+        return sal_False;
     }
 
     if (bUndo)
@@ -104,17 +104,17 @@ BOOL ScDBDocFunc::AddDBRange( const String& rName, const ScRange& rRange, BOOL /
 
     aModificator.SetDocumentModified();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDBDocFunc::DeleteDBRange( const String& rName, BOOL /* bApi */ )
+sal_Bool ScDBDocFunc::DeleteDBRange( const String& rName, sal_Bool /* bApi */ )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     ScDBCollection* pDocColl = pDoc->GetDBCollection();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     if (pDocColl->SearchName( rName, nPos ))
     {
         ScDocShellModificator aModificator( rDocShell );
@@ -123,9 +123,9 @@ BOOL ScDBDocFunc::DeleteDBRange( const String& rName, BOOL /* bApi */ )
         if (bUndo)
             pUndoColl = new ScDBCollection( *pDocColl );
 
-        pDoc->CompileDBFormula( TRUE );		// CreateFormulaString
+        pDoc->CompileDBFormula( sal_True );		// CreateFormulaString
         pDocColl->AtFree( nPos );
-        pDoc->CompileDBFormula( FALSE );	// CompileFormulaString
+        pDoc->CompileDBFormula( sal_False );	// CompileFormulaString
 
         if (bUndo)
         {
@@ -136,21 +136,21 @@ BOOL ScDBDocFunc::DeleteDBRange( const String& rName, BOOL /* bApi */ )
 
         aModificator.SetDocumentModified();
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
     return bDone;
 }
 
-BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew, BOOL /* bApi */ )
+sal_Bool ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew, sal_Bool /* bApi */ )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     ScDBCollection* pDocColl = pDoc->GetDBCollection();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
-    USHORT nPos = 0;
-    USHORT nDummy = 0;
+    sal_uInt16 nPos = 0;
+    sal_uInt16 nDummy = 0;
     if ( pDocColl->SearchName( rOld, nPos ) &&
          !pDocColl->SearchName( rNew, nDummy ) )
     {
@@ -162,15 +162,15 @@ BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew, BOOL /*
 
         ScDBCollection* pUndoColl = new ScDBCollection( *pDocColl );
 
-        pDoc->CompileDBFormula( TRUE );				// CreateFormulaString
+        pDoc->CompileDBFormula( sal_True );				// CreateFormulaString
         pDocColl->AtFree( nPos );
-        BOOL bInserted = pDocColl->Insert( pNewData );
+        sal_Bool bInserted = pDocColl->Insert( pNewData );
         if (!bInserted)								// Fehler -> alten Zustand wiederherstellen
         {
             delete pNewData;
             pDoc->SetDBCollection( pUndoColl );		// gehoert dann dem Dokument
         }
-        pDoc->CompileDBFormula( FALSE );			// CompileFormulaString
+        pDoc->CompileDBFormula( sal_False );			// CompileFormulaString
 
         if (bInserted)								// Einfuegen hat geklappt
         {
@@ -185,21 +185,21 @@ BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew, BOOL /*
 
             aModificator.SetDocumentModified();
             SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
-            bDone = TRUE;
+            bDone = sal_True;
         }
     }
 
     return bDone;
 }
 
-BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /* bApi */ )
+sal_Bool ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, sal_Bool /* bApi */ )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     ScDBCollection* pDocColl = pDoc->GetDBCollection();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     if (pDocColl->SearchName( rNewData.GetName(), nPos ))
     {
         ScDocShellModificator aModificator( rDocShell );
@@ -209,7 +209,7 @@ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /* bApi */ )
         ScRange aOldRange, aNewRange;
         pData->GetArea(aOldRange);
         rNewData.GetArea(aNewRange);
-        BOOL bAreaChanged = ( aOldRange != aNewRange );		// dann muss neu compiliert werden
+        sal_Bool bAreaChanged = ( aOldRange != aNewRange );		// dann muss neu compiliert werden
 
         ScDBCollection* pUndoColl = NULL;
         if (bUndo)
@@ -227,7 +227,7 @@ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /* bApi */ )
         }
 
         aModificator.SetDocumentModified();
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
     return bDone;
@@ -235,45 +235,45 @@ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /* bApi */ )
 
 // -----------------------------------------------------------------
 
-BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
+sal_Bool ScDBDocFunc::RepeatDB( const String& rDBName, sal_Bool bRecord, sal_Bool bApi )
 {
     //!	auch fuer ScDBFunc::RepeatDB benutzen!
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScDBCollection*	pColl = pDoc->GetDBCollection();
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     if ( pColl && pColl->SearchName( rDBName, nIndex ) )
     {
         ScDBData* pDBData = (*pColl)[nIndex];
 
         ScQueryParam aQueryParam;
         pDBData->GetQueryParam( aQueryParam );
-        BOOL bQuery = aQueryParam.GetEntry(0).bDoQuery;
+        sal_Bool bQuery = aQueryParam.GetEntry(0).bDoQuery;
 
         ScSortParam aSortParam;
         pDBData->GetSortParam( aSortParam );
-        BOOL bSort = aSortParam.bDoSort[0];
+        sal_Bool bSort = aSortParam.bDoSort[0];
 
         ScSubTotalParam aSubTotalParam;
         pDBData->GetSubTotalParam( aSubTotalParam );
-        BOOL bSubTotal = aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly;
+        sal_Bool bSubTotal = aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly;
 
         if ( bQuery || bSort || bSubTotal )
         {
-            BOOL bQuerySize = FALSE;
+            sal_Bool bQuerySize = sal_False;
             ScRange aOldQuery;
             ScRange aNewQuery;
             if (bQuery && !aQueryParam.bInplace)
             {
                 ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow,
-                                                        aQueryParam.nDestTab, TRUE );
+                                                        aQueryParam.nDestTab, sal_True );
                 if (pDest && pDest->IsDoSize())
                 {
                     pDest->GetArea( aOldQuery );
-                    bQuerySize = TRUE;
+                    bQuerySize = sal_True;
                 }
             }
 
@@ -306,22 +306,22 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
                     pTable->GetColArray()->GetRange( nOutStartCol, nOutEndCol );
                     pTable->GetRowArray()->GetRange( nOutStartRow, nOutEndRow );
 
-                    pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
+                    pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
                     pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0,
                             nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab,
-                            IDF_NONE, FALSE, pUndoDoc );
+                            IDF_NONE, sal_False, pUndoDoc );
                     pDoc->CopyToDocument( 0, static_cast<SCROW>(nOutStartRow),
                             nTab, MAXCOL, static_cast<SCROW>(nOutEndRow), nTab,
-                            IDF_NONE, FALSE, pUndoDoc );
+                            IDF_NONE, sal_False, pUndoDoc );
                 }
                 else
-                    pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
+                    pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
 
                 //	Datenbereich sichern - incl. Filter-Ergebnis
-                pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc );
+                pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, sal_False, pUndoDoc );
 
                 //	alle Formeln wegen Referenzen
-                pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc );
+                pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, sal_False, pUndoDoc );
 
                 //	DB- und andere Bereiche
                 ScRangeName* pDocRange = pDoc->GetRangeName();
@@ -336,23 +336,23 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
             {
                 //	Sortieren ohne SubTotals
 
-                aSubTotalParam.bRemoveOnly = TRUE;		// wird unten wieder zurueckgesetzt
-                DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi );
+                aSubTotalParam.bRemoveOnly = sal_True;		// wird unten wieder zurueckgesetzt
+                DoSubTotals( nTab, aSubTotalParam, NULL, sal_False, bApi );
             }
 
             if (bSort)
             {
                 pDBData->GetSortParam( aSortParam );			// Bereich kann sich geaendert haben
-                Sort( nTab, aSortParam, FALSE, FALSE, bApi );
+                Sort( nTab, aSortParam, sal_False, sal_False, bApi );
             }
             if (bQuery)
             {
                 pDBData->GetQueryParam( aQueryParam );			// Bereich kann sich geaendert haben
                 ScRange aAdvSource;
                 if (pDBData->GetAdvancedQuerySource(aAdvSource))
-                    Query( nTab, aQueryParam, &aAdvSource, FALSE, bApi );
+                    Query( nTab, aQueryParam, &aAdvSource, sal_False, bApi );
                 else
-                    Query( nTab, aQueryParam, NULL, FALSE, bApi );
+                    Query( nTab, aQueryParam, NULL, sal_False, bApi );
 
                 //	bei nicht-inplace kann die Tabelle umgestellt worden sein
 //				if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab )
@@ -361,8 +361,8 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
             if (bSubTotal)
             {
                 pDBData->GetSubTotalParam( aSubTotalParam );	// Bereich kann sich geaendert haben
-                aSubTotalParam.bRemoveOnly = FALSE;
-                DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi );
+                aSubTotalParam.bRemoveOnly = sal_False;
+                DoSubTotals( nTab, aSubTotalParam, NULL, sal_False, bApi );
             }
 
             if (bRecord)
@@ -378,7 +378,7 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
                 if (bQuerySize)
                 {
                     ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow,
-                                                            aQueryParam.nDestTab, TRUE );
+                                                            aQueryParam.nDestTab, sal_True );
                     if (pDest)
                     {
                         pDest->GetArea( aNewQuery );
@@ -400,7 +400,7 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
 
             rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
                                     PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE );
-            bDone = TRUE;
+            bDone = sal_True;
         }
         else if (!bApi)		// "Keine Operationen auszufuehren"
             rDocShell.ErrorMessage(STR_MSSG_REPEATDB_0);
@@ -411,14 +411,14 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
 
 // -----------------------------------------------------------------
 
-BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
-                            BOOL bRecord, BOOL bPaint, BOOL bApi )
+sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
+                            sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     SCTAB nSrcTab = nTab;
     ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
 
@@ -427,15 +427,15 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
     if (!pDBData)
     {
         DBG_ERROR( "Sort: keine DBData" );
-        return FALSE;
+        return sal_False;
     }
 
     ScDBData* pDestData = NULL;
     ScRange aOldDest;
-    BOOL bCopy = !rSortParam.bInplace;
+    sal_Bool bCopy = !rSortParam.bInplace;
     if ( bCopy && rSortParam.nDestCol == rSortParam.nCol1 &&
                   rSortParam.nDestRow == rSortParam.nRow1 && rSortParam.nDestTab == nTab )
-        bCopy = FALSE;
+        bCopy = sal_False;
     ScSortParam aLocalParam( rSortParam );
     if ( bCopy )
     {
@@ -444,12 +444,12 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
         {
             if (!bApi)
                 rDocShell.ErrorMessage(STR_PASTE_FULL);
-            return FALSE;
+            return sal_False;
         }
 
         nTab = rSortParam.nDestTab;
         pDestData = pDoc->GetDBAtCursor( rSortParam.nDestCol, rSortParam.nDestRow,
-                                            rSortParam.nDestTab, TRUE );
+                                            rSortParam.nDestTab, sal_True );
         if (pDestData)
             pDestData->GetArea(aOldDest);
     }
@@ -460,7 +460,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     if ( aLocalParam.bIncludePattern && pDoc->HasAttrib(
@@ -471,7 +471,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
         //	Merge-Attribute wuerden beim Sortieren durcheinanderkommen
         if (!bApi)
             rDocShell.ErrorMessage(STR_SORT_ERR_MERGED);
-        return FALSE;
+        return sal_False;
     }
 
 
@@ -479,11 +479,11 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
 
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
 
-    BOOL bRepeatQuery = FALSE;							// bestehenden Filter wiederholen?
+    sal_Bool bRepeatQuery = sal_False;							// bestehenden Filter wiederholen?
     ScQueryParam aQueryParam;
     pDBData->GetQueryParam( aQueryParam );
     if ( aQueryParam.GetEntry(0).bDoQuery )
-        bRepeatQuery = TRUE;
+        bRepeatQuery = sal_True;
 
     if (bRepeatQuery && bCopy)
     {
@@ -491,7 +491,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
                 aQueryParam.nDestCol != rSortParam.nDestCol ||
                 aQueryParam.nDestRow != rSortParam.nDestRow ||
                 aQueryParam.nDestTab != rSortParam.nDestTab )		// Query auf selben Zielbereich?
-            bRepeatQuery = FALSE;
+            bRepeatQuery = sal_False;
     }
 
     ScUndoSort* pUndoAction = 0;
@@ -502,7 +502,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
         ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         //  Zeilenhoehen immer (wegen automatischer Anpassung)
         //! auf ScBlockUndo umstellen
-        pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
+        pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
 
         /*  #i59745# Do not copy note captions to undo document. All existing
             caption objects will be repositioned while sorting which is tracked
@@ -511,7 +511,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
             existing captions) will be copied back into the source document. */
         pDoc->CopyToDocument( aLocalParam.nCol1, aLocalParam.nRow1, nTab,
                                 aLocalParam.nCol2, aLocalParam.nRow2, nTab,
-                                IDF_ALL|IDF_NOCAPTIONS, FALSE, pUndoDoc );
+                                IDF_ALL|IDF_NOCAPTIONS, sal_False, pUndoDoc );
 
         const ScRange* pR = 0;
         if (pDestData)
@@ -522,7 +522,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
                 caption objects are reinserted with drawing undo, and the cells
                 with the old notes (which still refer to the existing captions)
                 will be copied back into the source document. */
-            pDoc->CopyToDocument( aOldDest, IDF_ALL|IDF_NOCAPTIONS, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( aOldDest, IDF_ALL|IDF_NOCAPTIONS, sal_False, pUndoDoc );
             pR = &aOldDest;
         }
 
@@ -530,7 +530,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
         //!	auf ScBlockUndo umstellen
 //        if (bRepeatQuery)
             pDoc->CopyToDocument( 0, aLocalParam.nRow1, nTab, MAXCOL, aLocalParam.nRow2, nTab,
-                                    IDF_NONE, FALSE, pUndoDoc );
+                                    IDF_NONE, sal_False, pUndoDoc );
 
         ScDBCollection* pUndoDB = NULL;
         ScDBCollection* pDocDB = pDoc->GetDBCollection();
@@ -554,21 +554,21 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
                             rSortParam.nCol2,rSortParam.nRow2,nSrcTab );
         ScAddress aDest( rSortParam.nDestCol, rSortParam.nDestRow, rSortParam.nDestTab );
 
-        rDocShell.GetDocFunc().MoveBlock( aSource, aDest, FALSE, FALSE, FALSE, TRUE );
+        rDocShell.GetDocFunc().MoveBlock( aSource, aDest, sal_False, sal_False, sal_False, sal_True );
     }
 
     // #105780# don't call ScDocument::Sort with an empty SortParam (may be empty here if bCopy is set)
     if ( aLocalParam.bDoSort[0] )
         pDoc->Sort( nTab, aLocalParam, bRepeatQuery );
 
-    BOOL bSave = TRUE;
+    sal_Bool bSave = sal_True;
     if (bCopy)
     {
         ScSortParam aOldSortParam;
         pDBData->GetSortParam( aOldSortParam );
         if ( aOldSortParam.bDoSort[0] && aOldSortParam.bInplace )	// Inplace-Sortierung gemerkt?
         {
-            bSave = FALSE;
+            bSave = sal_False;
             aOldSortParam.nDestCol = rSortParam.nDestCol;
             aOldSortParam.nDestRow = rSortParam.nDestRow;
             aOldSortParam.nDestTab = rSortParam.nDestTab;
@@ -615,7 +615,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
 
     if (bPaint)
     {
-        USHORT nPaint = PAINT_GRID;
+        sal_uInt16 nPaint = PAINT_GRID;
         SCCOL nStartX = aLocalParam.nCol1;
         SCROW nStartY = aLocalParam.nRow1;
         SCCOL nEndX = aLocalParam.nCol2;
@@ -645,25 +645,25 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
 
     aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------
 
-BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
-                        const ScRange* pAdvSource, BOOL bRecord, BOOL bApi )
+sal_Bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
+                        const ScRange* pAdvSource, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScDBData* pDBData = pDoc->GetDBAtArea( nTab, rQueryParam.nCol1, rQueryParam.nRow1,
                                                     rQueryParam.nCol2, rQueryParam.nRow2 );
     if (!pDBData)
     {
         DBG_ERROR( "Query: keine DBData" );
-        return FALSE;
+        return sal_False;
     }
 
     //	Wechsel von Inplace auf nicht-Inplace, dann erst Inplace aufheben:
@@ -679,23 +679,23 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
 
             SCSIZE nEC = aOldQuery.GetEntryCount();
             for (SCSIZE i=0; i<nEC; i++)
-                aOldQuery.GetEntry(i).bDoQuery = FALSE;
-            aOldQuery.bDuplicate = TRUE;
+                aOldQuery.GetEntry(i).bDoQuery = sal_False;
+            aOldQuery.bDuplicate = sal_True;
             Query( nTab, aOldQuery, NULL, bRecord, bApi );
         }
     }
 
     ScQueryParam aLocalParam( rQueryParam );		// fuer Paint / Zielbereich
-    BOOL bCopy = !rQueryParam.bInplace; 			// kopiert wird in Table::Query
+    sal_Bool bCopy = !rQueryParam.bInplace; 			// kopiert wird in Table::Query
     ScDBData* pDestData = NULL;						// Bereich, in den kopiert wird
-    BOOL bDoSize = FALSE;							// Zielgroesse anpassen (einf./loeschen)
+    sal_Bool bDoSize = sal_False;							// Zielgroesse anpassen (einf./loeschen)
     SCCOL nFormulaCols = 0;						// nur bei bDoSize
-    BOOL bKeepFmt = FALSE;
+    sal_Bool bKeepFmt = sal_False;
     ScRange aOldDest;
     ScRange aDestTotal;
     if ( bCopy && rQueryParam.nDestCol == rQueryParam.nCol1 &&
                   rQueryParam.nDestRow == rQueryParam.nRow1 && rQueryParam.nDestTab == nTab )
-        bCopy = FALSE;
+        bCopy = sal_False;
     SCTAB nDestTab = nTab;
     if ( bCopy )
     {
@@ -705,7 +705,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
         {
             if (!bApi)
                 rDocShell.ErrorMessage(STR_PASTE_FULL);
-            return FALSE;
+            return sal_False;
         }
 
         ScEditableTester aTester( pDoc, nDestTab, aLocalParam.nCol1,aLocalParam.nRow1,
@@ -714,11 +714,11 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
         {
             if (!bApi)
                 rDocShell.ErrorMessage(aTester.GetMessageId());
-            return FALSE;
+            return sal_False;
         }
 
         pDestData = pDoc->GetDBAtCursor( rQueryParam.nDestCol, rQueryParam.nDestRow,
-                                            rQueryParam.nDestTab, TRUE );
+                                            rQueryParam.nDestTab, sal_True );
         if (pDestData)
         {
             pDestData->GetArea( aOldDest );
@@ -746,7 +746,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
             {
                 if (!bApi)
                     rDocShell.ErrorMessage(STR_MSSG_DOSUBTOTALS_2);		// kann keine Zeilen einfuegen
-                return FALSE;
+                return sal_False;
             }
         }
     }
@@ -755,14 +755,14 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
 
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
 
-    BOOL bKeepSub = FALSE;							// bestehende Teilergebnisse wiederholen?
+    sal_Bool bKeepSub = sal_False;							// bestehende Teilergebnisse wiederholen?
     ScSubTotalParam aSubTotalParam;
     if (rQueryParam.GetEntry(0).bDoQuery)			// nicht beim Aufheben
     {
         pDBData->GetSubTotalParam( aSubTotalParam );	// Teilergebnisse vorhanden?
 
         if ( aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly )
-            bKeepSub = TRUE;
+            bKeepSub = sal_True;
     }
 
     ScDocument* pUndoDoc = NULL;
@@ -774,23 +774,23 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         if (bCopy)
         {
-            pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab, FALSE, TRUE );
+            pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab, sal_False, sal_True );
             pDoc->CopyToDocument( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
                                     aLocalParam.nCol2, aLocalParam.nRow2, nDestTab,
-                                    IDF_ALL, FALSE, pUndoDoc );
+                                    IDF_ALL, sal_False, pUndoDoc );
             //	Attribute sichern, falls beim Filtern mitkopiert
 
             if (pDestData)
             {
-                pDoc->CopyToDocument( aOldDest, IDF_ALL, FALSE, pUndoDoc );
+                pDoc->CopyToDocument( aOldDest, IDF_ALL, sal_False, pUndoDoc );
                 pOld = &aOldDest;
             }
         }
         else
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
             pDoc->CopyToDocument( 0, rQueryParam.nRow1, nTab, MAXCOL, rQueryParam.nRow2, nTab,
-                                        IDF_NONE, FALSE, pUndoDoc );
+                                        IDF_NONE, sal_False, pUndoDoc );
         }
 
         ScDBCollection* pDocDB = pDoc->GetDBCollection();
@@ -817,8 +817,8 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
             aAttribRange.aEnd.SetCol( aAttribRange.aEnd.Col() + nFormulaCols );
 
             pAttribDoc = new ScDocument( SCDOCMODE_UNDO );
-            pAttribDoc->InitUndo( pDoc, nDestTab, nDestTab, FALSE, TRUE );
-            pDoc->CopyToDocument( aAttribRange, IDF_ATTRIB, FALSE, pAttribDoc );
+            pAttribDoc->InitUndo( pDoc, nDestTab, nDestTab, sal_False, sal_True );
+            pDoc->CopyToDocument( aAttribRange, IDF_ATTRIB, sal_False, pAttribDoc );
         }
 
         if ( bDoSize )
@@ -842,7 +842,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
 
             ScRange aNewDest( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
                                 aLocalParam.nCol2, aLocalParam.nRow2, nDestTab );
-            pDoc->FitBlock( aDestTotal, aNewDest, FALSE );		// FALSE - nicht loeschen
+            pDoc->FitBlock( aDestTotal, aNewDest, sal_False );		// sal_False - nicht loeschen
 
             if ( nFormulaCols > 0 )
             {
@@ -853,7 +853,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
                                   aLocalParam.nCol2+nFormulaCols, aLocalParam.nRow2, nDestTab );
                 ScRange aOldForm = aNewForm;
                 aOldForm.aEnd.SetRow( aOldDest.aEnd.Row() );
-                pDoc->FitBlock( aOldForm, aNewForm, FALSE );
+                pDoc->FitBlock( aOldForm, aNewForm, sal_False );
 
                 ScMarkData aMark;
                 aMark.SelectOneTable(nDestTab);
@@ -872,7 +872,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
             {
                 ScRange aHdrRange = aAttribRange;
                 aHdrRange.aEnd.SetRow( aHdrRange.aStart.Row() );
-                pAttribDoc->CopyToDocument( aHdrRange, IDF_ATTRIB, FALSE, pDoc );
+                pAttribDoc->CopyToDocument( aHdrRange, IDF_ATTRIB, sal_False, pDoc );
             }
 
             //	Daten
@@ -899,7 +899,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
     //	speichern: Inplace immer, sonst je nach Einstellung
     //			   alter Inplace-Filter ist ggf. schon aufgehoben
 
-    BOOL bSave = rQueryParam.bInplace || rQueryParam.bDestPers;
+    sal_Bool bSave = rQueryParam.bInplace || rQueryParam.bDestPers;
     if (bSave)													// merken
     {
         pDBData->SetQueryParam( rQueryParam );
@@ -977,31 +977,31 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
                                                 PAINT_GRID | PAINT_LEFT );
     aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------
 
-BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
-                                const ScSortParam* pForceNewSort, BOOL bRecord, BOOL bApi )
+sal_Bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
+                                const ScSortParam* pForceNewSort, sal_Bool bRecord, sal_Bool bApi )
 {
     //!	auch fuer ScDBFunc::DoSubTotals benutzen!
     //	dann bleibt aussen:
     //	- neuen Bereich (aus DBData) markieren
     //	- SelectionChanged (?)
 
-    BOOL bDo = !rParam.bRemoveOnly;							// FALSE = nur loeschen
-    BOOL bRet = FALSE;
+    sal_Bool bDo = !rParam.bRemoveOnly;							// sal_False = nur loeschen
+    sal_Bool bRet = sal_False;
 
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScDBData* pDBData = pDoc->GetDBAtArea( nTab, rParam.nCol1, rParam.nRow1,
                                                 rParam.nCol2, rParam.nRow2 );
     if (!pDBData)
     {
         DBG_ERROR( "SubTotals: keine DBData" );
-        return FALSE;
+        return sal_False;
     }
 
     ScEditableTester aTester( pDoc, nTab, 0,rParam.nRow1+1, MAXCOL,MAXROW );
@@ -1009,7 +1009,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     if (pDoc->HasAttrib( rParam.nCol1, rParam.nRow1+1, nTab,
@@ -1017,15 +1017,15 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0);	// nicht in zusammengefasste einfuegen
-        return FALSE;
+        return sal_False;
     }
 
-    BOOL bOk = TRUE;
-    BOOL bDelete = FALSE;
+    sal_Bool bOk = sal_True;
+    sal_Bool bDelete = sal_False;
     if (rParam.bReplace)
         if (pDoc->TestRemoveSubTotals( nTab, rParam ))
         {
-            bDelete = TRUE;
+            bDelete = sal_True;
             bOk = ( MessBox( rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
                 // "StarCalc" "Daten loeschen?"
                 ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
@@ -1047,7 +1047,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
 
         if (bRecord)										// alte Daten sichern
         {
-            BOOL bOldFilter = bDo && rParam.bDoSort;
+            sal_Bool bOldFilter = bDo && rParam.bDoSort;
 
             nTabCount = pDoc->GetTableCount();
             pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
@@ -1062,20 +1062,20 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
                 pTable->GetColArray()->GetRange( nOutStartCol, nOutEndCol );
                 pTable->GetRowArray()->GetRange( nOutStartRow, nOutEndRow );
 
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
-                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
+                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
             }
             else
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, bOldFilter );
 
             //	Datenbereich sichern - incl. Filter-Ergebnis
             pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab,
-                                    IDF_ALL, FALSE, pUndoDoc );
+                                    IDF_ALL, sal_False, pUndoDoc );
 
             //	alle Formeln wegen Referenzen
             pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
-                                        IDF_FORMULA, FALSE, pUndoDoc );
+                                        IDF_FORMULA, sal_False, pUndoDoc );
 
             //	DB- und andere Bereiche
             ScRangeName* pDocRange = pDoc->GetRangeName();
@@ -1093,7 +1093,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
 
         if (rParam.bReplace)
             pDoc->RemoveSubTotals( nTab, aNewParam );
-        BOOL bSuccess = TRUE;
+        sal_Bool bSuccess = sal_True;
         if (bDo)
         {
             // Sortieren
@@ -1107,7 +1107,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
                 ScSortParam aOldSort;
                 pDBData->GetSortParam( aOldSort );
                 ScSortParam aSortParam( aNewParam, pForceNewSort ? *pForceNewSort : aOldSort );
-                Sort( nTab, aSortParam, FALSE, FALSE, bApi );
+                Sort( nTab, aSortParam, sal_False, sal_False, bApi );
             }
 
             bSuccess = pDoc->DoSubTotals( nTab, aNewParam );
@@ -1149,7 +1149,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
 
 //==================================================================
 
-BOOL lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange& rExcept )
+sal_Bool lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange& rExcept )
 {
     ScCellIterator aIter( pDoc, rRange );
     ScBaseCell* pCell = aIter.GetFirst();
@@ -1158,23 +1158,23 @@ BOOL lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange& rE
         if ( !pCell->IsBlank() )      // real content?
         {
             if ( !rExcept.In( ScAddress( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ) ) )
-                return FALSE;		// cell found
+                return sal_False;		// cell found
         }
         pCell = aIter.GetNext();
     }
 
-    return TRUE;		// nothing found - empty
+    return sal_True;		// nothing found - empty
 }
 
-BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
-                                        BOOL bRecord, BOOL bApi, BOOL bAllowMove )
+sal_Bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
+                                        sal_Bool bRecord, sal_Bool bApi, sal_Bool bAllowMove )
 {
     ScDocShellModificator aModificator( rDocShell );
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
 
-    BOOL bDone = FALSE;
-    BOOL bUndoSelf = FALSE;
-    USHORT nErrId = 0;
+    sal_Bool bDone = sal_False;
+    sal_Bool bUndoSelf = sal_False;
+    sal_uInt16 nErrId = 0;
 
     ScDocument* pOldUndoDoc = NULL;
     ScDocument* pNewUndoDoc = NULL;
@@ -1184,7 +1184,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
 
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     if ( !rDocShell.IsEditable() || pDoc->GetChangeTrack() )
     {
         //	not recorded -> disallow
@@ -1225,7 +1225,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
             {
                 pOldUndoDoc = new ScDocument( SCDOCMODE_UNDO );
                 pOldUndoDoc->InitUndo( pDoc, nTab, nTab );
-                pDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pOldUndoDoc );
+                pDoc->CopyToDocument( aRange, IDF_ALL, sal_False, pOldUndoDoc );
             }
 
             pDoc->DeleteAreaTab( aRange.aStart.Col(), aRange.aStart.Row(),
@@ -1241,7 +1241,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
             rDocShell.PostPaint( aRange.aStart.Col(), aRange.aStart.Row(), nTab,
                                  aRange.aEnd.Col(),   aRange.aEnd.Row(),   nTab,
                                  PAINT_GRID );
-            bDone = TRUE;
+            bDone = sal_True;
         }
         else if ( pNewObj )
         {
@@ -1253,7 +1253,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                     SCTAB nTab = aRange.aStart.Tab();
                     pOldUndoDoc = new ScDocument( SCDOCMODE_UNDO );
                     pOldUndoDoc->InitUndo( pDoc, nTab, nTab );
-                    pDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pOldUndoDoc );
+                    pDoc->CopyToDocument( aRange, IDF_ALL, sal_False, pOldUndoDoc );
                 }
 
                 if ( pNewObj == pOldObj )
@@ -1285,7 +1285,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                 if ( pDoc->GetDPCollection()->GetByName(pDestObj->GetName()) )
                     pDestObj->SetName( String() );      // ignore the invalid name, create a new name below
 
-                pDestObj->SetAlive(TRUE);
+                pDestObj->SetAlive(sal_True);
                 if ( !pDoc->GetDPCollection()->InsertNewTable(pDestObj) )
                 {
                     DBG_ERROR("cannot insert DPObject");
@@ -1306,7 +1306,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                 if ( !pDestObj->GetName().Len() )
                     pDestObj->SetName( pDoc->GetDPCollection()->CreateNewName() );
 
-                BOOL bOverflow = FALSE;
+                sal_Bool bOverflow = sal_False;
                 ScRange aNewOut = pDestObj->GetNewOutputRange( bOverflow );
 
                 //!	test for overlap with other data pilot tables
@@ -1320,7 +1320,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                         aNewOut.aStart.SetRow( aOldRange.aStart.Row() );
                         aNewOut.aEnd.SetRow( aNewOut.aEnd.Row()+nDiff );
                         if( !ValidRow( aNewOut.aStart.Row() ) || !ValidRow( aNewOut.aEnd.Row() ) )
-                            bOverflow = TRUE;
+                            bOverflow = sal_True;
                     }
                 }
 
@@ -1328,7 +1328,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                 {
                     //	like with STR_PROTECTIONERR, use undo to reverse everything
                     DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" );
-                    bUndoSelf = TRUE;
+                    bUndoSelf = sal_True;
                     nErrId = STR_PIVOT_ERROR;
                 }
                 else
@@ -1342,7 +1342,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                         //	quick solution: proceed to end, use undo action
                         //	to reverse everything:
                         DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" );
-                        bUndoSelf = TRUE;
+                        bUndoSelf = sal_True;
                         nErrId = aTester.GetMessageId();
                     }
                 }
@@ -1350,7 +1350,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                 //	test if new output area is empty except for old area
                 if ( !bApi )
                 {
-                    BOOL bEmpty;
+                    sal_Bool bEmpty;
                     if ( pOldObj )	// OutRange of pOldObj (pDestObj) is still old area
                         bEmpty = lcl_EmptyExcept( pDoc, aNewOut, pOldObj->GetOutRange() );
                     else
@@ -1366,7 +1366,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                         {
                             //!	like above (not editable), use undo to reverse everything
                             DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" );
-                            bUndoSelf = TRUE;
+                            bUndoSelf = sal_True;
                         }
                     }
                 }
@@ -1376,13 +1376,13 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
                     SCTAB nTab = aNewOut.aStart.Tab();
                     pNewUndoDoc = new ScDocument( SCDOCMODE_UNDO );
                     pNewUndoDoc->InitUndo( pDoc, nTab, nTab );
-                    pDoc->CopyToDocument( aNewOut, IDF_ALL, FALSE, pNewUndoDoc );
+                    pDoc->CopyToDocument( aNewOut, IDF_ALL, sal_False, pNewUndoDoc );
                 }
 
                 pDestObj->Output( aNewOut.aStart );
 
                 rDocShell.PostPaintGridAll();			//! only necessary parts
-                bDone = TRUE;
+                bDone = sal_True;
             }
         }
         // else nothing (no old, no new)
@@ -1403,7 +1403,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
 
             pAction->Undo();
             delete pAction;
-            bDone = FALSE;
+            bDone = sal_False;
         }
         else
             rDocShell.GetUndoManager()->AddUndoAction( pAction );
@@ -1432,8 +1432,8 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
 //		Datenbank-Import...
 
 void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName,
-        const String& rTableName, const String& rStatement, BOOL bNative,
-        BYTE nType, const ::com::sun::star::uno::Reference<
+        const String& rTableName, const String& rStatement, sal_Bool bNative,
+        sal_uInt8 nType, const ::com::sun::star::uno::Reference<
         ::com::sun::star::sdbc::XResultSet >& xResultSet,
         const SbaSelectionList* pSelection )
 {
@@ -1443,13 +1443,13 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName,
     ScDBCollection& rDBColl = *pDoc->GetDBCollection();
     ScDBData* pData = NULL;
     ScImportParam aImportParam;
-    BOOL bFound = FALSE;
-    USHORT nCount = rDBColl.GetCount();
-    for (USHORT i=0; i<nCount && !bFound; i++)
+    sal_Bool bFound = sal_False;
+    sal_uInt16 nCount = rDBColl.GetCount();
+    for (sal_uInt16 i=0; i<nCount && !bFound; i++)
     {
         pData = rDBColl[i];
         if (pData->GetName() == rTarget)
-            bFound = TRUE;
+            bFound = sal_True;
     }
     if (!bFound)
     {
@@ -1465,15 +1465,15 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName,
     pData->GetArea( nTab, nDummyCol,nDummyRow,nDummyCol,nDummyRow );
     pData->GetImportParam( aImportParam );
 
-    BOOL bSql = ( rStatement.Len() != 0 );
+    sal_Bool bSql = ( rStatement.Len() != 0 );
 
     aImportParam.aDBName	= rDBName;
     aImportParam.bSql		= bSql;
     aImportParam.aStatement = bSql ? rStatement : rTableName;
     aImportParam.bNative	= bNative;
     aImportParam.nType		= nType;
-    aImportParam.bImport	= TRUE;
-    BOOL bContinue = DoImport( nTab, aImportParam, xResultSet, pSelection, TRUE );
+    aImportParam.bImport	= sal_True;
+    sal_Bool bContinue = DoImport( nTab, aImportParam, xResultSet, pSelection, sal_True );
 
     //	DB-Operationen wiederholen
 
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 6a91431c1..dffad5748 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -118,15 +118,15 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram
 
 // -----------------------------------------------------------------
 
-BOOL ScDBDocFunc::DoImportUno( const ScAddress& rPos,
+sal_Bool ScDBDocFunc::DoImportUno( const ScAddress& rPos,
                                 const uno::Sequence<beans::PropertyValue>& aArgs )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     ScImportParam aImParam;
     aImParam.nCol1 = aImParam.nCol2 = rPos.Col();
     aImParam.nRow1 = aImParam.nRow2 = rPos.Row();
-    aImParam.bImport = TRUE;
+    aImParam.bImport = sal_True;
 
     uno::Reference<sdbc::XResultSet> xResSet;
     uno::Sequence<uno::Any> aSelection;
@@ -156,7 +156,7 @@ BOOL ScDBDocFunc::DoImportUno( const ScAddress& rPos,
             if ( rProp.Value >>= nType )
             {
                 aImParam.bSql = ( nType == sdb::CommandType::COMMAND );
-                aImParam.nType = sal::static_int_cast<BYTE>( ( nType == sdb::CommandType::QUERY ) ? ScDbQuery : ScDbTable );
+                aImParam.nType = sal::static_int_cast<sal_uInt8>( ( nType == sdb::CommandType::QUERY ) ? ScDbQuery : ScDbTable );
                 // nType is ignored if bSql is set
             }
         }
@@ -179,10 +179,10 @@ BOOL ScDBDocFunc::DoImportUno( const ScAddress& rPos,
             aList.Insert( (void*)nEntry, LIST_APPEND );
     }
 
-    BOOL bAddrInsert = FALSE;		//!???
+    sal_Bool bAddrInsert = sal_False;		//!???
     if ( bAddrInsert )
     {
-        bDone = DoImport( rPos.Tab(), aImParam, xResSet, &aList, TRUE, bAddrInsert );
+        bDone = DoImport( rPos.Tab(), aImParam, xResSet, &aList, sal_True, bAddrInsert );
     }
     else
     {
@@ -203,7 +203,7 @@ BOOL ScDBDocFunc::DoImportUno( const ScAddress& rPos,
 
         UpdateImport( sTarget, aImParam.aDBName, aTableName, aStatement,
                 aImParam.bNative, aImParam.nType, xResSet, &aList );
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
     return bDone;
@@ -211,14 +211,14 @@ BOOL ScDBDocFunc::DoImportUno( const ScAddress& rPos,
 
 // -----------------------------------------------------------------
 
-BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
+sal_Bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         const uno::Reference< sdbc::XResultSet >& xResultSet,
-        const SbaSelectionList* pSelection, BOOL bRecord, BOOL bAddrInsert )
+        const SbaSelectionList* pSelection, sal_Bool bRecord, sal_Bool bAddrInsert )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScDBData* pDBData = 0;
     if ( !bAddrInsert )
@@ -228,7 +228,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         if (!pDBData)
         {
             DBG_ERROR( "DoImport: no DBData" );
-            return FALSE;
+            return sal_False;
         }
     }
 
@@ -237,10 +237,10 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         pWaitWin->EnterWait();
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
-    BOOL bApi = FALSE;						//! pass as argument
-    BOOL bTruncated = FALSE;				// for warning
-    USHORT nErrStringId = 0;
+    sal_Bool bSuccess = sal_False;
+    sal_Bool bApi = sal_False;						//! pass as argument
+    sal_Bool bTruncated = sal_False;				// for warning
+    sal_uInt16 nErrStringId = 0;
     String aErrorMessage;
 
     SCCOL nCol = rParam.nCol1;
@@ -249,23 +249,23 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
     SCROW nEndRow = nRow;
     long i;
 
-    BOOL bDoSelection = FALSE;
-    BOOL bRealSelection = FALSE;			// TRUE if not everything is selected
-    ULONG nListPos = 0;
-    ULONG nRowsRead = 0;
-    ULONG nListCount = 0;
+    sal_Bool bDoSelection = sal_False;
+    sal_Bool bRealSelection = sal_False;			// sal_True if not everything is selected
+    sal_uLong nListPos = 0;
+    sal_uLong nRowsRead = 0;
+    sal_uLong nListCount = 0;
 
     //	-1 is special
     if ( pSelection && pSelection->Count() && (long)pSelection->GetObject(0) != -1L )
     {
-        bDoSelection = TRUE;
+        bDoSelection = sal_True;
         nListCount = pSelection->Count();
     }
 
     // ImportDoc - also used for Redo
     ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO );
     pImportDoc->InitUndo( pDoc, nTab, nTab );
-    ScColumn::bDoubleAlloc = TRUE;
+    ScColumn::bDoubleAlloc = sal_True;
 
     //
     //	get data from database into import document
@@ -276,7 +276,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         //	progress bar
         //	only text (title is still needed, for the cancel button)
         ScProgress aProgress( &rDocShell, ScGlobal::GetRscString(STR_UNDO_IMPORTDATA), 0 );
-        USHORT nInserted = 0;
+        sal_uInt16 nInserted = 0;
 
         uno::Reference<sdbc::XRowSet> xRowSet = uno::Reference<sdbc::XRowSet>(
                 xResultSet, uno::UNO_QUERY );
@@ -373,7 +373,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
                     ++nRow;
                 }
 
-                BOOL bEnd = FALSE;
+                sal_Bool bEnd = sal_False;
                 if ( !bDoSelection )
                     xRowSet->beforeFirst();
                 while ( !bEnd )
@@ -381,23 +381,23 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
                     //	skip rows that are not selected
                     if ( !bDoSelection )
                     {
-                        if ( (bEnd = !xRowSet->next()) == FALSE )
+                        if ( (bEnd = !xRowSet->next()) == sal_False )
                             ++nRowsRead;
                     }
                     else
                     {
                         if (nListPos < nListCount)
                         {
-                            ULONG nNextRow = (ULONG) pSelection->GetObject(nListPos);
+                            sal_uLong nNextRow = (sal_uLong) pSelection->GetObject(nListPos);
                             if ( nRowsRead+1 < nNextRow )
-                                bRealSelection = TRUE;
+                                bRealSelection = sal_True;
                             bEnd = !xRowSet->absolute(nRowsRead = nNextRow);
                             ++nListPos;
                         }
                         else
                         {
                             bRealSelection = xRowSet->next();
-                            bEnd = TRUE; // more data available but not used
+                            bEnd = sal_True; // more data available but not used
                         }
                     }
 
@@ -427,21 +427,21 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
 
                                 if (!aProgress.SetStateText( 0, aText ))	// stopped by user?
                                 {
-                                    bEnd = TRUE;
-                                    bSuccess = FALSE;
+                                    bEnd = sal_True;
+                                    bSuccess = sal_False;
                                     nErrStringId = STR_DATABASE_ABORTED;
                                 }
                             }
                         }
                         else		// past the end of the spreadsheet
                         {
-                            bEnd = TRUE;			// don't continue
-                            bTruncated = TRUE;		// warning flag
+                            bEnd = sal_True;			// don't continue
+                            bTruncated = sal_True;		// warning flag
                         }
                     }
                 }
 
-                bSuccess = TRUE;
+                bSuccess = sal_True;
             }
 
             if ( bDispose )
@@ -457,15 +457,15 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         DBG_ERROR("Unexpected exception in database");
     }
 
-    ScColumn::bDoubleAlloc = FALSE;
+    ScColumn::bDoubleAlloc = sal_False;
     pImportDoc->DoColResize( nTab, rParam.nCol1,nEndCol, 0 );
 
     //
     //	test for cell protection
     //
 
-    BOOL bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt();
-    BOOL bMoveCells = !bAddrInsert && pDBData->IsDoSize();
+    sal_Bool bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt();
+    sal_Bool bMoveCells = !bAddrInsert && pDBData->IsDoSize();
     SCCOL nFormulaCols = 0;	// columns to be filled with formulas
     if (bMoveCells && nEndCol == rParam.nCol2)
     {
@@ -488,12 +488,12 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         if ( !aTester.IsEditable() )
         {
             nErrStringId = aTester.GetMessageId();
-            bSuccess = FALSE;
+            bSuccess = sal_False;
         }
         else if ( pDoc->GetChangeTrack() != NULL )
         {
             nErrStringId = STR_PROTECTIONERR;
-            bSuccess = FALSE;
+            bSuccess = sal_False;
         }
     }
 
@@ -506,7 +506,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         if (!pDoc->CanFitBlock( aOld, aNew ))
         {
             nErrStringId = STR_MSSG_DOSUBTOTALS_2;		// can't insert cells
-            bSuccess = FALSE;
+            bSuccess = sal_False;
         }
     }
 
@@ -526,7 +526,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
             pImportDoc->DeleteAreaTab( 0,0, MAXCOL,MAXROW, nTab, IDF_ATTRIB );
             pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab,
                                     nMinEndCol, rParam.nRow1, nTab,
-                                    IDF_ATTRIB, FALSE, pImportDoc );
+                                    IDF_ATTRIB, sal_False, pImportDoc );
 
             SCROW nDataStartRow = rParam.nRow1+1;
             for (SCCOL nCopyCol=rParam.nCol1; nCopyCol<=nMinEndCol; nCopyCol++)
@@ -546,7 +546,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         if (pDoc->IsTabProtected(nTab))
         {
             ScPatternAttr aPattern(pImportDoc->GetPool());
-            aPattern.GetItemSet().Put( ScProtectionAttr( FALSE,FALSE,FALSE,FALSE ) );
+            aPattern.GetItemSet().Put( ScProtectionAttr( sal_False,sal_False,sal_False,sal_False ) );
             pImportDoc->ApplyPatternAreaTab( 0,0,MAXCOL,MAXROW, nTab, aPattern );
         }
 
@@ -579,15 +579,15 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
             //	nFormulaCols is set only if column count is unchanged
             pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab,
                                     nEndCol+nFormulaCols, nEndRow, nTab,
-                                    nCopyFlags, FALSE, pUndoDoc );
+                                    nCopyFlags, sal_False, pUndoDoc );
             if ( rParam.nCol2 > nEndCol )
                 pDoc->CopyToDocument( nEndCol+1, rParam.nRow1, nTab,
                                         nUndoEndCol, nUndoEndRow, nTab,
-                                        nCopyFlags, FALSE, pUndoDoc );
+                                        nCopyFlags, sal_False, pUndoDoc );
             if ( rParam.nRow2 > nEndRow )
                 pDoc->CopyToDocument( rParam.nCol1, nEndRow+1, nTab,
                                         nUndoEndCol+nFormulaCols, nUndoEndRow, nTab,
-                                        nCopyFlags, FALSE, pUndoDoc );
+                                        nCopyFlags, sal_False, pUndoDoc );
         }
 
         //
@@ -607,7 +607,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
                             rParam.nCol2+nFormulaCols, rParam.nRow2, nTab );
             ScRange aNew( rParam.nCol1, rParam.nRow1, nTab,
                             nEndCol+nFormulaCols, nEndRow, nTab );
-            pDoc->FitBlock( aOld, aNew, FALSE );		// Formeln nicht loeschen
+            pDoc->FitBlock( aOld, aNew, sal_False );		// Formeln nicht loeschen
         }
         else if ( nEndCol < rParam.nCol2 )		// DeleteArea calls PutInOrder
             pDoc->DeleteArea( nEndCol+1, rParam.nRow1, rParam.nCol2, rParam.nRow2,
@@ -617,12 +617,12 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         pDoc->DeleteAreaTab( rParam.nCol1, rParam.nRow1, nEndCol, nEndRow, nTab, IDF_CONTENTS & ~IDF_NOTE );
 
         //	#41216# remove each column from ImportDoc after copying to reduce memory usage
-        BOOL bOldAutoCalc = pDoc->GetAutoCalc();
-        pDoc->SetAutoCalc( FALSE );				// outside of the loop
+        sal_Bool bOldAutoCalc = pDoc->GetAutoCalc();
+        pDoc->SetAutoCalc( sal_False );				// outside of the loop
         for (SCCOL nCopyCol = rParam.nCol1; nCopyCol <= nEndCol; nCopyCol++)
         {
             pImportDoc->CopyToDocument( nCopyCol, rParam.nRow1, nTab, nCopyCol, nEndRow, nTab,
-                                        IDF_ALL, FALSE, pDoc );
+                                        IDF_ALL, sal_False, pDoc );
             pImportDoc->DeleteAreaTab( nCopyCol, rParam.nRow1, nCopyCol, nEndRow, nTab, IDF_CONTENTS );
             pImportDoc->DoColResize( nTab, nCopyCol, nCopyCol, 0 );
         }
@@ -633,7 +633,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
             if (bKeepFormat)			// formats for formulas
                 pImportDoc->CopyToDocument( nEndCol+1, rParam.nRow1, nTab,
                                             nEndCol+nFormulaCols, nEndRow, nTab,
-                                            IDF_ATTRIB, FALSE, pDoc );
+                                            IDF_ATTRIB, sal_False, pDoc );
             // fill formulas
             ScMarkData aMark;
             aMark.SelectOneTable(nTab);
@@ -656,8 +656,8 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         if( !bAddrInsert )		// update database range
         {
             pDBData->SetImportParam( rParam );
-            pDBData->SetHeader( TRUE );
-            pDBData->SetByRow( TRUE );
+            pDBData->SetHeader( sal_True );
+            pDBData->SetByRow( sal_True );
             pDBData->SetArea( nTab, rParam.nCol1,rParam.nRow1, nEndCol,nEndRow );
             pDBData->SetImportSelection( bRealSelection );
             pDoc->CompileDBFormula();
@@ -671,7 +671,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
             if (nFormulaCols > 0)					// include filled formulas for redo
                 pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab,
                                         nEndCol+nFormulaCols, nEndRow, nTab,
-                                        IDF_ALL & ~IDF_NOTE, FALSE, pRedoDoc );
+                                        IDF_ALL & ~IDF_NOTE, sal_False, pRedoDoc );
 
             ScDBData* pRedoDBData = pDBData ? new ScDBData( *pDBData ) : NULL;
 
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 6e7c3fa2f..2d4b71370 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -126,7 +126,7 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction )
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
         if (pDoc->IsStreamValid(nTab))
-            pDoc->SetStreamValid(nTab, FALSE);
+            pDoc->SetStreamValid(nTab, sal_False);
 
     return 0;
 }
@@ -148,17 +148,17 @@ void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange )
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::AdjustRowHeight( const ScRange& rRange, BOOL bPaint )
+sal_Bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, sal_Bool bPaint )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if ( pDoc->IsImportingXML() )
     {
         //	for XML import, all row heights are updated together after importing
-        return FALSE;
+        return sal_False;
     }
     if ( !pDoc->IsAdjustHeightEnabled() )
     {
-        return FALSE;
+        return sal_False;
     }
 
     SCTAB nTab      = rRange.aStart.Tab();
@@ -168,8 +168,8 @@ BOOL ScDocFunc::AdjustRowHeight( const ScRange& rRange, BOOL bPaint )
     ScSizeDeviceProvider aProv( &rDocShell );
     Fraction aOne(1,1);
 
-    BOOL bChanged = pDoc->SetOptimalHeight( nStartRow, nEndRow, nTab, 0, aProv.GetDevice(),
-                                            aProv.GetPPTX(), aProv.GetPPTY(), aOne, aOne, FALSE );
+    sal_Bool bChanged = pDoc->SetOptimalHeight( nStartRow, nEndRow, nTab, 0, aProv.GetDevice(),
+                                            aProv.GetPPTX(), aProv.GetPPTY(), aOne, aOne, sal_False );
 
     if ( bPaint && bChanged )
         rDocShell.PostPaint( 0, nStartRow, nTab, MAXCOL, MAXROW, nTab,
@@ -181,13 +181,13 @@ BOOL ScDocFunc::AdjustRowHeight( const ScRange& rRange, BOOL bPaint )
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::DetectiveAddPred(const ScAddress& rPos)
+sal_Bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos)
 {
     ScDocShellModificator aModificator( rDocShell );
 
     rDocShell.MakeDrawLayer();
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     SCCOL nCol = rPos.Col();
     SCROW nRow = rPos.Row();
@@ -195,7 +195,7 @@ BOOL ScDocFunc::DetectiveAddPred(const ScAddress& rPos)
 
     if (bUndo)
         pModel->BeginCalcUndo();
-    BOOL bDone = ScDetectiveFunc( pDoc,nTab ).ShowPred( nCol, nRow );
+    sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowPred( nCol, nRow );
     SdrUndoGroup* pUndo = NULL;
     if (bUndo)
         pUndo = pModel->GetCalcUndo();
@@ -219,14 +219,14 @@ BOOL ScDocFunc::DetectiveAddPred(const ScAddress& rPos)
     return bDone;
 }
 
-BOOL ScDocFunc::DetectiveDelPred(const ScAddress& rPos)
+sal_Bool ScDocFunc::DetectiveDelPred(const ScAddress& rPos)
 {
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
     ScDocShellModificator aModificator( rDocShell );
 
@@ -236,7 +236,7 @@ BOOL ScDocFunc::DetectiveDelPred(const ScAddress& rPos)
 
     if (bUndo)
         pModel->BeginCalcUndo();
-    BOOL bDone = ScDetectiveFunc( pDoc,nTab ).DeletePred( nCol, nRow );
+    sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeletePred( nCol, nRow );
     SdrUndoGroup* pUndo = NULL;
     if (bUndo)
         pUndo = pModel->GetCalcUndo();
@@ -260,14 +260,14 @@ BOOL ScDocFunc::DetectiveDelPred(const ScAddress& rPos)
     return bDone;
 }
 
-BOOL ScDocFunc::DetectiveAddSucc(const ScAddress& rPos)
+sal_Bool ScDocFunc::DetectiveAddSucc(const ScAddress& rPos)
 {
     ScDocShellModificator aModificator( rDocShell );
 
     rDocShell.MakeDrawLayer();
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     SCCOL nCol = rPos.Col();
     SCROW nRow = rPos.Row();
@@ -275,7 +275,7 @@ BOOL ScDocFunc::DetectiveAddSucc(const ScAddress& rPos)
 
     if (bUndo)
         pModel->BeginCalcUndo();
-    BOOL bDone = ScDetectiveFunc( pDoc,nTab ).ShowSucc( nCol, nRow );
+    sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowSucc( nCol, nRow );
     SdrUndoGroup* pUndo = NULL;
     if (bUndo)
         pUndo = pModel->GetCalcUndo();
@@ -299,14 +299,14 @@ BOOL ScDocFunc::DetectiveAddSucc(const ScAddress& rPos)
     return bDone;
 }
 
-BOOL ScDocFunc::DetectiveDelSucc(const ScAddress& rPos)
+sal_Bool ScDocFunc::DetectiveDelSucc(const ScAddress& rPos)
 {
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
     ScDocShellModificator aModificator( rDocShell );
 
@@ -316,7 +316,7 @@ BOOL ScDocFunc::DetectiveDelSucc(const ScAddress& rPos)
 
     if (bUndo)
         pModel->BeginCalcUndo();
-    BOOL bDone = ScDetectiveFunc( pDoc,nTab ).DeleteSucc( nCol, nRow );
+    sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteSucc( nCol, nRow );
     SdrUndoGroup* pUndo = NULL;
     if (bUndo)
         pUndo = pModel->GetCalcUndo();
@@ -340,14 +340,14 @@ BOOL ScDocFunc::DetectiveDelSucc(const ScAddress& rPos)
     return bDone;
 }
 
-BOOL ScDocFunc::DetectiveAddError(const ScAddress& rPos)
+sal_Bool ScDocFunc::DetectiveAddError(const ScAddress& rPos)
 {
     ScDocShellModificator aModificator( rDocShell );
 
     rDocShell.MakeDrawLayer();
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     SCCOL nCol = rPos.Col();
     SCROW nRow = rPos.Row();
@@ -355,7 +355,7 @@ BOOL ScDocFunc::DetectiveAddError(const ScAddress& rPos)
 
     if (bUndo)
         pModel->BeginCalcUndo();
-    BOOL bDone = ScDetectiveFunc( pDoc,nTab ).ShowError( nCol, nRow );
+    sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowError( nCol, nRow );
     SdrUndoGroup* pUndo = NULL;
     if (bUndo)
         pUndo = pModel->GetCalcUndo();
@@ -379,14 +379,14 @@ BOOL ScDocFunc::DetectiveAddError(const ScAddress& rPos)
     return bDone;
 }
 
-BOOL ScDocFunc::DetectiveMarkInvalid(SCTAB nTab)
+sal_Bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab)
 {
     ScDocShellModificator aModificator( rDocShell );
 
     rDocShell.MakeDrawLayer();
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
 
     Window* pWaitWin = rDocShell.GetActiveDialogParent();
@@ -394,8 +394,8 @@ BOOL ScDocFunc::DetectiveMarkInvalid(SCTAB nTab)
         pWaitWin->EnterWait();
     if (bUndo)
         pModel->BeginCalcUndo();
-    BOOL bOverflow;
-    BOOL bDone = ScDetectiveFunc( pDoc,nTab ).MarkInvalid( bOverflow );
+    sal_Bool bOverflow;
+    sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).MarkInvalid( bOverflow );
     SdrUndoGroup* pUndo = NULL;
     if (bUndo)
         pUndo = pModel->GetCalcUndo();
@@ -421,20 +421,20 @@ BOOL ScDocFunc::DetectiveMarkInvalid(SCTAB nTab)
     return bDone;
 }
 
-BOOL ScDocFunc::DetectiveDelAll(SCTAB nTab)
+sal_Bool ScDocFunc::DetectiveDelAll(SCTAB nTab)
 {
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
-        return FALSE;
+        return sal_False;
 
     ScDocShellModificator aModificator( rDocShell );
 
     if (bUndo)
         pModel->BeginCalcUndo();
-    BOOL bDone = ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_DETECTIVE );
+    sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_DETECTIVE );
     SdrUndoGroup* pUndo = NULL;
     if (bUndo)
         pUndo = pModel->GetCalcUndo();
@@ -463,12 +463,12 @@ BOOL ScDocFunc::DetectiveDelAll(SCTAB nTab)
     return bDone;
 }
 
-BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
+sal_Bool ScDocFunc::DetectiveRefresh( sal_Bool bAutomatic )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     ScDetOpList* pList = pDoc->GetDetOpList();
     if ( pList && pList->Count() )
     {
@@ -485,8 +485,8 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
 
         //	Wiederholen
 
-        USHORT nCount = pList->Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pList->Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ScDetOpData* pData = (*pList)[i];
             if (pData)
@@ -531,45 +531,45 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
             }
         }
         rDocShell.SetDrawModified();
-        bDone = TRUE;
+        bDone = sal_True;
     }
     return bDone;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
-                                    BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags,
+                                    sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
     {
         DBG_ERROR("ScDocFunc::DeleteContents ohne Markierung");
-        return FALSE;
+        return sal_False;
     }
 
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScEditableTester aTester( pDoc, rMark );
     if (!aTester.IsEditable())
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     ScRange aMarkRange;
-    BOOL bSimple = FALSE;
+    sal_Bool bSimple = sal_False;
 
     ScMarkData aMultiMark = rMark;
-    aMultiMark.SetMarking(FALSE);		// fuer MarkToMulti
+    aMultiMark.SetMarking(sal_False);		// fuer MarkToMulti
 
     ScDocument* pUndoDoc = NULL;
-    BOOL bMulti = !bSimple && aMultiMark.IsMultiMarked();
+    sal_Bool bMulti = !bSimple && aMultiMark.IsMultiMarked();
     if (!bSimple)
     {
         aMultiMark.MarkToMulti();
@@ -578,22 +578,22 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
     ScRange aExtendedRange(aMarkRange);
     if (!bSimple)
     {
-        if ( pDoc->ExtendMerge( aExtendedRange, TRUE ) )
-            bMulti = FALSE;
+        if ( pDoc->ExtendMerge( aExtendedRange, sal_True ) )
+            bMulti = sal_False;
     }
 
     // keine Objekte auf geschuetzten Tabellen
-    BOOL bObjects = FALSE;
+    sal_Bool bObjects = sal_False;
     if ( nFlags & IDF_OBJECTS )
     {
-        bObjects = TRUE;
+        bObjects = sal_True;
         SCTAB nTabCount = pDoc->GetTableCount();
         for (SCTAB nTab=0; nTab<nTabCount; nTab++)
             if (aMultiMark.GetTableSelect(nTab) && pDoc->IsTabProtected(nTab))
-                bObjects = FALSE;
+                bObjects = sal_False;
     }
 
-    USHORT nExtFlags = 0;		// extra flags are needed only if attributes are deleted
+    sal_uInt16 nExtFlags = 0;		// extra flags are needed only if attributes are deleted
     if ( nFlags & IDF_ATTRIB )
         rDocShell.UpdatePaintExt( nExtFlags, aMarkRange );
 
@@ -624,7 +624,7 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
 
         //	bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument
         //	nur mit IDF_HARDATTR zu langsam ist:
-        USHORT nUndoDocFlags = nFlags;
+        sal_uInt16 nUndoDocFlags = nFlags;
         if (nFlags & IDF_ATTRIB)
             nUndoDocFlags |= IDF_ATTRIB;
         if (nFlags & IDF_EDITATTR)			// Edit-Engine-Attribute
@@ -674,31 +674,31 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
     }
 #endif
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
-                                    BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
+                                    sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScEditableTester aTester( pDoc, rMark );
     if (!aTester.IsEditable())
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     ScRange aMarkRange;
     ScMarkData aMultiMark = rMark;
-    aMultiMark.SetMarking(FALSE);		// for MarkToMulti
+    aMultiMark.SetMarking(sal_False);		// for MarkToMulti
     aMultiMark.MarkToMulti();
     aMultiMark.GetMultiMarkArea( aMarkRange );
 
@@ -716,7 +716,7 @@ BOOL ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
         ScRange aCopyRange = aMarkRange;
         aCopyRange.aStart.SetTab(0);
         aCopyRange.aEnd.SetTab(nTabCount-1);
-        pDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, TRUE, pUndoDoc, &aMultiMark );
+        pDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, sal_True, pUndoDoc, &aMultiMark );
 
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoTransliterate( &rDocShell, aMultiMark, pUndoDoc, nType ) );
@@ -729,31 +729,31 @@ BOOL ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
 
     aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, BOOL bApi )
+sal_Bool ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     ScEditableTester aTester( pDoc, rPos.Tab(), rPos.Col(),rPos.Row(), rPos.Col(),rPos.Row() );
     if (!aTester.IsEditable())
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     SCTAB* pTabs = NULL;
     ScBaseCell** ppOldCells = NULL;
-    BOOL* pHasFormat = NULL;
-    ULONG* pOldFormats = NULL;
+    sal_Bool* pHasFormat = NULL;
+    sal_uLong* pOldFormats = NULL;
     ScBaseCell* pDocCell = pDoc->GetCell( rPos );
-    BOOL bEditDeleted = (pDocCell && pDocCell->GetCellType() == CELLTYPE_EDIT);
+    sal_Bool bEditDeleted = (pDocCell && pDocCell->GetCellType() == CELLTYPE_EDIT);
     if (bUndo)
     {
         pTabs = new SCTAB[1];
@@ -761,18 +761,18 @@ BOOL ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, BOO
         ppOldCells	= new ScBaseCell*[1];
         ppOldCells[0] = pDocCell ? pDocCell->CloneWithoutNote( *pDoc ) : 0;
 
-        pHasFormat = new BOOL[1];
-        pOldFormats = new ULONG[1];
+        pHasFormat = new sal_Bool[1];
+        pOldFormats = new sal_uLong[1];
         const SfxPoolItem* pItem;
         const ScPatternAttr* pPattern = pDoc->GetPattern( rPos.Col(),rPos.Row(),rPos.Tab() );
         if ( SFX_ITEM_SET == pPattern->GetItemSet().GetItemState(
-                                ATTR_VALUE_FORMAT,FALSE,&pItem) )
+                                ATTR_VALUE_FORMAT,sal_False,&pItem) )
         {
-            pHasFormat[0] = TRUE;
+            pHasFormat[0] = sal_True;
             pOldFormats[0] = ((const SfxUInt32Item*)pItem)->GetValue();
         }
         else
-            pHasFormat[0] = FALSE;
+            pHasFormat[0] = sal_False;
     }
 
     pDoc->SetString( rPos.Col(), rPos.Row(), rPos.Tab(), rText );
@@ -794,15 +794,15 @@ BOOL ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, BOO
     if (bApi)
         NotifyInputHandler( rPos );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi )
+sal_Bool ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo (pDoc->IsUndoEnabled());
-    BOOL bXMLLoading(pDoc->IsImportingXML());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bXMLLoading(pDoc->IsImportingXML());
 
     // #i925#; it is not neccessary to test whether the cell is editable on loading a XML document
     if (!bXMLLoading)
@@ -813,14 +813,14 @@ BOOL ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi
             if (!bApi)
                 rDocShell.ErrorMessage(aTester.GetMessageId());
             pNewCell->Delete();
-            return FALSE;
+            return sal_False;
         }
     }
 
-    BOOL bEditCell = ( pNewCell->GetCellType() == CELLTYPE_EDIT );
+    sal_Bool bEditCell = ( pNewCell->GetCellType() == CELLTYPE_EDIT );
     ScBaseCell* pDocCell = pDoc->GetCell( rPos );
-    BOOL bEditDeleted = (pDocCell && pDocCell->GetCellType() == CELLTYPE_EDIT);
-    BOOL bHeight = ( bEditDeleted || bEditCell ||
+    sal_Bool bEditDeleted = (pDocCell && pDocCell->GetCellType() == CELLTYPE_EDIT);
+    sal_Bool bHeight = ( bEditDeleted || bEditCell ||
                     pDoc->HasAttrib( ScRange(rPos), HASATTR_NEEDHEIGHT ) );
 
     ScBaseCell* pUndoCell = (bUndo && pDocCell) ? pDocCell->CloneWithoutNote( *pDoc, rPos ) : 0;
@@ -848,7 +848,7 @@ BOOL ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi
     if (bApi && !bXMLLoading)
         NotifyInputHandler( rPos );
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScDocFunc::NotifyInputHandler( const ScAddress& rPos )
@@ -865,30 +865,30 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& rPos )
             // (the cell shows the same like the InputWindow)
             if (bIsEditMode)
                 pInputHdl->SetModified();
-            pViewSh->UpdateInputHandler(FALSE, !bIsEditMode);
+            pViewSh->UpdateInputHandler(sal_False, !bIsEditMode);
         }
     }
 }
 
         struct ScMyRememberItem
         {
-            USHORT		nIndex;
+            sal_uInt16		nIndex;
             SfxItemSet	aItemSet;
 
-            ScMyRememberItem(const SfxItemSet& rItemSet, USHORT nTempIndex) :
+            ScMyRememberItem(const SfxItemSet& rItemSet, sal_uInt16 nTempIndex) :
                 nIndex(nTempIndex), aItemSet(rItemSet) {}
         };
 
         typedef ::std::list<ScMyRememberItem*> ScMyRememberItemList;
 
-BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, BOOL bInterpret, BOOL bApi )
+sal_Bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, sal_Bool bInterpret, sal_Bool bApi )
 {
     //	PutData ruft PutCell oder SetNormalString
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     ScEditAttrTester aTester( &rEngine );
-    BOOL bEditCell = aTester.NeedsObject();
+    sal_Bool bEditCell = aTester.NeedsObject();
     if ( bEditCell )
     {
         // #i61702# With bLoseContent set, the content of rEngine isn't restored
@@ -907,8 +907,8 @@ BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
         //	not only alignment, so the object doesn't contain the cell attributes as
         //	paragraph attributes. Before remove the attributes store they in a list to
         //	set they back to the EditEngine.
-        USHORT nCount = rEngine.GetParagraphCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = rEngine.GetParagraphCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             const SfxItemSet& rOld = rEngine.GetParaAttribs( i );
             if ( rOld.Count() )
@@ -965,9 +965,9 @@ BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
         if ( aPattern.GetItemSet().Count() > 0 )
         {
             ScMarkData aMark;
-            aMark.SelectTable( rPos.Tab(), TRUE );
+            aMark.SelectTable( rPos.Tab(), sal_True );
             aMark.SetMarkArea( ScRange( rPos ) );
-            ApplyAttributes( aMark, aPattern, TRUE, bApi );
+            ApplyAttributes( aMark, aPattern, sal_True, bApi );
         }
     }
 
@@ -1037,8 +1037,8 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos,
 }
 
 
-BOOL ScDocFunc::SetCellText( const ScAddress& rPos, const String& rText,
-        BOOL bInterpret, BOOL bEnglish, BOOL bApi,
+sal_Bool ScDocFunc::SetCellText( const ScAddress& rPos, const String& rText,
+        sal_Bool bInterpret, sal_Bool bEnglish, sal_Bool bApi,
         const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
 {
     //	SetCellText ruft PutCell oder SetNormalString
@@ -1086,7 +1086,7 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow )
         rDocShell.GetUndoManager()->AddUndoAction( new ScUndoShowHideNote( rDocShell, rPos, bShow ) );
 
     if (rDoc.IsStreamValid(rPos.Tab()))
-        rDoc.SetStreamValid(rPos.Tab(), FALSE);
+        rDoc.SetStreamValid(rPos.Tab(), sal_False);
 
     rDocShell.SetDocumentModified();
 
@@ -1095,7 +1095,7 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow )
 
 //------------------------------------------------------------------------
 
-bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, BOOL bApi )
+bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -1117,7 +1117,7 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, BOOL bA
     //!	Undo !!!
 
     if (pDoc->IsStreamValid(rPos.Tab()))
-        pDoc->SetStreamValid(rPos.Tab(), FALSE);
+        pDoc->SetStreamValid(rPos.Tab(), sal_False);
 
     rDocShell.PostPaintCell( rPos );
     aModificator.SetDocumentModified();
@@ -1127,7 +1127,7 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, BOOL bA
 
 //------------------------------------------------------------------------
 
-bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, BOOL bApi )
+bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, sal_Bool bApi )
 {
     bool bDone = false;
 
@@ -1137,7 +1137,7 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, con
     if (aTester.IsEditable())
     {
         ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
-        SfxUndoManager* pUndoMgr = (pDrawLayer && rDoc.IsUndoEnabled()) ? rDocShell.GetUndoManager() : 0;
+        ::svl::IUndoManager* pUndoMgr = (pDrawLayer && rDoc.IsUndoEnabled()) ? rDocShell.GetUndoManager() : 0;
 
         ScNoteData aOldData;
         ScPostIt* pOldNote = rDoc.ReleaseNote( rPos );
@@ -1174,7 +1174,7 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, con
         rDocShell.PostPaintCell( rPos );
 
         if (rDoc.IsStreamValid(rPos.Tab()))
-            rDoc.SetStreamValid(rPos.Tab(), FALSE);
+            rDoc.SetStreamValid(rPos.Tab(), sal_False);
 
         aModificator.SetDocumentModified();
         bDone = true;
@@ -1189,23 +1189,23 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, con
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
-                                    BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
+                                    sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if ( bRecord && !pDoc->IsUndoEnabled() )
-        bRecord = FALSE;
+        bRecord = sal_False;
 
-    BOOL bImportingXML = pDoc->IsImportingXML();
+    sal_Bool bImportingXML = pDoc->IsImportingXML();
     // Cell formats can still be set if the range isn't editable only because of matrix formulas.
     // #i62483# When loading XML, the check can be skipped altogether.
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !bImportingXML && !pDoc->IsSelectionEditable( rMark, &bOnlyNotBecauseOfMatrix )
             && !bOnlyNotBecauseOfMatrix )
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_PROTECTIONERR);
-        return FALSE;
+        return sal_False;
     }
 
     ScDocShellModificator aModificator( rDocShell );
@@ -1213,7 +1213,7 @@ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r
     //!	Umrandung
 
     ScRange aMultiRange;
-    BOOL bMulti = rMark.IsMultiMarked();
+    sal_Bool bMulti = rMark.IsMultiMarked();
     if ( bMulti )
         rMark.GetMultiMarkArea( aMultiRange );
     else
@@ -1234,7 +1234,7 @@ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r
     }
 
     // While loading XML it is not neccessary to ask HasAttrib. It needs too much time.
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     if ( !bImportingXML )
         rDocShell.UpdatePaintExt( nExtFlags, aMultiRange );		// content before the change
     pDoc->ApplySelectionPattern( rPattern, rMark );
@@ -1248,38 +1248,38 @@ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r
 
     aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
-                                    BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
+                                    sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if ( bRecord && !pDoc->IsUndoEnabled() )
-        bRecord = FALSE;
+        bRecord = sal_False;
 
-    BOOL bImportingXML = pDoc->IsImportingXML();
+    sal_Bool bImportingXML = pDoc->IsImportingXML();
     // Cell formats can still be set if the range isn't editable only because of matrix formulas.
     // #i62483# When loading XML, the check can be skipped altogether.
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !bImportingXML && !pDoc->IsSelectionEditable( rMark, &bOnlyNotBecauseOfMatrix )
             && !bOnlyNotBecauseOfMatrix )
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_PROTECTIONERR);
-        return FALSE;
+        return sal_False;
     }
 
     ScStyleSheet* pStyleSheet = (ScStyleSheet*) pDoc->GetStyleSheetPool()->Find(
                                                 rStyleName, SFX_STYLE_FAMILY_PARA );
     if (!pStyleSheet)
-        return FALSE;
+        return sal_False;
 
     ScDocShellModificator aModificator( rDocShell );
 
     ScRange aMultiRange;
-    BOOL bMulti = rMark.IsMultiMarked();
+    sal_Bool bMulti = rMark.IsMultiMarked();
     if ( bMulti )
         rMark.GetMultiMarkArea( aMultiRange );
     else
@@ -1306,15 +1306,15 @@ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
 
     }
 
-//	BOOL bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
+//	sal_Bool bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
 //	pDoc->ApplySelectionPattern( rPattern, rMark );
 
     pDoc->ApplySelectionStyle( (ScStyleSheet&)*pStyleSheet, rMark );
 
 //	if (!bPaintExt)
 //		bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-//	USHORT nExtFlags = bPaintExt ? SC_PF_LINES : 0;
-    USHORT nExtFlags = 0;
+//	sal_uInt16 nExtFlags = bPaintExt ? SC_PF_LINES : 0;
+    sal_uInt16 nExtFlags = 0;
     if (!AdjustRowHeight( aMultiRange ))
         rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags );
     else if (nExtFlags & SC_PF_LINES)
@@ -1322,13 +1322,13 @@ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
 
     aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, InsCellCmd eCmd,
-                                BOOL bRecord, BOOL bApi, BOOL bPartOfPaste )
+sal_Bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, InsCellCmd eCmd,
+                                sal_Bool bRecord, sal_Bool bApi, sal_Bool bPartOfPaste )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -1342,7 +1342,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) )
     {
         DBG_ERROR("invalid row in InsertCells");
-        return FALSE;
+        return sal_False;
     }
 
     ScDocument* pDoc = rDocShell.GetDocument();
@@ -1351,8 +1351,8 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     SCROW nPaintStartY = nStartRow;
     SCCOL nPaintEndX = nEndCol;
     SCROW nPaintEndY = nEndRow;
-    USHORT nPaintFlags = PAINT_GRID;
-    BOOL bSuccess;
+    sal_uInt16 nPaintFlags = PAINT_GRID;
+    sal_Bool bSuccess;
     SCTAB i;
 
     ScTabViewShell* pViewSh = rDocShell.GetBestViewShell();  //preserve current cursor position
@@ -1365,7 +1365,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     }
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -1380,7 +1380,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                 nCount++;
                 if( nCount == nEndTab+1 )
                 {
-                    aMark.SelectTable( i, TRUE );
+                    aMark.SelectTable( i, sal_True );
                     break;
                 }
             }
@@ -1392,7 +1392,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
         if( aMark.GetTableSelect( i ) )
         {
             for( SCTAB j = i+1; j<nTabCount && pDoc->IsScenario(j); j++ )
-                aFullMark.SelectTable( j, TRUE );
+                aFullMark.SelectTable( j, sal_True );
         }
 
     SCTAB nSelCount = aMark.GetSelectCount();
@@ -1432,7 +1432,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     if ( eCmd == INS_CELLSRIGHT )
         nMergeTestEndX = MAXCOL;
 
-    BOOL bNeedRefresh = FALSE;
+    sal_Bool bNeedRefresh = sal_False;
 
     SCCOL nEditTestEndX = (eCmd==INS_INSCOLS) ? MAXCOL : nMergeTestEndX;
     SCROW nEditTestEndY = (eCmd==INS_INSROWS) ? MAXROW : nMergeTestEndY;
@@ -1441,7 +1441,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     WaitObject aWait( rDocShell.GetActiveDialogParent() );		// wichtig wegen TrackFormulas bei UpdateReference
@@ -1451,7 +1451,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     if ( bRecord )
     {
         pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-        pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, FALSE, FALSE );
+        pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, sal_False, sal_False );
 
         // pRefUndoDoc is filled in InsertCol / InsertRow
 
@@ -1462,7 +1462,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
 
     // #i8302 : we unmerge overwhelming ranges, before insertion all the actions are put in the same ListAction
     // the patch comes from mloiseleur and maoyg
-    BOOL bInsertMerge = FALSE;
+    sal_Bool bInsertMerge = sal_False;
     std::vector<ScRange> qIncreaseRange;
     String aUndo = ScGlobal::GetRscString( STR_UNDO_INSERTCELLS );
     if (bRecord)
@@ -1475,7 +1475,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
             if( pDoc->HasAttrib( nMergeTestStartX, nMergeTestStartY, i, nMergeTestEndX, nMergeTestEndY, i, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
             {
                 if (eCmd==INS_CELLSRIGHT)
-                    bNeedRefresh = TRUE;
+                    bNeedRefresh = sal_True;
 
                 SCCOL nMergeStartX = nMergeTestStartX;
                 SCROW nMergeStartY = nMergeTestStartY;
@@ -1491,7 +1491,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0);
                     rDocShell.GetUndoManager()->LeaveListAction();
-                    return FALSE;
+                    return sal_False;
                 }
 
                 SCCOL nTestCol = -1;
@@ -1507,12 +1507,12 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                 {
                     pMergeFlag = (const ScMergeAttr*) &pPattern->GetItem(ATTR_MERGE);
                     pMergeFlagAttr = (const ScMergeFlagAttr*) &pPattern->GetItem(ATTR_MERGE_FLAG);
-                    INT16 nNewFlags = pMergeFlagAttr->GetValue() & ( SC_MF_HOR | SC_MF_VER );
+                    sal_Int16 nNewFlags = pMergeFlagAttr->GetValue() & ( SC_MF_HOR | SC_MF_VER );
                     if( ( pMergeFlag && pMergeFlag->IsMerged() ) || nNewFlags == SC_MF_HOR || nNewFlags == SC_MF_VER )
                     {
                         ScRange aRange( nTestCol, nTestRow1, i );
                         pDoc->ExtendOverlapped(aRange);
-                        pDoc->ExtendMerge(aRange, TRUE, TRUE);
+                        pDoc->ExtendMerge(aRange, sal_True, sal_True);
 
                         if( nTestRow1 < nTestRow2 && nNewFlags == SC_MF_HOR )
                         {
@@ -1520,12 +1520,12 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                             {
                                 ScRange aTestRange( nTestCol, nTestRow, i );
                                 pDoc->ExtendOverlapped( aTestRange );
-                                pDoc->ExtendMerge( aTestRange, TRUE, TRUE);
+                                pDoc->ExtendMerge( aTestRange, sal_True, sal_True);
                                 ScRange aMergeRange( aTestRange.aStart.Col(),aTestRange.aStart.Row(), i );
                                 if( !aExtendRange.In( aMergeRange ) )
                                 {
                                     qIncreaseRange.push_back( aTestRange );
-                                    bInsertMerge = TRUE;
+                                    bInsertMerge = sal_True;
                                 }
                             }
                         }
@@ -1536,7 +1536,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                             {
                                 qIncreaseRange.push_back( aRange );
                             }
-                            bInsertMerge = TRUE;
+                            bInsertMerge = sal_True;
                         }
                     }
                 }
@@ -1579,7 +1579,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                             ScRange aRange( *iIter );
                             if( pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | HASATTR_MERGED ) )
                             {
-                                UnmergeCells( aRange, TRUE, TRUE );
+                                UnmergeCells( aRange, sal_True, sal_True );
                             }
                         }
                     }
@@ -1589,7 +1589,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0);
                     rDocShell.GetUndoManager()->LeaveListAction();
-                    return FALSE;
+                    return sal_False;
                 }
             }
         }
@@ -1621,7 +1621,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
             break;
         default:
             DBG_ERROR("Falscher Code beim Einfuegen");
-            bSuccess = FALSE;
+            bSuccess = sal_False;
             break;
     }
 
@@ -1680,7 +1680,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     default:
                         break;
                 }
-                MergeCells(aRange, FALSE, TRUE, TRUE);
+                MergeCells(aRange, sal_False, sal_True, sal_True);
             }
             qIncreaseRange.pop_back();
         }
@@ -1693,14 +1693,14 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
             if( aMark.GetTableSelect( i ) )
             {
                 if (bNeedRefresh)
-                    pDoc->ExtendMerge( nMergeTestStartX, nMergeTestStartY, nMergeTestEndX, nMergeTestEndY, i, TRUE );
+                    pDoc->ExtendMerge( nMergeTestStartX, nMergeTestStartY, nMergeTestEndX, nMergeTestEndY, i, sal_True );
                 else
                     pDoc->RefreshAutoFilter( nMergeTestStartX, nMergeTestStartY, nMergeTestEndX, nMergeTestEndY, i );
 
                 if ( eCmd == INS_INSROWS || eCmd == INS_INSCOLS )
                     pDoc->UpdatePageBreaks( i );
 
-                USHORT nExtFlags = 0;
+                sal_uInt16 nExtFlags = 0;
                 rDocShell.UpdatePaintExt( nExtFlags, nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY, i );
 
                 SCTAB nScenarioCount = 0;
@@ -1708,7 +1708,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                 for( SCTAB j = i+1; j<nTabCount && pDoc->IsScenario(j); j++ )
                     nScenarioCount ++;
 
-                BOOL bAdjusted = ( eCmd == INS_INSROWS ) ? AdjustRowHeight(ScRange(0, nStartRow, i, MAXCOL, nEndRow, i+nScenarioCount )) :
+                sal_Bool bAdjusted = ( eCmd == INS_INSROWS ) ? AdjustRowHeight(ScRange(0, nStartRow, i, MAXCOL, nEndRow, i+nScenarioCount )) :
                                                            AdjustRowHeight(ScRange(0, nPaintStartY, i, MAXCOL, nPaintEndY, i+nScenarioCount ));
                 if (bAdjusted)
                 {
@@ -1729,20 +1729,19 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
             while( !qIncreaseRange.empty() )
             {
                 ScRange aRange = qIncreaseRange.back();
-                MergeCells(aRange, FALSE, TRUE, TRUE);
+                MergeCells(aRange, sal_False, sal_True, sal_True);
                 qIncreaseRange.pop_back();
             }
 
             if( pViewSh )
             {
-                pViewSh->MarkRange( rRange, FALSE );
+                pViewSh->MarkRange( rRange, sal_False );
                 pViewSh->SetCursor( nCursorCol, nCursorRow );
             }
         }
 
         rDocShell.GetUndoManager()->LeaveListAction();
-        SfxUndoManager* pMgr = rDocShell.GetUndoManager();
-        pMgr->RemoveLastUndoAction();
+        rDocShell.GetUndoManager()->RemoveLastUndoAction();
 
         delete pRefUndoDoc;
         delete pUndoData;
@@ -1756,8 +1755,8 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
     return bSuccess;
 }
 
-BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, DelCellCmd eCmd,
-                             BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, DelCellCmd eCmd,
+                             sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -1771,7 +1770,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
     if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) )
     {
         DBG_ERROR("invalid row in DeleteCells");
-        return FALSE;
+        return sal_False;
     }
 
     ScDocument* pDoc = rDocShell.GetDocument();
@@ -1780,11 +1779,11 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
     SCROW nPaintStartY = nStartRow;
     SCCOL nPaintEndX = nEndCol;
     SCROW nPaintEndY = nEndRow;
-    USHORT nPaintFlags = PAINT_GRID;
+    sal_uInt16 nPaintFlags = PAINT_GRID;
     SCTAB i;
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -1799,7 +1798,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                 nCount++;
                 if( nCount == nEndTab+1 )
                 {
-                    aMark.SelectTable( i, TRUE );
+                    aMark.SelectTable( i, sal_True );
                     break;
                 }
             }
@@ -1811,7 +1810,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
         if( aMark.GetTableSelect( i ) )
         {
             for( SCTAB j = i+1; j<nTabCount && pDoc->IsScenario(j); j++ )
-                aFullMark.SelectTable( j, TRUE );
+                aFullMark.SelectTable( j, sal_True );
         }
 
     SCTAB nSelCount = aMark.GetSelectCount();
@@ -1856,7 +1855,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
                     // Test zusammengefasste
@@ -1865,12 +1864,12 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
     SCROW nMergeTestEndY = (eCmd==DEL_CELLSUP)   ? MAXROW : nUndoEndY;
     SCCOL nExtendStartCol = nUndoStartX;
     SCROW nExtendStartRow = nUndoStartY;
-    BOOL bNeedRefresh = FALSE;
+    sal_Bool bNeedRefresh = sal_False;
 
     //Issue 8302 want to be able to insert into the middle of merged cells
     //the patch comes from maoyg
     ::std::vector<ScRange> qDecreaseRange;
-    BOOL bDeletingMerge = FALSE;
+    sal_Bool bDeletingMerge = sal_False;
     String aUndo = ScGlobal::GetRscString( STR_UNDO_DELETECELLS );
     if (bRecord)
         rDocShell.GetUndoManager()->EnterListAction( aUndo, aUndo );
@@ -1894,7 +1893,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_DELETECELLS_0);
                     rDocShell.GetUndoManager()->LeaveListAction();
-                    return FALSE;
+                    return sal_False;
                 }
 
                 nExtendStartCol = nMergeStartX;
@@ -1912,12 +1911,12 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                 {
                     pMergeFlag = (const ScMergeAttr*) &pPattern->GetItem( ATTR_MERGE );
                     pMergeFlagAttr = (const ScMergeFlagAttr*) &pPattern->GetItem( ATTR_MERGE_FLAG );
-                    INT16 nNewFlags = pMergeFlagAttr->GetValue() & ( SC_MF_HOR | SC_MF_VER );
+                    sal_Int16 nNewFlags = pMergeFlagAttr->GetValue() & ( SC_MF_HOR | SC_MF_VER );
                     if( ( pMergeFlag && pMergeFlag->IsMerged() ) || nNewFlags == SC_MF_HOR || nNewFlags == SC_MF_VER )
                     {
                         ScRange aRange( nTestCol, nTestRow1, i );
                         pDoc->ExtendOverlapped( aRange );
-                        pDoc->ExtendMerge( aRange, TRUE, TRUE );
+                        pDoc->ExtendMerge( aRange, sal_True, sal_True );
 
                         if( nTestRow1 < nTestRow2 && nNewFlags == SC_MF_HOR )
                         {
@@ -1925,12 +1924,12 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                             {
                                 ScRange aTestRange( nTestCol, nTestRow, i );
                                 pDoc->ExtendOverlapped( aTestRange );
-                                pDoc->ExtendMerge( aTestRange, TRUE, TRUE);
+                                pDoc->ExtendMerge( aTestRange, sal_True, sal_True);
                                 ScRange aMergeRange( aTestRange.aStart.Col(),aTestRange.aStart.Row(), i );
                                 if( !aExtendRange.In( aMergeRange ) )
                                 {
                                     qDecreaseRange.push_back( aTestRange );
-                                    bDeletingMerge = TRUE;
+                                    bDeletingMerge = sal_True;
                                 }
                             }
                         }
@@ -1941,7 +1940,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                             {
                                 qDecreaseRange.push_back( aRange );
                             }
-                            bDeletingMerge = TRUE;
+                            bDeletingMerge = sal_True;
                         }
                     }
                 }
@@ -1953,7 +1952,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     {
                         nStartRow = aExtendMergeRange.aStart.Row();
                         nEndRow = aExtendMergeRange.aEnd.Row();
-                        bNeedRefresh = TRUE;
+                        bNeedRefresh = sal_True;
 
                         if( eCmd == DEL_CELLSUP )
                         {
@@ -1973,7 +1972,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                         if( eCmd == DEL_CELLSLEFT )
                         {
                             nEndRow = aExtendMergeRange.aEnd.Row();
-                            bNeedRefresh = TRUE;
+                            bNeedRefresh = sal_True;
                         }
                         else
                         {
@@ -1989,7 +1988,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                             ScRange aRange( *iIter );
                             if( pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | HASATTR_MERGED ) )
                             {
-                                UnmergeCells( aRange, TRUE, TRUE );
+                                UnmergeCells( aRange, sal_True, sal_True );
                             }
                         }
                     }
@@ -1999,7 +1998,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_DELETECELLS_0);
                     rDocShell.GetUndoManager()->LeaveListAction();
-                    return FALSE;
+                    return sal_False;
                 }
             }
         }
@@ -2031,26 +2030,26 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     nScenarioCount ++;
 
                 pDoc->CopyToDocument( nUndoStartX, nUndoStartY, i, nUndoEndX, nUndoEndY, i+nScenarioCount,
-                    IDF_ALL | IDF_NOCAPTIONS, FALSE, pUndoDoc );
+                    IDF_ALL | IDF_NOCAPTIONS, sal_False, pUndoDoc );
             }
         }
 
         pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-        pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, FALSE, FALSE );
+        pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, sal_False, sal_False );
 
         pUndoData = new ScRefUndoData( pDoc );
 
         pDoc->BeginDrawUndo();
     }
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     for( i=0; i<nTabCount; i++ )
     {
         if( aMark.GetTableSelect( i ) )
             rDocShell.UpdatePaintExt( nExtFlags, nStartCol, nStartRow, i, nEndCol, nEndRow, i );
     }
 
-    BOOL bUndoOutline = FALSE;
+    sal_Bool bUndoOutline = sal_False;
     switch (eCmd)
     {
         case DEL_CELLSUP:
@@ -2089,10 +2088,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                 pRefUndoDoc->DeleteAreaTab(nUndoStartX,nUndoStartY,nUndoEndX,nUndoEndY, i, IDF_ALL);
 
             //	alle Tabellen anlegen, damit Formeln kopiert werden koennen:
-        pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE );
+        pUndoDoc->AddUndoTab( 0, nTabCount-1, sal_False, sal_False );
 
-            //	kopieren mit bColRowFlags=FALSE (#54194#)
-        pRefUndoDoc->CopyToDocument(0,0,0,MAXCOL,MAXROW,MAXTAB,IDF_FORMULA,FALSE,pUndoDoc,NULL,FALSE);
+            //	kopieren mit bColRowFlags=sal_False (#54194#)
+        pRefUndoDoc->CopyToDocument(0,0,0,MAXCOL,MAXROW,MAXTAB,IDF_FORMULA,sal_False,pUndoDoc,NULL,sal_False);
         delete pRefUndoDoc;
 
         SCTAB* pTabs      = new SCTAB[nSelCount];
@@ -2167,7 +2166,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
 
         if( !pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | HASATTR_MERGED ) )
         {
-            MergeCells( aRange, FALSE, TRUE, TRUE );
+            MergeCells( aRange, sal_False, sal_True, sal_True );
         }
         qDecreaseRange.pop_back();
     }
@@ -2199,7 +2198,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
                     nScenarioCount ++;
 
                 ScRange aMergedRange( nExtendStartCol, nExtendStartRow, i, nMergeTestEndX, nMergeTestEndY, i+nScenarioCount );
-                pDoc->ExtendMerge( aMergedRange, TRUE );
+                pDoc->ExtendMerge( aMergedRange, sal_True );
             }
         }
     }
@@ -2235,11 +2234,11 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
-                                BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi )
+sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
+                                sal_Bool bCut, sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -2256,21 +2255,21 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
     if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) || !ValidRow(nDestRow) )
     {
         DBG_ERROR("invalid row in MoveBlock");
-        return FALSE;
+        return sal_False;
     }
 
     //	zugehoerige Szenarien auch anpassen - nur wenn innerhalb einer Tabelle verschoben wird!
-    BOOL bScenariosAdded = FALSE;
+    sal_Bool bScenariosAdded = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     SCTAB nTabCount = pDoc->GetTableCount();
     if ( nDestTab == nStartTab && !pDoc->IsScenario(nEndTab) )
         while ( nEndTab+1 < nTabCount && pDoc->IsScenario(nEndTab+1) )
         {
             ++nEndTab;
-            bScenariosAdded = TRUE;
+            bScenariosAdded = sal_True;
         }
 
     SCTAB nSrcTabCount = nEndTab-nStartTab+1;
@@ -2281,7 +2280,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
 
     ScMarkData aSourceMark;
     for (nTab=nStartTab; nTab<=nEndTab; nTab++)
-        aSourceMark.SelectTable( nTab, TRUE );		// Source selektieren
+        aSourceMark.SelectTable( nTab, sal_True );		// Source selektieren
     aSourceMark.SetMarkArea( rSource );
 
     ScDocShellRef aDragShellRef;
@@ -2299,13 +2298,13 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
 
     SCCOL nOldEndCol = nEndCol;
     SCROW nOldEndRow = nEndRow;
-    BOOL bClipOver = FALSE;
+    sal_Bool bClipOver = sal_False;
     for (nTab=nStartTab; nTab<=nEndTab; nTab++)
     {
         SCCOL nTmpEndCol = nOldEndCol;
         SCROW nTmpEndRow = nOldEndRow;
         if (pDoc->ExtendMerge( nStartCol, nStartRow, nTmpEndCol, nTmpEndRow, nTab ))
-            bClipOver = TRUE;
+            bClipOver = sal_True;
         if ( nTmpEndCol > nEndCol ) nEndCol = nTmpEndCol;
         if ( nTmpEndRow > nEndRow ) nEndRow = nTmpEndRow;
     }
@@ -2316,14 +2315,14 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
     SCCOL nUndoEndCol = nDestCol + ( nEndCol-nStartCol );		// erweitert im Zielblock
     SCROW nUndoEndRow = nDestRow + ( nEndRow-nStartRow );
 
-    BOOL bIncludeFiltered = bCut;
+    sal_Bool bIncludeFiltered = bCut;
     if ( !bIncludeFiltered )
     {
         //	adjust sizes to include only non-filtered rows
 
         SCCOL nClipX;
         SCROW nClipY;
-        pClipDoc->GetClipArea( nClipX, nClipY, FALSE );
+        pClipDoc->GetClipArea( nClipX, nClipY, sal_False );
         SCROW nUndoAdd = nUndoEndRow - nDestEndRow;
         nDestEndRow = nDestRow + nClipY;
         nUndoEndRow = nDestEndRow + nUndoAdd;
@@ -2334,7 +2333,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         if (!bApi)
             rDocShell.ErrorMessage(STR_PASTE_FULL);
         delete pClipDoc;
-        return FALSE;
+        return sal_False;
     }
 
     //	Test auf Zellschutz
@@ -2351,7 +2350,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
         delete pClipDoc;
-        return FALSE;
+        return sal_False;
     }
 
     //	Test auf zusammengefasste - beim Verschieben erst nach dem Loeschen
@@ -2363,14 +2362,14 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
             if (!bApi)
                 rDocShell.ErrorMessage(STR_MSSG_MOVEBLOCKTO_0);
             delete pClipDoc;
-            return FALSE;
+            return sal_False;
         }
 
     //	Are there borders in the cells? (for painting)
 
-    USHORT nSourceExt = 0;
+    sal_uInt16 nSourceExt = 0;
     rDocShell.UpdatePaintExt( nSourceExt, nStartCol,nStartRow,nStartTab, nEndCol,nEndRow,nEndTab );
-    USHORT nDestExt = 0;
+    sal_uInt16 nDestExt = 0;
     rDocShell.UpdatePaintExt( nDestExt, nDestCol,nDestRow,nDestTab, nDestEndCol,nDestEndRow,nDestEndTab );
 
     //
@@ -2382,9 +2381,9 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
     ScRefUndoData* pUndoData = NULL;
     if (bRecord)
     {
-        BOOL bWholeCols = ( nStartRow == 0 && nEndRow == MAXROW );
-        BOOL bWholeRows = ( nStartCol == 0 && nEndCol == MAXCOL );
-        USHORT nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
+        sal_Bool bWholeCols = ( nStartRow == 0 && nEndRow == MAXROW );
+        sal_Bool bWholeRows = ( nStartCol == 0 && nEndCol == MAXCOL );
+        sal_uInt16 nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
 
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab, bWholeCols, bWholeRows );
@@ -2392,30 +2391,30 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         if (bCut)
         {
             pDoc->CopyToDocument( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab,
-                                    nUndoFlags, FALSE, pUndoDoc );
+                                    nUndoFlags, sal_False, pUndoDoc );
             pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, FALSE, FALSE );
+            pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, sal_False, sal_False );
         }
 
         if ( nDestTab != nStartTab )
             pUndoDoc->AddUndoTab( nDestTab, nDestEndTab, bWholeCols, bWholeRows );
         pDoc->CopyToDocument( nDestCol, nDestRow, nDestTab,
                                     nDestEndCol, nDestEndRow, nDestEndTab,
-                                    nUndoFlags, FALSE, pUndoDoc );
+                                    nUndoFlags, sal_False, pUndoDoc );
 
         pUndoData = new ScRefUndoData( pDoc );
 
         pDoc->BeginDrawUndo();
     }
 
-    BOOL bSourceHeight = FALSE;		// Hoehen angepasst?
+    sal_Bool bSourceHeight = sal_False;		// Hoehen angepasst?
     if (bCut)
     {
         ScMarkData aDelMark;	// only for tables
         for (nTab=nStartTab; nTab<=nEndTab; nTab++)
         {
             pDoc->DeleteAreaTab( nStartCol,nStartRow, nOldEndCol,nOldEndRow, nTab, IDF_ALL );
-            aDelMark.SelectTable( nTab, TRUE );
+            aDelMark.SelectTable( nTab, sal_True );
         }
         pDoc->DeleteObjectsInArea( nStartCol,nStartRow, nOldEndCol,nOldEndRow, aDelMark );
 
@@ -2431,7 +2430,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
                 {
                     SCCOL nTmpEndCol = nEndCol;
                     SCROW nTmpEndRow = nEndRow;
-                    pDoc->ExtendMerge( nStartCol, nStartRow, nTmpEndCol, nTmpEndRow, nTab, TRUE );
+                    pDoc->ExtendMerge( nStartCol, nStartRow, nTmpEndCol, nTmpEndRow, nTab, sal_True );
                 }
 
                 //	Fehlermeldung erst nach dem Wiederherstellen des Inhalts
@@ -2442,17 +2441,17 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
                 delete pRefUndoDoc;
                 delete pUndoData;
                 delete pClipDoc;
-                return FALSE;
+                return sal_False;
             }
 
-        bSourceHeight = AdjustRowHeight( rSource, FALSE );
+        bSourceHeight = AdjustRowHeight( rSource, sal_False );
     }
 
     ScRange aPasteDest( nDestCol, nDestRow, nDestTab, nDestEndCol, nDestEndRow, nDestEndTab );
 
     ScMarkData aDestMark;
     for (nTab=nDestTab; nTab<=nDestEndTab; nTab++)
-        aDestMark.SelectTable( nTab, TRUE );		// Destination selektieren
+        aDestMark.SelectTable( nTab, sal_True );		// Destination selektieren
     aDestMark.SetMarkArea( aPasteDest );
 
     /*  Do not copy cell notes and drawing objects here. While pasting, the
@@ -2461,16 +2460,16 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         positions (e.g. if source and destination range overlaps). Cell notes
         and drawing objects are pasted below after doing all adjusting. */
     pDoc->CopyFromClip( aPasteDest, aDestMark, IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS),
-                        pRefUndoDoc, pClipDoc, TRUE, FALSE, bIncludeFiltered );
+                        pRefUndoDoc, pClipDoc, sal_True, sal_False, bIncludeFiltered );
 
     // skipped rows and merged cells don't mix
     if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
-        UnmergeCells( aPasteDest, FALSE, TRUE );
+        UnmergeCells( aPasteDest, sal_False, sal_True );
 
     VirtualDevice aVirtDev;
-    BOOL bDestHeight = AdjustRowHeight(
+    sal_Bool bDestHeight = AdjustRowHeight(
                             ScRange( 0,nDestRow,nDestTab, MAXCOL,nDestEndRow,nDestEndTab ),
-                            FALSE );
+                            sal_False );
 
     /*  Paste cell notes and drawing objects after adjusting formula references
         and row heights. There are no cell notes or drawing objects, if the
@@ -2481,19 +2480,19 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         touch existing cells. */
     if ( pClipDoc->GetDrawLayer() )
         pDoc->CopyFromClip( aPasteDest, aDestMark, IDF_NOTE | IDF_ADDNOTES | IDF_OBJECTS,
-                            pRefUndoDoc, pClipDoc, TRUE, FALSE, bIncludeFiltered );
+                            pRefUndoDoc, pClipDoc, sal_True, sal_False, bIncludeFiltered );
 
     if (bRecord)
     {
         if (pRefUndoDoc)
         {
                 //	alle Tabellen anlegen, damit Formeln kopiert werden koennen:
-            pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE );
+            pUndoDoc->AddUndoTab( 0, nTabCount-1, sal_False, sal_False );
 
             pRefUndoDoc->DeleteArea( nDestCol, nDestRow, nDestEndCol, nDestEndRow, aSourceMark, IDF_ALL );
-            //	kopieren mit bColRowFlags=FALSE (#54194#)
+            //	kopieren mit bColRowFlags=sal_False (#54194#)
             pRefUndoDoc->CopyToDocument( 0, 0, 0, MAXCOL, MAXROW, MAXTAB,
-                                            IDF_FORMULA, FALSE, pUndoDoc, NULL, FALSE );
+                                            IDF_FORMULA, sal_False, pUndoDoc, NULL, sal_False );
             delete pRefUndoDoc;
         }
 
@@ -2511,7 +2510,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
     {
         SCCOL nTmpEndCol = nDestEndCol;
         SCROW nTmpEndRow = nDestEndRow;
-        pDoc->ExtendMerge( nDestCol, nDestRow, nTmpEndCol, nTmpEndRow, nTab, TRUE );
+        pDoc->ExtendMerge( nDestCol, nDestRow, nTmpEndCol, nTmpEndRow, nTab, sal_True );
         if (nTmpEndCol > nDestPaintEndCol) nDestPaintEndCol = nTmpEndCol;
         if (nTmpEndRow > nDestPaintEndRow) nDestPaintEndRow = nTmpEndRow;
     }
@@ -2528,7 +2527,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
         SCROW nPaintStartY = nDestRow;
         SCCOL nPaintEndX = nDestPaintEndCol;
         SCROW nPaintEndY = nDestPaintEndRow;
-        USHORT nFlags = PAINT_GRID;
+        sal_uInt16 nFlags = PAINT_GRID;
 
         if ( nStartRow==0 && nEndRow==MAXROW )		// Breiten mitkopiert?
         {
@@ -2590,7 +2589,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 
     delete pClipDoc;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -2618,7 +2617,6 @@ script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule )
 
 void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String& sSource )
 {
-    SFX_APP()->EnterBasicCall();
     SfxObjectShell& rDocSh = *rDoc.GetDocumentShell();
     uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer();
     DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
@@ -2662,12 +2660,10 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
         }
 
     }
-    SFX_APP()->LeaveBasicCall();
 }
 
 void VBA_DeleteModule( ScDocShell& rDocSh, String& sModuleName )
 {
-    SFX_APP()->EnterBasicCall();
     uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer();
     DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
 
@@ -2689,13 +2685,12 @@ void VBA_DeleteModule( ScDocShell& rDocSh, String& sModuleName )
             xVBAModuleInfo->removeModuleInfo( sModuleName );
 
     }
-    SFX_APP()->LeaveBasicCall();
 }
 
 
-BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::InsertTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi )
 {
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
 
     ScDocShellModificator aModificator( rDocShell );
@@ -2705,20 +2700,20 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
 
     // Strange loop, also basic is loaded too early ( InsertTable )
     // is called via the xml import for sheets in described in odf 
-    BOOL bInsertDocModule = false;
+    sal_Bool bInsertDocModule = false;
 
     if(  !rDocShell.GetDocument()->IsImportingXML() )
     {
         bInsertDocModule = pDoc ? pDoc->IsInVBAMode() : false;
     }
     if ( bInsertDocModule || ( bRecord && !pDoc->IsUndoEnabled() ) )
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     if (bRecord)
         pDoc->BeginDrawUndo();							//	InsertTab erzeugt ein SdrUndoNewPage
 
     SCTAB nTabCount = pDoc->GetTableCount();
-    BOOL bAppend = ( nTab >= nTabCount );
+    sal_Bool bAppend = ( nTab >= nTabCount );
     if ( bAppend )
         nTab = nTabCount;		// wichtig fuer Undo
 
@@ -2740,7 +2735,7 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
         rDocShell.PostPaintExtras();
         aModificator.SetDocumentModified();
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else if (!bApi)
         rDocShell.ErrorMessage(STR_TABINSERT_ERROR);
@@ -2748,20 +2743,20 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
     return bSuccess;
 }
 
-BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
+sal_Bool ScDocFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool /* bApi */ )
 {
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
 
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bVbaEnabled = pDoc ? pDoc->IsInVBAMode() : false;
+    sal_Bool bVbaEnabled = pDoc ? pDoc->IsInVBAMode() : false;
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     if ( bVbaEnabled )
-        bRecord = FALSE;
-    BOOL bWasLinked = pDoc->IsLinked(nTab);
+        bRecord = sal_False;
+    sal_Bool bWasLinked = pDoc->IsLinked(nTab);
     ScDocument* pUndoDoc = NULL;
     ScRefUndoData* pUndoData = NULL;
     if (bRecord)
@@ -2769,13 +2764,13 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         SCTAB nCount = pDoc->GetTableCount();
 
-        pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );		// nur nTab mit Flags
+        pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );		// nur nTab mit Flags
         pUndoDoc->AddUndoTab( 0, nCount-1 );					// alle Tabs fuer Referenzen
 
-        pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pUndoDoc );
+        pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,sal_False, pUndoDoc );
         String aOldName;
         pDoc->GetName( nTab, aOldName );
-        pUndoDoc->RenameTab( nTab, aOldName, FALSE );
+        pUndoDoc->RenameTab( nTab, aOldName, sal_False );
         if (bWasLinked)
             pUndoDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), pDoc->GetLinkDoc(nTab),
                                 pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab),
@@ -2784,13 +2779,13 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
 
         if ( pDoc->IsScenario(nTab) )
         {
-            pUndoDoc->SetScenario( nTab, TRUE );
+            pUndoDoc->SetScenario( nTab, sal_True );
             String aComment;
             Color  aColor;
-            USHORT nScenFlags;
+            sal_uInt16 nScenFlags;
             pDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags );
             pUndoDoc->SetScenarioData( nTab, aComment, aColor, nScenFlags );
-            BOOL bActive = pDoc->IsActiveScenario( nTab );
+            sal_Bool bActive = pDoc->IsActiveScenario( nTab );
             pUndoDoc->SetActiveScenario( nTab, bActive );
         }
         pUndoDoc->SetVisible( nTab, pDoc->IsVisible( nTab ) );
@@ -2804,7 +2799,7 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
     }
 
     String sCodeName;
-    BOOL bHasCodeName = pDoc->GetCodeName( nTab, sCodeName );
+    sal_Bool bHasCodeName = pDoc->GetCodeName( nTab, sCodeName );
     if (pDoc->DeleteTab( nTab, pUndoDoc ))
     {
         if (bRecord)
@@ -2840,7 +2835,7 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
         pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
         pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else
     {
@@ -2850,18 +2845,18 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
     return bSuccess;
 }
 
-BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
+sal_Bool ScDocFunc::SetTableVisible( SCTAB nTab, sal_Bool bVisible, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     if ( pDoc->IsVisible( nTab ) == bVisible )
-        return TRUE;								// nichts zu tun - ok
+        return sal_True;								// nichts zu tun - ok
 
     if ( !pDoc->IsDocEditable() )
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_PROTECTIONERR);
-        return FALSE;
+        return sal_False;
     }
 
     ScDocShellModificator aModificator( rDocShell );
@@ -2870,7 +2865,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
     {
         //	nicht alle Tabellen ausblenden
 
-        USHORT nVisCount = 0;
+        sal_uInt16 nVisCount = 0;
         SCTAB nCount = pDoc->GetTableCount();
         for (SCTAB i=0; i<nCount; i++)
             if (pDoc->IsVisible(i))
@@ -2880,7 +2875,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
         {
             if (!bApi)
                 rDocShell.ErrorMessage(STR_PROTECTIONERR);	//!	eigene Meldung?
-            return FALSE;
+            return sal_False;
         }
     }
 
@@ -2896,15 +2891,15 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
     rDocShell.PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_EXTRAS);
     aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ )
+sal_Bool ScDocFunc::SetLayoutRTL( SCTAB nTab, sal_Bool bRTL, sal_Bool /* bApi */ )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     if ( pDoc->IsLayoutRTL( nTab ) == bRTL )
-        return TRUE;								// nothing to do - ok
+        return sal_True;								// nothing to do - ok
 
     //!	protection (sheet or document?)
 
@@ -2927,17 +2922,17 @@ BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ )
         pBindings->Invalidate( SID_ATTR_SIZE );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-//UNUSED2009-05 BOOL ScDocFunc::SetGrammar( formula::FormulaGrammar::Grammar eGrammar )
+//UNUSED2009-05 sal_Bool ScDocFunc::SetGrammar( formula::FormulaGrammar::Grammar eGrammar )
 //UNUSED2009-05 {
 //UNUSED2009-05     ScDocument* pDoc = rDocShell.GetDocument();
 //UNUSED2009-05 
 //UNUSED2009-05     if ( pDoc->GetGrammar() == eGrammar )
-//UNUSED2009-05         return TRUE;
+//UNUSED2009-05         return sal_True;
 //UNUSED2009-05 
-//UNUSED2009-05     BOOL bUndo(pDoc->IsUndoEnabled());
+//UNUSED2009-05     sal_Bool bUndo(pDoc->IsUndoEnabled());
 //UNUSED2009-05     ScDocShellModificator aModificator( rDocShell );
 //UNUSED2009-05 
 //UNUSED2009-05     pDoc->SetGrammar( eGrammar );
@@ -2952,7 +2947,7 @@ BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ )
 //UNUSED2009-05     ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
 //UNUSED2009-05     if (NULL != pViewSh)
 //UNUSED2009-05     {
-//UNUSED2009-05         pViewSh->UpdateInputHandler( FALSE, FALSE );
+//UNUSED2009-05         pViewSh->UpdateInputHandler( sal_False, sal_False );
 //UNUSED2009-05     }
 //UNUSED2009-05 
 //UNUSED2009-05     aModificator.SetDocumentModified();
@@ -2964,24 +2959,24 @@ BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ )
 //UNUSED2009-05         //pBindings->Invalidate( FID_TAB_USE_R1C1 );
 //UNUSED2009-05     }
 //UNUSED2009-05 
-//UNUSED2009-05     return TRUE;
+//UNUSED2009-05     return sal_True;
 //UNUSED2009-05 }
 
-BOOL ScDocFunc::RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::RenameTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     if ( !pDoc->IsDocEditable() )
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_PROTECTIONERR);
-        return FALSE;
+        return sal_False;
     }
 
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     String sOldName;
     pDoc->GetName(nTab, sOldName);
     if (pDoc->RenameTab( nTab, rName ))
@@ -2995,7 +2990,7 @@ BOOL ScDocFunc::RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
         aModificator.SetDocumentModified();
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
 
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     return bSuccess;
 }
@@ -3051,7 +3046,7 @@ bool ScDocFunc::SetTabBgColor(
         return false;
     }
 
-    USHORT nTab;
+    sal_uInt16 nTab;
     Color aNewTabBgColor;
     bool bSuccess = true;
     size_t nTabProtectCount = 0;
@@ -3105,9 +3100,9 @@ bool ScDocFunc::SetTabBgColor(
 //!	- Optimale Hoehe fuer Edit-Zellen ist unterschiedlich zwischen Drucker und Bildschirm
 //!	- Optimale Breite braucht Selektion, um evtl. nur selektierte Zellen zu beruecksichtigen
 
-USHORT lcl_GetOptimalColWidth( ScDocShell& rDocShell, SCCOL nCol, SCTAB nTab, BOOL bFormula )
+sal_uInt16 lcl_GetOptimalColWidth( ScDocShell& rDocShell, SCCOL nCol, SCTAB nTab, sal_Bool bFormula )
 {
-    USHORT nTwips = 0;
+    sal_uInt16 nTwips = 0;
 
     ScSizeDeviceProvider aProv(&rDocShell);
     OutputDevice* pDev = aProv.GetDevice();			// has pixel MapMode
@@ -3122,32 +3117,32 @@ USHORT lcl_GetOptimalColWidth( ScDocShell& rDocShell, SCCOL nCol, SCTAB nTab, BO
     return nTwips;
 }
 
-BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, SCTAB nTab,
-                                        ScSizeMode eMode, USHORT nSizeTwips,
-                                        BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, SCTAB nTab,
+                                        ScSizeMode eMode, sal_uInt16 nSizeTwips,
+                                        sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     if (!nRangeCnt)
-        return TRUE;
+        return sal_True;
 
     ScDocument* pDoc = rDocShell.GetDocument();
     if ( bRecord && !pDoc->IsUndoEnabled() )
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     // import into read-only document is possible
     if ( !pDoc->IsChangeReadOnlyEnabled() && !rDocShell.IsEditable() )
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_PROTECTIONERR);		//! eigene Meldung?
-        return FALSE;
+        return sal_False;
     }
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     SCCOLROW nStart = pRanges[0];
     SCCOLROW nEnd = pRanges[2*nRangeCnt-1];
 
-    BOOL bFormula = FALSE;
+    sal_Bool bFormula = sal_False;
     if ( eMode == SC_SIZE_OPTIMAL )
     {
         //!	Option "Formeln anzeigen" - woher nehmen?
@@ -3164,13 +3159,13 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         if (bWidth)
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, FALSE );
-            pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_False );
+            pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab, static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
         }
         else
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
-            pDoc->CopyToDocument( 0, static_cast<SCROW>(nStart), nTab, MAXCOL, static_cast<SCROW>(nEnd), nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
+            pDoc->CopyToDocument( 0, static_cast<SCROW>(nStart), nTab, MAXCOL, static_cast<SCROW>(nEnd), nTab, IDF_NONE, sal_False, pUndoDoc );
         }
 
         pUndoRanges = new SCCOLROW[ 2*nRangeCnt ];
@@ -3181,8 +3176,8 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
             pUndoTab = new ScOutlineTable( *pTable );
     }
 
-    BOOL bShow = nSizeTwips > 0 || eMode != SC_SIZE_DIRECT;
-    BOOL bOutline = FALSE;
+    sal_Bool bShow = nSizeTwips > 0 || eMode != SC_SIZE_DIRECT;
+    sal_Bool bOutline = sal_False;
 
     pDoc->IncSizeRecalcLevel( nTab );		// nicht fuer jede Spalte einzeln
     for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
@@ -3194,14 +3189,14 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
         {
             if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT )
             {
-                BOOL bAll = ( eMode==SC_SIZE_OPTIMAL );
+                sal_Bool bAll = ( eMode==SC_SIZE_OPTIMAL );
                 if (!bAll)
                 {
                     //	fuer alle eingeblendeten CR_MANUALSIZE loeschen,
                     //	dann SetOptimalHeight mit bShrink = FALSE
                     for (SCROW nRow=nStartNo; nRow<=nEndNo; nRow++)
                     {
-                        BYTE nOld = pDoc->GetRowFlags(nRow,nTab);
+                        sal_uInt8 nOld = pDoc->GetRowFlags(nRow,nTab);
                         SCROW nLastRow = -1;
                         bool bHidden = pDoc->RowHidden(nRow, nTab, nLastRow);
                         if ( !bHidden && ( nOld & CR_MANUALSIZE ) )
@@ -3215,9 +3210,9 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
                                         aProv.GetPPTX(), aProv.GetPPTY(), aOne, aOne, bAll );
 
                 if (bAll)
-                    pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE );
+                    pDoc->ShowRows( nStartNo, nEndNo, nTab, sal_True );
 
-                //	Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt
+                //	Manual-Flag wird bei bAll=sal_True schon in SetOptimalHeight gesetzt
                 //	(an bei Extra-Height, sonst aus).
             }
             else if ( eMode==SC_SIZE_DIRECT || eMode==SC_SIZE_ORIGINAL )
@@ -3225,14 +3220,14 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
                 if (nSizeTwips)
                 {
                     pDoc->SetRowHeightRange( nStartNo, nEndNo, nTab, nSizeTwips );
-                    pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE );			// height was set manually
+                    pDoc->SetManualHeight( nStartNo, nEndNo, nTab, sal_True );			// height was set manually
                 }
                 if ( eMode != SC_SIZE_ORIGINAL )
                     pDoc->ShowRows( nStartNo, nEndNo, nTab, nSizeTwips != 0 );
             }
             else if ( eMode==SC_SIZE_SHOW )
             {
-                pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE );
+                pDoc->ShowRows( nStartNo, nEndNo, nTab, sal_True );
             }
         }
         else								// Spaltenbreiten
@@ -3242,7 +3237,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
                 SCCOL nLastCol = -1;
                 if ( eMode != SC_SIZE_VISOPT || !pDoc->ColHidden(nCol, nTab, nLastCol) )
                 {
-                    USHORT nThisSize = nSizeTwips;
+                    sal_uInt16 nThisSize = nSizeTwips;
 
                     if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT )
                         nThisSize = nSizeTwips +
@@ -3295,21 +3290,21 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
 }
 
 
-BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
-                                BOOL bRecord, BOOL bSetModified, BOOL /* bApi */ )
+sal_Bool ScDocFunc::InsertPageBreak( sal_Bool bColumn, const ScAddress& rPos,
+                                sal_Bool bRecord, sal_Bool bSetModified, sal_Bool /* bApi */ )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     SCTAB nTab = rPos.Tab();
     SfxBindings* pBindings = rDocShell.GetViewBindings();
 
     SCCOLROW nPos = bColumn ? static_cast<SCCOLROW>(rPos.Col()) :
         static_cast<SCCOLROW>(rPos.Row());
     if (nPos == 0)
-        return FALSE;					// erste Spalte / Zeile
+        return sal_False;					// erste Spalte / Zeile
 
     ScBreakType nBreak = bColumn ? 
         pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) : 
@@ -3319,7 +3314,7 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
 
     if (bRecord)
         rDocShell.GetUndoManager()->AddUndoAction(
-            new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, TRUE ) );
+            new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, sal_True ) );
 
     if (bColumn)
         pDoc->SetColBreak(static_cast<SCCOL>(nPos), nTab, false, true);
@@ -3330,7 +3325,7 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
     pDoc->UpdatePageBreaks( nTab );
 
     if (pDoc->IsStreamValid(nTab))
-        pDoc->SetStreamValid(nTab, FALSE);
+        pDoc->SetStreamValid(nTab, sal_False);
 
     if (bColumn)
     {
@@ -3356,17 +3351,17 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
     if (bSetModified)
         aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
-                                BOOL bRecord, BOOL bSetModified, BOOL /* bApi */ )
+sal_Bool ScDocFunc::RemovePageBreak( sal_Bool bColumn, const ScAddress& rPos,
+                                sal_Bool bRecord, sal_Bool bSetModified, sal_Bool /* bApi */ )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     SCTAB nTab = rPos.Tab();
     SfxBindings* pBindings = rDocShell.GetViewBindings();
 
@@ -3384,7 +3379,7 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
 
     if (bRecord)
         rDocShell.GetUndoManager()->AddUndoAction(
-            new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, FALSE ) );
+            new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, sal_False ) );
 
     if (bColumn)
         pDoc->RemoveColBreak(static_cast<SCCOL>(nPos), nTab, false, true);
@@ -3394,7 +3389,7 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
     pDoc->UpdatePageBreaks( nTab );
 
     if (pDoc->IsStreamValid(nTab))
-        pDoc->SetStreamValid(nTab, FALSE);
+        pDoc->SetStreamValid(nTab, sal_False);
 
     if (bColumn)
     {
@@ -3420,7 +3415,7 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
     if (bSetModified)
         aModificator.SetDocumentModified();
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -3450,7 +3445,7 @@ void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect )
     aModificator.SetDocumentModified();
 }
 
-BOOL ScDocFunc::Protect( SCTAB nTab, const String& rPassword, BOOL /*bApi*/ )
+sal_Bool ScDocFunc::Protect( SCTAB nTab, const String& rPassword, sal_Bool /*bApi*/ )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if (nTab == TABLEID_DOC)
@@ -3504,7 +3499,7 @@ BOOL ScDocFunc::Protect( SCTAB nTab, const String& rPassword, BOOL /*bApi*/ )
     return true;
 }
 
-BOOL ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, BOOL bApi )
+sal_Bool ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
 
@@ -3579,18 +3574,18 @@ BOOL ScDocFunc::Unprotect( SCTAB nTab, const String& rPassword, BOOL bApi )
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL bApi )
+sal_Bool ScDocFunc::ClearItems( const ScMarkData& rMark, const sal_uInt16* pWhich, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
     ScEditableTester aTester( pDoc, rMark );
     if (!aTester.IsEditable())
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     //	#i12940# ClearItems is called (from setPropertyToDefault) directly with uno object's cached
@@ -3599,7 +3594,7 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL
 
     ScRange aMarkRange;
     ScMarkData aMultiMark = rMark;
-    aMultiMark.SetMarking(FALSE);		// for MarkToMulti
+    aMultiMark.SetMarking(sal_False);		// for MarkToMulti
     aMultiMark.MarkToMulti();
     aMultiMark.GetMultiMarkArea( aMarkRange );
 
@@ -3611,7 +3606,7 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL
 
         ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab );
-        pDoc->CopyToDocument( aMarkRange, IDF_ATTRIB, TRUE, pUndoDoc, (ScMarkData*)&aMultiMark );
+        pDoc->CopyToDocument( aMarkRange, IDF_ATTRIB, sal_True, pUndoDoc, (ScMarkData*)&aMultiMark );
 
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoClearItems( &rDocShell, aMultiMark, pUndoDoc, pWhich ) );
@@ -3624,21 +3619,21 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL
 
     //!	Bindings-Invalidate etc.?
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bApi )
+sal_Bool ScDocFunc::ChangeIndent( const ScMarkData& rMark, sal_Bool bIncrement, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     ScEditableTester aTester( pDoc, rMark );
     if (!aTester.IsEditable())
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     ScRange aMarkRange;
@@ -3659,7 +3654,7 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bAp
         ScRange aCopyRange = aMarkRange;
         aCopyRange.aStart.SetTab(0);
         aCopyRange.aEnd.SetTab(nTabCount-1);
-        pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pUndoDoc, (ScMarkData*)&rMark );
+        pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pUndoDoc, (ScMarkData*)&rMark );
 
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoIndent( &rDocShell, rMark, pUndoDoc, bIncrement ) );
@@ -3685,15 +3680,15 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bAp
         pBindings->Invalidate( SID_ALIGN_ANY_JUSTIFIED );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
-                            USHORT nFormatNo, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
+                            sal_uInt16 nFormatNo, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -3703,14 +3698,14 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScMarkData aMark;
     if (pTabMark)
         aMark = *pTabMark;
     else
     {
         for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++)
-            aMark.SelectTable( nTab, TRUE );
+            aMark.SelectTable( nTab, sal_True );
     }
 
     ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat();
@@ -3719,7 +3714,7 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
     {
         WaitObject aWait( rDocShell.GetActiveDialogParent() );
 
-        BOOL bSize = (*pAutoFormat)[nFormatNo]->GetIncludeWidthHeight();
+        sal_Bool bSize = (*pAutoFormat)[nFormatNo]->GetIncludeWidthHeight();
 
         SCTAB nTabCount = pDoc->GetTableCount();
         ScDocument* pUndoDoc = NULL;
@@ -3734,13 +3729,13 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
             ScRange aCopyRange = rRange;
             aCopyRange.aStart.SetTab(0);
             aCopyRange.aStart.SetTab(nTabCount-1);
-            pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, FALSE, pUndoDoc, &aMark );
+            pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_False, pUndoDoc, &aMark );
             if (bSize)
             {
                 pDoc->CopyToDocument( nStartCol,0,0, nEndCol,MAXROW,nTabCount-1,
-                                                            IDF_NONE, FALSE, pUndoDoc, &aMark );
+                                                            IDF_NONE, sal_False, pUndoDoc, &aMark );
                 pDoc->CopyToDocument( 0,nStartRow,0, MAXCOL,nEndRow,nTabCount-1,
-                                                            IDF_NONE, FALSE, pUndoDoc, &aMark );
+                                                            IDF_NONE, sal_False, pUndoDoc, &aMark );
             }
             pDoc->BeginDrawUndo();
         }
@@ -3762,8 +3757,8 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
             for (SCTAB nTab=0; nTab<nTabCount; nTab++)
                 if (aMark.GetTableSelect(nTab))
                 {
-                    SetWidthOrHeight( TRUE, 1,nCols, nTab, SC_SIZE_VISOPT, STD_EXTRA_WIDTH, FALSE, TRUE);
-                    SetWidthOrHeight( FALSE,1,nRows, nTab, SC_SIZE_VISOPT, 0, FALSE, FALSE);
+                    SetWidthOrHeight( sal_True, 1,nCols, nTab, SC_SIZE_VISOPT, STD_EXTRA_WIDTH, sal_False, sal_True);
+                    SetWidthOrHeight( sal_False,1,nRows, nTab, SC_SIZE_VISOPT, 0, sal_False, sal_False);
                     rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
                                     PAINT_GRID | PAINT_LEFT | PAINT_TOP );
                 }
@@ -3773,8 +3768,8 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
             for (SCTAB nTab=0; nTab<nTabCount; nTab++)
                 if (aMark.GetTableSelect(nTab))
                 {
-                    BOOL bAdj = AdjustRowHeight( ScRange(nStartCol, nStartRow, nTab,
-                                                        nEndCol, nEndRow, nTab), FALSE );
+                    sal_Bool bAdj = AdjustRowHeight( ScRange(nStartCol, nStartRow, nTab,
+                                                        nEndCol, nEndRow, nTab), sal_False );
                     if (bAdj)
                         rDocShell.PostPaint( 0,nStartRow,nTab, MAXCOL,MAXROW,nTab,
                                             PAINT_GRID | PAINT_LEFT );
@@ -3800,13 +3795,13 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
-        const ScTokenArray* pTokenArray, const String& rString, BOOL bApi, BOOL bEnglish,
+sal_Bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
+        const ScTokenArray* pTokenArray, const String& rString, sal_Bool bApi, sal_Bool bEnglish,
         const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
 {
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -3815,7 +3810,7 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
     SCROW nEndRow = rRange.aEnd.Row();
     SCTAB nEndTab = rRange.aEnd.Tab();
 
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     ScMarkData aMark;
     if (pTabMark)
@@ -3823,7 +3818,7 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
     else
     {
         for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++)
-            aMark.SelectTable( nTab, TRUE );
+            aMark.SelectTable( nTab, sal_True );
     }
 
     ScEditableTester aTester( pDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark );
@@ -3838,7 +3833,7 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
             //!	auch bei Undo selektierte Tabellen beruecksichtigen
             pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
             pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab );
-            pDoc->CopyToDocument( rRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( rRange, IDF_ALL & ~IDF_NOTE, sal_False, pUndoDoc );
         }
 
         // use TokenArray if given, string (and flags) otherwise
@@ -3880,7 +3875,7 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
         rDocShell.PostPaint( nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab, PAINT_GRID );
         aModificator.SetDocumentModified();
 
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else if (!bApi)
         rDocShell.ErrorMessage(aTester.GetMessageId());
@@ -3890,12 +3885,12 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
-                            const ScTabOpParam& rParam, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
+                            const ScTabOpParam& rParam, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -3905,7 +3900,7 @@ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -3913,7 +3908,7 @@ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
     else
     {
         for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++)
-            aMark.SelectTable( nTab, TRUE );
+            aMark.SelectTable( nTab, sal_True );
     }
 
     ScEditableTester aTester( pDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark );
@@ -3926,7 +3921,7 @@ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
             //!	auch bei Undo selektierte Tabellen beruecksichtigen
             ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
             pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab );
-            pDoc->CopyToDocument( rRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( rRange, IDF_ALL & ~IDF_NOTE, sal_False, pUndoDoc );
 
             rDocShell.GetUndoManager()->AddUndoAction(
                     new ScUndoTabOp( &rDocShell,
@@ -3941,7 +3936,7 @@ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
         pDoc->InsertTableOp(rParam, nStartCol, nStartRow, nEndCol, nEndRow, aMark);
         rDocShell.PostPaintGridAll();
         aModificator.SetDocumentModified();
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else if (!bApi)
         rDocShell.ErrorMessage(aTester.GetMessageId());
@@ -3963,12 +3958,12 @@ inline ScDirection DirFromFillDir( FillDir eDir )
         return DIR_LEFT;
 }
 
-BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
-                            FillDir eDir, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
+                            FillDir eDir, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -3978,7 +3973,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -3986,7 +3981,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
     else
     {
         for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++)
-            aMark.SelectTable( nTab, TRUE );
+            aMark.SelectTable( nTab, sal_True );
     }
 
     ScEditableTester aTester( pDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark );
@@ -4033,7 +4028,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
             ScRange aCopyRange = aDestArea;
             aCopyRange.aStart.SetTab(0);
             aCopyRange.aEnd.SetTab(nTabCount-1);
-            pDoc->CopyToDocument( aCopyRange, IDF_AUTOFILL, FALSE, pUndoDoc, &aMark );
+            pDoc->CopyToDocument( aCopyRange, IDF_AUTOFILL, sal_False, pUndoDoc, &aMark );
         }
 
         pDoc->Fill( aSourceArea.aStart.Col(), aSourceArea.aStart.Row(),
@@ -4053,7 +4048,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
 //		rDocShell.PostPaintDataChanged();
         aModificator.SetDocumentModified();
 
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else if (!bApi)
         rDocShell.ErrorMessage(aTester.GetMessageId());
@@ -4061,14 +4056,14 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
     return bSuccess;
 }
 
-BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
+sal_Bool ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
                             FillDir	eDir, FillCmd eCmd, FillDateCmd	eDateCmd,
                             double fStart, double fStep, double fMax,
-                            BOOL bRecord, BOOL bApi )
+                            sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -4078,7 +4073,7 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -4086,7 +4081,7 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
     else
     {
         for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++)
-            aMark.SelectTable( nTab, TRUE );
+            aMark.SelectTable( nTab, sal_True );
     }
 
     ScEditableTester aTester( pDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark );
@@ -4140,7 +4135,7 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
             pDoc->CopyToDocument(
                 aDestArea.aStart.Col(), aDestArea.aStart.Row(), 0,
                 aDestArea.aEnd.Col(), aDestArea.aEnd.Row(), nTabCount-1,
-                IDF_AUTOFILL, FALSE, pUndoDoc, &aMark );
+                IDF_AUTOFILL, sal_False, pUndoDoc, &aMark );
         }
 
         if (aDestArea.aStart.Col() <= aDestArea.aEnd.Col() &&
@@ -4171,7 +4166,7 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
                                     pDoc->GetRangeName()->GetSharedMaxIndex()+1 ) );
         }
 
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else if (!bApi)
         rDocShell.ErrorMessage(aTester.GetMessageId());
@@ -4179,8 +4174,8 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
     return bSuccess;
 }
 
-BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
-                            FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
+                            FillDir eDir, sal_uLong nCount, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -4193,7 +4188,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
     SCTAB nEndTab = rRange.aEnd.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScMarkData aMark;
     if (pTabMark)
@@ -4201,7 +4196,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
     else
     {
         for (SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++)
-            aMark.SelectTable( nTab, TRUE );
+            aMark.SelectTable( nTab, sal_True );
     }
 
     ScRange aSourceArea = rRange;
@@ -4218,7 +4213,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
             aDestArea.aEnd.SetRow( sal::static_int_cast<SCROW>( aSourceArea.aEnd.Row() + nCount ) );
             break;
         case FILL_TO_TOP:
-            if (nCount > sal::static_int_cast<ULONG>( aSourceArea.aStart.Row() ))
+            if (nCount > sal::static_int_cast<sal_uLong>( aSourceArea.aStart.Row() ))
             {
                 DBG_ERROR("FillAuto: Row < 0");
                 nCount = aSourceArea.aStart.Row();
@@ -4229,7 +4224,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
             aDestArea.aEnd.SetCol( sal::static_int_cast<SCCOL>( aSourceArea.aEnd.Col() + nCount ) );
             break;
         case FILL_TO_LEFT:
-            if (nCount > sal::static_int_cast<ULONG>( aSourceArea.aStart.Col() ))
+            if (nCount > sal::static_int_cast<sal_uLong>( aSourceArea.aStart.Col() ))
             {
                 DBG_ERROR("FillAuto: Col < 0");
                 nCount = aSourceArea.aStart.Col();
@@ -4250,7 +4245,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     if ( pDoc->HasSelectedBlockMatrixFragment( nStartCol, nStartRow,
@@ -4258,7 +4253,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
     {
         if (!bApi)
             rDocShell.ErrorMessage(STR_MATRIXFRAGMENTERR);
-        return FALSE;
+        return sal_False;
     }
 
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
@@ -4279,7 +4274,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
         pDoc->CopyToDocument(
             aDestArea.aStart.Col(), aDestArea.aStart.Row(), 0,
             aDestArea.aEnd.Col(), aDestArea.aEnd.Row(), nTabCount-1,
-            IDF_AUTOFILL, FALSE, pUndoDoc, &aMark );
+            IDF_AUTOFILL, sal_False, pUndoDoc, &aMark );
     }
 
     pDoc->Fill( aSourceArea.aStart.Col(), aSourceArea.aStart.Row(),
@@ -4301,12 +4296,12 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
     aModificator.SetDocumentModified();
 
     rRange = aDestArea;			// Zielbereich zurueckgeben (zum Markieren)
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::MergeCells( const ScRange& rRange, sal_Bool bContents, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -4318,20 +4313,20 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
     SCTAB nTab = rRange.aStart.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScEditableTester aTester( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
     if (!aTester.IsEditable())
     {
         if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     if ( nStartCol == nEndCol && nStartRow == nEndRow )
     {
         // nichts zu tun
-        return TRUE;
+        return sal_True;
     }
 
     if ( pDoc->HasAttrib( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
@@ -4340,10 +4335,10 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
         // "Zusammenfassen nicht verschachteln !"
         if (!bApi)
             rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
-        return FALSE;
+        return sal_False;
     }
 
-    BOOL bNeedContents = bContents &&
+    sal_Bool bNeedContents = bContents &&
             ( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) ||
               !pDoc->IsBlockEmpty( nTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) );
 
@@ -4362,7 +4357,7 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
             pUndoDoc->InitUndo( pDoc, nTab, nTab );
             // note captions are collected by drawing undo
             pDoc->CopyToDocument( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
-                                    IDF_ALL|IDF_NOCAPTIONS, FALSE, pUndoDoc );
+                                    IDF_ALL|IDF_NOCAPTIONS, sal_False, pUndoDoc );
         }
         if( bHasNotes )
             pDoc->BeginDrawUndo();
@@ -4396,10 +4391,10 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord,
         pBindings->Invalidate( FID_MERGE_TOGGLE );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
+sal_Bool ScDocFunc::UnmergeCells( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -4407,7 +4402,7 @@ BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
     SCTAB nTab = rRange.aStart.Tab();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     if ( pDoc->HasAttrib( rRange, HASATTR_MERGED ) )
     {
@@ -4420,7 +4415,7 @@ BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
         {
             ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
             pUndoDoc->InitUndo( pDoc, nTab, nTab );
-            pDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( aExtended, IDF_ATTRIB, sal_False, pUndoDoc );
             rDocShell.GetUndoManager()->AddUndoAction(
                 new ScUndoRemoveMerge( &rDocShell, rRange, pUndoDoc ) );
         }
@@ -4436,32 +4431,32 @@ BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
                                 aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
                                 SC_MF_HOR | SC_MF_VER );
 
-        pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
+        pDoc->ExtendMerge( aRefresh, sal_True, sal_False );
 
         if ( !AdjustRowHeight( aExtended ) )
             rDocShell.PostPaint( aExtended, PAINT_GRID );
         aModificator.SetDocumentModified();
     }
     else if (!bApi)
-        Sound::Beep();		//! FALSE zurueck???
+        Sound::Beep();		//! sal_False zurueck???
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi )
+sal_Bool ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, sal_Bool bApi )
 {
     return SetNewRangeNames( new ScRangeName( rNewRanges ), bApi );
 }
 
-BOOL ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, BOOL /* bApi */ )     // takes ownership of pNewRanges
+sal_Bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, sal_Bool /* bApi */ )     // takes ownership of pNewRanges
 {
     ScDocShellModificator aModificator( rDocShell );
 
     DBG_ASSERT( pNewRanges, "pNewRanges is 0" );
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     if (bUndo)
     {
@@ -4475,18 +4470,18 @@ BOOL ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, BOOL /* bApi */ )
     // #i55926# While loading XML, formula cells only have a single string token,
     // so CompileNameFormula would never find any name (index) tokens, and would
     // unnecessarily loop through all cells.
-    BOOL bCompile = ( !pDoc->IsImportingXML() && pDoc->GetNamedRangesLockCount() == 0 );
+    sal_Bool bCompile = ( !pDoc->IsImportingXML() && pDoc->GetNamedRangesLockCount() == 0 );
 
     if ( bCompile )
-        pDoc->CompileNameFormula( TRUE );	// CreateFormulaString
+        pDoc->CompileNameFormula( sal_True );	// CreateFormulaString
     pDoc->SetRangeName( pNewRanges );       // takes ownership
     if ( bCompile )
-        pDoc->CompileNameFormula( FALSE );	// CompileFormulaString
+        pDoc->CompileNameFormula( sal_False );	// CompileFormulaString
 
     aModificator.SetDocumentModified();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -4494,7 +4489,7 @@ BOOL ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, BOOL /* bApi */ )
 void ScDocFunc::CreateOneName( ScRangeName& rList,
                                 SCCOL nPosX, SCROW nPosY, SCTAB nTab,
                                 SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
-                                BOOL& rCancel, BOOL bApi )
+                                sal_Bool& rCancel, sal_Bool bApi )
 {
     if (rCancel)
         return;
@@ -4510,8 +4505,8 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
             String aContent;
             ScRange( nX1, nY1, nTab, nX2, nY2, nTab ).Format( aContent, SCR_ABS_3D, pDoc );
 
-            BOOL bInsert = FALSE;
-            USHORT nOldPos;
+            sal_Bool bInsert = sal_False;
+            sal_uInt16 nOldPos;
             if (rList.SearchName( aName, nOldPos ))			// vorhanden ?
             {
                 ScRangeData* pOld = rList[nOldPos];
@@ -4520,7 +4515,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
                 if (aOldStr != aContent)
                 {
                     if (bApi)
-                        bInsert = TRUE;		// per API nicht nachfragen
+                        bInsert = sal_True;		// per API nicht nachfragen
                     else
                     {
                         String aTemplate = ScGlobal::GetRscString( STR_CREATENAME_REPLACE );
@@ -4535,15 +4530,15 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
                         if ( nResult == RET_YES )
                         {
                             rList.AtFree(nOldPos);
-                            bInsert = TRUE;
+                            bInsert = sal_True;
                         }
                         else if ( nResult == RET_CANCEL )
-                            rCancel = TRUE;
+                            rCancel = sal_True;
                     }
                 }
             }
             else
-                bInsert = TRUE;
+                bInsert = sal_True;
 
             if (bInsert)
             {
@@ -4559,14 +4554,14 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
     }
 }
 
-BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi )
+sal_Bool ScDocFunc::CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi )
 {
     if (!nFlags)
-        return FALSE;		// war nix
+        return sal_False;		// war nix
 
     ScDocShellModificator aModificator( rDocShell );
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
     SCCOL nEndCol = rRange.aEnd.Col();
@@ -4574,26 +4569,26 @@ BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi )
     SCTAB nTab = rRange.aStart.Tab();
     DBG_ASSERT(rRange.aEnd.Tab() == nTab, "CreateNames: mehrere Tabellen geht nicht");
 
-    BOOL bValid = TRUE;
+    sal_Bool bValid = sal_True;
     if ( nFlags & ( NAME_TOP | NAME_BOTTOM ) )
         if ( nStartRow == nEndRow )
-            bValid = FALSE;
+            bValid = sal_False;
     if ( nFlags & ( NAME_LEFT | NAME_RIGHT ) )
         if ( nStartCol == nEndCol )
-            bValid = FALSE;
+            bValid = sal_False;
 
     if (bValid)
     {
         ScDocument* pDoc = rDocShell.GetDocument();
         ScRangeName* pNames = pDoc->GetRangeName();
         if (!pNames)
-            return FALSE;	// soll nicht sein
+            return sal_False;	// soll nicht sein
         ScRangeName aNewRanges( *pNames );
 
-        BOOL bTop    = ( ( nFlags & NAME_TOP ) != 0 );
-        BOOL bLeft   = ( ( nFlags & NAME_LEFT ) != 0 );
-        BOOL bBottom = ( ( nFlags & NAME_BOTTOM ) != 0 );
-        BOOL bRight  = ( ( nFlags & NAME_RIGHT ) != 0 );
+        sal_Bool bTop    = ( ( nFlags & NAME_TOP ) != 0 );
+        sal_Bool bLeft   = ( ( nFlags & NAME_LEFT ) != 0 );
+        sal_Bool bBottom = ( ( nFlags & NAME_BOTTOM ) != 0 );
+        sal_Bool bRight  = ( ( nFlags & NAME_RIGHT ) != 0 );
 
         SCCOL nContX1 = nStartCol;
         SCROW nContY1 = nStartRow;
@@ -4609,7 +4604,7 @@ BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi )
         if ( bRight )
             --nContX2;
 
-        BOOL bCancel = FALSE;
+        sal_Bool bCancel = sal_False;
         SCCOL i;
         SCROW j;
 
@@ -4646,21 +4641,21 @@ BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi )
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
+sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( rDocShell );
 
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
-    const BOOL bRecord = pDoc->IsUndoEnabled();
+    const sal_Bool bRecord = pDoc->IsUndoEnabled();
     SCTAB nTab = rStartPos.Tab();
     ScDocument* pUndoDoc = NULL;
 
     ScRangeName* pList = pDoc->GetRangeName();
-    USHORT nCount = pList->GetCount();
-    USHORT nValidCount = 0;
-    USHORT i;
+    sal_uInt16 nCount = pList->GetCount();
+    sal_uInt16 nValidCount = 0;
+    sal_uInt16 i;
     for (i=0; i<nCount; i++)
     {
         ScRangeData* pData = (*pList)[i];
@@ -4683,13 +4678,13 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
                 pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
                 pUndoDoc->InitUndo( pDoc, nTab, nTab );
                 pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab,
-                                        IDF_ALL, FALSE, pUndoDoc );
+                                        IDF_ALL, sal_False, pUndoDoc );
 
                 pDoc->BeginDrawUndo();		// wegen Hoehenanpassung
             }
 
             ScRangeData** ppSortArray = new ScRangeData* [ nValidCount ];
-            USHORT j = 0;
+            sal_uInt16 j = 0;
             for (i=0; i<nCount; i++)
             {
                 ScRangeData* pData = (*pList)[i];
@@ -4727,7 +4722,7 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
                 ScDocument* pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
                 pRedoDoc->InitUndo( pDoc, nTab, nTab );
                 pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab,
-                                        IDF_ALL, FALSE, pRedoDoc );
+                                        IDF_ALL, sal_False, pRedoDoc );
 
                 rDocShell.GetUndoManager()->AddUndoAction(
                     new ScUndoListNames( &rDocShell,
@@ -4739,7 +4734,7 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
                 rDocShell.PostPaint( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, PAINT_GRID );
 //!			rDocShell.UpdateOle(GetViewData());
             aModificator.SetDocumentModified();
-            bDone = TRUE;
+            bDone = sal_True;
         }
         else if (!bApi)
             rDocShell.ErrorMessage(aTester.GetMessageId());
@@ -4749,16 +4744,16 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi )
+sal_Bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, sal_Bool bApi )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     SCCOL nStartCol = rOldRange.aStart.Col();
     SCROW nStartRow = rOldRange.aStart.Row();
     SCTAB nTab = rOldRange.aStart.Tab();
 
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     String aFormula;
     pDoc->GetFormula( nStartCol, nStartRow, nTab, aFormula );
@@ -4773,17 +4768,17 @@ BOOL ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd
 
         ScMarkData aMark;
         aMark.SetMarkArea( rOldRange );
-        aMark.SelectTable( nTab, TRUE );
+        aMark.SelectTable( nTab, sal_True );
         ScRange aNewRange( rOldRange.aStart, rNewEnd );
 
-        if ( DeleteContents( aMark, IDF_CONTENTS, TRUE, bApi ) )
+        if ( DeleteContents( aMark, IDF_CONTENTS, sal_True, bApi ) )
         {
             // GRAM_PODF_A1 for API compatibility.
-            bRet = EnterMatrix( aNewRange, &aMark, NULL, aFormula, bApi, FALSE, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
+            bRet = EnterMatrix( aNewRange, &aMark, NULL, aFormula, bApi, sal_False, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
             if (!bRet)
             {
                 //	versuchen, alten Zustand wiederherzustellen
-                EnterMatrix( rOldRange, &aMark, NULL, aFormula, bApi, FALSE, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
+                EnterMatrix( rOldRange, &aMark, NULL, aFormula, bApi, sal_False, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
             }
         }
 
@@ -4796,15 +4791,15 @@ BOOL ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
+sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
                                 const String& rOptions, const String& rSource,
-                                const ScRange& rDestRange, ULONG nRefresh,
-                                BOOL bFitBlock, BOOL bApi )
+                                const ScRange& rDestRange, sal_uLong nRefresh,
+                                sal_Bool bFitBlock, sal_Bool bApi )
 {
     //!	auch fuer ScViewFunc::InsertAreaLink benutzen!
 
     ScDocument* pDoc = rDocShell.GetDocument();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
     sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
 
@@ -4812,9 +4807,9 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
     //  remove them first (file format specifies only one link definition
     //  for a cell)
 
-    USHORT nLinkCount = pLinkManager->GetLinks().Count();
-    USHORT nRemoved = 0;
-    USHORT nLinkPos = 0;
+    sal_uInt16 nLinkCount = pLinkManager->GetLinks().Count();
+    sal_uInt16 nRemoved = 0;
+    sal_uInt16 nLinkPos = 0;
     while (nLinkPos<nLinkCount)
     {
         ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[nLinkPos];
@@ -4847,7 +4842,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
     String aFilterName = rFilter;
     String aNewOptions = rOptions;
     if (!aFilterName.Len())
-        ScDocumentLoader::GetFilterName( rFile, aFilterName, aNewOptions, TRUE, !bApi );
+        ScDocumentLoader::GetFilterName( rFile, aFilterName, aNewOptions, sal_True, !bApi );
 
     //	remove application prefix from filter name here, so the filter options
     //	aren't reset when the filter name is changed in ScAreaLink::DataChanged
@@ -4874,7 +4869,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
         pLink->SetDoInsert(bFitBlock);	// beim ersten Update ggf. nichts einfuegen
         pLink->Update();				// kein SetInCreate -> Update ausfuehren
     }
-    pLink->SetDoInsert(TRUE);		// Default = TRUE
+    pLink->SetDoInsert(sal_True);		// Default = sal_True
 
     SfxBindings* pBindings = rDocShell.GetViewBindings();
     if (pBindings)
@@ -4882,7 +4877,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );		// Navigator
 
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index eb4714080..62b067249 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -274,17 +274,17 @@ sal_uInt16 ScDocShell::GetHiddenInformationState( sal_uInt16 nStates )
 
 void ScDocShell::BeforeXMLLoading()
 {
-    aDocument.DisableIdle( TRUE );
+    aDocument.DisableIdle( sal_True );
 
     // prevent unnecessary broadcasts and updates
     DBG_ASSERT(pModificator == NULL, "The Modificator should not exist");
     pModificator = new ScDocShellModificator( *this );
 
-    aDocument.SetImportingXML( TRUE );
+    aDocument.SetImportingXML( sal_True );
     aDocument.EnableExecuteLink( false );   // #i101304# to be safe, prevent nested loading from external references
-    aDocument.EnableUndo( FALSE );
+    aDocument.EnableUndo( sal_False );
     // prevent unnecessary broadcasts and "half way listeners"
-    aDocument.SetInsertingFromOtherDoc( TRUE );
+    aDocument.SetInsertingFromOtherDoc( sal_True );
 
     if (GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
         ScColumn::bDoubleAlloc = sal_True;
@@ -296,7 +296,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
     {
         UpdateLinks();
         // don't prevent establishing of listeners anymore
-        aDocument.SetInsertingFromOtherDoc( FALSE );
+        aDocument.SetInsertingFromOtherDoc( sal_False );
         if ( bRet )
         {
             ScChartListenerCollection* pChartListener = aDocument.GetChartListenerCollection();
@@ -323,12 +323,12 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
                             ScGlobal::UnicodeStrChr( pNameBuffer, SC_COMPILER_FILE_TAB_SEP ) )
                         {
                             rtl::OUStringBuffer aDocURLBuffer;
-                            BOOL bQuote = TRUE;			// Dokumentenname ist immer quoted
+                            sal_Bool bQuote = sal_True;			// Dokumentenname ist immer quoted
                             ++pNameBuffer;
                             while ( bQuote && *pNameBuffer )
                             {
                                 if ( *pNameBuffer == '\'' && *(pNameBuffer-1) != '\\' )
-                                    bQuote = FALSE;
+                                    bQuote = sal_False;
                                 else if( !(*pNameBuffer == '\\' && *(pNameBuffer+1) == '\'') )
                                     aDocURLBuffer.append(*pNameBuffer);		// falls escaped Quote: nur Quote in den Namen
                                 ++pNameBuffer;
@@ -344,7 +344,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
                                     !aINetURLObject.HasError()) // the docname should be a valid URL
                                 {
                                     aName = ScGlobal::GetDocTabName( aDocument.GetLinkDoc( i ), aDocument.GetLinkTab( i ) );
-                                    aDocument.RenameTab(i, aName, TRUE, TRUE);
+                                    aDocument.RenameTab(i, aName, sal_True, sal_True);
                                 }
                                 // else;  nothing has to happen, because it is a user given name
                             }
@@ -361,8 +361,8 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
             ScDPCollection* pDPCollection = aDocument.GetDPCollection();
             if ( pDPCollection )
             {
-                USHORT nDPCount = pDPCollection->GetCount();
-                for (USHORT nDP=0; nDP<nDPCount; nDP++)
+                sal_uInt16 nDPCount = pDPCollection->GetCount();
+                for (sal_uInt16 nDP=0; nDP<nDPCount; nDP++)
                 {
                     ScDPObject* pDPObj = (*pDPCollection)[nDP];
                     if ( !pDPObj->GetName().Len() )
@@ -373,12 +373,12 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
         ScColumn::bDoubleAlloc = sal_False;
     }
     else
-        aDocument.SetInsertingFromOtherDoc( FALSE );
+        aDocument.SetInsertingFromOtherDoc( sal_False );
         
-    aDocument.SetImportingXML( FALSE );
+    aDocument.SetImportingXML( sal_False );
     aDocument.EnableExecuteLink( true );
-    aDocument.EnableUndo( TRUE );
-    bIsEmpty = FALSE;
+    aDocument.EnableUndo( sal_True );
+    bIsEmpty = sal_False;
 
     if (pModificator)
     {
@@ -390,10 +390,10 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
         DBG_ERROR("The Modificator should exist");
     }
 
-    aDocument.DisableIdle( FALSE );
+    aDocument.DisableIdle( sal_False );
 }
 
-BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor )
+sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::LoadXML" );
 
@@ -406,7 +406,7 @@ BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R
     // #i62677# BeforeXMLLoading is also called from ScXMLImport::startDocument when invoked
     // from an external component. The XMLFromWrapper flag is only set here, when called
     // through ScDocShell.
-    aDocument.SetXMLFromWrapper( TRUE );
+    aDocument.SetXMLFromWrapper( sal_True );
 
     ScXMLImportWrapper aImport( aDocument, pLoadMedium, xStor );
 
@@ -420,7 +420,7 @@ BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R
     if ( nError )
         pLoadMedium->SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
 
-    aDocument.SetXMLFromWrapper( FALSE );
+    aDocument.SetXMLFromWrapper( sal_False );
     AfterXMLLoading(bRet);
 
     //!	row heights...
@@ -428,11 +428,11 @@ BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R
     return bRet;
 }
 
-BOOL ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor )
+sal_Bool ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::SaveXML" );
 
-    aDocument.DisableIdle( TRUE );
+    aDocument.DisableIdle( sal_True );
 
     ScXMLImportWrapper aImport( aDocument, pSaveMedium, xStor );
     sal_Bool bRet(sal_False);
@@ -441,12 +441,12 @@ BOOL ScDocShell::SaveXML( SfxMedium* pSaveMedium, const ::com::sun::star::uno::R
     else
         bRet = aImport.Export(sal_True);
 
-    aDocument.DisableIdle( FALSE );
+    aDocument.DisableIdle( sal_False );
 
     return bRet;
 }
 
-BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium )
+sal_Bool __EXPORT ScDocShell::Load( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" );
 
@@ -458,7 +458,7 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium )
 
     GetUndoManager()->Clear();
 
-    BOOL bRet = SfxObjectShell::Load( rMedium );
+    sal_Bool bRet = SfxObjectShell::Load( rMedium );
     if( bRet )
     {
         if (GetMedium())
@@ -491,7 +491,7 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium )
     if ( bRet )
         aDocument.InvalidateTableArea();
 
-    bIsEmpty = FALSE;
+    bIsEmpty = sal_False;
     FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES );
     return bRet;
 }
@@ -514,7 +514,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
         }
         else if ( rHint.ISA( SfxEventHint ) )
         {
-            ULONG nEventId = static_cast< const SfxEventHint& >( rHint ).GetEventId();
+            sal_uLong nEventId = static_cast< const SfxEventHint& >( rHint ).GetEventId();
             switch ( nEventId )
             {
                 case SFX_EVENT_ACTIVATEDOC:
@@ -569,7 +569,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
     if (rHint.ISA(SfxSimpleHint))								// ohne Parameter
     {
-        ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nSlot = ((const SfxSimpleHint&)rHint).GetId();
         switch ( nSlot )
         {
             case SFX_HINT_TITLECHANGED:
@@ -593,7 +593,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
         ScRange aRange = rStlHint.GetRange();
         String aName1 = rStlHint.GetStyle1();
         String aName2 = rStlHint.GetStyle2();
-        UINT32 nTimeout = rStlHint.GetTimeout();
+        sal_uInt32 nTimeout = rStlHint.GetTimeout();
 
         if (!pAutoStyleList)
             pAutoStyleList = new ScAutoStyleList(this);
@@ -601,7 +601,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
     else if ( rHint.ISA( SfxEventHint ) )
     {
-        ULONG nEventId = ((SfxEventHint&)rHint).GetEventId();
+        sal_uLong nEventId = ((SfxEventHint&)rHint).GetEventId();
         switch ( nEventId )
         {
             case SFX_EVENT_LOADFINISHED:
@@ -638,7 +638,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                                 ScGlobal::GetRscString( STR_SHARED_DOC_WARNING ) );
                             aBox.SetDefaultCheckBoxText();
                             aBox.Execute();
-                            BOOL bChecked = aBox.GetCheckBoxState();
+                            sal_Bool bChecked = aBox.GetCheckBoxState();
                             if ( bChecked )
                             {
                                 aAppOptions.SetShowSharedDocumentWarning( !bChecked );
@@ -795,8 +795,8 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                                             ScChangeViewSettings* pChangeViewSet = aDocument.GetChangeViewSettings();
                                             if ( pChangeViewSet && pChangeViewSet->ShowChanges() )
                                             {
-                                                pChangeViewSet->SetShowChanges( FALSE );
-                                                pChangeViewSet->SetShowAccepted( FALSE );
+                                                pChangeViewSet->SetShowChanges( sal_False );
+                                                pChangeViewSet->SetShowAccepted( sal_False );
                                                 aDocument.SetChangeViewSettings( *pChangeViewSet );
                                                 bChangedViewSettings = true;
                                             }
@@ -821,8 +821,8 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
                                             if ( bChangedViewSettings )
                                             {
-                                                pChangeViewSet->SetShowChanges( TRUE );
-                                                pChangeViewSet->SetShowAccepted( TRUE );
+                                                pChangeViewSet->SetShowChanges( sal_True );
+                                                pChangeViewSet->SetShowAccepted( sal_True );
                                                 aDocument.SetChangeViewSettings( *pChangeViewSet );
                                             }
                                         }
@@ -917,7 +917,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
     // Inhalte fuer Organizer laden
 
 
-BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
+sal_Bool __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::LoadFrom" );
 
@@ -925,7 +925,7 @@ BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium )
 
     WaitObject aWait( GetActiveDialogParent() );
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if (GetMedium())
     {
@@ -993,13 +993,13 @@ private:
 
 }
 
-BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
+sal_Bool __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" );
 
     LoadMediumGuard aLoadGuard(&aDocument);
 
-    BOOL bRet = FALSE;				// FALSE heisst Benutzerabbruch !!
+    sal_Bool bRet = sal_False;				// sal_False heisst Benutzerabbruch !!
                                     // bei Fehler: Fehler am Stream setzen!!
 
     ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
@@ -1007,13 +1007,13 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
     GetUndoManager()->Clear();
 
     // ob nach dem Import optimale Spaltenbreiten gesetzt werden sollen
-    BOOL bSetColWidths = FALSE;
-    BOOL bSetSimpleTextColWidths = FALSE;
-    BOOL bSimpleColWidth[MAXCOLCOUNT];
-    memset( bSimpleColWidth, 1, (MAXCOLCOUNT) * sizeof(BOOL) );
+    sal_Bool bSetColWidths = sal_False;
+    sal_Bool bSetSimpleTextColWidths = sal_False;
+    sal_Bool bSimpleColWidth[MAXCOLCOUNT];
+    memset( bSimpleColWidth, 1, (MAXCOLCOUNT) * sizeof(sal_Bool) );
     ScRange aColWidthRange;
     // ob nach dem Import optimale Zeilenhoehen gesetzt werden sollen
-    BOOL bSetRowHeights = FALSE;
+    sal_Bool bSetRowHeights = sal_False;
 
     aConvFilterName.Erase(); //@ #BugId 54198
 
@@ -1032,10 +1032,10 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
 
         aConvFilterName=aFltName; //@ #BugId 54198
 
-        BOOL bCalc3 = ( aFltName.EqualsAscii(pFilterSc30) );
-        BOOL bCalc4 = ( aFltName.EqualsAscii(pFilterSc40) );
+        sal_Bool bCalc3 = ( aFltName.EqualsAscii(pFilterSc30) );
+        sal_Bool bCalc4 = ( aFltName.EqualsAscii(pFilterSc40) );
         if (!bCalc3 && !bCalc4)
-            aDocument.SetInsertingFromOtherDoc( TRUE );
+            aDocument.SetInsertingFromOtherDoc( sal_True );
 
         if (aFltName.EqualsAscii(pFilterXML))
             bRet = LoadXML( &rMedium, NULL );
@@ -1051,7 +1051,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                         SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
                 }
                 else
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
         }
         else if (aFltName.EqualsAscii(pFilterLotus))
@@ -1060,7 +1060,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
             SfxItemSet*	 pSet = rMedium.GetItemSet();
             const SfxPoolItem* pItem;
             if ( pSet && SFX_ITEM_SET ==
-                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
             {
                 sItStr = ((const SfxStringItem*)pItem)->GetValue();
             }
@@ -1072,22 +1072,22 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_437 );
             }
 
-            ScColumn::bDoubleAlloc = TRUE;
+            ScColumn::bDoubleAlloc = sal_True;
             FltError eError = ScFormatFilter::Get().ScImportLotus123( rMedium, &aDocument,
                                                 ScGlobal::GetCharsetValue(sItStr));
-            ScColumn::bDoubleAlloc = FALSE;
+            ScColumn::bDoubleAlloc = sal_False;
             if (eError != eERR_OK)
             {
                 if (!GetError())
                     SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
 
                 if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
             else
-                bRet = TRUE;
-            bSetColWidths = TRUE;
-            bSetRowHeights = TRUE;
+                bRet = sal_True;
+            bSetColWidths = sal_True;
+            bSetRowHeights = sal_True;
         }
         else if ( aFltName.EqualsAscii(pFilterExcel4) || aFltName.EqualsAscii(pFilterExcel5) ||
                    aFltName.EqualsAscii(pFilterExcel95) || aFltName.EqualsAscii(pFilterExcel97) ||
@@ -1105,9 +1105,9 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
 
             MakeDrawLayer();				//! im Filter
             CalcOutputFactor();             // #93255# prepare update of row height
-            ScColumn::bDoubleAlloc = TRUE;
+            ScColumn::bDoubleAlloc = sal_True;
             FltError eError = ScFormatFilter::Get().ScImportExcel( rMedium, &aDocument, eFormat );
-            ScColumn::bDoubleAlloc = FALSE;
+            ScColumn::bDoubleAlloc = sal_False;
             aDocument.UpdateFontCharSet();
             if ( aDocument.IsChartListenerCollectionNeedsUpdate() )
                 aDocument.UpdateChartListenerCollection();				//! fuer alle Importe?
@@ -1119,7 +1119,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
             {
                 if (!GetError())
                     SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
-                bRet = TRUE;
+                bRet = sal_True;
             }
             else if (eError != eERR_OK)
             {
@@ -1127,23 +1127,23 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                     SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
             }
             else
-                bRet = TRUE;
+                bRet = sal_True;
 
             // #93255# update of row height done inside of Excel filter to speed up chart import
-//            bSetRowHeights = TRUE;      //  #75357# optimal row heights must be updated
+//            bSetRowHeights = sal_True;      //  #75357# optimal row heights must be updated
         }
         else if (aFltName.EqualsAscii(pFilterAscii))
         {
             SfxItemSet*	 pSet = rMedium.GetItemSet();
             const SfxPoolItem* pItem;
             ScAsciiOptions aOptions;
-            BOOL bOptInit = FALSE;
+            sal_Bool bOptInit = sal_False;
 
             if ( pSet && SFX_ITEM_SET ==
-                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
             {
                 aOptions.ReadFromString( ((const SfxStringItem*)pItem)->GetValue() );
-                bOptInit = TRUE;
+                bOptInit = sal_True;
             }
 
             if ( !bOptInit )
@@ -1157,7 +1157,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
             }
 
             FltError eError = eERR_OK;
-            BOOL bOverflow = FALSE;
+            sal_Bool bOverflow = sal_False;
 
             if( ! rMedium.IsStorage() )
             {
@@ -1191,8 +1191,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 if (!GetError())
                     SetError(SCWARN_IMPORT_RANGE_OVERFLOW, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
             }
-            bSetColWidths = TRUE;
-            bSetSimpleTextColWidths = TRUE;
+            bSetColWidths = sal_True;
+            bSetSimpleTextColWidths = sal_True;
         }
         else if (aFltName.EqualsAscii(pFilterDBase))
         {
@@ -1200,7 +1200,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
             SfxItemSet*	 pSet = rMedium.GetItemSet();
             const SfxPoolItem* pItem;
             if ( pSet && SFX_ITEM_SET ==
-                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
             {
                 sItStr = ((const SfxStringItem*)pItem)->GetValue();
             }
@@ -1213,7 +1213,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_850 );
             }
 
-            ULONG eError = DBaseImport( rMedium.GetPhysicalName(),
+            sal_uLong eError = DBaseImport( rMedium.GetPhysicalName(),
                     ScGlobal::GetCharsetValue(sItStr), bSimpleColWidth );
 
             if (eError != eERR_OK)
@@ -1223,16 +1223,16 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 bRet = ( eError == SCWARN_IMPORT_RANGE_OVERFLOW );
             }
             else
-                bRet = TRUE;
+                bRet = sal_True;
 
             aColWidthRange.aStart.SetRow( 1 );	// Spaltenheader nicht
-            bSetColWidths = TRUE;
-            bSetSimpleTextColWidths = TRUE;
+            bSetColWidths = sal_True;
+            bSetSimpleTextColWidths = sal_True;
             // Memo-Felder fuehren zu einem bSimpleColWidth[nCol]==FALSE
             for ( SCCOL nCol=0; nCol <= MAXCOL && !bSetRowHeights; nCol++ )
             {
                 if ( !bSimpleColWidth[nCol] )
-                    bSetRowHeights = TRUE;
+                    bSetRowHeights = sal_True;
             }
         }
         else if (aFltName.EqualsAscii(pFilterDif))
@@ -1245,7 +1245,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 SfxItemSet*	 pSet = rMedium.GetItemSet();
                 const SfxPoolItem* pItem;
                 if ( pSet && SFX_ITEM_SET ==
-                     pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+                     pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
                 {
                     sItStr = ((const SfxStringItem*)pItem)->GetValue();
                 }
@@ -1266,14 +1266,14 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                         SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
 
                     if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
-                        bRet = TRUE;
+                        bRet = sal_True;
                 }
                 else
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
-            bSetColWidths = TRUE;
-            bSetSimpleTextColWidths = TRUE;
-            bSetRowHeights = TRUE;
+            bSetColWidths = sal_True;
+            bSetSimpleTextColWidths = sal_True;
+            bSetRowHeights = sal_True;
         }
         else if (aFltName.EqualsAscii(pFilterSylk))
         {
@@ -1299,29 +1299,29 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
 
             if ( eError != eERR_OK && !GetError() )
                 SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
-            bSetColWidths = TRUE;
-            bSetSimpleTextColWidths = TRUE;
-            bSetRowHeights = TRUE;
+            bSetColWidths = sal_True;
+            bSetSimpleTextColWidths = sal_True;
+            bSetRowHeights = sal_True;
         }
         else if (aFltName.EqualsAscii(pFilterQPro6))
         {
-            ScColumn::bDoubleAlloc = TRUE;
+            ScColumn::bDoubleAlloc = sal_True;
             FltError eError = ScFormatFilter::Get().ScImportQuattroPro( rMedium, &aDocument);
-            ScColumn::bDoubleAlloc = FALSE;
+            ScColumn::bDoubleAlloc = sal_False;
             if (eError != eERR_OK)
             {
                 if (!GetError())
                     SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
                 if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
             else
-                bRet = TRUE;
+                bRet = sal_True;
             // TODO: Filter should set column widths. Not doing it here, it may
             // result in very narrow or wide columns, depending on content.
             // Setting row heights makes cells with font size attribution or
             // wrapping enabled look nicer..
-            bSetRowHeights = TRUE;
+            bSetRowHeights = sal_True;
         }
         else if (aFltName.EqualsAscii(pFilterRtf))
         {
@@ -1340,14 +1340,14 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                             SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
 
                         if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
-                            bRet = TRUE;
+                            bRet = sal_True;
                     }
                     else
-                        bRet = TRUE;
+                        bRet = sal_True;
                     aDocument.StartAllListeners();
                     aDocument.SetDirty();
-                    bSetColWidths = TRUE;
-                    bSetRowHeights = TRUE;
+                    bSetColWidths = sal_True;
+                    bSetRowHeights = sal_True;
                 }
                 else
                 {
@@ -1361,7 +1361,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
         else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ))
         {
             FltError eError = SCERR_IMPORT_UNKNOWN;
-            BOOL bWebQuery = aFltName.EqualsAscii(pFilterHtmlWebQ);
+            sal_Bool bWebQuery = aFltName.EqualsAscii(pFilterHtmlWebQ);
             if( !rMedium.IsStorage() )
             {
                 SvStream* pInStream = rMedium.GetInStream();
@@ -1372,7 +1372,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                     SfxItemSet*	 pSet = rMedium.GetItemSet();
                     const SfxPoolItem* pItem;
                     if ( pSet && SFX_ITEM_SET ==
-                         pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+                         pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
                     {
                         String aFilterOption = (static_cast<const SfxStringItem*>(pItem))->GetValue();
                         lcl_parseHtmlFilterOption(aFilterOption, eLang, bDateConvert);
@@ -1391,10 +1391,10 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
                             SetError(eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
 
                         if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
-                            bRet = TRUE;
+                            bRet = sal_True;
                     }
                     else
-                        bRet = TRUE;
+                        bRet = sal_True;
                     aDocument.StartAllListeners();
                     aDocument.SetDirty();
                 }
@@ -1414,7 +1414,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
         }
 
         if (!bCalc3)
-            aDocument.SetInsertingFromOtherDoc( FALSE );
+            aDocument.SetInsertingFromOtherDoc( sal_False );
     }
     else
     {
@@ -1447,18 +1447,18 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
             {
                 for ( SCCOL nCol=0; nCol <= nEndCol; nCol++ )
                 {
-                    USHORT nWidth = aDocument.GetOptimalColWidth(
-                        nCol, nTab, &aVirtDev, nPPTX, nPPTY, aZoom, aZoom, FALSE, &aMark,
+                    sal_uInt16 nWidth = aDocument.GetOptimalColWidth(
+                        nCol, nTab, &aVirtDev, nPPTX, nPPTY, aZoom, aZoom, sal_False, &aMark,
                         (bSetSimpleTextColWidths && bSimpleColWidth[nCol]) );
                     aDocument.SetColWidth( nCol, nTab,
-                        nWidth + (USHORT)ScGlobal::nLastColWidthExtra );
+                        nWidth + (sal_uInt16)ScGlobal::nLastColWidthExtra );
                 }
             }
 //			if ( bSetRowHeights )
 //			{
 //				//	nExtra must be 0
 //				aDocument.SetOptimalHeight(	0, nEndRow, nTab, 0, &aVirtDev,
-//					nPPTX, nPPTY, aZoom, aZoom, FALSE );
+//					nPPTX, nPPTY, aZoom, aZoom, sal_False );
 //			}
         }
         if ( bSetRowHeights )
@@ -1470,7 +1470,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
     if ( bRet )
         aDocument.InvalidateTableArea();
 
-    bIsEmpty = FALSE;
+    bIsEmpty = sal_False;
 
     return bRet;
 }
@@ -1514,7 +1514,7 @@ ScDocShell::PrepareSaveGuard::~PrepareSaveGuard()
 }
 
 
-BOOL __EXPORT ScDocShell::Save()
+sal_Bool __EXPORT ScDocShell::Save()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Save" );
 
@@ -1523,14 +1523,14 @@ BOOL __EXPORT ScDocShell::Save()
     PrepareSaveGuard aPrepareGuard( *this);
 
     //	wait cursor is handled with progress bar
-    BOOL bRet = SfxObjectShell::Save();
+    sal_Bool bRet = SfxObjectShell::Save();
     if( bRet )
         bRet = SaveXML( GetMedium(), NULL );
     return bRet;
 }
 
 
-BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
+sal_Bool __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::SaveAs" );
 
@@ -1549,7 +1549,7 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
     PrepareSaveGuard aPrepareGuard( *this);
 
     //	wait cursor is handled with progress bar
-    BOOL bRet = SfxObjectShell::SaveAs( rMedium );
+    sal_Bool bRet = SfxObjectShell::SaveAs( rMedium );
     if( bRet )
         bRet = SaveXML( &rMedium, NULL );
 
@@ -1557,13 +1557,13 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
 }
 
 
-BOOL __EXPORT ScDocShell::IsInformationLost()
+sal_Bool __EXPORT ScDocShell::IsInformationLost()
 {
 /*
     const SfxFilter *pFilt = GetMedium()->GetFilter();
-    BOOL bRet = pFilt && pFilt->IsAlienFormat() && bNoInformLost;
+    sal_Bool bRet = pFilt && pFilt->IsAlienFormat() && bNoInformLost;
     if (bNoInformLost)					// nur einmal!!
-        bNoInformLost = FALSE;
+        bNoInformLost = sal_False;
     return bRet;
 */
     //!!! bei Gelegenheit ein korrekte eigene Behandlung einbauen
@@ -1573,7 +1573,7 @@ BOOL __EXPORT ScDocShell::IsInformationLost()
 
 
 // Xcl-like column width measured in characters of standard font.
-xub_StrLen lcl_ScDocShell_GetColWidthInChars( USHORT nWidth )
+xub_StrLen lcl_ScDocShell_GetColWidthInChars( sal_uInt16 nWidth )
 {
     // double fColScale = 1.0;
     double	f = nWidth;
@@ -1588,7 +1588,7 @@ xub_StrLen lcl_ScDocShell_GetColWidthInChars( USHORT nWidth )
 
 
 void lcl_ScDocShell_GetFixedWidthString( String& rStr, const ScDocument& rDoc,
-        SCTAB nTab, SCCOL nCol, BOOL bValue, SvxCellHorJustify eHorJust )
+        SCTAB nTab, SCCOL nCol, sal_Bool bValue, SvxCellHorJustify eHorJust )
 {
     xub_StrLen nLen = lcl_ScDocShell_GetColWidthInChars(
             rDoc.GetColWidth( nCol, nTab ) );
@@ -1631,7 +1631,7 @@ void lcl_ScDocShell_WriteEmptyFixedWidthString( SvStream& rStream,
         const ScDocument& rDoc, SCTAB nTab, SCCOL nCol )
 {
     String aString;
-    lcl_ScDocShell_GetFixedWidthString( aString, rDoc, nTab, nCol, FALSE,
+    lcl_ScDocShell_GetFixedWidthString( aString, rDoc, nTab, nCol, sal_False,
             SVX_HOR_JUSTIFY_STANDARD );
     rStream.WriteUnicodeOrByteText( aString );
 }
@@ -1642,19 +1642,19 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
     sal_Unicode cDelim    = rAsciiOpt.nFieldSepCode;
     sal_Unicode cStrDelim = rAsciiOpt.nTextSepCode;
     CharSet eCharSet      = rAsciiOpt.eCharSet;
-    BOOL bFixedWidth      = rAsciiOpt.bFixedWidth;
-    BOOL bSaveAsShown     = rAsciiOpt.bSaveAsShown;
+    sal_Bool bFixedWidth      = rAsciiOpt.bFixedWidth;
+    sal_Bool bSaveAsShown     = rAsciiOpt.bSaveAsShown;
 
     CharSet eOldCharSet = rStream.GetStreamCharSet();
     rStream.SetStreamCharSet( eCharSet );
-    USHORT nOldNumberFormatInt = rStream.GetNumberFormatInt();
+    sal_uInt16 nOldNumberFormatInt = rStream.GetNumberFormatInt();
     ByteString aStrDelimEncoded;    // only used if not Unicode
     UniString aStrDelimDecoded;     // only used if context encoding
-    BOOL bContextOrNotAsciiEncoding;
+    sal_Bool bContextOrNotAsciiEncoding;
     if ( eCharSet == RTL_TEXTENCODING_UNICODE )
     {
         rStream.StartWritingUnicodeText();
-        bContextOrNotAsciiEncoding = FALSE;
+        bContextOrNotAsciiEncoding = sal_False;
     }
     else
     {
@@ -1670,7 +1670,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
                 aStrDelimDecoded = String( aStrDelimEncoded, eCharSet );
         }
         else
-            bContextOrNotAsciiEncoding = FALSE;
+            bContextOrNotAsciiEncoding = sal_False;
     }
 
     SCCOL nStartCol = 0;
@@ -1688,8 +1688,8 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
     const ScViewOptions& rOpt = (pViewSh)
                                 ? pViewSh->GetViewData()->GetOptions()
                                 : aDocument.GetViewOptions();
-    BOOL bShowFormulas = rOpt.GetOption( VOPT_FORMULAS );
-    BOOL bTabProtect = aDocument.IsTabProtected( nTab );
+    sal_Bool bShowFormulas = rOpt.GetOption( VOPT_FORMULAS );
+    sal_Bool bTabProtect = aDocument.IsTabProtected( nTab );
 
     SCCOL nCol;
     SCROW nRow;
@@ -1704,10 +1704,10 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
     ScBaseCell* pCell;
     while ( ( pCell = aIter.GetNext( nCol, nRow ) ) != NULL )
     {
-        BOOL bProgress = FALSE;		// only upon line change
+        sal_Bool bProgress = sal_False;		// only upon line change
         if ( nNextRow < nRow )
         {   // empty rows or/and empty columns up to end of row
-            bProgress = TRUE;
+            bProgress = sal_True;
             for ( nEmptyCol = nNextCol; nEmptyCol < nEndCol; nEmptyCol++ )
             {   // remaining columns of last row
                 if ( bFixedWidth )
@@ -1753,7 +1753,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
         }
         if ( nCol == nEndCol )
         {
-            bProgress = TRUE;
+            bProgress = sal_True;
             nNextCol = nStartCol;
             nNextRow = nRow + 1;
         }
@@ -1771,26 +1771,26 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
                       pProtAttr->GetHideFormula() ) )
                 eType = CELLTYPE_NONE;	// hide
         }
-        BOOL bString;
+        sal_Bool bString;
         switch ( eType )
         {
             case CELLTYPE_NOTE:
             case CELLTYPE_NONE:
                 aString.Erase();
-                bString = FALSE;
+                bString = sal_False;
                 break;
             case CELLTYPE_FORMULA :
                 {
-                    USHORT nErrCode;
+                    sal_uInt16 nErrCode;
                     if ( bShowFormulas )
                     {
                         ((ScFormulaCell*)pCell)->GetFormula( aString );
-                        bString = TRUE;
+                        bString = sal_True;
                     }
                     else if ( ( nErrCode = ((ScFormulaCell*)pCell)->GetErrCode() ) != 0 )
                     {
                         aString = ScGlobal::GetErrorString( nErrCode );
-                        bString = TRUE;
+                        bString = sal_True;
                     }
                     else if ( ((ScFormulaCell*)pCell)->IsValue() )
                     {
@@ -1805,7 +1805,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
                         else
                         {
                             ScCellFormat::GetInputString( pCell, nFormat, aString, rFormatter );
-                            bString = FALSE;
+                            bString = sal_False;
                         }
                     }
                     else
@@ -1819,7 +1819,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
                         }
                         else
                             ((ScFormulaCell*)pCell)->GetString( aString );
-                        bString = TRUE;
+                        bString = sal_True;
                     }
                 }
                 break;
@@ -1833,7 +1833,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
                 }
                 else
                     ((ScStringCell*)pCell)->GetString( aString );
-                bString = TRUE;
+                bString = sal_True;
                 break;
             case CELLTYPE_EDIT :
                 {
@@ -1842,7 +1842,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
                     EditEngine& rEngine = aDocument.GetEditEngine();
                     rEngine.SetText( *pObj);
                     aString = rEngine.GetText();  // including LF
-                    bString = TRUE;
+                    bString = sal_True;
                 }
                 break;
             case CELLTYPE_VALUE :
@@ -1858,14 +1858,14 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
                     else
                     {
                         ScCellFormat::GetInputString( pCell, nFormat, aString, rFormatter );
-                        bString = FALSE;
+                        bString = sal_False;
                     }
                 }
                 break;
             default:
                 DBG_ERROR( "ScDocShell::AsciiSave: unknown CellType" );
                 aString.Erase();
-                bString = FALSE;
+                bString = sal_False;
         }
 
         if ( bFixedWidth )
@@ -2009,7 +2009,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
     rStream.SetNumberFormatInt( nOldNumberFormatInt );
 }
 
-BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
+sal_Bool __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertTo" );
 
@@ -2025,7 +2025,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
 
     DBG_ASSERT( rMed.GetFilter(), "Filter == 0" );
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     String aFltName = rMed.GetFilter()->GetFilterName();
 
 /*
@@ -2117,7 +2117,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
             SfxItemSet*	 pSet = rMed.GetItemSet();
             const SfxPoolItem* pItem;
             if ( pSet && SFX_ITEM_SET ==
-                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
             {
                 sItStr = ((const SfxStringItem*)pItem)->GetValue();
             }
@@ -2134,7 +2134,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
             WaitObject aWait( GetActiveDialogParent() );
             ScImportOptions aOptions( sItStr );
             AsciiSave( *pStream, aOptions );
-            bRet = TRUE;
+            bRet = sal_True;
 
             if (aDocument.GetTableCount() > 1)
                 if (!rMed.GetError())
@@ -2147,7 +2147,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
         SfxItemSet*	pSet = rMed.GetItemSet();
         const SfxPoolItem* pItem;
         if ( pSet && SFX_ITEM_SET ==
-             pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+             pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
         {
             sCharSet = ((const SfxStringItem*)pItem)->GetValue();
         }
@@ -2163,9 +2163,9 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
         WaitObject aWait( GetActiveDialogParent() );
 // HACK damit Sba geoffnetes TempFile ueberschreiben kann
         rMed.CloseOutStream();
-        BOOL bHasMemo = FALSE;
+        sal_Bool bHasMemo = sal_False;
 
-        ULONG eError = DBaseExport( rMed.GetPhysicalName(),
+        sal_uLong eError = DBaseExport( rMed.GetPhysicalName(),
                         ScGlobal::GetCharsetValue(sCharSet), bHasMemo );
 
         if ( eError != eERR_OK && (eError & ERRCODE_WARNING_MASK) )
@@ -2189,7 +2189,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
         }
         else
         {
-            bRet = TRUE;
+            bRet = sal_True;
             if ( bHasMemo )
             {
                 SfxStringItem* pNameItem =
@@ -2197,9 +2197,9 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
                 INetURLObject aDbtFile( pNameItem->GetValue(), INET_PROT_FILE );
                 aDbtFile.setExtension( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("dbt")) );
                 if ( IsDocument( aDbtFile ) && !KillFile( aDbtFile ) )
-                    bRet = FALSE;
+                    bRet = sal_False;
                 if ( bRet && !MoveFile( aTmpFile, aDbtFile ) )
-                    bRet = FALSE;
+                    bRet = sal_False;
                 if ( !bRet )
                 {
                     KillFile( aTmpFile );
@@ -2218,7 +2218,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
             SfxItemSet*	 pSet = rMed.GetItemSet();
             const SfxPoolItem* pItem;
             if ( pSet && SFX_ITEM_SET ==
-                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+                 pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
             {
                 sItStr = ((const SfxStringItem*)pItem)->GetValue();
             }
@@ -2234,7 +2234,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
             WaitObject aWait( GetActiveDialogParent() );
             ScFormatFilter::Get().ScExportDif( *pStream, &aDocument, ScAddress(0,0,0),
                 ScGlobal::GetCharsetValue(sItStr) );
-            bRet = TRUE;
+            bRet = sal_True;
 
             if (aDocument.GetTableCount() > 1)
                 if (!rMed.GetError())
@@ -2254,7 +2254,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
             ScRange aRange( 0,0,0, nEndCol,nEndRow,0 );
 
             ScImportExport aImExport( &aDocument, aRange );
-            aImExport.SetFormulas( TRUE );
+            aImExport.SetFormulas( sal_True );
             bRet = aImExport.ExportStream( *pStream, rMed.GetBaseURL( true ), SOT_FORMATSTR_ID_SYLK );
         }
     }
@@ -2283,15 +2283,15 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
 }
 
 
-BOOL __EXPORT ScDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor )
+sal_Bool __EXPORT ScDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor )
 {
     return SfxObjectShell::SaveCompleted( xStor );
 }
 
 
-BOOL __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
+sal_Bool __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
 {
-    BOOL bRet = SfxObjectShell::DoSaveCompleted( pNewStor );
+    sal_Bool bRet = SfxObjectShell::DoSaveCompleted( pNewStor );
 
     //	SC_HINT_DOC_SAVED fuer Wechsel ReadOnly -> Read/Write
     Broadcast( SfxSimpleHint( SC_HINT_DOC_SAVED ) );
@@ -2299,7 +2299,7 @@ BOOL __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
 }
 
 
-sal_Bool ScDocShell::QuerySlotExecutable( USHORT nSlotId )
+sal_Bool ScDocShell::QuerySlotExecutable( sal_uInt16 nSlotId )
 {
     // #i112634# ask VBA event handlers whether to save or print the document
     
@@ -2338,7 +2338,7 @@ sal_Bool ScDocShell::QuerySlotExecutable( USHORT nSlotId )
 }
 
 
-USHORT __EXPORT ScDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
+sal_uInt16 __EXPORT ScDocShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
 {
     if(SC_MOD()->GetCurRefDlgId()>0)
     {
@@ -2354,12 +2354,12 @@ USHORT __EXPORT ScDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
             }
         }
 
-        return FALSE;
+        return sal_False;
     }
     if ( aDocument.IsInLinkUpdate() || aDocument.IsInInterpreter() )
     {
         ErrorMessage(STR_CLOSE_ERROR_LINK);
-        return FALSE;
+        return sal_False;
     }
 
     DoEnterHandler();
@@ -2384,9 +2384,9 @@ USHORT __EXPORT ScDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
     }
     // end handler code
 
-    USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
-    if (nRet == TRUE)						// TRUE = schliessen
-        aDocument.DisableIdle(TRUE);		// nicht mehr drin rumpfuschen !!!
+    sal_uInt16 nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
+    if (nRet == sal_True)						// sal_True = schliessen
+        aDocument.DisableIdle(sal_True);		// nicht mehr drin rumpfuschen !!!
 
     return nRet;
 }
@@ -2440,9 +2440,9 @@ String ScDocShell::GetDifFilterName()			// static
     return String::CreateFromAscii(pFilterDif);
 }
 
-BOOL ScDocShell::HasAutomaticTableName( const String& rFilter )		// static
+sal_Bool ScDocShell::HasAutomaticTableName( const String& rFilter )		// static
 {
-    //	TRUE for those filters that keep the default table name
+    //	sal_True for those filters that keep the default table name
     //	(which is language specific)
 
     return rFilter.EqualsAscii( pFilterAscii )
@@ -2463,15 +2463,15 @@ BOOL ScDocShell::HasAutomaticTableName( const String& rFilter )		// static
         aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TEXT"))), \
         nPrtToScreenFactor( 1.0 ), \
         pImpl           ( new DocShell_Impl ), \
-        bHeaderOn		( TRUE ), \
-        bFooterOn		( TRUE ), \
-        bNoInformLost   ( TRUE ), \
-        bIsEmpty		( TRUE ), \
-        bIsInUndo		( FALSE ), \
-        bDocumentModifiedPending( FALSE ), \
+        bHeaderOn		( sal_True ), \
+        bFooterOn		( sal_True ), \
+        bNoInformLost   ( sal_True ), \
+        bIsEmpty		( sal_True ), \
+        bIsInUndo		( sal_False ), \
+        bDocumentModifiedPending( sal_False ), \
         nDocumentLock	( 0 ), \
         nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), \
-        bUpdateEnabled  ( TRUE ), \
+        bUpdateEnabled  ( sal_True ), \
         pOldAutoDBRange ( NULL ), \
         pDocHelper 		( NULL ), \
         pAutoStyleList	( NULL ), \
@@ -2581,12 +2581,12 @@ __EXPORT ScDocShell::~ScDocShell()
 
 //------------------------------------------------------------------
 
-SfxUndoManager* __EXPORT ScDocShell::GetUndoManager()
+::svl::IUndoManager* __EXPORT ScDocShell::GetUndoManager()
 {
     return aDocument.GetUndoManager();
 }
 
-void ScDocShell::SetModified( BOOL bModified )
+void ScDocShell::SetModified( sal_Bool bModified )
 {
     if ( SfxObjectShell::IsEnableSetModified() )
     {
@@ -2596,7 +2596,7 @@ void ScDocShell::SetModified( BOOL bModified )
 }
 
 
-void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
+void ScDocShell::SetDocumentModified( sal_Bool bIsModified /* = sal_True */ )
 {
     //	BroadcastUno muss auch mit pPaintLockData sofort passieren
     //!	auch bei SetDrawModified, wenn Drawing angebunden ist
@@ -2617,16 +2617,16 @@ void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
     if ( bIsModified )
     {
         if ( aDocument.IsAutoCalcShellDisabled() )
-            SetDocumentModifiedPending( TRUE );
+            SetDocumentModifiedPending( sal_True );
         else
         {
-            SetDocumentModifiedPending( FALSE );
+            SetDocumentModifiedPending( sal_False );
             aDocument.InvalidateStyleSheetUsage();
             aDocument.InvalidateTableArea();
             aDocument.InvalidateLastTableOpParams();
             aDocument.Broadcast( SC_HINT_DATACHANGED, BCA_BRDCST_ALWAYS, NULL );
             if ( aDocument.IsForcedFormulaPending() && aDocument.GetAutoCalc() )
-                aDocument.CalcFormulaTree( TRUE );
+                aDocument.CalcFormulaTree( sal_True );
             PostDataChanged();
 
             //	Detective AutoUpdate:
@@ -2638,9 +2638,9 @@ void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
             if ( pList && ( aDocument.IsDetectiveDirty() || pList->HasAddError() ) &&
                  pList->Count() && !IsInUndo() && SC_MOD()->GetAppOptions().GetDetectiveAuto() )
             {
-                GetDocFunc().DetectiveRefresh(TRUE);	// TRUE = caused by automatic update
+                GetDocFunc().DetectiveRefresh(sal_True);	// sal_True = caused by automatic update
             }
-            aDocument.SetDetectiveDirty(FALSE);			// always reset, also if not refreshed
+            aDocument.SetDetectiveDirty(sal_False);			// always reset, also if not refreshed
         }
 
         // #b6697848# notify UNO objects after BCA_BRDCST_ALWAYS etc.
@@ -2652,9 +2652,9 @@ void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
 //	(Drawing muss auch beim normalen SetDocumentModified upgedated werden,
 //	 z.B. bei Tabelle loeschen etc.)
 
-void ScDocShell::SetDrawModified( BOOL bIsModified /* = TRUE */ )
+void ScDocShell::SetDrawModified( sal_Bool bIsModified /* = sal_True */ )
 {
-    BOOL bUpdate = ( bIsModified != IsModified() );
+    sal_Bool bUpdate = ( bIsModified != IsModified() );
 
     SetModified( bIsModified );
 
@@ -2689,7 +2689,7 @@ void ScDocShell::SetDrawModified( BOOL bIsModified /* = TRUE */ )
     }
 }
 
-void ScDocShell::SetInUndo(BOOL bSet)
+void ScDocShell::SetInUndo(sal_Bool bSet)
 {
     bIsInUndo = bSet;
 }
@@ -2704,8 +2704,8 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat )
 
     if ( pPrinter )
         for ( SCTAB i=0; i<rDocStat.nTableCount; i++ )
-            rDocStat.nPageCount = sal::static_int_cast<USHORT>( rDocStat.nPageCount +
-                (USHORT) ScPrintFunc( this, pPrinter, i ).GetTotalPages() );
+            rDocStat.nPageCount = sal::static_int_cast<sal_uInt16>( rDocStat.nPageCount +
+                (sal_uInt16) ScPrintFunc( this, pPrinter, i ).GetTotalPages() );
 }
 
 
@@ -2779,7 +2779,7 @@ void ScDocShell::UseSheetSaveEntries()
 
             for (nTab = 0; nTab < nTabCount; ++nTab)
                 if (aDocument.IsStreamValid(nTab))
-                    aDocument.SetStreamValid(nTab, FALSE);
+                    aDocument.SetStreamValid(nTab, sal_False);
         }
     }
 }
@@ -2794,8 +2794,8 @@ ScDocShellModificator::ScDocShellModificator( ScDocShell& rDS )
     ScDocument* pDoc = rDocShell.GetDocument();
     bAutoCalcShellDisabled = pDoc->IsAutoCalcShellDisabled();
     bIdleDisabled = pDoc->IsIdleDisabled();
-    pDoc->SetAutoCalcShellDisabled( TRUE );
-    pDoc->DisableIdle( TRUE );
+    pDoc->SetAutoCalcShellDisabled( sal_True );
+    pDoc->DisableIdle( sal_True );
 }
 
 
@@ -2815,7 +2815,7 @@ void ScDocShellModificator::SetDocumentModified()
     if ( !pDoc->IsImportingXML() )
     {
         // AutoCalcShellDisabled temporaer restaurieren
-        BOOL bDisabled = pDoc->IsAutoCalcShellDisabled();
+        sal_Bool bDisabled = pDoc->IsAutoCalcShellDisabled();
         pDoc->SetAutoCalcShellDisabled( bAutoCalcShellDisabled );
         rDocShell.SetDocumentModified();
         pDoc->SetAutoCalcShellDisabled( bDisabled );
@@ -2867,7 +2867,7 @@ void ScDocShell::SetChangeRecording( bool bActivate )
     {
         aDocument.StartChangeTracking();
         ScChangeViewSettings aChangeViewSet;
-        aChangeViewSet.SetShowChanges(TRUE);
+        aChangeViewSet.SetShowChanges(sal_True);
         aDocument.SetChangeViewSettings(aChangeViewSet);
     }
     else
@@ -2882,7 +2882,7 @@ void ScDocShell::SetChangeRecording( bool bActivate )
         // Slots invalidieren
         SfxBindings* pBindings = GetViewBindings();
         if (pBindings)
-            pBindings->InvalidateAll(FALSE);
+            pBindings->InvalidateAll(sal_False);
     }
 }    
 
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 33bd6fbb1..7ab559efa 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -72,22 +72,22 @@ using namespace com::sun::star;
 
 //------------------------------------------------------------------
 
-BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
+sal_Bool __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::InitNew" );
 
-    BOOL bRet = SfxObjectShell::InitNew( xStor );
+    sal_Bool bRet = SfxObjectShell::InitNew( xStor );
 
     aDocument.MakeTable(0);
     //	zusaetzliche Tabellen werden von der ersten View angelegt,
-    //	wenn bIsEmpty dann noch TRUE ist
+    //	wenn bIsEmpty dann noch sal_True ist
 
     if( bRet )
     {
         Size aSize( (long) ( STD_COL_WIDTH			 * HMM_PER_TWIPS * OLE_STD_CELLS_X ),
                     (long) ( ScGlobal::nStdRowHeight * HMM_PER_TWIPS * OLE_STD_CELLS_Y ) );
         // hier muss auch der Start angepasst werden
-        SetVisAreaOrSize( Rectangle( Point(), aSize ), TRUE );
+        SetVisAreaOrSize( Rectangle( Point(), aSize ), sal_True );
     }
 
     aDocument.SetDrawDefaults();        // drawing layer defaults that are set only in InitNew
@@ -129,13 +129,13 @@ BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xSt
 
 //------------------------------------------------------------------
 
-BOOL ScDocShell::IsEmpty() const
+sal_Bool ScDocShell::IsEmpty() const
 {
     return bIsEmpty;
 }
 
 
-void ScDocShell::SetEmpty(BOOL bSet)
+void ScDocShell::SetEmpty(sal_Bool bSet)
 {
     bIsEmpty = bSet;
 }
@@ -211,7 +211,7 @@ void ScDocShell::InitItems()
         if ( !aDocument.IsValidAsianCompression() )
         {
             // set compression mode from configuration if not already set (e.g. XML import)
-            aDocument.SetAsianCompression( sal::static_int_cast<BYTE>( aAsian.GetCharDistanceCompression() ) );
+            aDocument.SetAsianCompression( sal::static_int_cast<sal_uInt8>( aAsian.GetCharDistanceCompression() ) );
         }
 
         if ( !aDocument.IsValidAsianKerning() )
@@ -257,7 +257,7 @@ ScDrawLayer* ScDocShell::MakeDrawLayer()
         InitItems();											// incl. Undo und Basic
         Broadcast( SfxSimpleHint( SC_HINT_DRWLAYER_NEW ) );
         if (nDocumentLock)
-            pDrawLayer->setLock(TRUE);
+            pDrawLayer->setLock(sal_True);
     }
     return pDrawLayer;
 }
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 2567408bb..41685a95a 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -115,8 +115,8 @@ void ScDocShell::PostDataChanged()
 }
 
 void ScDocShell::PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
-                            SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, USHORT nPart,
-                            USHORT nExtFlags )
+                            SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, sal_uInt16 nPart,
+                            sal_uInt16 nExtFlags )
 {
     if (!ValidCol(nStartCol)) nStartCol = MAXCOL;
     if (!ValidRow(nStartRow)) nStartRow = MAXROW;
@@ -127,7 +127,7 @@ void ScDocShell::PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
     {
         // #i54081# PAINT_EXTRAS still has to be brodcast because it changes the
         // current sheet if it's invalid. All other flags added to pPaintLockData.
-        USHORT nLockPart = nPart & ~PAINT_EXTRAS;
+        sal_uInt16 nLockPart = nPart & ~PAINT_EXTRAS;
         if ( nLockPart )
         {
             //! nExtFlags ???
@@ -177,7 +177,7 @@ void ScDocShell::PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
         aDocument.ResetChanged( ScRange(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) );
 }
 
-void ScDocShell::PostPaint( const ScRange& rRange, USHORT nPart, USHORT nExtFlags )
+void ScDocShell::PostPaint( const ScRange& rRange, sal_uInt16 nPart, sal_uInt16 nExtFlags )
 {
     PostPaint( rRange.aStart.Col(), rRange.aStart.Row(), rRange.aStart.Tab(),
                rRange.aEnd.Col(),   rRange.aEnd.Row(),   rRange.aEnd.Tab(),
@@ -204,7 +204,7 @@ void ScDocShell::PostPaintExtras()
     PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_EXTRAS );
 }
 
-void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange )
+void ScDocShell::UpdatePaintExt( sal_uInt16& rExtFlags, const ScRange& rRange )
 {
     if ( ( rExtFlags & SC_PF_LINES ) == 0 && aDocument.HasAttrib( rRange, HASATTR_PAINTEXT ) )
     {
@@ -228,7 +228,7 @@ void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange )
     }
 }
 
-void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
+void ScDocShell::UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
                                                    SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab )
 {
     UpdatePaintExt( rExtFlags, ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ) );
@@ -236,14 +236,14 @@ void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStar
 
 //------------------------------------------------------------------
 
-void ScDocShell::LockPaint_Impl(BOOL bDoc)
+void ScDocShell::LockPaint_Impl(sal_Bool bDoc)
 {
     if ( !pPaintLockData )
         pPaintLockData = new ScPaintLockData(0);	//! Modus...
     pPaintLockData->IncLevel(bDoc);
 }
 
-void ScDocShell::UnlockPaint_Impl(BOOL bDoc)
+void ScDocShell::UnlockPaint_Impl(sal_Bool bDoc)
 {
     if ( pPaintLockData )
     {
@@ -259,9 +259,9 @@ void ScDocShell::UnlockPaint_Impl(BOOL bDoc)
             ScRangeListRef xRangeList = pPaint->GetRangeList();
             if (xRangeList)
             {
-                USHORT nParts = pPaint->GetParts();
-                ULONG nCount = xRangeList->Count();
-                for ( ULONG i=0; i<nCount; i++ )
+                sal_uInt16 nParts = pPaint->GetParts();
+                sal_uLong nCount = xRangeList->Count();
+                for ( sal_uLong i=0; i<nCount; i++ )
                 {
                     //!	nExtFlags ???
                     ScRange aRange = *xRangeList->GetObject(i);
@@ -283,63 +283,63 @@ void ScDocShell::UnlockPaint_Impl(BOOL bDoc)
     }
 }
 
-void ScDocShell::LockDocument_Impl(USHORT nNew)
+void ScDocShell::LockDocument_Impl(sal_uInt16 nNew)
 {
     if (!nDocumentLock)
     {
         ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
         if (pDrawLayer)
-            pDrawLayer->setLock(TRUE);
+            pDrawLayer->setLock(sal_True);
     }
     nDocumentLock = nNew;
 }
 
-void ScDocShell::UnlockDocument_Impl(USHORT nNew)
+void ScDocShell::UnlockDocument_Impl(sal_uInt16 nNew)
 {
     nDocumentLock = nNew;
     if (!nDocumentLock)
     {
         ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
         if (pDrawLayer)
-            pDrawLayer->setLock(FALSE);
+            pDrawLayer->setLock(sal_False);
     }
 }
 
-USHORT ScDocShell::GetLockCount() const
+sal_uInt16 ScDocShell::GetLockCount() const
 {
     return nDocumentLock;
 }
 
-void ScDocShell::SetLockCount(USHORT nNew)
+void ScDocShell::SetLockCount(sal_uInt16 nNew)
 {
     if (nNew)					// setzen
     {
         if ( !pPaintLockData )
             pPaintLockData = new ScPaintLockData(0);	//! Modus...
-        pPaintLockData->SetLevel(nNew-1, TRUE);
+        pPaintLockData->SetLevel(nNew-1, sal_True);
         LockDocument_Impl(nNew);
     }
     else if (pPaintLockData)	// loeschen
     {
-        pPaintLockData->SetLevel(0, TRUE);	// bei Unlock sofort ausfuehren
-        UnlockPaint_Impl(TRUE);					// jetzt
+        pPaintLockData->SetLevel(0, sal_True);	// bei Unlock sofort ausfuehren
+        UnlockPaint_Impl(sal_True);					// jetzt
         UnlockDocument_Impl(0);
     }
 }
 
 void ScDocShell::LockPaint()
 {
-    LockPaint_Impl(FALSE);
+    LockPaint_Impl(sal_False);
 }
 
 void ScDocShell::UnlockPaint()
 {
-    UnlockPaint_Impl(FALSE);
+    UnlockPaint_Impl(sal_False);
 }
 
 void ScDocShell::LockDocument()
 {
-    LockPaint_Impl(TRUE);
+    LockPaint_Impl(sal_True);
     LockDocument_Impl(nDocumentLock + 1);
 }
 
@@ -347,7 +347,7 @@ void ScDocShell::UnlockDocument()
 {
     if (nDocumentLock)
     {
-        UnlockPaint_Impl(TRUE);
+        UnlockPaint_Impl(sal_True);
         UnlockDocument_Impl(nDocumentLock - 1);
     }
     else
@@ -358,7 +358,7 @@ void ScDocShell::UnlockDocument()
 
 //------------------------------------------------------------------
 
-void ScDocShell::SetInplace( BOOL bInplace )
+void ScDocShell::SetInplace( sal_Bool bInplace )
 {
     if (bIsInplace != bInplace)
     {
@@ -375,7 +375,7 @@ void ScDocShell::CalcOutputFactor()
         return;
     }
 
-    BOOL bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg();
+    sal_Bool bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg();
     if (bTextWysiwyg)
     {
         nPrtToScreenFactor = 1.0;
@@ -428,8 +428,8 @@ void ScDocShell::InitOptions(bool bForLoading)      // called from InitNew and L
 {
     //	Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions
 
-    USHORT nDefLang, nCjkLang, nCtlLang;
-    BOOL bAutoSpell;
+    sal_uInt16 nDefLang, nCjkLang, nCtlLang;
+    sal_Bool bAutoSpell;
     ScModule::GetSpellSettings( nDefLang, nCjkLang, nCtlLang, bAutoSpell );
     ScModule* pScMod = SC_MOD();
 
@@ -438,7 +438,7 @@ void ScDocShell::InitOptions(bool bForLoading)      // called from InitNew and L
     aDocOpt.SetAutoSpell( bAutoSpell );
 
     // zweistellige Jahreszahleneingabe aus Extras->Optionen->Allgemein->Sonstiges
-    aDocOpt.SetYear2000( sal::static_int_cast<USHORT>( ::utl::MiscCfg().GetYear2000() ) );
+    aDocOpt.SetYear2000( sal::static_int_cast<sal_uInt16>( ::utl::MiscCfg().GetYear2000() ) );
 
     if (bForLoading)
     {
@@ -463,7 +463,7 @@ Printer* ScDocShell::GetDocumentPrinter()		// fuer OLE
     return aDocument.GetPrinter();
 }
 
-SfxPrinter* ScDocShell::GetPrinter(BOOL bCreateIfNotExist)
+SfxPrinter* ScDocShell::GetPrinter(sal_Bool bCreateIfNotExist)
 {
     return aDocument.GetPrinter(bCreateIfNotExist);
 }
@@ -472,7 +472,7 @@ void ScDocShell::UpdateFontList()
 {
     delete pImpl->pFontList;
     // pImpl->pFontList = new FontList( GetPrinter(), Application::GetDefaultDevice() );
-    pImpl->pFontList = new FontList( GetRefDevice(), NULL, FALSE ); // FALSE or TRUE???
+    pImpl->pFontList = new FontList( GetRefDevice(), NULL, sal_False ); // sal_False or sal_True???
     SvxFontListItem aFontListItem( pImpl->pFontList, SID_ATTR_CHAR_FONTLIST );
     PutItem( aFontListItem );
 
@@ -484,9 +484,9 @@ OutputDevice* ScDocShell::GetRefDevice()
     return aDocument.GetRefDevice();
 }
 
-USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags )
+sal_uInt16 ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags )
 {
-    SfxPrinter *pOld = aDocument.GetPrinter( FALSE );
+    SfxPrinter *pOld = aDocument.GetPrinter( sal_False );
     if ( pOld && pOld->IsPrinting() )
         return SFX_PRINTERROR_BUSY;
 
@@ -557,8 +557,8 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags )
             if (nDiffFlags & SFX_PRINTER_CHG_ORIENTATION)
             {
                 const SvxPageItem& rOldItem = (const SvxPageItem&)rSet.Get(ATTR_PAGE);
-                BOOL bWasLand = rOldItem.IsLandscape();
-                BOOL bNewLand = ( pNewPrinter->GetOrientation() == ORIENTATION_LANDSCAPE );
+                sal_Bool bWasLand = rOldItem.IsLandscape();
+                sal_Bool bNewLand = ( pNewPrinter->GetOrientation() == ORIENTATION_LANDSCAPE );
                 if (bNewLand != bWasLand)
                 {
                     SvxPageItem aNewItem( rOldItem );
@@ -665,13 +665,13 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const String& rComme
         ScChangeTrack* pTrack = GetDocument()->GetChangeTrack();
         if (pTrack)
         {
-            ULONG nNumber = pAction->GetActionNumber();
+            sal_uLong nNumber = pAction->GetActionNumber();
             pTrack->NotifyModified( SC_CTM_CHANGE, nNumber, nNumber );
         }
     }
 }
 
-void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext)
+void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,sal_Bool bPrevNext)
 {
     if (!pAction) return;			// ohne Aktion ist nichts..
 
@@ -681,7 +681,7 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pP
     DateTime aDT = pAction->GetDateTime();
     String aDate = ScGlobal::pLocaleData->getDate( aDT );
     aDate += ' ';
-    aDate += ScGlobal::pLocaleData->getTime( aDT, FALSE, FALSE );
+    aDate += ScGlobal::pLocaleData->getTime( aDT, sal_False, sal_False );
 
     SfxItemSet aSet( GetPool(),
                       SID_ATTR_POSTIT_AUTHOR, SID_ATTR_POSTIT_AUTHOR,
@@ -733,7 +733,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
             if (pOtherMed)
                 aOtherFile = pOtherMed->GetName();
         }
-        BOOL bSameDoc = ( aThisFile == aOtherFile && aThisFile.Len() );
+        sal_Bool bSameDoc = ( aThisFile == aOtherFile && aThisFile.Len() );
         if ( !bSameDoc )
         {
             //	create change actions from comparing with the name of the user
@@ -769,7 +769,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
 //
 //---------------------------------------------------------------------
 
-inline BOOL lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, BOOL bIgnore100Sec )
+inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec )
 {
     return pA && pB &&
         pA->GetActionNumber() == pB->GetActionNumber() &&
@@ -781,14 +781,14 @@ inline BOOL lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, BOOL
     //	State nicht vergleichen, falls eine alte Aenderung akzeptiert wurde
 }
 
-bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument* pSearchDoc, const ScChangeAction* pFirstSearchAction, const ScChangeAction* pLastSearchAction, BOOL bIgnore100Sec )
+bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument* pSearchDoc, const ScChangeAction* pFirstSearchAction, const ScChangeAction* pLastSearchAction, sal_Bool bIgnore100Sec )
 {
     if ( !pDoc || !pAction || !pSearchDoc || !pFirstSearchAction || !pLastSearchAction )
     {
         return false;
     }
 
-    ULONG nLastSearchAction = pLastSearchAction->GetActionNumber();
+    sal_uLong nLastSearchAction = pLastSearchAction->GetActionNumber();
     const ScChangeAction* pA = pFirstSearchAction;
     while ( pA && pA->GetActionNumber() <= nLastSearchAction )
     {
@@ -800,9 +800,9 @@ bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument
              pAction->GetBigRange() == pA->GetBigRange() )
         {
             String aActionDesc;
-            pAction->GetDescription( aActionDesc, pDoc, TRUE );
+            pAction->GetDescription( aActionDesc, pDoc, sal_True );
             String aADesc;
-            pA->GetDescription( aADesc, pSearchDoc, TRUE );
+            pA->GetDescription( aADesc, pSearchDoc, sal_True );
             if ( aActionDesc.Equals( aADesc ) )
             {
                 DBG_ERROR( "lcl_FindAction(): found equal action!" );
@@ -815,9 +815,9 @@ bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument
     return false;
 }
 
-void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheckDuplicates, ULONG nOffset, ScChangeActionMergeMap* pMergeMap, bool bInverseMap )
+void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheckDuplicates, sal_uLong nOffset, ScChangeActionMergeMap* pMergeMap, bool bInverseMap )
 {
-    ScTabViewShell* pViewSh = GetBestViewShell( FALSE );    //! Funktionen an die DocShell
+    ScTabViewShell* pViewSh = GetBestViewShell( sal_False );    //! Funktionen an die DocShell
     if (!pViewSh)
         return;
 
@@ -835,17 +835,17 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
         {
             // #51138# visuelles RedLining einschalten
             ScChangeViewSettings aChangeViewSet;
-            aChangeViewSet.SetShowChanges(TRUE);
+            aChangeViewSet.SetShowChanges(sal_True);
             aDocument.SetChangeViewSettings(aChangeViewSet);
         }
     }
 
     // #97286# include 100th seconds in compare?
-    BOOL bIgnore100Sec = !pSourceTrack->IsTime100thSeconds() ||
+    sal_Bool bIgnore100Sec = !pSourceTrack->IsTime100thSeconds() ||
             !pThisTrack->IsTime100thSeconds();
 
     //	gemeinsame Ausgangsposition suchen
-    ULONG nFirstNewNumber = 0;
+    sal_uLong nFirstNewNumber = 0;
     const ScChangeAction* pSourceAction = pSourceTrack->GetFirst();
     const ScChangeAction* pThisAction = pThisTrack->GetFirst();
     // skip identical actions
@@ -868,7 +868,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
     const ScChangeAction* pLastSearchAction = pThisTrack->GetLast();
 
     //	MergeChangeData aus den folgenden Aktionen erzeugen
-    ULONG nNewActionCount = 0;
+    sal_uLong nNewActionCount = 0;
     const ScChangeAction* pCount = pSourceAction;
     while ( pCount )
     {
@@ -884,7 +884,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                     String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("...")),
                     nNewActionCount );
 
-    ULONG nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber();
+    sal_uLong nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber();
     // UpdateReference-Undo, gueltige Referenzen fuer den letzten gemeinsamen Zustand
     pSourceTrack->MergePrepare( (ScChangeAction*) pFirstMergeAction, bShared );
 
@@ -910,7 +910,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                     const ScChangeActionDel* pDel = (const ScChangeActionDel*) pThisAction;
                     if ( pDel->IsTopDelete() && !pDel->IsTabDeleteCol() )
                     {	// deleted Table enthaelt deleted Cols, die nicht
-                        ULONG nStart, nEnd;
+                        sal_uLong nStart, nEnd;
                         pSourceTrack->AppendDeleteRange(
                             pDel->GetOverAllRange().MakeRange(), NULL, nStart, nEnd );
                     }
@@ -935,9 +935,9 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
     LockPaint();    // #i73877# no repainting after each action
 
     //	MergeChangeData in das aktuelle Dokument uebernehmen
-    BOOL bHasRejected = FALSE;
+    sal_Bool bHasRejected = sal_False;
     String aOldUser = pThisTrack->GetUser();
-    pThisTrack->SetUseFixDateTime( TRUE );
+    pThisTrack->SetUseFixDateTime( sal_True );
     ScMarkData& rMarkData = pViewSh->GetViewData()->GetMarkData();
     ScMarkData aOldMarkData( rMarkData );
     pSourceAction = pFirstMergeAction;
@@ -986,10 +986,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
 
                 pThisTrack->SetUser( pSourceAction->GetUser() );
                 pThisTrack->SetFixDateTimeUTC( pSourceAction->GetDateTimeUTC() );
-                ULONG nOldActionMax = pThisTrack->GetActionMax();
+                sal_uLong nOldActionMax = pThisTrack->GetActionMax();
 
                 bool bExecute = true;
-                ULONG nReject = pSourceAction->GetRejectAction();
+                sal_uLong nReject = pSourceAction->GetRejectAction();
                 if ( nReject )
                 {
                     if ( bShared )
@@ -1002,7 +1002,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                         if ( pOldAction && pOldAction->IsVirgin() )
                         {
                             pThisTrack->Reject( pOldAction );
-                            bHasRejected = TRUE;
+                            bHasRejected = sal_True;
                             bExecute = false;
                         }
                     }
@@ -1017,7 +1017,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                             //!	oder Reject-Aenderung normal ausfuehren
 
                             pThisTrack->Reject(pOldAction);
-                            bHasRejected = TRUE;				// fuer Paint
+                            bHasRejected = sal_True;				// fuer Paint
                         }
                         bExecute = false;
                     }
@@ -1039,7 +1039,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                             ScAddress aPos = aSourceRange.aStart;
                             String aValue;
                             ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue );
-                            BYTE eMatrix = MM_NONE;
+                            sal_uInt8 eMatrix = MM_NONE;
                             const ScBaseCell* pCell = ((const ScChangeActionContent*)pSourceAction)->GetNewCell();
                             if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA )
                                 eMatrix = ((const ScFormulaCell*)pCell)->GetMatrixFlag();
@@ -1058,7 +1058,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                                     aValue.Erase( 0, 1 );
                                     aValue.Erase( aValue.Len()-1, 1 );
                                     GetDocFunc().EnterMatrix( aSourceRange,
-                                        NULL, NULL, aValue, FALSE, FALSE,
+                                        NULL, NULL, aValue, sal_False, sal_False,
                                         EMPTY_STRING, formula::FormulaGrammar::GRAM_DEFAULT );
                                 }
                                 break;
@@ -1077,17 +1077,17 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                         {
                             String aName;
                             aDocument.CreateValidTabName( aName );
-                            GetDocFunc().InsertTable( aSourceRange.aStart.Tab(), aName, TRUE, FALSE );
+                            GetDocFunc().InsertTable( aSourceRange.aStart.Tab(), aName, sal_True, sal_False );
                         }
                         break;
                         case SC_CAT_INSERT_ROWS:
-                            GetDocFunc().InsertCells( aSourceRange, NULL, INS_INSROWS, TRUE, FALSE );
+                            GetDocFunc().InsertCells( aSourceRange, NULL, INS_INSROWS, sal_True, sal_False );
                         break;
                         case SC_CAT_INSERT_COLS:
-                            GetDocFunc().InsertCells( aSourceRange, NULL, INS_INSCOLS, TRUE, FALSE );
+                            GetDocFunc().InsertCells( aSourceRange, NULL, INS_INSCOLS, sal_True, sal_False );
                         break;
                         case SC_CAT_DELETE_TABS :
-                            GetDocFunc().DeleteTable( aSourceRange.aStart.Tab(), TRUE, FALSE );
+                            GetDocFunc().DeleteTable( aSourceRange.aStart.Tab(), sal_True, sal_False );
                         break;
                         case SC_CAT_DELETE_ROWS:
                         {
@@ -1095,7 +1095,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                             if ( pDel->IsTopDelete() )
                             {
                                 aSourceRange = pDel->GetOverAllRange().MakeRange();
-                                GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELROWS, TRUE, FALSE );
+                                GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELROWS, sal_True, sal_False );
 
                                 // #i101099# [Collaboration] Changes are not correctly shown
                                 if ( bShared )
@@ -1115,7 +1115,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                             if ( pDel->IsTopDelete() && !pDel->IsTabDeleteCol() )
                             {	// deleted Table enthaelt deleted Cols, die nicht
                                 aSourceRange = pDel->GetOverAllRange().MakeRange();
-                                GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELCOLS, TRUE, FALSE );
+                                GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELCOLS, sal_True, sal_False );
                             }
                         }
                         break;
@@ -1124,7 +1124,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                             const ScChangeActionMove* pMove = (const ScChangeActionMove*) pSourceAction;
                             ScRange aFromRange( pMove->GetFromRange().MakeRange() );
                             GetDocFunc().MoveBlock( aFromRange,
-                                aSourceRange.aStart, TRUE, TRUE, FALSE, FALSE );
+                                aSourceRange.aStart, sal_True, sal_True, sal_False, sal_False );
                         }
                         break;
                         default:
@@ -1164,10 +1164,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
                     ScChangeAction* pAct = pThisTrack->GetLast();
                     if ( pAct && pAct->GetActionNumber() > nOldActionMax )
                     {
-                        ULONG nActionMax = pAct->GetActionNumber();
-                        ULONG nActionCount = nActionMax - nOldActionMax;
-                        ULONG nAction = nActionMax - nActionCount + 1;
-                        ULONG nSourceAction = pSourceAction->GetActionNumber() - nActionCount + 1;
+                        sal_uLong nActionMax = pAct->GetActionNumber();
+                        sal_uLong nActionCount = nActionMax - nOldActionMax;
+                        sal_uLong nAction = nActionMax - nActionCount + 1;
+                        sal_uLong nSourceAction = pSourceAction->GetActionNumber() - nActionCount + 1;
                         while ( nAction <= nActionMax )
                         {
                             if ( bInverseMap )
@@ -1189,7 +1189,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
 
     rMarkData = aOldMarkData;
     pThisTrack->SetUser(aOldUser);
-    pThisTrack->SetUseFixDateTime( FALSE );
+    pThisTrack->SetUseFixDateTime( sal_False );
 
     pSourceTrack->Clear();		//! der ist jetzt verhunzt
 
@@ -1230,11 +1230,11 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
 
     // reset show changes
     ScChangeViewSettings aChangeViewSet;
-    aChangeViewSet.SetShowChanges( FALSE );
+    aChangeViewSet.SetShowChanges( sal_False );
     aDocument.SetChangeViewSettings( aChangeViewSet );
 
     // find first merge action in this document
-    BOOL bIgnore100Sec = !pThisTrack->IsTime100thSeconds() || !pSharedTrack->IsTime100thSeconds();
+    sal_Bool bIgnore100Sec = !pThisTrack->IsTime100thSeconds() || !pSharedTrack->IsTime100thSeconds();
     ScChangeAction* pThisAction = pThisTrack->GetFirst();
     ScChangeAction* pSharedAction = pSharedTrack->GetFirst();
     while ( lcl_Equal( pThisAction, pSharedAction, bIgnore100Sec ) )
@@ -1248,8 +1248,8 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
         if ( pThisAction )
         {
             // merge own changes into shared document
-            ULONG nActStartShared = pSharedAction->GetActionNumber();
-            ULONG nActEndShared = pSharedTrack->GetActionMax();
+            sal_uLong nActStartShared = pSharedAction->GetActionNumber();
+            sal_uLong nActEndShared = pSharedTrack->GetActionMax();
             ScDocument* pTmpDoc = new ScDocument;
             for ( sal_Int32 nIndex = 0; nIndex < aDocument.GetTableCount(); ++nIndex )
             {
@@ -1261,8 +1261,8 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
             ScChangeActionMergeMap aOwnInverseMergeMap;
             pSharedDocShell->MergeDocument( *pTmpDoc, true, true, 0, &aOwnInverseMergeMap, true );
             delete pTmpDoc;
-            ULONG nActStartOwn = nActEndShared + 1;
-            ULONG nActEndOwn = pSharedTrack->GetActionMax();
+            sal_uLong nActStartOwn = nActEndShared + 1;
+            sal_uLong nActEndOwn = pSharedTrack->GetActionMax();
 
             // find conflicts
             ScConflictsList aConflictsList;
@@ -1305,7 +1305,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
             pThisTrack->Clone( pTmpDoc );
 
             // undo own changes since last save in own document
-            ULONG nStartShared = pThisAction->GetActionNumber();
+            sal_uLong nStartShared = pThisAction->GetActionNumber();
             ScChangeAction* pAction = pThisTrack->GetLast();
             while ( pAction && pAction->GetActionNumber() >= nStartShared )
             {
@@ -1319,7 +1319,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
             // merge shared changes into own document
             ScChangeActionMergeMap aSharedMergeMap;
             MergeDocument( rSharedDoc, true, true, 0, &aSharedMergeMap );
-            ULONG nEndShared = pThisTrack->GetActionMax();
+            sal_uLong nEndShared = pThisTrack->GetActionMax();
 
             // resolve conflicts for shared non-content actions
             if ( !aConflictsList.empty() )
@@ -1337,18 +1337,18 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
             nEndShared = pThisTrack->GetActionMax();
 
             // only show changes from shared document
-            aChangeViewSet.SetShowChanges( TRUE );
-            aChangeViewSet.SetShowAccepted( TRUE );
+            aChangeViewSet.SetShowChanges( sal_True );
+            aChangeViewSet.SetShowAccepted( sal_True );
             aChangeViewSet.SetHasActionRange( true );
             aChangeViewSet.SetTheActionRange( nStartShared, nEndShared );
             aDocument.SetChangeViewSettings( aChangeViewSet );
 
             // merge own changes back into own document
-            ULONG nStartOwn = nEndShared + 1;
+            sal_uLong nStartOwn = nEndShared + 1;
             ScChangeActionMergeMap aOwnMergeMap;
             MergeDocument( *pTmpDoc, true, true, nEndShared - nStartShared + 1, &aOwnMergeMap );
             delete pTmpDoc;
-            ULONG nEndOwn = pThisTrack->GetActionMax();
+            sal_uLong nEndOwn = pThisTrack->GetActionMax();
 
             // resolve conflicts for shared content actions and own actions
             if ( !aConflictsList.empty() )
@@ -1376,13 +1376,13 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
         else
         {
             // merge shared changes into own document
-            ULONG nStartShared = pThisTrack->GetActionMax() + 1;
+            sal_uLong nStartShared = pThisTrack->GetActionMax() + 1;
             MergeDocument( rSharedDoc, true, true );
-            ULONG nEndShared = pThisTrack->GetActionMax();
+            sal_uLong nEndShared = pThisTrack->GetActionMax();
 
             // only show changes from shared document
-            aChangeViewSet.SetShowChanges( TRUE );
-            aChangeViewSet.SetShowAccepted( TRUE );
+            aChangeViewSet.SetShowChanges( sal_True );
+            aChangeViewSet.SetShowAccepted( sal_True );
             aChangeViewSet.SetHasActionRange( true );
             aChangeViewSet.SetTheActionRange( nStartShared, nEndShared );
             aDocument.SetChangeViewSettings( aChangeViewSet );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 6debac200..cbb875492 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -108,6 +108,7 @@ using namespace ::com::sun::star;
 #include "chgviset.hxx"
 #include "reffact.hxx"
 #include "chartlis.hxx"
+#include "chartpos.hxx"
 #include "waitoff.hxx"
 #include "tablink.hxx"		// ScDocumentLoader statics
 #include "drwlayer.hxx"
@@ -137,7 +138,7 @@ using namespace ::com::sun::star;
             Get(ATTR_PAGE_SHARED)).GetValue()
 
 #define IS_AVAILABLE(WhichId,ppItem) \
-    (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+    (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 
 #define SC_PREVIEW_SIZE_X	10000
 #define SC_PREVIEW_SIZE_Y	12400
@@ -153,9 +154,9 @@ void ScDocShell::Execute( SfxRequest& rReq )
 
     const SfxItemSet* pReqArgs = rReq.GetArgs();
     SfxBindings* pBindings = GetViewBindings();
-    BOOL bUndo (aDocument.IsUndoEnabled());
+    sal_Bool bUndo (aDocument.IsUndoEnabled());
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch ( nSlot )
     {
         case SID_SC_SETTEXT:
@@ -210,18 +211,18 @@ void ScDocShell::Execute( SfxRequest& rReq )
 
                 const SfxPoolItem* pItem;
                 String sSbaData, sTarget;
-                if ( pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
                     sSbaData = ((const SfxStringItem*)pItem)->GetValue();
-                if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET )
                     sTarget = ((const SfxStringItem*)pItem)->GetValue();
 
-                BOOL bIsNewArea = TRUE;			// Default TRUE (keine Nachfrage)
-                if ( pReqArgs->GetItemState( FN_PARAM_2, TRUE, &pItem ) == SFX_ITEM_SET )
+                sal_Bool bIsNewArea = sal_True;			// Default sal_True (keine Nachfrage)
+                if ( pReqArgs->GetItemState( FN_PARAM_2, sal_True, &pItem ) == SFX_ITEM_SET )
                     bIsNewArea = ((const SfxBoolItem*)pItem)->GetValue();
 
                 ::com::sun::star::uno::Reference<
                         ::com::sun::star::sdbc::XResultSet > xResultSet;
-                if ( pReqArgs->GetItemState( FN_PARAM_3, FALSE, &pItem ) == SFX_ITEM_SET && pItem )
+                if ( pReqArgs->GetItemState( FN_PARAM_3, sal_False, &pItem ) == SFX_ITEM_SET && pItem )
                     xResultSet.set(((const SfxUsrAnyItem*)pItem)->GetValue(),::com::sun::star::uno::UNO_QUERY);
 
                 String sDBName  = sSbaData.GetToken(0,cSbaSep);		// Datenbankname
@@ -229,7 +230,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 String sTabFlag = sSbaData.GetToken(2,cSbaSep);
                 String sDBSql	= sSbaData.GetToken(3,cSbaSep);		// SQL im Klartext
 
-                BYTE nType = ScDbTable;		// "0" oder "1"
+                sal_uInt8 nType = ScDbTable;		// "0" oder "1"
                 if ( sTabFlag.EqualsAscii("0") )		// "0" = Query, "1" = Table (Default)
                     nType = ScDbQuery;
 
@@ -247,17 +248,17 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 }
 
                 // bei Bedarf neuen Datenbankbereich anlegen
-                BOOL bMakeArea = FALSE;
+                sal_Bool bMakeArea = sal_False;
                 if (bIsNewArea)
                 {
                     ScDBCollection* pDBColl = aDocument.GetDBCollection();
-                    USHORT nDummy;
+                    sal_uInt16 nDummy;
                     if ( !pDBColl || !pDBColl->SearchName( sTarget, nDummy ) )
                     {
                         ScAddress aPos;
                         if ( aPos.Parse( sTarget, &aDocument, aDocument.GetAddressConvention() ) & SCA_VALID )
                         {
-                            bMakeArea = TRUE;
+                            bMakeArea = sal_True;
                             if (bUndo)
                             {
                                 String aStrImport = ScGlobal::GetRscString( STR_UNDO_IMPORTDATA );
@@ -272,7 +273,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 }
 
                 // nachfragen, bevor alter DB-Bereich ueberschrieben wird
-                BOOL bDo = TRUE;
+                sal_Bool bDo = sal_True;
                 if (!bIsNewArea)
                 {
                     String aTemplate = ScGlobal::GetRscString( STR_IMPORT_REPLACE );
@@ -287,7 +288,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 if (bDo)
                 {
                     ScDBDocFunc(*this).UpdateImport( sTarget, sDBName,
-                            sDBTable, sDBSql, TRUE, nType, xResultSet,
+                            sDBTable, sDBSql, sal_True, nType, xResultSet,
                             pSelectionList );
                     rReq.Done();
 
@@ -311,19 +312,19 @@ void ScDocShell::Execute( SfxRequest& rReq )
             if (pReqArgs)
             {
                 ScDocument* pDoc = GetDocument();
-//                BOOL bUndo (pDoc->IsUndoEnabled());
+//                sal_Bool bUndo (pDoc->IsUndoEnabled());
                 const	SfxPoolItem* pItem;
                 String	aChartName, aRangeName;
 
                 ScRange			aSingleRange;
                 ScRangeListRef	aRangeListRef;
-                BOOL			bMultiRange = FALSE;
+                sal_Bool			bMultiRange = sal_False;
 
-                BOOL bColHeaders = TRUE;
-                BOOL bRowHeaders = TRUE;
-                BOOL bColInit = FALSE;
-                BOOL bRowInit = FALSE;
-                BOOL bAddRange = (nSlot == SID_CHART_ADDSOURCE);
+                sal_Bool bColHeaders = sal_True;
+                sal_Bool bRowHeaders = sal_True;
+                sal_Bool bColInit = sal_False;
+                sal_Bool bRowInit = sal_False;
+                sal_Bool bAddRange = (nSlot == SID_CHART_ADDSOURCE);
 
                 if( IS_AVAILABLE( SID_CHART_NAME, &pItem ) )
                     aChartName = ((const SfxStringItem*)pItem)->GetValue();
@@ -334,25 +335,25 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
                 {
                     bColHeaders = ((const SfxBoolItem*)pItem)->GetValue();
-                    bColInit = TRUE;
+                    bColInit = sal_True;
                 }
                 if( IS_AVAILABLE( FN_PARAM_2, &pItem ) )
                 {
                     bRowHeaders = ((const SfxBoolItem*)pItem)->GetValue();
-                    bRowInit = TRUE;
+                    bRowInit = sal_True;
                 }
 
                 ScAddress::Details aDetails(pDoc->GetAddressConvention(), 0, 0);
-                BOOL bValid = ( aSingleRange.ParseAny( aRangeName, pDoc, aDetails ) & SCA_VALID ) != 0;
+                sal_Bool bValid = ( aSingleRange.ParseAny( aRangeName, pDoc, aDetails ) & SCA_VALID ) != 0;
                 if (!bValid)
                 {
                     aRangeListRef = new ScRangeList;
                     aRangeListRef->Parse( aRangeName, pDoc );
                     if ( aRangeListRef->Count() )
                     {
-                        bMultiRange = TRUE;
+                        bMultiRange = sal_True;
                         aSingleRange = *aRangeListRef->GetObject(0);	// fuer Header
-                        bValid = TRUE;
+                        bValid = sal_True;
                     }
                     else
                         aRangeListRef.Clear();
@@ -374,22 +375,14 @@ void ScDocShell::Execute( SfxRequest& rReq )
                         aDocument.LimitChartArea( nTab, nCol1,nRow1, nCol2,nRow2 );
 
                                         // Dialog fuer Spalten/Zeilenkoepfe
-                    BOOL bOk = TRUE;
+                    sal_Bool bOk = sal_True;
                     if ( !bAddRange && ( !bColInit || !bRowInit ) )
                     {
-                                                // Spalten/Zeilenkoepfe testen wie in chartarr
+                        ScChartPositioner aChartPositioner( &aDocument, nTab, nCol1,nRow1, nCol2,nRow2 );
                         if (!bColInit)
-                        {
-                            for (SCCOL i=nCol1; i<=nCol2 && bColHeaders; i++)
-                                if (aDocument.HasValueData( i, nRow1, nTab ))
-                                    bColHeaders = FALSE;
-                        }
+                            bColHeaders = aChartPositioner.HasColHeaders();
                         if (!bRowInit)
-                        {
-                            for (SCROW i=nRow1; i<=nRow2 && bRowHeaders; i++)
-                                if (aDocument.HasValueData( nCol1, i, nTab ))
-                                    bRowHeaders = FALSE;
-                        }
+                            bRowHeaders = aChartPositioner.HasRowHeaders();
 
                         //CHINA001 ScColRowLabelDlg aDlg( pParent, bRowHeaders, bColHeaders );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -406,7 +399,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                             rReq.AppendItem(SfxBoolItem(FN_PARAM_2, bRowHeaders));
                         }
                         else
-                            bOk = FALSE;
+                            bOk = sal_False;
                         delete pDlg; //CHINA001
                     }
 
@@ -451,9 +444,9 @@ void ScDocShell::Execute( SfxRequest& rReq )
 
         case FID_AUTO_CALC:
             {
-                BOOL bNewVal;
+                sal_Bool bNewVal;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, TRUE, &pItem ) )
+                if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, sal_True, &pItem ) )
                     bNewVal = ((const SfxBoolItem*)pItem)->GetValue();
                 else
                     bNewVal = !aDocument.GetAutoCalc();		// Toggle fuer Menue
@@ -482,7 +475,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 
                 ScLkUpdMode nSet=pDoc->GetLinkMode();
 
-                USHORT nDlgRet=RET_NO;
+                sal_uInt16 nDlgRet=RET_NO;
                 if(nSet==LM_UNKNOWN)
                 {
                     ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
@@ -525,7 +518,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 //	wird nach dem Laden aufgerufen, wenn DB-Bereiche mit
                 //	weggelassenen Daten enthalten sind
 
-                BOOL bDone = FALSE;
+                sal_Bool bDone = sal_False;
                 ScDBCollection* pDBColl = aDocument.GetDBCollection();
 
                 if ((nCanUpdate != com::sun::star::document::UpdateDocMode::NO_UPDATE) &&
@@ -540,7 +533,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                                                 ScGlobal::GetRscString(STR_REIMPORT_AFTER_LOAD) );
                         if (aBox.Execute() == RET_YES)
                         {
-                            for (USHORT i=0; i<pDBColl->GetCount(); i++)
+                            for (sal_uInt16 i=0; i<pDBColl->GetCount(); i++)
                             {
                                 ScDBData* pDBData = (*pDBColl)[i];
                                 if ( pDBData->IsStripData() &&
@@ -554,7 +547,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 
                                     ScImportParam aImportParam;
                                     pDBData->GetImportParam( aImportParam );
-                                    BOOL bContinue = pViewSh->ImportData( aImportParam );
+                                    sal_Bool bContinue = pViewSh->ImportData( aImportParam );
                                     pDBData->SetImportParam( aImportParam );
 
                                     //	markieren (Groesse kann sich geaendert haben)
@@ -575,7 +568,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                                     }
                                 }
                             }
-                            bDone = TRUE;
+                            bDone = sal_True;
                         }
                     }
                 }
@@ -617,18 +610,18 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 {
                     // get argument (recorded macro)
                     SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FID_CHG_RECORD, sal_False );
-                    BOOL bDo = TRUE;
+                    sal_Bool bDo = sal_True;
 
                     // xmlsec05/06:
                     // getting real parent window when called from Security-Options TP
                     Window* pParent = NULL;
                     const SfxPoolItem* pParentItem;
-                    if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, FALSE, &pParentItem ) )
+                    if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, sal_False, &pParentItem ) )
                         pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr();
 
                     // desired state
                     ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
-                    BOOL bActivateTracking = (pChangeTrack == 0);   // toggle
+                    sal_Bool bActivateTracking = (pChangeTrack == 0);   // toggle
                     if ( pItem )
                         bActivateTracking = pItem->GetValue();      // from argument
 
@@ -658,7 +651,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                     {
                         pDoc->StartChangeTracking();
                         ScChangeViewSettings aChangeViewSet;
-                        aChangeViewSet.SetShowChanges(TRUE);
+                        aChangeViewSet.SetShowChanges(sal_True);
                         pDoc->SetChangeViewSettings(aChangeViewSet);
                     }
 
@@ -668,7 +661,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 
                         // Slots invalidieren
                         if (pBindings)
-                            pBindings->InvalidateAll(FALSE);
+                            pBindings->InvalidateAll(sal_False);
                         if ( !pItem )
                             rReq.AppendItem( SfxBoolItem( FID_CHG_RECORD, bActivateTracking ) );
                         rReq.Done();
@@ -683,7 +676,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
             {
                 Window* pParent = NULL;
                 const SfxPoolItem* pParentItem;
-                if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, FALSE, &pParentItem ) )
+                if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, sal_False, &pParentItem ) )
                     pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr();
                 if ( ExecuteChangeProtectionDialog( pParent ) )
                 {
@@ -698,7 +691,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
         case SID_DOCUMENT_MERGE:
         case SID_DOCUMENT_COMPARE:
             {
-                BOOL bDo = TRUE;
+                sal_Bool bDo = sal_True;
                 ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack();
                 if ( pChangeTrack && !pImpl->bIgnoreLostRedliningWarning )
                 {
@@ -708,12 +701,12 @@ void ScDocShell::Execute( SfxRequest& rReq )
                             WinBits(WB_YES_NO | WB_DEF_NO),
                             ScGlobal::GetRscString( STR_END_REDLINING ) );
                         if( aBox.Execute() == RET_YES )
-                            bDo = ExecuteChangeProtectionDialog( NULL, TRUE );
+                            bDo = ExecuteChangeProtectionDialog( NULL, sal_True );
                         else
-                            bDo = FALSE;
+                            bDo = sal_False;
                     }
                     else    // merge might reject some actions
-                        bDo = ExecuteChangeProtectionDialog( NULL, TRUE );
+                        bDo = ExecuteChangeProtectionDialog( NULL, sal_True );
                 }
                 if ( !bDo )
                 {
@@ -724,25 +717,25 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 const SfxPoolItem* pItem;
                 SfxMedium* pMed = NULL;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState( SID_FILE_NAME, TRUE, &pItem ) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState( SID_FILE_NAME, sal_True, &pItem ) == SFX_ITEM_SET &&
                      pItem->ISA(SfxStringItem) )
                 {
                     String aFileName = ((const SfxStringItem*)pItem)->GetValue();
 
                     String aFilterName;
-                    if ( pReqArgs->GetItemState( SID_FILTER_NAME, TRUE, &pItem ) == SFX_ITEM_SET &&
+                    if ( pReqArgs->GetItemState( SID_FILTER_NAME, sal_True, &pItem ) == SFX_ITEM_SET &&
                          pItem->ISA(SfxStringItem) )
                     {
                         aFilterName = ((const SfxStringItem*)pItem)->GetValue();
                     }
                     String aOptions;
-                    if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) == SFX_ITEM_SET &&
+                    if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) == SFX_ITEM_SET &&
                          pItem->ISA(SfxStringItem) )
                     {
                         aOptions = ((const SfxStringItem*)pItem)->GetValue();
                     }
                     short nVersion = 0;
-                    if ( pReqArgs->GetItemState( SID_VERSION, TRUE, &pItem ) == SFX_ITEM_SET &&
+                    if ( pReqArgs->GetItemState( SID_VERSION, sal_True, &pItem ) == SFX_ITEM_SET &&
                          pItem->ISA(SfxInt16Item) )
                     {
                         nVersion = ((const SfxInt16Item*)pItem)->GetValue();
@@ -750,7 +743,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 
                     //	kein Filter angegeben -> Detection
                     if ( !aFilterName.Len() )
-                        ScDocumentLoader::GetFilterName( aFileName, aFilterName, aOptions, TRUE, FALSE );
+                        ScDocumentLoader::GetFilterName( aFileName, aFilterName, aOptions, sal_True, sal_False );
 
                     //	filter name from dialog contains application prefix,
                     //	GetFilter needs name without the prefix.
@@ -762,7 +755,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                         pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
                     if ( nVersion != 0 )
                         pSet->Put( SfxInt16Item( SID_VERSION, nVersion ) );
-                    pMed = new SfxMedium( aFileName, STREAM_STD_READ, FALSE, pFilter, pSet );
+                    pMed = new SfxMedium( aFileName, STREAM_STD_READ, sal_False, pFilter, pSet );
                 }
                 else
                 {
@@ -785,14 +778,14 @@ void ScDocShell::Execute( SfxRequest& rReq )
                     ScDocShell* pOtherDocSh = new ScDocShell;
                     SfxObjectShellLock aDocShTablesRef = pOtherDocSh;
                     pOtherDocSh->DoLoad( pMed );
-                    ULONG nErr = pOtherDocSh->GetErrorCode();
+                    sal_uLong nErr = pOtherDocSh->GetErrorCode();
                     if (nErr)
                         ErrorHandler::HandleError( nErr );			// auch Warnings
 
                     if ( !pOtherDocSh->GetError() )					// nur Errors
                     {
-                        BOOL bHadTrack = ( aDocument.GetChangeTrack() != NULL );
-                        ULONG nStart = 0;
+                        sal_Bool bHadTrack = ( aDocument.GetChangeTrack() != NULL );
+                        sal_uLong nStart = 0;
                         if ( nSlot == SID_DOCUMENT_MERGE && pChangeTrack )
                         {
                             nStart = pChangeTrack->GetActionMax() + 1;
@@ -810,7 +803,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                             SfxViewFrame* pViewFrm = SfxViewFrame::Current();
                             if ( pViewFrm )
                             {
-                                pViewFrm->ShowChildWindow( ScAcceptChgDlgWrapper::GetChildWindowId(), TRUE ); //@51669
+                                pViewFrm->ShowChildWindow( ScAcceptChgDlgWrapper::GetChildWindowId(), sal_True ); //@51669
                             }
                             if ( pBindings )
                             {
@@ -827,19 +820,19 @@ void ScDocShell::Execute( SfxRequest& rReq )
                             if ( !pOldSet || !pOldSet->ShowChanges() )
                             {
                                 ScChangeViewSettings aChangeViewSet;
-                                aChangeViewSet.SetShowChanges(TRUE);
+                                aChangeViewSet.SetShowChanges(sal_True);
                                 aDocument.SetChangeViewSettings(aChangeViewSet);
                             }
                         }
                         else if ( nSlot == SID_DOCUMENT_MERGE && IsDocShared() && pChangeTrack )
                         {
-                            ULONG nEnd = pChangeTrack->GetActionMax();
+                            sal_uLong nEnd = pChangeTrack->GetActionMax();
                             if ( nEnd >= nStart )
                             {
                                 // only show changes from merged document
                                 ScChangeViewSettings aChangeViewSet;
-                                aChangeViewSet.SetShowChanges( TRUE );
-                                aChangeViewSet.SetShowAccepted( TRUE );
+                                aChangeViewSet.SetShowChanges( sal_True );
+                                aChangeViewSet.SetShowAccepted( sal_True );
                                 aChangeViewSet.SetHasActionRange( true );
                                 aChangeViewSet.SetTheActionRange( nStart, nEnd );
                                 aDocument.SetChangeViewSettings( aChangeViewSet );
@@ -859,7 +852,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
             if (pReqArgs)
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
                 {
                     if ( pItem->ISA(SfxStringItem) )
                     {
@@ -887,7 +880,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
         case SID_EDIT_SCENARIO:
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
                 {
                     if ( pItem->ISA(SfxStringItem) )
                     {
@@ -899,7 +892,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                             {
                                 String aComment;
                                 Color aColor;
-                                USHORT nFlags;
+                                sal_uInt16 nFlags;
                                 aDocument.GetScenarioData( nTab, aComment, aColor, nFlags );
 
                                 // Determine if the Sheet that the Scenario was created on
@@ -911,15 +904,15 @@ void ScDocShell::Execute( SfxRequest& rReq )
                                     nActualTab--;
                                 }
                                 while(aDocument.IsScenario(nActualTab));
-                                BOOL bSheetProtected = aDocument.IsTabProtected(nActualTab);
+                                sal_Bool bSheetProtected = aDocument.IsTabProtected(nActualTab);
 
                                 //!	anderen Titel am Dialog setzen
 //CHINA001								ScNewScenarioDlg* pNewDlg =
-//CHINA001								new ScNewScenarioDlg( GetActiveDialogParent(), aName, TRUE, bSheetProtected);
+//CHINA001								new ScNewScenarioDlg( GetActiveDialogParent(), aName, sal_True, bSheetProtected);
                                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                                 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
 
-                                AbstractScNewScenarioDlg* pNewDlg = pFact->CreateScNewScenarioDlg( GetActiveDialogParent(), aName, RID_SCDLG_NEWSCENARIO, TRUE,bSheetProtected);
+                                AbstractScNewScenarioDlg* pNewDlg = pFact->CreateScNewScenarioDlg( GetActiveDialogParent(), aName, RID_SCDLG_NEWSCENARIO, sal_True,bSheetProtected);
                                 DBG_ASSERT(pNewDlg, "Dialog create fail!");//CHINA001
                                 pNewDlg->SetScenarioData( aName, aComment, aColor, nFlags );
                                 if ( pNewDlg->Execute() == RET_OK )
@@ -939,11 +932,11 @@ void ScDocShell::Execute( SfxRequest& rReq )
         case SID_ATTR_YEAR2000 :
         {
             const SfxPoolItem* pItem;
-            if ( pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
+            if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
             {
                 if ( pItem->ISA(SfxUInt16Item) )
                 {
-                    UINT16 nY2k = ((SfxUInt16Item*)pItem)->GetValue();
+                    sal_uInt16 nY2k = ((SfxUInt16Item*)pItem)->GetValue();
                     // immer an den DocOptions setzen, damit das auch fuer SO50
                     // gespeichert wird (und alle Abfragen bisher auch darauf laufen).
                     // SetDocOptions propagiert das an den NumberFormatter
@@ -1170,15 +1163,15 @@ void UpdateAcceptChangesDialog()
 
 //------------------------------------------------------------------
 
-BOOL ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQueryIfProtected )
+sal_Bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, sal_Bool bJustQueryIfProtected )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack();
     if ( pChangeTrack )
     {
-        BOOL bProtected = pChangeTrack->IsProtected();
+        sal_Bool bProtected = pChangeTrack->IsProtected();
         if ( bJustQueryIfProtected && !bProtected )
-            return TRUE;
+            return sal_True;
 
         String aTitle( ScResId( bProtected ? SCSTR_CHG_UNPROTECT : SCSTR_CHG_PROTECT ) );
         String aText( ScResId( SCSTR_PASSWORD ) );
@@ -1203,7 +1196,7 @@ BOOL ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQuer
                 if ( SvPasswordHelper::CompareHashPassword(pChangeTrack->GetProtection(), aPassword) )
                 {
                     if ( bJustQueryIfProtected )
-                        bDone = TRUE;
+                        bDone = sal_True;
                     else
                         pChangeTrack->SetProtection(
                             com::sun::star::uno::Sequence< sal_Int8 > (0) );
@@ -1224,21 +1217,21 @@ BOOL ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQuer
             if ( bProtected != pChangeTrack->IsProtected() )
             {
                 UpdateAcceptChangesDialog();
-                bDone = TRUE;
+                bDone = sal_True;
             }
         }
     }
     else if ( bJustQueryIfProtected )
-        bDone = TRUE;
+        bDone = sal_True;
     return bDone;
 }
 
 
 //------------------------------------------------------------------
 
-void ScDocShell::DoRecalc( BOOL bApi )
+void ScDocShell::DoRecalc( sal_Bool bApi )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScTabViewShell* pSh = GetBestViewShell();
     if ( pSh )
     {
@@ -1246,7 +1239,7 @@ void ScDocShell::DoRecalc( BOOL bApi )
         if ( pHdl && pHdl->IsInputMode() && pHdl->IsFormulaMode() && !bApi )
         {
             pHdl->FormulaPreview();		// Teilergebnis als QuickHelp
-            bDone = TRUE;
+            bDone = sal_True;
         }
         else
         {
@@ -1259,7 +1252,7 @@ void ScDocShell::DoRecalc( BOOL bApi )
         WaitObject aWaitObj( GetActiveDialogParent() );
         aDocument.CalcFormulaTree();
         if ( pSh )
-            pSh->UpdateCharts(TRUE);
+            pSh->UpdateCharts(sal_True);
 
         aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
 
@@ -1275,7 +1268,7 @@ void ScDocShell::DoRecalc( BOOL bApi )
     }
 }
 
-void ScDocShell::DoHardRecalc( BOOL /* bApi */ )
+void ScDocShell::DoHardRecalc( sal_Bool /* bApi */ )
 {
     WaitObject aWaitObj( GetActiveDialogParent() );
     ScTabViewShell* pSh = GetBestViewShell();
@@ -1287,7 +1280,7 @@ void ScDocShell::DoHardRecalc( BOOL /* bApi */ )
     aDocument.CalcAll();
     GetDocFunc().DetectiveRefresh();	// erzeugt eigenes Undo
     if ( pSh )
-        pSh->UpdateCharts(TRUE);
+        pSh->UpdateCharts(sal_True);
 
     // set notification flags for "calculate" event (used in SFX_HINT_DATACHANGED broadcast)
     // (might check for the presence of any formulas on each sheet)
@@ -1306,7 +1299,7 @@ void ScDocShell::DoHardRecalc( BOOL /* bApi */ )
     // (somewhat consistent with charts)
     for (nTab=0; nTab<nTabCount; nTab++)
         if (aDocument.IsStreamValid(nTab))
-            aDocument.SetStreamValid(nTab, FALSE);
+            aDocument.SetStreamValid(nTab, sal_False);
 
     PostPaintGridAll();
 }
@@ -1340,7 +1333,7 @@ void ScDocShell::DoAutoStyle( const ScRange& rRange, const String& rStyle )
 
 void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
 {
-    USHORT nId = rHint.GetHint();
+    sal_uInt16 nId = rHint.GetHint();
     const SfxStyleSheetBase* pStyle = rHint.GetStyleSheet();
     if (!pStyle)
         return;
@@ -1353,7 +1346,7 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
 
             String aNewName = pStyle->GetName();
             String aOldName = aNewName;
-            BOOL bExtended = rHint.ISA(SfxStyleSheetHintExtended);		// Name geaendert?
+            sal_Bool bExtended = rHint.ISA(SfxStyleSheetHintExtended);		// Name geaendert?
             if (bExtended)
                 aOldName = ((SfxStyleSheetHintExtended&)rHint).GetOldName();
 
@@ -1391,7 +1384,7 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
         {
             String aNewName = pStyle->GetName();
             String aOldName = aNewName;
-            BOOL bExtended = rHint.ISA(SfxStyleSheetHintExtended);
+            sal_Bool bExtended = rHint.ISA(SfxStyleSheetHintExtended);
             if (bExtended)
                 aOldName = ((SfxStyleSheetHintExtended&)rHint).GetOldName();
             if ( aNewName != aOldName )
@@ -1409,9 +1402,9 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
 //	wie in printfun.cxx
 #define ZOOM_MIN	10
 
-void ScDocShell::SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages )
+void ScDocShell::SetPrintZoom( SCTAB nTab, sal_uInt16 nScale, sal_uInt16 nPages )
 {
-    BOOL bUndo(aDocument.IsUndoEnabled());
+    sal_Bool bUndo(aDocument.IsUndoEnabled());
     String aStyleName = aDocument.GetPageStyle( nTab );
     ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool();
     SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStyleName, SFX_STYLE_FAMILY_PAGE );
@@ -1423,8 +1416,8 @@ void ScDocShell::SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages )
         SfxItemSet& rSet = pStyleSheet->GetItemSet();
         if (bUndo)
         {
-            USHORT nOldScale = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_SCALE)).GetValue();
-            USHORT nOldPages = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_SCALETOPAGES)).GetValue();
+            sal_uInt16 nOldScale = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_SCALE)).GetValue();
+            sal_uInt16 nOldPages = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_SCALETOPAGES)).GetValue();
             GetUndoManager()->AddUndoAction( new ScUndoPrintZoom(
                             this, nTab, nOldScale, nOldPages, nScale, nPages ) );
         }
@@ -1442,9 +1435,9 @@ void ScDocShell::SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages )
     }
 }
 
-BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange )
+sal_Bool ScDocShell::AdjustPrintZoom( const ScRange& rRange )
 {
-    BOOL bChange = FALSE;
+    sal_Bool bChange = sal_False;
     SCTAB nTab = rRange.aStart.Tab();
 
     String aStyleName = aDocument.GetPageStyle( nTab );
@@ -1454,15 +1447,15 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange )
     if ( pStyleSheet )
     {
         SfxItemSet& rSet = pStyleSheet->GetItemSet();
-        BOOL bHeaders = ((const SfxBoolItem&)rSet.Get(ATTR_PAGE_HEADERS)).GetValue();
-        USHORT nOldScale = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_SCALE)).GetValue();
-        USHORT nOldPages = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_SCALETOPAGES)).GetValue();
+        sal_Bool bHeaders = ((const SfxBoolItem&)rSet.Get(ATTR_PAGE_HEADERS)).GetValue();
+        sal_uInt16 nOldScale = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_SCALE)).GetValue();
+        sal_uInt16 nOldPages = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_SCALETOPAGES)).GetValue();
         const ScRange* pRepeatCol = aDocument.GetRepeatColRange( nTab );
         const ScRange* pRepeatRow = aDocument.GetRepeatRowRange( nTab );
 
         //	benoetigte Skalierung fuer Selektion ausrechnen
 
-        USHORT nNewScale = nOldScale;
+        sal_uInt16 nNewScale = nOldScale;
 
         long nBlkTwipsX = 0;
         if (bHeaders)
@@ -1512,7 +1505,7 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange )
         if ( nNeeded < ZOOM_MIN )
             nNeeded = ZOOM_MIN;			// Begrenzung
         if ( nNeeded < (long) nNewScale )
-            nNewScale = (USHORT) nNeeded;
+            nNewScale = (sal_uInt16) nNeeded;
 
         bChange = ( nNewScale != nOldScale || nOldPages != 0 );
         if ( bChange )
@@ -1521,11 +1514,11 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange )
     return bChange;
 }
 
-void ScDocShell::PageStyleModified( const String& rStyleName, BOOL bApi )
+void ScDocShell::PageStyleModified( const String& rStyleName, sal_Bool bApi )
 {
     ScDocShellModificator aModificator( *this );
 
-    BOOL bWarn = FALSE;
+    sal_Bool bWarn = sal_False;
 
     SCTAB nTabCount = aDocument.GetTableCount();
     SCTAB nUseTab = MAXTAB+1;
@@ -1539,7 +1532,7 @@ void ScDocShell::PageStyleModified( const String& rStyleName, BOOL bApi )
     {
         ScPrintFunc aPrintFunc( this, GetPrinter(), nUseTab );	//! ohne CountPages auskommen
         if (!aPrintFunc.UpdatePages())							//	setzt Umbrueche auf allen Tabs
-            bWarn = TRUE;
+            bWarn = sal_True;
 
         if (bWarn && !bApi)
         {
@@ -1577,7 +1570,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
                 }
                 else if ( pReqArgs == NULL )
                 {
-                    BOOL bUndo(aDocument.IsUndoEnabled());
+                    sal_Bool bUndo(aDocument.IsUndoEnabled());
                     String aOldName = aDocument.GetPageStyle( nCurTab );
                     ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool();
                     SfxStyleSheetBase* pStyleSheet
@@ -1637,7 +1630,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
                                                     aOldData, aNewData ) );
                             }
 
-                            PageStyleModified( aNewName, FALSE );
+                            PageStyleModified( aNewName, sal_False );
                             rReq.Done();
                         }
                         delete pDlg;
@@ -1673,9 +1666,9 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
                             SvxPageUsage( ((const SvxPageItem&)
                                             rStyleSet.Get( ATTR_PAGE )).
                                                 GetPageUsage() );
-                        BOOL bShareHeader = IS_SHARE_HEADER(rStyleSet);
-                        BOOL bShareFooter = IS_SHARE_FOOTER(rStyleSet);
-                        USHORT nResId = 0;
+                        sal_Bool bShareHeader = IS_SHARE_HEADER(rStyleSet);
+                        sal_Bool bShareFooter = IS_SHARE_FOOTER(rStyleSet);
+                        sal_uInt16 nResId = 0;
 
                         switch ( eUsage )
                         {
@@ -1794,7 +1787,7 @@ void ScDocShell::GetStatePageStyle( SfxViewShell&   /* rCaller */,
                                     SCTAB			nCurTab )
 {
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch (nWhich)
@@ -1831,13 +1824,13 @@ void ScDocShell::GetStatePageStyle( SfxViewShell&   /* rCaller */,
 void ScDocShell::GetState( SfxItemSet &rSet )
 {
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch (nWhich)
         {
             case FID_AUTO_CALC:
-                if ( (BOOL) aDocument.GetHardRecalcState() )
+                if ( (sal_Bool) aDocument.GetHardRecalcState() )
                     rSet.DisableItem( nWhich );
                 else
                     rSet.Put( SfxBoolItem( nWhich, aDocument.GetAutoCalc() ) );
@@ -1925,15 +1918,15 @@ void ScDocShell::GetSbxState( SfxItemSet &rSet )
         pVisibleSh->GetState( rSet );
 }
 
-void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, USHORT nAspect )
+void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, sal_uInt16 nAspect )
 {
-//	bIsOle = TRUE;		// jetzt ueber den CreateMode
+//	bIsOle = sal_True;		// jetzt ueber den CreateMode
 
     SCTAB nVisTab = aDocument.GetVisibleTab();
     if (!aDocument.HasTable(nVisTab))
         return;
 
-    ULONG nOldLayoutMode = pDev->GetLayoutMode();
+    sal_uLong nOldLayoutMode = pDev->GetLayoutMode();
     pDev->SetLayoutMode( TEXT_LAYOUT_DEFAULT );     // even if it's the same, to get the metafile action
 
     if ( nAspect == ASPECT_THUMBNAIL )
@@ -1943,7 +1936,7 @@ void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup *
         aTmpData.SetTabNo(nVisTab);
         aDocument.SnapVisArea( aBoundRect );
         aTmpData.SetScreen( aBoundRect );
-        ScPrintFunc::DrawToDev( &aDocument, pDev, 1.0, aBoundRect, &aTmpData, TRUE );
+        ScPrintFunc::DrawToDev( &aDocument, pDev, 1.0, aBoundRect, &aTmpData, sal_True );
     }
     else
     {
@@ -1952,13 +1945,13 @@ void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup *
         aTmpData.SetTabNo(nVisTab);
         aDocument.SnapVisArea( aBoundRect );
         aTmpData.SetScreen( aBoundRect );
-        ScPrintFunc::DrawToDev( &aDocument, pDev, 1.0, aBoundRect, &aTmpData, TRUE );
+        ScPrintFunc::DrawToDev( &aDocument, pDev, 1.0, aBoundRect, &aTmpData, sal_True );
     }
 
     pDev->SetLayoutMode( nOldLayoutMode );
 }
 
-Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
+Rectangle __EXPORT ScDocShell::GetVisArea( sal_uInt16 nAspect ) const
 {
     SfxObjectCreateMode eShellMode = GetCreateMode();
     if ( eShellMode == SFX_CREATE_MODE_ORGANIZER )
@@ -1972,7 +1965,7 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
     {
 //		Rectangle aArea( 0,0, 3175,3175 );							//	120x120 Pixel in 1:1
         Rectangle aArea( 0,0, SC_PREVIEW_SIZE_X,SC_PREVIEW_SIZE_Y );
-        BOOL bNegativePage = aDocument.IsNegativePage( aDocument.GetVisibleTab() );
+        sal_Bool bNegativePage = aDocument.IsNegativePage( aDocument.GetVisibleTab() );
         if ( bNegativePage )
             ScDrawLayer::MirrorRectRTL( aArea );
         aDocument.SnapVisArea( aArea );
@@ -2010,8 +2003,8 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
 
 void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
                                             SCTAB			  nCurTab,
-                                            BOOL&			  rbHeader,
-                                            BOOL&			  rbFooter )
+                                            sal_Bool&			  rbHeader,
+                                            sal_Bool&			  rbFooter )
 {
     if ( !pStyleSet )
     {
@@ -2025,7 +2018,7 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
         if ( pStyleSheet )
             pStyleSet = &pStyleSheet->GetItemSet();
         else
-            rbHeader = rbFooter = FALSE;
+            rbHeader = rbFooter = sal_False;
     }
 
     DBG_ASSERT( pStyleSet, "PageStyle-Set not found! :-(" );
@@ -2063,7 +2056,7 @@ long __EXPORT ScDocShell::DdeGetData( const String& rItem,
             return 0;							// ungueltiger Bereich
 
         if( aDdeTextFmt.GetChar(0) == 'F' )
-            aObj.SetFormulas( TRUE );
+            aObj.SetFormulas( sal_True );
         if( aDdeTextFmt.EqualsAscii( "SYLK" ) ||
             aDdeTextFmt.EqualsAscii( "FSYLK" ) )
         {
@@ -2110,7 +2103,7 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem,
         }
         ScImportExport aObj( &aDocument, rItem );
         if( aDdeTextFmt.GetChar(0) == 'F' )
-            aObj.SetFormulas( TRUE );
+            aObj.SetFormulas( sal_True );
         if( aDdeTextFmt.EqualsAscii( "SYLK" ) ||
             aDdeTextFmt.EqualsAscii( "FSYLK" ) )
         {
@@ -2141,7 +2134,7 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem,
     ScRangeName* pRange = aDocument.GetRangeName();
     if( pRange )
     {
-        USHORT nPos;
+        sal_uInt16 nPos;
         if( pRange->SearchName( aPos, nPos ) )
         {
             ScRangeData* pData = (*pRange)[ nPos ];
@@ -2189,7 +2182,7 @@ SCTAB ScDocShell::GetCurTab()
     return pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0);
 }
 
-ScTabViewShell* ScDocShell::GetBestViewShell( BOOL bOnlyVisible )
+ScTabViewShell* ScDocShell::GetBestViewShell( sal_Bool bOnlyVisible )
 {
     ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
     // falsches Doc?
@@ -2221,11 +2214,11 @@ SfxBindings* ScDocShell::GetViewBindings()
 
 //------------------------------------------------------------------
 
-ScDocShell* ScDocShell::GetShellByNum( USHORT nDocNo )		// static
+ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo )		// static
 {
     ScDocShell* pFound = NULL;
     SfxObjectShell*	pShell = SfxObjectShell::GetFirst();
-    USHORT nShellCnt = 0;
+    sal_uInt16 nShellCnt = 0;
 
     while ( pShell && !pFound )
     {
@@ -2251,7 +2244,7 @@ IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
 
     if ( ERRCODE_NONE == _pFileDlg->GetError() )
     {
-        USHORT nSlot = pImpl->pRequest->GetSlot();
+        sal_uInt16 nSlot = pImpl->pRequest->GetSlot();
         SfxMedium* pMed = pImpl->pDocInserter->CreateMedium();
         // #i87094# If a .odt was selected pMed is NULL.
         if (pMed)
@@ -2269,7 +2262,7 @@ IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
             const SfxPoolItem* pItem = NULL;
             SfxItemSet* pSet = pMed->GetItemSet();
             if ( pSet &&
-                    pSet->GetItemState( SID_VERSION, TRUE, &pItem ) == SFX_ITEM_SET &&
+                    pSet->GetItemState( SID_VERSION, sal_True, &pItem ) == SFX_ITEM_SET &&
                     pItem->ISA( SfxInt16Item ) )
             {
                 pImpl->pRequest->AppendItem( *pItem );
@@ -2295,7 +2288,7 @@ void ScDocShell::EnableSharedSettings( bool bEnable )
         aDocument.StartChangeTracking();
 
         // hide accept or reject changes dialog
-        USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId();
+        sal_uInt16 nId = ScAcceptChgDlgWrapper::GetChildWindowId();
         SfxViewFrame* pViewFrame = SfxViewFrame::Current();
         if ( pViewFrame && pViewFrame->HasChildWindow( nId ) )
         {
@@ -2313,7 +2306,7 @@ void ScDocShell::EnableSharedSettings( bool bEnable )
     }
 
     ScChangeViewSettings aChangeViewSet;
-    aChangeViewSet.SetShowChanges( FALSE );
+    aChangeViewSet.SetShowChanges( sal_False );
     aDocument.SetChangeViewSettings( aChangeViewSet );
 }
 
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index ac2a4132b..34d4b86ca 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -77,13 +77,13 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
 //	ehemalige viewfunc/dbfunc Methoden
 //
 
-void ScDocShell::ErrorMessage( USHORT nGlobStrId )
+void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId )
 {
     //!	StopMarking an der (aktiven) View?
 
     Window* pParent = GetActiveDialogParent();
     ScWaitCursorOff aWaitOff( pParent );
-    BOOL bFocus = pParent && pParent->HasFocus();
+    sal_Bool bFocus = pParent && pParent->HasFocus();
 
     if(nGlobStrId==STR_PROTECTIONERR)
     {
@@ -99,7 +99,7 @@ void ScDocShell::ErrorMessage( USHORT nGlobStrId )
         pParent->GrabFocus();
 }
 
-BOOL ScDocShell::IsEditable() const
+sal_Bool ScDocShell::IsEditable() const
 {
     // import into read-only document is possible - must be extended if other filters use api
     // #i108547# MSOOXML filter uses "IsChangeReadOnlyEnabled" property
@@ -126,12 +126,12 @@ ScDBData* lcl_GetDBNearCursor( ScDBCollection* pColl, SCCOL nCol, SCROW nRow, SC
 
     ScDBData* pNoNameData = NULL;
     ScDBData* pNearData = NULL;
-    USHORT nCount = pColl->GetCount();
+    sal_uInt16 nCount = pColl->GetCount();
     String aNoName = ScGlobal::GetRscString( STR_DB_NONAME );
     SCTAB nAreaTab;
     SCCOL nStartCol, nEndCol;
     SCROW nStartRow, nEndRow;
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ScDBData* pDB = (*pColl)[i];
         pDB->GetArea( nAreaTab, nStartCol, nStartRow, nEndCol, nEndRow );
@@ -175,11 +175,11 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
     if (!pData)
         pData = lcl_GetDBNearCursor( aDocument.GetDBCollection(), nCol, nRow, nTab );
 
-    BOOL bSelected = ( eSel == SC_DBSEL_FORCE_MARK ||
+    sal_Bool bSelected = ( eSel == SC_DBSEL_FORCE_MARK ||
             (rMarked.aStart != rMarked.aEnd && eSel != SC_DBSEL_ROW_DOWN) );
     bool bOnlyDown = (!bSelected && eSel == SC_DBSEL_ROW_DOWN && rMarked.aStart.Row() == rMarked.aEnd.Row());
 
-    BOOL bUseThis = FALSE;
+    sal_Bool bUseThis = sal_False;
     if (pData)
     {
         //		Bereich nehmen, wenn nichts anderes markiert
@@ -190,11 +190,11 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
         SCCOL nOldCol2;
         SCROW nOldRow2;
         pData->GetArea( nDummy, nOldCol1,nOldRow1, nOldCol2,nOldRow2 );
-        BOOL bIsNoName = ( pData->GetName() == ScGlobal::GetRscString( STR_DB_NONAME ) );
+        sal_Bool bIsNoName = ( pData->GetName() == ScGlobal::GetRscString( STR_DB_NONAME ) );
 
         if (!bSelected)
         {
-            bUseThis = TRUE;
+            bUseThis = sal_True;
             if ( bIsNoName && eMode == SC_DB_MAKE )
             {
                 // If nothing marked or only one row marked, adapt 
@@ -211,9 +211,9 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
                     nEndCol = nStartCol;
                     nEndRow = nStartRow;
                 }
-                aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE, bOnlyDown );
+                aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, sal_False, bOnlyDown );
                 if ( nOldCol1 != nStartCol || nOldCol2 != nEndCol || nOldRow1 != nStartRow )
-                    bUseThis = FALSE;				// passt gar nicht
+                    bUseThis = sal_False;				// passt gar nicht
                 else if ( nOldRow2 != nEndRow )
                 {
                     //	Bereich auf neue End-Zeile erweitern
@@ -225,15 +225,15 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
         {
             if ( nOldCol1 == nStartCol && nOldRow1 == nStartRow &&
                  nOldCol2 == nEndCol && nOldRow2 == nEndRow )				// genau markiert?
-                bUseThis = TRUE;
+                bUseThis = sal_True;
             else
-                bUseThis = FALSE;			// immer Markierung nehmen (Bug 11964)
+                bUseThis = sal_False;			// immer Markierung nehmen (Bug 11964)
         }
 
         //		fuer Import nie "unbenannt" nehmen
 
         if ( bUseThis && eMode == SC_DB_IMPORT && bIsNoName )
-            bUseThis = FALSE;
+            bUseThis = sal_False;
     }
 
     if ( bUseThis )
@@ -247,13 +247,13 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
         nStartCol = nEndCol = nCol;
         nStartRow = nEndRow = nRow;
         nStartTab = nEndTab = nTab;
-//		bMark = FALSE;							// nichts zu markieren
+//		bMark = sal_False;							// nichts zu markieren
     }
     else
     {
         if ( bSelected )
         {
-//			bMark = FALSE;
+//			bMark = sal_False;
         }
         else
         {										// zusammenhaengender Bereich
@@ -269,13 +269,13 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
                 nEndCol = nStartCol;
                 nEndRow = nStartRow;
             }
-            aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE, bOnlyDown );
+            aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, sal_False, bOnlyDown );
         }
 
-        BOOL bHasHeader = aDocument.HasColHeader( nStartCol,nStartRow, nEndCol,nEndRow, nTab );
+        sal_Bool bHasHeader = aDocument.HasColHeader( nStartCol,nStartRow, nEndCol,nEndRow, nTab );
 
         ScDBData* pNoNameData;
-        USHORT nNoNameIndex;
+        sal_uInt16 nNoNameIndex;
         ScDBCollection* pColl = aDocument.GetDBCollection();
         if ( eMode != SC_DB_IMPORT &&
                 pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nNoNameIndex ) )
@@ -302,9 +302,9 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
             pNoNameData->SetSubTotalParam( ScSubTotalParam() );
 
             pNoNameData->SetArea( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); 	// neu setzen
-            pNoNameData->SetByRow( TRUE );
+            pNoNameData->SetByRow( sal_True );
             pNoNameData->SetHeader( bHasHeader );
-            pNoNameData->SetAutoFilter( FALSE );
+            pNoNameData->SetAutoFilter( sal_False );
         }
         else
         {
@@ -313,12 +313,12 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
             String aNewName;
             if (eMode==SC_DB_IMPORT)
             {
-                aDocument.CompileDBFormula( TRUE );			// CreateFormulaString
+                aDocument.CompileDBFormula( sal_True );			// CreateFormulaString
                 pUndoColl = new ScDBCollection( *pColl );	// Undo fuer Import1-Bereich
 
                 String aImport = ScGlobal::GetRscString( STR_DBNAME_IMPORT );
                 long nCount = 0;
-                USHORT nDummy;
+                sal_uInt16 nDummy;
                 do
                 {
                     ++nCount;
@@ -331,12 +331,12 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
                 aNewName = ScGlobal::GetRscString( STR_DB_NONAME );
             pNoNameData = new ScDBData( aNewName, nTab,
                                 nStartCol,nStartRow, nEndCol,nEndRow,
-                                TRUE, bHasHeader );
+                                sal_True, bHasHeader );
             pColl->Insert( pNoNameData );
 
             if ( pUndoColl )
             {
-                aDocument.CompileDBFormula( FALSE );		// CompileFormulaString
+                aDocument.CompileDBFormula( sal_False );		// CompileFormulaString
 
                 ScDBCollection* pRedoColl = new ScDBCollection( *pColl );
                 GetUndoManager()->AddUndoAction( new ScUndoDBData( this, pUndoColl, pRedoColl ) );
@@ -352,7 +352,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
     }
 
 //	if (bMark)
-//		MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), FALSE );
+//		MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), sal_False );
 
     return pData;
 }
@@ -369,7 +369,7 @@ void ScDocShell::CancelAutoDBRange()
     // called when dialog is cancelled
     if ( pOldAutoDBRange )
     {
-        USHORT nNoNameIndex;
+        sal_uInt16 nNoNameIndex;
         ScDBCollection* pColl = aDocument.GetDBCollection();
         if ( pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nNoNameIndex ) )
         {
@@ -403,12 +403,12 @@ void ScDocShell::CancelAutoDBRange()
         //	Hoehen anpassen
         //!	mit docfunc zusammenfassen
 
-BOOL ScDocShell::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab )
+sal_Bool ScDocShell::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab )
 {
     ScSizeDeviceProvider aProv(this);
     Fraction aZoom(1,1);
-    BOOL bChange = aDocument.SetOptimalHeight( nStartRow,nEndRow, nTab, 0, aProv.GetDevice(),
-                                                aProv.GetPPTX(),aProv.GetPPTY(), aZoom,aZoom, FALSE );
+    sal_Bool bChange = aDocument.SetOptimalHeight( nStartRow,nEndRow, nTab, 0, aProv.GetDevice(),
+                                                aProv.GetPPTX(),aProv.GetPPTY(), aZoom,aZoom, sal_False );
     if (bChange)
         PostPaint( 0,nStartRow,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID|PAINT_LEFT );
 
@@ -426,8 +426,8 @@ void ScDocShell::UpdateAllRowHeights( const ScMarkData* pTabMark )
 
 void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
 {
-    BOOL bIsUndoEnabled = aDocument.IsUndoEnabled();
-    aDocument.EnableUndo( FALSE );
+    sal_Bool bIsUndoEnabled = aDocument.IsUndoEnabled();
+    aDocument.EnableUndo( sal_False );
     aDocument.LockStreamValid( true );      // ignore draw page size (but not formula results)
     if ( bBefore )          // check all sheets up to nUpdateTab
     {
@@ -439,7 +439,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
         SCTAB nTab;
         for (nTab=0; nTab<=nUpdateTab; ++nTab)
             if ( aDocument.IsPendingRowHeights( nTab ) )
-                aUpdateSheets.SelectTable( nTab, TRUE );
+                aUpdateSheets.SelectTable( nTab, sal_True );
 
         if (aUpdateSheets.GetSelectCount())
             UpdateAllRowHeights(&aUpdateSheets);        // update with a single progress bar
@@ -448,7 +448,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
             if ( aUpdateSheets.GetTableSelect( nTab ) )
             {
                 aDocument.UpdatePageBreaks( nTab );
-                aDocument.SetPendingRowHeights( nTab, FALSE );
+                aDocument.SetPendingRowHeights( nTab, sal_False );
             }
     }
     else                    // only nUpdateTab
@@ -457,7 +457,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
         {
             AdjustRowHeight( 0, MAXROW, nUpdateTab );
             aDocument.UpdatePageBreaks( nUpdateTab );
-            aDocument.SetPendingRowHeights( nUpdateTab, FALSE );
+            aDocument.SetPendingRowHeights( nUpdateTab, sal_False );
         }
     }
     aDocument.LockStreamValid( false );
@@ -474,8 +474,8 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource )
         //	DataPilotUpdate doesn't modify the collection order like PivotUpdate did,
         //	so a simple loop can be used.
 
-        USHORT nCount = pColl->GetCount();
-        for ( USHORT i=0; i<nCount; i++ )
+        sal_uInt16 nCount = pColl->GetCount();
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
             ScDPObject* pOld = (*pColl)[i];
             if ( pOld )
@@ -485,7 +485,7 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource )
                 {
                     ScDPObject* pNew = new ScDPObject( *pOld );
                     ScDBDocFunc aFunc( *this );
-                    aFunc.DataPilotUpdate( pOld, pNew, TRUE, FALSE );
+                    aFunc.DataPilotUpdate( pOld, pNew, sal_True, sal_False );
                     delete pNew;	// DataPilotUpdate copies settings from "new" object
                 }
             }
@@ -496,14 +496,14 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource )
 String lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea )
 {
     String aName;
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     ScDBData* pData = pDoc->GetDBAtArea( pArea->nTab, pArea->nColStart, pArea->nRowStart,
                                                         pArea->nColEnd, pArea->nRowEnd );
     if (pData)
     {
         pData->GetName( aName );
         if ( aName != ScGlobal::GetRscString( STR_DB_NONAME ) )
-            bOk = TRUE;
+            bOk = sal_True;
     }
 
     if (!bOk)
@@ -512,14 +512,14 @@ String lcl_GetAreaName( ScDocument* pDoc, ScArea* pArea )
     return aName;
 }
 
-void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
+void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, sal_Bool bRecord )
 {
     ScConsData aData;
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     SCCOL nColSize = 0;
     SCROW nRowSize = 0;
-    BOOL bErr = FALSE;
+    sal_Bool bErr = sal_False;
     for (nPos=0; nPos<rParam.nDataAreaCount; nPos++)
     {
         ScArea* pArea = rParam.ppDataAreas[nPos];
@@ -529,7 +529,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
                                         // Test, ob Quelldaten verschoben wuerden
         if (rParam.bReferenceData)
             if (pArea->nTab == rParam.nTab && pArea->nRowEnd >= rParam.nRow)
-                bErr = TRUE;
+                bErr = sal_True;
     }
 
     if (bErr)
@@ -546,7 +546,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
     ScDocShellModificator aModificator( *this );
 
     ScRange aOldDest;
-    ScDBData* pDestData = aDocument.GetDBAtCursor( rParam.nCol, rParam.nRow, rParam.nTab, TRUE );
+    ScDBData* pDestData = aDocument.GetDBAtCursor( rParam.nCol, rParam.nRow, rParam.nTab, sal_True );
     if (pDestData)
         pDestData->GetArea(aOldDest);
 
@@ -589,28 +589,28 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
             ScOutlineTable* pUndoTab = pTable ? new ScOutlineTable( *pTable ) : NULL;
 
             ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pUndoDoc->InitUndo( &aDocument, 0, nTabCount-1, FALSE, TRUE );
+            pUndoDoc->InitUndo( &aDocument, 0, nTabCount-1, sal_False, sal_True );
 
             // Zeilenstatus
             aDocument.CopyToDocument( 0,0,nDestTab, MAXCOL,MAXROW,nDestTab,
-                                    IDF_NONE, FALSE, pUndoDoc );
+                                    IDF_NONE, sal_False, pUndoDoc );
 
             // alle Formeln
             aDocument.CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
-                                        IDF_FORMULA, FALSE, pUndoDoc );
+                                        IDF_FORMULA, sal_False, pUndoDoc );
 
             // komplette Ausgangszeilen
             aDocument.CopyToDocument( 0,aDestArea.nRowStart,nDestTab,
                                     MAXCOL,aDestArea.nRowEnd,nDestTab,
-                                    IDF_ALL, FALSE, pUndoDoc );
+                                    IDF_ALL, sal_False, pUndoDoc );
 
             // alten Ausgabebereich
             if (pDestData)
-                aDocument.CopyToDocument( aOldDest, IDF_ALL, FALSE, pUndoDoc );
+                aDocument.CopyToDocument( aOldDest, IDF_ALL, sal_False, pUndoDoc );
 
             GetUndoManager()->AddUndoAction(
                     new ScUndoConsolidate( this, aDestArea, rParam, pUndoDoc,
-                                            TRUE, nInsertCount, pUndoTab, pUndoData ) );
+                                            sal_True, nInsertCount, pUndoTab, pUndoData ) );
         }
         else
         {
@@ -619,15 +619,15 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
 
             aDocument.CopyToDocument( aDestArea.nColStart, aDestArea.nRowStart, aDestArea.nTab,
                                     aDestArea.nColEnd, aDestArea.nRowEnd, aDestArea.nTab,
-                                    IDF_ALL, FALSE, pUndoDoc );
+                                    IDF_ALL, sal_False, pUndoDoc );
 
             // alten Ausgabebereich
             if (pDestData)
-                aDocument.CopyToDocument( aOldDest, IDF_ALL, FALSE, pUndoDoc );
+                aDocument.CopyToDocument( aOldDest, IDF_ALL, sal_False, pUndoDoc );
 
             GetUndoManager()->AddUndoAction(
                     new ScUndoConsolidate( this, aDestArea, rParam, pUndoDoc,
-                                            FALSE, 0, NULL, pUndoData ) );
+                                            sal_False, 0, NULL, pUndoData ) );
         }
     }
 
@@ -645,7 +645,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
     SCROW nPaintStartRow = rParam.nRow;
     SCCOL nPaintEndCol = nPaintStartCol + nColSize - 1;
     SCROW nPaintEndRow = nPaintStartRow + nRowSize - 1;
-    USHORT nPaintFlags = PAINT_GRID;
+    sal_uInt16 nPaintFlags = PAINT_GRID;
     if (rParam.bByCol)
         ++nPaintEndRow;
     if (rParam.bByRow)
@@ -669,7 +669,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
     aModificator.SetDocumentModified();
 }
 
-void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
+void ScDocShell::UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord )
 {
     if (!aDocument.IsScenario(nTab))
     {
@@ -707,22 +707,22 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
                     pUndoDoc->InitUndo( &aDocument, nTab,nEndTab );				// auch alle Szenarien
                     //	angezeigte Tabelle:
                     aDocument.CopyToDocument( nStartCol,nStartRow,nTab,
-                                    nEndCol,nEndRow,nTab, IDF_ALL,TRUE, pUndoDoc, &aScenMark );
+                                    nEndCol,nEndRow,nTab, IDF_ALL,sal_True, pUndoDoc, &aScenMark );
                     //	Szenarien
                     for (SCTAB i=nTab+1; i<=nEndTab; i++)
                     {
-                        pUndoDoc->SetScenario( i, TRUE );
+                        pUndoDoc->SetScenario( i, sal_True );
                         String aComment;
                         Color  aColor;
-                        USHORT nScenFlags;
+                        sal_uInt16 nScenFlags;
                         aDocument.GetScenarioData( i, aComment, aColor, nScenFlags );
                         pUndoDoc->SetScenarioData( i, aComment, aColor, nScenFlags );
-                        BOOL bActive = aDocument.IsActiveScenario( i );
+                        sal_Bool bActive = aDocument.IsActiveScenario( i );
                         pUndoDoc->SetActiveScenario( i, bActive );
                         //	Bei Zurueckkopier-Szenarios auch Inhalte
                         if ( nScenFlags & SC_SCENARIO_TWOWAY )
                             aDocument.CopyToDocument( 0,0,i, MAXCOL,MAXROW,i,
-                                                        IDF_ALL,FALSE, pUndoDoc );
+                                                        IDF_ALL,sal_False, pUndoDoc );
                     }
 
                     GetUndoManager()->AddUndoAction(
@@ -761,14 +761,14 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
 }
 
 void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
-                                    const Color& rColor, USHORT nFlags )
+                                    const Color& rColor, sal_uInt16 nFlags )
 {
     //	Undo
     String aOldName;
     aDocument.GetName( nTab, aOldName );
     String aOldComment;
     Color aOldColor;
-    USHORT nOldFlags;
+    sal_uInt16 nOldFlags;
     aDocument.GetScenarioData( nTab, aOldComment, aOldColor, nOldFlags );
     GetUndoManager()->AddUndoAction(
         new ScUndoScenarioFlags( this, nTab,
@@ -791,8 +791,8 @@ void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String&
 }
 
 SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
-                                    const Color& rColor, USHORT nFlags,
-                                    ScMarkData& rMark, BOOL bRecord )
+                                    const Color& rColor, sal_uInt16 nFlags,
+                                    ScMarkData& rMark, sal_Bool bRecord )
 {
     rMark.MarkToMulti();
     if (rMark.IsMultiMarked())
@@ -801,7 +801,7 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
         while (aDocument.IsScenario(nNewTab))
             ++nNewTab;
 
-        BOOL bCopyAll = ( (nFlags & SC_SCENARIO_COPYALL) != 0 );
+        sal_Bool bCopyAll = ( (nFlags & SC_SCENARIO_COPYALL) != 0 );
         const ScMarkData* pCopyMark = NULL;
         if (!bCopyAll)
             pCopyMark = &rMark;
@@ -820,8 +820,8 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
                                                 rName, rComment, rColor, nFlags, rMark ));
             }
 
-            aDocument.RenameTab( nNewTab, rName, FALSE );			// ohne Formel-Update
-            aDocument.SetScenario( nNewTab, TRUE );
+            aDocument.RenameTab( nNewTab, rName, sal_False );			// ohne Formel-Update
+            aDocument.SetScenario( nNewTab, sal_True );
             aDocument.SetScenarioData( nNewTab, rComment, rColor, nFlags );
 
             ScMarkData aDestMark = rMark;
@@ -830,19 +830,19 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
             //!		auf Filter / Buttons / Merging testen !
 
             ScPatternAttr aProtPattern( aDocument.GetPool() );
-            aProtPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) );
+            aProtPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) );
             aDocument.ApplyPatternAreaTab( 0,0, MAXCOL,MAXROW, nNewTab, aProtPattern );
 
             ScPatternAttr aPattern( aDocument.GetPool() );
             aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) );
-            aPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) );
+            aPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) );
             aDocument.ApplySelectionPattern( aPattern, aDestMark );
 
             if (!bCopyAll)
-                aDocument.SetVisible( nNewTab, FALSE );
+                aDocument.SetVisible( nNewTab, sal_False );
 
             //	dies ist dann das aktive Szenario
-            aDocument.CopyScenario( nNewTab, nTab, TRUE );	// TRUE - nicht aus Szenario kopieren
+            aDocument.CopyScenario( nNewTab, nTab, sal_True );	// sal_True - nicht aus Szenario kopieren
 
             if (nFlags & SC_SCENARIO_SHOWFRAME)
                 PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );	// Rahmen painten
@@ -857,7 +857,7 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
     return nTab;
 }
 
-BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord )
+sal_Bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, sal_Bool bRecord )
 {
     ScDocShellModificator aModificator( *this );
 
@@ -876,7 +876,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
         if (!aDocument.CopyTab( nSrcTab, nDestTab ))
         {
             //!	EndDrawUndo?
-            return FALSE;
+            return sal_False;
         }
         else
         {
@@ -897,7 +897,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
                         new ScUndoCopyTab( this, aSrcList, aDestList ) );
             }
             
-            BOOL bVbaEnabled = aDocument.IsInVBAMode();
+            sal_Bool bVbaEnabled = aDocument.IsInVBAMode();
                         if ( bVbaEnabled )
                         {
                 StarBASIC* pStarBASIC = GetBasic();
@@ -933,7 +933,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
     else
     {
         if ( aDocument.GetChangeTrack() )
-            return FALSE;
+            return sal_False;
 
         if ( nSrcTab<nDestTab && nDestTab!=SC_TAB_APPEND )
             nDestTab--;
@@ -941,11 +941,11 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
         if ( nSrcTab == nDestTab )
         {
             //!	allow only for api calls?
-            return TRUE;	// nothing to do, but valid
+            return sal_True;	// nothing to do, but valid
         }
 
         if (!aDocument.MoveTab( nSrcTab, nDestTab ))
-            return FALSE;
+            return sal_False;
         else if (bRecord)
         {
             SvShorts aSrcList;
@@ -964,7 +964,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
     aModificator.SetDocumentModified();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
 
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -972,7 +972,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
 {
     ScDBDocFunc aFunc(*this);
 
-    BOOL bContinue = TRUE;
+    sal_Bool bContinue = sal_True;
     ScDBData* pDBData = static_cast<ScDBData*>(pRefreshTimer);
     ScImportParam aImportParam;
     pDBData->GetImportParam( aImportParam );
@@ -981,11 +981,11 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
         ScRange aRange;
         pDBData->GetArea( aRange );
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet;
-        bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, TRUE, FALSE );	//! Api-Flag as parameter
+        bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, sal_True, sal_False );	//! Api-Flag as parameter
         // internal operations (sort, query, subtotal) only if no error
         if (bContinue)
         {
-            aFunc.RepeatDB( pDBData->GetName(), TRUE, TRUE );
+            aFunc.RepeatDB( pDBData->GetName(), sal_True, sal_True );
             RefreshPivotTables(aRange);
         }
     }
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 5c6a411bc..5136d5e2c 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -73,7 +73,7 @@ void __EXPORT ScDocShell::SetVisArea( const Rectangle & rVisArea )
 {
     //	with the SnapVisArea call in SetVisAreaOrSize, it's safe to always
     //	use both the size and position of the VisArea
-    SetVisAreaOrSize( rVisArea, TRUE );
+    SetVisAreaOrSize( rVisArea, sal_True );
 }
 
 void lcl_SetTopRight( Rectangle& rRect, const Point& rPos )
@@ -85,9 +85,9 @@ void lcl_SetTopRight( Rectangle& rRect, const Point& rPos )
     rRect.Bottom() = rPos.Y() + aSize.Height() - 1;
 }
 
-void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart )
+void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, sal_Bool bModifyStart )
 {
-    BOOL bNegativePage = aDocument.IsNegativePage( aDocument.GetVisibleTab() );
+    sal_Bool bNegativePage = aDocument.IsNegativePage( aDocument.GetVisibleTab() );
 
     Rectangle aArea = rVisArea;
     if (bModifyStart)
@@ -172,12 +172,12 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart
     }
 }
 
-BOOL ScDocShell::IsOle()
+sal_Bool ScDocShell::IsOle()
 {
     return (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
 }
 
-void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
+void ScDocShell::UpdateOle( const ScViewData* pViewData, sal_Bool bSnapSize )
 {
     //	wenn's gar nicht Ole ist, kann man sich die Berechnungen sparen
     //	(VisArea wird dann beim Save wieder zurueckgesetzt)
@@ -190,8 +190,8 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
     Rectangle aOldArea = SfxObjectShell::GetVisArea();
     Rectangle aNewArea = aOldArea;
 
-    BOOL bChange = FALSE;
-    BOOL bEmbedded = aDocument.IsEmbedded();
+    sal_Bool bChange = sal_False;
+    sal_Bool bEmbedded = aDocument.IsEmbedded();
     if (bEmbedded)
         aNewArea = aDocument.GetEmbeddedRect();
     else
@@ -200,10 +200,10 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
         if ( nTab != aDocument.GetVisibleTab() )
         {
             aDocument.SetVisibleTab( nTab );
-            bChange = TRUE;
+            bChange = sal_True;
         }
 
-        BOOL bNegativePage = aDocument.IsNegativePage( nTab );
+        sal_Bool bNegativePage = aDocument.IsNegativePage( nTab );
         SCCOL nX = pViewData->GetPosX(SC_SPLIT_LEFT);
         SCROW nY = pViewData->GetPosY(SC_SPLIT_BOTTOM);
         Rectangle aMMRect = aDocument.GetMMRect( nX,nY, nX,nY, nTab );
@@ -217,8 +217,8 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
 
     if (aNewArea != aOldArea)
     {
-        SetVisAreaOrSize( aNewArea, TRUE );	// hier muss auch der Start angepasst werden
-        bChange = TRUE;
+        SetVisAreaOrSize( aNewArea, sal_True );	// hier muss auch der Start angepasst werden
+        bChange = sal_True;
     }
 
 //	if (bChange)
@@ -248,14 +248,14 @@ void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool )
         SfxItemSet& rStyleSet = pStyle->GetItemSet();
 
         const SfxPoolItem* pItem;
-        if (rStyleSet.GetItemState(ATTR_PAGE_HEADERSET,FALSE,&pItem) == SFX_ITEM_SET)
+        if (rStyleSet.GetItemState(ATTR_PAGE_HEADERSET,sal_False,&pItem) == SFX_ITEM_SET)
         {
             SfxItemSet& rSrcSet = ((SvxSetItem*)pItem)->GetItemSet();
             SfxItemSet* pDestSet = new SfxItemSet(*rStyleSet.GetPool(),rSrcSet.GetRanges());
             pDestSet->Put(rSrcSet);
             rStyleSet.Put(SvxSetItem(ATTR_PAGE_HEADERSET,pDestSet));
         }
-        if (rStyleSet.GetItemState(ATTR_PAGE_FOOTERSET,FALSE,&pItem) == SFX_ITEM_SET)
+        if (rStyleSet.GetItemState(ATTR_PAGE_FOOTERSET,sal_False,&pItem) == SFX_ITEM_SET)
         {
             SfxItemSet& rSrcSet = ((SvxSetItem*)pItem)->GetItemSet();
             SfxItemSet* pDestSet = new SfxItemSet(*rStyleSet.GetPool(),rSrcSet.GetRanges());
@@ -283,7 +283,7 @@ void __EXPORT ScDocShell::LoadStyles( SfxObjectShell &rSource )
     PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT );
 }
 
-void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles )
+void ScDocShell::LoadStylesArgs( ScDocShell& rSource, sal_Bool bReplace, sal_Bool bCellStyles, sal_Bool bPageStyles )
 {
     //	similar to LoadStyles, but with selectable behavior for XStyleLoader::loadStylesFromURL call
 
@@ -297,12 +297,12 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS
             ( bPageStyles ? SFX_STYLE_FAMILY_ALL : SFX_STYLE_FAMILY_PARA ) :
             SFX_STYLE_FAMILY_PAGE;
     SfxStyleSheetIterator aIter( pSourcePool, eFamily );
-    USHORT nSourceCount = aIter.Count();
+    sal_uInt16 nSourceCount = aIter.Count();
     if ( nSourceCount == 0 )
         return;								// no source styles
 
     ScStylePair* pStyles = new ScStylePair[ nSourceCount ];
-    USHORT nFound = 0;
+    sal_uInt16 nFound = 0;
 
     //	first create all new styles
 
@@ -333,7 +333,7 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS
 
     //	then copy contents (after inserting all styles, for parent etc.)
 
-    for ( USHORT i = 0; i < nFound; ++i )
+    for ( sal_uInt16 i = 0; i < nFound; ++i )
     {
         pStyles[i].pDest->GetItemSet().PutExtended(
             pStyles[i].pSource->GetItemSet(), SFX_ITEM_DONTCARE, SFX_ITEM_DEFAULT);
@@ -350,11 +350,11 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS
 }
 
 
-BOOL __EXPORT ScDocShell::Insert( SfxObjectShell &rSource,
-                                USHORT nSourceIdx1, USHORT nSourceIdx2, USHORT nSourceIdx3,
-                                USHORT &nIdx1, USHORT &nIdx2, USHORT &nIdx3, USHORT &rIdxDeleted )
+sal_Bool __EXPORT ScDocShell::Insert( SfxObjectShell &rSource,
+                                sal_uInt16 nSourceIdx1, sal_uInt16 nSourceIdx2, sal_uInt16 nSourceIdx3,
+                                sal_uInt16 &nIdx1, sal_uInt16 &nIdx2, sal_uInt16 &nIdx3, sal_uInt16 &rIdxDeleted )
 {
-    BOOL bRet = SfxObjectShell::Insert( rSource, nSourceIdx1, nSourceIdx2, nSourceIdx3,
+    sal_Bool bRet = SfxObjectShell::Insert( rSource, nSourceIdx1, nSourceIdx2, nSourceIdx3,
                                             nIdx1, nIdx2, nIdx3, rIdxDeleted );
     if (bRet)
         lcl_AdjustPool( GetStyleSheetPool() );		// SetItems anpassen
@@ -369,8 +369,8 @@ void ScDocShell::UpdateLinks()
 
     // nicht mehr benutzte Links raus
 
-    USHORT nCount = pLinkManager->GetLinks().Count();
-    for (USHORT k=nCount; k>0; )
+    sal_uInt16 nCount = pLinkManager->GetLinks().Count();
+    for (sal_uInt16 k=nCount; k>0; )
     {
         --k;
         ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[k];
@@ -385,7 +385,7 @@ void ScDocShell::UpdateLinks()
             }
             else		// nicht mehr benutzt -> loeschen
             {
-                pTabLink->SetAddUndo(TRUE);
+                pTabLink->SetAddUndo(sal_True);
                 pLinkManager->Remove(k);
             }
         }
@@ -401,8 +401,8 @@ void ScDocShell::UpdateLinks()
             String aDocName = aDocument.GetLinkDoc(i);
             String aFltName = aDocument.GetLinkFlt(i);
             String aOptions = aDocument.GetLinkOpt(i);
-            ULONG nRefresh	= aDocument.GetLinkRefreshDelay(i);
-            BOOL bThere = FALSE;
+            sal_uLong nRefresh	= aDocument.GetLinkRefreshDelay(i);
+            sal_Bool bThere = sal_False;
             for (SCTAB j=0; j<i && !bThere; j++)				// im Dokument mehrfach?
                 if (aDocument.IsLinked(j)
                         && aDocument.GetLinkDoc(j) == aDocName
@@ -411,7 +411,7 @@ void ScDocShell::UpdateLinks()
                         // Ignore refresh delay in compare, it should be the
                         // same for identical links and we don't want dupes
                         // if it ain't.
-                    bThere = TRUE;
+                    bThere = sal_True;
 
             if (!bThere)										// schon als Filter eingetragen?
             {
@@ -419,38 +419,38 @@ void ScDocShell::UpdateLinks()
                 if (!aNames.Insert(pData))
                 {
                     delete pData;
-                    bThere = TRUE;
+                    bThere = sal_True;
                 }
             }
             if (!bThere)
             {
                 ScTableLink* pLink = new ScTableLink( this, aDocName, aFltName, aOptions, nRefresh );
-                pLink->SetInCreate( TRUE );
+                pLink->SetInCreate( sal_True );
                 pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aDocName, &aFltName );
                 pLink->Update();
-                pLink->SetInCreate( FALSE );
+                pLink->SetInCreate( sal_False );
             }
         }
 }
 
-BOOL ScDocShell::ReloadTabLinks()
+sal_Bool ScDocShell::ReloadTabLinks()
 {
     sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager();
 
-    BOOL bAny = FALSE;
-    USHORT nCount = pLinkManager->GetLinks().Count();
-    for (USHORT i=0; i<nCount; i++ )
+    sal_Bool bAny = sal_False;
+    sal_uInt16 nCount = pLinkManager->GetLinks().Count();
+    for (sal_uInt16 i=0; i<nCount; i++ )
     {
         ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i];
         if (pBase->ISA(ScTableLink))
         {
             ScTableLink* pTabLink = (ScTableLink*)pBase;
-//			pTabLink->SetAddUndo(FALSE);		//! Undo's zusammenfassen
-            pTabLink->SetPaint(FALSE);			//	Paint nur einmal am Ende
+//			pTabLink->SetAddUndo(sal_False);		//! Undo's zusammenfassen
+            pTabLink->SetPaint(sal_False);			//	Paint nur einmal am Ende
             pTabLink->Update();
-            pTabLink->SetPaint(TRUE);
-//			pTabLink->SetAddUndo(TRUE);
-            bAny = TRUE;
+            pTabLink->SetPaint(sal_True);
+//			pTabLink->SetAddUndo(sal_True);
+            bAny = sal_True;
         }
     }
 
@@ -463,7 +463,7 @@ BOOL ScDocShell::ReloadTabLinks()
         SetDocumentModified();
     }
 
-    return TRUE;		//! Fehler erkennen
+    return sal_True;		//! Fehler erkennen
 }
 
 
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 589b0c67a..44a3444aa 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -104,7 +104,7 @@ using namespace com::sun::star;
 
 namespace
 {
-    ULONG lcl_getDBaseConnection(uno::Reference<sdbc::XDriverManager>& _rDrvMgr,uno::Reference<sdbc::XConnection>& _rConnection,String& _rTabName,const String& rFullFileName,rtl_TextEncoding eCharSet)
+    sal_uLong lcl_getDBaseConnection(uno::Reference<sdbc::XDriverManager>& _rDrvMgr,uno::Reference<sdbc::XConnection>& _rConnection,String& _rTabName,const String& rFullFileName,rtl_TextEncoding eCharSet)
     {
         INetURLObject aURL;
         aURL.SetSmartProtocol( INET_PROT_FILE );
@@ -161,7 +161,7 @@ namespace
 // MoveFile/KillFile/IsDocument: similar to SfxContentHelper
 
 // static
-BOOL ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& rDestObj )
+sal_Bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& rDestObj )
 {
     sal_Bool bMoveData = sal_True;
     sal_Bool bRet = sal_True, bKillSource = sal_False;
@@ -206,7 +206,7 @@ BOOL ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject&
 
 
 // static
-BOOL ScDocShell::KillFile( const INetURLObject& rURL )
+sal_Bool ScDocShell::KillFile( const INetURLObject& rURL )
 {
     sal_Bool bRet = sal_True;
     try
@@ -226,7 +226,7 @@ BOOL ScDocShell::KillFile( const INetURLObject& rURL )
 }
 
 // static
-BOOL ScDocShell::IsDocument( const INetURLObject& rURL )
+sal_Bool ScDocShell::IsDocument( const INetURLObject& rURL )
 {
     sal_Bool bRet = sal_False;
     try
@@ -246,10 +246,10 @@ BOOL ScDocShell::IsDocument( const INetURLObject& rURL )
 
 // -----------------------------------------------------------------------
 
-ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
-                                BOOL bSimpleColWidth[MAXCOLCOUNT] )
+sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
+                                sal_Bool bSimpleColWidth[MAXCOLCOUNT] )
 {
-    ULONG nErr = eERR_OK;
+    sal_uLong nErr = eERR_OK;
     long i;
 
     try
@@ -257,7 +257,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
         String aTabName;
         uno::Reference<sdbc::XDriverManager> xDrvMan;
         uno::Reference<sdbc::XConnection> xConnection;
-        ULONG nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
+        sal_uLong nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
         if ( !xConnection.is() || !xDrvMan.is() )
             return nRet;
         ::utl::DisposableComponent aConnectionHelper(xConnection);
@@ -364,7 +364,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
         }
 
         SCROW nRow = 1;		// 0 is column titles
-        BOOL bEnd = FALSE;
+        sal_Bool bEnd = sal_False;
         while ( !bEnd && xRowSet->next() )
         {
             if ( nRow <= MAXROW )
@@ -373,7 +373,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
                 for (i=0; i<nColCount; i++)
                 {
                     ScDatabaseDocUtil::PutData( &aDocument, nCol, nRow, 0,
-                                                xRow, i+1, pTypeArr[i], FALSE,
+                                                xRow, i+1, pTypeArr[i], sal_False,
                                                 &bSimpleColWidth[nCol] );
                     ++nCol;
                 }
@@ -381,7 +381,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
             }
             else		// past the end of the spreadsheet
             {
-                bEnd = TRUE;							// don't continue
+                bEnd = sal_True;							// don't continue
                 nErr = SCWARN_IMPORT_RANGE_OVERFLOW;	// warning message
             }
 
@@ -415,15 +415,15 @@ inline sal_Bool IsAsciiAlpha( sal_Unicode c )
 }
 
 void lcl_GetColumnTypes( ScDocShell& rDocShell,
-                            const ScRange& rDataRange, BOOL bHasFieldNames,
+                            const ScRange& rDataRange, sal_Bool bHasFieldNames,
                             rtl::OUString* pColNames, sal_Int32* pColTypes,
                             sal_Int32* pColLengths, sal_Int32* pColScales,
-                            BOOL& bHasMemo, CharSet eCharSet )
+                            sal_Bool& bHasMemo, CharSet eCharSet )
 {
     //	updating of column titles didn't work in 5.2 and isn't always wanted
     //	(saving normally shouldn't modify the document)
     //!	read flag from configuration
-    BOOL bUpdateTitles = FALSE;
+    sal_Bool bUpdateTitles = sal_False;
 
     ScDocument* pDoc = rDocShell.GetDocument();
     SvNumberFormatter* pNumFmt = pDoc->GetFormatTable();
@@ -440,8 +440,8 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
     SCROW nFirstDataRow = ( bHasFieldNames ? nFirstRow + 1 : nFirstRow );
     for ( SCCOL nCol = nFirstCol; nCol <= nLastCol; nCol++ )
     {
-        BOOL bTypeDefined = FALSE;
-        BOOL bPrecDefined = FALSE;
+        sal_Bool bTypeDefined = sal_False;
+        sal_Bool bPrecDefined = sal_False;
         sal_Int32 nFieldLen = 0;
         sal_Int32 nPrecision = 0;
         sal_Int32 nDbType = sdbc::DataType::SQLNULL;
@@ -463,30 +463,30 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
                     case 'L' :
                         nDbType = sdbc::DataType::BIT;
                         nFieldLen = 1;
-                        bTypeDefined = TRUE;
-                        bPrecDefined = TRUE;
+                        bTypeDefined = sal_True;
+                        bPrecDefined = sal_True;
                         break;
                     case 'D' :
                         nDbType = sdbc::DataType::DATE;
                         nFieldLen = 8;
-                        bTypeDefined = TRUE;
-                        bPrecDefined = TRUE;
+                        bTypeDefined = sal_True;
+                        bPrecDefined = sal_True;
                         break;
                     case 'M' :
                         nDbType = sdbc::DataType::LONGVARCHAR;
                         nFieldLen = 10;
-                        bTypeDefined = TRUE;
-                        bPrecDefined = TRUE;
-                        bHasMemo = TRUE;
+                        bTypeDefined = sal_True;
+                        bPrecDefined = sal_True;
+                        bHasMemo = sal_True;
                         break;
                     case 'C' :
                         nDbType = sdbc::DataType::VARCHAR;
-                        bTypeDefined = TRUE;
-                        bPrecDefined = TRUE;
+                        bTypeDefined = sal_True;
+                        bPrecDefined = sal_True;
                         break;
                     case 'N' :
                         nDbType = sdbc::DataType::DECIMAL;
-                        bTypeDefined = TRUE;
+                        bTypeDefined = sal_True;
                         break;
                 }
                 if ( bTypeDefined && !nFieldLen && nToken > 2 )
@@ -498,7 +498,7 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
                         if ( CharClass::isAsciiNumeric(aTmp) )
                         {
                             nPrecision = aTmp.ToInt32();
-                            bPrecDefined = TRUE;
+                            bPrecDefined = sal_True;
                         }
                     }
                 }
@@ -528,7 +528,7 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
             StrData* pStrData = new StrData( aFieldName );
             if ( !aFieldNamesCollection.Insert( pStrData ) )
             {	// doppelter Feldname, numerisch erweitern
-                USHORT nSub = 1;
+                sal_uInt16 nSub = 1;
                 String aFixPart( aFieldName );
                 do
                 {
@@ -584,8 +584,8 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
                 }
             }
         }
-        BOOL bSdbLenAdjusted = FALSE;
-        BOOL bSdbLenBad = FALSE;
+        sal_Bool bSdbLenAdjusted = sal_False;
+        sal_Bool bSdbLenBad = sal_False;
         // Feldlaenge
         if ( nDbType == sdbc::DataType::VARCHAR && !nFieldLen )
         {	// maximale Feldbreite bestimmen
@@ -627,9 +627,9 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
              //! CAVEAT! There is no way to define a numeric field with a length
              //! of 1 and no decimals!
             if ( nFieldLen == 1 && nPrecision == 0 )
-                bSdbLenBad = TRUE;
+                bSdbLenBad = sal_True;
             nFieldLen = SvDbaseConverter::ConvertPrecisionToOdbc( nFieldLen, nPrecision );
-            bSdbLenAdjusted = TRUE;
+            bSdbLenAdjusted = sal_True;
         }
         if ( nFieldLen > 254 )
         {
@@ -637,7 +637,7 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
             {	// zu lang fuer normales Textfeld => Memofeld
                 nDbType = sdbc::DataType::LONGVARCHAR;
                 nFieldLen = 10;
-                bHasMemo = TRUE;
+                bHasMemo = sal_True;
             }
             else
                 nFieldLen = 254;					// dumm gelaufen..
@@ -709,13 +709,13 @@ inline void lcl_getLongVarCharString( String& rString, ScBaseCell* pCell,
 }
 
 
-ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BOOL& bHasMemo )
+sal_uLong ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, sal_Bool& bHasMemo )
 {
     // remove the file so the dBase driver doesn't find an invalid file
     INetURLObject aDeleteObj( rFullFileName, INET_PROT_FILE );
     KillFile( aDeleteObj );
 
-    ULONG nErr = eERR_OK;
+    sal_uLong nErr = eERR_OK;
     uno::Any aAny;
 
     SCCOL nFirstCol, nLastCol;
@@ -731,11 +731,11 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
                                                     nLastRow - nFirstRow );
     SvNumberFormatter* pNumFmt = aDocument.GetFormatTable();
 
-    BOOL bHasFieldNames = TRUE;
+    sal_Bool bHasFieldNames = sal_True;
     for ( SCCOL nDocCol = nFirstCol; nDocCol <= nLastCol && bHasFieldNames; nDocCol++ )
     {	// nur Strings in erster Zeile => sind Feldnamen
         if ( !aDocument.HasStringData( nDocCol, nFirstRow, nTab ) )
-            bHasFieldNames = FALSE;
+            bHasFieldNames = sal_False;
     }
 
     long nColCount = nLastCol - nFirstCol + 1;
@@ -759,7 +759,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
     {
         uno::Reference<sdbc::XDriverManager> xDrvMan;
         uno::Reference<sdbc::XConnection> xConnection;
-        ULONG nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
+        sal_uLong nRet = lcl_getDBaseConnection(xDrvMan,xConnection,aTabName,rFullFileName,eCharSet);
         if ( !xConnection.is() || !xDrvMan.is() )
             return nRet;
         ::utl::DisposableComponent aConnectionHelper(xConnection);
@@ -928,7 +928,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
                         {
                             aDocument.GetValue( nDocCol, nDocRow, nTab, fVal );
                             // #39274# zwischen 0 Wert und 0 kein Wert unterscheiden
-                            BOOL bIsNull = (fVal == 0.0);
+                            sal_Bool bIsNull = (fVal == 0.0);
                             if ( bIsNull )
                                 bIsNull = !aDocument.HasValueData( nDocCol, nDocRow, nTab );
                             if ( bIsNull )
diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx
index 103889520..b2fbcd396 100644
--- a/sc/source/ui/docshell/editable.cxx
+++ b/sc/source/ui/docshell/editable.cxx
@@ -38,15 +38,15 @@
 //------------------------------------------------------------------
 
 ScEditableTester::ScEditableTester() :
-    bIsEditable( TRUE ),
-    bOnlyMatrix( TRUE )
+    bIsEditable( sal_True ),
+    bOnlyMatrix( sal_True )
 {
 }
 
 ScEditableTester::ScEditableTester( ScDocument* pDoc, SCTAB nTab,
                         SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) :
-    bIsEditable( TRUE ),
-    bOnlyMatrix( TRUE )
+    bIsEditable( sal_True ),
+    bOnlyMatrix( sal_True )
 {
     TestBlock( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
 }
@@ -54,29 +54,29 @@ ScEditableTester::ScEditableTester( ScDocument* pDoc, SCTAB nTab,
 ScEditableTester::ScEditableTester( ScDocument* pDoc, 
                         SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                         const ScMarkData& rMark ) :
-    bIsEditable( TRUE ),
-    bOnlyMatrix( TRUE )
+    bIsEditable( sal_True ),
+    bOnlyMatrix( sal_True )
 {
     TestSelectedBlock( pDoc, nStartCol, nStartRow, nEndCol, nEndRow, rMark );
 }
 
 ScEditableTester::ScEditableTester( ScDocument* pDoc, const ScRange& rRange ) :
-    bIsEditable( TRUE ),
-    bOnlyMatrix( TRUE )
+    bIsEditable( sal_True ),
+    bOnlyMatrix( sal_True )
 {
     TestRange( pDoc, rRange );
 }
 
 ScEditableTester::ScEditableTester( ScDocument* pDoc, const ScMarkData& rMark ) :
-    bIsEditable( TRUE ),
-    bOnlyMatrix( TRUE )
+    bIsEditable( sal_True ),
+    bOnlyMatrix( sal_True )
 {
     TestSelection( pDoc, rMark );
 }
 
 ScEditableTester::ScEditableTester( ScViewFunc* pView ) :
-    bIsEditable( TRUE ),
-    bOnlyMatrix( TRUE )
+    bIsEditable( sal_True ),
+    bOnlyMatrix( sal_True )
 {
     TestView( pView );
 }
@@ -88,12 +88,12 @@ void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab,
 {
     if ( bIsEditable || bOnlyMatrix )
     {
-        BOOL bThisMatrix;
+        sal_Bool bThisMatrix;
         if ( !pDoc->IsBlockEditable( nTab, nStartCol, nStartRow, nEndCol, nEndRow, &bThisMatrix ) )
         {
-            bIsEditable = FALSE;
+            bIsEditable = sal_False;
             if ( !bThisMatrix )
-                bOnlyMatrix = FALSE;
+                bOnlyMatrix = sal_False;
         }
     }
 }
@@ -124,12 +124,12 @@ void ScEditableTester::TestSelection( ScDocument* pDoc, const ScMarkData& rMark
 {
     if ( bIsEditable || bOnlyMatrix )
     {
-        BOOL bThisMatrix;
+        sal_Bool bThisMatrix;
         if ( !pDoc->IsSelectionEditable( rMark, &bThisMatrix ) )
         {
-            bIsEditable = FALSE;
+            bIsEditable = sal_False;
             if ( !bThisMatrix )
-                bOnlyMatrix = FALSE;
+                bOnlyMatrix = sal_False;
         }
     }
 }
@@ -138,19 +138,19 @@ void ScEditableTester::TestView( ScViewFunc* pView )
 {
     if ( bIsEditable || bOnlyMatrix )
     {
-        BOOL bThisMatrix;
+        sal_Bool bThisMatrix;
         if ( !pView->SelectionEditable( &bThisMatrix ) )
         {
-            bIsEditable = FALSE;
+            bIsEditable = sal_False;
             if ( !bThisMatrix )
-                bOnlyMatrix = FALSE;
+                bOnlyMatrix = sal_False;
         }
     }
 }
 
 //------------------------------------------------------------------
 
-USHORT ScEditableTester::GetMessageId() const
+sal_uInt16 ScEditableTester::GetMessageId() const
 {
     if (bIsEditable)
         return 0;
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 269c3d585..d6ce4a04c 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1339,7 +1339,7 @@ static FormulaToken* lcl_convertToToken(ScBaseCell* pCell)
         case CELLTYPE_FORMULA:
         {
             ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
-            USHORT nError = pFCell->GetErrCode();
+            sal_uInt16 nError = pFCell->GetErrCode();
             if (nError)
                 return new FormulaErrorToken( nError);
             else if (pFCell->IsValue())
@@ -1392,7 +1392,8 @@ static ScTokenArray* lcl_convertToTokenArray(ScDocument* pSrcDoc, ScRange& rRang
         // Only loop within the data area.
         SCCOL nDataCol1 = nCol1, nDataCol2 = nCol2;
         SCROW nDataRow1 = nRow1, nDataRow2 = nRow2;
-        if (!pSrcDoc->ShrinkToDataArea(nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2))
+        bool bShrunk;
+        if (!pSrcDoc->ShrinkToUsedDataArea( bShrunk, nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2, false))
             // no data within specified range.
             continue;
 
@@ -1442,7 +1443,7 @@ static ScTokenArray* lcl_convertToTokenArray(ScDocument* pSrcDoc, ScRange& rRang
                         case CELLTYPE_FORMULA:
                         {
                             ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
-                            USHORT nError = pFCell->GetErrCode();
+                            sal_uInt16 nError = pFCell->GetErrCode();
                             if (nError)
                                 xMat->PutDouble( CreateDoubleError( nError), nC, nR);
                             else if (pFCell->IsValue())
@@ -1708,8 +1709,8 @@ ScExternalRefCache::TokenRef ScExternalRefManager::getSingleRefToken(
 
     SCCOL nDataCol1 = 0, nDataCol2 = MAXCOL;
     SCROW nDataRow1 = 0, nDataRow2 = MAXROW;
-    pSrcDoc->ShrinkToDataArea(nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2);
-    if (rCell.Col() < nDataCol1 || nDataCol2 < rCell.Col() || rCell.Row() < nDataRow1 || nDataRow2 < rCell.Row())
+    bool bData = pSrcDoc->ShrinkToDataArea(nTab, nDataCol1, nDataRow1, nDataCol2, nDataRow2);
+    if (!bData || rCell.Col() < nDataCol1 || nDataCol2 < rCell.Col() || rCell.Row() < nDataRow1 || nDataRow2 < rCell.Row())
     {
         // requested cell is outside the data area.  Don't even bother caching
         // this data, but add it to the cached range to prevent accessing the
@@ -1846,7 +1847,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getRangeNameTokens(sal_u
 
     ScRangeName* pExtNames = pSrcDoc->GetRangeName();
     String aUpperName = ScGlobal::pCharClass->upper(rName);
-    USHORT n;
+    sal_uInt16 n;
     bool bRes = pExtNames->SearchNameUpper(aUpperName, n);
     if (!bRes)
         return ScExternalRefCache::TokenArrayRef();
@@ -2045,7 +2046,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, Stri
         pSet->Put(SfxStringItem(SID_FILE_FILTEROPTIONS, aOptions));
 
     // make medium hidden to prevent assertion from progress bar
-    pSet->Put( SfxBoolItem( SID_HIDDEN, TRUE ) );
+    pSet->Put( SfxBoolItem( SID_HIDDEN, sal_True ) );
 
     auto_ptr<SfxMedium> pMedium(new SfxMedium(aFile, STREAM_STD_READ, false, pFilter, pSet));
     if (pMedium->GetError() != ERRCODE_NONE)
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index ac9788034..98f2453ff 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -112,9 +112,9 @@ enum SylkVersion
 ScImportExport::ScImportExport( ScDocument* p )
     : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
       nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), 
-      bFormulas( FALSE ), bIncludeFiltered( TRUE ),
-      bAll( TRUE ), bSingle( TRUE ), bUndo( FALSE ),
-      bOverflow( FALSE ), mbApi( true ), mExportTextOptions()
+      bFormulas( sal_False ), bIncludeFiltered( sal_True ),
+      bAll( sal_True ), bSingle( sal_True ), bUndo( sal_False ),
+      bOverflow( sal_False ), mbApi( true ), mExportTextOptions()
 {
     pUndoDoc = NULL;
     pExtOptions = NULL;
@@ -127,9 +127,9 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
     : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
       aRange( rPt ),
       nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ), 
-      bFormulas( FALSE ), bIncludeFiltered( TRUE ),
-      bAll( FALSE ), bSingle( TRUE ), bUndo( BOOL( pDocSh != NULL ) ),
-      bOverflow( FALSE ), mbApi( true ), mExportTextOptions()
+      bFormulas( sal_False ), bIncludeFiltered( sal_True ),
+      bAll( sal_False ), bSingle( sal_True ), bUndo( sal_Bool( pDocSh != NULL ) ),
+      bOverflow( sal_False ), mbApi( true ), mExportTextOptions()
 {
     pUndoDoc = NULL;
     pExtOptions = NULL;
@@ -137,15 +137,15 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
 
 
 //	ctor with a range is only used for export
-//!	ctor with a string (and bSingle=TRUE) is also used for DdeSetData
+//!	ctor with a string (and bSingle=sal_True) is also used for DdeSetData
 
 ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
     : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
       aRange( r ),
       nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
-      bFormulas( FALSE ), bIncludeFiltered( TRUE ),
-      bAll( FALSE ), bSingle( FALSE ), bUndo( BOOL( pDocSh != NULL ) ),
-      bOverflow( FALSE ), mbApi( true ), mExportTextOptions()
+      bFormulas( sal_False ), bIncludeFiltered( sal_True ),
+      bAll( sal_False ), bSingle( sal_False ), bUndo( sal_Bool( pDocSh != NULL ) ),
+      bOverflow( sal_False ), mbApi( true ), mExportTextOptions()
 {
     pUndoDoc = NULL;
     pExtOptions = NULL;
@@ -160,9 +160,9 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
 ScImportExport::ScImportExport( ScDocument* p, const String& rPos )
     : pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
       nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
-      bFormulas( FALSE ), bIncludeFiltered( TRUE ),
-      bAll( FALSE ), bSingle( TRUE ), bUndo( BOOL( pDocSh != NULL ) ),
-      bOverflow( FALSE ), mbApi( true ), mExportTextOptions()
+      bFormulas( sal_False ), bIncludeFiltered( sal_True ),
+      bAll( sal_False ), bSingle( sal_True ), bUndo( sal_Bool( pDocSh != NULL ) ),
+      bOverflow( sal_False ), mbApi( true ), mExportTextOptions()
 {
     pUndoDoc = NULL;
     pExtOptions = NULL;
@@ -174,7 +174,7 @@ ScImportExport::ScImportExport( ScDocument* p, const String& rPos )
     ScRangeName* pRange = pDoc->GetRangeName();
     if( pRange )
     {
-        USHORT nPos;
+        sal_uInt16 nPos;
         if( pRange->SearchName( aPos, nPos ) )
         {
             ScRangeData* pData = (*pRange)[ nPos ];
@@ -187,12 +187,12 @@ ScImportExport::ScImportExport( ScDocument* p, const String& rPos )
     formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
     // Bereich?
     if( aRange.Parse( aPos, pDoc, eConv ) & SCA_VALID )
-        bSingle = FALSE;
+        bSingle = sal_False;
     // Zelle?
     else if( aRange.aStart.Parse( aPos, pDoc, eConv ) & SCA_VALID )
         aRange.aEnd = aRange.aStart;
     else
-        bAll = TRUE;
+        bAll = sal_True;
 }
 
 
@@ -217,9 +217,9 @@ void ScImportExport::SetExtOptions( const ScAsciiOptions& rOpt )
 }
 
 
-BOOL ScImportExport::IsFormatSupported( ULONG nFormat )
+sal_Bool ScImportExport::IsFormatSupported( sal_uLong nFormat )
 {
-    return BOOL( nFormat == FORMAT_STRING
+    return sal_Bool( nFormat == FORMAT_STRING
               || nFormat == SOT_FORMATSTR_ID_SYLK
               || nFormat == SOT_FORMATSTR_ID_LINK
               || nFormat == SOT_FORMATSTR_ID_HTML
@@ -233,7 +233,7 @@ BOOL ScImportExport::IsFormatSupported( ULONG nFormat )
 // Vorbereitung fuer Undo: Undo-Dokument erzeugen
 
 
-BOOL ScImportExport::StartPaste()
+sal_Bool ScImportExport::StartPaste()
 {
     if ( !bAll )
     {
@@ -243,16 +243,16 @@ BOOL ScImportExport::StartPaste()
             InfoBox aInfoBox(Application::GetDefDialogParent(),
                                 ScGlobal::GetRscString( aTester.GetMessageId() ) );
             aInfoBox.Execute();
-            return FALSE;
+            return sal_False;
         }
     }
     if( bUndo && pDocSh && pDoc->IsUndoEnabled())
     {
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         pUndoDoc->InitUndo( pDoc, aRange.aStart.Tab(), aRange.aEnd.Tab() );
-        pDoc->CopyToDocument( aRange, IDF_ALL | IDF_NOCAPTIONS, FALSE, pUndoDoc );
+        pDoc->CopyToDocument( aRange, IDF_ALL | IDF_NOCAPTIONS, sal_False, pUndoDoc );
     }
-    return TRUE;
+    return sal_True;
 }
 
 // Nachbereitung Insert: Undo/Redo-Aktionen erzeugen, Invalidate/Repaint
@@ -260,14 +260,14 @@ BOOL ScImportExport::StartPaste()
 
 void ScImportExport::EndPaste()
 {
-    BOOL bHeight = pDocSh && pDocSh->AdjustRowHeight(
+    sal_Bool bHeight = pDocSh && pDocSh->AdjustRowHeight(
                     aRange.aStart.Row(), aRange.aEnd.Row(), aRange.aStart.Tab() );
 
     if( pUndoDoc && pDoc->IsUndoEnabled() )
     {
         ScDocument* pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
         pRedoDoc->InitUndo( pDoc, aRange.aStart.Tab(), aRange.aEnd.Tab() );
-        pDoc->CopyToDocument( aRange, IDF_ALL | IDF_NOCAPTIONS, FALSE, pRedoDoc );
+        pDoc->CopyToDocument( aRange, IDF_ALL | IDF_NOCAPTIONS, sal_False, pRedoDoc );
         ScMarkData aDestMark;
         aDestMark.SelectOneTable( aRange.aStart.Tab() );
         pDocSh->GetUndoManager()->AddUndoAction(
@@ -293,9 +293,9 @@ void ScImportExport::EndPaste()
 
 
 #if 0
-BOOL ScImportExport::ImportData( SvData& rData )
+sal_Bool ScImportExport::ImportData( SvData& rData )
 {
-    ULONG nFmt = rData.GetFormat();
+    sal_uLong nFmt = rData.GetFormat();
     if ( nFmt == SOT_FORMATSTR_ID_HTML_SIMPLE )
     {
         MSE40HTMLClipFormatObj aMSE40ClpObj;
@@ -304,12 +304,12 @@ BOOL ScImportExport::ImportData( SvData& rData )
             SvStream* pStream = aMSE40ClpObj.GetStream();
             return ImportStream( *pStream, nFmt );
         }
-        return FALSE;
+        return sal_False;
     }
     else
     {
         void* pMem;
-        ULONG nSize = rData.GetMinMemorySize();
+        sal_uLong nSize = rData.GetMinMemorySize();
         rData.GetData( &pMem, TRANSFER_REFERENCE );
         if( nFmt == FORMAT_STRING
                  || nFmt == FORMAT_RTF
@@ -336,14 +336,14 @@ BOOL ScImportExport::ImportData( SvData& rData )
 
 #endif
 
-BOOL ScImportExport::ImportData( const String& /* rMimeType */,
+sal_Bool ScImportExport::ImportData( const String& /* rMimeType */,
                      const ::com::sun::star::uno::Any & /* rValue */ )
 {
     DBG_ASSERT( !this, "Implementation is missing" );
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScImportExport::ExportData( const String& rMimeType,
+sal_Bool ScImportExport::ExportData( const String& rMimeType,
                                  ::com::sun::star::uno::Any & rValue )
 {
     SvMemoryStream aStrm;
@@ -351,17 +351,17 @@ BOOL ScImportExport::ExportData( const String& rMimeType,
     if( ExportStream( aStrm, String(),
                 SotExchange::GetFormatIdFromMimeType( rMimeType ) ))
     {
-        aStrm << (BYTE) 0;
+        aStrm << (sal_uInt8) 0;
         rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >(
                                         (sal_Int8*)aStrm.GetData(),
                                         aStrm.Seek( STREAM_SEEK_TO_END ) );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScImportExport::ImportString( const ::rtl::OUString& rText, ULONG nFmt )
+sal_Bool ScImportExport::ImportString( const ::rtl::OUString& rText, sal_uLong nFmt )
 {
     switch ( nFmt )
     {
@@ -386,14 +386,14 @@ BOOL ScImportExport::ImportString( const ::rtl::OUString& rText, ULONG nFmt )
 }
 
 
-BOOL ScImportExport::ExportString( ::rtl::OUString& rText, ULONG nFmt )
+sal_Bool ScImportExport::ExportString( ::rtl::OUString& rText, sal_uLong nFmt )
 {
     DBG_ASSERT( nFmt == FORMAT_STRING, "ScImportExport::ExportString: Unicode not supported for other formats than FORMAT_STRING" );
     if ( nFmt != FORMAT_STRING )
     {
         rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
         ByteString aTmp;
-        BOOL bOk = ExportByteString( aTmp, eEnc, nFmt );
+        sal_Bool bOk = ExportByteString( aTmp, eEnc, nFmt );
         rText = UniString( aTmp, eEnc );
         return bOk;
     }
@@ -409,16 +409,16 @@ BOOL ScImportExport::ExportString( ::rtl::OUString& rText, ULONG nFmt )
         aStrm.Seek( STREAM_SEEK_TO_END );
 
         rText = rtl::OUString( (const sal_Unicode*) aStrm.GetData() );
-        return TRUE;
+        return sal_True;
     }
     rText = rtl::OUString();
-    return FALSE;
+    return sal_False;
 
     // ExportStream must handle RTL_TEXTENCODING_UNICODE
 }
 
 
-BOOL ScImportExport::ExportByteString( ByteString& rText, rtl_TextEncoding eEnc, ULONG nFmt )
+sal_Bool ScImportExport::ExportByteString( ByteString& rText, rtl_TextEncoding eEnc, sal_uLong nFmt )
 {
     DBG_ASSERT( eEnc != RTL_TEXTENCODING_UNICODE, "ScImportExport::ExportByteString: Unicode not supported" );
     if ( eEnc == RTL_TEXTENCODING_UNICODE )
@@ -436,74 +436,74 @@ BOOL ScImportExport::ExportByteString( ByteString& rText, rtl_TextEncoding eEnc,
         aStrm << (sal_Char) 0;
         aStrm.Seek( STREAM_SEEK_TO_END );
         // Sicherheits-Check:
-        if( aStrm.Tell() <= (ULONG) STRING_MAXLEN )
+        if( aStrm.Tell() <= (sal_uLong) STRING_MAXLEN )
         {
             rText = (const sal_Char*) aStrm.GetData();
-            return TRUE;
+            return sal_True;
         }
     }
     rText.Erase();
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScImportExport::ImportStream( SvStream& rStrm, const String& rBaseURL, ULONG nFmt )
+sal_Bool ScImportExport::ImportStream( SvStream& rStrm, const String& rBaseURL, sal_uLong nFmt )
 {
     if( nFmt == FORMAT_STRING )
     {
         if( ExtText2Doc( rStrm ) )		// pExtOptions auswerten
-            return TRUE;
+            return sal_True;
     }
     if( nFmt == SOT_FORMATSTR_ID_SYLK )
     {
         if( Sylk2Doc( rStrm ) )
-            return TRUE;
+            return sal_True;
     }
     if( nFmt == SOT_FORMATSTR_ID_DIF )
     {
         if( Dif2Doc( rStrm ) )
-            return TRUE;
+            return sal_True;
     }
     if( nFmt == FORMAT_RTF )
     {
         if( RTF2Doc( rStrm, rBaseURL ) )
-            return TRUE;
+            return sal_True;
     }
     if( nFmt == SOT_FORMATSTR_ID_LINK )
-        return TRUE;			// Link-Import?
+        return sal_True;			// Link-Import?
     if ( nFmt == SOT_FORMATSTR_ID_HTML )
     {
         if( HTML2Doc( rStrm, rBaseURL ) )
-            return TRUE;
+            return sal_True;
     }
     if ( nFmt == SOT_FORMATSTR_ID_HTML_SIMPLE )
     {
         MSE40HTMLClipFormatObj aMSE40ClpObj;				// needed to skip the header data
         SvStream* pHTML = aMSE40ClpObj.IsValid( rStrm );
         if ( pHTML && HTML2Doc( *pHTML, rBaseURL ) )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
-BOOL ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, ULONG nFmt )
+sal_Bool ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, sal_uLong nFmt )
 {
     if( nFmt == FORMAT_STRING )
     {
         if( Doc2Text( rStrm ) )
-            return TRUE;
+            return sal_True;
     }
     if( nFmt == SOT_FORMATSTR_ID_SYLK )
     {
         if( Doc2Sylk( rStrm ) )
-            return TRUE;
+            return sal_True;
     }
     if( nFmt == SOT_FORMATSTR_ID_DIF )
     {
         if( Doc2Dif( rStrm ) )
-            return TRUE;
+            return sal_True;
     }
     if( nFmt == SOT_FORMATSTR_ID_LINK && !bAll )
     {
@@ -521,7 +521,7 @@ BOOL ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, ULON
         if( aDocName.Len() )
         {
             String aRefName;
-            USHORT nFlags = SCA_VALID | SCA_TAB_3D;
+            sal_uInt16 nFlags = SCA_VALID | SCA_TAB_3D;
             if( bSingle )
                 aRange.aStart.Format( aRefName, nFlags, pDoc, pDoc->GetAddressConvention() );
             else
@@ -532,33 +532,33 @@ BOOL ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, ULON
             }
             String aAppName = Application::GetAppName();
 
-            WriteUnicodeOrByteString( rStrm, aAppName, TRUE );
-            WriteUnicodeOrByteString( rStrm, aDocName, TRUE );
-            WriteUnicodeOrByteString( rStrm, aRefName, TRUE );
+            WriteUnicodeOrByteString( rStrm, aAppName, sal_True );
+            WriteUnicodeOrByteString( rStrm, aDocName, sal_True );
+            WriteUnicodeOrByteString( rStrm, aRefName, sal_True );
             if ( rStrm.GetStreamCharSet() == RTL_TEXTENCODING_UNICODE )
                 rStrm << sal_Unicode(0);
             else
                 rStrm << sal_Char(0);
-            return BOOL( rStrm.GetError() == SVSTREAM_OK );
+            return sal_Bool( rStrm.GetError() == SVSTREAM_OK );
         }
     }
     if( nFmt == SOT_FORMATSTR_ID_HTML )
     {
         if( Doc2HTML( rStrm, rBaseURL ) )
-            return TRUE;
+            return sal_True;
     }
     if( nFmt == FORMAT_RTF )
     {
         if( Doc2RTF( rStrm ) )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
 //static
-void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero )
+void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, sal_Bool bZero )
 {
     rtl_TextEncoding eEnc = rStrm.GetStreamCharSet();
     if ( eEnc == RTL_TEXTENCODING_UNICODE )
@@ -622,10 +622,10 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString,
             sal_Unicode cStr, DoubledQuoteMode eMode )
 {
     p++;	//! jump over opening quote
-    BOOL bCont;
+    sal_Bool bCont;
     do
     {
-        bCont = FALSE;
+        bCont = sal_False;
         const sal_Unicode* p0 = p;
         for( ;; )
         {
@@ -643,7 +643,7 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString,
                     break;
                     case DQM_ESCAPE :
                         p++;			// one for us (breaking for-loop)
-                        bCont = TRUE;	// and more
+                        bCont = sal_True;	// and more
                     break;
                     case DQM_CONCAT :
                         if ( p0+1 < p )
@@ -817,17 +817,17 @@ inline void lcl_WriteSimpleString( SvStream& rStrm, const String& rString )
 //////////////////////////////////////////////////////////////////////////////
 
 
-BOOL ScImportExport::Text2Doc( SvStream& rStrm )
+sal_Bool ScImportExport::Text2Doc( SvStream& rStrm )
 {
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
 
     SCCOL nStartCol = aRange.aStart.Col();
     SCROW nStartRow = aRange.aStart.Row();
     SCCOL nEndCol = aRange.aEnd.Col();
     SCROW nEndRow = aRange.aEnd.Row();
-    ULONG  nOldPos = rStrm.Tell();
+    sal_uLong  nOldPos = rStrm.Tell();
     rStrm.StartReadingUnicodeText( rStrm.GetStreamCharSet() );
-    BOOL   bData = BOOL( !bSingle );
+    sal_Bool   bData = sal_Bool( !bSingle );
     if( !bSingle)
         bOk = StartPaste();
 
@@ -875,7 +875,7 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm )
                         pDoc->SetString( nCol, nRow, aRange.aStart.Tab(), aCell );
                 }
                 else							// zuviele Spalten/Zeilen
-                    bOverflow = TRUE;			// beim Import Warnung ausgeben
+                    bOverflow = sal_True;			// beim Import Warnung ausgeben
                 ++nCol;
             }
             ++nRow;
@@ -886,7 +886,7 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm )
             aRange.aEnd.SetCol( nEndCol );
             aRange.aEnd.SetRow( nEndRow );
             bOk = StartPaste();
-            bData = TRUE;
+            bData = sal_True;
         }
         else
             break;
@@ -902,7 +902,7 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm )
 
 
 static bool lcl_PutString( 
-    ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rStr, BYTE nColFormat,
+    ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rStr, sal_uInt8 nColFormat,
     SvNumberFormatter* pFormatter, bool bDetectNumFormat,
     ::utl::TransliterationWrapper& rTransliteration, CalendarWrapper& rCalendar,
     ::utl::TransliterationWrapper* pSecondTransliteration, CalendarWrapper* pSecondCalendar )
@@ -934,12 +934,12 @@ static bool lcl_PutString(
     }
     else if ( nColFormat != SC_COL_STANDARD )					// Datumsformate
     {
-        const USHORT nMaxNumberParts = 7;   // Y-M-D h:m:s.t
+        const sal_uInt16 nMaxNumberParts = 7;   // Y-M-D h:m:s.t
         xub_StrLen nLen = rStr.Len();
         xub_StrLen nStart[nMaxNumberParts];
         xub_StrLen nEnd[nMaxNumberParts];
 
-        USHORT nDP, nMP, nYP;
+        sal_uInt16 nDP, nMP, nYP;
         switch ( nColFormat )
         {
             case SC_COL_YMD: nDP = 2; nMP = 1; nYP = 0; break;
@@ -948,28 +948,28 @@ static bool lcl_PutString(
             default:         nDP = 0; nMP = 1; nYP = 2; break;
         }
 
-        USHORT nFound = 0;
-        BOOL bInNum = FALSE;
+        sal_uInt16 nFound = 0;
+        sal_Bool bInNum = sal_False;
         for ( xub_StrLen nPos=0; nPos<nLen && (bInNum ||
                     nFound<nMaxNumberParts); nPos++ )
         {
             if (bInNum && nFound == 3 && nColFormat == SC_COL_YMD &&
                     nPos <= nStart[nFound]+2 && rStr.GetChar(nPos) == 'T')
-                bInNum = FALSE;     // ISO-8601: YYYY-MM-DDThh:mm...
+                bInNum = sal_False;     // ISO-8601: YYYY-MM-DDThh:mm...
             else if ((((!bInNum && nFound==nMP) || (bInNum && nFound==nMP+1))
                         && ScGlobal::pCharClass->isLetterNumeric( rStr, nPos))
                     || ScGlobal::pCharClass->isDigit( rStr, nPos))
             {
                 if (!bInNum)
                 {
-                    bInNum = TRUE;
+                    bInNum = sal_True;
                     nStart[nFound] = nPos;
                     ++nFound;
                 }
                 nEnd[nFound-1] = nPos;
             }
             else
-                bInNum = FALSE;
+                bInNum = sal_False;
         }
 
         if ( nFound == 1 )
@@ -986,13 +986,13 @@ static bool lcl_PutString(
                 //	8 digits: 4 for year, 2 each for day and month
                 //	5 or 7 digits: first field is shortened by 1
 
-                BOOL bLongYear = ( nDateLen >= 7 );
-                BOOL bShortFirst = ( nDateLen == 5 || nDateLen == 7 );
+                sal_Bool bLongYear = ( nDateLen >= 7 );
+                sal_Bool bShortFirst = ( nDateLen == 5 || nDateLen == 7 );
 
-                USHORT nFieldStart = nDateStart;
-                for (USHORT nPos=0; nPos<3; nPos++)
+                sal_uInt16 nFieldStart = nDateStart;
+                for (sal_uInt16 nPos=0; nPos<3; nPos++)
                 {
-                    USHORT nFieldEnd = nFieldStart + 1;		// default: 2 digits
+                    sal_uInt16 nFieldEnd = nFieldStart + 1;		// default: 2 digits
                     if ( bLongYear && nPos == nYP )
                         nFieldEnd += 2;						// 2 extra digits for long year
                     if ( bShortFirst && nPos == 0 )
@@ -1009,9 +1009,9 @@ static bool lcl_PutString(
         if ( nFound >= 3 )
         {
             using namespace ::com::sun::star;
-            BOOL bSecondCal = FALSE;
-            USHORT nDay  = (USHORT) rStr.Copy( nStart[nDP], nEnd[nDP]+1-nStart[nDP] ).ToInt32();
-            USHORT nYear = (USHORT) rStr.Copy( nStart[nYP], nEnd[nYP]+1-nStart[nYP] ).ToInt32();
+            sal_Bool bSecondCal = sal_False;
+            sal_uInt16 nDay  = (sal_uInt16) rStr.Copy( nStart[nDP], nEnd[nDP]+1-nStart[nDP] ).ToInt32();
+            sal_uInt16 nYear = (sal_uInt16) rStr.Copy( nStart[nYP], nEnd[nYP]+1-nStart[nYP] ).ToInt32();
             String aMStr = rStr.Copy( nStart[nMP], nEnd[nMP]+1-nStart[nMP] );
             sal_Int16 nMonth = (sal_Int16) aMStr.ToInt32();
             if (!nMonth)
@@ -1047,14 +1047,14 @@ static bool lcl_PutString(
                              pSecondTransliteration->isEqual( aMStr, xMonths[i].AbbrevName ) )
                         {
                             nMonth = sal::static_int_cast<sal_Int16>( i+1 );
-                            bSecondCal = TRUE;
+                            bSecondCal = sal_True;
                         }
                         else if ( i == 8 && pSecondTransliteration->isEqual(
                                     aMStr, aSepShortened ) )
                         {   // #102136# correct English abbreviation is SEPT,
                             // but data mostly contains SEP only
                             nMonth = sal::static_int_cast<sal_Int16>( i+1 );
-                            bSecondCal = TRUE;
+                            bSecondCal = sal_True;
                         }
                     }
                 }
@@ -1110,12 +1110,12 @@ static bool lcl_PutString(
                     LanguageType eDocLang = eLatin;     //! which language for date formats?
 
                     short nType = (nFound > 3 ? NUMBERFORMAT_DATETIME : NUMBERFORMAT_DATE);
-                    ULONG nFormat = pDocFormatter->GetStandardFormat( nType, eDocLang );
+                    sal_uLong nFormat = pDocFormatter->GetStandardFormat( nType, eDocLang );
                     // maybe there is a special format including seconds or milliseconds
                     if (nFound > 5)
                         nFormat = pDocFormatter->GetStandardFormat( fDays, nFormat, nType, eDocLang);
 
-                    pDoc->PutCell( nCol, nRow, nTab, new ScValueCell(fDays), nFormat, FALSE );
+                    pDoc->PutCell( nCol, nRow, nTab, new ScValueCell(fDays), nFormat, sal_False );
 
                     return bMultiLine;     // success
                 }
@@ -1156,33 +1156,33 @@ String lcl_GetFixed( const String& rLine, xub_StrLen nStart, xub_StrLen nNext, b
         return rLine.Copy(nStart, nSpace-nStart);
 }
 
-BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
+sal_Bool ScImportExport::ExtText2Doc( SvStream& rStrm )
 {
     if (!pExtOptions)
         return Text2Doc( rStrm );
 
-    ULONG nOldPos = rStrm.Tell();
+    sal_uLong nOldPos = rStrm.Tell();
     rStrm.Seek( STREAM_SEEK_TO_END );
     ::std::auto_ptr<ScProgress> xProgress( new ScProgress( pDocSh,
             ScGlobal::GetRscString( STR_LOAD_DOC ), rStrm.Tell() - nOldPos ));
     rStrm.Seek( nOldPos );
     rStrm.StartReadingUnicodeText( rStrm.GetStreamCharSet() );
 
-    BOOL bOld = ScColumn::bDoubleAlloc;
-    ScColumn::bDoubleAlloc = TRUE;
+    sal_Bool bOld = ScColumn::bDoubleAlloc;
+    ScColumn::bDoubleAlloc = sal_True;
 
     SCCOL nStartCol = aRange.aStart.Col();
     SCCOL nEndCol = aRange.aEnd.Col();
     SCROW nStartRow = aRange.aStart.Row();
     SCTAB nTab = aRange.aStart.Tab();
 
-    BOOL	bFixed			= pExtOptions->IsFixedLen();
+    sal_Bool	bFixed			= pExtOptions->IsFixedLen();
     const String& rSeps     = pExtOptions->GetFieldSeps();
     const sal_Unicode* pSeps = rSeps.GetBuffer();
-    BOOL	bMerge			= pExtOptions->IsMergeSeps();
-    USHORT	nInfoCount		= pExtOptions->GetInfoCount();
+    sal_Bool	bMerge			= pExtOptions->IsMergeSeps();
+    sal_uInt16	nInfoCount		= pExtOptions->GetInfoCount();
     const xub_StrLen* pColStart = pExtOptions->GetColStart();
-    const BYTE* pColFormat  = pExtOptions->GetColFormat();
+    const sal_uInt8* pColFormat  = pExtOptions->GetColFormat();
     long nSkipLines	= pExtOptions->GetStartRow();
 
     LanguageType eDocLang = pExtOptions->GetLanguage();
@@ -1209,7 +1209,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
     }
 
     String aLine, aCell;
-    USHORT i;
+    sal_uInt16 i;
     SCROW nRow = nStartRow;
 
     while(--nSkipLines>0)
@@ -1231,7 +1231,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
 
     bool bQuotedAsText = pExtOptions && pExtOptions->IsQuotedAsText();
 
-    ULONG nOriginalStreamPos = rStrm.Tell();
+    sal_uLong nOriginalStreamPos = rStrm.Tell();
  
     do
     {
@@ -1252,11 +1252,11 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
                 // SC_COL_SKIP.
                 for ( i=0; i<nInfoCount && nCol <= MAXCOL+1; i++ )
                 {
-                    BYTE nFmt = pColFormat[i];
+                    sal_uInt8 nFmt = pColFormat[i];
                     if (nFmt != SC_COL_SKIP)        // sonst auch nCol nicht hochzaehlen
                     {
                         if (nCol > MAXCOL)
-                            bOverflow = TRUE;       // display warning on import
+                            bOverflow = sal_True;       // display warning on import
                         else if (!bDetermineRange)
                         {
                             xub_StrLen nStart = pColStart[i];
@@ -1278,7 +1278,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
             else						//	Nach Trennzeichen suchen
             {
                 SCCOL nSourceCol = 0;
-                USHORT nInfoStart = 0;
+                sal_uInt16 nInfoStart = 0;
                 const sal_Unicode* p = aLine.GetBuffer();
                 // Yes, the check is nCol<=MAXCOL+1, +1 because it is only an
                 // overflow if there is really data following to be put behind
@@ -1289,7 +1289,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
                     bool bIsQuoted = false;
                     p = ScImportExport::ScanNextFieldFromString( p, aCell, cStr, pSeps, bMerge, bIsQuoted );
 
-                    BYTE nFmt = SC_COL_STANDARD;
+                    sal_uInt8 nFmt = SC_COL_STANDARD;
                     for ( i=nInfoStart; i<nInfoCount; i++ )
                     {
                         if ( pColStart[i] == nSourceCol + 1 )		// pColStart ist 1-basiert
@@ -1302,7 +1302,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
                     if ( nFmt != SC_COL_SKIP )
                     {
                         if (nCol > MAXCOL)
-                            bOverflow = TRUE;       // display warning on import
+                            bOverflow = sal_True;       // display warning on import
                         else if (!bDetermineRange)
                         {
                             if (bIsQuoted && bQuotedAsText)
@@ -1331,7 +1331,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
             ++nRow;
             if ( nRow > MAXROW )
             {
-                bOverflow = TRUE;       // display warning on import
+                bOverflow = sal_True;       // display warning on import
                 break;  // for
             }
         }
@@ -1354,7 +1354,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
                 {
                     delete pEnglishTransliteration;
                     delete pEnglishCalendar;
-                    return FALSE;
+                    return sal_False;
                 }
             }
 
@@ -1363,7 +1363,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
             if (!StartPaste())
             {
                 EndPaste();
-                return FALSE;
+                return sal_False;
             }
         }
 
@@ -1380,7 +1380,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
     if (bRangeIsDetermined)
         EndPaste();
 
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1426,7 +1426,7 @@ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p
         //
 
 
-BOOL ScImportExport::Doc2Text( SvStream& rStrm )
+sal_Bool ScImportExport::Doc2Text( SvStream& rStrm )
 {
     SCCOL nCol;
     SCROW nRow;
@@ -1451,7 +1451,7 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm )
                     {
                         if (bFormulas)
                         {
-                            pDoc->GetFormula( nCol, nRow, aRange.aStart.Tab(), aCell, TRUE );
+                            pDoc->GetFormula( nCol, nRow, aRange.aStart.Tab(), aCell, sal_True );
                             if( aCell.Search( cSep ) != STRING_NOTFOUND )
                                 lcl_WriteString( rStrm, aCell, cStr, cStr );
                             else
@@ -1523,14 +1523,14 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm )
         }
     }
 
-    return BOOL( rStrm.GetError() == SVSTREAM_OK );
+    return sal_Bool( rStrm.GetError() == SVSTREAM_OK );
 }
 
 
-BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
+sal_Bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
-    BOOL bOk = TRUE;
-    BOOL bMyDoc = FALSE;
+    sal_Bool bOk = sal_True;
+    sal_Bool bMyDoc = sal_False;
     SylkVersion eVersion = SYLK_OTHER;
 
     // US-English separators for StringToDouble
@@ -1541,8 +1541,8 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
     SCROW nStartRow = aRange.aStart.Row();
     SCCOL nEndCol = aRange.aEnd.Col();
     SCROW nEndRow = aRange.aEnd.Row();
-    ULONG nOldPos = rStrm.Tell();
-    BOOL bData = BOOL( !bSingle );
+    sal_uLong nOldPos = rStrm.Tell();
+    sal_Bool bData = sal_Bool( !bSingle );
     SvULongs aFormats;
 
     if( !bSingle)
@@ -1570,7 +1570,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
             if( cTag == 'C' )       // Content
             {
                 if( *p++ != ';' )
-                    return FALSE;
+                    return sal_False;
                 while( *p )
                 {
                     sal_Unicode ch = *p++;
@@ -1604,15 +1604,15 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
                                     nEndCol = nCol;
                                 break;
                             }
-                            BOOL bText;
+                            sal_Bool bText;
                             if( *p == '"' )
                             {
-                                bText = TRUE;
+                                bText = sal_True;
                                 aText.Erase();
                                 p = lcl_ScanSylkString( p, aText, eVersion);
                             }
                             else
-                                bText = FALSE;
+                                bText = sal_False;
                             const sal_Unicode* q = p;
                             while( *q && *q != ';' )
                                 q++;
@@ -1622,7 +1622,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
                                 {
                                     pDoc->PutCell( nCol, nRow, aRange.aStart.Tab(), 
                                             ScBaseCell::CreateTextCell( aText, pDoc),
-                                            (BOOL) TRUE);
+                                            (sal_Bool) sal_True);
                                 }
                                 else
                                 {
@@ -1666,7 +1666,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
                             if ( ch == 'M' )
                             {
                                 ScMarkData aMark;
-                                aMark.SelectTable( aPos.Tab(), TRUE );
+                                aMark.SelectTable( aPos.Tab(), sal_True );
                                 pDoc->InsertMatrixFormula( nCol, nRow, nRefCol,
                                     nRefRow, aMark, EMPTY_STRING, pCode );
                             }
@@ -1689,7 +1689,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
             else if( cTag == 'F' )      // Format
             {
                 if( *p++ != ';' )
-                    return FALSE;
+                    return sal_False;
                 sal_Int32 nFormat = -1;
                 while( *p )
                 {
@@ -1731,7 +1731,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
                 }
                 if ( 0 <= nFormat && nFormat < aFormats.Count() )
                 {
-                    ULONG nKey = aFormats[(USHORT)nFormat];
+                    sal_uLong nKey = aFormats[(sal_uInt16)nFormat];
                     pDoc->ApplyAttr( nCol, nRow, aRange.aStart.Tab(),
                             SfxUInt32Item( ATTR_VALUE_FORMAT, nKey ) );
                 }
@@ -1778,7 +1778,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
             aRange.aEnd.SetCol( nEndCol );
             aRange.aEnd.SetRow( nEndRow );
             bOk = StartPaste();
-            bData = TRUE;
+            bData = sal_True;
         }
         else
             break;
@@ -1789,7 +1789,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
 }
 
 
-BOOL ScImportExport::Doc2Sylk( SvStream& rStrm )
+sal_Bool ScImportExport::Doc2Sylk( SvStream& rStrm )
 {
     SCCOL nCol;
     SCROW nRow;
@@ -1809,7 +1809,7 @@ BOOL ScImportExport::Doc2Sylk( SvStream& rStrm )
         {
             String aBufStr;
             double nVal;
-            BOOL bForm = FALSE;
+            sal_Bool bForm = sal_False;
             SCROW r = nRow - nStartRow + 1;
             SCCOL c = nCol - nStartCol + 1;
             ScBaseCell* pCell;
@@ -1830,7 +1830,7 @@ BOOL ScImportExport::Doc2Sylk( SvStream& rStrm )
 
                     aValStr = ::rtl::math::doubleToUString( nVal,
                             rtl_math_StringFormat_Automatic,
-                            rtl_math_DecimalPlaces_Max, '.', TRUE );
+                            rtl_math_DecimalPlaces_Max, '.', sal_True );
 
                     aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" ));
                     aBufStr += String::CreateFromInt32( c );
@@ -1929,35 +1929,35 @@ BOOL ScImportExport::Doc2Sylk( SvStream& rStrm )
     }
     lcl_WriteSimpleString( rStrm, String( 'E' ) );
     WriteUnicodeOrByteEndl( rStrm );
-    return BOOL( rStrm.GetError() == SVSTREAM_OK );
+    return sal_Bool( rStrm.GetError() == SVSTREAM_OK );
 }
 
 
-BOOL ScImportExport::Doc2HTML( SvStream& rStrm, const String& rBaseURL )
+sal_Bool ScImportExport::Doc2HTML( SvStream& rStrm, const String& rBaseURL )
 {
     // CharSet is ignored in ScExportHTML, read from Load/Save HTML options
     ScFormatFilter::Get().ScExportHTML( rStrm, rBaseURL, pDoc, aRange, RTL_TEXTENCODING_DONTKNOW, bAll,
         aStreamPath, aNonConvertibleChars );
-    return BOOL( rStrm.GetError() == SVSTREAM_OK );
+    return sal_Bool( rStrm.GetError() == SVSTREAM_OK );
 }
 
-BOOL ScImportExport::Doc2RTF( SvStream& rStrm )
+sal_Bool ScImportExport::Doc2RTF( SvStream& rStrm )
 {
     //	CharSet is ignored in ScExportRTF
     ScFormatFilter::Get().ScExportRTF( rStrm, pDoc, aRange, RTL_TEXTENCODING_DONTKNOW );
-    return BOOL( rStrm.GetError() == SVSTREAM_OK );
+    return sal_Bool( rStrm.GetError() == SVSTREAM_OK );
 }
 
 
-BOOL ScImportExport::Doc2Dif( SvStream& rStrm )
+sal_Bool ScImportExport::Doc2Dif( SvStream& rStrm )
 {
     // for DIF in the clipboard, IBM_850 is always used
     ScFormatFilter::Get().ScExportDif( rStrm, pDoc, aRange, RTL_TEXTENCODING_IBM_850 );
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL ScImportExport::Dif2Doc( SvStream& rStrm )
+sal_Bool ScImportExport::Dif2Doc( SvStream& rStrm )
 {
     SCTAB nTab = aRange.aStart.Tab();
     ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO );
@@ -1976,12 +1976,12 @@ BOOL ScImportExport::Dif2Doc( SvStream& rStrm )
         nEndRow = aRange.aStart.Row();
     aRange.aEnd = ScAddress( nEndCol, nEndRow, nTab );
 
-    BOOL bOk = StartPaste();
+    sal_Bool bOk = StartPaste();
     if (bOk)
     {
-        USHORT nFlags = IDF_ALL & ~IDF_STYLES;
+        sal_uInt16 nFlags = IDF_ALL & ~IDF_STYLES;
         pDoc->DeleteAreaTab( aRange, nFlags );
-        pImportDoc->CopyToDocument( aRange, nFlags, FALSE, pDoc );
+        pImportDoc->CopyToDocument( aRange, nFlags, sal_False, pDoc );
         EndPaste();
     }
 
@@ -1991,7 +1991,7 @@ BOOL ScImportExport::Dif2Doc( SvStream& rStrm )
 }
 
 
-BOOL ScImportExport::RTF2Doc( SvStream& rStrm, const String& rBaseURL )
+sal_Bool ScImportExport::RTF2Doc( SvStream& rStrm, const String& rBaseURL )
 {
     ScEEAbsImport *pImp = ScFormatFilter::Get().CreateRTFImport( pDoc, aRange );
     if (!pImp)
@@ -1999,10 +1999,10 @@ BOOL ScImportExport::RTF2Doc( SvStream& rStrm, const String& rBaseURL )
     pImp->Read( rStrm, rBaseURL );
     aRange = pImp->GetRange();
 
-    BOOL bOk = StartPaste();
+    sal_Bool bOk = StartPaste();
     if (bOk)
     {
-        USHORT nFlags = IDF_ALL & ~IDF_STYLES;
+        sal_uInt16 nFlags = IDF_ALL & ~IDF_STYLES;
         pDoc->DeleteAreaTab( aRange, nFlags );
         pImp->WriteToDocument();
         EndPaste();
@@ -2012,15 +2012,15 @@ BOOL ScImportExport::RTF2Doc( SvStream& rStrm, const String& rBaseURL )
 }
 
 
-BOOL ScImportExport::HTML2Doc( SvStream& rStrm, const String& rBaseURL )
+sal_Bool ScImportExport::HTML2Doc( SvStream& rStrm, const String& rBaseURL )
 {
-    ScEEAbsImport *pImp = ScFormatFilter::Get().CreateHTMLImport( pDoc, rBaseURL, aRange, TRUE);
+    ScEEAbsImport *pImp = ScFormatFilter::Get().CreateHTMLImport( pDoc, rBaseURL, aRange, sal_True);
     if (!pImp)
         return false;
     pImp->Read( rStrm, rBaseURL );
     aRange = pImp->GetRange();
 
-    BOOL bOk = StartPaste();
+    sal_Bool bOk = StartPaste();
     if (bOk)
     {
         // ScHTMLImport may call ScDocument::InitDrawLayer, resulting in
@@ -2028,7 +2028,7 @@ BOOL ScImportExport::HTML2Doc( SvStream& rStrm, const String& rBaseURL )
         if (pDocSh)
             pDocSh->MakeDrawLayer();
 
-        USHORT nFlags = IDF_ALL & ~IDF_STYLES;
+        sal_uInt16 nFlags = IDF_ALL & ~IDF_STYLES;
         pDoc->DeleteAreaTab( aRange, nFlags );
         pImp->WriteToDocument();
         EndPaste();
@@ -2049,21 +2049,21 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin {
     virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) RETURN_ERROR
     virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) RETURN_ERROR
     virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress&,
-                 const CharSet, UINT32 ) RETURN_ERROR
+                 const CharSet, sal_uInt32 ) RETURN_ERROR
     virtual FltError ScImportRTF( SvStream&, const String&, ScDocument*, ScRange& ) RETURN_ERROR
-    virtual FltError ScImportHTML( SvStream&, const String&, ScDocument*, ScRange&, double, BOOL, SvNumberFormatter*, bool ) RETURN_ERROR
+    virtual FltError ScImportHTML( SvStream&, const String&, ScDocument*, ScRange&, double, sal_Bool, SvNumberFormatter*, bool ) RETURN_ERROR
 
     virtual ScEEAbsImport *CreateRTFImport( ScDocument*, const ScRange& ) { return NULL; }
-    virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const String&, const ScRange&, BOOL ) { return NULL; }
+    virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const String&, const ScRange&, sal_Bool ) { return NULL; }
     virtual String         GetHTMLRangeNameList( ScDocument*, const String& ) { return String(); }
 
 #if ENABLE_LOTUS123_EXPORT
     virtual FltError ScExportLotus123( SvStream&, ScDocument*, ExportFormatLotus, CharSet ) RETURN_ERROR
 #endif
     virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, CharSet ) RETURN_ERROR
-    virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const CharSet, UINT32 ) RETURN_ERROR
-    virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const CharSet, UINT32 ) RETURN_ERROR
-    virtual FltError ScExportHTML( SvStream&, const String&, ScDocument*, const ScRange&, const CharSet, BOOL,
+    virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const CharSet, sal_uInt32 ) RETURN_ERROR
+    virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const CharSet, sal_uInt32 ) RETURN_ERROR
+    virtual FltError ScExportHTML( SvStream&, const String&, ScDocument*, const ScRange&, const CharSet, sal_Bool,
                   const String&, String& ) RETURN_ERROR
     virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const CharSet ) RETURN_ERROR
 };
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 105783b8c..19e5f9279 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -64,11 +64,11 @@ void lcl_InvalidateOutliner( SfxBindings* pBindings )
 //!	PaintWidthHeight zur DocShell verschieben?
 
 void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab,
-                                    BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd )
+                                    sal_Bool bColumns, SCCOLROW nStart, SCCOLROW nEnd )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
 
-    USHORT nParts = PAINT_GRID;
+    sal_uInt16 nParts = PAINT_GRID;
     SCCOL nStartCol = 0;
     SCROW nStartRow = 0;
     SCCOL nEndCol = MAXCOL;			// fuer Test auf Merge
@@ -96,9 +96,9 @@ void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab,
 
 //------------------------------------------------------------------------
 
-BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi )
+sal_Bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, sal_Bool bColumns, sal_Bool bRecord, sal_Bool bApi )
 {
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
     SCCOL nEndCol = rRange.aEnd.Col();
@@ -106,19 +106,19 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b
     SCTAB nTab = rRange.aStart.Tab();
 
     ScDocument* pDoc = rDocShell.GetDocument();
-    ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab, TRUE );
+    ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab, sal_True );
     ScOutlineTable* pUndoTab = NULL;
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     if (bRecord)
         pUndoTab = new ScOutlineTable( *pTable );
 
     ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray();
 
-    BOOL bRes;
-    BOOL bSize = FALSE;
+    sal_Bool bRes;
+    sal_Bool bSize = sal_False;
     if ( bColumns )
         bRes = pArray->Insert( nStartCol, nEndCol, bSize );
     else
@@ -131,13 +131,13 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b
             rDocShell.GetUndoManager()->AddUndoAction(
                 new ScUndoMakeOutline( &rDocShell,
                                         nStartCol,nStartRow,nTab,nEndCol,nEndRow,nTab,
-                                        pUndoTab, bColumns, TRUE ) );
+                                        pUndoTab, bColumns, sal_True ) );
         }
 
         if (pDoc->IsStreamValid(nTab))
-            pDoc->SetStreamValid(nTab, FALSE);
+            pDoc->SetStreamValid(nTab, sal_False);
 
-        USHORT nParts = 0;				// Datenbereich nicht geaendert
+        sal_uInt16 nParts = 0;				// Datenbereich nicht geaendert
         if ( bColumns )
             nParts |= PAINT_TOP;
         else
@@ -148,7 +148,7 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b
         rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, nParts );
         rDocShell.SetDocumentModified();
         lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else
     {
@@ -160,9 +160,9 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b
     return bSuccess;
 }
 
-BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi )
+sal_Bool ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, sal_Bool bColumns, sal_Bool bRecord, sal_Bool bApi )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -173,7 +173,7 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
     if (pTable)
     {
@@ -183,8 +183,8 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL
 
         ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray();
 
-        BOOL bRes;
-        BOOL bSize = FALSE;
+        sal_Bool bRes;
+        sal_Bool bSize = sal_False;
         if ( bColumns )
             bRes = pArray->Remove( nStartCol, nEndCol, bSize );
         else
@@ -197,13 +197,13 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL
                 rDocShell.GetUndoManager()->AddUndoAction(
                     new ScUndoMakeOutline( &rDocShell,
                                             nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab,
-                                            pUndoTab, bColumns, FALSE ) );
+                                            pUndoTab, bColumns, sal_False ) );
             }
 
             if (pDoc->IsStreamValid(nTab))
-                pDoc->SetStreamValid(nTab, FALSE);
+                pDoc->SetStreamValid(nTab, sal_False);
 
-            USHORT nParts = 0;				// Datenbereich nicht geaendert
+            sal_uInt16 nParts = 0;				// Datenbereich nicht geaendert
             if ( bColumns )
                 nParts |= PAINT_TOP;
             else
@@ -213,7 +213,7 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL
 
             rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, nParts );
             rDocShell.SetDocumentModified();
-            bDone = TRUE;
+            bDone = sal_True;
             lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
 
             // es wird nicht wieder eingeblendet -> kein UpdatePageBreaks
@@ -228,13 +228,13 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL
     return bDone;
 }
 
-BOOL ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi )
+sal_Bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, sal_Bool bRecord, sal_Bool bApi )
 {
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
     if (pTable)
     {
@@ -249,9 +249,9 @@ BOOL ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi )
             SCROW nEndRow = nRow2;
 
             ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-            pDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
-            pDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+            pDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
+            pDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
 
             ScOutlineTable* pUndoTab = new ScOutlineTable( *pTable );
 
@@ -262,20 +262,20 @@ BOOL ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi )
                                                 pUndoDoc, pUndoTab ) );
         }
 
-        SelectLevel( nTab, TRUE,  pTable->GetColArray()->GetDepth(), FALSE, FALSE, bApi );
-        SelectLevel( nTab, FALSE, pTable->GetRowArray()->GetDepth(), FALSE, FALSE, bApi );
+        SelectLevel( nTab, sal_True,  pTable->GetColArray()->GetDepth(), sal_False, sal_False, bApi );
+        SelectLevel( nTab, sal_False, pTable->GetRowArray()->GetDepth(), sal_False, sal_False, bApi );
         pDoc->SetOutlineTable( nTab, NULL );
 
         pDoc->UpdatePageBreaks( nTab );
 
         if (pDoc->IsStreamValid(nTab))
-            pDoc->SetStreamValid(nTab, FALSE);
+            pDoc->SetStreamValid(nTab, sal_False);
 
         rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
                                     PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE );
         rDocShell.SetDocumentModified();
         lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     }
     else if (!bApi)
         Sound::Beep();
@@ -285,7 +285,7 @@ BOOL ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi )
 
 //------------------------------------------------------------------------
 
-BOOL ScOutlineDocFunc::AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi )
+sal_Bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi )
 {
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -296,7 +296,7 @@ BOOL ScOutlineDocFunc::AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bA
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
 
     ScDocument* pUndoDoc = NULL;
@@ -317,14 +317,14 @@ BOOL ScOutlineDocFunc::AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bA
             SCROW nOutEndRow = nRow2;
 
             pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-            pDoc->CopyToDocument( nOutStartCol, 0, nTab, nOutEndCol, MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
-            pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+            pDoc->CopyToDocument( nOutStartCol, 0, nTab, nOutEndCol, MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
+            pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
         }
 
         // einblenden
-        SelectLevel( nTab, TRUE,  pTable->GetColArray()->GetDepth(), FALSE, FALSE, bApi );
-        SelectLevel( nTab, FALSE, pTable->GetRowArray()->GetDepth(), FALSE, FALSE, bApi );
+        SelectLevel( nTab, sal_True,  pTable->GetColArray()->GetDepth(), sal_False, sal_False, bApi );
+        SelectLevel( nTab, sal_False, pTable->GetRowArray()->GetDepth(), sal_False, sal_False, bApi );
         pDoc->SetOutlineTable( nTab, NULL );
     }
 
@@ -340,30 +340,30 @@ BOOL ScOutlineDocFunc::AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bA
     }
 
     if (pDoc->IsStreamValid(nTab))
-        pDoc->SetStreamValid(nTab, FALSE);
+        pDoc->SetStreamValid(nTab, sal_False);
 
     rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_LEFT | PAINT_TOP | PAINT_SIZE );
     rDocShell.SetDocumentModified();
     lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
-                                    BOOL bRecord, BOOL bPaint, BOOL /* bApi */ )
+sal_Bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel,
+                                    sal_Bool bRecord, sal_Bool bPaint, sal_Bool /* bApi */ )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );				// ist schon da
     if (!pTable)
-        return FALSE;
+        return sal_False;
     ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray();
     if (!pArray)
-        return FALSE;
+        return sal_False;
 
     SCCOLROW nStart, nEnd;
     pArray->GetRange( nStart, nEnd );
@@ -374,15 +374,15 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
         ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         if (bColumns)
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, FALSE );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_False );
             pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
-                    static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, FALSE,
+                    static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, sal_False,
                     pUndoDoc );
         }
         else
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
-            pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
+            pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, sal_False, pUndoDoc );
         }
 
         rDocShell.GetUndoManager()->AddUndoAction(
@@ -396,21 +396,21 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
     ScOutlineEntry* pEntry;
     while ((pEntry=aIter.GetNext()) != NULL)
     {
-        USHORT nThisLevel = aIter.LastLevel();
-        BOOL bShow = (nThisLevel < nLevel);
+        sal_uInt16 nThisLevel = aIter.LastLevel();
+        sal_Bool bShow = (nThisLevel < nLevel);
         if (bShow)											// einblenden
         {
-            pEntry->SetHidden( FALSE );
-            pEntry->SetVisible( TRUE );
+            pEntry->SetHidden( sal_False );
+            pEntry->SetVisible( sal_True );
         }
         else if ( nThisLevel == nLevel )					// ausblenden
         {
-            pEntry->SetHidden( TRUE );
-            pEntry->SetVisible( TRUE );
+            pEntry->SetHidden( sal_True );
+            pEntry->SetVisible( sal_True );
         }
         else												// verdeckt
         {
-            pEntry->SetVisible( FALSE );
+            pEntry->SetVisible( sal_False );
         }
 
         SCCOLROW nThisStart = pEntry->GetStart();
@@ -433,14 +433,14 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
     rDocShell.SetDocumentModified();
     lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
 
-BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi )
+sal_Bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -451,7 +451,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
 
     if (pTable)
@@ -468,14 +468,14 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
         {
             ScOutlineTable* pUndoTab = new ScOutlineTable( *pTable );
             ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-            pDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
-            pDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+            pDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
+            pDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
 
             rDocShell.GetUndoManager()->AddUndoAction(
                 new ScUndoOutlineBlock( &rDocShell,
                                         nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
-                                        pUndoDoc, pUndoTab, TRUE ) );
+                                        pUndoDoc, pUndoTab, sal_True ) );
         }
 
         //	Spalten
@@ -490,14 +490,14 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
             nEnd   = pEntry->GetEnd();
             if ( nStart>=nStartCol && nEnd<=nEndCol )
             {
-                pEntry->SetHidden( FALSE );
-                pEntry->SetVisible( TRUE );
+                pEntry->SetHidden( sal_False );
+                pEntry->SetVisible( sal_True );
                 if (nStart<nMin) nMin=nStart;
                 if (nEnd>nMax) nMax=nEnd;
             }
         }
         for ( i=nMin; i<=nMax; i++ )
-            pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE );
+            pDoc->ShowCol( static_cast<SCCOL>(i), nTab, sal_True );
 
         //	Zeilen
 
@@ -511,22 +511,22 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
             nEnd   = pEntry->GetEnd();
             if ( nStart>=nStartRow && nEnd<=nEndRow )
             {
-                pEntry->SetHidden( FALSE );
-                pEntry->SetVisible( TRUE );
+                pEntry->SetHidden( sal_False );
+                pEntry->SetVisible( sal_True );
                 if (nStart<nMin) nMin=nStart;
                 if (nEnd>nMax) nMax=nEnd;
             }
         }
         for ( i=nMin; i<=nMax; i++ )
             if ( !pDoc->RowFiltered( i,nTab ) )				// weggefilterte nicht einblenden
-                pDoc->ShowRow( i, nTab, TRUE );
+                pDoc->ShowRow( i, nTab, sal_True );
 
         pDoc->UpdatePageBreaks( nTab );
 
         rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_LEFT | PAINT_TOP );
 
         rDocShell.SetDocumentModified();
-        bDone = TRUE;
+        bDone = sal_True;
 
         lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
     }
@@ -537,9 +537,9 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
     return bDone;
 }
 
-BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi )
+sal_Bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -550,18 +550,18 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord,
     ScDocument* pDoc = rDocShell.GetDocument();
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
 
     if (pTable)
     {
         ScOutlineEntry* pEntry;
-        USHORT nColLevel;
-        USHORT nRowLevel;
-        USHORT nCount;
+        sal_uInt16 nColLevel;
+        sal_uInt16 nRowLevel;
+        sal_uInt16 nCount;
         SCCOLROW nStart;
         SCCOLROW nEnd;
-        USHORT i;
+        sal_uInt16 i;
 
         SCCOLROW nEffStartCol = nStartCol;
         SCCOLROW nEffEndCol   = nEndCol;
@@ -578,16 +578,16 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord,
         {
             ScOutlineTable* pUndoTab = new ScOutlineTable( *pTable );
             ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
             pDoc->CopyToDocument( static_cast<SCCOL>(nEffStartCol), 0, nTab,
                     static_cast<SCCOL>(nEffEndCol), MAXROW, nTab, IDF_NONE,
-                    FALSE, pUndoDoc );
-            pDoc->CopyToDocument( 0, nEffStartRow, nTab, MAXCOL, nEffEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+                    sal_False, pUndoDoc );
+            pDoc->CopyToDocument( 0, nEffStartRow, nTab, MAXCOL, nEffEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
 
             rDocShell.GetUndoManager()->AddUndoAction(
                 new ScUndoOutlineBlock( &rDocShell,
                                         nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab,
-                                        pUndoDoc, pUndoTab, FALSE ) );
+                                        pUndoDoc, pUndoTab, sal_False ) );
         }
 
         //	Spalten
@@ -600,7 +600,7 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord,
             nEnd   = pEntry->GetEnd();
 
             if ( static_cast<SCCOLROW>(nStartCol)<=nEnd && static_cast<SCCOLROW>(nEndCol)>=nStart )
-                HideOutline( nTab, TRUE, nColLevel, i, FALSE, FALSE, bApi );
+                HideOutline( nTab, sal_True, nColLevel, i, sal_False, sal_False, bApi );
         }
 
         //	Zeilen
@@ -613,7 +613,7 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord,
             nEnd   = pEntry->GetEnd();
 
             if ( nStartRow<=nEnd && nEndRow>=nStart )
-                HideOutline( nTab, FALSE, nRowLevel, i, FALSE, FALSE, bApi );
+                HideOutline( nTab, sal_False, nRowLevel, i, sal_False, sal_False, bApi );
         }
 
         pDoc->UpdatePageBreaks( nTab );
@@ -621,7 +621,7 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord,
         rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_LEFT | PAINT_TOP );
 
         rDocShell.SetDocumentModified();
-        bDone = TRUE;
+        bDone = sal_True;
 
         lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
     }
@@ -634,12 +634,12 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord,
 
 //------------------------------------------------------------------------
 
-BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
-                                    BOOL bRecord, BOOL bPaint, BOOL /* bApi */ )
+sal_Bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
+                                    sal_Bool bRecord, sal_Bool bPaint, sal_Bool /* bApi */ )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
     ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray();
@@ -652,34 +652,34 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
         ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         if (bColumns)
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, FALSE );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_False );
             pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
-                    static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, FALSE,
+                    static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, sal_False,
                     pUndoDoc );
         }
         else
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
-            pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
+            pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, sal_False, pUndoDoc );
         }
 
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoDoOutline( &rDocShell,
                                     nStart, nEnd, nTab, pUndoDoc,		//! start und end berechnen
-                                    bColumns, nLevel, nEntry, TRUE ) );
+                                    bColumns, nLevel, nEntry, sal_True ) );
     }
 
 //!	HideCursor();
 
-    pEntry->SetHidden(FALSE);
+    pEntry->SetHidden(sal_False);
     SCCOLROW i;
     for ( i = nStart; i <= nEnd; i++ )
     {
         if ( bColumns )
-            pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE );
+            pDoc->ShowCol( static_cast<SCCOL>(i), nTab, sal_True );
         else
             if ( !pDoc->RowFiltered( i,nTab ) )				// weggefilterte nicht einblenden
-                pDoc->ShowRow( i, nTab, TRUE );
+                pDoc->ShowRow( i, nTab, sal_True );
     }
 
     ScSubOutlineIterator aIter( pArray, nLevel, nEntry );
@@ -692,14 +692,14 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
             for ( i = nSubStart; i <= nSubEnd; i++ )
             {
                 if ( bColumns )
-                    pDoc->ShowCol( static_cast<SCCOL>(i), nTab, FALSE );
+                    pDoc->ShowCol( static_cast<SCCOL>(i), nTab, sal_False );
                 else
-                    pDoc->ShowRow( i, nTab, FALSE );
+                    pDoc->ShowRow( i, nTab, sal_False );
             }
         }
     }
 
-    pArray->SetVisibleBelow( nLevel, nEntry, TRUE, TRUE );
+    pArray->SetVisibleBelow( nLevel, nEntry, sal_True, sal_True );
 
     pDoc->InvalidatePageBreaks(nTab);
     pDoc->UpdatePageBreaks( nTab );
@@ -715,15 +715,15 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
 
     lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
 
-    return TRUE;		//! immer ???
+    return sal_True;		//! immer ???
 }
 
-BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
-                                    BOOL bRecord, BOOL bPaint, BOOL /* bApi */ )
+sal_Bool ScOutlineDocFunc::HideOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
+                                    sal_Bool bRecord, sal_Bool bPaint, sal_Bool /* bApi */ )
 {
     ScDocument* pDoc = rDocShell.GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
     ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray();
@@ -736,36 +736,36 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
         ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         if (bColumns)
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, FALSE );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_False );
             pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
-                    static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, FALSE,
+                    static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, sal_False,
                     pUndoDoc );
         }
         else
         {
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
-            pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
+            pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, sal_False, pUndoDoc );
         }
 
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoDoOutline( &rDocShell,
                                     nStart, nEnd, nTab, pUndoDoc,
-                                    bColumns, nLevel, nEntry, FALSE ) );
+                                    bColumns, nLevel, nEntry, sal_False ) );
     }
 
 //!	HideCursor();
 
-    pEntry->SetHidden(TRUE);
+    pEntry->SetHidden(sal_True);
     SCCOLROW i;
     for ( i = nStart; i <= nEnd; i++ )
     {
         if ( bColumns )
-            pDoc->ShowCol( static_cast<SCCOL>(i), nTab, FALSE );
+            pDoc->ShowCol( static_cast<SCCOL>(i), nTab, sal_False );
         else
-            pDoc->ShowRow( i, nTab, FALSE );
+            pDoc->ShowRow( i, nTab, sal_False );
     }
 
-    pArray->SetVisibleBelow( nLevel, nEntry, FALSE );
+    pArray->SetVisibleBelow( nLevel, nEntry, sal_False );
 
     pDoc->InvalidatePageBreaks(nTab);
     pDoc->UpdatePageBreaks( nTab );
@@ -781,7 +781,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
 
     lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
 
-    return TRUE;		//! immer ???
+    return sal_True;		//! immer ???
 }
 
 
diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx
index 26721bb35..f13b64697 100644
--- a/sc/source/ui/docshell/pagedata.cxx
+++ b/sc/source/ui/docshell/pagedata.cxx
@@ -42,7 +42,7 @@ ScPrintRangeData::ScPrintRangeData()
     nPagesX = nPagesY = 0;
     pPageEndX = NULL;
     pPageEndY = NULL;
-    bTopDown = bAutomatic = TRUE;
+    bTopDown = bAutomatic = sal_True;
     nFirstPage = 1;
 }
 
@@ -108,18 +108,18 @@ ScPrintRangeData& ScPageBreakData::GetData(size_t nPos)
     return pData[nPos];
 }
 
-BOOL ScPageBreakData::IsEqual( const ScPageBreakData& rOther ) const
+sal_Bool ScPageBreakData::IsEqual( const ScPageBreakData& rOther ) const
 {
     if ( nUsed != rOther.nUsed )
-        return FALSE;
+        return sal_False;
 
-    for (USHORT i=0; i<nUsed; i++)
+    for (sal_uInt16 i=0; i<nUsed; i++)
         if ( pData[i].GetPrintRange() != rOther.pData[i].GetPrintRange() )
-            return FALSE;
+            return sal_False;
 
     //!	ScPrintRangeData komplett vergleichen ??
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScPageBreakData::AddPages()
@@ -127,7 +127,7 @@ void ScPageBreakData::AddPages()
     if ( nUsed > 1 )
     {
         long nPage = pData[0].GetFirstPage();
-        for (USHORT i=0; sal::static_int_cast<size_t>(i+1)<nUsed; i++)
+        for (sal_uInt16 i=0; sal::static_int_cast<size_t>(i+1)<nUsed; i++)
         {
             nPage += ((long)pData[i].GetPagesX())*pData[i].GetPagesY();
             pData[i+1].SetFirstPage( nPage );
diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx
index 2b8bc5b11..830a57e71 100644
--- a/sc/source/ui/docshell/pntlock.cxx
+++ b/sc/source/ui/docshell/pntlock.cxx
@@ -34,12 +34,12 @@
 
 //------------------------------------------------------------------------
 
-ScPaintLockData::ScPaintLockData(USHORT nNewMode) :
+ScPaintLockData::ScPaintLockData(sal_uInt16 nNewMode) :
     nMode( nNewMode ),
     nLevel( 0 ),
     nDocLevel( 0 ),
     nParts( 0 ),
-    bModified( FALSE )
+    bModified( sal_False )
 {
 }
 
@@ -47,7 +47,7 @@ ScPaintLockData::~ScPaintLockData()
 {
 }
 
-void ScPaintLockData::AddRange( const ScRange& rRange, USHORT nP )
+void ScPaintLockData::AddRange( const ScRange& rRange, sal_uInt16 nP )
 {
     if (!xRangeList.Is())
         xRangeList = new ScRangeList;
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index 1d69e2661..ecc740b6b 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -43,7 +43,7 @@
 
 // -----------------------------------------------------------------------
 
-BOOL lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const String& rName )
+sal_Bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const String& rName )
 {
     if (pDocSh)
     {
@@ -51,16 +51,16 @@ BOOL lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const String& r
         ScRangeName* pNames = pDoc->GetRangeName();
         if (pNames)
         {
-            USHORT nPos;
+            sal_uInt16 nPos;
             if( pNames->SearchName( rName, nPos ) )
             {
                 ScRangeData* pData = (*pNames)[ nPos ];
                 if ( pData->IsValidReference( rRange ) )
-                    return TRUE;
+                    return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 ScServerObjectSvtListenerForwarder::ScServerObjectSvtListenerForwarder(
@@ -82,7 +82,7 @@ void ScServerObjectSvtListenerForwarder::Notify( SvtBroadcaster& /* rBC */, cons
 ScServerObject::ScServerObject( ScDocShell* pShell, const String& rItem ) :
     aForwarder( this ),
     pDocSh( pShell ),
-    bRefreshListener( FALSE )
+    bRefreshListener( sal_False )
 {
     //	parse item string
 
@@ -144,12 +144,12 @@ void ScServerObject::EndListeningAll()
     SfxListener::EndListeningAll();
 }
 
-BOOL __EXPORT ScServerObject::GetData(
+sal_Bool __EXPORT ScServerObject::GetData(
         ::com::sun::star::uno::Any & rData /*out param*/,
-        const String & rMimeType, BOOL /* bSynchron */ )
+        const String & rMimeType, sal_Bool /* bSynchron */ )
 {
     if (!pDocSh)
-        return FALSE;
+        return sal_False;
 
     // named ranges may have changed -> update aRange
     if ( aItemStr.Len() )
@@ -158,7 +158,7 @@ BOOL __EXPORT ScServerObject::GetData(
         if ( lcl_FillRangeFromName( aNew, pDocSh, aItemStr ) && aNew != aRange )
         {
             aRange = aNew;
-            bRefreshListener = TRUE;
+            bRefreshListener = sal_True;
         }
     }
 
@@ -170,7 +170,7 @@ BOOL __EXPORT ScServerObject::GetData(
         pDocSh->GetDocument()->StartListeningArea( aRange, &aForwarder );
         StartListening(*pDocSh);
         StartListening(*SFX_APP());
-        bRefreshListener = FALSE;
+        bRefreshListener = sal_False;
     }
 
     String aDdeTextFmt = pDocSh->GetDdeTextFmt();
@@ -180,7 +180,7 @@ BOOL __EXPORT ScServerObject::GetData(
     {
         ScImportExport aObj( pDoc, aRange );
         if( aDdeTextFmt.GetChar(0) == 'F' )
-            aObj.SetFormulas( TRUE );
+            aObj.SetFormulas( sal_True );
         if( aDdeTextFmt.EqualsAscii( "SYLK" ) ||
             aDdeTextFmt.EqualsAscii( "FSYLK" ) )
         {
@@ -210,7 +210,7 @@ BOOL __EXPORT ScServerObject::GetData(
 
 void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
-    BOOL bDataChanged = FALSE;
+    sal_Bool bDataChanged = sal_False;
 
     //	DocShell can't be tested via type info, because SFX_HINT_DYING comes from the dtor
     if ( &rBC == pDocSh )
@@ -231,7 +231,7 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
             //	check if named range was modified
             ScRange aNew;
             if ( lcl_FillRangeFromName( aNew, pDocSh, aItemStr ) && aNew != aRange )
-                bDataChanged = TRUE;
+                bDataChanged = sal_True;
         }
     }
     else
@@ -240,25 +240,25 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 
         const ScHint* pScHint = PTR_CAST( ScHint, &rHint );
         if( pScHint && (pScHint->GetId() & (SC_HINT_DATACHANGED | SC_HINT_DYING)) )
-            bDataChanged = TRUE;
+            bDataChanged = sal_True;
         else if (rHint.ISA(ScAreaChangedHint))		// position of broadcaster changed
         {
             ScRange aNewRange = ((const ScAreaChangedHint&)rHint).GetRange();
             if ( aRange != aNewRange )
             {
-                bRefreshListener = TRUE;
-                bDataChanged = TRUE;
+                bRefreshListener = sal_True;
+                bDataChanged = sal_True;
             }
         }
         else if (rHint.ISA(SfxSimpleHint))
         {
-            ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+            sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
             if (nId == SFX_HINT_DYING)
             {
                 //	If the range is being deleted, listening must be restarted
                 //	after the deletion is complete (done in GetData)
-                bRefreshListener = TRUE;
-                bDataChanged = TRUE;
+                bRefreshListener = sal_True;
+                bDataChanged = sal_True;
             }
         }
     }
diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx
index a207f963f..0c91f6e5d 100644
--- a/sc/source/ui/docshell/sizedev.cxx
+++ b/sc/source/ui/docshell/sizedev.cxx
@@ -42,11 +42,11 @@
 
 ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh )
 {
-    BOOL bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg();
+    sal_Bool bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg();
     if ( bTextWysiwyg )
     {
         pDevice = pDocSh->GetPrinter();
-        bOwner = FALSE;
+        bOwner = sal_False;
 
         aOldMapMode = pDevice->GetMapMode();
         pDevice->SetMapMode( MAP_PIXEL );		// GetNeededSize needs pixel MapMode
@@ -56,7 +56,7 @@ ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh )
     {
         pDevice = new VirtualDevice;
         pDevice->SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
-        bOwner = TRUE;
+        bOwner = sal_True;
     }
 
     Point aLogic = pDevice->LogicToPixel( Point(1000,1000), MAP_TWIP );
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index e7092cb38..321d56097 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -78,34 +78,34 @@ TYPEINIT1(ScTableLink, ::sfx2::SvBaseLink);
 
 ScTableLink::ScTableLink(ScDocShell* pDocSh, const String& rFile,
                             const String& rFilter, const String& rOpt,
-                            ULONG nRefresh ):
+                            sal_uLong nRefresh ):
     ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE),
     ScRefreshTimer( nRefresh ),
     pImpl( new TableLink_Impl ),
     aFileName(rFile),
     aFilterName(rFilter),
     aOptions(rOpt),
-    bInCreate( FALSE ),
-    bInEdit( FALSE ),
-    bAddUndo( TRUE ),
-    bDoPaint( TRUE )
+    bInCreate( sal_False ),
+    bInEdit( sal_False ),
+    bAddUndo( sal_True ),
+    bDoPaint( sal_True )
 {
     pImpl->m_pDocSh = pDocSh;
 }
 
 ScTableLink::ScTableLink(SfxObjectShell* pShell, const String& rFile,
                             const String& rFilter, const String& rOpt,
-                            ULONG nRefresh ):
+                            sal_uLong nRefresh ):
     ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE),
     ScRefreshTimer( nRefresh ),
     pImpl( new TableLink_Impl ),
     aFileName(rFile),
     aFilterName(rFilter),
     aOptions(rOpt),
-    bInCreate( FALSE ),
-    bInEdit( FALSE ),
-    bAddUndo( TRUE ),
-    bDoPaint( TRUE )
+    bInCreate( sal_False ),
+    bInEdit( sal_False ),
+    bAddUndo( sal_True ),
+    bDoPaint( sal_True )
 {
     pImpl->m_pDocSh = static_cast< ScDocShell* >( pShell );
     SetRefreshHandler( LINK( this, ScTableLink, RefreshHdl ) );
@@ -136,7 +136,7 @@ void __EXPORT ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl )
     if (pParent)
         Application::SetDefDialogParent(pParent);
 
-    bInEdit = TRUE;
+    bInEdit = sal_True;
     SvBaseLink::Edit( pParent, LINK( this, ScTableLink, TableEndEditHdl ) );
 }
 
@@ -163,14 +163,14 @@ void __EXPORT ScTableLink::Closed()
 {
     // Verknuepfung loeschen: Undo
     ScDocument* pDoc = pImpl->m_pDocSh->GetDocument();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
     if (bAddUndo && bUndo)
     {
         pImpl->m_pDocSh->GetUndoManager()->AddUndoAction(
                 new ScUndoRemoveLink( pImpl->m_pDocSh, aFileName ) );
 
-        bAddUndo = FALSE;	// nur einmal
+        bAddUndo = sal_False;	// nur einmal
     }
 
     // Verbindung wird im dtor aufgehoben
@@ -178,30 +178,30 @@ void __EXPORT ScTableLink::Closed()
     SvBaseLink::Closed();
 }
 
-BOOL ScTableLink::IsUsed() const
+sal_Bool ScTableLink::IsUsed() const
 {
     return pImpl->m_pDocSh->GetDocument()->HasLink( aFileName, aFilterName, aOptions );
 }
 
-BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
-                            const String* pNewOptions, ULONG nNewRefresh )
+sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
+                            const String* pNewOptions, sal_uLong nNewRefresh )
 {
     //	Dokument laden
 
     if (!rNewFile.Len() || !rNewFilter.Len())
-        return FALSE;
+        return sal_False;
 
     String aNewUrl( ScGlobal::GetAbsDocName( rNewFile, pImpl->m_pDocSh ) );
-    BOOL bNewUrlName = (aNewUrl != aFileName);
+    sal_Bool bNewUrlName = (aNewUrl != aFileName);
 
     const SfxFilter* pFilter = pImpl->m_pDocSh->GetFactory().GetFilterContainer()->GetFilter4FilterName(rNewFilter);
     if (!pFilter)
-        return FALSE;
+        return sal_False;
 
     ScDocument* pDoc = pImpl->m_pDocSh->GetDocument();
-    pDoc->SetInLinkUpdate( TRUE );
+    pDoc->SetInLinkUpdate( sal_True );
 
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     //	wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
     if ( rNewFilter != aFilterName )
@@ -214,10 +214,10 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
     if ( aOptions.Len() )
         pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
 
-    SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter, pSet);
+    SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, sal_False, pFilter, pSet);
 
     if ( bInEdit )								// only if using the edit dialog,
-        pMed->UseInteractionHandler( TRUE );	// enable the filter options dialog
+        pMed->UseInteractionHandler( sal_True );	// enable the filter options dialog
 
     // aRef->DoClose() will be called explicitly, but it is still more safe to use SfxObjectShellLock here
     ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL);
@@ -232,7 +232,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
     //	Undo...
 
     ScDocument* pUndoDoc = NULL;
-    BOOL bFirst = TRUE;
+    sal_Bool bFirst = sal_True;
     if (bAddUndo && bUndo)
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
 
@@ -240,18 +240,18 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
 
     ScDocShellModificator aModificator( *pImpl->m_pDocSh );
 
-    BOOL bNotFound = FALSE;
+    sal_Bool bNotFound = sal_False;
     ScDocument* pSrcDoc = pSrcShell->GetDocument();
 
     //	#74835# from text filters that don't set the table name,
     //	use the one table regardless of link table name
-    BOOL bAutoTab = (pSrcDoc->GetTableCount() == 1) &&
+    sal_Bool bAutoTab = (pSrcDoc->GetTableCount() == 1) &&
                     ScDocShell::HasAutomaticTableName( rNewFilter );
 
     SCTAB nCount = pDoc->GetTableCount();
     for (SCTAB nTab=0; nTab<nCount; nTab++)
     {
-        BYTE nMode = pDoc->GetLinkMode(nTab);
+        sal_uInt8 nMode = pDoc->GetLinkMode(nTab);
         if (nMode && pDoc->GetLinkDoc(nTab)==aFileName)
         {
             String aTabName = pDoc->GetLinkTab(nTab);
@@ -261,12 +261,12 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
             if (bAddUndo && bUndo)
             {
                 if (bFirst)
-                    pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
+                    pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
                 else
-                    pUndoDoc->AddUndoTab( nTab, nTab, TRUE, TRUE );
-                bFirst = FALSE;
+                    pUndoDoc->AddUndoTab( nTab, nTab, sal_True, sal_True );
+                bFirst = sal_False;
                 ScRange aRange(0,0,nTab,MAXCOL,MAXROW,nTab);
-                pDoc->CopyToDocument(aRange, IDF_ALL, FALSE, pUndoDoc);
+                pDoc->CopyToDocument(aRange, IDF_ALL, sal_False, pUndoDoc);
                 pUndoDoc->TransferDrawPage( pDoc, nTab, nTab );
                 pUndoDoc->SetLink( nTab, nMode, aFileName, aFilterName,
                     aOptions, aTabName, GetRefreshDelay() );
@@ -283,7 +283,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
                 {
                     pDoc->RenameTab( nTab,
                         ScGlobal::GetDocTabName( aNewUrl, aTabName ),
-                        FALSE, TRUE );	// kein RefUpdate, kein ValidTabName
+                        sal_False, sal_True );	// kein RefUpdate, kein ValidTabName
                 }
             }
 
@@ -304,7 +304,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
             }
 
             if (bFound)
-                pDoc->TransferTab( pSrcDoc, nSrcTab, nTab, FALSE,		// nicht neu einfuegen
+                pDoc->TransferTab( pSrcDoc, nSrcTab, nTab, sal_False,		// nicht neu einfuegen
                                         (nMode == SC_LINK_VALUE) );		// nur Werte?
             else
             {
@@ -341,7 +341,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
                         pCell = aCellIter.GetNext();
                     }
 
-                    ULONG nRanges = aErrorCells.Count();
+                    sal_uLong nRanges = aErrorCells.Count();
                     if ( nRanges )                          // found any?
                     {
                         ScTokenArray aTokenArr;
@@ -350,7 +350,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
                         aTokenArr.AddOpCode( ocClose );
                         aTokenArr.AddOpCode( ocStop );
 
-                        for (ULONG nPos=0; nPos<nRanges; nPos++)
+                        for (sal_uLong nPos=0; nPos<nRanges; nPos++)
                         {
                             const ScRange* pRange = aErrorCells.GetObject(nPos);
                             SCCOL nStartCol = pRange->aStart.Col();
@@ -382,7 +382,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
                     pDoc->SetString( 1,2,nTab, aTabName );
                 }
 
-                bNotFound = TRUE;
+                bNotFound = sal_True;
             }
 
             if ( bNewUrlName || rNewFilter != aFilterName ||
@@ -427,7 +427,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
         //!	Fehler ausgeben ?
     }
 
-    pDoc->SetInLinkUpdate( FALSE );
+    pDoc->SetInLinkUpdate( sal_False );
 
     //	notify Uno objects (for XRefreshListener)
     //!	also notify Uno objects if file name was changed!
@@ -435,7 +435,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
     aHint.SetSheetLink( aFileName );
     pDoc->BroadcastUno( aHint );
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( ScTableLink, RefreshHdl, ScTableLink*, EMPTYARG )
@@ -448,7 +448,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink )
 {
     if ( pImpl->m_aEndEditLink.IsSet() )
         pImpl->m_aEndEditLink.Call( pLink );
-    bInEdit = FALSE;
+    bInEdit = sal_False;
     Application::SetDefDialogParent( pImpl->m_pOldParent );
     return 0;
 }
@@ -459,15 +459,15 @@ String ScDocumentLoader::GetOptions( SfxMedium& rMedium )		// static
 {
     SfxItemSet* pSet = rMedium.GetItemSet();
     const SfxPoolItem* pItem;
-    if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
+    if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) )
         return ((const SfxStringItem*)pItem)->GetValue();
 
     return EMPTY_STRING;
 }
 
-BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
+sal_Bool ScDocumentLoader::GetFilterName( const String& rFileName,
                                     String& rFilter, String& rOptions,
-                                    BOOL bWithContent, BOOL bWithInteraction )  // static
+                                    sal_Bool bWithContent, sal_Bool bWithInteraction )  // static
 {
     TypeId aScType = TYPE(ScDocShell);
     SfxObjectShell* pDocSh = SfxObjectShell::GetFirst( &aScType );
@@ -480,7 +480,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
             {
                 rFilter = pMed->GetFilter()->GetFilterName();
                 rOptions = GetOptions(*pMed);
-                return TRUE;
+                return sal_True;
             }
         }
         pDocSh = SfxObjectShell::GetNext( *pDocSh, &aScType );
@@ -489,16 +489,16 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
     INetURLObject aUrl( rFileName );
     INetProtocol eProt = aUrl.GetProtocol();
     if ( eProt == INET_PROT_NOT_VALID )         // invalid URL?
-        return FALSE;                           // abort without creating a medium
+        return sal_False;                           // abort without creating a medium
 
     //	Filter-Detection
 
     const SfxFilter* pSfxFilter = NULL;
-    SfxMedium* pMedium = new SfxMedium( rFileName, STREAM_STD_READ, FALSE );
+    SfxMedium* pMedium = new SfxMedium( rFileName, STREAM_STD_READ, sal_False );
     if ( pMedium->GetError() == ERRCODE_NONE )
     {
         if ( bWithInteraction )
-            pMedium->UseInteractionHandler(TRUE);   // #i73992# no longer called from GuessFilter
+            pMedium->UseInteractionHandler(sal_True);   // #i73992# no longer called from GuessFilter
 
         SfxFilterMatcher aMatcher( String::CreateFromAscii("scalc") );
         if( bWithContent )
@@ -507,7 +507,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
             aMatcher.GuessFilterIgnoringContent( *pMedium, &pSfxFilter );
     }
 
-    BOOL bOK = FALSE;
+    sal_Bool bOK = sal_False;
     if ( pMedium->GetError() == ERRCODE_NONE )
     {
         if ( pSfxFilter )
@@ -532,12 +532,12 @@ void ScDocumentLoader::RemoveAppPrefix( String& rFilterName )		// static
 
 ScDocumentLoader::ScDocumentLoader( const String& rFileName,
                                     String& rFilterName, String& rOptions,
-                                    UINT32 nRekCnt, BOOL bWithInteraction ) :
+                                    sal_uInt32 nRekCnt, sal_Bool bWithInteraction ) :
         pDocShell(0),
         pMedium(0)
 {
     if ( !rFilterName.Len() )
-        GetFilterName( rFileName, rFilterName, rOptions, TRUE, bWithInteraction );
+        GetFilterName( rFileName, rFilterName, rOptions, sal_True, bWithInteraction );
 
     const SfxFilter* pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName( rFilterName );
 
@@ -546,12 +546,12 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName,
     if ( rOptions.Len() )
         pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, rOptions ) );
 
-    pMedium = new SfxMedium( rFileName, STREAM_STD_READ, FALSE, pFilter, pSet );
+    pMedium = new SfxMedium( rFileName, STREAM_STD_READ, sal_False, pFilter, pSet );
     if ( pMedium->GetError() != ERRCODE_NONE )
         return ;
 
     if ( bWithInteraction )
-        pMedium->UseInteractionHandler( TRUE );	// to enable the filter options dialog
+        pMedium->UseInteractionHandler( sal_True );	// to enable the filter options dialog
 
     pDocShell = new ScDocShell( SFX_CREATE_MODE_INTERNAL );
     aRef = pDocShell;
@@ -604,12 +604,12 @@ ScDocument* ScDocumentLoader::GetDocument()
     return pDocShell ? pDocShell->GetDocument() : 0;
 }
 
-BOOL ScDocumentLoader::IsError() const
+sal_Bool ScDocumentLoader::IsError() const
 {
     if ( pDocShell && pMedium )
         return pMedium->GetError() != ERRCODE_NONE;
     else
-        return TRUE;
+        return sal_True;
 }
 
 String ScDocumentLoader::GetTitle() const
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 59af90ebc..cc87a99af 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -85,9 +85,9 @@ __EXPORT ScDocStatPage::~ScDocStatPage()
 
 //------------------------------------------------------------------------
 
-BOOL __EXPORT ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ )
+sal_Bool __EXPORT ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ )
 {
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index d1ab807a1..c7ba2d956 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -92,7 +92,7 @@ SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) )
 void ScDrawShell::StateDisableItems( SfxItemSet &rSet )
 {
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
 
     while (nWhich)
     {
@@ -113,14 +113,14 @@ void lcl_setModified( SfxObjectShell*  pShell )
 
 void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
 {
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
     Window* 			pWin		= pViewData->GetActiveWin();
 //	SfxViewFrame*		pViewFrame	= SfxViewShell::Current()->GetViewFrame(); //!!! koennte knallen
     ScDrawView* 		pView		= pViewData->GetScDrawView();
     SdrModel*			pDoc		= pViewData->GetDocument()->GetDrawLayer();
 
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    ULONG nMarkCount = rMarkList.GetMarkCount();
+    sal_uLong nMarkCount = rMarkList.GetMarkCount();
     SdrObject* pSingleSelectedObj = NULL;
     if ( nMarkCount > 0 )
         pSingleSelectedObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -137,7 +137,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
         case SID_TEXT_STANDARD:	// Harte Textattributierung loeschen
             {
                 SfxItemSet aEmptyAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
-                pView->SetAttributes(aEmptyAttr, TRUE);
+                pView->SetAttributes(aEmptyAttr, sal_True);
             }
             break;
 
@@ -189,9 +189,9 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
                 }
 
                 if( pView->AreObjectsMarked() )
-                    pView->SetAttrToMarked( *rReq.GetArgs(), FALSE );
+                    pView->SetAttrToMarked( *rReq.GetArgs(), sal_False );
                 else
-                    pView->SetDefaultAttr( *rReq.GetArgs(), FALSE);
+                    pView->SetDefaultAttr( *rReq.GetArgs(), sal_False);
                 pView->InvalidateAttribs();
             }
             break;
@@ -265,7 +265,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
                                 {
                                     SfxAbstractTabDialog *pDlg = pFact->CreateCaptionDialog( pWin, pView );
 
-                                    const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
+                                    const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
                                     SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
                                     aCombSet.Put( aNewAttr );
                                     aCombSet.Put( aNewGeoAttr );
@@ -316,7 +316,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
 void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
 {
     SvxMacroItem aItem ( SFX_APP()->GetPool().GetWhich( SID_ATTR_MACROITEM ) );
-    ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE );
+    ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True );
     if ( pInfo->GetMacro().getLength() > 0 )
     {
         SvxMacroTableDtor aTab;
@@ -343,7 +343,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
     {
         const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
         const SfxPoolItem* pItem;
-        if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, FALSE, &pItem ))
+        if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem ))
         {
             rtl::OUString sMacro;
             SvxMacro* pMacro = ((SvxMacroItem*)pItem)->GetMacroTable().Get( SFX_EVENT_MOUSECLICK_OBJECT );
@@ -353,10 +353,10 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
             if ( pObj->IsGroupObject() )
             {
                 SdrObjList* pOL = pObj->GetSubList();
-                ULONG nObj = pOL->GetObjCount();
-                for ( ULONG index=0; index<nObj; ++index )
+                sal_uLong nObj = pOL->GetObjCount();
+                for ( sal_uLong index=0; index<nObj; ++index )
                 {
-                    pInfo = ScDrawLayer::GetMacroInfo( pOL->GetObj(index), TRUE );
+                    pInfo = ScDrawLayer::GetMacroInfo( pOL->GetObj(index), sal_True );
                     pInfo->SetMacro( sMacro );
                 }
             }
@@ -370,10 +370,10 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
     delete pItemSet;
 }
 
-void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage )
+void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
 {
     ScDrawView*			pView		= pViewData->GetScDrawView();
-    BOOL 				bHasMarked	= pView->AreObjectsMarked();
+    sal_Bool 				bHasMarked	= pView->AreObjectsMarked();
     const SdrObject* 	pObj		= NULL;
     const SdrMarkList&	rMarkList	= pView->GetMarkedObjectList();
 
@@ -382,7 +382,7 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage )
 
     SfxItemSet	aNewAttr( pView->GetDefaultAttr() );
     if( bHasMarked )
-        pView->MergeAttrFromMarked( aNewAttr, FALSE );
+        pView->MergeAttrFromMarked( aNewAttr, sal_False );
 
 //CHINA001	SvxLineTabDialog* pDlg
 //CHINA001	= new SvxLineTabDialog( pViewData->GetDialogParent(),
@@ -404,9 +404,9 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage )
     if ( pDlg->Execute() == RET_OK )
     {
         if( bHasMarked )
-            pView->SetAttrToMarked( *pDlg->GetOutputItemSet(), FALSE );
+            pView->SetAttrToMarked( *pDlg->GetOutputItemSet(), sal_False );
         else
-            pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), FALSE );
+            pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), sal_False );
 
         pView->InvalidateAttribs();
         rReq.Done();
@@ -415,14 +415,14 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage )
     delete pDlg;
 }
 
-void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage )
+void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
 {
     ScDrawView*	pView		= pViewData->GetScDrawView();
-    BOOL		bHasMarked	= pView->AreObjectsMarked();
+    sal_Bool		bHasMarked	= pView->AreObjectsMarked();
 
     SfxItemSet	aNewAttr( pView->GetDefaultAttr() );
     if( bHasMarked )
-        pView->MergeAttrFromMarked( aNewAttr, FALSE );
+        pView->MergeAttrFromMarked( aNewAttr, sal_False );
 
     //CHINA001 SvxAreaTabDialog* pDlg
     //CHINA001 	= new SvxAreaTabDialog( pViewData->GetDialogParent(),
@@ -451,9 +451,9 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage )
     if ( pDlg->Execute() == RET_OK )
     {
         if( bHasMarked )
-            pView->SetAttrToMarked( *pDlg->GetOutputItemSet(), FALSE );
+            pView->SetAttrToMarked( *pDlg->GetOutputItemSet(), sal_False );
         else
-            pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), FALSE );
+            pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), sal_False );
 
         pView->InvalidateAttribs();
         rReq.Done();
@@ -462,26 +462,26 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage )
     delete pDlg;
 }
 
-void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ )
+void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 /* nTabPage */ )
 {
     ScDrawView*	pView		= pViewData->GetScDrawView();
-    BOOL		bHasMarked	= pView->AreObjectsMarked();
+    sal_Bool		bHasMarked	= pView->AreObjectsMarked();
     SfxItemSet	aNewAttr	( pView->GetDefaultAttr() );
 
     if( bHasMarked )
-        pView->MergeAttrFromMarked( aNewAttr, FALSE );
+        pView->MergeAttrFromMarked( aNewAttr, sal_False );
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, pView );
 
-    USHORT nResult = pDlg->Execute();
+    sal_uInt16 nResult = pDlg->Execute();
 
     if ( RET_OK == nResult )
     {
         if ( bHasMarked )
             pView->SetAttributes( *pDlg->GetOutputItemSet() );
         else
-            pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), FALSE );
+            pView->SetDefaultAttr( *pDlg->GetOutputItemSet(), sal_False );
 
         pView->InvalidateAttribs();
         rReq.Done();
@@ -494,7 +494,7 @@ void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk
 {
     if ( pObj )
     {
-        ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE );
+        ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True );
         pInfo->SetHlink( rHlnk );
         lcl_setModified( GetObjectShell() );
     }
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 7d1392ba0..649aad388 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -57,7 +57,7 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdocapt.hxx>
 
-USHORT ScGetFontWorkId();		// in drtxtob
+sal_uInt16 ScGetFontWorkId();		// in drtxtob
 
 using namespace com::sun::star;
 
@@ -68,7 +68,7 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) :
     pViewData( pData )
 {
     SetPool( &pViewData->GetScDrawView()->GetModel()->GetItemPool() );
-    SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
+    ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
     SetUndoManager( pMgr );
     if ( !pViewData->GetDocument()->IsUndoEnabled() )
     {
@@ -91,14 +91,14 @@ void ScDrawShell::GetState( SfxItemSet& rSet )			// Zustaende / Toggles
     rSet.Put( SfxBoolItem( SID_OBJECT_MIRROR, eMode == SDRDRAG_MIRROR ) );
     rSet.Put( SfxBoolItem( SID_BEZIER_EDIT, !pView->IsFrameDragSingles() ) );
 
-    USHORT nFWId = ScGetFontWorkId();
+    sal_uInt16 nFWId = ScGetFontWorkId();
     SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
     rSet.Put(SfxBoolItem(SID_FONTWORK, pViewFrm->HasChildWindow(nFWId)));
 
         // Notes always default to Page anchor.
     bool bDisableAnchor = false;
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    ULONG nMarkCount = rMarkList.GetMarkCount();
+    sal_uLong nMarkCount = rMarkList.GetMarkCount();
     if ( nMarkCount == 1 )
     {
         SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -115,18 +115,18 @@ void ScDrawShell::GetState( SfxItemSet& rSet )			// Zustaende / Toggles
         switch( pView->GetAnchor() )
         {
         case SCA_PAGE:
-            rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, TRUE ) );
-            rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, FALSE ) );
+            rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, sal_True ) );
+            rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, sal_False ) );
         break;
 
         case SCA_CELL:
-        rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, FALSE ) );
-        rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, TRUE ) );
+        rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, sal_False ) );
+        rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, sal_True ) );
         break;
 
         default:
-        rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, FALSE ) );
-        rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, FALSE ) );
+        rSet.Put( SfxBoolItem( SID_ANCHOR_PAGE, sal_False ) );
+        rSet.Put( SfxBoolItem( SID_ANCHOR_CELL, sal_False ) );
         break;
         }
     }
@@ -138,14 +138,14 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )		// Funktionen disablen
 
     //	#111711# call IsMirrorAllowed first to make sure ForcePossibilities (and thus CheckMarked)
     //	is called before GetMarkCount, so the nMarkCount value is valid for the rest of this method.
-    if (!pView->IsMirrorAllowed(TRUE,TRUE))
+    if (!pView->IsMirrorAllowed(sal_True,sal_True))
     {
         rSet.DisableItem( SID_MIRROR_HORIZONTAL );
         rSet.DisableItem( SID_MIRROR_VERTICAL );
     }
 
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    ULONG nMarkCount = rMarkList.GetMarkCount();
+    sal_uLong nMarkCount = rMarkList.GetMarkCount();
 
     if ( nMarkCount <= 1 || !pView->IsGroupPossible() )
         rSet.DisableItem( SID_GROUP );
@@ -194,7 +194,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )		// Funktionen disablen
         }
     }
 
-    BOOL bCanRename = FALSE;
+    sal_Bool bCanRename = sal_False;
     if ( nMarkCount > 1 )
     {
 #ifdef ISSUE66550_HLINK_FOR_SHAPES
@@ -217,10 +217,10 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )		// Funktionen disablen
 #endif
         SdrLayerID nLayerID = pObj->GetLayer();
         if ( nLayerID != SC_LAYER_INTERN )
-            bCanRename = TRUE;                          // #i51351# anything except internal objects can be renamed
+            bCanRename = sal_True;                          // #i51351# anything except internal objects can be renamed
 
         // #91929#; don't show original size entry if not possible
-        UINT16 nObjType = pObj->GetObjIdentifier();
+        sal_uInt16 nObjType = pObj->GetObjIdentifier();
         if ( nObjType == OBJ_OLE2 )
         {
             SdrOle2Obj* pOleObj = static_cast<SdrOle2Obj*>(rMarkList.GetMark( 0 )->GetMarkedSdrObj());
@@ -273,7 +273,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )		// Funktionen disablen
         pView->GetAttributes( aAttrs );
         if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE )
         {
-            BOOL bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue();
+            sal_Bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue();
             rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) );
         }
     }
@@ -292,17 +292,17 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
     Window* 	pWindow		= pViewData->GetActiveWin();
     ScDrawView* pDrView		= pViewData->GetScDrawView();
     Point		aPos	 	= pWindow->PixelToLogic(aMousePos);
-    BOOL		bHasMarked	= pDrView->AreObjectsMarked();
+    sal_Bool		bHasMarked	= pDrView->AreObjectsMarked();
 
     if( bHasMarked )
     {
-        rSet.Put( pDrView->GetAttrFromMarked(FALSE) );
+        rSet.Put( pDrView->GetAttrFromMarked(sal_False) );
 
         // Wenn die View selektierte Objekte besitzt, muessen entspr. Items
         // von SFX_ITEM_DEFAULT (_ON) auf SFX_ITEM_DISABLED geaendert werden
 
         SfxWhichIter aIter( rSet, XATTR_LINE_FIRST, XATTR_FILL_LAST );
-        USHORT nWhich = aIter.FirstWhich();
+        sal_uInt16 nWhich = aIter.FirstWhich();
         while( nWhich )
         {
             if( SFX_ITEM_DEFAULT == rSet.GetItemState( nWhich ) )
@@ -325,7 +325,7 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
         // #i34458# The SvxSizeItem in SID_TABLE_CELL is no longer needed by
         // SvxPosSizeStatusBarControl, it's enough to have it in SID_ATTR_SIZE.
 
-        BOOL bActionItem = FALSE;
+        sal_Bool bActionItem = sal_False;
         if ( pDrView->IsAction() )              // action rectangle
         {
             Rectangle aRect;
@@ -336,7 +336,7 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
                 rSet.Put( SfxPointItem( SID_ATTR_POSITION, aRect.TopLeft() ) );
                 Size aSize( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() );
                 rSet.Put( SvxSizeItem( SID_ATTR_SIZE, aSize ) );
-                bActionItem = TRUE;
+                bActionItem = sal_True;
             }
         }
         if ( !bActionItem )
@@ -365,7 +365,7 @@ void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet)
     //	Dialoge fuer Draw-Attribute disablen, wenn noetig
 
     ScDrawView* pDrView	= pViewData->GetScDrawView();
-    SfxItemSet aViewSet = pDrView->GetAttrFromMarked(FALSE);
+    SfxItemSet aViewSet = pDrView->GetAttrFromMarked(sal_False);
 
     if ( aViewSet.GetItemState( XATTR_LINESTYLE ) == SFX_ITEM_DEFAULT )
     {
@@ -377,18 +377,18 @@ void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet)
         rSet.DisableItem( SID_ATTRIBUTES_AREA );
 }
 
-BOOL ScDrawShell::AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark)
+sal_Bool ScDrawShell::AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark)
 {
-    BOOL bResult=TRUE;
-    ULONG nCount = rMark.GetMarkCount();
-    for (ULONG i=0; i<nCount; i++)
+    sal_Bool bResult=sal_True;
+    sal_uLong nCount = rMark.GetMarkCount();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj();
         if ( !pObj->ISA(SdrUnoObj) )
         {
             if(nLayerNo!=pObj->GetLayer())
             {
-                bResult=FALSE;
+                bResult=sal_False;
                 break;
             }
         }
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index e613437d4..15203714e 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -55,7 +55,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
     SvxFontWorkDialog*	pDlg		= NULL;
     ScDrawView* 		pDrView 	= pViewData->GetScDrawView();
     const SdrMarkList&	rMarkList	= pDrView->GetMarkedObjectList();
-    USHORT				nId = SvxFontWorkChildWindow::GetChildWindowId();
+    sal_uInt16				nId = SvxFontWorkChildWindow::GetChildWindowId();
 
     SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
     if ( pViewFrm->HasChildWindow(nId) )
@@ -68,7 +68,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
         !((SdrTextObj*) pObj)->HasText() )
     {
         if ( pDlg )
-            pDlg->SetActive(FALSE);
+            pDlg->SetActive(sal_False);
 
         rSet.DisableItem(XATTR_FORMTXTSTYLE);
         rSet.DisableItem(XATTR_FORMTXTADJUST);
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 2908af8dd..d5bbef227 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -83,7 +83,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet )             //  Hyperlink
 {
     ScDrawView* pView = pViewData->GetScDrawView();
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    ULONG nMarkCount = rMarkList.GetMarkCount();
+    sal_uLong nMarkCount = rMarkList.GetMarkCount();
 
         //  Hyperlink
 
@@ -163,14 +163,14 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
 {
     const SfxItemSet* pReqArgs = rReq.GetArgs();
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch ( nSlot )
     {
         case SID_HYPERLINK_SETLINK:
             if( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET )
                 {
                     const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
                     const String& rName     = pHyper->GetName();
@@ -178,7 +178,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
                     const String& rTarget   = pHyper->GetTargetFrame();
                     SvxLinkInsertMode eMode = pHyper->GetInsertMode();
 
-                    BOOL bDone = FALSE;
+                    sal_Bool bDone = sal_False;
                     if ( eMode == HLINK_FIELD || eMode == HLINK_BUTTON )
                     {
                         ScDrawView* pView = pViewData->GetScDrawView();
@@ -239,14 +239,14 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
 
                                     //! Undo ???
                                     pViewData->GetDocShell()->SetDocumentModified();
-                                    bDone = TRUE;
+                                    bDone = sal_True;
                                 }
                             }
 #ifdef ISSUE66550_HLINK_FOR_SHAPES
                             else
                             {
                                 SetHlinkForObject( pObj, rURL );
-                                bDone = TRUE;
+                                bDone = sal_True;
                             }
 #endif
                         }
@@ -254,7 +254,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
 
                     if (!bDone)
                         pViewData->GetViewShell()->
-                            InsertURL( rName, rURL, rTarget, (USHORT) eMode );
+                            InsertURL( rName, rURL, rTarget, (sal_uInt16) eMode );
 
                     //  InsertURL an der ViewShell schaltet bei "Text" die DrawShell ab !!!
                 }
@@ -265,7 +265,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
     }
 }
 
-USHORT ScGetFontWorkId();       // wegen CLOOKs - in drtxtob2
+sal_uInt16 ScGetFontWorkId();       // wegen CLOOKs - in drtxtob2
 
 //------------------------------------------------------------------
 
@@ -279,7 +279,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
     ScTabView*   pTabView  = pViewData->GetView();
     ScDrawView*  pView     = pTabView->GetScDrawView();
     const SfxItemSet *pArgs = rReq.GetArgs();
-    USHORT nSlotId = rReq.GetSlot();
+    sal_uInt16 nSlotId = rReq.GetSlot();
 
     //!!!
     // wer weiss, wie lange das funktioniert? (->vom Abreisscontrol funktioniert es)
@@ -300,7 +300,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
             rBindings.Invalidate(SID_OBJECT_HELL);
             //  leave draw shell if nothing selected (layer may be locked)
             if ( pView->GetMarkedObjectList().GetMarkCount() == 0 )
-                pViewData->GetViewShell()->SetDrawShell( FALSE );
+                pViewData->GetViewShell()->SetDrawShell( sal_False );
             break;
 
         case SID_FRAME_TO_TOP:
@@ -371,13 +371,13 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
         case SID_DELETE_CONTENTS:
             pView->DeleteMarked();
             if (!pTabView->IsDrawSelMode())
-                pViewData->GetViewShell()->SetDrawShell( FALSE );
+                pViewData->GetViewShell()->SetDrawShell( sal_False );
         break;
 
         case SID_CUT:
             pView->DoCut();
             if (!pTabView->IsDrawSelMode())
-                pViewData->GetViewShell()->SetDrawShell( FALSE );
+                pViewData->GetViewShell()->SetDrawShell( sal_False );
             break;
 
         case SID_COPY:
@@ -433,7 +433,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
                 rBindings.Invalidate( SID_OBJECT_MIRROR );
                 if (eMode == SDRDRAG_ROTATE && !pView->IsFrameDragSingles())
                 {
-                    pView->SetFrameDragSingles( TRUE );
+                    pView->SetFrameDragSingles( sal_True );
                     rBindings.Invalidate( SID_BEZIER_EDIT );
                 }
             }
@@ -450,14 +450,14 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
                 rBindings.Invalidate( SID_OBJECT_MIRROR );
                 if (eMode == SDRDRAG_MIRROR && !pView->IsFrameDragSingles())
                 {
-                    pView->SetFrameDragSingles( TRUE );
+                    pView->SetFrameDragSingles( sal_True );
                     rBindings.Invalidate( SID_BEZIER_EDIT );
                 }
             }
             break;
         case SID_BEZIER_EDIT:
             {
-                BOOL bOld = pView->IsFrameDragSingles();
+                sal_Bool bOld = pView->IsFrameDragSingles();
                 pView->SetFrameDragSingles( !bOld );
                 rBindings.Invalidate( SID_BEZIER_EDIT );
                 if (bOld && pView->GetDragMode() != SDRDRAG_MOVE)
@@ -471,7 +471,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
 
         case SID_FONTWORK:
         {
-            USHORT nId = ScGetFontWorkId();
+            sal_uInt16 nId = ScGetFontWorkId();
             SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
 
             if ( rReq.GetArgs() )
@@ -493,11 +493,11 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
 
         case SID_ENABLE_HYPHENATION:
             {
-                SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, FALSE);
+                SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, sal_False);
                 if( pItem )
                 {
                     SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE );
-                    BOOL bValue = ( (const SfxBoolItem*) pItem)->GetValue();
+                    sal_Bool bValue = ( (const SfxBoolItem*) pItem)->GetValue();
                     aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) );
                     pView->SetAttributes( aSet );
                 }
@@ -565,7 +565,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
                             }
 
                             // ChartListenerCollectionNeedsUpdate is needed for Navigator update
-                            pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( TRUE );
+                            pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( sal_True );
                             pDocSh->SetDrawModified();
                         }
 
@@ -604,7 +604,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
                             pSelected->SetDescription(aDescription);
 
                             // ChartListenerCollectionNeedsUpdate is needed for Navigator update
-                            pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( TRUE );
+                            pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( sal_True );
                             pDocSh->SetDrawModified();
                         }
 
@@ -690,12 +690,12 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq)
             pDrView->ScEndTextEdit();
 
         if (    SFX_ITEM_SET ==
-                rSet.GetItemState(XATTR_FORMTXTSTDFORM, TRUE, &pItem)
+                rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem)
              && XFTFORM_NONE !=
                 ((const XFormTextStdFormItem*) pItem)->GetValue() )
         {
 
-            USHORT nId              = SvxFontWorkChildWindow::GetChildWindowId();
+            sal_uInt16 nId              = SvxFontWorkChildWindow::GetChildWindowId();
             SfxViewFrame* pViewFrm  = pViewData->GetViewShell()->GetViewFrame();
             SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)
                                        (pViewFrm->
@@ -723,7 +723,7 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq )
     }
     else
     {
-        BOOL bLock = FALSE;
+        sal_Bool bLock = sal_False;
         const SfxItemSet *pArgs = rReq.GetArgs();
         if( pArgs && pArgs->Count() >= 1 )
             bLock = static_cast<const SfxBoolItem&>(pArgs->Get(SID_FORMATPAINTBRUSH)).GetValue();
@@ -731,7 +731,7 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq )
         ScDrawView* pDrawView = pViewData->GetScDrawView();
         if ( pDrawView && pDrawView->AreObjectsMarked() )
         {
-            BOOL bOnlyHardAttr = TRUE;
+            sal_Bool bOnlyHardAttr = sal_True;
             SfxItemSet* pItemSet = new SfxItemSet( pDrawView->GetAttrFromMarked(bOnlyHardAttr) );
             pView->SetDrawBrushSet( pItemSet, bLock );
         }
@@ -741,8 +741,8 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq )
 void ScDrawShell::StateFormatPaintbrush( SfxItemSet& rSet )
 {
     ScDrawView* pDrawView = pViewData->GetScDrawView();
-    BOOL bSelection = pDrawView && pDrawView->AreObjectsMarked();
-    BOOL bHasPaintBrush = pViewData->GetView()->HasPaintBrush();
+    sal_Bool bSelection = pDrawView && pDrawView->AreObjectsMarked();
+    sal_Bool bHasPaintBrush = pViewData->GetView()->HasPaintBrush();
 
     if ( !bHasPaintBrush && !bSelection )
         rSet.DisableItem( SID_FORMATPAINTBRUSH );
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 7373142a9..2b8e71432 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -109,7 +109,7 @@ TYPEINIT1( ScDrawTextObjectBar, SfxShell );
 void ScDrawTextObjectBar::StateDisableItems( SfxItemSet &rSet )
 {
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
 
     while (nWhich)
     {
@@ -122,12 +122,12 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
     SfxShell(pData->GetViewShell()),
     pViewData(pData),
     pClipEvtLstnr(NULL),
-    bPastePossible(FALSE)
+    bPastePossible(sal_False)
 {
     SetPool( pViewData->GetScDrawView()->GetDefaultAttr().GetPool() );
 
     //	UndoManager wird beim Umschalten in den Edit-Modus umgesetzt...
-    SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
+    ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
     SetUndoManager( pMgr );
     if ( !pViewData->GetDocument()->IsUndoEnabled() )
     {
@@ -142,7 +142,7 @@ __EXPORT ScDrawTextObjectBar::~ScDrawTextObjectBar()
 {
     if ( pClipEvtLstnr )
     {
-        pClipEvtLstnr->AddRemoveListener( pViewData->GetActiveWin(), FALSE );
+        pClipEvtLstnr->AddRemoveListener( pViewData->GetActiveWin(), sal_False );
 
         //  #122057# The listener may just now be waiting for the SolarMutex and call the link
         //  afterwards, in spite of RemoveListener. So the link has to be reset, too.
@@ -171,7 +171,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
     }
 
     const SfxItemSet* pReqArgs = rReq.GetArgs();
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch ( nSlot )
     {
         case SID_COPY:
@@ -188,10 +188,10 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
 
         case SID_CLIPBOARD_FORMAT_ITEMS:
             {
-                ULONG nFormat = 0;
+                sal_uLong nFormat = 0;
                 const SfxPoolItem* pItem;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET &&
                      pItem->ISA(SfxUInt32Item) )
                 {
                     nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
@@ -213,8 +213,8 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
 
         case SID_SELECTALL:
             {
-                ULONG nCount = pOutliner->GetParagraphCount();
-                ESelection aSel( 0,0,(USHORT)nCount,0 );
+                sal_uLong nCount = pOutliner->GetParagraphCount();
+                ESelection aSel( 0,0,(sal_uInt16)nCount,0 );
                 pOutView->SetSelection( aSel );
             }
             break;
@@ -230,13 +230,13 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
                 const SfxItemSet *pArgs = rReq.GetArgs();
                 const SfxPoolItem* pItem = 0;
                 if( pArgs )
-                    pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
+                    pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem);
 
                 if ( pItem )
                 {
                     aString = ((const SfxStringItem*)pItem)->GetValue();
                     const SfxPoolItem* pFtItem = NULL;
-                    pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem);
+                    pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem);
                     const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
                     if ( pFontItem )
                     {
@@ -269,7 +269,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
             if( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET )
                 {
                     const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
                     const String& rName		= pHyper->GetName();
@@ -277,7 +277,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
                     const String& rTarget	= pHyper->GetTargetFrame();
                     SvxLinkInsertMode eMode = pHyper->GetInsertMode();
 
-                    BOOL bDone = FALSE;
+                    sal_Bool bDone = sal_False;
                     if ( pOutView && ( eMode == HLINK_DEFAULT || eMode == HLINK_FIELD ) )
                     {
                         const SvxFieldItem*	pFieldItem = pOutView->GetFieldAtSelection();
@@ -314,7 +314,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
                             pOutView->SetSelection( aSel );
                         }
 
-                        bDone = TRUE;
+                        bDone = sal_True;
                     }
 
                     if (!bDone)
@@ -396,13 +396,13 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
 void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
 {
     SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
-    BOOL bHasFontWork = pViewFrm->HasChildWindow(SID_FONTWORK);
-    BOOL bDisableFontWork = FALSE;
+    sal_Bool bHasFontWork = pViewFrm->HasChildWindow(SID_FONTWORK);
+    sal_Bool bDisableFontWork = sal_False;
 
     if (IsNoteEdit())
     {
         // #i21255# notes now support rich text formatting (#i74140# but not fontwork)
-        bDisableFontWork = TRUE;
+        bDisableFontWork = sal_True;
     }
 
     if ( bDisableFontWork )
@@ -417,7 +417,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
         OutlinerView* pOutView = pView->GetTextEditOutlinerView();
         if ( pOutView )
         {
-            BOOL bField = FALSE;
+            sal_Bool bField = sal_False;
             const SvxFieldItem*	pFieldItem = pOutView->GetFieldAtSelection();
             if (pFieldItem)
             {
@@ -428,7 +428,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
                     aHLinkItem.SetName( pURLField->GetRepresentation() );
                     aHLinkItem.SetURL( pURLField->GetURL() );
                     aHLinkItem.SetTargetFrame( pURLField->GetTargetFrame() );
-                    bField = TRUE;
+                    bField = sal_True;
                 }
             }
             if (!bField)
@@ -477,7 +477,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
         pView->GetAttributes( aAttrs );
         if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE )
         {
-            BOOL bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue();
+            sal_Bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue();
             rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) );
         }
     }
@@ -499,7 +499,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
         rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
 
         // disable thesaurus main menu and context menu entry if there is nothing to look up
-        BOOL bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang );
+        sal_Bool bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang );
         if (!bIsLookUpWord || !bCanDoThesaurus)
             rSet.DisableItem( SID_THES );
         if (!bCanDoThesaurus)
@@ -536,7 +536,7 @@ void __EXPORT ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
         pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScDrawTextObjectBar, ClipboardChanged ) );
         pClipEvtLstnr->acquire();
         Window* pWin = pViewData->GetActiveWin();
-        pClipEvtLstnr->AddRemoveListener( pWin, TRUE );
+        pClipEvtLstnr->AddRemoveListener( pWin, sal_True );
 
         // get initial state
         TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
@@ -544,7 +544,7 @@ void __EXPORT ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
     }
 
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         switch (nWhich)
@@ -588,7 +588,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
 
     SdrView* pView = pViewData->GetScDrawView();
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
 
     SfxItemSet aSet( pView->GetDefaultAttr() );
 
@@ -635,41 +635,41 @@ void lcl_RemoveFields( OutlinerView& rOutView )
     aSel.Adjust();
     xub_StrLen nNewEnd = aSel.nEndPos;
 
-    BOOL bUpdate = pOutliner->GetUpdateMode();
-    BOOL bChanged = FALSE;
+    sal_Bool bUpdate = pOutliner->GetUpdateMode();
+    sal_Bool bChanged = sal_False;
 
     //!	GetPortions and GetAttribs should be const!
     EditEngine& rEditEng = (EditEngine&)pOutliner->GetEditEngine();
 
-    ULONG nParCount = pOutliner->GetParagraphCount();
-    for (ULONG nPar=0; nPar<nParCount; nPar++)
+    sal_uLong nParCount = pOutliner->GetParagraphCount();
+    for (sal_uLong nPar=0; nPar<nParCount; nPar++)
         if ( nPar >= aSel.nStartPara && nPar <= aSel.nEndPara )
         {
             SvUShorts aPortions;
-            rEditEng.GetPortions( (USHORT)nPar, aPortions );
+            rEditEng.GetPortions( (sal_uInt16)nPar, aPortions );
             //!	GetPortions should use xub_StrLen instead of USHORT
 
-            for ( USHORT nPos = aPortions.Count(); nPos; )
+            for ( sal_uInt16 nPos = aPortions.Count(); nPos; )
             {
                 --nPos;
-                USHORT nEnd = aPortions.GetObject( nPos );
-                USHORT nStart = nPos ? aPortions.GetObject( nPos - 1 ) : 0;
+                sal_uInt16 nEnd = aPortions.GetObject( nPos );
+                sal_uInt16 nStart = nPos ? aPortions.GetObject( nPos - 1 ) : 0;
                 // fields are single characters
                 if ( nEnd == nStart+1 &&
                      ( nPar > aSel.nStartPara || nStart >= aSel.nStartPos ) &&
                      ( nPar < aSel.nEndPara   || nEnd   <= aSel.nEndPos ) )
                 {
-                    ESelection aFieldSel( (USHORT)nPar, nStart, (USHORT)nPar, nEnd );
+                    ESelection aFieldSel( (sal_uInt16)nPar, nStart, (sal_uInt16)nPar, nEnd );
                     SfxItemSet aSet = rEditEng.GetAttribs( aFieldSel );
                     if ( aSet.GetItemState( EE_FEATURE_FIELD ) == SFX_ITEM_ON )
                     {
                         if (!bChanged)
                         {
                             if (bUpdate)
-                                pOutliner->SetUpdateMode( FALSE );
+                                pOutliner->SetUpdateMode( sal_False );
                             String aName = ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );
                             pOutliner->GetUndoManager().EnterListAction( aName, aName );
-                            bChanged = TRUE;
+                            bChanged = sal_True;
                         }
 
                         String aFieldText = rEditEng.GetText( aFieldSel );
@@ -687,7 +687,7 @@ void lcl_RemoveFields( OutlinerView& rOutView )
     if (bUpdate && bChanged)
     {
         pOutliner->GetUndoManager().LeaveListAction();
-        pOutliner->SetUpdateMode( TRUE );
+        pOutliner->SetUpdateMode( sal_True );
     }
 
     if ( aOldSel.IsEqual( aSel ) )			// aSel is adjusted
@@ -701,15 +701,15 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
 {
     SdrView*			pView = pViewData->GetScDrawView();
     const SfxItemSet*	pArgs = rReq.GetArgs();
-    USHORT				nSlot = rReq.GetSlot();
+    sal_uInt16				nSlot = rReq.GetSlot();
 
-    BOOL bArgsInReq = ( pArgs != NULL );
+    sal_Bool bArgsInReq = ( pArgs != NULL );
     if ( !bArgsInReq )
     {
         SfxItemSet aEditAttr(pView->GetModel()->GetItemPool());
         pView->GetAttributes(aEditAttr);
         SfxItemSet	aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
-        BOOL		bDone = TRUE;
+        sal_Bool		bDone = sal_True;
 
         switch ( nSlot )
         {
@@ -721,7 +721,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
                     pOutView->Paint( Rectangle() );
 
                 SfxItemSet aEmptyAttr( *aEditAttr.GetPool(), EE_ITEMS_START, EE_ITEMS_END );
-                pView->SetAttributes( aEmptyAttr, TRUE );
+                pView->SetAttributes( aEmptyAttr, sal_True );
 
                 if ( pOutView )
                 {
@@ -731,7 +731,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
 
                 rReq.Done( aEmptyAttr );
                 pViewData->GetScDrawView()->InvalidateDrawTextAttrs();
-                bDone = FALSE; // bereits hier passiert
+                bDone = sal_False; // bereits hier passiert
             }
             break;
 
@@ -875,13 +875,13 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
             // font items from toolbox controller have to be applied for the right script type
 
             // #i78017 establish the same behaviour as in Writer
-            USHORT nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+            sal_uInt16 nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
             if (nSlot == SID_ATTR_CHAR_FONT)
                 nScript = pView->GetScriptType();
 
             SfxItemPool& rPool = GetPool();
             SvxScriptSetItem aSetItem( nSlot, rPool );
-            USHORT nWhich = rPool.GetWhich( nSlot );
+            sal_uInt16 nWhich = rPool.GetWhich( nSlot );
             aSetItem.PutItemForScriptType( nScript, pArgs->Get( nWhich ) );
 
             pView->SetAttributes( aSetItem.GetItemSet() );
@@ -904,8 +904,8 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     }
 
     SvtLanguageOptions	aLangOpt;
-    BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled();
-    BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled();
+    sal_Bool bDisableCTLFont = !aLangOpt.IsCTLFontEnabled();
+    sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled();
 
     SdrView* pView = pViewData->GetScDrawView();
     SfxItemSet aAttrSet(pView->GetModel()->GetItemPool());
@@ -917,10 +917,10 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
 
     //	choose font info according to selection script type
 
-    USHORT nScript = pView->GetScriptType();
+    sal_uInt16 nScript = pView->GetScriptType();
 
     // #i55929# input-language-dependent script type (depends on input language if nothing selected)
-    USHORT nInputScript = nScript;
+    sal_uInt16 nInputScript = nScript;
     OutlinerView* pOutView = pView->GetTextEditOutlinerView();
     if (pOutView && !pOutView->GetSelection().HasRange())
     {
@@ -945,16 +945,16 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     switch( eAdj )
     {
         case SVX_ADJUST_LEFT:
-            rDestSet.Put( SfxBoolItem( SID_ALIGNLEFT, TRUE ) );
+            rDestSet.Put( SfxBoolItem( SID_ALIGNLEFT, sal_True ) );
             break;
         case SVX_ADJUST_CENTER:
-            rDestSet.Put( SfxBoolItem( SID_ALIGNCENTERHOR, TRUE ) );
+            rDestSet.Put( SfxBoolItem( SID_ALIGNCENTERHOR, sal_True ) );
             break;
         case SVX_ADJUST_RIGHT:
-            rDestSet.Put( SfxBoolItem( SID_ALIGNRIGHT, TRUE ) );
+            rDestSet.Put( SfxBoolItem( SID_ALIGNRIGHT, sal_True ) );
             break;
         case SVX_ADJUST_BLOCK:
-            rDestSet.Put( SfxBoolItem( SID_ALIGNBLOCK, TRUE ) );
+            rDestSet.Put( SfxBoolItem( SID_ALIGNBLOCK, sal_True ) );
             break;
         default:
         {
@@ -969,19 +969,19 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
 
     //	Zeilenabstand
 
-    USHORT nLineSpace = (USHORT)
+    sal_uInt16 nLineSpace = (sal_uInt16)
                 ((const SvxLineSpacingItem&)aAttrSet.
                         Get( EE_PARA_SBL )).GetPropLineSpace();
     switch( nLineSpace )
     {
         case 100:
-            rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, TRUE ) );
+            rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, sal_True ) );
             break;
         case 150:
-            rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, TRUE ) );
+            rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, sal_True ) );
             break;
         case 200:
-            rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, TRUE ) );
+            rDestSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, sal_True ) );
             break;
     }
 
@@ -990,13 +990,13 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     SvxEscapement eEsc = (SvxEscapement) ( (const SvxEscapementItem&)
                     aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
     if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT )
-        rDestSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, TRUE ) );
+        rDestSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) );
     else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT )
-        rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, TRUE ) );
+        rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) );
 
     //	Unterstreichung
 
-    SfxItemState eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, TRUE );
+    SfxItemState eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, sal_True );
     if ( eState == SFX_ITEM_DONTCARE )
     {
         rDestSet.InvalidateItem( SID_ULINE_VAL_NONE );
@@ -1008,7 +1008,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
     {
         FontUnderline eUnderline = ((const SvxUnderlineItem&)
                     aAttrSet.Get(EE_CHAR_UNDERLINE)).GetLineStyle();
-        USHORT nId = SID_ULINE_VAL_NONE;
+        sal_uInt16 nId = SID_ULINE_VAL_NONE;
         switch (eUnderline)
         {
             case UNDERLINE_SINGLE:	nId = SID_ULINE_VAL_SINGLE;	break;
@@ -1017,18 +1017,18 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
             default:
                 break;
         }
-        rDestSet.Put( SfxBoolItem( nId, TRUE ) );
+        rDestSet.Put( SfxBoolItem( nId, sal_True ) );
     }
 
     //	horizontal / vertical
 
-    BOOL bLeftToRight = TRUE;
+    sal_Bool bLeftToRight = sal_True;
 
     SdrOutliner* pOutl = pView->GetTextEditOutliner();
     if( pOutl )
     {
         if( pOutl->IsVertical() )
-            bLeftToRight = FALSE;
+            bLeftToRight = sal_False;
     }
     else
         bLeftToRight = ( (const SvxWritingModeItem&) aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB;
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 2a06767d5..8e678380c 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -56,7 +56,7 @@
 #include "scabstdlg.hxx" //CHINA00
 //------------------------------------------------------------------------
 
-BOOL ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
+sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
                                                 SfxItemSet& rOutSet )
 {
 //CHINA001	ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
@@ -69,7 +69,7 @@ BOOL ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
     SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg(  pViewData->GetDialogParent(), &rArgs,
                                                         pViewData->GetSfxDocShell(),RID_SCDLG_CHAR );
     DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
-    BOOL bRet = ( pDlg->Execute() == RET_OK );
+    sal_Bool bRet = ( pDlg->Execute() == RET_OK );
 
     if ( bRet )
     {
@@ -82,7 +82,7 @@ BOOL ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
     return bRet;
 }
 
-BOOL ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
+sal_Bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
                                                 SfxItemSet& rOutSet )
 {
     SfxItemPool* pArgPool = rArgs.GetPool();
@@ -114,7 +114,7 @@ BOOL ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
 
     SfxAbstractTabDialog* pDlg = pFact->CreateScParagraphDlg( pViewData->GetDialogParent(), &aNewAttr, RID_SCDLG_PARAGRAPH);
     DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
-    BOOL bRet = ( pDlg->Execute() == RET_OK );
+    sal_Bool bRet = ( pDlg->Execute() == RET_OK );
 
     if ( bRet )
     {
@@ -139,7 +139,7 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ )
 
     TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
 
-    ULONG nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );
+    sal_uLong nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );
 
     //!	test if outliner view is still valid
 
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 7f21071b5..3520f4676 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -57,12 +57,12 @@
 
 //------------------------------------------------------------------------
 
-USHORT ScGetFontWorkId()
+sal_uInt16 ScGetFontWorkId()
 {
     return SvxFontWorkChildWindow::GetChildWindowId();
 }
 
-BOOL ScDrawTextObjectBar::IsNoteEdit()
+sal_Bool ScDrawTextObjectBar::IsNoteEdit()
 {
     return ScDrawLayer::IsNoteCaption( pViewData->GetView()->GetSdrView()->GetTextEditObject() );
 }
@@ -74,7 +74,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
     ScTabView*	 pTabView  = pViewData->GetView();
     ScDrawView*  pView	   = pTabView->GetScDrawView();
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch ( nSlot )
     {
         case SID_COPY:
@@ -84,7 +84,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
         case SID_CUT:
             pView->DoCut();
             if (!pTabView->IsDrawSelMode())
-                pViewData->GetViewShell()->SetDrawShell( FALSE );
+                pViewData->GetViewShell()->SetDrawShell( sal_False );
             break;
 
         case SID_PASTE:
@@ -118,11 +118,11 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
 
         case SID_ENABLE_HYPHENATION:
             {
-                SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, FALSE);
+                SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, sal_False);
                 if( pItem )
                 {
                     SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE );
-                    BOOL bValue = ( (const SfxBoolItem*) pItem)->GetValue();
+                    sal_Bool bValue = ( (const SfxBoolItem*) pItem)->GetValue();
                     aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) );
                     pView->SetAttributes( aSet );
                 }
@@ -139,7 +139,7 @@ void ScDrawTextObjectBar::GetGlobalClipState( SfxItemSet& rSet )
     //!	move paste etc. to view shell?
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         rSet.DisableItem( nWhich );
@@ -152,12 +152,12 @@ void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq )
     ScTabView*	 pTabView  = pViewData->GetView();
     ScDrawView*  pView	   = pTabView->GetScDrawView();
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch ( nSlot )
     {
         case SID_FONTWORK:
             {
-                USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
+                sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
 
                 if ( rReq.GetArgs() )
@@ -180,7 +180,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq )
                                     EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR,
                                     EE_PARA_JUST, EE_PARA_JUST,
                                     0 );
-                BOOL bLeft = ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT );
+                sal_Bool bLeft = ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT );
                 aAttr.Put( SvxFrameDirectionItem(
                                 bLeft ? FRMDIR_HORI_LEFT_TOP : FRMDIR_HORI_RIGHT_TOP,
                                 EE_PARA_WRITINGDIR ) );
@@ -211,12 +211,12 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
             pDrView->ScEndTextEdit();
 
         if (	SFX_ITEM_SET ==
-                rSet.GetItemState(XATTR_FORMTXTSTDFORM, TRUE, &pItem)
+                rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem)
              && XFTFORM_NONE !=
                 ((const XFormTextStdFormItem*) pItem)->GetValue() )
         {
 
-            USHORT nId				= SvxFontWorkChildWindow::GetChildWindowId();
+            sal_uInt16 nId				= SvxFontWorkChildWindow::GetChildWindowId();
             SfxViewFrame* pViewFrm	= pViewData->GetViewShell()->GetViewFrame();
             SvxFontWorkDialog* pDlg	= (SvxFontWorkDialog*)
                                        (pViewFrm->
@@ -238,7 +238,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
     SvxFontWorkDialog*	pDlg		= NULL;
     ScDrawView* 		pDrView 	= pViewData->GetView()->GetScDrawView();
     const SdrMarkList&	rMarkList	= pDrView->GetMarkedObjectList();
-    USHORT				nId = SvxFontWorkChildWindow::GetChildWindowId();
+    sal_uInt16				nId = SvxFontWorkChildWindow::GetChildWindowId();
 
     SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
     if ( pViewFrm->HasChildWindow(nId) )
@@ -251,7 +251,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
         !((SdrTextObj*) pObj)->HasText() )
     {
         if ( pDlg )
-            pDlg->SetActive(FALSE);
+            pDlg->SetActive(sal_False);
 
         rSet.DisableItem(XATTR_FORMTXTSTYLE);
         rSet.DisableItem(XATTR_FORMTXTADJUST);
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 9af9aad22..9d0108317 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -65,19 +65,19 @@ FuConstArc::~FuConstArc()
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
+sal_Bool __EXPORT FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FuConstruct::MouseButtonDown( rMEvt );
+    sal_Bool bReturn = FuConstruct::MouseButtonDown( rMEvt );
 
     if ( rMEvt.IsLeft() && !pView->IsAction() )
     {
         Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
         pWindow->CaptureMouse();
         pView->BegCreateObj( aPnt );
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
     return bReturn;
 }
@@ -88,7 +88,7 @@ BOOL __EXPORT FuConstArc::MouseButtonDown( const MouseEvent& rMEvt )
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstArc::MouseMove( const MouseEvent& rMEvt )
+sal_Bool __EXPORT FuConstArc::MouseMove( const MouseEvent& rMEvt )
 {
     return FuConstruct::MouseMove(rMEvt);
 }
@@ -99,25 +99,25 @@ BOOL __EXPORT FuConstArc::MouseMove( const MouseEvent& rMEvt )
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
+sal_Bool __EXPORT FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( pView->IsCreateObj() && rMEvt.IsLeft() )
     {
         // Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
         pView->EndCreateObj( SDRCREATE_NEXTPOINT );
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
 /*
     else if ( pView->IsCreateObj() && rMEvt.IsRight() )
     {
         // Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
         pView->EndCreateObj( SDRCREATE_FORCEEND );
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
 */
     return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
@@ -127,14 +127,14 @@ BOOL __EXPORT FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstArc::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuConstArc::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+    sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
     return(bReturn);
 }
 
@@ -171,7 +171,7 @@ void FuConstArc::Activate()
             break;
     }
 
-    pView->SetCurrentObj( sal::static_int_cast<UINT16>( aObjKind ) );
+    pView->SetCurrentObj( sal::static_int_cast<sal_uInt16>( aObjKind ) );
 
     aOldPointer = pWindow->GetPointer();
     pViewShell->SetActivePointer( aNewPointer );
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 96d1eb9e1..55a0392bb 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -75,12 +75,12 @@ FuConstCustomShape::~FuConstCustomShape()
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+    sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
     if ( rMEvt.IsLeft() && !pView->IsAction() )
     {
         Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
@@ -102,7 +102,7 @@ BOOL __EXPORT FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
                 pObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) );
         }
 
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
     return bReturn;
 }
@@ -113,7 +113,7 @@ BOOL __EXPORT FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
 {
     return FuConstruct::MouseMove(rMEvt);
 }
@@ -124,18 +124,18 @@ BOOL __EXPORT FuConstCustomShape::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( pView->IsCreateObj() && rMEvt.IsLeft() )
     {
         Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
         pView->EndCreateObj(SDRCREATE_FORCEEND);
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
     return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
 }
@@ -144,14 +144,14 @@ BOOL __EXPORT FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstCustomShape::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuConstCustomShape::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+    sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
     return(bReturn);
 }
 
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 47c2c9234..f49cbd0fd 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -73,12 +73,12 @@ FuConstPolygon::~FuConstPolygon()
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+    sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
 
     SdrViewEvent aVEvt;
     (void)pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -86,15 +86,15 @@ BOOL __EXPORT FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
     {
         // Texteingabe hier nicht zulassen
         aVEvt.eEvent = SDREVENT_BEGDRAGOBJ;
-        pView->EnableExtendedMouseEventDispatcher(FALSE);
+        pView->EnableExtendedMouseEventDispatcher(sal_False);
     }
     else
     {
-        pView->EnableExtendedMouseEventDispatcher(TRUE);
+        pView->EnableExtendedMouseEventDispatcher(sal_True);
     }
 
     if ( pView->MouseButtonDown(rMEvt, pWindow) )
-        bReturn = TRUE;
+        bReturn = sal_True;
 
     return bReturn;
 }
@@ -105,10 +105,10 @@ BOOL __EXPORT FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
 {
     pView->MouseMove(rMEvt, pWindow);
-    BOOL bReturn = FuConstruct::MouseMove(rMEvt);
+    sal_Bool bReturn = FuConstruct::MouseMove(rMEvt);
     return bReturn;
 }
 
@@ -118,13 +118,13 @@ BOOL __EXPORT FuConstPolygon::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FALSE;
-    BOOL bSimple = FALSE;
+    sal_Bool bReturn = sal_False;
+    sal_Bool bSimple = sal_False;
 
     SdrViewEvent aVEvt;
     (void)pView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt);
@@ -133,11 +133,11 @@ BOOL __EXPORT FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
 
     if (aVEvt.eEvent == SDREVENT_ENDCREATE)
     {
-        bReturn = TRUE;
-        bSimple = TRUE;			// Doppelklick nicht weiterreichen
+        bReturn = sal_True;
+        bSimple = sal_True;			// Doppelklick nicht weiterreichen
     }
 
-    BOOL bParent;
+    sal_Bool bParent;
     if (bSimple)
         bParent = FuConstruct::SimpleMouseButtonUp(rMEvt);
     else
@@ -150,14 +150,14 @@ BOOL __EXPORT FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstPolygon::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuConstPolygon::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+    sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
 
     return(bReturn);
 }
@@ -170,7 +170,7 @@ BOOL __EXPORT FuConstPolygon::KeyInput(const KeyEvent& rKEvt)
 
 void FuConstPolygon::Activate()
 {
-    pView->EnableExtendedMouseEventDispatcher(TRUE);
+    pView->EnableExtendedMouseEventDispatcher(sal_True);
 
     SdrObjKind eKind;
 
@@ -221,7 +221,7 @@ void FuConstPolygon::Activate()
         break;
     }
 
-    pView->SetCurrentObj(sal::static_int_cast<UINT16>(eKind));
+    pView->SetCurrentObj(sal::static_int_cast<sal_uInt16>(eKind));
 
     pView->SetEditMode(SDREDITMODE_CREATE);
 
@@ -242,7 +242,7 @@ void FuConstPolygon::Deactivate()
 {
     pView->SetEditMode(SDREDITMODE_EDIT);
 
-    pView->EnableExtendedMouseEventDispatcher(FALSE);
+    pView->EnableExtendedMouseEventDispatcher(sal_False);
 
     FuConstruct::Deactivate();
 
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 61a35df31..6a64ad54c 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -73,12 +73,12 @@ FuConstRectangle::~FuConstRectangle()
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+    sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
 
     if ( rMEvt.IsLeft() && !pView->IsAction() )
     {
@@ -106,7 +106,7 @@ BOOL __EXPORT FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
 {
     return FuConstruct::MouseMove(rMEvt);
 }
@@ -117,12 +117,12 @@ BOOL __EXPORT FuConstRectangle::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( pView->IsCreateObj() && rMEvt.IsLeft() )
     {
@@ -142,11 +142,11 @@ BOOL __EXPORT FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
                     ((SdrTextObj*)pObj)->ForceOutlinerParaObject();
                 OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
                 if( pOPO && !pOPO->IsVertical() )
-                    pOPO->SetVertical( TRUE );
+                    pOPO->SetVertical( sal_True );
             }
         }
 
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
     return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
 }
@@ -155,14 +155,14 @@ BOOL __EXPORT FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstRectangle::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuConstRectangle::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+    sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
     return(bReturn);
 }
 
@@ -205,7 +205,7 @@ void FuConstRectangle::Activate()
             break;
     }
 
-    pView->SetCurrentObj(sal::static_int_cast<UINT16>(aObjKind));
+    pView->SetCurrentObj(sal::static_int_cast<sal_uInt16>(aObjKind));
 
     aOldPointer = pWindow->GetPointer();
     pViewShell->SetActivePointer( aNewPointer );
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index ca1378011..527bb3c6b 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -69,7 +69,7 @@ FuConstruct::~FuConstruct()
 {
 }
 
-BYTE FuConstruct::Command(const CommandEvent& rCEvt)
+sal_uInt8 FuConstruct::Command(const CommandEvent& rCEvt)
 {
     //	special code for non-VCL OS2/UNX removed
 
@@ -82,18 +82,18 @@ BYTE FuConstruct::Command(const CommandEvent& rCEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
+    sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
 
     if ( pView->IsAction() )
     {
         if ( rMEvt.IsRight() )
             pView->BckAction();
-        return TRUE;
+        return sal_True;
     }
 
     aDragTimer.Start();
@@ -109,16 +109,16 @@ BOOL __EXPORT FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
         if ( pHdl != NULL || pView->IsMarkedHit(aMDPos) )
         {
             pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, 1);
-            bReturn = TRUE;
+            bReturn = sal_True;
         }
         else if ( pView->AreObjectsMarked() )
         {
             pView->UnmarkAll();
-            bReturn = TRUE;
+            bReturn = sal_True;
         }
     }
 
-    bIsInDragMode = FALSE;
+    bIsInDragMode = sal_False;
 
     return bReturn;
 }
@@ -129,7 +129,7 @@ BOOL __EXPORT FuConstruct::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstruct::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstruct::MouseMove(const MouseEvent& rMEvt)
 {
     FuDraw::MouseMove(rMEvt);
 
@@ -167,7 +167,7 @@ BOOL __EXPORT FuConstruct::MouseMove(const MouseEvent& rMEvt)
             pViewShell->SetActivePointer( aNewPointer );
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -176,16 +176,16 @@ BOOL __EXPORT FuConstruct::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = SimpleMouseButtonUp( rMEvt );
+    sal_Bool bReturn = SimpleMouseButtonUp( rMEvt );
 
     //		Doppelklick auf Textobjekt? (->fusel)
 
-    USHORT nClicks = rMEvt.GetClicks();
+    sal_uInt16 nClicks = rMEvt.GetClicks();
     if ( nClicks == 2 && rMEvt.IsLeft() )
     {
         if ( pView->AreObjectsMarked() )
@@ -200,8 +200,8 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
                 if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) )
                 {
                     OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
-                    BOOL bVertical = ( pOPO && pOPO->IsVertical() );
-                    USHORT nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT;
+                    sal_Bool bVertical = ( pOPO && pOPO->IsVertical() );
+                    sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT;
 
                     pViewShell->GetViewData()->GetDispatcher().
                         Execute(nTextSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
@@ -214,7 +214,7 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
                         Point aMousePixel = rMEvt.GetPosPixel();
                         pText->SetInEditMode( pObj, &aMousePixel );
                     }
-                    bReturn = TRUE;
+                    bReturn = sal_True;
                 }
             }
         }
@@ -227,9 +227,9 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
 
 //		SimpleMouseButtonUp - ohne Test auf Doppelklick
 
-BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
 {
-    BOOL	bReturn = TRUE;
+    sal_Bool	bReturn = sal_True;
 
     if (aDragTimer.IsActive() )
     {
@@ -244,7 +244,7 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
     else if ( pView->IsMarkObj() )
         pView->EndMarkObj();
 
-    else bReturn = FALSE;
+    else bReturn = sal_False;
 
     if ( !pView->IsAction() )
     {
@@ -252,7 +252,7 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
 
         if ( !pView->AreObjectsMarked() && rMEvt.GetClicks() < 2 )
         {
-            pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1());
+            pView->MarkObj(aPnt, -2, sal_False, rMEvt.IsMod1());
 
             SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher();
             if ( pView->AreObjectsMarked() )
@@ -269,14 +269,14 @@ BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstruct::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuConstruct::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     switch ( rKEvt.GetKeyCode().GetCode() )
     {
@@ -285,7 +285,7 @@ BOOL __EXPORT FuConstruct::KeyInput(const KeyEvent& rKEvt)
             {
                 pView->BrkAction();
                 pWindow->ReleaseMouse();
-                bReturn = TRUE;
+                bReturn = sal_True;
             }
             else							// Zeichenmodus beenden
             {
@@ -296,7 +296,7 @@ BOOL __EXPORT FuConstruct::KeyInput(const KeyEvent& rKEvt)
 
         case KEY_DELETE:
             pView->DeleteMarked();
-            bReturn = TRUE;
+            bReturn = sal_True;
             break;
     }
 
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 0cbbb9199..7f5325100 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -43,8 +43,8 @@ FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, ScDr
                    SdrModel* pDoc, SfxRequest& rReq)
     : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq)
 {
-    SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, FALSE );
-    SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, FALSE );
+    SFX_REQUEST_ARG( rReq, pInventorItem, SfxUInt32Item, SID_FM_CONTROL_INVENTOR, sal_False );
+    SFX_REQUEST_ARG( rReq, pIdentifierItem, SfxUInt16Item, SID_FM_CONTROL_IDENTIFIER, sal_False );
     if( pInventorItem )
         nInventor = pInventorItem->GetValue();
     if( pIdentifierItem )
@@ -67,19 +67,19 @@ FuConstUnoControl::~FuConstUnoControl()
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+    sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
 
     if ( rMEvt.IsLeft() && !pView->IsAction() )
     {
         Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
         pWindow->CaptureMouse();
         pView->BegCreateObj(aPnt);
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
     return bReturn;
 }
@@ -90,7 +90,7 @@ BOOL __EXPORT FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstUnoControl::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstUnoControl::MouseMove(const MouseEvent& rMEvt)
 {
     return FuConstruct::MouseMove(rMEvt);
 }
@@ -101,18 +101,18 @@ BOOL __EXPORT FuConstUnoControl::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( pView->IsCreateObj() && rMEvt.IsLeft() )
     {
         Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
         pView->EndCreateObj(SDRCREATE_FORCEEND);
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
     return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
 }
@@ -121,14 +121,14 @@ BOOL __EXPORT FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuConstUnoControl::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuConstUnoControl::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+    sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
     return(bReturn);
 }
 
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 4cbd08dae..cb94b0cb5 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -90,19 +90,19 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt)
     //	Control	= Snap (Toggle)
     //	Alt		= zentrisch
 
-    BOOL bShift	= rMEvt.IsShift();
-//    BOOL bCtrl  = rMEvt.IsMod1();
-    BOOL bAlt	= rMEvt.IsMod2();
+    sal_Bool bShift	= rMEvt.IsShift();
+//    sal_Bool bCtrl  = rMEvt.IsMod1();
+    sal_Bool bAlt	= rMEvt.IsMod2();
 
 //    ScViewData* pViewData = pViewShell->GetViewData();
 //    const ScViewOptions& rOpt = pViewData->GetOptions();
 //    const ScGridOptions& rGrid = rOpt.GetGridOptions();
-//    BOOL bGridOpt = rGrid.GetUseGridSnap();
+//    sal_Bool bGridOpt = rGrid.GetUseGridSnap();
 
-    BOOL bOrtho		= bShift;
-    BOOL bAngleSnap	= bShift;
-//    BOOL bGridSnap  = ( bGridOpt != bCtrl );        // andere Snap's nicht unterstuetzt
-    BOOL bCenter	= bAlt;
+    sal_Bool bOrtho		= bShift;
+    sal_Bool bAngleSnap	= bShift;
+//    sal_Bool bGridSnap  = ( bGridOpt != bCtrl );        // andere Snap's nicht unterstuetzt
+    sal_Bool bCenter	= bAlt;
 
     // #i33136#
     if(doConstructOrthogonal())
@@ -134,12 +134,12 @@ void FuDraw::ResetModifiers()
     ScViewData* pViewData = pViewShell->GetViewData();
     const ScViewOptions& rOpt = pViewData->GetOptions();
     const ScGridOptions& rGrid = rOpt.GetGridOptions();
-    BOOL bGridOpt = rGrid.GetUseGridSnap();
+    sal_Bool bGridOpt = rGrid.GetUseGridSnap();
 
     if (pView->IsOrtho())
-        pView->SetOrtho(FALSE);
+        pView->SetOrtho(sal_False);
     if (pView->IsAngleSnapEnabled())
-        pView->SetAngleSnapEnabled(FALSE);
+        pView->SetAngleSnapEnabled(sal_False);
 
     if (pView->IsGridSnap() != bGridOpt)
         pView->SetGridSnap(bGridOpt);
@@ -147,9 +147,9 @@ void FuDraw::ResetModifiers()
         pView->SetSnapEnabled(bGridOpt);
 
     if (pView->IsCreate1stPointAsCenter())
-        pView->SetCreate1stPointAsCenter(FALSE);
+        pView->SetCreate1stPointAsCenter(sal_False);
     if (pView->IsResizeAtCenter())
-        pView->SetResizeAtCenter(FALSE);
+        pView->SetResizeAtCenter(sal_False);
 }
 
 /*************************************************************************
@@ -158,13 +158,13 @@ void FuDraw::ResetModifiers()
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
     DoModifiers( rMEvt );
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -173,14 +173,14 @@ BOOL __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt)
 {
     //	#106438# evaluate modifiers only if in a drawing layer action
     //	(don't interfere with keyboard shortcut handling)
     if (pView->IsAction())
         DoModifiers( rMEvt );
 
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
@@ -189,35 +189,35 @@ BOOL __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
     ResetModifiers();
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEvent* pInitialKey )
+sal_Bool lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEvent* pInitialKey )
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
     if ( pObj && pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) )
     {
         // start text edit - like FuSelection::MouseButtonUp,
         // but with bCursorToEnd instead of mouse position
 
         OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
-        BOOL bVertical = ( pOPO && pOPO->IsVertical() );
-        USHORT nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT;
+        sal_Bool bVertical = ( pOPO && pOPO->IsVertical() );
+        sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT;
 
         // don't switch shells if text shell is already active
         FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr();
@@ -232,17 +232,17 @@ BOOL lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEven
         if ( pPoor && pPoor->GetSlotID() == nTextSlotId )	 //	no RTTI
         {
             FuText* pText = (FuText*)pPoor;
-            pText->SetInEditMode( pObj, NULL, TRUE, pInitialKey );
+            pText->SetInEditMode( pObj, NULL, sal_True, pInitialKey );
             //! set cursor to end of text
         }
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
     return bReturn;
 }
 
-BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
     ScViewData& rViewData = *pViewShell->GetViewData();
 
     switch ( rKEvt.GetKeyCode().GetCode() )
@@ -255,14 +255,14 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
      *			{
      *				pView->BrkAction();
      *				pWindow->ReleaseMouse();
-     *				bReturn = TRUE;
+     *				bReturn = sal_True;
      *			}
      *			else if ( pView->IsTextEdit() )
      *			{
      *				pView->EndTextEdit();
      *				pView->SetCreateMode();
      *				pViewShell->GetScDrawView()->InvalidateDrawTextAttrs();
-     *				bReturn = TRUE;
+     *				bReturn = sal_True;
      *			}
      *			else
      */
@@ -271,13 +271,13 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
             {
                 // in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus
                 rViewData.GetDispatcher().Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
-                bReturn = TRUE;
+                bReturn = sal_True;
             }
             else if ( pViewShell->IsDrawSelMode() )
             {
                 pView->UnmarkAll();
                 rViewData.GetDispatcher().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
-                bReturn = TRUE;
+                bReturn = sal_True;
             }
             else if ( pView->AreObjectsMarked() )
             {
@@ -290,15 +290,15 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
 
                 //	Beim Bezier-Editieren ist jetzt wieder das Objekt selektiert
                 if (!pView->AreObjectsMarked())
-                    pViewShell->SetDrawShell( FALSE );
+                    pViewShell->SetDrawShell( sal_False );
 
-                bReturn = TRUE;
+                bReturn = sal_True;
             }
             break;
 
         case KEY_DELETE:					//! ueber Accelerator
             pView->DeleteMarked();
-            bReturn = TRUE;
+            bReturn = sal_True;
         break;
 
         case KEY_RETURN:
@@ -310,7 +310,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                 const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
                 if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() )
                 {
-                    BOOL bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace();
+                    sal_Bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace();
                     SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
                     if( pObj && pObj->ISA( SdrOle2Obj ) && !bOle )
                     {
@@ -318,10 +318,10 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                         pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), 0 );
 
                         // consumed
-                        bReturn = TRUE;
+                        bReturn = sal_True;
                     }
                     else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) )		// start text edit for suitable object
-                        bReturn = TRUE;
+                        bReturn = sal_True;
                 }
             }
         }
@@ -338,7 +338,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                 {
                     SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
                     if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) )			// start text edit for suitable object
-                        bReturn = TRUE;
+                        bReturn = sal_True;
                 }
             }
         }
@@ -368,7 +368,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                     if(pView->AreObjectsMarked())
                         pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow);
 
-                    bReturn = TRUE;
+                    bReturn = sal_True;
                 }
 
                 // #98994# handle Mod1 and Mod2 to get travelling running on different systems
@@ -391,7 +391,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                     }
 
                     // consumed
-                    bReturn = TRUE;
+                    bReturn = sal_True;
                 }
             }
         }
@@ -410,13 +410,13 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                 {
                     // #97016# mark last object
                     pView->UnmarkAllObj();
-                    pView->MarkNextObj(FALSE);
+                    pView->MarkNextObj(sal_False);
 
                     // #97016# II
                     if(pView->AreObjectsMarked())
                         pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow);
 
-                    bReturn = TRUE;
+                    bReturn = sal_True;
                 }
             }
         }
@@ -435,13 +435,13 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                 {
                     // #97016# mark first object
                     pView->UnmarkAllObj();
-                    pView->MarkNextObj(TRUE);
+                    pView->MarkNextObj(sal_True);
 
                     // #97016# II
                     if(pView->AreObjectsMarked())
                         pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow);
 
-                    bReturn = TRUE;
+                    bReturn = sal_True;
                 }
             }
         }
@@ -470,7 +470,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
 
                 long nX = 0;
                 long nY = 0;
-                USHORT nCode = rKEvt.GetKeyCode().GetCode();
+                sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
 
                 if (nCode == KEY_UP)
                 {
@@ -497,7 +497,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                     nY = 0;
                 }
 
-                BOOL bReadOnly = rViewData.GetDocShell()->IsReadOnly();
+                sal_Bool bReadOnly = rViewData.GetDocShell()->IsReadOnly();
 
                 if(!rKEvt.GetKeyCode().IsMod1() && !bReadOnly)
                 {
@@ -565,7 +565,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                                 // #97016# II
                                 pView->MakeVisible(pView->GetAllMarkedRect(), *pWindow);
 
-                                bReturn = TRUE;
+                                bReturn = sal_True;
                             }
                         }
                         else
@@ -584,13 +584,13 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                                 if(pView->IsDragObj())
                                 {
                                     FASTBOOL bWasNoSnap = rDragStat.IsNoSnap();
-                                    BOOL bWasSnapEnabled = pView->IsSnapEnabled();
+                                    sal_Bool bWasSnapEnabled = pView->IsSnapEnabled();
 
                                     // switch snapping off
                                     if(!bWasNoSnap)
-                                        ((SdrDragStat&)rDragStat).SetNoSnap(TRUE);
+                                        ((SdrDragStat&)rDragStat).SetNoSnap(sal_True);
                                     if(bWasSnapEnabled)
-                                        pView->SetSnapEnabled(FALSE);
+                                        pView->SetSnapEnabled(sal_False);
 
                                     pView->MovAction(aEndPoint);
                                     pView->EndDragObj();
@@ -606,7 +606,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                                 Rectangle aVisRect(aEndPoint - Point(100, 100), Size(200, 200));
                                 pView->MakeVisible(aVisRect, *pWindow);
 
-                                bReturn = TRUE;
+                                bReturn = sal_True;
                             }
                         }
                     }
@@ -673,7 +673,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
                             }
                         }
 
-                        bReturn = TRUE;
+                        bReturn = sal_True;
                     }
                 }
             }
@@ -697,7 +697,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
 
             // start text edit for suitable object, pass key event to OutlinerView
             if ( lcl_KeyEditMode( pObj, pViewShell, &rKEvt ) )
-                bReturn = TRUE;
+                bReturn = sal_True;
         }
     }
 
@@ -761,7 +761,7 @@ void FuDraw::Deactivate()
 |*
 \************************************************************************/
 
-BOOL lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow )
+sal_Bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow )
 {
     SdrViewEvent aVEvt;
     MouseEvent aMEvt( rPosPixel, 1, 0, MOUSE_LEFT );
@@ -771,13 +771,13 @@ BOOL lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow )
     {
         if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) && ScDrawLayer::GetHitIMapObject(
                                 aVEvt.pObj, pWindow->PixelToLogic(rPosPixel), *pWindow ) )
-            return TRUE;
+            return sal_True;
 
         if ( aVEvt.eEvent == SDREVENT_EXECUTEURL )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void FuDraw::ForcePointer(const MouseEvent* pMEvt)
@@ -785,7 +785,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
     if ( !pView->IsAction() )
     {
         Point aPosPixel = pWindow->GetPointerPosPixel();
-        BOOL bAlt		= pMEvt && pMEvt->IsMod2();
+        sal_Bool bAlt		= pMEvt && pMEvt->IsMod2();
         Point aPnt		= pWindow->PixelToLogic( aPosPixel );
         SdrHdl* pHdl	= pView->PickHandle(aPnt);
         SdrObject* pObj;
@@ -841,9 +841,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
     }
 }
 
-BOOL FuDraw::IsSizingOrMovingNote( const MouseEvent& rMEvt ) const
+sal_Bool FuDraw::IsSizingOrMovingNote( const MouseEvent& rMEvt ) const
 {
-    BOOL bIsSizingOrMoving = FALSE;
+    sal_Bool bIsSizingOrMoving = sal_False;
     if ( rMEvt.IsLeft() )
     {
         const SdrMarkList& rNoteMarkList = pView->GetMarkedObjectList();
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 80d6324c8..e697113c1 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -106,7 +106,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r
         return;
 
     Size aPageSize = rPage;
-    BOOL bNegative = aPageSize.Width() < 0;
+    sal_Bool bNegative = aPageSize.Width() < 0;
     if ( bNegative )
     {
         //	make everything positive temporarily
@@ -148,7 +148,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r
 //------------------------------------------------------------------------
 
 void lcl_InsertGraphic( const Graphic& rGraphic,
-                        const String& rFileName, const String& rFilterName, BOOL bAsLink, BOOL bApi,
+                        const String& rFileName, const String& rFilterName, sal_Bool bAsLink, sal_Bool bApi,
                         ScTabViewShell*	pViewSh, Window* pWindow, SdrView* pView )
 {
     //	#74778# set the size so the graphic has its original pixel size
@@ -193,7 +193,7 @@ void lcl_InsertGraphic( const Graphic& rGraphic,
     pObj->SetName(aName);
 
     //	don't select if from (dispatch) API, to allow subsequent cell operations
-    ULONG nInsOptions = bApi ? SDRINSERT_DONTMARK : 0;
+    sal_uLong nInsOptions = bApi ? SDRINSERT_DONTMARK : 0;
     pView->InsertObjectAtView( pObj, *pPV, nInsOptions );
 
     // #118522# SetGraphicLink has to be used after inserting the object,
@@ -256,23 +256,23 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell*	pViewSh,
     const SfxItemSet* pReqArgs = rReq.GetArgs();
     const SfxPoolItem* pItem;
     if ( pReqArgs &&
-         pReqArgs->GetItemState( SID_INSERT_GRAPHIC, TRUE, &pItem ) == SFX_ITEM_SET )
+         pReqArgs->GetItemState( SID_INSERT_GRAPHIC, sal_True, &pItem ) == SFX_ITEM_SET )
     {
         String aFileName = ((const SfxStringItem*)pItem)->GetValue();
 
         String aFilterName;
-        if ( pReqArgs->GetItemState( FN_PARAM_FILTER, TRUE, &pItem ) == SFX_ITEM_SET )
+        if ( pReqArgs->GetItemState( FN_PARAM_FILTER, sal_True, &pItem ) == SFX_ITEM_SET )
             aFilterName = ((const SfxStringItem*)pItem)->GetValue();
 
-        BOOL bAsLink = FALSE;
-        if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
+        sal_Bool bAsLink = sal_False;
+        if ( pReqArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET )
             bAsLink = ((const SfxBoolItem*)pItem)->GetValue();
 
         Graphic aGraphic;
         int nError = GraphicFilter::LoadGraphic( aFileName, aFilterName, aGraphic, GraphicFilter::GetGraphicFilter() );
         if ( nError == GRFILTER_OK )
         {
-            lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, TRUE, pViewSh, pWindow, pView );
+            lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, sal_True, pViewSh, pWindow, pView );
         }
     }
     else
@@ -287,9 +287,9 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell*	pViewSh,
             {
                 String aFileName = aDlg.GetPath();
                 String aFilterName = aDlg.GetCurrentFilter();
-                BOOL bAsLink = aDlg.IsAsLink();
+                sal_Bool bAsLink = aDlg.IsAsLink();
 
-                lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, FALSE, pViewSh, pWindow, pView );
+                lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, sal_False, pViewSh, pWindow, pView );
 
                 //	append items for recording
                 rReq.AppendItem( SfxStringItem( SID_INSERT_GRAPHIC, aFileName ) );
@@ -302,7 +302,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell*	pViewSh,
                 //	error is handled in SvxOpenGraphicDialog::GetGraphic
 
 #if 0
-                USHORT nRes = 0;
+                sal_uInt16 nRes = 0;
                 switch ( nError )
                 {
                     case GRFILTER_OPENERROR:	nRes = SCSTR_GRFILTER_OPENERROR;	break;
@@ -319,7 +319,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell*	pViewSh,
                 }
                 else
                 {
-                    ULONG nStreamError = GetGrfFilter()->GetLastError().nStreamError;
+                    sal_uLong nStreamError = GetGrfFilter()->GetLastError().nStreamError;
                     if( ERRCODE_NONE != nStreamError )
                         ErrorHandler::HandleError( nStreamError );
                 }
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index c199324db..bf765344a 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -98,7 +98,7 @@ extern SdrObject* pSkipPaintObj;			// output.cxx - dieses Objekt nicht zeichnen
 //------------------------------------------------------------------------
 
 #define IS_AVAILABLE(WhichId,ppItem) \
-    (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+    (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 
 void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScViewData* pViewData,
                     const rtl::OUString& rRangeParam )
@@ -118,7 +118,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
 
         ScMarkData& rMark = pViewData->GetMarkData();
         if ( !rMark.IsMarked() )
-            pViewData->GetView()->MarkDataArea( TRUE );
+            pViewData->GetView()->MarkDataArea( sal_True );
 
         if ( pViewData->GetSimpleArea( nCol1,nRow1,nTab1, nCol2,nRow2,nTab2 ) == SC_MARK_SIMPLE )
         {
@@ -228,7 +228,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
 
     uno::Reference < embed::XEmbeddedObject > xObj;
     uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage();
-    BOOL bIsFromFile = FALSE;
+    sal_Bool bIsFromFile = sal_False;
     ::rtl::OUString aName;
 
     sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
@@ -236,7 +236,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
     uno::Reference< io::XInputStream > xIconMetaFile;
 
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False );
     if ( nSlot == SID_INSERT_OBJECT && pNameItem )
     {
@@ -427,7 +427,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
                 if (bIsFromFile)
                 {
                     // #45012# Objekt ist selektiert, also Draw-Shell aktivieren
-                    pViewShell->SetDrawShell( TRUE );
+                    pViewShell->SetDrawShell( sal_True );
                 }
                 else
                 {
@@ -516,7 +516,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
             bool bAutomaticMark = false;
             if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
             {
-                pViewSh->GetViewData()->GetView()->MarkDataArea( TRUE );
+                pViewSh->GetViewData()->GetView()->MarkDataArea( sal_True );
                 bAutomaticMark = true;
             }
 
@@ -524,18 +524,18 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
             aMultiMark.MarkToMulti();
 
             ScRangeList aRanges;
-            aMultiMark.FillRangeListWithMarks( &aRanges, FALSE );
+            aMultiMark.FillRangeListWithMarks( &aRanges, sal_False );
             String aStr;
             ScDocument* pDocument = pViewSh->GetViewData()->GetDocument();
             aRanges.Format( aStr, SCR_ABS_3D, pDocument, pDocument->GetAddressConvention() );
             aRangeString = aStr;
 
             // get "total" range for positioning
-            ULONG nCount = aRanges.Count();
+            sal_uLong nCount = aRanges.Count();
             if ( nCount > 0 )
             {
                 aPositionRange = *aRanges.GetObject(0);
-                for (ULONG i=1; i<nCount; i++)
+                for (sal_uLong i=1; i<nCount; i++)
                     aPositionRange.ExtendTo( *aRanges.GetObject(i) );
             }
 
@@ -566,7 +566,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
         ScRangeListRef aDummy;
         Rectangle aMarkDest;
         SCTAB nMarkTab;
-        BOOL bDrawRect = pViewShell->GetChartArea( aDummy, aMarkDest, nMarkTab );
+        sal_Bool bDrawRect = pViewShell->GetChartArea( aDummy, aMarkDest, nMarkTab );
 
         //	Objekt-Groesse
         awt::Size aSz = xObj->getVisualAreaSize( nAspect );
@@ -574,17 +574,17 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
 
         MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) );
 
-        BOOL bSizeCh = FALSE;
+        sal_Bool bSizeCh = sal_False;
         if (bDrawRect && !aMarkDest.IsEmpty())
         {
             aSize = aMarkDest.GetSize();
-            bSizeCh = TRUE;
+            bSizeCh = sal_True;
         }
         if (aSize.Height() <= 0 || aSize.Width() <= 0)
         {
             aSize.Width() = 5000;
             aSize.Height() = 5000;
-            bSizeCh = TRUE;
+            bSizeCh = sal_True;
         }
         if (bSizeCh)
         {
@@ -597,12 +597,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
         ScViewData* pData = pViewSh->GetViewData();
         ScDocShell* pScDocSh = pData->GetDocShell();
         ScDocument* pScDoc	 = pScDocSh->GetDocument();
-        BOOL bUndo (pScDoc->IsUndoEnabled());
+        sal_Bool bUndo (pScDoc->IsUndoEnabled());
 
         if( pReqArgs )
         {
             const SfxPoolItem* pItem;
-            UINT16 nToTable = 0;
+            sal_uInt16 nToTable = 0;
 
             if( IS_AVAILABLE( FN_PARAM_4, &pItem ) )
             {
@@ -614,15 +614,15 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                     //	-> wenn gesetzt, neue Tabelle, sonst aktuelle Tabelle
 
                     if ( ((const SfxBoolItem*)pItem)->GetValue() )
-                        nToTable = static_cast<UINT16>(pScDoc->GetTableCount());
+                        nToTable = static_cast<sal_uInt16>(pScDoc->GetTableCount());
                     else
-                        nToTable = static_cast<UINT16>(pData->GetTabNo());
+                        nToTable = static_cast<sal_uInt16>(pData->GetTabNo());
                 }
             }
             else
             {
                 if (bDrawRect)
-                    nToTable = static_cast<UINT16>(nMarkTab);
+                    nToTable = static_cast<sal_uInt16>(nMarkTab);
                 rReq.AppendItem( SfxUInt16Item( FN_PARAM_4, nToTable ) );
             }
 
@@ -637,7 +637,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
 
                 if ( pScDoc->InsertTab( nNewTab, aTabName ) )
                 {
-                    BOOL bAppend = TRUE;
+                    sal_Bool bAppend = sal_True;
 
                     if (bUndo)
                     {
@@ -647,7 +647,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                     }
 
                     pScDocSh->Broadcast( ScTablesHint( SC_TAB_INSERTED, nNewTab ) );
-                    pViewSh->SetTabNo( nNewTab, TRUE );
+                    pViewSh->SetTabNo( nNewTab, sal_True );
                     pScDocSh->PostPaintExtras();			//! erst hinterher ???
                 }
                 else
@@ -657,7 +657,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
             }
             else if ( nToTable != pData->GetTabNo() )
             {
-                pViewSh->SetTabNo( nToTable, TRUE );
+                pViewSh->SetTabNo( nToTable, sal_True );
             }
         }
 
@@ -788,7 +788,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                             bAddUndo = false;       // don't create the undo action for inserting
 
                             // leave the draw shell
-                            pViewShell->SetDrawShell( FALSE );
+                            pViewShell->SetDrawShell( sal_False );
                         }
                         else
                         {
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index c3602ce0e..9ff17507b 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -51,8 +51,8 @@
 FuMarkRect::FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP,
                SdrModel* pDoc, SfxRequest& rReq) :
     FuPoor(pViewSh, pWin, pViewP, pDoc, rReq),
-    bVisible(FALSE),
-    bStartDrag(FALSE)
+    bVisible(sal_False),
+    bStartDrag(sal_False)
 {
 }
 
@@ -72,18 +72,18 @@ FuMarkRect::~FuMarkRect()
 |*
 \************************************************************************/
 
-BOOL FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
     pWindow->CaptureMouse();
     pView->UnmarkAll();			// der Einheitlichkeit halber und wegen #50558#
-    bStartDrag = TRUE;
+    bStartDrag = sal_True;
 
     aBeginPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() );
     aZoomRect = Rectangle( aBeginPos, Size() );
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -92,7 +92,7 @@ BOOL FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL FuMarkRect::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuMarkRect::MouseMove(const MouseEvent& rMEvt)
 {
     if ( bStartDrag )
     {
@@ -106,7 +106,7 @@ BOOL FuMarkRect::MouseMove(const MouseEvent& rMEvt)
         aZoomRect = aRect;
         aZoomRect.Justify();
         pViewShell->DrawMarkRect(aZoomRect);
-        bVisible = TRUE;
+        bVisible = sal_True;
     }
 
     ForcePointer(&rMEvt);
@@ -120,7 +120,7 @@ BOOL FuMarkRect::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
@@ -129,12 +129,12 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
     {
         // Hide ZoomRect
         pViewShell->DrawMarkRect(aZoomRect);
-        bVisible = FALSE;
+        bVisible = sal_False;
     }
 
     Size aZoomSizePixel = pWindow->LogicToPixel(aZoomRect).GetSize();
 
-    USHORT nMinMove = pView->GetMinMoveDistancePixel();
+    sal_uInt16 nMinMove = pView->GetMinMoveDistancePixel();
     if ( aZoomSizePixel.Width() < nMinMove || aZoomSizePixel.Height() < nMinMove )
     {
         // Klick auf der Stelle
@@ -142,7 +142,7 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
         aZoomRect.SetSize(Size());		// dann ganz leer
     }
 
-    bStartDrag = FALSE;
+    bStartDrag = sal_False;
     pWindow->ReleaseMouse();
 
     pViewShell->GetViewData()->GetDispatcher().
@@ -154,11 +154,11 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
 
         //	Chart-Dialog starten:
 
-//	USHORT nId  = ScChartDlgWrapper::GetChildWindowId();
+//	sal_uInt16 nId  = ScChartDlgWrapper::GetChildWindowId();
 //	SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId );
-//	SC_MOD()->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+//	SC_MOD()->SetRefDialog( nId, pWnd ? sal_False : sal_True );
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -167,7 +167,7 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BYTE FuMarkRect::Command(const CommandEvent& rCEvt)
+sal_uInt8 FuMarkRect::Command(const CommandEvent& rCEvt)
 {
     if ( COMMAND_STARTDRAG == rCEvt.GetCommand() )
     {
@@ -183,14 +183,14 @@ BYTE FuMarkRect::Command(const CommandEvent& rCEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL FuMarkRect::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuMarkRect::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     switch ( rKEvt.GetKeyCode().GetCode() )
     {
@@ -198,7 +198,7 @@ BOOL FuMarkRect::KeyInput(const KeyEvent& rKEvt)
             //	beenden
             pViewShell->GetViewData()->GetDispatcher().
                 Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
-            bReturn = TRUE;
+            bReturn = sal_True;
             break;
     }
 
@@ -246,7 +246,7 @@ void FuMarkRect::Activate()
     ScMarkData& rMark = pViewData->GetMarkData();
 
     if ( !rMark.IsMultiMarked() && !rMark.IsMarked() )
-        pViewShell->MarkDataArea( TRUE );
+        pViewShell->MarkDataArea( sal_True );
 
     pViewData->GetMultiArea( aSourceRange );		// Mehrfachselektion erlaubt
 
@@ -269,8 +269,8 @@ void FuMarkRect::Deactivate()
     {
         // Hide ZoomRect
         pViewShell->DrawMarkRect(aZoomRect);
-        bVisible = FALSE;
-        bStartDrag = FALSE;
+        bVisible = sal_False;
+        bStartDrag = sal_False;
     }
 }
 
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 314b16b2a..001cc7bbd 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -55,7 +55,7 @@ FuPoor::FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP,
     pDrDoc(pDoc),
     aSfxRequest(rReq),
     pDialog(NULL),
-    bIsInDragMode(FALSE),
+    bIsInDragMode(sal_False),
     // #95491# remember MouseButton state
     mnCode(0)
 {
@@ -178,21 +178,21 @@ IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG )
 IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer )
 
 // #95491# moved from inline to *.cxx
-BOOL FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
 { 
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    return FALSE; 
+    return sal_False; 
 }
 
 // #95491# moved from inline to *.cxx
-BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
 { 
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    return FALSE; 
+    return sal_False; 
 }
 
 /*************************************************************************
@@ -207,25 +207,25 @@ BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL FuPoor::KeyInput(const KeyEvent& /* rKEvt */)
+sal_Bool FuPoor::KeyInput(const KeyEvent& /* rKEvt */)
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     return(bReturn);
 }
 
-BYTE FuPoor::Command(const CommandEvent& rCEvt)
+sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt)
 {
     if ( COMMAND_STARTDRAG == rCEvt.GetCommand() )
     {
         //!!! sollte Joe eigentlich machen:
         // nur, wenn im Outliner was selektiert ist, darf
-        // Command TRUE zurueckliefern:
+        // Command sal_True zurueckliefern:
 
         OutlinerView* pOutView = pView->GetTextEditOutlinerView();
 
@@ -306,7 +306,7 @@ IMPL_LINK( FuPoor, DragHdl, void *, EMPTYARG )
     if ( pHdl==NULL && pView->IsMarkedHit(aMDPos) )
     {
         pWindow->ReleaseMouse();
-        bIsInDragMode = TRUE;
+        bIsInDragMode = sal_True;
 
 //		pView->BeginDrag(pWindow, aMDPos);
         pViewShell->GetScDrawView()->BeginDrag(pWindow, aMDPos);
@@ -316,24 +316,24 @@ IMPL_LINK( FuPoor, DragHdl, void *, EMPTYARG )
 
 //	Detektiv-Linie
 
-BOOL FuPoor::IsDetectiveHit( const Point& rLogicPos )
+sal_Bool FuPoor::IsDetectiveHit( const Point& rLogicPos )
 {
     SdrPageView* pPV = pView->GetSdrPageView();
     if (!pPV)
-        return FALSE;
+        return sal_False;
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SdrObjListIter aIter( *pPV->GetObjList(), IM_FLAT );
     SdrObject* pObject = aIter.Next();
     while (pObject && !bFound)
     {
         if (ScDetectiveFunc::IsNonAlienArrow( pObject ))
         {
-            USHORT nHitLog = (USHORT) pWindow->PixelToLogic(
+            sal_uInt16 nHitLog = (sal_uInt16) pWindow->PixelToLogic(
                                 Size(pView->GetHitTolerancePixel(),0)).Width();
             if(SdrObjectPrimitiveHit(*pObject, rLogicPos, nHitLog, *pPV, 0, false))
             {
-                bFound = TRUE;
+                bFound = sal_True;
             }
         }
 
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 5787fc6d9..59e33b2c9 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -83,7 +83,7 @@ using namespace com::sun::star;
 FuSelection::FuSelection(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP,
                SdrModel* pDoc, SfxRequest& rReq ) :
     FuDraw(pViewSh, pWin, pViewP, pDoc, rReq),
-    bVCAction(FALSE)
+    bVCAction(sal_False)
 {
 }
 
@@ -97,7 +97,7 @@ FuSelection::~FuSelection()
 {
 }
 
-BYTE FuSelection::Command(const CommandEvent& rCEvt)
+sal_uInt8 FuSelection::Command(const CommandEvent& rCEvt)
 {
     //	special code for non-VCL OS2/UNX removed
 
@@ -110,7 +110,7 @@ BYTE FuSelection::Command(const CommandEvent& rCEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
@@ -119,13 +119,13 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
     {
         if ( bSelectionOnly )
             pView->BckAction();
-        return TRUE;
+        return sal_True;
     }
 
-    bVCAction = FALSE;
-    bIsInDragMode = FALSE;		//	irgendwo muss es ja zurueckgesetzt werden (#50033#)
+    bVCAction = sal_False;
+    bIsInDragMode = sal_False;		//	irgendwo muss es ja zurueckgesetzt werden (#50033#)
 
-    BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
+    sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
 
     aMDPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() );
 
@@ -165,16 +165,16 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
             {
                 aDragTimer.Start();
                 pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
-                bReturn = TRUE;
+                bReturn = sal_True;
             }
         }
         else
         {
-            BOOL bAlt = rMEvt.IsMod2();
+            sal_Bool bAlt = rMEvt.IsMod2();
             if ( !bAlt && pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) )
             {
                 pView->BegMacroObj(aMDPos, pObj, pPV, pWindow);
-                bReturn = TRUE;
+                bReturn = sal_True;
             }
             else
             {
@@ -204,7 +204,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                            pObj = pHit;
                    }
 
-                   ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE );
+                   ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, sal_True );
 #ifdef ISSUE66550_HLINK_FOR_SHAPES
                    // For interoperability favour links over macros if both are defined
                    if ( pInfo->GetHlink().getLength() > 0 )
@@ -228,7 +228,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                            pObjSh->CallXScript( pInfo->GetMacro(),
                                *pInArgs, aRet, aOutArgsIndex, aOutArgs);
                            pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() );
-                           return TRUE;        // kein CaptureMouse etc.
+                           return sal_True;        // kein CaptureMouse etc.
                        }
                    }
                 }
@@ -262,13 +262,13 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                 {
                     ScGlobal::OpenURL( sURL, sTarget );
                     pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() );
-                    return TRUE;        // kein CaptureMouse etc.
+                    return sal_True;        // kein CaptureMouse etc.
                 }
 
                 //	Is another object being edited in this view?
                 //	(Editing is ended in MarkListHasChanged - test before UnmarkAll)
                 SfxInPlaceClient* pClient = pViewShell->GetIPClient();
-                BOOL bWasOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
+                sal_Bool bWasOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
 
                 //	Markieren
 
@@ -283,7 +283,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                     pView->UnlockInternalLayer();
 
                 // try to select the clicked object
-                if ( pView->MarkObj( aMDPos, -2, FALSE, rMEvt.IsMod1() ) )
+                if ( pView->MarkObj( aMDPos, -2, sal_False, rMEvt.IsMod1() ) )
                 {
                     //*********************************************************
                     //Objekt verschieben
@@ -299,11 +299,11 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
 
                         pHdl=pView->PickHandle(aMDPos);
                         pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
-                        bReturn = TRUE;
+                        bReturn = sal_True;
                     }
                     else									// Objekt am Rand getroffen
                         if (pViewShell->IsDrawSelMode())
-                            bReturn = TRUE;
+                            bReturn = sal_True;
                 }
                 else
                 {
@@ -315,7 +315,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                         //Objekt selektieren
                         //********************************************************
                         pView->BegMarkObj(aMDPos);
-                        bReturn = TRUE;
+                        bReturn = sal_True;
                     }
                 }
             }
@@ -339,9 +339,9 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt)
 {
-    BOOL bReturn = FuDraw::MouseMove(rMEvt);
+    sal_Bool bReturn = FuDraw::MouseMove(rMEvt);
 
     if (aDragTimer.IsActive() )
     {
@@ -359,7 +359,7 @@ BOOL __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt)
 
         ForceScroll(aPix);
         pView->MovAction(aPnt);
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
 
     // Ein VCControl ist aktiv
@@ -372,7 +372,7 @@ BOOL __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt)
         //VCSbxForm* pForm = (VCSbxForm*)(SbxObject*)(pPage->GetSbxForm());
         //((VCManager*)(pForm->GetVCContainer()))->
         //    MouseMove( pWindow, rMEvt );
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
 
     ForcePointer(&rMEvt);
@@ -386,14 +386,14 @@ BOOL __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FuDraw::MouseButtonUp(rMEvt);
-//	BOOL bOle	 = pViewShell->GetViewData()->IsOle();
-    BOOL bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace();
+    sal_Bool bReturn = FuDraw::MouseButtonUp(rMEvt);
+//	sal_Bool bOle	 = pViewShell->GetViewData()->IsOle();
+    sal_Bool bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace();
 
     if (aDragTimer.IsActive() )
     {
@@ -426,8 +426,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                 if ( pView && pDocument )
                 {
                     const SdrMarkList& rSdrMarkList = pView->GetMarkedObjectList();
-                    ULONG nMarkCount = rSdrMarkList.GetMarkCount();
-                    for ( ULONG i = 0; i < nMarkCount; ++i )
+                    sal_uLong nMarkCount = rSdrMarkList.GetMarkCount();
+                    for ( sal_uLong i = 0; i < nMarkCount; ++i )
                     {
                         SdrMark* pMark = rSdrMarkList.GetMark( i );
                         SdrObject* pObj = ( pMark ? pMark->GetMarkedSdrObj() : NULL );
@@ -452,7 +452,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                   FuText* pText = static_cast<FuText*>(pPoor);
                 pText->StopDragMode(pObj );
             }
-            bReturn = TRUE;
+            bReturn = sal_True;
         }
         else if (pView->IsAction() )
         {
@@ -461,16 +461,16 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
             pView->EndAction();
             if ( pView->AreObjectsMarked() )
             {
-                bReturn = TRUE;
+                bReturn = sal_True;
 
                 /*  if multi-selection contains a note caption object, remove
                     all other objects from selection. */
                 const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-                ULONG nCount = rMarkList.GetMarkCount();
+                sal_uLong nCount = rMarkList.GetMarkCount();
                 if( nCount > 1 )
                 {
                     bool bFound = false;
-                    for( ULONG nIdx = 0; !bFound && (nIdx < nCount); ++nIdx )
+                    for( sal_uLong nIdx = 0; !bFound && (nIdx < nCount); ++nIdx )
                     {
                         SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj();
                         bFound = ScDrawLayer::IsNoteCaption( pObj );
@@ -488,9 +488,9 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
 /*
     if ( pView->IsObjEdit() )
     {
-        BOOL bShowCursor = TRUE;
+        sal_Bool bShowCursor = sal_True;
 //! 	pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor);
-        bReturn = TRUE;
+        bReturn = sal_True;
     }
 */
     /**************************************************************************
@@ -507,7 +507,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
             pIPClient->DeactivateObject();
     }
 
-    USHORT nClicks = rMEvt.GetClicks();
+    sal_uInt16 nClicks = rMEvt.GetClicks();
     if ( nClicks == 2 && rMEvt.IsLeft() )
     {
         if ( pView->AreObjectsMarked() )
@@ -525,7 +525,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                 SdrHitKind eHit = pView->PickAnything( rMEvt, SDRMOUSEBUTTONDOWN, aVEvt );
                 if ( eHit != SDRHIT_NONE && aVEvt.pObj == pObj )
                 {
-                    UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+                    sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
 
                     //
                     //	OLE: aktivieren
@@ -551,8 +551,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                     else if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) && !pObj->ISA(SdrMediaObj) )
                     {
                         OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
-                        BOOL bVertical = ( pOPO && pOPO->IsVertical() );
-                        USHORT nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT;
+                        sal_Bool bVertical = ( pOPO && pOPO->IsVertical() );
+                        sal_uInt16 nTextSlotId = bVertical ? SID_DRAW_TEXT_VERTICAL : SID_DRAW_TEXT;
 
                         pViewShell->GetViewData()->GetDispatcher().
                             Execute(nTextSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
@@ -565,13 +565,13 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                             Point aMousePixel = rMEvt.GetPosPixel();
                             pText->SetInEditMode( pObj, &aMousePixel );
                         }
-                        bReturn = TRUE;
+                        bReturn = sal_True;
                     }
                 }
             }
         }
         else if ( TestDetective( pView->GetSdrPageView(), aPnt ) )
-            bReturn = TRUE;
+            bReturn = sal_True;
     }
 
     // Ein VCControl ist aktiv
@@ -585,8 +585,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
         //((VCManager*)(pForm->GetVCContainer()))->
         //    MouseButtonUp( pWindow, rMEvt );
         //HMHpView->ShowMarkHdl();
-        bVCAction = FALSE;
-        bReturn = TRUE;
+        bVCAction = sal_False;
+        bReturn = sal_True;
     }
 
     ForcePointer(&rMEvt);
@@ -619,14 +619,14 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL FuSelection::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if (!bReturn)
     {
@@ -677,7 +677,7 @@ void FuSelection::Deactivate()
     /**************************************************************************
     * Hide Cursor
     **************************************************************************/
-//    BOOL bShowCursor = FALSE;
+//    sal_Bool bShowCursor = sal_False;
 //! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor);
 
 //	pView->SetDragMode(SDRDRAG_MOVE);
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index 36d2f1cbb..7f4512ec7 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -63,19 +63,19 @@ inline long Diff( const Point& rP1, const Point& rP2 )
     return nX+nY;
 }
 
-BOOL FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos )
+sal_Bool FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos )
 {
     if (!pPV)
-        return FALSE;
+        return sal_False;
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SdrObjListIter aIter( *pPV->GetObjList(), IM_FLAT );
     SdrObject* pObject = aIter.Next();
     while (pObject && !bFound)
     {
         if (ScDetectiveFunc::IsNonAlienArrow( pObject ))
         {
-            USHORT nHitLog = (USHORT) pWindow->PixelToLogic(
+            sal_uInt16 nHitLog = (sal_uInt16) pWindow->PixelToLogic(
                                 Size(pView->GetHitTolerancePixel(),0)).Width();
             if (SdrObjectPrimitiveHit(*pObject, rPos, nHitLog, *pPV, 0, false))
             {
@@ -93,11 +93,11 @@ BOOL FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos )
                 pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), ePos, nEndCol, nEndRow );
                 SCsCOL nCurX = (SCsCOL) pViewData->GetCurX();
                 SCsROW nCurY = (SCsROW) pViewData->GetCurY();
-                BOOL bStart = ( Diff( rPos,aLineStart ) > Diff( rPos,aLineEnd ) );
+                sal_Bool bStart = ( Diff( rPos,aLineStart ) > Diff( rPos,aLineEnd ) );
                 if ( nCurX == nStartCol && nCurY == nStartRow )
-                    bStart = FALSE;
+                    bStart = sal_False;
                 else if ( nCurX == nEndCol && nCurY == nEndRow )
-                    bStart = TRUE;
+                    bStart = sal_True;
 
                 SCsCOL nDifX;
                 SCsROW nDifY;
@@ -111,9 +111,9 @@ BOOL FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos )
                     nDifX = nEndCol - nCurX;
                     nDifY = nEndRow - nCurY;
                 }
-                pViewShell->MoveCursorRel( nDifX, nDifY, SC_FOLLOW_JUMP, FALSE );
+                pViewShell->MoveCursorRel( nDifX, nDifY, SC_FOLLOW_JUMP, sal_False );
 
-                bFound = TRUE;
+                bFound = sal_True;
             }
         }
 
@@ -148,7 +148,7 @@ bool FuSelection::IsNoteCaptionClicked( const Point& rPos ) const
         bool bProtectDoc =  rDoc.IsTabProtected( nTab ) || (pDocSh && pDocSh->IsReadOnly());
 
         // search the last object (on top) in the object list
-        SdrObjListIter aIter( *pPageView->GetObjList(), IM_DEEPNOGROUPS, TRUE );
+        SdrObjListIter aIter( *pPageView->GetObjList(), IM_DEEPNOGROUPS, sal_True );
         for( SdrObject* pObj = aIter.Next(); pObj; pObj = aIter.Next() )
         {
             if( pObj->GetLogicRect().IsInside( rPos ) )
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 11f7574f0..477fabf79 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -131,13 +131,13 @@ FuText::~FuText()
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
     if ( pView->MouseButtonDown(rMEvt, pWindow) )
-        return (TRUE);				   // Event von der SdrView ausgewertet
+        return (sal_True);				   // Event von der SdrView ausgewertet
 
     if ( pView->IsTextEdit() )
     {
@@ -152,13 +152,13 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
     {
         SdrHdl* pHdl = pView->PickHandle(aMDPos);
 
-        ULONG nHdlNum = pView->GetHdlNum(pHdl);
+        sal_uLong nHdlNum = pView->GetHdlNum(pHdl);
 
         if (pHdl != NULL)
         {
             if (pView->HasMarkablePoints() && pView->IsPointMarkable(*pHdl))
             {
-                BOOL bPointMarked=pView->IsPointMarked(*pHdl);
+                sal_Bool bPointMarked=pView->IsPointMarked(*pHdl);
 
                 if ( rMEvt.IsShift() )
                 {
@@ -198,8 +198,8 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
                 //	vertical flag:
                 //	deduced from slot ids only if text object has no content
 
-                USHORT nSlotID = aSfxRequest.GetSlot();
-                BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
+                sal_uInt16 nSlotID = aSfxRequest.GetSlot();
+                sal_Bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
                 OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
                 if ( pOPO )
                     bVertical = pOPO->IsVertical();		// content wins
@@ -213,7 +213,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
 
                     OutlinerView* pOLV = pView->GetTextEditOutlinerView();
                     if ( pOLV->MouseButtonDown(rMEvt) )
-                        return (TRUE); // Event an den Outliner
+                        return (sal_True); // Event an den Outliner
                 }
             }
             else
@@ -244,7 +244,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
         }
         else
         {
-            BOOL bMacro = FALSE;
+            sal_Bool bMacro = sal_False;
 
 //			if (bMacro && pView->TakeMacroObject(aMDPos,pObj,pPV))
             if (bMacro && pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) )
@@ -256,7 +256,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
             {
                 if (pView->IsEditMode())
                 {
-                    BOOL bPointMode=pView->HasMarkablePoints();
+                    sal_Bool bPointMode=pView->HasMarkablePoints();
 
                     if (!rMEvt.IsShift())
                     {
@@ -276,7 +276,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
                         pHdl=pView->GetHdl(nHdlNum);
                     }
 
-                    if ( pView->MarkObj(aMDPos, -2, FALSE, rMEvt.IsMod1()) )
+                    if ( pView->MarkObj(aMDPos, -2, sal_False, rMEvt.IsMod1()) )
                     {
                         aDragTimer.Start();
 
@@ -333,7 +333,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
                     pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow ));
 
 //	return (bReturn);
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -342,9 +342,9 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
 //	pViewShell->SetActivePointer(aNewPointer);
 
@@ -361,7 +361,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
     }
 
     if ( pView->MouseMove(rMEvt, pWindow) )
-        return (TRUE); // Event von der SdrView ausgewertet
+        return (sal_True); // Event von der SdrView ausgewertet
 
     if ( pView->IsAction() )
     {
@@ -386,12 +386,12 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
 {
     // #95491# remember button state for creation of own MouseEvents
     SetMouseButtonCode(rMEvt.GetButtons());
 
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if (aDragTimer.IsActive() )
     {
@@ -403,7 +403,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
     Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
 
     if ( pView->MouseButtonUp(rMEvt, pWindow) )
-        return (TRUE); // Event von der SdrView ausgewertet
+        return (sal_True); // Event von der SdrView ausgewertet
 
     if ( pView->IsDragObj() )
     {
@@ -437,20 +437,20 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
                     SfxItemSet aItemSet( pDrDoc->GetItemPool(),
                                             SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
 
-                    aItemSet.Put( SdrTextAutoGrowWidthItem( FALSE ) );
-                    aItemSet.Put( SdrTextAutoGrowHeightItem( FALSE ) );
+                    aItemSet.Put( SdrTextAutoGrowWidthItem( sal_False ) );
+                    aItemSet.Put( SdrTextAutoGrowHeightItem( sal_False ) );
                     aItemSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) );
                     aItemSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) );
                     aItemSet.Put( SdrTextAniCountItem( 1 ) );
                     aItemSet.Put( SdrTextAniAmountItem(
-                                    (INT16)pWindow->PixelToLogic(Size(2,1)).Width()) );
+                                    (sal_Int16)pWindow->PixelToLogic(Size(2,1)).Width()) );
                     pObj->SetMergedItemSetAndBroadcast(aItemSet);
                 }
             }
 
             // #93382# init object different when vertical writing
             sal_uInt16 nSlotID(aSfxRequest.GetSlot());
-            BOOL bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotID);
+            sal_Bool bVertical = (SID_DRAW_TEXT_VERTICAL == nSlotID);
             if(bVertical)
             {
                 const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
@@ -462,10 +462,10 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
                         SdrTextObj* pText = (SdrTextObj*)pObj;
                         SfxItemSet aSet(pDrDoc->GetItemPool());
 
-                        pText->SetVerticalWriting(TRUE);
+                        pText->SetVerticalWriting(sal_True);
 
-                        aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
-                        aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
+                        aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+                        aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
                         aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
                         aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
 
@@ -481,7 +481,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
 
             if ( !pView->AreObjectsMarked() )
             {
-                pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1());
+                pView->MarkObj(aPnt, -2, sal_False, rMEvt.IsMod1());
 
                 SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher();
                 if ( pView->AreObjectsMarked() )
@@ -501,7 +501,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
 
         if ( !pView->AreObjectsMarked() && rMEvt.GetClicks() < 2 )
         {
-            pView->MarkObj(aPnt, -2, FALSE, rMEvt.IsMod1());
+            pView->MarkObj(aPnt, -2, sal_False, rMEvt.IsMod1());
 
             SfxDispatcher& rDisp = pViewShell->GetViewData()->GetDispatcher();
             if ( pView->AreObjectsMarked() )
@@ -574,18 +574,18 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
 |* FALSE.
 |*
 \************************************************************************/
 
-BOOL __EXPORT FuText::KeyInput(const KeyEvent& rKEvt)
+sal_Bool __EXPORT FuText::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( pView->KeyInput(rKEvt, pWindow) )
     {
-        bReturn = TRUE;
+        bReturn = sal_True;
         lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() );
     }
     else
@@ -619,10 +619,10 @@ void FuText::Activate()
         /**********************************************************************
         * Kein Textobjekt im EditMode, daher CreateMode setzen
         **********************************************************************/
-        USHORT nObj = OBJ_TEXT;
+        sal_uInt16 nObj = OBJ_TEXT;
 
-/*		UINT16 nIdent;
-        UINT32 nInvent;
+/*		sal_uInt16 nIdent;
+        sal_uInt32 nInvent;
         pView->TakeCurrentObj(nIdent, nInvent);
 */
         pView->SetCurrentObj(nObj);
@@ -678,7 +678,7 @@ void FuText::SelectionHasChanged()
             SdrMark* pMark = rMarkList.GetMark(0);
             SdrObject* pObj = pMark->GetMarkedSdrObj();
 
-            UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+            sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
 
             if (nSdrObjKind == OBJ_TEXT ||
                 nSdrObjKind == OBJ_TITLETEXT ||
@@ -695,9 +695,9 @@ void FuText::SelectionHasChanged()
         /**********************************************************************
         * Kein Textobjekt im EditMode, daher CreateMode setzen
         **********************************************************************/
-        USHORT nObj = OBJ_TEXT;
-        UINT16 nIdent;
-        UINT32 nInvent;
+        sal_uInt16 nObj = OBJ_TEXT;
+        sal_uInt16 nIdent;
+        sal_uInt32 nInvent;
         pView->TakeCurrentObj(nIdent, nInvent);
 
 //		  if (! pView->IsEditMode() )
@@ -729,7 +729,7 @@ void FuText::SelectionHasChanged()
 \************************************************************************/
 
 void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
-                            BOOL bCursorToEnd, const KeyEvent* pInitialKey)
+                            sal_Bool bCursorToEnd, const KeyEvent* pInitialKey)
 {
     /*  It is possible to pass a special (unselected) object in pObj, e.g. the
         caption object of a cell note. If pObj is 0, then the selected object
@@ -751,7 +751,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
 
     if ( pObj )
     {
-        UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+        sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
 
         if (nSdrObjKind == OBJ_TEXT ||
             nSdrObjKind == OBJ_TITLETEXT ||
@@ -770,8 +770,8 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
                 //	vertical flag:
                 //	deduced from slot ids only if text object has no content
 
-                USHORT nSlotID = aSfxRequest.GetSlot();
-                BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
+                sal_uInt16 nSlotID = aSfxRequest.GetSlot();
+                sal_Bool bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
                 OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
                 if ( pOPO )
                     bVertical = pOPO->IsVertical();		// content wins
@@ -847,8 +847,8 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
             {
                 SfxItemSet aSet(pDrDoc->GetItemPool());
 
-                aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
-                aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
+                aSet.Put(SdrTextAutoGrowWidthItem(sal_True));
+                aSet.Put(SdrTextAutoGrowHeightItem(sal_False));
                 aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
                 aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
 
@@ -859,12 +859,12 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
             {
                 SfxItemSet aSet(pDrDoc->GetItemPool(), SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
 
-                aSet.Put( SdrTextAutoGrowWidthItem( FALSE ) );
-                aSet.Put( SdrTextAutoGrowHeightItem( FALSE ) );
+                aSet.Put( SdrTextAutoGrowWidthItem( sal_False ) );
+                aSet.Put( SdrTextAutoGrowHeightItem( sal_False ) );
                 aSet.Put( SdrTextAniKindItem( SDRTEXTANI_SLIDE ) );
                 aSet.Put( SdrTextAniDirectionItem( SDRTEXTANI_LEFT ) );
                 aSet.Put( SdrTextAniCountItem( 1 ) );
-                aSet.Put( SdrTextAniAmountItem( (INT16)pWindow->PixelToLogic(Size(2,1)).Width()) );
+                aSet.Put( SdrTextAniAmountItem( (sal_Int16)pWindow->PixelToLogic(Size(2,1)).Width()) );
 
                 pObj->SetMergedItemSetAndBroadcast(aSet);
             }
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index dd6c80f17..e34a8d1e6 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -58,10 +58,10 @@
 //	Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden,
 //	damit die Aenderungen ins Dokument uebernommen werden!
 //	(Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte)
-//	bTextDirection=TRUE means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx).
+//	bTextDirection=sal_True means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx).
 // ------------------------------------------------------------------------------------
 
-void FuText::StopEditMode(BOOL /*bTextDirection*/)
+void FuText::StopEditMode(sal_Bool /*bTextDirection*/)
 {
     SdrObject* pObject = pView->GetTextEditObject();
     if( !pObject ) return;
@@ -85,7 +85,7 @@ void FuText::StopEditMode(BOOL /*bTextDirection*/)
     }
 
     ScDocShell* pDocShell = rViewData.GetDocShell();
-    SfxUndoManager* pUndoMgr = rDoc.IsUndoEnabled() ? pDocShell->GetUndoManager() : 0;
+    ::svl::IUndoManager* pUndoMgr = rDoc.IsUndoEnabled() ? pDocShell->GetUndoManager() : 0;
     bool bNewNote = false;
     if( pNote && pUndoMgr )
     {
@@ -187,7 +187,7 @@ void FuText::StopEditMode(BOOL /*bTextDirection*/)
         // invalidate stream positions only for the affected sheet
         rDoc.LockStreamValid(false);
         if (rDoc.IsStreamValid(aNotePos.Tab()))
-            rDoc.SetStreamValid(aNotePos.Tab(), FALSE);
+            rDoc.SetStreamValid(aNotePos.Tab(), sal_False);
     }
 }
 
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index e38dba336..70beb996d 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -95,14 +95,14 @@ void ScGraphicShell::GetFilterState( SfxItemSet& rSet )
 {
     ScDrawView* pView = GetViewData()->GetScDrawView();
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    BOOL bEnable = FALSE;
+    sal_Bool bEnable = sal_False;
 
     if( rMarkList.GetMarkCount() == 1 )
     {
         SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
 
         if( pObj && pObj->ISA( SdrGrafObj ) && ( ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) )
-            bEnable = TRUE;
+            bEnable = sal_True;
     }
 
     if( !bEnable )
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 92d8b6c5a..9965850a6 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -74,7 +74,7 @@ void ScMediaShell::GetMediaState( SfxItemSet& rSet )
     if( pView )
     {
         SfxWhichIter	aIter( rSet );
-        USHORT			nWhich = aIter.FirstWhich();
+        sal_uInt16			nWhich = aIter.FirstWhich();
 
         while( nWhich )
         {
@@ -117,7 +117,7 @@ void ScMediaShell::ExecuteMedia( SfxRequest& rReq )
         const SfxItemSet*	pArgs = rReq.GetArgs();
         const SfxPoolItem*	pItem;
 
-        if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) )
+        if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, sal_False, &pItem ) ) )
             pItem = NULL;
 
         if( pItem )
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index a19b3e984..55cb53dc3 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -75,7 +75,7 @@ SFX_IMPL_DOCKINGWINDOW( ScFunctionChildWindow, FID_FUNCTION_BOX )
 #************************************************************************/
 
 __EXPORT ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP,
-                                    USHORT nId,
+                                    sal_uInt16 nId,
                                     SfxBindings* pBindings,
                                     SfxChildWinInfo* pInfo ) :
     SfxChildWindow( pParentP, nId )
@@ -124,13 +124,13 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
 
     eSfxNewAlignment=GetAlignment();
     eSfxOldAlignment=eSfxNewAlignment;
-    aFiFuncDesc.SetUpdateMode(TRUE);
+    aFiFuncDesc.SetUpdateMode(sal_True);
     pAllFuncList=&aFuncList;
     aDDFuncList.Disable();
     aDDFuncList.Hide();
     nArgs=0;
     nDockMode=0;
-    bSizeFlag=FALSE;
+    bSizeFlag=sal_False;
     aCatBox.SetDropDownLineCount(9);
     Font aFont=aFiFuncDesc.GetFont();
     aFont.SetColor(Color(COL_BLACK));
@@ -150,7 +150,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
 
     Link a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl);
     aPrivatSplit.SetCtrModifiedHdl(a3Link);
-    StartListening( *pBindingsP, TRUE );
+    StartListening( *pBindingsP, sal_True );
 
     Point aTopLeft=aCatBox.GetPosPixel();
     //String aString=aCatBox.GetEntry( 0)+String("www");
@@ -165,7 +165,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
                 GetOutputSizePixel().Height()-2*aTxtSize.Height());
     aPrivatSplit.SetYRange(aYRange);
     SelHdl(&aCatBox);
-    bInit=TRUE;
+    bInit=sal_True;
 }
 
 /*************************************************************************
@@ -205,10 +205,10 @@ __EXPORT ScFunctionDockWin::~ScFunctionDockWin()
 void ScFunctionDockWin::InitLRUList()
 {
     const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
-    USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX );
-    USHORT*	pLRUListIds = rAppOpt.GetLRUFuncList();
+    sal_uInt16 nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (sal_uInt16)LRU_MAX );
+    sal_uInt16*	pLRUListIds = rAppOpt.GetLRUFuncList();
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i=0; i<LRU_MAX; i++ )
         aLRUList[i] = NULL;
 
@@ -219,7 +219,7 @@ void ScFunctionDockWin::InitLRUList()
             aLRUList[i] = pFuncMgr->Get( pLRUListIds[i] );
     }
 
-    USHORT	nSelPos	  = aCatBox.GetSelectEntryPos();
+    sal_uInt16	nSelPos	  = aCatBox.GetSelectEntryPos();
 
     if(nSelPos == 0)
         UpdateFunctionList();
@@ -265,7 +265,7 @@ void ScFunctionDockWin::UpdateLRUList()
 
 void ScFunctionDockWin::SetSize()
 {
-    USHORT nSelEntry=0;
+    sal_uInt16 nSelEntry=0;
     SfxChildAlignment  aChildAlign=eSfxOldAlignment;//GetAlignment();
     short nNewDockMode;
     switch(aChildAlign)
@@ -343,16 +343,16 @@ void ScFunctionDockWin::SetSize()
 
 void ScFunctionDockWin::SetLeftRightSize()
 {
-    if(bSizeFlag==FALSE)
+    if(bSizeFlag==sal_False)
     {
-        bSizeFlag=TRUE;
+        bSizeFlag=sal_True;
 
         Size aDiffSize=GetSizePixel();
         Size aNewSize=GetOutputSizePixel();
         aDiffSize.Width()-=aNewSize.Width();
         aDiffSize.Height()-=aNewSize.Height();
 
-        //@ SetUpdateMode( FALSE);
+        //@ SetUpdateMode( sal_False);
 
         String aString = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ww"));
 
@@ -373,8 +373,8 @@ void ScFunctionDockWin::SetLeftRightSize()
         aNewSize.Width()+=aDiffSize.Width();
         aNewSize.Height()+=aDiffSize.Height();
         //SetSizePixel(aNewSize);
-        //@ SetUpdateMode( TRUE);
-        bSizeFlag=FALSE;
+        //@ SetUpdateMode( sal_True);
+        bSizeFlag=sal_False;
     }
 
 }
@@ -395,9 +395,9 @@ void ScFunctionDockWin::SetLeftRightSize()
 
 void ScFunctionDockWin::SetTopBottonSize()
 {
-    if(bSizeFlag==FALSE)
+    if(bSizeFlag==sal_False)
     {
-        bSizeFlag=TRUE;
+        bSizeFlag=sal_True;
         Size aDiffSize=GetSizePixel();
         Size aNewSize=GetOutputSizePixel();
         aDiffSize.Width()-=aNewSize.Width();
@@ -409,8 +409,8 @@ void ScFunctionDockWin::SetTopBottonSize()
         aNewSize.Width()+=aDiffSize.Width();
         aNewSize.Height()+=aDiffSize.Height();
         //SetSizePixel(aNewSize);
-        //@ SetUpdateMode( TRUE);
-        bSizeFlag=FALSE;
+        //@ SetUpdateMode( sal_True);
+        bSizeFlag=sal_False;
     }
 }
 
@@ -431,7 +431,7 @@ void ScFunctionDockWin::SetTopBottonSize()
 
 void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize)
 {
-    if((ULONG)aNewSize.Width()<nMinWidth)	aNewSize.Width()=nMinWidth;
+    if((sal_uLong)aNewSize.Width()<nMinWidth)	aNewSize.Width()=nMinWidth;
 
     Size aCDSize=aCatBox.GetSizePixel();
     Size aFLSize=aFuncList.GetSizePixel();
@@ -471,7 +471,7 @@ void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize)
 
 void ScFunctionDockWin::SetMyHeightLeRi(Size &aNewSize)
 {
-    if((ULONG)aNewSize.Height()<nMinHeight) aNewSize.Height()=nMinHeight;
+    if((sal_uLong)aNewSize.Height()<nMinHeight) aNewSize.Height()=nMinHeight;
 
     Size aFLSize=aFuncList.GetSizePixel();
     Size aSplitterSize=aPrivatSplit.GetSizePixel();
@@ -520,7 +520,7 @@ void ScFunctionDockWin::SetMyHeightLeRi(Size &aNewSize)
 
 void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize)
 {
-    if((ULONG)aNewSize.Width()<nMinWidth)	aNewSize.Width()=nMinWidth;
+    if((sal_uLong)aNewSize.Width()<nMinWidth)	aNewSize.Width()=nMinWidth;
 
     Size aCDSize=aCatBox.GetSizePixel();
     Size aDdFLSize=aDDFuncList.GetSizePixel();
@@ -561,7 +561,7 @@ void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize)
 
 void ScFunctionDockWin::SetMyHeightToBo(Size &aNewSize)
 {
-    if((ULONG)aNewSize.Height()<nMinHeight) aNewSize.Height()=nMinHeight;
+    if((sal_uLong)aNewSize.Height()<nMinHeight) aNewSize.Height()=nMinHeight;
 
     Size aFDSize=aFiFuncDesc.GetSizePixel();
 
@@ -644,8 +644,8 @@ void ScFunctionDockWin::SetDescription()
 
 void __EXPORT ScFunctionDockWin::Resizing( Size& rNewSize )
 {
-    if((ULONG)rNewSize.Width()<nMinWidth) rNewSize.Width()=nMinWidth;
-    if((ULONG)rNewSize.Height()<nMinHeight) rNewSize.Height()=nMinHeight;
+    if((sal_uLong)rNewSize.Width()<nMinWidth) rNewSize.Width()=nMinWidth;
+    if((sal_uLong)rNewSize.Height()<nMinHeight) rNewSize.Height()=nMinHeight;
 
 }
 
@@ -663,9 +663,9 @@ void __EXPORT ScFunctionDockWin::Resizing( Size& rNewSize )
 #*
 #************************************************************************/
 
-BOOL __EXPORT ScFunctionDockWin::Close()
+sal_Bool __EXPORT ScFunctionDockWin::Close()
 {
-    SfxBoolItem aItem( FID_FUNCTION_BOX, FALSE );
+    SfxBoolItem aItem( FID_FUNCTION_BOX, sal_False );
 
     GetBindings().GetDispatcher()->Execute( FID_FUNCTION_BOX,
                                 SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
@@ -673,7 +673,7 @@ BOOL __EXPORT ScFunctionDockWin::Close()
 
     SfxDockingWindow::Close();
 
-    return( TRUE );
+    return( sal_True );
 }
 
 
@@ -703,7 +703,7 @@ SfxChildAlignment __EXPORT ScFunctionDockWin::CheckAlignment(SfxChildAlignment /
     }
     else
     {
-        bInit=FALSE;
+        bInit=sal_False;
         eSfxOldAlignment=aChildAlign;
         eSfxNewAlignment=aChildAlign;
     }
@@ -815,12 +815,12 @@ void __EXPORT ScFunctionDockWin::Resize()
 
 void ScFunctionDockWin::UpdateFunctionList()
 {
-    USHORT	nSelPos	  = aCatBox.GetSelectEntryPos();
-    USHORT	nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
+    sal_uInt16	nSelPos	  = aCatBox.GetSelectEntryPos();
+    sal_uInt16	nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
                             ? (nSelPos-1) : 0;
 
     pAllFuncList->Clear();
-    pAllFuncList->SetUpdateMode( FALSE );
+    pAllFuncList->SetUpdateMode( sal_False );
 
     if ( nSelPos > 0 )
     {
@@ -837,7 +837,7 @@ void ScFunctionDockWin::UpdateFunctionList()
     }
     else // LRU-Liste
     {
-        for ( USHORT i=0; i<LRU_MAX && aLRUList[i]; i++ )
+        for ( sal_uInt16 i=0; i<LRU_MAX && aLRUList[i]; i++ )
         {
             const ScFuncDesc* pDesc = aLRUList[i];
             pAllFuncList->SetEntryData(
@@ -848,7 +848,7 @@ void ScFunctionDockWin::UpdateFunctionList()
 
 
     //------------------------------------------------------
-    pAllFuncList->SetUpdateMode( TRUE );
+    pAllFuncList->SetUpdateMode( sal_True );
 
     if ( pAllFuncList->GetEntryCount() > 0 )
     {
@@ -877,7 +877,7 @@ void ScFunctionDockWin::UpdateFunctionList()
 #*
 #************************************************************************/
 
-void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
+void ScFunctionDockWin::DoEnter(sal_Bool /* bOk */) //@@ ???
 {
     String aFirstArgStr;
     String aParaStr;
@@ -919,8 +919,8 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
                 if ( nArgs != VAR_ARGS )
                 {	// no VarArgs or Fix plus VarArgs, but not VarArgs only
                     String aArgSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "; " ));
-                    USHORT nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 );
-                    for ( USHORT nArg = 1;
+                    sal_uInt16 nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 );
+                    for ( sal_uInt16 nArg = 1;
                             nArg < nFix && !pDesc->pDefArgFlags[nArg].bOptional; nArg++ )
                     {
                         if (!pDesc->pDefArgFlags[nArg].bSuppress)
@@ -948,7 +948,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
                 if(nArgs>0)
                 {
                     pHdl->InsertFunction(aString);
-                    pEdView->InsertText(aArgStr,TRUE);
+                    pEdView->InsertText(aArgStr,sal_True);
                     ESelection	aESel=pEdView->GetSelection();
                     aESel.nEndPos=aESel.nStartPos+aFirstArgStr.Len();
                     pEdView->SetSelection(aESel);
@@ -957,7 +957,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
                 else
                 {
                     aString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "()" ));
-                    pEdView->InsertText(aString,FALSE);
+                    pEdView->InsertText(aString,sal_False);
                     pHdl->DataChanged();
                 }
             }
@@ -1030,7 +1030,7 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl )
     if ((ImageButton *)pCtrl == &aInsertButton ||
         (ListBox *)pCtrl == &aFuncList)
     {
-        DoEnter(TRUE);			// Uebernimmt die Eingabe
+        DoEnter(sal_True);			// Uebernimmt die Eingabe
     }
     //...
 
@@ -1133,10 +1133,10 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo)
     if ( aStr.Len())
     {
         aSplitterInitPos=aPrivatSplit.GetPosPixel();
-        aSplitterInitPos.Y()=(USHORT) aStr.ToInt32();
+        aSplitterInitPos.Y()=(sal_uInt16) aStr.ToInt32();
         xub_StrLen n1 = aStr.Search(';');
         aStr.Erase(0, n1+1);
-        USHORT nSelPos=sal::static_int_cast<USHORT>( aStr.ToInt32() );
+        sal_uInt16 nSelPos=sal::static_int_cast<sal_uInt16>( aStr.ToInt32() );
         aCatBox.SelectEntryPos(nSelPos);
         SelHdl(&aCatBox);
 
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index a0847374b..a8b58707e 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -107,7 +107,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
             {
                 pScViewShell = PTR_CAST( ScTabViewShell, pMyViewFrm->GetViewShell() );
                 if( pScViewShell )
-                    pScViewShell->UpdateInputHandler(TRUE);
+                    pScViewShell->UpdateInputHandler(sal_True);
                 pParentDoc = pMyViewFrm->GetObjectShell();
             }
         }
@@ -132,10 +132,10 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
     if ( pInputHdl )
         pInputHdl->NotifyChange( NULL );
 
-    m_aHelper.enableInput( FALSE );
+    m_aHelper.enableInput( sal_False );
     m_aHelper.EnableSpreadsheets();
     m_aHelper.Init();
-    m_aHelper.SetDispatcherLock( TRUE );
+    m_aHelper.SetDispatcherLock( sal_True );
 
     notifyChange();
     fill();
@@ -165,26 +165,26 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
 
         String aFormula;
         pDoc->GetFormula( nCol, nRow, nTab, aFormula );
-        BOOL bEdit   = ( aFormula.Len() > 1 );
-        BOOL bMatrix = FALSE;
+        sal_Bool bEdit   = ( aFormula.Len() > 1 );
+        sal_Bool bMatrix = sal_False;
         if ( bEdit )
         {
             bMatrix = CheckMatrix(aFormula);
 
             xub_StrLen nFStart = 0;
             xub_StrLen nFEnd   = 0;
-            if ( GetFormulaHelper().GetNextFunc( aFormula, FALSE, nFStart, &nFEnd) )
+            if ( GetFormulaHelper().GetNextFunc( aFormula, sal_False, nFStart, &nFEnd) )
             {
                 pScMod->InputReplaceSelection( aFormula );
                 pScMod->InputSetSelection( nFStart, nFEnd );
                 xub_StrLen PrivStart, PrivEnd;
                 pScMod->InputGetSelection( PrivStart, PrivEnd);
 
-                eMode = SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,TRUE,TRUE);
+                eMode = SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,sal_True,sal_True);
                 pData->SetFStart( nFStart );
             }
             else
-                bEdit = FALSE;
+                bEdit = sal_False;
         }
 
         if ( !bEdit )
@@ -197,12 +197,12 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
             pScMod->InputSetSelection( 1, aNewFormula.Len()+1 );
             xub_StrLen PrivStart, PrivEnd;
             pScMod->InputGetSelection( PrivStart, PrivEnd);
-            SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,FALSE,FALSE);
+            SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,sal_False,sal_False);
 
             pData->SetFStart( 1 );		// hinter dem "="
         }
 
-        pData->SetMode( (USHORT) eMode );
+        pData->SetMode( (sal_uInt16) eMode );
         String rStrExp = GetMeText();
 
         pCell = new ScFormulaCell( pDoc, aCursorPos, rStrExp );
@@ -284,9 +284,9 @@ __EXPORT ScFormulaDlg::~ScFormulaDlg()
     delete pCell;
 }
 
-BOOL ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl)
+sal_Bool ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl)
 {
-    BOOL bAlive = FALSE;
+    sal_Bool bAlive = sal_False;
 
     //	gehoert der InputHandler zu irgendeiner ViewShell ?
 
@@ -295,7 +295,7 @@ BOOL ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl)
     while ( pSh && !bAlive )
     {
         if (((ScTabViewShell*)pSh)->GetInputHandler() == pHdl)
-            bAlive = TRUE;
+            bAlive = sal_True;
         pSh = SfxViewShell::GetNext( *pSh, &aScType );
     }
 
@@ -325,10 +325,10 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell,PtrTabVi
 }
 
 
-BOOL __EXPORT ScFormulaDlg::Close()
+sal_Bool __EXPORT ScFormulaDlg::Close()
 {
-    DoEnter(FALSE);
-    return TRUE;
+    DoEnter(sal_False);
+    return sal_True;
 }
 
 //	--------------------------------------------------------------------------
@@ -336,7 +336,7 @@ BOOL __EXPORT ScFormulaDlg::Close()
 //	--------------------------------------------------------------------------
 bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
 {
-    BOOL bResult = TRUE;
+    sal_Bool bResult = sal_True;
 
     ::std::auto_ptr<ScFormulaCell> pFCell( new ScFormulaCell( pDoc, aCursorPos, rStrExp ) );
 
@@ -344,7 +344,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
     // wenn ein Name eigentlich als Bereich in die Gesamt-Formel
     // eingefuegt wird, bei der Einzeldarstellung aber als
     // single-Zellbezug interpretiert wird
-    BOOL bColRowName = pCell->HasColRowName();
+    sal_Bool bColRowName = pCell->HasColRowName();
     if ( bColRowName )
     {
         // ColRowName im RPN-Code?
@@ -357,10 +357,10 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
             pFCell.reset( new ScFormulaCell( pDoc, aCursorPos, aBraced ) );
         }
         else
-            bColRowName = FALSE;
+            bColRowName = sal_False;
     }
 
-    USHORT nErrCode = pFCell->GetErrCode();
+    sal_uInt16 nErrCode = pFCell->GetErrCode();
     if ( nErrCode == 0 )
     {
         SvNumberFormatter& aFormatter = *(pDoc->GetFormatTable());
@@ -368,7 +368,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
         if ( pFCell->IsValue() )
         {
             double n = pFCell->GetValue();
-            ULONG nFormat = aFormatter.GetStandardFormat( n, 0,
+            sal_uLong nFormat = aFormatter.GetStandardFormat( n, 0,
                             pFCell->GetFormatType(), ScGlobal::eLnge );
             aFormatter.GetOutputString( n, nFormat,
                                         rStrResult, &pColor );
@@ -378,7 +378,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
             String aStr;
 
             pFCell->GetString( aStr );
-            ULONG nFormat = aFormatter.GetStandardFormat(
+            sal_uLong nFormat = aFormatter.GetStandardFormat(
                             pFCell->GetFormatType(), ScGlobal::eLnge);
             aFormatter.GetOutputString( aStr, nFormat,
                                         rStrResult, &pColor );
@@ -409,7 +409,7 @@ void ScFormulaDlg::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* p
     m_aHelper.RefInputStart( aPair.second, aPair.first);
     RefInputStartAfter( aPair.second, aPair.first );
 }
-void ScFormulaDlg::RefInputDone( BOOL bForced )
+void ScFormulaDlg::RefInputDone( sal_Bool bForced )
 {
     m_aHelper.RefInputDone( bForced );
     RefInputDoneAfter( bForced );
@@ -421,7 +421,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
     if ( pFunc && pFunc->getSuppressedArgumentCount() > 0 )
     {
         Selection theSel;
-        BOOL bRefNull = UpdateParaWin(theSel);
+        sal_Bool bRefNull = UpdateParaWin(theSel);
 
         if ( rRef.aStart != rRef.aEnd && bRefNull )
         {
@@ -429,7 +429,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
         }
 
         String		aRefStr;
-        BOOL bOtherDoc = ( pRefDoc != pDoc && pRefDoc->GetDocumentShell()->HasName() );
+        sal_Bool bOtherDoc = ( pRefDoc != pDoc && pRefDoc->GetDocumentShell()->HasName() );
         if ( bOtherDoc )
         {
             //	Referenz auf anderes Dokument - wie inputhdl.cxx
@@ -452,7 +452,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
         }
         else
         {
-            USHORT nFmt = ( rRef.aStart.Tab() == aCursorPos.Tab() )
+            sal_uInt16 nFmt = ( rRef.aStart.Tab() == aCursorPos.Tab() )
                                 ? SCA_VALID
                                 : SCA_VALID | SCA_TAB_3D;
             rRef.Format( aRefStr, nFmt, pRefDoc, pRefDoc->GetAddressConvention() );
@@ -462,21 +462,21 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
     }
 }
 
-BOOL ScFormulaDlg::IsRefInputMode() const
+sal_Bool ScFormulaDlg::IsRefInputMode() const
 {
     const IFunctionDescription*	pDesc = getCurrentFunctionDescription();
-    BOOL bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL);
+    sal_Bool bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL);
     return bRef;
 }
 
-BOOL ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const
+sal_Bool ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const
 {
     //	not allowed: different from this doc, and no name
     //	pDocSh is always a ScDocShell
     if ( pDocSh && ((ScDocShell*)pDocSh)->GetDocument() != pDoc && !pDocSh->HasName() )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;		// everything else is allowed
+    return sal_True;		// everything else is allowed
 }
 
 void ScFormulaDlg::SetActive()
@@ -498,7 +498,7 @@ void ScFormulaDlg::SaveLRUEntry(const ScFuncDesc* pFuncDescP)
     }
 }
 
-void ScFormulaDlg::doClose(BOOL /*_bOk*/)
+void ScFormulaDlg::doClose(sal_Bool /*_bOk*/)
 {
     m_aHelper.DoClose( ScFormulaDlgWrapper::GetChildWindowId() );
 }
@@ -515,7 +515,7 @@ void ScFormulaDlg::ShowReference(const String& _sFormula)
 {
     m_aHelper.ShowReference(_sFormula);
 }
-void ScFormulaDlg::HideReference( BOOL bDoneRefMode )
+void ScFormulaDlg::HideReference( sal_Bool bDoneRefMode )
 {
     m_aHelper.HideReference(bDoneRefMode);
 }
@@ -527,10 +527,10 @@ void ScFormulaDlg::AddRefEntry( )
 {
 
 }
-BOOL ScFormulaDlg::IsTableLocked( ) const
+sal_Bool ScFormulaDlg::IsTableLocked( ) const
 {
     // per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden
-    return FALSE;
+    return sal_False;
 }
 void ScFormulaDlg::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton)
 {
@@ -540,7 +540,7 @@ void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB
 {
     m_aHelper.ReleaseFocus(pEdit,pButton);
 }
-void ScFormulaDlg::dispatch(BOOL _bOK,BOOL _bMartixChecked)
+void ScFormulaDlg::dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked)
 {
     SfxBoolItem	  aRetItem( SID_DLG_RETOK, _bOK );
     SfxBoolItem	  aMatItem( SID_DLG_MATRIX, _bMartixChecked );
@@ -549,9 +549,9 @@ void ScFormulaDlg::dispatch(BOOL _bOK,BOOL _bMartixChecked)
     // Wenn durch Dokument-Umschalterei die Eingabezeile weg war/ist,
     // ist der String leer. Dann nicht die alte Formel loeschen.
     if ( !aStrItem.GetValue().Len() )
-        aRetItem.SetValue( FALSE );		// FALSE = Cancel
+        aRetItem.SetValue( sal_False );		// sal_False = Cancel
 
-    m_aHelper.SetDispatcherLock( FALSE ); // Modal-Modus ausschalten
+    m_aHelper.SetDispatcherLock( sal_False ); // Modal-Modus ausschalten
 
     clear();
 
@@ -559,7 +559,7 @@ void ScFormulaDlg::dispatch(BOOL _bOK,BOOL _bMartixChecked)
                               SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
                               &aRetItem, &aStrItem, &aMatItem, 0L );
 }
-void ScFormulaDlg::setDispatcherLock( BOOL bLock )
+void ScFormulaDlg::setDispatcherLock( sal_Bool bLock )
 {
     m_aHelper.SetDispatcherLock( bLock );
 }
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index 8c8a970be..11609dc04 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -63,7 +63,7 @@ ScPrivatSplit::ScPrivatSplit( Window* pParent, const ResId& rResId,
 
     aWinPointer=GetPointer();
 
-    aMovingFlag=FALSE;
+    aMovingFlag=sal_False;
     if(eScSplit==SC_SPLIT_HORZ)
     {
         aWinPointer=Pointer(POINTER_HSPLIT);
@@ -349,7 +349,7 @@ void ScPrivatSplit::MoveSplitTo(Point aPos)
 }
 
 
-void ScPrivatSplit::ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground )
+void ScPrivatSplit::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
@@ -388,17 +388,17 @@ void ScPrivatSplit::StateChanged( StateChangedType nType )
     if ( (nType == STATE_CHANGE_ZOOM) ||
          (nType == STATE_CHANGE_CONTROLFONT) )
     {
-        ImplInitSettings( TRUE, FALSE, FALSE );
+        ImplInitSettings( sal_True, sal_False, sal_False );
         Invalidate();
     }
     if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
     {
-        ImplInitSettings( FALSE, TRUE, FALSE );
+        ImplInitSettings( sal_False, sal_True, sal_False );
         Invalidate();
     }
     else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
     {
-        ImplInitSettings( FALSE, FALSE, TRUE );
+        ImplInitSettings( sal_False, sal_False, sal_True );
         Invalidate();
     }
 
@@ -412,7 +412,7 @@ void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt )
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
          (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        ImplInitSettings( TRUE, TRUE, TRUE );
+        ImplInitSettings( sal_True, sal_True, sal_True );
         Invalidate();
     }
     else
diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx
index 05be4a010..50d6d813b 100644
--- a/sc/source/ui/inc/IAnyRefDialog.hxx
+++ b/sc/source/ui/inc/IAnyRefDialog.hxx
@@ -44,18 +44,18 @@ public:
     virtual ~IAnyRefDialog(){}
         
     //virtual void ShowReference(const String& _sRef) = 0;
-    //virtual void HideReference( BOOL bDoneRefMode = TRUE ) = 0;
+    //virtual void HideReference( sal_Bool bDoneRefMode = sal_True ) = 0;
     //virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) = 0;
     //virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) = 0;
 
 
     virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0;
     virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) = 0;
-    virtual void RefInputDone( BOOL bForced = FALSE ) = 0;
-    virtual BOOL IsTableLocked() const = 0;
-    virtual BOOL IsRefInputMode() const = 0;
+    virtual void RefInputDone( sal_Bool bForced = sal_False ) = 0;
+    virtual sal_Bool IsTableLocked() const = 0;
+    virtual sal_Bool IsRefInputMode() const = 0;
     
-    virtual BOOL IsDocAllowed( SfxObjectShell* pDocSh ) const = 0;
+    virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const = 0;
     virtual void AddRefEntry() = 0;
     virtual void SetActive() = 0;
     virtual void ViewShellChanged( ScTabViewShell* pScViewShell ) = 0;
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 6593dc563..4966ae428 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -114,10 +114,10 @@ public:
     SCTAB			nTable;
     SCCOL			nCol;
     SCROW			nRow;
-    ULONG			nActionNo;
-    ULONG			nInfo;
-    BOOL			bIsRejectable;
-    BOOL			bIsAcceptable;
+    sal_uLong			nActionNo;
+    sal_uLong			nInfo;
+    sal_Bool			bIsRejectable;
+    sal_Bool			bIsAcceptable;
 };
 
 typedef	long LExpNum;
@@ -160,15 +160,15 @@ private:
     String					aStrChildContent;
     String					aStrChildOrgContent;
     String					aStrEmpty;
-    ULONG					nAcceptCount;
-    ULONG					nRejectCount;
-    BOOL					bAcceptEnableFlag;
-    BOOL					bRejectEnableFlag;
-    BOOL					bNeedsUpdate;
-    BOOL					bIgnoreMsg;
-    BOOL					bNoSelection;
-    BOOL					bHasFilterEntry;
-    BOOL					bUseColor;
+    sal_uLong					nAcceptCount;
+    sal_uLong					nRejectCount;
+    sal_Bool					bAcceptEnableFlag;
+    sal_Bool					bRejectEnableFlag;
+    sal_Bool					bNeedsUpdate;
+    sal_Bool					bIgnoreMsg;
+    sal_Bool					bNoSelection;
+    sal_Bool					bHasFilterEntry;
+    sal_Bool					bUseColor;
     //ScChgTrackExps			aExpandArray;
 
     void			Init();
@@ -198,51 +198,51 @@ private:
 protected:
 
     virtual void	Resize();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
     void			RejectFiltered();
     void			AcceptFiltered();
 
-    BOOL			IsValidAction(const ScChangeAction* pScChangeAction);
+    sal_Bool			IsValidAction(const ScChangeAction* pScChangeAction);
 
     String*			MakeTypeString(ScChangeActionType eType);
 
     SvLBoxEntry*	InsertChangeAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState,
-                                    SvLBoxEntry* pParent=NULL,BOOL bDelMaster=FALSE,
-                                    BOOL bDisabled=FALSE,ULONG nPos=LIST_APPEND);
+                                    SvLBoxEntry* pParent=NULL,sal_Bool bDelMaster=sal_False,
+                                    sal_Bool bDisabled=sal_False,sal_uLong nPos=LIST_APPEND);
 
     SvLBoxEntry*	InsertFilteredAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState,
-                                    SvLBoxEntry* pParent=NULL,BOOL bDelMaster=FALSE,
-                                    BOOL bDisabled=FALSE,ULONG nPos=LIST_APPEND);
+                                    SvLBoxEntry* pParent=NULL,sal_Bool bDelMaster=sal_False,
+                                    sal_Bool bDisabled=sal_False,sal_uLong nPos=LIST_APPEND);
 
 
     SvLBoxEntry*	InsertChangeActionContent(const ScChangeActionContent* pScChangeAction,
-                                              SvLBoxEntry* pParent,ULONG nSpecial);
+                                              SvLBoxEntry* pParent,sal_uLong nSpecial);
 
     void			GetDependents( const ScChangeAction* pScChangeAction,
                                 ScChangeActionTable& aActionTable,
                                 SvLBoxEntry* pEntry);
 
-    BOOL			InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
+    sal_Bool			InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
 
-    BOOL			InsertAcceptedORejected(SvLBoxEntry* pParent);
+    sal_Bool			InsertAcceptedORejected(SvLBoxEntry* pParent);
 
-    BOOL			InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable,
+    sal_Bool			InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable,
                                         SvLBoxEntry* pParent);
 
-    BOOL			InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
+    sal_Bool			InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
 
-    void			AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, ULONG nEndAction,
-                                    ULONG nPos=LIST_APPEND);
+    void			AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction,
+                                    sal_uLong nPos=LIST_APPEND);
 
-    void			RemoveEntrys(ULONG nStartAction,ULONG nEndAction);
-    void			UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction);
+    void			RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction);
+    void			UpdateEntrys(ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction);
 
     void			UpdateView();
     void			ClearView();
 
-    BOOL			Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction,
-                            SvLBoxEntry* pEntry, BOOL bFilter=FALSE);
+    sal_Bool			Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction,
+                            SvLBoxEntry* pEntry, sal_Bool bFilter=sal_False);
 
 public:
                     ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 42be09305..40f816ce2 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -72,7 +72,7 @@ class ScFormulaReferenceHelper
     SfxBindings*        m_pBindings;
     ::std::auto_ptr<Accelerator>        
                         pAccel;                 // fuer Enter/Escape
-    BOOL*               pHiddenMarks;           // Merkfeld fuer versteckte Controls
+    sal_Bool*               pHiddenMarks;           // Merkfeld fuer versteckte Controls
     SCTAB               nRefTab;                // used for ShowReference
 
     String              sOldDialogText;         // Originaltitel des Dialogfensters
@@ -81,9 +81,9 @@ class ScFormulaReferenceHelper
     Size                aOldEditSize;           // Originalgroesse des Eingabefeldes
     Point               aOldButtonPos;          // Originalpositiuon des Buttons
 
-    BOOL                bEnableColorRef;
-    BOOL                bHighLightRef;
-    BOOL                bAccInserted;
+    sal_Bool                bEnableColorRef;
+    sal_Bool                bHighLightRef;
+    sal_Bool                bAccInserted;
     
     DECL_LINK( AccelSelectHdl, Accelerator* );
     
@@ -98,24 +98,24 @@ public:
 
     void                ShowReference( const XubString& rStr );
     void                ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
-    void                HideReference( BOOL bDoneRefMode = TRUE );
+    void                HideReference( sal_Bool bDoneRefMode = sal_True );
     void                RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
-    void                RefInputDone( BOOL bForced = FALSE );
+    void                RefInputDone( sal_Bool bForced = sal_False );
     void                ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
 
     inline void         SetWindow(Window* _pWindow) { m_pWindow = _pWindow; }
-    BOOL                DoClose( USHORT nId );
-    void                SetDispatcherLock( BOOL bLock );
-    void                EnableSpreadsheets( BOOL bFlag = TRUE, BOOL bChilds = TRUE );
+    sal_Bool                DoClose( sal_uInt16 nId );
+    void                SetDispatcherLock( sal_Bool bLock );
+    void                EnableSpreadsheets( sal_Bool bFlag = sal_True, sal_Bool bChilds = sal_True );
     void                ViewShellChanged( ScTabViewShell* pScViewShell );
 
-    static              void enableInput(BOOL _bInput);
+    static              void enableInput(sal_Bool _bInput);
 //<!--Added by PengYunQuan for Validity Cell Range Picker
 protected:
     Window		*		GetWindow(){ return m_pWindow; }
 public:
     bool				CanInputStart( const ScRefEdit *pEdit ){ return !!pEdit; }
-    bool				CanInputDone( BOOL bForced ){	return pRefEdit && (bForced || !pRefBtn);	}
+    bool				CanInputDone( sal_Bool bForced ){	return pRefEdit && (bForced || !pRefBtn);	}
 //<!--Added by PengYunQuan for Validity Cell Range Picker
 };
 //============================================================================
@@ -148,15 +148,15 @@ private:
     
 
 protected:
-    virtual BOOL        DoClose( USHORT nId );
+    virtual sal_Bool        DoClose( sal_uInt16 nId );
 
-    void                SetDispatcherLock( BOOL bLock );
+    void                SetDispatcherLock( sal_Bool bLock );
 
     //Overwrite TWindow will implemented by ScRefHdlrImplBase
     //virtual long        PreNotify( NotifyEvent& rNEvt );
 
     virtual void        RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
-    virtual void        RefInputDone( BOOL bForced = FALSE );
+    virtual void        RefInputDone( sal_Bool bForced = sal_False );
     void                ShowSimpleReference( const XubString& rStr );
     void                ShowFormulaReference( const XubString& rStr );
 
@@ -164,18 +164,18 @@ protected:
 
 public:
                         ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW,
-                                     Window* pParent, USHORT nResId*/, bool bBindRef );
+                                     Window* pParent, sal_uInt16 nResId*/, bool bBindRef );
     virtual             ~ScRefHandler();
 
     virtual void        SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0;
     virtual void        AddRefEntry();
 
-    virtual BOOL        IsRefInputMode() const;
-    virtual BOOL        IsTableLocked() const;
-    virtual BOOL        IsDocAllowed( SfxObjectShell* pDocSh ) const;
+    virtual sal_Bool        IsRefInputMode() const;
+    virtual sal_Bool        IsTableLocked() const;
+    virtual sal_Bool        IsDocAllowed( SfxObjectShell* pDocSh ) const;
 
     virtual void        ShowReference( const XubString& rStr );
-    virtual void        HideReference( BOOL bDoneRefMode = TRUE );
+    virtual void        HideReference( sal_Bool bDoneRefMode = sal_True );
 
     virtual void        ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
     virtual void        ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
@@ -185,7 +185,7 @@ public:
     //SfxBindings&        GetBindings();
 
     virtual void        SetActive() = 0;
-//  virtual BOOL        Close();
+//  virtual sal_Bool        Close();
     //Overwrite TWindow will implemented by ScRefHdlrImplBase
     //virtual void        StateChanged( StateChangedType nStateChange );
 
@@ -194,7 +194,7 @@ public:
     bool                EnterRefMode();
     bool                LeaveRefMode();
     inline	bool		CanInputStart( const ScRefEdit *pEdit );
-    inline	bool		CanInputDone( BOOL bForced );
+    inline	bool		CanInputDone( sal_Bool bForced );
 //-->Added by PengYunQuan for Validity Cell Range Picker
 };
 
@@ -225,12 +225,12 @@ private:
 template<class TWindow, bool bBindRef>
 template<class TBindings, class TChildWindow, class TParentWindow, class TResId>
 ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
-                 TParentWindow* pParent, TResId nResId):TWindow(pB, pCW, pParent, ScResId(static_cast<USHORT>( nResId ) ) ), ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef ){}
+                 TParentWindow* pParent, TResId nResId):TWindow(pB, pCW, pParent, ScResId(static_cast<sal_uInt16>( nResId ) ) ), ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef ){}
 
 template<class TWindow, bool bBindRef >
 template<class TParentWindow, class TResId, class TArg>
 ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, TResId nResIdP, const TArg &rArg, SfxBindings *pB /*= NULL*/ )
-:TWindow( pParent, ScResId(static_cast<USHORT>( nResIdP )), rArg ), ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef ){}
+:TWindow( pParent, ScResId(static_cast<sal_uInt16>( nResIdP )), rArg ), ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef ){}
 
 template<class TWindow, bool bBindRef >
 ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){}
@@ -244,12 +244,12 @@ struct ScRefHdlrImpl: ScRefHdlrImplBase<TBase, bBindRef >
     template<class T1, class T2, class T3, class T4>
     ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3 & rt3, const T4 & rt4 ):ScRefHdlrImplBase<TBase, bBindRef >(rt1, rt2, rt3, rt4 )
     {
-        SC_MOD()->RegisterRefWindow( static_cast<USHORT>( static_cast<TDerived*>(this)->SLOTID ), this );
+        SC_MOD()->RegisterRefWindow( static_cast<sal_uInt16>( static_cast<TDerived*>(this)->SLOTID ), this );
     }
 
     ~ScRefHdlrImpl()
     {
-        SC_MOD()->UnregisterRefWindow( static_cast<USHORT>( static_cast<TDerived*>(this)->SLOTID ), this );
+        SC_MOD()->UnregisterRefWindow( static_cast<sal_uInt16>( static_cast<TDerived*>(this)->SLOTID ), this );
     }
 };
 //============================================================================
@@ -265,7 +265,7 @@ inline bool ScRefHandler::CanInputStart( const ScRefEdit *pEdit )
     return m_aHelper.CanInputStart( pEdit );
 }
 
-inline	bool ScRefHandler::CanInputDone( BOOL bForced )
+inline	bool ScRefHandler::CanInputDone( sal_Bool bForced )
 {
     return m_aHelper.CanInputDone( bForced );
 }
diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx
index 27305dcdc..78e459041 100644
--- a/sc/source/ui/inc/areasave.hxx
+++ b/sc/source/ui/inc/areasave.hxx
@@ -44,7 +44,7 @@ private:
     String		aOptions;
     String		aSourceArea;
     ScRange		aDestArea;
-    ULONG       nRefresh;
+    sal_uLong       nRefresh;
 
 public:
                 ScAreaLinkSaver( const ScAreaLink& rSource );
@@ -53,8 +53,8 @@ public:
 
     virtual	ScDataObject*	Clone() const;
 
-    BOOL		IsEqual( const ScAreaLink& rCompare ) const;
-    BOOL		IsEqualSource( const ScAreaLink& rCompare ) const;
+    sal_Bool		IsEqual( const ScAreaLink& rCompare ) const;
+    sal_Bool		IsEqualSource( const ScAreaLink& rCompare ) const;
 
     void		WriteToLink( ScAreaLink& rLink ) const;
     void        InsertNewLink( ScDocument* pDoc ) const;
@@ -70,9 +70,9 @@ public:
 
     virtual	ScDataObject*	Clone() const;
 
-    ScAreaLinkSaver*	operator[](USHORT nIndex) const {return (ScAreaLinkSaver*)At(nIndex);}
+    ScAreaLinkSaver*	operator[](sal_uInt16 nIndex) const {return (ScAreaLinkSaver*)At(nIndex);}
 
-    BOOL		IsEqual( const ScDocument* pDoc ) const;
+    sal_Bool		IsEqual( const ScDocument* pDoc ) const;
     void		Restore( ScDocument* pDoc ) const;
 
     // returns NULL if empty
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 0d4597a1c..4a3c19ed6 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -55,11 +55,11 @@ public:
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
     virtual void	AddRefEntry();
 
-    virtual BOOL	IsTableLocked() const;
+    virtual sal_Bool	IsTableLocked() const;
 
     virtual void	SetActive();
     virtual void	Deactivate();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 private:
     ListBox			aLbPrintArea;
@@ -81,7 +81,7 @@ private:
     CancelButton	aBtnCancel;
     HelpButton		aBtnHelp;
 
-    BOOL			bDlgLostFocus;
+    sal_Bool			bDlgLostFocus;
     formula::RefEdit*		pRefInputEdit;
     ScDocument*		pDoc;
     ScViewData*		pViewData;
@@ -90,9 +90,9 @@ private:
 #ifdef _AREASDLG_CXX
 private:
     void Impl_Reset();
-    BOOL Impl_CheckRefStrings();
+    sal_Bool Impl_CheckRefStrings();
     void Impl_FillLists();
-    BOOL Impl_GetItem( Edit* pEd, SfxStringItem& rItem );
+    sal_Bool Impl_GetItem( Edit* pEd, SfxStringItem& rItem );
 
     // Handler:
     DECL_LINK( Impl_SelectHdl,		ListBox*    );
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 0c6df4b39..b2317381d 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -59,19 +59,19 @@
 class ScAsciiOptions
 {
 private:
-    BOOL		bFixedLen;
+    sal_Bool		bFixedLen;
     String		aFieldSeps;
-    BOOL		bMergeFieldSeps;
+    sal_Bool		bMergeFieldSeps;
     bool        bQuotedFieldAsText;
     bool        bDetectSpecialNumber;
     sal_Unicode	cTextSep;
     CharSet		eCharSet;
     LanguageType eLang;
-    BOOL		bCharSetSystem;
+    sal_Bool		bCharSetSystem;
     long		nStartRow;
-    USHORT		nInfoCount;
+    sal_uInt16		nInfoCount;
     xub_StrLen* pColStart;  //! TODO replace with vector
-    BYTE*       pColFormat; //! TODO replace with vector
+    sal_uInt8*       pColFormat; //! TODO replace with vector
 
 public:
                     ScAsciiOptions();
@@ -82,7 +82,7 @@ public:
 
     ScAsciiOptions&	operator=( const ScAsciiOptions& rCpy );
 
-    BOOL			operator==( const ScAsciiOptions& rCmp ) const;
+    sal_Bool			operator==( const ScAsciiOptions& rCmp ) const;
 
     void			ReadFromString( const String& rString );
     String			WriteToString() const;
@@ -90,31 +90,31 @@ public:
     void			InterpretColumnList( const String& rString );
 
     CharSet				GetCharSet() const		{ return eCharSet; }
-    BOOL				GetCharSetSystem() const	{ return bCharSetSystem; }
+    sal_Bool				GetCharSetSystem() const	{ return bCharSetSystem; }
     const String&		GetFieldSeps() const	{ return aFieldSeps; }
-    BOOL				IsMergeSeps() const		{ return bMergeFieldSeps; }
+    sal_Bool				IsMergeSeps() const		{ return bMergeFieldSeps; }
     bool                IsQuotedAsText() const  { return bQuotedFieldAsText; }
     bool                IsDetectSpecialNumber() const { return bDetectSpecialNumber; }
     sal_Unicode			GetTextSep() const		{ return cTextSep; }
-    BOOL				IsFixedLen() const		{ return bFixedLen; }
-    USHORT				GetInfoCount() const	{ return nInfoCount; }
+    sal_Bool				IsFixedLen() const		{ return bFixedLen; }
+    sal_uInt16				GetInfoCount() const	{ return nInfoCount; }
     const xub_StrLen*	GetColStart() const		{ return pColStart; }
-    const BYTE*			GetColFormat() const	{ return pColFormat; }
+    const sal_uInt8*			GetColFormat() const	{ return pColFormat; }
     long				GetStartRow() const		{ return nStartRow; }
     LanguageType        GetLanguage() const     { return eLang; }
 
     void	SetCharSet( CharSet eNew )			{ eCharSet = eNew; }
-    void	SetCharSetSystem( BOOL bSet )		{ bCharSetSystem = bSet; }
-    void	SetFixedLen( BOOL bSet )			{ bFixedLen = bSet; }
+    void	SetCharSetSystem( sal_Bool bSet )		{ bCharSetSystem = bSet; }
+    void	SetFixedLen( sal_Bool bSet )			{ bFixedLen = bSet; }
     void	SetFieldSeps( const String& rStr )	{ aFieldSeps = rStr; }
-    void	SetMergeSeps( BOOL bSet )			{ bMergeFieldSeps = bSet; }
+    void	SetMergeSeps( sal_Bool bSet )			{ bMergeFieldSeps = bSet; }
     void    SetQuotedAsText(bool bSet)          { bQuotedFieldAsText = bSet; }
     void    SetDetectSpecialNumber(bool bSet)   { bDetectSpecialNumber = bSet; }
     void	SetTextSep( sal_Unicode c )			{ cTextSep = c; }
     void	SetStartRow( long nRow)				{ nStartRow= nRow; }
     void    SetLanguage(LanguageType e)         { eLang = e; }
 
-    void	SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat );
+    void	SetColInfo( sal_uInt16 nCount, const xub_StrLen* pStart, const sal_uInt8* pFormat );
     void    SetColumnInfo( const ScCsvExpDataVec& rDataVec );
 };
 
@@ -124,13 +124,13 @@ public:
 //CHINA001 class ScImportAsciiDlg : public ModalDialog
 //CHINA001 {
 //CHINA001 SvStream*                   pDatStream;
-//CHINA001 ULONG*                      pRowPosArray;
-//CHINA001 ULONG*                      pRowPosArrayUnicode;
-//CHINA001 USHORT                      nArrayEndPos;
-//CHINA001 USHORT                      nArrayEndPosUnicode;
-//CHINA001 ULONG                       nStreamPos;
-//CHINA001 ULONG                       nStreamPosUnicode;
-//CHINA001 BOOL                        bVFlag;
+//CHINA001 sal_uLong*                      pRowPosArray;
+//CHINA001 sal_uLong*                      pRowPosArrayUnicode;
+//CHINA001 sal_uInt16                      nArrayEndPos;
+//CHINA001 sal_uInt16                      nArrayEndPosUnicode;
+//CHINA001 sal_uLong                       nStreamPos;
+//CHINA001 sal_uLong                       nStreamPosUnicode;
+//CHINA001 sal_Bool                        bVFlag;
 //CHINA001 
 //CHINA001 FixedLine                   aFlFieldOpt;
 //CHINA001 FixedText                   aFtCharSet;
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index a450329a5..718bdec10 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -54,7 +54,7 @@ public:
                 ~ScAttrDlg();
 
 protected:
-    virtual void	PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+    virtual void	PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage );
 
 private:
     DECL_LINK( OkHandler, void* ); // fuer DoppelClick-Beenden in TabPages
diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx
index 4e3e7956e..f0afdb5a4 100644
--- a/sc/source/ui/inc/auditsh.hxx
+++ b/sc/source/ui/inc/auditsh.hxx
@@ -39,7 +39,7 @@ class ScAuditingShell : public SfxShell
 {
 private:
     ScViewData*	pViewData;
-    USHORT		nFunction;
+    sal_uInt16		nFunction;
 
 public:
     TYPEINFO();
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index b6eb80112..009b72761 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -75,7 +75,7 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
 //CHINA001 ScDocument*                pDoc );
 //CHINA001 ~ScAutoFormatDlg();
 //CHINA001
-//CHINA001 USHORT GetIndex() const { return nIndex; }
+//CHINA001 sal_uInt16 GetIndex() const { return nIndex; }
 //CHINA001 String GetCurrFormatName();
 //CHINA001
 //CHINA001 private:
@@ -106,9 +106,9 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
 //CHINA001 //------------------------
 //CHINA001 ScAutoFormat*			pFormat;
 //CHINA001 const ScAutoFormatData*	pSelFmtData;
-//CHINA001 USHORT					nIndex;
-//CHINA001 BOOL					bCoreDataChanged;
-//CHINA001 BOOL					bFmtInserted;
+//CHINA001 sal_uInt16					nIndex;
+//CHINA001 sal_Bool					bCoreDataChanged;
+//CHINA001 sal_Bool					bFmtInserted;
 //CHINA001
 //CHINA001 void Init			();
 //CHINA001 void UpdateChecks	();
@@ -141,7 +141,7 @@ private:
     VirtualDevice           aVD;
     SvtScriptedTextHelper   aScriptedText;
     ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBreakIter;
-    BOOL                    bFitWidth;
+    sal_Bool                    bFitWidth;
     svx::frame::Array       maArray;            /// Implementation to draw the frame borders.
     bool                    mbRTL;
     Size                    aPrvSize;
@@ -160,7 +160,7 @@ private:
     //-------------------------------------------
     SC_DLLPRIVATE void	Init			();
     SC_DLLPRIVATE void	DoPaint			( const Rectangle& rRect );
-    SC_DLLPRIVATE void	CalcCellArray	( BOOL bFitWidth );
+    SC_DLLPRIVATE void	CalcCellArray	( sal_Bool bFitWidth );
     SC_DLLPRIVATE void	CalcLineMap		();
     SC_DLLPRIVATE void	PaintCells		();
 
@@ -168,7 +168,7 @@ private:
     conjunction with class svx::frame::Array (svx/framelinkarray.hxx), which
     expects size_t coordinates. */
 
-    SC_DLLPRIVATE USHORT              GetFormatIndex( size_t nCol, size_t nRow ) const;
+    SC_DLLPRIVATE sal_uInt16              GetFormatIndex( size_t nCol, size_t nRow ) const;
     SC_DLLPRIVATE const SvxBoxItem&   GetBoxItem( size_t nCol, size_t nRow ) const;
     SC_DLLPRIVATE const SvxLineItem&  GetDiagItem( size_t nCol, size_t nRow, bool bTLBR ) const;
 
@@ -176,26 +176,26 @@ private:
     SC_DLLPRIVATE void                DrawStrings();
     SC_DLLPRIVATE void                DrawBackground();
 
-    SC_DLLPRIVATE void    MakeFonts       ( USHORT nIndex,
+    SC_DLLPRIVATE void    MakeFonts       ( sal_uInt16 nIndex,
                               Font& rFont,
                               Font& rCJKFont,
                               Font& rCTLFont );
 
-    SC_DLLPRIVATE String	MakeNumberString( String cellString, BOOL bAddDec );
+    SC_DLLPRIVATE String	MakeNumberString( String cellString, sal_Bool bAddDec );
     SC_DLLPRIVATE void	DrawFrameLine	( const SvxBorderLine&	rLineD,
                               Point					from,
                               Point					to,
-                              BOOL					bHorizontal,
+                              sal_Bool					bHorizontal,
                               const SvxBorderLine&	rLineLT,
                               const SvxBorderLine&	rLineL,
                               const SvxBorderLine&	rLineLB,
                               const SvxBorderLine&	rLineRT,
                               const SvxBorderLine&	rLineR,
                               const SvxBorderLine&	rLineRB );
-    SC_DLLPRIVATE void CheckPriority	( USHORT			nCurLine,
+    SC_DLLPRIVATE void CheckPriority	( sal_uInt16			nCurLine,
                               AutoFmtLine		eLine,
                               SvxBorderLine&	rLine );
-    SC_DLLPRIVATE void	GetLines		( USHORT nIndex, AutoFmtLine eLine,
+    SC_DLLPRIVATE void	GetLines		( sal_uInt16 nIndex, AutoFmtLine eLine,
                               SvxBorderLine&	rLineD,
                               SvxBorderLine&	rLineLT,
                               SvxBorderLine&	rLineL,
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index f33f31114..b4b2c1d8f 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -41,13 +41,13 @@ private:
     ScDocShell*		pDocSh;
     Timer			aTimer;
     Timer			aInitTimer;
-    ULONG			nTimerStart;
+    sal_uLong			nTimerStart;
     List			aEntries;
     List			aInitials;
 
     void	ExecuteEntries();
-    void	AdjustEntries(ULONG nDiff);
-    void	StartTimer(ULONG nNow);
+    void	AdjustEntries(sal_uLong nDiff);
+    void	StartTimer(sal_uLong nNow);
     DECL_LINK( TimerHdl, Timer* );
     DECL_LINK( InitHdl, Timer* );
 
@@ -56,8 +56,8 @@ public:
             ~ScAutoStyleList();
 
     void	AddInitial( const ScRange& rRange, const String& rStyle1,
-                        ULONG nTimeout, const String& rStyle2 );
-    void	AddEntry( ULONG nTimeout, const ScRange& rRange, const String& rStyle );
+                        sal_uLong nTimeout, const String& rStyle2 );
+    void	AddEntry( sal_uLong nTimeout, const ScRange& rRange, const String& rStyle );
 
     void	ExecuteAllNow();
 };
diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx
index c9f2936d9..10ea3418a 100644
--- a/sc/source/ui/inc/cbutton.hxx
+++ b/sc/source/ui/inc/cbutton.hxx
@@ -48,16 +48,16 @@ public:
 
     void	Draw( const Point&	rAt,
                   const Size&	rSize,
-                  BOOL          bState,
-                  BOOL			bBtnIn = FALSE );
+                  sal_Bool          bState,
+                  sal_Bool			bBtnIn = sal_False );
 
     void	Draw( const Point&	rAt,
-                  BOOL          bState,
-                  BOOL			bBtnIn = FALSE )
+                  sal_Bool          bState,
+                  sal_Bool			bBtnIn = sal_False )
                 { Draw( rAt, aBtnSize, bState, bBtnIn ); }
 
-    void    Draw( BOOL          bState,
-                  BOOL          bBtnIn = FALSE )
+    void    Draw( sal_Bool          bState,
+                  sal_Bool          bBtnIn = sal_False )
                 { Draw( aBtnPos, aBtnSize, bState, bBtnIn ); }
 
     void	SetOptSizePixel();
@@ -70,7 +70,7 @@ public:
 
 private:
     void	ImpDrawArrow( const Rectangle&	rRect,
-                          BOOL              bState );
+                          sal_Bool              bState );
 
 protected:
     OutputDevice* pOut;
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 9202c39e4..13e648a52 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -57,12 +57,12 @@ class ScCellShell: public ScFormatShell
 {
 private:
     CellShell_Impl* pImpl;
-    BOOL            bPastePossible;
+    sal_Bool            bPastePossible;
 
     void		GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats );
     void        ExecuteExternalSource(
                     const String& _rFile, const String& _rFilter, const String& _rOptions,
-                    const String& _rSource, ULONG _nRefresh, SfxRequest& _rRequest );
+                    const String& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest );
 
     DECL_LINK( ClipboardChanged, TransferableDataHelper* );
     DECL_LINK( DialogClosed, AbstractScLinkedAreaDlg* );
diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx
index 28d5a6d3f..13072ab06 100644
--- a/sc/source/ui/inc/colrowba.hxx
+++ b/sc/source/ui/inc/colrowba.hxx
@@ -50,24 +50,24 @@ public:
                 ~ScColBar();
 
     virtual SCCOLROW	GetPos();
-    virtual USHORT		GetEntrySize( SCCOLROW nEntryNo );
+    virtual sal_uInt16		GetEntrySize( SCCOLROW nEntryNo );
     virtual String 		GetEntryText( SCCOLROW nEntryNo );
 
-    virtual BOOL		IsLayoutRTL();						// only for columns
+    virtual sal_Bool		IsLayoutRTL();						// only for columns
 
-    virtual void		SetEntrySize( SCCOLROW nPos, USHORT nNewSize );
+    virtual void		SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize );
     virtual void		HideEntries( SCCOLROW nStart, SCCOLROW nEnd );
 
-    virtual void		SetMarking( BOOL bSet );
+    virtual void		SetMarking( sal_Bool bSet );
     virtual void		SelectWindow();
-    virtual BOOL		IsDisabled();
-    virtual BOOL		ResizeAllowed();
+    virtual sal_Bool		IsDisabled();
+    virtual sal_Bool		ResizeAllowed();
 
     virtual void		DrawInvert( long nDragPos );
 
     virtual String		GetDragHelp( long nVal );
 
-            BOOL		UseNumericHeader() const;
+            sal_Bool		UseNumericHeader() const;
 };
 
 
@@ -84,19 +84,19 @@ public:
                 ~ScRowBar();
 
     virtual SCCOLROW	GetPos();
-    virtual USHORT		GetEntrySize( SCCOLROW nEntryNo );
+    virtual sal_uInt16		GetEntrySize( SCCOLROW nEntryNo );
     virtual String 		GetEntryText( SCCOLROW nEntryNo );
 
-    virtual BOOL		IsMirrored();						// only for columns
+    virtual sal_Bool		IsMirrored();						// only for columns
     virtual SCROW		GetHiddenCount( SCROW nEntryNo );	// only for columns
 
-    virtual void		SetEntrySize( SCCOLROW nPos, USHORT nNewSize );
+    virtual void		SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize );
     virtual void		HideEntries( SCCOLROW nStart, SCCOLROW nEnd );
 
-    virtual void		SetMarking( BOOL bSet );
+    virtual void		SetMarking( sal_Bool bSet );
     virtual void		SelectWindow();
-    virtual BOOL		IsDisabled();
-    virtual BOOL		ResizeAllowed();
+    virtual sal_Bool		IsDisabled();
+    virtual sal_Bool		ResizeAllowed();
 
     virtual void		DrawInvert( long nDragPos );
 
diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx
index fe4f38d4a..6835dda7d 100644
--- a/sc/source/ui/inc/condfrmt.hxx
+++ b/sc/source/ui/inc/condfrmt.hxx
@@ -53,9 +53,9 @@ public:
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
     virtual void	AddRefEntry();
-    virtual BOOL    IsRefInputMode() const;
+    virtual sal_Bool    IsRefInputMode() const;
     virtual void	SetActive();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 private:
     CheckBox			aCbxCond1;
@@ -125,7 +125,7 @@ private:
     Size				aCond3Size3;
 
     formula::RefEdit*			pEdActive;
-    BOOL				bDlgLostFocus;
+    sal_Bool				bDlgLostFocus;
     ScDocument*			pDoc;
 
 #ifdef _CONDFRMT_CXX
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index 454ef7028..28ee20beb 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -49,7 +49,7 @@ enum ScConflictAction
     SC_CONFLICT_ACTION_KEEP_OTHER
 };
 
-typedef ::std::vector< ULONG > ScChangeActionList;
+typedef ::std::vector< sal_uLong > ScChangeActionList;
 
 
 //=============================================================================
@@ -62,8 +62,8 @@ struct ScConflictsListEntry
     ScChangeActionList  maSharedActions;
     ScChangeActionList  maOwnActions;
 
-    bool                HasSharedAction( ULONG nSharedAction ) const;
-    bool                HasOwnAction( ULONG nOwnAction ) const;
+    bool                HasSharedAction( sal_uLong nSharedAction ) const;
+    bool                HasOwnAction( sal_uLong nOwnAction ) const;
 };
 
 
@@ -82,11 +82,11 @@ private:
     static void                     Transform_Impl( ScChangeActionList& rActionList, ScChangeActionMergeMap* pMergeMap );
 
 public:
-//UNUSED2008-05  static bool                     HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction );
-    static bool                     HasOwnAction( ScConflictsList& rConflictsList, ULONG nOwnAction );
+//UNUSED2008-05  static bool                     HasSharedAction( ScConflictsList& rConflictsList, sal_uLong nSharedAction );
+    static bool                     HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction );
 
-    static ScConflictsListEntry*    GetSharedActionEntry( ScConflictsList& rConflictsList, ULONG nSharedAction );
-    static ScConflictsListEntry*    GetOwnActionEntry( ScConflictsList& rConflictsList, ULONG nOwnAction );
+    static ScConflictsListEntry*    GetSharedActionEntry( ScConflictsList& rConflictsList, sal_uLong nSharedAction );
+    static ScConflictsListEntry*    GetOwnActionEntry( ScConflictsList& rConflictsList, sal_uLong nOwnAction );
 
     static void                     TransformConflictsList( ScConflictsList& rConflictsList,
                                         ScChangeActionMergeMap* pSharedMap, ScChangeActionMergeMap* pOwnMap );
@@ -101,19 +101,19 @@ class ScConflictsFinder
 {
 private:
     ScChangeTrack*          mpTrack;
-    ULONG                   mnStartShared;
-    ULONG                   mnEndShared;
-    ULONG                   mnStartOwn;
-    ULONG                   mnEndOwn;
+    sal_uLong                   mnStartShared;
+    sal_uLong                   mnEndShared;
+    sal_uLong                   mnStartOwn;
+    sal_uLong                   mnEndOwn;
     ScConflictsList&        mrConflictsList;
 
     static bool             DoActionsIntersect( const ScChangeAction* pAction1, const ScChangeAction* pAction2 );
     ScConflictsListEntry*   GetIntersectingEntry( const ScChangeAction* pAction ) const;
-    ScConflictsListEntry*   GetEntry( ULONG nSharedAction, const ScChangeActionList& rOwnActions );
+    ScConflictsListEntry*   GetEntry( sal_uLong nSharedAction, const ScChangeActionList& rOwnActions );
 
 public:
-                            ScConflictsFinder( ScChangeTrack* pTrack, ULONG nStartShared, ULONG nEndShared,
-                                ULONG nStartOwn, ULONG nEndOwn, ScConflictsList& rConflictsList );
+                            ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared,
+                                sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList );
     virtual                 ~ScConflictsFinder();
 
     bool                    Find();
@@ -152,7 +152,7 @@ public:
                         ScConflictsListBox( Window* pParent, const ResId& rResId );
                         ~ScConflictsListBox();
 
-//UNUSED2008-05  ULONG               GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const;
+//UNUSED2008-05  sal_uLong               GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const;
 };
 
 //=============================================================================
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 9048a03ba..73ee39ca2 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -60,10 +60,10 @@ public:
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
 
-    virtual BOOL	IsRefInputMode() const { return TRUE; }
+    virtual sal_Bool	IsRefInputMode() const { return sal_True; }
     virtual void	SetActive();
 
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 protected:
     virtual void	Deactivate();
@@ -107,17 +107,17 @@ private:
     ScDocument*			pDoc;
     ScRangeUtil*		pRangeUtil;
     ScAreaData*			pAreaData;
-    USHORT				nAreaDataCount;
-    USHORT				nWhichCons;
+    sal_uInt16				nAreaDataCount;
+    sal_uInt16				nWhichCons;
 
     formula::RefEdit*			pRefInputEdit;
-    BOOL				bDlgLostFocus;
+    sal_Bool				bDlgLostFocus;
 
 #ifdef _CONSDLG_CXX
 private:
     void Init				();
     void FillAreaLists		();
-    BOOL VerifyEdit			( formula::RefEdit* pEd );
+    sal_Bool VerifyEdit			( formula::RefEdit* pEd );
 
     DECL_LINK( OkHdl,		 void* );
     DECL_LINK( ClickHdl,	 PushButton* );
@@ -125,8 +125,8 @@ private:
     DECL_LINK( ModifyHdl,	 formula::RefEdit* );
     DECL_LINK( SelectHdl,	 ListBox* );
 
-    ScSubTotalFunc	LbPosToFunc( USHORT nPos );
-    USHORT 			FuncToLbPos( ScSubTotalFunc eFunc );
+    ScSubTotalFunc	LbPosToFunc( sal_uInt16 nPos );
+    sal_uInt16 			FuncToLbPos( ScSubTotalFunc eFunc );
 #endif // _CONSDLG_CXX
 };
 
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 929df0f98..5070a32cf 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -50,7 +50,7 @@ class ScAreaLink;
 #define SC_CONTENT_DRAWING		8
 #define SC_CONTENT_COUNT		9
 
-const ULONG SC_CONTENT_NOCHILD  = ~0UL;
+const sal_uLong SC_CONTENT_NOCHILD  = ~0UL;
 
 //
 //	TreeListBox fuer Inhalte
@@ -62,24 +62,24 @@ class ScContentTree : public SvTreeListBox
     ImageList			aEntryImages;
     ImageList			aHCEntryImages;
     SvLBoxEntry*		pRootNodes[SC_CONTENT_COUNT];
-    USHORT				nRootType;			// als Root eingestellt
+    sal_uInt16				nRootType;			// als Root eingestellt
     String				aManualDoc;			// im Navigator umgeschaltet (Title)
-    BOOL				bHiddenDoc;			// verstecktes aktiv?
+    sal_Bool				bHiddenDoc;			// verstecktes aktiv?
     String				aHiddenName;		// URL zum Laden
     String				aHiddenTitle;		// fuer Anzeige
     ScDocument*			pHiddenDocument;	// temporaer
 
-    USHORT				pPosList[SC_CONTENT_COUNT];		// fuer die Reihenfolge
+    sal_uInt16				pPosList[SC_CONTENT_COUNT];		// fuer die Reihenfolge
 
-    static BOOL	bIsInDrag;		// static, falls der Navigator im ExecuteDrag geloescht wird
+    static sal_Bool	bIsInDrag;		// static, falls der Navigator im ExecuteDrag geloescht wird
 
     ScDocShell* GetManualOrCurrent();
 
-    void	InitRoot(USHORT nType);
-    void	ClearType(USHORT nType);
+    void	InitRoot(sal_uInt16 nType);
+    void	ClearType(sal_uInt16 nType);
     void	ClearAll();
-    void	InsertContent( USHORT nType, const String& rValue );
-    void    GetDrawNames( USHORT nType );
+    void	InsertContent( sal_uInt16 nType, const String& rValue );
+    void    GetDrawNames( sal_uInt16 nType );
 
     void	GetTableNames();
     void	GetAreaNames();
@@ -90,24 +90,24 @@ class ScContentTree : public SvTreeListBox
     void	GetDrawingNames();
     void	GetNoteStrings();
 
-    static bool IsPartOfType( USHORT nContentType, USHORT nObjIdentifier );
+    static bool IsPartOfType( sal_uInt16 nContentType, sal_uInt16 nObjIdentifier );
 
-    BOOL	DrawNamesChanged( USHORT nType );
-    BOOL	NoteStringsChanged();
+    sal_Bool	DrawNamesChanged( sal_uInt16 nType );
+    sal_Bool	NoteStringsChanged();
 
-    ScAddress GetNotePos( ULONG nIndex );
-    const ScAreaLink* GetLink( ULONG nIndex );
+    ScAddress GetNotePos( sal_uLong nIndex );
+    const ScAreaLink* GetLink( sal_uLong nIndex );
 
     /** Returns the indexes of the specified listbox entry.
         @param rnRootIndex  Root index of specified entry is returned.
         @param rnChildIndex  Index of the entry inside its root is returned (or SC_CONTENT_NOCHILD if entry is root).
         @param pEntry  The entry to examine. */
-    void    GetEntryIndexes( USHORT& rnRootIndex, ULONG& rnChildIndex, SvLBoxEntry* pEntry ) const;
+    void    GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvLBoxEntry* pEntry ) const;
 
     /** Returns the child index of the specified listbox entry.
         @param pEntry  The entry to examine or NULL for the selected entry.
         @return  Index of the entry inside its root or SC_CONTENT_NOCHILD if entry is root. */
-    ULONG   GetChildIndex( SvLBoxEntry* pEntry ) const;
+    sal_uLong   GetChildIndex( SvLBoxEntry* pEntry ) const;
 
     void	DoDrag();
 //UNUSED2008-05  void	AdjustTitle();
@@ -118,8 +118,8 @@ class ScContentTree : public SvTreeListBox
     DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* );
 
 protected:
-//	virtual BOOL	Drop( const DropEvent& rEvt );
-//	virtual BOOL	QueryDrop( DropEvent& rEvt );
+//	virtual sal_Bool	Drop( const DropEvent& rEvt );
+//	virtual sal_Bool	QueryDrop( DropEvent& rEvt );
 
     using SvTreeListBox::ExecuteDrop;
 
@@ -138,18 +138,18 @@ public:
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
     virtual void    KeyInput( const KeyEvent& rKEvt );
 
-    void	InitWindowBits( BOOL bButtons );
+    void	InitWindowBits( sal_Bool bButtons );
 
-    void    Refresh( USHORT nType = 0 );
+    void    Refresh( sal_uInt16 nType = 0 );
 
     void	ToggleRoot();
-    void	SetRootType( USHORT nNew );
-    USHORT	GetRootType() const				{ return nRootType; }
+    void	SetRootType( sal_uInt16 nNew );
+    sal_uInt16	GetRootType() const				{ return nRootType; }
 
     void	ActiveDocChanged();
     void	ResetManualDoc();
     void	SetManualDoc(const String& rName);
-    BOOL	LoadFile(const String& rUrl);
+    sal_Bool	LoadFile(const String& rUrl);
     void	SelectDoc(const String& rName);
 
     const String& GetHiddenTitle() const	{ return aHiddenTitle; }
@@ -159,7 +159,7 @@ public:
     /** Stores the current listbox state in the navigator settings. */
     void                        StoreSettings() const;
 
-    static BOOL	IsInDrag()	{ return bIsInDrag; }
+    static sal_Bool	IsInDrag()	{ return bIsInDrag; }
 };
 
 
diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx
index 36d1e1236..47e406211 100644
--- a/sc/source/ui/inc/corodlg.hxx
+++ b/sc/source/ui/inc/corodlg.hxx
@@ -47,8 +47,8 @@ class ScColRowLabelDlg : public ModalDialog
 {
 public:
             ScColRowLabelDlg( Window* pParent,
-                              BOOL bCol = FALSE,
-                              BOOL bRow = FALSE )
+                              sal_Bool bCol = sal_False,
+                              sal_Bool bRow = sal_False )
                 : ModalDialog( pParent, ScResId( RID_SCDLG_CHARTCOLROW ) ),
                   aFlColRow  ( this, ScResId(6) ),
                   aBtnRow	 ( this, ScResId(2) ),
@@ -62,8 +62,8 @@ public:
                     aBtnRow.Check( bRow );
                 }
 
-    BOOL IsCol() { return aBtnCol.IsChecked(); }
-    BOOL IsRow() { return aBtnRow.IsChecked(); }
+    sal_Bool IsCol() { return aBtnCol.IsChecked(); }
+    sal_Bool IsRow() { return aBtnRow.IsChecked(); }
 
 private:
     FixedLine       aFlColRow;
diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx
index 206374f8a..3ff1b9b9d 100644
--- a/sc/source/ui/inc/crdlg.hxx
+++ b/sc/source/ui/inc/crdlg.hxx
@@ -45,7 +45,7 @@ public:
             ScColOrRowDlg( Window*			pParent,
                            const String&	rStrTitle,
                            const String&	rStrLabel,
-                           BOOL				bColDefault = TRUE );
+                           sal_Bool				bColDefault = sal_True );
             ~ScColOrRowDlg();
 
 private:
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index 5cee52d5a..b11faea35 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -50,9 +50,9 @@ public:
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
 
-    virtual BOOL	IsRefInputMode() const;
+    virtual sal_Bool	IsRefInputMode() const;
     virtual void	SetActive();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 private:
     FixedLine       aFlAssign;
@@ -83,15 +83,15 @@ private:
     ScViewData*		pViewData;
     ScDocument*		pDoc;
     formula::RefEdit*		pEdActive;
-    BOOL			bDlgLostFocus;
+    sal_Bool			bDlgLostFocus;
 
 #ifdef _CRNRDLG_CXX
 private:
     void Init				();
     void UpdateNames		();
-    void UpdateRangeData	( const ScRange& rRange, BOOL bColName );
-    void SetColRowData( const ScRange& rLabelRange,BOOL bRef=FALSE);
-    void AdjustColRowData( const ScRange& rDataRange,BOOL bRef=FALSE);
+    void UpdateRangeData	( const ScRange& rRange, sal_Bool bColName );
+    void SetColRowData( const ScRange& rLabelRange,sal_Bool bRef=sal_False);
+    void AdjustColRowData( const ScRange& rDataRange,sal_Bool bRef=sal_False);
     DECL_LINK( CancelBtnHdl, void * );
     DECL_LINK( OkBtnHdl, void * );
     DECL_LINK( AddBtnHdl, void * );
diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index 33af9f9d2..945c208c4 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -77,7 +77,7 @@ public:
     virtual void                SetPosSizePixel(
                                     long nX, long nY,
                                     long nWidth, long nHeight,
-                                    USHORT nFlags = WINDOW_POSSIZE_ALL );
+                                    sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
 
     /** Apply current layout data to the ruler. */
     void                        ApplyLayout( const ScCsvLayoutData& rOldData );
@@ -89,7 +89,7 @@ private:
     SC_DLLPRIVATE void                        InitSizeData();
 
     /** Moves cursor to a new position.
-        @param bScroll  TRUE = The method may scroll the ruler. */
+        @param bScroll  sal_True = The method may scroll the ruler. */
     SC_DLLPRIVATE void                        MoveCursor( sal_Int32 nPos, bool bScroll = true );
     /** Moves cursor to the given direction. */
     SC_DLLPRIVATE void                        MoveCursorRel( ScMoveMode eDir );
@@ -150,7 +150,7 @@ private:
     /** Moves tracking to a new position. */
     SC_DLLPRIVATE void                        MoveMouseTracking( sal_Int32 nPos );
     /** Applies tracking action for the current tracking position.
-        @param bApply  TRUE = apply action, FALSE = cancel action. */
+        @param bApply  sal_True = apply action, sal_False = cancel action. */
     SC_DLLPRIVATE void                        EndMouseTracking( bool bApply );
 
     // painting ---------------------------------------------------------------
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index 2962df9fd..5ab238c38 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -51,11 +51,11 @@ private:
     HelpButton		aBtnHelp;
 
 public:
-            ScDataPilotSourceTypeDlg( Window* pParent, BOOL bEnableExternal );
+            ScDataPilotSourceTypeDlg( Window* pParent, sal_Bool bEnableExternal );
             ~ScDataPilotSourceTypeDlg();
 
-    BOOL	IsDatabase() const;
-    BOOL	IsExternal() const;
+    sal_Bool	IsDatabase() const;
+    sal_Bool	IsExternal() const;
 };
 
 
diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx
index 4346d2a85..3955b5580 100644
--- a/sc/source/ui/inc/dbdocfun.hxx
+++ b/sc/source/ui/inc/dbdocfun.hxx
@@ -81,42 +81,42 @@ public:
 
     void			UpdateImport( const String& rTarget, const String& rDBName,
                         const String& rTableName, const String& rStatement,
-                        BOOL bNative, BYTE nType,
+                        sal_Bool bNative, sal_uInt8 nType,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::sdbc::XResultSet >& xResultSet,
                         const SbaSelectionList* pSelection );
 
-    BOOL			DoImport( SCTAB nTab, const ScImportParam& rParam,
+    sal_Bool			DoImport( SCTAB nTab, const ScImportParam& rParam,
                         const ::com::sun::star::uno::Reference<
                         ::com::sun::star::sdbc::XResultSet >& xResultSet,
-                        const SbaSelectionList* pSelection, BOOL bRecord,
-                        BOOL bAddrInsert = FALSE );
+                        const SbaSelectionList* pSelection, sal_Bool bRecord,
+                        sal_Bool bAddrInsert = sal_False );
 
-    BOOL			DoImportUno( const ScAddress& rPos,
+    sal_Bool			DoImportUno( const ScAddress& rPos,
                                 const com::sun::star::uno::Sequence<
                                     com::sun::star::beans::PropertyValue>& aArgs );
 
     static void		ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame );
 
-    BOOL			Sort( SCTAB nTab, const ScSortParam& rSortParam,
-                            BOOL bRecord, BOOL bPaint, BOOL bApi );
+    sal_Bool			Sort( SCTAB nTab, const ScSortParam& rSortParam,
+                            sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
 
-    SC_DLLPUBLIC BOOL			Query( SCTAB nTab, const ScQueryParam& rQueryParam,
-                            const ScRange* pAdvSource, BOOL bRecord, BOOL bApi );
+    SC_DLLPUBLIC sal_Bool			Query( SCTAB nTab, const ScQueryParam& rQueryParam,
+                            const ScRange* pAdvSource, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
+    sal_Bool			DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
                                     const ScSortParam* pForceNewSort,
-                                    BOOL bRecord, BOOL bApi );
+                                    sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi );
-    BOOL			DeleteDBRange( const String& rName, BOOL bApi );
-    BOOL			RenameDBRange( const String& rOld, const String& rNew, BOOL bApi );
-    BOOL			ModifyDBData( const ScDBData& rNewData, BOOL bApi );	// Name unveraendert
+    sal_Bool			AddDBRange( const String& rName, const ScRange& rRange, sal_Bool bApi );
+    sal_Bool			DeleteDBRange( const String& rName, sal_Bool bApi );
+    sal_Bool			RenameDBRange( const String& rOld, const String& rNew, sal_Bool bApi );
+    sal_Bool			ModifyDBData( const ScDBData& rNewData, sal_Bool bApi );	// Name unveraendert
 
-    BOOL			RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi );
+    sal_Bool			RepeatDB( const String& rDBName, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
-                                        BOOL bRecord, BOOL bApi, BOOL bAllowMove = FALSE );
+    sal_Bool			DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
+                                        sal_Bool bRecord, sal_Bool bApi, sal_Bool bAllowMove = sal_False );
 };
 
 
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 65805c84f..31c40607a 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -58,40 +58,40 @@ public:
                     //	nur UISort wiederholt bei Bedarf die Teilergebnisse
 
     void			UISort( const ScSortParam& rSortParam,
-                          BOOL bRecord = TRUE );
+                          sal_Bool bRecord = sal_True );
 
     void			Sort( const ScSortParam& rSortParam,
-                          BOOL bRecord = TRUE, BOOL bPaint = TRUE );
+                          sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
     SC_DLLPUBLIC void			Query( const ScQueryParam& rQueryParam,
-                           const ScRange* pAdvSource, BOOL bRecord );
-    void			DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord = TRUE,
+                           const ScRange* pAdvSource, sal_Bool bRecord );
+    void			DoSubTotals( const ScSubTotalParam& rParam, sal_Bool bRecord = sal_True,
                             const ScSortParam* pForceNewSort = NULL );
 
     void			ToggleAutoFilter();
     void			HideAutoFilter();
 
-    void			RepeatDB( BOOL bRecord = TRUE );
+    void			RepeatDB( sal_Bool bRecord = sal_True );
 
-    BOOL			ImportData( const ScImportParam& rParam, BOOL bRecord = TRUE );
+    sal_Bool			ImportData( const ScImportParam& rParam, sal_Bool bRecord = sal_True );
 
     void			GotoDBArea( const String& rDBName );
 
                     // DB-Bereich vom Cursor
-    ScDBData* 		GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP );
+    ScDBData* 		GetDBData( sal_Bool bMarkArea = sal_True, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP );
 
     void			NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
 
-    void			Consolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE );
+    void			Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord = sal_True );
 
-    bool            MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable,
-                                    const ScDPObject& rSource, BOOL bApi = FALSE );
+    bool            MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, sal_Bool bNewTable,
+                                    const ScDPObject& rSource, sal_Bool bApi = sal_False );
     void			DeletePivotTable();
     // Wang Xu Ming -- 2009-6-17
     // DataPilot Migration
-    ULONG   RecalcPivotTable();
+    sal_uLong   RecalcPivotTable();
     // End Comments
-    BOOL            HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts );
-    BOOL            HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo );
+    sal_Bool            HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts );
+    sal_Bool            HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo );
     void            GroupDataPilot();
     void            DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nParts );
     void            NumGroupDataPilot( const ScDPNumGroupInfo& rInfo );
@@ -99,35 +99,35 @@ public:
     void            DataPilotInput( const ScAddress& rPos, const String& rString );
 
     bool            DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId = NULL );
-    BOOL            DataPilotMove( const ScRange& rSource, const ScAddress& rDest );
+    sal_Bool            DataPilotMove( const ScRange& rSource, const ScAddress& rDest );
 
-    BOOL            HasSelectionForDrillDown( USHORT& rOrientation );
-    void            SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName = NULL );
+    sal_Bool            HasSelectionForDrillDown( sal_uInt16& rOrientation );
+    void            SetDataPilotDetails( sal_Bool bShow, const String* pNewDimensionName = NULL );
 
     void            ShowDataPilotSourceData( ScDPObject& rDPObj,
                         const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters );
 
-    void			MakeOutline( BOOL bColumns, BOOL bRecord = TRUE );
-    void			RemoveOutline( BOOL bColumns, BOOL bRecord = TRUE );
-    void			RemoveAllOutlines( BOOL bRecord = TRUE );
-    void			TestRemoveOutline( BOOL& rCol, BOOL& rRow );
+    void			MakeOutline( sal_Bool bColumns, sal_Bool bRecord = sal_True );
+    void			RemoveOutline( sal_Bool bColumns, sal_Bool bRecord = sal_True );
+    void			RemoveAllOutlines( sal_Bool bRecord = sal_True );
+    void			TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow );
 
-    void			AutoOutline( BOOL bRecord = TRUE );
+    void			AutoOutline( sal_Bool bRecord = sal_True );
 
-    void			SelectLevel( BOOL bColumns, USHORT nLevel,
-                                    BOOL bRecord = TRUE, BOOL bPaint = TRUE );
-    void			ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry,
-                                    BOOL bRecord = TRUE, BOOL bPaint = TRUE );
-    void			HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry,
-                                    BOOL bRecord = TRUE, BOOL bPaint = TRUE );
+    void			SelectLevel( sal_Bool bColumns, sal_uInt16 nLevel,
+                                    sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
+    void			ShowOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
+                                    sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
+    void			HideOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
+                                    sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
 
-    void			ShowMarkedOutlines( BOOL bRecord = TRUE );
-    void			HideMarkedOutlines( BOOL bRecord = TRUE );
-    BOOL			OutlinePossible(BOOL bHide);
+    void			ShowMarkedOutlines( sal_Bool bRecord = sal_True );
+    void			HideMarkedOutlines( sal_Bool bRecord = sal_True );
+    sal_Bool			OutlinePossible(sal_Bool bHide);
 
-    void			UpdateCharts(BOOL bAllCharts = FALSE);		// Default: am Cursor
+    void			UpdateCharts(sal_Bool bAllCharts = sal_False);		// Default: am Cursor
 
-    static USHORT   DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCharts );
+    static sal_uInt16   DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, sal_Bool bAllCharts );
 };
 
 
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index 4e72c12d3..651af7627 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -58,9 +58,9 @@ public:
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
 
-    virtual BOOL	IsRefInputMode() const;
+    virtual sal_Bool	IsRefInputMode() const;
     virtual void	SetActive();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 private:
     FixedLine           aFlName;
@@ -85,7 +85,7 @@ private:
     PushButton		aBtnRemove;
     MoreButton		aBtnMore;
 
-    BOOL			bSaved;
+    sal_Bool			bSaved;
 
 
     const String	aStrAdd;	// "Hinzufuegen"
@@ -98,7 +98,7 @@ private:
 
     ScViewData*		pViewData;
     ScDocument*		pDoc;
-    BOOL			bRefInputMode;
+    sal_Bool			bRefInputMode;
     ScAddress::Details aAddrDetails;
 
     ScDBCollection	aLocalDbCol;
diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx
index 86c6cfc25..2e91fd215 100644
--- a/sc/source/ui/inc/delcldlg.hxx
+++ b/sc/source/ui/inc/delcldlg.hxx
@@ -52,7 +52,7 @@ private:
 
 
 public:
-            ScDeleteCellDlg( Window* pParent, BOOL bDisallowCellMove = FALSE );
+            ScDeleteCellDlg( Window* pParent, sal_Bool bDisallowCellMove = sal_False );
             ~ScDeleteCellDlg();
 
     DelCellCmd GetDelCellCmd() const;
diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx
index cd1383e0c..6c96c72e1 100644
--- a/sc/source/ui/inc/delcodlg.hxx
+++ b/sc/source/ui/inc/delcodlg.hxx
@@ -51,21 +51,21 @@ private:
     CancelButton	aBtnCancel;
     HelpButton		aBtnHelp;
 
-    BOOL			bObjectsDisabled;
+    sal_Bool			bObjectsDisabled;
 
-    static BOOL		bPreviousAllCheck;
-    static USHORT	nPreviousChecks;
+    static sal_Bool		bPreviousAllCheck;
+    static sal_uInt16	nPreviousChecks;
 
-    void DisableChecks( BOOL bDelAllChecked = TRUE );
+    void DisableChecks( sal_Bool bDelAllChecked = sal_True );
     DECL_LINK( DelAllHdl, void * );
 
 public:
             ScDeleteContentsDlg( Window* pParent,
-                                 USHORT  nCheckDefaults = 0 );
+                                 sal_uInt16  nCheckDefaults = 0 );
             ~ScDeleteContentsDlg();
     void	DisableObjects();
 
-    USHORT	GetDelContentsCmdBits() const;
+    sal_uInt16	GetDelContentsCmdBits() const;
 };
 
 
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 772b7fa60..f13ede95f 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -53,11 +53,11 @@ class ScDocFunc
 private:
     ScDocShell&		rDocShell;
 
-    BOOL			AdjustRowHeight( const ScRange& rRange, BOOL bPaint = TRUE );
+    sal_Bool			AdjustRowHeight( const ScRange& rRange, sal_Bool bPaint = sal_True );
     void			CreateOneName( ScRangeName& rList,
                                     SCCOL nPosX, SCROW nPosY, SCTAB nTab,
                                     SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
-                                    BOOL& rCancel, BOOL bApi );
+                                    sal_Bool& rCancel, sal_Bool bApi );
     void			NotifyInputHandler( const ScAddress& rPos );
 
 public:
@@ -66,27 +66,27 @@ public:
 
     DECL_LINK( NotifyDrawUndo, SdrUndoAction* );
 
-    BOOL			DetectiveAddPred(const ScAddress& rPos);
-    BOOL			DetectiveDelPred(const ScAddress& rPos);
-    BOOL			DetectiveAddSucc(const ScAddress& rPos);
-    BOOL			DetectiveDelSucc(const ScAddress& rPos);
-    BOOL			DetectiveAddError(const ScAddress& rPos);
-    BOOL			DetectiveMarkInvalid(SCTAB nTab);
-    BOOL			DetectiveDelAll(SCTAB nTab);
-    BOOL			DetectiveRefresh(BOOL bAutomatic = FALSE);
-
-    BOOL			DeleteContents( const ScMarkData& rMark, USHORT nFlags,
-                                    BOOL bRecord, BOOL bApi );
-
-    BOOL			TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
-                                    BOOL bRecord, BOOL bApi );
-
-    BOOL			SetNormalString( const ScAddress& rPos, const String& rText, BOOL bApi );
-    BOOL			PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi );
-    BOOL			PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
-                                BOOL bInterpret, BOOL bApi );
-    BOOL			SetCellText( const ScAddress& rPos, const String& rText,
-                                    BOOL bInterpret, BOOL bEnglish, BOOL bApi,
+    sal_Bool			DetectiveAddPred(const ScAddress& rPos);
+    sal_Bool			DetectiveDelPred(const ScAddress& rPos);
+    sal_Bool			DetectiveAddSucc(const ScAddress& rPos);
+    sal_Bool			DetectiveDelSucc(const ScAddress& rPos);
+    sal_Bool			DetectiveAddError(const ScAddress& rPos);
+    sal_Bool			DetectiveMarkInvalid(SCTAB nTab);
+    sal_Bool			DetectiveDelAll(SCTAB nTab);
+    sal_Bool			DetectiveRefresh(sal_Bool bAutomatic = sal_False);
+
+    sal_Bool			DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags,
+                                    sal_Bool bRecord, sal_Bool bApi );
+
+    sal_Bool			TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
+                                    sal_Bool bRecord, sal_Bool bApi );
+
+    sal_Bool			SetNormalString( const ScAddress& rPos, const String& rText, sal_Bool bApi );
+    sal_Bool			PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, sal_Bool bApi );
+    sal_Bool			PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
+                                sal_Bool bInterpret, sal_Bool bApi );
+    sal_Bool			SetCellText( const ScAddress& rPos, const String& rText,
+                                    sal_Bool bInterpret, sal_Bool bEnglish, sal_Bool bApi,
                                     const String& rFormulaNmsp,
                                     const formula::FormulaGrammar::Grammar eGrammar );
 
@@ -98,90 +98,90 @@ public:
     bool			ShowNote( const ScAddress& rPos, bool bShow = true );
     inline bool		HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); }
 
-    bool            SetNoteText( const ScAddress& rPos, const String& rNoteText, BOOL bApi );
-    bool            ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, BOOL bApi );
+    bool            SetNoteText( const ScAddress& rPos, const String& rNoteText, sal_Bool bApi );
+    bool            ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, sal_Bool bApi );
 
-    BOOL			ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
-                                    BOOL bRecord, BOOL bApi );
-    BOOL			ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
-                                    BOOL bRecord, BOOL bApi );
+    sal_Bool			ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
+                                    sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool			ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
+                                    sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			InsertCells( const ScRange& rRange,const ScMarkData* pTabMark,
-                                 InsCellCmd eCmd, BOOL bRecord, BOOL bApi,
-                                    BOOL bPartOfPaste = FALSE );
-    BOOL			DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
-                                 DelCellCmd eCmd, BOOL bRecord, BOOL bApi );
+    sal_Bool			InsertCells( const ScRange& rRange,const ScMarkData* pTabMark,
+                                 InsCellCmd eCmd, sal_Bool bRecord, sal_Bool bApi,
+                                    sal_Bool bPartOfPaste = sal_False );
+    sal_Bool			DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
+                                 DelCellCmd eCmd, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
-                                BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi );
+    sal_Bool			MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
+                                sal_Bool bCut, sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
 
-    BOOL			InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi );
-    BOOL			RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi );
-    BOOL			DeleteTable( SCTAB nTab, BOOL bRecord, BOOL bApi );
+    sal_Bool			InsertTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool			RenameTable( SCTAB nTab, const String& rName, sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool			DeleteTable( SCTAB nTab, sal_Bool bRecord, sal_Bool bApi );
 
     bool            SetTabBgColor( SCTAB nTab, const Color& rColor, bool bRecord, bool bApi );
     bool            SetTabBgColor( ScUndoTabColorInfo::List& rUndoTabColorList, bool bRecord, bool bApi );
 
-    BOOL			SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi );
+    sal_Bool			SetTableVisible( SCTAB nTab, sal_Bool bVisible, sal_Bool bApi );
 
-    BOOL			SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL bApi );
+    sal_Bool			SetLayoutRTL( SCTAB nTab, sal_Bool bRTL, sal_Bool bApi );
 
-//UNUSED2009-05 BOOL	 	    SetGrammar( formula::FormulaGrammar::Grammar eGrammar );
+//UNUSED2009-05 sal_Bool	 	    SetGrammar( formula::FormulaGrammar::Grammar eGrammar );
 
-    SC_DLLPUBLIC BOOL			SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
-                                    SCTAB nTab, ScSizeMode eMode, USHORT nSizeTwips,
-                                    BOOL bRecord, BOOL bApi );
+    SC_DLLPUBLIC sal_Bool			SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
+                                    SCTAB nTab, ScSizeMode eMode, sal_uInt16 nSizeTwips,
+                                    sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
-                                    BOOL bRecord, BOOL bSetModified, BOOL bApi );
-    BOOL			RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
-                                    BOOL bRecord, BOOL bSetModified, BOOL bApi );
+    sal_Bool			InsertPageBreak( sal_Bool bColumn, const ScAddress& rPos,
+                                    sal_Bool bRecord, sal_Bool bSetModified, sal_Bool bApi );
+    sal_Bool			RemovePageBreak( sal_Bool bColumn, const ScAddress& rPos,
+                                    sal_Bool bRecord, sal_Bool bSetModified, sal_Bool bApi );
 
     void            ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect );
 
-    BOOL			Protect( SCTAB nTab, const String& rPassword, BOOL bApi );
-    BOOL			Unprotect( SCTAB nTab, const String& rPassword, BOOL bApi );
+    sal_Bool			Protect( SCTAB nTab, const String& rPassword, sal_Bool bApi );
+    sal_Bool			Unprotect( SCTAB nTab, const String& rPassword, sal_Bool bApi );
 
-    BOOL			ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL bApi );
-    BOOL			ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bApi );
-    BOOL			AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
-                                    USHORT nFormatNo, BOOL bRecord, BOOL bApi );
+    sal_Bool			ClearItems( const ScMarkData& rMark, const sal_uInt16* pWhich, sal_Bool bApi );
+    sal_Bool			ChangeIndent( const ScMarkData& rMark, sal_Bool bIncrement, sal_Bool bApi );
+    sal_Bool			AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
+                                    sal_uInt16 nFormatNo, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
+    sal_Bool			EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
                                     const ScTokenArray* pTokenArray,
-                                    const String& rString, BOOL bApi, BOOL bEnglish,
+                                    const String& rString, sal_Bool bApi, sal_Bool bEnglish,
                                     const String& rFormulaNmsp,
                                     const formula::FormulaGrammar::Grammar );
 
-    BOOL			TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
-                            const ScTabOpParam& rParam, BOOL bRecord, BOOL bApi );
+    sal_Bool			TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
+                            const ScTabOpParam& rParam, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
-                                FillDir eDir, BOOL bRecord, BOOL bApi );
-    BOOL			FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
+    sal_Bool			FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
+                                FillDir eDir, sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool			FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
                                 FillDir	eDir, FillCmd eCmd, FillDateCmd	eDateCmd,
                                 double fStart, double fStep, double fMax,
-                                BOOL bRecord, BOOL bApi );
+                                sal_Bool bRecord, sal_Bool bApi );
                     // FillAuto: rRange wird von Source-Range auf Dest-Range angepasst
-    BOOL			FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
-                                FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi );
+    sal_Bool			FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
+                                FillDir eDir, sal_uLong nCount, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL			ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi );
+    sal_Bool			ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, sal_Bool bApi );
 
-    BOOL			MergeCells( const ScRange& rRange, BOOL bContents,
-                                BOOL bRecord, BOOL bApi );
-    BOOL			UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
+    sal_Bool			MergeCells( const ScRange& rRange, sal_Bool bContents,
+                                sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool			UnmergeCells( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL            SetNewRangeNames( ScRangeName* pNewRanges, BOOL bApi );     // takes ownership of pNewRanges
-    BOOL			ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi );
+    sal_Bool            SetNewRangeNames( ScRangeName* pNewRanges, sal_Bool bApi );     // takes ownership of pNewRanges
+    sal_Bool			ModifyRangeNames( const ScRangeName& rNewRanges, sal_Bool bApi );
 
-    BOOL			CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi );
-    BOOL			InsertNameList( const ScAddress& rStartPos, BOOL bApi );
+    sal_Bool			CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi );
+    sal_Bool			InsertNameList( const ScAddress& rStartPos, sal_Bool bApi );
 
-    BOOL			InsertAreaLink( const String& rFile, const String& rFilter,
+    sal_Bool			InsertAreaLink( const String& rFile, const String& rFilter,
                                     const String& rOptions, const String& rSource,
-                                    const ScRange& rDestRange, ULONG nRefresh,
-                                    BOOL bFitBlock, BOOL bApi );
+                                    const ScRange& rDestRange, sal_uLong nRefresh,
+                                    sal_Bool bFitBlock, sal_Bool bApi );
 };
 
 
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 44e11718e..6610c2318 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -71,7 +71,7 @@ class ScSheetSaveData;
 namespace sfx2 { class FileDialogHelper; }
 struct DocShell_Impl;
 
-typedef ::std::hash_map< ULONG, ULONG > ScChangeActionMergeMap;
+typedef ::std::hash_map< sal_uLong, sal_uLong > ScChangeActionMergeMap;
 
 //==================================================================
 
@@ -99,16 +99,16 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
 
     //SfxObjectCreateMode	eShellMode;
 
-    BOOL				bIsInplace;			// wird von der View gesetzt
-    BOOL				bHeaderOn;
-    BOOL				bFooterOn;
-    BOOL				bNoInformLost;
-    BOOL				bIsEmpty;
-    BOOL				bIsInUndo;
-    BOOL				bDocumentModifiedPending;
-    USHORT				nDocumentLock;
+    sal_Bool				bIsInplace;			// wird von der View gesetzt
+    sal_Bool				bHeaderOn;
+    sal_Bool				bFooterOn;
+    sal_Bool				bNoInformLost;
+    sal_Bool				bIsEmpty;
+    sal_Bool				bIsInUndo;
+    sal_Bool				bDocumentModifiedPending;
+    sal_uInt16				nDocumentLock;
     sal_Int16           nCanUpdate;  // stores the UpdateDocMode from loading a document till update links
-    BOOL                bUpdateEnabled;
+    sal_Bool                bUpdateEnabled;
 
     ScDBData*           pOldAutoDBRange;
 
@@ -142,23 +142,23 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
                         ScDocShell & mrDocShell;
     };
 
-    SC_DLLPRIVATE BOOL            LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
-    SC_DLLPRIVATE BOOL            SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
+    SC_DLLPRIVATE sal_Bool            LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
+    SC_DLLPRIVATE sal_Bool            SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
     SC_DLLPRIVATE SCTAB			GetSaveTab();
 
-    SC_DLLPRIVATE ULONG			DBaseImport( const String& rFullFileName, CharSet eCharSet,
-                                 BOOL bSimpleColWidth[MAXCOLCOUNT] );
-    SC_DLLPRIVATE ULONG			DBaseExport( const String& rFullFileName, CharSet eCharSet,
-                                 BOOL& bHasMemo );
+    SC_DLLPRIVATE sal_uLong			DBaseImport( const String& rFullFileName, CharSet eCharSet,
+                                 sal_Bool bSimpleColWidth[MAXCOLCOUNT] );
+    SC_DLLPRIVATE sal_uLong			DBaseExport( const String& rFullFileName, CharSet eCharSet,
+                                 sal_Bool& bHasMemo );
 
-    SC_DLLPRIVATE static BOOL		MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
-    SC_DLLPRIVATE static BOOL		KillFile( const INetURLObject& rURL );
-    SC_DLLPRIVATE static BOOL		IsDocument( const INetURLObject& rURL );
+    SC_DLLPRIVATE static sal_Bool		MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
+    SC_DLLPRIVATE static sal_Bool		KillFile( const INetURLObject& rURL );
+    SC_DLLPRIVATE static sal_Bool		IsDocument( const INetURLObject& rURL );
 
-    SC_DLLPRIVATE void			LockPaint_Impl(BOOL bDoc);
-    SC_DLLPRIVATE void			UnlockPaint_Impl(BOOL bDoc);
-    SC_DLLPRIVATE void			LockDocument_Impl(USHORT nNew);
-    SC_DLLPRIVATE void			UnlockDocument_Impl(USHORT nNew);
+    SC_DLLPRIVATE void			LockPaint_Impl(sal_Bool bDoc);
+    SC_DLLPRIVATE void			UnlockPaint_Impl(sal_Bool bDoc);
+    SC_DLLPRIVATE void			LockDocument_Impl(sal_uInt16 nNew);
+    SC_DLLPRIVATE void			UnlockDocument_Impl(sal_uInt16 nNew);
 
     SC_DLLPRIVATE void          EnableSharedSettings( bool bEnable );
     SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument();
@@ -180,14 +180,15 @@ public:
                     ~ScDocShell();
 
     using SotObject::GetInterface;
-    using SfxShell::Activate;           // with BOOL bMDI
-    using SfxShell::Deactivate;         // with BOOL bMDI
+    using SfxShell::Activate;           // with sal_Bool bMDI
+    using SfxShell::Deactivate;         // with sal_Bool bMDI
     using SfxObjectShell::Print;        // print styles
 
     virtual void    Activate();
     virtual void    Deactivate();
 
-    virtual SfxUndoManager*     GetUndoManager();
+    virtual ::svl::IUndoManager*
+                    GetUndoManager();
 
     virtual void	FillClass( SvGlobalName * pClassName,
                                sal_uInt32 * pFormat,
@@ -197,38 +198,38 @@ public:
                                sal_Int32 nFileFormat,
                                sal_Bool bTemplate = sal_False ) const;
 
-    virtual BOOL    InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
-    virtual BOOL    Load( SfxMedium& rMedium );
-    virtual BOOL    LoadFrom( SfxMedium& rMedium );
-    virtual BOOL    ConvertFrom( SfxMedium &rMedium );
-    virtual BOOL    Save();
-    virtual BOOL    SaveAs( SfxMedium& rMedium );
-    virtual BOOL    ConvertTo( SfxMedium &rMedium );
-    virtual USHORT	PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
+    virtual sal_Bool    InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
+    virtual sal_Bool    Load( SfxMedium& rMedium );
+    virtual sal_Bool    LoadFrom( SfxMedium& rMedium );
+    virtual sal_Bool    ConvertFrom( SfxMedium &rMedium );
+    virtual sal_Bool    Save();
+    virtual sal_Bool    SaveAs( SfxMedium& rMedium );
+    virtual sal_Bool    ConvertTo( SfxMedium &rMedium );
+    virtual sal_uInt16	PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
     virtual void	PrepareReload();
-    virtual BOOL	IsInformationLost();
+    virtual sal_Bool	IsInformationLost();
     virtual void	LoadStyles( SfxObjectShell &rSource );
-    virtual BOOL	Insert( SfxObjectShell &rSource,
-                                USHORT nSourceIdx1, USHORT nSourceIdx2, USHORT nSourceIdx3,
-                                USHORT &nIdx1, USHORT &nIdx2, USHORT &nIdx3, USHORT &rIdxDeleted );
+    virtual sal_Bool	Insert( SfxObjectShell &rSource,
+                                sal_uInt16 nSourceIdx1, sal_uInt16 nSourceIdx2, sal_uInt16 nSourceIdx3,
+                                sal_uInt16 &nIdx1, sal_uInt16 &nIdx2, sal_uInt16 &nIdx3, sal_uInt16 &rIdxDeleted );
 
-    virtual BOOL    SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );      // SfxInPlaceObject
-    virtual BOOL	DoSaveCompleted( SfxMedium * pNewStor);		// SfxObjectShell
-    virtual sal_Bool QuerySlotExecutable( USHORT nSlotId );
+    virtual sal_Bool    SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );      // SfxInPlaceObject
+    virtual sal_Bool	DoSaveCompleted( SfxMedium * pNewStor);		// SfxObjectShell
+    virtual sal_Bool QuerySlotExecutable( sal_uInt16 nSlotId );
 
     virtual void	Draw( OutputDevice *, const JobSetup & rSetup,
-                                USHORT nAspect = ASPECT_CONTENT );
+                                sal_uInt16 nAspect = ASPECT_CONTENT );
 
     virtual void    SetVisArea( const Rectangle & rVisArea );
 
     using SfxObjectShell::GetVisArea;
-    virtual Rectangle GetVisArea( USHORT nAspect ) const;
+    virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const;
 
     virtual Printer* GetDocumentPrinter();
 
-    virtual void	SetModified( BOOL = TRUE );
+    virtual void	SetModified( sal_Bool = sal_True );
 
-    void			SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart );
+    void			SetVisAreaOrSize( const Rectangle& rVisArea, sal_Bool bModifyStart );
 
     virtual SfxDocumentInfoDialog*  CreateDocumentInfoDialog( Window *pParent,
                                                               const SfxItemSet &rSet );
@@ -238,8 +239,8 @@ public:
     ScDocument*     GetDocument()	{ return &aDocument; }
     ScDocFunc&		GetDocFunc()	{ return *pDocFunc; }
 
-    SfxPrinter*		GetPrinter( BOOL bCreateIfNotExist = TRUE );
-    USHORT			SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL );
+    SfxPrinter*		GetPrinter( sal_Bool bCreateIfNotExist = sal_True );
+    sal_uInt16			SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL );
 
     void			UpdateFontList();
 
@@ -258,52 +259,52 @@ public:
     void			GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab );
 
     void			CompareDocument( ScDocument& rOtherDoc );
-    void            MergeDocument( ScDocument& rOtherDoc, bool bShared = false, bool bCheckDuplicates = false, ULONG nOffset = 0, ScChangeActionMergeMap* pMergeMap = NULL, bool bInverseMap = false );
+    void            MergeDocument( ScDocument& rOtherDoc, bool bShared = false, bool bCheckDuplicates = false, sal_uLong nOffset = 0, ScChangeActionMergeMap* pMergeMap = NULL, bool bInverseMap = false );
     bool            MergeSharedDocument( ScDocShell* pSharedDocShell );
 
     ScChangeAction*	GetChangeAction( const ScAddress& rPos );
     void			SetChangeComment( ScChangeAction* pAction, const String& rComment );
-    void			ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext=TRUE );
+    void			ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,sal_Bool bPrevNext=sal_True );
                     /// Protect/unprotect ChangeTrack and return <TRUE/> if
                     /// protection was successfully changed.
-                    /// If bJustQueryIfProtected==TRUE protection is not
+                    /// If bJustQueryIfProtected==sal_True protection is not
                     /// changed and <TRUE/> is returned if not protected or
                     /// password was entered correctly.
-    BOOL            ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQueryIfProtected = FALSE );
+    sal_Bool            ExecuteChangeProtectionDialog( Window* _pParent, sal_Bool bJustQueryIfProtected = sal_False );
 
-    void			SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages );
-    BOOL			AdjustPrintZoom( const ScRange& rRange );
+    void			SetPrintZoom( SCTAB nTab, sal_uInt16 nScale, sal_uInt16 nPages );
+    sal_Bool			AdjustPrintZoom( const ScRange& rRange );
 
-    void			LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles );
+    void			LoadStylesArgs( ScDocShell& rSource, sal_Bool bReplace, sal_Bool bCellStyles, sal_Bool bPageStyles );
 
-    void			PageStyleModified( const String& rStyleName, BOOL bApi );
+    void			PageStyleModified( const String& rStyleName, sal_Bool bApi );
 
     void			NotifyStyle( const SfxStyleSheetHint& rHint );
     void			DoAutoStyle( const ScRange& rRange, const String& rStyle );
 
     Window*			GetActiveDialogParent();
-    void			ErrorMessage( USHORT nGlobStrId );
-    BOOL			IsEditable() const;
+    void			ErrorMessage( sal_uInt16 nGlobStrId );
+    sal_Bool			IsEditable() const;
 
-    BOOL			AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
+    sal_Bool			AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
     void            UpdateAllRowHeights( const ScMarkData* pTabMark = NULL );
     void            UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore = false );
 
     void			RefreshPivotTables( const ScRange& rSource );
-    void			DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE );
-    void			UseScenario( SCTAB nTab, const String& rName, BOOL bRecord = TRUE );
+    void			DoConsolidate( const ScConsolidateParam& rParam, sal_Bool bRecord = sal_True );
+    void			UseScenario( SCTAB nTab, const String& rName, sal_Bool bRecord = sal_True );
     SCTAB			MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
-                                    const Color& rColor, USHORT nFlags,
-                                    ScMarkData& rMark, BOOL bRecord = TRUE );
+                                    const Color& rColor, sal_uInt16 nFlags,
+                                    ScMarkData& rMark, sal_Bool bRecord = sal_True );
     void			ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
-                                    const Color& rColor, USHORT nFlags );
-    BOOL			MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord );
+                                    const Color& rColor, sal_uInt16 nFlags );
+    sal_Bool			MoveTable( SCTAB nSrcTab, SCTAB nDestTab, sal_Bool bCopy, sal_Bool bRecord );
 
-    void			DoRecalc( BOOL bApi );
-    void			DoHardRecalc( BOOL bApi );
+    void			DoRecalc( sal_Bool bApi );
+    void			DoHardRecalc( sal_Bool bApi );
 
-    void			UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = FALSE );
-    BOOL			IsOle();
+    void			UpdateOle( const ScViewData* pViewData, sal_Bool bSnapSize = sal_False);
+    sal_Bool		IsOle();
 
     void			DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
     ScDBData*		GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel );
@@ -311,33 +312,35 @@ public:
     void            CancelAutoDBRange();    // called when dialog is cancelled
 
     void			UpdateLinks();			// Link-Eintraege aktuallisieren
-    BOOL			ReloadTabLinks();		// Links ausfuehren (Inhalt aktualisieren)
+    sal_Bool			ReloadTabLinks();		// Links ausfuehren (Inhalt aktualisieren)
 
     void            PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos );
 
     void            PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
-                            SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, USHORT nPart,
-                            USHORT nExtFlags = 0 );
-    void            PostPaint( const ScRange& rRange, USHORT nPart, USHORT nExtFlags = 0 );
+                            SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, sal_uInt16 nPart,
+                            sal_uInt16 nExtFlags = 0 );
+    void            PostPaint( const ScRange& rRange, sal_uInt16 nPart, sal_uInt16 nExtFlags = 0 );
 
     void            PostPaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
     void            PostPaintCell( const ScAddress& rPos );
     void            PostPaintGridAll();
     void            PostPaintExtras();
 
+    bool            IsPaintLocked() const { return pPaintLockData != NULL; }
+
     void            PostDataChanged();
 
-    void			UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
+    void			UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
                                                        SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
-    void			UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange );
+    void			UpdatePaintExt( sal_uInt16& rExtFlags, const ScRange& rRange );
 
-    void			SetDocumentModified( BOOL bIsModified = TRUE );
-    void			SetDrawModified( BOOL bIsModified = TRUE );
+    void			SetDocumentModified( sal_Bool bIsModified = sal_True );
+    void			SetDrawModified( sal_Bool bIsModified = sal_True );
 
     void			LockPaint();
     void			UnlockPaint();
-    USHORT			GetLockCount() const;
-    void			SetLockCount(USHORT nNew);
+    sal_uInt16			GetLockCount() const;
+    void			SetLockCount(sal_uInt16 nNew);
 
     void			LockDocument();
     void			UnlockDocument();
@@ -346,19 +349,19 @@ public:
 
     virtual SfxStyleSheetBasePool*	GetStyleSheetPool();
 
-    void			SetInplace( BOOL bInplace );
-    BOOL			IsEmpty() const;
-    void			SetEmpty(BOOL bSet);
+    void			SetInplace( sal_Bool bInplace );
+    sal_Bool			IsEmpty() const;
+    void			SetEmpty(sal_Bool bSet);
 
-    BOOL			IsInUndo() const				{ return bIsInUndo; }
-    void			SetInUndo(BOOL bSet);
+    sal_Bool			IsInUndo() const				{ return bIsInUndo; }
+    void			SetInUndo(sal_Bool bSet);
 
     void			CalcOutputFactor();
     double			GetOutputFactor() const;
     void			GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
                                                SCTAB			 nCurTab,
-                                               BOOL&			 rbHeader,
-                                               BOOL&			 rbFooter );
+                                               sal_Bool&			 rbHeader,
+                                               sal_Bool&			 rbFooter );
 
     virtual long DdeGetData( const String& rItem, const String& rMimeType,
                                 ::com::sun::star::uno::Any & rValue );
@@ -370,17 +373,17 @@ public:
 
     SfxBindings*	GetViewBindings();
 
-    ScTabViewShell* GetBestViewShell( BOOL bOnlyVisible = TRUE );
+    ScTabViewShell* GetBestViewShell( sal_Bool bOnlyVisible = sal_True );
     ScSbxDocHelper* GetDocHelperObject() { return pDocHelper; }
 
-    void			SetDocumentModifiedPending( BOOL bVal )
+    void			SetDocumentModifiedPending( sal_Bool bVal )
                         { bDocumentModifiedPending = bVal; }
-    BOOL			IsDocumentModifiedPending() const
+    sal_Bool			IsDocumentModifiedPending() const
                         { return bDocumentModifiedPending; }
 
-    BOOL            IsUpdateEnabled() const
+    sal_Bool            IsUpdateEnabled() const
                         { return bUpdateEnabled; }
-    void            SetUpdateEnabled(BOOL bValue)
+    void            SetUpdateEnabled(sal_Bool bValue)
                         { bUpdateEnabled = bValue; }
 
     OutputDevice*	GetRefDevice();	// WYSIWYG: Printer, otherwise VirtualDevice...
@@ -388,7 +391,7 @@ public:
     static ScViewData* GetViewData();
     static SCTAB	   GetCurTab();
 
-    static ScDocShell* GetShellByNum( USHORT nDocNo );
+    static ScDocShell* GetShellByNum( sal_uInt16 nDocNo );
     static String	GetOwnFilterName();
         static String   GetHtmlFilterName();
     static String	GetWebQueryFilterName();
@@ -396,7 +399,7 @@ public:
     static String	GetLotusFilterName();
     static String	GetDBaseFilterName();
     static String	GetDifFilterName();
-    static BOOL		HasAutomaticTableName( const String& rFilter );
+    static sal_Bool		HasAutomaticTableName( const String& rFilter );
 
     DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* );
 
@@ -440,8 +443,8 @@ class SC_DLLPUBLIC ScDocShellModificator
 {
             ScDocShell&		rDocShell;
     ScRefreshTimerProtector	aProtector;
-            BOOL			bAutoCalcShellDisabled;
-            BOOL			bIdleDisabled;
+            sal_Bool			bAutoCalcShellDisabled;
+            sal_Bool			bIdleDisabled;
 
                             // not implemented
                             ScDocShellModificator( const ScDocShellModificator& );
diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index 6cdcd6c7c..f3a9ed45b 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -114,7 +114,7 @@ public:
         virtual void execute() = 0;
     };
 
-    explicit ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, USHORT nMenuStackLevel = 0);
+    explicit ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel = 0);
     virtual ~ScMenuFloatingWindow();
 
     virtual void MouseMove(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 47ea4ce1c..b81fd7f61 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -78,13 +78,13 @@ public:
     void    StateFormatPaintbrush(SfxItemSet& rSet);
 
     void    ExecuteMacroAssign( SdrObject* pObj, Window* pWin );
-    void	ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
-    void	ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
-    void	ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
+    void	ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
+    void	ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
+    void	ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
 
     ScDrawView* GetDrawView();
 
-    BOOL	AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark);
+    sal_Bool	AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark);
 };
 
 
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index b86c8d178..6a4e80f43 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -48,7 +48,7 @@ class ScDrawView: public FmFormView
     Fraction				aScaleY;
     SdrDropMarkerOverlay*	pDropMarker;
     SdrObject*				pDropMarkObj;
-    BOOL					bInConstruct;
+    sal_Bool					bInConstruct;
     //HMHBOOL					bDisableHdl;
 
     void			Construct();
@@ -81,12 +81,12 @@ public:
 
     //HMHBOOL			IsDisableHdl() const 	{ return bDisableHdl; }
 
-    void			SetMarkedToLayer( BYTE nLayerNo );
+    void			SetMarkedToLayer( sal_uInt8 nLayerNo );
 
     void			InvalidateAttribs();
     void			InvalidateDrawTextAttrs();
 
-    BOOL			BeginDrag( Window* pWindow, const Point& rStartPos );
+    sal_Bool			BeginDrag( Window* pWindow, const Point& rStartPos );
     void			DoCut();
     void			DoCopy();
 
@@ -105,17 +105,17 @@ public:
 
     void 			UpdateIMap( SdrObject* pObj );
 
-    USHORT			GetPopupMenuId();
+    sal_uInt16			GetPopupMenuId();
     void			UpdateUserViewOptions();
 
     void			SetMarkedOriginalSize();
 
-    BOOL			SelectObject( const String& rName );
+    sal_Bool			SelectObject( const String& rName );
 //UNUSED2008-05  String			GetSelectedChartName() const;
     bool            HasMarkedControl() const;
     bool            HasMarkedInternal() const;
 
-    FASTBOOL		InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0);
+    FASTBOOL		InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, sal_uLong nOptions=0);
 
     /** Returns the selected object, if it is the caption object of a cell note.
         @param ppCaptData  (out-param) If not null, returns the pointer to the caption object data. */
@@ -140,7 +140,7 @@ public:
     inline void     UnlockInternalLayer() { LockInternalLayer( false ); }
 
     SdrEndTextEditKind	ScEndTextEdit();	// ruft SetDrawTextUndo(0)
-//UNUSED2009-05 void                    CaptionTextDirection(USHORT nSlot);
+//UNUSED2009-05 void                    CaptionTextDirection(sal_uInt16 nSlot);
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable();
 };
 
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index 49c2f93a5..6627b8334 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -37,7 +37,7 @@
 
 #include "shellids.hxx"
 
-USHORT ScGetFontWorkId();		// statt SvxFontWorkChildWindow::GetChildWindowId()
+sal_uInt16 ScGetFontWorkId();		// statt SvxFontWorkChildWindow::GetChildWindowId()
 
 class ScViewData;
 class TransferableDataHelper;
@@ -47,7 +47,7 @@ class ScDrawTextObjectBar : public SfxShell
 {
     ScViewData*			pViewData;
     TransferableClipboardListener* pClipEvtLstnr;
-    BOOL				bPastePossible;
+    sal_Bool				bPastePossible;
 
     DECL_LINK( ClipboardChanged, TransferableDataHelper* );
 
@@ -69,8 +69,8 @@ public:
     void GetAttrState( SfxItemSet& rSet );
     void ExecuteToggle( SfxRequest &rReq );
 
-    BOOL ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
-    BOOL ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
+    sal_Bool ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
+    sal_Bool ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
 
     void ExecuteExtra( SfxRequest &rReq );
     void ExecFormText(SfxRequest& rReq);		// StarFontWork
@@ -80,7 +80,7 @@ private:
     void ExecuteGlobal( SfxRequest &rReq );			// von Execute gerufen fuer ganze Objekte
     void GetGlobalClipState( SfxItemSet& rSet );
     void ExecutePasteContents( SfxRequest &rReq );
-    BOOL IsNoteEdit();
+    sal_Bool IsNoteEdit();
 };
 
 
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index ac1772bc6..9af1a9b07 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -60,14 +60,14 @@ private:
                                     // extracted from model in ctor:
     Size							aSrcSize;
     INetBookmark*					pBookmark;
-    BOOL							bGraphic;
-    BOOL							bGrIsBit;
-    BOOL							bOleObj;
+    sal_Bool							bGraphic;
+    sal_Bool							bGrIsBit;
+    sal_Bool							bOleObj;
                                     // source information for drag&drop:
                                     // (view is needed to handle drawing obejcts)
     SdrView*						pDragSourceView;
-    USHORT							nDragSourceFlags;
-    BOOL							bDragWasInternal;
+    sal_uInt16							nDragSourceFlags;
+    sal_Bool							bDragWasInternal;
 
     sal_uInt32                      nSourceDocID;
 
@@ -95,11 +95,11 @@ public:
     void				SetDrawPersist( const SfxObjectShellRef& rRef );
     void				SetDragSource( ScDrawView* pView );
     void				SetDragSourceObj( SdrObject* pObj, SCTAB nTab );
-    void				SetDragSourceFlags( USHORT nFlags );
+    void				SetDragSourceFlags( sal_uInt16 nFlags );
     void				SetDragWasInternal();
 
     SdrView*			GetDragSourceView()				{ return pDragSourceView; }
-    USHORT				GetDragSourceFlags() const		{ return nDragSourceFlags; }
+    sal_uInt16				GetDragSourceFlags() const		{ return nDragSourceFlags; }
 
     void                SetSourceDocID( sal_uInt32 nVal )
                             { nSourceDocID = nVal; }
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 286828015..c6baf2e66 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -60,7 +60,7 @@
 class ScFunctionChildWindow : public SfxChildWindow
 {
  public:
-    ScFunctionChildWindow( Window*, USHORT, SfxBindings*,
+    ScFunctionChildWindow( Window*, sal_uInt16, SfxBindings*,
                             SfxChildWinInfo* );
 
     SFX_DECL_CHILDWINDOW(ScFunctionChildWindow);
@@ -87,17 +87,17 @@ private:
     SfxChildAlignment	eSfxOldAlignment;
     ImageButton			aInsertButton;
     FixedText			aFiFuncDesc;
-    USHORT				nLeftSlot;
-    USHORT				nRightSlot;
-    ULONG				nMinWidth;
-    ULONG				nMinHeight;
+    sal_uInt16				nLeftSlot;
+    sal_uInt16				nRightSlot;
+    sal_uLong				nMinWidth;
+    sal_uLong				nMinHeight;
     Size				aOldSize;
-    BOOL 				bSizeFlag;
-    BOOL				bInit;
+    sal_Bool 				bSizeFlag;
+    sal_Bool				bInit;
     short				nDockMode;
     Point				aSplitterInitPos;
     const ScFuncDesc*	pFuncDesc;
-    USHORT				nArgs;
+    sal_uInt16				nArgs;
     String**			pArgArr;
 
 
@@ -105,7 +105,7 @@ private:
 
     void			UpdateFunctionList();
     void			UpdateLRUList();
-    void			DoEnter(BOOL bOk); //@@ ???
+    void			DoEnter(sal_Bool bOk); //@@ ???
     void			SetDescription();
     void			SetLeftRightSize();
     void			SetTopBottonSize();
@@ -122,7 +122,7 @@ private:
 
 protected:
 
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
     virtual void	Resize();
     virtual void	Resizing( Size& rSize );
     virtual void 	SetSize();
@@ -144,7 +144,7 @@ public:
     using SfxDockingWindow::Notify;
     virtual void 	Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    void			SetSlotIDs( USHORT nLeft, USHORT nRight )
+    void			SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight )
                         { nLeftSlot = nLeft; nRightSlot = nRight; }
 
     void			InitLRUList();
diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx
index 025ffff4e..6e9cce596 100644
--- a/sc/source/ui/inc/editable.hxx
+++ b/sc/source/ui/inc/editable.hxx
@@ -39,8 +39,8 @@ class ScRange;
 
 class ScEditableTester
 {
-    BOOL	bIsEditable;
-    BOOL	bOnlyMatrix;
+    sal_Bool	bIsEditable;
+    sal_Bool	bOnlyMatrix;
 
 public:
             // no test in ctor
@@ -77,9 +77,9 @@ public:
     void	TestSelection( ScDocument* pDoc, const ScMarkData& rMark );
     void	TestView( ScViewFunc* pView );
 
-    BOOL	IsEditable() const			{ return bIsEditable; }
-    BOOL	IsFormatEditable() const	{ return bIsEditable || bOnlyMatrix; }
-    USHORT	GetMessageId() const;
+    sal_Bool	IsEditable() const			{ return bIsEditable; }
+    sal_Bool	IsFormatEditable() const	{ return bIsEditable || bOnlyMatrix; }
+    sal_uInt16	GetMessageId() const;
 };
 
 #endif
diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index ce08dea63..96f2dfac6 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -48,8 +48,8 @@ private:
     EditView*	pEditView;
     ScViewData*	pViewData;
     TransferableClipboardListener* pClipEvtLstnr;
-    BOOL		bPastePossible;
-    BOOL		bIsInsertMode;
+    sal_Bool		bPastePossible;
+    sal_Bool		bIsInsertMode;
 
     const SvxURLField* GetURLField();
     ScInputHandler* GetMyInputHdl();
@@ -77,7 +77,7 @@ public:
     void	ExecuteUndo(SfxRequest& rReq);
     void	GetUndoState(SfxItemSet &rSet);
 
-    String  GetSelectionText( BOOL bWholeWord );
+    String  GetSelectionText( sal_Bool bWholeWord );
 };
 
 
diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx
index 4fe56d6f1..6dc64a194 100755..100644
--- a/sc/source/ui/inc/fieldwnd.hxx
+++ b/sc/source/ui/inc/fieldwnd.hxx
@@ -98,11 +98,11 @@ private:
                                 FieldString& rText,
                                 bool bFocus );
 
-    /** @return  TRUE, if the field index is inside of the control area. */
+    /** @return  sal_True, if the field index is inside of the control area. */
     bool                    IsValidIndex( size_t nIndex ) const;
-    /** @return  TRUE, if the field with the given index exists. */
+    /** @return  sal_True, if the field with the given index exists. */
     bool                    IsExistingIndex( size_t nIndex ) const;
-    /** @return  TRUE, if the field with the given index exists and the text is
+    /** @return  sal_True, if the field with the given index exists and the text is
                     too long for the button control. */
     bool                    IsShortenedText( size_t nIndex ) const;
     /** @return  The new selection index after moving to the given direction. */
@@ -115,7 +115,7 @@ private:
     /** Sets selection to last field. */
     void                    SetSelectionEnd();
     /** Sets selection to new position relative to current. */
-    void                    MoveSelection( USHORT nKeyCode, SCsCOL nDX, SCsROW nDY );
+    void                    MoveSelection( sal_uInt16 nKeyCode, SCsCOL nDX, SCsROW nDY );
 
     /** Moves the selected field to nDestIndex. */
     void                    MoveField( size_t nDestIndex );
@@ -183,16 +183,16 @@ public:
     /** Inserts a field using the specified pixel position.
         @param rPos  The coordinates to insert the field.
         @param rnIndex  The new index of the field is returned here.
-        @return  TRUE, if the field has been created. */
+        @return  sal_True, if the field has been created. */
     bool                    AddField( const String& rText, const Point& rPos, size_t& rnIndex );
     /** Calculates the field index at a specific pixel position.
         @param rnIndex  The index of the field is returned here.
-        @return  TRUE, if the index value is valid. */
+        @return  sal_True, if the index value is valid. */
     bool                    GetFieldIndex( const Point& rPos, size_t& rnIndex ) const;
     /** Calculates a field index at a specific pixel position. Returns in every
         case the index of an existing field.
         @param rnIndex  The index of the field is returned here.
-        @return  TRUE, if the index value is valid. */
+        @return  sal_True, if the index value is valid. */
     void                    GetExistingIndex( const Point& rPos, size_t& rnIndex );
 
     /** Notifies this control that the offset of the first field has been changed.
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index e270b341a..7bcfacd5a 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -64,7 +64,7 @@ public:
                              String			aStartStr,
                              double			fStep,
                              double			fMax,
-                             USHORT			nPossDir );
+                             sal_uInt16			nPossDir );
             ~ScFillSeriesDlg();
 
     FillDir		GetFillDir() const			{ return theFillDir; }
@@ -76,7 +76,7 @@ public:
 
     String		GetStartStr() const			{ return aEdStartVal.GetText(); }
 
-    void		SetEdStartValEnabled(BOOL bFlag=FALSE);
+    void		SetEdStartValEnabled(sal_Bool bFlag=sal_False);
 
 private:
     FixedLine       aFlDirection;
@@ -99,7 +99,7 @@ private:
     RadioButton		aBtnMonth;
     RadioButton		aBtnYear;
 
-    BOOL			bStartValFlag;
+    sal_Bool			bStartValFlag;
     FixedText		aFtStartVal;
     Edit			aEdStartVal;
     String			aStartStrVal;
@@ -128,10 +128,10 @@ private:
 
 #ifdef _FILLDLG_CXX
 private:
-    void Init( USHORT nPossDir );
-    BOOL CheckStartVal();
-    BOOL CheckIncrementVal();
-    BOOL CheckEndVal();
+    void Init( sal_uInt16 nPossDir );
+    sal_Bool CheckStartVal();
+    sal_Bool CheckIncrementVal();
+    sal_Bool CheckEndVal();
 
     DECL_LINK( OKHdl, void * );
     DECL_LINK( DisableHdl, Button * );
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 2e5cd9762..fad756ba6 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -99,13 +99,13 @@ public:
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
 
-    virtual BOOL	IsRefInputMode() const;
+    virtual sal_Bool	IsRefInputMode() const;
     virtual void	SetActive();
 
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
     void			SliderMoved();
-    USHORT			GetSliderPos();
-    void			RefreshEditRow( USHORT nOffset );
+    sal_uInt16			GetSliderPos();
+    void			RefreshEditRow( sal_uInt16 nOffset );
 
 private:
     FixedLine       aFlCriteria;
@@ -153,7 +153,7 @@ private:
 
     ScFilterOptionsMgr*	pOptionsMgr;
 
-    const USHORT		nWhichQuery;
+    const sal_uInt16		nWhichQuery;
     const ScQueryParam	theQueryData;
     ScQueryItem*		pOutItem;
     ScViewData*			pViewData;
@@ -165,12 +165,12 @@ private:
     ListBox*			aCondLbArr[4];
     ListBox*			aConnLbArr[4];
     bool                mbHasDates[MAXQUERY];
-    BOOL                bRefreshExceptQuery[MAXQUERY];
-    USHORT				nFieldCount;
-    BOOL				bRefInputMode;
+    sal_Bool                bRefreshExceptQuery[MAXQUERY];
+    sal_uInt16				nFieldCount;
+    sal_Bool				bRefInputMode;
 
     TypedScStrCollection*	pEntryLists[MAXCOLCOUNT];
-    USHORT				nHeaderPos[MAXCOLCOUNT];
+    sal_uInt16				nHeaderPos[MAXCOLCOUNT];
 
     // Hack: RefInput-Kontrolle
     Timer*	pTimer;
@@ -180,10 +180,10 @@ private:
     void			Init			( const SfxItemSet&	rArgSet );
     void			FillFieldLists	();
     void			FillAreaList	();
-    void			UpdateValueList	( USHORT nList );
-    void			UpdateHdrInValueList( USHORT nList );
-    void			ClearValueList	( USHORT nList );
-    USHORT			GetFieldSelPos	( SCCOL nField );
+    void			UpdateValueList	( sal_uInt16 nList );
+    void			UpdateHdrInValueList( sal_uInt16 nList );
+    void			ClearValueList	( sal_uInt16 nList );
+    sal_uInt16			GetFieldSelPos	( SCCOL nField );
     ScQueryItem*	GetOutputItem	();
 
     // Handler:
@@ -210,10 +210,10 @@ public:
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
 
-    virtual BOOL	IsRefInputMode() const;
+    virtual sal_Bool	IsRefInputMode() const;
     virtual void	SetActive();
 
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 private:
     ListBox		aLbFilterArea;
@@ -232,14 +232,14 @@ private:
 
     ScFilterOptionsMgr*	pOptionsMgr;
 
-    const USHORT		nWhichQuery;
+    const sal_uInt16		nWhichQuery;
     const ScQueryParam	theQueryData;
     ScQueryItem*		pOutItem;
     ScViewData*			pViewData;
     ScDocument*			pDoc;
 
     formula::RefEdit*			pRefInputEdit;
-    BOOL				bRefInputMode;
+    sal_Bool				bRefInputMode;
 
     // Hack: RefInput-Kontrolle
     Timer*	pTimer;
diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index 9e1129f26..ad0b4e783 100644
--- a/sc/source/ui/inc/foptmgr.hxx
+++ b/sc/source/ui/inc/foptmgr.hxx
@@ -79,7 +79,7 @@ public:
                                 const String&		refStrUndefined );
             ~ScFilterOptionsMgr();
 
-    BOOL	VerifyPosStr ( const String& rPosStr ) const;
+    sal_Bool	VerifyPosStr ( const String& rPosStr ) const;
 
 private:
     Dialog*			pDlg;
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 9896dd0a2..f4cbd9753 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -83,11 +83,11 @@ public:
     virtual void notifyChange();
     virtual void fill();
     virtual bool calculateValue(const String& _sExpression,String& _rResult);
-    virtual void doClose(BOOL _bOk);
+    virtual void doClose(sal_Bool _bOk);
     virtual void insertEntryToLRUList(const formula::IFunctionDescription*	pDesc);
     virtual void showReference(const String& _sFormula);
-    virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked);
-    virtual void setDispatcherLock( BOOL bLock );
+    virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked);
+    virtual void setDispatcherLock( sal_Bool bLock );
     virtual void setReferenceInput(const formula::FormEditData* _pData);
     virtual void deleteFormData();
     virtual void clear();
@@ -104,31 +104,31 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const;
     virtual ::com::sun::star::table::CellAddress getReferencePosition() const;
 
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
     // sc::IAnyRefDialog
     virtual void ShowReference(const String& _sRef);
-    virtual void HideReference( BOOL bDoneRefMode = TRUE );
+    virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
     virtual void SetReference( const ScRange& rRef, ScDocument* pD );
 
     virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
     virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
-    virtual void RefInputDone( BOOL bForced = FALSE );
-    virtual BOOL IsTableLocked() const;
-    virtual BOOL IsRefInputMode() const;
+    virtual void RefInputDone( sal_Bool bForced = sal_False );
+    virtual sal_Bool IsTableLocked() const;
+    virtual sal_Bool IsRefInputMode() const;
 
-    virtual BOOL IsDocAllowed( SfxObjectShell* pDocSh ) const;
+    virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const;
     virtual void AddRefEntry();
     virtual void SetActive();
     virtual void ViewShellChanged( ScTabViewShell* pScViewShell );
 protected:
 
     virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
-    ULONG		 FindFocusWin(Window *pWin);
+    sal_uLong		 FindFocusWin(Window *pWin);
     void		 SaveLRUEntry(const ScFuncDesc*	pFuncDesc);
     void		 HighlightFunctionParas(const String& aFormula);
 
-    BOOL        IsInputHdl(ScInputHandler* pHdl);
+    sal_Bool        IsInputHdl(ScInputHandler* pHdl);
     ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh);
 };
 
diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx
index de0918618..c13a232fe 100644
--- a/sc/source/ui/inc/fuconarc.hxx
+++ b/sc/source/ui/inc/fuconarc.hxx
@@ -44,10 +44,10 @@ class FuConstArc : public FuConstruct
 
     virtual ~FuConstArc();
                                        // Mouse- & Key-Events
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx
index b20043a91..99c48045c 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -42,10 +42,10 @@ public:
 
     virtual ~FuConstCustomShape();
                                        // Mouse- & Key-Events
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index b96c20562..f599b0bb4 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -46,10 +46,10 @@ class FuConstPolygon : public FuConstruct
 
     virtual ~FuConstPolygon();
                                        // Mouse- & Key-Events
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx
index ab8770ab0..930cf17f9 100644
--- a/sc/source/ui/inc/fuconrec.hxx
+++ b/sc/source/ui/inc/fuconrec.hxx
@@ -44,10 +44,10 @@ class FuConstRectangle : public FuConstruct
 
     virtual ~FuConstRectangle();
                                        // Mouse- & Key-Events
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index b0cca7238..bd1ca0b83 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -50,13 +50,13 @@ class FuConstruct : public FuDraw
 
     virtual ~FuConstruct();
                                        // Mouse- & Key-Events
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
-    virtual BYTE Command(const CommandEvent& rCEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_uInt8 Command(const CommandEvent& rCEvt);
 
-            BOOL SimpleMouseButtonUp(const MouseEvent& rMEvt);
+            sal_Bool SimpleMouseButtonUp(const MouseEvent& rMEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index b9f148f2f..29d8a81b9 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -40,8 +40,8 @@
 class FuConstUnoControl : public FuConstruct
 {
 protected:
-    UINT32 nInventor;
-    UINT16 nIdentifier;
+    sal_uInt32 nInventor;
+    sal_uInt16 nIdentifier;
 
 public:
     FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
@@ -49,10 +49,10 @@ public:
 
     virtual ~FuConstUnoControl();
                                        // Mouse- & Key-Events
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index 5333b0d13..bd1f93e07 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -48,7 +48,7 @@ class FuDraw : public FuPoor
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuDraw();
 
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
 
     virtual void ScrollStart();
     virtual void ScrollEnd();
@@ -58,14 +58,14 @@ class FuDraw : public FuPoor
 
     virtual void ForcePointer(const MouseEvent* pMEvt);
 
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
 
     // #97016# II
     virtual void SelectionHasChanged();
 
-    BOOL IsSizingOrMovingNote( const MouseEvent& rMEvt ) const;
+    sal_Bool IsSizingOrMovingNote( const MouseEvent& rMEvt ) const;
 
  private:
     void	DoModifiers(const MouseEvent& rMEvt);
diff --git a/sc/source/ui/inc/fuedipo.hxx b/sc/source/ui/inc/fuedipo.hxx
index 49acc7cd4..ec8ea6ebd 100644
--- a/sc/source/ui/inc/fuedipo.hxx
+++ b/sc/source/ui/inc/fuedipo.hxx
@@ -45,10 +45,10 @@ class FuEditPoints : public FuDraw
 
     virtual ~FuEditPoints();
                                        // Mouse- & Key-Events
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index 0bfa32631..e71ae0528 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -43,8 +43,8 @@ class FuMarkRect : public FuPoor
  protected:
     Point			aBeginPos;
     Rectangle		aZoomRect;
-    BOOL			bVisible;
-    BOOL			bStartDrag;
+    sal_Bool			bVisible;
+    sal_Bool			bStartDrag;
     ScRangeListRef	aSourceRange;
 
  public:
@@ -52,7 +52,7 @@ class FuMarkRect : public FuPoor
            SdrModel* pDoc, SfxRequest& rReq);
     virtual ~FuMarkRect();
 
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
 
     virtual void ScrollStart();
     virtual void ScrollEnd();
@@ -62,10 +62,10 @@ class FuMarkRect : public FuPoor
 
     virtual void ForcePointer(const MouseEvent* pMEvt);
 
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
-    virtual BYTE Command(const CommandEvent& rCEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_uInt8 Command(const CommandEvent& rCEvt);
 };
 
 
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index f9a24438a..0569c2f92 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -104,15 +104,15 @@ public:
 
                     ScFuncPage( Window* pParent);
 
-    void			SetCategory(USHORT nCat);
-    void			SetFunction(USHORT nFunc);
+    void			SetCategory(sal_uInt16 nCat);
+    void			SetFunction(sal_uInt16 nFunc);
     void			SetFocus();
-    USHORT			GetCategory();
-    USHORT			GetFunction();
-    USHORT			GetFunctionEntryCount();
+    sal_uInt16			GetCategory();
+    sal_uInt16			GetFunction();
+    sal_uInt16			GetFunctionEntryCount();
 
-    USHORT			GetFuncPos(const ScFuncDesc*);
-    const ScFuncDesc*	GetFuncDesc( USHORT nPos ) const;
+    sal_uInt16			GetFuncPos(const ScFuncDesc*);
+    const ScFuncDesc*	GetFuncDesc( sal_uInt16 nPos ) const;
     String			GetSelFunctionName() const;
 
     void            SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; }
diff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx
index b5fd76f55..b3d77367b 100644
--- a/sc/source/ui/inc/funcutl.hxx
+++ b/sc/source/ui/inc/funcutl.hxx
@@ -67,7 +67,7 @@ private:
     MultiLineEdit*	pMEdit;
     Link			aSelChangedLink;
     Selection		aOldSel;
-    BOOL			bMouseFlag;
+    sal_Bool			bMouseFlag;
                     DECL_LINK( ChangedHdl, ScEditBox* );
 
 protected:
@@ -102,7 +102,7 @@ public:
             ArgEdit( Window* pParent, const ResId& rResId );
 
     void	Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
-                  ScrollBar& rArgSlider, USHORT nArgCount );
+                  ScrollBar& rArgSlider, sal_uInt16 nArgCount );
 
 protected:
     virtual void	KeyInput( const KeyEvent& rKEvt );
@@ -111,7 +111,7 @@ private:
     ArgEdit*	pEdPrev;
     ArgEdit*	pEdNext;
     ScrollBar*	pSlider;
-    USHORT		nArgs;
+    sal_uInt16		nArgs;
 };
 
 
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 96d27913f..939756bf4 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -70,7 +70,7 @@ protected:
     Timer			aDragTimer; 			// fuer Drag&Drop
     DECL_LINK( DragTimerHdl, Timer * );
     DECL_LINK( DragHdl, void * );
-    BOOL			bIsInDragMode;
+    sal_Bool			bIsInDragMode;
     Point			aMDPos; 				// Position von MouseButtonDown
 
     // #95491# member to hold state of the mouse buttons for creation
@@ -94,16 +94,16 @@ public:
     virtual void DoPaste();
 
     // Mouse- & Key-Events; Returnwert=TRUE: Event wurde bearbeitet
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent&) { return FALSE; }
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent&) { return sal_False; }
 
     // #95491# moved from inline to *.cxx
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); // { return FALSE; }
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); // { return sal_False; }
 
     // #95491# moved from inline to *.cxx
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); // { return FALSE; }
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); // { return sal_False; }
 
-    virtual BYTE Command(const CommandEvent& rCEvt);
+    virtual sal_uInt8 Command(const CommandEvent& rCEvt);
 
     virtual void Activate();		// Function aktivieren
     virtual void Deactivate();		// Function deaktivieren
@@ -113,9 +113,9 @@ public:
 
     void SetWindow(Window* pWin) { pWindow = pWin; }
 
-    USHORT GetSlotID() const { return( aSfxRequest.GetSlot() ); }
+    sal_uInt16 GetSlotID() const { return( aSfxRequest.GetSlot() ); }
 
-    BOOL	IsDetectiveHit( const Point& rLogicPos );
+    sal_Bool	IsDetectiveHit( const Point& rLogicPos );
 
     void	StopDragTimer();
 
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index c168d025e..6c28da30b 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -52,11 +52,11 @@ public:
 
     virtual ~FuSelection();
                                        // Mouse- & Key-Events
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
-    virtual BYTE Command(const CommandEvent& rCEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_uInt8 Command(const CommandEvent& rCEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
@@ -66,10 +66,10 @@ public:
 protected:
 //	Outliner*		pOutliner;
 //	OutlinerView*	pOutlinerView;
-    BOOL			bVCAction;
+    sal_Bool			bVCAction;
 
 private:
-    BOOL TestDetective( SdrPageView* pPV, const Point& rPos );	// -> fusel2
+    sal_Bool TestDetective( SdrPageView* pPV, const Point& rPos );	// -> fusel2
 
     bool                IsNoteCaptionMarked() const;
     bool                IsNoteCaptionClicked( const Point& rPos ) const;
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index 1a01abcf5..e1a1de3d7 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -42,7 +42,7 @@ class SdrOutliner;
 class FuText : public FuConstruct
 {
 protected:
-//	USHORT			nOldObjectBar;
+//	sal_uInt16			nOldObjectBar;
     SdrTextObj* 	pTextObj;
 
 public:
@@ -51,10 +51,10 @@ public:
 
     virtual ~FuText();
 
-    virtual BOOL KeyInput(const KeyEvent& rKEvt);
-    virtual BOOL MouseMove(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
-    virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
+    virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
+    virtual sal_Bool MouseMove(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt);
+    virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt);
 
     virtual void Activate();		   // Function aktivieren
     virtual void Deactivate();		   // Function deaktivieren
@@ -64,8 +64,8 @@ public:
     virtual void SelectionHasChanged();
 
     void	SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL,
-                            BOOL bCursorToEnd = FALSE, const KeyEvent* pInitialKey = NULL );
-    void	StopEditMode(BOOL bTextDirection = FALSE);
+                            sal_Bool bCursorToEnd = sal_False, const KeyEvent* pInitialKey = NULL );
+    void	StopEditMode(sal_Bool bTextDirection = sal_False);
     void	StopDragMode(SdrObject* pObject);
 
     // #98185# Create default drawing objects via keyboard
diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx
index c18532e26..8db98784c 100644
--- a/sc/source/ui/inc/gridmerg.hxx
+++ b/sc/source/ui/inc/gridmerg.hxx
@@ -43,8 +43,8 @@ private:
     long			nVarStart;
     long			nVarDiff;
     long			nCount;
-    BOOL			bVertical;
-    BOOL			bOptimize;
+    sal_Bool			bVertical;
+    sal_Bool			bOptimize;
 
     void		AddLine( long nStart, long nEnd, long nPos );
 
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 368db6bbf..317cb9224 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -145,61 +145,61 @@ private:
     ::std::auto_ptr<ScDPFieldPopupWindow> mpDPFieldPopup;
     ::std::auto_ptr<ScDPFieldButton>      mpFilterButton;
 
-    USHORT					nCursorHideCount;
+    sal_uInt16					nCursorHideCount;
 
-    BOOL					bMarking;
+    sal_Bool					bMarking;
 
-    USHORT					nButtonDown;
-    BOOL					bEEMouse;				// Edit-Engine hat Maus
-    BYTE					nMouseStatus;
-    BYTE                    nNestedButtonState;     // track nested button up/down calls
+    sal_uInt16					nButtonDown;
+    sal_Bool					bEEMouse;				// Edit-Engine hat Maus
+    sal_uInt8					nMouseStatus;
+    sal_uInt8                    nNestedButtonState;     // track nested button up/down calls
 
-    BOOL					bDPMouse;				// DataPilot-D&D (neue Pivottabellen)
+    sal_Bool					bDPMouse;				// DataPilot-D&D (neue Pivottabellen)
     long					nDPField;
     ScDPObject*				pDragDPObj;	//! name?
 
-    BOOL					bRFMouse;				// RangeFinder-Drag
-    BOOL					bRFSize;
-    USHORT					nRFIndex;
+    sal_Bool					bRFMouse;				// RangeFinder-Drag
+    sal_Bool					bRFSize;
+    sal_uInt16					nRFIndex;
     SCsCOL					nRFAddX;
     SCsROW					nRFAddY;
 
-    USHORT					nPagebreakMouse;		// Pagebreak-Modus Drag
+    sal_uInt16					nPagebreakMouse;		// Pagebreak-Modus Drag
     SCCOLROW				nPagebreakBreak;
     SCCOLROW				nPagebreakPrev;
     ScRange					aPagebreakSource;
     ScRange					aPagebreakDrag;
-    BOOL					bPagebreakDrawn;
+    sal_Bool					bPagebreakDrawn;
 
-    BYTE					nPageScript;
+    sal_uInt8					nPageScript;
 
     long					nLastClickX;
     long					nLastClickY;
 
-    BOOL					bDragRect;
+    sal_Bool					bDragRect;
     SCCOL					nDragStartX;
     SCROW					nDragStartY;
     SCCOL					nDragEndX;
     SCROW					nDragEndY;
     InsCellCmd              meDragInsertMode;
 
-    USHORT					nCurrentPointer;
+    sal_uInt16					nCurrentPointer;
 
-    BOOL					bIsInScroll;
-    BOOL					bIsInPaint;
+    sal_Bool					bIsInScroll;
+    sal_Bool					bIsInPaint;
 
     ScDDComboBoxButton		aComboButton;
 
     Point					aCurMousePos;
 
-    USHORT					nPaintCount;
+    sal_uInt16					nPaintCount;
     Rectangle				aRepaintPixel;
-    BOOL					bNeedsRepaint;
+    sal_Bool					bNeedsRepaint;
 
-    BOOL					bAutoMarkVisible;
+    sal_Bool					bAutoMarkVisible;
     ScAddress				aAutoMarkPos;
 
-    BOOL					bListValButton;
+    sal_Bool					bListValButton;
     ScAddress				aListValPos;
 
     Rectangle				aInvertRect;
@@ -207,15 +207,15 @@ private:
     DECL_LINK( PopupModeEndHdl, FloatingWindow* );
     DECL_LINK( PopupSpellingHdl, SpellCallbackInfo* );
 
-    BOOL			TestMouse( const MouseEvent& rMEvt, BOOL bAction );
+    sal_Bool			TestMouse( const MouseEvent& rMEvt, sal_Bool bAction );
 
-    BOOL			DoPageFieldSelection( SCCOL nCol, SCROW nRow );
+    sal_Bool			DoPageFieldSelection( SCCOL nCol, SCROW nRow );
     bool            DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
     void			DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
 
     void			DPMouseMove( const MouseEvent& rMEvt );
     void			DPMouseButtonUp( const MouseEvent& rMEvt );
-    void			DPTestMouse( const MouseEvent& rMEvt, BOOL bMove );
+    void			DPTestMouse( const MouseEvent& rMEvt, sal_Bool bMove );
 
     /** 
      * Check if the mouse click is on a field popup button. 
@@ -227,24 +227,24 @@ private:
     void            DPLaunchFieldPopupMenu(
         const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj);
 
-    void			RFMouseMove( const MouseEvent& rMEvt, BOOL bUp );
+    void			RFMouseMove( const MouseEvent& rMEvt, sal_Bool bUp );
 
-    void			PagebreakMove( const MouseEvent& rMEvt, BOOL bUp );
+    void			PagebreakMove( const MouseEvent& rMEvt, sal_Bool bUp );
 
-    void			UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect );
+    void			UpdateDragRect( sal_Bool bShowRange, const Rectangle& rPosRect );
 
-    BOOL 			IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab );
-    void			ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow,
+    sal_Bool 			IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab );
+    void			ExecFilter( sal_uLong nSel, SCCOL nCol, SCROW nRow,
                                 const String& aValue, bool bCheckForDates );
-    void			FilterSelect( ULONG nSel );
+    void			FilterSelect( sal_uLong nSel );
 
     void			ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr );
 
-    void			ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr );
+    void			ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSelection, const String& rStr );
 
-    BOOL			HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange );
+    sal_Bool			HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange );
 
-    BOOL			DropScroll( const Point& rMousePos );
+    sal_Bool			DropScroll( const Point& rMousePos );
 
     sal_Int8		AcceptPrivateDrop( const AcceptDropEvent& rEvt );
     sal_Int8		ExecutePrivateDrop( const ExecuteDropEvent& rEvt );
@@ -253,42 +253,42 @@ private:
 
     void            HandleMouseButtonDown( const MouseEvent& rMEvt );
 
-    BOOL			DrawMouseButtonDown(const MouseEvent& rMEvt);
-    BOOL			DrawMouseButtonUp(const MouseEvent& rMEvt);
-    BOOL			DrawMouseMove(const MouseEvent& rMEvt);
-    BOOL			DrawKeyInput(const KeyEvent& rKEvt);
-    BOOL			DrawCommand(const CommandEvent& rCEvt);
-    BOOL			DrawHasMarkedObj();
+    sal_Bool			DrawMouseButtonDown(const MouseEvent& rMEvt);
+    sal_Bool			DrawMouseButtonUp(const MouseEvent& rMEvt);
+    sal_Bool			DrawMouseMove(const MouseEvent& rMEvt);
+    sal_Bool			DrawKeyInput(const KeyEvent& rKEvt);
+    sal_Bool			DrawCommand(const CommandEvent& rCEvt);
+    sal_Bool			DrawHasMarkedObj();
     void			DrawEndAction();
     void			DrawMarkDropObj( SdrObject* pObj );
     SdrObject*		GetEditObject();
-    BOOL			IsMyModel(SdrEditView* pSdrView);
+    sal_Bool			IsMyModel(SdrEditView* pSdrView);
     //void			DrawStartTimer();
 
-    void			DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, ULONG nLayer );
+    void			DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, sal_uLong nLayer );
     void            DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev );
-    //BOOL			DrawBeforeScroll();
-    void			DrawAfterScroll(/*BOOL bVal*/);
+    //sal_Bool			DrawBeforeScroll();
+    void			DrawAfterScroll(/*sal_Bool bVal*/);
     //void			DrawMarks();
-    //BOOL			NeedDrawMarks();
+    //sal_Bool			NeedDrawMarks();
     void 			DrawComboButton( const Point&	rCellPos,
                                      long			nCellSizeX,
                                      long			nCellSizeY,
-                                     BOOL           bArrowState,
-                                     BOOL			bBtnIn  = FALSE );
+                                     sal_Bool           bArrowState,
+                                     sal_Bool			bBtnIn  = sal_False );
     Rectangle		GetListValButtonRect( const ScAddress& rButtonPos );
 
     void            DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, OutputDevice* pContentDev );
 
-    BOOL			GetEditUrl( const Point& rPos,
+    sal_Bool			GetEditUrl( const Point& rPos,
                                 String* pName=0, String* pUrl=0, String* pTarget=0 );
-    BOOL			GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
+    sal_Bool			GetEditUrlOrError( sal_Bool bSpellErr, const Point& rPos,
                                 String* pName=0, String* pUrl=0, String* pTarget=0 );
 
-    BOOL			HitRangeFinder( const Point& rMouse, BOOL& rCorner, USHORT* pIndex = NULL,
+    sal_Bool			HitRangeFinder( const Point& rMouse, sal_Bool& rCorner, sal_uInt16* pIndex = NULL,
                                         SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL );
 
-    USHORT			HitPageBreak( const Point& rMouse, ScRange* pSource = NULL,
+    sal_uInt16			HitPageBreak( const Point& rMouse, ScRange* pSource = NULL,
                                     SCCOLROW* pBreak = NULL, SCCOLROW* pPrev = NULL );
 
     void			PasteSelection( const Point& rPosPixel );
@@ -347,7 +347,7 @@ public:
 
     void			UpdateFormulas();
 
-    void			DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect );
+    void			DoAutoFilterMenue( SCCOL nCol, SCROW nRow, sal_Bool bDataSelect );
     void			DoScenarioMenue( const ScRange& rScenRange );
 
     void            LaunchPageFieldMenu( SCCOL nCol, SCROW nRow );
@@ -363,7 +363,7 @@ public:
                         ScUpdateMode eMode = SC_UPDATE_ALL );
 
     void			InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
-                                    BOOL bTestMerge = FALSE, BOOL bRepeat = FALSE );
+                                    sal_Bool bTestMerge = sal_False, sal_Bool bRepeat = sal_False );
 
 //UNUSED2008-05  void			DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
 
@@ -373,21 +373,21 @@ public:
     void			ShowCursor();
     void 			DrawCursor();
     void			DrawAutoFillMark();
-    void			UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange);
+    void			UpdateAutoFillMark(sal_Bool bMarked, const ScRange& rMarkRange);
 
-    void			UpdateListValPos( BOOL bVisible, const ScAddress& rPos );
+    void			UpdateListValPos( sal_Bool bVisible, const ScAddress& rPos );
 
-    BOOL			ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard );
+    sal_Bool			ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, sal_Bool bKeyboard );
     void			HideNoteMarker();
 
-    MapMode			GetDrawMapMode( BOOL bForce = FALSE );
+    MapMode			GetDrawMapMode( sal_Bool bForce = sal_False );
 
     void			ContinueDrag();
 
     void			StopMarking();
     void			UpdateInputContext();
 
-    void			CheckInverted()		{ if (nPaintCount) bNeedsRepaint = TRUE; }
+    void			CheckInverted()		{ if (nPaintCount) bNeedsRepaint = sal_True; }
 
     void			DoInvertRect( const Rectangle& rPixel );
 
diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx
index 77ceecf47..b7dcef39c 100644
--- a/sc/source/ui/inc/groupdlg.hxx
+++ b/sc/source/ui/inc/groupdlg.hxx
@@ -39,12 +39,12 @@ class ScGroupDlg : public ModalDialog
 {
 public:
             ScGroupDlg( Window* pParent,
-                        USHORT	nResId,
-                        BOOL	bUnGroup = FALSE,
-                        BOOL	bRows    = TRUE  );
+                        sal_uInt16	nResId,
+                        sal_Bool	bUnGroup = sal_False,
+                        sal_Bool	bRows    = sal_True  );
             ~ScGroupDlg();
 
-    BOOL GetColsChecked() const;
+    sal_Bool GetColsChecked() const;
 
 private:
     FixedLine       aFlFrame;
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 502b036e5..0e346d8ff 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -52,10 +52,10 @@ private:
     SelectionEngine*	pSelEngine;
     Font				aNormFont;
     Font				aBoldFont;
-    BOOL				bBoldSet;
+    sal_Bool				bBoldSet;
 
-    USHORT			nFlags;
-    BOOL			bVertical;				// Vertikal = Zeilenheader
+    sal_uInt16			nFlags;
+    sal_Bool			bVertical;				// Vertikal = Zeilenheader
 
     long			nWidth;
     long			nSmallWidth;
@@ -65,18 +65,18 @@ private:
 
     SCCOLROW		nMarkStart;
     SCCOLROW		nMarkEnd;
-    BOOL			bMarkRange;
+    sal_Bool			bMarkRange;
 
-    BOOL			bDragging;				// Groessen aendern
+    sal_Bool			bDragging;				// Groessen aendern
     SCCOLROW		nDragNo;
     long			nDragStart;
     long			nDragPos;
-    BOOL			bDragMoved;
+    sal_Bool			bDragMoved;
 
-    BOOL			bIgnoreMove;
+    sal_Bool			bIgnoreMove;
 
     long			GetScrPos( SCCOLROW nEntryNo );
-    SCCOLROW		GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder );
+    SCCOLROW		GetMousePos( const MouseEvent& rMEvt, sal_Bool& rBorder );
     bool            IsSelectionAllowed(SCCOLROW nPos) const;
     void			ShowDragHelp();
 
@@ -99,20 +99,20 @@ protected:
                     //	neue Methoden
 
     virtual SCCOLROW	GetPos() = 0;								// aktuelle Position (Scrolling)
-    virtual USHORT	GetEntrySize( SCCOLROW nEntryNo ) = 0;		// Breite / Hoehe (Pixel)
+    virtual sal_uInt16	GetEntrySize( SCCOLROW nEntryNo ) = 0;		// Breite / Hoehe (Pixel)
     virtual String	GetEntryText( SCCOLROW nEntryNo ) = 0;
 
     virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo );
-    virtual BOOL	IsLayoutRTL();
-    virtual BOOL	IsMirrored();
+    virtual sal_Bool	IsLayoutRTL();
+    virtual sal_Bool	IsMirrored();
 
-    virtual void	SetEntrySize( SCCOLROW nPos, USHORT nNewWidth ) = 0;
+    virtual void	SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewWidth ) = 0;
     virtual void	HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0;
 
-    virtual void	SetMarking( BOOL bSet );
+    virtual void	SetMarking( sal_Bool bSet );
     virtual void	SelectWindow();
-    virtual BOOL	IsDisabled();
-    virtual BOOL	ResizeAllowed();
+    virtual sal_Bool	IsDisabled();
+    virtual sal_Bool	ResizeAllowed();
     virtual String	GetDragHelp( long nVal );
 
     virtual void	DrawInvert( long nDragPos );
@@ -120,14 +120,14 @@ protected:
 
 public:
             ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine,
-                                SCCOLROW nNewSize, USHORT nNewFlags );
+                                SCCOLROW nNewSize, sal_uInt16 nNewFlags );
             ~ScHeaderControl();
 
-    void	SetIgnoreMove(BOOL bSet)			{ bIgnoreMove = bSet; }
+    void	SetIgnoreMove(sal_Bool bSet)			{ bIgnoreMove = bSet; }
 
     void	StopMarking();
 
-    void	SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd );
+    void	SetMark( sal_Bool bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd );
 
     long	GetWidth() const					{ return nWidth; }
     long	GetSmallWidth() const				{ return nSmallWidth; }
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index b690d03f0..443af1d1c 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -45,11 +45,11 @@ public:
                          Window*			pParent,
                          const SfxItemSet&	rCoreSet,
                          const String&		rPageStyle,
-                         USHORT				nResId = RID_SCDLG_HFEDIT );
+                         sal_uInt16				nResId = RID_SCDLG_HFEDIT );
 
             ~ScHFEditDlg();
 
-    virtual void PageCreated( USHORT nId, SfxTabPage& rPage );
+    virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage );
 };
 
 
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index cd406ddd2..27f6b39f6 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -104,7 +104,7 @@ private:
 
 protected:
 
-    virtual void	RefInputDone( BOOL bForced = FALSE );
+    virtual void	RefInputDone( sal_Bool bForced = sal_False );
 
 public:
                     ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
@@ -114,8 +114,8 @@ public:
 
     virtual void	SetActive();
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
-    virtual BOOL	Close();
-    virtual BOOL	IsRefInputMode() const;
+    virtual sal_Bool	Close();
+    virtual sal_Bool	IsRefInputMode() const;
 
 };
 
diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx
index 308613887..558adb20f 100644
--- a/sc/source/ui/inc/hiranges.hxx
+++ b/sc/source/ui/inc/hiranges.hxx
@@ -51,9 +51,9 @@ public:
             ScHighlightRanges();
             ~ScHighlightRanges();
 
-    ULONG	Count() const						{ return aEntries.Count(); }
+    sal_uLong	Count() const						{ return aEntries.Count(); }
     void	Insert( ScHighlightEntry* pNew )	{ aEntries.Insert(pNew, LIST_APPEND); }
-    ScHighlightEntry* GetObject( ULONG nIndex ) const
+    ScHighlightEntry* GetObject( sal_uLong nIndex ) const
                         { return (ScHighlightEntry*)aEntries.GetObject(nIndex); }
 };
 
diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx
index 39c5c40be..b212f497c 100644
--- a/sc/source/ui/inc/imoptdlg.hxx
+++ b/sc/source/ui/inc/imoptdlg.hxx
@@ -44,19 +44,19 @@ class SC_DLLPUBLIC ScImportOptions
 public:
         ScImportOptions()
             : nFieldSepCode(0), nTextSepCode(0),
-            eCharSet(RTL_TEXTENCODING_DONTKNOW), bFixedWidth(FALSE),
-            bSaveAsShown(FALSE)
+            eCharSet(RTL_TEXTENCODING_DONTKNOW), bFixedWidth(sal_False),
+            bSaveAsShown(sal_False)
         {}
         ScImportOptions( const String& rStr );
 
         ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, const String& rStr )
             : nFieldSepCode(nFieldSep), nTextSepCode(nTextSep), aStrFont(rStr),
-            bFixedWidth(FALSE), bSaveAsShown(FALSE)
+            bFixedWidth(sal_False), bSaveAsShown(sal_False)
         { eCharSet = ScGlobal::GetCharsetValue(aStrFont); }
 
         ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, rtl_TextEncoding nEnc )
             : nFieldSepCode(nFieldSep), nTextSepCode(nTextSep),
-            bFixedWidth(FALSE), bSaveAsShown(FALSE)
+            bFixedWidth(sal_False), bSaveAsShown(sal_False)
         { SetTextEncoding( nEnc ); }
 
         ScImportOptions( const ScImportOptions& rCpy )
@@ -79,7 +79,7 @@ public:
                             return *this;
                         }
 
-    BOOL			 operator==( const ScImportOptions& rCmp )
+    sal_Bool			 operator==( const ScImportOptions& rCmp )
                         {
                             return
                                    nFieldSepCode 	== rCmp.nFieldSepCode
@@ -97,8 +97,8 @@ public:
     sal_Unicode nTextSepCode;
     String      aStrFont;
     CharSet     eCharSet;
-    BOOL        bFixedWidth;
-    BOOL        bSaveAsShown;
+    sal_Bool        bFixedWidth;
+    sal_Bool        bSaveAsShown;
 };
 
 
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index e28b34e89..ccc651abd 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -58,33 +58,33 @@ class ScImportExport
     ScRange     aRange;
     String		aStreamPath;
     String      aNonConvertibleChars;
-    ULONG		nSizeLimit;
+    sal_uLong		nSizeLimit;
     sal_Unicode	cSep;					// Separator
     sal_Unicode	cStr;					// String Delimiter
-    BOOL		bFormulas;				// Formeln im Text?
-    BOOL		bIncludeFiltered;		// include filtered rows? (default true)
-    BOOL		bAll;					// keine Selektion
-    BOOL		bSingle;				// Einfachselektion
-    BOOL		bUndo;					// Mit Undo?
-    BOOL		bOverflow;				// zuviele Zeilen/Spalten
+    sal_Bool		bFormulas;				// Formeln im Text?
+    sal_Bool		bIncludeFiltered;		// include filtered rows? (default true)
+    sal_Bool		bAll;					// keine Selektion
+    sal_Bool		bSingle;				// Einfachselektion
+    sal_Bool		bUndo;					// Mit Undo?
+    sal_Bool		bOverflow;				// zuviele Zeilen/Spalten
     bool        mbApi;
     ScExportTextOptions mExportTextOptions;
 
     ScAsciiOptions*	pExtOptions;		// erweiterte Optionen
 
-    BOOL StartPaste();					// Protect-Check, Undo einrichten
+    sal_Bool StartPaste();					// Protect-Check, Undo einrichten
     void EndPaste();					// Undo/Redo-Aktionen, Repaint
-    BOOL Doc2Text( SvStream& );
-    BOOL Text2Doc( SvStream& );
-    BOOL Doc2Sylk( SvStream& );
-    BOOL Sylk2Doc( SvStream& );
-    BOOL Doc2HTML( SvStream&, const String& );
-    BOOL Doc2RTF( SvStream& );
-    BOOL Doc2Dif( SvStream& );
-    BOOL Dif2Doc( SvStream& );
-    BOOL ExtText2Doc( SvStream& );		// mit pExtOptions
-    BOOL RTF2Doc( SvStream&, const String& rBaseURL );
-    BOOL HTML2Doc( SvStream&, const String& rBaseURL );
+    sal_Bool Doc2Text( SvStream& );
+    sal_Bool Text2Doc( SvStream& );
+    sal_Bool Doc2Sylk( SvStream& );
+    sal_Bool Sylk2Doc( SvStream& );
+    sal_Bool Doc2HTML( SvStream&, const String& );
+    sal_Bool Doc2RTF( SvStream& );
+    sal_Bool Doc2Dif( SvStream& );
+    sal_Bool Dif2Doc( SvStream& );
+    sal_Bool ExtText2Doc( SvStream& );		// mit pExtOptions
+    sal_Bool RTF2Doc( SvStream&, const String& rBaseURL );
+    sal_Bool HTML2Doc( SvStream&, const String& rBaseURL );
 
 public:
     ScImportExport( ScDocument* );					// Gesamtdokument
@@ -95,22 +95,22 @@ public:
 
     void SetExtOptions( const ScAsciiOptions& rOpt );
 
-    BOOL IsDoubleRef() const { return BOOL( !( bAll || bSingle ) ); }
-    BOOL IsSingleRef() const { return bSingle; }
-    BOOL IsNoRef() const	 { return bAll;    }
-    BOOL IsRef() const	 	 { return BOOL( !bAll ); }
+    sal_Bool IsDoubleRef() const { return sal_Bool( !( bAll || bSingle ) ); }
+    sal_Bool IsSingleRef() const { return bSingle; }
+    sal_Bool IsNoRef() const	 { return bAll;    }
+    sal_Bool IsRef() const	 	 { return sal_Bool( !bAll ); }
 
     const ScRange& GetRange() const { return aRange; }
 
-    BOOL IsUndo() const		 { return bUndo; }
-    void SetUndo( BOOL b )	 { bUndo = b;	 }
+    sal_Bool IsUndo() const		 { return bUndo; }
+    void SetUndo( sal_Bool b )	 { bUndo = b;	 }
 
-    static BOOL  IsFormatSupported( ULONG nFormat );
+    static sal_Bool  IsFormatSupported( sal_uLong nFormat );
     static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p,
             String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted );
-    static	void	WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE );
+    static	void	WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, sal_Bool bZero = sal_False );
     static	void	WriteUnicodeOrByteEndl( SvStream& rStrm );
-    static	inline	BOOL	IsEndianSwap( const SvStream& rStrm );
+    static	inline	sal_Bool	IsEndianSwap( const SvStream& rStrm );
 
     //! only if stream is only used in own (!) memory
     static  inline  void    SetNoEndianSwap( SvStream& rStrm );
@@ -119,29 +119,29 @@ public:
     void SetSeparator( sal_Unicode c ) { cSep = c; }
     sal_Unicode GetDelimiter() const { return cStr; }
     void SetDelimiter( sal_Unicode c ) { cStr = c; }
-    BOOL IsFormulas() const { return bFormulas; }
-    void SetFormulas( BOOL b ) { bFormulas = b; }
-    BOOL IsIncludeFiltered() const { return bIncludeFiltered; }
-    void SetIncludeFiltered( BOOL b ) { bIncludeFiltered = b; }
+    sal_Bool IsFormulas() const { return bFormulas; }
+    void SetFormulas( sal_Bool b ) { bFormulas = b; }
+    sal_Bool IsIncludeFiltered() const { return bIncludeFiltered; }
+    void SetIncludeFiltered( sal_Bool b ) { bIncludeFiltered = b; }
 
-    void SetSizeLimit( ULONG nNew ) { nSizeLimit = nNew; }	// momentan nur fuer Ascii
+    void SetSizeLimit( sal_uLong nNew ) { nSizeLimit = nNew; }	// momentan nur fuer Ascii
 
     void			SetStreamPath( const String& rPath ) { aStreamPath = rPath; }
     const String&	GetStreamPath() const { return aStreamPath; }
 
-    BOOL ImportString( const ::rtl::OUString&, ULONG=FORMAT_STRING );
-    BOOL ExportString( ::rtl::OUString&, ULONG=FORMAT_STRING );
-    BOOL ExportByteString( ByteString&, rtl_TextEncoding, ULONG=FORMAT_STRING );
+    sal_Bool ImportString( const ::rtl::OUString&, sal_uLong=FORMAT_STRING );
+    sal_Bool ExportString( ::rtl::OUString&, sal_uLong=FORMAT_STRING );
+    sal_Bool ExportByteString( ByteString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING );
 
-    BOOL ImportStream( SvStream&, const String& rBaseURL, ULONG=FORMAT_STRING );
-    BOOL ExportStream( SvStream&, const String& rBaseURL, ULONG=FORMAT_STRING );
+    sal_Bool ImportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING );
+    sal_Bool ExportStream( SvStream&, const String& rBaseURL, sal_uLong=FORMAT_STRING );
 
-    BOOL ImportData( const String& rMimeType,
+    sal_Bool ImportData( const String& rMimeType,
                      const ::com::sun::star::uno::Any & rValue );
-    BOOL ExportData( const String& rMimeType,
+    sal_Bool ExportData( const String& rMimeType,
                      ::com::sun::star::uno::Any & rValue  );
 
-    BOOL IsOverflow() const	{ return bOverflow; }		// nach dem Importieren
+    sal_Bool IsOverflow() const	{ return bOverflow; }		// nach dem Importieren
 
     const String& GetNonConvertibleChars() const { return aNonConvertibleChars; }
 
@@ -153,7 +153,7 @@ public:
 
 
 // static
-inline BOOL ScImportExport::IsEndianSwap( const SvStream& rStrm )
+inline sal_Bool ScImportExport::IsEndianSwap( const SvStream& rStrm )
 {
 #ifdef OSL_BIGENDIAN
     return rStrm.GetNumberFormatInt() != NUMBERFORMAT_INT_BIGENDIAN;
@@ -182,7 +182,7 @@ public:
                 rStr.getLength() * sizeof(sal_Unicode), STREAM_READ)
     {
         SetStreamCharSet( RTL_TEXTENCODING_UNICODE );
-        SetEndianSwap( FALSE );
+        SetEndianSwap( sal_False );
     }
 };
 
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index d31fca3e2..f7602bb61 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -69,38 +69,38 @@ private:
     TypedScStrCollection*		pFormulaData;
     TypedScStrCollection*		pFormulaDataPara;
     Window*					pTipVisibleParent;
-    ULONG					nTipVisible;
+    sal_uLong					nTipVisible;
     Window*					pTipVisibleSecParent;
-    ULONG                   nTipVisibleSec;
+    sal_uLong                   nTipVisibleSec;
     String					aManualTip;
     String					aAutoSearch;
-    USHORT					nAutoPos;
-    BOOL					bUseTab;					// Blaettern moeglich
+    sal_uInt16					nAutoPos;
+    sal_Bool					bUseTab;					// Blaettern moeglich
 
-    BOOL					bTextValid;					// Text noch nicht in Edit-Engine
+    sal_Bool					bTextValid;					// Text noch nicht in Edit-Engine
     String					aCurrentText;
 
     String					aFormText;					// fuer Funktions-Autopilot
     xub_StrLen				nFormSelStart;				// Selektion fuer Funktions-Autopilot
     xub_StrLen				nFormSelEnd;
 
-    USHORT					nAutoPar;					// autom.parentheses than can be overwritten
+    sal_uInt16					nAutoPar;					// autom.parentheses than can be overwritten
 
     ScAddress				aCursorPos;
     ScInputMode				eMode;
-    BOOL					bModified;
-    BOOL					bSelIsRef;
-    BOOL					bFormulaMode;
-    BOOL					bInRangeUpdate;
-    BOOL					bParenthesisShown;
-    BOOL					bCreatingFuncView;
-    BOOL					bInEnterHandler;
-    BOOL					bCommandErrorShown;
-    BOOL					bInOwnChange;
-
-    BOOL					bProtected;
-    BOOL					bCellHasPercentFormat;
-    ULONG					nValidation;
+    sal_Bool					bModified;
+    sal_Bool					bSelIsRef;
+    sal_Bool					bFormulaMode;
+    sal_Bool					bInRangeUpdate;
+    sal_Bool					bParenthesisShown;
+    sal_Bool					bCreatingFuncView;
+    sal_Bool					bInEnterHandler;
+    sal_Bool					bCommandErrorShown;
+    sal_Bool					bInOwnChange;
+
+    sal_Bool					bProtected;
+    sal_Bool					bCellHasPercentFormat;
+    sal_uLong					nValidation;
     SvxCellHorJustify       eAttrAdjust;
 
     Fraction				aScaleX;					// fuer Ref-MapMode
@@ -111,21 +111,21 @@ private:
 
     const ScPatternAttr*	pLastPattern;
     SfxItemSet*			 	pEditDefaults;
-    BOOL					bLastIsSymbol;
+    sal_Bool					bLastIsSymbol;
 
     ScInputHdlState*		pLastState;
     Timer*					pDelayTimer;
 
     ScRangeFindList*		pRangeFindList;
 
-    static BOOL				bAutoComplete;				// aus App-Optionen
-    static BOOL				bOptLoaded;
+    static sal_Bool				bAutoComplete;				// aus App-Optionen
+    static sal_Bool				bOptLoaded;
 
 #ifdef _INPUTHDL_CXX
 private:
     void			UpdateActiveView();
     void			SyncViews( EditView* pSourceView = NULL );
-    BOOL			StartTable( sal_Unicode cTyped, BOOL bFromCommand );
+    sal_Bool			StartTable( sal_Unicode cTyped, sal_Bool bFromCommand );
     void			RemoveSelection();
     void			UpdateFormulaMode();
     void			InvalidateAttribs();
@@ -133,11 +133,11 @@ private:
     DECL_LINK(		DelayTimer, Timer* );
     void			GetColData();
     void			UseColData();
-    void			NextAutoEntry( BOOL bBack );
+    void			NextAutoEntry( sal_Bool bBack );
     void			UpdateAdjust( sal_Unicode cTyped );
     void			GetFormulaData();
     void			UseFormulaData();
-    void			NextFormulaEntry( BOOL bBack );
+    void			NextFormulaEntry( sal_Bool bBack );
     void			PasteFunctionData();
     void			PasteManualTip();
     EditView*		GetFuncEditView();
@@ -148,7 +148,7 @@ private:
     void			UpdateAutoCorrFlag();
     void			ResetAutoPar();
     void			AutoParAdded();
-    BOOL			CursorAtClosingPar();
+    sal_Bool			CursorAtClosingPar();
     void			SkipClosingPar();
     DECL_LINK( ModifyHdl, void* );
     DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent* );
@@ -160,39 +160,39 @@ public:
     virtual			~ScInputHandler();
 
     void			SetMode( ScInputMode eNewMode );
-    BOOL			IsInputMode() const	{ return (eMode != SC_INPUT_NONE); }
-    BOOL			IsEditMode() const	{ return (eMode != SC_INPUT_NONE &&
+    sal_Bool			IsInputMode() const	{ return (eMode != SC_INPUT_NONE); }
+    sal_Bool			IsEditMode() const	{ return (eMode != SC_INPUT_NONE &&
                                                   eMode != SC_INPUT_TYPE); }
-    BOOL			IsTopMode() const	{ return (eMode == SC_INPUT_TOP);  }
+    sal_Bool			IsTopMode() const	{ return (eMode == SC_INPUT_TOP);  }
 
     const String&	GetEditString();
     const String&	GetFormString() const	{ return aFormText; }
 
     const ScAddress& GetCursorPos() const   { return aCursorPos; }
 
-    BOOL			GetTextAndFields( ScEditEngineDefaulter& rDestEngine );
+    sal_Bool			GetTextAndFields( ScEditEngineDefaulter& rDestEngine );
 
-    BOOL			KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE );
-    void			EnterHandler( BYTE nBlockMode = 0 );
+    sal_Bool			KeyInput( const KeyEvent& rKEvt, sal_Bool bStartEdit = sal_False );
+    void			EnterHandler( sal_uInt8 nBlockMode = 0 );
     void			CancelHandler();
     void			SetReference( const ScRange& rRef, ScDocument* pDoc );
     void			AddRefEntry();
 
-    BOOL			InputCommand( const CommandEvent& rCEvt, BOOL bForce );
+    sal_Bool			InputCommand( const CommandEvent& rCEvt, sal_Bool bForce );
 
-    void			InsertFunction( const String& rFuncName, BOOL bAddPar = TRUE );
+    void			InsertFunction( const String& rFuncName, sal_Bool bAddPar = sal_True );
     void			ClearText();
 
     void			InputSelection( EditView* pView );
-    void			InputChanged( EditView* pView, BOOL bFromNotify = FALSE );
+    void			InputChanged( EditView* pView, sal_Bool bFromNotify = sal_False );
 
     void			ViewShellGone(ScTabViewShell* pViewSh);
     void			SetRefViewShell(ScTabViewShell*	pRefVsh) {pRefViewSh=pRefVsh;}
 
 
-    void			NotifyChange( const ScInputHdlState* pState, BOOL bForce = FALSE,
+    void			NotifyChange( const ScInputHdlState* pState, sal_Bool bForce = sal_False,
                                     ScTabViewShell* pSourceSh = NULL,
-                                    BOOL bStopEditing = TRUE);
+                                    sal_Bool bStopEditing = sal_True);
     void            UpdateCellAdjust( SvxCellHorJustify eJust );
 
     void			ResetDelayTimer(); //BugId 54702
@@ -210,21 +210,21 @@ public:
     EditView*		GetTableView()		{ return pTableView; }
     EditView*		GetTopView()		{ return pTopView; }
 
-    BOOL			DataChanging( sal_Unicode cTyped = 0, BOOL bFromCommand = FALSE );
-    void			DataChanged( BOOL bFromTopNotify = FALSE );
+    sal_Bool			DataChanging( sal_Unicode cTyped = 0, sal_Bool bFromCommand = sal_False );
+    void			DataChanged( sal_Bool bFromTopNotify = sal_False );
 
-    BOOL			TakesReturn() const		{ return ( nTipVisible != 0 ); }
+    sal_Bool			TakesReturn() const		{ return ( nTipVisible != 0 ); }
 
-    void			SetModified()		{ bModified = TRUE; }
+    void			SetModified()		{ bModified = sal_True; }
 
-    BOOL			GetSelIsRef() const		{ return bSelIsRef; }
-    void			SetSelIsRef(BOOL bSet)	{ bSelIsRef = bSet; }
+    sal_Bool			GetSelIsRef() const		{ return bSelIsRef; }
+    void			SetSelIsRef(sal_Bool bSet)	{ bSelIsRef = bSet; }
 
     void			ShowRefFrame();
 
     ScRangeFindList* GetRangeFindList()		{ return pRangeFindList; }
 
-    void			UpdateRange( USHORT nIndex, const ScRange& rNew );
+    void			UpdateRange( sal_uInt16 nIndex, const ScRange& rNew );
 
     // Kommunikation mit Funktionsautopilot
     void			InputGetSelection		( xub_StrLen& rStart, xub_StrLen& rEnd );
@@ -232,19 +232,19 @@ public:
     void		 	InputReplaceSelection	( const String& rStr );
     String			InputGetFormulaStr		();
 
-    BOOL			IsFormulaMode() const					{ return bFormulaMode; }
+    sal_Bool			IsFormulaMode() const					{ return bFormulaMode; }
     ScInputWindow*	GetInputWindow()						{ return pInputWin; }
     void			SetInputWindow( ScInputWindow* pNew )	{ pInputWin = pNew; }
-    void			StopInputWinEngine( BOOL bAll );
+    void			StopInputWinEngine( sal_Bool bAll );
 
-    BOOL			IsInEnterHandler() const				{ return bInEnterHandler; }
-    BOOL			IsInOwnChange() const					{ return bInOwnChange; }
+    sal_Bool			IsInEnterHandler() const				{ return bInEnterHandler; }
+    sal_Bool			IsInOwnChange() const					{ return bInOwnChange; }
 
-    BOOL			IsModalMode( SfxObjectShell* pDocSh );
+    sal_Bool			IsModalMode( SfxObjectShell* pDocSh );
 
     void			ForgetLastPattern();
 
-    void			UpdateSpellSettings( BOOL bFromStartTab = FALSE );
+    void			UpdateSpellSettings( sal_Bool bFromStartTab = sal_False );
 
     void			FormulaPreview();
 
@@ -253,7 +253,7 @@ public:
                     // eigentlich private, fuer SID_INPUT_SUM public
     void			InitRangeFinder( const String& rFormula );
 
-    static void		SetAutoComplete(BOOL bSet)	{ bAutoComplete = bSet; }
+    static void		SetAutoComplete(sal_Bool bSet)	{ bAutoComplete = bSet; }
 };
 
 //========================================================================
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 856a97250..e8c3b2ff2 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -55,18 +55,18 @@ public:
     void			SetTextString( const String& rString );
     const String&	GetTextString() const;
 
-    BOOL			IsInputActive();
+    sal_Bool			IsInputActive();
     EditView*		GetEditView();
 
                         // fuer FunktionsAutopiloten
     void			MakeDialogEditView();
 
     void			StartEditEngine();
-    void			StopEditEngine( BOOL bAll );
+    void			StopEditEngine( sal_Bool bAll );
 
     virtual void	DataChanged( const DataChangedEvent& rDCEvt );
 
-    void			SetFormulaMode( BOOL bSet );
+    void			SetFormulaMode( sal_Bool bSet );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
@@ -103,13 +103,13 @@ private:
     ScEditEngineDefaulter*	pEditEngine;			// erst bei Bedarf angelegt
     EditView*	pEditView;
     AccTextDataVector maAccTextDatas;   // #i105267# text datas may be cloned, remember all copies
-    BOOL		bIsRTL;
-    BOOL		bIsInsertMode;
-    BOOL		bFormulaMode;
+    sal_Bool		bIsRTL;
+    sal_Bool		bIsInsertMode;
+    sal_Bool		bFormulaMode;
 
     // #102710#; this flag should be true if a key input or a command is handled
     // it prevents the call of InputChanged in the ModifyHandler of the EditEngine
-    BOOL        bInputMode;
+    sal_Bool        bInputMode;
 };
 
 //========================================================================
@@ -119,16 +119,16 @@ class ScPosWnd : public ComboBox, public SfxListener		// Positionsanzeige
 private:
     String			aPosStr;
     Accelerator*	pAccel;
-    ULONG           nTipVisible;
-    BOOL			bFormulaMode;
-    BOOL			bTopHadFocus;
+    sal_uLong           nTipVisible;
+    sal_Bool			bFormulaMode;
+    sal_Bool			bTopHadFocus;
 
 public:
                     ScPosWnd( Window* pParent );
     virtual			~ScPosWnd();
 
     void			SetPos( const String& rPosStr );		// angezeigter Text
-    void			SetFormulaMode( BOOL bSet );
+    void			SetFormulaMode( sal_Bool bSet );
 
 protected:
     virtual void	Select();
@@ -158,17 +158,17 @@ public:
     virtual void 	Resize();
     virtual void    Select();
 
-    void			SetFuncString( const String& rString, BOOL bDoEdit = TRUE );
+    void			SetFuncString( const String& rString, sal_Bool bDoEdit = sal_True );
     void			SetPosString( const String& rStr );
     void			SetTextString( const String& rString );
 
     void 			SetOkCancelMode();
     void 			SetSumAssignMode();
-    void			EnableButtons( BOOL bEnable = TRUE );
+    void			EnableButtons( sal_Bool bEnable = sal_True );
 
-    void			SetFormulaMode( BOOL bSet );
+    void			SetFormulaMode( sal_Bool bSet );
 
-    BOOL			IsInputActive();
+    sal_Bool			IsInputActive();
     EditView*		GetEditView();
 //UNUSED2008-05  EditView*		ActivateEdit( const String&     rText,
 //UNUSED2008-05                                const ESelection& rSel );
@@ -182,7 +182,7 @@ public:
     // Fuer FunktionsAutopiloten
     void			MakeDialogEditView();
 
-    void			StopEditEngine( BOOL bAll );
+    void			StopEditEngine( sal_Bool bAll );
 
     void			SetInputHandler( ScInputHandler* pNew );
 
@@ -207,7 +207,7 @@ private:
     String			aTextCancel;
     String			aTextSum;
     String			aTextEqual;
-    BOOL			bIsOkCancelMode;
+    sal_Bool			bIsOkCancelMode;
 };
 
 //==================================================================
@@ -216,7 +216,7 @@ class ScInputWindowWrapper : public SfxChildWindow
 {
 public:
             ScInputWindowWrapper( Window*			pParent,
-                                  USHORT			nId,
+                                  sal_uInt16			nId,
                                   SfxBindings*		pBindings,
                                   SfxChildWinInfo*	pInfo );
 
diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx
index 34600b4ec..da234fcda 100644
--- a/sc/source/ui/inc/inscldlg.hxx
+++ b/sc/source/ui/inc/inscldlg.hxx
@@ -50,7 +50,7 @@ private:
     HelpButton		aBtnHelp;
 
 public:
-            ScInsertCellDlg( Window* pParent,BOOL bDisallowCellMove = FALSE );
+            ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove = sal_False );
             ~ScInsertCellDlg();
 
     InsCellCmd GetInsCellCmd() const;
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index c65962558..ae7cb1114 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -46,20 +46,20 @@ class ScInsertContentsDlg : public ModalDialog
 {
 public:
             ScInsertContentsDlg( Window*		pParent,
-                                 USHORT  		nCheckDefaults = 0,
+                                 sal_uInt16  		nCheckDefaults = 0,
                                  const String*	pStrTitle = NULL );
             ~ScInsertContentsDlg();
 
-    USHORT		GetInsContentsCmdBits() const;
-    USHORT		GetFormulaCmdBits() const;
-    BOOL		IsSkipEmptyCells() const {return aBtnSkipEmptyCells.IsChecked();}
-    BOOL 		IsTranspose() const {return aBtnTranspose.IsChecked();}
-    BOOL 		IsLink() const {return aBtnLink.IsChecked();}
+    sal_uInt16		GetInsContentsCmdBits() const;
+    sal_uInt16		GetFormulaCmdBits() const;
+    sal_Bool		IsSkipEmptyCells() const {return aBtnSkipEmptyCells.IsChecked();}
+    sal_Bool 		IsTranspose() const {return aBtnTranspose.IsChecked();}
+    sal_Bool 		IsLink() const {return aBtnLink.IsChecked();}
     InsCellCmd	GetMoveMode();
 
-    void	SetOtherDoc( BOOL bSet );
-    void	SetFillMode( BOOL bSet );
-    void	SetChangeTrack( BOOL bSet );
+    void	SetOtherDoc( sal_Bool bSet );
+    void	SetFillMode( sal_Bool bSet );
+    void	SetChangeTrack( sal_Bool bSet );
     void	SetCellShiftDisabled( int nDisable );
 
 private:
@@ -96,19 +96,19 @@ private:
     CancelButton	aBtnCancel;
     HelpButton		aBtnHelp;
 
-    BOOL			bOtherDoc;
-    BOOL			bFillMode;
-    BOOL			bChangeTrack;
-    BOOL			bMoveDownDisabled;
-    BOOL			bMoveRightDisabled;
+    sal_Bool			bOtherDoc;
+    sal_Bool			bFillMode;
+    sal_Bool			bChangeTrack;
+    sal_Bool			bMoveDownDisabled;
+    sal_Bool			bMoveRightDisabled;
 
-    static BOOL		bPreviousAllCheck;
-    static USHORT	nPreviousChecks;
-    static USHORT	nPreviousChecks2;
-    static USHORT	nPreviousFormulaChecks;
-    static USHORT	nPreviousMoveMode;			// enum InsCellCmd
+    static sal_Bool		bPreviousAllCheck;
+    static sal_uInt16	nPreviousChecks;
+    static sal_uInt16	nPreviousChecks2;
+    static sal_uInt16	nPreviousFormulaChecks;
+    static sal_uInt16	nPreviousMoveMode;			// enum InsCellCmd
 
-    void DisableChecks( BOOL bInsAllChecked = TRUE );
+    void DisableChecks( sal_Bool bInsAllChecked = sal_True );
     void TestModes();
 
     // Handler
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 814fd2344..ba7b59c54 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -73,13 +73,13 @@ public:
 
     virtual short	Execute();		// ueberladen, um Dialog-Parent zu setzen
 
-    BOOL			GetTablesFromFile()	{ return aBtnFromFile.IsChecked(); }
-    BOOL			GetTablesAsLink()	{ return aBtnLink.IsChecked(); }
+    sal_Bool			GetTablesFromFile()	{ return aBtnFromFile.IsChecked(); }
+    sal_Bool			GetTablesAsLink()	{ return aBtnLink.IsChecked(); }
 
-    const String*	GetFirstTable( USHORT* pN = NULL );
-    const String*	GetNextTable( USHORT* pN = NULL );
+    const String*	GetFirstTable( sal_uInt16* pN = NULL );
+    const String*	GetNextTable( sal_uInt16* pN = NULL );
     ScDocShell*		GetDocShellTables()	{ return pDocShTables; }
-    BOOL			IsTableBefore() { return aBtnBefore.IsChecked(); }
+    sal_Bool			IsTableBefore() { return aBtnBefore.IsChecked(); }
     SCTAB			GetTableCount() { return nTableCount;}
 
 private:
@@ -109,7 +109,7 @@ private:
     SfxObjectShellRef       aDocShTablesRef;
 
     bool                bMustClose;
-    USHORT				nSelTabIndex;	// fuer GetFirstTable() / GetNextTable()
+    sal_uInt16				nSelTabIndex;	// fuer GetFirstTable() / GetNextTable()
     String				aStrCurSelTable;
     SCTAB				nTableCount;
 
diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx
index 6b420430c..519840d3e 100644
--- a/sc/source/ui/inc/lbseldlg.hxx
+++ b/sc/source/ui/inc/lbseldlg.hxx
@@ -54,14 +54,14 @@ private:
 
 public:
             ScSelEntryDlg(		Window* pParent,
-                                USHORT	nResId,
+                                sal_uInt16	nResId,
                           const String& aTitle,
                           const String& aLbTitle,
                                 List& 	aEntryList );
             ~ScSelEntryDlg();
 
     String GetSelectEntry() const;
-//UNUSED2008-05  USHORT GetSelectEntryPos() const;
+//UNUSED2008-05  sal_uInt16 GetSelectEntryPos() const;
 };
 
 
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index cbcba4f8a..e734dc3b8 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -91,7 +91,7 @@ public:
 
     void			InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
-                                        ULONG nRefresh );
+                                        sal_uLong nRefresh );
 
     virtual short	Execute();			// overwritten to set dialog parent
 
@@ -99,7 +99,7 @@ public:
     String			GetFilter();		// may be empty
     String			GetOptions();		// filter options
     String			GetSource();		// separated by ";"
-    ULONG			GetRefresh();		// 0 if disabled
+    sal_uLong			GetRefresh();		// 0 if disabled
 };
 
 #endif
diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx
index 7fe407abc..dd3c2f878 100644
--- a/sc/source/ui/inc/msgpool.hxx
+++ b/sc/source/ui/inc/msgpool.hxx
@@ -69,7 +69,7 @@ protected:
     virtual ~ScMessagePool();
 public:
 
-    virtual SfxMapUnit				GetMetric( USHORT nWhich ) const;
+    virtual SfxMapUnit				GetMetric( sal_uInt16 nWhich ) const;
 };
 
 
diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx
index 08c26fb83..30f1d989b 100644
--- a/sc/source/ui/inc/mtrindlg.hxx
+++ b/sc/source/ui/inc/mtrindlg.hxx
@@ -40,11 +40,11 @@ class ScMetricInputDlg : public ModalDialog
 {
 public:
             ScMetricInputDlg( Window*		pParent,
-                              USHORT		nResId,		// Ableitung fuer jeden Dialog!
+                              sal_uInt16		nResId,		// Ableitung fuer jeden Dialog!
                               long			nCurrent,
                               long			nDefault,
                               FieldUnit		eFUnit	  = FUNIT_MM,
-                              USHORT		nDecimals = 2,
+                              sal_uInt16		nDecimals = 2,
                               long			nMaximum  = 1000,
                               long			nMinimum  = 0,
                               long			nFirst	  = 1,
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 63924a168..76523ed08 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -46,11 +46,11 @@ public:
                     ScMoveTableDlg( Window* pParent );
                     ~ScMoveTableDlg();
 
-    USHORT	GetSelectedDocument		() const;
+    sal_uInt16	GetSelectedDocument		() const;
     SCTAB	GetSelectedTable		() const;
-    BOOL	GetCopyTable			() const;
-    void	SetCopyTable			(BOOL bFlag=TRUE);
-    void	EnableCopyTable			(BOOL bFlag=TRUE);
+    sal_Bool	GetCopyTable			() const;
+    void	SetCopyTable			(sal_Bool bFlag=sal_True);
+    void	EnableCopyTable			(sal_Bool bFlag=sal_True);
 
 private:
     FixedText		aFtDoc;
@@ -62,9 +62,9 @@ private:
     CancelButton	aBtnCancel;
     HelpButton		aBtnHelp;
 
-    USHORT			nDocument;
+    sal_uInt16			nDocument;
     SCTAB			nTable;
-    BOOL			bCopyTable;
+    sal_Bool			bCopyTable;
     //--------------------------------------
     void	Init			();
     void	InitDocListBox	();
diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx
index b3db3bf69..a2d7d0dca 100644
--- a/sc/source/ui/inc/namecrea.hxx
+++ b/sc/source/ui/inc/namecrea.hxx
@@ -50,9 +50,9 @@ protected:
     CancelButton	aCancelButton;
     HelpButton		aHelpButton;
 public:
-    ScNameCreateDlg( Window * pParent, USHORT nFlags );
+    ScNameCreateDlg( Window * pParent, sal_uInt16 nFlags );
 
-    USHORT			GetFlags() const;
+    sal_uInt16			GetFlags() const;
 };
 
 
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 66976c69f..f86deab97 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -69,7 +69,7 @@ private:
     PushButton		aBtnAdd;
     PushButton		aBtnRemove;
     MoreButton		aBtnMore;
-    BOOL			bSaved;
+    sal_Bool			bSaved;
 
     const String	aStrAdd;	// "Hinzufuegen"
     const String	aStrModify;	// "Aendern"
@@ -86,7 +86,7 @@ private:
     void Init();
     void UpdateChecks();
     void UpdateNames();
-    void CalcCurTableAssign( String& aAssign, USHORT nPos );
+    void CalcCurTableAssign( String& aAssign, sal_uInt16 nPos );
 
     // Handler:
     DECL_LINK( OkBtnHdl, void * );
@@ -100,7 +100,7 @@ private:
 
 protected:
 
-    virtual void	RefInputDone( BOOL bForced = FALSE );
+    virtual void	RefInputDone( sal_Bool bForced = sal_False );
 
 
 public:
@@ -110,10 +110,10 @@ public:
                     ~ScNameDlg();
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
-    virtual BOOL	IsRefInputMode() const;
+    virtual sal_Bool	IsRefInputMode() const;
 
     virtual void	SetActive();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 };
 
diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index 8c0d425c1..85b36270d 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -53,7 +53,7 @@ protected:
     HelpButton		aHelpButton;
     PushButton		aInsListButton;
 public:
-    ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList=TRUE );
+    ScNamePasteDlg( Window * pParent, const ScRangeName* pList, sal_Bool bInsList=sal_True );
 
     String			GetSelectedName() const;
 };
diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx
index 2801c7d69..9bdd5d064 100644
--- a/sc/source/ui/inc/navcitem.hxx
+++ b/sc/source/ui/inc/navcitem.hxx
@@ -39,11 +39,11 @@ class ScNavigatorDlg;
 class ScNavigatorControllerItem : public SfxControllerItem
 {
 public:
-    ScNavigatorControllerItem( USHORT nId,
+    ScNavigatorControllerItem( sal_uInt16 nId,
                                ScNavigatorDlg& rDlg,
                                SfxBindings& rBindings );
 protected:
-    virtual void	StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void	StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                       const SfxPoolItem* pItem );
 
 private:
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index a19ec51dd..4a6f7b4fc 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -93,7 +93,7 @@ private:
 private:
     const ScenarioEntry* GetSelectedEntry() const;
 
-    void                ExecuteScenarioSlot( USHORT nSlotId );
+    void                ExecuteScenarioSlot( sal_uInt16 nSlotId );
     void                SelectScenario();
     void                EditScenario();
     void                DeleteScenario( bool bQueryBox );
@@ -150,7 +150,7 @@ protected:
 private:
     ScNavigatorDlg& rDlg;
     SCCOL			nCol;
-    USHORT			nKeyGroup;
+    sal_uInt16			nKeyGroup;
 
     void	EvalText		();
     void	ExecuteCol		();
@@ -209,7 +209,7 @@ public:
             CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId );
             ~CommandToolBox();
 
-    void Select( USHORT nId );
+    void Select( sal_uInt16 nId );
     void UpdateButtons();
     void InitImageList();
 
@@ -272,11 +272,11 @@ private:
     long			nListModeHeight;
     long			nInitListHeight;
     NavListMode		eListMode;
-    USHORT			nDropMode;
+    sal_uInt16			nDropMode;
     SCCOL			nCurCol;
     SCROW			nCurRow;
     SCTAB			nCurTab;
-    BOOL			bFirstBig;
+    sal_Bool			bFirstBig;
 
     ScNavigatorControllerItem** ppBoundItems;
 
@@ -296,7 +296,7 @@ private:
 
     ScTabViewShell*         GetTabViewShell() const;
     ScNavigatorSettings*    GetNavigatorSettings();
-    BOOL                    GetViewData();
+    sal_Bool                    GetViewData();
 
     void	UpdateColumn	( const SCCOL* pCol = NULL );
     void	UpdateRow		( const SCROW* pRow = NULL );
@@ -305,12 +305,12 @@ private:
 
     void	GetDocNames(const String* pSelEntry = NULL);
 
-    void	SetListMode		( NavListMode eMode, BOOL bSetSize = TRUE );
-    void	ShowList		( BOOL bShow, BOOL bSetSize );
-    void	ShowScenarios	( BOOL bShow, BOOL bSetSize );
+    void	SetListMode		( NavListMode eMode, sal_Bool bSetSize = sal_True );
+    void	ShowList		( sal_Bool bShow, sal_Bool bSetSize );
+    void	ShowScenarios	( sal_Bool bShow, sal_Bool bSetSize );
 
-    void	SetDropMode(USHORT nNew);
-    USHORT	GetDropMode() const			{ return nDropMode; }
+    void	SetDropMode(sal_uInt16 nNew);
+    sal_uInt16	GetDropMode() const			{ return nDropMode; }
 
     const String& GetStrDragMode() const	{ return aStrDragMode; }
     const String& GetStrDisplay() const		{ return aStrDisplay; }
@@ -348,7 +348,7 @@ class ScNavigatorDialogWrapper: public SfxChildWindowContext
 {
 public:
             ScNavigatorDialogWrapper( Window*			pParent,
-                                      USHORT			nId,
+                                      sal_uInt16			nId,
                                       SfxBindings*		pBindings,
                                       SfxChildWinInfo*	pInfo );
 
diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx
index 28fcd8ecb..bd54c25dd 100644
--- a/sc/source/ui/inc/navsett.hxx
+++ b/sc/source/ui/inc/navsett.hxx
@@ -37,21 +37,21 @@
 class ScNavigatorSettings
 {
 private:
-    ::std::vector< BOOL >       maExpandedVec;      /// Array of Booleans for expand state.
-    USHORT                      mnRootSelected;     /// Index of selected root entry.
-    ULONG                       mnChildSelected;    /// Index of selected child entry.
+    ::std::vector< sal_Bool >       maExpandedVec;      /// Array of Booleans for expand state.
+    sal_uInt16                      mnRootSelected;     /// Index of selected root entry.
+    sal_uLong                       mnChildSelected;    /// Index of selected child entry.
 
 public:
                                 ScNavigatorSettings();
 
-    inline void                 SetExpanded( USHORT nIndex, BOOL bExpand ) { maExpandedVec[ nIndex ] = bExpand; }
-    inline BOOL                 IsExpanded( USHORT nIndex ) const { return maExpandedVec[ nIndex ]; }
+    inline void                 SetExpanded( sal_uInt16 nIndex, sal_Bool bExpand ) { maExpandedVec[ nIndex ] = bExpand; }
+    inline sal_Bool                 IsExpanded( sal_uInt16 nIndex ) const { return maExpandedVec[ nIndex ]; }
 
-    inline void                 SetRootSelected( USHORT nIndex ) { mnRootSelected = nIndex; }
-    inline USHORT               GetRootSelected() const { return mnRootSelected; }
+    inline void                 SetRootSelected( sal_uInt16 nIndex ) { mnRootSelected = nIndex; }
+    inline sal_uInt16               GetRootSelected() const { return mnRootSelected; }
 
-    inline void                 SetChildSelected( ULONG nIndex ) { mnChildSelected = nIndex; }
-    inline ULONG                GetChildSelected() const { return mnChildSelected; }
+    inline void                 SetChildSelected( sal_uLong nIndex ) { mnChildSelected = nIndex; }
+    inline sal_uLong                GetChildSelected() const { return mnChildSelected; }
 };
 
 
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index 02a1835bc..28d054f79 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -51,27 +51,27 @@ private:
     Rectangle   aVisRect;
     Timer		aTimer;
     MapMode		aMapMode;
-    BOOL		bLeft;
-    BOOL		bByKeyboard;
+    sal_Bool		bLeft;
+    sal_Bool		bByKeyboard;
 
     Rectangle		aRect;
     SdrModel*		pModel;
     SdrObject*		pObject;
-    BOOL			bVisible;
+    sal_Bool			bVisible;
 
     DECL_LINK( TimeHdl, Timer* );
 
 public:
                 ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal,
                                 ScDocument* pD, ScAddress aPos, const String& rUser,
-                                const MapMode& rMap, BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard );
+                                const MapMode& rMap, sal_Bool bLeftEdge, sal_Bool bForce, sal_Bool bKeyboard );
                 ~ScNoteMarker();
 
     void		Draw();
     void		InvalidateWin();
 
     ScAddress	GetDocPos() const		{ return aDocPos; }
-    BOOL		IsByKeyboard() const	{ return bByKeyboard; }
+    sal_Bool		IsByKeyboard() const	{ return bByKeyboard; }
 };
 
 
diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx
index f1b75ea82..27f2460d9 100644
--- a/sc/source/ui/inc/olinefun.hxx
+++ b/sc/source/ui/inc/olinefun.hxx
@@ -45,21 +45,21 @@ public:
                 ScOutlineDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {}
                 ~ScOutlineDocFunc() {}
 
-    BOOL		MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi );
-    BOOL		RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi );
-    BOOL		RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi );
-    BOOL		AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi );
+    sal_Bool		MakeOutline( const ScRange& rRange, sal_Bool bColumns, sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool		RemoveOutline( const ScRange& rRange, sal_Bool bColumns, sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool		RemoveAllOutlines( SCTAB nTab, sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool		AutoOutline( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL		SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
-                                    BOOL bRecord, BOOL bPaint, BOOL bApi );
+    sal_Bool		SelectLevel( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel,
+                                    sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
 
-    BOOL		ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi );
-    BOOL		HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi );
+    sal_Bool		ShowMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi );
+    sal_Bool		HideMarkedOutlines( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi );
 
-    BOOL		ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
-                                    BOOL bRecord, BOOL bPaint, BOOL bApi );
-    BOOL		HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
-                                    BOOL bRecord, BOOL bPaint, BOOL bApi );
+    sal_Bool		ShowOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
+                                    sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
+    sal_Bool		HideOutline( SCTAB nTab, sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
+                                    sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
 };
 
 
diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx
index b8a0623b8..a7fd3286c 100644
--- a/sc/source/ui/inc/olinewin.hxx
+++ b/sc/source/ui/inc/olinewin.hxx
@@ -208,7 +208,7 @@ private:
                                     long nLevelStart, long nEntryStart,
                                     long nLevelEnd, long nEntryEnd );
     /** Draws the specified image unpressed. */
-    void                        DrawImageRel( long nLevelPos, long nEntryPos, USHORT nId );
+    void                        DrawImageRel( long nLevelPos, long nEntryPos, sal_uInt16 nId );
     /** Draws a pressed or unpressed border. */
     void                        DrawBorderRel( size_t nLevel, size_t nEntry, bool bPressed );
 
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index 7dd486770..463cadcb2 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -78,7 +78,7 @@ public:
 
     static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	sal_Bool 		FillItemSet( SfxItemSet& rSet );
     virtual	void 		Reset( const SfxItemSet& rSet );
 };
 #endif
diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx
index 0eed9f6fc..e26bff779 100644
--- a/sc/source/ui/inc/optload.hxx
+++ b/sc/source/ui/inc/optload.hxx
@@ -59,7 +59,7 @@ public:
 
     void				SetDocument(ScDocument*);
 
-    virtual	BOOL 		FillItemSet( SfxItemSet& rSet );
+    virtual	sal_Bool 		FillItemSet( SfxItemSet& rSet );
     virtual	void 		Reset( const SfxItemSet& rSet );
 };
 
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index cffb4f1d8..e694ca7f5 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -62,7 +62,7 @@ protected:
 struct ScOptConditionRow
 {
     String  aLeftStr;
-    USHORT  nOperator;
+    sal_uInt16  nOperator;
     String  aRightStr;
 
     ScOptConditionRow() : nOperator(0) {}
@@ -73,9 +73,9 @@ struct ScOptConditionRow
 class ScOptSolverSave
 {
     String  maObjective;
-    BOOL    mbMax;
-    BOOL    mbMin;
-    BOOL    mbValue;
+    sal_Bool    mbMax;
+    sal_Bool    mbMin;
+    sal_Bool    mbValue;
     String  maTarget;
     String  maVariable;
     std::vector<ScOptConditionRow> maConditions;
@@ -83,16 +83,16 @@ class ScOptSolverSave
     com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties;
 
 public:
-            ScOptSolverSave( const String& rObjective, BOOL bMax, BOOL bMin, BOOL bValue,
+            ScOptSolverSave( const String& rObjective, sal_Bool bMax, sal_Bool bMin, sal_Bool bValue,
                              const String& rTarget, const String& rVariable,
                              const std::vector<ScOptConditionRow>& rConditions,
                              const String& rEngine,
                              const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties );
 
     const String&   GetObjective() const    { return maObjective; }
-    BOOL            GetMax() const          { return mbMax; }
-    BOOL            GetMin() const          { return mbMin; }
-    BOOL            GetValue() const        { return mbValue; }
+    sal_Bool            GetMax() const          { return mbMax; }
+    sal_Bool            GetMin() const          { return mbMin; }
+    sal_Bool            GetValue() const        { return mbValue; }
     const String&   GetTarget() const       { return maTarget; }
     const String&   GetVariable() const     { return maVariable; }
     const std::vector<ScOptConditionRow>& GetConditions() const { return maConditions; }
@@ -109,9 +109,9 @@ public:
                     ~ScOptSolverDlg();
 
     virtual void    SetReference( const ScRange& rRef, ScDocument* pDoc );
-    virtual BOOL    IsRefInputMode() const;
+    virtual sal_Bool    IsRefInputMode() const;
     virtual void    SetActive();
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 
 private:
     FixedText       maFtObjectiveCell;
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 1e2716200..54ccb10ec 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -106,7 +106,7 @@ private:
     ScOutputType eType;			// Bildschirm/Drucker ...
     double nPPTX;				// Pixel per Twips
     double nPPTY;
-//	USHORT nZoom;				// Zoom-Faktor (Prozent) - fuer GetFont
+//	sal_uInt16 nZoom;				// Zoom-Faktor (Prozent) - fuer GetFont
     Fraction aZoomX;
     Fraction aZoomY;
 
@@ -117,61 +117,61 @@ private:
     // #114135#
     FmFormView* pDrawView;		// SdrView to paint to
 
-    BOOL bEditMode;				// InPlace editierte Zelle - nicht ausgeben
+    sal_Bool bEditMode;				// InPlace editierte Zelle - nicht ausgeben
     SCCOL nEditCol;
     SCROW nEditRow;
 
-    BOOL bMetaFile;				// Ausgabe auf Metafile (nicht in Pixeln!)
-    BOOL bSingleGrid;			// beim Gitter bChanged auswerten
+    sal_Bool bMetaFile;				// Ausgabe auf Metafile (nicht in Pixeln!)
+    sal_Bool bSingleGrid;			// beim Gitter bChanged auswerten
 
-    BOOL bPagebreakMode;		// Seitenumbruch-Vorschau
-    BOOL bSolidBackground;		// weiss statt transparent
+    sal_Bool bPagebreakMode;		// Seitenumbruch-Vorschau
+    sal_Bool bSolidBackground;		// weiss statt transparent
 
-    BOOL bUseStyleColor;
-    BOOL bForceAutoColor;
+    sal_Bool bUseStyleColor;
+    sal_Bool bForceAutoColor;
 
-    BOOL bSyntaxMode;			// Syntax-Highlighting
+    sal_Bool bSyntaxMode;			// Syntax-Highlighting
     Color* pValueColor;
     Color* pTextColor;
     Color* pFormulaColor;
 
     Color	aGridColor;
 
-    BOOL	bShowNullValues;
-    BOOL	bShowFormulas;
-    BOOL	bShowSpellErrors;	// Spell-Errors in EditObjekten anzeigen
-    BOOL	bMarkClipped;
+    sal_Bool	bShowNullValues;
+    sal_Bool	bShowFormulas;
+    sal_Bool	bShowSpellErrors;	// Spell-Errors in EditObjekten anzeigen
+    sal_Bool	bMarkClipped;
 
-    BOOL	bSnapPixel;
+    sal_Bool	bSnapPixel;
 
-    BOOL	bAnyRotated;		// intern
-    BOOL	bAnyClipped;		// intern
-    BOOL	bTabProtected;
-    BYTE	nTabTextDirection;	// EEHorizontalTextDirection values
-    BOOL	bLayoutRTL;
+    sal_Bool	bAnyRotated;		// intern
+    sal_Bool	bAnyClipped;		// intern
+    sal_Bool	bTabProtected;
+    sal_uInt8	nTabTextDirection;	// EEHorizontalTextDirection values
+    sal_Bool	bLayoutRTL;
 
     // #i74769# use SdrPaintWindow direct, remember it during BeginDrawLayers/EndDrawLayers
     SdrPaintWindow*		mpTargetPaintWindow;
 
                             // private methods
 
-    BOOL			GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
-                                    SCCOL& rOverX, SCROW& rOverY, BOOL bVisRowChanged );
-    BOOL			IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY );
+    sal_Bool			GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
+                                    SCCOL& rOverX, SCROW& rOverY, sal_Bool bVisRowChanged );
+    sal_Bool			IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY );
     void			GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell );
 
-    BOOL			IsAvailable( SCCOL nX, SCROW nY );
+    sal_Bool			IsAvailable( SCCOL nX, SCROW nY );
 
     void			GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY,
                                    SCCOL nCellX, SCROW nCellY, long nNeeded,
                                    const ScPatternAttr& rPattern,
-                                   USHORT nHorJustify, bool bCellIsValue,
+                                   sal_uInt16 nHorJustify, bool bCellIsValue,
                                    bool bBreak, bool bOverwrite,
                                    OutputAreaParam& rParam );
 
     void            ShrinkEditEngine( EditEngine& rEngine, const Rectangle& rAlignRect,
                                     long nLeftM, long nTopM, long nRightM, long nBottomM,
-                                    BOOL bWidth, USHORT nOrient, long nAttrRotate, BOOL bPixelToLogic,
+                                    sal_Bool bWidth, sal_uInt16 nOrient, long nAttrRotate, sal_Bool bPixelToLogic,
                                     long& rEngineWidth, long& rEngineHeight, long& rNeededPixel,
                                     bool& rLeftClip, bool& rRightClip );
 
@@ -203,36 +203,36 @@ public:
     // #114135#
     void	SetDrawView( FmFormView* pNew )		{ pDrawView = pNew; }
 
-    void	SetSolidBackground( BOOL bSet )		{ bSolidBackground = bSet; }
-    void	SetUseStyleColor( BOOL bSet )		{ bUseStyleColor = bSet; }
+    void	SetSolidBackground( sal_Bool bSet )		{ bSolidBackground = bSet; }
+    void	SetUseStyleColor( sal_Bool bSet )		{ bUseStyleColor = bSet; }
 
     void	SetEditCell( SCCOL nCol, SCROW nRow );
-    void	SetSyntaxMode( BOOL bNewMode );
-    void	SetMetaFileMode( BOOL bNewMode );
-    void	SetSingleGrid( BOOL bNewMode );
+    void	SetSyntaxMode( sal_Bool bNewMode );
+    void	SetMetaFileMode( sal_Bool bNewMode );
+    void	SetSingleGrid( sal_Bool bNewMode );
     void	SetGridColor( const Color& rColor );
-    void	SetMarkClipped( BOOL bSet );
-    void	SetShowNullValues ( BOOL bSet = TRUE );
-    void	SetShowFormulas   ( BOOL bSet = TRUE );
-    void	SetShowSpellErrors( BOOL bSet = TRUE );
+    void	SetMarkClipped( sal_Bool bSet );
+    void	SetShowNullValues ( sal_Bool bSet = sal_True );
+    void	SetShowFormulas   ( sal_Bool bSet = sal_True );
+    void	SetShowSpellErrors( sal_Bool bSet = sal_True );
     void	SetMirrorWidth( long nNew );
     long	GetScrW() const		{ return nScrW; }
     long	GetScrH() const		{ return nScrH; }
 
-    void	SetSnapPixel( BOOL bSet = TRUE );
+    void	SetSnapPixel( sal_Bool bSet = sal_True );
 
-    void	DrawGrid( BOOL bGrid, BOOL bPage );
-    void	DrawStrings( BOOL bPixelToLogic = FALSE );
+    void	DrawGrid( sal_Bool bGrid, sal_Bool bPage );
+    void	DrawStrings( sal_Bool bPixelToLogic = sal_False );
     void	DrawBackground();
     void	DrawShadow();
-    void	DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom);
+    void	DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRight, sal_Bool bBottom);
     void	DrawFrame();
 
                     // with logic MapMode set!
-    void	DrawEdit(BOOL bPixelToLogic);
+    void	DrawEdit(sal_Bool bPixelToLogic);
 
     void	FindRotated();
-    void	DrawRotated(BOOL bPixelToLogic);		// logisch
+    void	DrawRotated(sal_Bool bPixelToLogic);		// logisch
 
     void	DrawClear();
 
@@ -245,7 +245,7 @@ public:
     void	DrawingSingle(const sal_uInt16 nLayer);
     void	DrawSelectiveObjects(const sal_uInt16 nLayer);
 
-    BOOL	SetChangedClip();		// FALSE = nix
+    sal_Bool	SetChangedClip();		// sal_False = nix
     PolyPolygon GetChangedArea();
 
     void	FindChanged();
@@ -255,10 +255,10 @@ public:
 #endif    
     void	DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
                          SCCOL nRefEndX, SCROW nRefEndY,
-                         const Color& rColor, BOOL bHandle );
+                         const Color& rColor, sal_Bool bHandle );
     void	DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
                             SCCOL nRefEndX, SCROW nRefEndY,
-                            const Color& rColor, USHORT nType );
+                            const Color& rColor, sal_uInt16 nType );
     void	DrawChangeTrack();
     void	DrawClipMarks();
 
diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx
index 1fa4abb19..29f08d3ef 100644
--- a/sc/source/ui/inc/pagedata.hxx
+++ b/sc/source/ui/inc/pagedata.hxx
@@ -44,8 +44,8 @@ private:
     size_t		nPagesY;
     SCROW*		pPageEndY;
     long		nFirstPage;
-    BOOL		bTopDown;
-    BOOL		bAutomatic;
+    sal_Bool		bTopDown;
+    sal_Bool		bAutomatic;
 
 public:
                 ScPrintRangeData();
@@ -64,10 +64,10 @@ public:
 
     void			SetFirstPage( long nNew )	{ nFirstPage = nNew; }
     long			GetFirstPage() const		{ return nFirstPage; }
-    void			SetTopDown( BOOL bSet )		{ bTopDown = bSet; }
-    BOOL			IsTopDown() const			{ return bTopDown; }
-    void			SetAutomatic( BOOL bSet )	{ bAutomatic = bSet; }
-    BOOL			IsAutomatic() const			{ return bAutomatic; }
+    void			SetTopDown( sal_Bool bSet )		{ bTopDown = bSet; }
+    sal_Bool			IsTopDown() const			{ return bTopDown; }
+    void			SetAutomatic( sal_Bool bSet )	{ bAutomatic = bSet; }
+    sal_Bool			IsAutomatic() const			{ return bAutomatic; }
 };
 
 class ScPageBreakData
@@ -84,7 +84,7 @@ public:
     size_t				GetCount() const			{ return nUsed; }
     ScPrintRangeData&	GetData(size_t i);
 
-    BOOL				IsEqual( const ScPageBreakData& rOther ) const;
+    sal_Bool				IsEqual( const ScPageBreakData& rOther ) const;
 
     void				AddPages();
 };
diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx
index 74324bb95..b588dacbb 100644
--- a/sc/source/ui/inc/parawin.hxx
+++ b/sc/source/ui/inc/parawin.hxx
@@ -62,10 +62,10 @@ private:
         Link			aFxLink;
         Link			aArgModifiedLink;
 
-        ::std::vector<USHORT>   aVisibleArgMapping;
+        ::std::vector<sal_uInt16>   aVisibleArgMapping;
         const ScFuncDesc*	pFuncDesc;
         ScAnyRefDlg*	pMyParent;
-        USHORT			nArgs;      // unsuppressed arguments
+        sal_uInt16			nArgs;      // unsuppressed arguments
         Font			aFntBold;
         Font			aFntLight;
 
@@ -90,10 +90,10 @@ private:
         ArgEdit			aEdArg4;
         formula::RefButton		aRefBtn4;
         ScrollBar		aSlider;
-        BOOL			bRefMode;
+        sal_Bool			bRefMode;
 
-        USHORT			nEdFocus;
-        USHORT			nActiveLine;
+        sal_uInt16			nEdFocus;
+        sal_uInt16			nActiveLine;
 
         ArgInput		aArgInput[4];
         String			aDefaultString;
@@ -110,7 +110,7 @@ protected:
         virtual void	ArgumentModified();
         virtual void	FxClick();
 
-        void			InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx,
+        void			InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, ImageButton& rBtnFx,
                                         ArgEdit& rEdArg, formula::RefButton& rRefBtn);
 
         void			DelParaArray();
@@ -118,40 +118,40 @@ protected:
         void			SetArgumentText(const String& aText);
 
 
-        void			SetArgName		(USHORT no,const String &aArg);
-        void			SetArgNameFont	(USHORT no,const Font&);
-        void			SetArgVal		(USHORT no,const String &aArg);
+        void			SetArgName		(sal_uInt16 no,const String &aArg);
+        void			SetArgNameFont	(sal_uInt16 no,const Font&);
+        void			SetArgVal		(sal_uInt16 no,const String &aArg);
 
-        void			HideParaLine(USHORT no);
-        void			ShowParaLine(USHORT no);
-        void			UpdateArgDesc( USHORT nArg );
-        void			UpdateArgInput( USHORT nOffset, USHORT i );
+        void			HideParaLine(sal_uInt16 no);
+        void			ShowParaLine(sal_uInt16 no);
+        void			UpdateArgDesc( sal_uInt16 nArg );
+        void			UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i );
 
 public:
                         ScParaWin(ScAnyRefDlg* pParent,Point aPos);
                         ~ScParaWin();
 
         void			SetFunctionDesc(const ScFuncDesc* pFDesc);
-        void			SetArgumentOffset(USHORT nOffset);
+        void			SetArgumentOffset(sal_uInt16 nOffset);
         void	    	SetEditDesc(const String& aText);
         void			UpdateParas();
         void			ClearAll();
 
-        BOOL			IsRefMode() {return bRefMode;}
-        void			SetRefMode(BOOL bFlag) {bRefMode=bFlag;}
+        sal_Bool			IsRefMode() {return bRefMode;}
+        void			SetRefMode(sal_Bool bFlag) {bRefMode=bFlag;}
 
-        USHORT	    	GetActiveLine();
-        void			SetActiveLine(USHORT no);
+        sal_uInt16	    	GetActiveLine();
+        void			SetActiveLine(sal_uInt16 no);
         formula::RefEdit*		GetActiveEdit();
         String			GetActiveArgName();
 
-        String			GetArgument(USHORT no);
-        void			SetArgument(USHORT no, const String& aString);
+        String			GetArgument(sal_uInt16 no);
+        void			SetArgument(sal_uInt16 no, const String& aString);
         void			SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont);
 
-        void			SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen
-        USHORT			GetSliderPos();
-        void			SetSliderPos(USHORT nSliderPos);
+        void			SetEdFocus(sal_uInt16 nEditLine); //Sichtbare Editzeilen
+        sal_uInt16			GetSliderPos();
+        void			SetSliderPos(sal_uInt16 nSliderPos);
 
         void            SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; }
         const Link&     GetScrollHdl() const { return aScrollLink; }
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 096bb53d9..ab5f94b08 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -111,14 +111,14 @@ private:
     const String	aStrRow;
     const String	aStrColumn;
 
-    const USHORT		nWhichQuery;
+    const sal_uInt16		nWhichQuery;
     const ScQueryParam	theQueryData;
     ScQueryItem*		pOutItem;
     ScViewData*			pViewData;
     ScDocument*			pDoc;
     SCTAB				nSrcTab;
 
-    USHORT				nFieldCount;
+    sal_uInt16				nFieldCount;
     ComboBox*			aValueEdArr[3];
     ListBox*			aFieldLbArr[3];
     ListBox*			aCondLbArr[3];
@@ -129,9 +129,9 @@ private:
 private:
     void	Init			( const SfxItemSet&	rArgSet );
     void	FillFieldLists	();
-    void	UpdateValueList	( USHORT nList );
-    void	ClearValueList	( USHORT nList );
-    USHORT	GetFieldSelPos	( SCCOL nField );
+    void	UpdateValueList	( sal_uInt16 nList );
+    void	ClearValueList	( sal_uInt16 nList );
+    sal_uInt16	GetFieldSelPos	( SCCOL nField );
 
     // Handler:
     DECL_LINK( LbSelectHdl, ListBox* );
diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx
index bf26bf085..485f92733 100644
--- a/sc/source/ui/inc/pfuncache.hxx
+++ b/sc/source/ui/inc/pfuncache.hxx
@@ -66,7 +66,7 @@ public:
     void	SetRanges(const ScRangeList& rNew)	{ aRanges = rNew; }
     void    SetOptions(const ScPrintOptions& rNew) { aOptions = rNew; }
 
-    BOOL	operator==(const ScPrintSelectionStatus& rOther) const
+    sal_Bool	operator==(const ScPrintSelectionStatus& rOther) const
             { return eMode == rOther.eMode && aRanges == rOther.aRanges && aOptions == rOther.aOptions; }
 
     ScPrintSelectionMode GetMode() const { return eMode; }
@@ -109,7 +109,7 @@ public:
                                 const ScPrintSelectionStatus& rStatus );
             ~ScPrintFuncCache();
 
-    BOOL	IsSameSelection( const ScPrintSelectionStatus& rStatus ) const;
+    sal_Bool	IsSameSelection( const ScPrintSelectionStatus& rStatus ) const;
 
     void    InitLocations( const ScMarkData& rMark, OutputDevice* pDev );
     bool    FindLocation( const ScAddress& rCell, ScPrintPageLocation& rLocation ) const;
diff --git a/sc/source/ui/inc/pntlock.hxx b/sc/source/ui/inc/pntlock.hxx
index 11afb42fb..755298f72 100644
--- a/sc/source/ui/inc/pntlock.hxx
+++ b/sc/source/ui/inc/pntlock.hxx
@@ -34,32 +34,32 @@ class ScPaintLockData
 {
 private:
     ScRangeListRef	xRangeList;
-    USHORT			nMode;
-    USHORT			nLevel;
-    USHORT			nDocLevel;
-    USHORT			nParts;
-    BOOL			bModified;
+    sal_uInt16			nMode;
+    sal_uInt16			nLevel;
+    sal_uInt16			nDocLevel;
+    sal_uInt16			nParts;
+    sal_Bool			bModified;
 
 public:
-                    ScPaintLockData(USHORT nNewMode);
+                    ScPaintLockData(sal_uInt16 nNewMode);
                     ~ScPaintLockData();
 
-    void			AddRange( const ScRange& rRange, USHORT nP );
+    void			AddRange( const ScRange& rRange, sal_uInt16 nP );
 
-    void			SetModified()	{ bModified = TRUE; }
+    void			SetModified()	{ bModified = sal_True; }
     void			IncLevel(sal_Bool bDoc)
                         { if (bDoc) ++nDocLevel; else ++nLevel; }
     void			DecLevel(sal_Bool bDoc)
                         { if (bDoc) --nDocLevel; else --nLevel; }
 
     const ScRangeListRef&	GetRangeList() const			{ return xRangeList; }
-    USHORT					GetParts() const				{ return nParts; }
-    USHORT					GetLevel(sal_Bool bDoc) const
+    sal_uInt16					GetParts() const				{ return nParts; }
+    sal_uInt16					GetLevel(sal_Bool bDoc) const
                                 { return bDoc ? nDocLevel : nLevel; }
-    BOOL					GetModified() const				{ return bModified; }
+    sal_Bool					GetModified() const				{ return bModified; }
 
                     // fuer Wiederherstellen nach Reset
-    void			SetLevel(USHORT nNew, sal_Bool bDoc)
+    void			SetLevel(sal_uInt16 nNew, sal_Bool bDoc)
                         { if (bDoc) nDocLevel = nNew; else nLevel = nNew; }
 };
 
diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx
index e4c611f52..125af76e6 100644
--- a/sc/source/ui/inc/popmenu.hxx
+++ b/sc/source/ui/inc/popmenu.hxx
@@ -36,15 +36,15 @@
 class SC_DLLPUBLIC ScPopupMenu : public PopupMenu
 {
 private:
-    USHORT	nSel;
-    BOOL	bHit;
+    sal_uInt16	nSel;
+    sal_Bool	bHit;
 protected:
     virtual void Select();
 public:
-    ScPopupMenu() : nSel(0),bHit(FALSE) {}
-    ScPopupMenu(const ResId& rRes) : PopupMenu(rRes),nSel(0),bHit(FALSE) {}
-    USHORT	GetSelected() const { return nSel; }
-    BOOL	WasHit() const		{ return bHit; }
+    ScPopupMenu() : nSel(0),bHit(sal_False) {}
+    ScPopupMenu(const ResId& rRes) : PopupMenu(rRes),nSel(0),bHit(sal_False) {}
+    sal_uInt16	GetSelected() const { return nSel; }
+    sal_Bool	WasHit() const		{ return bHit; }
 };
 
 
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 51370b605..f82ffc55d 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -40,11 +40,11 @@ class ScPreview : public Window
 private:
                                         // eingestellt:
     long			nPageNo;			// Seite im Dokument
-    USHORT			nZoom;				// eingestellter Zoom
+    sal_uInt16			nZoom;				// eingestellter Zoom
     Point			aOffset;			// positiv
 
                                         // berechnet:
-    BOOL			bValid;				// folgende Werte gueltig
+    sal_Bool			bValid;				// folgende Werte gueltig
     SCTAB			nTabCount;
     SCTAB			nTabsTested;		// fuer wieviele Tabellen ist nPages gueltig?
     long			nPages[MAXTABCOUNT];
@@ -57,33 +57,33 @@ private:
     Time			aTime;
     long			nTotalPages;
     Size			aPageSize;			// fuer GetOptimalZoom
-    BOOL			bStateValid;
-    BOOL			bLocationValid;
+    sal_Bool			bStateValid;
+    sal_Bool			bLocationValid;
     ScPrintState	aState;
     ScPreviewLocationData* pLocationData;	// stores table layout for accessibility API
     FmFormView*		pDrawView;
 
                                         // intern:
-    BOOL			bInPaint;
-    BOOL			bInGetState;
+    sal_Bool			bInPaint;
+    sal_Bool			bInGetState;
     ScDocShell*		pDocShell;
     ScPreviewShell*	pViewShell;
 
-    BOOL            bLeftRulerMove;
-    BOOL            bRightRulerMove;
-    BOOL            bTopRulerMove;
-    BOOL            bBottomRulerMove;
-    BOOL            bHeaderRulerMove;
-    BOOL            bFooterRulerMove;
+    sal_Bool            bLeftRulerMove;
+    sal_Bool            bRightRulerMove;
+    sal_Bool            bTopRulerMove;
+    sal_Bool            bBottomRulerMove;
+    sal_Bool            bHeaderRulerMove;
+    sal_Bool            bFooterRulerMove;
     
-    BOOL            bLeftRulerChange;
-    BOOL            bRightRulerChange;
-    BOOL            bTopRulerChange;
-    BOOL            bBottomRulerChange;
-    BOOL            bHeaderRulerChange;
-    BOOL            bFooterRulerChange;
-    BOOL            bPageMargin;
-    BOOL            bColRulerMove;
+    sal_Bool            bLeftRulerChange;
+    sal_Bool            bRightRulerChange;
+    sal_Bool            bTopRulerChange;
+    sal_Bool            bBottomRulerChange;
+    sal_Bool            bHeaderRulerChange;
+    sal_Bool            bFooterRulerChange;
+    sal_Bool            bPageMargin;
+    sal_Bool            bColRulerMove;
     ScRange         aPageArea;
     long            nRight[ MAXCOL+1 ];
     long            nLeftPosition;
@@ -101,7 +101,7 @@ private:
     void	UpdateDrawView();
     void	DoPrint( ScPreviewLocationData* pFillLocation );
 
-    void	InvalidateLocationData( ULONG nId );
+    void	InvalidateLocationData( sal_uLong nId );
 
     using Window::SetZoom;
 
@@ -124,18 +124,18 @@ public:
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
 
-    void	DataChanged(BOOL bNewTime = FALSE);				// statt Invalidate rufen
+    void	DataChanged(sal_Bool bNewTime = sal_False);				// statt Invalidate rufen
     void	DoInvalidate();
 
     void	SetXOffset( long nX );
     void	SetYOffset( long nY );
-    void	SetZoom(USHORT nNewZoom);
+    void	SetZoom(sal_uInt16 nNewZoom);
     void	SetPageNo( long nPage );
 
-    BOOL    GetPageMargins()const { return bPageMargin; }
-    void    SetPageMargins( BOOL bVal )  { bPageMargin = bVal; }
-    void    DrawInvert( long nDragPos, USHORT nFlags );
-    void    DragMove( long nDragMovePos, USHORT nFlags );
+    sal_Bool    GetPageMargins()const { return bPageMargin; }
+    void    SetPageMargins( sal_Bool bVal )  { bPageMargin = bVal; }
+    void    DrawInvert( long nDragPos, sal_uInt16 nFlags );
+    void    DragMove( long nDragMovePos, sal_uInt16 nFlags );
 
 
     const ScPreviewLocationData& GetLocationData();
@@ -143,19 +143,19 @@ public:
     String	GetPosString();
 
     long	GetPageNo() const	{ return nPageNo; }
-    USHORT	GetZoom() const		{ return nZoom; }
+    sal_uInt16	GetZoom() const		{ return nZoom; }
     Point	GetOffset() const	{ return aOffset; }
 
     SCTAB	GetTab()			{ if (!bValid) { CalcPages(0); RecalcPages(); } return nTab; }
     long	GetTotalPages()		{ if (!bValid) { CalcPages(0); RecalcPages(); } return nTotalPages; }
 
-    BOOL	AllTested() const	{ return bValid && nTabsTested >= nTabCount; }
+    sal_Bool	AllTested() const	{ return bValid && nTabsTested >= nTabCount; }
 
-    USHORT	GetOptimalZoom(BOOL bWidthOnly);
+    sal_uInt16	GetOptimalZoom(sal_Bool bWidthOnly);
     long	GetFirstPage(SCTAB nTab);
 
     void	CalcAll()			{ CalcPages(MAXTAB); }
-    void	SetInGetState(BOOL bSet) { bInGetState = bSet; }
+    void	SetInGetState(sal_Bool bSet) { bInGetState = bSet; }
 
     DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* );
     static void StaticInvalidate();
diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx
index 1e34d96d7..ab0826c7a 100644
--- a/sc/source/ui/inc/prevloc.hxx
+++ b/sc/source/ui/inc/prevloc.hxx
@@ -50,12 +50,12 @@ class ScDocument;
 
 struct ScPreviewColRowInfo
 {
-    BOOL	bIsHeader;
+    sal_Bool	bIsHeader;
     SCCOLROW    nDocIndex;
     long	nPixelStart;
     long	nPixelEnd;
 
-    void Set( BOOL bHeader, SCCOLROW nIndex, long nStart, long nEnd )
+    void Set( sal_Bool bHeader, SCCOLROW nIndex, long nStart, long nEnd )
     {
         bIsHeader   = bHeader;
         nDocIndex   = nIndex;
@@ -97,7 +97,7 @@ class ScPreviewLocationData
     MapMode		aDrawMapMode[SC_PREVIEW_MAXRANGES];
     Rectangle	aDrawRectangle[SC_PREVIEW_MAXRANGES];
         sal_uInt8   	aDrawRangeId[SC_PREVIEW_MAXRANGES];
-    USHORT		nDrawRanges;
+    sal_uInt16		nDrawRanges;
     SCTAB		nPrintTab;
     List		aEntries;
 
@@ -111,11 +111,11 @@ public:
     void	SetCellMapMode( const MapMode& rMapMode );
     void	SetPrintTab( SCTAB nNew );
     void	Clear();
-    void	AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow,
+    void	AddCellRange( const Rectangle& rRect, const ScRange& rRange, sal_Bool bRepCol, sal_Bool bRepRow,
                             const MapMode& rDrawMap );
-    void	AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol );
-    void	AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow );
-    void	AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft );
+    void	AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, sal_Bool bRepCol );
+    void	AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, sal_Bool bRepRow );
+    void	AddHeaderFooter( const Rectangle& rRect, sal_Bool bHeader, sal_Bool bLeft );
     void	AddNoteMark( const Rectangle& rRect, const ScAddress& rPos );
     void	AddNoteText( const Rectangle& rRect, const ScAddress& rPos );
 
@@ -124,24 +124,24 @@ public:
     //	Get info on visible columns/rows in the visible area
     void	GetTableInfo( const Rectangle& rVisiblePixel, ScPreviewTableInfo& rInfo ) const;
 
-    USHORT	GetDrawRanges() const	{ return nDrawRanges; }
-    void	GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const;
+    sal_uInt16	GetDrawRanges() const	{ return nDrawRanges; }
+    void	GetDrawRange( sal_uInt16 nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const;
 
-    BOOL	GetHeaderPosition( Rectangle& rHeaderRect ) const;
-    BOOL	GetFooterPosition( Rectangle& rFooterRect ) const;
-    BOOL	IsHeaderLeft() const;
-    BOOL	IsFooterLeft() const;
+    sal_Bool	GetHeaderPosition( Rectangle& rHeaderRect ) const;
+    sal_Bool	GetFooterPosition( Rectangle& rFooterRect ) const;
+    sal_Bool	IsHeaderLeft() const;
+    sal_Bool	IsFooterLeft() const;
 
-    long	GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const;
-    BOOL	GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks,
+    long	GetNoteCountInRange( const Rectangle& rVisiblePixel, sal_Bool bNoteMarks ) const;
+    sal_Bool	GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, sal_Bool bNoteMarks,
                             ScAddress& rCellPos, Rectangle& rNoteRect ) const;
-    Rectangle GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks, 
+    Rectangle GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, sal_Bool bNoteMarks, 
                             const ScAddress& aCellPos) const;
 
     //	Check if any cells (including column/row headers) are in the visible area
-    BOOL	HasCellsInRange( const Rectangle& rVisiblePixel ) const;
+    sal_Bool	HasCellsInRange( const Rectangle& rVisiblePixel ) const;
 
-    BOOL	GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const;
+    sal_Bool	GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const;
 
     // returns the rectangle where the EditEngine draws the text of a Header Cell
     // if bColHeader is true it returns the rectangle of the header of the column in rCellPos
@@ -150,8 +150,8 @@ public:
     Rectangle GetCellOutputRect(const ScAddress& rCellPos) const;
 
     // Query the range and rectangle of the main (non-repeat) cell range.
-    // Returns FALSE if not contained.
-    BOOL    GetMainCellRange( ScRange& rRange, Rectangle& rPixRect ) const;
+    // Returns sal_False if not contained.
+    sal_Bool    GetMainCellRange( ScRange& rRange, Rectangle& rPixRect ) const;
 };
 
 #endif
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 9fe815b02..786200c2a 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -57,7 +57,7 @@ class ScPreviewShell: public SfxViewShell
     Window*			pCorner;
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData;  // ViewData
-    BYTE			nSourceDesignMode;		// form design mode from TabView
+    sal_uInt8			nSourceDesignMode;		// form design mode from TabView
     SvxZoomType		eZoom;
     long            nMaxVertPos;
 
@@ -66,11 +66,11 @@ class ScPreviewShell: public SfxViewShell
 private:
     void			Construct( Window* pParent );
     DECL_LINK(ScrollHandler, ScrollBar* );
-    void			DoScroll( USHORT nMode );
+    void			DoScroll( sal_uInt16 nMode );
 
 protected:
-    virtual void	Activate(BOOL bMDI);
-    virtual void	Deactivate(BOOL bMDI);
+    virtual void	Activate(sal_Bool bMDI);
+    virtual void	Deactivate(sal_Bool bMDI);
 
     virtual void	AdjustPosSizePixel( const Point &rPos, const Size &rSize );
 
@@ -81,8 +81,8 @@ protected:
 
     virtual String  GetDescription() const;
 
-    virtual void	WriteUserData(String &, BOOL bBrowse = FALSE);
-    virtual void	ReadUserData(const String &, BOOL bBrowse = FALSE);
+    virtual void	WriteUserData(String &, sal_Bool bBrowse = sal_False);
+    virtual void	ReadUserData(const String &, sal_Bool bBrowse = sal_False);
 
     virtual void    WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
     virtual void    ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
@@ -101,7 +101,7 @@ public:
     void			InitStartTable(SCTAB nTab);
 
     void			UpdateScrollBars();
-    BOOL			ScrollCommand( const CommandEvent& rCEvt );
+    sal_Bool			ScrollCommand( const CommandEvent& rCEvt );
 
     void			Execute( SfxRequest& rReq );
     void			GetState( SfxItemSet& rSet );
@@ -110,18 +110,18 @@ public:
 
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >
                     GetSourceData() const       { return aSourceData; }
-    BYTE			GetSourceDesignMode() const	{ return nSourceDesignMode; }
+    sal_uInt8			GetSourceDesignMode() const	{ return nSourceDesignMode; }
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-    virtual SfxPrinter*		GetPrinter( BOOL bCreate = FALSE );
-    virtual USHORT          SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+    virtual SfxPrinter*		GetPrinter( sal_Bool bCreate = sal_False );
+    virtual sal_uInt16          SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
     virtual SfxTabPage*     CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
 
     void	AddAccessibilityObject( SfxListener& rObject );
     void	RemoveAccessibilityObject( SfxListener& rObject );
     void	BroadcastAccessibility( const SfxHint &rHint );
-    BOOL	HasAccessibilityObjects();
+    sal_Bool	HasAccessibilityObjects();
 
     const ScPreviewLocationData& GetLocationData();
     ScDocument*		GetDocument();
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index a4cb1645f..f69baa971 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -64,14 +64,14 @@ class FmFormView;
                                             //	Einstellungen fuer Kopf-/Fusszeilen
 struct ScPrintHFParam
 {
-    BOOL				bEnable;
-    BOOL				bDynamic;
-    BOOL				bShared;
+    sal_Bool				bEnable;
+    sal_Bool				bDynamic;
+    sal_Bool				bShared;
     long				nHeight;			//	insgesamt (Hoehe+Abstand+Rahmen)
     long				nManHeight;			//	eingestellte Groesse (Min. bei dynamisch)
-    USHORT				nDistance;
-    USHORT				nLeft;				//	Raender
-    USHORT				nRight;
+    sal_uInt16				nDistance;
+    sal_uInt16				nLeft;				//	Raender
+    sal_uInt16				nRight;
     const ScPageHFItem* pLeft;
     const ScPageHFItem* pRight;
     const SvxBoxItem*	pBorder;
@@ -91,7 +91,7 @@ public:
     MapMode		aUserMapMode;
     Paper	ePaper;
     Orientation eOrientation;
-    USHORT		nPaperBin;
+    sal_uInt16		nPaperBin;
 };
 
 struct ScPrintState							//	Variablen aus ScPrintFunc retten
@@ -101,7 +101,7 @@ struct ScPrintState							//	Variablen aus ScPrintFunc retten
     SCROW	nStartRow;
     SCCOL	nEndCol;
     SCROW	nEndRow;
-    USHORT	nZoom;
+    sal_uInt16	nZoom;
     size_t	nPagesX;
     size_t	nPagesY;
     long	nTabPages;
@@ -116,7 +116,7 @@ private:
     SCROW	nStartRow;
     SCROW	nEndRow;
     size_t	nPagesX;
-    BOOL*	pHidden;
+    sal_Bool*	pHidden;
     //!		Anzahl wirklich sichtbarer cachen???
 
 public:
@@ -134,7 +134,7 @@ public:
 
     void	SetPagesX(size_t nNew);
     void	SetHidden(size_t nX);
-    BOOL	IsHidden(size_t nX) const;
+    sal_Bool	IsHidden(size_t nX) const;
 
     size_t	CountVisible() const;
 };
@@ -152,10 +152,10 @@ private:
 
     Point				aSrcOffset;			//	Papier-1/100 mm
     Point				aOffset;			//	mit Faktor aus Seitenformat skaliert
-    USHORT				nManualZoom;		//	Zoom in Preview (Prozent)
-    BOOL				bClearWin;			//	Ausgabe vorher loeschen
-    BOOL				bUseStyleColor;
-    BOOL				bIsRender;
+    sal_uInt16				nManualZoom;		//	Zoom in Preview (Prozent)
+    sal_Bool				bClearWin;			//	Ausgabe vorher loeschen
+    sal_Bool				bUseStyleColor;
+    sal_Bool				bIsRender;
 
     SCTAB				nPrintTab;
     long				nPageStart;			//	Offset fuer erste Seite
@@ -164,19 +164,19 @@ private:
     const ScRange*		pUserArea;			//	Selektion, wenn im Dialog eingestellt
 
     const SfxItemSet*	pParamSet;			//	eingestellte Vorlage
-    BOOL				bState;				//	aus State-struct erzeugt
+    sal_Bool				bState;				//	aus State-struct erzeugt
 
                                             //	Parameter aus Vorlage:
-    USHORT				nLeftMargin;
-    USHORT				nTopMargin;
-    USHORT				nRightMargin;
-    USHORT				nBottomMargin;
-    BOOL				bCenterHor;
-    BOOL				bCenterVer;
-    BOOL				bLandscape;
-    BOOL				bSourceRangeValid;
-
-    USHORT				nPageUsage;
+    sal_uInt16				nLeftMargin;
+    sal_uInt16				nTopMargin;
+    sal_uInt16				nRightMargin;
+    sal_uInt16				nBottomMargin;
+    sal_Bool				bCenterHor;
+    sal_Bool				bCenterVer;
+    sal_Bool				bLandscape;
+    sal_Bool				bSourceRangeValid;
+
+    sal_uInt16				nPageUsage;
     Size				aPageSize;			//	Drucker-Twips
     const SvxBoxItem*	pBorderItem;
     const SvxBrushItem* pBackgroundItem;
@@ -189,9 +189,9 @@ private:
     ScPageAreaParam 	aAreaParam;
 
                                             //	berechnete Werte:
-    USHORT				nZoom;
-    BOOL				bPrintCurrentTable;
-    BOOL				bMultiArea;
+    sal_uInt16				nZoom;
+    sal_Bool				bPrintCurrentTable;
+    sal_Bool				bMultiArea;
     long				nTabPages;
     long				nTotalPages;
 
@@ -258,27 +258,27 @@ public:
                     ~ScPrintFunc();
 
     static void 	DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double nPrintFactor,
-                                const Rectangle& rBound, ScViewData* pViewData, BOOL bMetaFile );
+                                const Rectangle& rBound, ScViewData* pViewData, sal_Bool bMetaFile );
 
     void			SetDrawView( FmFormView* pNew );
 
     void			SetOffset( const Point& rOfs );
-    void			SetManualZoom( USHORT nNewZoom );
+    void			SetManualZoom( sal_uInt16 nNewZoom );
     void			SetDateTime( const Date& rDate, const Time& rTime );
 
-    void			SetClearFlag( BOOL bFlag );
-    void			SetUseStyleColor( BOOL bFlag );
-    void			SetRenderFlag( BOOL bFlag );
+    void			SetClearFlag( sal_Bool bFlag );
+    void			SetUseStyleColor( sal_Bool bFlag );
+    void			SetRenderFlag( sal_Bool bFlag );
 
     void            SetExclusivelyDrawOleAndDrawObjects();//for printing selected objects without surrounding cell contents
 
-    BOOL			UpdatePages();
+    sal_Bool			UpdatePages();
 
     void			ApplyPrintSettings();		// aus DoPrint() schon gerufen
     long			DoPrint( const MultiSelection& rPageRanges,
-                                /*long nStartPage, long nDisplayStart, BOOL bDoPrint,
+                                /*long nStartPage, long nDisplayStart, sal_Bool bDoPrint,
                                 SfxProgress* pProgress, ScPreviewLocationData* pLocationData );*/
-                                long nStartPage, long nDisplayStart, BOOL bDoPrint = TRUE,
+                                long nStartPage, long nDisplayStart, sal_Bool bDoPrint = sal_True,
                                 SfxProgress* pProgress = NULL, ScPreviewLocationData* pLocationData = NULL);
 
                     //	Werte abfragen - sofort
@@ -293,32 +293,32 @@ public:
     double			GetScaleX() const { return nScaleX; }
     double			GetScaleY() const { return nScaleY; }
     long			GetTotalPages() const { return nTotalPages; }
-    USHORT			GetZoom() const { return nZoom; }
+    sal_uInt16			GetZoom() const { return nZoom; }
 
     void			ResetBreaks( SCTAB nTab );
 
     void			GetPrintState( ScPrintState& rState );
-    BOOL			GetLastSourceRange( ScRange& rRange ) const;
-    USHORT          GetLeftMargin() const{return nLeftMargin;}
-    USHORT          GetRightMargin() const{return nRightMargin;}
-    USHORT          GetTopMargin() const{return nTopMargin;}
-    USHORT          GetBottomMargin() const{return nBottomMargin;}
-    void            SetLeftMargin(USHORT nRulerLeftDistance){ nLeftMargin = nRulerLeftDistance; }
-    void            SetRightMargin(USHORT nRulerRightDistance){ nRightMargin = nRulerRightDistance; }
-    void            SetTopMargin(USHORT nRulerTopDistance){ nTopMargin = nRulerTopDistance; }
-    void            SetBottomMargin(USHORT nRulerBottomDistance){ nBottomMargin = nRulerBottomDistance; }
+    sal_Bool			GetLastSourceRange( ScRange& rRange ) const;
+    sal_uInt16          GetLeftMargin() const{return nLeftMargin;}
+    sal_uInt16          GetRightMargin() const{return nRightMargin;}
+    sal_uInt16          GetTopMargin() const{return nTopMargin;}
+    sal_uInt16          GetBottomMargin() const{return nBottomMargin;}
+    void            SetLeftMargin(sal_uInt16 nRulerLeftDistance){ nLeftMargin = nRulerLeftDistance; }
+    void            SetRightMargin(sal_uInt16 nRulerRightDistance){ nRightMargin = nRulerRightDistance; }
+    void            SetTopMargin(sal_uInt16 nRulerTopDistance){ nTopMargin = nRulerTopDistance; }
+    void            SetBottomMargin(sal_uInt16 nRulerBottomDistance){ nBottomMargin = nRulerBottomDistance; }
     ScPrintHFParam  GetHeader(){return aHdr;}
     ScPrintHFParam  GetFooter(){return aFtr;}
 
 private:
     void			Construct( const ScPrintOptions* pOptions );
     void			InitParam( const ScPrintOptions* pOptions );
-    void			CalcZoom( USHORT nRangeNo );
+    void			CalcZoom( sal_uInt16 nRangeNo );
     void			CalcPages();
     long			CountPages();
     long			CountNotePages();
 
-    BOOL			AdjustPrintArea( BOOL bNew );
+    sal_Bool			AdjustPrintArea( sal_Bool bNew );
 
     Size			GetDocPageSize();
 
@@ -328,31 +328,31 @@ private:
 
     void			InitModes();
 
-    BOOL			IsLeft( long nPageNo );
-    BOOL			IsMirror( long nPageNo );
+    sal_Bool			IsLeft( long nPageNo );
+    sal_Bool			IsMirror( long nPageNo );
     void			ReplaceFields( long nPageNo );		// aendert Text in pEditEngine
     void			MakeTableString();				 	// setzt aTableStr
 
     void			PrintPage( long nPageNo,
                                     SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
-                                    BOOL bDoPrint, ScPreviewLocationData* pLocationData );
+                                    sal_Bool bDoPrint, ScPreviewLocationData* pLocationData );
     void			PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                                     long nScrX, long nScrY,
-                                    BOOL bShLeft, BOOL bShTop, BOOL bShRight, BOOL bShBottom );
+                                    sal_Bool bShLeft, sal_Bool bShTop, sal_Bool bShRight, sal_Bool bShBottom );
     void			LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
-                                    long nScrX, long nScrY, BOOL bRepCol, BOOL bRepRow,
+                                    long nScrX, long nScrY, sal_Bool bRepCol, sal_Bool bRepRow,
                                     ScPreviewLocationData& rLocationData );
     void			PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY );
     void			PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY );
     void			LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY,
-                                BOOL bRepCol, ScPreviewLocationData& rLocationData );
+                                sal_Bool bRepCol, ScPreviewLocationData& rLocationData );
     void			LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY,
-                                BOOL bRepRow, ScPreviewLocationData& rLocationData );
-    void			PrintHF( long nPageNo, BOOL bHeader, long nStartY,
-                                    BOOL bDoPrint, ScPreviewLocationData* pLocationData );
+                                sal_Bool bRepRow, ScPreviewLocationData& rLocationData );
+    void			PrintHF( long nPageNo, sal_Bool bHeader, long nStartY,
+                                    sal_Bool bDoPrint, ScPreviewLocationData* pLocationData );
 
-    long			PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData );
-    long			DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData );
+    long			PrintNotes( long nPageNo, long nNoteStart, sal_Bool bDoPrint, ScPreviewLocationData* pLocationData );
+    long			DoNotes( long nNoteStart, sal_Bool bDoPrint, ScPreviewLocationData* pLocationData );
 
     void			DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
                                     const SvxBoxItem* pBorderData,
diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx
index 369db1191..487d79b47 100644
--- a/sc/source/ui/inc/privsplt.hxx
+++ b/sc/source/ui/inc/privsplt.hxx
@@ -37,7 +37,7 @@ class ScPrivatSplit : public Control
     private:
 
         Link				aCtrModifiedLink;
-        BOOL				aMovingFlag;
+        sal_Bool				aMovingFlag;
         Pointer				aWinPointer;
         SC_SPLIT_DIRECTION	eScSplit;
         short				nOldX;
@@ -52,7 +52,7 @@ class ScPrivatSplit : public Control
         short				nDeltaY;
 
         using Control::ImplInitSettings;
-        void				ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        void				ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
 
 
 
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 2c813cc36..36070ed35 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -67,8 +67,8 @@ class ScDPFunctionListBox : public MultiListBox
 public:
     explicit            ScDPFunctionListBox( Window* pParent, const ResId& rResId );
 
-    void                SetSelection( USHORT nFuncMask );
-    USHORT              GetSelection() const;
+    void                SetSelection( sal_uInt16 nFuncMask );
+    sal_uInt16              GetSelection() const;
 
 private:
     void                FillFunctionNames();
@@ -82,7 +82,7 @@ public:
     explicit            ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVec& rLabelVec,
                             const ScDPLabelData& rLabelData, const ScDPFuncData& rFuncData );
 
-    USHORT              GetFuncMask() const;
+    sal_uInt16              GetFuncMask() const;
     ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const;
 
 private:
@@ -123,7 +123,7 @@ public:
                             const ScDPLabelData& rLabelData, const ScDPFuncData& rFuncData,
                             const ScDPNameVec& rDataFields, bool bEnableLayout );
 
-    USHORT              GetFuncMask() const;
+    sal_uInt16              GetFuncMask() const;
 
     void                FillLabelData( ScDPLabelData& rLabelData ) const;
 
@@ -212,7 +212,7 @@ private:
 class ScDPShowDetailDlg : public ModalDialog
 {
 public:
-    explicit            ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHORT nOrient );
+    explicit            ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient );
 
     virtual short       Execute();
 
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index b7d3e52e9..e135998b9 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -91,19 +91,19 @@ public:
     virtual                 ~ScDPLayoutDlg();
 
     virtual void            SetReference( const ScRange& rRef, ScDocument* pDoc );
-    virtual BOOL            IsRefInputMode() const { return bRefInputMode; }
+    virtual sal_Bool            IsRefInputMode() const { return bRefInputMode; }
     virtual void            SetActive();
-    virtual BOOL            Close();
+    virtual sal_Bool            Close();
     virtual void            StateChanged( StateChangedType nStateChange );
 
     void                    NotifyDoubleClick    ( ScDPFieldType eType, size_t nFieldIndex );
     PointerStyle            NotifyMouseButtonDown( ScDPFieldType eType, size_t nFieldIndex );
     void                    NotifyMouseButtonUp  ( const Point& rAt );
     PointerStyle            NotifyMouseMove      ( const Point& rAt );
-    void                    NotifyFieldFocus     ( ScDPFieldType eType, BOOL bGotFocus );
+    void                    NotifyFieldFocus     ( ScDPFieldType eType, sal_Bool bGotFocus );
     void                    NotifyMoveField      ( ScDPFieldType eToType );
     void                    NotifyRemoveField    ( ScDPFieldType eType, size_t nFieldIndex );
-    BOOL                    NotifyMoveSlider     ( USHORT nKeyCode );   // return TRUE, if position changed
+    sal_Bool                    NotifyMoveSlider     ( sal_uInt16 nKeyCode );   // return sal_True, if position changed
 
 protected:
     virtual void            Deactivate();
@@ -159,7 +159,7 @@ private:
 
     ScDPFieldType           eDnDFromType;
     size_t                  nDnDFromIndex;
-    BOOL                    bIsDrag;
+    sal_Bool                    bIsDrag;
 
     ::formula::RefEdit*     pEditActive;
 
@@ -185,7 +185,7 @@ private:
     ScPivotParam            thePivotData;
     ScViewData*             pViewData;
     ScDocument*             pDoc;
-    BOOL                    bRefInputMode;
+    sal_Bool                    bRefInputMode;
 
 private:
     ScDPFieldWindow&        GetFieldWindow  ( ScDPFieldType eType );
@@ -199,8 +199,8 @@ private:
     ScDPLabelData*          GetLabelData    ( SCsCOL nCol, size_t* pPos = NULL );
     String                  GetLabelString  ( SCsCOL nCol );
     bool                    IsOrientationAllowed( SCsCOL nCol, ScDPFieldType eType );
-    String                  GetFuncString   ( USHORT& rFuncMask, BOOL bIsValue = TRUE );
-    BOOL                    Contains        ( ScDPFuncDataVec* pArr, SCsCOL nCol, size_t& nAt );
+    String                  GetFuncString   ( sal_uInt16& rFuncMask, sal_Bool bIsValue = sal_True );
+    sal_Bool                    Contains        ( ScDPFuncDataVec* pArr, SCsCOL nCol, size_t& nAt );
     void                    Remove          ( ScDPFuncDataVec* pArr, size_t nAt );
     void                    Insert          ( ScDPFuncDataVec* pArr, const ScDPFuncData& rFData, size_t nAt );
 
@@ -210,14 +210,14 @@ private:
                                               ScDPFieldType eToType, const Point&  rAtPos );
     void                    RemoveField     ( ScDPFieldType eRemType, size_t nRemIndex );
 
-    BOOL                    GetPivotArrays  ( PivotField*   pPageArr,
+    sal_Bool                    GetPivotArrays  ( PivotField*   pPageArr,
                                               PivotField*   pColArr,
                                               PivotField*   pRowArr,
                                               PivotField*   pDataArr,
-                                              USHORT&       rPageCount,
-                                              USHORT&       rColCount,
-                                              USHORT&       rRowCount,
-                                              USHORT&       rDataCount );
+                                              sal_uInt16&       rPageCount,
+                                              sal_uInt16&       rColCount,
+                                              sal_uInt16&       rRowCount,
+                                              sal_uInt16&       rDataCount );
 
     void                    UpdateSrcRange();
 
diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx
index e4613d874..ae2bb159f 100644
--- a/sc/source/ui/inc/redcom.hxx
+++ b/sc/source/ui/inc/redcom.hxx
@@ -60,7 +60,7 @@ protected:
 public:
 
     ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet,
-                    ScDocShell *,ScChangeAction *,BOOL bPrevNext = FALSE);
+                    ScDocShell *,ScChangeAction *,sal_Bool bPrevNext = sal_False);
     ~ScRedComDialog();
 
     short Execute();
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 79c15d2d5..7869d0796 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -36,7 +36,7 @@
     class Class : public SfxChildWindow											\
     {																			\
     public:																		\
-        Class( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );				\
+        Class( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );				\
         SFX_DECL_CHILDWINDOW(Class);											\
     };
 
@@ -68,7 +68,7 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow
 {
     public:
         ScAcceptChgDlgWrapper(	Window*,
-                                USHORT,
+                                sal_uInt16,
                                 SfxBindings*,
                                 SfxChildWinInfo* );
 
@@ -81,20 +81,20 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
 {
     public:
         ScSimpleRefDlgWrapper(	Window*,
-                                USHORT,
+                                sal_uInt16,
                                 SfxBindings*,
                                 SfxChildWinInfo* );
 
         SFX_DECL_CHILDWINDOW(Class);
 
-        static void		SetDefaultPosSize(Point aPos, Size aSize, BOOL bSet=TRUE);
+        static void		SetDefaultPosSize(Point aPos, Size aSize, sal_Bool bSet=sal_True);
         virtual String	GetRefString();
         virtual void	SetRefString(const String& rStr);
         void			SetCloseHdl( const Link& rLink );
         void			SetUnoLinks( const Link& rDone, const Link& rAbort,
                                         const Link& rChange );
-        void            SetFlags( BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection );
-        static void		SetAutoReOpen(BOOL bFlag);
+        void            SetFlags( sal_Bool bCloseOnButtonUp, sal_Bool bSingleCell, sal_Bool bMultiSelection );
+        static void		SetAutoReOpen(sal_Bool bFlag);
 
         void			StartRefInput();
 };
@@ -106,13 +106,13 @@ class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow
     bool	m_bFreeWindowLock:1;
     Window * m_pSavedWndParent;
 public:	
-    ScValidityRefChildWin( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+    ScValidityRefChildWin( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
     SFX_DECL_CHILDWINDOW(ScValidityRefChildWin);									
     ~ScValidityRefChildWin();
     bool	LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; }
     bool	LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; }
     void				Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); }
-    void                Show( USHORT nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); }
+    void                Show( sal_uInt16 nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); }
 };
 //-->Added by PengYunQuan for Validity Cell Range Picker
 
diff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxx
index 668adbe07..629588eb4 100644
--- a/sc/source/ui/inc/refundo.hxx
+++ b/sc/source/ui/inc/refundo.hxx
@@ -60,7 +60,7 @@ public:
                 ~ScRefUndoData();
 
     void		DeleteUnchanged( const ScDocument* pDoc );
-    void		DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst );
+    void		DoUndo( ScDocument* pDoc, sal_Bool bUndoRefFirst );
 };
 
 
diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
index 6f9aa0d73..31a692697 100644
--- a/sc/source/ui/inc/rfindlst.hxx
+++ b/sc/source/ui/inc/rfindlst.hxx
@@ -37,11 +37,11 @@
 struct ScRangeFindData
 {
     ScRange		aRef;
-    USHORT		nFlags;
+    sal_uInt16		nFlags;
     xub_StrLen	nSelStart;
     xub_StrLen	nSelEnd;
 
-    ScRangeFindData( const ScRange& rR, USHORT nF, xub_StrLen nS, xub_StrLen nE ) :
+    ScRangeFindData( const ScRange& rR, sal_uInt16 nF, xub_StrLen nS, xub_StrLen nE ) :
         aRef(rR), nFlags(nF), nSelStart(nS), nSelEnd(nE) {}
 };
 
@@ -49,23 +49,23 @@ class ScRangeFindList
 {
     List		aEntries;
     String		aDocName;
-    BOOL		bHidden;
+    sal_Bool		bHidden;
 
 public:
             ScRangeFindList(const String& rName);
             ~ScRangeFindList();
 
-    ULONG	Count() const						{ return aEntries.Count(); }
+    sal_uLong	Count() const						{ return aEntries.Count(); }
     void	Insert( ScRangeFindData* pNew )		{ aEntries.Insert(pNew, LIST_APPEND); }
-    ScRangeFindData* GetObject( ULONG nIndex ) const
+    ScRangeFindData* GetObject( sal_uLong nIndex ) const
                         { return (ScRangeFindData*)aEntries.GetObject(nIndex); }
 
-    void	SetHidden( BOOL bSet )				{ bHidden = bSet; }
+    void	SetHidden( sal_Bool bSet )				{ bHidden = bSet; }
 
     const String&	GetDocName() const			{ return aDocName; }
-    BOOL			IsHidden() const			{ return bHidden; }
+    sal_Bool			IsHidden() const			{ return bHidden; }
 
-    static ColorData GetColorName( USHORT nIndex );
+    static ColorData GetColorName( sal_uInt16 nIndex );
 };
 
 
diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx
index a1ca9c38b..b34659d1f 100644
--- a/sc/source/ui/inc/scendlg.hxx
+++ b/sc/source/ui/inc/scendlg.hxx
@@ -41,14 +41,14 @@
 class ScNewScenarioDlg : public ModalDialog
 {
 public:
-        ScNewScenarioDlg( Window* pParent, const String& rName, BOOL bEdit = FALSE, BOOL bSheetProtected = FALSE );
+        ScNewScenarioDlg( Window* pParent, const String& rName, sal_Bool bEdit = sal_False, sal_Bool bSheetProtected = sal_False );
         ~ScNewScenarioDlg();
 
     void SetScenarioData( const String& rName, const String& rComment,
-                            const Color& rColor, USHORT nFlags );
+                            const Color& rColor, sal_uInt16 nFlags );
 
     void GetScenarioData( String& rName, String& rComment,
-                            Color& rColor, USHORT& rFlags ) const;
+                            Color& rColor, sal_uInt16& rFlags ) const;
 
 private:
     FixedLine           aFlName;
@@ -68,7 +68,7 @@ private:
     CancelButton		aBtnCancel;
     HelpButton			aBtnHelp;
     const String		aDefScenarioName;
-    BOOL				bIsEdit;
+    sal_Bool				bIsEdit;
 
     DECL_LINK( OkHdl, OKButton * );
     DECL_LINK( EnableHdl, CheckBox * );
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index b89e7aeea..98a3792eb 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -39,9 +39,9 @@
 class ScImportAsciiDlg : public ModalDialog
 {
     SvStream*                   mpDatStream;
-    ULONG                       mnStreamPos;
-    ULONG*                      mpRowPosArray;
-    ULONG                       mnRowPosCount;
+    sal_uLong                       mnStreamPos;
+    sal_uLong*                      mpRowPosArray;
+    sal_uLong                       mnRowPosCount;
 
     String                      maPreviewLine[ CSV_PREVIEW_LINES ];
 
@@ -116,9 +116,9 @@ private:
     void                        SetupSeparatorCtrls();
 
 
-    bool                        GetLine( ULONG nLine, String &rText );
+    bool                        GetLine( sal_uLong nLine, String &rText );
     void                        UpdateVertical();
-    inline bool                 Seek( ULONG nPos ); // synced to and from mnStreamPos
+    inline bool                 Seek( sal_uLong nPos ); // synced to and from mnStreamPos
 
                                 DECL_LINK( CharSetHdl, SvxTextEncodingBox* );
                                 DECL_LINK( FirstRowHdl, NumericField* );
@@ -130,7 +130,7 @@ private:
 };
 
 
-inline bool ScImportAsciiDlg::Seek(ULONG nPos)
+inline bool ScImportAsciiDlg::Seek(sal_uLong nPos)
 {
     bool bSuccess = true;
     if (nPos != mnStreamPos && mpDatStream)
diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx
index 857ca2f3f..8e7e17764 100644
--- a/sc/source/ui/inc/scuiautofmt.hxx
+++ b/sc/source/ui/inc/scuiautofmt.hxx
@@ -37,7 +37,7 @@ public:
                              ScDocument*                pDoc );
             ~ScAutoFormatDlg();
 
-    USHORT GetIndex() const { return nIndex; }
+    sal_uInt16 GetIndex() const { return nIndex; }
     String GetCurrFormatName();
 
 private:
@@ -68,9 +68,9 @@ private:
     //------------------------
     ScAutoFormat*			pFormat;
     const ScAutoFormatData*	pSelFmtData;
-    USHORT					nIndex;
-    BOOL					bCoreDataChanged;
-    BOOL					bFmtInserted;
+    sal_uInt16					nIndex;
+    sal_Bool					bCoreDataChanged;
+    sal_Bool					bFmtInserted;
 
     void Init			();
     void UpdateChecks	();
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index bba9fefec..fe304da78 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -39,12 +39,12 @@ class ScImportOptionsDlg : public ModalDialog
 {
 public:
                 ScImportOptionsDlg( Window* 				pParent,
-                                    BOOL                    bAscii = TRUE,
+                                    sal_Bool                    bAscii = sal_True,
                                     const ScImportOptions*	pOptions = NULL,
                                     const String*			pStrTitle = NULL,
-                                    BOOL                    bMultiByte = FALSE,
-                                    BOOL                    bOnlyDbtoolsEncodings = FALSE,
-                                    BOOL                    bImport = TRUE );
+                                    sal_Bool                    bMultiByte = sal_False,
+                                    sal_Bool                    bOnlyDbtoolsEncodings = sal_False,
+                                    sal_Bool                    bImport = sal_True );
 
                 ~ScImportOptionsDlg();
 
@@ -68,7 +68,7 @@ private:
     ScDelimiterTable*	pTextSepTab;
 
 private:
-    USHORT GetCodeFromCombo( const ComboBox& rEd ) const;
+    sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const;
 
     DECL_LINK( FixedWidthHdl, CheckBox* );
     DECL_LINK( DoubleClickHdl, ListBox* );
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 715097df1..386105287 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -59,7 +59,7 @@ class ScAccessibleEditObject;
 class ScHFEditPage : public SfxTabPage
 {
 public:
-    virtual	BOOL	FillItemSet	( SfxItemSet& rCoreSet );
+    virtual	sal_Bool	FillItemSet	( SfxItemSet& rCoreSet );
     virtual	void	Reset		( const SfxItemSet& rCoreSet );
 
     void			SetNumType(SvxNumType eNumType);
@@ -67,9 +67,9 @@ public:
 
 protected:
                 ScHFEditPage( Window*			pParent,
-                              USHORT			nResId,
+                              sal_uInt16			nResId,
                               const SfxItemSet&	rCoreSet,
-                              USHORT			nWhich, bool bHeader );
+                              sal_uInt16			nWhich, bool bHeader );
     virtual		~ScHFEditPage();
 
 private:
@@ -93,7 +93,7 @@ private:
     FixedInfo		aFtInfo;
     ScPopupMenu		aPopUpFile;
 
-    USHORT			nWhich;
+    sal_uInt16			nWhich;
     String			aCmdArr[6];
 
 private:
@@ -119,7 +119,7 @@ class ScRightHeaderEditPage : public ScHFEditPage
 {
 public:
     static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-    static USHORT*		GetRanges();
+    static sal_uInt16*		GetRanges();
 
 private:
     ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -131,7 +131,7 @@ class ScLeftHeaderEditPage : public ScHFEditPage
 {
 public:
     static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-    static USHORT*		GetRanges();
+    static sal_uInt16*		GetRanges();
 
 private:
     ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -143,7 +143,7 @@ class ScRightFooterEditPage : public ScHFEditPage
 {
 public:
     static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-    static USHORT*		GetRanges();
+    static sal_uInt16*		GetRanges();
 
 private:
     ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -155,7 +155,7 @@ class ScLeftFooterEditPage : public ScHFEditPage
 {
 public:
     static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-    static USHORT*		GetRanges();
+    static sal_uInt16*		GetRanges();
 
 private:
     ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx
index 47d1669ca..d3e071e10 100644
--- a/sc/source/ui/inc/select.hxx
+++ b/sc/source/ui/inc/select.hxx
@@ -59,8 +59,8 @@ private:
     ScViewData*				pViewData;
     ScViewSelectionEngine*	pEngine;
 
-    BOOL			bAnchor;
-    BOOL			bStarted;
+    sal_Bool			bAnchor;
+    sal_Bool			bStarted;
     ScAddress		aAnchorPos;
 
     ScSplitPos		GetWhich();
@@ -71,17 +71,17 @@ public:
     void			SetSelectionEngine( ScViewSelectionEngine* pSelEngine );
 
     void			SetAnchor( SCCOL nPosX, SCROW nPosY );
-    void			SetAnchorFlag( BOOL bSet );
+    void			SetAnchorFlag( sal_Bool bSet );
 
     virtual void	BeginDrag();
     virtual void	CreateAnchor();
     virtual void	DestroyAnchor();
-    virtual BOOL	SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
-    virtual BOOL	IsSelectionAtPoint( const Point& rPointPixel );
+    virtual sal_Bool	SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False );
+    virtual sal_Bool	IsSelectionAtPoint( const Point& rPointPixel );
     virtual void	DeselectAtPoint( const Point& rPointPixel );
     virtual void	DeselectAll();
 
-    BOOL			SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScroll );
+    sal_Bool			SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Bool bScroll );
 };
 
 
@@ -92,27 +92,27 @@ class ScHeaderFunctionSet : public FunctionSet			// Spalten- / Zeilenkoepfe
 {
 private:
     ScViewData*		pViewData;
-    BOOL			bColumn;				// Col- / Rowbar
+    sal_Bool			bColumn;				// Col- / Rowbar
     ScSplitPos		eWhich;
 
-    BOOL			bAnchor;
+    sal_Bool			bAnchor;
     SCCOLROW		nCursorPos;
 
 public:
                     ScHeaderFunctionSet( ScViewData* pNewViewData );
 
-    void			SetColumn( BOOL bSet );
+    void			SetColumn( sal_Bool bSet );
     void			SetWhich( ScSplitPos eNew );
 
     virtual void	BeginDrag();
     virtual void	CreateAnchor();
     virtual void	DestroyAnchor();
-    virtual BOOL	SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
-    virtual BOOL	IsSelectionAtPoint( const Point& rPointPixel );
+    virtual sal_Bool	SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False );
+    virtual sal_Bool	IsSelectionAtPoint( const Point& rPointPixel );
     virtual void	DeselectAtPoint( const Point& rPointPixel );
     virtual void	DeselectAll();
 
-    void			SetAnchorFlag(BOOL bSet)	{ bAnchor = bSet; }
+    void			SetAnchorFlag(sal_Bool bSet)	{ bAnchor = bSet; }
 };
 
 
diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx
index 4d06c24a7..05c8dda7b 100644
--- a/sc/source/ui/inc/seltrans.hxx
+++ b/sc/source/ui/inc/seltrans.hxx
@@ -66,7 +66,7 @@ public:
     virtual		~ScSelectionTransferObj();
 
     void		ForgetView();
-    BOOL		StillValid();
+    sal_Bool		StillValid();
     ScTabView*	GetView() const		{ return pView; }
     
     ScTransferObj*		GetCellData();
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index cf7fd66ec..c03dd3661 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -54,7 +54,7 @@ private:
     ScDocShell*		pDocSh;
     ScRange			aRange;
     String			aItemStr;
-    BOOL			bRefreshListener;
+    sal_Bool			bRefreshListener;
 
     void	Clear();
 
@@ -62,9 +62,9 @@ public:
             ScServerObject( ScDocShell* pShell, const String& rItem );
     virtual ~ScServerObject();
 
-    virtual BOOL GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+    virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
                              const String & rMimeType,
-                             BOOL bSynchron = FALSE );
+                             sal_Bool bSynchron = sal_False );
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
             void    EndListeningAll();
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index 838467b79..101305336 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -62,11 +62,11 @@ public:
                 const ::rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId );
 
     /** Inserts a string into the ListBox. */
-    void    Insert( const String& rString, BOOL bSelected );
+    void    Insert( const String& rString, sal_Bool bSelected );
 
-    USHORT	GetSelectEntryCount() const;
-    String	GetSelectEntry(USHORT nPos) const;
-    USHORT  GetSelectEntryPos(USHORT nPos) const;
+    sal_uInt16	GetSelectEntryCount() const;
+    String	GetSelectEntry(sal_uInt16 nPos) const;
+    sal_uInt16  GetSelectEntryPos(sal_uInt16 nPos) const;
 };
 
 
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 1030d2c01..389c9beca 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -71,14 +71,14 @@ private:
 
     ScViewData*		pViewData;
     ScDocument*		pDoc;
-    BOOL			bRefInputMode;
+    sal_Bool			bRefInputMode;
 
     ScRange			theCurArea;
-    BOOL			bCloseFlag;
-    BOOL			bAutoReOpen;
-    BOOL			bCloseOnButtonUp;
-    BOOL			bSingleCell;
-    BOOL            bMultiSelection;
+    sal_Bool			bCloseFlag;
+    sal_Bool			bAutoReOpen;
+    sal_Bool			bCloseOnButtonUp;
+    sal_Bool			bSingleCell;
+    sal_Bool            bMultiSelection;
 
     void			Init();
 
@@ -88,7 +88,7 @@ private:
 
 protected:
 
-    virtual void	RefInputDone( BOOL bForced = FALSE );
+    virtual void	RefInputDone( sal_Bool bForced = sal_False );
 
 public:
                     ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
@@ -97,9 +97,9 @@ public:
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
 
-    virtual BOOL	IsRefInputMode() const;
+    virtual sal_Bool	IsRefInputMode() const;
     virtual void	SetActive();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
     void			StartRefInput();
 
@@ -111,9 +111,9 @@ public:
     void			SetUnoLinks( const Link& rDone, const Link& rAbort,
                                 const Link& rChange );
 
-    void            SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection );
+    void            SetFlags( sal_Bool bSetCloseOnButtonUp, sal_Bool bSetSingleCell, sal_Bool bSetMultiSelection );
 
-    void			SetAutoReOpen(BOOL bFlag) {bAutoReOpen=bFlag;}
+    void			SetAutoReOpen(sal_Bool bFlag) {bAutoReOpen=bFlag;}
 };
 
 
diff --git a/sc/source/ui/inc/sizedev.hxx b/sc/source/ui/inc/sizedev.hxx
index 5b5010684..35ec33fa6 100644
--- a/sc/source/ui/inc/sizedev.hxx
+++ b/sc/source/ui/inc/sizedev.hxx
@@ -36,7 +36,7 @@ class ScDocShell;
 class ScSizeDeviceProvider
 {
     OutputDevice*	pDevice;
-    BOOL			bOwner;
+    sal_Bool			bOwner;
     double			nPPTX;
     double			nPPTY;
     MapMode			aOldMapMode;
@@ -48,7 +48,7 @@ public:
     OutputDevice* 	GetDevice() const	{ return pDevice; }
     double			GetPPTX() const		{ return nPPTX; }
     double			GetPPTY() const		{ return nPPTY; }
-    BOOL			IsPrinter() const	{ return !bOwner; }
+    sal_Bool			IsPrinter() const	{ return !bOwner; }
 };
 
 #endif
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index 4ab38adc8..47b621c8d 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -58,9 +58,9 @@ public:
                     ~ScSolverDlg();
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
-    virtual BOOL    IsRefInputMode() const;
+    virtual sal_Bool    IsRefInputMode() const;
     virtual void	SetActive();
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 private:
     FixedLine       aFlVariables;
@@ -86,7 +86,7 @@ private:
     ScDocument*		pDoc;
     const SCTAB	    nCurTab;
     formula::RefEdit*		pEdActive;
-    BOOL			bDlgLostFocus;
+    sal_Bool			bDlgLostFocus;
     const String	errMsgInvalidVar;
     const String	errMsgInvalidForm;
     const String	errMsgNoFormula;
@@ -95,7 +95,7 @@ private:
 
 #ifdef _SOLVRDLG_CXX
     void	Init();
-    BOOL	CheckTargetValue( String& rStrVal );
+    sal_Bool	CheckTargetValue( String& rStrVal );
     void	RaiseError( ScSolverErr eError );
 
     DECL_LINK( BtnHdl, PushButton* );
diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx
index f6b2231f6..5e6906e53 100644
--- a/sc/source/ui/inc/sortdlg.hxx
+++ b/sc/source/ui/inc/sortdlg.hxx
@@ -50,21 +50,21 @@ public:
                            const SfxItemSet* pArgSet );
                 ~ScSortDlg();
 
-    void	SetHeaders( BOOL bHeaders );
-    void	SetByRows ( BOOL bByRows );
-    BOOL	GetHeaders() const;
-    BOOL	GetByRows () const;
+    void	SetHeaders( sal_Bool bHeaders );
+    void	SetByRows ( sal_Bool bByRows );
+    sal_Bool	GetHeaders() const;
+    sal_Bool	GetByRows () const;
 
 
 private:
-    BOOL	bIsHeaders;
-    BOOL	bIsByRows;
+    sal_Bool	bIsHeaders;
+    sal_Bool	bIsByRows;
 };
 
-inline void ScSortDlg::SetHeaders( BOOL bHeaders )	{ bIsHeaders = bHeaders; }
-inline void ScSortDlg::SetByRows ( BOOL bByRows  )	{ bIsByRows = bByRows; }
-inline BOOL ScSortDlg::GetHeaders() const 			{ return bIsHeaders; }
-inline BOOL ScSortDlg::GetByRows () const 			{ return bIsByRows; }
+inline void ScSortDlg::SetHeaders( sal_Bool bHeaders )	{ bIsHeaders = bHeaders; }
+inline void ScSortDlg::SetByRows ( sal_Bool bByRows  )	{ bIsByRows = bByRows; }
+inline sal_Bool ScSortDlg::GetHeaders() const 			{ return bIsHeaders; }
+inline sal_Bool ScSortDlg::GetByRows () const 			{ return bIsByRows; }
 
 class ScSortWarningDlg : public ModalDialog
 {
diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx
index d77ccc7df..59f8528bc 100644
--- a/sc/source/ui/inc/spelldialog.hxx
+++ b/sc/source/ui/inc/spelldialog.hxx
@@ -51,7 +51,7 @@ class ScSpellDialogChildWindow : public ::svx::SpellDialogChildWindow
 public:
     SFX_DECL_CHILDWINDOW( ScSpellDialogChildWindow );
 
-    explicit            ScSpellDialogChildWindow( Window* pParent, USHORT nId,
+    explicit            ScSpellDialogChildWindow( Window* pParent, sal_uInt16 nId,
                             SfxBindings* pBindings, SfxChildWinInfo* pInfo );
     virtual             ~ScSpellDialogChildWindow();
 
diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx
index 85b54daa4..12f12cb63 100644
--- a/sc/source/ui/inc/spelleng.hxx
+++ b/sc/source/ui/inc/spelleng.hxx
@@ -120,7 +120,7 @@ public:
 
 protected:
     /** Callback from edit engine to check the next cell. */
-    virtual BOOL        SpellNextDocument();
+    virtual sal_Bool        SpellNextDocument();
 
     /** Returns true, if the current text contains a spelling error. */
     virtual bool        NeedsConversion();
@@ -154,7 +154,7 @@ public:
 
 protected:
     /** Callback from edit engine to convert the next cell. */
-    virtual BOOL        ConvertNextDocument();
+    virtual sal_Bool        ConvertNextDocument();
 
     /** Returns true, if the current text contains text to convert. */
     virtual bool        NeedsConversion();
diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx
index 35ef4986d..31cef922f 100644
--- a/sc/source/ui/inc/styledlg.hxx
+++ b/sc/source/ui/inc/styledlg.hxx
@@ -42,15 +42,15 @@ class ScStyleDlg : public SfxStyleDialog
 public:
                 ScStyleDlg( Window*				pParent,
                             SfxStyleSheetBase&	rStyleBase,
-                            USHORT				nRscId );
+                            sal_uInt16				nRscId );
                 ~ScStyleDlg();
 
 protected:
-    virtual void				PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+    virtual void				PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage );
     virtual const SfxItemSet*	GetRefreshedSet();
 
 private:
-    USHORT nDlgRsc;
+    sal_uInt16 nDlgRsc;
 };
 
 
diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index 77dfecc3e..77cc4d59f 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -45,13 +45,13 @@ class ScTabControl : public TabBar, public DropTargetHelper, public DragSourceHe
 {
 private:
     ScViewData*		pViewData;
-    USHORT          nMouseClickPageId;      /// Last page ID after mouse button down/up
-    USHORT          nSelPageIdByMouse;      /// Selected page ID, if selected with mouse
-    BOOL            bErrorShown;
+    sal_uInt16          nMouseClickPageId;      /// Last page ID after mouse button down/up
+    sal_uInt16          nSelPageIdByMouse;      /// Selected page ID, if selected with mouse
+    sal_Bool            bErrorShown;
 
     void    		DoDrag( const Region& rRegion );
 
-    USHORT			GetMaxId() const;
+    sal_uInt16			GetMaxId() const;
     SCTAB			GetPrivatDropPos(const Point& rPos );
 
 protected:
@@ -77,9 +77,9 @@ public:
     using TabBar::StartDrag;
 
     void			UpdateStatus();
-    void			ActivateView(BOOL bActivate);
+    void			ActivateView(sal_Bool bActivate);
 
-    void            SetSheetLayoutRTL( BOOL bSheetRTL );
+    void            SetSheetLayoutRTL( sal_Bool bSheetRTL );
 };
 
 
diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx
index 5ecd5fbdd..949c8cc22 100644
--- a/sc/source/ui/inc/tabopdlg.hxx
+++ b/sc/source/ui/inc/tabopdlg.hxx
@@ -59,10 +59,10 @@ public:
                     ~ScTabOpDlg();
 
     virtual void	SetReference( const ScRange& rRef, ScDocument* pDoc );
-    virtual BOOL	IsRefInputMode() const { return TRUE; }
+    virtual sal_Bool	IsRefInputMode() const { return sal_True; }
     virtual void	SetActive();
 
-    virtual BOOL	Close();
+    virtual sal_Bool	Close();
 
 private:
     FixedLine       aFlVariables;
@@ -90,7 +90,7 @@ private:
     ScDocument*		pDoc;
     const SCTAB	    nCurTab;
     formula::RefEdit*		pEdActive;
-    BOOL			bDlgLostFocus;
+    sal_Bool			bDlgLostFocus;
     const String	errMsgNoFormula;
     const String	errMsgNoColRow;
     const String	errMsgWrongFormula;
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index a69ad206e..e5c8af0d4 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -41,8 +41,8 @@ class ScTabPageProtection : public SfxTabPage
 public:
     static	SfxTabPage*	Create			( Window* 				pParent,
                                           const SfxItemSet&		rAttrSet );
-    static	USHORT*		GetRanges		();
-    virtual	BOOL		FillItemSet		( SfxItemSet& rCoreAttrs );
+    static	sal_uInt16*		GetRanges		();
+    virtual	sal_Bool		FillItemSet		( SfxItemSet& rCoreAttrs );
     virtual	void		Reset			( const SfxItemSet& );
 
 protected:
@@ -66,12 +66,12 @@ private:
     FixedInfo	aTxtHint2;
 
                                     // aktueller Status:
-    BOOL		bTriEnabled;		//	wenn vorher Dont-Care
-    BOOL		bDontCare;			//	alles auf TriState
-    BOOL		bProtect;			//	einzelne Einstellungen ueber TriState sichern
-    BOOL		bHideForm;
-    BOOL		bHideCell;
-    BOOL		bHidePrint;
+    sal_Bool		bTriEnabled;		//	wenn vorher Dont-Care
+    sal_Bool		bDontCare;			//	alles auf TriState
+    sal_Bool		bProtect;			//	einzelne Einstellungen ueber TriState sichern
+    sal_Bool		bHideForm;
+    sal_Bool		bHideCell;
+    sal_Bool		bHidePrint;
 
     // Handler:
     DECL_LINK( ButtonClickHdl, TriStateBox* pBox );
diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx
index e6574322f..94041df21 100644
--- a/sc/source/ui/inc/tabsplit.hxx
+++ b/sc/source/ui/inc/tabsplit.hxx
@@ -37,7 +37,7 @@ class ScTabSplitter : public Splitter
 {
 private:
     ScViewData*		pViewData;
-    BOOL			bFixed;
+    sal_Bool			bFixed;
 
 protected:
     virtual void	MouseMove( const MouseEvent& rMEvt );
@@ -51,7 +51,7 @@ public:
                                     ScViewData* pData );
                     ~ScTabSplitter();
 
-    void			SetFixed(BOOL bSet);
+    void			SetFixed(sal_Bool bSet);
 };
 
 
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 497caaded..7b061141a 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -75,14 +75,14 @@ class ScCornerButton : public Window
 {
 private:
     ScViewData*		pViewData;
-    BOOL			bAdd;
+    sal_Bool			bAdd;
 
 protected:
     virtual void	Paint( const Rectangle& rRect );
     virtual void	Resize();
     virtual void	MouseButtonDown( const MouseEvent& rMEvt );
 public:
-                    ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditional );
+                    ScCornerButton( Window* pParent, ScViewData* pData, sal_Bool bAdditional );
                     ~ScCornerButton();
 
     virtual	void	StateChanged( StateChangedType nType );
@@ -111,7 +111,7 @@ private:
     Size				aFrameSize;				// wie bei DoResize uebergeben
     Point				aBorderPos;
 
-    BOOL				bDrawSelMode;			// nur Zeichenobjekte selektieren ?
+    sal_Bool				bDrawSelMode;			// nur Zeichenobjekte selektieren ?
 
     FuPoor* 			pDrawActual;
     FuPoor*				pDrawOld;
@@ -139,21 +139,21 @@ private:
 
     ScDocument*         pBrushDocument;         // cell formats for format paint brush
     SfxItemSet*         pDrawBrushSet;          // drawing object attributes for paint brush
-    BOOL                bLockPaintBrush;        // keep for more than one use?
+    sal_Bool                bLockPaintBrush;        // keep for more than one use?
 
     Timer				aScrollTimer;
     ScGridWindow*		pTimerWindow;
     MouseEvent			aTimerMEvt;
 
-    ULONG				nTipVisible;
+    sal_uLong				nTipVisible;
 
-    BOOL				bDragging;				// fuer Scrollbars
+    sal_Bool				bDragging;				// fuer Scrollbars
     long				nPrevDragPos;
 
-    BOOL				bIsBlockMode;           // Block markieren
-    BOOL				bBlockNeg;				// wird Markierung aufgehoben?
-    BOOL				bBlockCols;				// werden ganze Spalten markiert?
-    BOOL				bBlockRows;				// werden ganze Zeilen markiert?
+    sal_Bool				bIsBlockMode;           // Block markieren
+    sal_Bool				bBlockNeg;				// wird Markierung aufgehoben?
+    sal_Bool				bBlockCols;				// werden ganze Spalten markiert?
+    sal_Bool				bBlockRows;				// werden ganze Zeilen markiert?
 
     SCCOL				nBlockStartX;
     SCCOL               nBlockStartXOrig;
@@ -171,12 +171,12 @@ private:
 
     double              mfPendingTabBarWidth;       // Tab bar width relative to frame window width.
 
-    BOOL				bMinimized;
-    BOOL				bInUpdateHeader;
-    BOOL				bInActivatePart;
-    BOOL				bInZoomUpdate;
-    BOOL				bMoveIsShift;
-    BOOL				bNewStartIfMarking;
+    sal_Bool				bMinimized;
+    sal_Bool				bInUpdateHeader;
+    sal_Bool				bInActivatePart;
+    sal_Bool				bInZoomUpdate;
+    sal_Bool				bMoveIsShift;
+    sal_Bool				bNewStartIfMarking;
 
     void			Init();
 
@@ -194,8 +194,8 @@ private:
 
     void			UpdateVarZoom();
 
-    static void		SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL );
-    static long		GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL );
+    static void		SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, sal_Bool bLayoutRTL );
+    static long		GetScrollBarPos( ScrollBar& rScroll, sal_Bool bLayoutRTL );
 
 protected:
     void			UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL,
@@ -209,11 +209,11 @@ protected:
     void			GetBorderSize( SvBorder& rBorder, const Size& rSize );
 
     void			ResetDrawDragMode();
-    BOOL			IsDrawTextEdit() const;
-    void			DrawEnableAnim(BOOL bSet);
-    //HMHvoid			DrawShowMarkHdl(BOOL bShow);
+    sal_Bool			IsDrawTextEdit() const;
+    void			DrawEnableAnim(sal_Bool bSet);
+    //HMHvoid			DrawShowMarkHdl(sal_Bool bShow);
 
-    void			MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE );
+    void			MakeDrawView( sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE );
 
     void			HideNoteMarker();
 
@@ -228,7 +228,7 @@ public:
 
     void			HideListBox();
 
-    BOOL			HasHintWindow() const	{ return pInputHintWindow != NULL; }
+    sal_Bool			HasHintWindow() const	{ return pInputHintWindow != NULL; }
     void			RemoveHintWindow();
     void			TestHintWindow();
 
@@ -249,13 +249,13 @@ public:
     /** Returns the pending tab bar width relative to the frame window width (0.0 ... 1.0). */
     double          GetPendingRelTabBarWidth() const;
 
-    void			DoResize( const Point& rOffset, const Size& rSize, BOOL bInner = FALSE );
-    void			RepeatResize( BOOL bUpdateFix = TRUE );
+    void			DoResize( const Point& rOffset, const Size& rSize, sal_Bool bInner = sal_False );
+    void			RepeatResize( sal_Bool bUpdateFix = sal_True );
     void			UpdateFixPos();
     Point			GetGridOffset() const;
 
-    BOOL			IsDrawSelMode() const 		{ return bDrawSelMode; }
-    void			SetDrawSelMode(BOOL bNew)	{ bDrawSelMode = bNew; }
+    sal_Bool			IsDrawSelMode() const 		{ return bDrawSelMode; }
+    void			SetDrawSelMode(sal_Bool bNew)	{ bDrawSelMode = bNew; }
 
     void			SetDrawFuncPtr(FuPoor* pFuncPtr)	{ pDrawActual = pFuncPtr; }
     void			SetDrawFuncOldPtr(FuPoor* pFuncPtr)	{ pDrawOld = pFuncPtr; }
@@ -270,7 +270,7 @@ public:
     ScPageBreakData* GetPageBreakData()		{ return pPageBreakData; }
     ScHighlightRanges* GetHighlightRanges()	{ return pHighlightRanges; }
 
-    void			UpdatePageBreakData( BOOL bForcePaint = FALSE );
+    void			UpdatePageBreakData( sal_Bool bForcePaint = sal_False );
 
     void			DrawMarkRect( const Rectangle& rRect );
 
@@ -280,18 +280,18 @@ public:
     ScViewFunctionSet*		GetFunctionSet()	{ return &aFunctionSet; }
     ScViewSelectionEngine*	GetSelEngine()		{ return pSelEngine; }
 
-    BOOL			SelMouseButtonDown( const MouseEvent& rMEvt );
+    sal_Bool			SelMouseButtonDown( const MouseEvent& rMEvt );
 
     ScDrawView*		GetScDrawView()			{ return pDrawView; }
     SdrView*		GetSdrView();			// gegen CLOKs
 
-    BOOL			IsMinimized() const		{ return bMinimized; }
+    sal_Bool			IsMinimized() const		{ return bMinimized; }
 
     // bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
     void			TabChanged( bool bSameTabButMoved = false );
-    void			SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
+    void			SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll );
     SC_DLLPUBLIC void            RefreshZoom();
-    void			SetPagebreakMode( BOOL bSet );
+    void			SetPagebreakMode( sal_Bool bSet );
 
     void			UpdateLayerLocks();
 
@@ -301,8 +301,8 @@ public:
     void			UpdateInputLine();
 
     void			InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType,
-                                    BOOL bPaint = TRUE );
-    void			DoneRefMode( BOOL bContinue = FALSE );
+                                    sal_Bool bPaint = sal_True );
+    void			DoneRefMode( sal_Bool bContinue = sal_False );
     void			UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ );
     void			StopRefMode();
 
@@ -323,9 +323,9 @@ public:
 //UNUSED2008-05  void			ActiveReleaseMouse();
 //UNUSED2008-05  Point           ActivePixelToLogic( const Point& rDevicePoint );
 
-    void			ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl );
+    void			ClickCursor( SCCOL nPosX, SCROW nPosY, sal_Bool bControl );
 
-    SC_DLLPUBLIC void			SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew = FALSE );
+    SC_DLLPUBLIC void			SetCursor( SCCOL nPosX, SCROW nPosY, sal_Bool bNew = sal_False );
 
     SC_DLLPUBLIC void			CellContentChanged();
     void			SelectionChanged();
@@ -353,10 +353,10 @@ public:
                                     const ScSplitPos* pWhich = NULL );
 
     SvxZoomType     GetZoomType() const;
-    void            SetZoomType( SvxZoomType eNew, BOOL bAll );
-    USHORT			CalcZoom( SvxZoomType eType, USHORT nOldZoom );
+    void            SetZoomType( SvxZoomType eNew, sal_Bool bAll );
+    sal_uInt16			CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom );
 
-//	void			CalcZoom( SvxZoomType eType, USHORT& rZoom, SCCOL& rCol, SCROW& rRow );
+//	void			CalcZoom( SvxZoomType eType, sal_uInt16& rZoom, SCCOL& rCol, SCROW& rRow );
 
     sal_Bool        HasPageFieldDataAtCursor() const;
     void			StartDataSelect();
@@ -368,42 +368,42 @@ public:
                     //	MoveCursorEnd		- links oben / benutzter Bereich
 
     SC_DLLPUBLIC void			MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
-                                    BOOL bShift, BOOL bControl,
-                                    BOOL bKeepOld = FALSE, BOOL bKeepSel = FALSE );
+                                    sal_Bool bShift, sal_Bool bControl,
+                                    sal_Bool bKeepOld = sal_False, sal_Bool bKeepSel = sal_False );
     void			MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
-                                    BOOL bShift, BOOL bKeepSel = FALSE );
+                                    sal_Bool bShift, sal_Bool bKeepSel = sal_False );
     void			MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
-                                    BOOL bShift, BOOL bKeepSel = FALSE );
+                                    sal_Bool bShift, sal_Bool bKeepSel = sal_False );
     void			MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
-                                    BOOL bShift, BOOL bKeepSel = FALSE );
+                                    sal_Bool bShift, sal_Bool bKeepSel = sal_False );
     void			MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
-                                    BOOL bShift, BOOL bKeepSel = FALSE );
-    void			MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift );
+                                    sal_Bool bShift, sal_Bool bKeepSel = sal_False );
+    void			MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift );
 
-    void			MoveCursorEnter( BOOL bShift );		// Shift fuer Richtung (kein Markieren)
+    void			MoveCursorEnter( sal_Bool bShift );		// Shift fuer Richtung (kein Markieren)
 
-    BOOL            MoveCursorKeyInput( const KeyEvent& rKeyEvent );
+    sal_Bool            MoveCursorKeyInput( const KeyEvent& rKeyEvent );
 
-    void			FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE );
+    void			FindNextUnprot( sal_Bool bShift, sal_Bool bInSelection = sal_True );
 
     void			SetNewStartIfMarking();
 
     // bSameTabButMoved = true if the same sheet as before is activated, used after moving/copying/inserting/deleting a sheet
-    SC_DLLPUBLIC void SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE, bool bSameTabButMoved = false );
-    void            SelectNextTab( short nDir, BOOL bExtendSelection = FALSE );
+    SC_DLLPUBLIC void SetTabNo( SCTAB nTab, sal_Bool bNew = sal_False, sal_Bool bExtendSelection = sal_False, bool bSameTabButMoved = false );
+    void            SelectNextTab( short nDir, sal_Bool bExtendSelection = sal_False );
 
-    void			ActivateView( BOOL bActivate, BOOL bFirst );
+    void			ActivateView( sal_Bool bActivate, sal_Bool bFirst );
     void			ActivatePart( ScSplitPos eWhich );
-    BOOL			IsInActivatePart() const	{ return bInActivatePart; }
+    sal_Bool			IsInActivatePart() const	{ return bInActivatePart; }
 
     void			SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt );
     void			ResetTimer();
 
-    void 			ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars = TRUE );
-    void 			ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars = TRUE );
+    void 			ScrollX( long nDeltaX, ScHSplitPos eWhich, sal_Bool bUpdBars = sal_True );
+    void 			ScrollY( long nDeltaY, ScVSplitPos eWhich, sal_Bool bUpdBars = sal_True );
     SC_DLLPUBLIC void			ScrollLines( long nDeltaX, long nDeltaY );				// aktives
 
-    BOOL			ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos );
+    sal_Bool			ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos );
 
     void			ScrollToObject( SdrObject* pDrawObj );
     void			MakeVisible( const Rectangle& rHMMRect );
@@ -430,7 +430,7 @@ public:
     void			PaintLeftArea( SCROW nStartRow, SCROW nEndRow );
     void			PaintLeft();
 
-    BOOL			PaintExtras();
+    sal_Bool			PaintExtras();
 
     void			RecalcPPT();
 
@@ -460,69 +460,69 @@ public:
     void			InvalidateAttribs();
 
     void			MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow );
-    void			KillEditView( BOOL bNoPaint );
+    void			KillEditView( sal_Bool bNoPaint );
     void			UpdateEditView();
 
 
                                     //	Bloecke
 
-    void			SelectAll( BOOL bContinue = FALSE );
+    void			SelectAll( sal_Bool bContinue = sal_False );
     void			SelectAllTables();
     void            DeselectAllTables();
 
     void			MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-                                BOOL bCols = FALSE, BOOL bRows = FALSE, BOOL bCellSelection = FALSE );
+                                sal_Bool bCols = sal_False, sal_Bool bRows = sal_False, sal_Bool bCellSelection = sal_False );
     void			InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-                                    BOOL bTestNeg = FALSE,
-                                    BOOL bCols = FALSE, BOOL bRows = FALSE );
+                                    sal_Bool bTestNeg = sal_False,
+                                    sal_Bool bCols = sal_False, sal_Bool bRows = sal_False );
     void			InitOwnBlockMode();
-    void			DoneBlockMode( BOOL bContinue = FALSE );
+    void			DoneBlockMode( sal_Bool bContinue = sal_False );
 
-    BOOL			IsBlockMode() const		{ return bIsBlockMode; }
+    sal_Bool			IsBlockMode() const		{ return bIsBlockMode; }
 
     void			MarkColumns();
     void			MarkRows();
-    void			MarkDataArea( BOOL bIncludeCursor = TRUE );
+    void			MarkDataArea( sal_Bool bIncludeCursor = sal_True );
     void			MarkMatrixFormula();
     void			Unmark();
 
-    void            MarkRange( const ScRange& rRange, BOOL bSetCursor = TRUE, BOOL bContinue = FALSE );
+    void            MarkRange( const ScRange& rRange, sal_Bool bSetCursor = sal_True, sal_Bool bContinue = sal_False );
 
-    BOOL			IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+    sal_Bool			IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
 
     void			PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
-    void			PaintBlock( BOOL bReset = FALSE );
+    void			PaintBlock( sal_Bool bReset = sal_False );
 
     void            SetMarkData( const ScMarkData& rNew );
     void            MarkDataChanged();
 
-    void			LockModifiers( USHORT nModifiers );
-    USHORT			GetLockedModifiers() const;
-    void			ViewOptionsHasChanged( BOOL bHScrollChanged,
-                                            BOOL bGraphicsChanged = FALSE);
+    void			LockModifiers( sal_uInt16 nModifiers );
+    sal_uInt16			GetLockedModifiers() const;
+    void			ViewOptionsHasChanged( sal_Bool bHScrollChanged,
+                                            sal_Bool bGraphicsChanged = sal_False);
 
     Point			GetMousePosPixel();
 
     void			SnapSplitPos( Point& rScreenPosPixel );
-    void			FreezeSplitters( BOOL bFreeze );
+    void			FreezeSplitters( sal_Bool bFreeze );
     void			RemoveSplit();
     void			SplitAtCursor();
-    void			SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer );
+    void			SplitAtPixel( const Point& rPixel, sal_Bool bHor, sal_Bool bVer );
     void			InvalidateSplit();
 
-    void			ErrorMessage( USHORT nGlobStrId );
-    Window*			GetParentOrChild( USHORT nChildId );
+    void			ErrorMessage( sal_uInt16 nGlobStrId );
+    Window*			GetParentOrChild( sal_uInt16 nChildId );
 
-    void			EnableRefInput(BOOL bFlag=TRUE);
+    void			EnableRefInput(sal_Bool bFlag=sal_True);
 
     Window*			GetFrameWin() const	{ return pFrameWin; }
 
-    BOOL            HasPaintBrush() const           { return pBrushDocument || pDrawBrushSet; }
+    sal_Bool            HasPaintBrush() const           { return pBrushDocument || pDrawBrushSet; }
     ScDocument*     GetBrushDocument() const        { return pBrushDocument; }
     SfxItemSet*     GetDrawBrushSet() const         { return pDrawBrushSet; }
-    BOOL            IsPaintBrushLocked() const      { return bLockPaintBrush; }
-    void            SetBrushDocument( ScDocument* pNew, BOOL bLock );
-    void            SetDrawBrushSet( SfxItemSet* pNew, BOOL bLock );
+    sal_Bool            IsPaintBrushLocked() const      { return bLockPaintBrush; }
+    void            SetBrushDocument( ScDocument* pNew, sal_Bool bLock );
+    void            SetDrawBrushSet( SfxItemSet* pNew, sal_Bool bLock );
     void            ResetBrushDocument();
 };
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 621e9a167..a1ed7e14d 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -100,15 +100,15 @@ enum ObjectSelectionType
 class ScTabViewShell: public SfxViewShell, public ScDBFunc
 {
 private:
-    static USHORT			nInsertCtrlState;
-    static USHORT			nInsCellsCtrlState;
-    static USHORT			nInsObjCtrlState;
+    static sal_uInt16			nInsertCtrlState;
+    static sal_uInt16			nInsCellsCtrlState;
+    static sal_uInt16			nInsObjCtrlState;
 
     SvxHtmlOptions          aHTMLOpt;
     ObjectSelectionType		eCurOST;
-    USHORT					nDrawSfxId;
-    USHORT					nCtrlSfxId;
-    USHORT					nFormSfxId;
+    sal_uInt16					nDrawSfxId;
+    sal_uInt16					nCtrlSfxId;
+    sal_uInt16					nFormSfxId;
     String                  sDrawCustom;                // current custom shape type
     ScDrawShell*			pDrawShell;
     ScDrawTextObjectBar*	pDrawTextShell;
@@ -144,37 +144,37 @@ private:
     ScNavigatorSettings*    pNavSettings;
 
     // used in first Activate
-    BOOL					bFirstActivate;
+    sal_Bool					bFirstActivate;
 
-    BOOL					bActiveDrawSh;
-    BOOL					bActiveDrawTextSh;
-    BOOL					bActivePivotSh;
-    BOOL					bActiveAuditingSh;
-    BOOL					bActiveDrawFormSh;
-    BOOL					bActiveOleObjectSh;
-    BOOL					bActiveChartSh;
-    BOOL					bActiveGraphicSh;
-    BOOL					bActiveMediaSh;
-    BOOL					bActiveEditSh;
+    sal_Bool					bActiveDrawSh;
+    sal_Bool					bActiveDrawTextSh;
+    sal_Bool					bActivePivotSh;
+    sal_Bool					bActiveAuditingSh;
+    sal_Bool					bActiveDrawFormSh;
+    sal_Bool					bActiveOleObjectSh;
+    sal_Bool					bActiveChartSh;
+    sal_Bool					bActiveGraphicSh;
+    sal_Bool					bActiveMediaSh;
+    sal_Bool					bActiveEditSh;
 
-    BOOL                    bFormShellAtTop;            // does the FormShell need to be on top?
+    sal_Bool                    bFormShellAtTop;            // does the FormShell need to be on top?
 
 
-    BOOL					bDontSwitch;				// EditShell nicht abschalten
-    BOOL					bInFormatDialog;			// fuer GetSelectionText
-    BOOL					bPrintSelected;				// for result of SvxPrtQryBox
+    sal_Bool					bDontSwitch;				// EditShell nicht abschalten
+    sal_Bool					bInFormatDialog;			// fuer GetSelectionText
+    sal_Bool					bPrintSelected;				// for result of SvxPrtQryBox
 
-    BOOL					bReadOnly;					// um Status-Aenderungen zu erkennen
+    sal_Bool					bReadOnly;					// um Status-Aenderungen zu erkennen
 
     SbxObject*				pScSbxObject;
 
-//UNUSED2008-05  BOOL                    bChartDlgIsEdit;            // Datenbereich aendern
-    BOOL					bChartAreaValid;			// wenn Chart aufgezogen wird
+//UNUSED2008-05  sal_Bool                    bChartDlgIsEdit;            // Datenbereich aendern
+    sal_Bool					bChartAreaValid;			// wenn Chart aufgezogen wird
     String					aEditChartName;
     ScRangeListRef			aChartSource;
     Rectangle				aChartPos;
     SCTAB					nChartDestTab;
-    USHORT					nCurRefDlgId;
+    sal_uInt16					nCurRefDlgId;
 
     SfxBroadcaster*			pAccessibilityBroadcaster;
 
@@ -182,7 +182,7 @@ private:
     String					aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ];
 
 private:
-    void	Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE );
+    void	Construct( sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE );
 
 //UNUSED2008-05  void          SetMySubShell( SfxShell* pShell );
     SfxShell*		GetMySubShell() const;
@@ -199,9 +199,9 @@ private:
     DECL_LINK( HtmlOptionsHdl, void * );
 
 protected:
-    virtual void	Activate(BOOL bMDI);
-    virtual void	Deactivate(BOOL bMDI);
-    virtual USHORT	PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
+    virtual void	Activate(sal_Bool bMDI);
+    virtual void	Deactivate(sal_Bool bMDI);
+    virtual sal_uInt16	PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
 
     virtual void	ShowCursor(FASTBOOL bOn);
 
@@ -217,12 +217,12 @@ protected:
 
     virtual Size	GetOptimalSizePixel() const;
 
-    virtual String  GetSelectionText( BOOL bWholeWord );
-    virtual BOOL	HasSelection( BOOL bText ) const;
+    virtual String  GetSelectionText( sal_Bool bWholeWord );
+    virtual sal_Bool	HasSelection( sal_Bool bText ) const;
     virtual String  GetDescription() const;
 
-    virtual void	WriteUserData(String &, BOOL bBrowse = FALSE);
-    virtual void	ReadUserData(const String &, BOOL bBrowse = FALSE);
+    virtual void	WriteUserData(String &, sal_Bool bBrowse = sal_False);
+    virtual void	ReadUserData(const String &, sal_Bool bBrowse = sal_False);
     virtual void    WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
     virtual void    ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
 
@@ -257,10 +257,10 @@ public:
     void			ExecuteInputDirect();
 
     ScInputHandler*	GetInputHandler() const;
-    void			UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE );
+    void			UpdateInputHandler( sal_Bool bForce = sal_False, sal_Bool bStopEditing = sal_True );
     void            UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust );
-    BOOL			TabKeyInput(const KeyEvent& rKEvt);
-    BOOL			SfxKeyInput(const KeyEvent& rKEvt);
+    sal_Bool			TabKeyInput(const KeyEvent& rKEvt);
+    sal_Bool			SfxKeyInput(const KeyEvent& rKEvt);
 
     void			SetActive();
 
@@ -310,32 +310,32 @@ public:
     void			GetDrawOptState(SfxItemSet &rSet);
 
 
-    void			SetDrawShell( BOOL bActive );
-    void			SetDrawTextShell( BOOL bActive );
+    void			SetDrawShell( sal_Bool bActive );
+    void			SetDrawTextShell( sal_Bool bActive );
 
-    void			SetPivotShell( BOOL bActive );
+    void			SetPivotShell( sal_Bool bActive );
     ScArea*			GetPivotSource(){return pPivotSource;}
     void			SetPivotSource(ScArea* pSrc){pPivotSource=pSrc;}
     void			SetDialogDPObject( const ScDPObject* pObj );
     const ScDPObject* GetDialogDPObject() const { return pDialogDPObject; }
 
-    BOOL			GetDontSwitch(){return bDontSwitch;}
-    void			SetDontSwitch(BOOL bFlag){bDontSwitch=bFlag;}
+    sal_Bool			GetDontSwitch(){return bDontSwitch;}
+    void			SetDontSwitch(sal_Bool bFlag){bDontSwitch=bFlag;}
 
 
-    void			SetAuditShell( BOOL bActive );
-    void			SetDrawFormShell( BOOL bActive );
-    void			SetEditShell(EditView* pView, BOOL bActive );
-    void			SetOleObjectShell( BOOL bActive );
-    void			SetChartShell( BOOL bActive );
-    void			SetGraphicShell( BOOL bActive );
-    void			SetMediaShell( BOOL bActive );
+    void			SetAuditShell( sal_Bool bActive );
+    void			SetDrawFormShell( sal_Bool bActive );
+    void			SetEditShell(EditView* pView, sal_Bool bActive );
+    void			SetOleObjectShell( sal_Bool bActive );
+    void			SetChartShell( sal_Bool bActive );
+    void			SetGraphicShell( sal_Bool bActive );
+    void			SetMediaShell( sal_Bool bActive );
 
 
     void			SetDrawShellOrSub();
-    void			SetCurSubShell( ObjectSelectionType eOST, BOOL bForce = FALSE );
+    void			SetCurSubShell( ObjectSelectionType eOST, sal_Bool bForce = sal_False );
 
-    void            SetFormShellAtTop( BOOL bSet );
+    void            SetFormShellAtTop( sal_Bool bSet );
 
     ObjectSelectionType GetCurObjectSelectionType();
 
@@ -343,19 +343,19 @@ public:
 
 
     void			StopEditShell();
-    BOOL			IsDrawTextShell() const;
-    BOOL			IsAuditShell() const;
+    sal_Bool			IsDrawTextShell() const;
+    sal_Bool			IsAuditShell() const;
 
-    void			SetDrawTextUndo( SfxUndoManager* pUndoMgr );
+    void			SetDrawTextUndo( ::svl::IUndoManager* pUndoMgr );
 
     void			FillFieldData( ScHeaderFieldData& rData );
 
 //UNUSED2008-05  void            ResetChartArea();
     void			SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest );
-    BOOL			GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const;
+    sal_Bool			GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const;
 
-//UNUSED2008-05  BOOL            IsChartDlgEdit() const;
-//UNUSED2008-05  void            SetChartDlgEdit(BOOL bFlag){bChartDlgIsEdit=bFlag;}
+//UNUSED2008-05  sal_Bool            IsChartDlgEdit() const;
+//UNUSED2008-05  void            SetChartDlgEdit(sal_Bool bFlag){bChartDlgIsEdit=bFlag;}
 
     void			SetEditChartName(const String& aStr){aEditChartName=aStr;}
 //UNUSED2008-05  const String&   GetEditChartName() const;
@@ -365,21 +365,21 @@ public:
     ScNavigatorSettings*    GetNavigatorSettings();
 
     // Drucken:
-    virtual SfxPrinter*		GetPrinter( BOOL bCreate = FALSE );
-    virtual USHORT			SetPrinter( SfxPrinter* pNewPrinter,
-                                          USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false );
+    virtual SfxPrinter*		GetPrinter( sal_Bool bCreate = sal_False );
+    virtual sal_uInt16			SetPrinter( SfxPrinter* pNewPrinter,
+                                          sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false );
 
     virtual SfxTabPage*     CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
 
     void			ConnectObject( SdrOle2Obj* pObj );
-    BOOL			ActivateObject( SdrOle2Obj* pObj, long nVerb );
+    sal_Bool			ActivateObject( SdrOle2Obj* pObj, long nVerb );
 
     void            DeactivateOle();
 
     SC_DLLPUBLIC static ScTabViewShell* GetActiveViewShell();
     SfxModelessDialog*	CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW,
                                         SfxChildWinInfo* pInfo,
-                                        Window* pParent, USHORT nSlotId );
+                                        Window* pParent, sal_uInt16 nSlotId );
 
     void			UpdateOleZoom();
     inline SbxObject* GetScSbxObject() const
@@ -390,15 +390,15 @@ public:
     FmFormShell*	GetFormShell() const	{ return pFormShell; }
 
     void 	InsertURL( const String& rName, const String& rURL, const String& rTarget,
-                            USHORT nMode );
+                            sal_uInt16 nMode );
     void 	InsertURLButton( const String& rName, const String& rURL, const String& rTarget,
                             const Point* pInsPos = NULL );
     void 	InsertURLField( const String& rName, const String& rURL, const String& rTarget );
 
-    BOOL	SelectObject( const String& rName );
+    sal_Bool	SelectObject( const String& rName );
 
-    void	SetInFormatDialog(BOOL bFlag) {bInFormatDialog=bFlag;}
-    BOOL    IsInFormatDialog() {return bInFormatDialog;}
+    void	SetInFormatDialog(sal_Bool bFlag) {bInFormatDialog=bFlag;}
+    sal_Bool    IsInFormatDialog() {return bInFormatDialog;}
 
     void	ForceMove()		{ Move(); }
 
@@ -409,20 +409,20 @@ public:
     void 	UpdateNumberFormatter	( ScDocument*		     	pDoc,
                                       const SvxNumberInfoItem& 	rInfoItem );
 
-    void	ExecuteCellFormatDlg	( SfxRequest& rReq, USHORT nTabPage = 0xffff );
+    void	ExecuteCellFormatDlg	( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
 
-    BOOL	GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 );
+    sal_Bool	GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 );
 
     void	StartSimpleRefDialog( const String& rTitle, const String& rInitVal,
-                                    BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection );
+                                    sal_Bool bCloseOnButtonUp, sal_Bool bSingleCell, sal_Bool bMultiSelection );
     void	StopSimpleRefDialog();
 
-    void	SetCurRefDlgId( USHORT nNew );
+    void	SetCurRefDlgId( sal_uInt16 nNew );
 
     void	AddAccessibilityObject( SfxListener& rObject );
     void	RemoveAccessibilityObject( SfxListener& rObject );
     void	BroadcastAccessibility( const SfxHint &rHint );
-    BOOL	HasAccessibilityObjects();
+    sal_Bool	HasAccessibilityObjects();
 
     bool    ExecuteRetypePassDlg(ScPasswordHash eDesiredHash);
 
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index 5ef748848..96326d4d7 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -36,20 +36,20 @@
 
 class ScTbxInsertCtrl : public SfxToolBoxControl
 {
-    USHORT 					nLastSlotId;
+    sal_uInt16 					nLastSlotId;
 
     using SfxToolBoxControl::Select;
-    virtual void			Select( BOOL bMod1 = FALSE );
+    virtual void			Select( sal_Bool bMod1 = sal_False );
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    ScTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
+    ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
     ~ScTbxInsertCtrl();
 
     virtual SfxPopupWindowType	GetPopupWindowType() const;
     virtual SfxPopupWindow* 	CreatePopupWindow();
-    virtual void				StateChanged( USHORT nSID,
+    virtual void				StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 };
@@ -73,7 +73,7 @@ protected:
     virtual void		PopupModeEnd();
 
 public:
-    ScTbxInsertPopup( USHORT nId, WindowAlign eAlign,
+    ScTbxInsertPopup( sal_uInt16 nId, WindowAlign eAlign,
                         const ResId& rRIdWin, const ResId& rRIdTbx,
                         SfxBindings& rBindings );
     ~ScTbxInsertPopup();
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index 358be7084..13a9c2fba 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -50,10 +50,10 @@ class ScZoomSliderControl: public SfxToolBoxControl
 {
 public:
     SFX_DECL_TOOLBOX_CONTROL();
-    ScZoomSliderControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    ScZoomSliderControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~ScZoomSliderControl();
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual Window* CreateItemWindow( Window *pParent );
 };
 
@@ -69,13 +69,13 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >            m_xFrame;
 
-    USHORT          Offset2Zoom( long nOffset ) const;
-    long            Zoom2Offset( USHORT nZoom ) const;
+    sal_uInt16          Offset2Zoom( long nOffset ) const;
+    long            Zoom2Offset( sal_uInt16 nZoom ) const;
     void            DoPaint( const Rectangle& rRect );
 
 public:
     ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, 
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , USHORT nCurrentZoom );
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom );
     ~ScZoomSliderWnd();
     void            UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem );
 
diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx
index accd124c2..e25693bf3 100644
--- a/sc/source/ui/inc/textdlgs.hxx
+++ b/sc/source/ui/inc/textdlgs.hxx
@@ -42,7 +42,7 @@ private:
     const SfxItemSet&		rOutAttrs;
     const SfxObjectShell&	rDocShell;
 
-    virtual void	PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void	PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
             ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
@@ -59,7 +59,7 @@ class ScParagraphDlg : public SfxTabDialog
 private:
     const SfxItemSet&	rOutAttrs;
 
-    virtual void	PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void	PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
             ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr );
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 3fe9b76db..81fd2d7bd 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -45,8 +45,8 @@ class ScTpCalcOptions : public SfxTabPage
 public:
     static	SfxTabPage* Create			( Window*				pParent,
                                           const SfxItemSet& 	rCoreSet );
-    static	USHORT* 	GetRanges		();
-    virtual BOOL		FillItemSet 	( SfxItemSet& rCoreSet );
+    static	sal_uInt16* 	GetRanges		();
+    virtual sal_Bool		FillItemSet 	( SfxItemSet& rCoreSet );
     virtual void		Reset			( const SfxItemSet& rCoreSet );
     using SfxTabPage::DeactivatePage;
     virtual int 		DeactivatePage	( SfxItemSet* pSet = NULL );
@@ -83,7 +83,7 @@ private:
 
     ScDocOptions*	pOldOptions;
     ScDocOptions*	pLocalOptions;
-    USHORT			nWhichCalc;
+    sal_uInt16			nWhichCalc;
 
 #ifdef _TPCALC_CXX
 private:
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 79db18ba7..ce82f3741 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -41,16 +41,16 @@ public:
     virtual			~ScHFPage();
 
     virtual void	Reset( const SfxItemSet& rSet );
-    virtual BOOL 	FillItemSet( SfxItemSet& rOutSet );
+    virtual sal_Bool 	FillItemSet( SfxItemSet& rOutSet );
 
     void			SetPageStyle( const String& rName )    { aStrPageStyle = rName; }
     void			SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; }
 
 protected:
                     ScHFPage( Window* pParent,
-                              USHORT nResId,
+                              sal_uInt16 nResId,
                               const SfxItemSet& rSet,
-                              USHORT nSetId );
+                              sal_uInt16 nSetId );
 
 //    using SvxHFPage::ActivatePage;
 //    using SvxHFPage::DeactivatePage;
@@ -63,7 +63,7 @@ private:
     PushButton			aBtnEdit;
     SfxItemSet			aDataSet;
     String				aStrPageStyle;
-    USHORT				nPageUsage;
+    sal_uInt16				nPageUsage;
     const ScStyleDlg*	pStyleDlg;
 
 #ifdef _TPHF_CXX
@@ -80,7 +80,7 @@ class ScHeaderPage : public ScHFPage
 {
 public:
     static SfxTabPage* 	Create(	Window* pParent, const SfxItemSet& rSet );
-    static USHORT*		GetRanges();
+    static sal_uInt16*		GetRanges();
 
 private:
     ScHeaderPage( Window* pParent, const SfxItemSet& rSet );
@@ -92,7 +92,7 @@ class ScFooterPage : public ScHFPage
 {
 public:
     static SfxTabPage* 	Create(	Window* pParent, const SfxItemSet& rSet );
-    static USHORT*		GetRanges();
+    static sal_uInt16*		GetRanges();
 
 private:
     ScFooterPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 90ee43cf6..eb9dd800e 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -110,7 +110,7 @@ private:
     Timer			aTimer;
     ScPopupMenu*	pPopupMenu;
     Link			aMLink;
-    USHORT			nSelected;
+    sal_uInt16			nSelected;
 
     SC_DLLPRIVATE  DECL_LINK( TimerHdl, Timer*);
 
@@ -130,7 +130,7 @@ public:
 
     void			SetPopupMenu(ScPopupMenu* pPopUp);
 
-    USHORT			GetSelected();
+    sal_uInt16			GetSelected();
 
     void            SetMenuHdl( const Link& rLink ) { aMLink = rLink; }
     const Link&     GetMenuHdl() const { return aMLink; }
@@ -144,16 +144,16 @@ public:
 //CHINA001 class ScHFEditPage : public SfxTabPage
 //CHINA001 {
 //CHINA001 public:
-//CHINA001 virtual	BOOL	FillItemSet	( SfxItemSet& rCoreSet );
+//CHINA001 virtual	sal_Bool	FillItemSet	( SfxItemSet& rCoreSet );
 //CHINA001 virtual	void	Reset		( const SfxItemSet& rCoreSet );
 //CHINA001 
 //CHINA001 void			SetNumType(SvxNumType eNumType);
 //CHINA001 
 //CHINA001 protected:
 //CHINA001 ScHFEditPage( Window*			pParent,
-//CHINA001 USHORT			nResId,
+//CHINA001 sal_uInt16			nResId,
 //CHINA001 const SfxItemSet&	rCoreSet,
-//CHINA001 USHORT			nWhich );
+//CHINA001 sal_uInt16			nWhich );
 //CHINA001 virtual		~ScHFEditPage();
 //CHINA001 
 //CHINA001 private:
@@ -174,7 +174,7 @@ public:
 //CHINA001 FixedInfo		aFtInfo;
 //CHINA001 ScPopupMenu		aPopUpFile;
 //CHINA001 
-//CHINA001 USHORT			nWhich;
+//CHINA001 sal_uInt16			nWhich;
 //CHINA001 String			aCmdArr[6];
 //CHINA001 
 //CHINA001 private:
@@ -191,7 +191,7 @@ public:
 //CHINA001 {
 //CHINA001 public:
 //CHINA001 static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT*		GetRanges();
+//CHINA001 static sal_uInt16*		GetRanges();
 //CHINA001 
 //CHINA001 private:
 //CHINA001 ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -203,7 +203,7 @@ public:
 //CHINA001 {
 //CHINA001 public:
 //CHINA001 static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT*		GetRanges();
+//CHINA001 static sal_uInt16*		GetRanges();
 //CHINA001 
 //CHINA001 private:
 //CHINA001 ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -215,7 +215,7 @@ public:
 //CHINA001 {
 //CHINA001 public:
 //CHINA001 static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT*		GetRanges();
+//CHINA001 static sal_uInt16*		GetRanges();
 //CHINA001 
 //CHINA001 private:
 //CHINA001 ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -227,7 +227,7 @@ public:
 //CHINA001 {
 //CHINA001 public:
 //CHINA001 static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT*		GetRanges();
+//CHINA001 static sal_uInt16*		GetRanges();
 //CHINA001 
 //CHINA001 private:
 //CHINA001 ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index 434b83a65..57a4f23b3 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -45,8 +45,8 @@ class ScTpPrintOptions : public SfxTabPage
 
 public:
     static SfxTabPage*	Create( Window* pParent, const SfxItemSet& rCoreSet );
-    static USHORT*		GetRanges();
-    virtual BOOL		FillItemSet( SfxItemSet& rCoreSet );
+    static sal_uInt16*		GetRanges();
+    virtual sal_Bool		FillItemSet( SfxItemSet& rCoreSet );
     virtual void		Reset( const SfxItemSet& rCoreSet );
     using SfxTabPage::DeactivatePage;
     virtual int 		DeactivatePage( SfxItemSet* pSet = NULL );
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index f197ca6d5..797e4afcf 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -61,8 +61,8 @@ public:
 
     static	SfxTabPage*	Create		( Window*				pParent,
                                       const SfxItemSet& 	rArgSet );
-    static	USHORT*		GetRanges	();
-    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    static	sal_uInt16*		GetRanges	();
+    virtual	sal_Bool		FillItemSet	( SfxItemSet& rArgSet );
     virtual	void		Reset		( const SfxItemSet& rArgSet );
 
 protected:
@@ -93,16 +93,16 @@ private:
     String			aStrColumn;
     String			aStrRow;
 
-    const USHORT		nWhichSort;
+    const sal_uInt16		nWhichSort;
     ScSortDlg*			pDlg;
     ScViewData*			pViewData;
     const ScSortParam&	rSortData;
     SCCOLROW			nFieldArr[SC_MAXFIELDS];
-    USHORT				nFieldCount;
+    sal_uInt16				nFieldCount;
     SCCOL				nFirstCol;
     SCROW				nFirstRow;
-    BOOL				bHasHeader;
-    BOOL				bSortByRows;
+    sal_Bool				bHasHeader;
+    sal_Bool				bSortByRows;
 
     ListBox*			aSortLbArr[3];
     RadioButton*		aDirBtnArr[3][2];
@@ -111,10 +111,10 @@ private:
 #ifdef _TPSORT_CXX
 private:
     void	Init			();
-    void	DisableField	( USHORT nField );
-    void	EnableField		( USHORT nField );
+    void	DisableField	( sal_uInt16 nField );
+    void	EnableField		( sal_uInt16 nField );
     void	FillFieldLists	();
-    USHORT	GetFieldSelPos	( SCCOLROW nField );
+    sal_uInt16	GetFieldSelPos	( SCCOLROW nField );
 
     // Handler ------------------------
     DECL_LINK( SelectHdl, ListBox * );
@@ -147,8 +147,8 @@ public:
 #define SfxTabPage ::SfxTabPage
     static	SfxTabPage*	Create		( Window*				pParent,
                                       const SfxItemSet& 	rArgSet );
-    static	USHORT*		GetRanges	();
-    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    static	sal_uInt16*		GetRanges	();
+    virtual	sal_Bool		FillItemSet	( SfxItemSet& rArgSet );
     virtual	void		Reset		( const SfxItemSet& rArgSet );
 
 protected:
@@ -189,7 +189,7 @@ private:
     String              aStrNoName;
     String              aStrAreaLabel;
 
-    const USHORT		nWhichSort;
+    const sal_uInt16		nWhichSort;
     const ScSortParam&	rSortData;
     ScViewData*			pViewData;
     ScDocument*			pDoc;
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index d02d3e22e..74ee2fce8 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -47,7 +47,7 @@ private:
             ~ScDocStatPage();
 
 protected:
-    virtual BOOL    FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool    FillItemSet( SfxItemSet& rSet );
     virtual void    Reset      ( const SfxItemSet& rSet );
 
 private:
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index b2f164d24..8ac8a9d33 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -47,16 +47,16 @@ class ScDocument;
 class ScTpSubTotalGroup : public SfxTabPage
 {
 protected:
-            ScTpSubTotalGroup( Window* pParent, USHORT nResId,
+            ScTpSubTotalGroup( Window* pParent, sal_uInt16 nResId,
                                const SfxItemSet& rArgSet );
 
 public:
     virtual ~ScTpSubTotalGroup();
 
-    static USHORT*	GetRanges		();
-    BOOL			DoReset			( USHORT			nGroupNo,
+    static sal_uInt16*	GetRanges		();
+    sal_Bool			DoReset			( sal_uInt16			nGroupNo,
                                       const SfxItemSet&	rArgSet  );
-    BOOL			DoFillItemSet	( USHORT		nGroupNo,
+    sal_Bool			DoFillItemSet	( sal_uInt16		nGroupNo,
                                       SfxItemSet&	rArgSet  );
 protected:
     FixedText		aFtGroup;
@@ -71,17 +71,17 @@ protected:
     ScViewData*				pViewData;
     ScDocument*				pDoc;
 
-    const USHORT			nWhichSubTotals;
+    const sal_uInt16			nWhichSubTotals;
     const ScSubTotalParam&	rSubTotalData;
     SCCOL					nFieldArr[SC_MAXFIELDS];
-    const USHORT			nFieldCount;
+    const sal_uInt16			nFieldCount;
 
 private:
     void 			Init			();
     void 			FillListBoxes	();
-    ScSubTotalFunc	LbPosToFunc		( USHORT nPos );
-    USHORT			FuncToLbPos		( ScSubTotalFunc eFunc );
-    USHORT			GetFieldSelPos	( SCCOL nField );
+    ScSubTotalFunc	LbPosToFunc		( sal_uInt16 nPos );
+    sal_uInt16			FuncToLbPos		( ScSubTotalFunc eFunc );
+    sal_uInt16			GetFieldSelPos	( SCCOL nField );
 
     // Handler ------------------------
     DECL_LINK( SelectHdl, ListBox * );
@@ -101,7 +101,7 @@ public:
 
     static	SfxTabPage*	Create		( Window*				pParent,
                                       const SfxItemSet& 	rArgSet );
-    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    virtual	sal_Bool		FillItemSet	( SfxItemSet& rArgSet );
     virtual	void		Reset		( const SfxItemSet& rArgSet );
 };
 
@@ -118,7 +118,7 @@ public:
 
     static	SfxTabPage*	Create		( Window*				pParent,
                                       const SfxItemSet& 	rArgSet );
-    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    virtual	sal_Bool		FillItemSet	( SfxItemSet& rArgSet );
     virtual	void		Reset		( const SfxItemSet& rArgSet );
 };
 
@@ -135,7 +135,7 @@ public:
 
     static	SfxTabPage*	Create		( Window*				pParent,
                                       const SfxItemSet& 	rArgSet );
-    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    virtual	sal_Bool		FillItemSet	( SfxItemSet& rArgSet );
     virtual	void		Reset		( const SfxItemSet& rArgSet );
 };
 
@@ -151,10 +151,10 @@ protected:
 public:
     virtual ~ScTpSubTotalOptions();
 
-    static USHORT*		GetRanges	();
+    static sal_uInt16*		GetRanges	();
     static SfxTabPage*	Create		( Window*				pParent,
                                       const SfxItemSet& 	rArgSet );
-    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    virtual	sal_Bool		FillItemSet	( SfxItemSet& rArgSet );
     virtual	void		Reset		( const SfxItemSet& rArgSet );
 
 private:
@@ -171,7 +171,7 @@ private:
 
     ScViewData*				pViewData;
     ScDocument*				pDoc;
-    const USHORT			nWhichSubTotals;
+    const sal_uInt16			nWhichSubTotals;
     const ScSubTotalParam&	rSubTotalData;
 
 private:
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 83a693eaa..ec8ec80d2 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -57,8 +57,8 @@ class ScTablePage : public SfxTabPage
 public:
     static	SfxTabPage*	Create			( Window*		 	pParent,
                                           const SfxItemSet&	rCoreSet );
-    static	USHORT*		GetRanges		();
-    virtual	BOOL		FillItemSet		( SfxItemSet& rCoreSet );
+    static	sal_uInt16*		GetRanges		();
+    virtual	sal_Bool		FillItemSet		( SfxItemSet& rCoreSet );
     virtual	void		Reset			( const SfxItemSet& rCoreSet );
     using SfxTabPage::DeactivatePage;
     virtual int			DeactivatePage	( SfxItemSet* pSet = NULL );
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index ff4e114dd..046eacf63 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -46,8 +46,8 @@ class ScTpUserLists : public SfxTabPage
 public:
     static	SfxTabPage*	Create			( Window*				pParent,
                                           const SfxItemSet& 	rAttrSet );
-    static	USHORT*		GetRanges		();
-    virtual	BOOL		FillItemSet		( SfxItemSet& rCoreAttrs );
+    static	sal_uInt16*		GetRanges		();
+    virtual	sal_Bool		FillItemSet		( SfxItemSet& rCoreAttrs );
     virtual	void		Reset			( const SfxItemSet& rCoreAttrs );
     using SfxTabPage::DeactivatePage;
     virtual int			DeactivatePage	( SfxItemSet* pSet = NULL );
@@ -78,7 +78,7 @@ private:
     const String	aStrCopyFrom;
     const String	aStrCopyErr;
 
-    const USHORT	nWhichUserLists;
+    const sal_uInt16	nWhichUserLists;
     ScUserList*		pUserLists;
 
     ScDocument*		pDoc;
@@ -86,20 +86,20 @@ private:
     ScRangeUtil*	pRangeUtil;
     String			aStrSelectedArea;
 
-    BOOL			bModifyMode;
-    BOOL			bCancelMode;
-    BOOL			bCopyDone;
-    USHORT			nCancelPos;
+    sal_Bool			bModifyMode;
+    sal_Bool			bCancelMode;
+    sal_Bool			bCopyDone;
+    sal_uInt16			nCancelPos;
 
 #ifdef _TPUSRLST_CXX
 private:
     void	Init				();
-    USHORT	UpdateUserListBox	();
-    void	UpdateEntries		( USHORT nList );
+    sal_uInt16	UpdateUserListBox	();
+    void	UpdateEntries		( sal_uInt16 nList );
     void	MakeListStr			( String& rListStr );
     void	AddNewList			( const String& rEntriesStr );
-    void	RemoveList			( USHORT nList );
-    void	ModifyList			( USHORT		nSelList,
+    void	RemoveList			( sal_uInt16 nList );
+    void	ModifyList			( sal_uInt16		nSelList,
                                   const String& rEntriesStr );
     void	CopyListFromArea	( const ScRefAddress& rStartPos,
                                   const ScRefAddress& rEndPos );
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 8556911f8..25c830a4c 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -99,7 +99,7 @@ class ScTpContentOptions : public SfxTabPage
 public:
     static	SfxTabPage*	Create			( Window*		 		pParent,
                                           const SfxItemSet&		rCoreSet );
-    virtual	BOOL		FillItemSet		( SfxItemSet& rCoreSet );
+    virtual	sal_Bool		FillItemSet		( SfxItemSet& rCoreSet );
     virtual	void		Reset			( const SfxItemSet& rCoreSet );
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
@@ -155,7 +155,7 @@ class ScTpLayoutOptions : public SfxTabPage
 public:
     static	SfxTabPage*	Create			( Window*		 		pParent,
                                           const SfxItemSet&		rCoreSet );
-    virtual	BOOL		FillItemSet		( SfxItemSet& rCoreSet );
+    virtual	sal_Bool		FillItemSet		( SfxItemSet& rCoreSet );
     virtual	void		Reset			( const SfxItemSet& rCoreSet );
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index c27b59f80..7ca354830 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -60,9 +60,9 @@ private:
     SCCOL							nDragHandleX;
     SCROW							nDragHandleY;
     SCTAB							nVisibleTab;
-    USHORT							nDragSourceFlags;
-    BOOL							bDragWasInternal;
-    BOOL							bUsedForLink;
+    sal_uInt16							nDragSourceFlags;
+    sal_Bool							bDragWasInternal;
+    sal_Bool							bUsedForLink;
     bool                            bHasFiltered;       // if has filtered rows
     bool                            bUseInApi;          // to recognize clipboard content copied from API
 
@@ -72,7 +72,7 @@ private:
                             ScDocument* pDestDoc=0,
                             SCCOL nSubX=0, SCROW nSubY=0 );
     static void PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPrintFactor,
-                            const ScRange& rBlock, BOOL bMetaFile );
+                            const ScRange& rBlock, sal_Bool bMetaFile );
     static void GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol );
 
 public:
@@ -92,7 +92,7 @@ public:
     SCCOL				GetDragHandleX() const	{ return nDragHandleX; }
     SCROW				GetDragHandleY() const	{ return nDragHandleY; }
     SCTAB				GetVisibleTab() const	{ return nVisibleTab; }
-    USHORT				GetDragSourceFlags() const	{ return nDragSourceFlags; }
+    sal_uInt16				GetDragSourceFlags() const	{ return nDragSourceFlags; }
     bool                HasFilteredRows() const { return bHasFiltered; }
     bool                GetUseInApi() const     { return bUseInApi; }
     ScDocShell*			GetSourceDocShell();
@@ -103,13 +103,13 @@ public:
     void				SetDragHandlePos( SCCOL nX, SCROW nY );
     void				SetVisibleTab( SCTAB nNew );
     void				SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark );
-    void				SetDragSourceFlags( USHORT nFlags );
+    void				SetDragSourceFlags( sal_uInt16 nFlags );
     void				SetDragWasInternal();
     SC_DLLPUBLIC void   SetUseInApi( bool bSet );
 
     static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( Window* pUIWin );
 
-    static SfxObjectShell*	SetDrawClipDoc( BOOL bAnyOle );		// update ScGlobal::pDrawClipDocShellRef
+    static SfxObjectShell*	SetDrawClipDoc( sal_Bool bAnyOle );		// update ScGlobal::pDrawClipDocShellRef
     virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException );
     static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 };
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 579f9dfa8..95241add4 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -54,7 +54,7 @@ class ScInputStatusItem : public SfxPoolItem
 
 public:
                             TYPEINFO();
-//UNUSED2008-05     		ScInputStatusItem( USHORT nWhich,
+//UNUSED2008-05     		ScInputStatusItem( sal_uInt16 nWhich,
 //UNUSED2008-05     						   SCTAB nTab,
 //UNUSED2008-05     						   SCCOL nCol, SCROW nRow,
 //UNUSED2008-05     						   SCCOL nStartCol, SCROW nStartRow,
@@ -62,7 +62,7 @@ public:
 //UNUSED2008-05     						   const String& rString,
 //UNUSED2008-05     						   const EditTextObject* pData );
 
-                            ScInputStatusItem( USHORT nWhich,
+                            ScInputStatusItem( sal_uInt16 nWhich,
                                                const ScAddress& rCurPos,
                                                const ScAddress& rStartPos,
                                                const ScAddress& rEndPos,
@@ -100,16 +100,16 @@ public:
 
 class ScTablesHint : public SfxHint
 {
-    USHORT nId;
+    sal_uInt16 nId;
     SCTAB nTab1;
     SCTAB nTab2;
 
 public:
                     TYPEINFO();
-                    ScTablesHint(USHORT nNewId, SCTAB nTable1, SCTAB nTable2=0);
+                    ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2=0);
                     ~ScTablesHint();
 
-    USHORT			GetId() const			{ return nId; }
+    sal_uInt16			GetId() const			{ return nId; }
     SCTAB			GetTab1() const			{ return nTab1; }
     SCTAB			GetTab2() const			{ return nTab2; }
 };
@@ -135,16 +135,16 @@ private:
 
 class ScIndexHint : public SfxHint
 {
-    USHORT nId;
-    USHORT nIndex;
+    sal_uInt16 nId;
+    sal_uInt16 nIndex;
 
 public:
                     TYPEINFO();
-                    ScIndexHint(USHORT nNewId, USHORT nIdx);
+                    ScIndexHint(sal_uInt16 nNewId, sal_uInt16 nIdx);
                     ~ScIndexHint();
 
-    USHORT			GetId() const			{ return nId; }
-    USHORT			GetIndex() const		{ return nIndex; }
+    sal_uInt16			GetId() const			{ return nId; }
+    sal_uInt16			GetIndex() const		{ return nIndex; }
 };
 
 //----------------------------------------------------------------------------
@@ -154,10 +154,10 @@ class SC_DLLPUBLIC ScSortItem : public SfxPoolItem
 {
 public:
                             TYPEINFO();
-                            ScSortItem( USHORT				nWhich,
+                            ScSortItem( sal_uInt16				nWhich,
                                         ScViewData*			ptrViewData,
                                         const ScSortParam*	pSortData );
-                            ScSortItem( USHORT				nWhich,
+                            ScSortItem( sal_uInt16				nWhich,
                                         const ScSortParam*	pSortData );
                             ScSortItem( const ScSortItem& rItem );
                             ~ScSortItem();
@@ -165,7 +165,7 @@ public:
     virtual String          GetValueText() const;
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const;
 
     ScViewData*			GetViewData () const { return pViewData; }
     const ScSortParam&	GetSortData	() const { return theSortData; }
@@ -182,10 +182,10 @@ class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem
 {
 public:
                             TYPEINFO();
-                            ScQueryItem( USHORT					nWhich,
+                            ScQueryItem( sal_uInt16					nWhich,
                                          ScViewData*			ptrViewData,
                                          const ScQueryParam*	pQueryData );
-                            ScQueryItem( USHORT					nWhich,
+                            ScQueryItem( sal_uInt16					nWhich,
                                          const ScQueryParam*	pQueryData );
                             ScQueryItem( const ScQueryItem& rItem );
                             ~ScQueryItem();
@@ -197,13 +197,13 @@ public:
     ScViewData*			GetViewData () const { return pViewData; }
     const ScQueryParam&	GetQueryData() const { return theQueryData; }
 
-    BOOL		GetAdvancedQuerySource(ScRange& rSource) const;
+    sal_Bool		GetAdvancedQuerySource(ScRange& rSource) const;
     void		SetAdvancedQuerySource(const ScRange* pSource);
 
 private:
     ScViewData* 	pViewData;
     ScQueryParam	theQueryData;
-    BOOL			bIsAdvanced;
+    sal_Bool			bIsAdvanced;
     ScRange			aAdvSource;
 };
 
@@ -214,10 +214,10 @@ class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScSubTotalItem( USHORT					nWhich,
+                ScSubTotalItem( sal_uInt16					nWhich,
                                 ScViewData*				ptrViewData,
                                 const ScSubTotalParam*	pSubTotalData );
-                ScSubTotalItem( USHORT					nWhich,
+                ScSubTotalItem( sal_uInt16					nWhich,
                                 const ScSubTotalParam*	pSubTotalData );
                 ScSubTotalItem( const ScSubTotalItem&	rItem );
                 ~ScSubTotalItem();
@@ -225,7 +225,7 @@ public:
     virtual String          GetValueText() const;
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const;
 
     ScViewData*				GetViewData () const { return pViewData; }
     const ScSubTotalParam&	GetSubTotalData() const { return theSubTotalData; }
@@ -242,7 +242,7 @@ class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScUserListItem( USHORT nWhich );
+                ScUserListItem( sal_uInt16 nWhich );
                 ScUserListItem( const ScUserListItem& rItem );
                 ~ScUserListItem();
 
@@ -264,7 +264,7 @@ class ScConsolidateItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScConsolidateItem( USHORT					 nWhich,
+                ScConsolidateItem( sal_uInt16					 nWhich,
                                    const ScConsolidateParam* pParam );
                 ScConsolidateItem( const ScConsolidateItem&	rItem );
                 ~ScConsolidateItem();
@@ -286,8 +286,8 @@ class ScPivotItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScPivotItem( USHORT nWhich, const ScDPSaveData* pData,
-                             const ScRange* pRange, BOOL bNew );
+                ScPivotItem( sal_uInt16 nWhich, const ScDPSaveData* pData,
+                             const ScRange* pRange, sal_Bool bNew );
                 ScPivotItem( const ScPivotItem&	rItem );
                 ~ScPivotItem();
 
@@ -297,12 +297,12 @@ public:
 
     const ScDPSaveData& GetData() const			{ return *pSaveData; }
     const ScRange&		GetDestRange() const	{ return aDestRange; }
-    BOOL				IsNewSheet() const		{ return bNewSheet; }
+    sal_Bool				IsNewSheet() const		{ return bNewSheet; }
 
 private:
     ScDPSaveData*	pSaveData;
     ScRange			aDestRange;
-    BOOL			bNewSheet;
+    sal_Bool			bNewSheet;
 };
 
 //----------------------------------------------------------------------------
@@ -312,7 +312,7 @@ class ScSolveItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScSolveItem( USHORT				 nWhich,
+                ScSolveItem( sal_uInt16				 nWhich,
                              const ScSolveParam* pParam );
                 ScSolveItem( const ScSolveItem&	rItem );
                 ~ScSolveItem();
@@ -334,7 +334,7 @@ class ScTabOpItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScTabOpItem( USHORT				 nWhich,
+                ScTabOpItem( sal_uInt16				 nWhich,
                              const ScTabOpParam* pParam );
                 ScTabOpItem( const ScTabOpItem&	rItem );
                 ~ScTabOpItem();
@@ -356,7 +356,7 @@ class ScCondFrmtItem : public SfxPoolItem
 {
 public:
                 TYPEINFO();
-                ScCondFrmtItem( USHORT nWhich,
+                ScCondFrmtItem( sal_uInt16 nWhich,
 //!								const ScConditionalFormat* pCondFrmt );
                                 const ScConditionalFormat& rCondFrmt );
                 ScCondFrmtItem( const ScCondFrmtItem& rItem );
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 4bb22d42f..a29fd2253 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -31,6 +31,7 @@
 #include <svl/undo.hxx>
 #include "global.hxx"
 #include "address.hxx"
+#include "docsh.hxx"
 
 class ScDocument;
 class ScDocShell;
@@ -47,12 +48,16 @@ public:
                     ScSimpleUndo( ScDocShell* pDocSh );
     virtual 		~ScSimpleUndo();
 
-    virtual BOOL	Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool	Merge( SfxUndoAction *pNextAction );
 
 protected:
     ScDocShell*		pDocShell;
     SfxUndoAction*	pDetectiveUndo;
 
+    bool            IsPaintLocked() const { return pDocShell->IsPaintLocked(); }
+
+    bool            SetViewMarkData( const ScMarkData& rMarkData );
+
     void			BeginUndo();
     void			EndUndo();
     void			BeginRedo();
@@ -84,7 +89,7 @@ protected:
 //	void			BeginRedo();
     void			EndRedo();
 
-    BOOL			AdjustHeight();
+    sal_Bool			AdjustHeight();
     void			ShowBlock();
 };
 
@@ -154,16 +159,16 @@ public:
     SfxUndoAction*          GetWrappedUndo()        { return pWrappedUndo; }
     void                    ForgetWrappedUndo();
 
-    virtual BOOL            IsLinked();
-    virtual void            SetLinked( BOOL bIsLinked );
+    virtual sal_Bool            IsLinked();
+    virtual void            SetLinked( sal_Bool bIsLinked );
     virtual void            Undo();
     virtual void            Redo();
     virtual void            Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL            CanRepeat(SfxRepeatTarget& rTarget) const;
-    virtual BOOL            Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool            CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool            Merge( SfxUndoAction *pNextAction );
     virtual String          GetComment() const;
     virtual String          GetRepeatComment(SfxRepeatTarget&) const;
-    virtual USHORT          GetId() const;
+    virtual sal_uInt16          GetId() const;
 };
 
 
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 350a41620..2e0ef16ec 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -54,29 +54,29 @@ public:
                     ScUndoInsertCells( ScDocShell* pNewDocShell,
                                        const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
                                        InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
-                                       BOOL bNewPartOfPaste );
+                                       sal_Bool bNewPartOfPaste );
     virtual			~ScUndoInsertCells();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat( SfxRepeatTarget& rTarget );
-    virtual BOOL	CanRepeat( SfxRepeatTarget& rTarget ) const;
+    virtual sal_Bool	CanRepeat( SfxRepeatTarget& rTarget ) const;
 
     virtual String	GetComment() const;
 
-    virtual BOOL	Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool	Merge( SfxUndoAction *pNextAction );
 
 private:
     ScRange			aEffRange;
     SCTAB           nCount;
     SCTAB*          pTabs;
     SCTAB*          pScenarios;
-    ULONG			nEndChangeAction;
+    sal_uLong			nEndChangeAction;
     InsCellCmd		eCmd;
-    BOOL			bPartOfPaste;
+    sal_Bool			bPartOfPaste;
     SfxUndoAction*	pPasteUndo;
 
-    void			DoChange ( const BOOL bUndo );
+    void			DoChange ( const sal_Bool bUndo );
     void			SetChangeTrack();
 };
 
@@ -93,7 +93,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -102,11 +102,11 @@ private:
     SCTAB           nCount;
     SCTAB*          pTabs;
     SCTAB*          pScenarios;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
     DelCellCmd		eCmd;
 
-    void			DoChange ( const BOOL bUndo );
+    void			DoChange ( const sal_Bool bUndo );
     void			SetChangeTrack();
 };
 
@@ -116,7 +116,7 @@ class ScUndoDeleteMulti: public ScMoveUndo
 public:
                     TYPEINFO();
                     ScUndoDeleteMulti( ScDocShell* pNewDocShell,
-                                       BOOL bNewRows, BOOL bNeedsRefresh, SCTAB nNewTab,
+                                       sal_Bool bNewRows, sal_Bool bNeedsRefresh, SCTAB nNewTab,
                                        const SCCOLROW* pRng, SCCOLROW nRngCnt,
                                        ScDocument* pUndoDocument, ScRefUndoData* pRefData );
     virtual			~ScUndoDeleteMulti();
@@ -124,18 +124,18 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
-    BOOL			bRows;
-    BOOL            bRefresh;
+    sal_Bool			bRows;
+    sal_Bool            bRefresh;
     SCTAB			nTab;
     SCCOLROW*		pRanges;
     SCCOLROW		nRangeCnt;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
 
     void			DoChange() const;
     void			SetChangeTrack();
@@ -156,7 +156,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -164,27 +164,27 @@ private:
     ScMarkData      aMarkData;
     ScDocument*		pUndoDoc;
     ScRange			aExtendedRange;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
 
-    void			DoChange( const BOOL bUndo );
+    void			DoChange( const sal_Bool bUndo );
     void			SetChangeTrack();
 };
 
 
 struct ScUndoPasteOptions
 {
-    USHORT nFunction;
-    BOOL bSkipEmpty;
-    BOOL bTranspose;
-    BOOL bAsLink;
+    sal_uInt16 nFunction;
+    sal_Bool bSkipEmpty;
+    sal_Bool bTranspose;
+    sal_Bool bAsLink;
     InsCellCmd eMoveMode;
 
     ScUndoPasteOptions() :
         nFunction( PASTE_NOFUNC ),
-        bSkipEmpty( FALSE ),
-        bTranspose( FALSE ),
-        bAsLink( FALSE ),
+        bSkipEmpty( sal_False ),
+        bTranspose( sal_False ),
+        bAsLink( sal_False ),
         eMoveMode( INS_NONE )
     {}
 };
@@ -198,16 +198,16 @@ public:
                                  SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                                  const ScMarkData& rMark,
                                  ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                                 USHORT nNewFlags,
+                                 sal_uInt16 nNewFlags,
                                  ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3,
-                                 BOOL bRedoIsFilled = TRUE,
+                                 sal_Bool bRedoIsFilled = sal_True,
                                  const ScUndoPasteOptions* pOptions = NULL );
     virtual 		~ScUndoPaste();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -215,15 +215,15 @@ private:
     ScMarkData		aMarkData;
     ScDocument*		pUndoDoc;
     ScDocument*		pRedoDoc;
-    USHORT			nFlags;
+    sal_uInt16			nFlags;
     ScRefUndoData*	pRefUndoData;
     ScRefUndoData*	pRefRedoData;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
-    BOOL			bRedoFilled;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
+    sal_Bool			bRedoFilled;
     ScUndoPasteOptions aPasteOptions;
 
-    void			DoChange( const BOOL bUndo );
+    void			DoChange( const sal_Bool bUndo );
     void			SetChangeTrack();
 };
 
@@ -233,27 +233,27 @@ class ScUndoDragDrop: public ScMoveUndo
 public:
                     TYPEINFO();
                     ScUndoDragDrop( ScDocShell* pNewDocShell,
-                                    const ScRange& rRange, ScAddress aNewDestPos, BOOL bNewCut,
+                                    const ScRange& rRange, ScAddress aNewDestPos, sal_Bool bNewCut,
                                     ScDocument* pUndoDocument, ScRefUndoData* pRefData,
-                                    BOOL bScenario );
+                                    sal_Bool bScenario );
     virtual 		~ScUndoDragDrop();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     ScRange			aSrcRange;
     ScRange			aDestRange;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
-    BOOL			bCut;
-    BOOL			bKeepScenarioFlags;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
+    sal_Bool			bCut;
+    sal_Bool			bKeepScenarioFlags;
 
-    void			PaintArea( ScRange aRange, USHORT nExtFlags ) const;
+    void			PaintArea( ScRange aRange, sal_uInt16 nExtFlags ) const;
     void			DoUndo( ScRange aRange ) const;
 
     void			SetChangeTrack();
@@ -267,14 +267,14 @@ public:
                     ScUndoDeleteContents( ScDocShell* pNewDocShell,
                                           const ScMarkData& rMark,
                                           const ScRange& rRange,
-                                          ScDocument* pNewUndoDoc, BOOL bNewMulti,
-                                          USHORT nNewFlags, BOOL bObjects );
+                                          ScDocument* pNewUndoDoc, sal_Bool bNewMulti,
+                                          sal_uInt16 nNewFlags, sal_Bool bObjects );
     virtual 		~ScUndoDeleteContents();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -283,12 +283,12 @@ private:
     ScMarkData		aMarkData;
     ScDocument*		pUndoDoc;		// Blockmarkierung und geloeschte Daten
     SdrUndoAction*	pDrawUndo;		// geloeschte Objekte
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
-    USHORT			nFlags;
-    BOOL			bMulti;			// Mehrfachselektion
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
+    sal_uInt16			nFlags;
+    sal_Bool			bMulti;			// Mehrfachselektion
 
-    void			DoChange( const BOOL bUndo );
+    void			DoChange( const sal_Bool bUndo );
     void			SetChangeTrack();
 };
 
@@ -301,14 +301,14 @@ public:
                                      const ScMarkData& rMark,
                                      SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                                      SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                                     ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc,
-                                     USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink );
+                                     ScDocument* pNewUndoDoc, sal_Bool bNewMulti, SCTAB nSrc,
+                                     sal_uInt16 nFlg, sal_uInt16 nFunc, sal_Bool bSkip, sal_Bool bLink );
     virtual			~ScUndoFillTable();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -316,16 +316,16 @@ private:
     ScRange			aRange;
     ScMarkData		aMarkData;
     ScDocument*		pUndoDoc;		// Blockmarkierung und geloeschte Daten
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
-    USHORT			nFlags;
-    USHORT			nFunction;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
+    sal_uInt16			nFlags;
+    sal_uInt16			nFunction;
     SCTAB			nSrcTab;
-    BOOL			bMulti;			// Mehrfachselektion
-    BOOL			bSkipEmpty;
-    BOOL			bAsLink;
+    sal_Bool			bMulti;			// Mehrfachselektion
+    sal_Bool			bSkipEmpty;
+    sal_Bool			bAsLink;
 
-    void			DoChange( const BOOL bUndo );
+    void			DoChange( const sal_Bool bUndo );
     void			SetChangeTrack();
 };
 
@@ -338,7 +338,7 @@ public:
                                          const ScMarkData& rMark,
                                          SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                                          SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                                         ScDocument* pNewUndoDoc, BOOL bNewMulti,
+                                         ScDocument* pNewUndoDoc, sal_Bool bNewMulti,
                                          const ScPatternAttr* pNewApply,
                                          const SvxBoxItem* pNewOuter = NULL,
                                          const SvxBoxInfoItem* pNewInner = NULL );
@@ -347,7 +347,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -355,12 +355,12 @@ private:
     ScMarkData		aMarkData;
     ScRange			aRange;
     ScDocument*		pUndoDoc;
-    BOOL			bMulti;
+    sal_Bool			bMulti;
     ScPatternAttr*	pApplyPattern;
     SvxBoxItem*		pLineOuter;
     SvxBoxInfoItem*	pLineInner;
 
-    void			DoChange( const BOOL bUndo );
+    void			DoChange( const sal_Bool bUndo );
 };
 
 
@@ -375,14 +375,14 @@ public:
                                     ScDocument* pNewUndoDoc,
                                     SCCOLROW nNewCnt, SCCOLROW* pNewRanges,
                                     ScOutlineTable* pNewUndoTab,
-                                    ScSizeMode eNewMode, USHORT nNewSizeTwips,
-                                    BOOL bNewWidth );
+                                    ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips,
+                                    sal_Bool bNewWidth );
     virtual 				~ScUndoWidthOrHeight();
 
     virtual void			Undo();
     virtual void			Redo();
     virtual void			Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL			CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool			CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String          GetComment() const;
 
@@ -396,8 +396,8 @@ private:
     ScOutlineTable*	pUndoTab;
     SCCOLROW		nRangeCnt;
     SCCOLROW*		pRanges;
-    USHORT			nNewSize;
-    BOOL			bWidth;
+    sal_uInt16			nNewSize;
+    sal_Bool			bWidth;
     ScSizeMode		eMode;
     SdrUndoAction*	pDrawUndo;
 };
@@ -413,13 +413,13 @@ public:
                                     FillDir eNewFillDir,
                                     FillCmd eNewFillCmd, FillDateCmd eNewFillDateCmd,
                                     double fNewStartValue, double fNewStepValue, double fNewMaxValue,
-                                    USHORT nMaxShIndex );
+                                    sal_uInt16 nMaxShIndex );
     virtual 		~ScUndoAutoFill();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -433,9 +433,9 @@ private:
     double			fStartValue;
     double			fStepValue;
     double			fMaxValue;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
-    USHORT			nMaxSharedIndex;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
+    sal_uInt16			nMaxSharedIndex;
 
     void			SetChangeTrack();
 };
@@ -454,7 +454,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -475,21 +475,21 @@ public:
                     ScUndoAutoFormat( ScDocShell* pNewDocShell,
                                       const ScRange& rRange, ScDocument* pNewUndoDoc,
                                       const ScMarkData& rMark,
-                                      BOOL bNewSize, USHORT nNewFormatNo );
+                                      sal_Bool bNewSize, sal_uInt16 nNewFormatNo );
     virtual 		~ScUndoAutoFormat();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     ScDocument*		pUndoDoc;		// geloeschte Daten
     ScMarkData		aMarkData;
-    BOOL			bSize;
-    USHORT			nFormatNo;
+    sal_Bool			bSize;
+    sal_uInt16			nFormatNo;
 };
 
 
@@ -507,7 +507,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -517,8 +517,8 @@ private:
     String			aUndoStr;			// Daten bei Einfachmarkierung
     ScDocument*		pUndoDoc;			// Blockmarkierung und geloeschte Daten
     SvxSearchItem*	pSearchItem;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
 
             void	SetChangeTrack();
 };
@@ -536,13 +536,13 @@ public:
                                  const ScRefAddress& rFormulaEnd,
                                  const ScRefAddress& rRowCell,
                                  const ScRefAddress& rColCell,
-                                 BYTE nMode );
+                                 sal_uInt8 nMode );
     virtual			~ScUndoTabOp();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -553,7 +553,7 @@ private:
     ScRefAddress	theFormulaEnd;
     ScRefAddress	theRowCell;
     ScRefAddress	theColCell;
-    BYTE			nMode;
+    sal_uInt8			nMode;
 };
 
 
@@ -572,7 +572,7 @@ public:
     virtual void            Undo();
     virtual void            Redo();
     virtual void            Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL            CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool            CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String          GetComment() const;
 
@@ -582,8 +582,8 @@ private:
     ScDocument*             pUndoDoc;           // Blockmarkierung und geloeschte Daten
     ScAddress               aNewCursorPos;
     ScDocument*             pRedoDoc;           // Blockmarkierung und neue Daten
-    ULONG                   nStartChangeAction;
-    ULONG                   nEndChangeAction;
+    sal_uLong                   nStartChangeAction;
+    sal_uLong                   nEndChangeAction;
     ScConversionParam       maConvParam;        /// Conversion type and parameters.
 
     void                    DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos );
@@ -596,13 +596,13 @@ public:
                         TYPEINFO();
                         ScUndoRefConversion( ScDocShell* pNewDocShell,
                             const ScRange& aMarkRange, const ScMarkData& rMark,
-                            ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, BOOL bNewMulti, USHORT nNewFlag);
+                            ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_Bool bNewMulti, sal_uInt16 nNewFlag);
     virtual             ~ScUndoRefConversion();
 
     virtual void        Undo();
     virtual void        Redo();
     virtual void        Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL        CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool        CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String      GetComment() const;
 
@@ -611,10 +611,10 @@ private:
     ScDocument*         pUndoDoc;
     ScDocument*         pRedoDoc;
     ScRange             aRange;
-    BOOL                bMulti;
-    USHORT              nFlags;
-    ULONG               nStartChangeAction;
-    ULONG               nEndChangeAction;
+    sal_Bool                bMulti;
+    sal_uInt16              nFlags;
+    sal_uLong               nStartChangeAction;
+    sal_uLong               nEndChangeAction;
 
     void                DoChange( ScDocument* pRefDoc);
     void                SetChangeTrack();
@@ -632,7 +632,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -657,7 +657,7 @@ public:
     virtual void			Undo();
     virtual void			Redo();
     virtual void			Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL			CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool			CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String          GetComment() const;
 
@@ -683,10 +683,10 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
-    virtual USHORT	GetId() const;
+    virtual sal_uInt16	GetId() const;
 
 private:
     ScMarkData		aMarkData;
@@ -694,7 +694,7 @@ private:
     String			aStyleName;
     ScRange			aRange;
 
-    void			DoChange( const BOOL bUndo );
+    void			DoChange( const sal_Bool bUndo );
 };
 
 
@@ -709,7 +709,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -732,7 +732,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -740,8 +740,8 @@ private:
     ScDocument*		pUndoDoc;
     String			aFormula;
     formula::FormulaGrammar::AddressConvention eConv;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
 
     void			SetChangeTrack();
 };
@@ -755,13 +755,13 @@ public:
                                           const String& rDoc,
                                           const String& rFlt, const String& rOpt,
                                           const String& rArea, const ScRange& rDestRange,
-                                          ULONG nRefreshDelay );
+                                          sal_uLong nRefreshDelay );
     virtual			~ScUndoInsertAreaLink();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -771,7 +771,7 @@ private:
     String			aOptions;
     String			aAreaName;
     ScRange			aRange;
-    ULONG			nRefreshDelay;
+    sal_uLong			nRefreshDelay;
 };
 
 
@@ -783,13 +783,13 @@ public:
                                           const String& rDoc,
                                           const String& rFlt, const String& rOpt,
                                           const String& rArea, const ScRange& rDestRange,
-                                          ULONG nRefreshDelay );
+                                          sal_uLong nRefreshDelay );
     virtual			~ScUndoRemoveAreaLink();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -799,7 +799,7 @@ private:
     String			aOptions;
     String			aAreaName;
     ScRange			aRange;
-    ULONG			nRefreshDelay;
+    sal_uLong			nRefreshDelay;
 };
 
 
@@ -811,19 +811,19 @@ public:
                                           const String& rOldD,
                                           const String& rOldF, const String& rOldO,
                                           const String& rOldA, const ScRange& rOldR,
-                                          ULONG nOldRD,
+                                          sal_uLong nOldRD,
                                           const String& rNewD,
                                           const String& rNewF, const String& rNewO,
                                           const String& rNewA, const ScRange& rNewR,
-                                          ULONG nNewRD,
+                                          sal_uLong nNewRD,
                                           ScDocument* pUndo, ScDocument* pRedo,
-                                          BOOL bDoInsert );
+                                          sal_Bool bDoInsert );
     virtual			~ScUndoUpdateAreaLink();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -840,11 +840,11 @@ private:
     ScRange			aNewRange;
     ScDocument*		pUndoDoc;
     ScDocument*		pRedoDoc;
-    ULONG			nOldRefresh;
-    ULONG			nNewRefresh;
-    BOOL			bWithInsert;
+    sal_uLong			nOldRefresh;
+    sal_uLong			nNewRefresh;
+    sal_Bool			bWithInsert;
 
-    void			DoChange( const BOOL bUndo ) const;
+    void			DoChange( const sal_Bool bUndo ) const;
 };
 
 
@@ -853,20 +853,20 @@ class ScUndoIndent: public ScBlockUndo
 public:
                     TYPEINFO();
                     ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark,
-                                    ScDocument* pNewUndoDoc, BOOL bIncrement );
+                                    ScDocument* pNewUndoDoc, sal_Bool bIncrement );
     virtual 		~ScUndoIndent();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     ScMarkData		aMarkData;
     ScDocument*		pUndoDoc;
-    BOOL			bIsIncrement;
+    sal_Bool			bIsIncrement;
 };
 
 
@@ -881,7 +881,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -897,20 +897,20 @@ class ScUndoClearItems: public ScBlockUndo
 public:
                     TYPEINFO();
                     ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
-                                        ScDocument* pNewUndoDoc, const USHORT* pW );
+                                        ScDocument* pNewUndoDoc, const sal_uInt16* pW );
     virtual 		~ScUndoClearItems();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     ScMarkData		aMarkData;
     ScDocument*		pUndoDoc;
-    USHORT*			pWhich;
+    sal_uInt16*			pWhich;
 };
 
 
@@ -925,7 +925,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -947,7 +947,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -970,7 +970,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 8bded7d83..88621e89a 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -49,13 +49,13 @@ public:
                     ScUndoCursorAttr( ScDocShell* pNewDocShell,
                             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                             const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
-                            const ScPatternAttr* pApplyPat, BOOL bAutomatic );
+                            const ScPatternAttr* pApplyPat, sal_Bool bAutomatic );
     virtual 		~ScUndoCursorAttr();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -66,7 +66,7 @@ private:
     ScPatternAttr*	pOldPattern;
     ScPatternAttr*	pNewPattern;
     ScPatternAttr*	pApplyPattern;
-    BOOL			bIsAutomatic;
+    sal_Bool			bIsAutomatic;
 
     void			DoChange( const ScPatternAttr* pWhichPattern ) const;
 };
@@ -79,14 +79,14 @@ public:
                     ScUndoEnterData( ScDocShell* pNewDocShell,
                             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
                             SCTAB nNewCount, SCTAB* pNewTabs,
-                            ScBaseCell** ppOldData, BOOL* pHasForm, ULONG* pOldForm,
+                            ScBaseCell** ppOldData, sal_Bool* pHasForm, sal_uLong* pOldForm,
                             const String& rNewStr, EditTextObject* pObj = NULL );
     virtual 		~ScUndoEnterData();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -94,10 +94,10 @@ private:
     String			aNewString;
     SCTAB*			pTabs;
     ScBaseCell**	ppOldCells;
-    BOOL*			pHasFormat;
-    ULONG*			pOldFormats;
+    sal_Bool*			pHasFormat;
+    sal_uLong*			pOldFormats;
     EditTextObject*	pNewEditData;
-    ULONG			nEndChangeAction;
+    sal_uLong			nEndChangeAction;
     SCCOL			nCol;
     SCROW			nRow;
     SCTAB			nTab;
@@ -114,13 +114,13 @@ public:
                     TYPEINFO();
                     ScUndoEnterValue( ScDocShell* pNewDocShell,
                             const ScAddress& rNewPos,
-                            ScBaseCell* pUndoCell, double nVal, BOOL bHeight );
+                            ScBaseCell* pUndoCell, double nVal, sal_Bool bHeight );
     virtual 		~ScUndoEnterValue();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -128,8 +128,8 @@ private:
     ScAddress		aPos;
     ScBaseCell*		pOldCell;
     double			nValue;
-    ULONG			nEndChangeAction;
-    BOOL			bNeedHeight;
+    sal_uLong			nEndChangeAction;
+    sal_Bool			bNeedHeight;
 
     void			SetChangeTrack();
 };
@@ -141,13 +141,13 @@ public:
                     TYPEINFO();
                     ScUndoPutCell( ScDocShell* pNewDocShell,
                             const ScAddress& rNewPos,
-                            ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, BOOL bHeight );
+                            ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, sal_Bool bHeight );
     virtual 		~ScUndoPutCell();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -155,8 +155,8 @@ private:
     ScAddress		aPos;
     ScBaseCell*		pOldCell;
     ScBaseCell*		pEnteredCell;
-    ULONG			nEndChangeAction;
-    BOOL			bNeedHeight;
+    sal_uLong			nEndChangeAction;
+    sal_Bool			bNeedHeight;
 
     void			SetChangeTrack();
 };
@@ -168,13 +168,13 @@ public:
                     TYPEINFO();
                     ScUndoPageBreak( ScDocShell* pNewDocShell,
                             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
-                            BOOL bNewColumn, BOOL bNewInsert );
+                            sal_Bool bNewColumn, sal_Bool bNewInsert );
     virtual 		~ScUndoPageBreak();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -182,10 +182,10 @@ private:
     SCCOL			nCol;
     SCROW			nRow;
     SCTAB			nTab;
-    BOOL			bColumn;		// Spalten- oder Zeilenumbruch
-    BOOL			bInsert;		// Einfuegen oder Loeschen
+    sal_Bool			bColumn;		// Spalten- oder Zeilenumbruch
+    sal_Bool			bInsert;		// Einfuegen oder Loeschen
 
-    void			DoChange( BOOL bInsert ) const;
+    void			DoChange( sal_Bool bInsert ) const;
 };
 
 class ScUndoPrintZoom: public ScSimpleUndo
@@ -193,24 +193,24 @@ class ScUndoPrintZoom: public ScSimpleUndo
 public:
                     TYPEINFO();
                     ScUndoPrintZoom( ScDocShell* pNewDocShell, SCTAB nT,
-                                    USHORT nOS, USHORT nOP, USHORT nNS, USHORT nNP );
+                                    sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP );
     virtual 		~ScUndoPrintZoom();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     SCTAB			nTab;
-    USHORT			nOldScale;
-    USHORT			nOldPages;
-    USHORT			nNewScale;
-    USHORT			nNewPages;
+    sal_uInt16			nOldScale;
+    sal_uInt16			nOldPages;
+    sal_uInt16			nNewScale;
+    sal_uInt16			nNewPages;
 
-    void			DoChange( BOOL bUndo );
+    void			DoChange( sal_Bool bUndo );
 };
 
 class ScUndoThesaurus: public ScSimpleUndo
@@ -226,7 +226,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -238,9 +238,9 @@ private:
     EditTextObject* pUndoTObject;		//       bei EditZelle
     String			aRedoStr;
     EditTextObject* pRedoTObject;
-    ULONG			nEndChangeAction;
+    sal_uLong			nEndChangeAction;
 
-    void			DoChange( BOOL bUndo, const String& rStr,
+    void			DoChange( sal_Bool bUndo, const String& rStr,
                                 const EditTextObject* pTObj );
     void			SetChangeTrack( ScBaseCell* pOldCell );
 };
@@ -274,7 +274,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat( SfxRepeatTarget& rTarget );
-    virtual BOOL    CanRepeat( SfxRepeatTarget& rTarget ) const;
+    virtual sal_Bool    CanRepeat( SfxRepeatTarget& rTarget ) const;
 
     virtual String  GetComment() const;
 
@@ -302,7 +302,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat( SfxRepeatTarget& rTarget );
-    virtual BOOL	CanRepeat( SfxRepeatTarget& rTarget ) const;
+    virtual sal_Bool	CanRepeat( SfxRepeatTarget& rTarget ) const;
 
     virtual String	GetComment() const;
 
@@ -325,14 +325,14 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
-    BOOL			bIsDelete;
+    sal_Bool			bIsDelete;
     ScDetOpList*	pOldList;
-    USHORT			nAction;
+    sal_uInt16			nAction;
     ScAddress		aPos;
     SdrUndoAction*	pDrawUndo;
 };
@@ -349,7 +349,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -357,7 +357,7 @@ private:
     ScRangeName*	pOldRanges;
     ScRangeName*	pNewRanges;
 
-    void			DoChange( BOOL bUndo );
+    void			DoChange( sal_Bool bUndo );
 };
 
 
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 81da22ed9..560010845 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -53,14 +53,14 @@ public:
                     TYPEINFO();
                     ScUndoDoOutline( ScDocShell* pNewDocShell,
                             SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
-                            ScDocument* pNewUndoDoc, BOOL bNewColumns,
-                            USHORT nNewLevel, USHORT nNewEntry, BOOL bNewShow );
+                            ScDocument* pNewUndoDoc, sal_Bool bNewColumns,
+                            sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, sal_Bool bNewShow );
     virtual 		~ScUndoDoOutline();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -69,10 +69,10 @@ private:
     SCCOLROW		nEnd;
     SCTAB			nTab;
     ScDocument*		pUndoDoc;
-    BOOL			bColumns;
-    USHORT			nLevel;
-    USHORT			nEntry;
-    BOOL			bShow;
+    sal_Bool			bColumns;
+    sal_uInt16			nLevel;
+    sal_uInt16			nEntry;
+    sal_Bool			bShow;
 };
 
 
@@ -84,13 +84,13 @@ public:
                             SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                             SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                             ScOutlineTable* pNewUndoTab,
-                            BOOL bNewColumns, BOOL bNewMake );
+                            sal_Bool bNewColumns, sal_Bool bNewMake );
     virtual 		~ScUndoMakeOutline();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -98,8 +98,8 @@ private:
     ScAddress		aBlockStart;
     ScAddress		aBlockEnd;
     ScOutlineTable*	pUndoTable;
-    BOOL			bColumns;
-    BOOL			bMake;
+    sal_Bool			bColumns;
+    sal_Bool			bMake;
 };
 
 
@@ -110,13 +110,13 @@ public:
                     ScUndoOutlineLevel( ScDocShell* pNewDocShell,
                             SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
                             ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
-                            BOOL bNewColumns, USHORT nNewLevel );
+                            sal_Bool bNewColumns, sal_uInt16 nNewLevel );
     virtual 		~ScUndoOutlineLevel();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -126,8 +126,8 @@ private:
     SCTAB			nTab;
     ScDocument*		pUndoDoc;
     ScOutlineTable*	pUndoTable;
-    BOOL			bColumns;
-    USHORT			nLevel;
+    sal_Bool			bColumns;
+    sal_uInt16			nLevel;
 };
 
 
@@ -139,13 +139,13 @@ public:
                             SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                             SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                             ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
-                            BOOL bNewShow );
+                            sal_Bool bNewShow );
     virtual 		~ScUndoOutlineBlock();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -154,7 +154,7 @@ private:
     ScAddress		aBlockEnd;
     ScDocument*		pUndoDoc;
     ScOutlineTable*	pUndoTable;
-    BOOL			bShow;
+    sal_Bool			bShow;
 };
 
 
@@ -171,7 +171,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -196,7 +196,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -222,7 +222,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -244,24 +244,24 @@ public:
                     TYPEINFO();
                     ScUndoSort( ScDocShell* pNewDocShell, SCTAB nNewTab,
                             const ScSortParam& rParam,
-                            BOOL bQuery, ScDocument* pNewUndoDoc,
+                            sal_Bool bQuery, ScDocument* pNewUndoDoc,
                             ScDBCollection* pNewUndoDB, const ScRange* pDest = NULL );
     virtual 		~ScUndoSort();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     SCTAB			nTab;
     ScSortParam		aSortParam;
-    BOOL			bRepeatQuery;
+    sal_Bool			bRepeatQuery;
     ScDocument*		pUndoDoc;
     ScDBCollection*	pUndoDB;				// wegen Quell- und Zielbereich
-    BOOL			bDestArea;
+    sal_Bool			bDestArea;
     ScRange			aDestRange;
 };
 
@@ -273,13 +273,13 @@ public:
                     ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab,
                             const ScQueryParam& rParam, ScDocument* pNewUndoDoc,
                             ScDBCollection* pNewUndoDB, const ScRange* pOld,
-                            BOOL bSize, const ScRange* pAdvSrc );
+                            sal_Bool bSize, const ScRange* pAdvSrc );
     virtual 		~ScUndoQuery();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -291,9 +291,9 @@ private:
     ScDBCollection*	pUndoDB;				// wegen Quell- und Zielbereich
     ScRange			aOldDest;
     ScRange			aAdvSource;
-    BOOL			bIsAdvanced;
-    BOOL			bDestArea;
-    BOOL			bDoSize;
+    sal_Bool			bIsAdvanced;
+    sal_Bool			bDestArea;
+    sal_Bool			bDoSize;
 };
 
 
@@ -301,20 +301,20 @@ class ScUndoAutoFilter: public ScDBFuncUndo
 {
 private:
     String          aDBName;
-    BOOL            bFilterSet;
+    sal_Bool            bFilterSet;
 
-    void            DoChange( BOOL bUndo );
+    void            DoChange( sal_Bool bUndo );
 
 public:
                     TYPEINFO();
                     ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange,
-                            const String& rName, BOOL bSet );
+                            const String& rName, sal_Bool bSet );
     virtual         ~ScUndoAutoFilter();
 
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String  GetComment() const;
 };
@@ -331,7 +331,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -355,7 +355,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -369,7 +369,7 @@ private:
     ScDBData*		pUndoDBData;
     ScDBData*		pRedoDBData;
     SCCOL			nFormulaCols;
-    BOOL			bRedoFilled;
+    sal_Bool			bRedoFilled;
 };
 
 
@@ -388,7 +388,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -403,7 +403,7 @@ private:
     ScDBCollection*	pUndoDB;
     ScRange			aOldQuery;
     ScRange			aNewQuery;
-    BOOL			bQuerySize;
+    sal_Bool			bQuerySize;
 };
 
 //UNUSED2008-05  class ScUndoPivot: public ScSimpleUndo
@@ -419,7 +419,7 @@ private:
 //UNUSED2008-05      virtual void    Undo();
 //UNUSED2008-05      virtual void    Redo();
 //UNUSED2008-05      virtual void    Repeat(SfxRepeatTarget& rTarget);
-//UNUSED2008-05      virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
+//UNUSED2008-05      virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 //UNUSED2008-05  
 //UNUSED2008-05      virtual String  GetComment() const;
 //UNUSED2008-05  
@@ -447,13 +447,13 @@ public:
                     ScUndoDataPilot( ScDocShell* pNewDocShell,
                             ScDocument* pOldDoc, ScDocument* pNewDoc,
                             const ScDPObject* pOldObj, const ScDPObject* pNewObj,
-                            BOOL bMove );
+                            sal_Bool bMove );
     virtual 		~ScUndoDataPilot();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -462,7 +462,7 @@ private:
     ScDocument*		pNewUndoDoc;
     ScDPObject*		pOldDPObject;
     ScDPObject*		pNewDPObject;
-    BOOL			bAllowMove;
+    sal_Bool			bAllowMove;
 };
 
 
@@ -472,7 +472,7 @@ public:
                         TYPEINFO();
                         ScUndoConsolidate( ScDocShell* pNewDocShell,
                                 const ScArea& rArea, const ScConsolidateParam& rPar,
-                                ScDocument* pNewUndoDoc, BOOL bReference,
+                                ScDocument* pNewUndoDoc, sal_Bool bReference,
                                 SCROW nInsCount, ScOutlineTable* pTab,
                                 ScDBData* pData );
     virtual 			~ScUndoConsolidate();
@@ -480,7 +480,7 @@ public:
     virtual void		Undo();
     virtual void		Redo();
     virtual void		Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL		CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool		CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String		GetComment() const;
 
@@ -488,7 +488,7 @@ private:
     ScArea				aDestArea;
     ScDocument*			pUndoDoc;
     ScConsolidateParam	aParam;
-    BOOL				bInsRef;
+    sal_Bool				bInsRef;
     SCSIZE				nInsertCount;
     ScOutlineTable*		pUndoTab;
     ScDBData*			pUndoData;
@@ -501,29 +501,29 @@ public:
                         TYPEINFO();
                         ScUndoChartData( ScDocShell* pNewDocShell,
                                 const String& rName, const ScRange& rNew,
-                                BOOL bColHdr, BOOL bRowHdr, BOOL bAdd );
+                                sal_Bool bColHdr, sal_Bool bRowHdr, sal_Bool bAdd );
                         ScUndoChartData( ScDocShell* pNewDocShell,
                                 const String& rName, const ScRangeListRef& rNew,
-                                BOOL bColHdr, BOOL bRowHdr, BOOL bAdd );
+                                sal_Bool bColHdr, sal_Bool bRowHdr, sal_Bool bAdd );
     virtual 			~ScUndoChartData();
 
     virtual void		Undo();
     virtual void		Redo();
     virtual void		Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL		CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool		CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String		GetComment() const;
 
 private:
     String				aChartName;
     ScRangeListRef		aOldRangeListRef;
-    BOOL				bOldColHeaders;
-    BOOL				bOldRowHeaders;
+    sal_Bool				bOldColHeaders;
+    sal_Bool				bOldRowHeaders;
 //	ScRange				aNewRange;
     ScRangeListRef		aNewRangeListRef;
-    BOOL				bNewColHeaders;
-    BOOL				bNewRowHeaders;
-    BOOL				bAddRange;
+    sal_Bool				bNewColHeaders;
+    sal_Bool				bNewRowHeaders;
+    sal_Bool				bAddRange;
 
     void				Init();
 };
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index 16dddd99c..d46c0ee07 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -45,16 +45,16 @@ public:
     SfxUndoAction*			GetDrawUndo()		{ return pDrawUndo; }
     void					ForgetDrawUndo();
 
-    virtual BOOL			IsLinked();
-    virtual void			SetLinked( BOOL bIsLinked );
+    virtual sal_Bool			IsLinked();
+    virtual void			SetLinked( sal_Bool bIsLinked );
     virtual void			Undo();
     virtual void			Redo();
     virtual void			Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL			CanRepeat(SfxRepeatTarget& rTarget) const;
-    virtual BOOL			Merge( SfxUndoAction *pNextAction );
+    virtual sal_Bool			CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool			Merge( SfxUndoAction *pNextAction );
     virtual String          GetComment() const;
     virtual String			GetRepeatComment(SfxRepeatTarget&) const;
-    virtual USHORT			GetId() const;
+    virtual sal_uInt16			GetId() const;
 };
 
 
diff --git a/sc/source/ui/inc/undoolk.hxx b/sc/source/ui/inc/undoolk.hxx
index 0ad489cf6..70846a574 100644
--- a/sc/source/ui/inc/undoolk.hxx
+++ b/sc/source/ui/inc/undoolk.hxx
@@ -37,7 +37,7 @@ SdrUndoAction*	GetSdrUndoAction	( ScDocument* pDoc );
 void			DoSdrUndoAction 	( SdrUndoAction* pUndoAction, ScDocument* pDoc );
 void			RedoSdrUndoAction 	( SdrUndoAction* pUndoAction );
 void			DeleteSdrUndoAction ( SdrUndoAction* pUndoAction );
-void			EnableDrawAdjust	( ScDocument* pDoc, BOOL bEnable );
+void			EnableDrawAdjust	( ScDocument* pDoc, sal_Bool bEnable );
 
 
 
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index 6869fc8cd..cb52c46fc 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -78,7 +78,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 };
@@ -95,7 +95,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 1be7962dd..9c659b830 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -69,23 +69,23 @@ public:
                     ScUndoInsertTab(
                             ScDocShell* pNewDocShell,
                             SCTAB nTabNum,
-                            BOOL bApp,
+                            sal_Bool bApp,
                             const String& rNewName);
     virtual			~ScUndoInsertTab();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     String			sNewName;
     SdrUndoAction*	pDrawUndo;
-    ULONG			nEndChangeAction;
+    sal_uLong			nEndChangeAction;
     SCTAB			nTab;
-    BOOL			bAppend;
+    sal_Bool			bAppend;
 
     void			SetChangeTrack();
 };
@@ -97,14 +97,14 @@ public:
                     ScUndoInsertTables(
                             ScDocShell* pNewDocShell,
                             SCTAB nTabNum,
-                            BOOL bApp,
+                            sal_Bool bApp,
                             SvStrings *pNewNameList);
     virtual			~ScUndoInsertTables();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -112,10 +112,10 @@ private:
 
     SdrUndoAction*	pDrawUndo;
     SvStrings*		pNameList;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
     SCTAB			nTab;
-    BOOL			bAppend;
+    sal_Bool			bAppend;
 
     void			SetChangeTrack();
 };
@@ -135,14 +135,14 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     SvShorts	theTabs;
-    ULONG			nStartChangeAction;
-    ULONG			nEndChangeAction;
+    sal_uLong			nStartChangeAction;
+    sal_uLong			nEndChangeAction;
 
     void			SetChangeTrack();
 };
@@ -162,7 +162,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -187,7 +187,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -195,7 +195,7 @@ private:
     SvShorts	theOldTabs;
     SvShorts	theNewTabs;
 
-    void DoChange( BOOL bUndo ) const;
+    void DoChange( sal_Bool bUndo ) const;
 };
 
 
@@ -212,7 +212,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -241,7 +241,7 @@ public:
     virtual void    Undo();
     virtual void    Redo();
     virtual void    Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 
 virtual String	GetComment() const;
 
@@ -260,14 +260,14 @@ public:
                             ScDocShell* pNewDocShell,
                             SCTAB nSrc, SCTAB nDest,
                             const String& rN, const String& rC,
-                            const Color& rCol, USHORT nF,
+                            const Color& rCol, sal_uInt16 nF,
                             const ScMarkData& rMark );
     virtual			~ScUndoMakeScenario();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -277,7 +277,7 @@ private:
     String		aName;
     String		aComment;
     Color		aColor;
-    USHORT		nFlags;
+    sal_uInt16		nFlags;
     ScMarkData	aMarkData;
     SdrUndoAction* pDrawUndo;
 };
@@ -290,20 +290,20 @@ public:
                     ScUndoImportTab(
                             ScDocShell* pShell,
                             SCTAB nNewTab, SCTAB nNewCount,
-                            BOOL bNewLink );
+                            sal_Bool bNewLink );
     virtual			~ScUndoImportTab();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     SCTAB		nTab;
     SCTAB		nCount;
-    BOOL		bLink;
+    sal_Bool		bLink;
     ScDocument*	pRedoDoc;
     SdrUndoAction*	pDrawUndo;
 
@@ -323,7 +323,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -331,13 +331,13 @@ private:
     String	aDocName;
     String	aFltName;
     String	aOptions;
-    ULONG	nRefreshDelay;
-    USHORT	nCount;
+    sal_uLong	nRefreshDelay;
+    sal_uInt16	nCount;
     SCTAB*	pTabs;
-    BYTE*	pModes;
+    sal_uInt8*	pModes;
     String*	pTabNames;
 
-    void DoChange( BOOL bLink ) const;
+    void DoChange( sal_Bool bLink ) const;
 };
 
 
@@ -347,21 +347,21 @@ public:
                     TYPEINFO();
                     ScUndoShowHideTab(
                             ScDocShell* pShell,
-                            SCTAB nNewTab, BOOL bNewShow );
+                            SCTAB nNewTab, sal_Bool bNewShow );
     virtual			~ScUndoShowHideTab();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     SCTAB	nTab;
-    BOOL	bShow;
+    sal_Bool	bShow;
 
-    void DoChange( BOOL bShow ) const;
+    void DoChange( sal_Bool bShow ) const;
 };
 
 // ============================================================================
@@ -377,7 +377,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -401,7 +401,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -424,7 +424,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -433,7 +433,7 @@ private:
     ScPrintRangeSaver*	pOldRanges;
     ScPrintRangeSaver*	pNewRanges;
 
-    void DoChange( BOOL bUndo );
+    void DoChange( sal_Bool bUndo );
 };
 
 
@@ -446,14 +446,14 @@ public:
                             const String& rON, const String& rNN,
                             const String& rOC, const String& rNC,
                             const Color& rOCol, const Color& rNCol,
-                            USHORT nOF, USHORT nNF );
+                            sal_uInt16 nOF, sal_uInt16 nNF );
 
     virtual			~ScUndoScenarioFlags();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -465,8 +465,8 @@ private:
     String	aNewComment;
     Color	aOldColor;
     Color	aNewColor;
-    USHORT	nOldFlags;
-    USHORT	nNewFlags;
+    sal_uInt16	nOldFlags;
+    sal_uInt16	nNewFlags;
 };
 
 
@@ -483,7 +483,7 @@ public:
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
@@ -500,21 +500,21 @@ class ScUndoLayoutRTL : public ScSimpleUndo
 {
 public:
                     TYPEINFO();
-                    ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRTL );
+                    ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, sal_Bool bNewRTL );
     virtual			~ScUndoLayoutRTL();
 
     virtual void	Undo();
     virtual void	Redo();
     virtual void	Repeat(SfxRepeatTarget& rTarget);
-    virtual BOOL	CanRepeat(SfxRepeatTarget& rTarget) const;
+    virtual sal_Bool	CanRepeat(SfxRepeatTarget& rTarget) const;
 
     virtual String	GetComment() const;
 
 private:
     SCTAB	nTab;
-    BOOL	bRTL;
+    sal_Bool	bRTL;
 
-    void DoChange( BOOL bNew );
+    void DoChange( sal_Bool bNew );
 };
 
 
@@ -529,7 +529,7 @@ private:
 //UNUSED2009-05     virtual void    Undo();
 //UNUSED2009-05     virtual void    Redo();
 //UNUSED2009-05     virtual void    Repeat(SfxRepeatTarget& rTarget);
-//UNUSED2009-05     virtual BOOL    CanRepeat(SfxRepeatTarget& rTarget) const;
+//UNUSED2009-05     virtual sal_Bool    CanRepeat(SfxRepeatTarget& rTarget) const;
 //UNUSED2009-05 
 //UNUSED2009-05     virtual String  GetComment() const;
 //UNUSED2009-05 
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 11f6f1aba..efae45485 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -119,9 +119,9 @@ public:
     inline	ScTabViewShell * GetTabViewShell();
 
     bool	SetupRefDlg();
-    bool	RemoveRefDlg( BOOL bRestoreModal = TRUE );
+    bool	RemoveRefDlg( sal_Bool bRestoreModal = sal_True );
 
-    virtual void			SetModal( BOOL bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); }
+    virtual void			SetModal( sal_Bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); }
 
     virtual void            SetReference( const ScRange& rRef, ScDocument* pDoc )
     {
@@ -140,7 +140,7 @@ public:
         DBG_ASSERT( false, "should not execute here!!!when the edit kill focus, should remove refhandler.\r\n" );
 
         if ( IsInExecute() )
-            EndDialog( FALSE );
+            EndDialog( sal_False );
         else if ( GetStyle() & WB_CLOSEABLE )
             Close();
     }
@@ -160,7 +160,7 @@ public:
             (m_pHandler->*m_pRefInputStartPostHdl)( pEdit, pButton );
     }
 
-    virtual void        RefInputDone( BOOL bForced = FALSE )
+    virtual void        RefInputDone( sal_Bool bForced = sal_False )
     {
         if( !CanInputDone( bForced ) )
             return;
@@ -175,11 +175,11 @@ public:
             (m_pHandler->*m_pRefInputDonePostHdl)();
     }
 
-    BOOL IsChildFocus();
+    sal_Bool IsChildFocus();
 
     enum { SLOTID = SID_VALIDITY_REFERENCE };
 
-    BOOL Close();
+    sal_Bool Close();
     //-->Added by PengYunQuan for Validity Cell Range Picker
 };
 
@@ -197,9 +197,9 @@ public:
     virtual                     ~ScTPValidationValue();
 
     static SfxTabPage*          Create( Window* pParent, const SfxItemSet& rArgSet );
-    static USHORT*              GetRanges();
+    static sal_uInt16*              GetRanges();
 
-    virtual BOOL                FillItemSet( SfxItemSet& rArgSet );
+    virtual sal_Bool                FillItemSet( SfxItemSet& rArgSet );
     virtual void                Reset( const SfxItemSet& rArgSet );
 
 private:
@@ -262,7 +262,7 @@ private:
     //TYPEINFO();
     void			TidyListBoxes();
 public:
-    USHORT			GetAllowEntryPos();
+    sal_uInt16			GetAllowEntryPos();
     String			GetMinText();
     void	SetupRefDlg();
     void	RemoveRefDlg();
@@ -294,8 +294,8 @@ public:
             ~ScTPValidationHelp();
 
     static	SfxTabPage*	Create		( Window* pParent, const SfxItemSet& rArgSet );
-    static	USHORT*		GetRanges	();
-    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    static	sal_uInt16*		GetRanges	();
+    virtual	sal_Bool		FillItemSet	( SfxItemSet& rArgSet );
     virtual	void		Reset		( const SfxItemSet& rArgSet );
 };
 
@@ -327,8 +327,8 @@ public:
             ~ScTPValidationError();
 
     static	SfxTabPage*	Create		( Window* pParent, const SfxItemSet& rArgSet );
-    static	USHORT*		GetRanges	();
-    virtual	BOOL		FillItemSet	( SfxItemSet& rArgSet );
+    static	sal_uInt16*		GetRanges	();
+    virtual	sal_Bool		FillItemSet	( SfxItemSet& rArgSet );
     virtual	void		Reset		( const SfxItemSet& rArgSet );
 };
 
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 114601d82..ddfb2ecc5 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -139,7 +139,7 @@ private:
     SCCOL			nPosX[2];
     SCROW			nPosY[2];
 
-    BOOL			bOldCurValid;				// "virtuelle" Cursorpos. bei zusammengefassten
+    sal_Bool			bOldCurValid;				// "virtuelle" Cursorpos. bei zusammengefassten
 
                     ScViewDataTable();
                     ~ScViewDataTable();
@@ -208,14 +208,14 @@ private:
     ScRange				aDelRange;					// fuer AutoFill-Loeschen
 
     ScSplitPos          eEditActivePart;            // the part that was active when edit mode was started
-    BOOL				bEditActive[4];				// aktiv?
-    BOOL				bActive;					// aktives Fenster ?
-    BOOL				bIsRefMode;					// Referenzeingabe
-    BOOL				bDelMarkValid;				// nur gueltig bei SC_REFTYPE_FILL
-    BYTE				nFillMode;					// Modus
-    BOOL				bPagebreak;					// Seitenumbruch-Vorschaumodus
+    sal_Bool				bEditActive[4];				// aktiv?
+    sal_Bool				bActive;					// aktives Fenster ?
+    sal_Bool				bIsRefMode;					// Referenzeingabe
+    sal_Bool				bDelMarkValid;				// nur gueltig bei SC_REFTYPE_FILL
+    sal_uInt8				nFillMode;					// Modus
+    sal_Bool				bPagebreak;					// Seitenumbruch-Vorschaumodus
 
-    BOOL				bSelCtrlMouseClick;         // special selection handling for ctrl-mouse-click
+    sal_Bool				bSelCtrlMouseClick;         // special selection handling for ctrl-mouse-click
 
     SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, EditStatus*);
     SC_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*);
@@ -249,9 +249,9 @@ public:
     Window*			GetDialogParent();			// von tabvwsh weitergeleitet
     Window*			GetActiveWin();				// von View
     ScDrawView*		GetScDrawView();			// von View
-    BOOL			IsMinimized();				// von View
+    sal_Bool			IsMinimized();				// von View
 
-    void			UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE );
+    void			UpdateInputHandler( sal_Bool bForce = sal_False, sal_Bool bStopEditing = sal_True );
 
     void			WriteUserData(String& rData);
     void			ReadUserData(const String& rData);
@@ -264,8 +264,8 @@ public:
 
     void			SetViewShell( ScTabViewShell* pViewSh );
 
-    BOOL			IsActive() const			{ return bActive; }
-    void			Activate(BOOL bActivate)	{ bActive = bActivate; }
+    sal_Bool			IsActive() const			{ return bActive; }
+    void			Activate(sal_Bool bActivate)	{ bActive = bActivate; }
 
     void			UpdateThis();
 
@@ -283,7 +283,7 @@ public:
     SCROW			GetPosY( ScVSplitPos eWhich ) const		{ return pThisTab->nPosY[eWhich]; }
     SCCOL			GetCurX() const							{ return pThisTab->nCurX; }
     SCROW			GetCurY() const							{ return pThisTab->nCurY; }
-    BOOL			HasOldCursor() const					{ return pThisTab->bOldCurValid; }
+    sal_Bool			HasOldCursor() const					{ return pThisTab->bOldCurValid; }
     SCCOL			GetOldCurX() const;
     SCROW			GetOldCurY() const;
     ScSplitMode		GetHSplitMode() const					{ return pThisTab->eHSplitMode; }
@@ -292,7 +292,7 @@ public:
     long			GetVSplitPos() const					{ return pThisTab->nVSplitPos; }
     SCCOL			GetFixPosX() const						{ return pThisTab->nFixPosX; }
     SCROW			GetFixPosY() const						{ return pThisTab->nFixPosY; }
-    BOOL			IsPagebreakMode() const					{ return bPagebreak; }
+    sal_Bool			IsPagebreakMode() const					{ return bPagebreak; }
 
     void			SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX );
     void			SetPosY( ScVSplitPos eWhich, SCROW nNewPosY );
@@ -306,15 +306,15 @@ public:
     void			SetVSplitPos( long nPos )						{ pThisTab->nVSplitPos = nPos; }
     void			SetFixPosX( SCCOL nPos )						{ pThisTab->nFixPosX = nPos; }
     void			SetFixPosY( SCROW nPos )						{ pThisTab->nFixPosY = nPos; }
-    void			SetPagebreakMode( BOOL bSet );
+    void			SetPagebreakMode( sal_Bool bSet );
 
-    void            SetZoomType( SvxZoomType eNew, BOOL bAll );
+    void            SetZoomType( SvxZoomType eNew, sal_Bool bAll );
     void            SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs );
     void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs );
-    void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
+    void            SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll );
     void            RefreshZoom();
 
-    void			SetSelCtrlMouseClick( BOOL bTmp ) { bSelCtrlMouseClick = bTmp; }
+    void			SetSelCtrlMouseClick( sal_Bool bTmp ) { bSelCtrlMouseClick = bTmp; }
 
     SvxZoomType     GetZoomType() const     { return pThisTab->eZoomType; }
     const Fraction&	GetZoomX() const        { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; }
@@ -336,31 +336,31 @@ public:
     ScMarkType      GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
     void			GetMultiArea( ScRangeListRef& rRange ) const;
 
-    BOOL			SimpleColMarked();
-    BOOL			SimpleRowMarked();
+    sal_Bool			SimpleColMarked();
+    sal_Bool			SimpleRowMarked();
 
-    BOOL			IsMultiMarked();
+    sal_Bool			IsMultiMarked();
 
     void			SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
     void			SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                    BYTE nMode );
+                                    sal_uInt8 nMode );
     void			GetFillData( SCCOL& rStartCol, SCROW& rStartRow,
                                  SCCOL& rEndCol, SCROW& rEndRow );
     void			ResetFillMode();
-    BOOL			IsAnyFillMode()				{ return nFillMode != SC_FILL_NONE; }
-    BOOL			IsFillMode()				{ return nFillMode == SC_FILL_FILL; }
-    BYTE			GetFillMode()				{ return nFillMode; }
+    sal_Bool			IsAnyFillMode()				{ return nFillMode != SC_FILL_NONE; }
+    sal_Bool			IsFillMode()				{ return nFillMode == SC_FILL_FILL; }
+    sal_uInt8			GetFillMode()				{ return nFillMode; }
 
                     // TRUE: Zelle ist zusammengefasst
-    BOOL			GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix );
-    BOOL			GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
+    sal_Bool			GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix );
+    sal_Bool			GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
                                         SCsCOL& rPosX, SCsROW& rPosY,
-                                        BOOL bTestMerge = TRUE, BOOL bRepair = FALSE,
-                                        BOOL bNextIfLarge = TRUE );
+                                        sal_Bool bTestMerge = sal_True, sal_Bool bRepair = sal_False,
+                                        sal_Bool bNextIfLarge = sal_True );
     void			GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich,
-                                        SCsCOL nPosX, SCsROW nPosY, BOOL& rLeft, BOOL& rTop );
+                                        SCsCOL nPosX, SCsROW nPosY, sal_Bool& rLeft, sal_Bool& rTop );
 
-    BOOL			IsRefMode() const						{ return bIsRefMode; }
+    sal_Bool			IsRefMode() const						{ return bIsRefMode; }
     ScRefType		GetRefType() const						{ return eRefType; }
     SCCOL			GetRefStartX() const					{ return nRefStartX; }
     SCROW			GetRefStartY() const					{ return nRefStartY; }
@@ -369,7 +369,7 @@ public:
     SCROW			GetRefEndY() const						{ return nRefEndY; }
     SCTAB			GetRefEndZ() const						{ return nRefEndZ; }
 
-    void			SetRefMode( BOOL bNewMode, ScRefType eNewType )
+    void			SetRefMode( sal_Bool bNewMode, ScRefType eNewType )
                                     { bIsRefMode = bNewMode; eRefType = eNewType; }
 
     void			SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
@@ -377,11 +377,11 @@ public:
     void			SetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
                             { nRefEndX = nNewX; nRefEndY = nNewY; nRefEndZ = nNewZ; }
 
-    void			ResetDelMark()							{ bDelMarkValid = FALSE; }
+    void			ResetDelMark()							{ bDelMarkValid = sal_False; }
     void			SetDelMark( const ScRange& rRange )
-                            { aDelRange = rRange; bDelMarkValid = TRUE; }
+                            { aDelRange = rRange; bDelMarkValid = sal_True; }
 
-    BOOL			GetDelMark( ScRange& rRange ) const
+    sal_Bool			GetDelMark( ScRange& rRange ) const
                             { rRange = aDelRange; return bDelMarkValid; }
 
     inline void		GetMoveCursor( SCCOL& rCurX, SCROW& rCurY );
@@ -389,20 +389,20 @@ public:
     const ScViewOptions&	GetOptions() const { return *pOptions; }
     void					SetOptions( const ScViewOptions& rOpt );
 
-    BOOL	IsGridMode		() const			{ return pOptions->GetOption( VOPT_GRID ); }
-    void	SetGridMode		( BOOL bNewMode )	{ pOptions->SetOption( VOPT_GRID, bNewMode ); }
-    BOOL	IsSyntaxMode	() const			{ return pOptions->GetOption( VOPT_SYNTAX ); }
-    void	SetSyntaxMode	( BOOL bNewMode )	{ pOptions->SetOption( VOPT_SYNTAX, bNewMode ); }
-    BOOL	IsHeaderMode	() const			{ return pOptions->GetOption( VOPT_HEADER ); }
-    void	SetHeaderMode	( BOOL bNewMode )	{ pOptions->SetOption( VOPT_HEADER, bNewMode ); }
-    BOOL	IsTabMode		() const			{ return pOptions->GetOption( VOPT_TABCONTROLS ); }
-    void	SetTabMode		( BOOL bNewMode )	{ pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); }
-    BOOL	IsVScrollMode	() const			{ return pOptions->GetOption( VOPT_VSCROLL ); }
-    void	SetVScrollMode	( BOOL bNewMode )	{ pOptions->SetOption( VOPT_VSCROLL, bNewMode ); }
-    BOOL	IsHScrollMode	() const			{ return pOptions->GetOption( VOPT_HSCROLL ); }
-    void	SetHScrollMode	( BOOL bNewMode )	{ pOptions->SetOption( VOPT_HSCROLL, bNewMode ); }
-    BOOL	IsOutlineMode	() const			{ return pOptions->GetOption( VOPT_OUTLINER ); }
-    void	SetOutlineMode	( BOOL bNewMode )	{ pOptions->SetOption( VOPT_OUTLINER, bNewMode ); }
+    sal_Bool	IsGridMode		() const			{ return pOptions->GetOption( VOPT_GRID ); }
+    void	SetGridMode		( sal_Bool bNewMode )	{ pOptions->SetOption( VOPT_GRID, bNewMode ); }
+    sal_Bool	IsSyntaxMode	() const			{ return pOptions->GetOption( VOPT_SYNTAX ); }
+    void	SetSyntaxMode	( sal_Bool bNewMode )	{ pOptions->SetOption( VOPT_SYNTAX, bNewMode ); }
+    sal_Bool	IsHeaderMode	() const			{ return pOptions->GetOption( VOPT_HEADER ); }
+    void	SetHeaderMode	( sal_Bool bNewMode )	{ pOptions->SetOption( VOPT_HEADER, bNewMode ); }
+    sal_Bool	IsTabMode		() const			{ return pOptions->GetOption( VOPT_TABCONTROLS ); }
+    void	SetTabMode		( sal_Bool bNewMode )	{ pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); }
+    sal_Bool	IsVScrollMode	() const			{ return pOptions->GetOption( VOPT_VSCROLL ); }
+    void	SetVScrollMode	( sal_Bool bNewMode )	{ pOptions->SetOption( VOPT_VSCROLL, bNewMode ); }
+    sal_Bool	IsHScrollMode	() const			{ return pOptions->GetOption( VOPT_HSCROLL ); }
+    void	SetHScrollMode	( sal_Bool bNewMode )	{ pOptions->SetOption( VOPT_HSCROLL, bNewMode ); }
+    sal_Bool	IsOutlineMode	() const			{ return pOptions->GetOption( VOPT_OUTLINER ); }
+    void	SetOutlineMode	( sal_Bool bNewMode )	{ pOptions->SetOption( VOPT_OUTLINER, bNewMode ); }
 
     void 			KillEditView();
     void			ResetEditView();
@@ -410,13 +410,13 @@ public:
                                     ScEditEngineDefaulter* pNewEngine,
                                     Window* pWin, SCCOL nNewX, SCROW nNewY );
     void			GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow );
-    BOOL			HasEditView( ScSplitPos eWhich ) const
+    sal_Bool			HasEditView( ScSplitPos eWhich ) const
                                         { return pEditView[eWhich] && bEditActive[eWhich]; }
     EditView*		GetEditView( ScSplitPos eWhich ) const
                                         { return pEditView[eWhich]; }
 
     void			EditGrowX();
-    void			EditGrowY( BOOL bInitial = FALSE );
+    void			EditGrowY( sal_Bool bInitial = sal_False );
 
     ScSplitPos      GetEditActivePart() const       { return eEditActivePart; }
     SCCOL			GetEditViewCol() const			{ return nEditCol; }
@@ -427,18 +427,18 @@ public:
     SCROW			GetEditEndRow() const			{ return nEditEndRow; }
 
     Rectangle		GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin,
-                                    const ScPatternAttr* pPattern, BOOL bForceToTop );
+                                    const ScPatternAttr* pPattern, sal_Bool bForceToTop );
 
     void			SetTabNo( SCTAB nNewTab );
     void			SetActivePart( ScSplitPos eNewActive );
 
     Point			GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
-                                BOOL bAllowNeg = FALSE ) const;
+                                sal_Bool bAllowNeg = sal_False ) const;
     Point			GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const;
     Point			GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const;
 
-    SCCOL			CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeY = SC_SIZE_NONE ) const;
-    SCROW			CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeX = SC_SIZE_NONE ) const;
+    SCCOL			CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, sal_uInt16 nScrSizeY = SC_SIZE_NONE ) const;
+    SCROW			CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, sal_uInt16 nScrSizeX = SC_SIZE_NONE ) const;
 
     SCCOL			VisibleCellsX( ScHSplitPos eWhichX ) const;		// angezeigte komplette Zellen
     SCROW			VisibleCellsY( ScVSplitPos eWhichY ) const;
@@ -447,7 +447,7 @@ public:
 //UNUSED2008-05  SCCOL           LastCellsX( ScHSplitPos eWhichX ) const;        // Zellen auf der letzten Seite
 //UNUSED2008-05  SCROW           LastCellsY( ScVSplitPos eWhichY ) const;
 
-    BOOL			IsOle();
+    sal_Bool			IsOle();
 //UNUSED2008-05  void            UpdateOle( ScSplitPos eWhich );
     void			SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
     void			SetScreen( const Rectangle& rVisArea );
@@ -468,8 +468,8 @@ public:
 
     Point			GetMousePosPixel();
 
-    BOOL			UpdateFixX(SCTAB nTab = MAXTAB+1);
-    BOOL			UpdateFixY(SCTAB nTab = MAXTAB+1);
+    sal_Bool			UpdateFixX(SCTAB nTab = MAXTAB+1);
+    sal_Bool			UpdateFixY(SCTAB nTab = MAXTAB+1);
 
     SCCOL			GetTabStartCol() const			{ return nTabStartCol; }
     void			SetTabStartCol(SCCOL nNew)		{ nTabStartCol = nNew; }
@@ -479,9 +479,9 @@ public:
     const Size&		GetScenButSize() const				{ return aScenButSize; }
     void			SetScenButSize(const Size& rNew)	{ aScenButSize = rNew; }
 
-    BOOL			IsSelCtrlMouseClick() { return bSelCtrlMouseClick; }
+    sal_Bool			IsSelCtrlMouseClick() { return bSelCtrlMouseClick; }
 
-    static inline long ToPixel( USHORT nTwips, double nFactor );
+    static inline long ToPixel( sal_uInt16 nTwips, double nFactor );
 
     /** while (rScrY <= nEndPixels && rPosY <= nEndRow) add pixels of row 
         heights converted with nPPTY to rScrY, optimized for row height 
@@ -505,7 +505,7 @@ public:
 
 // ---------------------------------------------------------------------------
 
-inline long ScViewData::ToPixel( USHORT nTwips, double nFactor )
+inline long ScViewData::ToPixel( sal_uInt16 nTwips, double nFactor )
 {
     long nRet = (long)( nTwips * nFactor );
     if ( !nRet && nTwips )
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index d30c32b72..33151a750 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -80,7 +80,7 @@ class ScViewFunc : public ScTabView
 private:
     ScAddress	aFormatSource;		// fuer automatisches Erweitern von Formatierung
     ScRange		aFormatArea;
-    BOOL		bFormatValid;
+    sal_Bool		bFormatValid;
 
 public:
                     ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell );
@@ -91,190 +91,190 @@ public:
     void					GetSelectionFrame	( SvxBoxItem&		rLineOuter,
                                                   SvxBoxInfoItem&	rLineInner );
 
-    BYTE			GetSelectionScriptType();
+    sal_uInt8			GetSelectionScriptType();
 
-    BOOL			GetAutoSumArea(ScRangeList& rRangeList);
+    sal_Bool			GetAutoSumArea(ScRangeList& rRangeList);
     void			EnterAutoSum(const ScRangeList& rRangeList, sal_Bool bSubTotal);
     bool            AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue );
     String          GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal );
 
     void			EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
-                               BOOL bRecord = TRUE, const EditTextObject* pData = NULL );
+                               sal_Bool bRecord = sal_True, const EditTextObject* pData = NULL );
     void			EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue );
     void			EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData,
-                                BOOL bRecord = TRUE, BOOL bTestSimple = FALSE );
+                                sal_Bool bRecord = sal_True, sal_Bool bTestSimple = sal_False );
 
     void			EnterMatrix( const String& rString );
     void			EnterBlock( const String& rString, const EditTextObject* pData );
 
     void			EnterDataAtCursor( const String& rString );			//! nicht benutzt ?
 
-    SC_DLLPUBLIC void			CutToClip( ScDocument* pClipDoc = NULL, BOOL bIncludeObjects = FALSE );
-    SC_DLLPUBLIC BOOL			CopyToClip( ScDocument* pClipDoc = NULL, BOOL bCut = FALSE, BOOL bApi = FALSE,
-                                BOOL bIncludeObjects = FALSE, BOOL bStopEdit = TRUE );
+    SC_DLLPUBLIC void			CutToClip( ScDocument* pClipDoc = NULL, sal_Bool bIncludeObjects = sal_False );
+    SC_DLLPUBLIC sal_Bool			CopyToClip( ScDocument* pClipDoc = NULL, sal_Bool bCut = sal_False, sal_Bool bApi = sal_False,
+                                sal_Bool bIncludeObjects = sal_False, sal_Bool bStopEdit = sal_True );
     ScTransferObj*              CopyToTransferable();
-    SC_DLLPUBLIC BOOL			PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
-                                    USHORT nFunction = PASTE_NOFUNC, BOOL bSkipEmpty = FALSE,
-                                    BOOL bTranspose = FALSE, BOOL bAsLink = FALSE,
+    SC_DLLPUBLIC sal_Bool			PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc,
+                                    sal_uInt16 nFunction = PASTE_NOFUNC, sal_Bool bSkipEmpty = sal_False,
+                                    sal_Bool bTranspose = sal_False, sal_Bool bAsLink = sal_False,
                                     InsCellCmd eMoveMode = INS_NONE,
-                                    USHORT nUndoExtraFlags = IDF_NONE,
-                                    BOOL bAllowDialogs = FALSE );
+                                    sal_uInt16 nUndoExtraFlags = IDF_NONE,
+                                    sal_Bool bAllowDialogs = sal_False );
 
-    void			FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink );
+    void			FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, sal_Bool bSkipEmpty, sal_Bool bAsLink );
 
     SC_DLLPUBLIC void			PasteFromSystem();
-    SC_DLLPUBLIC BOOL			PasteFromSystem( ULONG nFormatId, BOOL bApi = FALSE );
+    SC_DLLPUBLIC sal_Bool			PasteFromSystem( sal_uLong nFormatId, sal_Bool bApi = sal_False );
     void                        PasteFromTransferable( const ::com::sun::star::uno::Reference<
                                                        ::com::sun::star::datatransfer::XTransferable >& rxTransferable );
 
     void			PasteDraw();
     void			PasteDraw( const Point& rLogicPos, SdrModel* pModel,
-                                BOOL bGroup = FALSE, BOOL bSameDocClipboard = FALSE );
+                                sal_Bool bGroup = sal_False, sal_Bool bSameDocClipboard = sal_False );
 
-    BOOL			PasteOnDrawObject( const ::com::sun::star::uno::Reference<
+    sal_Bool			PasteOnDrawObject( const ::com::sun::star::uno::Reference<
                                             ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
-                                        SdrObject* pHitObj, BOOL bLink );
+                                        SdrObject* pHitObj, sal_Bool bLink );
 
-    BOOL			PasteDataFormat( ULONG nFormatId,
+    sal_Bool			PasteDataFormat( sal_uLong nFormatId,
                                         const ::com::sun::star::uno::Reference<
                                             ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
                                         SCCOL nPosX, SCROW nPosY, Point* pLogicPos = NULL,
-                                        BOOL bLink = FALSE, BOOL bAllowDialogs = FALSE );
+                                        sal_Bool bLink = sal_False, sal_Bool bAllowDialogs = sal_False );
 
-    BOOL			PasteFile( const Point&, const String&, BOOL bLink=FALSE );
-    BOOL            PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
-    BOOL			PasteBitmap( const Point&, const Bitmap& );
-    BOOL			PasteMetaFile( const Point&, const GDIMetaFile& );
-    BOOL			PasteGraphic( const Point& rPos, const Graphic& rGraphic,
+    sal_Bool			PasteFile( const Point&, const String&, sal_Bool bLink=sal_False );
+    sal_Bool            PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
+    sal_Bool			PasteBitmap( const Point&, const Bitmap& );
+    sal_Bool			PasteMetaFile( const Point&, const GDIMetaFile& );
+    sal_Bool			PasteGraphic( const Point& rPos, const Graphic& rGraphic,
                                     const String& rFile, const String& rFilter );
-    BOOL			PasteBookmark( ULONG nFormatId,
+    sal_Bool			PasteBookmark( sal_uLong nFormatId,
                                 const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
                                 SCCOL nPosX, SCROW nPosY );
-    BOOL			PasteDDE( const ::com::sun::star::uno::Reference<
+    sal_Bool			PasteDDE( const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::datatransfer::XTransferable >& rxTransferable );
 
-    BOOL			ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic );
+    sal_Bool			ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic );
 
     void			InsertBookmark( const String& rDescription, const String& rURL,
                                     SCCOL nPosX, SCROW nPosY, const String* pTarget = NULL,
-                                    BOOL bTryReplace = FALSE );
-    BOOL			HasBookmarkAtCursor( SvxHyperlinkItem* pContent );
+                                    sal_Bool bTryReplace = sal_False );
+    sal_Bool			HasBookmarkAtCursor( SvxHyperlinkItem* pContent );
 
     long			DropRequestHdl( Exchange* pExchange );
-    BOOL			MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
-                                    BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi );
+    sal_Bool			MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
+                                    sal_Bool bCut, sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi );
 
-    BOOL			LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi );
+    sal_Bool			LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, sal_Bool bApi );
 
-    void			CreateNames( USHORT nFlags );
-    USHORT			GetCreateNameFlags();
+    void			CreateNames( sal_uInt16 nFlags );
+    sal_uInt16			GetCreateNameFlags();
     void			InsertNameList();
-    BOOL			InsertName( const String& rName, const String& rSymbol,
+    sal_Bool			InsertName( const String& rName, const String& rSymbol,
                                 const String& rType );
 
     void			ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet,
-                                        BOOL bRecord = TRUE );
+                                        sal_Bool bRecord = sal_True );
     void			ApplyAttr( const SfxPoolItem& rAttrItem );
     void			ApplySelectionPattern( const ScPatternAttr& rAttr,
-                                            BOOL bRecord = TRUE,
-                                            BOOL bCursorOnly = FALSE );
+                                            sal_Bool bRecord = sal_True,
+                                            sal_Bool bCursorOnly = sal_False );
     void			ApplyPatternLines( const ScPatternAttr& rAttr,
                                         const SvxBoxItem* pNewOuter,
-                                        const SvxBoxInfoItem* pNewInner, BOOL bRecord = TRUE );
+                                        const SvxBoxInfoItem* pNewInner, sal_Bool bRecord = sal_True );
 
     void			ApplyUserItemSet( const SfxItemSet& rItemSet );
 
     const SfxStyleSheet*	GetStyleSheetFromMarked();
     void					SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet,
-                                                        BOOL bRecord = TRUE );
+                                                        sal_Bool bRecord = sal_True );
     void                    RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
     void                    UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
 
-    void			SetNumberFormat( short nFormatType, ULONG nAdd = 0 );
+    void			SetNumberFormat( short nFormatType, sal_uLong nAdd = 0 );
     void			SetNumFmtByStr( const String& rCode );
-    void			ChangeNumFmtDecimals( BOOL bIncrement );
+    void			ChangeNumFmtDecimals( sal_Bool bIncrement );
 
     void			SetConditionalFormat( const ScConditionalFormat& rNew );
     void			SetValidation( const ScValidationData& rNew );
 
-    void			ChangeIndent( BOOL bIncrement );
+    void			ChangeIndent( sal_Bool bIncrement );
 
     void			ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect );
 
     void			Protect( SCTAB nTab, const String& rPassword );
-    BOOL			Unprotect( SCTAB nTab, const String& rPassword );
+    sal_Bool			Unprotect( SCTAB nTab, const String& rPassword );
 
-    void			DeleteCells( DelCellCmd eCmd, BOOL bRecord = TRUE );
-    BOOL			InsertCells( InsCellCmd eCmd, BOOL bRecord = TRUE, BOOL bPartOfPaste = FALSE );
-    void			DeleteMulti( BOOL bRows, BOOL bRecord = TRUE );
+    void			DeleteCells( DelCellCmd eCmd, sal_Bool bRecord = sal_True );
+    sal_Bool			InsertCells( InsCellCmd eCmd, sal_Bool bRecord = sal_True, sal_Bool bPartOfPaste = sal_False );
+    void			DeleteMulti( sal_Bool bRows, sal_Bool bRecord = sal_True );
 
-    void			DeleteContents( USHORT nFlags, BOOL bRecord = TRUE );
+    void			DeleteContents( sal_uInt16 nFlags, sal_Bool bRecord = sal_True );
 
-    void			SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
-                                        ScSizeMode eMode, USHORT nSizeTwips,
-                                        BOOL bRecord = TRUE, BOOL bPaint = TRUE,
+    void			SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
+                                        ScSizeMode eMode, sal_uInt16 nSizeTwips,
+                                        sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True,
                                         ScMarkData* pMarkData = NULL );
-    void			SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips,
-                                        BOOL bRecord = TRUE, BOOL bPaint = TRUE );
-    void			ShowMarkedColumns( BOOL bShow, BOOL bRecord = TRUE );
-    void			ShowMarkedRows( BOOL bShow, BOOL bRecord = TRUE );
+    void			SetMarkedWidthOrHeight( sal_Bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips,
+                                        sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
+    void			ShowMarkedColumns( sal_Bool bShow, sal_Bool bRecord = sal_True );
+    void			ShowMarkedRows( sal_Bool bShow, sal_Bool bRecord = sal_True );
 
-    BOOL			AdjustBlockHeight( BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL );
-    BOOL			AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint = TRUE );
+    sal_Bool			AdjustBlockHeight( sal_Bool bPaint = sal_True, ScMarkData* pMarkData = NULL );
+    sal_Bool			AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, sal_Bool bPaint = sal_True );
 
-    void			ModifyCellSize( ScDirection eDir, BOOL bOptimal );
+    void			ModifyCellSize( ScDirection eDir, sal_Bool bOptimal );
 
-    SC_DLLPUBLIC void			InsertPageBreak( BOOL bColumn, BOOL bRecord = TRUE,
+    SC_DLLPUBLIC void			InsertPageBreak( sal_Bool bColumn, sal_Bool bRecord = sal_True,
                                         const ScAddress* pPos = NULL,
-                                        BOOL bSetModified = TRUE );
-    SC_DLLPUBLIC void			DeletePageBreak( BOOL bColumn, BOOL bRecord = TRUE,
+                                        sal_Bool bSetModified = sal_True );
+    SC_DLLPUBLIC void			DeletePageBreak( sal_Bool bColumn, sal_Bool bRecord = sal_True,
                                         const ScAddress* pPos = NULL,
-                                        BOOL bSetModified = TRUE );
+                                        sal_Bool bSetModified = sal_True );
 
     void			RemoveManualBreaks();
 
-    void			SetPrintZoom(USHORT nScale, USHORT nPages);
+    void			SetPrintZoom(sal_uInt16 nScale, sal_uInt16 nPages);
     void			AdjustPrintZoom();
 
-    BOOL			TestMergeCells();
-    BOOL			TestRemoveMerge();
+    sal_Bool			TestMergeCells();
+    sal_Bool			TestRemoveMerge();
 
-    BOOL			MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE );
-    BOOL			RemoveMerge( BOOL bRecord = TRUE );
+    sal_Bool			MergeCells( sal_Bool bApi, sal_Bool& rDoContents, sal_Bool bRecord = sal_True );
+    sal_Bool			RemoveMerge( sal_Bool bRecord = sal_True );
 
-    void			FillSimple( FillDir eDir, BOOL bRecord = TRUE );
+    void			FillSimple( FillDir eDir, sal_Bool bRecord = sal_True );
     void			FillSeries( FillDir	eDir, FillCmd eCmd, FillDateCmd	eDateCmd,
-                                double fStart, double fStep, double fMax, BOOL bRecord = TRUE );
+                                double fStart, double fStep, double fMax, sal_Bool bRecord = sal_True );
     void			FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
-                                SCCOL nEndCol, SCROW nEndRow, ULONG nCount, BOOL bRecord = TRUE );
+                                SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, sal_Bool bRecord = sal_True );
     void			FillCrossDblClick();
 
     void			TransliterateText( sal_Int32 nType );
 
     ScAutoFormatData* CreateAutoFormatData();
-    void			AutoFormat( USHORT nFormatNo, BOOL bRecord = TRUE );
+    void			AutoFormat( sal_uInt16 nFormatNo, sal_Bool bRecord = sal_True );
 
     void			SearchAndReplace( const SvxSearchItem* pSearchItem,
-                                        BOOL bAddUndo, BOOL bIsApi );
+                                        sal_Bool bAddUndo, sal_Bool bIsApi );
 
     void			Solve( const ScSolveParam& rParam );
-    void			TabOp( const ScTabOpParam& rParam,  BOOL bRecord = TRUE );
+    void			TabOp( const ScTabOpParam& rParam,  sal_Bool bRecord = sal_True );
 
-    BOOL			InsertTable( const String& rName, SCTAB nTabNr, BOOL bRecord = TRUE );
-    BOOL			InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord = TRUE);
+    sal_Bool			InsertTable( const String& rName, SCTAB nTabNr, sal_Bool bRecord = sal_True );
+    sal_Bool			InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, sal_Bool bRecord = sal_True);
 
 
-    BOOL			AppendTable( const String& rName, BOOL bRecord = TRUE );
+    sal_Bool			AppendTable( const String& rName, sal_Bool bRecord = sal_True );
 
-    BOOL			DeleteTable( SCTAB nTabNr, BOOL bRecord = TRUE );
-    BOOL			DeleteTables(const SvShorts &TheTabs, BOOL bRecord = TRUE );
+    sal_Bool			DeleteTable( SCTAB nTabNr, sal_Bool bRecord = sal_True );
+    sal_Bool			DeleteTables(const SvShorts &TheTabs, sal_Bool bRecord = sal_True );
 
-    BOOL			RenameTable( const String& rName, SCTAB nTabNr );
-    void			MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy );
+    sal_Bool			RenameTable( const String& rName, SCTAB nTabNr );
+    void			MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, sal_Bool bCopy );
     void			ImportTables( ScDocShell* pSrcShell,
                                     SCTAB nCount, const SCTAB* pSrcTabs,
-                                    BOOL bLink,SCTAB nTab);
+                                    sal_Bool bLink,SCTAB nTab);
 
     bool            SetTabBgColor( const Color& rColor, SCTAB nTabNr );
     bool            SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfoList );
@@ -284,13 +284,13 @@ public:
                                         const String& rTabName );
     void			InsertAreaLink( const String& rFile,
                                         const String& rFilter, const String& rOptions,
-                                        const String& rSource, ULONG nRefresh );
+                                        const String& rSource, sal_uLong nRefresh );
 
     void			ShowTable( const String& rName );
     void			HideTable( SCTAB nTabNr );
 
     void			MakeScenario( const String& rName, const String& rComment,
-                                    const Color& rColor, USHORT nFlags );
+                                    const Color& rColor, sal_uInt16 nFlags );
     void			ExtendScenario();
     void			UseScenario( const String& rName );
 
@@ -302,24 +302,24 @@ public:
     void			InsertDraw();
 
     void			SetSelectionFrameLines( const SvxBorderLine* pLine,
-                                            BOOL bColorOnly );
+                                            sal_Bool bColorOnly );
 
     void            SetNoteText( const ScAddress& rPos, const String& rNoteText );
     void            ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate );
-    void            DoRefConversion( BOOL bRecord = TRUE );
+    void            DoRefConversion( sal_Bool bRecord = sal_True );
 
-//UNUSED2008-05  void            DoSpellingChecker( BOOL bRecord = TRUE );
-    void            DoHangulHanjaConversion( BOOL bRecord = TRUE );
-    void			DoThesaurus( BOOL bRecord = TRUE );
+//UNUSED2008-05  void            DoSpellingChecker( sal_Bool bRecord = sal_True );
+    void            DoHangulHanjaConversion( sal_Bool bRecord = sal_True );
+    void			DoThesaurus( sal_Bool bRecord = sal_True );
 //UNUSED2008-05  DECL_LINK( SpellError, void * );
 
     /** Generic implementation of sheet conversion functions. */
-    void            DoSheetConversion( const ScConversionParam& rParam, BOOL bRecord = TRUE );
+    void            DoSheetConversion( const ScConversionParam& rParam, sal_Bool bRecord = sal_True );
 
-    void            SetPrintRanges( BOOL bEntireSheet,
+    void            SetPrintRanges( sal_Bool bEntireSheet,
                                     const String* pPrint,
                                     const String* pRepCol, const String* pRepRow,
-                                    BOOL bAddPrint );
+                                    sal_Bool bAddPrint );
 
     void			DetectiveAddPred();
     void			DetectiveDelPred();
@@ -334,17 +334,17 @@ public:
     inline void		HideNote() { ShowNote( false ); }
     void			EditNote();
 
-    void			ForgetFormatArea()		{ bFormatValid = FALSE; }
-    BOOL			SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL );
+    void			ForgetFormatArea()		{ bFormatValid = sal_False; }
+    sal_Bool			SelectionEditable( sal_Bool* pOnlyNotBecauseOfMatrix = NULL );
 
                                                 // interne Hilfsfunktionen
 protected:
     void			UpdateLineAttrs( SvxBorderLine&		  rLine,
                                      const SvxBorderLine* pDestLine,
                                      const SvxBorderLine* pSrcLine,
-                                     BOOL 				  bColor );
+                                     sal_Bool 				  bColor );
 
-//UNUSED2008-05  void            PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd );
+//UNUSED2008-05  void            PaintWidthHeight( sal_Bool bColumns, SCCOLROW nStart, SCCOLROW nEnd );
 
 
 private:
@@ -356,12 +356,12 @@ private:
                                               InsCellCmd eMoveMode, sal_uInt16 nCondFlags, sal_uInt16 nUndoFlags );
     void            PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData& rMark);
 
-    USHORT			GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula );
+    sal_uInt16			GetOptimalColWidth( SCCOL nCol, SCTAB nTab, sal_Bool bFormula );
 
     void			StartFormatArea();
-    BOOL			TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged );
+    sal_Bool			TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bAttrChanged );
     void			DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                        BOOL bAttrChanged, BOOL bAddUndo );
+                                        sal_Bool bAttrChanged, sal_Bool bAddUndo );
 };
 
 
diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx
index 9d17f866a..93e5a1f70 100644
--- a/sc/source/ui/inc/viewutil.hxx
+++ b/sc/source/ui/inc/viewutil.hxx
@@ -52,21 +52,21 @@ enum ScUpdateMode { SC_UPDATE_ALL, SC_UPDATE_CHANGED, SC_UPDATE_MARKS };
 class ScViewUtil								// static Methoden
 {
 public:
-    static BOOL	ExecuteCharMap( const SvxFontItem&	rOldFont,
+    static sal_Bool	ExecuteCharMap( const SvxFontItem&	rOldFont,
                                 SfxViewFrame&		rFrame,
                                 SvxFontItem&		rNewFont,
                                 String&				rString );
 
-    static BOOL IsActionShown( const ScChangeAction& rAction,
+    static sal_Bool IsActionShown( const ScChangeAction& rAction,
                                 const ScChangeViewSettings& rSettings,
                                 ScDocument& rDocument );
 
     static void PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet,
-                                USHORT nWhichId, USHORT nScript );
+                                sal_uInt16 nWhichId, sal_uInt16 nScript );
 
-    static USHORT GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos );
+    static sal_uInt16 GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos );
 
-    static sal_Int32 GetTransliterationType( USHORT nSlotID );
+    static sal_Int32 GetTransliterationType( sal_uInt16 nSlotID );
 
     static bool HasFiltered( const ScRange& rRange, ScDocument* pDoc );
     /** Fit a range to cover nRows number of unfiltered rows.
@@ -74,7 +74,7 @@ public:
     static bool FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows );
     static void UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc );
 
-    static void HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USHORT nSlotId );
+    static void HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal_uInt16 nSlotId );
 
     /** Returns true, if the passed view shell is in full screen mode. */
     static bool IsFullScreen( SfxViewShell& rViewShell );
@@ -102,9 +102,9 @@ private:
 public:
             ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
     void	SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
-    BOOL	GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
+    sal_Bool	GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
 #ifdef OLD_SELECTION_PAINT	
-    BOOL	GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont );
+    sal_Bool	GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, sal_Bool& rCont );
     void    GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
 #endif    
 };
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index cd09a35d3..a78300127 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -68,7 +68,7 @@
 
 #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
 
-inline void EnableDisable( Window& rWin, BOOL bEnable )
+inline void EnableDisable( Window& rWin, sal_Bool bEnable )
 {
     if (bEnable)
         rWin.Enable();
@@ -90,9 +90,9 @@ ScRedlinData::ScRedlinData()
     nInfo=RD_SPECIAL_NONE;
     nActionNo=0;
     pData=NULL;
-    bDisabled=FALSE;
-    bIsRejectable=FALSE;
-    bIsAcceptable=FALSE;
+    bDisabled=sal_False;
+    bIsRejectable=sal_False;
+    bIsAcceptable=sal_False;
     nTable=SCTAB_MAX;
     nCol=SCCOL_MAX;
     nRow=SCROW_MAX;
@@ -103,9 +103,9 @@ ScRedlinData::~ScRedlinData()
     nInfo=RD_SPECIAL_NONE;
     nActionNo=0;
     pData=NULL;
-    bDisabled=FALSE;
-    bIsRejectable=FALSE;
-    bIsAcceptable=FALSE;
+    bDisabled=sal_False;
+    bIsRejectable=sal_False;
+    bIsAcceptable=sal_False;
 }
 
 
@@ -141,16 +141,16 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
         aStrEmpty				( ScResId( STR_EMPTY		))
 {
     FreeResource();
-//	bScAcceptChgDlgIsDead=FALSE;
-    bNoSelection=FALSE;
-    bNeedsUpdate=FALSE;
-    bIgnoreMsg=FALSE;
+//	bScAcceptChgDlgIsDead=sal_False;
+    bNoSelection=sal_False;
+    bNeedsUpdate=sal_False;
+    bIgnoreMsg=sal_False;
     nAcceptCount=0;
     nRejectCount=0;
-    bAcceptEnableFlag=TRUE;
-    bRejectEnableFlag=TRUE;
-    bHasFilterEntry=FALSE;
-    bUseColor=FALSE;
+    bAcceptEnableFlag=sal_True;
+    bRejectEnableFlag=sal_True;
+    bHasFilterEntry=sal_False;
+    bUseColor=sal_False;
     aReOpenTimer.SetTimeout(50);
     aReOpenTimer.SetTimeoutHdl(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl ));
 
@@ -172,7 +172,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
     pTPFilter->SetReadyHdl(LINK( this, ScAcceptChgDlg, FilterHandle ));
     pTPFilter->SetRefHdl(LINK( this, ScAcceptChgDlg, RefHandle ));
     pTPFilter->SetModifyHdl(LINK( this, ScAcceptChgDlg, FilterModified));
-    pTPFilter->HideRange(FALSE);
+    pTPFilter->HideRange(sal_False);
     pTPView->InsertCalcHeader();
     pTPView->SetRejectClickHdl( LINK( this, ScAcceptChgDlg,RejectHandle));
     pTPView->SetAcceptClickHdl( LINK(this, ScAcceptChgDlg, AcceptHandle));
@@ -201,7 +201,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
 }
 ScAcceptChgDlg::~ScAcceptChgDlg()
 {
-//	bScAcceptChgDlgIsDead=TRUE;
+//	bScAcceptChgDlgIsDead=sal_True;
     ClearView();
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
 
@@ -224,13 +224,13 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData)
         pDoc=NULL;
     }
 
-    bNoSelection=FALSE;
-    bNeedsUpdate=FALSE;
-    bIgnoreMsg=FALSE;
+    bNoSelection=sal_False;
+    bNeedsUpdate=sal_False;
+    bIgnoreMsg=sal_False;
     nAcceptCount=0;
     nRejectCount=0;
-    bAcceptEnableFlag=TRUE;
-    bRejectEnableFlag=TRUE;
+    bAcceptEnableFlag=sal_True;
+    bRejectEnableFlag=sal_True;
 
     //	#91781# don't call Init here (switching between views), just set link below
     //	(dialog is just hidden, not deleted anymore, when switching views)
@@ -260,7 +260,7 @@ void __EXPORT ScAcceptChgDlg::Init()
         aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser());
         pTPFilter->ClearAuthors();
         ScStrCollection aUserColl=pChanges->GetUserCollection();
-        for(USHORT	i=0;i<aUserColl.GetCount();i++)
+        for(sal_uInt16	i=0;i<aUserColl.GetCount();i++)
             pTPFilter->InsertAuthor(aUserColl[i]->GetString());
     }
 
@@ -275,7 +275,7 @@ void __EXPORT ScAcceptChgDlg::Init()
     pTPFilter->SetFirstTime(aChangeViewSet.GetTheFirstDateTime());
     pTPFilter->SetLastDate(aChangeViewSet.GetTheLastDateTime());
     pTPFilter->SetLastTime(aChangeViewSet.GetTheLastDateTime());
-    pTPFilter->SetDateMode((USHORT)aChangeViewSet.GetTheDateMode());
+    pTPFilter->SetDateMode((sal_uInt16)aChangeViewSet.GetTheDateMode());
     pTPFilter->CheckComment(aChangeViewSet.HasComment());
     pTPFilter->SetComment(aChangeViewSet.GetTheComment());
 
@@ -318,10 +318,10 @@ void ScAcceptChgDlg::ClearView()
 {
     nAcceptCount=0;
     nRejectCount=0;
-    pTheView->SetUpdateMode(FALSE);
+    pTheView->SetUpdateMode(sal_False);
 
     pTheView->Clear();
-    pTheView->SetUpdateMode(TRUE);
+    pTheView->SetUpdateMode(sal_True);
 }
 
 String* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType)
@@ -355,11 +355,11 @@ String* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType)
 }
 
 
-BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
+sal_Bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
 {
-    if(pScChangeAction==NULL) return FALSE;
+    if(pScChangeAction==NULL) return sal_False;
 
-    BOOL bFlag=FALSE;
+    sal_Bool bFlag=sal_False;
 
     ScRange aRef=pScChangeAction->GetBigRange().MakeRange();
     String aUser=pScChangeAction->GetUser();
@@ -376,7 +376,7 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
     {
         if(!pScChangeAction->IsDialogParent())
         {
-            pScChangeAction->GetDescription( aDesc, pDoc, TRUE);
+            pScChangeAction->GetDescription( aDesc, pDoc, sal_True);
         }
     }
     else
@@ -405,12 +405,12 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
 
             if(pRangeEntry!=NULL)
             {
-                bFlag=TRUE;
+                bFlag=sal_True;
             }
         }
         else
         {
-            bFlag=TRUE;
+            bFlag=sal_True;
         }
     }
 
@@ -419,7 +419,7 @@ BOOL ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
 
 SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeAction,
                                                    ScChangeActionState /* eState */, SvLBoxEntry* pParent,
-                                                   BOOL bDelMaster,BOOL bDisabled,ULONG nPos)
+                                                   sal_Bool bDelMaster,sal_Bool bDisabled,sal_uLong nPos)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
 
@@ -427,7 +427,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
 
     SvLBoxEntry* pEntry=NULL;
 
-    BOOL bFlag=FALSE;
+    sal_Bool bFlag=sal_False;
 
     ScRange aRef=pScChangeAction->GetBigRange().MakeRange();
     String aUser=pScChangeAction->GetUser();
@@ -455,13 +455,13 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
         {
             aString=aStrContentWithChild;
             pNewData->nInfo=RD_SPECIAL_VISCONTENT;
-            pNewData->bIsRejectable=FALSE;
-            pNewData->bIsAcceptable=FALSE;
+            pNewData->bIsRejectable=sal_False;
+            pNewData->bIsAcceptable=sal_False;
         }
         else
         {
             aString=*MakeTypeString(eType);
-            pScChangeAction->GetDescription( aDesc, pDoc, TRUE);
+            pScChangeAction->GetDescription( aDesc, pDoc, sal_True);
         }
     }
     else
@@ -470,9 +470,9 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
 
         if(bDelMaster)
         {
-            pScChangeAction->GetDescription( aDesc, pDoc,TRUE);
-            pNewData->bDisabled=TRUE;
-            pNewData->bIsRejectable=FALSE;
+            pScChangeAction->GetDescription( aDesc, pDoc,sal_True);
+            pNewData->bDisabled=sal_True;
+            pNewData->bIsRejectable=sal_False;
         }
         else
             pScChangeAction->GetDescription( aDesc, pDoc,!pScChangeAction->IsMasterDelete());
@@ -480,11 +480,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
     }
 
     aString+='\t';
-    pScChangeAction->GetRefString(aRefStr, pDoc, TRUE);
+    pScChangeAction->GetRefString(aRefStr, pDoc, sal_True);
     aString+=aRefStr;
     aString+='\t';
 
-    BOOL bIsGenerated;
+    sal_Bool bIsGenerated;
 
     if(!pChanges->IsGenerated(pScChangeAction->GetActionNumber()))
     {
@@ -495,13 +495,13 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
         aString+=' ';
         aString+=ScGlobal::pLocaleData->getTime(aDateTime);
         aString+='\t';
-        bIsGenerated=FALSE;
+        bIsGenerated=sal_False;
     }
     else
     {
         aString+='\t';
         aString+='\t';
-        bIsGenerated=TRUE;
+        bIsGenerated=sal_True;
     }
 
     String aComment=pScChangeAction->GetComment();
@@ -531,14 +531,14 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
                 //SC_CAS_VIRGIN,SC_CAS_ACCEPTED,SC_CAS_REJECTED
                 if(pRangeEntry!=NULL)
                 {
-                    bHasFilterEntry=TRUE;
-                    bFlag=TRUE;
+                    bHasFilterEntry=sal_True;
+                    bFlag=sal_True;
                 }
             }
             else if(!bIsGenerated)
             {
-                bHasFilterEntry=TRUE;
-                bFlag=TRUE;
+                bHasFilterEntry=sal_True;
+                bFlag=sal_True;
             }
         }
     }
@@ -570,18 +570,18 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
 
 SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChangeAction,
                                                    ScChangeActionState eState,SvLBoxEntry* pParent,
-                                                   BOOL bDelMaster,BOOL bDisabled,ULONG nPos)
+                                                   sal_Bool bDelMaster,sal_Bool bDisabled,sal_uLong nPos)
 {
 
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
 
     if(pScChangeAction==NULL || pChanges==NULL) return NULL;
 
-    BOOL bIsGenerated=pChanges->IsGenerated(pScChangeAction->GetActionNumber());
+    sal_Bool bIsGenerated=pChanges->IsGenerated(pScChangeAction->GetActionNumber());
 
     SvLBoxEntry* pEntry=NULL;
 
-    int bFlag=FALSE;
+    int bFlag=sal_False;
 
     ScRange aRef=pScChangeAction->GetBigRange().MakeRange();
     String aUser=pScChangeAction->GetUser();
@@ -602,12 +602,12 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
             if(pRangeEntry!=NULL &&
                 pScChangeAction->GetState()==eState)
             {
-                bFlag=TRUE;
+                bFlag=sal_True;
             }
         }
         else if(pScChangeAction->GetState()==eState && !bIsGenerated)
         {
-            bFlag=TRUE;
+            bFlag=sal_True;
         }
     }
 
@@ -637,13 +637,13 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
             {
                 aString=aStrContentWithChild;
                 pNewData->nInfo=RD_SPECIAL_VISCONTENT;
-                pNewData->bIsRejectable=FALSE;
-                pNewData->bIsAcceptable=FALSE;
+                pNewData->bIsRejectable=sal_False;
+                pNewData->bIsAcceptable=sal_False;
             }
             else
             {
                 aString=*MakeTypeString(eType);
-                pScChangeAction->GetDescription( aDesc, pDoc, TRUE);
+                pScChangeAction->GetDescription( aDesc, pDoc, sal_True);
             }
         }
         else
@@ -652,9 +652,9 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
 
             if(bDelMaster)
             {
-                pScChangeAction->GetDescription( aDesc, pDoc,TRUE);
-                pNewData->bDisabled=TRUE;
-                pNewData->bIsRejectable=FALSE;
+                pScChangeAction->GetDescription( aDesc, pDoc,sal_True);
+                pNewData->bDisabled=sal_True;
+                pNewData->bIsRejectable=sal_False;
             }
             else
                 pScChangeAction->GetDescription( aDesc, pDoc,!pScChangeAction->IsMasterDelete());
@@ -662,7 +662,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
         }
 
         aString+='\t';
-        pScChangeAction->GetRefString(aRefStr, pDoc, TRUE);
+        pScChangeAction->GetRefString(aRefStr, pDoc, sal_True);
         aString+=aRefStr;
         aString+='\t';
 
@@ -701,16 +701,16 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
 }
 
 SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionContent* pScChangeAction,
-                                                          SvLBoxEntry* pParent, ULONG nSpecial)
+                                                          SvLBoxEntry* pParent, sal_uLong nSpecial)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     SvLBoxEntry* pEntry=NULL;
 
     if(pScChangeAction==NULL || pChanges==NULL) return NULL;
 
-    BOOL bIsGenerated=pChanges->IsGenerated(pScChangeAction->GetActionNumber());
+    sal_Bool bIsGenerated=pChanges->IsGenerated(pScChangeAction->GetActionNumber());
 
-    BOOL bFlag=FALSE;
+    sal_Bool bFlag=sal_False;
 
     ScRange aRef=pScChangeAction->GetBigRange().MakeRange();
     String aUser=pScChangeAction->GetUser();
@@ -730,11 +730,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
             //SC_CAS_VIRGIN,SC_CAS_ACCEPTED,SC_CAS_REJECTED
             if(pRangeEntry!=NULL)
             {
-                bFlag=TRUE;
+                bFlag=sal_True;
             }
         }
         else if(!bIsGenerated)
-            bFlag=TRUE;
+            bFlag=sal_True;
     }
 
     String aRefStr;
@@ -775,7 +775,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
 
     aDesc+=a2String;
     aString+='\t';
-    pScChangeAction->GetRefString(aRefStr, pDoc, TRUE);
+    pScChangeAction->GetRefString(aRefStr, pDoc, sal_True);
     aString+=aRefStr;
     aString+='\t';
 
@@ -811,7 +811,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
     pNewData->pData=(void *)pScChangeAction;
     pNewData->nActionNo=pScChangeAction->GetActionNumber();
     pNewData->bIsAcceptable=pScChangeAction->IsClickable();
-    pNewData->bIsRejectable=FALSE;
+    pNewData->bIsRejectable=sal_False;
     pNewData->bDisabled=!pNewData->bIsAcceptable;
     pNewData->aDateTime=aDateTime;
     pNewData->nRow	= aRef.aStart.Row();
@@ -820,7 +820,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
 
     if(pTheView->IsValidComment(&aComment) && bFlag)
     {
-        bHasFilterEntry=TRUE;
+        bHasFilterEntry=sal_True;
         pEntry=pTheView->InsertEntry(aString,pNewData,pParent);
     }
     else
@@ -834,7 +834,7 @@ long ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt )
     {
         ClearView();
         UpdateView();
-        bNoSelection=FALSE;
+        bNoSelection=sal_False;
     }
 
     return SfxModelessDialog::PreNotify(rNEvt);
@@ -843,16 +843,16 @@ long ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt )
 
 void ScAcceptChgDlg::UpdateView()
 {
-    bNeedsUpdate=FALSE;
+    bNeedsUpdate=sal_False;
     DateTime aDateTime;
     SvLBoxEntry* pParent=NULL;
     ScChangeTrack* pChanges=NULL;
     const ScChangeAction* pScChangeAction=NULL;
-    bAcceptEnableFlag=TRUE;
-    bRejectEnableFlag=TRUE;
+    bAcceptEnableFlag=sal_True;
+    bRejectEnableFlag=sal_True;
     SetPointer(Pointer(POINTER_WAIT));
-    pTheView->SetUpdateMode(FALSE);
-    BOOL bFilterFlag=pTPFilter->IsDate()||pTPFilter->IsRange()||
+    pTheView->SetUpdateMode(sal_False);
+    sal_Bool bFilterFlag=pTPFilter->IsDate()||pTPFilter->IsRange()||
                      pTPFilter->IsAuthor()||pTPFilter->IsComment();
 
     bUseColor=bFilterFlag;
@@ -866,11 +866,11 @@ void ScAcceptChgDlg::UpdateView()
         }
     }
     ScChangeActionTable ActionTable;
-    BOOL bTheFlag=FALSE;
+    sal_Bool bTheFlag=sal_False;
 
     while(pScChangeAction!=NULL)
     {
-        bHasFilterEntry=FALSE;
+        bHasFilterEntry=sal_False;
         switch(pScChangeAction->GetState())
         {
             case SC_CAS_VIRGIN:
@@ -885,7 +885,7 @@ void ScAcceptChgDlg::UpdateView()
                 else
                     pParent=NULL;
 
-                bTheFlag=TRUE;
+                bTheFlag=sal_True;
                 break;
 
             case SC_CAS_ACCEPTED:
@@ -903,12 +903,12 @@ void ScAcceptChgDlg::UpdateView()
         {
             if(!bFilterFlag)
             {
-                pParent->EnableChildsOnDemand(TRUE);
+                pParent->EnableChildsOnDemand(sal_True);
             }
             else
             {
-                BOOL bTestFlag=bHasFilterEntry;
-                bHasFilterEntry=FALSE;
+                sal_Bool bTestFlag=bHasFilterEntry;
+                bHasFilterEntry=sal_False;
                 if(Expand(pChanges,pScChangeAction,pParent,!bTestFlag)&&!bTestFlag)
                     pTheView->RemoveEntry(pParent);
             }
@@ -918,7 +918,7 @@ void ScAcceptChgDlg::UpdateView()
     }
 
     if( bTheFlag && (!pDoc->IsDocEditable() || pChanges->IsProtected()) )
-        bTheFlag=FALSE;
+        bTheFlag=sal_False;
 
     pTPView->EnableAccept(bTheFlag);
     pTPView->EnableAcceptAll(bTheFlag);
@@ -930,16 +930,16 @@ void ScAcceptChgDlg::UpdateView()
         pParent=pTheView->InsertEntry(
             aStrAllAccepted, static_cast< RedlinData * >(NULL),
             static_cast< SvLBoxEntry * >(NULL));
-        pParent->EnableChildsOnDemand(TRUE);
+        pParent->EnableChildsOnDemand(sal_True);
     }
     if(nRejectCount>0)
     {
         pParent=pTheView->InsertEntry(
             aStrAllRejected, static_cast< RedlinData * >(NULL),
             static_cast< SvLBoxEntry * >(NULL));
-        pParent->EnableChildsOnDemand(TRUE);
+        pParent->EnableChildsOnDemand(sal_True);
     }
-    pTheView->SetUpdateMode(TRUE);
+    pTheView->SetUpdateMode(sal_True);
     SetPointer(Pointer(POINTER_ARROW));
     SvLBoxEntry* pEntry=pTheView->First();
     if(pEntry!=NULL)
@@ -949,7 +949,7 @@ void ScAcceptChgDlg::UpdateView()
 }
 
 //----------------------------------------------------------------------------
-BOOL ScAcceptChgDlg::Close()
+sal_Bool ScAcceptChgDlg::Close()
 {
     return SfxModelessDialog::Close();
 }
@@ -973,23 +973,23 @@ IMPL_LINK( ScAcceptChgDlg, MinSizeHandle, SvxAcceptChgCtr*, pCtr )
 
 IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG )
 {
-    USHORT nId  =ScSimpleRefDlgWrapper::GetChildWindowId();
+    sal_uInt16 nId  =ScSimpleRefDlgWrapper::GetChildWindowId();
 
-    ScSimpleRefDlgWrapper::SetDefaultPosSize(GetPosPixel(),GetSizePixel(),TRUE);
+    ScSimpleRefDlgWrapper::SetDefaultPosSize(GetPosPixel(),GetSizePixel(),sal_True);
 
-    SC_MOD()->SetRefDialog( nId, TRUE );
+    SC_MOD()->SetRefDialog( nId, sal_True );
 
     SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
     ScSimpleRefDlgWrapper* pWnd =(ScSimpleRefDlgWrapper*)pViewFrm->GetChildWindow( nId );
 
     if(pWnd!=NULL)
     {
-//		bSimpleRefDlgStarted=TRUE;
-        USHORT nAcceptId=ScAcceptChgDlgWrapper::GetChildWindowId();
-        pViewFrm->ShowChildWindow(nAcceptId,FALSE);
+//		bSimpleRefDlgStarted=sal_True;
+        sal_uInt16 nAcceptId=ScAcceptChgDlgWrapper::GetChildWindowId();
+        pViewFrm->ShowChildWindow(nAcceptId,sal_False);
         pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle));
         pWnd->SetRefString(pTPFilter->GetRange());
-        pWnd->SetAutoReOpen(FALSE);
+        pWnd->SetAutoReOpen(sal_False);
         Window* pWin=pWnd->GetWindow();
         pWin->SetPosSizePixel(GetPosPixel(),GetSizePixel());
         Hide();
@@ -1001,10 +1001,10 @@ IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG )
 
 IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult)
 {
-    USHORT nId;
+    sal_uInt16 nId;
 
-//	bSimpleRefDlgStarted=FALSE;
-    ScSimpleRefDlgWrapper::SetAutoReOpen(TRUE);
+//	bSimpleRefDlgStarted=sal_False;
+    ScSimpleRefDlgWrapper::SetAutoReOpen(sal_True);
 
     SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
     if(pResult!=NULL)
@@ -1024,12 +1024,12 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult)
             Invalidate();
         }
         nId = ScAcceptChgDlgWrapper::GetChildWindowId();
-        pViewFrm->ShowChildWindow( nId, TRUE );
+        pViewFrm->ShowChildWindow( nId, sal_True );
     }
     else
     {
         nId = ScAcceptChgDlgWrapper::GetChildWindowId();
-        pViewFrm->SetChildWindow( nId, FALSE );
+        pViewFrm->SetChildWindow( nId, sal_False );
     }
     return 0;
 }
@@ -1050,7 +1050,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef )
 {
     SetPointer(Pointer(POINTER_WAIT));
 
-    bIgnoreMsg=TRUE;
+    bIgnoreMsg=sal_True;
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
 
     if(pRef!=NULL)
@@ -1082,7 +1082,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef )
     }
     SetPointer(Pointer(POINTER_ARROW));
 
-    bIgnoreMsg=FALSE;
+    bIgnoreMsg=sal_False;
     return 0;
 }
 IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef )
@@ -1090,7 +1090,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef )
     SetPointer(Pointer(POINTER_WAIT));
 
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
-    bIgnoreMsg=TRUE;
+    bIgnoreMsg=sal_True;
     if(pRef!=NULL)
     {
         SvLBoxEntry* pEntry=pTheView->FirstSelected();
@@ -1105,7 +1105,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef )
                 {
                     if(pEntryData->nInfo==RD_SPECIAL_CONTENT)
                     {
-                        pChanges->SelectContent(pScChangeAction,TRUE);
+                        pChanges->SelectContent(pScChangeAction,sal_True);
                     }
                     else
                     {
@@ -1124,7 +1124,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef )
         ClearView();
         UpdateView();
     }
-    bIgnoreMsg=FALSE;
+    bIgnoreMsg=sal_False;
 
     return 0;
 }
@@ -1179,7 +1179,7 @@ void ScAcceptChgDlg::AcceptFiltered()
 IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG )
 {
     SetPointer(Pointer(POINTER_WAIT));
-    bIgnoreMsg=TRUE;
+    bIgnoreMsg=sal_True;
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     if(pChanges!=NULL)
     {
@@ -1203,7 +1203,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG )
     }
     SetPointer(Pointer(POINTER_ARROW));
 
-    bIgnoreMsg=FALSE;
+    bIgnoreMsg=sal_False;
 
     return 0;
 }
@@ -1212,7 +1212,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG )
 {
     SetPointer(Pointer(POINTER_WAIT));
 
-    bIgnoreMsg=TRUE;
+    bIgnoreMsg=sal_True;
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     if(pChanges!=NULL)
     {
@@ -1231,7 +1231,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG )
         ClearView();
         UpdateView();
     }
-    bIgnoreMsg=FALSE;
+    bIgnoreMsg=sal_False;
     SetPointer(Pointer(POINTER_ARROW));
 
     return 0;
@@ -1243,7 +1243,7 @@ IMPL_LINK( ScAcceptChgDlg, SelectHandle, SvxRedlinTable*, EMPTYARG )
     {
         aSelectionTimer.Start();
     }
-    bNoSelection=FALSE;
+    bNoSelection=sal_False;
     return 0;
 }
 
@@ -1276,12 +1276,12 @@ void ScAcceptChgDlg::GetDependents(  const ScChangeAction* pScChangeAction,
     }
 }
 
-BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
+sal_Bool ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
 {
-    BOOL bTheTestFlag=TRUE;
+    sal_Bool bTheTestFlag=sal_True;
     ScRedlinData *pEntryData=(ScRedlinData *)(pParent->GetUserData());
     const ScChangeAction* pScChangeAction = (ScChangeAction*) pEntryData->pData;
-    BOOL bParentInserted = FALSE;
+    sal_Bool bParentInserted = sal_False;
     // If the parent is a MatrixOrigin then place it in the right order before
     // the MatrixReferences. Also if it is the first content change at this
     // position don't insert the first dependent MatrixReference as the special
@@ -1292,7 +1292,7 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo
     {
         pActionTable->Insert( pScChangeAction->GetActionNumber(),
             (ScChangeAction*) pScChangeAction );
-        bParentInserted = TRUE;
+        bParentInserted = sal_True;
     }
     SvLBoxEntry* pEntry=NULL;
 
@@ -1304,18 +1304,18 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo
         pCChild=(const ScChangeActionContent*)pActionTable->Next();
     }
 
-    if(pCChild==NULL) return TRUE;
+    if(pCChild==NULL) return sal_True;
 
     SvLBoxEntry* pOriginal=InsertChangeActionContent(pCChild,pParent,RD_SPECIAL_CONTENT);
     if(pOriginal!=NULL)
     {
-        bTheTestFlag=FALSE;
+        bTheTestFlag=sal_False;
         ScRedlinData *pParentData=(ScRedlinData *)(pOriginal->GetUserData());
         pParentData->pData=(void *)pScChangeAction;
         pParentData->nActionNo=pScChangeAction->GetActionNumber();
         pParentData->bIsAcceptable=pScChangeAction->IsRejectable();	// select old value
-        pParentData->bIsRejectable=FALSE;
-        pParentData->bDisabled=FALSE;
+        pParentData->bIsRejectable=sal_False;
+        pParentData->bDisabled=sal_False;
     }
     while(pCChild!=NULL)
     {
@@ -1324,7 +1324,7 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo
             pEntry=InsertChangeActionContent(pCChild,pParent,RD_SPECIAL_NONE);
 
             if(pEntry!=NULL)
-                bTheTestFlag=FALSE;
+                bTheTestFlag=sal_False;
         }
         pCChild=(const ScChangeActionContent*)pActionTable->Next();
     }
@@ -1336,13 +1336,13 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo
 
         if(pEntry!=NULL)
         {
-            bTheTestFlag=FALSE;
+            bTheTestFlag=sal_False;
             ScRedlinData *pParentData=(ScRedlinData *)(pEntry->GetUserData());
             pParentData->pData=(void *)pScChangeAction;
             pParentData->nActionNo=pScChangeAction->GetActionNumber();
             pParentData->bIsAcceptable=pScChangeAction->IsClickable();
-            pParentData->bIsRejectable=FALSE;
-            pParentData->bDisabled=FALSE;
+            pParentData->bIsRejectable=sal_False;
+            pParentData->bDisabled=sal_False;
         }
     }
 
@@ -1350,10 +1350,10 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo
 
 }
 
-BOOL ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent)
+sal_Bool ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
-    BOOL bTheTestFlag=TRUE;
+    sal_Bool bTheTestFlag=sal_True;
 
     ScChangeActionState eState = SC_CAS_VIRGIN;
     String aString=pTheView->GetEntryText( pParent);
@@ -1376,35 +1376,35 @@ BOOL ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent)
     {
         if(pScChangeAction->GetState()==eState &&
             InsertFilteredAction(pScChangeAction,eState,pParent)!=NULL)
-            bTheTestFlag=FALSE;
+            bTheTestFlag=sal_False;
         pScChangeAction=pScChangeAction->GetNext();
     }
     return bTheTestFlag;
 }
 
-BOOL ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
+sal_Bool ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
-    BOOL bTheTestFlag=TRUE;
+    sal_Bool bTheTestFlag=sal_True;
     SvLBoxEntry* pEntry=NULL;
     const ScChangeAction* pChild=(const ScChangeAction*)pActionTable->First();
     while(pChild!=NULL)
     {
-        pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,FALSE,TRUE);
+        pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,sal_False,sal_True);
 
         if(pEntry!=NULL)
         {
-            bTheTestFlag=FALSE;
+            bTheTestFlag=sal_False;
 
             ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData());
-            pEntryData->bIsRejectable=FALSE;
-            pEntryData->bIsAcceptable=FALSE;
-            pEntryData->bDisabled=TRUE;
+            pEntryData->bIsRejectable=sal_False;
+            pEntryData->bIsAcceptable=sal_False;
+            pEntryData->bDisabled=sal_True;
 
             if(pChild->IsDialogParent())
             {
 
-                //pEntry->EnableChildsOnDemand(TRUE);
+                //pEntry->EnableChildsOnDemand(sal_True);
                 Expand(pChanges,pChild,pEntry);
             }
         }
@@ -1412,11 +1412,11 @@ BOOL ScAcceptChgDlg::InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry*
     }
     return bTheTestFlag;
 }
-BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction,
+sal_Bool ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction,
                                          ScChangeActionTable* pActionTable,SvLBoxEntry* pParent)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
-    BOOL bTheTestFlag=TRUE;
+    sal_Bool bTheTestFlag=sal_True;
     SvLBoxEntry* pEntry=NULL;
     ScChangeActionTable aDelActionTable;
     const ScChangeAction* pChild=(const ScChangeAction*)pActionTable->First();
@@ -1425,18 +1425,18 @@ BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction,
     {
 
         if(pScChangeAction!=pChild)
-            pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,FALSE,TRUE);
+            pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,sal_False,sal_True);
         else
-            pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,TRUE,TRUE);
+            pEntry=InsertChangeAction(pChild,SC_CAS_VIRGIN,pParent,sal_True,sal_True);
 
         if(pEntry!=NULL)
         {
             ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData());
-            pEntryData->bIsRejectable=FALSE;
-            pEntryData->bIsAcceptable=FALSE;
-            pEntryData->bDisabled=TRUE;
+            pEntryData->bIsRejectable=sal_False;
+            pEntryData->bIsAcceptable=sal_False;
+            pEntryData->bDisabled=sal_True;
 
-            bTheTestFlag=FALSE;
+            bTheTestFlag=sal_False;
             if ( pChild->IsDialogParent() )
             {
                 Expand(pChanges,pChild,pEntry);
@@ -1444,7 +1444,7 @@ BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction,
                 pChanges->GetDependents((ScChangeAction*) pChild,aDelActionTable);
                 if(aDelActionTable.First()!=NULL)
                 {
-                    pEntry->EnableChildsOnDemand(TRUE);
+                    pEntry->EnableChildsOnDemand(sal_True);
                 }
                 aDelActionTable.Clear();
                 */
@@ -1455,10 +1455,10 @@ BOOL ScAcceptChgDlg::InsertDeletedChilds(const ScChangeAction* pScChangeAction,
     return bTheTestFlag;
 }
 
-BOOL ScAcceptChgDlg::Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction,
-                            SvLBoxEntry* pEntry,BOOL bFilter)
+sal_Bool ScAcceptChgDlg::Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction,
+                            SvLBoxEntry* pEntry,sal_Bool bFilter)
 {
-    BOOL bTheTestFlag=TRUE;
+    sal_Bool bTheTestFlag=sal_True;
 
     if(pChanges!=NULL &&pEntry!=NULL &&pScChangeAction!=NULL)
     {
@@ -1513,8 +1513,8 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
 
             if(pEntry->HasChildsOnDemand())
             {
-                BOOL bTheTestFlag=TRUE;
-                pEntry->EnableChildsOnDemand(FALSE);
+                sal_Bool bTheTestFlag=sal_True;
+                pEntry->EnableChildsOnDemand(sal_False);
                 pTheView->RemoveEntry(pTheView->FirstChild(pEntry));
 
                 if(pEntryData!=NULL)
@@ -1556,32 +1556,32 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
         }
     }
     SetPointer(Pointer(POINTER_ARROW));
-    return (ULONG) TRUE;
+    return (sal_uLong) sal_True;
 }
 
 
-void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction,
-                                   ULONG nEndAction, ULONG /* nPos */)
+void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction,
+                                   sal_uLong nEndAction, sal_uLong /* nPos */)
 {
     if(pChanges!=NULL)
     {
         DateTime aDateTime;
         SvLBoxEntry* pParent=NULL;
         const ScChangeAction* pScChangeAction=NULL;
-        bAcceptEnableFlag=TRUE;
-        bRejectEnableFlag=TRUE;
+        bAcceptEnableFlag=sal_True;
+        bRejectEnableFlag=sal_True;
         SetPointer(Pointer(POINTER_WAIT));
-        pTheView->SetUpdateMode(FALSE);
+        pTheView->SetUpdateMode(sal_False);
 
         ScChangeActionTable ActionTable;
-        BOOL bTheFlag=FALSE;
+        sal_Bool bTheFlag=sal_False;
 
-        BOOL bFilterFlag=pTPFilter->IsDate()||pTPFilter->IsRange()||
+        sal_Bool bFilterFlag=pTPFilter->IsDate()||pTPFilter->IsRange()||
                      pTPFilter->IsAuthor()||pTPFilter->IsComment();
 
         bUseColor=bFilterFlag;
 
-        for(ULONG i=nStartAction;i<=nEndAction;i++)
+        for(sal_uLong i=nStartAction;i<=nEndAction;i++)
         {
             pScChangeAction=pChanges->GetAction(i);
             if(pScChangeAction==NULL) continue;
@@ -1601,7 +1601,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction,
                     else
                         pParent=NULL;
 
-                    bTheFlag=TRUE;
+                    bTheFlag=sal_True;
                     break;
 
                 case SC_CAS_ACCEPTED:
@@ -1619,12 +1619,12 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction,
             {
                 if(!bFilterFlag)
                 {
-                    pParent->EnableChildsOnDemand(TRUE);
+                    pParent->EnableChildsOnDemand(sal_True);
                 }
                 else
                 {
-                    BOOL bTestFlag=bHasFilterEntry;
-                    bHasFilterEntry=FALSE;
+                    sal_Bool bTestFlag=bHasFilterEntry;
+                    bHasFilterEntry=sal_False;
                     if(Expand(pChanges,pScChangeAction,pParent,!bTestFlag)&&!bTestFlag)
                         pTheView->RemoveEntry(pParent);
                 }
@@ -1634,22 +1634,22 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction,
         }
 
         if( bTheFlag && (!pDoc->IsDocEditable() || pChanges->IsProtected()) )
-            bTheFlag=FALSE;
+            bTheFlag=sal_False;
 
         pTPView->EnableAccept(bTheFlag);
         pTPView->EnableAcceptAll(bTheFlag);
         pTPView->EnableReject(bTheFlag);
         pTPView->EnableRejectAll(bTheFlag);
 
-        pTheView->SetUpdateMode(TRUE);
+        pTheView->SetUpdateMode(sal_True);
         SetPointer(Pointer(POINTER_ARROW));
     }
 }
 
-void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction)
+void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction)
 {
 
-    pTheView->SetUpdateMode(FALSE);
+    pTheView->SetUpdateMode(sal_False);
 
     SvLBoxEntry* pEntry=pTheView->GetCurEntry();
 
@@ -1658,7 +1658,7 @@ void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction)
     if(pEntry!=NULL)
         pEntryData=(ScRedlinData *)(pEntry->GetUserData());
 
-    ULONG nAction=0;
+    sal_uLong nAction=0;
     if(pEntryData!=NULL)
     {
         nAction=pEntryData->nActionNo;
@@ -1669,19 +1669,19 @@ void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction)
         pTheView->SetCurEntry(pTheView->GetModel()->GetEntry(0));
     }
 
-    BOOL bRemove=FALSE;
+    sal_Bool bRemove=sal_False;
 
     // MUST do it backwards, don't delete parents before children and GPF
     pEntry=pTheView->Last();
     while(pEntry!=NULL)
     {
-        bRemove=FALSE;
+        bRemove=sal_False;
         pEntryData=(ScRedlinData *)(pEntry->GetUserData());
         if(pEntryData!=NULL)
         {
             nAction=pEntryData->nActionNo;
 
-            if(nStartAction<=nAction && nAction<=nEndAction) bRemove=TRUE;
+            if(nStartAction<=nAction && nAction<=nEndAction) bRemove=sal_True;
 
 
         }
@@ -1694,33 +1694,33 @@ void ScAcceptChgDlg::RemoveEntrys(ULONG nStartAction,ULONG nEndAction)
         }
         pEntry=pPrevEntry;
     }
-    pTheView->SetUpdateMode(TRUE);
+    pTheView->SetUpdateMode(sal_True);
 
 }
 
-void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction)
+void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, sal_uLong nStartAction,sal_uLong nEndAction)
 {
-    pTheView->SetUpdateMode(FALSE);
+    pTheView->SetUpdateMode(sal_False);
 
-    ULONG nPos=LIST_APPEND;
+    sal_uLong nPos=LIST_APPEND;
 
-    BOOL bRemove=FALSE;
+    sal_Bool bRemove=sal_False;
 
     SvLBoxEntry* pEntry=pTheView->First();
     SvLBoxEntry* pNextEntry = (pEntry ? pTheView->NextSibling(pEntry) : NULL);
     SvLBoxEntry* pLastEntry=NULL;
     while(pEntry!=NULL)
     {
-        bRemove=FALSE;
+        bRemove=sal_False;
         ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData());
         if(pEntryData!=NULL)
         {
             ScChangeAction* pScChangeAction=
                     (ScChangeAction*) pEntryData->pData;
 
-            ULONG nAction=pScChangeAction->GetActionNumber();
+            sal_uLong nAction=pScChangeAction->GetActionNumber();
 
-            if(nStartAction<=nAction && nAction<=nEndAction) bRemove=TRUE;
+            if(nStartAction<=nAction && nAction<=nEndAction) bRemove=sal_True;
         }
 
         if(bRemove)
@@ -1756,7 +1756,7 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,U
     else
         AppendChanges(pChgTrack,nStartAction,nEndAction);
 
-    pTheView->SetUpdateMode(TRUE);
+    pTheView->SetUpdateMode(sal_True);
 
 }
 
@@ -1767,8 +1767,8 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack)
     ScChangeTrackMsgQueue& aMsgQueue= pChgTrack->GetMsgQueue();
 
     ScChangeTrackMsgInfo* pTrackInfo=aMsgQueue.Get();
-    ULONG	nStartAction;
-    ULONG	nEndAction;
+    sal_uLong	nStartAction;
+    sal_uLong	nEndAction;
 
     while(pTrackInfo!=NULL)
     {
@@ -1777,7 +1777,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack)
 
         if(!bIgnoreMsg)
         {
-            bNoSelection=TRUE;
+            bNoSelection=sal_True;
 
             switch(pTrackInfo->eMsgType)
             {
@@ -1786,7 +1786,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack)
                 case SC_CTM_REMOVE: RemoveEntrys(nStartAction,nEndAction);
                                     break;
                 case SC_CTM_PARENT:
-                case SC_CTM_CHANGE: //bNeedsUpdate=TRUE;
+                case SC_CTM_CHANGE: //bNeedsUpdate=sal_True;
                                     UpdateEntrys(pChgTrack,nStartAction,nEndAction);
                                     break;
                 default:
@@ -1803,7 +1803,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack)
 }
 IMPL_LINK( ScAcceptChgDlg, ReOpenTimerHdl, Timer*, EMPTYARG )
 {
-    ScSimpleRefDlgWrapper::SetAutoReOpen(TRUE);
+    ScSimpleRefDlgWrapper::SetAutoReOpen(sal_True);
     aAcceptChgCtr.ShowFilterPage();
     RefHandle(NULL);
 
@@ -1814,9 +1814,9 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG )
 {
     ScTabView* pTabView = pViewData->GetView();
 
-    BOOL bAcceptFlag = TRUE;
-    BOOL bRejectFlag = TRUE;
-    BOOL bContMark = FALSE;
+    sal_Bool bAcceptFlag = sal_True;
+    sal_Bool bRejectFlag = sal_True;
+    sal_Bool bContMark = sal_False;
 
     pTabView->DoneBlockMode();  // clears old marking
     SvLBoxEntry* pEntry = pTheView->FirstSelected();
@@ -1835,16 +1835,16 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG )
                 const ScBigRange& rBigRange = pScChangeAction->GetBigRange();
                 if( rBigRange.IsValid( pDoc ) && IsActive() )
                 {
-                    BOOL bSetCursor = !pTheView->NextSelected( pEntry );
+                    sal_Bool bSetCursor = !pTheView->NextSelected( pEntry );
                     pTabView->MarkRange( rBigRange.MakeRange(), bSetCursor, bContMark );
-                    bContMark = TRUE;
+                    bContMark = sal_True;
                 }
             }
         }
         else
         {
-            bAcceptFlag = FALSE;
-            bRejectFlag = FALSE;
+            bAcceptFlag = sal_False;
+            bRejectFlag = sal_False;
         }
         bAcceptEnableFlag = bAcceptFlag;
         bRejectEnableFlag = bRejectFlag;
@@ -1853,7 +1853,7 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG )
     }
 
     ScChangeTrack* pChanges = pDoc->GetChangeTrack();
-    BOOL bEnable = pDoc->IsDocEditable() && pChanges && !pChanges->IsProtected();
+    sal_Bool bEnable = pDoc->IsDocEditable() && pChanges && !pChanges->IsProtected();
     pTPView->EnableAccept( bAcceptFlag && bEnable );
     pTPView->EnableReject( bRejectFlag && bEnable );
 
@@ -1881,11 +1881,11 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG )
             aPopup.Deactivate();
         }
 
-        USHORT nSortedCol= pTheView->GetSortedCol();
+        sal_uInt16 nSortedCol= pTheView->GetSortedCol();
 
         if(nSortedCol!=0xFFFF)
         {
-            USHORT nItemId=nSortedCol+SC_SUB_SORT+1;
+            sal_uInt16 nItemId=nSortedCol+SC_SUB_SORT+1;
 
             aPopup.CheckItem(nItemId);
 
@@ -1896,7 +1896,7 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG )
             }
         }
 
-        aPopup.EnableItem(SC_CHANGES_COMMENT,FALSE);
+        aPopup.EnableItem(SC_CHANGES_COMMENT,sal_False);
 
         if(pDoc->IsDocEditable() && pEntry!=NULL)
         {
@@ -1910,7 +1910,7 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG )
             }
         }
 
-        USHORT nCommand=aPopup.Execute( this, GetPointerPosPixel() );
+        sal_uInt16 nCommand=aPopup.Execute( this, GetPointerPosPixel() );
 
 
         if(nCommand)
@@ -1925,14 +1925,14 @@ IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG )
                         ScChangeAction* pScChangeAction=
                                 (ScChangeAction*) pEntryData->pData;
 
-                        pViewData->GetDocShell()->ExecuteChangeCommentDialog( pScChangeAction, this,FALSE);
+                        pViewData->GetDocShell()->ExecuteChangeCommentDialog( pScChangeAction, this,sal_False);
                     }
                 }
             }
             else
             {
-                BOOL bSortDir=pTheView->GetSortDirection();
-                USHORT nDialogCol=nCommand-SC_SUB_SORT-1;
+                sal_Bool bSortDir=pTheView->GetSortDirection();
+                sal_uInt16 nDialogCol=nCommand-SC_SUB_SORT-1;
                 if(nSortedCol==nDialogCol) bSortDir=!bSortDir;
                 pTheView->SortByCol(nDialogCol,bSortDir);
                 /*
@@ -1982,13 +1982,13 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
 
     if ( aStr.Len())
     {
-        USHORT nCount=(USHORT)aStr.ToInt32();
+        sal_uInt16 nCount=(sal_uInt16)aStr.ToInt32();
 
-        for(USHORT i=0;i<nCount;i++)
+        for(sal_uInt16 i=0;i<nCount;i++)
         {
             xub_StrLen n1 = aStr.Search(';');
             aStr.Erase(0, n1+1);
-            pTheView->SetTab(i,(USHORT)aStr.ToInt32(),MAP_PIXEL);
+            pTheView->SetTab(i,(sal_uInt16)aStr.ToInt32(),MAP_PIXEL);
         }
     }
 }
@@ -2000,11 +2000,11 @@ void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const
     SfxModelessDialog::FillInfo(rInfo);
     rInfo.aExtraString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "AcceptChgDat:(" ));
 
-    USHORT	nCount=pTheView->TabCount();
+    sal_uInt16	nCount=pTheView->TabCount();
 
     rInfo.aExtraString += String::CreateFromInt32(nCount);
     rInfo.aExtraString += ';';
-    for(USHORT i=0;i<nCount;i++)
+    for(sal_uInt16 i=0;i<nCount;i++)
     {
         rInfo.aExtraString += String::CreateFromInt32(pTheView->GetTab(i));
         rInfo.aExtraString += ';';
@@ -2029,7 +2029,7 @@ void ScAcceptChgDlg::InitFilter()
         pTheView->SetFilterComment(pTPFilter->IsComment());
 
         utl::SearchParam aSearchParam( pTPFilter->GetComment(),
-                utl::SearchParam::SRCH_REGEXP,FALSE,FALSE,FALSE );
+                utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False );
 
         pTheView->SetCommentParams(&aSearchParam);
 
@@ -2118,8 +2118,8 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData )
 
         if(pLeftItem != NULL && pRightItem != NULL)
         {
-            USHORT nLeftKind=pLeftItem->IsA();
-            USHORT nRightKind=pRightItem->IsA();
+            sal_uInt16 nLeftKind=pLeftItem->IsA();
+            sal_uInt16 nRightKind=pRightItem->IsA();
 
             if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
                 nLeftKind == SV_ITEM_ID_LBOXSTRING )
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 8d061b20d..f210fc536 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -70,8 +70,8 @@ ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindi
  , pAccel( NULL )
  , pHiddenMarks(NULL)
  , nRefTab(0)
- , bHighLightRef( FALSE )
- , bAccInserted( FALSE )
+ , bHighLightRef( sal_False )
+ , bAccInserted( sal_False )
 {
     ScInputOptions aInputOption=SC_MOD()->GetInputOptions();
     bEnableColorRef=aInputOption.GetRangeFinder();
@@ -85,14 +85,14 @@ ScFormulaReferenceHelper::~ScFormulaReferenceHelper()
     // common cleanup for ScAnyRefDlg and ScFormulaDlg is done here
 
     HideReference();
-    enableInput( TRUE );
+    enableInput( sal_True );
 
     ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
     if ( pInputHdl )
         pInputHdl->ResetDelayTimer();   // stop the timer for disabling the input line
 }
 // -----------------------------------------------------------------------------
-void ScFormulaReferenceHelper::enableInput( BOOL bEnable )
+void ScFormulaReferenceHelper::enableInput( sal_Bool bEnable )
 {
     TypeId aType(TYPE(ScDocShell));
     ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType);
@@ -114,8 +114,8 @@ void ScFormulaReferenceHelper::enableInput( BOOL bEnable )
                         Window *pParent=pWin->GetParent();
                         if(pParent)
                         {
-                            pParent->EnableInput(bEnable,TRUE /* FALSE */);
-                            if(TRUE /*bChilds*/)
+                            pParent->EnableInput(bEnable,sal_True /* sal_False */);
+                            if(sal_True /*bChilds*/)
                                 pViewSh->EnableRefInput(bEnable);
                         }
                     }
@@ -132,7 +132,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr )
 {
     if( /*!pRefEdit &&*/ bEnableColorRef )
     {
-        bHighLightRef=TRUE;
+        bHighLightRef=sal_True;
         ScViewData* pViewData=ScDocShell::GetViewData();
         if ( pViewData )
         {
@@ -141,14 +141,14 @@ void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr )
 
             ScRangeList aRangeList;
 
-            pTabViewShell->DoneRefMode( FALSE );
+            pTabViewShell->DoneRefMode( sal_False );
             pTabViewShell->ClearHighlightRanges();
 
             if( ParseWithNames( aRangeList, rStr, pDoc ) )
             {
                 ScRange* pRangeEntry = aRangeList.First();
 
-                USHORT nIndex=0;
+                sal_uInt16 nIndex=0;
                 while(pRangeEntry != NULL)
                 {
                     ColorData aColName = ScRangeFindList::GetColorName(nIndex++);
@@ -174,7 +174,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin
         ScRange aRange;
         String aRangeStr( rStr.GetToken( nToken ) );
 
-        USHORT nFlags = aRange.ParseAny( aRangeStr, pDoc, aDetails );
+        sal_uInt16 nFlags = aRange.ParseAny( aRangeStr, pDoc, aDetails );
         if ( nFlags & SCA_VALID )
         {
             if ( (nFlags & SCA_TAB_3D) == 0 )
@@ -196,7 +196,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr )
 {
     if( /*!pRefEdit &&*/ bEnableColorRef)
     {
-        bHighLightRef=TRUE;
+        bHighLightRef=sal_True;
         ScViewData* pViewData=ScDocShell::GetViewData();
         if ( pViewData && pRefComp.get() )
         {
@@ -211,17 +211,17 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr )
 
             if(pTabViewShell!=NULL && pScTokA!=NULL)
             {
-                pTabViewShell->DoneRefMode( FALSE );
+                pTabViewShell->DoneRefMode( sal_False );
                 pTabViewShell->ClearHighlightRanges();
 
                 pScTokA->Reset();
                 const ScToken* pToken = static_cast<const ScToken*>(pScTokA->GetNextReference());
 
-                USHORT nIndex=0;
+                sal_uInt16 nIndex=0;
 
                 while(pToken!=NULL)
                 {
-                    BOOL bDoubleRef=(pToken->GetType()==formula::svDoubleRef);
+                    sal_Bool bDoubleRef=(pToken->GetType()==formula::svDoubleRef);
 
 
                     if(pToken->GetType()==formula::svSingleRef || bDoubleRef)
@@ -253,7 +253,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr )
     }
 }
 // -----------------------------------------------------------------------------
-void ScFormulaReferenceHelper::HideReference( BOOL bDoneRefMode )
+void ScFormulaReferenceHelper::HideReference( sal_Bool bDoneRefMode )
 {
     ScViewData* pViewData=ScDocShell::GetViewData();
 
@@ -263,14 +263,14 @@ void ScFormulaReferenceHelper::HideReference( BOOL bDoneRefMode )
 
         if(pTabViewShell!=NULL)
         {
-            //	bDoneRefMode is FALSE when called from before SetReference.
+            //	bDoneRefMode is sal_False when called from before SetReference.
             //	In that case, RefMode was just started and must not be ended now.
 
             if ( bDoneRefMode )
-                pTabViewShell->DoneRefMode( FALSE );
+                pTabViewShell->DoneRefMode( sal_False );
             pTabViewShell->ClearHighlightRanges();
         }
-        bHighLightRef=FALSE;
+        bHighLightRef=sal_False;
     }
 }
 // -----------------------------------------------------------------------------
@@ -323,9 +323,9 @@ void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::R
                 {
                     pViewShell->SetTabNo( pRange->aStart.Tab() );
                     pViewShell->MoveCursorAbs(  pRange->aStart.Col(),
-                        pRange->aStart.Row(), SC_FOLLOW_JUMP, FALSE, FALSE );
+                        pRange->aStart.Row(), SC_FOLLOW_JUMP, sal_False, sal_False );
                     pViewShell->MoveCursorAbs( pRange->aEnd.Col(),
-                        pRange->aEnd.Row(), SC_FOLLOW_JUMP, TRUE, FALSE );
+                        pRange->aEnd.Row(), SC_FOLLOW_JUMP, sal_True, sal_False );
                     m_pDlg->SetReference( *pRange, pDoc );
                 }
             }
@@ -348,7 +348,7 @@ void ScFormulaReferenceHelper::Init()
         pRefCell.reset( new ScFormulaCell( pDoc, aCursorPos, rStrExp ) );
         pRefComp.reset( new ScCompiler( pDoc, aCursorPos) );
         pRefComp->SetGrammar( pDoc->GetGrammar() );
-        pRefComp->SetCompileForFAP(TRUE);
+        pRefComp->SetCompileForFAP(sal_True);
 
         nRefTab = nTab;
     } // if ( pViewData )
@@ -365,13 +365,13 @@ IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel )
         case KEY_ESCAPE:
             if( pRefEdit )
                 pRefEdit->GrabFocus();
-            m_pDlg->RefInputDone( TRUE );
+            m_pDlg->RefInputDone( sal_True );
         break;
     }
-    return TRUE;
+    return sal_True;
 }
 //----------------------------------------------------------------------------
-void ScFormulaReferenceHelper::RefInputDone( BOOL bForced )
+void ScFormulaReferenceHelper::RefInputDone( sal_Bool bForced )
 {
     //<!--Modified by PengYunQuan for Validity Cell Range Picker
     //if (pRefEdit && (bForced || !pRefBtn))
@@ -381,7 +381,7 @@ void ScFormulaReferenceHelper::RefInputDone( BOOL bForced )
         if (bAccInserted)			// Accelerator wieder abschalten
         {
             Application::RemoveAccel( pAccel.get() );
-            bAccInserted = FALSE;
+            bAccInserted = sal_False;
         }
 
         // Fenstertitel anpassen
@@ -401,8 +401,8 @@ void ScFormulaReferenceHelper::RefInputDone( BOOL bForced )
         }
 
         // Alle anderen: Show();
-        USHORT nChildren = m_pWindow->GetChildCount();
-        for ( USHORT i = 0; i < nChildren; i++ )
+        sal_uInt16 nChildren = m_pWindow->GetChildCount();
+        for ( sal_uInt16 i = 0; i < nChildren; i++ )
             if (pHiddenMarks[i])
             {
                 m_pWindow->GetChild(i)->GetWindow( WINDOW_CLIENT )->Show();
@@ -428,11 +428,11 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
         sNewDialogText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " ));
 
         // Alle Elemente ausser EditCell und Button verstecken
-        USHORT nChildren = m_pWindow->GetChildCount();
-        pHiddenMarks = new BOOL [nChildren];
-        for (USHORT i = 0; i < nChildren; i++)
+        sal_uInt16 nChildren = m_pWindow->GetChildCount();
+        pHiddenMarks = new sal_Bool [nChildren];
+        for (sal_uInt16 i = 0; i < nChildren; i++)
         {
-            pHiddenMarks[i] = FALSE;
+            pHiddenMarks[i] = sal_False;
             Window* pWin = m_pWindow->GetChild(i);
             pWin = pWin->GetWindow( WINDOW_CLIENT );
             if (pWin == (Window*)pRefEdit)
@@ -443,7 +443,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
                 ;	// do nothing
             else if (pWin->IsVisible())
             {
-                pHiddenMarks[i] = TRUE;
+                pHiddenMarks[i] = sal_True;
                 pWin->Hide();
             }
         }
@@ -497,7 +497,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
                 pAccel->SetSelectHdl( LINK( this, ScFormulaReferenceHelper, AccelSelectHdl ) );
             }
             Application::InsertAccel( pAccel.get() );
-            bAccInserted = TRUE;
+            bAccInserted = sal_True;
 //        }
     }
 }
@@ -509,11 +509,11 @@ void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula
         if( pRefEdit == pEdit )                 // is this the active ref edit field?
         {
             pRefEdit->GrabFocus();              // before RefInputDone()
-            m_pDlg->RefInputDone( TRUE );               // finish ref input
+            m_pDlg->RefInputDone( sal_True );               // finish ref input
         }
         else
         {
-            m_pDlg->RefInputDone( TRUE );               // another active ref edit?
+            m_pDlg->RefInputDone( sal_True );               // another active ref edit?
             m_pDlg->RefInputStart( pEdit, pButton );    // start ref input
             // pRefEdit might differ from pEdit after RefInputStart() (i.e. ScFormulaDlg)
             if( pRefEdit )
@@ -522,11 +522,11 @@ void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ScFormulaReferenceHelper::DoClose( USHORT nId )
+sal_Bool ScFormulaReferenceHelper::DoClose( sal_uInt16 nId )
 {
     SfxApplication* pSfxApp = SFX_APP();
 
-    SetDispatcherLock( FALSE );			//! here and in dtor ?
+    SetDispatcherLock( sal_False );			//! here and in dtor ?
 
     SfxViewFrame* pViewFrm = SfxViewFrame::Current();
     if ( pViewFrm && pViewFrm->HasChildWindow(FID_INPUTLINE_STATUS) )
@@ -550,17 +550,17 @@ BOOL ScFormulaReferenceHelper::DoClose( USHORT nId )
         if (pMyDisp)
             pMyViewFrm = pMyDisp->GetFrame();
     }
-    SC_MOD()->SetRefDialog( nId, FALSE, pMyViewFrm );
+    SC_MOD()->SetRefDialog( nId, sal_False, pMyViewFrm );
 
     pSfxApp->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) );
 
     ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell();
     if ( pScViewShell )
-        pScViewShell->UpdateInputHandler(TRUE);
+        pScViewShell->UpdateInputHandler(sal_True);
 
-    return TRUE;
+    return sal_True;
 }
-void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock )
+void ScFormulaReferenceHelper::SetDispatcherLock( sal_Bool bLock )
 {
     //	lock / unlock only the dispatchers of Calc documents
 
@@ -587,11 +587,11 @@ void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock )
 // -----------------------------------------------------------------------------
 void ScFormulaReferenceHelper::ViewShellChanged(ScTabViewShell* /* pScViewShell */)
 {
-    enableInput( FALSE );
+    enableInput( sal_False );
 
     EnableSpreadsheets();
 }
-void ScFormulaReferenceHelper::EnableSpreadsheets(BOOL bFlag, BOOL bChilds)
+void ScFormulaReferenceHelper::EnableSpreadsheets(sal_Bool bFlag, sal_Bool bChilds)
 {
     TypeId aType(TYPE(ScDocShell));
     ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType);
@@ -613,7 +613,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(BOOL bFlag, BOOL bChilds)
                         Window *pParent=pWin->GetParent();
                         if(pParent)
                         {
-                            pParent->EnableInput(bFlag,FALSE);
+                            pParent->EnableInput(bFlag,sal_False);
                             if(bChilds)
                                 pViewSh->EnableRefInput(bFlag);
                         }
@@ -681,7 +681,7 @@ void lcl_HideAllReferences()
 //----------------------------------------------------------------------------
 
 ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW,
-                          Window* pParent, USHORT nResId*/, bool bBindRef )
+                          Window* pParent, sal_uInt16 nResId*/, bool bBindRef )
     :	//SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ),
         m_rWindow( rWindow ),
         m_bInRefMode( false ),
@@ -723,7 +723,7 @@ bool ScRefHandler::EnterRefMode()
             {
                 pScViewShell = PTR_CAST( ScTabViewShell, pMyViewFrm->GetViewShell() );
                 if( pScViewShell )
-                    pScViewShell->UpdateInputHandler(TRUE);
+                    pScViewShell->UpdateInputHandler(sal_True);
                 pParentDoc = pMyViewFrm->GetObjectShell();
             }
         }
@@ -740,15 +740,15 @@ bool ScRefHandler::EnterRefMode()
     if ( pInputHdl )
         pInputHdl->NotifyChange( NULL );
 
-    m_aHelper.enableInput( FALSE );
+    m_aHelper.enableInput( sal_False );
 
     m_aHelper.EnableSpreadsheets();
 
     m_aHelper.Init();
 
-    m_aHelper.SetDispatcherLock( TRUE );
+    m_aHelper.SetDispatcherLock( sal_True );
     //@Test
-    //SFX_APPWINDOW->Disable(TRUE);	  //@BugID 54702
+    //SFX_APPWINDOW->Disable(sal_True);	  //@BugID 54702
     
     return m_bInRefMode = true;
 }
@@ -767,14 +767,14 @@ bool ScRefHandler::LeaveRefMode()
     lcl_HideAllReferences();
 
     if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<Window*>(*this) ) )
-        pDlg->SetModalInputMode(FALSE);
-    SetDispatcherLock( FALSE );			//! here and in DoClose ?
+        pDlg->SetModalInputMode(sal_False);
+    SetDispatcherLock( sal_False );			//! here and in DoClose ?
 
     ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell();
     if( pScViewShell )
-        pScViewShell->UpdateInputHandler(TRUE);
+        pScViewShell->UpdateInputHandler(sal_True);
 
-    //SFX_APPWINDOW->Enable(TRUE,TRUE);
+    //SFX_APPWINDOW->Enable(sal_True,sal_True);
     lcl_InvalidateWindows();
 
     m_bInRefMode = false;
@@ -822,7 +822,7 @@ void ScRefHandler::SwitchToDocument()
 
 //----------------------------------------------------------------------------
 
-BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const	// pDocSh may be 0
+sal_Bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const	// pDocSh may be 0
 {
     //	default: allow only same document (overridden in function dialog)
     String aCmpName;
@@ -835,20 +835,20 @@ BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const	// pDocSh may be 0
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScRefHandler::IsRefInputMode() const
+sal_Bool __EXPORT ScRefHandler::IsRefInputMode() const
 {
     return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen
 }
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScRefHandler::DoClose( USHORT nId )
+sal_Bool __EXPORT ScRefHandler::DoClose( sal_uInt16 nId )
 {
     m_aHelper.DoClose(nId);
-    return TRUE;
+    return sal_True;
 }
 
-void ScRefHandler::SetDispatcherLock( BOOL bLock )
+void ScRefHandler::SetDispatcherLock( sal_Bool bLock )
 {
     m_aHelper.SetDispatcherLock( bLock );
 }
@@ -869,11 +869,11 @@ void ScRefHandler::AddRefEntry()
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScRefHandler::IsTableLocked() const
+sal_Bool __EXPORT ScRefHandler::IsTableLocked() const
 {
     // per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden
 
-    return FALSE;
+    return sal_False;
 }
 
 //----------------------------------------------------------------------------
@@ -897,7 +897,7 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
 //The two following function is commentted out by PengYunQuan for Validity Cell Range Picker
 //long ScAnyRefDlg::PreNotify( NotifyEvent& rNEvt )
 //{
-//	USHORT nSwitch=rNEvt.GetType();
+//	sal_uInt16 nSwitch=rNEvt.GetType();
 //	if(nSwitch==EVENT_GETFOCUS)
 //	{
 //		pActiveWin=rNEvt.GetWindow();
@@ -913,15 +913,15 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
 //	{
 //		if(IsVisible())
 //		{
-//			m_aHelper.enableInput( FALSE );
+//			m_aHelper.enableInput( sal_False );
 //			m_aHelper.EnableSpreadsheets();
-//			m_aHelper.SetDispatcherLock( TRUE );
+//			m_aHelper.SetDispatcherLock( sal_True );
 //			aTimer.Start();
 //		}
 //		else
 //		{
-//			m_aHelper.enableInput( TRUE );
-//			m_aHelper.SetDispatcherLock( FALSE );			//! here and in DoClose ?
+//			m_aHelper.enableInput( sal_True );
+//			m_aHelper.SetDispatcherLock( sal_False );			//! here and in DoClose ?
 //		}
 //	}
 //}
@@ -937,7 +937,7 @@ INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEv
 {\
     if( bBindRef || m_bInRefMode )\
     {\
-        USHORT nSwitch=rNEvt.GetType();\
+        sal_uInt16 nSwitch=rNEvt.GetType();\
         if(nSwitch==EVENT_GETFOCUS)\
         {\
             pActiveWin=rNEvt.GetWindow();\
@@ -957,15 +957,15 @@ INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( State
     {\
         if(m_rWindow.IsVisible())\
         {\
-            m_aHelper.enableInput( FALSE );\
+            m_aHelper.enableInput( sal_False );\
             m_aHelper.EnableSpreadsheets();\
-            m_aHelper.SetDispatcherLock( TRUE );\
+            m_aHelper.SetDispatcherLock( sal_True );\
             aTimer.Start();\
         }\
         else\
         {\
-            m_aHelper.enableInput( TRUE );\
-            m_aHelper.SetDispatcherLock( FALSE );			/*//! here and in DoClose ?*/\
+            m_aHelper.enableInput( sal_True );\
+            m_aHelper.SetDispatcherLock( sal_False );			/*//! here and in DoClose ?*/\
         }\
     }\
 }
@@ -989,7 +989,7 @@ bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const String& rStr, ScD
     return m_aHelper.ParseWithNames( rRanges, rStr, pDoc );
 }
 // -----------------------------------------------------------------------------
-void ScRefHandler::HideReference( BOOL bDoneRefMode )
+void ScRefHandler::HideReference( sal_Bool bDoneRefMode )
 {
     m_aHelper.HideReference( bDoneRefMode );
 }
@@ -1004,7 +1004,7 @@ void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB
     m_aHelper.ReleaseFocus( pEdit,pButton );
 }
 //----------------------------------------------------------------------------
-void ScRefHandler::RefInputDone( BOOL bForced )
+void ScRefHandler::RefInputDone( sal_Bool bForced )
 {
     m_aHelper.RefInputDone( bForced );
 }
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index ceed2e048..31bce08f6 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -104,8 +104,8 @@
 //CHINA001   aStrDelMsg      ( ScResId( STR_DEL_MSG ) ) ,
 //CHINA001   //
 //CHINA001   nIndex          ( 0 ),
-//CHINA001   bFmtInserted    ( FALSE ),
-//CHINA001   bCoreDataChanged( FALSE ),
+//CHINA001   bFmtInserted    ( sal_False ),
+//CHINA001   bCoreDataChanged( sal_False ),
 //CHINA001   pFormat         ( pAutoFormat ),
 //CHINA001   pSelFmtData     ( pSelFormatData )
 //CHINA001 {
@@ -125,7 +125,7 @@
 //CHINA001
 //CHINA001 void ScAutoFormatDlg::Init()
 //CHINA001 {
-//CHINA001   USHORT nCount;
+//CHINA001   sal_uInt16 nCount;
 //CHINA001   String aEntry;
 //CHINA001
 //CHINA001   aLbFormat    .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) );
@@ -153,7 +153,7 @@
 //CHINA001
 //CHINA001   nCount = pFormat->GetCount();
 //CHINA001
-//CHINA001   for ( USHORT i = 0; i < nCount; i++ )
+//CHINA001   for ( sal_uInt16 i = 0; i < nCount; i++ )
 //CHINA001   {
 //CHINA001     ((*pFormat)[i])->GetName( aEntry );
 //CHINA001     aLbFormat.InsertEntry( aEntry );
@@ -173,7 +173,7 @@
 //CHINA001   {
 //CHINA001     aBtnAdd.Disable();
 //CHINA001     aBtnRemove.Disable();
-//CHINA001     bFmtInserted = TRUE;
+//CHINA001     bFmtInserted = sal_True;
 //CHINA001   }
 //CHINA001 }
 //CHINA001
@@ -224,7 +224,7 @@
 //CHINA001 IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn )
 //CHINA001 {
 //CHINA001   ScAutoFormatData* pData  = (*pFormat)[nIndex];
-//CHINA001   BOOL              bCheck = ((CheckBox*)pBtn)->IsChecked();
+//CHINA001   sal_Bool              bCheck = ((CheckBox*)pBtn)->IsChecked();
 //CHINA001
 //CHINA001   if ( pBtn == &aBtnNumFormat )
 //CHINA001     pData->SetIncludeValueFormat( bCheck );
@@ -242,7 +242,7 @@
 //CHINA001   if ( !bCoreDataChanged )
 //CHINA001   {
 //CHINA001     aBtnCancel.SetText( aStrClose );
-//CHINA001     bCoreDataChanged = TRUE;
+//CHINA001     bCoreDataChanged = sal_True;
 //CHINA001   }
 //CHINA001
 //CHINA001   pWndPreview->NotifyChange( pData );
@@ -259,7 +259,7 @@
 //CHINA001     String              aStrStandard( ScResId(STR_STANDARD) );
 //CHINA001     String              aFormatName;
 //CHINA001     ScStringInputDlg*   pDlg;
-//CHINA001     BOOL                bOk = FALSE;
+//CHINA001     sal_Bool                bOk = sal_False;
 //CHINA001
 //CHINA001     while ( !bOk )
 //CHINA001     {
@@ -283,7 +283,7 @@
 //CHINA001
 //CHINA001                 if ( bFmtInserted )
 //CHINA001                 {
-//CHINA001                     USHORT nAt = pFormat->IndexOf( pNewData );
+//CHINA001                     sal_uInt16 nAt = pFormat->IndexOf( pNewData );
 //CHINA001
 //CHINA001                     aLbFormat.InsertEntry( aFormatName, nAt );
 //CHINA001                     aLbFormat.SelectEntry( aFormatName );
@@ -292,11 +292,11 @@
 //CHINA001                     if ( !bCoreDataChanged )
 //CHINA001                     {
 //CHINA001                         aBtnCancel.SetText( aStrClose );
-//CHINA001                         bCoreDataChanged = TRUE;
+//CHINA001                         bCoreDataChanged = sal_True;
 //CHINA001                     }
 //CHINA001
 //CHINA001                     SelFmtHdl( 0 );
-//CHINA001                     bOk = TRUE;
+//CHINA001                     bOk = sal_True;
 //CHINA001                 }
 //CHINA001                 else
 //CHINA001                     delete pNewData;
@@ -305,7 +305,7 @@
 //CHINA001
 //CHINA001             if ( !bFmtInserted )
 //CHINA001             {
-//CHINA001                 USHORT nRet = ErrorBox( this,
+//CHINA001                 sal_uInt16 nRet = ErrorBox( this,
 //CHINA001                                         WinBits( WB_OK_CANCEL | WB_DEF_OK),
 //CHINA001                                         ScGlobal::GetRscString(STR_INVALID_AFNAME)
 //CHINA001                                       ).Execute();
@@ -314,7 +314,7 @@
 //CHINA001             }
 //CHINA001         }
 //CHINA001         else
-//CHINA001             bOk = TRUE;
+//CHINA001             bOk = sal_True;
 //CHINA001
 //CHINA001         delete pDlg;
 //CHINA001     }
@@ -346,7 +346,7 @@
 //CHINA001         if ( !bCoreDataChanged )
 //CHINA001         {
 //CHINA001             aBtnCancel.SetText( aStrClose );
-//CHINA001             bCoreDataChanged = TRUE;
+//CHINA001             bCoreDataChanged = sal_True;
 //CHINA001         }
 //CHINA001
 //CHINA001         pFormat->AtFree( nIndex ); // in der Core loeschen
@@ -363,7 +363,7 @@
 //CHINA001
 //CHINA001 IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, pBtn)
 //CHINA001 {
-//CHINA001   BOOL bOk = FALSE;
+//CHINA001   sal_Bool bOk = sal_False;
 //CHINA001   while( !bOk )
 //CHINA001   {
 //CHINA001
@@ -377,9 +377,9 @@
 //CHINA001                                      HID_SC_RENAME_AUTOFMT );
 //CHINA001     if( pDlg->Execute() == RET_OK )
 //CHINA001     {
-//CHINA001         BOOL bFmtRenamed = FALSE;
+//CHINA001         sal_Bool bFmtRenamed = sal_False;
 //CHINA001         pDlg->GetInputString( aFormatName );
-//CHINA001         USHORT n;
+//CHINA001         sal_uInt16 n;
 //CHINA001
 //CHINA001         if ( aFormatName.Len() > 0 )
 //CHINA001         {
@@ -405,29 +405,29 @@
 //CHINA001
 //CHINA001                 pFormat->Insert( pNewData);
 //CHINA001
-//CHINA001                 USHORT nCount = pFormat->GetCount();
+//CHINA001                 sal_uInt16 nCount = pFormat->GetCount();
 //CHINA001
-//CHINA001                 aLbFormat.SetUpdateMode(FALSE);
+//CHINA001                 aLbFormat.SetUpdateMode(sal_False);
 //CHINA001                 aLbFormat.Clear();
-//CHINA001                 for ( USHORT i = 0; i < nCount; i++ )
+//CHINA001                 for ( sal_uInt16 i = 0; i < nCount; i++ )
 //CHINA001                 {
 //CHINA001                     ((*pFormat)[i])->GetName( aEntry );
 //CHINA001                     aLbFormat.InsertEntry( aEntry );
 //CHINA001                 }
 //CHINA001
-//CHINA001                 aLbFormat.SetUpdateMode( TRUE);
+//CHINA001                 aLbFormat.SetUpdateMode( sal_True);
 //CHINA001                 aLbFormat.SelectEntry( aFormatName);
 //CHINA001
 //CHINA001                 if ( !bCoreDataChanged )
 //CHINA001                 {
 //CHINA001                     aBtnCancel.SetText( aStrClose );
-//CHINA001                     bCoreDataChanged = TRUE;
+//CHINA001                     bCoreDataChanged = sal_True;
 //CHINA001                 }
 //CHINA001
 //CHINA001
 //CHINA001                 SelFmtHdl( 0 );
-//CHINA001                 bOk = TRUE;
-//CHINA001                 bFmtRenamed = TRUE;
+//CHINA001                 bOk = sal_True;
+//CHINA001                 bFmtRenamed = sal_True;
 //CHINA001             }
 //CHINA001         }
 //CHINA001         if( !bFmtRenamed )
@@ -439,7 +439,7 @@
 //CHINA001         }
 //CHINA001     }
 //CHINA001     else
-//CHINA001         bOk = TRUE;
+//CHINA001         bOk = sal_True;
 //CHINA001     delete pDlg;
 //CHINA001   }
 //CHINA001
@@ -489,7 +489,7 @@ ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocume
         aVD 			( *this ),
         aScriptedText   ( aVD ),
         xBreakIter      ( pDoc->GetBreakIterator() ),
-        bFitWidth		( FALSE ),
+        bFitWidth		( sal_False ),
         mbRTL           ( false ),
         aPrvSize        ( GetSizePixel().Width() - 6, GetSizePixel().Height() - 30 ),
         mnLabelColWidth ( (aPrvSize.Width() - 4) / 4 - 12 ),
@@ -532,7 +532,7 @@ void lcl_SetFontProperties(
     rFont.SetItalic     ( (FontItalic)rPostureItem.GetValue() );
 }
 
-void ScAutoFmtPreview::MakeFonts( USHORT nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont )
+void ScAutoFmtPreview::MakeFonts( sal_uInt16 nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont )
 {
     if ( pCurData )
     {
@@ -573,7 +573,7 @@ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Va
         SETONALLFONTS( SetShadow,       pShadowedItem->GetValue() )
         SETONALLFONTS( SetColor,        aColor )
         SETONALLFONTS( SetSize,         aFontSize )
-        SETONALLFONTS( SetTransparent,  TRUE )
+        SETONALLFONTS( SetTransparent,  sal_True )
 
 #undef SETONALLFONTS
     }
@@ -581,9 +581,9 @@ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Va
 
 //------------------------------------------------------------------------
 
-USHORT ScAutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const
+sal_uInt16 ScAutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const
 {
-    static const USHORT pnFmtMap[] =
+    static const sal_uInt16 pnFmtMap[] =
     {
         0,  1,  2,  1,  3,
         4,  5,  6,  5,  7,
@@ -617,11 +617,11 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
         //------------------------
 
         String	cellString;
-        BOOL	bNumFormat	= pCurData->GetIncludeValueFormat();
-        ULONG   nNum;
+        sal_Bool	bNumFormat	= pCurData->GetIncludeValueFormat();
+        sal_uLong   nNum;
         double  nVal;
         Color*  pDummy = NULL;
-        USHORT  nIndex = static_cast< USHORT >( maArray.GetCellIndex( nCol, nRow, mbRTL ) );
+        sal_uInt16  nIndex = static_cast< sal_uInt16 >( maArray.GetCellIndex( nCol, nRow, mbRTL ) );
 
         switch( nIndex )
         {
@@ -660,7 +660,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
             mknum:
                 if( bNumFormat )
                 {
-                    ScNumFormatAbbrev& rNumFormat = (ScNumFormatAbbrev&)pCurData->GetNumFormat( (USHORT) nNum );
+                    ScNumFormatAbbrev& rNumFormat = (ScNumFormatAbbrev&)pCurData->GetNumFormat( (sal_uInt16) nNum );
                     nNum = rNumFormat.GetFormatIndex( *pNumFmt );
                 }
                 else
@@ -672,11 +672,11 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
         if ( cellString.Len() > 0 )
         {
             Size				aStrSize;
-            USHORT              nFmtIndex       = GetFormatIndex( nCol, nRow );
+            sal_uInt16              nFmtIndex       = GetFormatIndex( nCol, nRow );
             Rectangle           cellRect        = maArray.GetCellRect( nCol, nRow );
             Point               aPos            = cellRect.TopLeft();
-            USHORT				nRightX 		= 0;
-            BOOL				bJustify		= pCurData->GetIncludeJustify();
+            sal_uInt16				nRightX 		= 0;
+            sal_Bool				bJustify		= pCurData->GetIncludeJustify();
             SvxHorJustifyItem    aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY );
             SvxCellHorJustify	   eJustification;
 
@@ -729,21 +729,21 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
                 aStrSize = aScriptedText.GetTextSize();
             }
 
-            nRightX  = (USHORT)(  cellRect.GetWidth()
+            nRightX  = (sal_uInt16)(  cellRect.GetWidth()
                                   - aStrSize.Width()
                                   - FRAME_OFFSET );
 
             //-----------------------------
             // vertikal (immer zentrieren):
             //-----------------------------
-            aPos.Y() += (mnRowHeight - (USHORT)aStrSize.Height()) / 2;
+            aPos.Y() += (mnRowHeight - (sal_uInt16)aStrSize.Height()) / 2;
 
             //-----------
             // horizontal
             //-----------
             if ( eJustification != SVX_HOR_JUSTIFY_STANDARD )
             {
-                USHORT nHorPos = (USHORT)
+                sal_uInt16 nHorPos = (sal_uInt16)
                                  ((cellRect.GetWidth()-aStrSize.Width())/2);
 
                 switch ( eJustification )
@@ -849,7 +849,7 @@ void ScAutoFmtPreview::Init()
     SetBorderStyle( WINDOW_BORDER_MONO );
     maArray.Initialize( 5, 5 );
     maArray.SetUseDiagDoubleClipping( false );
-    CalcCellArray( FALSE );
+    CalcCellArray( sal_False );
     CalcLineMap();
     
     TypeId aType(TYPE(ScDocShell));
@@ -865,7 +865,7 @@ void ScAutoFmtPreview::Init()
 
 //------------------------------------------------------------------------
 
-void ScAutoFmtPreview::CalcCellArray( BOOL bFitWidthP )
+void ScAutoFmtPreview::CalcCellArray( sal_Bool bFitWidthP )
 {
     maArray.SetXOffset( 2 );
     maArray.SetAllColWidths( bFitWidthP ? mnDataColWidth2 : mnDataColWidth1 );
@@ -940,7 +940,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData )
 void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
 {
     sal_uInt32 nOldDrawMode = aVD.GetDrawMode();
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
     if( GetSettings().GetStyleSettings().GetHighContrastMode() )
         aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
 
@@ -950,7 +950,7 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
     Point aTmpPoint;
     Rectangle aRect( aTmpPoint, aWndSize );
 
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     aVD.SetFont( aFont );
     aVD.SetLineColor();
     aVD.SetFillColor( aBackCol );
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 776ddb62d..7fc3b3dc3 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -43,7 +43,7 @@
 // struct ScConflictsListEntry
 //=============================================================================
 
-bool ScConflictsListEntry::HasSharedAction( ULONG nSharedAction ) const
+bool ScConflictsListEntry::HasSharedAction( sal_uLong nSharedAction ) const
 {
     ScChangeActionList::const_iterator aEnd = maSharedActions.end();
     for ( ScChangeActionList::const_iterator aItr = maSharedActions.begin(); aItr != aEnd; ++aItr )
@@ -57,7 +57,7 @@ bool ScConflictsListEntry::HasSharedAction( ULONG nSharedAction ) const
     return false;
 }
 
-bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const
+bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const
 {
     ScChangeActionList::const_iterator aEnd = maOwnActions.end();
     for ( ScChangeActionList::const_iterator aItr = maOwnActions.begin(); aItr != aEnd; ++aItr )
@@ -76,7 +76,7 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const
 // class ScConflictsListHelper
 //=============================================================================
 
-//UNUSED2008-05  bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction )
+//UNUSED2008-05  bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, sal_uLong nSharedAction )
 //UNUSED2008-05  {
 //UNUSED2008-05      ScConflictsList::const_iterator aEnd = rConflictsList.end();
 //UNUSED2008-05      for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr )
@@ -90,7 +90,7 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const
 //UNUSED2008-05      return false;
 //UNUSED2008-05  }
 
-bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, ULONG nOwnAction )
+bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction )
 {
     ScConflictsList::const_iterator aEnd = rConflictsList.end();
     for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr )
@@ -104,7 +104,7 @@ bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, ULONG
     return false;
 }
 
-ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsList& rConflictsList, ULONG nSharedAction )
+ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsList& rConflictsList, sal_uLong nSharedAction )
 {
     ScConflictsList::iterator aEnd = rConflictsList.end();
     for ( ScConflictsList::iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr )
@@ -118,7 +118,7 @@ ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsLi
     return NULL;
 }
 
-ScConflictsListEntry* ScConflictsListHelper::GetOwnActionEntry( ScConflictsList& rConflictsList, ULONG nOwnAction )
+ScConflictsListEntry* ScConflictsListHelper::GetOwnActionEntry( ScConflictsList& rConflictsList, sal_uLong nOwnAction )
 {
     ScConflictsList::iterator aEnd = rConflictsList.end();
     for ( ScConflictsList::iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr )
@@ -178,8 +178,8 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL
 // class ScConflictsFinder
 //=============================================================================
 
-ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, ULONG nStartShared, ULONG nEndShared,
-        ULONG nStartOwn, ULONG nEndOwn, ScConflictsList& rConflictsList )
+ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared,
+        sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList )
     :mpTrack( pTrack )
     ,mnStartShared( nStartShared )
     ,mnEndShared( nEndShared )
@@ -229,7 +229,7 @@ ScConflictsListEntry* ScConflictsFinder::GetIntersectingEntry( const ScChangeAct
     return NULL;
 }
 
-ScConflictsListEntry* ScConflictsFinder::GetEntry( ULONG nSharedAction, const ScChangeActionList& rOwnActions )
+ScConflictsListEntry* ScConflictsFinder::GetEntry( sal_uLong nSharedAction, const ScChangeActionList& rOwnActions )
 {
     // try to get a list entry which already contains the shared action
     ScConflictsListEntry* pEntry = ScConflictsListHelper::GetSharedActionEntry( mrConflictsList, nSharedAction );
@@ -444,9 +444,9 @@ ScConflictsListBox::~ScConflictsListBox()
 {
 }
 
-//UNUSED2008-05  ULONG ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const
+//UNUSED2008-05  sal_uLong ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const
 //UNUSED2008-05  {
-//UNUSED2008-05      ULONG nPos = 0;
+//UNUSED2008-05      sal_uLong nPos = 0;
 //UNUSED2008-05      SvLBoxEntry* pEntry = GetRootLevelParent( First() );
 //UNUSED2008-05      while ( pEntry )
 //UNUSED2008-05      {
@@ -566,7 +566,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen
     if ( pAction && pDoc )
     {
         String aDesc;
-        pAction->GetDescription( aDesc, pDoc, TRUE, false );
+        pAction->GetDescription( aDesc, pDoc, sal_True, false );
         aString += aDesc;
         aString += '\t';
 
@@ -582,7 +582,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen
         DateTime aDateTime = pAction->GetDateTime();
         aString += ScGlobal::pLocaleData->getDate( aDateTime );
         aString += ' ';
-        aString += ScGlobal::pLocaleData->getTime( aDateTime, FALSE );
+        aString += ScGlobal::pLocaleData->getTime( aDateTime, sal_False );
         aString += '\t';
     }
 
@@ -606,7 +606,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle )
     {
         if ( bSelectHandle )
         {
-            maLbConflicts.SelectAll( FALSE );
+            maLbConflicts.SelectAll( sal_False );
         }
         if ( !maLbConflicts.IsSelected( pRootEntry ) )
         {
@@ -662,7 +662,7 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG )
 
     ScTabView* pTabView = mpViewData->GetView();
     pTabView->DoneBlockMode();
-    BOOL bContMark = FALSE;
+    sal_Bool bContMark = sal_False;
     SvLBoxEntry* pEntry = maLbConflicts.FirstSelected();
     while ( pEntry )
     {
@@ -678,9 +678,9 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG )
                     const ScBigRange& rBigRange = ( static_cast< const ScChangeAction* >( pAction ) )->GetBigRange();
                     if ( rBigRange.IsValid( mpOwnDoc ) )
                     {
-                        BOOL bSetCursor = !maLbConflicts.NextSelected( pEntry );
+                        sal_Bool bSetCursor = !maLbConflicts.NextSelected( pEntry );
                         pTabView->MarkRange( rBigRange.MakeRange(), bSetCursor, bContMark );
-                        bContMark = TRUE;
+                        bContMark = sal_True;
                     }
                 }
             }
@@ -735,9 +735,9 @@ void ScConflictsDlg::KeepAllHandler( bool bMine )
         SetConflictAction( pRootEntry, eConflictAction );
         pRootEntry = maLbConflicts.NextSibling( pRootEntry );
     }
-    maLbConflicts.SetUpdateMode( FALSE );
+    maLbConflicts.SetUpdateMode( sal_False );
     maLbConflicts.Clear();
-    maLbConflicts.SetUpdateMode( TRUE );
+    maLbConflicts.SetUpdateMode( sal_True );
     SetPointer( Pointer( POINTER_ARROW ) );
     EndDialog( RET_OK );
 }
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 38b539265..d15a036a4 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -44,7 +44,7 @@
 ScColOrRowDlg::ScColOrRowDlg( Window*		pParent,
                               const String&	rStrTitle,
                               const String&	rStrLabel,
-                              BOOL			bColDefault )
+                              sal_Bool			bColDefault )
 
     :	ModalDialog     ( pParent, ScResId( RID_SCDLG_COLORROW ) ),
         //
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index f2fa6eb77..1916bf15f 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -52,9 +52,9 @@
 #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute()
 #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute()
 
-const ULONG nEntryDataCol = 0;
-const ULONG nEntryDataRow = 1;
-const ULONG nEntryDataDelim = 2;
+const sal_uLong nEntryDataCol = 0;
+const sal_uLong nEntryDataRow = 1;
+const sal_uLong nEntryDataDelim = 2;
 
 
 //============================================================================
@@ -108,7 +108,7 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
         pDoc			( ptrViewData->GetDocument() ),
 
         pEdActive		( NULL ),
-        bDlgLostFocus	( FALSE )
+        bDlgLostFocus	( sal_False )
 {
     xColNameRanges = pDoc->GetColNameRanges()->Clone();
     xRowNameRanges = pDoc->GetRowNameRanges()->Clone();
@@ -196,8 +196,8 @@ void ScColRowNameRangesDlg::Init()
     }
     else
     {
-        aBtnColHead.Check( TRUE );
-        aBtnRowHead.Check( FALSE );
+        aBtnColHead.Check( sal_True );
+        aBtnRowHead.Check( sal_False );
         aEdAssign.SetText( EMPTY_STRING );
         aEdAssign2.SetText( EMPTY_STRING );
     }
@@ -231,22 +231,22 @@ void ScColRowNameRangesDlg::Init()
 #*
 #************************************************************************/
 
-void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef)
+void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,sal_Bool bRef)
 {
     theCurData = theCurArea = rLabelRange;
-    BOOL bValid = TRUE;
+    sal_Bool bValid = sal_True;
     SCCOL nCol1 = theCurArea.aStart.Col();
     SCCOL nCol2 = theCurArea.aEnd.Col();
     SCROW nRow1 = theCurArea.aStart.Row();
     SCROW nRow2 = theCurArea.aEnd.Row();
     if ( (static_cast<SCCOLROW>(nCol2 - nCol1) >= nRow2 - nRow1) || (nCol1 == 0 && nCol2 == MAXCOL) )
     {	// Spaltenkoepfe und Grenzfall gesamte Tabelle
-        aBtnColHead.Check( TRUE );
-        aBtnRowHead.Check( FALSE );
+        aBtnColHead.Check( sal_True );
+        aBtnRowHead.Check( sal_False );
         if ( nRow2 == MAXROW  )
         {
             if ( nRow1 == 0 )
-                bValid = FALSE;		// Grenzfall gesamte Tabelle
+                bValid = sal_False;		// Grenzfall gesamte Tabelle
             else
             {	// Head unten, Data oben
                 theCurData.aStart.SetRow( 0 );
@@ -261,8 +261,8 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef)
     }
     else
     {	// Zeilenkoepfe
-        aBtnRowHead.Check( TRUE );
-        aBtnColHead.Check( FALSE );
+        aBtnRowHead.Check( sal_True );
+        aBtnColHead.Check( sal_False );
         if ( nCol2 == MAXCOL )
         {	// Head rechts, Data links
             theCurData.aStart.SetCol( 0 );
@@ -331,7 +331,7 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef)
 #*
 #************************************************************************/
 
-void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRef)
+void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,sal_Bool bRef)
 {
     theCurData = rDataRange;
     if ( aBtnColHead.IsChecked() )
@@ -418,9 +418,9 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD
 
         String aRefStr;
         if ( pEdActive == &aEdAssign )
-            SetColRowData( rRef, TRUE );
+            SetColRowData( rRef, sal_True );
         else
-            AdjustColRowData( rRef, TRUE );
+            AdjustColRowData( rRef, sal_True );
         aBtnColHead.Enable();
         aBtnRowHead.Enable();
         aBtnAdd.Enable();
@@ -443,7 +443,7 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD
 #*
 #************************************************************************/
 
-BOOL __EXPORT ScColRowNameRangesDlg::Close()
+sal_Bool __EXPORT ScColRowNameRangesDlg::Close()
 {
     return DoClose( ScColRowNameRangesDlgWrapper::GetChildWindowId() );
 }
@@ -467,7 +467,7 @@ void ScColRowNameRangesDlg::SetActive()
 {
     if ( bDlgLostFocus )
     {
-        bDlgLostFocus = FALSE;
+        bDlgLostFocus = sal_False;
         if( pEdActive )
             pEdActive->GrabFocus();
     }
@@ -499,14 +499,14 @@ void ScColRowNameRangesDlg::SetActive()
 
 void ScColRowNameRangesDlg::UpdateNames()
 {
-    aLbRange.SetUpdateMode( FALSE );
+    aLbRange.SetUpdateMode( sal_False );
     //-----------------------------------------------------------
     aLbRange.Clear();
     aRangeMap.clear();
     aEdAssign.SetText( EMPTY_STRING );
 
-    ULONG nCount, j;
-    USHORT nPos; //@008 Hilfsvariable q eingefuegt
+    sal_uLong nCount, j;
+    sal_uInt16 nPos; //@008 Hilfsvariable q eingefuegt
 
     SCCOL nCol1;	//@008 04.09.97
     SCROW nRow1;	//Erweiterung fuer Bereichsnamen
@@ -613,7 +613,7 @@ void ScColRowNameRangesDlg::UpdateNames()
         delete [] ppSortArray;
     }
     //-----------------------------------------------------------
-    aLbRange.SetUpdateMode( TRUE );
+    aLbRange.SetUpdateMode( sal_True );
     aLbRange.Invalidate();
 }
 
@@ -633,14 +633,14 @@ void ScColRowNameRangesDlg::UpdateNames()
 #*
 #************************************************************************/
 
-void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, BOOL bColName )
+void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, sal_Bool bColName )
 {
     ScRangePair* pPair = NULL;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if ( bColName && (pPair = xColNameRanges->Find( rRange )) != NULL )
-        bFound = TRUE;
+        bFound = sal_True;
     else if ( !bColName && (pPair = xRowNameRanges->Find( rRange )) != NULL )
-        bFound = TRUE;
+        bFound = sal_True;
 
     if ( bFound )
     {
@@ -684,7 +684,7 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, BOOL bColNam
 #*
 #************************************************************************/
 
-BOOL ScColRowNameRangesDlg::IsRefInputMode() const
+sal_Bool ScColRowNameRangesDlg::IsRefInputMode() const
 {
     return (pEdActive != NULL);
 }
@@ -774,8 +774,8 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG )
     {
         const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
         ScRange aRange1, aRange2;
-        BOOL bOk1;
-        if ( (bOk1 = ((aRange1.ParseAny( aNewArea, pDoc, eConv ) & SCA_VALID) == SCA_VALID)) != FALSE
+        sal_Bool bOk1;
+        if ( (bOk1 = ((aRange1.ParseAny( aNewArea, pDoc, eConv ) & SCA_VALID) == SCA_VALID)) != sal_False
           && ((aRange2.ParseAny( aNewData, pDoc, eConv ) & SCA_VALID) == SCA_VALID) )
         {
             theCurArea = aRange1;
@@ -802,8 +802,8 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG )
             aBtnAdd.Disable();
             aBtnRemove.Disable();
             aEdAssign.SetText( EMPTY_STRING );
-            aBtnColHead.Check( TRUE );
-            aBtnRowHead.Check( FALSE );
+            aBtnColHead.Check( sal_True );
+            aBtnRowHead.Check( sal_False );
             aEdAssign2.SetText( EMPTY_STRING );
             theCurArea = ScRange();
             theCurData = theCurArea;
@@ -840,20 +840,20 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG )
 IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
 {
     String aRangeStr = aLbRange.GetSelectEntry();
-    USHORT nSelectPos = aLbRange.GetSelectEntryPos();
-    BOOL bColName =
-        ((ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol);
+    sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos();
+    sal_Bool bColName =
+        ((sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol);
     NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
     if (itr == aRangeMap.end())
         return 0;
     const ScRange& rRange = itr->second;
 
     ScRangePair* pPair = NULL;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if ( bColName && (pPair = xColNameRanges->Find( rRange )) != NULL )
-        bFound = TRUE;
+        bFound = sal_True;
     else if ( !bColName && (pPair = xRowNameRanges->Find( rRange )) != NULL )
-        bFound = TRUE;
+        bFound = sal_True;
     if ( bFound )
     {
         String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY );
@@ -871,7 +871,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
             delete pPair;
 
             UpdateNames();
-            USHORT nCnt = aLbRange.GetEntryCount();
+            sal_uInt16 nCnt = aLbRange.GetEntryCount();
             if ( nSelectPos >= nCnt )
             {
                 if ( nCnt )
@@ -881,7 +881,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
             }
             aLbRange.SelectEntryPos( nSelectPos );
             if ( nSelectPos &&
-                    (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim )
+                    (sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim )
                 aLbRange.SelectEntryPos( --nSelectPos );	// ---Zeile---
 
             aLbRange.GrabFocus();
@@ -889,8 +889,8 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
             aBtnRemove.Disable();
             aEdAssign.SetText( EMPTY_STRING );
             theCurArea = theCurData = ScRange();
-            aBtnColHead.Check( TRUE );
-            aBtnRowHead.Check( FALSE );
+            aBtnColHead.Check( sal_True );
+            aBtnRowHead.Check( sal_False );
             aEdAssign2.SetText( EMPTY_STRING );
             Range1SelectHdl( 0 );
         }
@@ -917,11 +917,11 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
 
 IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG )
 {
-    USHORT nSelectPos = aLbRange.GetSelectEntryPos();
-    USHORT nCnt = aLbRange.GetEntryCount();
-    USHORT nMoves = 0;
+    sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos();
+    sal_uInt16 nCnt = aLbRange.GetEntryCount();
+    sal_uInt16 nMoves = 0;
     while ( nSelectPos < nCnt
-            && (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim )
+            && (sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim )
     {	// skip Delimiter
         ++nMoves;
         aLbRange.SelectEntryPos( ++nSelectPos );
@@ -947,8 +947,8 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG )
     NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
     if ( itr != aRangeMap.end() )
     {
-        BOOL bColName =
-            ((ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol);
+        sal_Bool bColName =
+            ((sal_uLong)aLbRange.GetEntryData( nSelectPos ) == nEntryDataCol);
         UpdateRangeData( itr->second, bColName );
         aBtnAdd.Disable();
         aBtnRemove.Enable();
@@ -1005,14 +1005,14 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG )
 IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG )
 {
     String aNewArea( aEdAssign.GetText() );
-    BOOL bValid = FALSE;
+    sal_Bool bValid = sal_False;
     if ( aNewArea.Len() > 0 )
     {
         ScRange aRange;
         if ( (aRange.ParseAny( aNewArea, pDoc, pDoc->GetAddressConvention() ) & SCA_VALID) == SCA_VALID )
         {
             SetColRowData( aRange );
-            bValid = TRUE;
+            bValid = sal_True;
         }
     }
     if ( bValid )
@@ -1093,8 +1093,8 @@ IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG )
 {
     if ( !aBtnColHead.GetSavedValue() )
     {
-        aBtnColHead.Check( TRUE );
-        aBtnRowHead.Check( FALSE );
+        aBtnColHead.Check( sal_True );
+        aBtnRowHead.Check( sal_False );
         if ( theCurArea.aStart.Row() == 0 && theCurArea.aEnd.Row() == MAXROW )
         {
             theCurArea.aEnd.SetRow( MAXROW - 1 );
@@ -1131,8 +1131,8 @@ IMPL_LINK( ScColRowNameRangesDlg, RowClickHdl, void *, EMPTYARG )
 {
     if ( !aBtnRowHead.GetSavedValue() )
     {
-        aBtnRowHead.Check( TRUE );
-        aBtnColHead.Check( FALSE );
+        aBtnRowHead.Check( sal_True );
+        aBtnColHead.Check( sal_False );
         if ( theCurArea.aStart.Col() == 0 && theCurArea.aEnd.Col() == MAXCOL )
         {
             theCurArea.aEnd.SetCol( MAXCOL - 1 );
diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx
index e3fc21672..222994ef5 100644
--- a/sc/source/ui/miscdlgs/delcldlg.cxx
+++ b/sc/source/ui/miscdlgs/delcldlg.cxx
@@ -39,11 +39,11 @@
 #include "miscdlgs.hrc"
 
 
-static BYTE nDelItemChecked=0;
+static sal_uInt8 nDelItemChecked=0;
 
 //==================================================================
 
-ScDeleteCellDlg::ScDeleteCellDlg( Window* pParent, BOOL bDisallowCellMove ) :
+ScDeleteCellDlg::ScDeleteCellDlg( Window* pParent, sal_Bool bDisallowCellMove ) :
     ModalDialog     ( pParent, ScResId( RID_SCDLG_DELCELL ) ),
     //
     aFlFrame        ( this, ScResId( FL_FRAME ) ),
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 1811a1eee..14cc979b9 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -41,15 +41,15 @@
 
 //==================================================================
 
-BOOL   ScDeleteContentsDlg::bPreviousAllCheck = FALSE;
-USHORT ScDeleteContentsDlg::nPreviousChecks   = (IDF_DATETIME | IDF_STRING  |
+sal_Bool   ScDeleteContentsDlg::bPreviousAllCheck = sal_False;
+sal_uInt16 ScDeleteContentsDlg::nPreviousChecks   = (IDF_DATETIME | IDF_STRING  |
                                                  IDF_NOTE     | IDF_FORMULA |
                                                  IDF_VALUE);
 
 //-----------------------------------------------------------------------
 
 ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent,
-                                          USHORT  nCheckDefaults ) :
+                                          sal_uInt16  nCheckDefaults ) :
     ModalDialog     ( pParent, ScResId( RID_SCDLG_DELCONT ) ),
     //
     aFlFrame        ( this, ScResId( FL_FRAME ) ),
@@ -64,12 +64,12 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent,
     aBtnOk          ( this, ScResId( BTN_OK ) ),
     aBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
     aBtnHelp        ( this, ScResId( BTN_HELP ) ),
-    bObjectsDisabled( FALSE )
+    bObjectsDisabled( sal_False )
 {
     if ( nCheckDefaults != 0 )
     {
         ScDeleteContentsDlg::nPreviousChecks = nCheckDefaults;
-        ScDeleteContentsDlg::bPreviousAllCheck = FALSE;
+        ScDeleteContentsDlg::bPreviousAllCheck = sal_False;
     }
 
     aBtnDelAll.Check     ( ScDeleteContentsDlg::bPreviousAllCheck );
@@ -98,7 +98,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent,
 
 //------------------------------------------------------------------------
 
-USHORT ScDeleteContentsDlg::GetDelContentsCmdBits() const
+sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const
 {
     ScDeleteContentsDlg::nPreviousChecks = 0;
 
@@ -126,7 +126,7 @@ USHORT ScDeleteContentsDlg::GetDelContentsCmdBits() const
 
 //------------------------------------------------------------------------
 
-void ScDeleteContentsDlg::DisableChecks( BOOL bDelAllChecked )
+void ScDeleteContentsDlg::DisableChecks( sal_Bool bDelAllChecked )
 {
     if ( bDelAllChecked )
     {
@@ -157,8 +157,8 @@ void ScDeleteContentsDlg::DisableChecks( BOOL bDelAllChecked )
 
 void ScDeleteContentsDlg::DisableObjects()
 {
-    bObjectsDisabled = TRUE;
-    aBtnDelObjects.Check(FALSE);
+    bObjectsDisabled = sal_True;
+    aBtnDelObjects.Check(sal_False);
     aBtnDelObjects.Disable();
 }
 
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 63cb85480..66b80e878 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -61,7 +61,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window*       pParent,
                                   String		aStartStr,
                                   double		fStep,
                                   double		fMax,
-                                  USHORT		nPossDir )
+                                  sal_uInt16		nPossDir )
 
     :	ModalDialog     ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ),
 
@@ -115,7 +115,7 @@ __EXPORT ScFillSeriesDlg::~ScFillSeriesDlg()
 
 //----------------------------------------------------------------------------
 
-void ScFillSeriesDlg::SetEdStartValEnabled(BOOL bFlag)
+void ScFillSeriesDlg::SetEdStartValEnabled(sal_Bool bFlag)
 {
     bStartValFlag=bFlag;
     if(bFlag)
@@ -132,7 +132,7 @@ void ScFillSeriesDlg::SetEdStartValEnabled(BOOL bFlag)
 
 //----------------------------------------------------------------------------
 
-void ScFillSeriesDlg::Init( USHORT nPossDir )
+void ScFillSeriesDlg::Init( sal_uInt16 nPossDir )
 {
     aBtnOk.SetClickHdl         ( LINK( this, ScFillSeriesDlg, OKHdl ) );
     aBtnArithmetic.SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
@@ -221,7 +221,7 @@ void ScFillSeriesDlg::Init( USHORT nPossDir )
         rDoc.GetFormatTable()->GetInputLineString( fEndVal, 0, aEndTxt );
     aEdEndVal.SetText( aEndTxt );
 
-    bStartValFlag=FALSE;
+    bStartValFlag=sal_False;
 
     aFlSep1.SetStyle( aFlSep1.GetStyle() | WB_VERT );
     aFlSep2.SetStyle( aFlSep2.GetStyle() | WB_VERT );
@@ -230,16 +230,16 @@ void ScFillSeriesDlg::Init( USHORT nPossDir )
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScFillSeriesDlg::CheckStartVal()
+sal_Bool __EXPORT ScFillSeriesDlg::CheckStartVal()
 {
-    BOOL bValOk = FALSE;
+    sal_Bool bValOk = sal_False;
     sal_uInt32 nKey = 0;
     String aStr( aEdStartVal.GetText() );
 
     if ( aStr.Len() == 0 || aBtnAutoFill.IsChecked())
     {
         fStartVal = MAXDOUBLE;
-        bValOk = TRUE;
+        bValOk = sal_True;
     }
     else
         bValOk = rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fStartVal );
@@ -250,7 +250,7 @@ BOOL __EXPORT ScFillSeriesDlg::CheckStartVal()
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal()
+sal_Bool __EXPORT ScFillSeriesDlg::CheckIncrementVal()
 {
     sal_uInt32 nKey = 0;
     String aStr( aEdIncrement.GetText() );
@@ -261,16 +261,16 @@ BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal()
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScFillSeriesDlg::CheckEndVal()
+sal_Bool __EXPORT ScFillSeriesDlg::CheckEndVal()
 {
-    BOOL	bValOk = FALSE;
+    sal_Bool	bValOk = sal_False;
     sal_uInt32 nKey = 0;
     String	aStr( aEdEndVal.GetText() );
 
     if ( aStr.Len() == 0 )
     {
         fEndVal = (fIncrement < 0) ? -MAXDOUBLE : MAXDOUBLE;
-        bValOk  = TRUE;
+        bValOk  = sal_True;
     }
     else
         bValOk = rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fEndVal );
@@ -339,21 +339,21 @@ IMPL_LINK( ScFillSeriesDlg, OKHdl, void *, EMPTYARG )
     else if ( aBtnMonth.IsChecked() )       theFillDateCmd = FILL_MONTH;
     else if ( aBtnYear.IsChecked() )        theFillDateCmd = FILL_YEAR;
 
-    BOOL  bAllOk = TRUE;
+    sal_Bool  bAllOk = sal_True;
     Edit* pEdWrong = NULL;
     if ( !CheckStartVal() )
     {
-        bAllOk = FALSE;
+        bAllOk = sal_False;
         pEdWrong = &aEdStartVal;
     }
     else if ( !CheckIncrementVal() )
     {
-        bAllOk = FALSE;
+        bAllOk = sal_False;
         pEdWrong = &aEdIncrement;
     }
     else if ( !CheckEndVal() )
     {
-        bAllOk = FALSE;
+        bAllOk = sal_False;
         pEdWrong = &aEdEndVal;
     }
     if ( bAllOk )
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index 60513d76e..87b57371e 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -42,9 +42,9 @@
 //==================================================================
 
 ScGroupDlg::ScGroupDlg( Window* pParent,
-                        USHORT	nResId,
-                        BOOL    bUngroup,
-                        BOOL    bRows ) :
+                        sal_uInt16	nResId,
+                        sal_Bool    bUngroup,
+                        sal_Bool    bRows ) :
     ModalDialog     ( pParent, ScResId( nResId ) ),
     //
     aFlFrame        ( this, ScResId( FL_FRAME ) ),
@@ -68,7 +68,7 @@ ScGroupDlg::ScGroupDlg( Window* pParent,
 
 //------------------------------------------------------------------------
 
-BOOL ScGroupDlg::GetColsChecked() const
+sal_Bool ScGroupDlg::GetColsChecked() const
 {
     return aBtnCols.IsChecked();
 }
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 57af65470..691895e9c 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -59,7 +59,7 @@
 
 #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
 
-inline void EnableDisable( Window& rWin, BOOL bEnable )
+inline void EnableDisable( Window& rWin, sal_Bool bEnable )
 {
     if (bEnable)
         rWin.Enable();
@@ -102,17 +102,17 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind
     aOkButton.SetClickHdl(LINK( this, ScHighlightChgDlg, OKBtnHdl));
     aHighlightBox.SetClickHdl(LINK( this, ScHighlightChgDlg, HighLightHandle ));
     aFilterCtr.SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle ));
-    aFilterCtr.HideRange(FALSE);
+    aFilterCtr.HideRange(sal_False);
     aFilterCtr.Show();
-    SetDispatcherLock( TRUE );
-    //SFX_APPWINDOW->Disable(FALSE);
+    SetDispatcherLock( sal_True );
+    //SFX_APPWINDOW->Disable(sal_False);
 
     Init();
 
 }
 ScHighlightChgDlg::~ScHighlightChgDlg()
 {
-    SetDispatcherLock( FALSE );
+    SetDispatcherLock( sal_False );
     //SFX_APPWINDOW->Enable();
 }
 
@@ -129,7 +129,7 @@ void __EXPORT ScHighlightChgDlg::Init()
         aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser());
         aFilterCtr.ClearAuthors();
         ScStrCollection aUserColl=pChanges->GetUserCollection();
-        for(USHORT	i=0;i<aUserColl.GetCount();i++)
+        for(sal_uInt16	i=0;i<aUserColl.GetCount();i++)
             aFilterCtr.InsertAuthor(aUserColl[i]->GetString());
     }
 
@@ -144,7 +144,7 @@ void __EXPORT ScHighlightChgDlg::Init()
     aFilterCtr.SetFirstTime(aChangeViewSet.GetTheFirstDateTime());
     aFilterCtr.SetLastDate(aChangeViewSet.GetTheLastDateTime());
     aFilterCtr.SetLastTime(aChangeViewSet.GetTheLastDateTime());
-    aFilterCtr.SetDateMode((USHORT)aChangeViewSet.GetTheDateMode());
+    aFilterCtr.SetDateMode((sal_uInt16)aChangeViewSet.GetTheDateMode());
     aFilterCtr.CheckAuthor(aChangeViewSet.HasAuthor());
     aFilterCtr.CheckComment(aChangeViewSet.HasComment());
     aFilterCtr.SetComment(aChangeViewSet.GetTheComment());
@@ -172,7 +172,7 @@ void __EXPORT ScHighlightChgDlg::Init()
         pRangeEntry->Format( aRefStr, ABS_DREF3D, pDoc );
         aFilterCtr.SetRange(aRefStr);
     }
-    aFilterCtr.Enable(TRUE,TRUE);
+    aFilterCtr.Enable(sal_True,sal_True);
     HighLightHandle(&aHighlightBox);
 }
 
@@ -194,12 +194,12 @@ void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 }
 
 //----------------------------------------------------------------------------
-BOOL __EXPORT ScHighlightChgDlg::Close()
+sal_Bool __EXPORT ScHighlightChgDlg::Close()
 {
     return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() );
 }
 
-void ScHighlightChgDlg::RefInputDone( BOOL bForced)
+void ScHighlightChgDlg::RefInputDone( sal_Bool bForced)
 {
     ScAnyRefDlg::RefInputDone(bForced);
     if(bForced || !aRbAssign.IsVisible())
@@ -220,13 +220,13 @@ void ScHighlightChgDlg::SetActive()
         aEdAssign.Hide();
         aRbAssign.Hide();
         SFX_APPWINDOW->Enable();
-        SetDispatcherLock( FALSE );
+        SetDispatcherLock( sal_False );
     }
     //RefInputDone();
     */
 }
 
-BOOL ScHighlightChgDlg::IsRefInputMode() const
+sal_Bool ScHighlightChgDlg::IsRefInputMode() const
 {
     return aEdAssign.IsVisible();
 }
@@ -237,13 +237,13 @@ IMPL_LINK( ScHighlightChgDlg, HighLightHandle, CheckBox*, pCb )
     {
         if(aHighlightBox.IsChecked())
         {
-            aFilterCtr.Enable(TRUE,TRUE);
+            aFilterCtr.Enable(sal_True,sal_True);
             aCbAccept.Enable();
             aCbReject.Enable();
         }
         else
         {
-            aFilterCtr.Disable(TRUE);
+            aFilterCtr.Disable(sal_True);
             aCbAccept.Disable();
             aCbReject.Disable();
         }
@@ -255,8 +255,8 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef )
 {
     if(pRef!=NULL)
     {
-        SetDispatcherLock( TRUE );
-        //SFX_APPWINDOW->Disable(FALSE);
+        SetDispatcherLock( sal_True );
+        //SFX_APPWINDOW->Disable(sal_False);
         aEdAssign.Show();
         aRbAssign.Show();
         aEdAssign.SetText(aFilterCtr.GetRange());
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx
index 20a501700..7121f8190 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -39,11 +39,11 @@
 #include "miscdlgs.hrc"
 
 
-static BYTE nInsItemChecked=0;
+static sal_uInt8 nInsItemChecked=0;
 
 //==================================================================
 
-ScInsertCellDlg::ScInsertCellDlg( Window* pParent,BOOL bDisallowCellMove) :
+ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) :
     ModalDialog     ( pParent, ScResId( RID_SCDLG_INSCELL ) ),
     //
     aFlFrame        ( this, ScResId( FL_FRAME ) ),
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 39332abe7..c02e2f78f 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -41,18 +41,18 @@
 
 //==================================================================
 
-BOOL   ScInsertContentsDlg::bPreviousAllCheck = TRUE;
-USHORT ScInsertContentsDlg::nPreviousChecks   = (IDF_DATETIME | IDF_STRING  |
+sal_Bool   ScInsertContentsDlg::bPreviousAllCheck = sal_True;
+sal_uInt16 ScInsertContentsDlg::nPreviousChecks   = (IDF_DATETIME | IDF_STRING  |
                                                  IDF_NOTE     | IDF_FORMULA |
                                                  IDF_ATTRIB   | IDF_OBJECTS);
-USHORT ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC;
-USHORT ScInsertContentsDlg::nPreviousChecks2 = 0;
-USHORT ScInsertContentsDlg::nPreviousMoveMode = INS_NONE;	// enum InsCellCmd
+sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC;
+sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0;
+sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE;	// enum InsCellCmd
 
 //-----------------------------------------------------------------------
 
 ScInsertContentsDlg::ScInsertContentsDlg( Window*		pParent,
-                                          USHORT		nCheckDefaults,
+                                          sal_uInt16		nCheckDefaults,
                                           const String* pStrTitle )
 
  :  ModalDialog     ( pParent, ScResId( RID_SCDLG_INSCONT ) ),
@@ -85,11 +85,11 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*		pParent,
     aBtnOk          ( this, ScResId( BTN_OK ) ),
     aBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
     aBtnHelp        ( this, ScResId( BTN_HELP ) ),
-    bOtherDoc		( FALSE ),
-    bFillMode		( FALSE ),
-    bChangeTrack	( FALSE ),
-    bMoveDownDisabled( FALSE ),
-    bMoveRightDisabled( FALSE )
+    bOtherDoc		( sal_False ),
+    bFillMode		( sal_False ),
+    bChangeTrack	( sal_False ),
+    bMoveDownDisabled( sal_False ),
+    bMoveRightDisabled( sal_False )
 {
     if ( pStrTitle )
         SetText( *pStrTitle );
@@ -97,7 +97,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*		pParent,
     if ( nCheckDefaults != 0 )
     {
         ScInsertContentsDlg::nPreviousChecks = nCheckDefaults;
-        ScInsertContentsDlg::bPreviousAllCheck = FALSE;
+        ScInsertContentsDlg::bPreviousAllCheck = sal_False;
         ScInsertContentsDlg::nPreviousChecks2 = 0;
     }
 
@@ -119,18 +119,18 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*		pParent,
 
     switch( ScInsertContentsDlg::nPreviousFormulaChecks )
     {
-        case PASTE_NOFUNC: aRbNoOp.Check(TRUE); break;
-        case PASTE_ADD:    aRbAdd.Check(TRUE); break;
-        case PASTE_SUB:    aRbSub.Check(TRUE); break;
-        case PASTE_MUL:    aRbMul.Check(TRUE); break;
-        case PASTE_DIV:    aRbDiv.Check(TRUE); break;
+        case PASTE_NOFUNC: aRbNoOp.Check(sal_True); break;
+        case PASTE_ADD:    aRbAdd.Check(sal_True); break;
+        case PASTE_SUB:    aRbSub.Check(sal_True); break;
+        case PASTE_MUL:    aRbMul.Check(sal_True); break;
+        case PASTE_DIV:    aRbDiv.Check(sal_True); break;
     }
 
     switch( ScInsertContentsDlg::nPreviousMoveMode )
     {
-        case INS_NONE:  	 aRbMoveNone.Check(TRUE); break;
-        case INS_CELLSDOWN:	 aRbMoveDown.Check(TRUE); break;
-        case INS_CELLSRIGHT: aRbMoveRight.Check(TRUE); break;
+        case INS_NONE:  	 aRbMoveNone.Check(sal_True); break;
+        case INS_CELLSDOWN:	 aRbMoveDown.Check(sal_True); break;
+        case INS_CELLSRIGHT: aRbMoveRight.Check(sal_True); break;
     }
 
     aBtnSkipEmptyCells.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_NOEMPTY ) != 0);
@@ -151,7 +151,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*		pParent,
 
 //------------------------------------------------------------------------
 
-USHORT ScInsertContentsDlg::GetInsContentsCmdBits() const
+sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const
 {
     ScInsertContentsDlg::nPreviousChecks = 0;
 
@@ -191,7 +191,7 @@ InsCellCmd ScInsertContentsDlg::GetMoveMode()
 
 //------------------------------------------------------------------------
 
-void ScInsertContentsDlg::DisableChecks( BOOL bInsAllChecked )
+void ScInsertContentsDlg::DisableChecks( sal_Bool bInsAllChecked )
 {
     if ( bInsAllChecked )
     {
@@ -242,7 +242,7 @@ void ScInsertContentsDlg::TestModes()
 
         aFlFrame.Disable();
         aBtnInsAll.Disable();
-        DisableChecks(TRUE);
+        DisableChecks(sal_True);
     }
     else
     {
@@ -266,52 +266,52 @@ void ScInsertContentsDlg::TestModes()
     }
 }
 
-void ScInsertContentsDlg::SetOtherDoc( BOOL bSet )
+void ScInsertContentsDlg::SetOtherDoc( sal_Bool bSet )
 {
     if ( bSet != bOtherDoc )
     {
         bOtherDoc = bSet;
         TestModes();
         if ( bSet )
-            aRbMoveNone.Check(TRUE);
+            aRbMoveNone.Check(sal_True);
     }
 }
 
-void ScInsertContentsDlg::SetFillMode( BOOL bSet )
+void ScInsertContentsDlg::SetFillMode( sal_Bool bSet )
 {
     if ( bSet != bFillMode )
     {
         bFillMode = bSet;
         TestModes();
         if ( bSet )
-            aRbMoveNone.Check(TRUE);
+            aRbMoveNone.Check(sal_True);
     }
 }
 
-void ScInsertContentsDlg::SetChangeTrack( BOOL bSet )
+void ScInsertContentsDlg::SetChangeTrack( sal_Bool bSet )
 {
     if ( bSet != bChangeTrack )
     {
         bChangeTrack = bSet;
         TestModes();
         if ( bSet )
-            aRbMoveNone.Check(TRUE);
+            aRbMoveNone.Check(sal_True);
     }
 }
 
 void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable )
 {
-    BOOL bDown = ((nDisable & SC_CELL_SHIFT_DISABLE_DOWN) != 0);
-    BOOL bRight = ((nDisable & SC_CELL_SHIFT_DISABLE_RIGHT) != 0);
+    sal_Bool bDown = ((nDisable & SC_CELL_SHIFT_DISABLE_DOWN) != 0);
+    sal_Bool bRight = ((nDisable & SC_CELL_SHIFT_DISABLE_RIGHT) != 0);
     if ( bDown != bMoveDownDisabled || bRight != bMoveRightDisabled )
     {
         bMoveDownDisabled = bDown;
         bMoveRightDisabled = bRight;
         TestModes();
         if ( bMoveDownDisabled && aRbMoveDown.IsChecked() )
-            aRbMoveNone.Check(TRUE);
+            aRbMoveNone.Check(sal_True);
         if ( bMoveRightDisabled && aRbMoveRight.IsChecked() )
-            aRbMoveNone.Check(TRUE);
+            aRbMoveNone.Check(sal_True);
     }
 }
 
@@ -353,7 +353,7 @@ __EXPORT ScInsertContentsDlg::~ScInsertContentsDlg()
     }
 }
 
-USHORT	ScInsertContentsDlg::GetFormulaCmdBits() const
+sal_uInt16	ScInsertContentsDlg::GetFormulaCmdBits() const
 {
     ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC;
     if(aRbAdd.IsChecked())
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 2bb75ad5b..0c330bfa0 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -225,7 +225,7 @@ void ScInsertTableDlg::SetFromTo_Impl()
 
 void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
 {
-    aLbTables.SetUpdateMode( FALSE );
+    aLbTables.SetUpdateMode( sal_False );
     aLbTables.Clear();
 
     if ( pSrcDoc )
@@ -240,7 +240,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
         }
     }
 
-    aLbTables.SetUpdateMode( TRUE );
+    aLbTables.SetUpdateMode( sal_True );
 
     if(aLbTables.GetEntryCount()==1)
         aLbTables.SelectEntryPos(0);
@@ -248,7 +248,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
 
 //------------------------------------------------------------------------
 
-const String* ScInsertTableDlg::GetFirstTable( USHORT* pN )
+const String* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
 {
     const String* pStr = NULL;
 
@@ -271,7 +271,7 @@ const String* ScInsertTableDlg::GetFirstTable( USHORT* pN )
 
 //------------------------------------------------------------------------
 
-const String* ScInsertTableDlg::GetNextTable( USHORT* pN )
+const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
 {
     const String* pStr = NULL;
 
@@ -392,7 +392,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
             if ( pDocShTables )
                 pDocShTables->DoClose();        // delete passiert beim Zuweisen auf die Ref
 
-            pMed->UseInteractionHandler( TRUE );    // to enable the filter options dialog
+            pMed->UseInteractionHandler( sal_True );    // to enable the filter options dialog
 
             pDocShTables = new ScDocShell;
             aDocShTablesRef = pDocShTables;
@@ -402,7 +402,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
             pDocShTables->DoLoad( pMed );
             SetPointer( aOldPtr );
 
-            ULONG nErr = pDocShTables->GetErrorCode();
+            sal_uLong nErr = pDocShTables->GetErrorCode();
             if ( nErr )
                 ErrorHandler::HandleError( nErr );              // auch Warnings
 
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index eb010b414..d042efd41 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -44,7 +44,7 @@
 //==================================================================
 
 ScSelEntryDlg::ScSelEntryDlg(      Window*  pParent,
-                                   USHORT	nResId,
+                                   sal_uInt16	nResId,
                              const String&  aTitle,
                              const String&  aLbTitle,
                                    List&    aEntryList ) :
@@ -84,7 +84,7 @@ String ScSelEntryDlg::GetSelectEntry() const
 
 //------------------------------------------------------------------------
 
-//UNUSED2008-05  USHORT ScSelEntryDlg::GetSelectEntryPos() const
+//UNUSED2008-05  sal_uInt16 ScSelEntryDlg::GetSelectEntryPos() const
 //UNUSED2008-05  {
 //UNUSED2008-05      return aLb.GetSelectEntryPos();
 //UNUSED2008-05  }
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index d16a829cb..6efc4a19f 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -130,9 +130,9 @@ IMPL_LINK( ScLinkedAreaDlg, FileHdl, ComboBox*, EMPTYARG )
 
     String aFilter;
     String aOptions;
-    //	get filter name by looking at the file content (bWithContent = TRUE)
+    //	get filter name by looking at the file content (bWithContent = sal_True)
     // Break operation if any error occured inside.
-    if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, TRUE, TRUE ))
+    if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, sal_True, sal_True ))
         return 0;
 
     // #i53241# replace HTML filter with DataQuery filter
@@ -165,11 +165,11 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter,
 
         SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, rFile );
 
-        ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, TRUE );	// with interaction
+        ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, sal_True );	// with interaction
         pSourceShell = aLoader.GetDocShell();
         if ( pSourceShell )
         {
-            ULONG nErr = pSourceShell->GetErrorCode();
+            sal_uLong nErr = pSourceShell->GetErrorCode();
             if (nErr)
                 ErrorHandler::HandleError( nErr );		// including warnings
 
@@ -181,7 +181,7 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter,
 
 void ScLinkedAreaDlg::InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
-                                        ULONG nRefresh )
+                                        sal_uLong nRefresh )
 {
     LoadDocument( rFile, rFilter, rOptions );
     if (pSourceShell)
@@ -201,7 +201,7 @@ void ScLinkedAreaDlg::InitFromOldLink( const String& rFile, const String& rFilte
         aLbRanges.SelectEntry( aRange );
     }
 
-    BOOL bDoRefresh = ( nRefresh != 0 );
+    sal_Bool bDoRefresh = ( nRefresh != 0 );
     aBtnReload.Check( bDoRefresh );
     if (bDoRefresh)
         aNfDelay.SetValue( nRefresh );
@@ -250,13 +250,13 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
         if (pSourceShell)
             pSourceShell->DoClose();        // deleted when assigning aSourceRef
 
-        pMed->UseInteractionHandler( TRUE );    // to enable the filter options dialog
+        pMed->UseInteractionHandler( sal_True );    // to enable the filter options dialog
 
         pSourceShell = new ScDocShell;
         aSourceRef = pSourceShell;
         pSourceShell->DoLoad( pMed );
 
-        ULONG nErr = pSourceShell->GetErrorCode();
+        sal_uLong nErr = pSourceShell->GetErrorCode();
         if (nErr)
             ErrorHandler::HandleError( nErr );              // including warnings
 
@@ -285,7 +285,7 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
 
 void ScLinkedAreaDlg::UpdateSourceRanges()
 {
-    aLbRanges.SetUpdateMode( FALSE );
+    aLbRanges.SetUpdateMode( sal_False );
 
     aLbRanges.Clear();
     if ( pSourceShell )
@@ -297,7 +297,7 @@ void ScLinkedAreaDlg::UpdateSourceRanges()
             aLbRanges.InsertEntry( aName );
     }
 
-    aLbRanges.SetUpdateMode( TRUE );
+    aLbRanges.SetUpdateMode( sal_True );
 
     if ( aLbRanges.GetEntryCount() == 1 )
         aLbRanges.SelectEntryPos(0);
@@ -305,10 +305,10 @@ void ScLinkedAreaDlg::UpdateSourceRanges()
 
 void ScLinkedAreaDlg::UpdateEnable()
 {
-    BOOL bEnable = ( pSourceShell && aLbRanges.GetSelectEntryCount() );
+    sal_Bool bEnable = ( pSourceShell && aLbRanges.GetSelectEntryCount() );
     aBtnOk.Enable( bEnable );
 
-    BOOL bReload = aBtnReload.IsChecked();
+    sal_Bool bReload = aBtnReload.IsChecked();
     aNfDelay.Enable( bReload );
     aFtSeconds.Enable( bReload );
 }
@@ -346,8 +346,8 @@ String ScLinkedAreaDlg::GetOptions()
 String ScLinkedAreaDlg::GetSource()
 {
     String aSource;
-    USHORT nCount = aLbRanges.GetSelectEntryCount();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = aLbRanges.GetSelectEntryCount();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         if (i > 0)
             aSource.Append( (sal_Unicode) ';' );
@@ -356,10 +356,10 @@ String ScLinkedAreaDlg::GetSource()
     return aSource;
 }
 
-ULONG ScLinkedAreaDlg::GetRefresh()
+sal_uLong ScLinkedAreaDlg::GetRefresh()
 {
     if ( aBtnReload.IsChecked() )
-        return sal::static_int_cast<ULONG>( aNfDelay.GetValue() );
+        return sal::static_int_cast<sal_uLong>( aNfDelay.GetValue() );
     else
         return 0;	// disabled
 }
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index ceb96573e..c3430e618 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -42,11 +42,11 @@
 //==================================================================
 
 ScMetricInputDlg::ScMetricInputDlg( Window*         pParent,
-                                    USHORT			nResId,
+                                    sal_uInt16			nResId,
                                     long			nCurrent,
                                     long			nDefault,
                                     FieldUnit       eFUnit,
-                                    USHORT          nDecimals,
+                                    sal_uInt16          nDecimals,
                                     long            nMaximum,
                                     long            nMinimum,
                                     long            nFirst,
@@ -98,14 +98,14 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const
     mit Nachkommastellen:
 
     double	nVal	= aEdValue.GetValue( eUnit );
-    USHORT	nDecs	= aEdValue.GetDecimalDigits();
+    sal_uInt16	nDecs	= aEdValue.GetDecimalDigits();
     double	nFactor = 0.0;
 
-    // static long ImpPower10( USHORT nDecs )
+    // static long ImpPower10( sal_uInt16 nDecs )
     {
         nFactor = 1.0;
 
-        for ( USHORT i=0; i < nDecs; i++ )
+        for ( sal_uInt16 i=0; i < nDecs; i++ )
             nFactor *= 10.0;
     }
 
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 37405ee1d..9b27b91cd 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -70,7 +70,7 @@ ScMoveTableDlg::ScMoveTableDlg( Window* pParent )
         //
         nDocument   ( 0 ),
         nTable      ( 0 ),
-        bCopyTable  ( FALSE )
+        bCopyTable  ( sal_False )
 {
 #if ENABLE_LAYOUT
 #undef ScResId
@@ -88,17 +88,17 @@ __EXPORT ScMoveTableDlg::~ScMoveTableDlg()
 
 //------------------------------------------------------------------------
 
-USHORT ScMoveTableDlg::GetSelectedDocument () const { return nDocument;  }
+sal_uInt16 ScMoveTableDlg::GetSelectedDocument () const { return nDocument;  }
 
 SCTAB ScMoveTableDlg::GetSelectedTable    () const { return nTable;     }
 
-BOOL   ScMoveTableDlg::GetCopyTable        () const { return bCopyTable; }
+sal_Bool   ScMoveTableDlg::GetCopyTable        () const { return bCopyTable; }
 
-void ScMoveTableDlg::SetCopyTable(BOOL bFlag)
+void ScMoveTableDlg::SetCopyTable(sal_Bool bFlag)
 {
     aBtnCopy.Check(bFlag);
 }
-void ScMoveTableDlg::EnableCopyTable(BOOL bFlag)
+void ScMoveTableDlg::EnableCopyTable(sal_Bool bFlag)
 {
     if(bFlag)
         aBtnCopy.Enable();
@@ -113,7 +113,7 @@ void __EXPORT ScMoveTableDlg::Init()
 {
     aBtnOk.SetClickHdl   ( LINK( this, ScMoveTableDlg, OkHdl ) );
     aLbDoc.SetSelectHdl  ( LINK( this, ScMoveTableDlg, SelHdl ) );
-    aBtnCopy.Check( FALSE );
+    aBtnCopy.Check( sal_False );
     InitDocListBox();
     SelHdl( &aLbDoc );
 }
@@ -124,11 +124,11 @@ void ScMoveTableDlg::InitDocListBox()
 {
     SfxObjectShell* pSh		= SfxObjectShell::GetFirst();
     ScDocShell*		pScSh	= NULL;
-    USHORT    		nSelPos	= 0;
-    USHORT    		i    	= 0;
+    sal_uInt16    		nSelPos	= 0;
+    sal_uInt16    		i    	= 0;
 
     aLbDoc.Clear();
-    aLbDoc.SetUpdateMode( FALSE );
+    aLbDoc.SetUpdateMode( sal_False );
 
     while ( pSh )
     {
@@ -147,7 +147,7 @@ void ScMoveTableDlg::InitDocListBox()
         pSh = SfxObjectShell::GetNext( *pSh );
     }
 
-    aLbDoc.SetUpdateMode( TRUE );
+    aLbDoc.SetUpdateMode( sal_True );
     aLbDoc.InsertEntry( String( ScResId( STR_NEWDOC ) ) );
     aLbDoc.SelectEntryPos( nSelPos );
 }
@@ -158,10 +158,10 @@ void ScMoveTableDlg::InitDocListBox()
 
 IMPL_LINK( ScMoveTableDlg, OkHdl, void *, EMPTYARG )
 {
-    USHORT  nDocSel     = aLbDoc.GetSelectEntryPos();
-    USHORT  nDocLast    = aLbDoc.GetEntryCount()-1;
-    USHORT  nTabSel     = aLbTable.GetSelectEntryPos();
-    USHORT  nTabLast    = aLbTable.GetEntryCount()-1;
+    sal_uInt16  nDocSel     = aLbDoc.GetSelectEntryPos();
+    sal_uInt16  nDocLast    = aLbDoc.GetEntryCount()-1;
+    sal_uInt16  nTabSel     = aLbTable.GetSelectEntryPos();
+    sal_uInt16  nTabLast    = aLbTable.GetEntryCount()-1;
 
     nDocument   = (nDocSel != nDocLast) ? nDocSel : SC_DOC_NEW;
     nTable      = (nTabSel != nTabLast) ? static_cast<SCTAB>(nTabSel) : SC_TAB_APPEND;
@@ -183,7 +183,7 @@ IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb )
         String      aName;
 
         aLbTable.Clear();
-        aLbTable.SetUpdateMode( FALSE );
+        aLbTable.SetUpdateMode( sal_False );
         if ( pDoc )
         {
             nLast = pDoc->GetTableCount()-1;
@@ -194,7 +194,7 @@ IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb )
             }
         }
         aLbTable.InsertEntry( ScGlobal::GetRscString(STR_MOVE_TO_END) );
-        aLbTable.SetUpdateMode( TRUE );
+        aLbTable.SetUpdateMode( sal_True );
         aLbTable.SelectEntryPos( 0 );
     }
 
diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx
index 770551e33..77d4f03b9 100644
--- a/sc/source/ui/miscdlgs/namecrea.cxx
+++ b/sc/source/ui/miscdlgs/namecrea.cxx
@@ -41,7 +41,7 @@
 
 //==================================================================
 
-ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags )
+ScNameCreateDlg::ScNameCreateDlg( Window * pParent, sal_uInt16 nFlags )
     : ModalDialog( pParent, ScResId(RID_SCDLG_NAMES_CREATE) ),
     aFixedLine      ( this, ScResId( FL_FRAME ) ),
     aTopBox			( this, ScResId( BTN_TOP ) ),
@@ -52,19 +52,19 @@ ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags )
     aCancelButton	( this, ScResId( BTN_CANCEL ) ),
     aHelpButton		( this, ScResId( BTN_HELP ) )
 {
-    aTopBox.Check	( (nFlags & NAME_TOP) 	? TRUE : FALSE );
-    aLeftBox.Check	( (nFlags & NAME_LEFT) 	? TRUE : FALSE );
-    aBottomBox.Check( (nFlags & NAME_BOTTOM)? TRUE : FALSE );
-    aRightBox.Check	( (nFlags & NAME_RIGHT) ? TRUE : FALSE );
+    aTopBox.Check	( (nFlags & NAME_TOP) 	? sal_True : sal_False );
+    aLeftBox.Check	( (nFlags & NAME_LEFT) 	? sal_True : sal_False );
+    aBottomBox.Check( (nFlags & NAME_BOTTOM)? sal_True : sal_False );
+    aRightBox.Check	( (nFlags & NAME_RIGHT) ? sal_True : sal_False );
 
     FreeResource();
 }
 
 //------------------------------------------------------------------
 
-USHORT ScNameCreateDlg::GetFlags() const
+sal_uInt16 ScNameCreateDlg::GetFlags() const
 {
-    USHORT	nResult = 0;
+    sal_uInt16	nResult = 0;
 
     nResult |= aTopBox.IsChecked()		? NAME_TOP: 	0 ;
     nResult |= aLeftBox.IsChecked() 	? NAME_LEFT: 	0 ;
diff --git a/sc/source/ui/miscdlgs/namepast.cxx b/sc/source/ui/miscdlgs/namepast.cxx
index d72d86d2b..0d55b0362 100644
--- a/sc/source/ui/miscdlgs/namepast.cxx
+++ b/sc/source/ui/miscdlgs/namepast.cxx
@@ -42,7 +42,7 @@
 
 //==================================================================
 
-ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList )
+ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, sal_Bool bInsList )
     : ModalDialog( pParent, ScResId( RID_SCDLG_NAMES_PASTE ) ),
     aLabelText		( this, ScResId( FT_LABEL ) ),
     aNameList		( this, ScResId( LB_ENTRYLIST ) ),
@@ -59,10 +59,10 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL
     aNameList.SetSelectHdl( LINK( this,ScNamePasteDlg,ListSelHdl) );
     aNameList.SetDoubleClickHdl( LINK( this,ScNamePasteDlg,ListDblClickHdl) );
 
-    USHORT	nCnt = pList->GetCount();
+    sal_uInt16	nCnt = pList->GetCount();
     String	aText;
 
-    for( USHORT i=0 ; i<nCnt ; i++ )
+    for( sal_uInt16 i=0 ; i<nCnt ; i++ )
     {
         ScRangeData* pData = (*pList)[ i ];
 
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index ca91292dd..59188b2b8 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -67,7 +67,7 @@ ScSolverProgressDialog::ScSolverProgressDialog( Window* pParent )
     maFlButtons     ( this, ScResId( FL_BUTTONS ) ),
     maBtnOk         ( this, ScResId( BTN_OK ) )
 {
-    maBtnOk.Enable(FALSE);
+    maBtnOk.Enable(sal_False);
     FreeResource();
 }
 
@@ -159,7 +159,7 @@ void ScCursorRefEdit::KeyInput( const KeyEvent& rKEvt )
 
 //----------------------------------------------------------------------------
 
-ScOptSolverSave::ScOptSolverSave( const String& rObjective, BOOL bMax, BOOL bMin, BOOL bValue,
+ScOptSolverSave::ScOptSolverSave( const String& rObjective, sal_Bool bMax, sal_Bool bMin, sal_Bool bValue,
                              const String& rTarget, const String& rVariable,
                              const std::vector<ScOptConditionRow>& rConditions,
                              const String& rEngine,
@@ -289,8 +289,8 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
     aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) );
     uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame();
-    Image aDelNm = ::GetImage( xFrame, aSlotURL, FALSE, FALSE );
-    Image aDelHC = ::GetImage( xFrame, aSlotURL, FALSE, TRUE );     // high contrast
+    Image aDelNm = ::GetImage( xFrame, aSlotURL, sal_False, sal_False );
+    Image aDelHC = ::GetImage( xFrame, aSlotURL, sal_False, sal_True );     // high contrast
 
     for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow )
     {
@@ -451,7 +451,7 @@ void ScOptSolverDlg::EnableButtons()
 
 //----------------------------------------------------------------------------
 
-BOOL ScOptSolverDlg::Close()
+sal_Bool ScOptSolverDlg::Close()
 {
     return DoClose( ScOptSolverDlgWrapper::GetChildWindowId() );
 }
@@ -496,7 +496,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
             aStr = aName;
         else                                                        // format cell/range reference
         {
-            USHORT nFmt = ( aAdr.Tab() == mnCurTab ) ? SCA_ABS : SCA_ABS_3D;
+            sal_uInt16 nFmt = ( aAdr.Tab() == mnCurTab ) ? SCA_ABS : SCA_ABS_3D;
             if ( bSingle )
                 aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); 
             else
@@ -529,7 +529,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 
 //----------------------------------------------------------------------------
 
-BOOL ScOptSolverDlg::IsRefInputMode() const
+sal_Bool ScOptSolverDlg::IsRefInputMode() const
 {
     return mpEdActive != NULL;
 }
@@ -543,7 +543,7 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn )
     {
         bool bSolve = ( pBtn == &maBtnSolve );
 
-        SetDispatcherLock( FALSE );
+        SetDispatcherLock( sal_False );
         SwitchToDocument();
 
         bool bClose = true;
@@ -563,7 +563,7 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn )
         else
         {
             // no solution -> dialog is kept open
-            SetDispatcherLock( TRUE );
+            SetDispatcherLock( sal_True );
         }
     }
     else if ( pBtn == &maBtnOpt )
@@ -628,7 +628,7 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn )
     for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow )
         if( pBtn == mpDelButton[nRow] )
         {
-            BOOL bHadFocus = pBtn->HasFocus();
+            sal_Bool bHadFocus = pBtn->HasFocus();
 
             ReadConditions();
             long nVecPos = nScrollPos + nRow;
@@ -771,7 +771,7 @@ bool ScOptSolverDlg::ParseRef( ScRange& rRange, const String& rInput, bool bAllo
 {
     ScRangeUtil aRangeUtil;
     ScAddress::Details aDetails(mpDoc->GetAddressConvention(), 0, 0);
-    USHORT nFlags = rRange.ParseAny( rInput, mpDoc, aDetails );
+    sal_uInt16 nFlags = rRange.ParseAny( rInput, mpDoc, aDetails );
     if ( nFlags & SCA_VALID )
     {
         if ( (nFlags & SCA_TAB_3D) == 0 )
@@ -842,8 +842,8 @@ bool ScOptSolverDlg::CallSolver()       // return true -> close dialog after cal
     }
     uno::Sequence<table::CellAddress> aVariables;
     sal_Int32 nVarPos = 0;
-       ULONG nRangeCount = aVarRanges.Count();
-    for (ULONG nRangePos=0; nRangePos<nRangeCount; ++nRangePos)
+       sal_uLong nRangeCount = aVarRanges.Count();
+    for (sal_uLong nRangePos=0; nRangePos<nRangeCount; ++nRangePos)
     {
         ScRange aRange(*aVarRanges.GetObject(nRangePos));
         aRange.Justify();
@@ -1021,7 +1021,7 @@ bool ScOptSolverDlg::CallSolver()       // return true -> close dialog after cal
             {
                 ScAddress aCellPos;
                 ScUnoConversion::FillScAddress( aCellPos, aVariables[nVarPos] );
-                aFunc.PutCell( aCellPos, new ScValueCell( aSolution[nVarPos] ), TRUE );
+                aFunc.PutCell( aCellPos, new ScValueCell( aSolution[nVarPos] ), sal_True );
             }
             mpDocShell->UnlockPaint();
         }
@@ -1056,7 +1056,7 @@ bool ScOptSolverDlg::CallSolver()       // return true -> close dialog after cal
         {
             ScAddress aCellPos;
             ScUnoConversion::FillScAddress( aCellPos, aVariables[nVarPos] );
-            aFunc.PutCell( aCellPos, new ScValueCell( aOldValues[nVarPos] ), TRUE );
+            aFunc.PutCell( aCellPos, new ScValueCell( aOldValues[nVarPos] ), sal_True );
         }
         mpDocShell->UnlockPaint();
     }
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index 79d53b9c8..0068a8306 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -41,7 +41,7 @@ static const ScTableProtection::Option aOptions[] = {
     ScTableProtection::SELECT_LOCKED_CELLS,
     ScTableProtection::SELECT_UNLOCKED_CELLS,
 };
-static const USHORT nOptionCount = sizeof(aOptions)/sizeof(aOptions[0]);
+static const sal_uInt16 nOptionCount = sizeof(aOptions)/sizeof(aOptions[0]);
 
 
 ScTableProtectionDlg::ScTableProtectionDlg(Window* pParent) :
@@ -78,7 +78,7 @@ short ScTableProtectionDlg::Execute()
 
 void ScTableProtectionDlg::SetDialogData(const ScTableProtection& rData)
 {
-    for (USHORT i = 0; i < nOptionCount; ++i)
+    for (sal_uInt16 i = 0; i < nOptionCount; ++i)
         maOptionsListBox.CheckEntryPos(i, rData.isOptionEnabled(aOptions[i]));
 }
 
@@ -89,7 +89,7 @@ void ScTableProtectionDlg::WriteData(ScTableProtection& rData) const
     // We assume that the two password texts match.
     rData.setPassword(maPassword1Edit.GetText());
 
-    for (USHORT i = 0; i < nOptionCount; ++i)
+    for (sal_uInt16 i = 0; i < nOptionCount; ++i)
         rData.setOption(aOptions[i], maOptionsListBox.IsChecked(i));
 }
 
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index f1004a3fa..78d4a55a4 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -40,13 +40,13 @@
 //------------------------------------------------------------------------
 
 ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet,
-                    ScDocShell *pShell,ScChangeAction *pAction,BOOL bPrevNext)
+                    ScDocShell *pShell,ScChangeAction *pAction,sal_Bool bPrevNext)
 {
-    //CHINA001 pDlg = new SvxPostItDialog(pParent,rCoreSet,bPrevNext,TRUE);
+    //CHINA001 pDlg = new SvxPostItDialog(pParent,rCoreSet,bPrevNext,sal_True);
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
-        pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, bPrevNext, TRUE );
+        pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, bPrevNext, sal_True );
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
         pDocShell=pShell;
         pDlg->DontChangeAuthor();
@@ -116,8 +116,8 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction)
         pDlg->SetText(aTitle);
         aComment=pChangeAction->GetComment();
 
-        BOOL bNext=FindNext(pChangeAction)!=NULL;
-        BOOL bPrev=FindPrev(pChangeAction)!=NULL;
+        sal_Bool bNext=FindNext(pChangeAction)!=NULL;
+        sal_Bool bPrev=FindPrev(pChangeAction)!=NULL;
         pDlg->EnableTravel(bNext,bPrev);
 
         String aAuthor = pChangeAction->GetUser();
@@ -125,7 +125,7 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction)
         DateTime aDT = pChangeAction->GetDateTime();
         String aDate = ScGlobal::pLocaleData->getDate( aDT );
         aDate += ' ';
-        aDate += ScGlobal::pLocaleData->getTime( aDT, FALSE, FALSE );
+        aDate += ScGlobal::pLocaleData->getTime( aDT, sal_False, sal_False );
 
         pDlg->ShowLastAuthor(aAuthor, aDate);
         pDlg->SetNote(aComment);
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 628b50bfd..6e4585193 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -101,8 +101,8 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window*					pParent,
     pFormat 		( pAutoFormat ),
     pSelFmtData 	( pSelFormatData ),
     nIndex			( 0 ),
-    bCoreDataChanged( FALSE ),
-    bFmtInserted	( FALSE )
+    bCoreDataChanged( sal_False ),
+    bFmtInserted	( sal_False )
 {
     Init();
     pWndPreview->NotifyChange( (*pFormat)[0] );
@@ -120,7 +120,7 @@ __EXPORT ScAutoFormatDlg::~ScAutoFormatDlg()
 
 void ScAutoFormatDlg::Init()
 {
-    USHORT nCount;
+    sal_uInt16 nCount;
     String aEntry;
 
     aLbFormat	 .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) );
@@ -148,7 +148,7 @@ void ScAutoFormatDlg::Init()
 
     nCount = pFormat->GetCount();
 
-    for ( USHORT i = 0; i < nCount; i++ )
+    for ( sal_uInt16 i = 0; i < nCount; i++ )
     {
         ((*pFormat)[i])->GetName( aEntry );
         aLbFormat.InsertEntry( aEntry );
@@ -168,7 +168,7 @@ void ScAutoFormatDlg::Init()
     {
         aBtnAdd.Disable();
         aBtnRemove.Disable();
-        bFmtInserted = TRUE;
+        bFmtInserted = sal_True;
     }
 }
 
@@ -219,7 +219,7 @@ IMPL_LINK_INLINE_END( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG )
 IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn )
 {
     ScAutoFormatData* pData  = (*pFormat)[nIndex];
-    BOOL			  bCheck = ((CheckBox*)pBtn)->IsChecked();
+    sal_Bool			  bCheck = ((CheckBox*)pBtn)->IsChecked();
 
     if ( pBtn == &aBtnNumFormat )
         pData->SetIncludeValueFormat( bCheck );
@@ -237,7 +237,7 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn )
     if ( !bCoreDataChanged )
     {
         aBtnCancel.SetText( aStrClose );
-        bCoreDataChanged = TRUE;
+        bCoreDataChanged = sal_True;
     }
 
     pWndPreview->NotifyChange( pData );
@@ -254,7 +254,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
         String				aStrStandard( SfxResId(STR_STANDARD) );
         String				aFormatName;
         ScStringInputDlg*	pDlg;
-        BOOL				bOk = FALSE;
+        sal_Bool				bOk = sal_False;
 
         while ( !bOk )
         {
@@ -278,7 +278,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
 
                     if ( bFmtInserted )
                     {
-                        USHORT nAt = pFormat->IndexOf( pNewData );
+                        sal_uInt16 nAt = pFormat->IndexOf( pNewData );
 
                         aLbFormat.InsertEntry( aFormatName, nAt );
                         aLbFormat.SelectEntry( aFormatName );
@@ -287,11 +287,11 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
                         if ( !bCoreDataChanged )
                         {
                             aBtnCancel.SetText( aStrClose );
-                            bCoreDataChanged = TRUE;
+                            bCoreDataChanged = sal_True;
                         }
 
                         SelFmtHdl( 0 );
-                        bOk = TRUE;
+                        bOk = sal_True;
                     }
                     else
                         delete pNewData;
@@ -300,7 +300,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
 
                 if ( !bFmtInserted )
                 {
-                    USHORT nRet = ErrorBox( this,
+                    sal_uInt16 nRet = ErrorBox( this,
                                             WinBits( WB_OK_CANCEL | WB_DEF_OK),
                                             ScGlobal::GetRscString(STR_INVALID_AFNAME)
                                           ).Execute();
@@ -309,7 +309,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
                 }
             }
             else
-                bOk = TRUE;
+                bOk = sal_True;
 
             delete pDlg;
         }
@@ -341,7 +341,7 @@ IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG )
             if ( !bCoreDataChanged )
             {
                 aBtnCancel.SetText( aStrClose );
-                bCoreDataChanged = TRUE;
+                bCoreDataChanged = sal_True;
             }
 
             pFormat->AtFree( nIndex ); // in der Core loeschen
@@ -358,7 +358,7 @@ IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG )
 
 IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG )
 {
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     while( !bOk )
     {
 
@@ -372,9 +372,9 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG )
                                          HID_SC_REN_AFMT_DLG, HID_SC_REN_AFMT_NAME );
         if( pDlg->Execute() == RET_OK )
         {
-            BOOL bFmtRenamed = FALSE;
+            sal_Bool bFmtRenamed = sal_False;
             pDlg->GetInputString( aFormatName );
-            USHORT n;
+            sal_uInt16 n;
 
             if ( aFormatName.Len() > 0 )
             {
@@ -400,29 +400,29 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG )
 
                     pFormat->Insert( pNewData);
 
-                    USHORT nCount = pFormat->GetCount();
+                    sal_uInt16 nCount = pFormat->GetCount();
 
-                    aLbFormat.SetUpdateMode(FALSE);
+                    aLbFormat.SetUpdateMode(sal_False);
                     aLbFormat.Clear();
-                    for ( USHORT i = 0; i < nCount; i++ )
+                    for ( sal_uInt16 i = 0; i < nCount; i++ )
                     {
                         ((*pFormat)[i])->GetName( aEntry );
                         aLbFormat.InsertEntry( aEntry );
                     }
 
-                    aLbFormat.SetUpdateMode( TRUE);
+                    aLbFormat.SetUpdateMode( sal_True);
                     aLbFormat.SelectEntry( aFormatName);
 
                     if ( !bCoreDataChanged )
                     {
                         aBtnCancel.SetText( aStrClose );
-                        bCoreDataChanged = TRUE;
+                        bCoreDataChanged = sal_True;
                     }
 
 
                     SelFmtHdl( 0 );
-                    bOk = TRUE;
-                    bFmtRenamed = TRUE;
+                    bOk = sal_True;
+                    bFmtRenamed = sal_True;
                 }
             }
             if( !bFmtRenamed )
@@ -434,7 +434,7 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG )
             }
         }
         else
-            bOk = TRUE;
+            bOk = sal_True;
         delete pDlg;
     }
 
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 96d5ded3b..26043b900 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -158,12 +158,12 @@ void ScShareDocumentDlg::UpdateView()
                         ::rtl::OUString aDateStr = aDateTimeStr.getToken( 0, ' ', nIndex );
                         ::rtl::OUString aTimeStr = aDateTimeStr.getToken( 0, ' ', nIndex );
                         nIndex = 0;
-                        USHORT nDay = sal::static_int_cast< USHORT >( aDateStr.getToken( 0, '.', nIndex ).toInt32() );
-                        USHORT nMonth = sal::static_int_cast< USHORT >( aDateStr.getToken( 0, '.', nIndex ).toInt32() );
-                        USHORT nYear = sal::static_int_cast< USHORT >( aDateStr.getToken( 0, '.', nIndex ).toInt32() );
+                        sal_uInt16 nDay = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() );
+                        sal_uInt16 nMonth = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() );
+                        sal_uInt16 nYear = sal::static_int_cast< sal_uInt16 >( aDateStr.getToken( 0, '.', nIndex ).toInt32() );
                         nIndex = 0;
-                        USHORT nHours = sal::static_int_cast< USHORT >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() );
-                        USHORT nMinutes = sal::static_int_cast< USHORT >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() );
+                        sal_uInt16 nHours = sal::static_int_cast< sal_uInt16 >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() );
+                        sal_uInt16 nMinutes = sal::static_int_cast< sal_uInt16 >( aTimeStr.getToken( 0, ':', nIndex ).toInt32() );
                         Date aDate( nDay, nMonth, nYear );
                         Time aTime( nHours, nMinutes );
                         DateTime aDateTime( aDate, aTime );
@@ -172,7 +172,7 @@ void ScShareDocumentDlg::UpdateView()
                         aString += '\t';
                         aString += ScGlobal::pLocaleData->getDate( aDateTime );
                         aString += ' ';
-                        aString += ScGlobal::pLocaleData->getTime( aDateTime, FALSE );
+                        aString += ScGlobal::pLocaleData->getTime( aDateTime, sal_False );
 
                         maLbUsers.InsertEntry( aString, NULL );
                     }
@@ -228,7 +228,7 @@ void ScShareDocumentDlg::UpdateView()
 
         aString += ScGlobal::pLocaleData->getDate( aDateTime );
         aString += ' ';
-        aString += ScGlobal::pLocaleData->getTime( aDateTime, FALSE );
+        aString += ScGlobal::pLocaleData->getTime( aDateTime, sal_False );
 
         maLbUsers.InsertEntry( aString, NULL );
     }
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index 7a06c4c94..fde9832dd 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -70,7 +70,7 @@ void ScShowTabDlg::SetDescription(
     aLb.SetHelpId( sLbHelpId );
 }
 
-void ScShowTabDlg::Insert( const String& rString, BOOL bSelected )
+void ScShowTabDlg::Insert( const String& rString, sal_Bool bSelected )
 {
     aLb.InsertEntry( rString );
     if( bSelected )
@@ -79,17 +79,17 @@ void ScShowTabDlg::Insert( const String& rString, BOOL bSelected )
 
 //------------------------------------------------------------------------
 
-USHORT ScShowTabDlg::GetSelectEntryCount() const
+sal_uInt16 ScShowTabDlg::GetSelectEntryCount() const
 {
     return aLb.GetSelectEntryCount();
 }
 
-String ScShowTabDlg::GetSelectEntry(USHORT nPos) const
+String ScShowTabDlg::GetSelectEntry(sal_uInt16 nPos) const
 {
     return aLb.GetSelectEntry(nPos);
 }
 
-USHORT ScShowTabDlg::GetSelectEntryPos(USHORT nPos) const
+sal_uInt16 ScShowTabDlg::GetSelectEntryPos(sal_uInt16 nPos) const
 {
     return aLb.GetSelectEntryPos(nPos);
 }
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 9dfc1af2d..c8d076bc7 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -80,22 +80,22 @@ ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
         //
         pViewData		( ptrViewData ),
         pDoc			( ptrViewData->GetDocument() ),
-        bRefInputMode	( FALSE ),
-        bAutoReOpen		( TRUE ),
-        bCloseOnButtonUp( FALSE ),
-        bSingleCell     ( FALSE ),
-        bMultiSelection ( FALSE )
+        bRefInputMode	( sal_False ),
+        bAutoReOpen		( sal_True ),
+        bCloseOnButtonUp( sal_False ),
+        bSingleCell     ( sal_False ),
+        bMultiSelection ( sal_False )
 {
     //	damit die Strings in der Resource bei den FixedTexten bleiben koennen:
     Init();
     FreeResource();
-    SetDispatcherLock( TRUE ); // Modal-Modus einschalten
+    SetDispatcherLock( sal_True ); // Modal-Modus einschalten
 }
 
 //----------------------------------------------------------------------------
 __EXPORT ScSimpleRefDlg::~ScSimpleRefDlg()
 {
-    SetDispatcherLock( FALSE ); // Modal-Modus einschalten
+    SetDispatcherLock( sal_False ); // Modal-Modus einschalten
 }
 
 //----------------------------------------------------------------------------
@@ -116,7 +116,7 @@ void ScSimpleRefDlg::Init()
 {
     aBtnOk.SetClickHdl		( LINK( this, ScSimpleRefDlg, OkBtnHdl ) );
     aBtnCancel.SetClickHdl	( LINK( this, ScSimpleRefDlg, CancelBtnHdl ) );
-    bCloseFlag=FALSE;
+    bCloseFlag=sal_False;
 }
 
 //----------------------------------------------------------------------------
@@ -159,10 +159,10 @@ void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 
 
 //----------------------------------------------------------------------------
-BOOL __EXPORT ScSimpleRefDlg::Close()
+sal_Bool __EXPORT ScSimpleRefDlg::Close()
 {
     CancelBtnHdl(&aBtnCancel);
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -177,9 +177,9 @@ void ScSimpleRefDlg::SetActive()
     RefInputDone();
 }
 //------------------------------------------------------------------------
-BOOL ScSimpleRefDlg::IsRefInputMode() const
+sal_Bool ScSimpleRefDlg::IsRefInputMode() const
 {
-    return TRUE;
+    return sal_True;
 }
 
 String ScSimpleRefDlg::GetRefString() const
@@ -200,7 +200,7 @@ void ScSimpleRefDlg::SetUnoLinks( const Link& rDone, const Link& rAbort,
     aChangeHdl	= rChange;
 }
 
-void ScSimpleRefDlg::SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection )
+void ScSimpleRefDlg::SetFlags( sal_Bool bSetCloseOnButtonUp, sal_Bool bSetSingleCell, sal_Bool bSetMultiSelection )
 {
     bCloseOnButtonUp = bSetCloseOnButtonUp;
     bSingleCell = bSetSingleCell;
@@ -216,10 +216,10 @@ void ScSimpleRefDlg::StartRefInput()
     }
 
     aRbAssign.DoRef();
-    bCloseFlag=TRUE;
+    bCloseFlag=sal_True;
 }
 
-void ScSimpleRefDlg::RefInputDone( BOOL bForced)
+void ScSimpleRefDlg::RefInputDone( sal_Bool bForced)
 {
     ScAnyRefDlg::RefInputDone(bForced);
     if ( (bForced || bCloseOnButtonUp) && bCloseFlag )
@@ -230,7 +230,7 @@ void ScSimpleRefDlg::RefInputDone( BOOL bForced)
 // ========
 IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG )
 {
-    bAutoReOpen=FALSE;
+    bAutoReOpen=sal_False;
     String aResult=aEdAssign.GetText();
     aCloseHdl.Call(&aResult);
     Link aUnoLink = aDoneHdl;		// stack var because this is deleted in DoClose
@@ -242,7 +242,7 @@ IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG )
 //------------------------------------------------------------------------
 IMPL_LINK( ScSimpleRefDlg, CancelBtnHdl, void *, EMPTYARG )
 {
-    bAutoReOpen=FALSE;
+    bAutoReOpen=sal_False;
     String aResult=aEdAssign.GetText();
     aCloseHdl.Call(NULL);
     Link aUnoLink = aAbortedHdl;	// stack var because this is deleted in DoClose
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 2f5244329..7b661d171 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -76,7 +76,7 @@ class ScSolverOptionsString : public SvLBoxString
     sal_Int32   mnIntValue;
 
 public:
-    ScSolverOptionsString( SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) :
+    ScSolverOptionsString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) :
         SvLBoxString( pEntry, nFlags, rStr ),
         mbIsDouble( false ),
         mfDoubleValue( 0.0 ),
@@ -89,10 +89,10 @@ public:
     void      SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; }
     void      SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; }
 
-    virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry );
+    virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
 };
 
-void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* /* pEntry */ )
+void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ )
 {
     //! move position? (SvxLinguTabPage: aPos.X() += 20)
     String aNormalStr( GetText() );
@@ -174,7 +174,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent,
         maProperties.realloc(0);        // don't use options from different engine
     }
     if ( nSelect >= 0 )                 // select in list box
-        maLbEngine.SelectEntryPos( static_cast<USHORT>(nSelect) );
+        maLbEngine.SelectEntryPos( static_cast<sal_uInt16>(nSelect) );
 
     if ( !maProperties.getLength() )
         ReadFromComponent();            // fill maProperties from component (using maEngine)
@@ -207,8 +207,8 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties(
             SvLBoxEntry* pEntry = pModel->GetEntry(nEntryPos);
 
             bool bHasData = false;
-            USHORT nItemCount = pEntry->ItemCount();
-            for (USHORT nItemPos=0; nItemPos<nItemCount && !bHasData; ++nItemPos)
+            sal_uInt16 nItemCount = pEntry->ItemCount();
+            for (sal_uInt16 nItemPos=0; nItemPos<nItemCount && !bHasData; ++nItemPos)
             {
                 SvLBoxItem*	pItem = pEntry->GetItem( nItemPos );
                 ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem);
@@ -264,7 +264,7 @@ void ScSolverOptionsDialog::FillListBox()
 
     // fill the list box
 
-    maLbSettings.SetUpdateMode(FALSE);
+    maLbSettings.SetUpdateMode(sal_False);
     maLbSettings.Clear();
 
     String sEmpty;
@@ -317,7 +317,7 @@ void ScSolverOptionsDialog::FillListBox()
         pModel->Insert( pEntry );
     }
 
-    maLbSettings.SetUpdateMode(TRUE);
+    maLbSettings.SetUpdateMode(sal_True);
 }
 
 void ScSolverOptionsDialog::ReadFromComponent()
@@ -330,8 +330,8 @@ void ScSolverOptionsDialog::EditOption()
     SvLBoxEntry* pEntry = maLbSettings.GetCurEntry();
     if (pEntry)
     {
-        USHORT nItemCount = pEntry->ItemCount();
-        for (USHORT nPos=0; nPos<nItemCount; ++nPos)
+        sal_uInt16 nItemCount = pEntry->ItemCount();
+        for (sal_uInt16 nPos=0; nPos<nItemCount; ++nPos)
         {
             SvLBoxItem*	pItem = pEntry->GetItem( nPos );
             ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem);
@@ -380,7 +380,7 @@ IMPL_LINK( ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, EMPTYA
 
 IMPL_LINK( ScSolverOptionsDialog, EngineSelectHdl, ListBox*, EMPTYARG )
 {
-    USHORT nSelectPos = maLbEngine.GetSelectEntryPos();
+    sal_uInt16 nSelectPos = maLbEngine.GetSelectEntryPos();
     if ( nSelectPos < maImplNames.getLength() )
     {
         String aNewEngine( maImplNames[nSelectPos] );
@@ -396,14 +396,14 @@ IMPL_LINK( ScSolverOptionsDialog, EngineSelectHdl, ListBox*, EMPTYARG )
 
 IMPL_LINK( ScSolverOptionsDialog, SettingsSelHdl, SvxCheckListBox*, EMPTYARG )
 {
-    BOOL bCheckbox = FALSE;
+    sal_Bool bCheckbox = sal_False;
 
     SvLBoxEntry* pEntry = maLbSettings.GetCurEntry();
     if (pEntry)
     {
         SvLBoxItem* pItem = pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON);
         if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON )
-            bCheckbox = TRUE;
+            bCheckbox = sal_True;
     }
 
     maBtnEdit.Enable( !bCheckbox );
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index c430fce89..d643ddbed 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -80,7 +80,7 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         pDoc				( pDocument ),
         nCurTab				( aCursorPos.Tab() ),
         pEdActive			( NULL ),
-        bDlgLostFocus		( FALSE ),
+        bDlgLostFocus		( sal_False ),
         errMsgInvalidVar	( ScResId( STR_INVALIDVAR ) ),
         errMsgInvalidForm	( ScResId( STR_INVALIDFORM ) ),
         errMsgNoFormula		( ScResId( STR_NOFORMULA ) ),
@@ -127,7 +127,7 @@ void __EXPORT ScSolverDlg::Init()
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScSolverDlg::Close()
+sal_Bool __EXPORT ScSolverDlg::Close()
 {
     return DoClose( ScSolverDlgWrapper::GetChildWindowId() );
 }
@@ -138,7 +138,7 @@ void ScSolverDlg::SetActive()
 {
     if ( bDlgLostFocus )
     {
-        bDlgLostFocus = FALSE;
+        bDlgLostFocus = sal_False;
         if( pEdActive )
             pEdActive->GrabFocus();
     }
@@ -160,7 +160,7 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 
         String		aStr;
         ScAddress	aAdr = rRef.aStart;
-        USHORT	 	nFmt = ( aAdr.Tab() == nCurTab )
+        sal_uInt16	 	nFmt = ( aAdr.Tab() == nCurTab )
                                 ? SCA_ABS
                                 : SCA_ABS_3D;
 
@@ -204,14 +204,14 @@ void ScSolverDlg::RaiseError( ScSolverErr eError )
 
 //----------------------------------------------------------------------------
 
-BOOL ScSolverDlg::IsRefInputMode() const
+sal_Bool ScSolverDlg::IsRefInputMode() const
 {
     return pEdActive != NULL;
 }
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScSolverDlg::CheckTargetValue( String& rStrVal )
+sal_Bool __EXPORT ScSolverDlg::CheckTargetValue( String& rStrVal )
 {
     sal_uInt32 n1 = 0;
     double n2;
@@ -234,8 +234,8 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn )
         // 3. wurde ein korrekter Zielwert eingegeben
 
         const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
-        USHORT	nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(),  pDoc, eConv );
-        USHORT	nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv );
+        sal_uInt16	nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(),  pDoc, eConv );
+        sal_uInt16	nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv );
 
         if ( SCA_VALID == ( nRes1 & SCA_VALID ) )
         {
@@ -256,7 +256,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn )
                                                 theTargetValStr );
                         ScSolveItem	 aOutItem( SCITEM_SOLVEDATA, &aOutParam );
 
-                        SetDispatcherLock( FALSE );
+                        SetDispatcherLock( sal_False );
 
                         SwitchToDocument();
                         GetBindings().GetDispatcher()->Execute( SID_SOLVE,
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index b5ba7899e..adb56b229 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -102,7 +102,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
     const Size aSize15x15 = Size( 15, 15 );
     const Size aSize10x10 = Size( 10, 10 );
     const Size aSize5x5 = Size( 5, 5 );
-    USHORT nSelectedItem = 0;
+    sal_uInt16 nSelectedItem = 0;
 
     DBG_ASSERT( pDocSh, "DocShell not found!" );
 
@@ -155,10 +155,10 @@ IMPL_LINK( ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, EMPTYARG )
     Handler, called when color selection is changed
 */
 {
-    USHORT nItemId = aTabBgColorSet.GetSelectItemId();
+    sal_uInt16 nItemId = aTabBgColorSet.GetSelectItemId();
     Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO );
     aTabBgColor = aColor;
-    EndDialog( TRUE );
+    EndDialog( sal_True );
     return 0;
 }
 
@@ -167,10 +167,10 @@ IMPL_LINK( ScTabBgColorDlg, TabBgColorOKHdl_Impl, OKButton*, EMPTYARG )
 
 //    Handler, called when the OK button is pushed
 
-    USHORT nItemId = aTabBgColorSet.GetSelectItemId();
+    sal_uInt16 nItemId = aTabBgColorSet.GetSelectItemId();
     Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO );
     aTabBgColor = aColor;
-    EndDialog( TRUE );
+    EndDialog( sal_True );
     return 0;
 }
 
@@ -187,10 +187,10 @@ void ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt )
         case KEY_SPACE:
         case KEY_RETURN:
         {
-            USHORT nItemId = GetSelectItemId();
+            sal_uInt16 nItemId = GetSelectItemId();
             const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : Color( COL_AUTO );
             aTabBgColorDlg->aTabBgColor = aColor;
-            aTabBgColorDlg->EndDialog(TRUE);
+            aTabBgColorDlg->EndDialog(sal_True);
         }
         break;
     }
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 884560c55..8036637a8 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -76,7 +76,7 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         pDoc                ( pDocument ),
         nCurTab             ( theFormulaCell.Tab() ),
         pEdActive           ( NULL ),
-        bDlgLostFocus       ( FALSE ),
+        bDlgLostFocus       ( sal_False ),
         errMsgNoFormula		( ScResId( STR_NOFORMULA ) ),
         errMsgNoColRow		( ScResId( STR_NOCOLROW ) ),
         errMsgWrongFormula	( ScResId( STR_WRONGFORMULA ) ),
@@ -127,7 +127,7 @@ void __EXPORT ScTabOpDlg::Init()
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScTabOpDlg::Close()
+sal_Bool __EXPORT ScTabOpDlg::Close()
 {
     return DoClose( ScTabOpDlgWrapper::GetChildWindowId() );
 }
@@ -138,7 +138,7 @@ void ScTabOpDlg::SetActive()
 {
     if ( bDlgLostFocus )
     {
-        bDlgLostFocus = FALSE;
+        bDlgLostFocus = sal_False;
         if( pEdActive )
             pEdActive->GrabFocus();
     }
@@ -160,7 +160,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
             RefInputStart(pEdActive);
 
         String		aStr;
-        USHORT	 	nFmt = ( rRef.aStart.Tab() == nCurTab )
+        sal_uInt16	 	nFmt = ( rRef.aStart.Tab() == nCurTab )
                                 ? SCR_ABS
                                 : SCR_ABS_3D;
 
@@ -236,10 +236,10 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError )
 
 //----------------------------------------------------------------------------
 
-BOOL lcl_Parse( const String& rString, ScDocument* pDoc, SCTAB nCurTab,
+sal_Bool lcl_Parse( const String& rString, ScDocument* pDoc, SCTAB nCurTab,
                 ScRefAddress& rStart, ScRefAddress& rEnd )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
     if ( rString.Search(':') != STRING_NOTFOUND )
         bRet = ConvertDoubleRef( pDoc, rString, nCurTab, rStart, rEnd, eConv );
@@ -258,8 +258,8 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
 {
     if ( pBtn == &aBtnOk )
     {
-        BYTE nMode = 3;
-        USHORT nError = 0;
+        sal_uInt8 nMode = 3;
+        sal_uInt16 nError = 0;
 
         // Zu ueberpruefen:
         // 1. enthalten die Strings korrekte Tabellenkoordinaten/def.Namen?
@@ -324,7 +324,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
                                     nMode );
             ScTabOpItem	 aOutItem( SID_TABOP, &aOutParam );
 
-            SetDispatcherLock( FALSE );
+            SetDispatcherLock( sal_False );
             SwitchToDocument();
             GetBindings().GetDispatcher()->Execute( SID_TABOP,
                                       SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index 7c48cf288..4bfe6264e 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -68,7 +68,7 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
 
 // -----------------------------------------------------------------------
 
-void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
+void __EXPORT ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001
     switch( nId )
@@ -118,7 +118,7 @@ ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) :
 
 // -----------------------------------------------------------------------
 
-void __EXPORT ScParagraphDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
+void __EXPORT ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     switch( nId )
     {
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index 3d970e4e5..f6b0f8b5d 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -75,14 +75,14 @@ ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) :
 
 bool ScReplaceWarnBox::IsDialogEnabled()
 {
-    return SC_MOD()->GetInputOptions().GetReplaceCellsWarn() == TRUE;
+    return SC_MOD()->GetInputOptions().GetReplaceCellsWarn() == sal_True;
 }
 
 void ScReplaceWarnBox::DisableDialog()
 {
     ScModule* pScMod = SC_MOD();
     ScInputOptions aInputOpt( pScMod->GetInputOptions() );
-    aInputOpt.SetReplaceCellsWarn( FALSE );
+    aInputOpt.SetReplaceCellsWarn( sal_False );
     pScMod->SetInputOptions( aInputOpt );
 }
 
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 1e1ebd7ee..164684687 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -66,24 +66,24 @@
 struct SaveData
 {
     SaveData()
-        : bCriteria(FALSE),bPrintArea(FALSE),
-          bColHeader(FALSE),bRowHeader(FALSE),
-          bDirty(FALSE) {}
+        : bCriteria(sal_False),bPrintArea(sal_False),
+          bColHeader(sal_False),bRowHeader(sal_False),
+          bDirty(sal_False) {}
 
     void Clear()
         {
             aStrSymbol.Erase();
             bCriteria  = bPrintArea =
-            bColHeader = bRowHeader = FALSE;
-            bDirty = TRUE;
+            bColHeader = bRowHeader = sal_False;
+            bDirty = sal_True;
         }
 
     String	aStrSymbol;
-    BOOL	bCriteria:1;
-    BOOL	bPrintArea:1;
-    BOOL	bColHeader:1;
-    BOOL	bRowHeader:1;
-    BOOL	bDirty:1;
+    sal_Bool	bCriteria:1;
+    sal_Bool	bPrintArea:1;
+    sal_Bool	bColHeader:1;
+    sal_Bool	bRowHeader:1;
+    sal_Bool	bDirty:1;
 };
 
 static SaveData* pSaveObj = NULL;
@@ -94,7 +94,7 @@ static SaveData* pSaveObj = NULL;
     pSaveObj->bPrintArea = aBtnPrintArea.IsChecked();	\
     pSaveObj->bColHeader = aBtnColHeader.IsChecked();	\
     pSaveObj->bRowHeader = aBtnRowHeader.IsChecked();	\
-    pSaveObj->bDirty	 = TRUE;
+    pSaveObj->bDirty	 = sal_True;
 
 #define RESTORE_DATA() \
     if ( pSaveObj->bDirty ) 							\
@@ -104,7 +104,7 @@ static SaveData* pSaveObj = NULL;
         aBtnPrintArea.Check( pSaveObj->bPrintArea );	\
         aBtnColHeader.Check( pSaveObj->bColHeader );	\
         aBtnRowHeader.Check( pSaveObj->bRowHeader );	\
-        pSaveObj->bDirty = FALSE;						\
+        pSaveObj->bDirty = sal_False;						\
     }
 
 #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
@@ -141,7 +141,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         aBtnRemove		( this, ScResId( BTN_REMOVE ) ),
         aBtnMore		( this, ScResId( BTN_MORE ) ),
         //
-        bSaved			(FALSE),
+        bSaved			(sal_False),
         aStrAdd 		( ScResId( STR_ADD ) ),
         aStrModify		( ScResId( STR_MODIFY ) ),
         errMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ),
@@ -213,20 +213,20 @@ void __EXPORT ScNameDlg::Init()
     UpdateChecks();
     EdModifyHdl( 0 );
 
-    bSaved=TRUE;
+    bSaved=sal_True;
     SAVE_DATA()
 
     //@BugID 54702
-    //SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+    //SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
 }
 
 //----------------------------------------------------------------------------
-BOOL ScNameDlg::IsRefInputMode() const
+sal_Bool ScNameDlg::IsRefInputMode() const
 {
     return aEdAssign.IsEnabled();
 }
 
-void ScNameDlg::RefInputDone( BOOL bForced)
+void ScNameDlg::RefInputDone( sal_Bool bForced)
 {
     ScAnyRefDlg::RefInputDone(bForced);
     EdModifyHdl(&aEdAssign);
@@ -251,7 +251,7 @@ void ScNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 
 
 //----------------------------------------------------------------------------
-BOOL __EXPORT ScNameDlg::Close()
+sal_Bool __EXPORT ScNameDlg::Close()
 {
     return DoClose( ScNameDlgWrapper::GetChildWindowId() );
 }
@@ -270,7 +270,7 @@ void ScNameDlg::SetActive()
 
 void __EXPORT ScNameDlg::UpdateChecks()
 {
-    USHORT		 nCurPos=0;
+    sal_uInt16		 nCurPos=0;
 
     if(aLocalRangeName.SearchName( aEdName.GetText(), nCurPos))
     {
@@ -315,11 +315,11 @@ void __EXPORT ScNameDlg::UpdateChecks()
 
 void __EXPORT ScNameDlg::UpdateNames()
 {
-    USHORT	nRangeCount = aLocalRangeName.GetCount();
+    sal_uInt16	nRangeCount = aLocalRangeName.GetCount();
 
-    aEdName.SetUpdateMode( FALSE );
+    aEdName.SetUpdateMode( sal_False );
     //-----------------------------------------------------------
-    USHORT  nNamePos = aEdName.GetTopEntry();
+    sal_uInt16  nNamePos = aEdName.GetTopEntry();
     aEdName.Clear();
 
     aEdAssign.SetText( EMPTY_STRING );
@@ -329,7 +329,7 @@ void __EXPORT ScNameDlg::UpdateNames()
         ScRangeData*	pRangeData = NULL;
         String			aString;
 
-        for ( USHORT i=0; i<nRangeCount; i++ )
+        for ( sal_uInt16 i=0; i<nRangeCount; i++ )
         {
             pRangeData = (ScRangeData*)(aLocalRangeName.At( i ));
             if ( pRangeData )
@@ -350,7 +350,7 @@ void __EXPORT ScNameDlg::UpdateNames()
         aBtnRemove.Disable();
     }
     //-----------------------------------------------------------
-    aEdName.SetUpdateMode( TRUE );
+    aEdName.SetUpdateMode( sal_True );
     aEdName.SetTopEntry(nNamePos);
     aEdName.Invalidate();
 }
@@ -358,7 +358,7 @@ void __EXPORT ScNameDlg::UpdateNames()
 
 //----------------------------------------------------------------------------
 
-void __EXPORT ScNameDlg::CalcCurTableAssign( String& aAssign, USHORT nCurPos )
+void __EXPORT ScNameDlg::CalcCurTableAssign( String& aAssign, sal_uInt16 nCurPos )
 {
     ScRangeData* pRangeData = (ScRangeData*)(aLocalRangeName.At( nCurPos ));
 
@@ -388,7 +388,7 @@ IMPL_LINK( ScNameDlg, OkBtnHdl, void *, EMPTYARG )
     {
         ScDocShell* pDocSh = pViewData->GetDocShell();
         ScDocFunc aFunc(*pDocSh);
-        aFunc.ModifyRangeNames( aLocalRangeName, FALSE );
+        aFunc.ModifyRangeNames( aLocalRangeName, sal_False );
         Close();
     }
     return 0;
@@ -409,9 +409,9 @@ IMPL_LINK_INLINE_END( ScNameDlg, CancelBtnHdl, void *, EMPTYARG )
 
 IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
 {
-    BOOL	bAdded	  = FALSE;
+    sal_Bool	bAdded	  = sal_False;
     String	aNewEntry = aEdName.GetText();
-    USHORT  nNamePos = aEdName.GetTopEntry();
+    sal_uInt16  nNamePos = aEdName.GetTopEntry();
     aNewEntry.EraseLeadingChars( ' ' );
     aNewEntry.EraseTrailingChars( ' ' );
 
@@ -423,7 +423,7 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
             {
                 ScRangeData*	pNewEntry	= NULL;
                 RangeType		nType		= RT_NAME;
-                USHORT			nFoundAt	= 0;
+                sal_uInt16			nFoundAt	= 0;
                 String			theSymbol	= aEdAssign.GetText();
                 String			aStrPos;
                 String			aStrArea;
@@ -462,7 +462,7 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
                         delete pNewEntry;
 
                     UpdateNames();
-                    bSaved=FALSE;
+                    bSaved=sal_False;
                     RESTORE_DATA()
                     aEdName.SetText(EMPTY_STRING);
                     aEdName.GrabFocus();
@@ -472,9 +472,9 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
                     aBtnRemove.Disable();
 
                     //@BugID 54702 raus mit dem Sch.
-                    //SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+                    //SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
 
-                    bAdded = TRUE;
+                    bAdded = sal_True;
                 }
                 else // theSymbol ungueltig
                 {
@@ -502,7 +502,7 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
 
 IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG )
 {
-    USHORT		 nRemoveAt = 0;
+    sal_uInt16		 nRemoveAt = 0;
     const String aStrEntry = aEdName.GetText();
 
     if ( aLocalRangeName.SearchName( aStrEntry, nRemoveAt ) )
@@ -519,7 +519,7 @@ IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG )
             aLocalRangeName.AtFree( nRemoveAt );
             UpdateNames();
             UpdateChecks();
-            bSaved=FALSE;
+            bSaved=sal_False;
             RESTORE_DATA()
             theCurSel = Selection( 0, SELECTION_MAX );
             aBtnAdd.SetText( aStrAdd );
@@ -535,7 +535,7 @@ IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG )
 
 IMPL_LINK( ScNameDlg, NameSelectHdl, void *, EMPTYARG )
 {
-    USHORT nAtPos;
+    sal_uInt16 nAtPos;
 
     if ( aLocalRangeName.SearchName( aEdName.GetText(), nAtPos ) )
     {
@@ -562,7 +562,7 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
 {
     String	theName 	= aEdName.GetText();
     String	theSymbol	= aEdAssign.GetText();
-    BOOL	bNameFound	= (COMBOBOX_ENTRY_NOTFOUND
+    sal_Bool	bNameFound	= (COMBOBOX_ENTRY_NOTFOUND
                            != aEdName.GetEntryPos( theName ));
 
     if ( pEd == &aEdName )
@@ -577,7 +577,7 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
             aEdAssign.Disable();
             aRbAssign.Disable();
             //@BugID 54702 raus mit dem Sch.
-            //SFX_APPWINDOW->Disable(FALSE);		//! allgemeine Methode im ScAnyRefDlg
+            //SFX_APPWINDOW->Disable(sal_False);		//! allgemeine Methode im ScAnyRefDlg
         }
         else
         {
@@ -590,7 +590,7 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
 
                 if(!bSaved)
                 {
-                    bSaved=TRUE;
+                    bSaved=sal_True;
                     SAVE_DATA()
                 }
                 NameSelectHdl( 0 );
@@ -601,7 +601,7 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
                     aBtnAdd.SetText( aStrAdd );
                 aBtnRemove.Disable();
 
-                bSaved=FALSE;
+                bSaved=sal_False;
                 RESTORE_DATA()
             }
             theSymbol = aEdAssign.GetText();
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 6d31c0856..52c1baeee 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -74,7 +74,7 @@ using namespace com::sun::star;
 
 //	Reihenfolge der Kategorien im Navigator -------------------------------------
 
-static USHORT pTypeList[SC_CONTENT_COUNT] =
+static sal_uInt16 pTypeList[SC_CONTENT_COUNT] =
 {
     SC_CONTENT_ROOT,			// ROOT (0) muss vorne stehen
     SC_CONTENT_TABLE,
@@ -87,7 +87,7 @@ static USHORT pTypeList[SC_CONTENT_COUNT] =
     SC_CONTENT_DRAWING
 };
 
-BOOL ScContentTree::bIsInDrag = FALSE;
+sal_Bool ScContentTree::bIsInDrag = sal_False;
 
 
 ScDocShell* ScContentTree::GetManualOrCurrent()
@@ -129,10 +129,10 @@ ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) :
     aEntryImages	( ScResId( RID_IMAGELIST_NAVCONT ) ),
     aHCEntryImages	( ScResId( RID_IMAGELIST_H_NAVCONT ) ),
     nRootType		( SC_CONTENT_ROOT ),
-    bHiddenDoc		( FALSE ),
+    bHiddenDoc		( sal_False ),
     pHiddenDocument	( NULL )
 {
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<SC_CONTENT_COUNT; i++)
         pPosList[pTypeList[i]] = i;			// invers zum suchen
 
@@ -153,7 +153,7 @@ ScContentTree::~ScContentTree()
 {
 }
 
-void ScContentTree::InitRoot( USHORT nType )
+void ScContentTree::InitRoot( sal_uInt16 nType )
 {
     if ( !nType )
         return;
@@ -167,8 +167,8 @@ void ScContentTree::InitRoot( USHORT nType )
     const Image& rImage = aEntryImages.GetImage( nType );
     String aName( ScResId( SCSTR_CONTENT_ROOT + nType ) );
     // wieder an die richtige Position:
-    USHORT nPos = nRootType ? 0 : pPosList[nType]-1;
-    SvLBoxEntry* pNew = InsertEntry( aName, rImage, rImage, NULL, FALSE, nPos );
+    sal_uInt16 nPos = nRootType ? 0 : pPosList[nType]-1;
+    SvLBoxEntry* pNew = InsertEntry( aName, rImage, rImage, NULL, sal_False, nPos );
 
     const Image& rHCImage = aHCEntryImages.GetImage( nType );
     SetExpandedEntryBmp( pNew, rHCImage, BMP_COLOR_HIGHCONTRAST );
@@ -180,11 +180,11 @@ void ScContentTree::InitRoot( USHORT nType )
 void ScContentTree::ClearAll()
 {
     Clear();
-    for (USHORT i=1; i<SC_CONTENT_COUNT; i++)
+    for (sal_uInt16 i=1; i<SC_CONTENT_COUNT; i++)
         InitRoot(i);
 }
 
-void ScContentTree::ClearType(USHORT nType)
+void ScContentTree::ClearType(sal_uInt16 nType)
 {
     if (!nType)
         ClearAll();
@@ -200,7 +200,7 @@ void ScContentTree::ClearType(USHORT nType)
     }
 }
 
-void ScContentTree::InsertContent( USHORT nType, const String& rValue )
+void ScContentTree::InsertContent( sal_uInt16 nType, const String& rValue )
 {
     if (nType >= SC_CONTENT_COUNT)
     {
@@ -217,7 +217,7 @@ void ScContentTree::InsertContent( USHORT nType, const String& rValue )
     }
 }
 
-void ScContentTree::GetEntryIndexes( USHORT& rnRootIndex, ULONG& rnChildIndex, SvLBoxEntry* pEntry ) const
+void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvLBoxEntry* pEntry ) const
 {
     rnRootIndex = SC_CONTENT_ROOT;
     rnChildIndex = SC_CONTENT_NOCHILD;
@@ -227,7 +227,7 @@ void ScContentTree::GetEntryIndexes( USHORT& rnRootIndex, ULONG& rnChildIndex, S
 
     SvLBoxEntry* pParent = GetParent( pEntry );
     bool bFound = false;
-    for( USHORT nRoot = 1; !bFound && (nRoot < SC_CONTENT_COUNT); ++nRoot )
+    for( sal_uInt16 nRoot = 1; !bFound && (nRoot < SC_CONTENT_COUNT); ++nRoot )
     {
         if( pEntry == pRootNodes[ nRoot ] )
         {
@@ -240,7 +240,7 @@ void ScContentTree::GetEntryIndexes( USHORT& rnRootIndex, ULONG& rnChildIndex, S
             rnRootIndex = nRoot;
 
             // search the entry in all child entries of the parent
-            ULONG nEntry = 0;
+            sal_uLong nEntry = 0;
             SvLBoxEntry* pIterEntry = FirstChild( pParent );
             while( !bFound && pIterEntry )
             {
@@ -258,10 +258,10 @@ void ScContentTree::GetEntryIndexes( USHORT& rnRootIndex, ULONG& rnChildIndex, S
     }
 }
 
-ULONG ScContentTree::GetChildIndex( SvLBoxEntry* pEntry ) const
+sal_uLong ScContentTree::GetChildIndex( SvLBoxEntry* pEntry ) const
 {
-    USHORT nRoot;
-    ULONG nChild;
+    sal_uInt16 nRoot;
+    sal_uLong nChild;
     GetEntryIndexes( nRoot, nChild, pEntry );
     return nChild;
 }
@@ -272,8 +272,8 @@ String lcl_GetDBAreaRange( ScDocument* pDoc, const String& rDBName )
     if (pDoc)
     {
         ScDBCollection*	pDbNames = pDoc->GetDBCollection();
-        USHORT nCount = pDbNames->GetCount();
-        for ( USHORT i=0; i<nCount; i++ )
+        sal_uInt16 nCount = pDbNames->GetCount();
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
             ScDBData* pData = (*pDbNames)[i];
             if ( pData->GetName() == rDBName )
@@ -290,8 +290,8 @@ String lcl_GetDBAreaRange( ScDocument* pDoc, const String& rDBName )
 
 IMPL_LINK( ScContentTree, ContentDoubleClickHdl, ScContentTree *, EMPTYARG )
 {
-    USHORT nType;
-    ULONG nChild;
+    sal_uInt16 nType;
+    sal_uLong nChild;
     SvLBoxEntry* pEntry = GetCurEntry();
     GetEntryIndexes( nType, nChild, pEntry );
 
@@ -370,7 +370,7 @@ void ScContentTree::MouseButtonDown( const MouseEvent& rMEvt )
 
 void ScContentTree::KeyInput( const KeyEvent& rKEvt )
 {
-    BOOL bUsed = FALSE;
+    sal_Bool bUsed = sal_False;
 
     const KeyCode aCode = rKEvt.GetKeyCode();
     if (aCode.GetCode() == KEY_RETURN)
@@ -379,15 +379,15 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
         {
             case KEY_MOD1:
                 ToggleRoot();		// toggle root mode (as in Writer)
-                bUsed = TRUE;
+                bUsed = sal_True;
                 break;
             case 0:
             {
                 SvLBoxEntry* pEntry = GetCurEntry();
                 if( pEntry )
                 {
-                    USHORT nType;
-                    ULONG nChild;
+                    sal_uInt16 nType;
+                    sal_uLong nChild;
                     GetEntryIndexes( nType, nChild, pEntry );
 
                     if( (nType != SC_CONTENT_ROOT) && (nChild == SC_CONTENT_NOCHILD) )
@@ -402,7 +402,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
                         ContentDoubleClickHdl(0);      // select content as if double clicked
                 }
 
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
             break;
         }
@@ -413,12 +413,12 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
         SvTreeListBox::KeyInput(rKEvt);
 }
 
-//BOOL __EXPORT ScContentTree::Drop( const DropEvent& rEvt )
+//sal_Bool __EXPORT ScContentTree::Drop( const DropEvent& rEvt )
 //{
 //	return pParentWindow->Drop(rEvt);			// Drop auf Navigator
 //}
 
-//BOOL __EXPORT ScContentTree::QueryDrop( DropEvent& rEvt )
+//sal_Bool __EXPORT ScContentTree::QueryDrop( DropEvent& rEvt )
 //{
 //	return pParentWindow->QueryDrop(rEvt);		// Drop auf Navigator
 //}
@@ -444,7 +444,7 @@ void ScContentTree::DragFinished( sal_Int8 /* nAction */ )
 
 void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     switch ( rCEvt.GetCommand() )
     {
@@ -458,7 +458,7 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
 
             Application::PostUserEvent( STATIC_LINK( this, ScContentTree, ExecDragHdl ) );
 
-            bDone = TRUE;
+            bDone = sal_True;
             break;
 
         case COMMAND_CONTEXTMENU:
@@ -475,8 +475,8 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
 
                 ScPopupMenu aDocMenu;
                 aDocMenu.SetMenuFlags( aDocMenu.GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
-                USHORT i=0;
-                USHORT nPos=0;
+                sal_uInt16 i=0;
+                sal_uInt16 nPos=0;
                 //	geladene Dokumente
                 ScDocShell* pCurrentSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
                 SfxObjectShell* pSh = SfxObjectShell::GetFirst();
@@ -519,13 +519,13 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
 
                 if ( aDropMenu.WasHit() )				//	Drag-Drop Modus
                 {
-                    USHORT nId = aDropMenu.GetSelected();
+                    sal_uInt16 nId = aDropMenu.GetSelected();
                     if ( nId >= RID_DROPMODE_URL && nId <= RID_DROPMODE_COPY )
                         pParentWindow->SetDropMode( nId - RID_DROPMODE_URL );
                 }
                 else if ( aDocMenu.WasHit() )			//	angezeigtes Dokument
                 {
-                    USHORT nId = aDocMenu.GetSelected();
+                    sal_uInt16 nId = aDocMenu.GetSelected();
                     String aName = aDocMenu.GetItemText(nId);
                     SelectDoc( aName );
                 }
@@ -539,14 +539,14 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
 
 void __EXPORT ScContentTree::RequestHelp( const HelpEvent& rHEvt )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if( rHEvt.GetMode() & HELPMODE_QUICK )
     {
         Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ));
         SvLBoxEntry* pEntry = GetEntry( aPos );
         if ( pEntry )
         {
-            BOOL bRet = FALSE;
+            sal_Bool bRet = sal_False;
             String aHelpText;
             SvLBoxEntry* pParent = GetParent(pEntry);
             if ( !pParent )									// Top-Level ?
@@ -554,23 +554,23 @@ void __EXPORT ScContentTree::RequestHelp( const HelpEvent& rHEvt )
                 aHelpText = String::CreateFromInt32( GetChildCount(pEntry) );
                 aHelpText += ' ';
                 aHelpText += GetEntryText(pEntry);
-                bRet = TRUE;
+                bRet = sal_True;
             }
             else if ( pParent == pRootNodes[SC_CONTENT_NOTE] )
             {
                 aHelpText = GetEntryText(pEntry);			// Notizen als Help-Text
-                bRet = TRUE;
+                bRet = sal_True;
             }
             else if ( pParent == pRootNodes[SC_CONTENT_AREALINK] )
             {
-                ULONG nIndex = GetChildIndex(pEntry);
+                sal_uLong nIndex = GetChildIndex(pEntry);
                 if( nIndex != SC_CONTENT_NOCHILD )
                 {
                     const ScAreaLink* pLink = GetLink(nIndex);
                     if (pLink)
                     {
                         aHelpText = pLink->GetFile();           // Source-Datei als Help-Text
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -588,7 +588,7 @@ void __EXPORT ScContentTree::RequestHelp( const HelpEvent& rHEvt )
 
                     Rectangle aItemRect( aPos, aSize );
                     Help::ShowQuickHelp( this, aItemRect, aHelpText );
-                    bDone = TRUE;
+                    bDone = sal_True;
                 }
             }
         }
@@ -611,7 +611,7 @@ ScDocument* ScContentTree::GetSourceDocument()
     return NULL;
 }
 
-void ScContentTree::Refresh( USHORT nType )
+void ScContentTree::Refresh( sal_uInt16 nType )
 {
     if ( bHiddenDoc && !pHiddenDocument )
         return;									// anderes Dokument angezeigt
@@ -631,7 +631,7 @@ void ScContentTree::Refresh( USHORT nType )
         if (!DrawNamesChanged(SC_CONTENT_DRAWING))
             return;
 
-    SetUpdateMode(FALSE);
+    SetUpdateMode(sal_False);
 
     ClearType( nType );
 
@@ -653,7 +653,7 @@ void ScContentTree::Refresh( USHORT nType )
         GetLinkNames();
 
     ApplySettings();
-    SetUpdateMode(TRUE);
+    SetUpdateMode(sal_True);
 }
 
 void ScContentTree::GetTableNames()
@@ -684,12 +684,12 @@ void ScContentTree::GetAreaNames()
         return;
 
     ScRangeName* pRangeNames = pDoc->GetRangeName();
-    USHORT nCount = pRangeNames->GetCount();
+    sal_uInt16 nCount = pRangeNames->GetCount();
     if ( nCount > 0 )
     {
-        USHORT nValidCount = 0;
+        sal_uInt16 nValidCount = 0;
         ScRange aDummy;
-        USHORT i;
+        sal_uInt16 i;
         for ( i=0; i<nCount; i++ )
         {
             ScRangeData* pData = (*pRangeNames)[i];
@@ -699,7 +699,7 @@ void ScContentTree::GetAreaNames()
         if ( nValidCount )
         {
             ScRangeData** ppSortArray = new ScRangeData* [ nValidCount ];
-            USHORT j;
+            sal_uInt16 j;
             for ( i=0, j=0; i<nCount; i++ )
             {
                 ScRangeData* pData = (*pRangeNames)[i];
@@ -730,11 +730,11 @@ void ScContentTree::GetDbNames()
         return;
 
     ScDBCollection*	pDbNames = pDoc->GetDBCollection();
-    USHORT nCount = pDbNames->GetCount();
+    sal_uInt16 nCount = pDbNames->GetCount();
     if ( nCount > 0 )
     {
         String aStrNoName( ScGlobal::GetRscString(STR_DB_NONAME) );
-        for ( USHORT i=0; i<nCount; i++ )
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
             ScDBData* pData = (*pDbNames)[i];
             String aStrName = pData->GetName();
@@ -744,7 +744,7 @@ void ScContentTree::GetDbNames()
     }
 }
 
-bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier )  // static
+bool ScContentTree::IsPartOfType( sal_uInt16 nContentType, sal_uInt16 nObjIdentifier )  // static
 {
     bool bRet = false;
     switch ( nContentType )
@@ -764,7 +764,7 @@ bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier )
     return bRet;
 }
 
-void ScContentTree::GetDrawNames( USHORT nType )
+void ScContentTree::GetDrawNames( sal_uInt16 nType )
 {
     if ( nRootType && nRootType != nType )				// ausgeblendet ?
         return;
@@ -832,8 +832,8 @@ void ScContentTree::GetLinkNames()
     sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
     DBG_ASSERT(pLinkManager, "kein LinkManager am Dokument?");
     const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-    USHORT nCount = rLinks.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = rLinks.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ::sfx2::SvBaseLink* pBase = *rLinks[i];
         if (pBase->ISA(ScAreaLink))
@@ -843,18 +843,18 @@ void ScContentTree::GetLinkNames()
     }
 }
 
-const ScAreaLink* ScContentTree::GetLink( ULONG nIndex )
+const ScAreaLink* ScContentTree::GetLink( sal_uLong nIndex )
 {
     ScDocument* pDoc = GetSourceDocument();
     if (!pDoc)
         return NULL;
 
-    ULONG nFound = 0;
+    sal_uLong nFound = 0;
     sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
     DBG_ASSERT(pLinkManager, "kein LinkManager am Dokument?");
     const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-    USHORT nCount = rLinks.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = rLinks.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ::sfx2::SvBaseLink* pBase = *rLinks[i];
         if (pBase->ISA(ScAreaLink))
@@ -897,13 +897,13 @@ void ScContentTree::GetNoteStrings()
     }
 }
 
-ScAddress ScContentTree::GetNotePos( ULONG nIndex )
+ScAddress ScContentTree::GetNotePos( sal_uLong nIndex )
 {
     ScDocument* pDoc = GetSourceDocument();
     if (!pDoc)
         return ScAddress();
 
-    ULONG nFound = 0;
+    sal_uLong nFound = 0;
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
     {
@@ -925,19 +925,19 @@ ScAddress ScContentTree::GetNotePos( ULONG nIndex )
     return ScAddress();
 }
 
-BOOL ScContentTree::NoteStringsChanged()
+sal_Bool ScContentTree::NoteStringsChanged()
 {
     ScDocument* pDoc = GetSourceDocument();
     if (!pDoc)
-        return FALSE;
+        return sal_False;
 
     SvLBoxEntry* pParent = pRootNodes[SC_CONTENT_NOTE];
     if (!pParent)
-        return FALSE;
+        return sal_False;
 
     SvLBoxEntry* pEntry = FirstChild( pParent );
 
-    BOOL bEqual = TRUE;
+    sal_Bool bEqual = sal_True;
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB nTab=0; nTab<nTabCount && bEqual; nTab++)
     {
@@ -948,11 +948,11 @@ BOOL ScContentTree::NoteStringsChanged()
             if( const ScPostIt* pNote = pCell->GetNote() )
             {
                 if ( !pEntry )
-                    bEqual = FALSE;
+                    bEqual = sal_False;
                 else
                 {
                     if ( lcl_NoteString( *pNote ) != GetEntryText(pEntry) )
-                        bEqual = FALSE;
+                        bEqual = sal_False;
 
                     pEntry = NextSibling( pEntry );
                 }
@@ -962,27 +962,27 @@ BOOL ScContentTree::NoteStringsChanged()
     }
 
     if ( pEntry )
-        bEqual = FALSE;				// kommt noch was
+        bEqual = sal_False;				// kommt noch was
 
     return !bEqual;
 }
 
-BOOL ScContentTree::DrawNamesChanged( USHORT nType )
+sal_Bool ScContentTree::DrawNamesChanged( sal_uInt16 nType )
 {
     ScDocument* pDoc = GetSourceDocument();
     if (!pDoc)
-        return FALSE;
+        return sal_False;
 
     SvLBoxEntry* pParent = pRootNodes[nType];
     if (!pParent)
-        return FALSE;
+        return sal_False;
 
     SvLBoxEntry* pEntry = FirstChild( pParent );
 
     // iterate in flat mode for groups
     SdrIterMode eIter = ( nType == SC_CONTENT_DRAWING ) ? IM_FLAT : IM_DEEPNOGROUPS;
 
-    BOOL bEqual = TRUE;
+    sal_Bool bEqual = sal_True;
     ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
     SfxObjectShell* pShell = pDoc->GetDocumentShell();
     if (pDrawLayer && pShell)
@@ -1001,11 +1001,11 @@ BOOL ScContentTree::DrawNamesChanged( USHORT nType )
                     if ( IsPartOfType( nType, pObject->GetObjIdentifier() ) )
                     {
                         if ( !pEntry )
-                            bEqual = FALSE;
+                            bEqual = sal_False;
                         else
                         {
                             if ( ScDrawLayer::GetVisibleName( pObject ) != GetEntryText(pEntry) )
-                                bEqual = FALSE;
+                                bEqual = sal_False;
 
                             pEntry = NextSibling( pEntry );
                         }
@@ -1017,15 +1017,15 @@ BOOL ScContentTree::DrawNamesChanged( USHORT nType )
     }
 
     if ( pEntry )
-        bEqual = FALSE;				// kommt noch was
+        bEqual = sal_False;				// kommt noch was
 
     return !bEqual;
 }
 
-BOOL lcl_GetRange( ScDocument* pDoc, USHORT nType, const String& rName, ScRange& rRange )
+sal_Bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rName, ScRange& rRange )
 {
-    BOOL bFound = FALSE;
-    USHORT nPos;
+    sal_Bool bFound = sal_False;
+    sal_uInt16 nPos;
 
     if ( nType == SC_CONTENT_RANGENAME )
     {
@@ -1033,7 +1033,7 @@ BOOL lcl_GetRange( ScDocument* pDoc, USHORT nType, const String& rName, ScRange&
         if (pList)
             if (pList->SearchName( rName, nPos ))
                 if ( (*pList)[nPos]->IsValidReference( rRange ) )
-                    bFound = TRUE;
+                    bFound = sal_True;
     }
     else if ( nType == SC_CONTENT_DBAREA )
     {
@@ -1046,22 +1046,22 @@ BOOL lcl_GetRange( ScDocument* pDoc, USHORT nType, const String& rName, ScRange&
                 SCROW nRow1, nRow2;
                 (*pList)[nPos]->GetArea(nTab,nCol1,nRow1,nCol2,nRow2);
                 rRange = ScRange( nCol1,nRow1,nTab, nCol2,nRow2,nTab );
-                bFound = TRUE;
+                bFound = sal_True;
             }
     }
 
     return bFound;
 }
 
-void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, USHORT nType, Window* pWin )
+void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, sal_uInt16 nType, Window* pWin )
 {
     ScDocument* pSrcDoc = pSrcShell->GetDocument();
     ScDrawLayer* pModel = pSrcDoc->GetDrawLayer();
     if (pModel)
     {
-        BOOL bOle = ( nType == SC_CONTENT_OLEOBJECT );
-        BOOL bGraf = ( nType == SC_CONTENT_GRAPHIC );
-        USHORT nDrawId = sal::static_int_cast<USHORT>( bOle ? OBJ_OLE2 : ( bGraf ? OBJ_GRAF : OBJ_GRUP ) );
+        sal_Bool bOle = ( nType == SC_CONTENT_OLEOBJECT );
+        sal_Bool bGraf = ( nType == SC_CONTENT_GRAPHIC );
+        sal_uInt16 nDrawId = sal::static_int_cast<sal_uInt16>( bOle ? OBJ_OLE2 : ( bGraf ? OBJ_GRAF : OBJ_GRUP ) );
         SCTAB nTab = 0;
         SdrObject* pObject = pModel->GetNamedObject( rName, nDrawId, nTab );
         if (pObject)
@@ -1091,10 +1091,10 @@ void lcl_DoDragObject( ScDocShell* pSrcShell, const String& rName, USHORT nType,
     }
 }
 
-void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, USHORT nFlags, Window* pWin )
+void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, sal_uInt16 nFlags, Window* pWin )
 {
     ScMarkData aMark;
-    aMark.SelectTable( rRange.aStart.Tab(), TRUE );
+    aMark.SelectTable( rRange.aStart.Tab(), sal_True );
     aMark.SetMarkArea( rRange );
 
     ScDocument* pSrcDoc = pSrcShell->GetDocument();
@@ -1105,7 +1105,7 @@ void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, USHORT nFlag
         ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
         ScClipParam aClipParam(rRange, false);
         pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aMark);
-        // pClipDoc->ExtendMerge( rRange, TRUE );
+        // pClipDoc->ExtendMerge( rRange, sal_True );
 
         TransferableObjectDescriptor aObjDesc;
         pSrcShell->FillTransferableObjectDescriptor( aObjDesc );
@@ -1127,12 +1127,12 @@ void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, USHORT nFlag
 void ScContentTree::DoDrag()
 {
     ScDocumentLoader* pDocLoader = NULL;
-    bIsInDrag = TRUE;
+    bIsInDrag = sal_True;
 
     ScModule* pScMod = SC_MOD();
 
-    USHORT nType;
-    ULONG nChild;
+    sal_uInt16 nType;
+    sal_uLong nChild;
     SvLBoxEntry* pEntry = GetCurEntry();
     GetEntryIndexes( nType, nChild, pEntry );
 
@@ -1160,11 +1160,11 @@ void ScContentTree::DoDrag()
             }
         }
 
-        BOOL bDoLinkTrans = FALSE;		// use ScLinkTransferObj
+        sal_Bool bDoLinkTrans = sal_False;		// use ScLinkTransferObj
         String aLinkURL;				// for ScLinkTransferObj
         String aLinkText;
 
-        USHORT nDropMode = pParentWindow->GetDropMode();
+        sal_uInt16 nDropMode = pParentWindow->GetDropMode();
         switch ( nDropMode )
         {
             case SC_DROPMODE_URL:
@@ -1183,7 +1183,7 @@ void ScContentTree::DoDrag()
                         aLinkURL = aUrl;
                         aLinkText = aText;
                     }
-                    bDoLinkTrans = TRUE;
+                    bDoLinkTrans = sal_True;
                 }
                 break;
             case SC_DROPMODE_LINK:
@@ -1196,12 +1196,12 @@ void ScContentTree::DoDrag()
                         {
                             case SC_CONTENT_TABLE:
                                 pScMod->SetDragLink( aDocName, aText, EMPTY_STRING );
-                                bDoLinkTrans = TRUE;
+                                bDoLinkTrans = sal_True;
                                 break;
                             case SC_CONTENT_RANGENAME:
                             case SC_CONTENT_DBAREA:
                                 pScMod->SetDragLink( aDocName, EMPTY_STRING, aText );
-                                bDoLinkTrans = TRUE;
+                                bDoLinkTrans = sal_True;
                                 break;
 
                             // other types cannot be linked
@@ -1270,7 +1270,7 @@ void ScContentTree::DoDrag()
         }
     }
 
-    bIsInDrag = FALSE;				// static Member
+    bIsInDrag = sal_False;				// static Member
 
     delete pDocLoader;				// falls Dokument zum Draggen geladen wurde
 }
@@ -1295,19 +1295,19 @@ IMPL_STATIC_LINK(ScContentTree, ExecDragHdl, void*, EMPTYARG)
 //UNUSED2008-05      pParentWindow->SetText(aTitle);
 //UNUSED2008-05  }
 
-BOOL ScContentTree::LoadFile( const String& rUrl )
+sal_Bool ScContentTree::LoadFile( const String& rUrl )
 {
     String aDocName = rUrl;
     xub_StrLen nPos = aDocName.Search('#');
     if ( nPos != STRING_NOTFOUND )
         aDocName.Erase(nPos);			// nur der Name, ohne #...
 
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
     String aFilter, aOptions;
     ScDocumentLoader aLoader( aDocName, aFilter, aOptions );
     if ( !aLoader.IsError() )
     {
-        bHiddenDoc = TRUE;
+        bHiddenDoc = sal_True;
         aHiddenName = aDocName;
         aHiddenTitle = aLoader.GetTitle();
         pHiddenDocument = aLoader.GetDocument();
@@ -1327,7 +1327,7 @@ BOOL ScContentTree::LoadFile( const String& rUrl )
     return bReturn;
 }
 
-void ScContentTree::InitWindowBits( BOOL bButtons )
+void ScContentTree::InitWindowBits( sal_Bool bButtons )
 {
     WinBits nFlags = GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL;
     if (bButtons)
@@ -1336,7 +1336,7 @@ void ScContentTree::InitWindowBits( BOOL bButtons )
     SetStyle( nFlags );
 }
 
-void ScContentTree::SetRootType( USHORT nNew )
+void ScContentTree::SetRootType( sal_uInt16 nNew )
 {
     if ( nNew != nRootType )
     {
@@ -1351,14 +1351,14 @@ void ScContentTree::SetRootType( USHORT nNew )
 
 void ScContentTree::ToggleRoot()		// nach Selektion
 {
-    USHORT nNew = SC_CONTENT_ROOT;
+    sal_uInt16 nNew = SC_CONTENT_ROOT;
     if ( nRootType == SC_CONTENT_ROOT )
     {
         SvLBoxEntry* pEntry = GetCurEntry();
         if (pEntry)
         {
             SvLBoxEntry* pParent = GetParent(pEntry);
-            for (USHORT i=1; i<SC_CONTENT_COUNT; i++)
+            for (sal_uInt16 i=1; i<SC_CONTENT_COUNT; i++)
                 if ( pEntry == pRootNodes[i] || pParent == pRootNodes[i] )
                     nNew = i;
         }
@@ -1370,7 +1370,7 @@ void ScContentTree::ToggleRoot()		// nach Selektion
 void ScContentTree::ResetManualDoc()
 {
     aManualDoc.Erase();
-    bHiddenDoc = FALSE;
+    bHiddenDoc = sal_False;
 
     ActiveDocChanged();
 }
@@ -1435,7 +1435,7 @@ void ScContentTree::SelectDoc(const String& rName)		// rName wie im Menue/Listbo
 
     //
 
-    BOOL bLoaded = FALSE;
+    sal_Bool bLoaded = sal_False;
 
         // ist es ein normal geladenes Doc ?
 
@@ -1444,13 +1444,13 @@ void ScContentTree::SelectDoc(const String& rName)		// rName wie im Menue/Listbo
     {
         if ( pSh->ISA(ScDocShell) )
             if ( pSh->GetTitle() == aRealName )
-                bLoaded = TRUE;
+                bLoaded = sal_True;
         pSh = SfxObjectShell::GetNext( *pSh );
     }
 
     if (bLoaded)
     {
-        bHiddenDoc = FALSE;
+        bHiddenDoc = sal_False;
         SetManualDoc(aRealName);
     }
     else if (aHiddenTitle.Len())				// verstecktes ausgewaehlt
@@ -1469,15 +1469,15 @@ void ScContentTree::ApplySettings()
     const ScNavigatorSettings* pSettings = pParentWindow->GetNavigatorSettings();
     if( pSettings )
     {
-        USHORT nRootSel = pSettings->GetRootSelected();
-        ULONG nChildSel = pSettings->GetChildSelected();
+        sal_uInt16 nRootSel = pSettings->GetRootSelected();
+        sal_uLong nChildSel = pSettings->GetChildSelected();
 
-        for( USHORT nEntry = 1; nEntry < SC_CONTENT_COUNT; ++nEntry )
+        for( sal_uInt16 nEntry = 1; nEntry < SC_CONTENT_COUNT; ++nEntry )
         {
             if( pRootNodes[ nEntry ] )
             {
                 // expand
-                BOOL bExp = pSettings->IsExpanded( nEntry );
+                sal_Bool bExp = pSettings->IsExpanded( nEntry );
                 if( bExp != IsExpanded( pRootNodes[ nEntry ] ) )
                 {
                     if( bExp )
@@ -1504,13 +1504,13 @@ void ScContentTree::StoreSettings() const
     ScNavigatorSettings* pSettings = pParentWindow->GetNavigatorSettings();
     if( pSettings )
     {
-        for( USHORT nEntry = 1; nEntry < SC_CONTENT_COUNT; ++nEntry )
+        for( sal_uInt16 nEntry = 1; nEntry < SC_CONTENT_COUNT; ++nEntry )
         {
-            BOOL bExp = pRootNodes[ nEntry ] && IsExpanded( pRootNodes[ nEntry ] );
+            sal_Bool bExp = pRootNodes[ nEntry ] && IsExpanded( pRootNodes[ nEntry ] );
             pSettings->SetExpanded( nEntry, bExp );
         }
-        USHORT nRoot;
-        ULONG nChild;
+        sal_uInt16 nRoot;
+        sal_uLong nChild;
         GetEntryIndexes( nRoot, nChild, GetCurEntry() );
         pSettings->SetRootSelected( nRoot );
         pSettings->SetChildSelected( nChild );
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index 280538011..6d6e6ed68 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -45,7 +45,7 @@
 
 //------------------------------------------------------------------------
 
-ScNavigatorControllerItem::ScNavigatorControllerItem( USHORT          nIdP,
+ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16          nIdP,
                                                       ScNavigatorDlg& rDlg,
                                                       SfxBindings&	  rBindings )
     :   SfxControllerItem   ( nIdP, rBindings ),
@@ -55,7 +55,7 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( USHORT          nIdP,
 
 //------------------------------------------------------------------------
 
-void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxItemState /* eState */,
+void __EXPORT ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemState /* eState */,
                                                           const SfxPoolItem* pItem )
 {
     switch( GetId() )
@@ -77,8 +77,8 @@ void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxIte
                     SCCOL nCol = aScAddress.Col()+1;
                     SCROW nRow = aScAddress.Row()+1;
 
-//					SCCOL nCol = (USHORT)pCellPosItem->GetValue().X()+1;
-//					SCROW nRow = (USHORT)pCellPosItem->GetValue().Y()+1;
+//					SCCOL nCol = (sal_uInt16)pCellPosItem->GetValue().X()+1;
+//					SCROW nRow = (sal_uInt16)pCellPosItem->GetValue().Y()+1;
 
                     rNavigatorDlg.UpdateColumn( &nCol );
                     rNavigatorDlg.UpdateRow   ( &nRow );
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index d01ee0375..f07851ee0 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -115,7 +115,7 @@ long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt )
 {
     long nHandled = SpinField::Notify( rNEvt );
 
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( nType == EVENT_KEYINPUT )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -397,8 +397,8 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId )
     SetSizePixel( CalcWindowSizePixel() );
     SetDropdownClickHdl( LINK(this, CommandToolBox, ToolBoxDropdownClickHdl) );
     SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY );
-//	EnableItem( IID_UP, FALSE );
-//	EnableItem( IID_DOWN, FALSE );
+//	EnableItem( IID_UP, sal_False );
+//	EnableItem( IID_DOWN, sal_False );
 }
 
 //------------------------------------------------------------------------
@@ -409,7 +409,7 @@ __EXPORT CommandToolBox::~CommandToolBox()
 
 //------------------------------------------------------------------------
 
-void CommandToolBox::Select( USHORT nSelId )
+void CommandToolBox::Select( sal_uInt16 nSelId )
 {
     //	Modus umschalten ?
 
@@ -478,7 +478,7 @@ IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG )
         ScPopupMenu aPop( ScResId( RID_POPUP_DROPMODE ) );
         aPop.CheckItem( RID_DROPMODE_URL + rDlg.GetDropMode() );
         aPop.Execute( this, GetItemRect(IID_DROPMODE), POPUPMENU_EXECUTE_DOWN );
-        USHORT nId = aPop.GetSelected();
+        sal_uInt16 nId = aPop.GetSelected();
 
         EndSelection();		// vor SetDropMode (SetDropMode ruft SetItemImage)
 
@@ -505,19 +505,19 @@ void CommandToolBox::UpdateButtons()
     //	Umschalten-Button:
     if ( eMode == NAV_LMODE_SCENARIOS || eMode == NAV_LMODE_NONE )
     {
-        EnableItem( IID_CHANGEROOT,	FALSE );
-        CheckItem( IID_CHANGEROOT, FALSE );
+        EnableItem( IID_CHANGEROOT,	sal_False );
+        CheckItem( IID_CHANGEROOT, sal_False );
     }
     else
     {
-        EnableItem( IID_CHANGEROOT,	TRUE );
-        BOOL bRootSet = rDlg.aLbEntries.GetRootType() != SC_CONTENT_ROOT;
+        EnableItem( IID_CHANGEROOT,	sal_True );
+        sal_Bool bRootSet = rDlg.aLbEntries.GetRootType() != SC_CONTENT_ROOT;
         CheckItem( IID_CHANGEROOT, bRootSet );
     }
 
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
 
-    USHORT nImageId = 0;
+    sal_uInt16 nImageId = 0;
     switch ( rDlg.nDropMode )
     {
         case SC_DROPMODE_URL:	nImageId = bHC ? RID_IMG_H_DROP_URL  : RID_IMG_DROP_URL;  break;
@@ -529,14 +529,14 @@ void CommandToolBox::UpdateButtons()
 
 void CommandToolBox::InitImageList()
 {
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+    sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
 
     ImageList& rImgLst = bHC ? rDlg.aCmdImageListH : rDlg.aCmdImageList;
 
-    USHORT nCount = GetItemCount();
-    for (USHORT i = 0; i < nCount; i++)
+    sal_uInt16 nCount = GetItemCount();
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
-        USHORT nId = GetItemId(i);
+        sal_uInt16 nId = GetItemId(i);
         SetItemImage( nId, rImgLst.GetImage( nId ) );
     }
 }
@@ -559,7 +559,7 @@ void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt )
 //==================================================================
 
 ScNavigatorSettings::ScNavigatorSettings() :
-    maExpandedVec( SC_CONTENT_COUNT, FALSE ),
+    maExpandedVec( SC_CONTENT_COUNT, sal_False ),
     mnRootSelected( SC_CONTENT_ROOT ),
     mnChildSelected( SC_CONTENT_NOCHILD )
 {
@@ -575,7 +575,7 @@ SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR )
 
 ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
                                     Window*			 pParent,
-                                    USHORT			 nId,
+                                    sal_uInt16			 nId,
                                     SfxBindings*	 pBind,
                                     SfxChildWinInfo* /* pInfo */ ) :
         SfxChildWindowContext( nId )
@@ -597,7 +597,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
     //	deshalb muessen in Abhaengigkeit von der momentanen Groesse die
     //	Inhalte eingeblendet werden oder nicht
 
-    BOOL bSmall = ( aInfoSize.Height() <= pNavigator->aInitSize.Height() + SCNAV_MINTOL );
+    sal_Bool bSmall = ( aInfoSize.Height() <= pNavigator->aInitSize.Height() + SCNAV_MINTOL );
     NavListMode eNavMode = NAV_LMODE_NONE;
     if (!bSmall)
     {
@@ -611,12 +611,12 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
             eNavMode = NAV_LMODE_AREAS;
     }
 
-    //	Die Groesse des Floats nicht neu setzen (FALSE bei SetListMode), damit der
+    //	Die Groesse des Floats nicht neu setzen (sal_False bei SetListMode), damit der
     //	Navigator nicht aufgeklappt wird, wenn er minimiert war (#38872#).
 
-    pNavigator->SetListMode( eNavMode, FALSE );		// FALSE: Groesse des Float nicht setzen
+    pNavigator->SetListMode( eNavMode, sal_False );		// FALSE: Groesse des Float nicht setzen
 
-    USHORT nCmdId;
+    sal_uInt16 nCmdId;
     switch (eNavMode)
     {
         case NAV_LMODE_DOCS:		nCmdId = IID_DOCS; 		break;
@@ -682,7 +682,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
         nCurCol		( 0 ),
         nCurRow		( 0 ),
         nCurTab		( 0 ),
-        bFirstBig	( FALSE )
+        bFirstBig	( sal_False )
 {
     ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg();
     nDropMode = rCfg.GetDragMode();
@@ -738,7 +738,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
 
     aLbDocuments.Hide();		// bei NAV_LMODE_NONE gibts die nicht
 
-    aLbEntries.InitWindowBits(TRUE);
+    aLbEntries.InitWindowBits(sal_True);
 
     aLbEntries.SetSpaceBetweenEntries(0);
     aLbEntries.SetSelectionMode( SINGLE_SELECTION );
@@ -747,7 +747,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
                                     SV_DRAGDROP_ENABLE_TOP );
 
     //	war eine Kategorie als Root ausgewaehlt?
-    USHORT nLastRoot = rCfg.GetRootType();
+    sal_uInt16 nLastRoot = rCfg.GetRootType();
     if ( nLastRoot )
         aLbEntries.SetRootType( nLastRoot );
 
@@ -775,7 +775,7 @@ __EXPORT ScNavigatorDlg::~ScNavigatorDlg()
 {
     aContentTimer.Stop();
 
-    USHORT i;
+    sal_uInt16 i;
     for ( i=0; i<CTRL_ITEMS; i++ )
         delete ppBoundItems[i];
 
@@ -853,18 +853,18 @@ void ScNavigatorDlg::DoResize()
     //	#41403# bei angedocktem Navigator wird das Fenster evtl. erst klein erzeugt,
     //	dann kommt ein Resize auf die wirkliche Groesse -> dann Inhalte einschalten
 
-    BOOL bSmall = ( nTotalHeight <= aInitSize.Height() + SCNAV_MINTOL );
+    sal_Bool bSmall = ( nTotalHeight <= aInitSize.Height() + SCNAV_MINTOL );
     if ( !bSmall && bFirstBig )
     {
         //	Inhalte laut Config wieder einschalten
 
-        bFirstBig = FALSE;
+        bFirstBig = sal_False;
         NavListMode eNavMode = NAV_LMODE_AREAS;
         ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg();
         NavListMode eLastMode = (NavListMode) rCfg.GetListMode();
         if ( eLastMode == NAV_LMODE_SCENARIOS )
             eNavMode = NAV_LMODE_SCENARIOS;
-        SetListMode( eNavMode, FALSE );			// FALSE: Groesse des Float nicht setzen
+        SetListMode( eNavMode, sal_False );			// FALSE: Groesse des Float nicht setzen
     }
 
     //	auch wenn die Inhalte nicht sichtbar sind, die Groessen anpassen,
@@ -896,7 +896,7 @@ void ScNavigatorDlg::DoResize()
 
     //@@ 03.11.97 end
 
-    BOOL bListMode = (eListMode != NAV_LMODE_NONE);
+    sal_Bool bListMode = (eListMode != NAV_LMODE_NONE);
     FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
     if ( pFloat && bListMode )
         nListModeHeight = nTotalHeight;
@@ -908,7 +908,7 @@ void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.ISA(SfxSimpleHint) )
     {
-        ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
+        sal_uLong nHintId = ((SfxSimpleHint&)rHint).GetId();
 
         if ( nHintId == SC_HINT_DOCNAME_CHANGED )
         {
@@ -962,7 +962,7 @@ void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
     else if ( rHint.ISA(SfxEventHint) )
     {
-        ULONG nEventId = ((SfxEventHint&)rHint).GetEventId();
+        sal_uLong nEventId = ((SfxEventHint&)rHint).GetEventId();
         if ( nEventId == SFX_EVENT_ACTIVATEDOC )
         {
             aLbEntries.ActiveDocChanged();
@@ -984,7 +984,7 @@ IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer )
 
 //------------------------------------------------------------------------
 
-void ScNavigatorDlg::SetDropMode(USHORT nNew)
+void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew)
 {
     nDropMode = nNew;
     aTbxCmd.UpdateButtons();
@@ -1017,7 +1017,7 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
         String	aAddr;
         aScAddress.Format( aAddr, SCA_ABS );
 
-        BOOL bUnmark = FALSE;
+        sal_Bool bUnmark = sal_False;
         if ( GetViewData() )
             bUnmark = !pViewData->GetMarkData().IsCellMarked( nColNo, nRowNo );
 
@@ -1117,7 +1117,7 @@ ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings()
 
 //------------------------------------------------------------------------
 
-BOOL ScNavigatorDlg::GetViewData()
+sal_Bool ScNavigatorDlg::GetViewData()
 {
     ScTabViewShell* pViewSh = GetTabViewShell();
     pViewData = pViewSh ? pViewSh->GetViewData() : NULL;
@@ -1189,30 +1189,30 @@ void ScNavigatorDlg::UpdateAll()
 
 //------------------------------------------------------------------------
 
-void ScNavigatorDlg::SetListMode( NavListMode eMode, BOOL bSetSize )
+void ScNavigatorDlg::SetListMode( NavListMode eMode, sal_Bool bSetSize )
 {
     if ( eMode != eListMode )
     {
         if ( eMode != NAV_LMODE_NONE )
-            bFirstBig = FALSE;				// nicht mehr automatisch umschalten
+            bFirstBig = sal_False;				// nicht mehr automatisch umschalten
 
         eListMode = eMode;
 
         switch ( eMode )
         {
             case NAV_LMODE_NONE:
-                ShowList( FALSE, bSetSize );
+                ShowList( sal_False, bSetSize );
                 break;
 
             case NAV_LMODE_AREAS:
             case NAV_LMODE_DBAREAS:
             case NAV_LMODE_DOCS:
                 aLbEntries.Refresh();
-                ShowList( TRUE, bSetSize );
+                ShowList( sal_True, bSetSize );
                 break;
 
             case NAV_LMODE_SCENARIOS:
-                ShowScenarios( TRUE, bSetSize );
+                ShowScenarios( sal_True, bSetSize );
                 break;
         }
 
@@ -1221,7 +1221,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, BOOL bSetSize )
         if ( eMode != NAV_LMODE_NONE )
         {
             ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg();
-            rCfg.SetListMode( (USHORT) eMode );
+            rCfg.SetListMode( (sal_uInt16) eMode );
         }
     }
 
@@ -1231,7 +1231,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, BOOL bSetSize )
 
 //------------------------------------------------------------------------
 
-void ScNavigatorDlg::ShowList( BOOL bShow, BOOL bSetSize )
+void ScNavigatorDlg::ShowList( sal_Bool bShow, sal_Bool bSetSize )
 {
     FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
     Size aSize = GetParent()->GetOutputSizePixel();
@@ -1276,7 +1276,7 @@ void ScNavigatorDlg::ShowList( BOOL bShow, BOOL bSetSize )
 
 //------------------------------------------------------------------------
 
-void ScNavigatorDlg::ShowScenarios( BOOL bShow, BOOL bSetSize )
+void ScNavigatorDlg::ShowScenarios( sal_Bool bShow, sal_Bool bSetSize )
 {
     FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
     Size aSize = GetParent()->GetOutputSizePixel();
@@ -1332,7 +1332,7 @@ void ScNavigatorDlg::ShowScenarios( BOOL bShow, BOOL bSetSize )
 void ScNavigatorDlg::GetDocNames( const String* pManualSel )
 {
     aLbDocuments.Clear();
-    aLbDocuments.SetUpdateMode( FALSE );
+    aLbDocuments.SetUpdateMode( sal_False );
 
     ScDocShell* pCurrentSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
 
@@ -1371,7 +1371,7 @@ void ScNavigatorDlg::GetDocNames( const String* pManualSel )
             aSelEntry = aEntry;
     }
 
-    aLbDocuments.SetUpdateMode( TRUE );
+    aLbDocuments.SetUpdateMode( sal_True );
 
     aLbDocuments.SelectEntry( aSelEntry );
 }
@@ -1512,9 +1512,9 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment(
 //------------------------------------------------------------------------
 
 #if 0
-BOOL __EXPORT ScNavigatorDlg::Drop( const DropEvent& rEvt )
+sal_Bool __EXPORT ScNavigatorDlg::Drop( const DropEvent& rEvt )
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( !aLbEntries.IsInDrag() )		// kein Verschieben innerhalb der TreeListBox
     {
@@ -1522,7 +1522,7 @@ BOOL __EXPORT ScNavigatorDlg::Drop( const DropEvent& rEvt )
 
         SvScDataObjectRef pObject = SvScDataObject::PasteDragServer(rEvt);
 
-        ULONG nFormat = INetBookmark::HasFormat(*pObject);
+        sal_uLong nFormat = INetBookmark::HasFormat(*pObject);
         INetBookmark aBookmark;
         if (aBookmark.Paste(*pObject,nFormat))
             aFileName = aBookmark.GetURL();
@@ -1530,8 +1530,8 @@ BOOL __EXPORT ScNavigatorDlg::Drop( const DropEvent& rEvt )
         {
             //	FORMAT_FILE direkt aus DragServer
 
-            USHORT nCount = DragServer::GetItemCount();
-            for ( USHORT i = 0; i < nCount && !aFileName.Len(); ++i )
+            sal_uInt16 nCount = DragServer::GetItemCount();
+            for ( sal_uInt16 i = 0; i < nCount && !aFileName.Len(); ++i )
                 if (DragServer::HasFormat( i, FORMAT_FILE ))
                     aFileName = DragServer::PasteFile( i );
         }
@@ -1542,9 +1542,9 @@ BOOL __EXPORT ScNavigatorDlg::Drop( const DropEvent& rEvt )
     return bReturn;
 }
 
-BOOL __EXPORT ScNavigatorDlg::QueryDrop( DropEvent& rEvt )
+sal_Bool __EXPORT ScNavigatorDlg::QueryDrop( DropEvent& rEvt )
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( !aLbEntries.IsInDrag() )		// kein Verschieben innerhalb der TreeListBox
     {
@@ -1553,7 +1553,7 @@ BOOL __EXPORT ScNavigatorDlg::QueryDrop( DropEvent& rEvt )
             || INetBookmark::HasFormat(*pObject) )
         {
             rEvt.SetAction(DROP_COPY);		// Kopier-Cursor anzeigen
-            bReturn = TRUE;
+            bReturn = sal_True;
         }
     }
 
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index bb496059a..283e646bd 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -54,7 +54,7 @@ ScScenarioListBox::ScScenarioListBox( ScScenarioWindow& rParent ) :
     mrParent( rParent )
 {
     Font aFont( GetFont() );
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     aFont.SetWeight( WEIGHT_LIGHT );
     SetFont( aFont );
 }
@@ -87,7 +87,7 @@ void ScScenarioListBox::UpdateEntries( List* pNewEntryList )
         {
             // sheet contains scenarios
             DBG_ASSERT( pNewEntryList->Count() % 3 == 0, "ScScenarioListBox::UpdateEntries - wrong list size" );
-            SetUpdateMode( FALSE );
+            SetUpdateMode( sal_False );
             String* pEntry = static_cast< String* >( pNewEntryList->First() );
             while( pEntry )
             {
@@ -106,7 +106,7 @@ void ScScenarioListBox::UpdateEntries( List* pNewEntryList )
                 InsertEntry( aEntry.maName, LISTBOX_APPEND );
                 pEntry = static_cast< String* >( pNewEntryList->Next() );
             }
-            SetUpdateMode( TRUE );
+            SetUpdateMode( sal_True );
             SetNoSelection();
             mrParent.SetComment( EMPTY_STRING );
         }
@@ -181,7 +181,7 @@ const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() co
     return (nPos < maEntries.size()) ? &maEntries[ nPos ] : 0;
 }
 
-void ScScenarioListBox::ExecuteScenarioSlot( USHORT nSlotId )
+void ScScenarioListBox::ExecuteScenarioSlot( sal_uInt16 nSlotId )
 {
     if( SfxViewFrame* pViewFrm = SfxViewFrame::Current() )
     {
@@ -220,7 +220,7 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent,const String& aQH_List,
         aEdComment  ( this,  WB_BORDER | WB_LEFT | WB_READONLY | WB_VSCROLL | WB_TABSTOP )
 {
     Font aFont( GetFont() );
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     aFont.SetWeight( WEIGHT_LIGHT );
     aEdComment.SetFont( aFont );
     aEdComment.SetMaxTextLen( 512 );
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 1147bd43f..f632d5a2d 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -101,12 +101,12 @@ SfxTabPage*	__EXPORT ScRedlineOptionsTabPage::Create( Window* pParent, const Sfx
     Beschreibung:
  -----------------------------------------------------------------------*/
 
-BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
+sal_Bool __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
 {
     ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
 
-    ULONG nNew=0;
-    USHORT nPos=0;
+    sal_uLong nNew=0;
+    sal_uInt16 nPos=0;
 
     nPos = aContentColorLB.GetSelectEntryPos();
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -165,7 +165,7 @@ BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
     if (pDocSh)
         pDocSh->PostPaintGridAll();
 
-    return FALSE;
+    return sal_False;
 }
 
 /*-----------------------------------------------------------------------
@@ -181,12 +181,12 @@ void __EXPORT ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
     aInsertColorLB.InsertEntry(aAuthorStr);
     aRemoveColorLB.InsertEntry(aAuthorStr);
 
-    aContentColorLB.SetUpdateMode( FALSE);
-    aMoveColorLB.SetUpdateMode( FALSE);
-    aInsertColorLB.SetUpdateMode( FALSE);
-    aRemoveColorLB.SetUpdateMode( FALSE);
+    aContentColorLB.SetUpdateMode( sal_False);
+    aMoveColorLB.SetUpdateMode( sal_False);
+    aInsertColorLB.SetUpdateMode( sal_False);
+    aRemoveColorLB.SetUpdateMode( sal_False);
 
-    for( USHORT i = 0; i < pColorTbl->Count(); ++i )
+    for( sal_uInt16 i = 0; i < pColorTbl->Count(); ++i )
     {
         XColorEntry* pEntry = pColorTbl->GetColor( i );
         Color aColor = pEntry->GetColor();
@@ -197,15 +197,15 @@ void __EXPORT ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
         aInsertColorLB.InsertEntry( aColor, sName );
         aRemoveColorLB.InsertEntry( aColor, sName );
     }
-    aContentColorLB.SetUpdateMode( TRUE );
-    aMoveColorLB.SetUpdateMode( TRUE );
-    aInsertColorLB.SetUpdateMode( TRUE );
-    aRemoveColorLB.SetUpdateMode( TRUE );
+    aContentColorLB.SetUpdateMode( sal_True );
+    aMoveColorLB.SetUpdateMode( sal_True );
+    aInsertColorLB.SetUpdateMode( sal_True );
+    aRemoveColorLB.SetUpdateMode( sal_True );
 
 
     ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
 
-    ULONG nColor = aAppOptions.GetTrackContentColor();
+    sal_uLong nColor = aAppOptions.GetTrackContentColor();
     if (nColor == COL_TRANSPARENT)
         aContentColorLB.SelectEntryPos(0);
     else
@@ -252,7 +252,7 @@ IMPL_LINK( ScRedlineOptionsTabPage, ColorHdl, ColorListBox *, EMPTYARG )
     }
 
     SvxFont& rFont = pPrev->GetFont();
-    USHORT nPos = pLB->GetSelectEntryPos();
+    sal_uInt16 nPos = pLB->GetSelectEntryPos();
     if (nPos == LISTBOX_ENTRY_NOTFOUND)
         nPos = 0;
 
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index a82900205..16a614d5d 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -55,7 +55,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-static USHORT pCalcOptRanges[] =
+static sal_uInt16 pCalcOptRanges[] =
 {
     SID_SCDOCOPTIONS,
     SID_SCDOCOPTIONS,
@@ -125,7 +125,7 @@ void ScTpCalcOptions::Init()
 
 //-----------------------------------------------------------------------
 
-USHORT* __EXPORT ScTpCalcOptions::GetRanges()
+sal_uInt16* __EXPORT ScTpCalcOptions::GetRanges()
 {
     return pCalcOptRanges;
 }
@@ -141,7 +141,7 @@ SfxTabPage* __EXPORT ScTpCalcOptions::Create( Window* pParent, const SfxItemSet&
 
 void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
 {
-    USHORT	d,m,y;
+    sal_uInt16	d,m,y;
 
     *pLocalOptions	= *pOldOptions;
 
@@ -190,10 +190,10 @@ void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
 
 //-----------------------------------------------------------------------
 
-BOOL __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
 {
     // alle weiteren Optionen werden in den Handlern aktualisiert
-    pLocalOptions->SetIterCount( (USHORT)aEdSteps.GetValue() );
+    pLocalOptions->SetIterCount( (sal_uInt16)aEdSteps.GetValue() );
     pLocalOptions->SetIgnoreCase( !aBtnCase.IsChecked() );
     pLocalOptions->SetCalcAsShown( aBtnCalc.IsChecked() );
     pLocalOptions->SetMatchWholeCell( aBtnMatch.IsChecked() );
@@ -209,10 +209,10 @@ BOOL __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
     if ( *pLocalOptions != *pOldOptions )
     {
         rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) );
-        return TRUE;
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -285,13 +285,13 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn )
     {
         if ( pBtn->IsChecked() )
         {
-            pLocalOptions->SetIter( TRUE );
+            pLocalOptions->SetIter( sal_True );
             aFtSteps.Enable();	aEdSteps.Enable();
             aFtEps	.Enable();	aEdEps	.Enable();
         }
         else
         {
-            pLocalOptions->SetIter( FALSE );
+            pLocalOptions->SetIter( sal_False );
             aFtSteps.Disable(); aEdSteps.Disable();
             aFtEps	.Disable(); aEdEps	.Disable();
         }
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index d0b317d96..b155466a7 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -41,7 +41,7 @@
 
 // -----------------------------------------------------------------------
 
-static USHORT pPrintOptRanges[] =
+static sal_uInt16 pPrintOptRanges[] =
 {
     SID_SCPRINTOPTIONS,
     SID_SCPRINTOPTIONS,
@@ -67,7 +67,7 @@ ScTpPrintOptions::~ScTpPrintOptions()
 {
 }
 
-USHORT* ScTpPrintOptions::GetRanges()
+sal_uInt16* ScTpPrintOptions::GetRanges()
 {
     return pPrintOptRanges;
 }
@@ -92,7 +92,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
     ScPrintOptions aOptions;
 
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCPRINTOPTIONS, FALSE , &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCPRINTOPTIONS, sal_False , &pItem))
         aOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
     else
     {
@@ -100,9 +100,9 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
         aOptions = SC_MOD()->GetPrintOptions();
     }
 
-    if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, FALSE , &pItem ) )
+    if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, sal_False , &pItem ) )
     {
-        BOOL bChecked = ( (const SfxBoolItem*)pItem )->GetValue();
+        sal_Bool bChecked = ( (const SfxBoolItem*)pItem )->GetValue();
         aSelectedSheetsCB.Check( bChecked );
     }
     else
@@ -117,7 +117,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
 
 // -----------------------------------------------------------------------
 
-BOOL ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
 {
     rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET );
 
@@ -134,11 +134,11 @@ BOOL ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
         {
             rCoreAttrs.Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, aSelectedSheetsCB.IsChecked() ) );
         }
-        return TRUE;
+        return sal_True;
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 }
 
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index ae16bb781..344fc9d07 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -63,7 +63,7 @@
 #define CR	(sal_Unicode)13
 #define LF	(sal_Unicode)10
 
-static USHORT pUserListsRanges[] =
+static sal_uInt16 pUserListsRanges[] =
 {
     SID_SCUSERLISTS,
     SID_SCUSERLISTS,
@@ -107,9 +107,9 @@ ScTpUserLists::ScTpUserLists( Window*				pParent,
         pDoc			( NULL ),
         pViewData		( NULL ),
         pRangeUtil		( new ScRangeUtil ),
-        bModifyMode 	( FALSE ),
-        bCancelMode 	( FALSE ),
-        bCopyDone		( FALSE ),
+        bModifyMode 	( sal_False ),
+        bCancelMode 	( sal_False ),
+        bCopyDone		( sal_False ),
         nCancelPos		( 0 )
 {
     SetExchangeSupport();
@@ -177,7 +177,7 @@ void ScTpUserLists::Init()
 
 // -----------------------------------------------------------------------
 
-USHORT* __EXPORT ScTpUserLists::GetRanges()
+sal_uInt16* __EXPORT ScTpUserLists::GetRanges()
 {
     return pUserListsRanges;
 }
@@ -242,7 +242,7 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
 {
     // Modifikationen noch nicht uebernommen?
     // -> Click auf Add-Button simulieren
@@ -254,18 +254,18 @@ BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
                                            GetItemSet().Get( nWhichUserLists );
 
     ScUserList* pCoreList		= rUserListItem.GetUserList();
-    BOOL		bDataModified	= FALSE;
+    sal_Bool		bDataModified	= sal_False;
 
     if ( (pUserLists == NULL) && (pCoreList == NULL) )
     {
-        bDataModified = FALSE;
+        bDataModified = sal_False;
     }
     else if ( pUserLists != NULL )
     {
         if ( pCoreList != NULL )
             bDataModified = (*pUserLists != *pCoreList);
         else
-            bDataModified = TRUE;
+            bDataModified = sal_True;
     }
 
     if ( bDataModified )
@@ -293,7 +293,7 @@ int __EXPORT ScTpUserLists::DeactivatePage( SfxItemSet* pSetP )
 
 // -----------------------------------------------------------------------
 
-USHORT ScTpUserLists::UpdateUserListBox()
+sal_uInt16 ScTpUserLists::UpdateUserListBox()
 {
     aLbLists.Clear();
 
@@ -301,12 +301,12 @@ USHORT ScTpUserLists::UpdateUserListBox()
 
     //----------------------------------------------------------
 
-    USHORT	nCount = pUserLists->GetCount();
+    sal_uInt16	nCount = pUserLists->GetCount();
     String	aEntry;
 
     if ( nCount > 0 )
     {
-        for ( USHORT i=0; i<nCount; i++ )
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
             aEntry = (*pUserLists)[i]->GetString();
             DBG_ASSERT( aEntry.Len() > 0, "Empty UserList-entry :-/" );
@@ -319,7 +319,7 @@ USHORT ScTpUserLists::UpdateUserListBox()
 
 // -----------------------------------------------------------------------
 
-void ScTpUserLists::UpdateEntries( USHORT nList )
+void ScTpUserLists::UpdateEntries( sal_uInt16 nList )
 {
     if ( !pUserLists ) return;
 
@@ -328,10 +328,10 @@ void ScTpUserLists::UpdateEntries( USHORT nList )
     if ( nList < pUserLists->GetCount() )
     {
         ScUserListData* pList	  = (*pUserLists)[nList];
-        USHORT			nSubCount = pList->GetSubCount();
+        sal_uInt16			nSubCount = pList->GetSubCount();
         String			aEntryListStr;
 
-        for ( USHORT i=0; i<nSubCount; i++ )
+        for ( sal_uInt16 i=0; i<nSubCount; i++ )
         {
             if ( i!=0 )
                 aEntryListStr += CR;
@@ -438,8 +438,8 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
     SCROW	nStartRow		= rStartPos.Row();
     SCCOL	nEndCol			= rEndPos.Col();
     SCROW	nEndRow			= rEndPos.Row();
-    USHORT	nCellDir		= SCRET_COLS;
-    BOOL	bValueIgnored	= FALSE;
+    sal_uInt16	nCellDir		= SCRET_COLS;
+    sal_Bool	bValueIgnored	= sal_False;
 
     if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) )
     {	
@@ -479,7 +479,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
                         }
                     }
                     else
-                        bValueIgnored = TRUE;
+                        bValueIgnored = sal_True;
                 }
                 if ( aStrList.Len() > 0 )
                     AddNewList( aStrList );
@@ -503,7 +503,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
                         }
                     }
                     else
-                        bValueIgnored = TRUE;
+                        bValueIgnored = sal_True;
                 }
                 if ( aStrList.Len() > 0 )
                     AddNewList( aStrList );
@@ -519,13 +519,13 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
 
     //----------------------------------------------------------
 
-    bCopyDone = TRUE;
+    bCopyDone = sal_True;
     
 }
 
 // -----------------------------------------------------------------------
 
-void ScTpUserLists::ModifyList( USHORT			nSelList,
+void ScTpUserLists::ModifyList( sal_uInt16			nSelList,
                                 const String&	rEntriesStr )
 {
     if ( !pUserLists ) return;
@@ -541,7 +541,7 @@ void ScTpUserLists::ModifyList( USHORT			nSelList,
 
 // -----------------------------------------------------------------------
 
-void ScTpUserLists::RemoveList( USHORT nList )
+void ScTpUserLists::RemoveList( sal_uInt16 nList )
 {
     if ( pUserLists ) pUserLists->AtFree( nList );
 }
@@ -554,7 +554,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
 {
     if ( pLb == &aLbLists )
     {
-        USHORT nSelPos = aLbLists.GetSelectEntryPos();
+        sal_uInt16 nSelPos = aLbLists.GetSelectEntryPos();
         if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
         {
             if ( !aFtEntries.IsEnabled() )	aFtEntries.Enable();
@@ -597,7 +597,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
                 aEdCopyFrom.Disable();
             }
             aBtnNew.SetText( aStrCancel );
-            bCancelMode = TRUE;
+            bCancelMode = sal_True;
         }
         else // if ( bCancelMode )
         {
@@ -624,8 +624,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
                 aEdCopyFrom.Enable();
             }
             aBtnNew.SetText( aStrNew );
-            bCancelMode = FALSE;
-            bModifyMode = FALSE;
+            bCancelMode = sal_False;
+            bModifyMode = sal_False;
         }
     }
     else if ( pBtn == &aBtnAdd )
@@ -657,11 +657,11 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
             aBtnAdd.Disable();
             aBtnRemove.Enable();
             aBtnNew.SetText( aStrNew );
-            bCancelMode = FALSE;
+            bCancelMode = sal_False;
         }
         else // if ( bModifyMode )
         {
-            USHORT nSelList = aLbLists.GetSelectEntryPos();
+            sal_uInt16 nSelList = aLbLists.GetSelectEntryPos();
 
             DBG_ASSERT( nSelList != LISTBOX_ENTRY_NOTFOUND,	"Modify without List :-/" );
 
@@ -677,8 +677,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
                 LbSelectHdl( &aLbLists );
             }
 
-            aBtnNew.SetText( aStrNew ); bCancelMode = FALSE;
-            aBtnAdd.SetText( aStrAdd ); bModifyMode = FALSE;
+            aBtnNew.SetText( aStrNew ); bCancelMode = sal_False;
+            aBtnAdd.SetText( aStrAdd ); bModifyMode = sal_False;
             aBtnAdd.Disable();
             aBtnRemove.Enable();
             aFtLists.Enable();
@@ -696,7 +696,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
     {
         if ( aLbLists.GetEntryCount() > 0 )
         {
-            USHORT nRemovePos	= aLbLists.GetSelectEntryPos();
+            sal_uInt16 nRemovePos	= aLbLists.GetSelectEntryPos();
             String aMsg 		( aStrQueryRemove.GetToken( 0, '#' ) );
 
             aMsg += aLbLists.GetEntry( nRemovePos );
@@ -748,7 +748,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
         ScRefAddress theStartPos;
         ScRefAddress theEndPos;
         String		theAreaStr( aEdCopyFrom.GetText() );
-        BOOL		bAreaOk = FALSE;
+        sal_Bool		bAreaOk = sal_False;
 
         if ( theAreaStr.Len() > 0 )
         {
@@ -815,8 +815,8 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, MultiLineEdit*, pEd )
     {
         if ( !bCancelMode && !bModifyMode )
         {
-            aBtnNew.SetText( aStrCancel );	bCancelMode = TRUE;
-            aBtnAdd.SetText( aStrModify );	bModifyMode = TRUE;
+            aBtnNew.SetText( aStrCancel );	bCancelMode = sal_True;
+            aBtnAdd.SetText( aStrModify );	bModifyMode = sal_True;
             aBtnAdd.Enable();
             aBtnRemove.Disable();
             aFtLists.Disable();
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 0ab4c76f6..0861200d1 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -152,9 +152,9 @@ SfxTabPage*	ScTpContentOptions::Create( Window*		pParent,
 /*-----------------11.01.97 10.52-------------------
 
 --------------------------------------------------*/
-BOOL	ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool	ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if(	aFormulaCB	.GetSavedValue() != aFormulaCB	.IsChecked() ||
         aNilCB		.GetSavedValue() != aNilCB		.IsChecked() ||
         aAnnotCB  	.GetSavedValue() != aAnnotCB	.IsChecked() ||
@@ -179,17 +179,17 @@ BOOL	ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
         pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
                                      aColorLB.GetSelectEntry() );
         rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions));
-        bRet = TRUE;
+        bRet = sal_True;
     }
     if(aRangeFindCB.GetSavedValue() != aRangeFindCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, aRangeFindCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
     if(aSyncZoomCB.GetSavedValue() != aSyncZoomCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, aSyncZoomCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
 
@@ -202,7 +202,7 @@ BOOL	ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
 void	ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
 {
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, sal_False , &pItem))
         pLocalOptions  = new ScViewOptions(
                             ((const ScTpViewItem*)pItem)->GetViewOptions() );
     else
@@ -214,9 +214,9 @@ void	ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
     aAnchorCB 	.Check(pLocalOptions->GetOption(VOPT_ANCHOR));
     aClipMarkCB	.Check(pLocalOptions->GetOption(VOPT_CLIPMARKS));
 
-    aObjGrfLB 	.SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
-    aDiagramLB  .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
-    aDrawLB     .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
+    aObjGrfLB 	.SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
+    aDiagramLB  .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
+    aDrawLB     .SelectEntryPos( (sal_uInt16)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
 
     aRowColHeaderCB.Check( pLocalOptions->GetOption(VOPT_HEADER) );
     aHScrollCB .Check( pLocalOptions->GetOption(VOPT_HSCROLL) );
@@ -231,9 +231,9 @@ void	ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
     aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) );	// inverted
     aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, sal_False, &pItem))
         aRangeFindCB.Check(((const SfxBoolItem*)pItem)->GetValue());
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, sal_False, &pItem))
         aSyncZoomCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
     aRangeFindCB.SaveValue();
@@ -267,7 +267,7 @@ void	ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
 void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
+    if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, sal_False , &pItem))
         *pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions();
 }
 /*-----------------11.01.97 12.45-------------------
@@ -286,7 +286,7 @@ int	ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
 
 IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
 {
-    USHORT		nSelPos = pLb->GetSelectEntryPos();
+    sal_uInt16		nSelPos = pLb->GetSelectEntryPos();
     ScVObjMode	eMode	= ScVObjMode(nSelPos);
     ScVObjType	eType	= VOBJ_TYPE_OLE;
 
@@ -307,7 +307,7 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
 IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
 {
     ScViewOption eOption = VOPT_FORMULAS;
-    BOOL		 bChecked = pBtn->IsChecked();
+    sal_Bool		 bChecked = pBtn->IsChecked();
 
     if ( 	  &aFormulaCB 	== pBtn )	eOption = VOPT_FORMULAS;
     else if ( &aNilCB 		== pBtn )	eOption = VOPT_NULLVALS;
@@ -340,7 +340,7 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
 
 void ScTpContentOptions::InitGridOpt()
 {
-    BOOL bGrid = pLocalOptions->GetOption( VOPT_GRID );
+    sal_Bool bGrid = pLocalOptions->GetOption( VOPT_GRID );
 
     aGridCB.Check( bGrid );
 
@@ -372,7 +372,7 @@ void ScTpContentOptions::InitGridOpt()
 
         //------------------------------------------------------
 
-        aColorLB.SetUpdateMode( FALSE );
+        aColorLB.SetUpdateMode( sal_False );
 
         //	Eintraege aus der Colortable
 
@@ -390,7 +390,7 @@ void ScTpContentOptions::InitGridOpt()
                 aColorLB.GetEntryPos( aStdCol ) )
             aColorLB.InsertEntry( aStdCol, ScGlobal::GetRscString( STR_GRIDCOLOR ) );
 
-        aColorLB.SetUpdateMode( TRUE );
+        aColorLB.SetUpdateMode( sal_True );
 
         Invalidate();
     }
@@ -399,7 +399,7 @@ void ScTpContentOptions::InitGridOpt()
 
     String	aName;
     Color	aCol	= pLocalOptions->GetGridColor( &aName );
-    USHORT	nSelPos	= aColorLB.GetEntryPos( aCol );
+    sal_uInt16	nSelPos	= aColorLB.GetEntryPos( aCol );
 
     if ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
         aColorLB.SelectEntryPos( nSelPos );
@@ -412,7 +412,7 @@ void ScTpContentOptions::InitGridOpt()
 
 IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
 {
-    BOOL bChecked = pBox->IsChecked();
+    sal_Bool bChecked = pBox->IsChecked();
     aColorFT.Enable(bChecked);
     aColorLB.Enable(bChecked);
     pLocalOptions->SetOption( VOPT_GRID, bChecked );
@@ -458,7 +458,7 @@ ScTpLayoutOptions::ScTpLayoutOptions( 	Window*	pParent,
     aAlignCB.SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl));
 
 
-    for ( USHORT i = 0; i < aUnitArr.Count(); ++i )
+    for ( sal_uInt16 i = 0; i < aUnitArr.Count(); ++i )
     {
         String sMetric = aUnitArr.GetStringByPos( i );
         FieldUnit eFUnit = (FieldUnit)aUnitArr.GetValue( i );
@@ -472,7 +472,7 @@ ScTpLayoutOptions::ScTpLayoutOptions( 	Window*	pParent,
             case FUNIT_INCH:
             {
                 // nur diese Metriken benutzen
-                USHORT nPos = aUnitLB.InsertEntry( sMetric );
+                sal_uInt16 nPos = aUnitLB.InsertEntry( sMetric );
                 aUnitLB.SetEntryData( nPos, (void*)(long)eFUnit );
             }
             break;
@@ -509,23 +509,23 @@ SfxTabPage*	ScTpLayoutOptions::Create( Window*			pParent,
 
 --------------------------------------------------*/
 
-BOOL	ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool	ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
 {
-    BOOL bRet = TRUE;
-    const USHORT nMPos = aUnitLB.GetSelectEntryPos();
+    sal_Bool bRet = sal_True;
+    const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos();
     if ( nMPos != aUnitLB.GetSavedValue() )
     {
-        USHORT nFieldUnit = (USHORT)(long)aUnitLB.GetEntryData( nMPos );
+        sal_uInt16 nFieldUnit = (sal_uInt16)(long)aUnitLB.GetEntryData( nMPos );
         rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC,
-                                     (UINT16)nFieldUnit ) );
-        bRet = TRUE;
+                                     (sal_uInt16)nFieldUnit ) );
+        bRet = sal_True;
     }
 
     if(aTabMF.GetText() != aTabMF.GetSavedValue())
     {
         rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
-                    sal::static_int_cast<UINT16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
-        bRet = TRUE;
+                    sal::static_int_cast<sal_uInt16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
+        bRet = sal_True;
     }
 
     ScLkUpdMode nSet=LM_ALWAYS;
@@ -547,55 +547,55 @@ BOOL	ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
         ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
         aAppOptions.SetLinkMode(nSet );
         SC_MOD()->SetAppOptions(aAppOptions);
-        bRet = TRUE;
+        bRet = sal_True;
     }
     if(aAlignCB.GetSavedValue() != aAlignCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, aAlignCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aAlignLB.GetSavedValue() != aAlignLB.GetSelectEntryPos())
     {
         rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, aAlignLB.GetSelectEntryPos()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aEditModeCB.GetSavedValue() != aEditModeCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, aEditModeCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aFormatCB.GetSavedValue() != aFormatCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, aFormatCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
 
     if(aExpRefCB.GetSavedValue() != aExpRefCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, aExpRefCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aMarkHdrCB.GetSavedValue() != aMarkHdrCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, aMarkHdrCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if(aTextFmtCB.GetSavedValue() != aTextFmtCB.IsChecked())
     {
         rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, aTextFmtCB.IsChecked()));
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if( aReplWarnCB.GetSavedValue() != aReplWarnCB.IsChecked() )
     {
         rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, aReplWarnCB.IsChecked() ) );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
@@ -612,7 +612,7 @@ void	ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
         const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet.Get( SID_ATTR_METRIC );
         FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
 
-        for ( USHORT i = 0; i < aUnitLB.GetEntryCount(); ++i )
+        for ( sal_uInt16 i = 0; i < aUnitLB.GetEntryCount(); ++i )
         {
             if ( (FieldUnit)(long)aUnitLB.GetEntryData( i ) == eFieldUnit )
             {
@@ -625,7 +625,7 @@ void	ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
     aUnitLB.SaveValue();
 
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False, &pItem))
         aTabMF.SetValue(aTabMF.Normalize(((SfxUInt16Item*)pItem)->GetValue()), FUNIT_TWIP);
     aTabMF.SaveValue();
 
@@ -655,29 +655,29 @@ void	ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
             // added to avoid warnings
         }
     }
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, sal_False, &pItem))
         aAlignCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, sal_False, &pItem))
         aAlignLB.SelectEntryPos(((const SfxUInt16Item*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, sal_False, &pItem))
         aEditModeCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, sal_False, &pItem))
         aFormatCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, sal_False, &pItem))
         aExpRefCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, sal_False, &pItem))
         aMarkHdrCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, FALSE, &pItem))
+    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, sal_False, &pItem))
         aTextFmtCB.Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, FALSE, &pItem ) )
+    if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, sal_False, &pItem ) )
         aReplWarnCB.Check( ( (const SfxBoolItem*)pItem)->GetValue() );
 
     aAlignCB    .SaveValue();
@@ -721,7 +721,7 @@ int	ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
 
 IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
 {
-    const USHORT nMPos = aUnitLB.GetSelectEntryPos();
+    const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos();
     if(nMPos != USHRT_MAX)
     {
         FieldUnit eFieldUnit = (FieldUnit)(long)aUnitLB.GetEntryData( nMPos );
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 3ab86455f..51c69a282 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -55,16 +55,16 @@
 // STATIC DATA ---------------------------------------------------------------
 
 // List box positions for print range (PR)
-const USHORT SC_AREASDLG_PR_NONE    = 0;
-const USHORT SC_AREASDLG_PR_ENTIRE  = 1;
-const USHORT SC_AREASDLG_PR_USER    = 2;
-const USHORT SC_AREASDLG_PR_SELECT  = 3;
-const USHORT SC_AREASDLG_PR_OFFSET  = 4;
+const sal_uInt16 SC_AREASDLG_PR_NONE    = 0;
+const sal_uInt16 SC_AREASDLG_PR_ENTIRE  = 1;
+const sal_uInt16 SC_AREASDLG_PR_USER    = 2;
+const sal_uInt16 SC_AREASDLG_PR_SELECT  = 3;
+const sal_uInt16 SC_AREASDLG_PR_OFFSET  = 4;
 
 // List box positions for repeat ranges (RR)
-const USHORT SC_AREASDLG_RR_NONE    = 0;
-const USHORT SC_AREASDLG_RR_USER    = 1;
-const USHORT SC_AREASDLG_RR_OFFSET  = 2;
+const sal_uInt16 SC_AREASDLG_RR_NONE    = 0;
+const sal_uInt16 SC_AREASDLG_RR_USER    = 1;
+const sal_uInt16 SC_AREASDLG_RR_OFFSET  = 2;
 
 //============================================================================
 
@@ -79,7 +79,7 @@ bool    lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow
 void	lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr );
 
 #if 0
-static void printAddressFlags(USHORT nFlag)
+static void printAddressFlags(sal_uInt16 nFlag)
 {
     if ((nFlag & SCA_COL_ABSOLUTE  ) == SCA_COL_ABSOLUTE  )  printf("SCA_COL_ABSOLUTE \n");
     if ((nFlag & SCA_ROW_ABSOLUTE  ) == SCA_ROW_ABSOLUTE  )  printf("SCA_ROW_ABSOLUTE \n");
@@ -131,7 +131,7 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window*
         aBtnCancel		( this, ScResId( BTN_CANCEL ) ),
         aBtnHelp		( this, ScResId( BTN_HELP ) ),
         //
-        bDlgLostFocus	( FALSE ),
+        bDlgLostFocus	( sal_False ),
         pRefInputEdit	( &aEdPrintArea ),
         pDoc			( NULL ),
         pViewData		( NULL ),
@@ -166,10 +166,10 @@ ScPrintAreasDlg::~ScPrintAreasDlg()
     // Extra-Data an ListBox-Entries abraeumen
     ListBox* pLb[3] = { &aLbPrintArea, &aLbRepeatRow, &aLbRepeatCol };
 
-    for ( USHORT i=0; i<3; i++ )
+    for ( sal_uInt16 i=0; i<3; i++ )
     {
-        USHORT nCount = pLb[i]->GetEntryCount();
-        for ( USHORT j=0; j<nCount; j++ )
+        sal_uInt16 nCount = pLb[i]->GetEntryCount();
+        for ( sal_uInt16 j=0; j<nCount; j++ )
             delete (String*)pLb[i]->GetEntryData(j);
     }
 }
@@ -177,7 +177,7 @@ ScPrintAreasDlg::~ScPrintAreasDlg()
 
 //----------------------------------------------------------------------------
 
-BOOL ScPrintAreasDlg::Close()
+sal_Bool ScPrintAreasDlg::Close()
 {
     return DoClose( ScPrintAreasDlgWrapper::GetChildWindowId() );
 }
@@ -185,12 +185,12 @@ BOOL ScPrintAreasDlg::Close()
 
 //----------------------------------------------------------------------------
 
-BOOL ScPrintAreasDlg::IsTableLocked() const
+sal_Bool ScPrintAreasDlg::IsTableLocked() const
 {
     //	Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn,
     //	bei der Eingabe die Tabelle umzuschalten
 
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -223,7 +223,7 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */
         }
         else
         {
-            BOOL bRow = ( &aEdRepeatRow == pRefInputEdit );
+            sal_Bool bRow = ( &aEdRepeatRow == pRefInputEdit );
             lcl_GetRepeatRangeString(&rRef, pDoc, bRow, aStr);
             pRefInputEdit->SetRefString( aStr );
         }
@@ -256,7 +256,7 @@ void ScPrintAreasDlg::AddRefEntry()
 
 void ScPrintAreasDlg::Deactivate()
 {
-    bDlgLostFocus = TRUE;
+    bDlgLostFocus = sal_True;
 }
 
 
@@ -266,7 +266,7 @@ void ScPrintAreasDlg::SetActive()
 {
     if ( bDlgLostFocus )
     {
-        bDlgLostFocus = FALSE;
+        bDlgLostFocus = sal_False;
 
         if ( pRefInputEdit )
         {
@@ -313,8 +313,8 @@ void ScPrintAreasDlg::Impl_Reset()
     String aOne;
     const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
     const sal_Unicode sep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
-    USHORT nRangeCount = pDoc->GetPrintRangeCount( nCurTab );
-    for (USHORT i=0; i<nRangeCount; i++)
+    sal_uInt16 nRangeCount = pDoc->GetPrintRangeCount( nCurTab );
+    for (sal_uInt16 i=0; i<nRangeCount; i++)
     {
         const ScRange* pPrintRange = pDoc->GetPrintRange( nCurTab, i );
         if (pPrintRange)
@@ -353,10 +353,10 @@ void ScPrintAreasDlg::Impl_Reset()
 
 //----------------------------------------------------------------------------
 
-BOOL ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem )
+sal_Bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem )
 {
     String	aRangeStr = pEd->GetText();
-    BOOL	bDataChanged = (pEd->GetSavedValue() != aRangeStr);
+    sal_Bool	bDataChanged = (pEd->GetSavedValue() != aRangeStr);
 
     if ( (aRangeStr.Len() > 0) && &aEdPrintArea != pEd )
     {
@@ -374,18 +374,18 @@ BOOL ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem )
 
 //----------------------------------------------------------------------------
 
-BOOL ScPrintAreasDlg::Impl_CheckRefStrings()
+sal_Bool ScPrintAreasDlg::Impl_CheckRefStrings()
 {
-    BOOL		bOk = FALSE;
+    sal_Bool		bOk = sal_False;
     String		aStrPrintArea	= aEdPrintArea.GetText();
     String		aStrRepeatRow	= aEdRepeatRow.GetText();
     String		aStrRepeatCol	= aEdRepeatCol.GetText();
 
-    BOOL bPrintAreaOk = TRUE;
+    sal_Bool bPrintAreaOk = sal_True;
     if ( aStrPrintArea.Len() )
     {
-        const USHORT nValidAddr  = SCA_VALID | SCA_VALID_ROW | SCA_VALID_COL;
-        const USHORT nValidRange = nValidAddr | SCA_VALID_ROW2 | SCA_VALID_COL2;
+        const sal_uInt16 nValidAddr  = SCA_VALID | SCA_VALID_ROW | SCA_VALID_COL;
+        const sal_uInt16 nValidRange = nValidAddr | SCA_VALID_ROW2 | SCA_VALID_COL2;
         const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
         const sal_Unicode sep  = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
         // const sal_Unicode rsep = ScCompiler::GetNativeSymbol(ocRange).GetChar(0);
@@ -396,21 +396,21 @@ BOOL ScPrintAreasDlg::Impl_CheckRefStrings()
         for ( xub_StrLen i = 0; i < nSepCount && bPrintAreaOk; ++i )
         {
             String aOne = aStrPrintArea.GetToken(i, sep);
-            USHORT nResult = aRange.Parse( aOne, pDoc, eConv );
+            sal_uInt16 nResult = aRange.Parse( aOne, pDoc, eConv );
             if ((nResult & nValidRange) != nValidRange)
             {
-                USHORT nAddrResult = aAddr.Parse( aOne, pDoc, eConv );
+                sal_uInt16 nAddrResult = aAddr.Parse( aOne, pDoc, eConv );
                 if ((nAddrResult & nValidAddr) != nValidAddr)
-                    bPrintAreaOk = FALSE;
+                    bPrintAreaOk = sal_False;
             }
         }
     }
 
-    BOOL bRepeatRowOk = (aStrRepeatRow.Len() == 0);
+    sal_Bool bRepeatRowOk = (aStrRepeatRow.Len() == 0);
     if ( !bRepeatRowOk )
         bRepeatRowOk = lcl_CheckRepeatString(aStrRepeatRow, pDoc, true, NULL);
 
-    BOOL bRepeatColOk = (aStrRepeatCol.Len() == 0);
+    sal_Bool bRepeatColOk = (aStrRepeatCol.Len() == 0);
     if ( !bRepeatColOk )
         bRepeatColOk = lcl_CheckRepeatString(aStrRepeatCol, pDoc, false, NULL);
 
@@ -443,7 +443,7 @@ void ScPrintAreasDlg::Impl_FillLists()
     //------------------------------------------------------
     ScRange	aRange;
     String	aStrRange;
-    BOOL bSimple = TRUE;
+    sal_Bool bSimple = sal_True;
 
     if ( pViewData )
         bSimple = (pViewData->GetSimpleArea( aRange ) == SC_MARK_SIMPLE);
@@ -455,7 +455,7 @@ void ScPrintAreasDlg::Impl_FillLists()
     else
     {
         ScRangeListRef aList( new ScRangeList );
-        pViewData->GetMarkData().FillRangeListWithMarks( aList, FALSE );
+        pViewData->GetMarkData().FillRangeListWithMarks( aList, sal_False );
         aList->Format( aStrRange, SCR_ABS, pDoc, eConv );
     }
 
@@ -465,7 +465,7 @@ void ScPrintAreasDlg::Impl_FillLists()
     // Ranges holen und in ListBoxen merken
     //------------------------------------------------------
     ScRangeName*	pRangeNames = pDoc->GetRangeName();
-    const USHORT	nCount		= pRangeNames ? pRangeNames->GetCount() : 0;
+    const sal_uInt16	nCount		= pRangeNames ? pRangeNames->GetCount() : 0;
 
     if ( nCount > 0 )
     {
@@ -474,7 +474,7 @@ void ScPrintAreasDlg::Impl_FillLists()
 //        ScRange         aRange;
         ScRangeData*	pData = NULL;
 
-        for ( USHORT i=0; i<nCount; i++ )
+        for ( sal_uInt16 i=0; i<nCount; i++ )
         {
             pData = (ScRangeData*)(pRangeNames->At( i ));
             if ( pData )
@@ -528,7 +528,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
     {
         if ( Impl_CheckRefStrings() )
         {
-            BOOL			bDataChanged = FALSE;
+            sal_Bool			bDataChanged = sal_False;
             String			aStr;
             SfxStringItem	aPrintArea( SID_CHANGE_PRINTAREA, aStr );
             SfxStringItem	aRepeatRow( FN_PARAM_2, aStr );
@@ -539,7 +539,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
             //-------------------------
 
             // first try the list box, if "Entite sheet" is selected
-            BOOL bEntireSheet = (aLbPrintArea.GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE);
+            sal_Bool bEntireSheet = (aLbPrintArea.GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE);
             SfxBoolItem aEntireSheet( FN_PARAM_4, bEntireSheet );
 
             bDataChanged = bEntireSheet != pDoc->IsPrintEntireSheet( nCurTab );
@@ -561,7 +561,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
 
             if ( bDataChanged )
             {
-                SetDispatcherLock( FALSE );
+                SetDispatcherLock( sal_False );
                 SwitchToDocument();
                 GetBindings().GetDispatcher()->Execute( SID_CHANGE_PRINTAREA,
                                           SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
@@ -609,13 +609,13 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr )
 
 IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb )
 {
-    USHORT nSelPos = pLb->GetSelectEntryPos();
+    sal_uInt16 nSelPos = pLb->GetSelectEntryPos();
     Edit* pEd = NULL;
 
     // list box positions of specific entries, default to "repeat row/column" list boxes
-    USHORT nAllSheetPos = SC_AREASDLG_RR_NONE;
-    USHORT nUserDefPos = SC_AREASDLG_RR_USER;
-    USHORT nFirstCustomPos = SC_AREASDLG_RR_OFFSET;
+    sal_uInt16 nAllSheetPos = SC_AREASDLG_RR_NONE;
+    sal_uInt16 nUserDefPos = SC_AREASDLG_RR_USER;
+    sal_uInt16 nFirstCustomPos = SC_AREASDLG_RR_OFFSET;
 
     // find edit field for list box, and list box positions
     if( pLb == &aLbPrintArea )
@@ -651,8 +651,8 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd )
     ListBox* pLb = NULL;
 
     // list box positions of specific entries, default to "repeat row/column" list boxes
-    USHORT nUserDefPos = SC_AREASDLG_RR_USER;
-    USHORT nFirstCustomPos = SC_AREASDLG_RR_OFFSET;
+    sal_uInt16 nUserDefPos = SC_AREASDLG_RR_USER;
+    sal_uInt16 nFirstCustomPos = SC_AREASDLG_RR_OFFSET;
 
     if( pEd == &aEdPrintArea )
     {
@@ -668,16 +668,16 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd )
         return 0;
 
     // set list box selection according to edit field
-    USHORT	nEntryCount = pLb->GetEntryCount();
+    sal_uInt16	nEntryCount = pLb->GetEntryCount();
     String	aStrEd( pEd->GetText() );
     String	aEdUpper = aStrEd;
     aEdUpper.ToUpperAscii();
 
     if ( (nEntryCount > nFirstCustomPos) && aStrEd.Len() > 0 )
     {
-        BOOL	bFound	= FALSE;
+        sal_Bool	bFound	= sal_False;
         String* pSymbol	= NULL;
-        USHORT i;
+        sal_uInt16 i;
 
         for ( i=nFirstCustomPos; i<nEntryCount && !bFound; i++ )
         {
@@ -710,7 +710,7 @@ bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal )
     String	aStr	= rStr;
     xub_StrLen nLen = aStr.Len();
     SCCOLROW	nNum	= 0;
-    BOOL	bStrOk  = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) );
+    sal_Bool	bStrOk  = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) );
 
     if ( bStrOk )
     {
@@ -725,7 +725,7 @@ bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal )
             {
                 sal_Int32 n = aStr.ToInt32();
 
-                if ( ( bStrOk = (n > 0) && ( n <= MAXROWCOUNT ) ) != FALSE )
+                if ( ( bStrOk = (n > 0) && ( n <= MAXROWCOUNT ) ) != sal_False )
                     nNum = static_cast<SCCOLROW>(n - 1);
             }
         }
@@ -892,7 +892,7 @@ void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIs
     const ScAddress& rStart = pRange->aStart;
     const ScAddress& rEnd   = pRange->aEnd;
 
-    const USHORT nFmt = bIsRow ? (SCA_VALID_ROW | SCA_ROW_ABSOLUTE) : (SCA_VALID_COL | SCA_COL_ABSOLUTE);
+    const sal_uInt16 nFmt = bIsRow ? (SCA_VALID_ROW | SCA_ROW_ABSOLUTE) : (SCA_VALID_COL | SCA_COL_ABSOLUTE);
     String aTmpStr;
     rStart.Format(aTmpStr, nFmt, pDoc, eConv);
     rStr += aTmpStr;
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index c155ef3a8..57e8f54c2 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -65,7 +65,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame*     pFrameP,
                           Window*			pParent,
                           const SfxItemSet& rCoreSet,
                           const String&		rPageStyle,
-                          USHORT            nResIdP )
+                          sal_uInt16            nResIdP )
     :   SfxTabDialog( pFrameP, pParent, ScResId( nResIdP ), &rCoreSet )
 {
     eNumType = ((const SvxPageItem&)rCoreSet.Get(ATTR_PAGE)).GetNumType();
@@ -135,7 +135,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame*     pFrameP,
                             rCoreSet.Get(
                                 rCoreSet.GetPool()->GetWhich(SID_ATTR_PAGE) );
 
-                BOOL bRightPage = ( SVX_PAGE_LEFT !=
+                sal_Bool bRightPage = ( SVX_PAGE_LEFT !=
                                     SvxPageUsage(rPageItem.GetPageUsage()) );
 
                 if ( bRightPage )
@@ -147,13 +147,13 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame*     pFrameP,
                 {
                     //	#69193a# respect "shared" setting
 
-                    BOOL bShareHeader = IS_SHARE_HEADER(rCoreSet);
+                    sal_Bool bShareHeader = IS_SHARE_HEADER(rCoreSet);
                     if ( bShareHeader )
                         AddTabPage( 1, ScRightHeaderEditPage::Create, NULL );
                     else
                         AddTabPage( 1, ScLeftHeaderEditPage::Create, NULL );
 
-                    BOOL bShareFooter = IS_SHARE_FOOTER(rCoreSet);
+                    sal_Bool bShareFooter = IS_SHARE_FOOTER(rCoreSet);
                     if ( bShareFooter )
                         AddTabPage( 2, ScRightFooterEditPage::Create, NULL );
                     else
@@ -174,7 +174,7 @@ __EXPORT ScHFEditDlg::~ScHFEditDlg()
 
 // -----------------------------------------------------------------------
 
-void __EXPORT ScHFEditDlg::PageCreated( USHORT /* nId */, SfxTabPage& rPage )
+void __EXPORT ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage )
 {
     // kann ja nur ne ScHFEditPage sein...
 
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 2c897cb51..6a56550c4 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -70,19 +70,19 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-static USHORT pPageRightHeaderRanges[] = { SID_SCATTR_PAGE_HEADERRIGHT,
+static sal_uInt16 pPageRightHeaderRanges[] = { SID_SCATTR_PAGE_HEADERRIGHT,
                                            SID_SCATTR_PAGE_HEADERRIGHT,
                                            0 };
 
-static USHORT pPageRightFooterRanges[] = { SID_SCATTR_PAGE_FOOTERRIGHT,
+static sal_uInt16 pPageRightFooterRanges[] = { SID_SCATTR_PAGE_FOOTERRIGHT,
                                            SID_SCATTR_PAGE_FOOTERRIGHT,
                                            0 };
 
-static USHORT pPageLeftHeaderRanges[] =  { SID_SCATTR_PAGE_HEADERLEFT,
+static sal_uInt16 pPageLeftHeaderRanges[] =  { SID_SCATTR_PAGE_HEADERLEFT,
                                            SID_SCATTR_PAGE_HEADERLEFT,
                                            0 };
 
-static USHORT pPageLeftFooterRanges[] =  { SID_SCATTR_PAGE_FOOTERLEFT,
+static sal_uInt16 pPageLeftFooterRanges[] =  { SID_SCATTR_PAGE_FOOTERLEFT,
                                            SID_SCATTR_PAGE_FOOTERLEFT,
                                            0 };
 
@@ -95,9 +95,9 @@ static ScEditWindow* pActiveEdWnd = NULL;
 //
 
 ScHFEditPage::ScHFEditPage( Window* 			pParent,
-                            USHORT				nResId,
+                            sal_uInt16				nResId,
                             const SfxItemSet&	rCoreAttrs,
-                            USHORT				nWhichId,
+                            sal_uInt16				nWhichId,
                             bool bHeader  )
 
     :	SfxTabPage		( pParent, ScResId( nResId ), rCoreAttrs ),
@@ -217,7 +217,7 @@ void __EXPORT ScHFEditPage::Reset( const SfxItemSet& rCoreSet )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
 {
     ScPageHFItem	aItem( nWhich );
     EditTextObject* pLeft	= aWndLeft	.CreateTextObject();
@@ -233,7 +233,7 @@ BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
 
     rCoreSet.Put( aItem );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -345,7 +345,7 @@ void ScHFEditPage::InitPreDefinedList()
 
 void ScHFEditPage::InsertToDefinedList()
 {
-    USHORT nCount =  maLbDefined.GetEntryCount();
+    sal_uInt16 nCount =  maLbDefined.GetEntryCount();
     if(nCount == eEntryCount)
     {
         String aCustomizedEntry(ScGlobal::GetRscString( STR_HF_CUSTOMIZED ) );
@@ -356,7 +356,7 @@ void ScHFEditPage::InsertToDefinedList()
 
 void ScHFEditPage::RemoveFromDefinedList()
 {
-    USHORT nCount =  maLbDefined.GetEntryCount();
+    sal_uInt16 nCount =  maLbDefined.GetEntryCount();
     if(nCount > eEntryCount )
         maLbDefined.RemoveEntry( nCount-1);
 }
@@ -383,8 +383,8 @@ void ScHFEditPage::SetSelectDefinedList()
 
     bool bFound = false;
 
-    USHORT i;
-    USHORT nCount =  maLbDefined.GetEntryCount();
+    sal_uInt16 i;
+    sal_uInt16 nCount =  maLbDefined.GetEntryCount();
     for(i = 0; i < nCount && !bFound; i++)
     {
         switch(static_cast<ScHFEntryId>(i))
@@ -551,7 +551,7 @@ void ScHFEditPage::SetSelectDefinedList()
     if(eSelectEntry == eEntryCount)
         InsertToDefinedList();
 
-    maLbDefined.SelectEntryPos( sal::static_int_cast<USHORT>( eSelectEntry ) );
+    maLbDefined.SelectEntryPos( sal::static_int_cast<sal_uInt16>( eSelectEntry ) );
 }
 
 bool ScHFEditPage::IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj)
@@ -934,7 +934,7 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet&
 
 // -----------------------------------------------------------------------
 
-USHORT* __EXPORT ScRightHeaderEditPage::GetRanges()
+sal_uInt16* __EXPORT ScRightHeaderEditPage::GetRanges()
     { return pPageRightHeaderRanges; }
 
 // -----------------------------------------------------------------------
@@ -954,7 +954,7 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r
 
 // -----------------------------------------------------------------------
 
-USHORT* __EXPORT ScLeftHeaderEditPage::GetRanges()
+sal_uInt16* __EXPORT ScLeftHeaderEditPage::GetRanges()
     { return pPageLeftHeaderRanges; }
 
 // -----------------------------------------------------------------------
@@ -973,7 +973,7 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet&
 
 // -----------------------------------------------------------------------
 
-USHORT* __EXPORT ScRightFooterEditPage::GetRanges()
+sal_uInt16* __EXPORT ScRightFooterEditPage::GetRanges()
     { return pPageRightFooterRanges; }
 
 // -----------------------------------------------------------------------
@@ -992,7 +992,7 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r
 
 // -----------------------------------------------------------------------
 
-USHORT* __EXPORT ScLeftFooterEditPage::GetRanges()
+sal_uInt16* __EXPORT ScLeftFooterEditPage::GetRanges()
     { return pPageLeftFooterRanges; }
 
 // -----------------------------------------------------------------------
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 059535e80..604cde4ea 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -60,15 +60,15 @@
 // class ScHFPage
 //==================================================================
 
-ScHFPage::ScHFPage( Window* pParent, USHORT nResId,
-                    const SfxItemSet& rSet, USHORT nSetId )
+ScHFPage::ScHFPage( Window* pParent, sal_uInt16 nResId,
+                    const SfxItemSet& rSet, sal_uInt16 nSetId )
 
     :	SvxHFPage	( pParent, nResId, rSet, nSetId ),
         aBtnEdit	( this, ScResId( RID_SCBTN_HFEDIT ) ),
         aDataSet 	( *rSet.GetPool(),
                        ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERRIGHT,
                        ATTR_PAGE, ATTR_PAGE, 0 ),
-        nPageUsage	( (USHORT)SVX_PAGE_ALL ),
+        nPageUsage	( (sal_uInt16)SVX_PAGE_ALL ),
         pStyleDlg	( NULL )
 {
     SetExchangeSupport();
@@ -119,9 +119,9 @@ void __EXPORT ScHFPage::Reset( const SfxItemSet& rSet )
 
 //------------------------------------------------------------------
 
-BOOL __EXPORT ScHFPage::FillItemSet( SfxItemSet& rOutSet )
+sal_Bool __EXPORT ScHFPage::FillItemSet( SfxItemSet& rOutSet )
 {
-    BOOL bResult = SvxHFPage::FillItemSet( rOutSet );
+    sal_Bool bResult = SvxHFPage::FillItemSet( rOutSet );
 
     if ( nId == SID_ATTR_PAGE_HEADERSET )
     {
@@ -141,7 +141,7 @@ BOOL __EXPORT ScHFPage::FillItemSet( SfxItemSet& rOutSet )
 
 void __EXPORT ScHFPage::ActivatePage( const SfxItemSet& rSet )
 {
-    USHORT				nPageWhich = GetWhich( SID_ATTR_PAGE );
+    sal_uInt16				nPageWhich = GetWhich( SID_ATTR_PAGE );
     const SvxPageItem&	rPageItem  = (const SvxPageItem&)
                                      rSet.Get(nPageWhich);
 
@@ -219,7 +219,7 @@ IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG )
     if (   aCntSharedBox.IsEnabled()
         && !aCntSharedBox.IsChecked() )
     {
-        USHORT nResId = ( nId == SID_ATTR_PAGE_HEADERSET )
+        sal_uInt16 nResId = ( nId == SID_ATTR_PAGE_HEADERSET )
                             ? RID_SCDLG_HFED_HEADER
                             : RID_SCDLG_HFED_FOOTER;
 
@@ -238,7 +238,7 @@ IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG )
     {
         String				aText;
         SfxSingleTabDialog* pDlg = new SfxSingleTabDialog( this, aDataSet, 42 );
-        BOOL bRightPage =   aCntSharedBox.IsChecked()
+        sal_Bool bRightPage =   aCntSharedBox.IsChecked()
                          || ( SVX_PAGE_LEFT != SvxPageUsage(nPageUsage) );
 
         if ( nId == SID_ATTR_PAGE_HEADERSET )
@@ -298,7 +298,7 @@ SfxTabPage* __EXPORT ScHeaderPage::Create( Window* pParent, const SfxItemSet& rC
 
 //------------------------------------------------------------------
 
-USHORT* __EXPORT ScHeaderPage::GetRanges()
+sal_uInt16* __EXPORT ScHeaderPage::GetRanges()
 {
     return SvxHeaderPage::GetRanges();
 }
@@ -321,7 +321,7 @@ SfxTabPage* __EXPORT ScFooterPage::Create( Window* pParent, const SfxItemSet& rC
 
 //------------------------------------------------------------------
 
-USHORT* __EXPORT ScFooterPage::GetRanges()
+sal_uInt16* __EXPORT ScFooterPage::GetRanges()
 {
     return SvxHeaderPage::GetRanges();
 }
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index baaf85e08..67b365f4e 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -74,19 +74,19 @@ ScEditWindow* GetScEditWindow ()
 }
 
 //CHINA001
-//CHINA001 static USHORT pPageRightHeaderRanges[] = { SID_SCATTR_PAGE_HEADERRIGHT,
+//CHINA001 static sal_uInt16 pPageRightHeaderRanges[] = { SID_SCATTR_PAGE_HEADERRIGHT,
 //CHINA001 SID_SCATTR_PAGE_HEADERRIGHT,
 //CHINA001 0 };
 //CHINA001
-//CHINA001 static USHORT pPageRightFooterRanges[] = { SID_SCATTR_PAGE_FOOTERRIGHT,
+//CHINA001 static sal_uInt16 pPageRightFooterRanges[] = { SID_SCATTR_PAGE_FOOTERRIGHT,
 //CHINA001 SID_SCATTR_PAGE_FOOTERRIGHT,
 //CHINA001 0 };
 //CHINA001
-//CHINA001 static USHORT pPageLeftHeaderRanges[] =  { SID_SCATTR_PAGE_HEADERLEFT,
+//CHINA001 static sal_uInt16 pPageLeftHeaderRanges[] =  { SID_SCATTR_PAGE_HEADERLEFT,
 //CHINA001 SID_SCATTR_PAGE_HEADERLEFT,
 //CHINA001 0 };
 //CHINA001
-//CHINA001 static USHORT pPageLeftFooterRanges[] =  { SID_SCATTR_PAGE_FOOTERLEFT,
+//CHINA001 static sal_uInt16 pPageLeftFooterRanges[] =  { SID_SCATTR_PAGE_FOOTERLEFT,
 //CHINA001 SID_SCATTR_PAGE_FOOTERLEFT,
 //CHINA001 0 };
 //CHINA001
@@ -99,9 +99,9 @@ ScEditWindow* GetScEditWindow ()
 //CHINA001 //
 //CHINA001
 //CHINA001 ScHFEditPage::ScHFEditPage( Window*			pParent,
-//CHINA001 USHORT				nResId,
+//CHINA001 sal_uInt16				nResId,
 //CHINA001 const SfxItemSet&	rCoreAttrs,
-//CHINA001 USHORT				nWhichId )
+//CHINA001 sal_uInt16				nWhichId )
 //CHINA001
 //CHINA001 :	SfxTabPage		( pParent, ScResId( nResId ), rCoreAttrs ),
 //CHINA001
@@ -198,7 +198,7 @@ ScEditWindow* GetScEditWindow ()
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
 //CHINA001
-//CHINA001 BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
+//CHINA001 sal_Bool __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
 //CHINA001 {
 //CHINA001 ScPageHFItem	aItem( nWhich );
 //CHINA001 EditTextObject* pLeft	= aWndLeft	.CreateTextObject();
@@ -214,7 +214,7 @@ ScEditWindow* GetScEditWindow ()
 //CHINA001
 //CHINA001 rCoreSet.Put( aItem );
 //CHINA001
-//CHINA001 return TRUE;
+//CHINA001 return sal_True;
 //CHINA001 }
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
@@ -313,7 +313,7 @@ ScEditWindow* GetScEditWindow ()
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
 //CHINA001
-//CHINA001 USHORT* __EXPORT ScRightHeaderEditPage::GetRanges()
+//CHINA001 sal_uInt16* __EXPORT ScRightHeaderEditPage::GetRanges()
 //CHINA001	{ return pPageRightHeaderRanges; }
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
@@ -333,7 +333,7 @@ ScEditWindow* GetScEditWindow ()
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
 //CHINA001
-//CHINA001 USHORT* __EXPORT ScLeftHeaderEditPage::GetRanges()
+//CHINA001 sal_uInt16* __EXPORT ScLeftHeaderEditPage::GetRanges()
 //CHINA001	{ return pPageLeftHeaderRanges; }
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
@@ -352,7 +352,7 @@ ScEditWindow* GetScEditWindow ()
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
 //CHINA001
-//CHINA001 USHORT* __EXPORT ScRightFooterEditPage::GetRanges()
+//CHINA001 sal_uInt16* __EXPORT ScRightFooterEditPage::GetRanges()
 //CHINA001	{ return pPageRightFooterRanges; }
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
@@ -371,7 +371,7 @@ ScEditWindow* GetScEditWindow ()
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
 //CHINA001
-//CHINA001 USHORT* __EXPORT ScLeftFooterEditPage::GetRanges()
+//CHINA001 sal_uInt16* __EXPORT ScLeftFooterEditPage::GetRanges()
 //CHINA001	{ return pPageLeftFooterRanges; }
 //CHINA001
 //CHINA001 // -----------------------------------------------------------------------
@@ -402,7 +402,7 @@ ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLo
     eLocation(eLoc),
     pAcc(NULL)
 {
-    EnableRTL(FALSE);
+    EnableRTL(sal_False);
 
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     Color aBgColor = rStyleSettings.GetWindowColor();
@@ -414,7 +414,7 @@ ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLo
     Size aSize( GetOutputSize() );
     aSize.Height() *= 4;
 
-    pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), TRUE );
+    pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True );
     pEdEngine->SetPaperSize( aSize );
     pEdEngine->SetRefDevice( this );
 
@@ -466,8 +466,8 @@ EditTextObject* __EXPORT ScEditWindow::CreateTextObject()
     //	(GetAttribs beim Format-Dialog-Aufruf gibt immer gesetzte Items zurueck)
 
     const SfxItemSet& rEmpty = pEdEngine->GetEmptyItemSet();
-    USHORT nParCnt = pEdEngine->GetParagraphCount();
-    for (USHORT i=0; i<nParCnt; i++)
+    sal_uInt16 nParCnt = pEdEngine->GetParagraphCount();
+    for (sal_uInt16 i=0; i<nParCnt; i++)
         pEdEngine->SetParaAttribs( i, rEmpty );
 
     return pEdEngine->CreateTextObject();
@@ -519,7 +519,7 @@ void ScEditWindow::SetCharAttriutes()
 
     if ( pDocSh && pViewSh )
     {
-        if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(TRUE);
+        if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(sal_True);
 
         SfxItemSet aSet( pEdView->GetAttribs() );
 
@@ -538,7 +538,7 @@ void ScEditWindow::SetCharAttriutes()
             pEdView->SetAttribs( aSet );
         }
 
-        if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(FALSE);
+        if(pTabViewSh!=NULL) pTabViewSh->SetInFormatDialog(sal_False);
         delete pDlg;
     }
 }
@@ -587,7 +587,7 @@ void __EXPORT ScEditWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
 void __EXPORT ScEditWindow::KeyInput( const KeyEvent& rKEvt )
 {
-    USHORT nKey =  rKEvt.GetKeyCode().GetModifier()
+    sal_uInt16 nKey =  rKEvt.GetKeyCode().GetModifier()
                  + rKEvt.GetKeyCode().GetCode();
 
     if ( nKey == KEY_TAB || nKey == KEY_TAB + KEY_SHIFT )
@@ -692,7 +692,7 @@ public:
 
     void			SetPopupMenu(ScPopupMenu* pPopUp);
 
-    USHORT			GetSelected();
+    sal_uInt16			GetSelected();
 
     void            SetMenuHdl( const Link& rLink ) { aFxLink = rLink; }
     const Link&     GetMenuHdl() const { return aFxLink; }
@@ -705,7 +705,7 @@ ScExtIButton::ScExtIButton(Window* pParent, const ResId& rResId )
 {
     nSelected=0;
     aTimer.SetTimeout(600);
-    SetDropDown( TRUE);
+    SetDropDown( sal_True);
 
 //	DrawArrow();
 }
@@ -715,7 +715,7 @@ void ScExtIButton::SetPopupMenu(ScPopupMenu* pPopUp)
     pPopupMenu=pPopUp;
 }
 
-USHORT ScExtIButton::GetSelected()
+sal_uInt16 ScExtIButton::GetSelected()
 {
     return nSelected;
 }
@@ -750,7 +750,7 @@ void ScExtIButton::StartPopup()
 
     if(pPopupMenu!=NULL)
     {
-        SetPressed( TRUE );
+        SetPressed( sal_True );
         EndSelection();
         Point aPoint(0,0);
         aPoint.Y()=GetOutputSizePixel().Height();
@@ -761,13 +761,13 @@ void ScExtIButton::StartPopup()
         {
             aMLink.Call(this);
         }
-        SetPressed( FALSE);
+        SetPressed( sal_False);
     }
 }
 
 long ScExtIButton::PreNotify( NotifyEvent& rNEvt )
 {
-    USHORT nSwitch=rNEvt.GetType();
+    sal_uInt16 nSwitch=rNEvt.GetType();
     if(nSwitch==EVENT_MOUSEBUTTONUP)
     {
         MouseButtonUp(*rNEvt.GetMouseEvent());
@@ -783,8 +783,8 @@ IMPL_LINK( ScExtIButton, TimerHdl, Timer*, EMPTYARG )
 }
 
 /*
-static void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, BOOL bBlack,
-                               BOOL bLeft = FALSE, BOOL bTop = FALSE )
+static void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, sal_Bool bBlack,
+                               sal_Bool bLeft = sal_False, sal_Bool bTop = sal_False )
 {
     Color			aOldFillColor = pBox->GetFillColor();
     WindowAlign 	eAlign = pBox->meAlign;
@@ -862,10 +862,10 @@ Click
 Timer
     if ( ??? )
     {
-    - SetPressed( TRUE );
+    - SetPressed( sal_True );
     - EndSelection();
     - Menu anzeigen
-    - SetPressed( FALSE );
+    - SetPressed( sal_False );
     }
 
 
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index cae675222..8a3a3dcab 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -70,38 +70,38 @@ sal_Int64 EmptyNumericField::GetValue() const
 
 // STATIC DATA -----------------------------------------------------------
 
-static USHORT pPageTableRanges[] =
+static sal_uInt16 pPageTableRanges[] =
 {
     ATTR_PAGE_NOTES, ATTR_PAGE_FIRSTPAGENO,
     0
 };
 
-BOOL lcl_PutVObjModeItem( USHORT			nWhich,
+sal_Bool lcl_PutVObjModeItem( sal_uInt16			nWhich,
                           SfxItemSet&		rCoreSet,
                           const SfxItemSet&	rOldSet,
                           const CheckBox&	rBtn );
 
-BOOL lcl_PutScaleItem( USHORT				nWhich,
+sal_Bool lcl_PutScaleItem( sal_uInt16				nWhich,
                        SfxItemSet&			rCoreSet,
                        const SfxItemSet&	rOldSet,
                        const ListBox&       rListBox,
-                       USHORT               nLBEntry,
+                       sal_uInt16               nLBEntry,
                        const SpinField&     rEd,
-                       UINT16               nValue );
+                       sal_uInt16               nValue );
 
-BOOL lcl_PutScaleItem2( USHORT               nWhich,
+sal_Bool lcl_PutScaleItem2( sal_uInt16               nWhich,
                        SfxItemSet&          rCoreSet,
                        const SfxItemSet&    rOldSet,
                        const ListBox&       rListBox,
-                       USHORT               nLBEntry,
+                       sal_uInt16               nLBEntry,
                        const NumericField&  rEd1,
                        const NumericField&  rEd2 );
 
-BOOL lcl_PutBoolItem( USHORT			nWhich,
+sal_Bool lcl_PutBoolItem( sal_uInt16			nWhich,
                       SfxItemSet&		rCoreSet,
                       const SfxItemSet&	rOldSet,
-                      BOOL				bIsChecked,
-                      BOOL				bSavedValue );
+                      sal_Bool				bIsChecked,
+                      sal_Bool				bSavedValue );
 
 //------------------------------------------------------------------------
 
@@ -109,9 +109,9 @@ BOOL lcl_PutBoolItem( USHORT			nWhich,
 #define PAGEDIR_HDL 		LINK(this,ScTablePage,PageDirHdl)
 #define SCALE_HDL			LINK(this,ScTablePage,ScaleHdl)
 
-#define WAS_DEFAULT(w,s)    (SFX_ITEM_DEFAULT==(s).GetItemState((w),TRUE))
+#define WAS_DEFAULT(w,s)    (SFX_ITEM_DEFAULT==(s).GetItemState((w),sal_True))
 #define GET_BOOL(sid,set)	((const SfxBoolItem&)((set).Get(GetWhich((sid))))).GetValue()
-#define GET_USHORT(sid,set)	(USHORT)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue()
+#define GET_USHORT(sid,set)	(sal_uInt16)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue()
 #define GET_SHOW(sid,set) 	( ScVObjMode( ((const ScViewObjectModeItem&)((set).Get(GetWhich((sid))))).GetValue() ) \
                               == VOBJ_MODE_SHOW )
 
@@ -183,7 +183,7 @@ ScTablePage::~ScTablePage()
 
 //------------------------------------------------------------------------
 
-USHORT* ScTablePage::GetRanges()
+sal_uInt16* ScTablePage::GetRanges()
 {
     return pPageTableRanges;
 }
@@ -199,11 +199,11 @@ SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet )
 
 void ScTablePage::Reset( const SfxItemSet& rCoreSet )
 {
-    BOOL	bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet );
-    USHORT	nWhich   = 0;
+    sal_Bool	bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet );
+    sal_uInt16	nWhich   = 0;
 
     //-----------
-    // BOOL-Flags
+    // sal_Bool-Flags
     //-----------
     aBtnNotes		.Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) );
     aBtnGrid		.Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) );
@@ -216,7 +216,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
     //------------------
     // Erste Druckseite:
     //------------------
-    USHORT nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,rCoreSet);
+    sal_uInt16 nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,rCoreSet);
     aBtnPageNo.Check( nPage != 0 );
     aEdPageNo.SetValue( (nPage != 0) ? nPage : 1 );
     PageNoHdl( NULL );
@@ -233,20 +233,20 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
     //------------
 
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALE);
-    if ( rCoreSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE )
+    if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
     {
-        USHORT nScale = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue();
+        sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue();
         if( nScale > 0 )
             aLbScaleMode.SelectEntryPos( SC_TPTABLE_SCALE_PERCENT );
         aEdScaleAll.SetValue( (nScale > 0) ? nScale : 100 );
     }
 
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO);
-    if ( rCoreSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE )
+    if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
     {
         const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet.Get( nWhich ) );
-        USHORT nWidth = rItem.GetWidth();
-        USHORT nHeight = rItem.GetHeight();
+        sal_uInt16 nWidth = rItem.GetWidth();
+        sal_uInt16 nHeight = rItem.GetHeight();
 
         /*  width==0 and height==0 is invalid state, used as "not selected".
             Dialog shows width=height=1 then. */
@@ -258,9 +258,9 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
     }
 
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES);
-    if ( rCoreSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE )
+    if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
     {
-        USHORT nPages = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue();
+        sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue();
         if( nPages > 0 )
             aLbScaleMode.SelectEntryPos( SC_TPTABLE_SCALE_TO_PAGES );
         aEdScalePageNum.SetValue( (nPages > 0) ? nPages : 1 );
@@ -299,14 +299,14 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
 
 // -----------------------------------------------------------------------
 
-BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
 {
     const SfxItemSet&	rOldSet		 = GetItemSet();
-    USHORT				nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO);
-    BOOL				bDataChanged = FALSE;
+    sal_uInt16				nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO);
+    sal_Bool				bDataChanged = sal_False;
 
     //-----------
-    // BOOL-Flags
+    // sal_Bool-Flags
     //-----------
 
     bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NOTES),
@@ -342,7 +342,7 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
     //------------------
     // Erste Druckseite:
     //------------------
-    BOOL bUseValue = aBtnPageNo.IsChecked();
+    sal_Bool bUseValue = aBtnPageNo.IsChecked();
 
     if (   WAS_DEFAULT(nWhichPageNo,rOldSet)
         && (	(!bUseValue && bUseValue == aBtnPageNo.GetSavedValue())
@@ -353,12 +353,12 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
     }
     else
     {
-        UINT16 nPage = (UINT16)( aBtnPageNo.IsChecked()
+        sal_uInt16 nPage = (sal_uInt16)( aBtnPageNo.IsChecked()
                                     ? aEdPageNo.GetValue()
                                     : 0 );
 
         rCoreSet.Put( SfxUInt16Item( nWhichPageNo, nPage ) );
-        bDataChanged = TRUE;
+        bDataChanged = sal_True;
     }
 
     //-------------------
@@ -387,7 +387,7 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
     bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALE),
                                       rCoreSet, rOldSet,
                                       aLbScaleMode, SC_TPTABLE_SCALE_PERCENT,
-                                      aEdScaleAll, (UINT16)aEdScaleAll.GetValue() );
+                                      aEdScaleAll, (sal_uInt16)aEdScaleAll.GetValue() );
 
     bDataChanged |= lcl_PutScaleItem2( GetWhich(SID_SCATTR_PAGE_SCALETO),
                                       rCoreSet, rOldSet,
@@ -397,7 +397,7 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
     bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALETOPAGES),
                                       rCoreSet, rOldSet,
                                       aLbScaleMode, SC_TPTABLE_SCALE_TO_PAGES,
-                                      aEdScalePageNum, (UINT16)aEdScalePageNum.GetValue() );
+                                      aEdScalePageNum, (sal_uInt16)aEdScalePageNum.GetValue() );
 
     return bDataChanged;
 }
@@ -475,13 +475,13 @@ IMPL_LINK( ScTablePage, ScaleHdl, ListBox*, EMPTYARG )
 // Hilfsfunktionen fuer FillItemSet:
 //========================================================================
 
-BOOL lcl_PutBoolItem( USHORT			nWhich,
+sal_Bool lcl_PutBoolItem( sal_uInt16			nWhich,
                      SfxItemSet&		rCoreSet,
                      const SfxItemSet&	rOldSet,
-                     BOOL				bIsChecked,
-                     BOOL				bSavedValue )
+                     sal_Bool				bIsChecked,
+                     sal_Bool				bSavedValue )
 {
-    BOOL bDataChanged = (   bSavedValue == bIsChecked
+    sal_Bool bDataChanged = (   bSavedValue == bIsChecked
                          && WAS_DEFAULT(nWhich,rOldSet) );
 
     if ( bDataChanged )
@@ -494,13 +494,13 @@ BOOL lcl_PutBoolItem( USHORT			nWhich,
 
 //------------------------------------------------------------------------
 
-BOOL lcl_PutVObjModeItem( USHORT			nWhich,
+sal_Bool lcl_PutVObjModeItem( sal_uInt16			nWhich,
                          SfxItemSet&		rCoreSet,
                          const SfxItemSet&	rOldSet,
                          const CheckBox&	rBtn )
 {
-    BOOL bIsChecked   = rBtn.IsChecked();
-    BOOL bDataChanged = (   rBtn.GetSavedValue() == bIsChecked
+    sal_Bool bIsChecked   = rBtn.IsChecked();
+    sal_Bool bDataChanged = (   rBtn.GetSavedValue() == bIsChecked
                          && WAS_DEFAULT(nWhich,rOldSet) );
 
     if ( bDataChanged )
@@ -515,16 +515,16 @@ BOOL lcl_PutVObjModeItem( USHORT			nWhich,
 
 //------------------------------------------------------------------------
 
-BOOL lcl_PutScaleItem( USHORT				nWhich,
+sal_Bool lcl_PutScaleItem( sal_uInt16				nWhich,
                       SfxItemSet&			rCoreSet,
                       const SfxItemSet&		rOldSet,
                       const ListBox&        rListBox,
-                      USHORT                nLBEntry,
+                      sal_uInt16                nLBEntry,
                       const SpinField&      rEd,
-                      UINT16                nValue )
+                      sal_uInt16                nValue )
 {
-    BOOL bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
-    BOOL bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
+    sal_Bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
+    sal_Bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
                         (rEd.GetSavedValue() != rEd.GetText()) ||
                         !WAS_DEFAULT( nWhich, rOldSet );
 
@@ -537,18 +537,18 @@ BOOL lcl_PutScaleItem( USHORT				nWhich,
 }
 
 
-BOOL lcl_PutScaleItem2( USHORT               nWhich,
+sal_Bool lcl_PutScaleItem2( sal_uInt16               nWhich,
                       SfxItemSet&           rCoreSet,
                       const SfxItemSet&     rOldSet,
                       const ListBox&        rListBox,
-                      USHORT                nLBEntry,
+                      sal_uInt16                nLBEntry,
                       const NumericField&   rEd1,
                       const NumericField&   rEd2 )
 {
-    UINT16 nValue1 = (UINT16)rEd1.GetValue();
-    UINT16 nValue2 = (UINT16)rEd2.GetValue();
-    BOOL bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
-    BOOL bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
+    sal_uInt16 nValue1 = (sal_uInt16)rEd1.GetValue();
+    sal_uInt16 nValue2 = (sal_uInt16)rEd2.GetValue();
+    sal_Bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
+    sal_Bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
                         (rEd1.GetSavedValue() != rEd1.GetText()) ||
                         (rEd2.GetSavedValue() != rEd2.GetText()) ||
                         !WAS_DEFAULT( nWhich, rOldSet );
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 6d5c2d336..3dc1dd047 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -65,12 +65,12 @@
 
 ScStyleDlg::ScStyleDlg( Window*				pParent,
                         SfxStyleSheetBase&	rStyleBase,
-                        USHORT				nRscId )
+                        sal_uInt16				nRscId )
 
     :	SfxStyleDialog	( pParent,
                           ScResId( nRscId ),
                           rStyleBase,
-                          FALSE ),
+                          sal_False ),
         nDlgRsc			( nRscId )
 {
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); //CHINA001
@@ -145,7 +145,7 @@ __EXPORT ScStyleDlg::~ScStyleDlg()
 
 // -----------------------------------------------------------------------
 
-void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
+void __EXPORT ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
 {
     if ( nDlgRsc == RID_SCDLG_STYLES_PAR )
     {
@@ -194,7 +194,7 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
         {
             case TP_PAGE_STD:
                 //CHINA001 ((SvxPageDescPage&)rTabPage).SetMode( SVX_PAGE_MODE_CENTER );
-                aSet.Put (SfxAllEnumItem((const USHORT)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_CENTER)); //CHINA001 
+                aSet.Put (SfxAllEnumItem((const sal_uInt16)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_CENTER)); //CHINA001 
                 rTabPage.PageCreated(aSet); //CHINA001 
                 break;
 
diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx
index 77cae60a8..583777a7f 100644
--- a/sc/source/ui/undo/areasave.cxx
+++ b/sc/source/ui/undo/areasave.cxx
@@ -73,7 +73,7 @@ ScDataObject*	ScAreaLinkSaver::Clone() const
     return new ScAreaLinkSaver( *this );
 }
 
-BOOL ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const
+sal_Bool ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const
 {
     return ( aFileName	 == rCompare.GetFile() &&
              aFilterName == rCompare.GetFilter() &&
@@ -82,7 +82,7 @@ BOOL ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const
              nRefresh    == rCompare.GetRefreshDelay() );
 }
 
-BOOL ScAreaLinkSaver::IsEqual( const ScAreaLink& rCompare ) const
+sal_Bool ScAreaLinkSaver::IsEqual( const ScAreaLink& rCompare ) const
 {
     return ( IsEqualSource( rCompare ) &&
              aDestArea == rCompare.GetDestArea() );
@@ -104,11 +104,11 @@ void ScAreaLinkSaver::InsertNewLink( ScDocument* pDoc ) const
     {
         ScAreaLink* pLink = new ScAreaLink( pObjSh, aFileName, aFilterName, aOptions,
                                             aSourceArea, aDestArea.aStart, nRefresh );
-        pLink->SetInCreate( TRUE );
+        pLink->SetInCreate( sal_True );
         pLink->SetDestArea( aDestArea );
         pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFileName, &aFilterName, &aSourceArea );
         pLink->Update();
-        pLink->SetInCreate( FALSE );
+        pLink->SetInCreate( sal_False );
     }
 }
 
@@ -132,7 +132,7 @@ ScDataObject*	ScAreaLinkSaveCollection::Clone() const
     return new ScAreaLinkSaveCollection( *this );
 }
 
-BOOL ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const
+sal_Bool ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const
 {
     // IsEqual can be checked in sequence.
     // Neither ref-update nor removing links will change the order.
@@ -140,31 +140,31 @@ BOOL ScAreaLinkSaveCollection::IsEqual( const ScDocument* pDoc ) const
     sfx2::LinkManager* pLinkManager = const_cast<ScDocument*>(pDoc)->GetLinkManager();
     if (pLinkManager)
     {
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nLinkCount = rLinks.Count();
-        for (USHORT i=0; i<nLinkCount; i++)
+        sal_uInt16 nLinkCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nLinkCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScAreaLink))
             {
                 if ( nPos >= GetCount() || !(*this)[nPos]->IsEqual( *(ScAreaLink*)pBase ) )
-                    return FALSE;
+                    return sal_False;
 
                 ++nPos;
             }
         }
         if ( nPos < GetCount() )
-            return FALSE;           // fewer links in the document than in the save collection
+            return sal_False;           // fewer links in the document than in the save collection
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 ScAreaLink* lcl_FindLink( const ::sfx2::SvBaseLinks& rLinks, const ScAreaLinkSaver& rSaver )
 {
-    USHORT nLinkCount = rLinks.Count();
-    for (USHORT i=0; i<nLinkCount; i++)
+    sal_uInt16 nLinkCount = rLinks.Count();
+    for (sal_uInt16 i=0; i<nLinkCount; i++)
     {
         ::sfx2::SvBaseLink* pBase = *rLinks[i];
         if ( pBase->ISA(ScAreaLink) &&
@@ -187,8 +187,8 @@ void ScAreaLinkSaveCollection::Restore( ScDocument* pDoc ) const
     if (pLinkManager)
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nSaveCount = GetCount();
-        for (USHORT nPos=0; nPos<nSaveCount; nPos++)
+        sal_uInt16 nSaveCount = GetCount();
+        for (sal_uInt16 nPos=0; nPos<nSaveCount; nPos++)
         {
             ScAreaLinkSaver* pSaver = (*this)[nPos];
             ScAreaLink* pLink = lcl_FindLink( rLinks, *pSaver );
@@ -209,8 +209,8 @@ ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocum
     if (pLinkManager)
     {
         const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-        USHORT nLinkCount = rLinks.Count();
-        for (USHORT i=0; i<nLinkCount; i++)
+        sal_uInt16 nLinkCount = rLinks.Count();
+        for (sal_uInt16 i=0; i<nLinkCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *rLinks[i];
             if (pBase->ISA(ScAreaLink))
diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx
index 69344dffa..e9bd35f10 100644
--- a/sc/source/ui/undo/refundo.cxx
+++ b/sc/source/ui/undo/refundo.cxx
@@ -166,7 +166,7 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc )
     }
 }
 
-void ScRefUndoData::DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst )
+void ScRefUndoData::DoUndo( ScDocument* pDoc, sal_Bool bUndoRefFirst )
 {
     if (pDBCollection)
         pDoc->SetDBCollection( new ScDBCollection(*pDBCollection) );
@@ -195,8 +195,8 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst )
 
     if (pDBCollection || pRangeName)
     {
-        BOOL bOldAutoCalc = pDoc->GetAutoCalc();
-        pDoc->SetAutoCalc( FALSE );	// Mehrfachberechnungen vermeiden
+        sal_Bool bOldAutoCalc = pDoc->GetAutoCalc();
+        pDoc->SetAutoCalc( sal_False );	// Mehrfachberechnungen vermeiden
         pDoc->CompileAll();
         pDoc->SetDirty();
         pDoc->SetAutoCalc( bOldAutoCalc );
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 3798d7f76..afb910d1a 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -66,14 +66,27 @@ __EXPORT ScSimpleUndo::~ScSimpleUndo()
     delete pDetectiveUndo;
 }
 
-BOOL __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction )
+bool ScSimpleUndo::SetViewMarkData( const ScMarkData& rMarkData )
+{
+    if ( IsPaintLocked() )
+        return false;
+
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+    if ( !pViewShell )
+        return false;
+
+    pViewShell->SetMarkData( rMarkData );
+    return true;
+}
+
+sal_Bool __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction )
 {
     //	Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren
     //	der Detektiv-Pfeile gehoeren.
     //	DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in
     //	eine ScUndoDraw Action verpackt.
     //	Nur beim automatischen Aktualisieren wird AddUndoAction mit
-    //	bTryMerg=TRUE gerufen.
+    //	bTryMerg=sal_True gerufen.
 
     if ( !pDetectiveUndo && pNextAction->ISA(ScUndoDraw) )
     {
@@ -83,15 +96,15 @@ BOOL __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction )
         ScUndoDraw* pCalcUndo = (ScUndoDraw*)pNextAction;
         pDetectiveUndo = pCalcUndo->GetDrawUndo();
         pCalcUndo->ForgetDrawUndo();
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void ScSimpleUndo::BeginUndo()
 {
-    pDocShell->SetInUndo( TRUE );
+    pDocShell->SetInUndo( sal_True );
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
@@ -114,12 +127,12 @@ void ScSimpleUndo::EndUndo()
         pViewShell->ShowAllCursors();
     }
 
-    pDocShell->SetInUndo( FALSE );
+    pDocShell->SetInUndo( sal_False );
 }
 
 void ScSimpleUndo::BeginRedo()
 {
-    pDocShell->SetInUndo( TRUE );	//! eigenes Flag fuer Redo?
+    pDocShell->SetInUndo( sal_True );	//! eigenes Flag fuer Redo?
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
@@ -141,7 +154,7 @@ void ScSimpleUndo::EndRedo()
         pViewShell->ShowAllCursors();
     }
 
-    pDocShell->SetInUndo( FALSE );
+    pDocShell->SetInUndo( sal_False );
 }
 
 void ScSimpleUndo::ShowTable( SCTAB nTab )			// static
@@ -184,7 +197,7 @@ __EXPORT ScBlockUndo::~ScBlockUndo()
 void ScBlockUndo::BeginUndo()
 {
     ScSimpleUndo::BeginUndo();
-    EnableDrawAdjust( pDocShell->GetDocument(), FALSE );
+    EnableDrawAdjust( pDocShell->GetDocument(), sal_False );
 }
 
 void ScBlockUndo::EndUndo()
@@ -192,7 +205,7 @@ void ScBlockUndo::EndUndo()
     if (eMode == SC_UNDO_AUTOHEIGHT)
         AdjustHeight();
 
-    EnableDrawAdjust( pDocShell->GetDocument(), TRUE );
+    EnableDrawAdjust( pDocShell->GetDocument(), sal_True );
     DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() );
 
     ShowBlock();
@@ -215,7 +228,7 @@ void ScBlockUndo::EndRedo()
     ScSimpleUndo::EndRedo();
 }
 
-BOOL ScBlockUndo::AdjustHeight()
+sal_Bool ScBlockUndo::AdjustHeight()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
 
@@ -239,9 +252,9 @@ BOOL ScBlockUndo::AdjustHeight()
         nPPTY = ScGlobal::nScreenPPTY;
     }
 
-    BOOL bRet = pDoc->SetOptimalHeight( aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(),
+    sal_Bool bRet = pDoc->SetOptimalHeight( aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(),
 /*!*/									aBlockRange.aStart.Tab(), 0, &aVirtDev,
-                                        nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
+                                        nPPTX, nPPTY, aZoomX, aZoomY, sal_False );
 
     if (bRet)
         pDocShell->PostPaint( 0,      aBlockRange.aStart.Row(), aBlockRange.aStart.Tab(),
@@ -253,12 +266,15 @@ BOOL ScBlockUndo::AdjustHeight()
 
 void ScBlockUndo::ShowBlock()
 {
+    if ( IsPaintLocked() )
+        return;
+
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
         ShowTable( aBlockRange );		// bei mehreren Tabs im Range ist jede davon gut
         pViewShell->MoveCursorAbs( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
-                                   SC_FOLLOW_JUMP, FALSE, FALSE );
+                                   SC_FOLLOW_JUMP, sal_False, sal_False );
         SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
         ScRange aRange = aBlockRange;
         aRange.aStart.SetTab( nTab );
@@ -296,7 +312,7 @@ void ScMoveUndo::UndoRef()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     ScRange aRange(0,0,0, MAXCOL,MAXROW,pRefUndoDoc->GetTableCount()-1);
-    pRefUndoDoc->CopyToDocument( aRange, IDF_FORMULA, FALSE, pDoc, NULL, FALSE );
+    pRefUndoDoc->CopyToDocument( aRange, IDF_FORMULA, sal_False, pDoc, NULL, sal_False );
     if (pRefUndoData)
         pRefUndoData->DoUndo( pDoc, (eMode == SC_UNDO_REFFIRST) );
         // #65055# HACK: ScDragDropUndo ist der einzige mit REFFIRST.
@@ -308,7 +324,7 @@ void ScMoveUndo::BeginUndo()
 {
     ScSimpleUndo::BeginUndo();
 
-    EnableDrawAdjust( pDocShell->GetDocument(), FALSE );
+    EnableDrawAdjust( pDocShell->GetDocument(), sal_False );
 
     if (pRefUndoDoc && eMode == SC_UNDO_REFFIRST)
         UndoRef();
@@ -322,7 +338,7 @@ void ScMoveUndo::EndUndo()
     if (pRefUndoDoc && eMode == SC_UNDO_REFLAST)
         UndoRef();
 
-    EnableDrawAdjust( pDocShell->GetDocument(), TRUE );
+    EnableDrawAdjust( pDocShell->GetDocument(), sal_True );
 
     ScSimpleUndo::EndUndo();
 }
@@ -375,7 +391,7 @@ void ScDBFuncUndo::EndUndo()
 
     if ( pAutoDBRange )
     {
-        USHORT nNoNameIndex;
+        sal_uInt16 nNoNameIndex;
         ScDocument* pDoc = pDocShell->GetDocument();
         ScDBCollection* pColl = pDoc->GetDBCollection();
         if ( pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nNoNameIndex ) )
@@ -410,7 +426,7 @@ void ScDBFuncUndo::BeginRedo()
     {
         // move the database range to this function's position again (see ScDocShell::GetDBData)
 
-        USHORT nNoNameIndex;
+        sal_uInt16 nNoNameIndex;
         ScDocument* pDoc = pDocShell->GetDocument();
         ScDBCollection* pColl = pDoc->GetDBCollection();
         if ( pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nNoNameIndex ) )
@@ -433,8 +449,8 @@ void ScDBFuncUndo::BeginRedo()
                                   aOriginalRange.aStart.Col(), aOriginalRange.aStart.Row(),
                                   aOriginalRange.aEnd.Col(), aOriginalRange.aEnd.Row() );
 
-            pNoNameData->SetByRow( TRUE );
-            pNoNameData->SetAutoFilter( FALSE );
+            pNoNameData->SetByRow( sal_True );
+            pNoNameData->SetAutoFilter( sal_False );
             // header is always set with the operation in redo
         }
     }
@@ -480,7 +496,7 @@ String ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const
         return String();
 }
 
-USHORT ScUndoWrapper::GetId() const
+sal_uInt16 ScUndoWrapper::GetId() const
 {
     if (pWrappedUndo)
         return pWrappedUndo->GetId();
@@ -488,26 +504,26 @@ USHORT ScUndoWrapper::GetId() const
         return 0;
 }
 
-BOOL ScUndoWrapper::IsLinked()
+sal_Bool ScUndoWrapper::IsLinked()
 {
     if (pWrappedUndo)
         return pWrappedUndo->IsLinked();
     else
-        return FALSE;
+        return sal_False;
 }
 
-void ScUndoWrapper::SetLinked( BOOL bIsLinked )
+void ScUndoWrapper::SetLinked( sal_Bool bIsLinked )
 {
     if (pWrappedUndo)
         pWrappedUndo->SetLinked(bIsLinked);
 }
 
-BOOL ScUndoWrapper::Merge( SfxUndoAction* pNextAction )
+sal_Bool ScUndoWrapper::Merge( SfxUndoAction* pNextAction )
 {
     if (pWrappedUndo)
         return pWrappedUndo->Merge(pNextAction);
     else
-        return FALSE;
+        return sal_False;
 }
 
 void ScUndoWrapper::Undo()
@@ -528,12 +544,12 @@ void ScUndoWrapper::Repeat(SfxRepeatTarget& rTarget)
         pWrappedUndo->Repeat(rTarget);
 }
 
-BOOL ScUndoWrapper::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoWrapper::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     if (pWrappedUndo)
         return pWrappedUndo->CanRepeat(rTarget);
     else
-        return FALSE;
+        return sal_False;
 }
 
 
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 6c096c99f..a3955af12 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -103,7 +103,7 @@ TYPEINIT1(ScUndoBorder,				ScBlockUndo);
 ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell,
                                 const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
                                 InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
-                                BOOL bNewPartOfPaste ) :
+                                sal_Bool bNewPartOfPaste ) :
     ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFLAST ),
     aEffRange( rRange ),
     nCount( nNewCount ),
@@ -140,7 +140,7 @@ String __EXPORT ScUndoInsertCells::GetComment() const
     return ScGlobal::GetRscString( pPasteUndo ? STR_UNDO_PASTE : STR_UNDO_INSERTCELLS );
 }
 
-BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
+sal_Bool ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
 {
     //	If a paste undo action has already been added, append (detective) action there.
     if ( pPasteUndo )
@@ -157,7 +157,7 @@ BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
 
             pPasteUndo = pWrappedAction;
             pWrapper->ForgetWrappedUndo();		// pWrapper is deleted by UndoManager
-            return TRUE;
+            return sal_True;
         }
     }
 
@@ -177,7 +177,7 @@ void ScUndoInsertCells::SetChangeTrack()
         nEndChangeAction = 0;
 }
 
-void ScUndoInsertCells::DoChange( const BOOL bUndo )
+void ScUndoInsertCells::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     SCTAB i;
@@ -235,13 +235,13 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo )
         {
             SCCOL nEndCol = aWorkRange.aEnd.Col();
             SCROW nEndRow = aWorkRange.aEnd.Row();
-            pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], TRUE );
+            pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], sal_True );
         }
     }
 
 //?	Undo fuer herausgeschobene Attribute ?
 
-    USHORT nPaint = PAINT_GRID;
+    sal_uInt16 nPaint = PAINT_GRID;
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     switch (eCmd)
     {
@@ -298,7 +298,7 @@ void __EXPORT ScUndoInsertCells::Undo()
 
     WaitObject aWait( pDocShell->GetActiveDialogParent() );		// wichtig wegen TrackFormulas bei UpdateReference
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
@@ -306,7 +306,7 @@ void __EXPORT ScUndoInsertCells::Redo()
 {
     WaitObject aWait( pDocShell->GetActiveDialogParent() );		// wichtig wegen TrackFormulas bei UpdateReference
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( sal_False );
     EndRedo();
 
     if ( pPasteUndo )
@@ -325,11 +325,11 @@ void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget)
             pPasteUndo->Repeat( rTarget );
         }
         else
-            ((ScTabViewTarget&)rTarget).GetViewShell()->InsertCells( eCmd, TRUE );
+            ((ScTabViewTarget&)rTarget).GetViewShell()->InsertCells( eCmd, sal_True );
     }
 }
 
-BOOL __EXPORT ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -388,7 +388,7 @@ void ScUndoDeleteCells::SetChangeTrack()
         nStartChangeAction = nEndChangeAction = 0;
 }
 
-void ScUndoDeleteCells::DoChange( const BOOL bUndo )
+void ScUndoDeleteCells::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     SCTAB i;
@@ -439,7 +439,7 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
     for( i=0; i<nCount && bUndo; i++ )
     {
         pRefUndoDoc->CopyToDocument( aEffRange.aStart.Col(), aEffRange.aStart.Row(), pTabs[i], aEffRange.aEnd.Col(), aEffRange.aEnd.Row(), pTabs[i]+pScenarios[i],
-            IDF_ALL | IDF_NOCAPTIONS, FALSE, pDoc );
+            IDF_ALL | IDF_NOCAPTIONS, sal_False, pDoc );
     }
 
     ScRange aWorkRange( aEffRange );
@@ -471,12 +471,12 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
 
             SCCOL nEndCol = aWorkRange.aEnd.Col();
             SCROW nEndRow = aWorkRange.aEnd.Row();
-            pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], TRUE );
+            pDoc->ExtendMerge( aWorkRange.aStart.Col(), aWorkRange.aStart.Row(), nEndCol, nEndRow, pTabs[i], sal_True );
         }
     }
 
     // Zeichnen
-    USHORT nPaint = PAINT_GRID;
+    sal_uInt16 nPaint = PAINT_GRID;
     switch (eCmd)
     {
         case DEL_DELROWS:
@@ -530,7 +530,7 @@ void __EXPORT ScUndoDeleteCells::Undo()
 {
     WaitObject aWait( pDocShell->GetActiveDialogParent() );		// wichtig wegen TrackFormulas bei UpdateReference
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 
@@ -549,7 +549,7 @@ void __EXPORT ScUndoDeleteCells::Redo()
 {
     WaitObject aWait( pDocShell->GetActiveDialogParent() );		// wichtig wegen TrackFormulas bei UpdateReference
     BeginRedo();
-    DoChange( FALSE);
+    DoChange( sal_False);
     EndRedo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 
@@ -561,10 +561,10 @@ void __EXPORT ScUndoDeleteCells::Redo()
 void __EXPORT ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( eCmd, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( eCmd, sal_True );
 }
 
-BOOL __EXPORT ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -576,7 +576,7 @@ BOOL __EXPORT ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoDeleteMulti::ScUndoDeleteMulti( ScDocShell* pNewDocShell,
-                                        BOOL bNewRows, BOOL bNeedsRefresh, SCTAB nNewTab,
+                                        sal_Bool bNewRows, sal_Bool bNeedsRefresh, SCTAB nNewTab,
                                         const SCCOLROW* pRng, SCCOLROW nRngCnt,
                                         ScDocument* pUndoDocument, ScRefUndoData* pRefData ) :
     ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFLAST ),
@@ -604,7 +604,7 @@ void ScUndoDeleteMulti::DoChange() const
 {
     SCCOL nStartCol;
     SCROW nStartRow;
-    USHORT nPaint;
+    sal_uInt16 nPaint;
     if (bRows)
     {
         nStartCol = 0;
@@ -624,7 +624,7 @@ void ScUndoDeleteMulti::DoChange() const
         SCCOL nEndCol = MAXCOL;
         SCROW nEndRow = MAXROW;
         pDoc->RemoveFlagsTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, SC_MF_HOR | SC_MF_VER );
-        pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab, TRUE );
+        pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab, sal_True );
     }
 
     pDocShell->PostPaint( nStartCol, nStartRow, nTab, MAXCOL, MAXROW, nTab, nPaint );
@@ -663,7 +663,7 @@ void ScUndoDeleteMulti::SetChangeTrack()
                 aRange.aStart.SetCol( static_cast<SCCOL>(nStart) );
                 aRange.aEnd.SetCol( static_cast<SCCOL>(nEnd) );
             }
-            ULONG nDummyStart;
+            sal_uLong nDummyStart;
             pChangeTrack->AppendDeleteRange( aRange, pRefUndoDoc,
                 nDummyStart, nEndChangeAction );
         }
@@ -699,10 +699,10 @@ void __EXPORT ScUndoDeleteMulti::Undo()
         SCCOLROW nStart = *(pOneRange++);
         SCCOLROW nEnd = *(pOneRange++);
         if (bRows)
-            pRefUndoDoc->CopyToDocument( 0,nStart,nTab, MAXCOL,nEnd,nTab, IDF_ALL,FALSE,pDoc );
+            pRefUndoDoc->CopyToDocument( 0,nStart,nTab, MAXCOL,nEnd,nTab, IDF_ALL,sal_False,pDoc );
         else
             pRefUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart),0,nTab,
-                    static_cast<SCCOL>(nEnd),MAXROW,nTab, IDF_ALL,FALSE,pDoc );
+                    static_cast<SCCOL>(nEnd),MAXROW,nTab, IDF_ALL,sal_False,pDoc );
     }
 
     ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
@@ -754,10 +754,10 @@ void __EXPORT ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget)
 {
     //	DeleteCells, falls einfache Selektion
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, sal_True );
 }
 
-BOOL __EXPORT ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -799,13 +799,13 @@ void ScUndoCut::SetChangeTrack()
         nStartChangeAction = nEndChangeAction = 0;
 }
 
-void ScUndoCut::DoChange( const BOOL bUndo )
+void ScUndoCut::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
 
     // do not undo/redo objects and note captions, they are handled via drawing undo
-    USHORT nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
+    sal_uInt16 nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
 
     if (bUndo)	// nur bei Undo
     {
@@ -814,7 +814,7 @@ void ScUndoCut::DoChange( const BOOL bUndo )
         ScRange aCopyRange = aExtendedRange;
         aCopyRange.aStart.SetTab(0);
         aCopyRange.aEnd.SetTab(nTabCount-1);
-        pUndoDoc->CopyToDocument( aCopyRange, nUndoFlags, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( aCopyRange, nUndoFlags, sal_False, pDoc );
         ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
         if ( pChangeTrack )
             pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
@@ -842,7 +842,7 @@ void ScUndoCut::DoChange( const BOOL bUndo )
 void __EXPORT ScUndoCut::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
@@ -850,19 +850,19 @@ void __EXPORT ScUndoCut::Redo()
 {
     BeginRedo();
     ScDocument* pDoc = pDocShell->GetDocument();
-    EnableDrawAdjust( pDoc, FALSE );				//! include in ScBlockUndo?
-    DoChange( FALSE );
-    EnableDrawAdjust( pDoc, TRUE );					//! include in ScBlockUndo?
+    EnableDrawAdjust( pDoc, sal_False );				//! include in ScBlockUndo?
+    DoChange( sal_False );
+    EnableDrawAdjust( pDoc, sal_True );					//! include in ScBlockUndo?
     EndRedo();
 }
 
 void __EXPORT ScUndoCut::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->CutToClip( NULL, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->CutToClip( NULL, sal_True );
 }
 
-BOOL __EXPORT ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -878,10 +878,10 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell,
                 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
                 const ScMarkData& rMark,
                 ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                USHORT nNewFlags,
+                sal_uInt16 nNewFlags,
                 ScRefUndoData* pRefData,
                 void* /* pFill1 */, void* /* pFill2 */, void* /* pFill3 */,
-                BOOL bRedoIsFilled, const ScUndoPasteOptions* pOptions ) :
+                sal_Bool bRedoIsFilled, const ScUndoPasteOptions* pOptions ) :
     ScBlockUndo( pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE ),
     aMarkData( rMark ),
     pUndoDoc( pNewUndoDoc ),
@@ -930,20 +930,20 @@ void ScUndoPaste::SetChangeTrack()
         nStartChangeAction = nEndChangeAction = 0;
 }
 
-void ScUndoPaste::DoChange( const BOOL bUndo )
+void ScUndoPaste::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
 
     //	RefUndoData for redo is created before first undo
     //	(with DeleteUnchanged after the DoUndo call)
-    BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
+    sal_Bool bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
     if ( bCreateRedoData )
         pRefRedoData = new ScRefUndoData( pDoc );
 
     ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData;
 
         //	fuer Undo immer alle oder keine Inhalte sichern
-    USHORT nUndoFlags = IDF_NONE;
+    sal_uInt16 nUndoFlags = IDF_NONE;
     if (nFlags & IDF_CONTENTS)
         nUndoFlags |= IDF_CONTENTS;
     if (nFlags & IDF_ATTRIB)
@@ -952,7 +952,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
     // do not undo/redo objects and note captions, they are handled via drawing undo
     (nUndoFlags &= ~IDF_OBJECTS) |= IDF_NOCAPTIONS;
 
-    BOOL bPaintAll = FALSE;
+    sal_Bool bPaintAll = sal_False;
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
@@ -964,8 +964,8 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
     {
         if (!pRedoDoc)
         {
-            BOOL bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW );
-            BOOL bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL );
+            sal_Bool bColInfo = ( aBlockRange.aStart.Row()==0 && aBlockRange.aEnd.Row()==MAXROW );
+            sal_Bool bRowInfo = ( aBlockRange.aStart.Col()==0 && aBlockRange.aEnd.Col()==MAXCOL );
 
             pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
             pRedoDoc->InitUndoSelected( pDoc, aMarkData, bColInfo, bRowInfo );
@@ -975,11 +975,11 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
         ScRange aCopyRange = aBlockRange;
         aCopyRange.aStart.SetTab(0);
         aCopyRange.aEnd.SetTab(nTabCount-1);
-        pDoc->CopyToDocument( aCopyRange, nUndoFlags, FALSE, pRedoDoc );
-        bRedoFilled = TRUE;
+        pDoc->CopyToDocument( aCopyRange, nUndoFlags, sal_False, pRedoDoc );
+        bRedoFilled = sal_True;
     }
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocShell->UpdatePaintExt( nExtFlags, aBlockRange );
 
     aMarkData.MarkToMulti();
@@ -994,21 +994,21 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
     {
         aTabSelectRange.aStart.SetTab( nFirstSelected );
         aTabSelectRange.aEnd.SetTab( nFirstSelected );
-        pRedoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, FALSE, pDoc );
+        pRedoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, sal_False, pDoc );
         for (nTab=0; nTab<nTabCount; nTab++)
             if (nTab != nFirstSelected && aMarkData.GetTableSelect(nTab))
             {
                 aTabSelectRange.aStart.SetTab( nTab );
                 aTabSelectRange.aEnd.SetTab( nTab );
-                pRedoDoc->CopyToDocument( aTabSelectRange, nUndoFlags, FALSE, pDoc );
+                pRedoDoc->CopyToDocument( aTabSelectRange, nUndoFlags, sal_False, pDoc );
             }
     }
 
     if (pWorkRefData)
     {
-        pWorkRefData->DoUndo( pDoc, TRUE );		// TRUE = bSetChartRangeLists for SetChartListenerCollection
+        pWorkRefData->DoUndo( pDoc, sal_True );		// sal_True = bSetChartRangeLists for SetChartListenerCollection
         if ( pDoc->RefreshAutoFilter( 0,0, MAXCOL,MAXROW, aBlockRange.aStart.Tab() ) )
-            bPaintAll = TRUE;
+            bPaintAll = sal_True;
     }
 
     if ( bCreateRedoData && pRefRedoData )
@@ -1018,13 +1018,13 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
     {
         aTabSelectRange.aStart.SetTab( nFirstSelected );
         aTabSelectRange.aEnd.SetTab( nFirstSelected );
-        pUndoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, FALSE, pDoc );
+        pUndoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, sal_False, pDoc );
         for (nTab=0; nTab<nTabCount; nTab++)
             if (nTab != nFirstSelected && aMarkData.GetTableSelect(nTab))
             {
                 aTabSelectRange.aStart.SetTab( nTab );
                 aTabSelectRange.aEnd.SetTab( nTab );
-                pUndoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, FALSE, pDoc );
+                pUndoDoc->UndoToDocument( aTabSelectRange, nUndoFlags, sal_False, pDoc );
             }
     }
 
@@ -1038,8 +1038,8 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
         SetChangeTrack();
 
     ScRange aDrawRange( aBlockRange );
-    pDoc->ExtendMerge( aDrawRange, TRUE );      // only needed for single sheet (text/rtf etc.)
-    USHORT nPaint = PAINT_GRID;
+    pDoc->ExtendMerge( aDrawRange, sal_True );      // only needed for single sheet (text/rtf etc.)
+    sal_uInt16 nPaint = PAINT_GRID;
     if (bPaintAll)
     {
         aDrawRange.aStart.SetCol(0);
@@ -1048,7 +1048,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
         aDrawRange.aEnd.SetRow(MAXROW);
         nPaint |= PAINT_TOP | PAINT_LEFT;
 /*A*/	if (pViewShell)
-            pViewShell->AdjustBlockHeight(FALSE);
+            pViewShell->AdjustBlockHeight(sal_False);
     }
     else
     {
@@ -1062,7 +1062,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
             nPaint |= PAINT_LEFT;
             aDrawRange.aEnd.SetRow(MAXROW);
         }
-/*A*/	if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
+/*A*/	if ((pViewShell) && pViewShell->AdjustBlockHeight(sal_False))
         {
             aDrawRange.aStart.SetCol(0);
             aDrawRange.aStart.SetRow(0);
@@ -1086,7 +1086,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
 void __EXPORT ScUndoPaste::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     ShowTable( aBlockRange );
     EndUndo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -1096,9 +1096,9 @@ void __EXPORT ScUndoPaste::Redo()
 {
     BeginRedo();
     ScDocument* pDoc = pDocShell->GetDocument();
-    EnableDrawAdjust( pDoc, FALSE );				//! include in ScBlockUndo?
-    DoChange( FALSE );
-    EnableDrawAdjust( pDoc, TRUE );					//! include in ScBlockUndo?
+    EnableDrawAdjust( pDoc, sal_False );				//! include in ScBlockUndo?
+    DoChange( sal_False );
+    EnableDrawAdjust( pDoc, sal_True );					//! include in ScBlockUndo?
     EndRedo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
 }
@@ -1116,12 +1116,12 @@ void __EXPORT ScUndoPaste::Repeat(SfxRepeatTarget& rTarget)
             pViewSh->PasteFromClip( nFlags, pOwnClip->GetDocument(),
                                     aPasteOptions.nFunction, aPasteOptions.bSkipEmpty, aPasteOptions.bTranspose,
                                     aPasteOptions.bAsLink, aPasteOptions.eMoveMode, IDF_NONE,
-                                    TRUE );		// allow warning dialog
+                                    sal_True );		// allow warning dialog
         }
     }
 }
 
-BOOL __EXPORT ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1133,8 +1133,8 @@ BOOL __EXPORT ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
-                    const ScRange& rRange, ScAddress aNewDestPos, BOOL bNewCut,
-                    ScDocument* pUndoDocument, ScRefUndoData* pRefData, BOOL bScenario ) :
+                    const ScRange& rRange, ScAddress aNewDestPos, sal_Bool bNewCut,
+                    ScDocument* pUndoDocument, ScRefUndoData* pRefData, sal_Bool bScenario ) :
     ScMoveUndo( pNewDocShell, pUndoDocument, pRefData, SC_UNDO_REFFIRST ),
     aSrcRange( rRange ),
     bCut( bNewCut ),
@@ -1145,7 +1145,7 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
     aDestEnd.IncCol(aSrcRange.aEnd.Col() - aSrcRange.aStart.Col());
     aDestEnd.IncTab(aSrcRange.aEnd.Tab() - aSrcRange.aStart.Tab());
 
-    BOOL bIncludeFiltered = bCut;
+    sal_Bool bIncludeFiltered = bCut;
     if ( !bIncludeFiltered )
     {
         // find number of non-filtered rows
@@ -1193,9 +1193,9 @@ void ScUndoDragDrop::SetChangeTrack()
         nStartChangeAction = nEndChangeAction = 0;
 }
 
-void ScUndoDragDrop::PaintArea( ScRange aRange, USHORT nExtFlags ) const
+void ScUndoDragDrop::PaintArea( ScRange aRange, sal_uInt16 nExtFlags ) const
 {
-    USHORT nPaint = PAINT_GRID;
+    sal_uInt16 nPaint = PAINT_GRID;
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     ScDocument* pDoc = pDocShell->GetDocument();
 
@@ -1208,7 +1208,7 @@ void ScUndoDragDrop::PaintArea( ScRange aRange, USHORT nExtFlags ) const
                                      aRange.aStart.Tab(), 0, &aVirtDev,
                                      pViewData->GetPPTX(),  pViewData->GetPPTY(),
                                      pViewData->GetZoomX(), pViewData->GetZoomY(),
-                                     FALSE ) )
+                                     sal_False ) )
         {
             aRange.aStart.SetCol(0);
             aRange.aEnd.SetCol(MAXCOL);
@@ -1255,16 +1255,16 @@ void ScUndoDragDrop::DoUndo( ScRange aRange ) const
     ScRange aPaintRange = aRange;
     pDoc->ExtendMerge( aPaintRange );			// before deleting
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocShell->UpdatePaintExt( nExtFlags, aPaintRange );
 
     // do not undo objects and note captions, they are handled via drawing undo
-    USHORT nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
+    sal_uInt16 nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
 
     pDoc->DeleteAreaTab( aRange, nUndoFlags );
-    pRefUndoDoc->CopyToDocument( aRange, nUndoFlags, FALSE, pDoc );
+    pRefUndoDoc->CopyToDocument( aRange, nUndoFlags, sal_False, pDoc );
     if ( pDoc->HasAttrib( aRange, HASATTR_MERGED ) )
-        pDoc->ExtendMerge( aRange, TRUE );
+        pDoc->ExtendMerge( aRange, sal_True );
 
     aPaintRange.aEnd.SetCol( Max( aPaintRange.aEnd.Col(), aRange.aEnd.Col() ) );
     aPaintRange.aEnd.SetRow( Max( aPaintRange.aEnd.Row(), aRange.aEnd.Row() ) );
@@ -1290,10 +1290,10 @@ void __EXPORT ScUndoDragDrop::Redo()
     ScDocument* pDoc = pDocShell->GetDocument();
     ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
 
-    EnableDrawAdjust( pDoc, FALSE );				//! include in ScBlockUndo?
+    EnableDrawAdjust( pDoc, sal_False );				//! include in ScBlockUndo?
 
     // do not undo/redo objects and note captions, they are handled via drawing undo
-    USHORT nRedoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
+    sal_uInt16 nRedoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
 
     /*  TODO: Redoing note captions is quite tricky due to the fact that a
         helper clip document is used. While (re-)pasting the contents to the
@@ -1311,7 +1311,7 @@ void __EXPORT ScUndoDragDrop::Redo()
     SCTAB nTab;
     ScMarkData aSourceMark;
     for (nTab=aSrcRange.aStart.Tab(); nTab<=aSrcRange.aEnd.Tab(); nTab++)
-        aSourceMark.SelectTable( nTab, TRUE );
+        aSourceMark.SelectTable( nTab, sal_True );
 
     // do not clone objects and note captions into clipdoc (see above)
     ScClipParam aClipParam(aSrcRange, bCut);
@@ -1321,7 +1321,7 @@ void __EXPORT ScUndoDragDrop::Redo()
     {
         ScRange aSrcPaintRange = aSrcRange;
         pDoc->ExtendMerge( aSrcPaintRange );			// before deleting
-        USHORT nExtFlags = 0;
+        sal_uInt16 nExtFlags = 0;
         pDocShell->UpdatePaintExt( nExtFlags, aSrcPaintRange );
         pDoc->DeleteAreaTab( aSrcRange, nRedoFlags );
         PaintArea( aSrcPaintRange, nExtFlags );
@@ -1329,11 +1329,11 @@ void __EXPORT ScUndoDragDrop::Redo()
 
     ScMarkData aDestMark;
     for (nTab=aDestRange.aStart.Tab(); nTab<=aDestRange.aEnd.Tab(); nTab++)
-        aDestMark.SelectTable( nTab, TRUE );
+        aDestMark.SelectTable( nTab, sal_True );
 
-    BOOL bIncludeFiltered = bCut;
+    sal_Bool bIncludeFiltered = bCut;
     // TODO: restore old note captions instead of cloning new captions...
-    pDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL & ~IDF_OBJECTS, NULL, pClipDoc, TRUE, FALSE, bIncludeFiltered );
+    pDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL & ~IDF_OBJECTS, NULL, pClipDoc, sal_True, sal_False, bIncludeFiltered );
 
     if (bCut)
         for (nTab=aSrcRange.aStart.Tab(); nTab<=aSrcRange.aEnd.Tab(); nTab++)
@@ -1342,14 +1342,14 @@ void __EXPORT ScUndoDragDrop::Redo()
 
     // skipped rows and merged cells don't mix
     if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
-        pDocShell->GetDocFunc().UnmergeCells( aDestRange, FALSE, TRUE );
+        pDocShell->GetDocFunc().UnmergeCells( aDestRange, sal_False, sal_True );
 
     for (nTab=aDestRange.aStart.Tab(); nTab<=aDestRange.aEnd.Tab(); nTab++)
     {
         SCCOL nEndCol = aDestRange.aEnd.Col();
         SCROW nEndRow = aDestRange.aEnd.Row();
         pDoc->ExtendMerge( aDestRange.aStart.Col(), aDestRange.aStart.Row(),
-                            nEndCol, nEndRow, nTab, TRUE );
+                            nEndCol, nEndRow, nTab, sal_True );
         PaintArea( ScRange( aDestRange.aStart.Col(), aDestRange.aStart.Row(), nTab,
                             nEndCol, nEndRow, nTab ), 0 );
     }
@@ -1360,7 +1360,7 @@ void __EXPORT ScUndoDragDrop::Redo()
     ShowTable( aDestRange.aStart.Tab() );
 
     RedoSdrUndoAction( pDrawUndo );             //! include in ScBlockUndo?
-    EnableDrawAdjust( pDoc, TRUE );				//! include in ScBlockUndo?
+    EnableDrawAdjust( pDoc, sal_True );				//! include in ScBlockUndo?
 
     EndRedo();
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -1370,9 +1370,9 @@ void __EXPORT ScUndoDragDrop::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL __EXPORT ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;			// geht nicht
+    return sal_False;			// geht nicht
 }
 
 
@@ -1406,7 +1406,7 @@ void ScUndoListNames::DoChange( ScDocument* pSrcDoc ) const
     ScDocument* pDoc = pDocShell->GetDocument();
 
     pDoc->DeleteAreaTab( aBlockRange, IDF_ALL );
-    pSrcDoc->CopyToDocument( aBlockRange, IDF_ALL, FALSE, pDoc );
+    pSrcDoc->CopyToDocument( aBlockRange, IDF_ALL, sal_False, pDoc );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID );
     pDocShell->PostDataChanged();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -1434,7 +1434,7 @@ void __EXPORT ScUndoListNames::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->InsertNameList();
 }
 
-BOOL __EXPORT ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1487,10 +1487,10 @@ void __EXPORT ScUndoUseScenario::Undo()
 
     ScDocument* pDoc = pDocShell->GetDocument();
     pDoc->DeleteSelection( IDF_ALL, aMarkData );
-    pUndoDoc->CopyToDocument( aRange, IDF_ALL, TRUE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aRange, IDF_ALL, sal_True, pDoc, &aMarkData );
 
     //	Szenario-Tabellen
-    BOOL bFrame = FALSE;
+    sal_Bool bFrame = sal_False;
     SCTAB nTab = aRange.aStart.Tab();
     SCTAB nEndTab = nTab;
     while ( pUndoDoc->HasTable(nEndTab+1) && pUndoDoc->IsScenario(nEndTab+1) )
@@ -1500,19 +1500,19 @@ void __EXPORT ScUndoUseScenario::Undo()
         //	Flags immer
         String aComment;
         Color  aColor;
-        USHORT nScenFlags;
+        sal_uInt16 nScenFlags;
         pUndoDoc->GetScenarioData( i, aComment, aColor, nScenFlags );
         pDoc->SetScenarioData( i, aComment, aColor, nScenFlags );
-        BOOL bActive = pUndoDoc->IsActiveScenario( i );
+        sal_Bool bActive = pUndoDoc->IsActiveScenario( i );
         pDoc->SetActiveScenario( i, bActive );
         //	Bei Zurueckkopier-Szenarios auch Inhalte
         if ( nScenFlags & SC_SCENARIO_TWOWAY )
         {
             pDoc->DeleteAreaTab( 0,0, MAXCOL,MAXROW, i, IDF_ALL );
-            pUndoDoc->CopyToDocument( 0,0,i, MAXCOL,MAXROW,i, IDF_ALL,FALSE, pDoc );
+            pUndoDoc->CopyToDocument( 0,0,i, MAXCOL,MAXROW,i, IDF_ALL,sal_False, pDoc );
         }
         if ( nScenFlags & SC_SCENARIO_SHOWFRAME )
-            bFrame = TRUE;
+            bFrame = sal_True;
     }
 
     //	Wenn sichtbare Rahmen, dann alles painten
@@ -1542,7 +1542,7 @@ void __EXPORT ScUndoUseScenario::Redo()
         pViewShell->InitOwnBlockMode();
     }
 
-    pDocShell->UseScenario( nTab, aName, FALSE );
+    pDocShell->UseScenario( nTab, aName, sal_False );
 
     EndRedo();
 }
@@ -1556,14 +1556,14 @@ void __EXPORT ScUndoUseScenario::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL __EXPORT ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     if (rTarget.ISA(ScTabViewTarget))
     {
         ScViewData* pViewData = ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData();
         return !pViewData->GetDocument()->IsScenario( pViewData->GetTabNo() );
     }
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1597,19 +1597,17 @@ String __EXPORT ScUndoSelectionStyle::GetComment() const
     return ScGlobal::GetRscString( STR_UNDO_APPLYCELLSTYLE );
 }
 
-void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
+void ScUndoSelectionStyle::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    if (pViewShell)
-        pViewShell->SetMarkData( aMarkData );
+    SetViewMarkData( aMarkData );
 
     ScRange aWorkRange( aRange );
     if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) )		// zusammengefasste Zellen?
-        pDoc->ExtendMerge( aWorkRange, TRUE );
+        pDoc->ExtendMerge( aWorkRange, sal_True );
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
 
     if (bUndo)		// bei Undo alte Daten wieder reinschubsen
@@ -1618,7 +1616,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
         ScRange aCopyRange = aWorkRange;
         aCopyRange.aStart.SetTab(0);
         aCopyRange.aEnd.SetTab(nTabCount-1);
-        pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
+        pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData );
     }
     else			// bei Redo Style wieder zuweisen
     {
@@ -1635,6 +1633,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
 
     pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
 /*A*/	pDocShell->PostPaint( aWorkRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
 
@@ -1644,14 +1643,14 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
 void __EXPORT ScUndoSelectionStyle::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
 void __EXPORT ScUndoSelectionStyle::Redo()
 {
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( sal_False );
     EndRedo();
 }
 
@@ -1670,16 +1669,16 @@ void __EXPORT ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget)
         }
 
         ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
-        rViewShell.SetStyleSheetToMarked( pStyleSheet, TRUE );
+        rViewShell.SetStyleSheetToMarked( pStyleSheet, sal_True );
     }
 }
 
-BOOL __EXPORT ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
 
-USHORT __EXPORT ScUndoSelectionStyle::GetId() const
+sal_uInt16 __EXPORT ScUndoSelectionStyle::GetId() const
 {
     return STR_UNDO_APPLYCELLSTYLE;
 }
@@ -1727,7 +1726,7 @@ void __EXPORT ScUndoEnterMatrix::Undo()
     ScDocument* pDoc = pDocShell->GetDocument();
 
     pDoc->DeleteAreaTab( aBlockRange, IDF_ALL & ~IDF_NOTE );
-    pUndoDoc->CopyToDocument( aBlockRange, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+    pUndoDoc->CopyToDocument( aBlockRange, IDF_ALL & ~IDF_NOTE, sal_False, pDoc );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID );
     pDocShell->PostDataChanged();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -1770,7 +1769,7 @@ void __EXPORT ScUndoEnterMatrix::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL __EXPORT ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1790,7 +1789,7 @@ ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
 }
 
 ScUndoIndent::ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark,
-                            ScDocument* pNewUndoDoc, BOOL bIncrement ) :
+                            ScDocument* pNewUndoDoc, sal_Bool bIncrement ) :
     ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
     aMarkData( rMark ),
     pUndoDoc( pNewUndoDoc ),
@@ -1805,7 +1804,7 @@ __EXPORT ScUndoIndent::~ScUndoIndent()
 
 String __EXPORT ScUndoIndent::GetComment() const
 {
-    USHORT nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
+    sal_uInt16 nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT;
     return ScGlobal::GetRscString( nId );
 }
 
@@ -1818,7 +1817,7 @@ void __EXPORT ScUndoIndent::Undo()
     ScRange aCopyRange = aBlockRange;
     aCopyRange.aStart.SetTab(0);
     aCopyRange.aEnd.SetTab(nTabCount-1);
-    pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
 
     EndUndo();
@@ -1841,7 +1840,7 @@ void __EXPORT ScUndoIndent::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->ChangeIndent( bIsIncrement );
 }
 
-BOOL __EXPORT ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1879,7 +1878,7 @@ void __EXPORT ScUndoTransliterate::Undo()
     ScRange aCopyRange = aBlockRange;
     aCopyRange.aStart.SetTab(0);
     aCopyRange.aEnd.SetTab(nTabCount-1);
-    pUndoDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, TRUE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aCopyRange, IDF_CONTENTS, sal_True, pDoc, &aMarkData );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
 
     EndUndo();
@@ -1902,7 +1901,7 @@ void __EXPORT ScUndoTransliterate::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->TransliterateText( nTransliterationType );
 }
 
-BOOL __EXPORT ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1913,7 +1912,7 @@ BOOL __EXPORT ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
-                            ScDocument* pNewUndoDoc, const USHORT* pW ) :
+                            ScDocument* pNewUndoDoc, const sal_uInt16* pW ) :
     ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
     aMarkData( rMark ),
     pUndoDoc( pNewUndoDoc ),
@@ -1921,11 +1920,11 @@ ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData&
 {
     DBG_ASSERT( pW, "ScUndoClearItems: Which-Pointer ist 0" );
 
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     while ( pW[nCount] )
         ++nCount;
-    pWhich = new USHORT[nCount+1];
-    for (USHORT i=0; i<=nCount; i++)
+    pWhich = new sal_uInt16[nCount+1];
+    for (sal_uInt16 i=0; i<=nCount; i++)
         pWhich[i] = pW[i];
 }
 
@@ -1945,7 +1944,7 @@ void __EXPORT ScUndoClearItems::Undo()
     BeginUndo();
 
     ScDocument* pDoc = pDocShell->GetDocument();
-    pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
 
     EndUndo();
@@ -1968,11 +1967,11 @@ void __EXPORT ScUndoClearItems::Repeat(SfxRepeatTarget& rTarget)
     {
         ScViewData* pViewData = ((ScTabViewTarget&)rTarget).GetViewShell()->GetViewData();
         ScDocFunc aFunc(*pViewData->GetDocShell());
-        aFunc.ClearItems( pViewData->GetMarkData(), pWhich, FALSE );
+        aFunc.ClearItems( pViewData->GetMarkData(), pWhich, sal_False );
     }
 }
 
-BOOL __EXPORT ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -2007,9 +2006,9 @@ void __EXPORT ScUndoRemoveBreaks::Undo()
     ScDocument* pDoc = pDocShell->GetDocument();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, FALSE, pDoc );
+    pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, sal_False, pDoc );
     if (pViewShell)
-        pViewShell->UpdatePageBreakData( TRUE );
+        pViewShell->UpdatePageBreakData( sal_True );
     pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
 
     EndUndo();
@@ -2025,7 +2024,7 @@ void __EXPORT ScUndoRemoveBreaks::Redo()
     pDoc->RemoveManualBreaks(nTab);
     pDoc->UpdatePageBreaks(nTab);
     if (pViewShell)
-        pViewShell->UpdatePageBreakData( TRUE );
+        pViewShell->UpdatePageBreakData( sal_True );
     pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
 
     EndRedo();
@@ -2040,7 +2039,7 @@ void __EXPORT ScUndoRemoveBreaks::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -2077,9 +2076,9 @@ void __EXPORT ScUndoRemoveMerge::Undo()
     pUndoDoc->ExtendMerge( aExtended );
 
     pDoc->DeleteAreaTab( aExtended, IDF_ATTRIB );
-    pUndoDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pDoc );
+    pUndoDoc->CopyToDocument( aExtended, IDF_ATTRIB, sal_False, pDoc );
 
-    BOOL bDidPaint = FALSE;
+    sal_Bool bDidPaint = sal_False;
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if ( pViewShell )
     {
@@ -2116,11 +2115,11 @@ void __EXPORT ScUndoRemoveMerge::Redo()
                             aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab,
                             SC_MF_HOR | SC_MF_VER );
 
-    pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
+    pDoc->ExtendMerge( aRefresh, sal_True, sal_False );
 
     //	Paint
 
-    BOOL bDidPaint = FALSE;
+    sal_Bool bDidPaint = sal_False;
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if ( pViewShell )
     {
@@ -2139,7 +2138,7 @@ void __EXPORT ScUndoRemoveMerge::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveMerge();
 }
 
-BOOL __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -2152,8 +2151,8 @@ BOOL __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
 ScRange lcl_TotalRange( const ScRangeList& rRanges )
 {
     ScRange aTotal;
-    ULONG nCount = rRanges.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = rRanges.Count();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         ScRange aRange = *rRanges.GetObject(i);
         if (i==0)
@@ -2207,8 +2206,8 @@ void __EXPORT ScUndoBorder::Undo()
 
     ScDocument* pDoc = pDocShell->GetDocument();
     ScMarkData aMarkData;
-    aMarkData.MarkFromRangeList( *pRanges, FALSE );
-    pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
+    aMarkData.MarkFromRangeList( *pRanges, sal_False );
+    pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, sal_True, pDoc, &aMarkData );
     pDocShell->PostPaint( aBlockRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
 
     EndUndo();
@@ -2219,8 +2218,8 @@ void __EXPORT ScUndoBorder::Redo()
     BeginRedo();
 
     ScDocument* pDoc = pDocShell->GetDocument();		//! Funktion an docfunc aufrufen
-    ULONG nCount = pRanges->Count();
-    ULONG i;
+    sal_uLong nCount = pRanges->Count();
+    sal_uLong i;
     for (i=0; i<nCount; i++)
     {
         ScRange aRange = *pRanges->GetObject(i);
@@ -2228,7 +2227,7 @@ void __EXPORT ScUndoBorder::Redo()
 
         ScMarkData aMark;
         aMark.SetMarkArea( aRange );
-        aMark.SelectTable( nTab, TRUE );
+        aMark.SelectTable( nTab, sal_True );
 
         pDoc->ApplySelectionFrame( aMark, pOuter, pInner );
     }
@@ -2243,9 +2242,9 @@ void __EXPORT ScUndoBorder::Repeat(SfxRepeatTarget& /* rTarget */)
     //!	spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist)
 }
 
-BOOL __EXPORT ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;	// s.o.
+    return sal_False;	// s.o.
 }
 
 
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index bf9540ce7..c4437af8d 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -67,7 +67,7 @@ ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
                 SCCOLROW nNewStart, SCTAB nNewStartTab, SCCOLROW nNewEnd, SCTAB nNewEndTab,
                 ScDocument* pNewUndoDoc, SCCOLROW nNewCnt, SCCOLROW* pNewRanges,
                 ScOutlineTable* pNewUndoTab,
-                ScSizeMode eNewMode, USHORT nNewSizeTwips, BOOL bNewWidth ) :
+                ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips, sal_Bool bNewWidth ) :
     ScSimpleUndo( pNewDocShell ),
     aMarkData( rMark ),
     nStart( nNewStart ),
@@ -113,18 +113,13 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
     BeginUndo();
 
     ScDocument* pDoc = pDocShell->GetDocument();
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
     SCCOLROW nPaintStart = nStart > 0 ? nStart-1 : static_cast<SCCOLROW>(0);
 
     if (eMode==SC_SIZE_OPTIMAL)
     {
-        if (pViewShell)
-        {
-            pViewShell->SetMarkData( aMarkData );
-
+        if ( SetViewMarkData( aMarkData ) )
             nPaintStart = 0;		// paint all, because of changed selection
-        }
     }
 
     //!	outlines from all tables?
@@ -140,14 +135,14 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
             {
                 pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
                         static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE,
-                        FALSE, pDoc );
+                        sal_False, pDoc );
                 pDoc->UpdatePageBreaks( nTab );
                 pDocShell->PostPaint( static_cast<SCCOL>(nPaintStart), 0, nTab,
                         MAXCOL, MAXROW, nTab, PAINT_GRID | PAINT_TOP );
             }
             else		// Height
             {
-                pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pDoc );
+                pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, sal_False, pDoc );
                 pDoc->UpdatePageBreaks( nTab );
                 pDocShell->PostPaint( 0, nPaintStart, nTab, MAXCOL, MAXROW, nTab, PAINT_GRID | PAINT_LEFT );
             }
@@ -155,6 +150,7 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
 
     DoSdrUndoAction( pDrawUndo, pDoc );
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
         pViewShell->UpdateScrollBars();
@@ -171,19 +167,14 @@ void __EXPORT ScUndoWidthOrHeight::Redo()
 {
     BeginRedo();
 
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-
-    BOOL bPaintAll = FALSE;
+    sal_Bool bPaintAll = sal_False;
     if (eMode==SC_SIZE_OPTIMAL)
     {
-        if (pViewShell)
-        {
-            pViewShell->SetMarkData( aMarkData );
-
-            bPaintAll = TRUE;		// paint all, because of changed selection
-        }
+        if ( SetViewMarkData( aMarkData ) )
+            bPaintAll = sal_True;		// paint all, because of changed selection
     }
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
         SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
@@ -192,7 +183,8 @@ void __EXPORT ScUndoWidthOrHeight::Redo()
     }
 
     // SetWidthOrHeight aendert aktuelle Tabelle !
-    pViewShell->SetWidthOrHeight( bWidth, nRangeCnt, pRanges, eMode, nNewSize, FALSE, TRUE, &aMarkData );
+    if ( pViewShell )
+        pViewShell->SetWidthOrHeight( bWidth, nRangeCnt, pRanges, eMode, nNewSize, sal_False, sal_True, &aMarkData );
 
     // paint grid if selection was changed directly at the MarkData
     if (bPaintAll)
@@ -204,10 +196,10 @@ void __EXPORT ScUndoWidthOrHeight::Redo()
 void __EXPORT ScUndoWidthOrHeight::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->SetMarkedWidthOrHeight( bWidth, eMode, nNewSize, sal_True );
 }
 
-BOOL __EXPORT ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoWidthOrHeight::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 0a6325198..274b1f2d7 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -92,8 +92,8 @@ TYPEINIT1(ScUndoUpdateAreaLink,		SfxUndoAction);
 ScUndoDeleteContents::ScUndoDeleteContents(
                 ScDocShell* pNewDocShell,
                 const ScMarkData& rMark, const ScRange& rRange,
-                ScDocument* pNewUndoDoc, BOOL bNewMulti,
-                USHORT nNewFlags, BOOL bObjects )
+                ScDocument* pNewUndoDoc, sal_Bool bNewMulti,
+                sal_uInt16 nNewFlags, sal_Bool bObjects )
         //
     :	ScSimpleUndo( pNewDocShell ),
         //
@@ -144,19 +144,17 @@ void ScUndoDeleteContents::SetChangeTrack()
 
 //----------------------------------------------------------------------------
 
-void ScUndoDeleteContents::DoChange( const BOOL bUndo )
+void ScUndoDeleteContents::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    if (pViewShell)
-        pViewShell->SetMarkData( aMarkData );
+    SetViewMarkData( aMarkData );
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
 
     if (bUndo)	// nur Undo
     {
-        USHORT nUndoFlags = IDF_NONE;		//	entweder alle oder keine Inhalte kopieren
+        sal_uInt16 nUndoFlags = IDF_NONE;		//	entweder alle oder keine Inhalte kopieren
         if (nFlags & IDF_CONTENTS)			//	(es sind nur die richtigen ins UndoDoc kopiert worden)
             nUndoFlags |= IDF_CONTENTS;
         if (nFlags & IDF_ATTRIB)
@@ -188,13 +186,14 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
         aMarkData.MarkToMulti();
         RedoSdrUndoAction( pDrawUndo );
         // do not delete objects and note captions, they have been removed via drawing undo
-        USHORT nRedoFlags = (nFlags & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
+        sal_uInt16 nRedoFlags = (nFlags & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
         pDoc->DeleteSelection( nRedoFlags, aMarkData );
         aMarkData.MarkToSimple();
 
         SetChangeTrack();
     }
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if ( !( (pViewShell) && pViewShell->AdjustRowHeight(
                                 aRange.aStart.Row(), aRange.aEnd.Row() ) ) )
 /*A*/	pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
@@ -212,7 +211,7 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
 void __EXPORT ScUndoDeleteContents::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 
     // #i97876# Spreadsheet data changes are not notified
@@ -231,7 +230,7 @@ void __EXPORT ScUndoDeleteContents::Undo()
 void __EXPORT ScUndoDeleteContents::Redo()
 {
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( sal_False );
     EndRedo();
 
     // #i97876# Spreadsheet data changes are not notified
@@ -250,13 +249,13 @@ void __EXPORT ScUndoDeleteContents::Redo()
 void __EXPORT ScUndoDeleteContents::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteContents( nFlags, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->DeleteContents( nFlags, sal_True );
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -274,8 +273,8 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
                 const ScMarkData& rMark,
                 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc,
-                USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink )
+                ScDocument* pNewUndoDoc, sal_Bool bNewMulti, SCTAB nSrc,
+                sal_uInt16 nFlg, sal_uInt16 nFunc, sal_Bool bSkip, sal_Bool bLink )
         //
     :	ScSimpleUndo( pNewDocShell ),
         //
@@ -317,7 +316,7 @@ void ScUndoFillTable::SetChangeTrack()
         SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount();
         ScRange aWorkRange(aRange);
         nStartChangeAction = 0;
-        ULONG nTmpAction;
+        sal_uLong nTmpAction;
         for ( SCTAB i = 0; i < nTabCount; i++ )
         {
             if (i != nSrcTab && aMarkData.GetTableSelect(i))
@@ -338,13 +337,11 @@ void ScUndoFillTable::SetChangeTrack()
 
 //----------------------------------------------------------------------------
 
-void ScUndoFillTable::DoChange( const BOOL bUndo )
+void ScUndoFillTable::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    if (pViewShell)
-        pViewShell->SetMarkData( aMarkData );
+    SetViewMarkData( aMarkData );
 
     if (bUndo)	// nur Undo
     {
@@ -379,6 +376,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
 
     //	CellContentChanged kommt mit der Markierung
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
         SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
@@ -395,7 +393,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
 void __EXPORT ScUndoFillTable::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
@@ -405,7 +403,7 @@ void __EXPORT ScUndoFillTable::Undo()
 void __EXPORT ScUndoFillTable::Redo()
 {
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( sal_False );
     EndRedo();
 }
 
@@ -421,7 +419,7 @@ void __EXPORT ScUndoFillTable::Repeat(SfxRepeatTarget& rTarget)
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -438,7 +436,7 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
                 const ScMarkData& rMark,
                 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                ScDocument* pNewUndoDoc, BOOL bNewMulti,
+                ScDocument* pNewUndoDoc, sal_Bool bNewMulti,
                 const ScPatternAttr* pNewApply,
                 const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner )
         //
@@ -482,19 +480,17 @@ String __EXPORT ScUndoSelectionAttr::GetComment() const
 
 //----------------------------------------------------------------------------
 
-void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
+void ScUndoSelectionAttr::DoChange( const sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    if (pViewShell)
-        pViewShell->SetMarkData( aMarkData );
+    SetViewMarkData( aMarkData );
 
     ScRange aEffRange( aRange );
     if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) )			// zusammengefasste Zellen?
         pDoc->ExtendMerge( aEffRange );
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocShell->UpdatePaintExt( nExtFlags, aEffRange );
 
     if (bUndo)	// nur bei Undo
@@ -515,6 +511,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
             pDoc->ApplySelectionFrame( aMarkData, pLineOuter, pLineInner );
     }
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
 /*A*/	pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
 
@@ -527,7 +524,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
 void __EXPORT ScUndoSelectionAttr::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
@@ -537,7 +534,7 @@ void __EXPORT ScUndoSelectionAttr::Undo()
 void __EXPORT ScUndoSelectionAttr::Redo()
 {
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( sal_False );
     EndRedo();
 }
 
@@ -550,16 +547,16 @@ void __EXPORT ScUndoSelectionAttr::Repeat(SfxRepeatTarget& rTarget)
     {
         ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
         if (pLineOuter)
-            rViewShell.ApplyPatternLines( *pApplyPattern, pLineOuter, pLineInner, TRUE );
+            rViewShell.ApplyPatternLines( *pApplyPattern, pLineOuter, pLineInner, sal_True );
         else
-            rViewShell.ApplySelectionPattern( *pApplyPattern, TRUE );
+            rViewShell.ApplySelectionPattern( *pApplyPattern, sal_True );
     }
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -577,7 +574,7 @@ ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell,
                 ScDocument* pNewUndoDoc, const ScMarkData& rMark,
                 FillDir eNewFillDir, FillCmd eNewFillCmd, FillDateCmd eNewFillDateCmd,
                 double fNewStartValue, double fNewStepValue, double fNewMaxValue,
-                USHORT nMaxShIndex )
+                sal_uInt16 nMaxShIndex )
         //
     :	ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
         //
@@ -641,12 +638,12 @@ void __EXPORT ScUndoAutoFill::Undo()
             aWorkRange.aStart.SetTab(nTab);
             aWorkRange.aEnd.SetTab(nTab);
 
-            USHORT nExtFlags = 0;
+            sal_uInt16 nExtFlags = 0;
             pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
             pDoc->DeleteAreaTab( aWorkRange, IDF_AUTOFILL );
-            pUndoDoc->CopyToDocument( aWorkRange, IDF_AUTOFILL, FALSE, pDoc );
+            pUndoDoc->CopyToDocument( aWorkRange, IDF_AUTOFILL, sal_False, pDoc );
 
-            pDoc->ExtendMerge( aWorkRange, TRUE );
+            pDoc->ExtendMerge( aWorkRange, sal_True );
             pDocShell->PostPaint( aWorkRange, PAINT_GRID, nExtFlags );
         }
     }
@@ -664,8 +661,8 @@ void __EXPORT ScUndoAutoFill::Undo()
     aName += String::CreateFromInt32(nMaxSharedIndex);
     aName += '_';
     ScRangeName* pRangeName = pDoc->GetRangeName();
-    BOOL bHasFound = FALSE;
-    for (USHORT i = 0; i < pRangeName->GetCount(); i++)
+    sal_Bool bHasFound = sal_False;
+    for (sal_uInt16 i = 0; i < pRangeName->GetCount(); i++)
     {
         ScRangeData* pRangeData = (*pRangeName)[i];
         if (pRangeData)
@@ -675,7 +672,7 @@ void __EXPORT ScUndoAutoFill::Undo()
             if (aRName.Search(aName) != STRING_NOTFOUND)
             {
                 pRangeName->AtFree(i);
-                bHasFound = TRUE;
+                bHasFound = sal_True;
             }
         }
     }
@@ -749,17 +746,17 @@ void __EXPORT ScUndoAutoFill::Repeat(SfxRepeatTarget& rTarget)
     {
         ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
         if (eFillCmd==FILL_SIMPLE)
-            rViewShell.FillSimple( eFillDir, TRUE );
+            rViewShell.FillSimple( eFillDir, sal_True );
         else
             rViewShell.FillSeries( eFillDir, eFillCmd, eFillDateCmd,
-                                   fStartValue, fStepValue, fMaxValue, TRUE );
+                                   fStartValue, fStepValue, fMaxValue, sal_True );
     }
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -825,7 +822,7 @@ void ScUndoMerge::DoChange( bool bUndo ) const
     if (bUndo && mpUndoDoc)
     {
         pDoc->DeleteAreaTab( maRange, IDF_CONTENTS|IDF_NOCAPTIONS );
-        mpUndoDoc->CopyToDocument( maRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
+        mpUndoDoc->CopyToDocument( maRange, IDF_ALL|IDF_NOCAPTIONS, sal_False, pDoc );
     }
 
     // redo -> merge contents again
@@ -841,7 +838,7 @@ void ScUndoMerge::DoChange( bool bUndo ) const
     else
         RedoSdrUndoAction( mpDrawUndo );
 
-    BOOL bDidPaint = FALSE;
+    sal_Bool bDidPaint = sal_False;
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if ( pViewShell )
     {
@@ -883,15 +880,15 @@ void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget)
     if (rTarget.ISA(ScTabViewTarget))
     {
         ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
-        BOOL bCont = FALSE;
-        rViewShell.MergeCells( FALSE, bCont, TRUE );
+        sal_Bool bCont = sal_False;
+        rViewShell.MergeCells( sal_False, bCont, sal_True );
     }
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -906,7 +903,7 @@ BOOL ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
 
 ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
                         const ScRange& rRange, ScDocument* pNewUndoDoc,
-                        const ScMarkData& rMark, BOOL bNewSize, USHORT nNewFormatNo )
+                        const ScMarkData& rMark, sal_Bool bNewSize, sal_uInt16 nNewFormatNo )
         //
     :	ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
         //
@@ -944,7 +941,7 @@ void __EXPORT ScUndoAutoFormat::Undo()
 
     // Attribute
 //	pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB );
-//	pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc );
+//	pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, sal_False, pDoc );
 
     SCTAB nTabCount = pDoc->GetTableCount();
     pDoc->DeleteArea( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
@@ -953,7 +950,7 @@ void __EXPORT ScUndoAutoFormat::Undo()
     ScRange aCopyRange = aBlockRange;
     aCopyRange.aStart.SetTab(0);
     aCopyRange.aEnd.SetTab(nTabCount-1);
-    pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, FALSE, pDoc, &aMarkData );
+    pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_False, pDoc, &aMarkData );
 
     // Zellhoehen und -breiten (IDF_NONE)
     if (bSize)
@@ -966,9 +963,9 @@ void __EXPORT ScUndoAutoFormat::Undo()
         SCTAB nEndZ = aBlockRange.aEnd.Tab();
 
         pUndoDoc->CopyToDocument( nStartX, 0, 0, nEndX, MAXROW, nTabCount-1,
-                                    IDF_NONE, FALSE, pDoc, &aMarkData );
+                                    IDF_NONE, sal_False, pDoc, &aMarkData );
         pUndoDoc->CopyToDocument( 0, nStartY, 0, MAXCOL, nEndY, nTabCount-1,
-                                    IDF_NONE, FALSE, pDoc, &aMarkData );
+                                    IDF_NONE, sal_False, pDoc, &aMarkData );
         pDocShell->PostPaint( 0, 0, nStartZ, MAXCOL, MAXROW, nEndZ,
                               PAINT_GRID | PAINT_LEFT | PAINT_TOP, SC_PF_LINES );
     }
@@ -1018,7 +1015,7 @@ void __EXPORT ScUndoAutoFormat::Redo()
             nPPTY = ScGlobal::nScreenPPTY;
         }
 
-        BOOL bFormula = FALSE;	//! merken
+        sal_Bool bFormula = sal_False;	//! merken
 
         for (SCTAB nTab=nStartZ; nTab<=nEndZ; nTab++)
         {
@@ -1031,23 +1028,23 @@ void __EXPORT ScUndoAutoFormat::Redo()
             SCROW nLastRow = -1;
             for (SCROW nRow=nStartY; nRow<=nEndY; nRow++)
             {
-                BYTE nOld = pDoc->GetRowFlags(nRow,nTab);
+                sal_uInt8 nOld = pDoc->GetRowFlags(nRow,nTab);
                 bool bHidden = pDoc->RowHidden(nRow, nTab, nLastRow);
                 if ( !bHidden && ( nOld & CR_MANUALSIZE ) )
                     pDoc->SetRowFlags( nRow, nTab, nOld & ~CR_MANUALSIZE );
             }
             pDoc->SetOptimalHeight( nStartY, nEndY, nTab, 0, &aVirtDev,
-                                        nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
+                                        nPPTX, nPPTY, aZoomX, aZoomY, sal_False );
 
             SCCOL nLastCol = -1;
             for (SCCOL nCol=nStartX; nCol<=nEndX; nCol++)
                 if (!pDoc->ColHidden(nCol, nTab, nLastCol))
                 {
-                    USHORT nThisSize = STD_EXTRA_WIDTH + pDoc->GetOptimalColWidth( nCol, nTab,
+                    sal_uInt16 nThisSize = STD_EXTRA_WIDTH + pDoc->GetOptimalColWidth( nCol, nTab,
                                                 &aVirtDev, nPPTX, nPPTY, aZoomX, aZoomY, bFormula,
                                                 &aDestMark );
                     pDoc->SetColWidth( nCol, nTab, nThisSize );
-                    pDoc->ShowCol( nCol, nTab, TRUE );
+                    pDoc->ShowCol( nCol, nTab, sal_True );
                 }
         }
 
@@ -1067,13 +1064,13 @@ void __EXPORT ScUndoAutoFormat::Redo()
 void __EXPORT ScUndoAutoFormat::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->AutoFormat( nFormatNo, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->AutoFormat( nFormatNo, sal_True );
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1165,8 +1162,7 @@ void __EXPORT ScUndoReplace::Undo()
         DBG_ASSERT(pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE_ALL,
                    "ScUndoReplace:: Falscher Modus");
 
-        if (pViewShell)
-            pViewShell->SetMarkData( aMarkData );
+        SetViewMarkData( aMarkData );
 
 //!	markierte Tabellen
 //!	Bereich merken ?
@@ -1174,10 +1170,10 @@ void __EXPORT ScUndoReplace::Undo()
         //	Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE
         //	kopieren, um Outline-Gruppen nicht kaputtzumachen.
 
-        USHORT nUndoFlags = (pSearchItem->GetPattern()) ? IDF_ATTRIB : IDF_CONTENTS;
+        sal_uInt16 nUndoFlags = (pSearchItem->GetPattern()) ? IDF_ATTRIB : IDF_CONTENTS;
         pUndoDoc->CopyToDocument( 0,      0,      0,
                                   MAXCOL, MAXROW, MAXTAB,
-                                  nUndoFlags, FALSE, pDoc, NULL, FALSE );	// ohne Row-Flags
+                                  nUndoFlags, sal_False, pDoc, NULL, sal_False );	// ohne Row-Flags
         pDocShell->PostPaintGridAll();
     }
     else if (pSearchItem->GetPattern() &&
@@ -1188,12 +1184,12 @@ void __EXPORT ScUndoReplace::Undo()
         pSearchItem->SetReplaceString(aTempStr);
         pDoc->ReplaceStyle( *pSearchItem,
                             aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(),
-                            aMarkData, TRUE);
+                            aMarkData, sal_True);
         pSearchItem->SetReplaceString(pSearchItem->GetSearchString());
         pSearchItem->SetSearchString(aTempStr);
         if (pViewShell)
             pViewShell->MoveCursorAbs( aCursorPos.Col(), aCursorPos.Row(),
-                                       SC_FOLLOW_JUMP, FALSE, FALSE );
+                                       SC_FOLLOW_JUMP, sal_False, sal_False );
         pDocShell->PostPaintGridAll();
     }
     else if (pSearchItem->GetCellType() == SVX_SEARCHIN_NOTE)
@@ -1204,7 +1200,7 @@ void __EXPORT ScUndoReplace::Undo()
             pNote->SetText( aCursorPos, aUndoStr );
         if (pViewShell)
             pViewShell->MoveCursorAbs( aCursorPos.Col(), aCursorPos.Row(),
-                                       SC_FOLLOW_JUMP, FALSE, FALSE );
+                                       SC_FOLLOW_JUMP, sal_False, sal_False );
     }
     else
     {
@@ -1215,7 +1211,7 @@ void __EXPORT ScUndoReplace::Undo()
             pDoc->SetString( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), aUndoStr );
         if (pViewShell)
             pViewShell->MoveCursorAbs( aCursorPos.Col(), aCursorPos.Row(),
-                                       SC_FOLLOW_JUMP, FALSE, FALSE );
+                                       SC_FOLLOW_JUMP, sal_False, sal_False );
         pDocShell->PostPaintGridAll();
     }
 
@@ -1238,14 +1234,14 @@ void __EXPORT ScUndoReplace::Redo()
 
     if (pViewShell)
         pViewShell->MoveCursorAbs( aCursorPos.Col(), aCursorPos.Row(),
-                                   SC_FOLLOW_JUMP, FALSE, FALSE );
+                                   SC_FOLLOW_JUMP, sal_False, sal_False );
     if (pUndoDoc)
     {
         if (pViewShell)
         {
-            pViewShell->SetMarkData( aMarkData );
+            SetViewMarkData( aMarkData );
 
-            pViewShell->SearchAndReplace( pSearchItem, FALSE, TRUE );
+            pViewShell->SearchAndReplace( pSearchItem, sal_False, sal_True );
         }
     }
     else if (pSearchItem->GetPattern() &&
@@ -1253,12 +1249,12 @@ void __EXPORT ScUndoReplace::Redo()
     {
         pDoc->ReplaceStyle( *pSearchItem,
                             aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(),
-                            aMarkData, TRUE);
+                            aMarkData, sal_True);
         pDocShell->PostPaintGridAll();
     }
     else
         if (pViewShell)
-            pViewShell->SearchAndReplace( pSearchItem, FALSE, TRUE );
+            pViewShell->SearchAndReplace( pSearchItem, sal_False, sal_True );
 
     SetChangeTrack();
 
@@ -1271,13 +1267,13 @@ void __EXPORT ScUndoReplace::Redo()
 void __EXPORT ScUndoReplace::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->SearchAndReplace( pSearchItem, TRUE, FALSE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->SearchAndReplace( pSearchItem, sal_True, sal_False );
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1297,7 +1293,7 @@ ScUndoTabOp::ScUndoTabOp( ScDocShell* pNewDocShell,
                 const ScRefAddress& rFormulaEnd,
                 const ScRefAddress& rRowCell,
                 const ScRefAddress& rColCell,
-                BYTE nMd )
+                sal_uInt8 nMd )
         //
     :	ScSimpleUndo( pNewDocShell ),
         //
@@ -1336,12 +1332,12 @@ void __EXPORT ScUndoTabOp::Undo()
 
     ScUndoUtil::MarkSimpleBlock( pDocShell, aRange );
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocShell->UpdatePaintExt( nExtFlags, aRange );
 
     ScDocument* pDoc = pDocShell->GetDocument();
     pDoc->DeleteAreaTab( aRange,IDF_ALL & ~IDF_NOTE );
-    pUndoDoc->CopyToDocument( aRange, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+    pUndoDoc->CopyToDocument( aRange, IDF_ALL & ~IDF_NOTE, sal_False, pDoc );
     pDocShell->PostPaint( aRange, PAINT_GRID, nExtFlags );
     pDocShell->PostDataChanged();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -1366,7 +1362,7 @@ void __EXPORT ScUndoTabOp::Redo()
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
-        pViewShell->TabOp( aParam, FALSE);
+        pViewShell->TabOp( aParam, sal_False);
 
     EndRedo();
 }
@@ -1381,9 +1377,9 @@ void __EXPORT ScUndoTabOp::Repeat(SfxRepeatTarget& /* rTarget */)
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1466,14 +1462,12 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
         ScDocument* pDoc = pDocShell->GetDocument();
         ShowTable( rCursorPos.Tab() );
 
-        ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-        if (pViewShell)
-            pViewShell->SetMarkData( aMarkData );
+        SetViewMarkData( aMarkData );
 
         SCTAB nTabCount = pDoc->GetTableCount();
         //	Undo/Redo-doc has only selected tables
 
-        BOOL bMulti = aMarkData.IsMultiMarked();
+        sal_Bool bMulti = aMarkData.IsMultiMarked();
         pRefDoc->CopyToDocument( 0,      0,      0,
                                  MAXCOL, MAXROW, nTabCount-1,
                                  IDF_CONTENTS, bMulti, pDoc, &aMarkData );
@@ -1515,13 +1509,13 @@ void ScUndoConversion::Redo()
 void ScUndoConversion::Repeat( SfxRepeatTarget& rTarget )
 {
     if( rTarget.ISA( ScTabViewTarget ) )
-        ((ScTabViewTarget&)rTarget).GetViewShell()->DoSheetConversion( maConvParam, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->DoSheetConversion( maConvParam, sal_True );
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return rTarget.ISA( ScTabViewTarget );
 }
@@ -1536,7 +1530,7 @@ BOOL ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
 
 ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell,
                                          const ScRange& aMarkRange, const ScMarkData& rMark,
-                                         ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, BOOL bNewMulti, USHORT nNewFlag) :
+                                         ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_Bool bNewMulti, sal_uInt16 nNewFlag) :
 ScSimpleUndo( pNewDocShell ),
 aMarkData   ( rMark ),
 pUndoDoc	( pNewUndoDoc ),
@@ -1575,9 +1569,7 @@ void ScUndoRefConversion::DoChange( ScDocument* pRefDoc)
 
     ShowTable(aRange);
 
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-    if (pViewShell)
-        pViewShell->SetMarkData( aMarkData );
+    SetViewMarkData( aMarkData );
 
     ScRange aCopyRange = aRange;
     SCTAB nTabCount = pDoc->GetTableCount();
@@ -1586,6 +1578,7 @@ void ScUndoRefConversion::DoChange( ScDocument* pRefDoc)
     pRefDoc->CopyToDocument( aCopyRange, nFlags, bMulti, pDoc, &aMarkData );
     pDocShell->PostPaint( aRange, PAINT_GRID);
     pDocShell->PostDataChanged();
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
         pViewShell->CellContentChanged();
 }
@@ -1615,7 +1608,7 @@ void __EXPORT ScUndoRefConversion::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->DoRefConversion();
 }
 
-BOOL __EXPORT ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1660,11 +1653,11 @@ void __EXPORT ScUndoRefreshLink::Undo()
 {
     BeginUndo();
 
-    BOOL bMakeRedo = !pRedoDoc;
+    sal_Bool bMakeRedo = !pRedoDoc;
     if (bMakeRedo)
         pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
 
-    BOOL bFirst = TRUE;
+    sal_Bool bFirst = sal_True;
     ScDocument* pDoc = pDocShell->GetDocument();
     SCTAB nCount = pDoc->GetTableCount();
     for (SCTAB nTab=0; nTab<nCount; nTab++)
@@ -1674,11 +1667,11 @@ void __EXPORT ScUndoRefreshLink::Undo()
             if (bMakeRedo)
             {
                 if (bFirst)
-                    pRedoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
+                    pRedoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
                 else
-                    pRedoDoc->AddUndoTab( nTab, nTab, TRUE, TRUE );
-                bFirst = FALSE;
-                pDoc->CopyToDocument(aRange, IDF_ALL, FALSE, pRedoDoc);
+                    pRedoDoc->AddUndoTab( nTab, nTab, sal_True, sal_True );
+                bFirst = sal_False;
+                pDoc->CopyToDocument(aRange, IDF_ALL, sal_False, pRedoDoc);
 //				pRedoDoc->TransferDrawPage( pDoc, nTab, nTab );
                 pRedoDoc->SetLink( nTab,
                                    pDoc->GetLinkMode(nTab),
@@ -1690,7 +1683,7 @@ void __EXPORT ScUndoRefreshLink::Undo()
             }
 
             pDoc->DeleteAreaTab( aRange,IDF_ALL );
-            pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
+            pUndoDoc->CopyToDocument( aRange, IDF_ALL, sal_False, pDoc );
 //			pDoc->TransferDrawPage( pUndoDoc, nTab, nTab );
             pDoc->SetLink( nTab, pUndoDoc->GetLinkMode(nTab), pUndoDoc->GetLinkDoc(nTab),
                                  pUndoDoc->GetLinkFlt(nTab),  pUndoDoc->GetLinkOpt(nTab),
@@ -1720,7 +1713,7 @@ void __EXPORT ScUndoRefreshLink::Redo()
             ScRange aRange(0,0,nTab,MAXCOL,MAXROW,nTab);
 
             pDoc->DeleteAreaTab( aRange, IDF_ALL );
-            pRedoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
+            pRedoDoc->CopyToDocument( aRange, IDF_ALL, sal_False, pDoc );
 //			pDoc->TransferDrawPage( pRedoDoc, nTab, nTab );
             pDoc->SetLink( nTab,
                            pRedoDoc->GetLinkMode(nTab),
@@ -1747,9 +1740,9 @@ void __EXPORT ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */)
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoRefreshLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1760,8 +1753,8 @@ ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDo
                             const String& rSrc, const ScRange& rDest )
 {
     const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks();
-    USHORT nCount = pLinkManager->GetLinks().Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = pLinkManager->GetLinks().Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ::sfx2::SvBaseLink* pBase = *rLinks[i];
         if (pBase->ISA(ScAreaLink))
@@ -1785,7 +1778,7 @@ ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
                             const String& rDoc,
                             const String& rFlt, const String& rOpt,
                             const String& rArea, const ScRange& rDestRange,
-                            ULONG nRefresh )
+                            sal_uLong nRefresh )
         //
     :	ScSimpleUndo	( pShell ),
         //
@@ -1839,11 +1832,11 @@ void __EXPORT ScUndoInsertAreaLink::Redo()
 
     ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions,
                                             aAreaName, aRange.aStart, nRefreshDelay );
-    pLink->SetInCreate( TRUE );
+    pLink->SetInCreate( sal_True );
     pLink->SetDestArea( aRange );
     pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aDocName, &aFltName, &aAreaName );
     pLink->Update();
-    pLink->SetInCreate( FALSE );
+    pLink->SetInCreate( sal_False );
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );		// Navigator
 }
@@ -1859,9 +1852,9 @@ void __EXPORT ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1875,7 +1868,7 @@ BOOL __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co
 ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
                             const String& rDoc, const String& rFlt, const String& rOpt,
                             const String& rArea, const ScRange& rDestRange,
-                            ULONG nRefresh )
+                            sal_uLong nRefresh )
         //
     :	ScSimpleUndo	( pShell ),
         //
@@ -1913,11 +1906,11 @@ void __EXPORT ScUndoRemoveAreaLink::Undo()
 
     ScAreaLink* pLink = new ScAreaLink( pDocShell, aDocName, aFltName, aOptions,
                                         aAreaName, aRange.aStart, nRefreshDelay );
-    pLink->SetInCreate( TRUE );
+    pLink->SetInCreate( sal_True );
     pLink->SetDestArea( aRange );
     pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aDocName, &aFltName, &aAreaName );
     pLink->Update();
-    pLink->SetInCreate( FALSE );
+    pLink->SetInCreate( sal_False );
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );		// Navigator
 }
@@ -1949,9 +1942,9 @@ void __EXPORT ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1964,10 +1957,10 @@ BOOL __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co
 
 ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
                             const String& rOldD, const String& rOldF, const String& rOldO,
-                            const String& rOldA, const ScRange& rOldR, ULONG nOldRD,
+                            const String& rOldA, const ScRange& rOldR, sal_uLong nOldRD,
                             const String& rNewD, const String& rNewF, const String& rNewO,
-                            const String& rNewA, const ScRange& rNewR, ULONG nNewRD,
-                            ScDocument* pUndo, ScDocument* pRedo, BOOL bDoInsert )
+                            const String& rNewA, const ScRange& rNewR, sal_uLong nNewRD,
+                            ScDocument* pUndo, ScDocument* pRedo, sal_Bool bDoInsert )
         //
     :	ScSimpleUndo( pShell ),
         //
@@ -2010,7 +2003,7 @@ String __EXPORT ScUndoUpdateAreaLink::GetComment() const
 
 //----------------------------------------------------------------------------
 
-void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
+void ScUndoUpdateAreaLink::DoChange( const sal_Bool bUndo ) const
 {
     ScDocument* pDoc = pDocShell->GetDocument();
 
@@ -2024,13 +2017,13 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
         {
             pDoc->FitBlock( aNewRange, aOldRange );
             pDoc->DeleteAreaTab( aOldRange, IDF_ALL & ~IDF_NOTE );
-            pUndoDoc->UndoToDocument( aOldRange, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+            pUndoDoc->UndoToDocument( aOldRange, IDF_ALL & ~IDF_NOTE, sal_False, pDoc );
         }
         else
         {
             ScRange aCopyRange( aOldRange.aStart, ScAddress(nEndX,nEndY,nEndZ) );
             pDoc->DeleteAreaTab( aCopyRange, IDF_ALL & ~IDF_NOTE );
-            pUndoDoc->CopyToDocument( aCopyRange, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+            pUndoDoc->CopyToDocument( aCopyRange, IDF_ALL & ~IDF_NOTE, sal_False, pDoc );
         }
     }
     else
@@ -2039,18 +2032,18 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
         {
             pDoc->FitBlock( aOldRange, aNewRange );
             pDoc->DeleteAreaTab( aNewRange, IDF_ALL & ~IDF_NOTE );
-            pRedoDoc->CopyToDocument( aNewRange, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+            pRedoDoc->CopyToDocument( aNewRange, IDF_ALL & ~IDF_NOTE, sal_False, pDoc );
         }
         else
         {
             ScRange aCopyRange( aOldRange.aStart, ScAddress(nEndX,nEndY,nEndZ) );
             pDoc->DeleteAreaTab( aCopyRange, IDF_ALL & ~IDF_NOTE );
-            pRedoDoc->CopyToDocument( aCopyRange, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+            pRedoDoc->CopyToDocument( aCopyRange, IDF_ALL & ~IDF_NOTE, sal_False, pDoc );
         }
     }
 
     ScRange aWorkRange( aNewRange.aStart, ScAddress( nEndX, nEndY, nEndZ ) );
-    pDoc->ExtendMerge( aWorkRange, TRUE );
+    pDoc->ExtendMerge( aWorkRange, sal_True );
 
     //	Paint
 
@@ -2084,7 +2077,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo()
         pLink->SetRefreshDelay( nOldRefresh );
     }
 
-    DoChange(TRUE);
+    DoChange(sal_True);
 }
 
 
@@ -2103,7 +2096,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo()
         pLink->SetRefreshDelay( nNewRefresh );
     }
 
-    DoChange(FALSE);
+    DoChange(sal_False);
 }
 
 
@@ -2117,9 +2110,9 @@ void __EXPORT ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
 
 //----------------------------------------------------------------------------
 
-BOOL __EXPORT ScUndoUpdateAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoUpdateAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 453bd15ee..ffea37bd7 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -77,7 +77,7 @@ TYPEINIT1(ScUndoRangeNames, ScSimpleUndo);
 ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell,
             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
             const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
-            const ScPatternAttr* pApplyPat, BOOL bAutomatic ) :
+            const ScPatternAttr* pApplyPat, sal_Bool bAutomatic ) :
     ScSimpleUndo( pNewDocShell ),
     nCol( nNewCol ),
     nRow( nNewRow ),
@@ -102,28 +102,28 @@ String __EXPORT ScUndoCursorAttr::GetComment() const
 {
     //!	eigener Text fuer automatische Attributierung
 
-    USHORT nId = STR_UNDO_CURSORATTR;		 // "Attribute"
+    sal_uInt16 nId = STR_UNDO_CURSORATTR;		 // "Attribute"
     return ScGlobal::GetRscString( nId );
 }
 
 void ScUndoCursorAttr::DoChange( const ScPatternAttr* pWhichPattern ) const
 {
-    pDocShell->GetDocument()->SetPattern( nCol, nRow, nTab, *pWhichPattern, TRUE );
+    pDocShell->GetDocument()->SetPattern( nCol, nRow, nTab, *pWhichPattern, sal_True );
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
         pViewShell->SetTabNo( nTab );
-        pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, FALSE, FALSE );
+        pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, sal_False, sal_False );
         pViewShell->AdjustBlockHeight();
     }
 
     const SfxItemSet& rApplySet = pApplyPattern->GetItemSet();
-    BOOL bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, TRUE ) != SFX_ITEM_DEFAULT ||
-                       rApplySet.GetItemState( ATTR_CONDITIONAL, TRUE ) != SFX_ITEM_DEFAULT );
-    BOOL bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, TRUE ) != SFX_ITEM_DEFAULT );
+    sal_Bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, sal_True ) != SFX_ITEM_DEFAULT ||
+                       rApplySet.GetItemState( ATTR_CONDITIONAL, sal_True ) != SFX_ITEM_DEFAULT );
+    sal_Bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, sal_True ) != SFX_ITEM_DEFAULT );
 
-    USHORT nFlags = SC_PF_TESTMERGE;
+    sal_uInt16 nFlags = SC_PF_TESTMERGE;
     if (bPaintExt)
         nFlags |= SC_PF_LINES;
     if (bPaintRows)
@@ -162,7 +162,7 @@ void __EXPORT ScUndoCursorAttr::Repeat(SfxRepeatTarget& rTarget)
         ((ScTabViewTarget&)rTarget).GetViewShell()->ApplySelectionPattern( *pApplyPattern );
 }
 
-BOOL __EXPORT ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -176,7 +176,7 @@ BOOL __EXPORT ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const
 ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell,
             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
             SCTAB nNewCount, SCTAB* pNewTabs, ScBaseCell** ppOldData,
-            BOOL* pHasForm, ULONG* pOldForm,
+            sal_Bool* pHasForm, sal_uLong* pOldForm,
             const String& rNewStr, EditTextObject* pObj ) :
     ScSimpleUndo( pNewDocShell ),
     aNewString( rNewStr ),
@@ -195,7 +195,7 @@ ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell,
 
 __EXPORT ScUndoEnterData::~ScUndoEnterData()
 {
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         if (ppOldCells[i])
             ppOldCells[i]->Delete();
     delete[] ppOldCells;
@@ -216,14 +216,14 @@ void ScUndoEnterData::DoChange() const
 {
     //	Zeilenhoehe anpassen
     //!	nur wenn noetig (alte oder neue EditZelle, oder Attribute) ??
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         pDocShell->AdjustRowHeight( nRow, nRow, pTabs[i] );
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
         pViewShell->SetTabNo( nTab );
-        pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, FALSE, FALSE );
+        pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, sal_False, sal_False );
     }
 
     pDocShell->PostDataChanged();
@@ -236,10 +236,10 @@ void ScUndoEnterData::SetChangeTrack()
     {
         nEndChangeAction = pChangeTrack->GetActionMax() + 1;
         ScAddress aPos( nCol, nRow, nTab );
-        for (USHORT i=0; i<nCount; i++)
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             aPos.SetTab( pTabs[i] );
-            ULONG nFormat = 0;
+            sal_uLong nFormat = 0;
             if ( pHasFormat && pOldFormats )
             {
                 if ( pHasFormat[i] )
@@ -259,7 +259,7 @@ void __EXPORT ScUndoEnterData::Undo()
     BeginUndo();
 
     ScDocument* pDoc = pDocShell->GetDocument();
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ScBaseCell* pNewCell = ppOldCells[i] ? ppOldCells[i]->CloneWithoutNote( *pDoc, SC_CLONECELL_STARTLISTENING ) : 0;
         pDoc->PutCell( nCol, nRow, pTabs[i], pNewCell );
@@ -273,14 +273,14 @@ void __EXPORT ScUndoEnterData::Undo()
             {
                 ScPatternAttr aPattern( *pDoc->GetPattern( nCol, nRow, pTabs[i] ) );
                 aPattern.GetItemSet().ClearItem( ATTR_VALUE_FORMAT );
-                pDoc->SetPattern( nCol, nRow, pTabs[i], aPattern, TRUE );
+                pDoc->SetPattern( nCol, nRow, pTabs[i], aPattern, sal_True );
             }
         }
         pDocShell->PostPaintCell( nCol, nRow, pTabs[i] );
     }
 
     ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
-    if ( pChangeTrack && nEndChangeAction >= sal::static_int_cast<ULONG>(nCount) )
+    if ( pChangeTrack && nEndChangeAction >= sal::static_int_cast<sal_uLong>(nCount) )
         pChangeTrack->Undo( nEndChangeAction - nCount + 1, nEndChangeAction );
 
     DoChange();
@@ -291,7 +291,7 @@ void __EXPORT ScUndoEnterData::Undo()
     if ( pModelObj && pModelObj->HasChangesListeners() )
     {
         ScRangeList aChangeRanges;
-        for ( USHORT i = 0; i < nCount; ++i )
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
             aChangeRanges.Append( ScRange( nCol, nRow, pTabs[i] ) );
         }
@@ -304,7 +304,7 @@ void __EXPORT ScUndoEnterData::Redo()
     BeginRedo();
 
     ScDocument* pDoc = pDocShell->GetDocument();
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         if (pNewEditData)
             pDoc->PutCell( nCol, nRow, pTabs[i], new ScEditCell( pNewEditData,
@@ -324,7 +324,7 @@ void __EXPORT ScUndoEnterData::Redo()
     if ( pModelObj && pModelObj->HasChangesListeners() )
     {
         ScRangeList aChangeRanges;
-        for ( USHORT i = 0; i < nCount; ++i )
+        for ( sal_uInt16 i = 0; i < nCount; ++i )
         {
             aChangeRanges.Append( ScRange( nCol, nRow, pTabs[i] ) );
         }
@@ -341,7 +341,7 @@ void __EXPORT ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL __EXPORT ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -353,7 +353,7 @@ BOOL __EXPORT ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
-                                    ScBaseCell* pUndoCell, double nVal, BOOL bHeight ) :
+                                    ScBaseCell* pUndoCell, double nVal, sal_Bool bHeight ) :
     ScSimpleUndo( pNewDocShell ),
     aPos		( rNewPos ),
     pOldCell	( pUndoCell ),
@@ -425,9 +425,9 @@ void __EXPORT ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */)
     //	gippsnich
 }
 
-BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -437,7 +437,7 @@ BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 //
 
 ScUndoPutCell::ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
-                            ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, BOOL bHeight ) :
+                            ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, sal_Bool bHeight ) :
     ScSimpleUndo( pNewDocShell ),
     aPos		( rNewPos ),
     pOldCell	( pUndoCell ),
@@ -514,9 +514,9 @@ void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */)
     //	gippsnich
 }
 
-BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -527,7 +527,7 @@ BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 
 ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell,
             SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
-            BOOL bNewColumn, BOOL bNewInsert ) :
+            sal_Bool bNewColumn, sal_Bool bNewInsert ) :
     ScSimpleUndo( pNewDocShell ),
     nCol( nNewCol ),
     nRow( nNewRow ),
@@ -555,19 +555,19 @@ String __EXPORT ScUndoPageBreak::GetComment() const
         ) );
 }
 
-void ScUndoPageBreak::DoChange( BOOL bInsertP ) const
+void ScUndoPageBreak::DoChange( sal_Bool bInsertP ) const
 {
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
     if (pViewShell)
     {
         pViewShell->SetTabNo( nTab );
-        pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, FALSE, FALSE );
+        pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, sal_False, sal_False );
 
         if (bInsertP)
-            pViewShell->InsertPageBreak(bColumn, FALSE);
+            pViewShell->InsertPageBreak(bColumn, sal_False);
         else
-            pViewShell->DeletePageBreak(bColumn, FALSE);
+            pViewShell->DeletePageBreak(bColumn, sal_False);
 
         pDocShell->GetDocument()->InvalidatePageBreaks(nTab);
     }
@@ -594,13 +594,13 @@ void __EXPORT ScUndoPageBreak::Repeat(SfxRepeatTarget& rTarget)
         ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
 
         if (bInsert)
-            rViewShell.InsertPageBreak(bColumn, TRUE);
+            rViewShell.InsertPageBreak(bColumn, sal_True);
         else
-            rViewShell.DeletePageBreak(bColumn, TRUE);
+            rViewShell.DeletePageBreak(bColumn, sal_True);
     }
 }
 
-BOOL __EXPORT ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -611,7 +611,7 @@ BOOL __EXPORT ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell,
-            SCTAB nT, USHORT nOS, USHORT nOP, USHORT nNS, USHORT nNP ) :
+            SCTAB nT, sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP ) :
     ScSimpleUndo( pNewDocShell ),
     nTab( nT ),
     nOldScale( nOS ),
@@ -630,10 +630,10 @@ String __EXPORT ScUndoPrintZoom::GetComment() const
     return ScGlobal::GetRscString( STR_UNDO_PRINTSCALE );
 }
 
-void ScUndoPrintZoom::DoChange( BOOL bUndo )
+void ScUndoPrintZoom::DoChange( sal_Bool bUndo )
 {
-    USHORT nScale = bUndo ? nOldScale : nNewScale;
-    USHORT nPages = bUndo ? nOldPages : nNewPages;
+    sal_uInt16 nScale = bUndo ? nOldScale : nNewScale;
+    sal_uInt16 nPages = bUndo ? nOldPages : nNewPages;
 
     ScDocument* pDoc = pDocShell->GetDocument();
     String aStyleName = pDoc->GetPageStyle( nTab );
@@ -654,14 +654,14 @@ void ScUndoPrintZoom::DoChange( BOOL bUndo )
 void __EXPORT ScUndoPrintZoom::Undo()
 {
     BeginUndo();
-    DoChange(TRUE);
+    DoChange(sal_True);
     EndUndo();
 }
 
 void __EXPORT ScUndoPrintZoom::Redo()
 {
     BeginRedo();
-    DoChange(FALSE);
+    DoChange(sal_False);
     EndRedo();
 }
 
@@ -675,7 +675,7 @@ void __EXPORT ScUndoPrintZoom::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL __EXPORT ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -734,7 +734,7 @@ void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell )
         nEndChangeAction = 0;
 }
 
-void __EXPORT ScUndoThesaurus::DoChange( BOOL bUndo, const String& rStr,
+void __EXPORT ScUndoThesaurus::DoChange( sal_Bool bUndo, const String& rStr,
             const EditTextObject* pTObj )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
@@ -743,7 +743,7 @@ void __EXPORT ScUndoThesaurus::DoChange( BOOL bUndo, const String& rStr,
     if (pViewShell)
     {
         pViewShell->SetTabNo( nTab );
-        pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, FALSE, FALSE );
+        pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, sal_False, sal_False );
     }
 
     if (pTObj)
@@ -781,7 +781,7 @@ void __EXPORT ScUndoThesaurus::DoChange( BOOL bUndo, const String& rStr,
 void __EXPORT ScUndoThesaurus::Undo()
 {
     BeginUndo();
-    DoChange( TRUE, aUndoStr, pUndoTObject );
+    DoChange( sal_True, aUndoStr, pUndoTObject );
     ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
     if ( pChangeTrack )
         pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
@@ -791,17 +791,17 @@ void __EXPORT ScUndoThesaurus::Undo()
 void __EXPORT ScUndoThesaurus::Redo()
 {
     BeginRedo();
-    DoChange( FALSE, aRedoStr, pRedoTObject );
+    DoChange( sal_False, aRedoStr, pRedoTObject );
     EndRedo();
 }
 
 void __EXPORT ScUndoThesaurus::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->DoThesaurus( TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->DoThesaurus( sal_True );
 }
 
-BOOL __EXPORT ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoThesaurus::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -866,9 +866,9 @@ void ScUndoReplaceNote::Repeat( SfxRepeatTarget& /*rTarget*/ )
 {
 }
 
-BOOL ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
+sal_Bool ScUndoReplaceNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 String ScUndoReplaceNote::GetComment() const
@@ -938,9 +938,9 @@ void ScUndoShowHideNote::Repeat( SfxRepeatTarget& /*rTarget*/ )
 {
 }
 
-BOOL ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
+sal_Bool ScUndoShowHideNote::CanRepeat( SfxRepeatTarget& /*rTarget*/ ) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 String ScUndoShowHideNote::GetComment() const
@@ -966,7 +966,7 @@ ScUndoDetective::ScUndoDetective( ScDocShell* pNewDocShell,
     bIsDelete = ( pOperation == NULL );
     if (!bIsDelete)
     {
-        nAction = (USHORT) pOperation->GetOperation();
+        nAction = (sal_uInt16) pOperation->GetOperation();
         aPos = pOperation->GetPos();
     }
 }
@@ -979,7 +979,7 @@ __EXPORT ScUndoDetective::~ScUndoDetective()
 
 String __EXPORT ScUndoDetective::GetComment() const
 {
-    USHORT nId = STR_UNDO_DETDELALL;
+    sal_uInt16 nId = STR_UNDO_DETDELALL;
     if ( !bIsDelete )
         switch ( (ScDetOpType) nAction )
         {
@@ -1013,7 +1013,7 @@ void __EXPORT ScUndoDetective::Undo()
         ScDetOpList* pList = pDoc->GetDetOpList();
         if (pList && pList->Count())
         {
-            USHORT nPos = pList->Count() - 1;
+            sal_uInt16 nPos = pList->Count() - 1;
             ScDetOpData* pData = (*pList)[nPos];
             if ( pData->GetOperation() == (ScDetOpType) nAction && pData->GetPos() == aPos )
                 pList->DeleteAndDestroy( nPos, 1 );
@@ -1056,9 +1056,9 @@ void __EXPORT ScUndoDetective::Repeat(SfxRepeatTarget& /* rTarget */)
     //	hammanich
 }
 
-BOOL __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -1085,17 +1085,17 @@ String __EXPORT ScUndoRangeNames::GetComment() const
     return ScGlobal::GetRscString( STR_UNDO_RANGENAMES );
 }
 
-void ScUndoRangeNames::DoChange( BOOL bUndo )
+void ScUndoRangeNames::DoChange( sal_Bool bUndo )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    pDoc->CompileNameFormula( TRUE );	// CreateFormulaString
+    pDoc->CompileNameFormula( sal_True );	// CreateFormulaString
 
     if ( bUndo )
         pDoc->SetRangeName( new ScRangeName( *pOldRanges ) );
     else
         pDoc->SetRangeName( new ScRangeName( *pNewRanges ) );
 
-    pDoc->CompileNameFormula( FALSE );	// CompileFormulaString
+    pDoc->CompileNameFormula( sal_False );	// CompileFormulaString
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
 }
@@ -1103,14 +1103,14 @@ void ScUndoRangeNames::DoChange( BOOL bUndo )
 void __EXPORT ScUndoRangeNames::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
 void __EXPORT ScUndoRangeNames::Redo()
 {
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( sal_False );
     EndRedo();
 }
 
@@ -1119,9 +1119,9 @@ void __EXPORT ScUndoRangeNames::Repeat(SfxRepeatTarget& /* rTarget */)
     //	hammanich
 }
 
-BOOL __EXPORT ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index d42dc6486..3625c941c 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -82,8 +82,8 @@ TYPEINIT1(ScUndoChartData,          ScSimpleUndo);
 
 ScUndoDoOutline::ScUndoDoOutline( ScDocShell* pNewDocShell,
                             SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
-                            ScDocument* pNewUndoDoc, BOOL bNewColumns,
-                            USHORT nNewLevel, USHORT nNewEntry, BOOL bNewShow ) :
+                            ScDocument* pNewUndoDoc, sal_Bool bNewColumns,
+                            sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, sal_Bool bNewShow ) :
     ScSimpleUndo( pNewDocShell ),
     nStart( nNewStart ),
     nEnd( nNewEnd ),
@@ -124,17 +124,17 @@ void __EXPORT ScUndoDoOutline::Undo()
     //	inverse Funktion ausfuehren
 
     if (bShow)
-        pViewShell->HideOutline( bColumns, nLevel, nEntry, FALSE, FALSE );
+        pViewShell->HideOutline( bColumns, nLevel, nEntry, sal_False, sal_False );
     else
-        pViewShell->ShowOutline( bColumns, nLevel, nEntry, FALSE, FALSE );
+        pViewShell->ShowOutline( bColumns, nLevel, nEntry, sal_False, sal_False );
 
     //	Original Spalten-/Zeilenstatus
 
     if (bColumns)
         pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
-                static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, FALSE, pDoc);
+                static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, sal_False, pDoc);
     else
-        pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, sal_False, pDoc );
 
     pViewShell->UpdateScrollBars();
 
@@ -156,9 +156,9 @@ void __EXPORT ScUndoDoOutline::Redo()
         pViewShell->SetTabNo( nTab );
 
     if (bShow)
-        pViewShell->ShowOutline( bColumns, nLevel, nEntry, FALSE );
+        pViewShell->ShowOutline( bColumns, nLevel, nEntry, sal_False );
     else
-        pViewShell->HideOutline( bColumns, nLevel, nEntry, FALSE );
+        pViewShell->HideOutline( bColumns, nLevel, nEntry, sal_False );
 
     EndRedo();
 }
@@ -167,9 +167,9 @@ void __EXPORT ScUndoDoOutline::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL __EXPORT ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;						// geht nicht
+    return sal_False;						// geht nicht
 }
 
 //
@@ -179,7 +179,7 @@ BOOL __EXPORT ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 ScUndoMakeOutline::ScUndoMakeOutline( ScDocShell* pNewDocShell,
                             SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                             SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                            ScOutlineTable* pNewUndoTab, BOOL bNewColumns, BOOL bNewMake ) :
+                            ScOutlineTable* pNewUndoTab, sal_Bool bNewColumns, sal_Bool bNewMake ) :
     ScSimpleUndo( pNewDocShell ),
     aBlockStart( nStartX, nStartY, nStartZ ),
     aBlockEnd( nEndX, nEndY, nEndZ ),
@@ -231,9 +231,9 @@ void __EXPORT ScUndoMakeOutline::Redo()
     ScUndoUtil::MarkSimpleBlock( pDocShell, aBlockStart, aBlockEnd );
 
     if (bMake)
-        pViewShell->MakeOutline( bColumns, FALSE );
+        pViewShell->MakeOutline( bColumns, sal_False );
     else
-        pViewShell->RemoveOutline( bColumns, FALSE );
+        pViewShell->RemoveOutline( bColumns, sal_False );
 
     pDocShell->PostPaint(0,0,aBlockStart.Tab(),MAXCOL,MAXROW,aBlockEnd.Tab(),PAINT_GRID);
 
@@ -247,13 +247,13 @@ void __EXPORT ScUndoMakeOutline::Repeat(SfxRepeatTarget& rTarget)
         ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
 
         if (bMake)
-            rViewShell.MakeOutline( bColumns, TRUE );
+            rViewShell.MakeOutline( bColumns, sal_True );
         else
-            rViewShell.RemoveOutline( bColumns, TRUE );
+            rViewShell.RemoveOutline( bColumns, sal_True );
     }
 }
 
-BOOL __EXPORT ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -265,7 +265,7 @@ BOOL __EXPORT ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const
 ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell,
                         SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
                         ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
-                        BOOL bNewColumns, USHORT nNewLevel ) :
+                        sal_Bool bNewColumns, sal_uInt16 nNewLevel ) :
     ScSimpleUndo( pNewDocShell ),
     nStart( nNewStart ),
     nEnd( nNewEnd ),
@@ -303,9 +303,9 @@ void __EXPORT ScUndoOutlineLevel::Undo()
 
     if (bColumns)
         pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
-                static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, FALSE, pDoc);
+                static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE, sal_False, pDoc);
     else
-        pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, sal_False, pDoc );
 
     pDoc->UpdatePageBreaks( nTab );
 
@@ -332,7 +332,7 @@ void __EXPORT ScUndoOutlineLevel::Redo()
     if ( nVisTab != nTab )
         pViewShell->SetTabNo( nTab );
 
-    pViewShell->SelectLevel( bColumns, nLevel, FALSE );
+    pViewShell->SelectLevel( bColumns, nLevel, sal_False );
 
     EndRedo();
 }
@@ -340,10 +340,10 @@ void __EXPORT ScUndoOutlineLevel::Redo()
 void __EXPORT ScUndoOutlineLevel::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->SelectLevel( bColumns, nLevel, TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->SelectLevel( bColumns, nLevel, sal_True );
 }
 
-BOOL __EXPORT ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -355,7 +355,7 @@ BOOL __EXPORT ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const
 ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell,
                         SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                         SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                        ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, BOOL bNewShow ) :
+                        ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, sal_Bool bNewShow ) :
     ScSimpleUndo( pNewDocShell ),
     aBlockStart( nStartX, nStartY, nStartZ ),
     aBlockEnd( nEndX, nEndY, nEndZ ),
@@ -399,7 +399,7 @@ void __EXPORT ScUndoOutlineBlock::Undo()
 
     if (!bShow)
     {								//	Groesse des ausgeblendeten Blocks
-        USHORT nLevel;
+        sal_uInt16 nLevel;
         pUndoTable->GetColArray()->FindTouchedLevel( nStartCol, nEndCol, nLevel );
         pUndoTable->GetColArray()->ExtendBlock( nLevel, nStartCol, nEndCol );
         pUndoTable->GetRowArray()->FindTouchedLevel( nStartRow, nEndRow, nLevel );
@@ -407,8 +407,8 @@ void __EXPORT ScUndoOutlineBlock::Undo()
     }
 
     pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStartCol), 0, nTab,
-            static_cast<SCCOL>(nEndCol), MAXROW, nTab, IDF_NONE, FALSE, pDoc );
-    pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pDoc );
+            static_cast<SCCOL>(nEndCol), MAXROW, nTab, IDF_NONE, sal_False, pDoc );
+    pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, sal_False, pDoc );
 
     pDoc->UpdatePageBreaks( nTab );
 
@@ -431,9 +431,9 @@ void __EXPORT ScUndoOutlineBlock::Redo()
 
     ScUndoUtil::MarkSimpleBlock( pDocShell, aBlockStart, aBlockEnd );
     if (bShow)
-        pViewShell->ShowMarkedOutlines( FALSE );
+        pViewShell->ShowMarkedOutlines( sal_False );
     else
-        pViewShell->HideMarkedOutlines( FALSE );
+        pViewShell->HideMarkedOutlines( sal_False );
 
     EndRedo();
 }
@@ -445,13 +445,13 @@ void __EXPORT ScUndoOutlineBlock::Repeat(SfxRepeatTarget& rTarget)
         ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
 
         if (bShow)
-            rViewShell.ShowMarkedOutlines( TRUE );
+            rViewShell.ShowMarkedOutlines( sal_True );
         else
-            rViewShell.HideMarkedOutlines( TRUE );
+            rViewShell.HideMarkedOutlines( sal_True );
     }
 }
 
-BOOL __EXPORT ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -502,8 +502,8 @@ void __EXPORT ScUndoRemoveAllOutlines::Undo()
     SCROW	nStartRow = aBlockStart.Row();
     SCROW	nEndRow = aBlockEnd.Row();
 
-    pUndoDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, FALSE, pDoc );
-    pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pDoc );
+    pUndoDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, sal_False, pDoc );
+    pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, sal_False, pDoc );
 
     pDoc->UpdatePageBreaks( nTab );
 
@@ -531,7 +531,7 @@ void __EXPORT ScUndoRemoveAllOutlines::Redo()
     if ( nVisTab != nTab )
         pViewShell->SetTabNo( nTab );
 
-    pViewShell->RemoveAllOutlines( FALSE );
+    pViewShell->RemoveAllOutlines( sal_False );
 
     EndRedo();
 }
@@ -539,10 +539,10 @@ void __EXPORT ScUndoRemoveAllOutlines::Redo()
 void __EXPORT ScUndoRemoveAllOutlines::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveAllOutlines( TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveAllOutlines( sal_True );
 }
 
-BOOL __EXPORT ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -598,9 +598,9 @@ void __EXPORT ScUndoAutoOutline::Undo()
         pUndoTable->GetRowArray()->GetRange( nStartRow, nEndRow );
 
         pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStartCol), 0, nTab,
-                static_cast<SCCOL>(nEndCol), MAXROW, nTab, IDF_NONE, FALSE,
+                static_cast<SCCOL>(nEndCol), MAXROW, nTab, IDF_NONE, sal_False,
                 pDoc);
-        pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, sal_False, pDoc );
 
         pViewShell->UpdateScrollBars();
     }
@@ -633,7 +633,7 @@ void __EXPORT ScUndoAutoOutline::Redo()
     ScRange aRange( aBlockStart.Col(), aBlockStart.Row(), nTab,
                     aBlockEnd.Col(),   aBlockEnd.Row(),   nTab );
     ScOutlineDocFunc aFunc( *pDocShell );
-    aFunc.AutoOutline( aRange, FALSE, FALSE );
+    aFunc.AutoOutline( aRange, sal_False, sal_False );
 
     //	auf der View markieren
     //	Wenn's beim Aufruf eine Mehrfachselektion war, ist es jetzt der
@@ -648,10 +648,10 @@ void __EXPORT ScUndoAutoOutline::Redo()
 void __EXPORT ScUndoAutoOutline::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->AutoOutline( TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->AutoOutline( sal_True );
 }
 
-BOOL __EXPORT ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -727,9 +727,9 @@ void __EXPORT ScUndoSubTotals::Undo()
         pUndoTable->GetRowArray()->GetRange( nStartRow, nEndRow );
 
         pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStartCol), 0, nTab,
-                static_cast<SCCOL>(nEndCol), MAXROW, nTab, IDF_NONE, FALSE,
+                static_cast<SCCOL>(nEndCol), MAXROW, nTab, IDF_NONE, sal_False,
                 pDoc);
-        pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, sal_False, pDoc );
 
         pViewShell->UpdateScrollBars();
     }
@@ -742,9 +742,9 @@ void __EXPORT ScUndoSubTotals::Undo()
     pDoc->DeleteAreaTab( 0,aParam.nRow1+1, MAXCOL,aParam.nRow2, nTab, IDF_ALL );
 
     pUndoDoc->CopyToDocument( 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab,
-                                                            IDF_NONE, FALSE, pDoc );	// Flags
+                                                            IDF_NONE, sal_False, pDoc );	// Flags
     pUndoDoc->UndoToDocument( 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab,
-                                                            IDF_ALL, FALSE, pDoc );
+                                                            IDF_ALL, sal_False, pDoc );
 
     ScUndoUtil::MarkSimpleBlock( pDocShell, aParam.nCol1,aParam.nRow1,nTab,
                                             aParam.nCol2,aParam.nRow2,nTab );
@@ -755,7 +755,7 @@ void __EXPORT ScUndoSubTotals::Undo()
     if (pUndoRange)
         pDoc->SetRangeName( new ScRangeName( *pUndoRange ) );
     if (pUndoDB)
-        pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE );
+        pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), sal_True );
 
     SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
     if ( nVisTab != nTab )
@@ -779,7 +779,7 @@ void __EXPORT ScUndoSubTotals::Redo()
 
     ScUndoUtil::MarkSimpleBlock( pDocShell, aParam.nCol1,aParam.nRow1,nTab,
                                             aParam.nCol2,aParam.nRow2,nTab );
-    pViewShell->DoSubTotals( aParam, FALSE );
+    pViewShell->DoSubTotals( aParam, sal_False );
 
     EndRedo();
 }
@@ -788,9 +788,9 @@ void __EXPORT ScUndoSubTotals::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL __EXPORT ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;						// geht nicht wegen Spaltennummern
+    return sal_False;						// geht nicht wegen Spaltennummern
 }
 
 //
@@ -799,7 +799,7 @@ BOOL __EXPORT ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 
 ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell,
                         SCTAB nNewTab, const ScSortParam& rParam,
-                        BOOL bQuery, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB,
+                        sal_Bool bQuery, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB,
                         const ScRange* pDest ) :
     ScDBFuncUndo( pNewDocShell, ScRange( rParam.nCol1, rParam.nRow1, nNewTab,
                                          rParam.nCol2, rParam.nRow2, nNewTab ) ),
@@ -808,11 +808,11 @@ ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell,
     bRepeatQuery( bQuery ),
     pUndoDoc( pNewUndoDoc ),
     pUndoDB( pNewUndoDB ),
-    bDestArea( FALSE )
+    bDestArea( sal_False )
 {
     if ( pDest )
     {
-        bDestArea = TRUE;
+        bDestArea = sal_True;
         aDestRange = *pDest;
     }
 }
@@ -855,23 +855,23 @@ void __EXPORT ScUndoSort::Undo()
     // do not delete/copy note captions, they are handled in drawing undo (ScDBFuncUndo::mpDrawUndo)
     pDoc->DeleteAreaTab( nStartCol,nStartRow, nEndCol,nEndRow, nSortTab, IDF_ALL|IDF_NOCAPTIONS );
     pUndoDoc->CopyToDocument( nStartCol, nStartRow, nSortTab, nEndCol, nEndRow, nSortTab,
-                                IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
+                                IDF_ALL|IDF_NOCAPTIONS, sal_False, pDoc );
 
     if (bDestArea)
     {
         // do not delete/copy note captions, they are handled in drawing undo (ScDBFuncUndo::mpDrawUndo)
         pDoc->DeleteAreaTab( aDestRange, IDF_ALL|IDF_NOCAPTIONS );
-        pUndoDoc->CopyToDocument( aDestRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( aDestRange, IDF_ALL|IDF_NOCAPTIONS, sal_False, pDoc );
     }
 
     //	Zeilenhoehen immer (wegen automatischer Anpassung)
     //!	auf ScBlockUndo umstellen
 //	if (bRepeatQuery)
         pUndoDoc->CopyToDocument( 0, nStartRow, nSortTab, MAXCOL, nEndRow, nSortTab,
-                                IDF_NONE, FALSE, pDoc );
+                                IDF_NONE, sal_False, pDoc );
 
     if (pUndoDB)
-        pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE );
+        pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), sal_True );
 
     SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
     if ( nVisTab != nSortTab )
@@ -900,7 +900,7 @@ void __EXPORT ScUndoSort::Redo()
     pViewShell->MarkRange( ScRange( aSortParam.nCol1, aSortParam.nRow1, nTab,
                                       aSortParam.nCol2, aSortParam.nRow2, nTab ) );
 
-    pViewShell->Sort( aSortParam, FALSE );
+    pViewShell->Sort( aSortParam, sal_False );
 
     //	Quellbereich painten wegen Markierung
     if ( !aSortParam.bInplace )
@@ -914,9 +914,9 @@ void __EXPORT ScUndoSort::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL __EXPORT ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;						// geht nicht wegen Spaltennummern
+    return sal_False;						// geht nicht wegen Spaltennummern
 }
 
 //
@@ -925,7 +925,7 @@ BOOL __EXPORT ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 
 ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQueryParam& rParam,
                             ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB,
-                            const ScRange* pOld, BOOL bSize, const ScRange* pAdvSrc ) :
+                            const ScRange* pOld, sal_Bool bSize, const ScRange* pAdvSrc ) :
     ScDBFuncUndo( pNewDocShell, ScRange( rParam.nCol1, rParam.nRow1, nNewTab,
                                          rParam.nCol2, rParam.nRow2, nNewTab ) ),
     pDrawUndo( NULL ),
@@ -934,18 +934,18 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery
     pUndoDoc( pNewUndoDoc ),
 //	pUndoDBData( pNewData )
     pUndoDB( pNewUndoDB ),
-    bIsAdvanced( FALSE ),
-    bDestArea( FALSE ),
+    bIsAdvanced( sal_False ),
+    bDestArea( sal_False ),
     bDoSize( bSize )
 {
     if ( pOld )
     {
-        bDestArea = TRUE;
+        bDestArea = sal_True;
         aOldDest = *pOld;
     }
     if ( pAdvSrc )
     {
-        bIsAdvanced = TRUE;
+        bIsAdvanced = sal_True;
         aAdvSource = *pAdvSrc;
     }
 
@@ -972,7 +972,7 @@ void __EXPORT ScUndoQuery::Undo()
     ScDocument* pDoc = pDocShell->GetDocument();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    BOOL bCopy = !aQueryParam.bInplace;
+    sal_Bool bCopy = !aQueryParam.bInplace;
     SCCOL nDestEndCol = 0;
     SCROW nDestEndRow = 0;
     if (bCopy)
@@ -981,7 +981,7 @@ void __EXPORT ScUndoQuery::Undo()
         nDestEndRow = aQueryParam.nDestRow + ( aQueryParam.nRow2-aQueryParam.nRow1 );
 
         ScDBData* pData = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow,
-                                                aQueryParam.nDestTab, TRUE );
+                                                aQueryParam.nDestTab, sal_True );
         if (pData)
         {
             ScRange aNewDest;
@@ -1009,22 +1009,22 @@ void __EXPORT ScUndoQuery::Undo()
 
         pUndoDoc->CopyToDocument( aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab,
                                     nDestEndCol, nDestEndRow, aQueryParam.nDestTab,
-                                    IDF_ALL, FALSE, pDoc );
+                                    IDF_ALL, sal_False, pDoc );
         //	Attribute werden immer mitkopiert (#49287#)
 
         //	Rest von altem Bereich
         if ( bDestArea && !bDoSize )
         {
             pDoc->DeleteAreaTab( aOldDest, IDF_ALL );
-            pUndoDoc->CopyToDocument( aOldDest, IDF_ALL, FALSE, pDoc );
+            pUndoDoc->CopyToDocument( aOldDest, IDF_ALL, sal_False, pDoc );
         }
     }
     else
         pUndoDoc->CopyToDocument( 0, aQueryParam.nRow1, nTab, MAXCOL, aQueryParam.nRow2, nTab,
-                                        IDF_NONE, FALSE, pDoc );
+                                        IDF_NONE, sal_False, pDoc );
 
     if (pUndoDB)
-        pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE );
+        pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), sal_True );
 
     if (!bCopy)
     {
@@ -1079,9 +1079,9 @@ void __EXPORT ScUndoQuery::Redo()
         pViewShell->SetTabNo( nTab );
 
     if ( bIsAdvanced )
-        pViewShell->Query( aQueryParam, &aAdvSource, FALSE );
+        pViewShell->Query( aQueryParam, &aAdvSource, sal_False );
     else
-        pViewShell->Query( aQueryParam, NULL, FALSE );
+        pViewShell->Query( aQueryParam, NULL, sal_False );
 
     EndRedo();
 }
@@ -1090,9 +1090,9 @@ void __EXPORT ScUndoQuery::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL __EXPORT ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;						// geht nicht wegen Spaltennummern
+    return sal_False;						// geht nicht wegen Spaltennummern
 }
 
 //
@@ -1100,7 +1100,7 @@ BOOL __EXPORT ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 //
 
 ScUndoAutoFilter::ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange,
-                                    const String& rName, BOOL bSet ) :
+                                    const String& rName, sal_Bool bSet ) :
     ScDBFuncUndo( pNewDocShell, rRange ),
     aDBName( rName ),
     bFilterSet( bSet )
@@ -1116,11 +1116,11 @@ String ScUndoAutoFilter::GetComment() const
     return ScGlobal::GetRscString( STR_UNDO_QUERY );    // same as ScUndoQuery
 }
 
-void ScUndoAutoFilter::DoChange( BOOL bUndo )
+void ScUndoAutoFilter::DoChange( sal_Bool bUndo )
 {
-    BOOL bNewFilter = bUndo ? !bFilterSet : bFilterSet;
+    sal_Bool bNewFilter = bUndo ? !bFilterSet : bFilterSet;
 
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     ScDocument* pDoc = pDocShell->GetDocument();
     ScDBCollection* pColl = pDoc->GetDBCollection();
     if ( pColl->SearchName( aDBName, nIndex ) )
@@ -1147,14 +1147,14 @@ void ScUndoAutoFilter::DoChange( BOOL bUndo )
 void ScUndoAutoFilter::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
 void ScUndoAutoFilter::Redo()
 {
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( sal_False );
     EndRedo();
 }
 
@@ -1162,9 +1162,9 @@ void ScUndoAutoFilter::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL ScUndoAutoFilter::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoAutoFilter::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 //
@@ -1196,11 +1196,11 @@ void __EXPORT ScUndoDBData::Undo()
 
     ScDocument* pDoc = pDocShell->GetDocument();
 
-    BOOL bOldAutoCalc = pDoc->GetAutoCalc();
-    pDoc->SetAutoCalc( FALSE );			// unnoetige Berechnungen vermeiden
-    pDoc->CompileDBFormula( TRUE );		// CreateFormulaString
-    pDoc->SetDBCollection( new ScDBCollection(*pUndoColl), TRUE );
-    pDoc->CompileDBFormula( FALSE );	// CompileFormulaString
+    sal_Bool bOldAutoCalc = pDoc->GetAutoCalc();
+    pDoc->SetAutoCalc( sal_False );			// unnoetige Berechnungen vermeiden
+    pDoc->CompileDBFormula( sal_True );		// CreateFormulaString
+    pDoc->SetDBCollection( new ScDBCollection(*pUndoColl), sal_True );
+    pDoc->CompileDBFormula( sal_False );	// CompileFormulaString
     pDoc->SetAutoCalc( bOldAutoCalc );
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
@@ -1214,11 +1214,11 @@ void __EXPORT ScUndoDBData::Redo()
 
     ScDocument* pDoc = pDocShell->GetDocument();
 
-    BOOL bOldAutoCalc = pDoc->GetAutoCalc();
-    pDoc->SetAutoCalc( FALSE );			// unnoetige Berechnungen vermeiden
-    pDoc->CompileDBFormula( TRUE );		// CreateFormulaString
-    pDoc->SetDBCollection( new ScDBCollection(*pRedoColl), TRUE );
-    pDoc->CompileDBFormula( FALSE );	// CompileFormulaString
+    sal_Bool bOldAutoCalc = pDoc->GetAutoCalc();
+    pDoc->SetAutoCalc( sal_False );			// unnoetige Berechnungen vermeiden
+    pDoc->CompileDBFormula( sal_True );		// CreateFormulaString
+    pDoc->SetDBCollection( new ScDBCollection(*pRedoColl), sal_True );
+    pDoc->CompileDBFormula( sal_False );	// CompileFormulaString
     pDoc->SetAutoCalc( bOldAutoCalc );
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
@@ -1230,9 +1230,9 @@ void __EXPORT ScUndoDBData::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL __EXPORT ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;						// geht nicht
+    return sal_False;						// geht nicht
 }
 
 //
@@ -1254,7 +1254,7 @@ ScUndoImportData::ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab,
     pUndoDBData( pNewUndoData ),
     pRedoDBData( pNewRedoData ),
     nFormulaCols( nNewFormula ),
-    bRedoFilled( FALSE )
+    bRedoFilled( sal_False )
 {
     // redo doc doesn't contain imported data (but everything else)
 }
@@ -1298,20 +1298,20 @@ void __EXPORT ScUndoImportData::Undo()
             //	imported data is deleted later anyway,
             //	so now delete each column after copying to save memory (#41216#)
 
-            BOOL bOldAutoCalc = pDoc->GetAutoCalc();
-            pDoc->SetAutoCalc( FALSE );				// outside of the loop
+            sal_Bool bOldAutoCalc = pDoc->GetAutoCalc();
+            pDoc->SetAutoCalc( sal_False );				// outside of the loop
             for (SCCOL nCopyCol = nCol1; nCopyCol <= nCol2; nCopyCol++)
             {
                 pDoc->CopyToDocument( nCopyCol,nRow1,nTab, nCopyCol,nRow2,nTab,
-                                        IDF_CONTENTS & ~IDF_NOTE, FALSE, pRedoDoc );
+                                        IDF_CONTENTS & ~IDF_NOTE, sal_False, pRedoDoc );
                 pDoc->DeleteAreaTab( nCopyCol,nRow1, nCopyCol,nRow2, nTab, IDF_CONTENTS & ~IDF_NOTE );
                 pDoc->DoColResize( nTab, nCopyCol, nCopyCol, 0 );
             }
             pDoc->SetAutoCalc( bOldAutoCalc );
-            bRedoFilled = TRUE;
+            bRedoFilled = sal_True;
         }
     }
-    BOOL bMoveCells = pUndoDBData && pRedoDBData &&
+    sal_Bool bMoveCells = pUndoDBData && pRedoDBData &&
                         pRedoDBData->IsDoSize();		// in alt und neu gleich
     if (bMoveCells)
     {
@@ -1326,7 +1326,7 @@ void __EXPORT ScUndoImportData::Undo()
 
         aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols );		// FitBlock auch fuer Formeln
         aNew.aEnd.SetCol( aNew.aEnd.Col() + nFormulaCols );
-        pDoc->FitBlock( aNew, aOld, FALSE );					// rueckwaerts
+        pDoc->FitBlock( aNew, aOld, sal_False );					// rueckwaerts
     }
     else
         pDoc->DeleteAreaTab( aImportParam.nCol1,aImportParam.nRow1,
@@ -1334,7 +1334,7 @@ void __EXPORT ScUndoImportData::Undo()
 
     pUndoDoc->CopyToDocument( aImportParam.nCol1,aImportParam.nRow1,nTab,
                                 nEndCol+nFormulaCols,nEndRow,nTab,
-                                IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+                                IDF_ALL & ~IDF_NOTE, sal_False, pDoc );
 
     if (pCurrentData)
     {
@@ -1381,7 +1381,7 @@ void __EXPORT ScUndoImportData::Redo()
         pCurrentData = ScUndoUtil::GetOldDBData( pUndoDBData, pDoc, nTab,
                                                     nCol1, nRow1, nCol2, nRow2 );
     }
-    BOOL bMoveCells = pUndoDBData && pRedoDBData &&
+    sal_Bool bMoveCells = pUndoDBData && pRedoDBData &&
                         pRedoDBData->IsDoSize();		// in alt und neu gleich
     if (bMoveCells)
     {
@@ -1398,14 +1398,14 @@ void __EXPORT ScUndoImportData::Redo()
         pDoc->DeleteAreaTab( aNew.aStart.Col(), aNew.aStart.Row(),
                                 aNew.aEnd.Col(), aNew.aEnd.Row(), nTab, IDF_ALL & ~IDF_NOTE );
 
-        pRedoDoc->CopyToDocument( aNew, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );        // incl. Formeln
+        pRedoDoc->CopyToDocument( aNew, IDF_ALL & ~IDF_NOTE, sal_False, pDoc );        // incl. Formeln
     }
     else
     {
         pDoc->DeleteAreaTab( aImportParam.nCol1,aImportParam.nRow1,
                                 nEndCol,nEndRow, nTab, IDF_ALL & ~IDF_NOTE );
         pRedoDoc->CopyToDocument( aImportParam.nCol1,aImportParam.nRow1,nTab,
-                                nEndCol,nEndRow,nTab, IDF_ALL & ~IDF_NOTE, FALSE, pDoc );
+                                nEndCol,nEndRow,nTab, IDF_ALL & ~IDF_NOTE, sal_False, pDoc );
     }
 
     if (pCurrentData)
@@ -1448,14 +1448,14 @@ void __EXPORT ScUndoImportData::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL __EXPORT ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     //	Repeat nur fuer Import per DB-Bereich, dann ist pUndoDBData gesetzt
 
     if (pUndoDBData)
         return (rTarget.ISA(ScTabViewTarget));
     else
-        return FALSE;		// Adressbuch
+        return sal_False;		// Adressbuch
 }
 
 //
@@ -1477,13 +1477,13 @@ ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab,
     pUndoTable( pNewUndoTab ),
     pUndoRange( pNewUndoRange ),
     pUndoDB( pNewUndoDB ),
-    bQuerySize( FALSE )
+    bQuerySize( sal_False )
 {
     if ( pOldQ && pNewQ )
     {
         aOldQuery = *pOldQ;
         aNewQuery = *pNewQ;
-        bQuerySize = TRUE;;
+        bQuerySize = sal_True;;
     }
 }
 
@@ -1510,7 +1510,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
 
     if (bQuerySize)
     {
-        pDoc->FitBlock( aNewQuery, aOldQuery, FALSE );
+        pDoc->FitBlock( aNewQuery, aOldQuery, sal_False );
 
         if ( aNewQuery.aEnd.Col() == aOldQuery.aEnd.Col() )
         {
@@ -1528,7 +1528,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
                 aOldForm.aEnd.SetCol( aOldQuery.aEnd.Col() + nFormulaCols );
                 ScRange aNewForm = aOldForm;
                 aNewForm.aEnd.SetRow( aNewQuery.aEnd.Row() );
-                pDoc->FitBlock( aNewForm, aOldForm, FALSE );
+                pDoc->FitBlock( aNewForm, aOldForm, sal_False );
             }
         }
     }
@@ -1560,9 +1560,9 @@ void __EXPORT ScUndoRepeatDB::Undo()
         pUndoTable->GetRowArray()->GetRange( nStartRow, nEndRow );
 
         pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStartCol), 0, nTab,
-                static_cast<SCCOL>(nEndCol), MAXROW, nTab, IDF_NONE, FALSE,
+                static_cast<SCCOL>(nEndCol), MAXROW, nTab, IDF_NONE, sal_False,
                 pDoc );
-        pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, sal_False, pDoc );
 
         pViewShell->UpdateScrollBars();
     }
@@ -1575,9 +1575,9 @@ void __EXPORT ScUndoRepeatDB::Undo()
                             MAXCOL, aBlockEnd.Row(), nTab, IDF_ALL );
 
     pUndoDoc->CopyToDocument( 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab,
-                                                            IDF_NONE, FALSE, pDoc );			// Flags
+                                                            IDF_NONE, sal_False, pDoc );			// Flags
     pUndoDoc->UndoToDocument( 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab,
-                                                            IDF_ALL, FALSE, pDoc );
+                                                            IDF_ALL, sal_False, pDoc );
 
     ScUndoUtil::MarkSimpleBlock( pDocShell, aBlockStart.Col(),aBlockStart.Row(),nTab,
                                             aBlockEnd.Col(),aBlockEnd.Row(),nTab );
@@ -1585,7 +1585,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
     if (pUndoRange)
         pDoc->SetRangeName( new ScRangeName( *pUndoRange ) );
     if (pUndoDB)
-        pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE );
+        pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), sal_True );
 
 // erack! it's broadcasted
 //	pDoc->SetDirty();
@@ -1615,7 +1615,7 @@ void __EXPORT ScUndoRepeatDB::Redo()
                                             aBlockEnd.Col(),aBlockEnd.Row(),nTab );
     pViewShell->SetCursor( aCursorPos.Col(), aCursorPos.Row() );
 
-    pViewShell->RepeatDB( FALSE );
+    pViewShell->RepeatDB( sal_False );
 
     EndRedo();
 }
@@ -1623,10 +1623,10 @@ void __EXPORT ScUndoRepeatDB::Redo()
 void __EXPORT ScUndoRepeatDB::Repeat(SfxRepeatTarget& rTarget)
 {
     if (rTarget.ISA(ScTabViewTarget))
-        ((ScTabViewTarget&)rTarget).GetViewShell()->RepeatDB( TRUE );
+        ((ScTabViewTarget&)rTarget).GetViewShell()->RepeatDB( sal_True );
 }
 
-BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1667,7 +1667,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
 //UNUSED2008-05
 //UNUSED2008-05  String __EXPORT ScUndoPivot::GetComment() const
 //UNUSED2008-05  {
-//UNUSED2008-05      USHORT nIndex;
+//UNUSED2008-05      sal_uInt16 nIndex;
 //UNUSED2008-05      if ( pOldUndoDoc && pNewUndoDoc )
 //UNUSED2008-05          nIndex = STR_UNDO_PIVOT_MODIFY;
 //UNUSED2008-05      else if ( pNewUndoDoc )
@@ -1690,7 +1690,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
 //UNUSED2008-05                              aNewArea.nColEnd,aNewArea.nRowEnd, aNewArea.nTab, IDF_ALL );
 //UNUSED2008-05          pNewUndoDoc->CopyToDocument( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab,
 //UNUSED2008-05                                  aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab,
-//UNUSED2008-05                                  IDF_ALL, FALSE, pDoc );
+//UNUSED2008-05                                  IDF_ALL, sal_False, pDoc );
 //UNUSED2008-05      }
 //UNUSED2008-05      if (pOldUndoDoc)
 //UNUSED2008-05      {
@@ -1698,7 +1698,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
 //UNUSED2008-05                              aOldArea.nColEnd,aOldArea.nRowEnd, aOldArea.nTab, IDF_ALL );
 //UNUSED2008-05          pOldUndoDoc->CopyToDocument( aOldArea.nColStart, aOldArea.nRowStart, aOldArea.nTab,
 //UNUSED2008-05                                  aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab,
-//UNUSED2008-05                                  IDF_ALL, FALSE, pDoc );
+//UNUSED2008-05                                  IDF_ALL, sal_False, pDoc );
 //UNUSED2008-05      }
 //UNUSED2008-05
 //UNUSED2008-05      ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection();
@@ -1769,7 +1769,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
 //UNUSED2008-05          pNewPivot->SetTag( aNewTag );
 //UNUSED2008-05      }
 //UNUSED2008-05  
-//UNUSED2008-05      pDocShell->PivotUpdate( pOldPivot, pNewPivot, FALSE );
+//UNUSED2008-05      pDocShell->PivotUpdate( pOldPivot, pNewPivot, sal_False );
 //UNUSED2008-05  
 //UNUSED2008-05      EndRedo();
 //UNUSED2008-05  }
@@ -1782,7 +1782,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
 //UNUSED2008-05          ((ScTabViewTarget&)rTarget).GetViewShell()->DeletePivotTable();
 //UNUSED2008-05  }
 //UNUSED2008-05  
-//UNUSED2008-05  BOOL __EXPORT ScUndoPivot::CanRepeat(SfxRepeatTarget& rTarget) const
+//UNUSED2008-05  sal_Bool __EXPORT ScUndoPivot::CanRepeat(SfxRepeatTarget& rTarget) const
 //UNUSED2008-05  {
 //UNUSED2008-05      //  Wiederholen: nur loeschen
 //UNUSED2008-05  
@@ -1795,7 +1795,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
 
 ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell,
                             ScDocument* pOldDoc, ScDocument* pNewDoc,
-                            const ScDPObject* pOldObj, const ScDPObject* pNewObj, BOOL bMove ) :
+                            const ScDPObject* pOldObj, const ScDPObject* pNewObj, sal_Bool bMove ) :
     ScSimpleUndo( pNewDocShell ),
     pOldUndoDoc( pOldDoc ),
     pNewUndoDoc( pNewDoc ),
@@ -1819,7 +1819,7 @@ __EXPORT ScUndoDataPilot::~ScUndoDataPilot()
 
 String __EXPORT ScUndoDataPilot::GetComment() const
 {
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     if ( pOldUndoDoc && pNewUndoDoc )
         nIndex = STR_UNDO_PIVOT_MODIFY;
     else if ( pNewUndoDoc )
@@ -1843,13 +1843,13 @@ void __EXPORT ScUndoDataPilot::Undo()
     {
         aNewRange = pNewDPObject->GetOutRange();
         pDoc->DeleteAreaTab( aNewRange, IDF_ALL );
-        pNewUndoDoc->CopyToDocument( aNewRange, IDF_ALL, FALSE, pDoc );
+        pNewUndoDoc->CopyToDocument( aNewRange, IDF_ALL, sal_False, pDoc );
     }
     if ( pOldDPObject && pOldUndoDoc )
     {
         aOldRange = pOldDPObject->GetOutRange();
         pDoc->DeleteAreaTab( aOldRange, IDF_ALL );
-        pOldUndoDoc->CopyToDocument( aOldRange, IDF_ALL, FALSE, pDoc );
+        pOldUndoDoc->CopyToDocument( aOldRange, IDF_ALL, sal_False, pDoc );
     }
 
     //	update objects in collection
@@ -1886,7 +1886,7 @@ void __EXPORT ScUndoDataPilot::Undo()
         //	re-insert deleted object
 
         ScDPObject* pDestObj = new ScDPObject( *pOldDPObject );
-        pDestObj->SetAlive(TRUE);
+        pDestObj->SetAlive(sal_True);
         if ( !pDoc->GetDPCollection()->InsertNewTable(pDestObj) )
         {
             DBG_ERROR("cannot insert DPObject");
@@ -1937,7 +1937,7 @@ void __EXPORT ScUndoDataPilot::Redo()
     }
 
     ScDBDocFunc aFunc( *pDocShell );
-    aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE, bAllowMove );	// no new undo action
+    aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, sal_False, sal_False, bAllowMove );	// no new undo action
 
     EndRedo();
 }
@@ -1947,10 +1947,10 @@ void __EXPORT ScUndoDataPilot::Repeat(SfxRepeatTarget& /* rTarget */)
     //!	allow deletion
 }
 
-BOOL __EXPORT ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
     //!	allow deletion
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1960,7 +1960,7 @@ BOOL __EXPORT ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 
 ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rArea,
                     const ScConsolidateParam& rPar, ScDocument* pNewUndoDoc,
-                    BOOL bReference, SCROW nInsCount, ScOutlineTable* pTab,
+                    sal_Bool bReference, SCROW nInsCount, ScOutlineTable* pTab,
                     ScDBData* pData ) :
     ScSimpleUndo( pNewDocShell ),
     aDestArea( rArea ),
@@ -2005,19 +2005,19 @@ void __EXPORT ScUndoConsolidate::Undo()
         pDoc->SetOutlineTable( nTab, pUndoTab );
 
         //	Zeilenstatus
-        pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, FALSE, pDoc );
+        pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, sal_False, pDoc );
 
         //	Daten & Referenzen
         pDoc->DeleteAreaTab( 0,aDestArea.nRowStart, MAXCOL,aDestArea.nRowEnd, nTab, IDF_ALL );
         pUndoDoc->UndoToDocument( 0, aDestArea.nRowStart, nTab,
                                     MAXCOL, aDestArea.nRowEnd, nTab,
-                                    IDF_ALL, FALSE, pDoc );
+                                    IDF_ALL, sal_False, pDoc );
 
         //	Original-Bereich
         if (pUndoData)
         {
             pDoc->DeleteAreaTab(aOldRange, IDF_ALL);
-            pUndoDoc->CopyToDocument(aOldRange, IDF_ALL, FALSE, pDoc);
+            pUndoDoc->CopyToDocument(aOldRange, IDF_ALL, sal_False, pDoc);
         }
 
         pDocShell->PostPaint( 0,aDestArea.nRowStart,nTab, MAXCOL,MAXROW,nTab,
@@ -2029,13 +2029,13 @@ void __EXPORT ScUndoConsolidate::Undo()
                                 aDestArea.nColEnd,aDestArea.nRowEnd, nTab, IDF_ALL );
         pUndoDoc->CopyToDocument( aDestArea.nColStart, aDestArea.nRowStart, nTab,
                                     aDestArea.nColEnd, aDestArea.nRowEnd, nTab,
-                                    IDF_ALL, FALSE, pDoc );
+                                    IDF_ALL, sal_False, pDoc );
 
         //	Original-Bereich
         if (pUndoData)
         {
             pDoc->DeleteAreaTab(aOldRange, IDF_ALL);
-            pUndoDoc->CopyToDocument(aOldRange, IDF_ALL, FALSE, pDoc);
+            pUndoDoc->CopyToDocument(aOldRange, IDF_ALL, sal_False, pDoc);
         }
 
         SCCOL nEndX = aDestArea.nColEnd;
@@ -2057,7 +2057,7 @@ void __EXPORT ScUndoConsolidate::Undo()
         ScDBCollection*	pColl = pDoc->GetDBCollection();
         if (pColl)
         {
-            USHORT nIndex;
+            sal_uInt16 nIndex;
             if (pColl->SearchName( pUndoData->GetName(), nIndex ))
             {
                 ScDBData* pDocData = (*pColl)[nIndex];
@@ -2086,7 +2086,7 @@ void __EXPORT ScUndoConsolidate::Redo()
 {
     BeginRedo();
 
-    pDocShell->DoConsolidate( aParam, FALSE );
+    pDocShell->DoConsolidate( aParam, sal_False );
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
@@ -2103,9 +2103,9 @@ void __EXPORT ScUndoConsolidate::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL __EXPORT ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -2121,8 +2121,8 @@ void ScUndoChartData::Init()
 }
 
 ScUndoChartData::ScUndoChartData( ScDocShell* pNewDocShell, const String& rName,
-                                    const ScRange& rNew, BOOL bColHdr, BOOL bRowHdr,
-                                    BOOL bAdd ) :
+                                    const ScRange& rNew, sal_Bool bColHdr, sal_Bool bRowHdr,
+                                    sal_Bool bAdd ) :
     ScSimpleUndo( pNewDocShell ),
     aChartName( rName ),
     bNewColHeaders( bColHdr ),
@@ -2136,8 +2136,8 @@ ScUndoChartData::ScUndoChartData( ScDocShell* pNewDocShell, const String& rName,
 }
 
 ScUndoChartData::ScUndoChartData( ScDocShell* pNewDocShell, const String& rName,
-                                    const ScRangeListRef& rNew, BOOL bColHdr, BOOL bRowHdr,
-                                    BOOL bAdd ) :
+                                    const ScRangeListRef& rNew, sal_Bool bColHdr, sal_Bool bRowHdr,
+                                    sal_Bool bAdd ) :
     ScSimpleUndo( pNewDocShell ),
     aChartName( rName ),
     aNewRangeListRef( rNew ),
@@ -2162,7 +2162,7 @@ void __EXPORT ScUndoChartData::Undo()
     BeginUndo();
 
     pDocShell->GetDocument()->UpdateChartArea( aChartName, aOldRangeListRef,
-                                bOldColHeaders, bOldRowHeaders, FALSE );
+                                bOldColHeaders, bOldRowHeaders, sal_False );
 
     EndUndo();
 }
@@ -2181,9 +2181,9 @@ void __EXPORT ScUndoChartData::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL __EXPORT ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool __EXPORT ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index 458cabec8..e8069c676 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -203,7 +203,7 @@ String __EXPORT ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const
         return String();
 }
 
-USHORT __EXPORT ScUndoDraw::GetId() const
+sal_uInt16 __EXPORT ScUndoDraw::GetId() const
 {
     if (pDrawUndo)
         return pDrawUndo->GetId();
@@ -211,26 +211,26 @@ USHORT __EXPORT ScUndoDraw::GetId() const
         return 0;
 }
 
-BOOL __EXPORT ScUndoDraw::IsLinked()
+sal_Bool __EXPORT ScUndoDraw::IsLinked()
 {
     if (pDrawUndo)
         return pDrawUndo->IsLinked();
     else
-        return FALSE;
+        return sal_False;
 }
 
-void __EXPORT ScUndoDraw::SetLinked( BOOL bIsLinked )
+void __EXPORT ScUndoDraw::SetLinked( sal_Bool bIsLinked )
 {
     if (pDrawUndo)
         pDrawUndo->SetLinked(bIsLinked);
 }
 
-BOOL  __EXPORT ScUndoDraw::Merge( SfxUndoAction* pNextAction )
+sal_Bool  __EXPORT ScUndoDraw::Merge( SfxUndoAction* pNextAction )
 {
     if (pDrawUndo)
         return pDrawUndo->Merge(pNextAction);
     else
-        return FALSE;
+        return sal_False;
 }
 
 void __EXPORT ScUndoDraw::Undo()
@@ -257,12 +257,12 @@ void __EXPORT ScUndoDraw::Repeat(SfxRepeatTarget& rTarget)
         pDrawUndo->Repeat(rTarget);
 }
 
-BOOL __EXPORT ScUndoDraw::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool __EXPORT ScUndoDraw::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     if (pDrawUndo)
         return pDrawUndo->CanRepeat(rTarget);
     else
-        return FALSE;
+        return sal_False;
 }
 
 
diff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxx
index 8053f472c..95186e405 100644
--- a/sc/source/ui/undo/undoolk.cxx
+++ b/sc/source/ui/undo/undoolk.cxx
@@ -91,7 +91,7 @@ void DeleteSdrUndoAction( SdrUndoAction* pUndoAction )
     delete pUndoAction;
 }
 
-void EnableDrawAdjust( ScDocument* pDoc, BOOL bEnable )
+void EnableDrawAdjust( ScDocument* pDoc, sal_Bool bEnable )
 {
     ScDrawLayer* pLayer = pDoc->GetDrawLayer();
     if (pLayer)
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index 7f85a38ad..b9b6be613 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -118,13 +118,13 @@ ScUndoModifyStyle::~ScUndoModifyStyle()
 
 String ScUndoModifyStyle::GetComment() const
 {
-    USHORT nId = (eFamily == SFX_STYLE_FAMILY_PARA) ?
+    sal_uInt16 nId = (eFamily == SFX_STYLE_FAMILY_PARA) ?
                                 STR_UNDO_EDITCELLSTYLE :
                                 STR_UNDO_EDITPAGESTYLE;
     return ScGlobal::GetRscString( nId );
 }
 
-void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, BOOL bRemoved )
+void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, sal_Bool bRemoved )
 {
     //!	move to document or docshell
 
@@ -147,8 +147,8 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
     ScDocument* pDoc = pDocSh->GetDocument();
     ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool();
     String aNewName = rData.GetName();
-    BOOL bDelete = ( aNewName.Len() == 0 );			// no new name -> delete style
-    BOOL bNew = ( rName.Len() == 0 && !bDelete );	// creating new style
+    sal_Bool bDelete = ( aNewName.Len() == 0 );			// no new name -> delete style
+    sal_Bool bNew = ( rName.Len() == 0 && !bDelete );	// creating new style
 
     SfxStyleSheetBase* pStyle = NULL;
     if ( rName.Len() )
@@ -177,7 +177,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
         if ( bDelete )
         {
             if ( eStyleFamily == SFX_STYLE_FAMILY_PARA )
-                lcl_DocStyleChanged( pDoc, pStyle, TRUE );		// TRUE: remove usage of style
+                lcl_DocStyleChanged( pDoc, pStyle, sal_True );		// TRUE: remove usage of style
             else
                 pDoc->RemovePageStyleInUse( rName );
 
@@ -196,11 +196,11 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
             const SfxItemSet* pNewSet = rData.GetItems();
             DBG_ASSERT( pNewSet, "no ItemSet for style" );
             if (pNewSet)
-                rStyleSet.Set( *pNewSet, FALSE );
+                rStyleSet.Set( *pNewSet, sal_False );
 
             if ( eStyleFamily == SFX_STYLE_FAMILY_PARA )
             {
-                lcl_DocStyleChanged( pDoc, pStyle, FALSE );		// cell styles: row heights
+                lcl_DocStyleChanged( pDoc, pStyle, sal_False );		// cell styles: row heights
             }
             else
             {
@@ -212,7 +212,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
                 if (pNewSet)
                     pDoc->ModifyStyleSheet( *pStyle, *pNewSet );
 
-                pDocSh->PageStyleModified( aNewName, TRUE );
+                pDocSh->PageStyleModified( aNewName, sal_True );
             }
         }
     }
@@ -241,9 +241,9 @@ void ScUndoModifyStyle::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;		// no repeat possible
+    return sal_False;		// no repeat possible
 }
 
 // -----------------------------------------------------------------------
@@ -303,9 +303,9 @@ void ScUndoApplyPageStyle::Repeat(SfxRepeatTarget& /* rTarget */)
     //!	set same page style to current tab
 }
 
-BOOL ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 595be642a..e76d67e6f 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -56,7 +56,7 @@
 #include "drwlayer.hxx"
 #include "scresid.hxx"
 
-extern BOOL bDrawIsInUndo;			//! irgendwo als Member !!!
+extern sal_Bool bDrawIsInUndo;			//! irgendwo als Member !!!
 
 using namespace com::sun::star;
 using ::com::sun::star::uno::Sequence;
@@ -89,7 +89,7 @@ TYPEINIT1(ScUndoTabColor,  SfxUndoAction);
 
 ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell,
                                   SCTAB nTabNum,
-                                  BOOL bApp,
+                                  sal_Bool bApp,
                                   const String& rNewName) :
     ScSimpleUndo( pNewDocShell ),
     sNewName( rNewName ),
@@ -132,11 +132,11 @@ void ScUndoInsertTab::Undo()
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     pViewShell->SetTabNo(nTab);
 
-    pDocShell->SetInUndo( TRUE );				//! BeginUndo
-    bDrawIsInUndo = TRUE;
-    pViewShell->DeleteTable( nTab, FALSE );
-    bDrawIsInUndo = FALSE;
-    pDocShell->SetInUndo( FALSE );				//! EndUndo
+    pDocShell->SetInUndo( sal_True );				//! BeginUndo
+    bDrawIsInUndo = sal_True;
+    pViewShell->DeleteTable( nTab, sal_False );
+    bDrawIsInUndo = sal_False;
+    pDocShell->SetInUndo( sal_False );				//! EndUndo
 
     DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() );
 
@@ -144,7 +144,7 @@ void ScUndoInsertTab::Undo()
     if ( pChangeTrack )
         pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
 
-    //	SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+    //	SetTabNo(...,sal_True) for all views to sync with drawing layer pages
     pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
 }
 
@@ -154,17 +154,17 @@ void ScUndoInsertTab::Redo()
 
     RedoSdrUndoAction( pDrawUndo );             // Draw Redo first
 
-    pDocShell->SetInUndo( TRUE );				//! BeginRedo
-    bDrawIsInUndo = TRUE;
+    pDocShell->SetInUndo( sal_True );				//! BeginRedo
+    bDrawIsInUndo = sal_True;
     if (bAppend)
-        pViewShell->AppendTable( sNewName, FALSE );
+        pViewShell->AppendTable( sNewName, sal_False );
     else
     {
         pViewShell->SetTabNo(nTab);
-        pViewShell->InsertTable( sNewName, nTab, FALSE );
+        pViewShell->InsertTable( sNewName, nTab, sal_False );
     }
-    bDrawIsInUndo = FALSE;
-    pDocShell->SetInUndo( FALSE );				//! EndRedo
+    bDrawIsInUndo = sal_False;
+    pDocShell->SetInUndo( sal_False );				//! EndRedo
 
     SetChangeTrack();
 }
@@ -176,7 +176,7 @@ void ScUndoInsertTab::Repeat(SfxRepeatTarget& rTarget)
             Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
 }
 
-BOOL ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -188,7 +188,7 @@ BOOL ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const
 
 ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
                                         SCTAB nTabNum,
-                                        BOOL bApp,SvStrings *pNewNameList) :
+                                        sal_Bool bApp,SvStrings *pNewNameList) :
     ScSimpleUndo( pNewDocShell ),
     pDrawUndo( NULL ),
     nTab( nTabNum ),
@@ -207,7 +207,7 @@ ScUndoInsertTables::~ScUndoInsertTables()
     {
         for(int i=0;i<pNameList->Count();i++)
         {
-            pStr=pNameList->GetObject(sal::static_int_cast<USHORT>(i));
+            pStr=pNameList->GetObject(sal::static_int_cast<sal_uInt16>(i));
             delete pStr;
         }
         pNameList->Remove(0,pNameList->Count());
@@ -246,8 +246,8 @@ void ScUndoInsertTables::Undo()
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     pViewShell->SetTabNo(nTab);
 
-    pDocShell->SetInUndo( TRUE );				//! BeginUndo
-    bDrawIsInUndo = TRUE;
+    pDocShell->SetInUndo( sal_True );				//! BeginUndo
+    bDrawIsInUndo = sal_True;
 
     SvShorts TheTabs;
     for(int i=0;i<pNameList->Count();i++)
@@ -255,11 +255,11 @@ void ScUndoInsertTables::Undo()
         TheTabs.push_back( sal::static_int_cast<short>(nTab+i) );
     }
 
-    pViewShell->DeleteTables( TheTabs, FALSE );
+    pViewShell->DeleteTables( TheTabs, sal_False );
     TheTabs.clear();
 
-    bDrawIsInUndo = FALSE;
-    pDocShell->SetInUndo( FALSE );				//! EndUndo
+    bDrawIsInUndo = sal_False;
+    pDocShell->SetInUndo( sal_False );				//! EndUndo
 
     DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() );
 
@@ -267,7 +267,7 @@ void ScUndoInsertTables::Undo()
     if ( pChangeTrack )
         pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
 
-    //	SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+    //	SetTabNo(...,sal_True) for all views to sync with drawing layer pages
     pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
 }
 
@@ -277,13 +277,13 @@ void ScUndoInsertTables::Redo()
 
     RedoSdrUndoAction( pDrawUndo );             // Draw Redo first
 
-    pDocShell->SetInUndo( TRUE );				//! BeginRedo
-    bDrawIsInUndo = TRUE;
+    pDocShell->SetInUndo( sal_True );				//! BeginRedo
+    bDrawIsInUndo = sal_True;
     pViewShell->SetTabNo(nTab);
-    pViewShell->InsertTables( pNameList, nTab, static_cast<SCTAB>(pNameList->Count()),FALSE );
+    pViewShell->InsertTables( pNameList, nTab, static_cast<SCTAB>(pNameList->Count()),sal_False );
 
-    bDrawIsInUndo = FALSE;
-    pDocShell->SetInUndo( FALSE );				//! EndRedo
+    bDrawIsInUndo = sal_False;
+    pDocShell->SetInUndo( sal_False );				//! EndRedo
 
     SetChangeTrack();
 }
@@ -295,7 +295,7 @@ void ScUndoInsertTables::Repeat(SfxRepeatTarget& rTarget)
             Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
 }
 
-BOOL ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -330,14 +330,14 @@ void ScUndoDeleteTab::SetChangeTrack()
     ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
     if ( pChangeTrack )
     {
-        ULONG nTmpChangeAction;
+        sal_uLong nTmpChangeAction;
         nStartChangeAction = pChangeTrack->GetActionMax() + 1;
         nEndChangeAction = 0;
         ScRange aRange( 0, 0, 0, MAXCOL, MAXROW, 0 );
         for ( size_t i = 0; i < theTabs.size(); i++ )
         {
-            aRange.aStart.SetTab( theTabs[sal::static_int_cast<USHORT>(i)] );
-            aRange.aEnd.SetTab( theTabs[sal::static_int_cast<USHORT>(i)] );
+            aRange.aStart.SetTab( theTabs[sal::static_int_cast<sal_uInt16>(i)] );
+            aRange.aEnd.SetTab( theTabs[sal::static_int_cast<sal_uInt16>(i)] );
             pChangeTrack->AppendDeleteRange( aRange, pRefUndoDoc,
                 nTmpChangeAction, nEndChangeAction, (short) i );
         }
@@ -360,43 +360,43 @@ void ScUndoDeleteTab::Undo()
     size_t i=0;
     ScDocument* pDoc = pDocShell->GetDocument();
 
-    BOOL bLink = FALSE;
+    sal_Bool bLink = sal_False;
     String aName;
 
     for(i=0;i<theTabs.size();i++)
     {
-        SCTAB nTab = theTabs[sal::static_int_cast<USHORT>(i)];
+        SCTAB nTab = theTabs[sal::static_int_cast<sal_uInt16>(i)];
         pRefUndoDoc->GetName( nTab, aName );
 
-        bDrawIsInUndo = TRUE;
-        BOOL bOk = pDoc->InsertTab( nTab, aName );
-        bDrawIsInUndo = FALSE;
+        bDrawIsInUndo = sal_True;
+        sal_Bool bOk = pDoc->InsertTab( nTab, aName );
+        bDrawIsInUndo = sal_False;
         if (bOk)
         {
             //	Ref-Undo passiert in EndUndo
-    //		pUndoDoc->UndoToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc );
-            pRefUndoDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc );
+    //		pUndoDoc->UndoToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,sal_False, pDoc );
+            pRefUndoDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,sal_False, pDoc );
 
             String aOldName;
             pRefUndoDoc->GetName( nTab, aOldName );
-            pDoc->RenameTab( nTab, aOldName, FALSE );
+            pDoc->RenameTab( nTab, aOldName, sal_False );
             if (pRefUndoDoc->IsLinked(nTab))
             {
                 pDoc->SetLink( nTab, pRefUndoDoc->GetLinkMode(nTab), pRefUndoDoc->GetLinkDoc(nTab),
                                      pRefUndoDoc->GetLinkFlt(nTab), pRefUndoDoc->GetLinkOpt(nTab),
                                      pRefUndoDoc->GetLinkTab(nTab), pRefUndoDoc->GetLinkRefreshDelay(nTab) );
-                bLink = TRUE;
+                bLink = sal_True;
             }
 
             if ( pRefUndoDoc->IsScenario(nTab) )
             {
-                pDoc->SetScenario( nTab, TRUE );
+                pDoc->SetScenario( nTab, sal_True );
                 String aComment;
                 Color  aColor;
-                USHORT nScenFlags;
+                sal_uInt16 nScenFlags;
                 pRefUndoDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags );
                 pDoc->SetScenarioData( nTab, aComment, aColor, nScenFlags );
-                BOOL bActive = pRefUndoDoc->IsActiveScenario( nTab );
+                sal_Bool bActive = pRefUndoDoc->IsActiveScenario( nTab );
                 pDoc->SetActiveScenario( nTab, bActive );
             }
             pDoc->SetVisible( nTab, pRefUndoDoc->IsVisible( nTab ) );
@@ -423,7 +423,7 @@ void ScUndoDeleteTab::Undo()
 
     for(i=0;i<theTabs.size();i++)
     {
-        pDocShell->Broadcast( ScTablesHint( SC_TAB_INSERTED, theTabs[sal::static_int_cast<USHORT>(i)]) );
+        pDocShell->Broadcast( ScTablesHint( SC_TAB_INSERTED, theTabs[sal::static_int_cast<sal_uInt16>(i)]) );
     }
     SfxApplication* pSfxApp = SFX_APP();                                // Navigator
     pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
@@ -432,10 +432,10 @@ void ScUndoDeleteTab::Undo()
 
     pDocShell->PostPaint(0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_ALL );	// incl. Extras
 
-    //	nicht ShowTable wegen SetTabNo(..., TRUE):
+    //	nicht ShowTable wegen SetTabNo(..., sal_True):
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
-        pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDoc, theTabs.front() ), TRUE );
+        pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDoc, theTabs.front() ), sal_True );
 
 //	EndUndo();
 }
@@ -447,15 +447,15 @@ void ScUndoDeleteTab::Redo()
 
     RedoSdrUndoAction( pDrawUndo );             // Draw Redo first
 
-    pDocShell->SetInUndo( TRUE );				//! BeginRedo
-    bDrawIsInUndo = TRUE;
-    pViewShell->DeleteTables( theTabs, FALSE );
-    bDrawIsInUndo = FALSE;
-    pDocShell->SetInUndo( TRUE );				//! EndRedo
+    pDocShell->SetInUndo( sal_True );				//! BeginRedo
+    bDrawIsInUndo = sal_True;
+    pViewShell->DeleteTables( theTabs, sal_False );
+    bDrawIsInUndo = sal_False;
+    pDocShell->SetInUndo( sal_True );				//! EndRedo
 
     SetChangeTrack();
 
-    //	SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+    //	SetTabNo(...,sal_True) for all views to sync with drawing layer pages
     pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
 }
 
@@ -464,11 +464,11 @@ void ScUndoDeleteTab::Repeat(SfxRepeatTarget& rTarget)
     if (rTarget.ISA(ScTabViewTarget))
     {
         ScTabViewShell* pViewShell = ((ScTabViewTarget&)rTarget).GetViewShell();
-        pViewShell->DeleteTable( pViewShell->GetViewData()->GetTabNo(), TRUE );
+        pViewShell->DeleteTable( pViewShell->GetViewData()->GetTabNo(), sal_True );
     }
 }
 
-BOOL ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -531,9 +531,9 @@ void ScUndoRenameTab::Repeat(SfxRepeatTarget& /* rTarget */)
     //	Repeat macht keinen Sinn
 }
 
-BOOL ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -562,7 +562,7 @@ String ScUndoMoveTab::GetComment() const
     return ScGlobal::GetRscString( STR_UNDO_MOVE_TAB );
 }
 
-void ScUndoMoveTab::DoChange( BOOL bUndo ) const
+void ScUndoMoveTab::DoChange( sal_Bool bUndo ) const
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -578,7 +578,7 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
 
             pDoc->MoveTab( nDestTab, nOldTab );
             pViewShell->GetViewData()->MoveTab( nDestTab, nOldTab );
-            pViewShell->SetTabNo( nOldTab, TRUE );
+            pViewShell->SetTabNo( nOldTab, sal_True );
         }
     }
     else
@@ -593,7 +593,7 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
 
             pDoc->MoveTab( nOldTab, nNewTab );
             pViewShell->GetViewData()->MoveTab( nOldTab, nNewTab );
-            pViewShell->SetTabNo( nDestTab, TRUE );
+            pViewShell->SetTabNo( nDestTab, sal_True );
         }
     }
 
@@ -606,12 +606,12 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
 
 void ScUndoMoveTab::Undo()
 {
-    DoChange( TRUE );
+    DoChange( sal_True );
 }
 
 void ScUndoMoveTab::Redo()
 {
-    DoChange( FALSE );
+    DoChange( sal_False );
 }
 
 void ScUndoMoveTab::Repeat(SfxRepeatTarget& /* rTarget */)
@@ -619,9 +619,9 @@ void ScUndoMoveTab::Repeat(SfxRepeatTarget& /* rTarget */)
         // No Repeat ! ? !
 }
 
-BOOL ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -657,7 +657,7 @@ void ScUndoCopyTab::DoChange() const
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
     if (pViewShell)
-        pViewShell->SetTabNo(theOldTabs.front(),TRUE);
+        pViewShell->SetTabNo(theOldTabs.front(),sal_True);
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );	// Navigator
 
@@ -678,9 +678,9 @@ void ScUndoCopyTab::Undo()
         if (nDestTab > MAXTAB)							// append?
             nDestTab = pDoc->GetTableCount() - 1;
 
-        bDrawIsInUndo = TRUE;
+        bDrawIsInUndo = sal_True;
         pDoc->DeleteTab(nDestTab);
-        bDrawIsInUndo = FALSE;
+        bDrawIsInUndo = sal_False;
     }
 
     //	ScTablesHint broadcasts after all sheets have been deleted,
@@ -712,9 +712,9 @@ void ScUndoCopyTab::Redo()
         if (nDestTab > MAXTAB)							// append ?
             nDestTab = pDoc->GetTableCount() - 1;
 
-        bDrawIsInUndo = TRUE;
+        bDrawIsInUndo = sal_True;
         pDoc->CopyTab( nOldTab, nNewTab );
-        bDrawIsInUndo = FALSE;
+        bDrawIsInUndo = sal_False;
 
         pViewShell->GetViewData()->MoveTab( nOldTab, nNewTab );
 
@@ -724,15 +724,15 @@ void ScUndoCopyTab::Redo()
 
         if ( pDoc->IsScenario(nAdjSource) )
         {
-            pDoc->SetScenario(nNewTab, TRUE );
+            pDoc->SetScenario(nNewTab, sal_True );
             String aComment;
             Color  aColor;
-            USHORT nScenFlags;
+            sal_uInt16 nScenFlags;
             pDoc->GetScenarioData(nAdjSource, aComment, aColor, nScenFlags );
             pDoc->SetScenarioData(nNewTab, aComment, aColor, nScenFlags );
-            BOOL bActive = pDoc->IsActiveScenario(nAdjSource);
+            sal_Bool bActive = pDoc->IsActiveScenario(nAdjSource);
             pDoc->SetActiveScenario(nNewTab, bActive );
-            BOOL bVisible=pDoc->IsVisible(nAdjSource);
+            sal_Bool bVisible=pDoc->IsVisible(nAdjSource);
             pDoc->SetVisible(nNewTab,bVisible );
         }
 
@@ -742,7 +742,7 @@ void ScUndoCopyTab::Redo()
 
     RedoSdrUndoAction( pDrawUndo );             // after the sheets are inserted
 
-    pViewShell->SetTabNo( nDestTab, TRUE );		// after draw-undo
+    pViewShell->SetTabNo( nDestTab, sal_True );		// after draw-undo
 
     DoChange();
 
@@ -753,9 +753,9 @@ void ScUndoCopyTab::Repeat(SfxRepeatTarget& /* rTarget */)
         // kein Repeat ! ? !
 }
 
-BOOL ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 //---------------------------------------------------------------------------------
@@ -826,9 +826,9 @@ void ScUndoTabColor::Repeat(SfxRepeatTarget& /* rTarget */)
     //  No Repeat
 }
 
-BOOL ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -839,7 +839,7 @@ BOOL ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell,
                         SCTAB nSrc, SCTAB nDest,
                         const String& rN, const String& rC,
-                        const Color& rCol, USHORT nF,
+                        const Color& rCol, sal_uInt16 nF,
                         const ScMarkData& rMark ) :
     ScSimpleUndo( pNewDocShell ),
     nSrcTab( nSrc ),
@@ -868,11 +868,11 @@ void ScUndoMakeScenario::Undo()
 {
     ScDocument* pDoc = pDocShell->GetDocument();
 
-    pDocShell->SetInUndo( TRUE );
-    bDrawIsInUndo = TRUE;
+    pDocShell->SetInUndo( sal_True );
+    bDrawIsInUndo = sal_True;
     pDoc->DeleteTab( nDestTab );
-    bDrawIsInUndo = FALSE;
-    pDocShell->SetInUndo( FALSE );
+    bDrawIsInUndo = sal_False;
+    pDocShell->SetInUndo( sal_False );
 
     DoSdrUndoAction( pDrawUndo, pDoc );
 
@@ -881,32 +881,31 @@ void ScUndoMakeScenario::Undo()
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
-        pViewShell->SetTabNo( nSrcTab, TRUE );
+        pViewShell->SetTabNo( nSrcTab, sal_True );
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
 
-    //  SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+    //  SetTabNo(...,sal_True) for all views to sync with drawing layer pages
     pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
 }
 
 void ScUndoMakeScenario::Redo()
 {
-    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-    if (pViewShell)
-        pViewShell->SetMarkData( aMarkData );
+    SetViewMarkData( aMarkData );
 
     RedoSdrUndoAction( pDrawUndo );             // Draw Redo first
 
-    pDocShell->SetInUndo( TRUE );
-    bDrawIsInUndo = TRUE;
+    pDocShell->SetInUndo( sal_True );
+    bDrawIsInUndo = sal_True;
 
-    pDocShell->MakeScenario( nSrcTab, aName, aComment, aColor, nFlags, aMarkData, FALSE );
+    pDocShell->MakeScenario( nSrcTab, aName, aComment, aColor, nFlags, aMarkData, sal_False );
 
-    bDrawIsInUndo = FALSE;
-    pDocShell->SetInUndo( FALSE );
+    bDrawIsInUndo = sal_False;
+    pDocShell->SetInUndo( sal_False );
 
+    ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
-        pViewShell->SetTabNo( nDestTab, TRUE );
+        pViewShell->SetTabNo( nDestTab, sal_True );
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
 }
@@ -919,7 +918,7 @@ void ScUndoMakeScenario::Repeat(SfxRepeatTarget& rTarget)
     }
 }
 
-BOOL ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -931,7 +930,7 @@ BOOL ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const
 //
 
 ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell,
-                        SCTAB nNewTab, SCTAB nNewCount, BOOL bNewLink ) :
+                        SCTAB nNewTab, SCTAB nNewCount, sal_Bool bNewLink ) :
     ScSimpleUndo( pShell ),
     nTab( nNewTab ),
     nCount( nNewCount ),
@@ -962,11 +961,11 @@ void ScUndoImportTab::DoChange() const
     {
         if(nTab<nTabCount)
         {
-            pViewShell->SetTabNo(nTab,TRUE);
+            pViewShell->SetTabNo(nTab,sal_True);
         }
         else
         {
-            pViewShell->SetTabNo(nTab-1,TRUE);
+            pViewShell->SetTabNo(nTab-1,sal_True);
         }
     }
 
@@ -981,32 +980,32 @@ void ScUndoImportTab::Undo()
 
     SCTAB i;
     ScDocument* pDoc = pDocShell->GetDocument();
-    BOOL bMakeRedo = !pRedoDoc;
+    sal_Bool bMakeRedo = !pRedoDoc;
     if (bMakeRedo)
     {
         pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
-        pRedoDoc->InitUndo( pDoc, nTab,nTab+nCount-1, TRUE,TRUE );
+        pRedoDoc->InitUndo( pDoc, nTab,nTab+nCount-1, sal_True,sal_True );
 
         String aOldName;
         for (i=0; i<nCount; i++)
         {
             SCTAB nTabPos=nTab+i;
 
-            pDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,FALSE, pRedoDoc );
+            pDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,sal_False, pRedoDoc );
             pDoc->GetName( nTabPos, aOldName );
-            pRedoDoc->RenameTab( nTabPos, aOldName, FALSE );
+            pRedoDoc->RenameTab( nTabPos, aOldName, sal_False );
 
             if ( pDoc->IsScenario(nTabPos) )
             {
-                pRedoDoc->SetScenario(nTabPos, TRUE );
+                pRedoDoc->SetScenario(nTabPos, sal_True );
                 String aComment;
                 Color  aColor;
-                USHORT nScenFlags;
+                sal_uInt16 nScenFlags;
                 pDoc->GetScenarioData(nTabPos, aComment, aColor, nScenFlags );
                 pRedoDoc->SetScenarioData(nTabPos, aComment, aColor, nScenFlags );
-                BOOL bActive = pDoc->IsActiveScenario(nTabPos);
+                sal_Bool bActive = pDoc->IsActiveScenario(nTabPos);
                 pRedoDoc->SetActiveScenario(nTabPos, bActive );
-                BOOL bVisible=pDoc->IsVisible(nTabPos);
+                sal_Bool bVisible=pDoc->IsVisible(nTabPos);
                 pRedoDoc->SetVisible(nTabPos,bVisible );
             }
 
@@ -1018,10 +1017,10 @@ void ScUndoImportTab::Undo()
 
     DoSdrUndoAction( pDrawUndo, pDoc );             // before the sheets are deleted
 
-    bDrawIsInUndo = TRUE;
+    bDrawIsInUndo = sal_True;
     for (i=0; i<nCount; i++)
         pDoc->DeleteTab( nTab );
-    bDrawIsInUndo = FALSE;
+    bDrawIsInUndo = sal_False;
 
     DoChange();
 }
@@ -1041,26 +1040,26 @@ void ScUndoImportTab::Redo()
     {
         SCTAB nTabPos=nTab+i;
         pRedoDoc->GetName(nTabPos,aName);
-        bDrawIsInUndo = TRUE;
+        bDrawIsInUndo = sal_True;
         pDoc->InsertTab(nTabPos,aName);
-        bDrawIsInUndo = FALSE;
+        bDrawIsInUndo = sal_False;
     }
     for (i=0; i<nCount; i++)				// then copy into inserted sheets
     {
         SCTAB nTabPos=nTab+i;
-        pRedoDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,FALSE, pDoc );
+        pRedoDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,sal_False, pDoc );
 
         if ( pRedoDoc->IsScenario(nTabPos) )
         {
-            pDoc->SetScenario(nTabPos, TRUE );
+            pDoc->SetScenario(nTabPos, sal_True );
             String aComment;
             Color  aColor;
-            USHORT nScenFlags;
+            sal_uInt16 nScenFlags;
             pRedoDoc->GetScenarioData(nTabPos, aComment, aColor, nScenFlags );
             pDoc->SetScenarioData(nTabPos, aComment, aColor, nScenFlags );
-            BOOL bActive = pRedoDoc->IsActiveScenario(nTabPos);
+            sal_Bool bActive = pRedoDoc->IsActiveScenario(nTabPos);
             pDoc->SetActiveScenario(nTabPos, bActive );
-            BOOL bVisible=pRedoDoc->IsVisible(nTabPos);
+            sal_Bool bVisible=pRedoDoc->IsVisible(nTabPos);
             pDoc->SetVisible(nTabPos,bVisible );
         }
 
@@ -1080,7 +1079,7 @@ void ScUndoImportTab::Repeat(SfxRepeatTarget& rTarget)
             Execute(FID_INS_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
 }
 
-BOOL ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1099,12 +1098,12 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
     ScDocument* pDoc = pDocShell->GetDocument();
     SCTAB nTabCount = pDoc->GetTableCount();
     pTabs	  = new SCTAB[nTabCount];
-    pModes	  = new BYTE[nTabCount];
+    pModes	  = new sal_uInt8[nTabCount];
     pTabNames = new String[nTabCount];
 
     for (SCTAB i=0; i<nTabCount; i++)
     {
-        BYTE nMode = pDoc->GetLinkMode(i);
+        sal_uInt8 nMode = pDoc->GetLinkMode(i);
         if (nMode)
             if (pDoc->GetLinkDoc(i) == aDocName)
             {
@@ -1140,11 +1139,11 @@ String ScUndoRemoveLink::GetComment() const
     return ScGlobal::GetRscString( STR_UNDO_REMOVELINK );
 }
 
-void ScUndoRemoveLink::DoChange( BOOL bLink ) const
+void ScUndoRemoveLink::DoChange( sal_Bool bLink ) const
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     String aEmpty;
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
         if (bLink)		// establish link
             pDoc->SetLink( pTabs[i], pModes[i], aDocName, aFltName, aOptions, pTabNames[i], nRefreshDelay );
         else			// remove link
@@ -1154,12 +1153,12 @@ void ScUndoRemoveLink::DoChange( BOOL bLink ) const
 
 void ScUndoRemoveLink::Undo()
 {
-    DoChange( TRUE );
+    DoChange( sal_True );
 }
 
 void ScUndoRemoveLink::Redo()
 {
-    DoChange( FALSE );
+    DoChange( sal_False );
 }
 
 void ScUndoRemoveLink::Repeat(SfxRepeatTarget& /* rTarget */)
@@ -1167,9 +1166,9 @@ void ScUndoRemoveLink::Repeat(SfxRepeatTarget& /* rTarget */)
     //	gippsnich
 }
 
-BOOL ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1178,7 +1177,7 @@ BOOL ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 //		Tabellen ein-/ausblenden
 //
 
-ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewShow ) :
+ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, sal_Bool bNewShow ) :
     ScSimpleUndo( pShell ),
     nTab( nNewTab ),
     bShow( bNewShow )
@@ -1189,14 +1188,14 @@ ScUndoShowHideTab::~ScUndoShowHideTab()
 {
 }
 
-void ScUndoShowHideTab::DoChange( BOOL bShowP ) const
+void ScUndoShowHideTab::DoChange( sal_Bool bShowP ) const
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     pDoc->SetVisible( nTab, bShowP );
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
-        pViewShell->SetTabNo(nTab,TRUE);
+        pViewShell->SetTabNo(nTab,sal_True);
 
     SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
     pDocShell->SetDocumentModified();
@@ -1220,14 +1219,14 @@ void ScUndoShowHideTab::Repeat(SfxRepeatTarget& rTarget)
                                 SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
 }
 
-BOOL ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
 
 String ScUndoShowHideTab::GetComment() const
 {
-    USHORT nId = bShow ? STR_UNDO_SHOWTAB : STR_UNDO_HIDETAB;
+    sal_uInt16 nId = bShow ? STR_UNDO_SHOWTAB : STR_UNDO_HIDETAB;
     return ScGlobal::GetRscString( nId );
 }
 
@@ -1264,7 +1263,7 @@ void ScUndoDocProtect::DoProtect(bool bProtect)
     if (pViewShell)
     {
         pViewShell->UpdateLayerLocks();
-        pViewShell->UpdateInputHandler(TRUE);   // damit sofort wieder eingegeben werden kann
+        pViewShell->UpdateInputHandler(sal_True);   // damit sofort wieder eingegeben werden kann
     }
 
     pDocShell->PostPaintGridAll();
@@ -1289,14 +1288,14 @@ void ScUndoDocProtect::Repeat(SfxRepeatTarget& /* rTarget */)
     //  gippsnich
 }
 
-BOOL ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;       // gippsnich
+    return sal_False;       // gippsnich
 }
 
 String ScUndoDocProtect::GetComment() const
 {
-    USHORT nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
+    sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC;
     return ScGlobal::GetRscString( nId );
 }
 
@@ -1334,7 +1333,7 @@ void ScUndoTabProtect::DoProtect(bool bProtect)
     if (pViewShell)
     {
         pViewShell->UpdateLayerLocks();
-        pViewShell->UpdateInputHandler(TRUE);   // damit sofort wieder eingegeben werden kann
+        pViewShell->UpdateInputHandler(sal_True);   // damit sofort wieder eingegeben werden kann
     }
 
     pDocShell->PostPaintGridAll();
@@ -1359,14 +1358,14 @@ void ScUndoTabProtect::Repeat(SfxRepeatTarget& /* rTarget */)
     //  gippsnich
 }
 
-BOOL ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;       // gippsnich
+    return sal_False;       // gippsnich
 }
 
 String ScUndoTabProtect::GetComment() const
 {
-    USHORT nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB;
+    sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB;
     return ScGlobal::GetRscString( nId );
 }
 
@@ -1390,7 +1389,7 @@ ScUndoPrintRange::~ScUndoPrintRange()
     delete pNewRanges;
 }
 
-void ScUndoPrintRange::DoChange(BOOL bUndo)
+void ScUndoPrintRange::DoChange(sal_Bool bUndo)
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     if (bUndo)
@@ -1410,14 +1409,14 @@ void ScUndoPrintRange::DoChange(BOOL bUndo)
 void ScUndoPrintRange::Undo()
 {
     BeginUndo();
-    DoChange( TRUE );
+    DoChange( sal_True );
     EndUndo();
 }
 
 void ScUndoPrintRange::Redo()
 {
     BeginRedo();
-    DoChange( FALSE );
+    DoChange( sal_False );
     EndRedo();
 }
 
@@ -1426,9 +1425,9 @@ void ScUndoPrintRange::Repeat(SfxRepeatTarget& /* rTarget */)
     //	gippsnich
 }
 
-BOOL ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;		// gippsnich
+    return sal_False;		// gippsnich
 }
 
 String ScUndoPrintRange::GetComment() const
@@ -1446,7 +1445,7 @@ String ScUndoPrintRange::GetComment() const
 
 ScUndoScenarioFlags::ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT,
                     const String& rON, const String& rNN, const String& rOC, const String& rNC,
-                    const Color& rOCol, const Color& rNCol, USHORT nOF, USHORT nNF ) :
+                    const Color& rOCol, const Color& rNCol, sal_uInt16 nOF, sal_uInt16 nNF ) :
     ScSimpleUndo( pNewDocShell ),
     nTab		( nT ),
     aOldName	( rON ),
@@ -1508,9 +1507,9 @@ void ScUndoScenarioFlags::Repeat(SfxRepeatTarget& /* rTarget */)
     //	Repeat macht keinen Sinn
 }
 
-BOOL ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1545,8 +1544,8 @@ SdrObject* ScUndoRenameObject::GetObject()
     ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
     if ( pDrawLayer )
     {
-        USHORT nCount = pDrawLayer->GetPageCount();
-        for (USHORT nTab=0; nTab<nCount; nTab++)
+        sal_uInt16 nCount = pDrawLayer->GetPageCount();
+        for (sal_uInt16 nTab=0; nTab<nCount; nTab++)
         {
             SdrPage* pPage = pDrawLayer->GetPage(nTab);
             DBG_ASSERT(pPage,"Page ?");
@@ -1591,9 +1590,9 @@ void ScUndoRenameObject::Repeat(SfxRepeatTarget& /* rTarget */)
 {
 }
 
-BOOL ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const
+sal_Bool ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -1601,7 +1600,7 @@ BOOL ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 //		Switch sheet between left-to-right and right-to-left
 //
 
-ScUndoLayoutRTL::ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRTL ) :
+ScUndoLayoutRTL::ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, sal_Bool bNewRTL ) :
     ScSimpleUndo( pShell ),
     nTab( nNewTab ),
     bRTL( bNewRTL )
@@ -1612,20 +1611,20 @@ ScUndoLayoutRTL::~ScUndoLayoutRTL()
 {
 }
 
-void ScUndoLayoutRTL::DoChange( BOOL bNew )
+void ScUndoLayoutRTL::DoChange( sal_Bool bNew )
 {
-    pDocShell->SetInUndo( TRUE );
+    pDocShell->SetInUndo( sal_True );
 
     ScDocument* pDoc = pDocShell->GetDocument();
     pDoc->SetLayoutRTL( nTab, bNew );
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
-        pViewShell->SetTabNo(nTab,TRUE);
+        pViewShell->SetTabNo(nTab,sal_True);
 
     pDocShell->SetDocumentModified();
 
-    pDocShell->SetInUndo( FALSE );
+    pDocShell->SetInUndo( sal_False );
 }
 
 void ScUndoLayoutRTL::Undo()
@@ -1645,7 +1644,7 @@ void ScUndoLayoutRTL::Repeat(SfxRepeatTarget& rTarget)
             Execute( FID_TAB_RTL, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
 }
 
-BOOL ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const
+sal_Bool ScUndoLayoutRTL::CanRepeat(SfxRepeatTarget& rTarget) const
 {
     return (rTarget.ISA(ScTabViewTarget));
 }
@@ -1676,11 +1675,11 @@ String ScUndoLayoutRTL::GetComment() const
 //UNUSED2009-05 
 //UNUSED2009-05 void ScUndoSetGrammar::DoChange( formula::FormulaGrammar::Grammar eGrammar )
 //UNUSED2009-05 {
-//UNUSED2009-05     pDocShell->SetInUndo( TRUE );
+//UNUSED2009-05     pDocShell->SetInUndo( sal_True );
 //UNUSED2009-05     ScDocument* pDoc = pDocShell->GetDocument();
 //UNUSED2009-05     pDoc->SetGrammar( eGrammar );
 //UNUSED2009-05     pDocShell->SetDocumentModified();
-//UNUSED2009-05     pDocShell->SetInUndo( FALSE );
+//UNUSED2009-05     pDocShell->SetInUndo( sal_False );
 //UNUSED2009-05 }
 //UNUSED2009-05 
 //UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Undo()
@@ -1703,7 +1702,7 @@ String ScUndoLayoutRTL::GetComment() const
 //UNUSED2009-05 #endif
 //UNUSED2009-05 }
 //UNUSED2009-05 
-//UNUSED2009-05 BOOL __EXPORT ScUndoSetGrammar::CanRepeat(SfxRepeatTarget& rTarget) const
+//UNUSED2009-05 sal_Bool __EXPORT ScUndoSetGrammar::CanRepeat(SfxRepeatTarget& rTarget) const
 //UNUSED2009-05 {
 //UNUSED2009-05     return (rTarget.ISA(ScTabViewTarget));
 //UNUSED2009-05 }
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index c87fd8a54..497dcd79e 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -43,10 +43,13 @@
 #include "globstr.hrc"
 #include "global.hxx"
 
-void ScUndoUtil::MarkSimpleBlock( ScDocShell* /* pDocShell */,
+void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell,
                                 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
                                 SCCOL nEndX, SCROW nEndY, SCTAB nEndZ )
 {
+    if ( pDocShell->IsPaintLocked() )
+        return;
+
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     if (pViewShell)
     {
@@ -55,7 +58,7 @@ void ScUndoUtil::MarkSimpleBlock( ScDocShell* /* pDocShell */,
             pViewShell->SetTabNo( nStartZ );
 
         pViewShell->DoneBlockMode();
-        pViewShell->MoveCursorAbs( nStartX, nStartY, SC_FOLLOW_JUMP, FALSE, FALSE );
+        pViewShell->MoveCursorAbs( nStartX, nStartY, SC_FOLLOW_JUMP, sal_False, sal_False );
         pViewShell->InitOwnBlockMode();
         pViewShell->GetViewData()->GetMarkData().
                 SetMarkArea( ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ) );
@@ -89,24 +92,24 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB
 
     if (!pRet)
     {
-        BOOL bWasTemp = FALSE;
+        sal_Bool bWasTemp = sal_False;
         if ( pUndoData )
         {
             String aName;
             pUndoData->GetName( aName );
             if ( aName == ScGlobal::GetRscString( STR_DB_NONAME ) )
-                bWasTemp = TRUE;
+                bWasTemp = sal_True;
         }
         DBG_ASSERT(bWasTemp, "Undo: didn't find database range");
 
-        USHORT nIndex;
+        sal_uInt16 nIndex;
         ScDBCollection* pColl = pDoc->GetDBCollection();
         if (pColl->SearchName( ScGlobal::GetRscString( STR_DB_NONAME ), nIndex ))
             pRet = (*pColl)[nIndex];
         else
         {
             pRet = new ScDBData( ScGlobal::GetRscString( STR_DB_NONAME ), nTab,
-                                nCol1,nRow1, nCol2,nRow2, TRUE,
+                                nCol1,nRow1, nCol2,nRow2, sal_True,
                                 pDoc->HasColHeader( nCol1,nRow1,nCol2,nRow2,nTab ) );
             pColl->Insert( pRet );
         }
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index d5ab13c39..a9ab9f0bd 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -78,7 +78,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString, ::formu
     sal_Bool bSuccess = sal_False;
     if ( bIsRange )
     {
-        USHORT nResult = aRange.ParseAny( rUIString, pDoc, eConv );
+        sal_uInt16 nResult = aRange.ParseAny( rUIString, pDoc, eConv );
         if ( nResult & SCA_VALID )
         {
             if ( ( nResult & SCA_TAB_3D ) == 0 )
@@ -92,7 +92,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString, ::formu
     }
     else
     {
-        USHORT nResult = aRange.aStart.Parse( rUIString, pDoc, eConv );
+        sal_uInt16 nResult = aRange.aStart.Parse( rUIString, pDoc, eConv );
         if ( nResult & SCA_VALID )
         {
             if ( ( nResult & SCA_TAB_3D ) == 0 )
@@ -261,7 +261,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString&
     {
         //  generate UI representation string - include sheet only if different from ref sheet
         String aFormatStr;
-        USHORT nFlags = SCA_VALID;
+        sal_uInt16 nFlags = SCA_VALID;
         if ( aRange.aStart.Tab() != nRefSheet )
             nFlags |= SCA_TAB_3D;
         if ( bIsRange )
@@ -283,7 +283,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString&
             //  manually concatenate range so both parts always have the sheet name
             aFormatStr.Append( (sal_Unicode) ':' );
             String aSecond;
-            USHORT nFlags = SCA_VALID;
+            sal_uInt16 nFlags = SCA_VALID;
             if( eConv != ::formula::FormulaGrammar::CONV_XL_A1 )
                 nFlags |= SCA_TAB_3D;
             aRange.aEnd.Format( aSecond, nFlags, pDoc, eConv );
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 0a174c00f..a46d002d2 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -756,18 +756,18 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue(
                             switch( eOrient )
                             {
                                 case table::CellOrientation_STANDARD:
-                                    pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, FALSE ) );
+                                    pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, sal_False ) );
                                 break;
                                 case table::CellOrientation_TOPBOTTOM:
-                                    pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, FALSE ) );
+                                    pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, sal_False ) );
                                     pData->PutItem( nFieldIndex, SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) );
                                 break;
                                 case table::CellOrientation_BOTTOMTOP:
-                                    pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, FALSE ) );
+                                    pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, sal_False ) );
                                     pData->PutItem( nFieldIndex, SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) );
                                 break;
                                 case table::CellOrientation_STACKED:
-                                    pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, TRUE ) );
+                                    pData->PutItem( nFieldIndex, SfxBoolItem( ATTR_STACKED, sal_True ) );
                                 break;
                                 default:
                                 {
@@ -840,7 +840,7 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const rtl::OUString& a
                     {
                         const SfxInt32Item* pRotItem = (const SfxInt32Item*)pData->GetItem( nFieldIndex, ATTR_ROTATE_VALUE );
                         sal_Int32 nRot = pRotItem ? pRotItem->GetValue() : 0;
-                        BOOL bStacked = ((const SfxBoolItem*)pItem)->GetValue();
+                        sal_Bool bStacked = ((const SfxBoolItem*)pItem)->GetValue();
                         SvxOrientationItem( nRot, bStacked, 0 ).QueryValue( aVal );
                     }
                     break;
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 778a64bc0..8e28af168 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -418,74 +418,74 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
     ScModule* pScMod = SC_MOD();
     ScAppOptions   aAppOpt(pScMod->GetAppOptions());
     ScInputOptions aInpOpt(pScMod->GetInputOptions());
-    BOOL bSaveApp = FALSE;
-    BOOL bSaveInp = FALSE;
+    sal_Bool bSaveApp = sal_False;
+    sal_Bool bSaveInp = sal_False;
     // print options aren't loaded until needed
 
     if (aString.EqualsAscii( SC_UNONAME_DOAUTOCP ))
     {
         aAppOpt.SetAutoComplete( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveApp = TRUE;
+        bSaveApp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_ENTERED ))
     {
         aInpOpt.SetEnterEdit( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_EXPREF ))
     {
         aInpOpt.SetExpandRefs( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_EXTFMT ))
     {
         aInpOpt.SetExtendFormat( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_LINKUPD ))
     {
         aAppOpt.SetLinkMode( (ScLkUpdMode) ScUnoHelpFunctions::GetInt16FromAny( aValue ) );
-        bSaveApp = TRUE;
+        bSaveApp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_MARKHDR ))
     {
         aInpOpt.SetMarkHeader( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_MOVESEL ))
     {
         aInpOpt.SetMoveSelection( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_RANGEFIN ))
     {
         aInpOpt.SetRangeFinder( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_USETABCOL ))
     {
         aInpOpt.SetUseTabCol( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_PRMETRICS ))
     {
         aInpOpt.SetTextWysiwyg( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_REPLWARN ))
     {
         aInpOpt.SetReplaceCellsWarn( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_METRIC ))
     {
         aAppOpt.SetAppMetric( (FieldUnit) ScUnoHelpFunctions::GetInt16FromAny( aValue ) );
-        bSaveApp = TRUE;
+        bSaveApp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_MOVEDIR ))
     {
         aInpOpt.SetMoveDir( ScUnoHelpFunctions::GetInt16FromAny( aValue ) );
-        bSaveInp = TRUE;
+        bSaveInp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_SCALE ))
     {
@@ -506,12 +506,12 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
             aAppOpt.SetZoom( nVal );
             aAppOpt.SetZoomType( SVX_ZOOM_PERCENT );
         }
-        bSaveApp = TRUE;
+        bSaveApp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_STBFUNC ))
     {
         aAppOpt.SetStatusFunc( ScUnoHelpFunctions::GetInt16FromAny( aValue ) );
-        bSaveApp = TRUE;
+        bSaveApp = sal_True;
     }
     else if (aString.EqualsAscii( SC_UNONAME_ULISTS ))
     {
@@ -523,16 +523,16 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
             //	mehr tut ScGlobal::SetUserList auch nicht
 
             pUserList->FreeAll();					// alle Eintraege raus
-            USHORT nCount = (USHORT)aSeq.getLength();
+            sal_uInt16 nCount = (sal_uInt16)aSeq.getLength();
             const rtl::OUString* pAry = aSeq.getConstArray();
-            for (USHORT i=0; i<nCount; i++)
+            for (sal_uInt16 i=0; i<nCount; i++)
             {
                 String aEntry = pAry[i];
                 ScUserListData* pData = new ScUserListData(aEntry);
                 if (!pUserList->Insert(pData))		// hinten anhaengen
                     delete pData;					// sollte nicht vorkommen
             }
-            bSaveApp = TRUE;	// Liste wird mit den App-Optionen gespeichert
+            bSaveApp = sal_True;	// Liste wird mit den App-Optionen gespeichert
         }
     }
     else if (aString.EqualsAscii( SC_UNONAME_PRALLSH ))
@@ -584,7 +584,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString&
     else if (aString.EqualsAscii( SC_UNONAME_STBFUNC ))	aRet <<= (sal_Int16) aAppOpt.GetStatusFunc();
     else if (aString.EqualsAscii( SC_UNONAME_SCALE ))
     {
-        INT16 nZoomVal = 0;
+        sal_Int16 nZoomVal = 0;
         switch ( aAppOpt.GetZoomType() )
         {
             case SVX_ZOOM_PERCENT:	 nZoomVal = aAppOpt.GetZoom();	  break;
@@ -603,10 +603,10 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString&
         ScUserList* pUserList = ScGlobal::GetUserList();
         if (pUserList)
         {
-            USHORT nCount = pUserList->GetCount();
+            sal_uInt16 nCount = pUserList->GetCount();
             uno::Sequence<rtl::OUString> aSeq(nCount);
             rtl::OUString* pAry = aSeq.getArray();
-            for (USHORT i=0; i<nCount; i++)
+            for (sal_uInt16 i=0; i<nCount; i++)
             {
                 String aEntry((*pUserList)[i]->GetString());
                 pAry[i] = aEntry;
@@ -665,13 +665,13 @@ uno::Sequence<sal_Int32> SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds()
 {
     ScUnoGuard aGuard;
     const ScAppOptions& rOpt = SC_MOD()->GetAppOptions();
-    USHORT nCount = rOpt.GetLRUFuncListCount();
-    const USHORT* pFuncs = rOpt.GetLRUFuncList();
+    sal_uInt16 nCount = rOpt.GetLRUFuncListCount();
+    const sal_uInt16* pFuncs = rOpt.GetLRUFuncList();
     if (pFuncs)
     {
         uno::Sequence<sal_Int32> aSeq(nCount);
         sal_Int32* pAry = aSeq.getArray();
-        for (USHORT i=0; i<nCount; i++)
+        for (sal_uInt16 i=0; i<nCount; i++)
             pAry[i] = pFuncs[i];
         return aSeq;
     }
@@ -683,12 +683,12 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds(
                                     throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = (USHORT) Min( aRecentFunctionIds.getLength(), (INT32) LRU_MAX );
-    const INT32* pAry = aRecentFunctionIds.getConstArray();
+    sal_uInt16 nCount = (sal_uInt16) Min( aRecentFunctionIds.getLength(), (sal_Int32) LRU_MAX );
+    const sal_Int32* pAry = aRecentFunctionIds.getConstArray();
 
-    USHORT* pFuncs = nCount ? new USHORT[nCount] : NULL;
-    for (USHORT i=0; i<nCount; i++)
-        pFuncs[i] = (USHORT)pAry[i];		//! auf gueltige Werte testen?
+    sal_uInt16* pFuncs = nCount ? new sal_uInt16[nCount] : NULL;
+    for (sal_uInt16 i=0; i<nCount; i++)
+        pFuncs[i] = (sal_uInt16)pAry[i];		//! auf gueltige Werte testen?
 
     ScModule* pScMod = SC_MOD();
     ScAppOptions aNewOpts(pScMod->GetAppOptions());
@@ -765,10 +765,10 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co
     pArray[4].Name = rtl::OUString::createFromAscii( SC_UNONAME_ARGUMENTS );
     if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags )
     {
-        USHORT nCount = rDesc.nArgCount;
+        sal_uInt16 nCount = rDesc.nArgCount;
         if (nCount >= VAR_ARGS)
             nCount -= VAR_ARGS - 1;
-        USHORT nSeqCount = rDesc.GetSuppressedArgCount();
+        sal_uInt16 nSeqCount = rDesc.GetSuppressedArgCount();
         if (nSeqCount >= VAR_ARGS)
             nSeqCount -= VAR_ARGS - 1;
 
@@ -776,7 +776,7 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co
         {
             uno::Sequence<sheet::FunctionArgument> aArgSeq(nSeqCount);
             sheet::FunctionArgument* pArgAry = aArgSeq.getArray();
-            for (USHORT i=0, j=0; i<nCount; i++)
+            for (sal_uInt16 i=0, j=0; i<nCount; i++)
             {
                 if (!rDesc.pDefArgFlags[i].bSuppress)
                 {
@@ -805,8 +805,8 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
     if ( pFuncList )
     {
-        USHORT nCount = (USHORT)pFuncList->GetCount();
-        for (USHORT nIndex=0; nIndex<nCount; nIndex++)
+        sal_uInt16 nCount = (sal_uInt16)pFuncList->GetCount();
+        for (sal_uInt16 nIndex=0; nIndex<nCount; nIndex++)
         {
             const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex);
             if ( pDesc && pDesc->nFIndex == nId )
@@ -836,8 +836,8 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName )
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
     if ( pFuncList )
     {
-        USHORT nCount = (USHORT)pFuncList->GetCount();
-        for (USHORT nIndex=0; nIndex<nCount; nIndex++)
+        sal_uInt16 nCount = (sal_uInt16)pFuncList->GetCount();
+        for (sal_uInt16 nIndex=0; nIndex<nCount; nIndex++)
         {
             const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex);
             //!	Case-insensitiv ???
@@ -862,10 +862,10 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName )
 sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
     if ( pFuncList )
-        nCount = (USHORT)pFuncList->GetCount();
+        nCount = (sal_uInt16)pFuncList->GetCount();
     return nCount;
 }
 
@@ -925,10 +925,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScFunctionListObj::getElementNames() throw
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
     if ( pFuncList )
     {
-        USHORT nCount = (USHORT)pFuncList->GetCount();
+        sal_uInt16 nCount = (sal_uInt16)pFuncList->GetCount();
         uno::Sequence<rtl::OUString> aSeq(nCount);
         rtl::OUString* pAry = aSeq.getArray();
-        for (USHORT nIndex=0; nIndex<nCount; nIndex++)
+        for (sal_uInt16 nIndex=0; nIndex<nCount; nIndex++)
         {
             const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex);
             if ( pDesc && pDesc->pFuncName )
@@ -947,16 +947,16 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const rtl::OUString& aName )
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
     if ( pFuncList )
     {
-        USHORT nCount = (USHORT)pFuncList->GetCount();
-        for (USHORT nIndex=0; nIndex<nCount; nIndex++)
+        sal_uInt16 nCount = (sal_uInt16)pFuncList->GetCount();
+        for (sal_uInt16 nIndex=0; nIndex<nCount; nIndex++)
         {
             const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex);
             //!	Case-insensitiv ???
             if ( pDesc && pDesc->pFuncName && aNameStr == *pDesc->pFuncName )
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 23bde9d8b..874ad9b15 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -854,8 +854,8 @@ void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& rSourc
     {
         uno::Sequence<beans::Property> aSeq(xInfo->getProperties());
         const beans::Property* pAry = aSeq.getConstArray();
-        ULONG nCount = aSeq.getLength();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = aSeq.getLength();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             rtl::OUString aName(pAry[i].Name);
             rDest.setPropertyValue( aName, rSource.getPropertyValue( aName ) );
@@ -873,16 +873,16 @@ SCTAB lcl_FirstTab( const ScRangeList& rRanges )
     return 0;	// soll nicht sein
 }
 
-BOOL lcl_WholeSheet( const ScRangeList& rRanges )
+sal_Bool lcl_WholeSheet( const ScRangeList& rRanges )
 {
     if ( rRanges.Count() == 1 )
     {
         ScRange* pRange = rRanges.GetObject(0);
         if ( pRange && pRange->aStart.Col() == 0 && pRange->aEnd.Col() == MAXCOL &&
                        pRange->aStart.Row() == 0 && pRange->aEnd.Row() == MAXROW )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -941,9 +941,9 @@ const SvxBorderLine* ScHelperFunctions::GetBorderLine( SvxBorderLine& rLine, con
 {
     //	Calc braucht Twips, im Uno-Struct sind 1/100mm
 
-    rLine.SetOutWidth( (USHORT)HMMToTwips( rStruct.OuterLineWidth ) );
-    rLine.SetInWidth(  (USHORT)HMMToTwips( rStruct.InnerLineWidth ) );
-    rLine.SetDistance( (USHORT)HMMToTwips( rStruct.LineDistance ) );
+    rLine.SetOutWidth( (sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ) );
+    rLine.SetInWidth(  (sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ) );
+    rLine.SetDistance( (sal_uInt16)HMMToTwips( rStruct.LineDistance ) );
     rLine.SetColor( ColorData( rStruct.Color ) );
 
     if ( rLine.GetOutWidth() || rLine.GetInWidth() || rLine.GetDistance() )
@@ -955,7 +955,7 @@ const SvxBorderLine* ScHelperFunctions::GetBorderLine( SvxBorderLine& rLine, con
 void ScHelperFunctions::FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const table::TableBorder& rBorder )
 {
     SvxBorderLine aLine;
-    rOuter.SetDistance( (USHORT)HMMToTwips( rBorder.Distance ) );
+    rOuter.SetDistance( (sal_uInt16)HMMToTwips( rBorder.Distance ) );
     rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.TopLine ),		BOX_LINE_TOP );
     rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.BottomLine ),		BOX_LINE_BOTTOM );
     rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.LeftLine ),		BOX_LINE_LEFT );
@@ -969,7 +969,7 @@ void ScHelperFunctions::FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner
     rInner.SetValid( VALID_HORI,	 rBorder.IsHorizontalLineValid );
     rInner.SetValid( VALID_VERT,	 rBorder.IsVerticalLineValid );
     rInner.SetValid( VALID_DISTANCE, rBorder.IsDistanceValid );
-    rInner.SetTable( TRUE );
+    rInner.SetTable( sal_True );
 }
 
 void ScHelperFunctions::FillBorderLine( table::BorderLine& rStruct, const SvxBorderLine* pLine )
@@ -1014,12 +1014,12 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r
                         const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     ScDocument* pUndoDoc = NULL;
     if (bUndo)
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-    ULONG nCount = rRanges.Count();
-    ULONG i;
+    sal_uLong nCount = rRanges.Count();
+    sal_uLong i;
     for (i=0; i<nCount; i++)
     {
         ScRange aRange(*rRanges.GetObject(i));
@@ -1031,12 +1031,12 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r
                 pUndoDoc->InitUndo( pDoc, nTab, nTab );
             else
                 pUndoDoc->AddUndoTab( nTab, nTab );
-            pDoc->CopyToDocument( aRange, IDF_ATTRIB, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( aRange, IDF_ATTRIB, sal_False, pUndoDoc );
         }
 
         ScMarkData aMark;
         aMark.SetMarkArea( aRange );
-        aMark.SelectTable( nTab, TRUE );
+        aMark.SelectTable( nTab, sal_True );
 
         pDoc->ApplySelectionFrame( aMark, &rOuter, &rInner );
         // RowHeight bei Umrandung alleine nicht noetig
@@ -1057,10 +1057,10 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r
 //! move lcl_PutDataArray to docfunc?
 //!	merge loop with ScFunctionAccess::callFunction
 
-BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
+sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
                         const uno::Sequence< uno::Sequence<uno::Any> >& aData )
 {
-//	BOOL bApi = TRUE;
+//	sal_Bool bApi = sal_True;
 
     ScDocument* pDoc = rDocShell.GetDocument();
     SCTAB nTab = rRange.aStart.Tab();
@@ -1068,12 +1068,12 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
     SCROW nStartRow = rRange.aStart.Row();
     SCCOL nEndCol = rRange.aEnd.Col();
     SCROW nEndRow = rRange.aEnd.Row();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     if ( !pDoc->IsBlockEditable( nTab, nStartCol,nStartRow, nEndCol,nEndRow ) )
     {
         //!	error message
-        return FALSE;
+        return sal_False;
     }
 
     long nCols = 0;
@@ -1085,7 +1085,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
     if ( nCols != nEndCol-nStartCol+1 || nRows != nEndRow-nStartRow+1 )
     {
         //!	error message?
-        return FALSE;
+        return sal_False;
     }
 
     ScDocument* pUndoDoc = NULL;
@@ -1093,12 +1093,12 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
     {
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         pUndoDoc->InitUndo( pDoc, nTab, nTab );
-        pDoc->CopyToDocument( rRange, IDF_CONTENTS|IDF_NOCAPTIONS, FALSE, pUndoDoc );
+        pDoc->CopyToDocument( rRange, IDF_CONTENTS|IDF_NOCAPTIONS, sal_False, pUndoDoc );
     }
 
     pDoc->DeleteAreaTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, IDF_CONTENTS );
 
-    BOOL bError = FALSE;
+    sal_Bool bError = sal_False;
     SCROW nDocRow = nStartRow;
     for (long nRow=0; nRow<nRows; nRow++)
     {
@@ -1138,18 +1138,18 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
                         pDoc->PutCell( nDocCol, nDocRow, nTab, new ScStringCell( aUStr ) );
                 }
                 else
-                    bError = TRUE;		// invalid type
+                    bError = sal_True;		// invalid type
 
                 ++nDocCol;
             }
         }
         else
-            bError = TRUE;							// wrong size
+            bError = sal_True;							// wrong size
 
         ++nDocRow;
     }
 
-    BOOL bHeight = rDocShell.AdjustRowHeight( nStartRow, nEndRow, nTab );
+    sal_Bool bHeight = rDocShell.AdjustRowHeight( nStartRow, nEndRow, nTab );
 
     if ( pUndoDoc )
     {
@@ -1158,7 +1158,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoPaste( &rDocShell,
                 nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, aDestMark,
-                pUndoDoc, NULL, IDF_CONTENTS, NULL,NULL,NULL,NULL, FALSE ) );
+                pUndoDoc, NULL, IDF_CONTENTS, NULL,NULL,NULL,NULL, sal_False ) );
     }
 
     if (!bHeight)
@@ -1169,11 +1169,11 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
     return !bError;
 }
 
-BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
+sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
         const uno::Sequence< uno::Sequence<rtl::OUString> >& aData,
         const ::rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
 {
-//	BOOL bApi = TRUE;
+//	sal_Bool bApi = sal_True;
 
     ScDocument* pDoc = rDocShell.GetDocument();
     SCTAB nTab = rRange.aStart.Tab();
@@ -1181,12 +1181,12 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
     SCROW nStartRow = rRange.aStart.Row();
     SCCOL nEndCol = rRange.aEnd.Col();
     SCROW nEndRow = rRange.aEnd.Row();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     if ( !pDoc->IsBlockEditable( nTab, nStartCol,nStartRow, nEndCol,nEndRow ) )
     {
         //!	error message
-        return FALSE;
+        return sal_False;
     }
 
     long nCols = 0;
@@ -1198,7 +1198,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
     if ( nCols != nEndCol-nStartCol+1 || nRows != nEndRow-nStartRow+1 )
     {
         //!	error message?
-        return FALSE;
+        return sal_False;
     }
 
     ScDocument* pUndoDoc = NULL;
@@ -1206,14 +1206,14 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
     {
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         pUndoDoc->InitUndo( pDoc, nTab, nTab );
-        pDoc->CopyToDocument( rRange, IDF_CONTENTS, FALSE, pUndoDoc );
+        pDoc->CopyToDocument( rRange, IDF_CONTENTS, sal_False, pUndoDoc );
     }
 
     pDoc->DeleteAreaTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, IDF_CONTENTS );
 
     ScDocFunc aFunc( rDocShell );		// for InterpretEnglishString
 
-    BOOL bError = FALSE;
+    sal_Bool bError = sal_False;
     SCROW nDocRow = nStartRow;
     for (long nRow=0; nRow<nRows; nRow++)
     {
@@ -1233,12 +1233,12 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
             }
         }
         else
-            bError = TRUE;							// wrong size
+            bError = sal_True;							// wrong size
 
         ++nDocRow;
     }
 
-    BOOL bHeight = rDocShell.AdjustRowHeight( nStartRow, nEndRow, nTab );
+    sal_Bool bHeight = rDocShell.AdjustRowHeight( nStartRow, nEndRow, nTab );
 
     if ( pUndoDoc )
     {
@@ -1247,7 +1247,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
         rDocShell.GetUndoManager()->AddUndoAction(
             new ScUndoPaste( &rDocShell,
                 nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, aDestMark,
-                pUndoDoc, NULL, IDF_CONTENTS, NULL,NULL,NULL,NULL, FALSE ) );
+                pUndoDoc, NULL, IDF_CONTENTS, NULL,NULL,NULL,NULL, sal_False ) );
     }
 
     if (!bHeight)
@@ -1259,7 +1259,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
 }
 
 //	used in ScCellRangeObj::getFormulaArray and ScCellObj::GetInputString_Impl
-String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bEnglish )
+String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, sal_Bool bEnglish )
 {
     String aVal;
     if ( pDoc )
@@ -1334,10 +1334,10 @@ ScCellRangesBase::ScCellRangesBase() :
     pNoDfltCurrentDataSet( NULL ),
     pMarkData( NULL ),
     nObjectId( 0 ),
-    bChartColAsHdr( FALSE ),
-    bChartRowAsHdr( FALSE ),
-    bCursorOnly( FALSE ),
-    bGotDataChangedHint( FALSE ),
+    bChartColAsHdr( sal_False ),
+    bChartRowAsHdr( sal_False ),
+    bCursorOnly( sal_False ),
+    bGotDataChangedHint( sal_False ),
     aValueListeners( 0 )
 {
 }
@@ -1352,10 +1352,10 @@ ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) :
     pNoDfltCurrentDataSet( NULL ),
     pMarkData( NULL ),
     nObjectId( 0 ),
-    bChartColAsHdr( FALSE ),
-    bChartRowAsHdr( FALSE ),
-    bCursorOnly( FALSE ),
-    bGotDataChangedHint( FALSE ),
+    bChartColAsHdr( sal_False ),
+    bChartRowAsHdr( sal_False ),
+    bCursorOnly( sal_False ),
+    bGotDataChangedHint( sal_False ),
     aValueListeners( 0 )
 {
     ScRange aCellRange(rR);
@@ -1381,10 +1381,10 @@ ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR) :
     pMarkData( NULL ),
     aRanges( rR ),
     nObjectId( 0 ),
-    bChartColAsHdr( FALSE ),
-    bChartRowAsHdr( FALSE ),
-    bCursorOnly( FALSE ),
-    bGotDataChangedHint( FALSE ),
+    bChartColAsHdr( sal_False ),
+    bChartRowAsHdr( sal_False ),
+    bCursorOnly( sal_False ),
+    bGotDataChangedHint( sal_False ),
     aValueListeners( 0 )
 {
     if (pDocShell)  // Null if created with createInstance
@@ -1439,7 +1439,7 @@ const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsFlat()
     if ( !pCurrentFlat && pDocShell )
     {
         ScDocument* pDoc = pDocShell->GetDocument();
-        pCurrentFlat = pDoc->CreateSelectionPattern( *GetMarkData(), FALSE );
+        pCurrentFlat = pDoc->CreateSelectionPattern( *GetMarkData(), sal_False );
     }
     return pCurrentFlat;
 }
@@ -1451,7 +1451,7 @@ const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsDeep()
     if ( !pCurrentDeep && pDocShell )
     {
         ScDocument* pDoc = pDocShell->GetDocument();
-        pCurrentDeep = pDoc->CreateSelectionPattern( *GetMarkData(), TRUE );
+        pCurrentDeep = pDoc->CreateSelectionPattern( *GetMarkData(), sal_True );
     }
     return pCurrentDeep;
 }
@@ -1477,7 +1477,7 @@ const ScMarkData* ScCellRangesBase::GetMarkData()
     if (!pMarkData)
     {
         pMarkData = new ScMarkData();
-        pMarkData->MarkFromRangeList( aRanges, FALSE );
+        pMarkData->MarkFromRangeList( aRanges, sal_False );
     }
     return pMarkData;
 }
@@ -1514,7 +1514,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
             // #129050# any change of the range address is broadcast to value (modify) listeners
             if ( aValueListeners.Count() )
-                bGotDataChangedHint = TRUE;
+                bGotDataChangedHint = sal_True;
 
             if ( pUndoRanges )
                 pDoc->AddUnoRefChange( nObjectId, *pUndoRanges );
@@ -1524,7 +1524,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
     else if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             ForgetCurrentAttrs();
@@ -1536,7 +1536,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
                 lang::EventObject aEvent;
                 aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
-                for ( USHORT n=0; n<aValueListeners.Count(); n++ )
+                for ( sal_uInt16 n=0; n<aValueListeners.Count(); n++ )
                     (*aValueListeners[n])->disposing( aEvent );
 
                 aValueListeners.DeleteAndDestroy( 0, aValueListeners.Count() );
@@ -1566,10 +1566,10 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
                 // the EventObject holds a Ref to this object until after the listener calls
 
                 ScDocument* pDoc = pDocShell->GetDocument();
-                for ( USHORT n=0; n<aValueListeners.Count(); n++ )
+                for ( sal_uInt16 n=0; n<aValueListeners.Count(); n++ )
                     pDoc->AddUnoListenerCall( *aValueListeners[n], aEvent );
 
-                bGotDataChangedHint = FALSE;
+                bGotDataChangedHint = sal_False;
             }
         }
         else if ( nId == SC_HINT_CALCALL )
@@ -1578,7 +1578,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
             // (SFX_HINT_DATACHANGED follows separately)
 
             if ( aValueListeners.Count() )
-                bGotDataChangedHint = TRUE;
+                bGotDataChangedHint = sal_True;
         }
     }
     else if ( rHint.ISA( ScUnoRefUndoHint ) )
@@ -1592,7 +1592,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
             RefChanged();
             if ( aValueListeners.Count() )
-                bGotDataChangedHint = TRUE;     // need to broadcast the undo, too
+                bGotDataChangedHint = sal_True;     // need to broadcast the undo, too
         }
     }
 }
@@ -1606,8 +1606,8 @@ void ScCellRangesBase::RefChanged()
         pValueListener->EndListeningAll();
 
         ScDocument* pDoc = pDocShell->GetDocument();
-        ULONG nCount = aRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = aRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
             pDoc->StartListeningArea( *aRanges.GetObject(i), pValueListener );
     }
 
@@ -1665,7 +1665,7 @@ void ScCellRangesBase::SetNewRanges(const ScRangeList& rNew)
     RefChanged();
 }
 
-void ScCellRangesBase::SetCursorOnly( BOOL bSet )
+void ScCellRangesBase::SetCursorOnly( sal_Bool bSet )
 {
     //	set for a selection object that is created from the cursor position
     //	without anything selected (may contain several sheets)
@@ -1744,10 +1744,10 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId()
 
 // ---
 
-void ScCellRangesBase::PaintRanges_Impl( USHORT nPart )
+void ScCellRangesBase::PaintRanges_Impl( sal_uInt16 nPart )
 {
-    ULONG nCount = aRanges.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = aRanges.Count();
+    for (sal_uLong i=0; i<nCount; i++)
         pDocShell->PostPaint( *aRanges.GetObject(i), nPart );
 }
 
@@ -1760,7 +1760,7 @@ double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunct
     ScMarkData aMark(*GetMarkData());
     aMark.MarkToSimple();
     if (!aMark.IsMarked())
-        aMark.SetMarkNegative(TRUE);	// um Dummy Position angeben zu koennen
+        aMark.SetMarkNegative(sal_True);	// um Dummy Position angeben zu koennen
 
     ScAddress aDummy;					// wenn nicht Marked, ignoriert wegen Negative
     double fVal;
@@ -1780,12 +1780,12 @@ void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags ) throw(u
     if ( aRanges.Count() )
     {
         // only for clearContents: EDITATTR is only used if no contents are deleted
-        USHORT nDelFlags = static_cast< USHORT >( nContentFlags & IDF_ALL );
+        sal_uInt16 nDelFlags = static_cast< sal_uInt16 >( nContentFlags & IDF_ALL );
         if ( ( nContentFlags & IDF_EDITATTR ) && ( nContentFlags & IDF_CONTENTS ) == 0 )
             nDelFlags |= IDF_EDITATTR;
 
         ScDocFunc aFunc(*pDocShell);
-        aFunc.DeleteContents( *GetMarkData(), nDelFlags, TRUE, TRUE );
+        aFunc.DeleteContents( *GetMarkData(), nDelFlags, sal_True, sal_True );
     }
     // sonst ist nichts zu tun
 }
@@ -1798,7 +1798,7 @@ const SfxItemPropertyMap* ScCellRangesBase::GetItemPropertyMap()
 }
 
 void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry, 
-                                                USHORT& rItemWhich )
+                                                sal_uInt16& rItemWhich )
 {
     //	Which-ID des betroffenen Items, auch wenn das Item die Property
     //	nicht alleine behandeln kann
@@ -1827,7 +1827,7 @@ void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry,
 
 }
 
-beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, const SfxItemPropertySimpleEntry* pEntry )
+beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry )
 {
     beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE;
     if ( nItemWhich )					// item wid (from map or special case)
@@ -1839,15 +1839,15 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, c
         const ScPatternAttr* pPattern = GetCurrentAttrsFlat();
         if ( pPattern )
         {
-            SfxItemState eState = pPattern->GetItemSet().GetItemState( nItemWhich, FALSE );
+            SfxItemState eState = pPattern->GetItemSet().GetItemState( nItemWhich, sal_False );
 
 //           //  if no rotate value is set, look at orientation
 //           //! also for a fixed value of 0 (in case orientation is ambiguous)?
 //           if ( nItemWhich == ATTR_ROTATE_VALUE && eState == SFX_ITEM_DEFAULT )
-//               eState = pPattern->GetItemSet().GetItemState( ATTR_ORIENTATION, FALSE );
+//               eState = pPattern->GetItemSet().GetItemState( ATTR_ORIENTATION, sal_False );
 
             if ( nItemWhich == ATTR_VALUE_FORMAT && eState == SFX_ITEM_DEFAULT )
-                eState = pPattern->GetItemSet().GetItemState( ATTR_LANGUAGE_FORMAT, FALSE );
+                eState = pPattern->GetItemSet().GetItemState( ATTR_LANGUAGE_FORMAT, sal_False );
 
             if ( eState == SFX_ITEM_SET )
                 eRet = beans::PropertyState_DIRECT_VALUE;
@@ -1888,7 +1888,7 @@ beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const rtl::OUS
         throw uno::RuntimeException();
 
     const SfxItemPropertyMap* pMap = GetItemPropertyMap();     // from derived class
-    USHORT nItemWhich = 0;
+    sal_uInt16 nItemWhich = 0;
     const SfxItemPropertySimpleEntry* pEntry  = pMap->getByName( aPropertyName );
     lcl_GetPropertyWhich( pEntry, nItemWhich );
     return GetOnePropertyState( nItemWhich, pEntry );
@@ -1904,9 +1904,9 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates
 
     uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength());
     beans::PropertyState* pStates = aRet.getArray();
-    for(INT32 i = 0; i < aPropertyNames.getLength(); i++)
+    for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++)
     {
-        USHORT nItemWhich = 0;
+        sal_uInt16 nItemWhich = 0;
         const SfxItemPropertySimpleEntry* pEntry  = pPropertyMap->getByName( aPropertyNames[i] );
         lcl_GetPropertyWhich( pEntry, nItemWhich );
         pStates[i] = GetOnePropertyState(nItemWhich, pEntry);
@@ -1921,7 +1921,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp
     if ( pDocShell )
     {
         const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
-        USHORT nItemWhich = 0;
+        sal_uInt16 nItemWhich = 0;
         const SfxItemPropertySimpleEntry* pEntry  = pPropertyMap->getByName( aPropertyName );
         lcl_GetPropertyWhich( pEntry, nItemWhich );
         if ( nItemWhich )				// item wid (from map or special case)
@@ -1935,7 +1935,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp
 
 //               //! for ATTR_ROTATE_VALUE, also reset ATTR_ORIENTATION?
 
-                USHORT aWIDs[3];
+                sal_uInt16 aWIDs[3];
                 aWIDs[0] = nItemWhich;
                 if ( nItemWhich == ATTR_VALUE_FORMAT )
                 {
@@ -1944,19 +1944,19 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp
                 }
                 else
                     aWIDs[1] = 0;
-                aFunc.ClearItems( *GetMarkData(), aWIDs, TRUE );
+                aFunc.ClearItems( *GetMarkData(), aWIDs, sal_True );
             }
         }
         else if ( pEntry )
         {
             if ( pEntry->nWID == SC_WID_UNO_CHCOLHDR )
-                bChartColAsHdr = FALSE;
+                bChartColAsHdr = sal_False;
             else if ( pEntry->nWID == SC_WID_UNO_CHROWHDR )
-                bChartRowAsHdr = FALSE;
+                bChartRowAsHdr = sal_False;
             else if ( pEntry->nWID == SC_WID_UNO_CELLSTYL )
             {
                 ScDocFunc aFunc(*pDocShell);
-                aFunc.ApplyStyle( *GetMarkData(), ScGlobal::GetRscString(STR_STYLENAME_STANDARD), TRUE, TRUE );
+                aFunc.ApplyStyle( *GetMarkData(), ScGlobal::GetRscString(STR_STYLENAME_STANDARD), sal_True, sal_True );
             }
         }
     }
@@ -2005,7 +2005,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr
                 {
                     case SC_WID_UNO_CHCOLHDR:
                     case SC_WID_UNO_CHROWHDR:
-                        ScUnoHelpFunctions::SetBoolInAny( aAny, FALSE );
+                        ScUnoHelpFunctions::SetBoolInAny( aAny, sal_False );
                         break;
                     case SC_WID_UNO_CELLSTYL:
                         aAny <<= rtl::OUString( ScStyleNameConversion::DisplayToProgrammaticName(
@@ -2028,8 +2028,8 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr
                     case SC_WID_UNO_CONDLOC:
                     case SC_WID_UNO_CONDXML:
                         {
-                            BOOL bEnglish = ( pEntry->nWID != SC_WID_UNO_CONDLOC );
-                            BOOL bXML = ( pEntry->nWID == SC_WID_UNO_CONDXML );
+                            sal_Bool bEnglish = ( pEntry->nWID != SC_WID_UNO_CONDLOC );
+                            sal_Bool bXML = ( pEntry->nWID == SC_WID_UNO_CONDXML );
                             formula::FormulaGrammar::Grammar eGrammar = (bXML ?
                                     pDoc->GetStorageGrammar() :
                                    formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
@@ -2042,8 +2042,8 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr
                     case SC_WID_UNO_VALILOC:
                     case SC_WID_UNO_VALIXML:
                         {
-                            BOOL bEnglish = ( pEntry->nWID != SC_WID_UNO_VALILOC );
-                            BOOL bXML = ( pEntry->nWID == SC_WID_UNO_VALIXML );
+                            sal_Bool bEnglish = ( pEntry->nWID != SC_WID_UNO_VALILOC );
+                            sal_Bool bXML = ( pEntry->nWID == SC_WID_UNO_VALIXML );
                             formula::FormulaGrammar::Grammar eGrammar = (bXML ?
                                     pDoc->GetStorageGrammar() :
                                    formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
@@ -2078,7 +2078,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangesBase::getPropertySe
 
 void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rValue,
                             ScPatternAttr& rPattern, ScDocument* pDoc,
-                            USHORT& rFirstItemId, USHORT& rSecondItemId )
+                            sal_uInt16& rFirstItemId, sal_uInt16& rSecondItemId )
 {
     rFirstItemId = rEntry.nWID;
     rSecondItemId = 0;
@@ -2090,14 +2090,14 @@ void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::A
             {
                 // #67847# language for number formats
                 SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-                ULONG nOldFormat = ((const SfxUInt32Item&)rSet.Get( ATTR_VALUE_FORMAT )).GetValue();
+                sal_uLong nOldFormat = ((const SfxUInt32Item&)rSet.Get( ATTR_VALUE_FORMAT )).GetValue();
                 LanguageType eOldLang = ((const SvxLanguageItem&)rSet.Get( ATTR_LANGUAGE_FORMAT )).GetLanguage();
                 nOldFormat = pFormatter->GetFormatForLanguageIfBuiltIn( nOldFormat, eOldLang );
 
                 sal_Int32 nIntVal = 0;
                 if ( rValue >>= nIntVal )
                 {
-                    ULONG nNewFormat = (ULONG)nIntVal;
+                    sal_uLong nNewFormat = (sal_uLong)nIntVal;
                     rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) );
 
                     const SvNumberformat* pNewEntry = pFormatter->GetEntry( nNewFormat );
@@ -2109,7 +2109,7 @@ void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::A
 
                         // #40606# if only language is changed,
                         // don't touch number format attribute
-                        ULONG nNewMod = nNewFormat % SV_COUNTRY_LANGUAGE_OFFSET;
+                        sal_uLong nNewMod = nNewFormat % SV_COUNTRY_LANGUAGE_OFFSET;
                         if ( nNewMod == ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) &&
                              nNewMod <= SV_MAX_ANZ_STANDARD_FORMATE )
                         {
@@ -2127,7 +2127,7 @@ void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::A
             {
                 sal_Int16 nIntVal = 0;
                 if ( rValue >>= nIntVal )
-                    rSet.Put( SfxUInt16Item( rEntry.nWID, (USHORT)HMMToTwips(nIntVal) ) );
+                    rSet.Put( SfxUInt16Item( rEntry.nWID, (sal_uInt16)HMMToTwips(nIntVal) ) );
                 else
                     throw lang::IllegalArgumentException();
             }
@@ -2156,20 +2156,20 @@ void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::A
                     switch( eOrient )
                     {
                         case table::CellOrientation_STANDARD:
-                            rSet.Put( SfxBoolItem( ATTR_STACKED, FALSE ) );
+                            rSet.Put( SfxBoolItem( ATTR_STACKED, sal_False ) );
                         break;
                         case table::CellOrientation_TOPBOTTOM:
-                            rSet.Put( SfxBoolItem( ATTR_STACKED, FALSE ) );
+                            rSet.Put( SfxBoolItem( ATTR_STACKED, sal_False ) );
                             rSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) );
                             rSecondItemId = ATTR_ROTATE_VALUE;
                         break;
                         case table::CellOrientation_BOTTOMTOP:
-                            rSet.Put( SfxBoolItem( ATTR_STACKED, FALSE ) );
+                            rSet.Put( SfxBoolItem( ATTR_STACKED, sal_False ) );
                             rSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) );
                             rSecondItemId = ATTR_ROTATE_VALUE;
                         break;
                         case table::CellOrientation_STACKED:
-                            rSet.Put( SfxBoolItem( ATTR_STACKED, TRUE ) );
+                            rSet.Put( SfxBoolItem( ATTR_STACKED, sal_True ) );
                         break;
                         default:
                         {
@@ -2228,14 +2228,14 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                 SfxItemSet& rSet = aPattern.GetItemSet();
                 rSet.ClearInvalidItems();
 
-                USHORT nFirstItem, nSecondItem;
+                sal_uInt16 nFirstItem, nSecondItem;
                 lcl_SetCellProperty( *pEntry, aValue, aPattern, pDoc, nFirstItem, nSecondItem );
 
-                for (USHORT nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; nWhich++)
+                for (sal_uInt16 nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; nWhich++)
                     if ( nWhich != nFirstItem && nWhich != nSecondItem )
                         rSet.ClearItem(nWhich);
 
-                aFunc.ApplyAttributes( *GetMarkData(), aPattern, TRUE, TRUE );
+                aFunc.ApplyAttributes( *GetMarkData(), aPattern, sal_True, sal_True );
             }
         }
         else		// implemented here
@@ -2255,7 +2255,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                         String aString(ScStyleNameConversion::ProgrammaticToDisplayName(
                                                             aStrVal, SFX_STYLE_FAMILY_PARA ));
                         ScDocFunc aFunc(*pDocShell);
-                        aFunc.ApplyStyle( *GetMarkData(), aString, TRUE, TRUE );
+                        aFunc.ApplyStyle( *GetMarkData(), aString, sal_True, sal_True );
                     }
                     break;
                 case SC_WID_UNO_TBLBORD:
@@ -2283,21 +2283,21 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                             if (pFormat)
                             {
                                 ScDocument* pDoc = pDocShell->GetDocument();
-                                BOOL bEnglish = ( pEntry->nWID != SC_WID_UNO_CONDLOC );
-                                BOOL bXML = ( pEntry->nWID == SC_WID_UNO_CONDXML );
+                                sal_Bool bEnglish = ( pEntry->nWID != SC_WID_UNO_CONDLOC );
+                                sal_Bool bXML = ( pEntry->nWID == SC_WID_UNO_CONDXML );
                                 formula::FormulaGrammar::Grammar eGrammar = (bXML ?
                                        formula::FormulaGrammar::GRAM_UNSPECIFIED :
                                        formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
 
                                 ScConditionalFormat aNew( 0, pDoc );	// Index wird beim Einfuegen gesetzt
                                 pFormat->FillFormat( aNew, pDoc, eGrammar );
-                                ULONG nIndex = pDoc->AddCondFormat( aNew );
+                                sal_uLong nIndex = pDoc->AddCondFormat( aNew );
 
                                 ScDocFunc aFunc(*pDocShell);
 
                                 ScPatternAttr aPattern( pDoc->GetPool() );
                                 aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) );
-                                aFunc.ApplyAttributes( *GetMarkData(), aPattern, TRUE, TRUE );
+                                aFunc.ApplyAttributes( *GetMarkData(), aPattern, sal_True, sal_True );
                             }
                         }
                     }
@@ -2314,22 +2314,22 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                             if (pValidObj)
                             {
                                 ScDocument* pDoc = pDocShell->GetDocument();
-                                BOOL bEnglish = ( pEntry->nWID != SC_WID_UNO_VALILOC );
-                                BOOL bXML = ( pEntry->nWID == SC_WID_UNO_VALIXML );
+                                sal_Bool bEnglish = ( pEntry->nWID != SC_WID_UNO_VALILOC );
+                                sal_Bool bXML = ( pEntry->nWID == SC_WID_UNO_VALIXML );
                                 formula::FormulaGrammar::Grammar eGrammar = (bXML ?
                                        formula::FormulaGrammar::GRAM_UNSPECIFIED :
                                        formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
 
                                 ScValidationData* pNewData =
                                         pValidObj->CreateValidationData( pDoc, eGrammar );
-                                ULONG nIndex = pDoc->AddValidationEntry( *pNewData );
+                                sal_uLong nIndex = pDoc->AddValidationEntry( *pNewData );
                                 delete pNewData;
 
                                 ScDocFunc aFunc(*pDocShell);
 
                                 ScPatternAttr aPattern( pDoc->GetPool() );
                                 aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_VALIDDATA, nIndex ) );
-                                aFunc.ApplyAttributes( *GetMarkData(), aPattern, TRUE, TRUE );
+                                aFunc.ApplyAttributes( *GetMarkData(), aPattern, sal_True, sal_True );
                             }
                         }
                     }
@@ -2375,7 +2375,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                         {
                             ScDocument* pDoc = pDocShell->GetDocument();
 
-                            ULONG nOldFormat = ((const SfxUInt32Item&)
+                            sal_uLong nOldFormat = ((const SfxUInt32Item&)
                                     pDataSet->Get( ATTR_VALUE_FORMAT )).GetValue();
                             LanguageType eOldLang = ((const SvxLanguageItem&)
                                     pDataSet->Get( ATTR_LANGUAGE_FORMAT )).GetLanguage();
@@ -2391,7 +2391,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                     case ATTR_STACKED:
                         {
                             sal_Int32 nRot = ((const SfxInt32Item&)pDataSet->Get(ATTR_ROTATE_VALUE)).GetValue();
-                            BOOL bStacked = ((const SfxBoolItem&)pDataSet->Get(pEntry->nWID)).GetValue();
+                            sal_Bool bStacked = ((const SfxBoolItem&)pDataSet->Get(pEntry->nWID)).GetValue();
                             SvxOrientationItem( nRot, bStacked, 0 ).QueryValue( rAny );
                         }
                         break;
@@ -2431,7 +2431,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                             ScDocument* pDoc = pDocShell->GetDocument();
                             ScMarkData aMark;
                             aMark.SetMarkArea( *pFirst );
-                            aMark.SelectTable( pFirst->aStart.Tab(), TRUE );
+                            aMark.SelectTable( pFirst->aStart.Tab(), sal_True );
                             pDoc->GetSelectionFrame( aMark, aOuter, aInner );
 
                             table::TableBorder aBorder;
@@ -2448,12 +2448,12 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                         if ( pPattern )
                         {
                             ScDocument* pDoc = pDocShell->GetDocument();
-                            BOOL bEnglish = ( pEntry->nWID != SC_WID_UNO_CONDLOC );
-                            BOOL bXML = ( pEntry->nWID == SC_WID_UNO_CONDXML );
+                            sal_Bool bEnglish = ( pEntry->nWID != SC_WID_UNO_CONDLOC );
+                            sal_Bool bXML = ( pEntry->nWID == SC_WID_UNO_CONDXML );
                             formula::FormulaGrammar::Grammar eGrammar = (bXML ?
                                     pDoc->GetStorageGrammar() :
                                    formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
-                            ULONG nIndex = ((const SfxUInt32Item&)
+                            sal_uLong nIndex = ((const SfxUInt32Item&)
                                     pPattern->GetItem(ATTR_CONDITIONAL)).GetValue();
                             rAny <<= uno::Reference<sheet::XSheetConditionalEntries>(
                                     new ScTableConditionalFormat( pDoc, nIndex, eGrammar ));
@@ -2468,12 +2468,12 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
                         if ( pPattern )
                         {
                             ScDocument* pDoc = pDocShell->GetDocument();
-                            BOOL bEnglish = ( pEntry->nWID != SC_WID_UNO_VALILOC );
-                            BOOL bXML = ( pEntry->nWID == SC_WID_UNO_VALIXML );
+                            sal_Bool bEnglish = ( pEntry->nWID != SC_WID_UNO_VALILOC );
+                            sal_Bool bXML = ( pEntry->nWID == SC_WID_UNO_VALIXML );
                             formula::FormulaGrammar::Grammar eGrammar = (bXML ?
                                     pDoc->GetStorageGrammar() :
                                    formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
-                            ULONG nIndex = ((const SfxUInt32Item&)
+                            sal_uLong nIndex = ((const SfxUInt32Item&)
                                     pPattern->GetItem(ATTR_VALIDDATA)).GetValue();
                             rAny <<= uno::Reference<beans::XPropertySet>(
                                     new ScTableValidationObj( pDoc, nIndex, eGrammar ));
@@ -2606,7 +2606,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS
 
                     //	collect items in pNewPattern, apply with one call after the loop
 
-                    USHORT nFirstItem, nSecondItem;
+                    sal_uInt16 nFirstItem, nSecondItem;
                     lcl_SetCellProperty( *pEntry, pValues[i], *pOldPattern, pDoc, nFirstItem, nSecondItem );
 
                     //	put only affected items into new set
@@ -2626,7 +2626,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS
         if ( pNewPattern && aRanges.Count() )
         {
             ScDocFunc aFunc(*pDocShell);
-            aFunc.ApplyAttributes( *GetMarkData(), *pNewPattern, TRUE, TRUE );
+            aFunc.ApplyAttributes( *GetMarkData(), *pNewPattern, sal_True, sal_True );
         }
 
         delete pNewPattern;
@@ -2645,7 +2645,7 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues(
 
     uno::Sequence<uno::Any> aRet(aPropertyNames.getLength());
     uno::Any* pProperties = aRet.getArray();
-    for(INT32 i = 0; i < aPropertyNames.getLength(); i++)
+    for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++)
     {
         const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyNames[i] );
         GetOnePropertyValue( pEntry, pProperties[i] );
@@ -2682,7 +2682,7 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint )
         //	in the range are notified. So only a flag is set that is checked when
         //	SFX_HINT_DATACHANGED is received.
 
-        bGotDataChangedHint = TRUE;
+        bGotDataChangedHint = sal_True;
     }
     return 0;
 }
@@ -2757,7 +2757,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set
 
                     //	collect items in pNewPattern, apply with one call after the loop
 
-                    USHORT nFirstItem, nSecondItem;
+                    sal_uInt16 nFirstItem, nSecondItem;
                     try
                     {
                         lcl_SetCellProperty( *pEntry, pValues[i], *pOldPattern, pDoc, nFirstItem, nSecondItem );
@@ -2801,7 +2801,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set
         if ( pNewPattern && aRanges.Count() )
         {
             ScDocFunc aFunc(*pDocShell);
-            aFunc.ApplyAttributes( *GetMarkData(), *pNewPattern, TRUE, TRUE );
+            aFunc.ApplyAttributes( *GetMarkData(), *pNewPattern, sal_True, sal_True );
         }
 
         delete pNewPattern;
@@ -2826,7 +2826,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get
 
     const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
 
-    for(INT32 i = 0; i < nCount; i++)
+    for(sal_Int32 i = 0; i < nCount; i++)
     {
         const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyNames[i] );
         if (!pEntry)
@@ -2835,7 +2835,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get
         }
         else
         {
-            USHORT nItemWhich = 0;
+            sal_uInt16 nItemWhich = 0;
             lcl_GetPropertyWhich( pEntry, nItemWhich );
             pReturns[i].State = GetOnePropertyState( nItemWhich, pEntry );
             GetOnePropertyValue( pEntry, pReturns[i].Value );
@@ -2856,8 +2856,8 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas
 
     const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
 
-    INT32 j = 0;
-    for(INT32 i = 0; i < nCount; i++)
+    sal_Int32 j = 0;
+    for(sal_Int32 i = 0; i < nCount; i++)
     {
         const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyNames[i] );
         if (!pEntry)
@@ -2866,7 +2866,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas
         }
         else
         {
-            USHORT nItemWhich = 0;
+            sal_uInt16 nItemWhich = 0;
             lcl_GetPropertyWhich( pEntry, nItemWhich );
             pReturns[j].State = GetOnePropertyState( nItemWhich, pEntry );
             if (pReturns[j].State == beans::PropertyState_DIRECT_VALUE)
@@ -2894,7 +2894,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::R
         //#97041#; put only MultiMarked ScMarkData in ChangeIndent
         ScMarkData aMarkData(*GetMarkData());
         aMarkData.MarkToMulti();
-        aFunc.ChangeIndent( aMarkData, FALSE, TRUE );
+        aFunc.ChangeIndent( aMarkData, sal_False, sal_True );
     }
 }
 
@@ -2907,7 +2907,7 @@ void SAL_CALL ScCellRangesBase::incrementIndent() throw(::com::sun::star::uno::R
         //#97041#; put only MultiMarked ScMarkData in ChangeIndent
         ScMarkData aMarkData(*GetMarkData());
         aMarkData.MarkToMulti();
-        aFunc.ChangeIndent( aMarkData, TRUE, TRUE );
+        aFunc.ChangeIndent( aMarkData, sal_True, sal_True );
     }
 }
 
@@ -3028,7 +3028,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     long nRowCount = aData.getLength();
     long nColCount = nRowCount ? aData[0].getLength() : 0;
     ScRangeListRef xChartRanges = GetLimitedChartRanges_Impl( nColCount, nRowCount );
@@ -3068,7 +3068,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub
                 PaintRanges_Impl( PAINT_GRID );
                 pDocShell->SetDocumentModified();
                 ForceChartListener_Impl();			// call listeners for this object synchronously
-                bDone = TRUE;
+                bDone = sal_True;
             }
         }
     }
@@ -3101,7 +3101,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions(
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if ( bChartColAsHdr )
     {
         long nRowCount = aRowDescriptions.getLength();
@@ -3135,7 +3135,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions(
                     PaintRanges_Impl( PAINT_GRID );
                     pDocShell->SetDocumentModified();
                     ForceChartListener_Impl();			// call listeners for this object synchronously
-                    bDone = TRUE;
+                    bDone = sal_True;
                 }
             }
         }
@@ -3169,7 +3169,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions(
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if ( bChartRowAsHdr )
     {
         long nColCount = aColumnDescriptions.getLength();
@@ -3203,7 +3203,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions(
                     PaintRanges_Impl( PAINT_GRID );
                     pDocShell->SetDocumentModified();
                     ForceChartListener_Impl();			// call listeners for this object synchronously
-                    bDone = TRUE;
+                    bDone = sal_True;
                 }
             }
         }
@@ -3223,8 +3223,8 @@ void ScCellRangesBase::ForceChartListener_Impl()
         ScChartListenerCollection* pColl = pDocShell->GetDocument()->GetChartListenerCollection();
         if ( pColl )
         {
-            USHORT nCollCount = pColl->GetCount();
-            for ( USHORT nIndex = 0; nIndex < nCollCount; nIndex++ )
+            sal_uInt16 nCollCount = pColl->GetCount();
+            for ( sal_uInt16 nIndex = 0; nIndex < nCollCount; nIndex++ )
             {
                 ScChartListener* pChartListener = (ScChartListener*)pColl->At(nIndex);
                 if ( pChartListener &&
@@ -3239,16 +3239,16 @@ void ScCellRangesBase::ForceChartListener_Impl()
 String lcl_UniqueName( ScStrCollection& rColl, const String& rPrefix )
 {
     long nNumber = 1;
-    USHORT nCollCount = rColl.GetCount();
-    while (TRUE)
+    sal_uInt16 nCollCount = rColl.GetCount();
+    while (sal_True)
     {
         String aName(rPrefix);
         aName += String::CreateFromInt32( nNumber );
-        BOOL bFound = FALSE;
-        for (USHORT i=0; i<nCollCount; i++)
+        sal_Bool bFound = sal_False;
+        for (sal_uInt16 i=0; i<nCollCount; i++)
             if ( rColl[i]->GetString() == aName )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 break;
             }
         if (!bFound)
@@ -3322,8 +3322,8 @@ void SAL_CALL ScCellRangesBase::addModifyListener( const uno::Reference<util::XM
             pValueListener = new ScLinkListener( LINK( this, ScCellRangesBase, ValueListenerHdl ) );
 
         ScDocument* pDoc = pDocShell->GetDocument();
-        ULONG nCount = aRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = aRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
             pDoc->StartListeningArea( *aRanges.GetObject(i), pValueListener );
 
         acquire();	// don't lose this object (one ref for all listeners)
@@ -3340,8 +3340,8 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util:
 
     acquire();		// in case the listeners have the last ref - released below
 
-    USHORT nCount = aValueListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aValueListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<util::XModifyListener> *pObj = aValueListeners[n];
         if ( *pObj == aListener )
@@ -3398,7 +3398,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC
         }
 
         ScRangeList aNewRanges;
-        aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
+        aMarkData.FillRangeListWithMarks( &aNewRanges, sal_False );
         return new ScCellRangesObj( pDocShell, aNewRanges );
     }
 
@@ -3416,8 +3416,8 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel
         ScMarkData aMarkData(*GetMarkData());
 
         //	belegte Zellen wegmarkieren
-        ULONG nCount = aRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = aRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScRange aRange = *aRanges.GetObject(i);
 
@@ -3429,7 +3429,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel
                 if ( !pCell->IsBlank() )
                     aMarkData.SetMultiMarkArea(
                             ScRange( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ),
-                            FALSE );
+                            sal_False );
 
                 pCell = aIter.GetNext();
             }
@@ -3438,7 +3438,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel
         ScRangeList aNewRanges;
         //	IsMultiMarked reicht hier nicht (wird beim deselektieren nicht zurueckgesetzt)
         if (aMarkData.HasAnyMultiMarks())
-            aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
+            aMarkData.FillRangeListWithMarks( &aNewRanges, sal_False );
 
         return new ScCellRangesObj( pDocShell, aNewRanges );	// aNewRanges kann leer sein
     }
@@ -3458,8 +3458,8 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
         ScMarkData aMarkData;
 
         //	passende Zellen selektieren
-        ULONG nCount = aRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = aRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScRange aRange = *aRanges.GetObject(i);
 
@@ -3467,33 +3467,33 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
             ScBaseCell* pCell = aIter.GetFirst();
             while (pCell)
             {
-                BOOL bAdd = FALSE;
+                sal_Bool bAdd = sal_False;
                 if ( pCell->HasNote() && ( nContentFlags & sheet::CellFlags::ANNOTATION ) )
-                    bAdd = TRUE;
+                    bAdd = sal_True;
                 else
                     switch ( pCell->GetCellType() )
                     {
                         case CELLTYPE_STRING:
                             if ( nContentFlags & sheet::CellFlags::STRING )
-                                bAdd = TRUE;
+                                bAdd = sal_True;
                             break;
                         case CELLTYPE_EDIT:
                             if ( (nContentFlags & sheet::CellFlags::STRING) || (nContentFlags & sheet::CellFlags::FORMATTED) )
-                                bAdd = TRUE;
+                                bAdd = sal_True;
                             break;
                         case CELLTYPE_FORMULA:
                             if ( nContentFlags & sheet::CellFlags::FORMULA )
-                                bAdd = TRUE;
+                                bAdd = sal_True;
                             break;
                         case CELLTYPE_VALUE:
                             if ( (nContentFlags & (sheet::CellFlags::VALUE|sheet::CellFlags::DATETIME))
                                     == (sheet::CellFlags::VALUE|sheet::CellFlags::DATETIME) )
-                                bAdd = TRUE;
+                                bAdd = sal_True;
                             else
                             {
                                 //	Date/Time Erkennung
 
-                                ULONG nIndex = (ULONG)((SfxUInt32Item*)pDoc->GetAttr(
+                                sal_uLong nIndex = (sal_uLong)((SfxUInt32Item*)pDoc->GetAttr(
                                         aIter.GetCol(), aIter.GetRow(), aIter.GetTab(),
                                         ATTR_VALUE_FORMAT ))->GetValue();
                                 short nTyp = pDoc->GetFormatTable()->GetType(nIndex);
@@ -3501,12 +3501,12 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
                                     (nTyp == NUMBERFORMAT_DATETIME))
                                 {
                                     if ( nContentFlags & sheet::CellFlags::DATETIME )
-                                        bAdd = TRUE;
+                                        bAdd = sal_True;
                                 }
                                 else
                                 {
                                     if ( nContentFlags & sheet::CellFlags::VALUE )
-                                        bAdd = TRUE;
+                                        bAdd = sal_True;
                                 }
                             }
                             break;
@@ -3519,7 +3519,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
                 if (bAdd)
                     aMarkData.SetMultiMarkArea(
                             ScRange( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ),
-                            TRUE );
+                            sal_True );
 
                 pCell = aIter.GetNext();
             }
@@ -3527,7 +3527,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
 
         ScRangeList aNewRanges;
         if (aMarkData.IsMultiMarked())
-            aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
+            aMarkData.FillRangeListWithMarks( &aNewRanges, sal_False );
 
         return new ScCellRangesObj( pDocShell, aNewRanges );	// aNewRanges kann leer sein
     }
@@ -3547,8 +3547,8 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
         ScMarkData aMarkData;
 
         //	passende Zellen selektieren
-        ULONG nCount = aRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = aRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScRange aRange = *aRanges.GetObject(i);
 
@@ -3559,27 +3559,27 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
                 if (pCell->GetCellType() == CELLTYPE_FORMULA)
                 {
                     ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
-                    BOOL bAdd = FALSE;
+                    sal_Bool bAdd = sal_False;
                     if (pFCell->GetErrCode())
                     {
                         if ( nResultFlags & sheet::FormulaResult::ERROR )
-                            bAdd = TRUE;
+                            bAdd = sal_True;
                     }
                     else if (pFCell->IsValue())
                     {
                         if ( nResultFlags & sheet::FormulaResult::VALUE )
-                            bAdd = TRUE;
+                            bAdd = sal_True;
                     }
                     else	// String
                     {
                         if ( nResultFlags & sheet::FormulaResult::STRING )
-                            bAdd = TRUE;
+                            bAdd = sal_True;
                     }
 
                     if (bAdd)
                         aMarkData.SetMultiMarkArea(
                                 ScRange( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ),
-                                TRUE );
+                                sal_True );
                 }
 
                 pCell = aIter.GetNext();
@@ -3588,7 +3588,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
 
         ScRangeList aNewRanges;
         if (aMarkData.IsMultiMarked())
-            aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
+            aMarkData.FillRangeListWithMarks( &aNewRanges, sal_False );
 
         return new ScCellRangesObj( pDocShell, aNewRanges );	// aNewRanges kann leer sein
     }
@@ -3597,12 +3597,12 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
 }
 
 uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
-                        const table::CellAddress& aCompare, BOOL bColumnDiff)
+                        const table::CellAddress& aCompare, sal_Bool bColumnDiff)
 {
     if (pDocShell)
     {
-        ULONG nRangeCount = aRanges.Count();
-        ULONG i;
+        sal_uLong nRangeCount = aRanges.Count();
+        sal_uLong i;
         ScDocument* pDoc = pDocShell->GetDocument();
         ScMarkData aMarkData;
 
@@ -3674,7 +3674,7 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
                 if ( !ScBaseCell::CellEqual( pCell, pOtherCell ) )
                     aMarkData.SetMultiMarkArea( aOneRange );
                 else
-                    aMarkData.SetMultiMarkArea( aOneRange, FALSE );     // deselect
+                    aMarkData.SetMultiMarkArea( aOneRange, sal_False );     // deselect
 
                 pCell = aIter.GetNext();
             }
@@ -3682,7 +3682,7 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
 
         ScRangeList aNewRanges;
         if (aMarkData.IsMultiMarked())
-            aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
+            aMarkData.FillRangeListWithMarks( &aNewRanges, sal_False );
 
         return new ScCellRangesObj( pDocShell, aNewRanges );	// aNewRanges kann leer sein
     }
@@ -3693,14 +3693,14 @@ uno::Reference<sheet::XSheetCellRanges > SAL_CALL ScCellRangesBase::queryColumnD
                             const table::CellAddress& aCompare ) throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    return QueryDifferences_Impl( aCompare, TRUE );
+    return QueryDifferences_Impl( aCompare, sal_True );
 }
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryRowDifferences(
                             const table::CellAddress& aCompare ) throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    return QueryDifferences_Impl( aCompare, FALSE );
+    return QueryDifferences_Impl( aCompare, sal_False );
 }
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersection(
@@ -3711,8 +3711,8 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec
                    (SCCOL)aRange.EndColumn,   (SCROW)aRange.EndRow,   aRange.Sheet );
 
     ScRangeList aNew;
-    ULONG nCount = aRanges.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = aRanges.Count();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         ScRange aTemp(*aRanges.GetObject(i));
         if ( aTemp.Intersects( aMask ) )
@@ -3738,18 +3738,18 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden
         ScDocument* pDoc = pDocShell->GetDocument();
 
         ScRangeList aNewRanges(aRanges);
-        BOOL bFound;
+        sal_Bool bFound;
         do
         {
-            bFound = FALSE;
+            bFound = sal_False;
 
             //	#97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used
             ScMarkData aMarkData;
-            aMarkData.MarkFromRangeList( aNewRanges, FALSE );
+            aMarkData.MarkFromRangeList( aNewRanges, sal_False );
             aMarkData.MarkToMulti();		// needed for IsAllMarked
 
-            ULONG nCount = aNewRanges.Count();
-            for (ULONG nR=0; nR<nCount; nR++)
+            sal_uLong nCount = aNewRanges.Count();
+            for (sal_uLong nR=0; nR<nCount; nR++)
             {
                 ScRange aRange(*aNewRanges.GetObject(nR));
                 ScCellIterator aIter( pDoc, aRange );
@@ -3765,15 +3765,15 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden
                         while ( aRefIter.GetNextRef( aRefRange) )
                         {
                             if ( bRecursive && !bFound && !aMarkData.IsAllMarked( aRefRange ) )
-                                bFound = TRUE;
-                            aMarkData.SetMultiMarkArea( aRefRange, TRUE );
+                                bFound = sal_True;
+                            aMarkData.SetMultiMarkArea( aRefRange, sal_True );
                         }
                     }
                     pCell = aIter.GetNext();
                 }
             }
 
-            aMarkData.FillRangeListWithMarks( &aNewRanges, TRUE );
+            aMarkData.FillRangeListWithMarks( &aNewRanges, sal_True );
         }
         while ( bRecursive && bFound );
 
@@ -3792,15 +3792,15 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen
         ScDocument* pDoc = pDocShell->GetDocument();
 
         ScRangeList aNewRanges(aRanges);
-        BOOL bFound;
+        sal_Bool bFound;
         do
         {
-            bFound = FALSE;
-            ULONG nRangesCount = aNewRanges.Count();
+            bFound = sal_False;
+            sal_uLong nRangesCount = aNewRanges.Count();
 
             //	#97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used
             ScMarkData aMarkData;
-            aMarkData.MarkFromRangeList( aNewRanges, FALSE );
+            aMarkData.MarkFromRangeList( aNewRanges, sal_False );
             aMarkData.MarkToMulti();		// needed for IsAllMarked
 
             SCTAB nTab = lcl_FirstTab(aNewRanges); 				//! alle Tabellen
@@ -3811,16 +3811,16 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen
             {
                 if (pCell->GetCellType() == CELLTYPE_FORMULA)
                 {
-                    BOOL bMark = FALSE;
+                    sal_Bool bMark = sal_False;
                     ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
                     ScRange aRefRange;
                     while ( aIter.GetNextRef( aRefRange) )
                     {
-                        for (ULONG nR=0; nR<nRangesCount; nR++)
+                        for (sal_uLong nR=0; nR<nRangesCount; nR++)
                         {
                             ScRange aRange(*aNewRanges.GetObject(nR));
                             if (aRange.Intersects(aRefRange))
-                                bMark = TRUE;					// von Teil des Ranges abhaengig
+                                bMark = sal_True;					// von Teil des Ranges abhaengig
                         }
                     }
                     if (bMark)
@@ -3829,14 +3829,14 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen
                                             aCellIter.GetRow(),
                                             aCellIter.GetTab() );
                         if ( bRecursive && !bFound && !aMarkData.IsAllMarked( aCellRange ) )
-                            bFound = TRUE;
-                        aMarkData.SetMultiMarkArea( aCellRange, TRUE );
+                            bFound = sal_True;
+                        aMarkData.SetMultiMarkArea( aCellRange, sal_True );
                     }
                 }
                 pCell = aCellIter.GetNext();
             }
 
-            aMarkData.FillRangeListWithMarks( &aNewRanges, TRUE );
+            aMarkData.FillRangeListWithMarks( &aNewRanges, sal_True );
         }
         while ( bRecursive && bFound );
 
@@ -3880,12 +3880,12 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll(
                 SCCOL nCol = 0;
                 SCROW nRow = 0;
                 SCTAB nTab = 0;
-                BOOL bFound = pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab,
+                sal_Bool bFound = pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab,
                                                         aMark, aDummyUndo, NULL );
                 if (bFound)
                 {
                     ScRangeList aNewRanges;
-                    aMark.FillRangeListWithMarks( &aNewRanges, TRUE );
+                    aMark.FillRangeListWithMarks( &aNewRanges, sal_True );
                     //	bei findAll immer CellRanges, egal wieviel gefunden wurde
                     xRet.set(new ScCellRangesObj( pDocShell, aNewRanges ));
                 }
@@ -3927,7 +3927,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl(
                 }
 
                 String aDummyUndo;
-                BOOL bFound = pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab,
+                sal_Bool bFound = pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab,
                                                         aMark, aDummyUndo, NULL );
                 if (bFound)
                 {
@@ -3983,7 +3983,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    INT32 nReplaced = 0;
+    sal_Int32 nReplaced = 0;
     if ( pDocShell && xDesc.is() )
     {
         ScCellSearchObj* pSearch = ScCellSearchObj::getImplementation( xDesc );
@@ -3993,7 +3993,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
             if (pSearchItem)
             {
                 ScDocument* pDoc = pDocShell->GetDocument();
-                BOOL bUndo(pDoc->IsUndoEnabled());
+                sal_Bool bUndo(pDoc->IsUndoEnabled());
                 pSearchItem->SetCommand( SVX_SEARCHCMD_REPLACE_ALL );
                 //	immer nur innerhalb dieses Objekts
                 pSearchItem->SetSelection( !lcl_WholeSheet(aRanges) );
@@ -4001,10 +4001,10 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
                 ScMarkData aMark(*GetMarkData());
 
                 SCTAB nTabCount = pDoc->GetTableCount();
-                BOOL bProtected = !pDocShell->IsEditable();
+                sal_Bool bProtected = !pDocShell->IsEditable();
                 for (SCTAB i=0; i<nTabCount; i++)
                     if ( aMark.GetTableSelect(i) && pDoc->IsTabProtected(i) )
-                        bProtected = TRUE;
+                        bProtected = sal_True;
                 if (bProtected)
                 {
                     //!	Exception, oder was?
@@ -4029,7 +4029,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
                     if (bUndo)
                         pUndoMark = new ScMarkData(aMark);
 
-                    BOOL bFound(FALSE);
+                    sal_Bool bFound(sal_False);
                     if (bUndo)
                         bFound = pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab,
                                                             aMark, aUndoStr, pUndoDoc );
@@ -4198,7 +4198,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddress
     ScUnoGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
     const ScRangeList& rRanges = GetRangeList();
-    ULONG nCount = rRanges.Count();
+    sal_uLong nCount = rRanges.Count();
     if ( pDocSh && nCount )
     {
         table::CellRangeAddress aRangeAddress;
@@ -4262,8 +4262,8 @@ void SAL_CALL ScCellRangesObj::addRangeAddress( const table::CellRangeAddress& r
 
 void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const ScRange& rRange )
 {
-    USHORT nCount = rNamedEntries.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = rNamedEntries.Count();
+    for ( sal_uInt16 n=nCount; n--; )
         if ( rNamedEntries[n]->GetRange() == rRange )
             rNamedEntries.DeleteAndDestroy( n );
 }
@@ -4289,7 +4289,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress
         }
     }
     ScMarkData aMarkData;
-    aMarkData.MarkFromRangeList( aSheetRanges, FALSE );
+    aMarkData.MarkFromRangeList( aSheetRanges, sal_False );
     ScRange aRange(static_cast<SCCOL>(rRange.StartColumn),
                 static_cast<SCROW>(rRange.StartRow),
                 static_cast<SCTAB>(rRange.Sheet),
@@ -4301,7 +4301,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress
         aMarkData.MarkToMulti();
         if (aMarkData.IsAllMarked( aRange ) )
         {
-            aMarkData.SetMultiMarkArea( aRange, FALSE );
+            aMarkData.SetMultiMarkArea( aRange, sal_False );
             lcl_RemoveNamedEntry(aNamedEntries, aRange);
         }
         else
@@ -4309,7 +4309,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress
     }
     SetNewRanges(aNotSheetRanges);
     ScRangeList aNew;
-    aMarkData.FillRangeListWithMarks( &aNew, FALSE );
+    aMarkData.FillRangeListWithMarks( &aNew, sal_False );
     for (sal_uInt32 j = 0; j < aNew.Count(); ++j)
     {
         AddRange(*aNew.GetObject(j), sal_False);
@@ -4362,8 +4362,8 @@ void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table::
 
 void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const String& rName )
 {
-    USHORT nCount = rNamedEntries.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = rNamedEntries.Count();
+    for ( sal_uInt16 n=nCount; n--; )
         if ( rNamedEntries[n]->GetName() == rName )
             rNamedEntries.DeleteAndDestroy( n );
 }
@@ -4374,7 +4374,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u
 {
     ScUnoGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     //!	Type of aElement can be some specific interface instead of XInterface
 
@@ -4389,19 +4389,19 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u
             String aNamStr(aName);
             if ( aNamStr.Len() )
             {
-                USHORT nNamedCount = aNamedEntries.Count();
-                for (USHORT n=0; n<nNamedCount; n++)
+                sal_uInt16 nNamedCount = aNamedEntries.Count();
+                for (sal_uInt16 n=0; n<nNamedCount; n++)
                     if ( aNamedEntries[n]->GetName() == aNamStr )
                         throw container::ElementExistException();
             }
 
             ScRangeList aNew(GetRangeList());
             const ScRangeList& rAddRanges = pRangesImp->GetRangeList();
-            ULONG nAddCount = rAddRanges.Count();
-            for (ULONG i=0; i<nAddCount; i++)
+            sal_uLong nAddCount = rAddRanges.Count();
+            for (sal_uLong i=0; i<nAddCount; i++)
                 aNew.Join( *rAddRanges.GetObject(i) );
             SetNewRanges(aNew);
-            bDone = TRUE;
+            bDone = sal_True;
 
             if ( aName.getLength() && nAddCount == 1 )
             {
@@ -4422,53 +4422,53 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u
     }
 }
 
-BOOL lcl_FindRangeByName( const ScRangeList& rRanges, ScDocShell* pDocSh,
-                            const String& rName, ULONG& rIndex )
+sal_Bool lcl_FindRangeByName( const ScRangeList& rRanges, ScDocShell* pDocSh,
+                            const String& rName, sal_uLong& rIndex )
 {
     if (pDocSh)
     {
         String aRangeStr;
         ScDocument* pDoc = pDocSh->GetDocument();
-        ULONG nCount = rRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = rRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             rRanges.GetObject(i)->Format( aRangeStr, SCA_VALID | SCA_TAB_3D, pDoc );
             if ( aRangeStr == rName )
             {
                 rIndex = i;
-                return TRUE;
+                return sal_True;
             }
         }
     }
-    return FALSE;	// nicht gefunden
+    return sal_False;	// nicht gefunden
 }
 
-BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
+sal_Bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
                             const ScRangeList& rRanges, ScDocShell* pDocSh,
                             const String& rName, ScRange& rFound )
 {
     //	exact range in list?
 
-    ULONG nIndex = 0;
+    sal_uLong nIndex = 0;
     if ( lcl_FindRangeByName( rRanges, pDocSh, rName, nIndex ) )
     {
         rFound = *rRanges.GetObject(nIndex);
-        return TRUE;
+        return sal_True;
     }
 
     //	range contained in selection? (sheet must be specified)
 
     ScRange aCellRange;
-    USHORT nParse = aCellRange.ParseAny( rName, pDocSh->GetDocument() );
+    sal_uInt16 nParse = aCellRange.ParseAny( rName, pDocSh->GetDocument() );
     if ( ( nParse & ( SCA_VALID | SCA_TAB_3D ) ) == ( SCA_VALID | SCA_TAB_3D ) )
     {
         ScMarkData aMarkData;
-        aMarkData.MarkFromRangeList( rRanges, FALSE );
+        aMarkData.MarkFromRangeList( rRanges, sal_False );
         aMarkData.MarkToMulti();		// needed for IsAllMarked
         if ( aMarkData.IsAllMarked( aCellRange ) )
         {
             rFound = aCellRange;
-            return TRUE;
+            return sal_True;
         }
     }
 
@@ -4476,24 +4476,24 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
 
     if ( rNamedEntries.Count() )
     {
-        for ( USHORT n=0; n<rNamedEntries.Count(); n++ )
+        for ( sal_uInt16 n=0; n<rNamedEntries.Count(); n++ )
             if ( rNamedEntries[n]->GetName() == rName )
             {
                 //	test if named entry is contained in rRanges
 
                 const ScRange& rComp = rNamedEntries[n]->GetRange();
                 ScMarkData aMarkData;
-                aMarkData.MarkFromRangeList( rRanges, FALSE );
+                aMarkData.MarkFromRangeList( rRanges, sal_False );
                 aMarkData.MarkToMulti();		// needed for IsAllMarked
                 if ( aMarkData.IsAllMarked( rComp ) )
                 {
                     rFound = rComp;
-                    return TRUE;
+                    return sal_True;
                 }
             }
     }
 
-    return FALSE;		// not found
+    return sal_False;		// not found
 }
 
 void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName )
@@ -4501,56 +4501,56 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName )
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     String aNameStr(aName);
     ScDocShell* pDocSh = GetDocShell();
     const ScRangeList& rRanges = GetRangeList();
-    ULONG nIndex = 0;
+    sal_uLong nIndex = 0;
     if ( lcl_FindRangeByName( rRanges, pDocSh, aNameStr, nIndex ) )
     {
         //	einzelnen Range weglassen
         ScRangeList aNew;
-        ULONG nCount = rRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = rRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
             if (i != nIndex)
                 aNew.Append( *rRanges.GetObject(i) );
         SetNewRanges(aNew);
-        bDone = TRUE;
+        bDone = sal_True;
     }
     else if (pDocSh)
     {
         //	deselect any ranges (parsed or named entry)
         ScRangeList aDiff;
-        BOOL bValid = ( aDiff.Parse( aNameStr, pDocSh->GetDocument() ) & SCA_VALID ) != 0;
+        sal_Bool bValid = ( aDiff.Parse( aNameStr, pDocSh->GetDocument() ) & SCA_VALID ) != 0;
         if ( !bValid && aNamedEntries.Count() )
         {
-            USHORT nCount = aNamedEntries.Count();
-            for (USHORT n=0; n<nCount && !bValid; n++)
+            sal_uInt16 nCount = aNamedEntries.Count();
+            for (sal_uInt16 n=0; n<nCount && !bValid; n++)
                 if (aNamedEntries[n]->GetName() == aNameStr)
                 {
                     aDiff.RemoveAll();
                     aDiff.Append( aNamedEntries[n]->GetRange() );
-                    bValid = TRUE;
+                    bValid = sal_True;
                 }
         }
         if ( bValid )
         {
             ScMarkData aMarkData;
-            aMarkData.MarkFromRangeList( rRanges, FALSE );
+            aMarkData.MarkFromRangeList( rRanges, sal_False );
 
-            ULONG nDiffCount = aDiff.Count();
-            for (ULONG i=0; i<nDiffCount; i++)
+            sal_uLong nDiffCount = aDiff.Count();
+            for (sal_uLong i=0; i<nDiffCount; i++)
             {
                 ScRange* pDiffRange = aDiff.GetObject(i);
                 if (aMarkData.GetTableSelect( pDiffRange->aStart.Tab() ))
-                    aMarkData.SetMultiMarkArea( *pDiffRange, FALSE );
+                    aMarkData.SetMultiMarkArea( *pDiffRange, sal_False );
             }
 
             ScRangeList aNew;
-            aMarkData.FillRangeListWithMarks( &aNew, FALSE );
+            aMarkData.FillRangeListWithMarks( &aNew, sal_False );
             SetNewRanges(aNew);
 
-            bDone = TRUE;		//! error if range was not selected before?
+            bDone = sal_True;		//! error if range was not selected before?
         }
     }
 
@@ -4600,17 +4600,17 @@ uno::Any SAL_CALL ScCellRangesObj::getByName( const rtl::OUString& aName )
     return aRet;
 }
 
-BOOL lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries,
+sal_Bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries,
                         const ScRange& rRange, String& rName )
 {
-    USHORT nCount = rNamedEntries.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = rNamedEntries.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
         if (rNamedEntries[i]->GetRange() == rRange)
         {
             rName = rNamedEntries[i]->GetName();
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames()
@@ -4624,11 +4624,11 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames()
     {
         String aRangeStr;
         ScDocument* pDoc = pDocSh->GetDocument();
-        ULONG nCount = rRanges.Count();
+        sal_uLong nCount = rRanges.Count();
 
         uno::Sequence<rtl::OUString> aSeq(nCount);
         rtl::OUString* pAry = aSeq.getArray();
-        for (ULONG i=0; i<nCount; i++)
+        for (sal_uLong i=0; i<nCount; i++)
         {
             //	use given name if for exactly this range, otherwise just format
             ScRange aRange = *rRanges.GetObject(i);
@@ -4936,9 +4936,9 @@ uno::Reference<table::XCellRange>  ScCellRangeObj::getCellRangeByName(
         SCTAB nTab = aRange.aStart.Tab();
 
         ScRange aCellRange;
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         String aString(aName);
-        USHORT nParse = aCellRange.ParseAny( aString, pDoc, rDetails );
+        sal_uInt16 nParse = aCellRange.ParseAny( aString, pDoc, rDetails );
         if ( nParse & SCA_VALID )
         {
             if ( !(nParse & SCA_TAB_3D) )	// keine Tabelle angegeben -> auf dieser Tabelle
@@ -4946,20 +4946,20 @@ uno::Reference<table::XCellRange>  ScCellRangeObj::getCellRangeByName(
                 aCellRange.aStart.SetTab(nTab);
                 aCellRange.aEnd.SetTab(nTab);
             }
-            bFound = TRUE;
+            bFound = sal_True;
         }
         else
         {
             ScRangeUtil aRangeUtil;
             if ( aRangeUtil.MakeRangeFromName( aString, pDoc, nTab, aCellRange, RUTL_NAMES ) ||
                  aRangeUtil.MakeRangeFromName( aString, pDoc, nTab, aCellRange, RUTL_DBASE ) )
-                bFound = TRUE;
+                bFound = sal_True;
         }
 
         if (bFound)			// valid only if within this object's range
         {
             if (!aRange.In(aCellRange))
-                bFound = FALSE;
+                bFound = sal_False;
         }
 
         if (bFound)
@@ -5074,15 +5074,15 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula,
                 throw uno::RuntimeException();
             }
 
-            aFunc.EnterMatrix( aRange, NULL, NULL, rFormula, TRUE, TRUE, rFormulaNmsp, eGrammar );
+            aFunc.EnterMatrix( aRange, NULL, NULL, rFormula, sal_True, sal_True, rFormulaNmsp, eGrammar );
         }
         else
         {
             //	empty string -> erase array formula
             ScMarkData aMark;
             aMark.SetMarkArea( aRange );
-            aMark.SelectTable( aRange.aStart.Tab(), TRUE );
-            aFunc.DeleteContents( aMark, IDF_CONTENTS, TRUE, TRUE );
+            aMark.SelectTable( aRange.aStart.Tab(), sal_True );
+            aFunc.DeleteContents( aMark, IDF_CONTENTS, sal_True, sal_True );
         }
     }
 }
@@ -5159,15 +5159,15 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula
             // Actually GRAM_PODF_A1 is a don't-care here because of the token
             // array being set, it fits with other API compatibility grammars
             // though.
-            aFunc.EnterMatrix( aRange, NULL, &aTokenArray, EMPTY_STRING, TRUE, TRUE, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
+            aFunc.EnterMatrix( aRange, NULL, &aTokenArray, EMPTY_STRING, sal_True, sal_True, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
         }
         else
         {
             //  empty sequence -> erase array formula
             ScMarkData aMark;
             aMark.SetMarkArea( aRange );
-            aMark.SelectTable( aRange.aStart.Tab(), TRUE );
-            aFunc.DeleteContents( aMark, IDF_CONTENTS, TRUE, TRUE );
+            aMark.SelectTable( aRange.aStart.Tab(), sal_True );
+            aFunc.DeleteContents( aMark, IDF_CONTENTS, sal_True, sal_True );
         }
     }
 }
@@ -5190,7 +5190,7 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray()
     {
         uno::Any aAny;
         // bAllowNV = TRUE: errors as void
-        if ( ScRangeToSequence::FillMixedArray( aAny, pDocSh->GetDocument(), aRange, TRUE ) )
+        if ( ScRangeToSequence::FillMixedArray( aAny, pDocSh->GetDocument(), aRange, sal_True ) )
         {
             uno::Sequence< uno::Sequence<uno::Any> > aSeq;
             if ( aAny >>= aSeq )
@@ -5208,7 +5208,7 @@ void SAL_CALL ScCellRangeObj::setDataArray(
 {
     ScUnoGuard aGuard;
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDocShell* pDocSh = GetDocShell();
     if (pDocSh)
     {
@@ -5252,7 +5252,7 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul
             rtl::OUString* pColAry = aColSeq.getArray();
             for (SCCOL nColIndex = 0; nColIndex < nColCount; nColIndex++)
                 pColAry[nColIndex] = lcl_GetInputString( pDocSh->GetDocument(),
-                                    ScAddress( nStartCol+nColIndex, nStartRow+nRowIndex, nTab ), TRUE );
+                                    ScAddress( nStartCol+nColIndex, nStartRow+nRowIndex, nTab ), sal_True );
 
             pRowAry[nRowIndex] = aColSeq;
         }
@@ -5270,7 +5270,7 @@ void SAL_CALL ScCellRangeObj::setFormulaArray(
 {
     ScUnoGuard aGuard;
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDocShell* pDocSh = GetDocShell();
     if (pDocSh)
     {
@@ -5296,20 +5296,20 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress&
     ScDocShell* pDocSh = GetDocShell();
     if (pDocSh)
     {
-        BOOL bError = FALSE;
+        sal_Bool bError = sal_False;
         ScTabOpParam aParam;
         aParam.aRefFormulaCell = ScRefAddress( (SCCOL)aFormulaRange.StartColumn,
                                               (SCROW)aFormulaRange.StartRow, aFormulaRange.Sheet,
-                                              FALSE, FALSE, FALSE );
+                                              sal_False, sal_False, sal_False );
         aParam.aRefFormulaEnd  = ScRefAddress( (SCCOL)aFormulaRange.EndColumn,
                                               (SCROW)aFormulaRange.EndRow, aFormulaRange.Sheet,
-                                              FALSE, FALSE, FALSE );
+                                              sal_False, sal_False, sal_False );
         aParam.aRefRowCell	   = ScRefAddress( (SCCOL)aRowCell.Column,
                                               (SCROW)aRowCell.Row, aRowCell.Sheet,
-                                              FALSE, FALSE, FALSE );
+                                              sal_False, sal_False, sal_False );
         aParam.aRefColCell	   = ScRefAddress( (SCCOL)aColumnCell.Column,
                                               (SCROW)aColumnCell.Row, aColumnCell.Sheet,
-                                              FALSE, FALSE, FALSE );
+                                              sal_False, sal_False, sal_False );
         switch (nMode)
         {
             case sheet::TableOperationMode_COLUMN:
@@ -5322,13 +5322,13 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress&
                 aParam.nMode = 2;
                 break;
             default:
-                bError = TRUE;
+                bError = sal_True;
         }
 
         if (!bError)
         {
             ScDocFunc aFunc(*pDocSh);
-            aFunc.TabOp( aRange, NULL, aParam, TRUE, TRUE );
+            aFunc.TabOp( aRange, NULL, aParam, sal_True, sal_True );
         }
     }
 }
@@ -5343,9 +5343,9 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
     {
         ScDocFunc aFunc(*pDocSh);
         if ( bMerge )
-            aFunc.MergeCells( aRange, FALSE, TRUE, TRUE );
+            aFunc.MergeCells( aRange, sal_False, sal_True, sal_True );
         else
-            aFunc.UnmergeCells( aRange, TRUE, TRUE );
+            aFunc.UnmergeCells( aRange, sal_True, sal_True );
 
         //!	Fehler abfangen?
     }
@@ -5368,7 +5368,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
     {
-        BOOL bError = FALSE;
+        sal_Bool bError = sal_False;
 
         FillDir	eDir = FILL_TO_BOTTOM;
         switch (nFillDirection)
@@ -5386,7 +5386,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
                 eDir = FILL_TO_LEFT;
                 break;
             default:
-                bError = TRUE;
+                bError = sal_True;
         }
 
         FillCmd eCmd = FILL_SIMPLE;
@@ -5408,7 +5408,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
                 eCmd = FILL_AUTO;
                 break;
             default:
-                bError = TRUE;
+                bError = sal_True;
         }
 
         FillDateCmd	eDateCmd = FILL_DAY;
@@ -5427,14 +5427,14 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
                 eDateCmd = FILL_YEAR;
                 break;
             default:
-                bError = TRUE;
+                bError = sal_True;
         }
 
         if (!bError)
         {
             ScDocFunc aFunc(*pDocSh);
             aFunc.FillSeries( aRange, NULL, eDir, eCmd, eDateCmd,
-                                MAXDOUBLE, fStep, fEndValue, TRUE, TRUE );
+                                MAXDOUBLE, fStep, fEndValue, sal_True, sal_True );
         }
     }
 }
@@ -5449,7 +5449,7 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection,
         ScRange aSourceRange(aRange);
         SCsCOLROW nCount = 0;                   // "Dest-Count"
         FillDir eDir = FILL_TO_BOTTOM;
-        BOOL bError = FALSE;
+        sal_Bool bError = sal_False;
         switch (nFillDirection)
         {
             case sheet::FillDirection_TO_BOTTOM:
@@ -5473,15 +5473,15 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection,
                 eDir = FILL_TO_LEFT;
                 break;
             default:
-                bError = TRUE;
+                bError = sal_True;
         }
         if (nCount < 0 || nCount > MAXROW)      // overflow
-            bError = TRUE;
+            bError = sal_True;
 
         if (!bError)
         {
             ScDocFunc aFunc(*pDocSh);
-            aFunc.FillAuto( aSourceRange, NULL, eDir, nCount, TRUE, TRUE );
+            aFunc.FillAuto( aSourceRange, NULL, eDir, nCount, sal_True, sal_True );
         }
     }
 }
@@ -5497,8 +5497,8 @@ void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName )
     if ( pDocSh && pAutoFormat )
     {
         String aNameString(aName);
-        USHORT nCount = pAutoFormat->GetCount();
-        USHORT nIndex;
+        sal_uInt16 nCount = pAutoFormat->GetCount();
+        sal_uInt16 nIndex;
         String aCompare;
         for (nIndex=0; nIndex<nCount; nIndex++)
         {
@@ -5509,7 +5509,7 @@ void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName )
         if (nIndex<nCount)
         {
             ScDocFunc aFunc(*pDocSh);
-            aFunc.AutoFormat( aRange, NULL, nIndex, TRUE, TRUE );
+            aFunc.AutoFormat( aRange, NULL, nIndex, sal_True, sal_True );
         }
         else
             throw lang::IllegalArgumentException();
@@ -5538,7 +5538,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescripto
             SCCOLROW nFieldStart = aParam.bByRow ?
                 static_cast<SCCOLROW>(aDBRange.aStart.Col()) :
                 static_cast<SCCOLROW>(aDBRange.aStart.Row());
-            for (USHORT i=0; i<MAXSORT; i++)
+            for (sal_uInt16 i=0; i<MAXSORT; i++)
                 if ( aParam.bDoSort[i] && aParam.nField[i] >= nFieldStart )
                     aParam.nField[i] -= nFieldStart;
         }
@@ -5556,7 +5556,7 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a
     ScDocShell* pDocSh = GetDocShell();
     if (pDocSh)
     {
-        USHORT i;
+        sal_uInt16 i;
         ScSortParam aParam;
         ScDBData* pData = pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK );	// ggf. Bereich anlegen
         if (pData)
@@ -5590,7 +5590,7 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a
         pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK );		// ggf. Bereich anlegen
 
         ScDBDocFunc aFunc(*pDocSh);							// Bereich muss angelegt sein
-        aFunc.Sort( nTab, aParam, TRUE, TRUE, TRUE );
+        aFunc.Sort( nTab, aParam, sal_True, sal_True, sal_True );
     }
 }
 
@@ -5693,7 +5693,7 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
         //!	if created by createFilterDescriptorByObject ???
 
         ScDBDocFunc aFunc(*pDocSh);
-        aFunc.Query( nTab, aParam, NULL, TRUE, TRUE );	// Bereich muss angelegt sein
+        aFunc.Query( nTab, aParam, NULL, sal_True, sal_True );	// Bereich muss angelegt sein
     }
 }
 
@@ -5718,10 +5718,10 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil
         //!	Test, ob xObject im selben Dokument ist
 
         ScFilterDescriptor* pNew = new ScFilterDescriptor(pDocSh);	//! stattdessen vom Objekt?
-        //XSheetFilterDescriptorRef xNew = xObject->createFilterDescriptor(TRUE);
+        //XSheetFilterDescriptorRef xNew = xObject->createFilterDescriptor(sal_True);
 
         ScQueryParam aParam = pNew->GetParam();
-        aParam.bHasHeader = TRUE;
+        aParam.bHasHeader = sal_True;
 
         table::CellRangeAddress aDataAddress(xAddr->getRangeAddress());
         aParam.nCol1 = (SCCOL)aDataAddress.StartColumn;
@@ -5731,7 +5731,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil
         aParam.nTab  = aDataAddress.Sheet;
 
         ScDocument* pDoc = pDocSh->GetDocument();
-        BOOL bOk = pDoc->CreateQueryParam(
+        sal_Bool bOk = pDoc->CreateQueryParam(
                             aRange.aStart.Col(), aRange.aStart.Row(),
                             aRange.aEnd.Col(), aRange.aEnd.Row(),
                             aRange.aStart.Tab(), aParam );
@@ -5783,7 +5783,7 @@ uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTot
             ScRange aDBRange;
             pData->GetArea(aDBRange);
             SCCOL nFieldStart = aDBRange.aStart.Col();
-            for (USHORT i=0; i<MAXSUBTOTAL; i++)
+            for (sal_uInt16 i=0; i<MAXSUBTOTAL; i++)
             {
                 if ( aParam.bGroupActive[i] )
                 {
@@ -5819,7 +5819,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals(
 
         //	im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt
         SCCOL nFieldStart = aRange.aStart.Col();
-        for (USHORT i=0; i<MAXSUBTOTAL; i++)
+        for (sal_uInt16 i=0; i<MAXSUBTOTAL; i++)
         {
             if ( aParam.bGroupActive[i] )
             {
@@ -5840,7 +5840,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals(
         pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK );	// ggf. Bereich anlegen
 
         ScDBDocFunc aFunc(*pDocSh);
-        aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE );	// Bereich muss angelegt sein
+        aFunc.DoSubTotals( nTab, aParam, NULL, sal_True, sal_True );	// Bereich muss angelegt sein
     }
 }
 
@@ -5856,7 +5856,7 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException)
         if (pData)
             pData->GetSubTotalParam(aParam);	// auch bei Remove die Feld-Eintraege behalten
 
-        aParam.bRemoveOnly = TRUE;
+        aParam.bRemoveOnly = sal_True;
 
         SCTAB nTab = aRange.aStart.Tab();
         aParam.nCol1 = aRange.aStart.Col();
@@ -5867,7 +5867,7 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException)
         pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK );	// ggf. Bereich anlegen
 
         ScDBDocFunc aFunc(*pDocSh);
-        aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE );	// Bereich muss angelegt sein
+        aFunc.DoSubTotals( nTab, aParam, NULL, sal_True, sal_True );	// Bereich muss angelegt sein
     }
 }
 
@@ -5912,7 +5912,7 @@ void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue
         pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK );		// ggf. Bereich anlegen
 
         ScDBDocFunc aFunc(*pDocSh);							// Bereich muss angelegt sein
-        aFunc.DoImport( nTab, aParam, xResultSet, NULL, TRUE, FALSE );	//! Api-Flag als Parameter
+        aFunc.DoImport( nTab, aParam, xResultSet, NULL, sal_True, sal_False );	//! Api-Flag als Parameter
     }
 }
 
@@ -6157,7 +6157,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() throw(uno::Run
 
 //	Hilfsfunktionen
 
-String ScCellObj::GetInputString_Impl(BOOL bEnglish) const		// fuer getFormula / FormulaLocal
+String ScCellObj::GetInputString_Impl(sal_Bool bEnglish) const		// fuer getFormula / FormulaLocal
 {
     if (GetDocShell())
         return lcl_GetInputString( GetDocShell()->GetDocument(), aCellPos, bEnglish );
@@ -6190,7 +6190,7 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP
             {
                 //	wie in GetString am Dokument (column)
                 Color* pColor;
-                ULONG nNumFmt = pDoc->GetNumberFormat( aCellPos );
+                sal_uLong nNumFmt = pDoc->GetNumberFormat( aCellPos );
                 ScCellFormat::GetString( pCell, nNumFmt, aVal, &pColor, *pDoc->GetFormatTable() );
             }
         }
@@ -6207,14 +6207,14 @@ String ScCellObj::GetOutputString_Impl() const
     return aVal;
 }
 
-void ScCellObj::SetString_Impl(const String& rString, BOOL bInterpret, BOOL bEnglish)
+void ScCellObj::SetString_Impl(const String& rString, sal_Bool bInterpret, sal_Bool bEnglish)
 {
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
     {
         ScDocFunc aFunc(*pDocSh);
         // GRAM_PODF_A1 for API compatibility.
-        (void)aFunc.SetCellText( aCellPos, rString, bInterpret, bEnglish, TRUE, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
+        (void)aFunc.SetCellText( aCellPos, rString, bInterpret, bEnglish, sal_True, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
     }
 }
 
@@ -6233,7 +6233,7 @@ void ScCellObj::SetValue_Impl(double fValue)
     if ( pDocSh )
     {
         ScDocFunc aFunc(*pDocSh);
-        (void)aFunc.PutCell( aCellPos, new ScValueCell(fValue), TRUE );
+        (void)aFunc.PutCell( aCellPos, new ScValueCell(fValue), sal_True );
     }
 }
 
@@ -6268,7 +6268,7 @@ void ScCellObj::SetFormulaWithGrammar( const ::rtl::OUString& rFormula,
     if ( pDocSh )
     {
         ScDocFunc aFunc(*pDocSh);
-        aFunc.SetCellText( aCellPos, rFormula, TRUE, TRUE, TRUE, rFormulaNmsp, eGrammar);
+        aFunc.SetCellText( aCellPos, rFormula, sal_True, sal_True, sal_True, rFormulaNmsp, eGrammar);
     }
 }
 
@@ -6287,7 +6287,7 @@ void ScCellObj::InputEnglishString( const ::rtl::OUString& rText )
         sal_uInt32 nOldFormat = pDoc->GetNumberFormat( aCellPos );
         if ( pFormatter->GetType( nOldFormat ) == NUMBERFORMAT_TEXT )
         {
-            SetString_Impl(aString, FALSE, FALSE);      // text cell
+            SetString_Impl(aString, sal_False, sal_False);      // text cell
         }
         else
         {
@@ -6306,15 +6306,15 @@ void ScCellObj::InputEnglishString( const ::rtl::OUString& rText )
                         ScPatternAttr aPattern( pDoc->GetPool() );
                         aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) );
                         // ATTR_LANGUAGE_FORMAT remains unchanged
-                        aFunc.ApplyAttributes( *GetMarkData(), aPattern, TRUE, TRUE );
+                        aFunc.ApplyAttributes( *GetMarkData(), aPattern, sal_True, sal_True );
                     }
                 }
                 // put the cell into the document
                 // (after applying the format, so possible formula recalculation already uses the new format)
-                (void)aFunc.PutCell( aCellPos, pNewCell, TRUE );
+                (void)aFunc.PutCell( aCellPos, pNewCell, sal_True );
             }
             else
-                SetString_Impl(aString, FALSE, FALSE);      // no cell from InterpretEnglishString, probably empty string
+                SetString_Impl(aString, sal_False, sal_False);      // no cell from InterpretEnglishString, probably empty string
         }
     }
 }
@@ -6361,7 +6361,7 @@ void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::Runt
 {
     ScUnoGuard aGuard;
     String aString(aText);
-    SetString_Impl(aString, FALSE, FALSE);	// immer Text
+    SetString_Impl(aString, sal_False, sal_False);	// immer Text
 
     // don't create pUnoText here if not there
     if (pUnoText)
@@ -6431,7 +6431,7 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang
             aSelection.nEndPos = aSelection.nStartPos + 1;
             pCellField->InitDoc( pDocSh, aCellPos, aSelection );
 
-            //	#91431# for bAbsorb=FALSE, the new selection must be behind the inserted content
+            //	#91431# for bAbsorb=sal_False, the new selection must be behind the inserted content
             //	(the xml filter relies on this)
             if (!bAbsorb)
                 aSelection.nStartPos = aSelection.nEndPos;
@@ -6503,15 +6503,15 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException)
 rtl::OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    //	TRUE = englisch
-    return GetInputString_Impl(TRUE);
+    //	sal_True = englisch
+    return GetInputString_Impl(sal_True);
 }
 
 void SAL_CALL ScCellObj::setFormula( const rtl::OUString& aFormula ) throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
     String aString(aFormula);
-    SetString_Impl(aString, TRUE, TRUE);	// englisch interpretieren
+    SetString_Impl(aString, sal_True, sal_True);	// englisch interpretieren
 }
 
 double SAL_CALL ScCellObj::getValue() throw(uno::RuntimeException)
@@ -6566,7 +6566,7 @@ table::CellContentType ScCellObj::GetResultType_Impl()
         ScBaseCell* pCell = pDocSh->GetDocument()->GetCell(aCellPos);
         if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA )
         {
-            BOOL bValue = ((ScFormulaCell*)pCell)->IsValue();
+            sal_Bool bValue = ((ScFormulaCell*)pCell)->IsValue();
             return bValue ? table::CellContentType_VALUE : table::CellContentType_TEXT;
         }
     }
@@ -6576,7 +6576,7 @@ table::CellContentType ScCellObj::GetResultType_Impl()
 sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nError = 0;
+    sal_uInt16 nError = 0;
     ScDocShell* pDocSh = GetDocShell();
     if (pDocSh)
     {
@@ -6626,7 +6626,7 @@ void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rT
 
         ScDocFunc aFunc( *pDocSh );
         ScBaseCell* pNewCell = new ScFormulaCell( pDoc, aCellPos, &aTokenArray );
-        (void)aFunc.PutCell( aCellPos, pNewCell, TRUE );
+        (void)aFunc.PutCell( aCellPos, pNewCell, sal_True );
     }
 }
 
@@ -6697,7 +6697,7 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c
             rtl::OUString aStrVal;
             aValue >>= aStrVal;
             String aString(aStrVal);
-            SetString_Impl(aString, TRUE, FALSE);	// lokal interpretieren
+            SetString_Impl(aString, sal_True, sal_False);	// lokal interpretieren
         }
         else if ( pEntry->nWID == SC_WID_UNO_FORMRT )
         {
@@ -6717,8 +6717,8 @@ void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
     {
         if ( pEntry->nWID == SC_WID_UNO_FORMLOC )
         {
-            // FALSE = lokal
-            rAny <<= rtl::OUString( GetInputString_Impl(FALSE) );
+            // sal_False = lokal
+            rAny <<= rtl::OUString( GetInputString_Impl(sal_False) );
         }
         else if ( pEntry->nWID == SC_WID_UNO_FORMRT )
         {
@@ -6841,7 +6841,7 @@ void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExc
 sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nRet(nActionLockCount);
+    sal_uInt16 nRet(nActionLockCount);
     if (pUnoText)
     {
         ScSharedCellEditSource* pEditSource =
@@ -7114,7 +7114,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
         sheet::TablePageBreakData aData;
         uno::Sequence<sheet::TablePageBreakData> aSeq(nCount);
         sheet::TablePageBreakData* pAry = aSeq.getArray();
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         for (nCol=0; nCol<=MAXCOL; nCol++)
         {
             ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab);
@@ -7164,14 +7164,14 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc
         //!	docfunc Funktion, auch fuer ScViewFunc::RemoveManualBreaks
 
         ScDocument* pDoc = pDocSh->GetDocument();
-        BOOL bUndo (pDoc->IsUndoEnabled());
+        sal_Bool bUndo (pDoc->IsUndoEnabled());
         SCTAB nTab = GetTab_Impl();
 
         if (bUndo)
         {
             ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-            pDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, FALSE, pUndoDoc );
+            pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+            pDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, sal_False, pUndoDoc );
             pDocSh->GetUndoManager()->AddUndoAction(
                                     new ScUndoRemoveBreaks( pDocSh, nTab, pUndoDoc ) );
         }
@@ -7179,7 +7179,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc
         pDoc->RemoveManualBreaks(nTab);
         pDoc->UpdatePageBreaks(nTab);
 
-        //? UpdatePageBreakData( TRUE );
+        //? UpdatePageBreakData( sal_True );
         pDocSh->SetDocumentModified();
         pDocSh->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
     }
@@ -7206,7 +7206,7 @@ void SAL_CALL ScTableSheetObj::setName( const rtl::OUString& aNewName )
     {
         String aString(aNewName);
         ScDocFunc aFunc( *pDocSh );
-        aFunc.RenameTable( GetTab_Impl(), aString, TRUE, TRUE );
+        aFunc.RenameTable( GetTab_Impl(), aString, sal_True, sal_True );
     }
 }
 
@@ -7243,18 +7243,18 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
     {
-        BOOL bDo = TRUE;
+        sal_Bool bDo = sal_True;
         InsCellCmd eCmd = INS_NONE;
         switch (nMode)
         {
-            case sheet::CellInsertMode_NONE:	bDo = FALSE;			break;
+            case sheet::CellInsertMode_NONE:	bDo = sal_False;			break;
             case sheet::CellInsertMode_DOWN:	eCmd = INS_CELLSDOWN;	break;
             case sheet::CellInsertMode_RIGHT:	eCmd = INS_CELLSRIGHT;	break;
             case sheet::CellInsertMode_ROWS:	eCmd = INS_INSROWS;		break;
             case sheet::CellInsertMode_COLUMNS: eCmd = INS_INSCOLS;		break;
             default:
                 DBG_ERROR("insertCells: falscher Mode");
-                bDo = FALSE;
+                bDo = sal_False;
         }
 
         if (bDo)
@@ -7263,7 +7263,7 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang
             ScRange aScRange;
             ScUnoConversion::FillScRange( aScRange, rRangeAddress );
             ScDocFunc aFunc(*pDocSh);
-            aFunc.InsertCells( aScRange, NULL, eCmd, TRUE, TRUE );
+            aFunc.InsertCells( aScRange, NULL, eCmd, sal_True, sal_True );
         }
     }
 }
@@ -7275,18 +7275,18 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
     {
-        BOOL bDo = TRUE;
+        sal_Bool bDo = sal_True;
         DelCellCmd eCmd = DEL_NONE;
         switch (nMode)
         {
-            case sheet::CellDeleteMode_NONE:	 bDo = FALSE;			break;
+            case sheet::CellDeleteMode_NONE:	 bDo = sal_False;			break;
             case sheet::CellDeleteMode_UP:		 eCmd = DEL_CELLSUP;	break;
             case sheet::CellDeleteMode_LEFT:	 eCmd = DEL_CELLSLEFT;	break;
             case sheet::CellDeleteMode_ROWS:	 eCmd = DEL_DELROWS;	break;
             case sheet::CellDeleteMode_COLUMNS:	 eCmd = DEL_DELCOLS;	break;
             default:
                 DBG_ERROR("deleteCells: falscher Mode");
-                bDo = FALSE;
+                bDo = sal_False;
         }
 
         if (bDo)
@@ -7295,7 +7295,7 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang
             ScRange aScRange;
             ScUnoConversion::FillScRange( aScRange, rRangeAddress );
             ScDocFunc aFunc(*pDocSh);
-            aFunc.DeleteCells( aScRange, NULL, eCmd, TRUE, TRUE );
+            aFunc.DeleteCells( aScRange, NULL, eCmd, sal_True, sal_True );
         }
     }
 }
@@ -7313,7 +7313,7 @@ void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination
         ScUnoConversion::FillScRange( aSourceRange, aSource );
         ScAddress aDestPos( (SCCOL)aDestination.Column, (SCROW)aDestination.Row, aDestination.Sheet );
         ScDocFunc aFunc(*pDocSh);
-        aFunc.MoveBlock( aSourceRange, aDestPos, TRUE, TRUE, TRUE, TRUE );
+        aFunc.MoveBlock( aSourceRange, aDestPos, sal_True, sal_True, sal_True, sal_True );
     }
 }
 
@@ -7330,7 +7330,7 @@ void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination
         ScUnoConversion::FillScRange( aSourceRange, aSource );
         ScAddress aDestPos( (SCCOL)aDestination.Column, (SCROW)aDestination.Row, aDestination.Sheet );
         ScDocFunc aFunc(*pDocSh);
-        aFunc.MoveBlock( aSourceRange, aDestPos, FALSE, TRUE, TRUE, TRUE );
+        aFunc.MoveBlock( aSourceRange, aDestPos, sal_False, sal_True, sal_True, sal_True );
     }
 }
 
@@ -7344,7 +7344,7 @@ void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges )
     if ( pDocSh )
     {
         ScDocument* pDoc = pDocSh->GetDocument();
-        BOOL bUndo(pDoc->IsUndoEnabled());
+        sal_Bool bUndo(pDoc->IsUndoEnabled());
         SCTAB nTab = GetTab_Impl();
 
         ScPrintRangeSaver* pNewRanges = pDoc->CreatePrintRangeSaver();
@@ -7375,12 +7375,12 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScTableSheetObj::getPrintAreas()
     {
         ScDocument* pDoc = pDocSh->GetDocument();
         SCTAB nTab = GetTab_Impl();
-        USHORT nCount = pDoc->GetPrintRangeCount( nTab );
+        sal_uInt16 nCount = pDoc->GetPrintRangeCount( nTab );
 
         table::CellRangeAddress aRangeAddress;
         uno::Sequence<table::CellRangeAddress> aSeq(nCount);
         table::CellRangeAddress* pAry = aSeq.getArray();
-        for (USHORT i=0; i<nCount; i++)
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             const ScRange* pRange = pDoc->GetPrintRange( nTab, i );
             DBG_ASSERT(pRange,"wo ist der Druckbereich");
@@ -7409,13 +7409,13 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
 
         ScPrintRangeSaver* pOldRanges = pDoc->CreatePrintRangeSaver();
 
-        USHORT nCount = (USHORT) aPrintAreas.getLength();
+        sal_uInt16 nCount = (sal_uInt16) aPrintAreas.getLength();
         pDoc->ClearPrintRanges( nTab );
         if (nCount)
         {
             ScRange aPrintRange;
             const table::CellRangeAddress* pAry = aPrintAreas.getConstArray();
-            for (USHORT i=0; i<nCount; i++)
+            for (sal_uInt16 i=0; i<nCount; i++)
             {
                 ScUnoConversion::FillScRange( aPrintRange, pAry[i] );
                 pDoc->AddPrintRange( nTab, aPrintRange );
@@ -7436,7 +7436,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeExce
         SCTAB nTab = GetTab_Impl();
         return ( pDoc->GetRepeatColRange(nTab) != NULL );
     }
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns )
@@ -7517,7 +7517,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeExcepti
         SCTAB nTab = GetTab_Impl();
         return ( pDoc->GetRepeatRowRange(nTab) != NULL );
     }
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows )
@@ -7597,7 +7597,7 @@ sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeE
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
     {
-        BYTE nMode = pDocSh->GetDocument()->GetLinkMode( GetTab_Impl() );
+        sal_uInt8 nMode = pDocSh->GetDocument()->GetLinkMode( GetTab_Impl() );
         if ( nMode == SC_LINK_NORMAL )
             eRet = sheet::SheetLinkMode_NORMAL;
         else if ( nMode == SC_LINK_VALUE )
@@ -7686,19 +7686,19 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr
 
         aFileString = ScGlobal::GetAbsDocName( aFileString, pDocSh );
         if ( !aFilterString.Len() )
-            ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, TRUE, FALSE );
+            ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, sal_True, sal_False );
 
         //	remove application prefix from filter name here, so the filter options
         //	aren't reset when the filter name is changed in ScTableLink::DataChanged
         ScDocumentLoader::RemoveAppPrefix( aFilterString );
 
-        BYTE nLinkMode = SC_LINK_NONE;
+        sal_uInt8 nLinkMode = SC_LINK_NONE;
         if ( nMode == sheet::SheetLinkMode_NORMAL )
             nLinkMode = SC_LINK_NORMAL;
         else if ( nMode == sheet::SheetLinkMode_VALUE )
             nLinkMode = SC_LINK_VALUE;
 
-        ULONG nRefresh = 0;
+        sal_uLong nRefresh = 0;
         pDoc->SetLink( nTab, nLinkMode, aFileString, aFilterString, aOptString, aSheetString, nRefresh );
 
         pDocSh->UpdateLinks();					// ggf. Link eintragen oder loeschen
@@ -7714,8 +7714,8 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr
             //!	Update nur fuer die betroffene Tabelle???
 
             sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
-            USHORT nCount = pLinkManager->GetLinks().Count();
-            for ( USHORT i=0; i<nCount; i++ )
+            sal_uInt16 nCount = pLinkManager->GetLinks().Count();
+            for ( sal_uInt16 i=0; i<nCount; i++ )
             {
                 ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i];
                 if (pBase->ISA(ScTableLink))
@@ -7748,7 +7748,7 @@ sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPo
         ScDocFunc aFunc(*pDocSh);
         return aFunc.DetectiveDelSucc( aPos );
     }
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPosition )
@@ -7764,7 +7764,7 @@ sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPo
         ScDocFunc aFunc(*pDocSh);
         return aFunc.DetectiveDelPred( aPos );
     }
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPosition )
@@ -7780,7 +7780,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPo
         ScDocFunc aFunc(*pDocSh);
         return aFunc.DetectiveAddSucc( aPos );
     }
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPosition )
@@ -7796,7 +7796,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPo
         ScDocFunc aFunc(*pDocSh);
         return aFunc.DetectiveAddPred( aPos );
     }
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPosition )
@@ -7812,7 +7812,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPositi
         ScDocFunc aFunc(*pDocSh);
         return aFunc.DetectiveAddError( aPos );
     }
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException)
@@ -7824,7 +7824,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException)
         ScDocFunc aFunc(*pDocSh);
         return aFunc.DetectiveMarkInvalid( GetTab_Impl() );
     }
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException)
@@ -7848,11 +7848,11 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
     {
-        BOOL bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
+        sal_Bool bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
         ScRange aGroupRange;
         ScUnoConversion::FillScRange( aGroupRange, rGroupRange );
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.MakeOutline( aGroupRange, bColumns, TRUE, TRUE );
+        aFunc.MakeOutline( aGroupRange, bColumns, sal_True, sal_True );
     }
 }
 
@@ -7864,11 +7864,11 @@ void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRan
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
     {
-        BOOL bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
+        sal_Bool bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
         ScRange aGroupRange;
         ScUnoConversion::FillScRange( aGroupRange, rGroupRange );
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.RemoveOutline( aGroupRange, bColumns, TRUE, TRUE );
+        aFunc.RemoveOutline( aGroupRange, bColumns, sal_True, sal_True );
     }
 }
 
@@ -7882,7 +7882,7 @@ void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCell
         ScRange aFormulaRange;
         ScUnoConversion::FillScRange( aFormulaRange, rCellRange );
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.AutoOutline( aFormulaRange, TRUE, TRUE );
+        aFunc.AutoOutline( aFormulaRange, sal_True, sal_True );
     }
 }
 
@@ -7894,7 +7894,7 @@ void SAL_CALL ScTableSheetObj::clearOutline() throw(uno::RuntimeException)
     {
         SCTAB nTab = GetTab_Impl();
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.RemoveAllOutlines( nTab, TRUE, TRUE );
+        aFunc.RemoveAllOutlines( nTab, sal_True, sal_True );
     }
 }
 
@@ -7908,7 +7908,7 @@ void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellR
         ScRange aMarkRange;
         ScUnoConversion::FillScRange( aMarkRange, rCellRange );
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.HideMarkedOutlines( aMarkRange, TRUE, TRUE );
+        aFunc.HideMarkedOutlines( aMarkRange, sal_True, sal_True );
     }
 }
 
@@ -7922,7 +7922,7 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellR
         ScRange aMarkRange;
         ScUnoConversion::FillScRange( aMarkRange, rCellRange );
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.ShowMarkedOutlines( aMarkRange, TRUE, TRUE );
+        aFunc.ShowMarkedOutlines( aMarkRange, sal_True, sal_True );
     }
 }
 
@@ -7933,10 +7933,10 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
     {
-        BOOL bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
+        sal_Bool bColumns = ( nOrientation == table::TableOrientation_COLUMNS );
         SCTAB nTab = GetTab_Impl();
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.SelectLevel( nTab, bColumns, nLevel, TRUE, TRUE, TRUE );
+        aFunc.SelectLevel( nTab, bColumns, nLevel, sal_True, sal_True, sal_True );
     }
 }
 
@@ -7952,7 +7952,7 @@ void SAL_CALL ScTableSheetObj::protect( const rtl::OUString& aPassword )
     {
         String aString(aPassword);
         ScDocFunc aFunc(*pDocSh);
-        aFunc.Protect( GetTab_Impl(), aString, TRUE );
+        aFunc.Protect( GetTab_Impl(), aString, sal_True );
     }
 }
 
@@ -7965,7 +7965,7 @@ void SAL_CALL ScTableSheetObj::unprotect( const rtl::OUString& aPassword )
     {
         String aString(aPassword);
         ScDocFunc aFunc(*pDocSh);
-        BOOL bDone = aFunc.Unprotect( GetTab_Impl(), aString, TRUE );
+        sal_Bool bDone = aFunc.Unprotect( GetTab_Impl(), aString, sal_True );
         if (!bDone)
             throw lang::IllegalArgumentException();
     }
@@ -7979,7 +7979,7 @@ sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException)
         return pDocSh->GetDocument()->IsTabProtected( GetTab_Impl() );
 
     DBG_ERROR("keine DocShell");		//! Exception oder so?
-    return FALSE;
+    return sal_False;
 }
 
 // XScenario
@@ -7991,7 +7991,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException)
     if ( pDocSh )
         return pDocSh->GetDocument()->IsScenario( GetTab_Impl() );
 
-    return FALSE;
+    return sal_False;
 }
 
 rtl::OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException)
@@ -8002,7 +8002,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeE
     {
         String aComment;
         Color  aColor;
-        USHORT nFlags;
+        sal_uInt16 nFlags;
         pDocSh->GetDocument()->GetScenarioData( GetTab_Impl(), aComment, aColor, nFlags );
         return aComment;
     }
@@ -8022,7 +8022,7 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenari
         String aName;
         String aComment;
         Color  aColor;
-        USHORT nFlags;
+        sal_uInt16 nFlags;
         pDoc->GetName( nTab, aName );
         pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
@@ -8045,13 +8045,13 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
         if (pDoc->IsScenario(nTab))
         {
             ScMarkData aMarkData;
-            aMarkData.SelectTable( nTab, TRUE );
+            aMarkData.SelectTable( nTab, sal_True );
 
-            USHORT nRangeCount = (USHORT)rScenRanges.getLength();
+            sal_uInt16 nRangeCount = (sal_uInt16)rScenRanges.getLength();
             if (nRangeCount)
             {
                 const table::CellRangeAddress* pAry = rScenRanges.getConstArray();
-                for (USHORT i=0; i<nRangeCount; i++)
+                for (sal_uInt16 i=0; i<nRangeCount; i++)
                 {
                     DBG_ASSERT( pAry[i].Sheet == nTab, "addRanges mit falscher Tab" );
                     ScRange aOneRange( (SCCOL)pAry[i].StartColumn, (SCROW)pAry[i].StartRow, nTab,
@@ -8064,51 +8064,51 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
             //	Szenario-Ranges sind durch Attribut gekennzeichnet
             ScPatternAttr aPattern( pDoc->GetPool() );
             aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) );
-            aPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) );
+            aPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) );
             ScDocFunc aFunc(*pDocSh);
-            aFunc.ApplyAttributes( aMarkData, aPattern, TRUE, TRUE );
+            aFunc.ApplyAttributes( aMarkData, aPattern, sal_True, sal_True );
         }
 
         // don't use. We should use therefor a private interface, so we can also set the flags.
 /*    	else if (nTab > 0 && pDoc->IsImportingXML()) // make this sheet as an scenario and only if it is not the first sheet and only if it is ImportingXML,
             // because than no UNDO and repaint is necessary.
         {
-            USHORT nRangeCount = (USHORT)rScenRanges.getLength();
+            sal_uInt16 nRangeCount = (sal_uInt16)rScenRanges.getLength();
             if (nRangeCount)
             {
-                pDoc->SetScenario( nTab, TRUE );
+                pDoc->SetScenario( nTab, sal_True );
 
                 // default flags
                 Color aColor( COL_LIGHTGRAY );	// Default
-                USHORT nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY;
+                sal_uInt16 nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY;
                 String aComment;
 
                 pDoc->SetScenarioData( nTab, aComment, aColor, nFlags );
                 const table::CellRangeAddress* pAry = rScenRanges.getConstArray();
-                for (USHORT i=0; i<nRangeCount; i++)
+                for (sal_uInt16 i=0; i<nRangeCount; i++)
                 {
                     DBG_ASSERT( pAry[i].Sheet == nTab, "addRanges mit falscher Tab" );
-                    pDoc->ApplyFlagsTab( (USHORT)pAry[i].StartColumn, (USHORT)pAry[i].StartRow,
-                            (USHORT)pAry[i].EndColumn, (USHORT)pAry[i].EndRow, nTab, SC_MF_SCENARIO );
+                    pDoc->ApplyFlagsTab( (sal_uInt16)pAry[i].StartColumn, (sal_uInt16)pAry[i].StartRow,
+                            (sal_uInt16)pAry[i].EndColumn, (sal_uInt16)pAry[i].EndRow, nTab, SC_MF_SCENARIO );
                 }
-                pDoc->SetActiveScenario( nTab, TRUE );
+                pDoc->SetActiveScenario( nTab, sal_True );
 
                 // set to next visible tab
-                USHORT j = nTab - 1;
-                BOOL bFinished = FALSE;
+                sal_uInt16 j = nTab - 1;
+                sal_Bool bFinished = sal_False;
                 while (j < nTab && !bFinished)
                 {
                     if (pDoc->IsVisible(j))
                     {
                         pDoc->SetVisibleTab(j);
-                        bFinished = TRUE;
+                        bFinished = sal_True;
                     }
                     else
                         --j;
                 }
 
                 ScDocFunc aFunc(*pDocSh);
-                aFunc.SetTableVisible( nTab, FALSE, TRUE );
+                aFunc.SetTableVisible( nTab, sal_False, sal_True );
             }
         }*/
     }
@@ -8184,7 +8184,7 @@ void ScTableSheetObj::setExternalName( const ::rtl::OUString& aUrl, const ::rtl:
             const SCTAB nTab = GetTab_Impl();
             const String aAbsDocName( ScGlobal::GetAbsDocName( aUrl, pDocSh ) );
             const String aDocTabName( ScGlobal::GetDocTabName( aAbsDocName, aSheetName ) );
-            if ( !pDoc->RenameTab( nTab, aDocTabName, FALSE /*bUpdateRef*/, TRUE /*bExternalDocument*/ ) )
+            if ( !pDoc->RenameTab( nTab, aDocTabName, sal_False /*bUpdateRef*/, sal_True /*bExternalDocument*/ ) )
             {
                 throw container::ElementExistException( ::rtl::OUString(), *this );
             }
@@ -8267,8 +8267,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
         {
-            BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
-            aFunc.SetTableVisible( nTab, bVis, TRUE );
+            sal_Bool bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            aFunc.SetTableVisible( nTab, bVis, sal_True );
         }
         else if ( pEntry->nWID == SC_WID_UNO_ISACTIVE )
         {
@@ -8285,7 +8285,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
                     String aName;
                     String aComment;
                     Color  aColor;
-                    USHORT nFlags;
+                    sal_uInt16 nFlags;
                     pDoc->GetName( nTab, aName );
                     pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
@@ -8302,7 +8302,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
                 String aName;
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetName( nTab, aName );
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
                 sal_Bool bModify(sal_False);
@@ -8335,7 +8335,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
                 String aName;
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetName( nTab, aName );
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
                 sal_Bool bModify(sal_False);
@@ -8368,7 +8368,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
                 String aName;
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetName( nTab, aName );
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
                 sal_Bool bModify(sal_False);
@@ -8401,7 +8401,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
                 String aName;
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetName( nTab, aName );
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
                 sal_Bool bModify(sal_False);
@@ -8434,7 +8434,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
                 String aName;
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetName( nTab, aName );
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
                 sal_Bool bModify(sal_False);
@@ -8467,7 +8467,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
                 String aName;
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetName( nTab, aName );
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
                 sal_Bool bModify(sal_False);
@@ -8506,7 +8506,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
         }
         else if ( pEntry->nWID == SC_WID_UNO_AUTOPRINT )
         {
-            BOOL bAutoPrint = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bAutoPrint = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             if (bAutoPrint)
                 pDoc->SetPrintEntireSheet( nTab ); // clears all print ranges
             else
@@ -8556,7 +8556,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
         {
-            BOOL bVis = pDoc->IsVisible( nTab );
+            sal_Bool bVis = pDoc->IsVisible( nTab );
             ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
         }
         else if ( pEntry->nWID == SC_WID_UNO_LINKDISPBIT )
@@ -8580,7 +8580,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             {
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
                 rAny <<= static_cast<sal_Int32>(aColor.GetColor());
@@ -8592,7 +8592,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             {
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
                 ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_PROTECT) != 0 );
@@ -8604,7 +8604,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             {
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
                 ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_SHOWFRAME) != 0 );
@@ -8616,7 +8616,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             {
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
                 ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_PRINTFRAME) != 0 );
@@ -8628,7 +8628,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             {
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
                 ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_TWOWAY) != 0 );
@@ -8640,7 +8640,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             {
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
                 ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_ATTRIB) != 0 );
@@ -8652,7 +8652,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             {
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
                 pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
 
                 ScUnoHelpFunctions::SetBoolInAny( rAny, !(nFlags & SC_SCENARIO_VALUE));
@@ -8667,7 +8667,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
         }
         else if ( pEntry->nWID == SC_WID_UNO_AUTOPRINT )
         {
-            BOOL bAutoPrint = pDoc->IsPrintEntireSheet( nTab );
+            sal_Bool bAutoPrint = pDoc->IsPrintEntireSheet( nTab );
             ScUnoHelpFunctions::SetBoolInAny( rAny, bAutoPrint );
         }
         else if ( pEntry->nWID == SC_WID_UNO_TABCOLOR )
@@ -8891,32 +8891,32 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
             {
                 //	property is 1/100mm, column width is twips
                 nNewWidth = HMMToTwips(nNewWidth);
-                aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, SC_SIZE_ORIGINAL,
-                                        (USHORT)nNewWidth, TRUE, TRUE );
+                aFunc.SetWidthOrHeight( sal_True, 1, nColArr, nTab, SC_SIZE_ORIGINAL,
+                                        (sal_uInt16)nNewWidth, sal_True, sal_True );
             }
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
         {
-            BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
-            aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, eMode, 0, TRUE, TRUE );
+            aFunc.SetWidthOrHeight( sal_True, 1, nColArr, nTab, eMode, 0, sal_True, sal_True );
             //	SC_SIZE_DIRECT mit Groesse 0 blendet aus
         }
         else if ( pEntry->nWID == SC_WID_UNO_OWIDTH )
         {
-            BOOL bOpt = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bOpt = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             if (bOpt)
-                aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab,
-                                        SC_SIZE_OPTIMAL, STD_EXTRA_WIDTH, TRUE, TRUE );
-            // FALSE bei Spalten momentan ohne Auswirkung
+                aFunc.SetWidthOrHeight( sal_True, 1, nColArr, nTab,
+                                        SC_SIZE_OPTIMAL, STD_EXTRA_WIDTH, sal_True, sal_True );
+            // sal_False bei Spalten momentan ohne Auswirkung
         }
         else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE || pEntry->nWID == SC_WID_UNO_MANPAGE )
         {
-            BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             if (bSet)
-                aFunc.InsertPageBreak( TRUE, rRange.aStart, TRUE, TRUE, TRUE );
+                aFunc.InsertPageBreak( sal_True, rRange.aStart, sal_True, sal_True, sal_True );
             else
-                aFunc.RemovePageBreak( TRUE, rRange.aStart, TRUE, TRUE, TRUE );
+                aFunc.RemovePageBreak( sal_True, rRange.aStart, sal_True, sal_True, sal_True );
         }
         else
             ScCellRangeObj::SetOnePropertyValue(pEntry, aValue);        // base class, no Item WID
@@ -8942,9 +8942,9 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
         if ( pEntry->nWID == SC_WID_UNO_CELLWID )
         {
             // for hidden column, return original height
-            USHORT nWidth = pDoc->GetOriginalWidth( nCol, nTab );
+            sal_uInt16 nWidth = pDoc->GetOriginalWidth( nCol, nTab );
             //	property is 1/100mm, column width is twips
-            nWidth = (USHORT) TwipsToHMM(nWidth);
+            nWidth = (sal_uInt16) TwipsToHMM(nWidth);
             rAny <<= (sal_Int32)( nWidth );
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
@@ -8956,7 +8956,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
         else if ( pEntry->nWID == SC_WID_UNO_OWIDTH )
         {
             //!	momentan immer gesetzt ??!?!
-            BOOL bOpt = !(pDoc->GetColFlags( nCol, nTab ) & CR_MANUALSIZE);
+            sal_Bool bOpt = !(pDoc->GetColFlags( nCol, nTab ) & CR_MANUALSIZE);
             ScUnoHelpFunctions::SetBoolInAny( rAny, bOpt );
         }
         else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE )
@@ -9036,44 +9036,44 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
             {
                 //	property is 1/100mm, row height is twips
                 nNewHeight = HMMToTwips(nNewHeight);
-                aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_ORIGINAL,
-                                        (USHORT)nNewHeight, TRUE, TRUE );
+                aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, nTab, SC_SIZE_ORIGINAL,
+                                        (sal_uInt16)nNewHeight, sal_True, sal_True );
             }
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
         {
-            BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
-            aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
+            aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, nTab, eMode, 0, sal_True, sal_True );
             //	SC_SIZE_DIRECT mit Groesse 0 blendet aus
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLFILT )
         {
-            BOOL bFil = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bFil = ScUnoHelpFunctions::GetBoolFromAny( aValue );
 //			ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
-//			aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
+//			aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, nTab, eMode, 0, sal_True, sal_True );
             //	SC_SIZE_DIRECT mit Groesse 0 blendet aus
             pDoc->SetRowFiltered(nRow, nRow, nTab, bFil);
         }
         else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT )
         {
-            BOOL bOpt = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bOpt = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             if (bOpt)
-                aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_OPTIMAL, 0, TRUE, TRUE );
+                aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, nTab, SC_SIZE_OPTIMAL, 0, sal_True, sal_True );
             else
             {
                 //	set current height again manually
-                USHORT nHeight = pDoc->GetOriginalHeight( nRow, nTab );
-                aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_ORIGINAL, nHeight, TRUE, TRUE );
+                sal_uInt16 nHeight = pDoc->GetOriginalHeight( nRow, nTab );
+                aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, nTab, SC_SIZE_ORIGINAL, nHeight, sal_True, sal_True );
             }
         }
         else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE || pEntry->nWID == SC_WID_UNO_MANPAGE )
         {
-            BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             if (bSet)
-                aFunc.InsertPageBreak( FALSE, rRange.aStart, TRUE, TRUE, TRUE );
+                aFunc.InsertPageBreak( sal_False, rRange.aStart, sal_True, sal_True, sal_True );
             else
-                aFunc.RemovePageBreak( FALSE, rRange.aStart, TRUE, TRUE, TRUE );
+                aFunc.RemovePageBreak( sal_False, rRange.aStart, sal_True, sal_True, sal_True );
         }
         else
             ScCellRangeObj::SetOnePropertyValue(pEntry, aValue);        // base class, no Item WID
@@ -9098,9 +9098,9 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
         if ( pEntry->nWID == SC_WID_UNO_CELLHGT )
         {
             // for hidden row, return original height
-            USHORT nHeight = pDoc->GetOriginalHeight( nRow, nTab );
+            sal_uInt16 nHeight = pDoc->GetOriginalHeight( nRow, nTab );
             //	property is 1/100mm, row height is twips
-            nHeight = (USHORT) TwipsToHMM(nHeight);
+            nHeight = (sal_uInt16) TwipsToHMM(nHeight);
             rAny <<= (sal_Int32)( nHeight );
         }
         else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
@@ -9116,7 +9116,7 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
         }
         else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT )
         {
-            BOOL bOpt = !(pDoc->GetRowFlags( nRow, nTab ) & CR_MANUALSIZE);
+            sal_Bool bOpt = !(pDoc->GetRowFlags( nRow, nTab ) & CR_MANUALSIZE);
             ScUnoHelpFunctions::SetBoolInAny( rAny, bOpt );
         }
         else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE )
@@ -9189,7 +9189,7 @@ uno::Type SAL_CALL ScCellsObj::getElementType() throw(uno::RuntimeException)
 sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bHas = FALSE;
+    sal_Bool bHas = sal_False;
     if ( pDocShell )
     {
         //!	schneller selber testen?
@@ -9206,13 +9206,13 @@ ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR
     pDocShell( pDocSh ),
     aRanges( rR ),
     pMark( NULL ),
-    bAtEnd( FALSE )
+    bAtEnd( sal_False )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     pDoc->AddUnoObject(*this);
 
     if ( aRanges.Count() == 0 )
-        bAtEnd = TRUE;
+        bAtEnd = sal_True;
     else
     {
         SCTAB nTab = 0;
@@ -9228,7 +9228,7 @@ void ScCellsEnumeration::CheckPos_Impl()
 {
     if (pDocShell)
     {
-        BOOL bFound = FALSE;
+        sal_Bool bFound = sal_False;
         ScDocument* pDoc = pDocShell->GetDocument();
         ScBaseCell* pCell = pDoc->GetCell(aPos);
         if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE )
@@ -9236,7 +9236,7 @@ void ScCellsEnumeration::CheckPos_Impl()
             if (!pMark)
             {
                 pMark = new ScMarkData;
-                pMark->MarkFromRangeList( aRanges, FALSE );
+                pMark->MarkFromRangeList( aRanges, sal_False );
                 pMark->MarkToMulti();	// needed for GetNextMarkedCell
             }
             bFound = pMark->IsCellMarked( aPos.Col(), aPos.Row() );
@@ -9259,18 +9259,18 @@ void ScCellsEnumeration::Advance_Impl()
     if (!pMark)
     {
         pMark = new ScMarkData;
-        pMark->MarkFromRangeList( aRanges, FALSE );
+        pMark->MarkFromRangeList( aRanges, sal_False );
         pMark->MarkToMulti();	// needed for GetNextMarkedCell
     }
 
     SCCOL nCol = aPos.Col();
     SCROW nRow = aPos.Row();
     SCTAB nTab = aPos.Tab();
-    BOOL bFound = pDocShell->GetDocument()->GetNextMarkedCell( nCol, nRow, nTab, *pMark );
+    sal_Bool bFound = pDocShell->GetDocument()->GetNextMarkedCell( nCol, nRow, nTab, *pMark );
     if (bFound)
         aPos.Set( nCol, nRow, nTab );
     else
-        bAtEnd = TRUE;		// kommt nix mehr
+        bAtEnd = sal_True;		// kommt nix mehr
 }
 
 void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
@@ -9461,8 +9461,8 @@ ScCellFormatsEnumeration::ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScR
     pDocShell( pDocSh ),
     nTab( rRange.aStart.Tab() ),
     pIter( NULL ),
-    bAtEnd( FALSE ),
-    bDirty( FALSE )
+    bAtEnd( sal_False ),
+    bDirty( sal_False )
 {
     ScDocument* pDoc = pDocShell->GetDocument();
     pDoc->AddUnoObject(*this);
@@ -9492,7 +9492,7 @@ void ScCellFormatsEnumeration::Advance_Impl()
         if ( bDirty )
         {
             pIter->DataChanged();	// AttrArray-Index neu suchen
-            bDirty = FALSE;
+            bDirty = sal_False;
         }
 
         SCCOL nCol1, nCol2;
@@ -9500,10 +9500,10 @@ void ScCellFormatsEnumeration::Advance_Impl()
         if ( pIter->GetNext( nCol1, nCol2, nRow1, nRow2 ) )
             aNext = ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab );
         else
-            bAtEnd = TRUE;		// kommt nix mehr
+            bAtEnd = sal_True;		// kommt nix mehr
     }
     else
-        bAtEnd = TRUE;			// Dok weggekommen oder so
+        bAtEnd = sal_True;			// Dok weggekommen oder so
 }
 
 ScCellRangeObj* ScCellFormatsEnumeration::NextObject_Impl()
@@ -9528,7 +9528,7 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
     else if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             pDocShell = NULL;						// ungueltig geworden
@@ -9537,7 +9537,7 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
         }
         else if ( nId == SFX_HINT_DATACHANGED )
         {
-            bDirty = TRUE;			// AttrArray-Index evtl. ungueltig geworden
+            bDirty = sal_True;			// AttrArray-Index evtl. ungueltig geworden
         }
     }
 }
@@ -9591,7 +9591,7 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
     else if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
             pDocShell = NULL;						// ungueltig geworden
     }
@@ -9858,7 +9858,7 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi
     }
     else if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
             pDocShell = NULL;						// ungueltig geworden
     }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index cd7984d02..a61f32b5f 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1099,7 +1099,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
     SCROW nMaxRow = 0;
     SCTAB nTab    = 0;
 
-    USHORT nFileId = 0;
+    sal_uInt16 nFileId = 0;
     String aExtTabName;
     bool bExternal = false;
 
@@ -2617,7 +2617,7 @@ void ScChart2DataSequence::BuildDataCache()
                             case CELLTYPE_FORMULA:
                             {
                                 ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
-                                USHORT nErr = pFCell->GetErrCode();
+                                sal_uInt16 nErr = pFCell->GetErrCode();
                                 if (nErr)
                                     break;
     
@@ -2834,7 +2834,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
+        sal_uLong nId = static_cast<const SfxSimpleHint&>(rHint).GetId();
         if ( nId ==SFX_HINT_DYING )
         {
             m_pDocument = NULL;
@@ -2851,7 +2851,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
 
                 if( m_pDocument )
                 {
-                    for ( USHORT n=0; n<m_aValueListeners.Count(); n++ )
+                    for ( sal_uInt16 n=0; n<m_aValueListeners.Count(); n++ )
                         m_pDocument->AddUnoListenerCall( *m_aValueListeners[n], aEvent );
                 }
 
@@ -3409,8 +3409,8 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference<
 
     acquire();		// in case the listeners have the last ref - released below
 
-    USHORT nCount = m_aValueListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = m_aValueListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<util::XModifyListener> *pObj = m_aValueListeners[n];
         if ( *pObj == aListener )
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 195209afb..69437c08f 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -208,11 +208,11 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName,
     }
 
     ScRangeList* pList = new ScRangeList;
-    USHORT nRangeCount = (USHORT)aRanges.getLength();
+    sal_uInt16 nRangeCount = (sal_uInt16)aRanges.getLength();
     if (nRangeCount)
     {
         const table::CellRangeAddress* pAry = aRanges.getConstArray();
-        for (USHORT i=0; i<nRangeCount; i++)
+        for (sal_uInt16 i=0; i<nRangeCount; i++)
         {
             ScRange aRange( static_cast<SCCOL>(pAry[i].StartColumn), pAry[i].StartRow, pAry[i].Sheet,
                             static_cast<SCCOL>(pAry[i].EndColumn),   pAry[i].EndRow,   pAry[i].Sheet );
@@ -340,7 +340,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration(
 sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    INT32 nCount = 0;
+    sal_Int32 nCount = 0;
     if ( pDocShell )
     {
         ScDocument* pDoc = pDocShell->GetDocument();
@@ -554,14 +554,14 @@ void ScChartObj::Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, b
     if (pDocShell)
     {
         ScDocument* pDoc = pDocShell->GetDocument();
-        BOOL bUndo(pDoc->IsUndoEnabled());
+        sal_Bool bUndo(pDoc->IsUndoEnabled());
 
         if (bUndo)
         {
             pDocShell->GetUndoManager()->AddUndoAction(
-                new ScUndoChartData( pDocShell, aChartName, rRanges, bColHeaders, bRowHeaders, FALSE ) );
+                new ScUndoChartData( pDocShell, aChartName, rRanges, bColHeaders, bRowHeaders, sal_False ) );
         }
-        pDoc->UpdateChartArea( aChartName, rRanges, bColHeaders, bRowHeaders, FALSE );
+        pDoc->UpdateChartArea( aChartName, rRanges, bColHeaders, bRowHeaders, sal_False );
     }
 }
 
@@ -617,7 +617,7 @@ void ScChartObj::getFastPropertyValue( uno::Any& rValue, sal_Int32 nHandle ) con
                 if ( pDoc )
                 {
                     ScRange aEmptyRange;
-                    USHORT nIndex = 0;
+                    sal_uInt16 nIndex = 0;
                     ScChartListener aSearcher( aChartName, pDoc, aEmptyRange );
                     ScChartListenerCollection* pCollection = pDoc->GetChartListenerCollection();
                     if ( pCollection && pCollection->Search( &aSearcher, nIndex ) )
@@ -628,10 +628,10 @@ void ScChartObj::getFastPropertyValue( uno::Any& rValue, sal_Int32 nHandle ) con
                             const ScRangeListRef& rRangeList = pListener->GetRangeList();
                             if ( rRangeList.Is() )
                             {
-                                ULONG nCount = rRangeList->Count();
+                                sal_uLong nCount = rRangeList->Count();
                                 uno::Sequence< table::CellRangeAddress > aCellRanges( nCount );
                                 table::CellRangeAddress* pCellRanges = aCellRanges.getArray();
-                                for ( USHORT i = 0; i < nCount; ++i )
+                                for ( sal_uInt16 i = 0; i < nCount; ++i )
                                 {
                                     ScRange aRange( *rRangeList->GetObject( i ) );
                                     table::CellRangeAddress aCellRange;
@@ -726,12 +726,12 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un
     GetData_Impl( xRanges, bColHeaders, bRowHeaders );
     if ( xRanges.Is() )
     {
-        ULONG nCount = xRanges->Count();
+        sal_uLong nCount = xRanges->Count();
 
         table::CellRangeAddress aRangeAddress;
         uno::Sequence<table::CellRangeAddress> aSeq(nCount);
         table::CellRangeAddress* pAry = aSeq.getArray();
-        for (USHORT i=0; i<nCount; i++)
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ScRange aRange(*xRanges->GetObject(i));
 
@@ -759,11 +759,11 @@ void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress
     GetData_Impl( xOldRanges, bColHeaders, bRowHeaders );
 
     ScRangeList* pList = new ScRangeList;
-    USHORT nRangeCount = (USHORT)aRanges.getLength();
+    sal_uInt16 nRangeCount = (sal_uInt16)aRanges.getLength();
     if (nRangeCount)
     {
         const table::CellRangeAddress* pAry = aRanges.getConstArray();
-        for (USHORT i=0; i<nRangeCount; i++)
+        for (sal_uInt16 i=0; i<nRangeCount; i++)
         {
             ScRange aRange( static_cast<SCCOL>(pAry[i].StartColumn), pAry[i].StartRow, pAry[i].Sheet,
                             static_cast<SCCOL>(pAry[i].EndColumn),   pAry[i].EndRow,   pAry[i].Sheet );
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 6b33d1e01..5b879bd1c 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -244,7 +244,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
             {
                 // Int16 contains CharacterCompressionType values
                 sal_Int16 nUno = ScUnoHelpFunctions::GetInt16FromAny( aValue );
-                pDoc->SetAsianCompression( (BYTE) nUno );
+                pDoc->SetAsianCompression( (sal_uInt8) nUno );
                 bUpdateHeights = sal_True;
             }
             else if ( aPropertyName.compareToAscii( SC_UNO_ASIANKERN ) == 0 )
@@ -379,7 +379,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString
             {
                 // #i75610# don't create the printer, return empty string if no printer created yet
                 // (as in SwXDocumentSettings)
-                SfxPrinter* pPrinter = pDoc->GetPrinter( FALSE );
+                SfxPrinter* pPrinter = pDoc->GetPrinter( sal_False );
                 if (pPrinter)
                     aRet <<= rtl::OUString ( pPrinter->GetName());
                 else
@@ -389,7 +389,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString
             {
                 // #i75610# don't create the printer, return empty sequence if no printer created yet
                 // (as in SwXDocumentSettings)
-                SfxPrinter* pPrinter = pDoc->GetPrinter( FALSE );
+                SfxPrinter* pPrinter = pDoc->GetPrinter( sal_False );
                 if (pPrinter)
                 {
                     SvMemoryStream aStream;
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 638efe0b3..135e3e8bc 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -133,7 +133,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeExcep
         SCTAB nTab = aOneRange.aStart.Tab();
 
         pDocSh->GetDocument()->GetDataArea(
-                        nTab, nStartCol, nStartRow, nEndCol, nEndRow, TRUE, false );
+                        nTab, nStartCol, nStartRow, nEndCol, nEndRow, sal_True, false );
 
         ScRange aNew( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab );
         SetNewRange( aNew );
@@ -331,7 +331,7 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException)
         SCTAB nTab = aOneRange.aStart.Tab();
 
         pDocSh->GetDocument()->GetDataArea(
-                        nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE, false );
+                        nTab, nStartCol, nStartRow, nEndCol, nEndRow, sal_False, false );
 
         ScRange aNew( nStartCol, nStartRow, nTab );
         SetNewRange( aNew );
@@ -359,7 +359,7 @@ void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException)
         SCTAB nTab = aOneRange.aStart.Tab();
 
         pDocSh->GetDocument()->GetDataArea(
-                        nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE, false );
+                        nTab, nStartCol, nStartRow, nEndCol, nEndRow, sal_False, false );
 
         ScRange aNew( nEndCol, nEndRow, nTab );
         SetNewRange( aNew );
@@ -382,7 +382,7 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException)
     SCTAB nTab  = aCursor.Tab();
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
-        pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab,  1,0, FALSE,TRUE, aMark );
+        pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab,  1,0, sal_False,sal_True, aMark );
     //!	sonst Exception oder so
 
     SetNewRange( ScRange( nNewX, nNewY, nTab ) );
@@ -404,7 +404,7 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException)
     SCTAB nTab  = aCursor.Tab();
     ScDocShell* pDocSh = GetDocShell();
     if ( pDocSh )
-        pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, -1,0, FALSE,TRUE, aMark );
+        pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, -1,0, sal_False,sal_True, aMark );
     //!	sonst Exception oder so
 
     SetNewRange( ScRange( nNewX, nNewY, nTab ) );
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 821828937..7c8338535 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -202,7 +202,7 @@ SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupItemObj, "ScDataPilotFieldGroupItem
 
 //------------------------------------------------------------------------
 
-GeneralFunction ScDataPilotConversion::FirstFunc( USHORT nBits )
+GeneralFunction ScDataPilotConversion::FirstFunc( sal_uInt16 nBits )
 {
     if ( nBits & PIVOT_FUNC_SUM )       return GeneralFunction_SUM;
     if ( nBits & PIVOT_FUNC_COUNT )     return GeneralFunction_COUNT;
@@ -219,9 +219,9 @@ GeneralFunction ScDataPilotConversion::FirstFunc( USHORT nBits )
     return GeneralFunction_NONE;
 }
 
-USHORT ScDataPilotConversion::FunctionBit( GeneralFunction eFunc )
+sal_uInt16 ScDataPilotConversion::FunctionBit( GeneralFunction eFunc )
 {
-    USHORT nRet = PIVOT_FUNC_NONE;	// 0
+    sal_uInt16 nRet = PIVOT_FUNC_NONE;	// 0
     switch (eFunc)
     {
         case GeneralFunction_SUM:       nRet = PIVOT_FUNC_SUM;       break;
@@ -264,8 +264,8 @@ ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const String& rN
         ScDPCollection* pColl = pDoc->GetDPCollection();
         if ( pColl )
         {
-            USHORT nCount = pColl->GetCount();
-            for (USHORT i=0; i<nCount; i++)
+            sal_uInt16 nCount = pColl->GetCount();
+            for (sal_uInt16 i=0; i<nCount; i++)
             {
                 ScDPObject* pDPObj = (*pColl)[i];
                 if ( pDPObj->GetOutRange().aStart.Tab() == nTab &&
@@ -297,7 +297,7 @@ sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier& rFiel
         sal_Int32 nCount = pDPObj->GetDimCount();
         for ( sal_Int32 nDim = 0; nDim < nCount; ++nDim )
         {
-            BOOL bIsDataLayout = FALSE;
+            sal_Bool bIsDataLayout = sal_False;
             OUString aDimName( pDPObj->GetDimName( nDim, bIsDataLayout ) );
             if ( rFieldId.mbDataLayout ? bIsDataLayout : (aDimName == rFieldId.maFieldName) )
                 return nDim;
@@ -346,8 +346,8 @@ ScDataPilotTableObj* ScDataPilotTablesObj::GetObjectByIndex_Impl( sal_Int32 nInd
             //	api only handles sheet data at this time
             //!	allow all data sources!!!
             sal_Int32 nFound = 0;
-            USHORT nCount = pColl->GetCount();
-            for (USHORT i=0; i<nCount; i++)
+            sal_uInt16 nCount = pColl->GetCount();
+            for (sal_uInt16 i=0; i<nCount; i++)
             {
                 ScDPObject* pDPObj = (*pColl)[i];
                 if ( pDPObj->GetOutRange().aStart.Tab() == nTab )
@@ -430,7 +430,7 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName,
     if ( aNewName.getLength() && hasByName( aNewName ) )
         throw RuntimeException();       // no other exceptions specified
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScDataPilotDescriptorBase* pImp = ScDataPilotDescriptorBase::getImplementation( xDescriptor );
     if ( pDocShell && pImp )
     {
@@ -451,7 +451,7 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName,
     // todo: handle double fields (for more information see ScDPObject
 
             ScDBDocFunc aFunc(*pDocShell);
-            bDone = aFunc.DataPilotUpdate( NULL, pNewObj, TRUE, TRUE );
+            bDone = aFunc.DataPilotUpdate( NULL, pNewObj, sal_True, sal_True );
         }
     }
 
@@ -468,7 +468,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName )
     if (pDPObj && pDocShell)
     {
         ScDBDocFunc aFunc(*pDocShell);
-        aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, TRUE );	// remove - incl. undo etc.
+        aFunc.DataPilotUpdate( pDPObj, NULL, sal_True, sal_True );	// remove - incl. undo etc.
     }
     else
         throw RuntimeException();       // no other exceptions specified
@@ -497,9 +497,9 @@ sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException)
             //	api only handles sheet data at this time
             //!	allow all data sources!!!
 
-            USHORT nFound = 0;
-            USHORT nCount = pColl->GetCount();
-            for (USHORT i=0; i<nCount; i++)
+            sal_uInt16 nFound = 0;
+            sal_uInt16 nCount = pColl->GetCount();
+            for (sal_uInt16 i=0; i<nCount; i++)
             {
                 ScDPObject* pDPObj = (*pColl)[i];
                 if ( pDPObj->GetOutRange().aStart.Tab() == nTab )
@@ -560,9 +560,9 @@ Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames()
             //	api only handles sheet data at this time
             //!	allow all data sources!!!
 
-            USHORT nFound = 0;
-            USHORT nCount = pColl->GetCount();
-            USHORT i;
+            sal_uInt16 nFound = 0;
+            sal_uInt16 nCount = pColl->GetCount();
+            sal_uInt16 i;
             for (i=0; i<nCount; i++)
             {
                 ScDPObject* pDPObj = (*pColl)[i];
@@ -570,7 +570,7 @@ Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames()
                     ++nFound;
             }
 
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             Sequence<OUString> aSeq(nFound);
             OUString* pAry = aSeq.getArray();
             for (i=0; i<nCount; i++)
@@ -597,8 +597,8 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName )
         if ( pColl )
         {
             String aNamStr(aName);
-            USHORT nCount = pColl->GetCount();
-            for (USHORT i=0; i<nCount; i++)
+            sal_uInt16 nCount = pColl->GetCount();
+            for (sal_uInt16 i=0; i<nCount; i++)
             {
                 //	api only handles sheet data at this time
                 //!	allow all data sources!!!
@@ -606,11 +606,11 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName )
                 ScDPObject* pDPObj = (*pColl)[i];
                 if ( pDPObj->GetOutRange().aStart.Tab() == nTab &&
                      pDPObj->GetName() == aNamStr )
-                    return TRUE;
+                    return sal_True;
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -838,7 +838,7 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp
                     ScImportParam aParam;
                     ScImportDescriptor::FillImportParam( aParam, aArgSeq );
 
-                    USHORT nNewType = sheet::DataImportMode_NONE;
+                    sal_uInt16 nNewType = sheet::DataImportMode_NONE;
                     if ( aParam.bImport )
                     {
                         if ( aParam.bSql )
@@ -979,7 +979,7 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope
                     aParam.aStatement = pImportDesc->aObject;
                     aParam.bNative    = pImportDesc->bNative;
                     aParam.bSql       = ( pImportDesc->nType == sheet::DataImportMode_SQL );
-                    aParam.nType      = static_cast<BYTE>(( pImportDesc->nType == sheet::DataImportMode_QUERY ) ? ScDbQuery : ScDbTable);
+                    aParam.nType      = static_cast<sal_uInt8>(( pImportDesc->nType == sheet::DataImportMode_QUERY ) ? ScDbQuery : ScDbTable);
 
                     uno::Sequence<beans::PropertyValue> aSeq( ScImportDescriptor::GetPropertyCount() );
                     ScImportDescriptor::FillProperties( aSeq, aParam );
@@ -1198,7 +1198,7 @@ void ScDataPilotTableObj::SetDPObject( ScDPObject* pDPObject )
     if ( pDPObj && pDocSh )
     {
         ScDBDocFunc aFunc(*pDocSh);
-        aFunc.DataPilotUpdate( pDPObj, pDPObject, TRUE, TRUE );
+        aFunc.DataPilotUpdate( pDPObj, pDPObject, sal_True, sal_True );
     }
 }
 
@@ -1274,18 +1274,18 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeExc
     return aRet;
 }
 
-ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, BOOL bRecord, BOOL bApi );
+sal_uLong RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, sal_Bool bRecord, sal_Bool bApi );
 
 void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException)
 {
     ScUnoGuard aGuard;
     if( ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName) )
-        RefreshDPObject( pDPObj, NULL, GetDocShell(), TRUE, TRUE );
+        RefreshDPObject( pDPObj, NULL, GetDocShell(), sal_True, sal_True );
     //if (pDPObj)
     //{
     //	ScDPObject* pNew = new ScDPObject(*pDPObj);
     //	ScDBDocFunc aFunc(*GetDocShell());
-    //	aFunc.DataPilotUpdate( pDPObj, pNew, TRUE, TRUE );
+    //	aFunc.DataPilotUpdate( pDPObj, pNew, sal_True, sal_True );
     //	delete pNew;		// DataPilotUpdate copies settings from "new" object
     //}
 
@@ -1367,8 +1367,8 @@ void SAL_CALL ScDataPilotTableObj::removeModifyListener( const uno::Reference<ut
 
     acquire();      // in case the listeners have the last ref - released below
 
-    USHORT nCount = aModifyListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aModifyListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<util::XModifyListener> *pObj = aModifyListeners[n];
         if ( *pObj == aListener )
@@ -1423,7 +1423,7 @@ void ScDataPilotTableObj::Refreshed_Impl()
     // the EventObject holds a Ref to this object until after the listener calls
 
     ScDocument* pDoc = GetDocShell()->GetDocument();
-    for ( USHORT n=0; n<aModifyListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aModifyListeners.Count(); n++ )
         pDoc->AddUnoListenerCall( *aModifyListeners[n], aEvent );
 }
 
@@ -1540,9 +1540,9 @@ ScDPSaveDimension* ScDataPilotChildObjBase::GetDPDimension( ScDPObject** ppDPObj
             // find dimension with specified index (search in duplicated dimensions)
             String aFieldName = maFieldId.maFieldName;  // needed for comparison
             const List& rDimensions = pSaveData->GetDimensions();
-            ULONG nDimCount = rDimensions.Count();
+            sal_uLong nDimCount = rDimensions.Count();
             sal_Int32 nFoundIdx = 0;
-            for( ULONG nDim = 0; nDim < nDimCount; ++nDim )
+            for( sal_uLong nDim = 0; nDim < nDimCount; ++nDim )
             {
                 ScDPSaveDimension* pDim = static_cast< ScDPSaveDimension* >( rDimensions.GetObject( nDim ) );
                 if( !pDim->IsDataLayout() && (pDim->GetName() == aFieldName) )
@@ -1628,10 +1628,10 @@ sal_Int32 lcl_GetFieldCount( const Reference<XDimensionsSupplier>& rSource, cons
     return nRet;
 }
 
-BOOL lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& rSource,
+sal_Bool lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& rSource,
                                 const Any& rOrient, SCSIZE nIndex, ScFieldIdentifier& rFieldId )
 {
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     SCSIZE nPos = 0;
     sal_Int32 nDimIndex = 0;
 
@@ -1712,7 +1712,7 @@ BOOL lcl_GetFieldDataByIndex( const Reference<XDimensionsSupplier>& rSource,
     return bOk;
 }
 
-BOOL lcl_GetFieldDataByName( ScDPObject* pDPObj, const OUString& rFieldName, ScFieldIdentifier& rFieldId )
+sal_Bool lcl_GetFieldDataByName( ScDPObject* pDPObj, const OUString& rFieldName, ScFieldIdentifier& rFieldId )
 {
     // "By name" is always the first match.
     // The name "Data" always refers to the data layout field.
@@ -2124,7 +2124,7 @@ void ScDataPilotFieldObj::setOrientation(DataPilotFieldOrientation eNew)
             pDim = pNewDim;
         }
 
-        pDim->SetOrientation(sal::static_int_cast<USHORT>(eNew));
+        pDim->SetOrientation(sal::static_int_cast<sal_uInt16>(eNew));
 
         // move changed field behind all other fields (make it the last field in dimension)
         pSaveData->SetPosition( pDim, pSaveData->GetDimensions().Count() );
@@ -2168,12 +2168,12 @@ void ScDataPilotFieldObj::setFunction(GeneralFunction eNewFunc)
                 pDim->SetSubTotals( 0, NULL );
             else
             {
-                USHORT nFunc = sal::static_int_cast<USHORT>( eNewFunc );
+                sal_uInt16 nFunc = sal::static_int_cast<sal_uInt16>( eNewFunc );
                 pDim->SetSubTotals( 1, &nFunc );
             }
         }
         else
-            pDim->SetFunction( sal::static_int_cast<USHORT>( eNewFunc ) );
+            pDim->SetFunction( sal::static_int_cast<sal_uInt16>( eNewFunc ) );
         SetDPObject( pDPObj );
     }
 }
@@ -2215,21 +2215,21 @@ void ScDataPilotFieldObj::setSubtotals( const Sequence< GeneralFunction >& rSubt
                     pDim->SetSubTotals( 0, NULL );
                 else
                 {
-                    USHORT nFunc = sal::static_int_cast<USHORT>( rSubtotals[ 0 ] );
+                    sal_uInt16 nFunc = sal::static_int_cast<sal_uInt16>( rSubtotals[ 0 ] );
                     pDim->SetSubTotals( 1, &nFunc );
                 }
             }
             else if( nCount > 1 )
             {
                 // set multiple functions, ignore NONE and AUTO in this case
-                ::std::vector< USHORT > aSubt;
+                ::std::vector< sal_uInt16 > aSubt;
                 for( sal_Int32 nIdx = 0; nIdx < nCount; ++nIdx )
                 {
                     GeneralFunction eFunc = rSubtotals[ nIdx ];
                     if( (eFunc != GeneralFunction_NONE) && (eFunc != GeneralFunction_AUTO) )
                     {
                         // do not insert functions twice
-                        USHORT nFunc = static_cast< USHORT >( eFunc );
+                        sal_uInt16 nFunc = static_cast< sal_uInt16 >( eFunc );
                         if( ::std::find( aSubt.begin(), aSubt.end(), nFunc ) == aSubt.end() )
                             aSubt.push_back( nFunc );
                     }
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 68bd1dd0f..e11faf742 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -286,25 +286,25 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ
             switch (eMode)
             {
                 case sheet::DataImportMode_NONE:
-                    rParam.bImport = FALSE;
+                    rParam.bImport = sal_False;
                     break;
                 case sheet::DataImportMode_SQL:
-                    rParam.bImport = TRUE;
-                    rParam.bSql    = TRUE;
+                    rParam.bImport = sal_True;
+                    rParam.bSql    = sal_True;
                     break;
                 case sheet::DataImportMode_TABLE:
-                    rParam.bImport = TRUE;
-                    rParam.bSql    = FALSE;
+                    rParam.bImport = sal_True;
+                    rParam.bSql    = sal_False;
                     rParam.nType   = ScDbTable;
                     break;
                 case sheet::DataImportMode_QUERY:
-                    rParam.bImport = TRUE;
-                    rParam.bSql    = FALSE;
+                    rParam.bImport = sal_True;
+                    rParam.bSql    = sal_False;
                     rParam.nType   = ScDbQuery;
                     break;
                 default:
                     DBG_ERROR("falscher Mode");
-                    rParam.bImport = FALSE;
+                    rParam.bImport = sal_False;
             }
         }
     }
@@ -334,7 +334,7 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
     aOutPos.Column = rParam.nDestCol;
     aOutPos.Row    = rParam.nDestRow;
 
-    USHORT nSortCount = 0;
+    sal_uInt16 nSortCount = 0;
     while ( nSortCount < MAXSORT && rParam.bDoSort[nSortCount] )
         ++nSortCount;
 
@@ -342,7 +342,7 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
     if (nSortCount)
     {
         table::TableSortField* pFieldArray = aFields.getArray();
-        for (USHORT i=0; i<nSortCount; i++)
+        for (sal_uInt16 i=0; i<nSortCount; i++)
         {
             pFieldArray[i].Field		 = rParam.nField[i];
             pFieldArray[i].IsAscending   = rParam.bAscending[i];
@@ -425,8 +425,8 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
             if ( rProp.Value >>= aSeq )
             {
                 bOldSortDescriptor = sal_True;
-                INT32 nCount = aSeq.getLength();
-                INT32 i;
+                sal_Int32 nCount = aSeq.getLength();
+                sal_Int32 i;
                 if ( nCount > MAXSORT )
                 {
                     DBG_ERROR("Zu viele Sortierfelder");
@@ -439,16 +439,16 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
                     rParam.bAscending[i] = pFieldArray[i].SortAscending;
 
                     // FieldType wird ignoriert
-                    rParam.bDoSort[i] = TRUE;
+                    rParam.bDoSort[i] = sal_True;
                 }
                 for (i=nCount; i<MAXSORT; i++)
-                    rParam.bDoSort[i] = FALSE;
+                    rParam.bDoSort[i] = sal_False;
             }
             else if ( rProp.Value >>= aNewSeq )
             {
                 bNewSortDescriptor = sal_True;
-                INT32 nCount = aNewSeq.getLength();
-                INT32 i;
+                sal_Int32 nCount = aNewSeq.getLength();
+                sal_Int32 i;
                 if ( nCount > MAXSORT )
                 {
                     DBG_ERROR("Zu viele Sortierfelder");
@@ -466,10 +466,10 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
                     rParam.aCollatorAlgorithm = pFieldArray[i].CollatorAlgorithm;
 
                     // FieldType wird ignoriert
-                    rParam.bDoSort[i] = TRUE;
+                    rParam.bDoSort[i] = sal_True;
                 }
                 for (i=nCount; i<MAXSORT; i++)
-                    rParam.bDoSort[i] = FALSE;
+                    rParam.bDoSort[i] = sal_False;
             }
         }
         else if (aPropName.EqualsAscii( SC_UNONAME_ISCASE ))
@@ -497,7 +497,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
         {
             sal_Int32 nVal = 0;
             if ( rProp.Value >>= nVal )
-                rParam.nUserIndex = (USHORT)nVal;
+                rParam.nUserIndex = (sal_uInt16)nVal;
         }
         else if (aPropName.EqualsAscii( SC_UNONAME_COLLLOC ))
         {
@@ -516,7 +516,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
 
 //------------------------------------------------------------------------
 
-ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP ) :
+ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uInt16 nP ) :
     xRef( pDesc ),			// Objekt festhalten
     rParent( *pDesc ),
     nPos( nP )
@@ -577,8 +577,8 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns(
     ScSubTotalParam aParam;
     rParent.GetData(aParam);
 
-    UINT32 nColCount = aSubTotalColumns.getLength();
-    if ( nColCount <= sal::static_int_cast<UINT32>(SCCOL_MAX) )
+    sal_uInt32 nColCount = aSubTotalColumns.getLength();
+    if ( nColCount <= sal::static_int_cast<sal_uInt32>(SCCOL_MAX) )
     {
         SCCOL nCount = static_cast<SCCOL>(nColCount);
         aParam.nSubTotals[nPos] = nCount;
@@ -631,7 +631,7 @@ void ScSubTotalDescriptorBase::PutData( const ScSubTotalParam& /* rParam */ )
 
 // XSubTotalDesctiptor
 
-ScSubTotalFieldObj* ScSubTotalDescriptorBase::GetObjectByIndex_Impl(USHORT nIndex)
+ScSubTotalFieldObj* ScSubTotalDescriptorBase::GetObjectByIndex_Impl(sal_uInt16 nIndex)
 {
     if ( nIndex < getCount() )
         return new ScSubTotalFieldObj( this, nIndex );
@@ -644,8 +644,8 @@ void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException)
     ScSubTotalParam aParam;
     GetData(aParam);
 
-    for (USHORT i=0; i<MAXSUBTOTAL; i++)
-        aParam.bGroupActive[i] = FALSE;
+    for (sal_uInt16 i=0; i<MAXSUBTOTAL; i++)
+        aParam.bGroupActive[i] = sal_False;
 
     //!	Notify oder so fuer die Field-Objekte???
 
@@ -660,15 +660,15 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew(
     ScSubTotalParam aParam;
     GetData(aParam);
 
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     while ( nPos < MAXSUBTOTAL && aParam.bGroupActive[nPos] )
         ++nPos;
 
-    UINT32 nColCount = aSubTotalColumns.getLength();
+    sal_uInt32 nColCount = aSubTotalColumns.getLength();
 
-    if ( nPos < MAXSUBTOTAL && nColCount <= sal::static_int_cast<UINT32>(SCCOL_MAX) )
+    if ( nPos < MAXSUBTOTAL && nColCount <= sal::static_int_cast<sal_uInt32>(SCCOL_MAX) )
     {
-        aParam.bGroupActive[nPos] = TRUE;
+        aParam.bGroupActive[nPos] = sal_True;
         aParam.nField[nPos] = static_cast<SCCOL>(nGroupColumn);
 
         delete aParam.pSubTotals[nPos];
@@ -720,7 +720,7 @@ sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() throw(uno::RuntimeExcept
     ScSubTotalParam aParam;
     GetData(aParam);
 
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     while ( nCount < MAXSUBTOTAL && aParam.bGroupActive[nCount] )
         ++nCount;
     return nCount;
@@ -731,7 +731,7 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex )
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    uno::Reference<sheet::XSubTotalField> xField(GetObjectByIndex_Impl((USHORT)nIndex));
+    uno::Reference<sheet::XSubTotalField> xField(GetObjectByIndex_Impl((sal_uInt16)nIndex));
     if (xField.is())
         return uno::makeAny(xField);
     else
@@ -792,7 +792,7 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue(
     {
         sal_Int32 nVal = 0;
         if ( aValue >>= nVal )
-            aParam.nUserIndex = (USHORT)nVal;
+            aParam.nUserIndex = (sal_uInt16)nVal;
     }
     else if (aString.EqualsAscii( SC_UNONAME_MAXFLD ))
     {
@@ -969,13 +969,13 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSo
                                                         throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aParam.nDataAreaCount;
+    sal_uInt16 nCount = aParam.nDataAreaCount;
     if (!aParam.ppDataAreas)
         nCount = 0;
     table::CellRangeAddress aRange;
     uno::Sequence<table::CellRangeAddress> aSeq(nCount);
     table::CellRangeAddress* pAry = aSeq.getArray();
-    for (USHORT i=0; i<nCount; i++)
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ScArea* pArea = aParam.ppDataAreas[i];
         if (pArea)
@@ -996,12 +996,12 @@ void SAL_CALL ScConsolidationDescriptor::setSources(
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = (USHORT)aSources.getLength();
+    sal_uInt16 nCount = (sal_uInt16)aSources.getLength();
     if (nCount)
     {
         const table::CellRangeAddress* pAry = aSources.getConstArray();
         ScArea** pNew = new ScArea*[nCount];
-        USHORT i;
+        sal_uInt16 i;
         for (i=0; i<nCount; i++)
             pNew[i] = new ScArea( pAry[i].Sheet,
                     static_cast<SCCOL>(pAry[i].StartColumn), pAry[i].StartRow,
@@ -1097,7 +1097,7 @@ void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             pDocSh = NULL;			// invalid
@@ -1271,7 +1271,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields(
         if (!rEntry.pStr)
             rEntry.pStr = new String;		// sollte nicht sein (soll immer initialisiert sein)
 
-        rEntry.bDoQuery			= TRUE;
+        rEntry.bDoQuery			= sal_True;
         rEntry.eConnect			= (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR;
         rEntry.nField			= pAry[i].Field;
         rEntry.bQueryByString	= !pAry[i].IsNumeric;
@@ -1299,7 +1299,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields(
                 {
                     rEntry.eOp = SC_EQUAL;
                     rEntry.nVal = SC_EMPTYFIELDS;
-                    rEntry.bQueryByString = FALSE;
+                    rEntry.bQueryByString = sal_False;
                     *rEntry.pStr = EMPTY_STRING;
                 }
                 break;
@@ -1307,7 +1307,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields(
                 {
                     rEntry.eOp = SC_EQUAL;
                     rEntry.nVal = SC_NONEMPTYFIELDS;
-                    rEntry.bQueryByString = FALSE;
+                    rEntry.bQueryByString = sal_False;
                     *rEntry.pStr = EMPTY_STRING;
                 }
                 break;
@@ -1319,7 +1319,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields(
 
     SCSIZE nParamCount = aParam.GetEntryCount();	// Param wird nicht unter 8 resized
     for (i=nCount; i<nParamCount; i++)
-        aParam.GetEntry(i).bDoQuery = FALSE;		// ueberzaehlige Felder zuruecksetzen
+        aParam.GetEntry(i).bDoQuery = sal_False;		// ueberzaehlige Felder zuruecksetzen
 
     PutData(aParam);
 }
@@ -1345,7 +1345,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2(
         if (!rEntry.pStr)
             rEntry.pStr = new String;		// sollte nicht sein (soll immer initialisiert sein)
 
-        rEntry.bDoQuery			= TRUE;
+        rEntry.bDoQuery			= sal_True;
         rEntry.eConnect			= (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR;
         rEntry.nField			= pAry[i].Field;
         rEntry.bQueryByString	= !pAry[i].IsNumeric;
@@ -1379,7 +1379,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2(
             {
                 rEntry.eOp = SC_EQUAL;
                 rEntry.nVal = SC_EMPTYFIELDS;
-                rEntry.bQueryByString = FALSE;
+                rEntry.bQueryByString = sal_False;
                 *rEntry.pStr = EMPTY_STRING;
             }
             break;
@@ -1387,7 +1387,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2(
             {
                 rEntry.eOp = SC_EQUAL;
                 rEntry.nVal = SC_NONEMPTYFIELDS;
-                rEntry.bQueryByString = FALSE;
+                rEntry.bQueryByString = sal_False;
                 *rEntry.pStr = EMPTY_STRING;
             }
             break;
@@ -1399,7 +1399,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2(
 
     SCSIZE nParamCount = aParam.GetEntryCount();	// Param wird nicht unter 8 resized
     for (i=nCount; i<nParamCount; i++)
-        aParam.GetEntry(i).bDoQuery = FALSE;		// ueberzaehlige Felder zuruecksetzen
+        aParam.GetEntry(i).bDoQuery = sal_False;		// ueberzaehlige Felder zuruecksetzen
 
     PutData(aParam);
 }
@@ -1654,7 +1654,7 @@ ScDBData* ScDatabaseRangeObj::GetDBData_Impl() const
         ScDBCollection* pNames = pDocShell->GetDocument()->GetDBCollection();
         if (pNames)
         {
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             if (pNames->SearchName( aName, nPos ))
                 pRet = (*pNames)[nPos];
         }
@@ -1678,7 +1678,7 @@ void SAL_CALL ScDatabaseRangeObj::setName( const rtl::OUString& aNewName )
     {
         ScDBDocFunc aFunc(*pDocShell);
         String aNewStr(aNewName);
-        BOOL bOk = aFunc.RenameDBRange( aName, aNewStr, TRUE );
+        sal_Bool bOk = aFunc.RenameDBRange( aName, aNewStr, sal_True );
         if (bOk)
             aName = aNewStr;
     }
@@ -1716,7 +1716,7 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aD
         aNewData.SetArea( aDataArea.Sheet, (SCCOL)aDataArea.StartColumn, (SCROW)aDataArea.StartRow,
                                            (SCCOL)aDataArea.EndColumn, (SCROW)aDataArea.EndRow );
         ScDBDocFunc aFunc(*pDocShell);
-        aFunc.ModifyDBData(aNewData, TRUE);
+        aFunc.ModifyDBData(aNewData, sal_True);
     }
 }
 
@@ -1734,7 +1734,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getSortDescript
         ScRange aDBRange;
         pData->GetArea(aDBRange);
         SCCOLROW nFieldStart = aParam.bByRow ? static_cast<SCCOLROW>(aDBRange.aStart.Col()) : static_cast<SCCOLROW>(aDBRange.aStart.Row());
-        for (USHORT i=0; i<MAXSORT; i++)
+        for (sal_uInt16 i=0; i<MAXSORT; i++)
             if ( aParam.bDoSort[i] && aParam.nField[i] >= nFieldStart )
                 aParam.nField[i] -= nFieldStart;
     }
@@ -1788,7 +1788,7 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam)
         aNewData.SetQueryParam(aParam);
         aNewData.SetHeader(aParam.bHasHeader);		// not in ScDBData::SetQueryParam
         ScDBDocFunc aFunc(*pDocShell);
-        aFunc.ModifyDBData(aNewData, TRUE);
+        aFunc.ModifyDBData(aNewData, sal_True);
     }
 }
 
@@ -1810,7 +1810,7 @@ void ScDatabaseRangeObj::GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const
         ScRange aDBRange;
         pData->GetArea(aDBRange);
         SCCOL nFieldStart = aDBRange.aStart.Col();
-        for (USHORT i=0; i<MAXSUBTOTAL; i++)
+        for (sal_uInt16 i=0; i<MAXSUBTOTAL; i++)
         {
             if ( rSubTotalParam.bGroupActive[i] )
             {
@@ -1835,7 +1835,7 @@ void ScDatabaseRangeObj::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam)
         ScRange aDBRange;
         pData->GetArea(aDBRange);
         SCCOL nFieldStart = aDBRange.aStart.Col();
-        for (USHORT i=0; i<MAXSUBTOTAL; i++)
+        for (sal_uInt16 i=0; i<MAXSUBTOTAL; i++)
         {
             if ( aParam.bGroupActive[i] )
             {
@@ -1848,7 +1848,7 @@ void ScDatabaseRangeObj::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam)
         ScDBData aNewData( *pData );
         aNewData.SetSubTotalParam(aParam);
         ScDBDocFunc aFunc(*pDocShell);
-        aFunc.ModifyDBData(aNewData, TRUE);
+        aFunc.ModifyDBData(aNewData, sal_True);
     }
 }
 
@@ -1884,7 +1884,7 @@ void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException)
         ScDBDocFunc aFunc(*pDocShell);
 
         // Import zu wiederholen?
-        BOOL bContinue = TRUE;
+        sal_Bool bContinue = sal_True;
         ScImportParam aImportParam;
         pData->GetImportParam( aImportParam );
         if (aImportParam.bImport && !pData->HasImportSelection())
@@ -1894,12 +1894,12 @@ void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException)
             SCROW nDummyRow;
             pData->GetArea( nTab, nDummyCol,nDummyRow,nDummyCol,nDummyRow );
             uno::Reference< sdbc::XResultSet > xResultSet;
-            bContinue = aFunc.DoImport( nTab, aImportParam, xResultSet, NULL, TRUE, FALSE );	//! Api-Flag als Parameter
+            bContinue = aFunc.DoImport( nTab, aImportParam, xResultSet, NULL, sal_True, sal_False );	//! Api-Flag als Parameter
         }
 
         // interne Operationen (sort, query, subtotal) nur, wenn kein Fehler
         if (bContinue)
-            aFunc.RepeatDB( pData->GetName(), TRUE, TRUE );
+            aFunc.RepeatDB( pData->GetName(), sal_True, sal_True );
     }
 }
 
@@ -1922,8 +1922,8 @@ void SAL_CALL ScDatabaseRangeObj::removeRefreshListener(
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aRefreshListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aRefreshListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<util::XRefreshListener>* pObj = aRefreshListeners[n];
         if ( *pObj == xListener )
@@ -1940,7 +1940,7 @@ void ScDatabaseRangeObj::Refreshed_Impl()
 {
     lang::EventObject aEvent;
     aEvent.Source = (cppu::OWeakObject*)this;
-    for ( USHORT n=0; n<aRefreshListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aRefreshListeners.Count(); n++ )
         (*aRefreshListeners[n])->refreshed( aEvent );
 }
 
@@ -1987,7 +1987,7 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue(
     if ( pDocShell && pData )
     {
         ScDBData aNewData( *pData );
-        BOOL bDo = TRUE;
+        sal_Bool bDo = sal_True;
 
         String aString(aPropertyName);
         if ( aString.EqualsAscii( SC_UNONAME_KEEPFORM ) )
@@ -2059,12 +2059,12 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue(
         {
         }
         else
-            bDo = FALSE;
+            bDo = sal_False;
 
         if (bDo)
         {
             ScDBDocFunc aFunc(*pDocShell);
-            aFunc.ModifyDBData(aNewData, TRUE);
+            aFunc.ModifyDBData(aNewData, sal_True);
         }
     }
 }
@@ -2195,7 +2195,7 @@ void ScDatabaseRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XDatabaseRanges
 
-ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByIndex_Impl(USHORT nIndex)
+ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex)
 {
     if (pDocShell)
     {
@@ -2222,7 +2222,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName,
                                         throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         ScDBDocFunc aFunc(*pDocShell);
@@ -2230,7 +2230,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName,
         String aString(aName);
         ScRange aNameRange( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet,
                             (SCCOL)aRange.EndColumn,   (SCROW)aRange.EndRow,   aRange.Sheet );
-        bDone = aFunc.AddDBRange( aString, aNameRange, TRUE );
+        bDone = aFunc.AddDBRange( aString, aNameRange, sal_True );
     }
     if (!bDone)
         throw uno::RuntimeException();		// no other exceptions specified
@@ -2240,12 +2240,12 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName )
                                         throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         ScDBDocFunc aFunc(*pDocShell);
         String aString(aName);
-        bDone = aFunc.DeleteDBRange( aString, TRUE );
+        bDone = aFunc.DeleteDBRange( aString, sal_True );
     }
     if (!bDone)
         throw uno::RuntimeException();		// no other exceptions specified
@@ -2282,7 +2282,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex )
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    uno::Reference<sheet::XDatabaseRange> xRange(GetObjectByIndex_Impl((USHORT)nIndex));
+    uno::Reference<sheet::XDatabaseRange> xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex));
     if (xRange.is())
         return uno::makeAny(xRange);
     else
@@ -2329,11 +2329,11 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames()
         ScDBCollection* pNames = pDocShell->GetDocument()->GetDBCollection();
         if (pNames)
         {
-            USHORT nCount = pNames->GetCount();
+            sal_uInt16 nCount = pNames->GetCount();
             String aName;
             uno::Sequence<rtl::OUString> aSeq(nCount);
             rtl::OUString* pAry = aSeq.getArray();
-            for (USHORT i=0; i<nCount; i++)
+            for (sal_uInt16 i=0; i<nCount; i++)
                 pAry[i] = (*pNames)[i]->GetName();
 
             return aSeq;
@@ -2355,12 +2355,12 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const rtl::OUString& aName )
         if (pNames)
         {
             String aString(aName);
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             if (pNames->SearchName( aString, nPos ))
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index c174db80f..c85f6e1f7 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -302,7 +302,7 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUS
 
     beans::PropertyState eRet = beans::PropertyState_DEFAULT_VALUE;
 
-    USHORT nWID = pEntry->nWID;
+    sal_uInt16 nWID = pEntry->nWID;
     if ( nWID == ATTR_FONT || nWID == ATTR_CJK_FONT || nWID == ATTR_CTL_FONT || !nWID )
     {
         //	static default for font is system-dependent,
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 6696132fa..d206cf4dd 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -215,7 +215,7 @@ void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject&
 
 ScDispatch::ScDispatch(ScTabViewShell* pViewSh) :
     pViewShell( pViewSh ),
-    bListeningToView( FALSE )
+    bListeningToView( sal_False )
 {
     if (pViewShell)
         StartListening(*pViewShell);
@@ -249,7 +249,7 @@ void SAL_CALL ScDispatch::dispatch( const util::URL& aURL,
 {
     ScUnoGuard aGuard;
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if ( pViewShell && !aURL.Complete.compareToAscii(cURLInsertColumns) )
     {
         ScViewData* pViewData = pViewShell->GetViewData();
@@ -321,7 +321,7 @@ void SAL_CALL ScDispatch::addStatusListener(
             bListeningToView = sal_True;
         }
 
-        ScDBData* pDBData = pViewShell->GetDBData(FALSE,SC_DB_OLD);
+        ScDBData* pDBData = pViewShell->GetDBData(sal_False,SC_DB_OLD);
         if ( pDBData )
             pDBData->GetImportParam( aLastImport );
         lcl_FillDataSource( aEvent, aLastImport );          // modifies State, IsEnabled
@@ -340,8 +340,8 @@ void SAL_CALL ScDispatch::removeStatusListener(
 
     if ( !aURL.Complete.compareToAscii(cURLDocDataSource) )
     {
-        USHORT nCount = aDataSourceListeners.Count();
-        for ( USHORT n=nCount; n--; )
+        sal_uInt16 nCount = aDataSourceListeners.Count();
+        for ( sal_uInt16 n=nCount; n--; )
         {
             uno::Reference<frame::XStatusListener> *pObj = aDataSourceListeners[n];
             if ( *pObj == xListener )
@@ -371,7 +371,7 @@ void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventO
     if ( pViewShell )
     {
         ScImportParam aNewImport;
-        ScDBData* pDBData = pViewShell->GetDBData(FALSE,SC_DB_OLD);
+        ScDBData* pDBData = pViewShell->GetDBData(sal_False,SC_DB_OLD);
         if ( pDBData )
             pDBData->GetImportParam( aNewImport );
 
@@ -388,7 +388,7 @@ void SAL_CALL ScDispatch::selectionChanged( const ::com::sun::star::lang::EventO
 
             lcl_FillDataSource( aEvent, aNewImport );       // modifies State, IsEnabled
 
-            for ( USHORT n=0; n<aDataSourceListeners.Count(); n++ )
+            for ( sal_uInt16 n=0; n<aDataSourceListeners.Count(); n++ )
                 (*aDataSourceListeners[n])->statusChanged( aEvent );
 
             aLastImport = aNewImport;
@@ -407,7 +407,7 @@ void SAL_CALL ScDispatch::disposing( const ::com::sun::star::lang::EventObject&
 
     lang::EventObject aEvent;
     aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
-    for ( USHORT n=0; n<aDataSourceListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aDataSourceListeners.Count(); n++ )
         (*aDataSourceListeners[n])->disposing( aEvent );
 
     pViewShell = NULL;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index eb0306ab7..4f9485eb9 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -560,7 +560,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 
     if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             pDocShell = NULL;		// has become invalid
@@ -602,7 +602,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     }
     else if ( rHint.ISA( ScPointerChangedHint ) )
     {
-        USHORT nFlags = ((const ScPointerChangedHint&)rHint).GetFlags();
+        sal_uInt16 nFlags = ((const ScPointerChangedHint&)rHint).GetFlags();
         if (nFlags & SC_POINTERCHANGED_NUMFMT)
         {
             //	NumberFormatter-Pointer am Uno-Objekt neu setzen
@@ -753,7 +753,7 @@ bool lcl_ParseTarget( const String& rTarget, ScRange& rTargetRange, Rectangle& r
     return bRangeValid;
 }
 
-BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
+sal_Bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
                                      const uno::Sequence< beans::PropertyValue >& rOptions,
                                      ScMarkData& rMark,
                                      ScPrintSelectionStatus& rStatus, String& rPagesStr ) const
@@ -761,7 +761,7 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
     DBG_ASSERT( !rMark.IsMarked() && !rMark.IsMultiMarked(), "FillRenderMarkData: MarkData must be empty" );
     DBG_ASSERT( pDocShell, "FillRenderMarkData: DocShell must be set" );
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     
     uno::Reference<frame::XController> xView;
 
@@ -814,11 +814,11 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
         uno::Reference< drawing::XShapes > xShapes( xInterface, uno::UNO_QUERY );
         if ( pSelObj && pSelObj->GetDocShell() == pDocShell )
         {
-            BOOL bSheet = ( ScTableSheetObj::getImplementation( xInterface ) != NULL );
-            BOOL bCursor = pSelObj->IsCursorOnly();
+            sal_Bool bSheet = ( ScTableSheetObj::getImplementation( xInterface ) != NULL );
+            sal_Bool bCursor = pSelObj->IsCursorOnly();
             const ScRangeList& rRanges = pSelObj->GetRangeList();
 
-            rMark.MarkFromRangeList( rRanges, FALSE );
+            rMark.MarkFromRangeList( rRanges, sal_False );
             rMark.MarkToSimple();
 
             if ( rMark.IsMultiMarked() )
@@ -844,7 +844,7 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
                     rStatus.SetMode( SC_PRINTSEL_RANGE );
 
                 rStatus.SetRanges( rRanges );
-                bDone = TRUE;
+                bDone = sal_True;
             }
             // multi selection isn't supported
         }
@@ -873,7 +873,7 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
                             if( rMark.IsMarked() && !rMark.IsMultiMarked() )
                             {
                                 rStatus.SetMode( SC_PRINTSEL_RANGE_EXCLUSIVELY_OLE_AND_DRAW_OBJECTS );
-                                bDone = TRUE;
+                                bDone = sal_True;
                             }
                         }
                     }
@@ -887,9 +887,9 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
 
             SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount();
             for (SCTAB nTab = 0; nTab < nTabCount; nTab++)
-                rMark.SelectTable( nTab, TRUE );
+                rMark.SelectTable( nTab, sal_True );
             rStatus.SetMode( SC_PRINTSEL_DOCUMENT );
-            bDone = TRUE;
+            bDone = sal_True;
         }
         // other selection types aren't supported
     }
@@ -907,7 +907,7 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
                 SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount();
                 for (SCTAB nTab = 0; nTab < nTabCount; nTab++)
                     if (!rViewMark.GetTableSelect(nTab))
-                        rMark.SelectTable( nTab, FALSE );
+                        rMark.SelectTable( nTab, sal_False );
             }
         }
     }
@@ -1042,7 +1042,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32
     }
     ScPrintFunc aFunc( pDocShell, pDocShell->GetPrinter(), nTab,
                         pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, pSelRange, &aStatus.GetOptions() );
-    aFunc.SetRenderFlag( TRUE );
+    aFunc.SetRenderFlag( sal_True );
 
     Range aPageRange( nRenderer+1, nRenderer+1 );
     MultiSelection aPage( aPageRange );
@@ -1052,10 +1052,10 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32
     long nDisplayStart = pPrintFuncCache->GetDisplayStart( nTab );
     long nTabStart = pPrintFuncCache->GetTabStart( nTab );
 
-    (void)aFunc.DoPrint( aPage, nTabStart, nDisplayStart, FALSE, NULL, NULL );
+    (void)aFunc.DoPrint( aPage, nTabStart, nDisplayStart, sal_False, NULL, NULL );
 
     ScRange aCellRange;
-    BOOL bWasCellRange = aFunc.GetLastSourceRange( aCellRange );
+    sal_Bool bWasCellRange = aFunc.GetLastSourceRange( aCellRange );
     Size aTwips = aFunc.GetPageSize();
     awt::Size aPageSize( TwipsToHMM( aTwips.Width() ), TwipsToHMM( aTwips.Height() ) );
 
@@ -1130,7 +1130,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec
     {
         pDrawView = new FmFormView( pModel, pDev );
         pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab));
-        pDrawView->SetPrintPreview( TRUE );
+        pDrawView->SetPrintPreview( sal_True );
     }
 
     ScRange aRange;
@@ -1146,7 +1146,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec
 
     ScPrintFunc aFunc( pDev, pDocShell, nTab, pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, pSelRange, &aStatus.GetOptions() );
     aFunc.SetDrawView( pDrawView );
-    aFunc.SetRenderFlag( TRUE );
+    aFunc.SetRenderFlag( sal_True );
     if( aStatus.GetMode() == SC_PRINTSEL_RANGE_EXCLUSIVELY_OLE_AND_DRAW_OBJECTS )
         aFunc.SetExclusivelyDrawOleAndDrawObjects();
 
@@ -1186,7 +1186,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec
         //<---i56629
     }
 
-    (void)aFunc.DoPrint( aPage, nTabStart, nDisplayStart, TRUE, NULL, NULL );
+    (void)aFunc.DoPrint( aPage, nTabStart, nDisplayStart, sal_True, NULL, NULL );
 
     //  resolve the hyperlinks for PDF export
 
@@ -1301,7 +1301,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno
 sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bLocked = FALSE;
+    sal_Bool bLocked = sal_False;
     if (pDocShell)
         bLocked = ( pDocShell->GetLockCount() != 0 );
     return bLocked;
@@ -1331,7 +1331,7 @@ void SAL_CALL ScModelObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeEx
 sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nRet = 0;
+    sal_uInt16 nRet = 0;
     if (pDocShell)
     {
         nRet = pDocShell->GetLockCount();
@@ -1365,7 +1365,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
     if (pDocShell)
-        pDocShell->DoRecalc(TRUE);
+        pDocShell->DoRecalc(sal_True);
     else
     {
         DBG_ERROR("keine DocShell");		//! Exception oder so?
@@ -1376,7 +1376,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
     if (pDocShell)
-        pDocShell->DoHardRecalc(TRUE);
+        pDocShell->DoHardRecalc(sal_True);
     else
     {
         DBG_ERROR("keine DocShell");		//! Exception oder so?
@@ -1390,7 +1390,7 @@ sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::Runtime
         return pDocShell->GetDocument()->GetAutoCalc();
 
     DBG_ERROR("keine DocShell");		//! Exception oder so?
-    return FALSE;
+    return sal_False;
 }
 
 void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabled )
@@ -1423,7 +1423,7 @@ void SAL_CALL ScModelObj::protect( const rtl::OUString& aPassword ) throw(uno::R
         String aString(aPassword);
 
         ScDocFunc aFunc(*pDocShell);
-        aFunc.Protect( TABLEID_DOC, aString, TRUE );
+        aFunc.Protect( TABLEID_DOC, aString, sal_True );
     }
 }
 
@@ -1436,7 +1436,7 @@ void SAL_CALL ScModelObj::unprotect( const rtl::OUString& aPassword )
         String aString(aPassword);
 
         ScDocFunc aFunc(*pDocShell);
-        BOOL bDone = aFunc.Unprotect( TABLEID_DOC, aString, TRUE );
+        sal_Bool bDone = aFunc.Unprotect( TABLEID_DOC, aString, sal_True );
         if (!bDone)
             throw lang::IllegalArgumentException();
     }
@@ -1449,7 +1449,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException)
         return pDocShell->GetDocument()->IsDocProtected();
 
     DBG_ERROR("keine DocShell");		//! Exception oder so?
-    return FALSE;
+    return sal_False;
 }
 
 // XDrawPagesSupplier
@@ -1536,7 +1536,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal(
         String aGoalString(aGoalValue);
         ScDocument* pDoc = pDocShell->GetDocument();
         double fValue = 0.0;
-        BOOL bFound = pDoc->Solver(
+        sal_Bool bFound = pDoc->Solver(
                     (SCCOL)aFormulaPosition.Column, (SCROW)aFormulaPosition.Row, aFormulaPosition.Sheet,
                     (SCCOL)aVariablePosition.Column, (SCROW)aVariablePosition.Row, aVariablePosition.Sheet,
                     aGoalString, fValue );
@@ -1585,7 +1585,7 @@ void SAL_CALL ScModelObj::consolidate(
     if (pDocShell)
     {
         const ScConsolidateParam& rParam = aImpl.GetParam();
-        pDocShell->DoConsolidate( rParam, TRUE );
+        pDocShell->DoConsolidate( rParam, sal_True );
         pDocShell->GetDocument()->SetConsolidateDlgData( &rParam );
     }
 }
@@ -1661,7 +1661,7 @@ void SAL_CALL ScModelObj::setPropertyValue(
         const ScDocOptions& rOldOpt = pDoc->GetDocOptions();
         ScDocOptions aNewOpt = rOldOpt;
 
-        BOOL bOpt = ScDocOptionsHelper::setPropertyValue( aNewOpt, *aPropSet.getPropertyMap(), aPropertyName, aValue );
+        sal_Bool bOpt = ScDocOptionsHelper::setPropertyValue( aNewOpt, *aPropSet.getPropertyMap(), aPropertyName, aValue );
         if (bOpt)
         {
             // done...
@@ -1731,10 +1731,10 @@ void SAL_CALL ScModelObj::setPropertyValue(
         }
         else if ( aString.EqualsAscii( SC_UNO_ISUNDOENABLED ) )
         {
-            BOOL bUndoEnabled = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bUndoEnabled = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             pDoc->EnableUndo( bUndoEnabled );
-            USHORT nCount = ( bUndoEnabled ?
-                static_cast< USHORT >( SvtUndoOptions().GetUndoCount() ) : 0 );
+            sal_uInt16 nCount = ( bUndoEnabled ?
+                static_cast< sal_uInt16 >( SvtUndoOptions().GetUndoCount() ) : 0 );
             pDocShell->GetUndoManager()->SetMaxUndoActionCount( nCount );
         }
         else if ( aString.EqualsAscii( SC_UNO_ISADJUSTHEIGHTENABLED ) )
@@ -1775,7 +1775,7 @@ void SAL_CALL ScModelObj::setPropertyValue(
             //  Recalculation after loading is handled separately.
             //! Recalc only for options that need it?
             if ( !pDoc->IsImportingXML() )
-                pDocShell->DoHardRecalc( TRUE );
+                pDocShell->DoHardRecalc( sal_True );
             pDocShell->SetDocumentModified();
         }
     }
@@ -1841,11 +1841,11 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa
         }
         else if ( aString.EqualsAscii( SC_UNO_COLLABELRNG ) )
         {
-            aRet <<= uno::Reference<sheet::XLabelRanges>(new ScLabelRangesObj( pDocShell, TRUE ));
+            aRet <<= uno::Reference<sheet::XLabelRanges>(new ScLabelRangesObj( pDocShell, sal_True ));
         }
         else if ( aString.EqualsAscii( SC_UNO_ROWLABELRNG ) )
         {
-            aRet <<= uno::Reference<sheet::XLabelRanges>(new ScLabelRangesObj( pDocShell, FALSE ));
+            aRet <<= uno::Reference<sheet::XLabelRanges>(new ScLabelRangesObj( pDocShell, sal_False ));
         }
         else if ( aString.EqualsAscii( SC_UNO_AREALINKS ) )
         {
@@ -1951,7 +1951,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
     ScUnoGuard aGuard;
     uno::Reference<uno::XInterface> xRet;
     String aNameStr(aServiceSpecifier);
-    USHORT nType = ScServiceProvider::GetProviderType(aNameStr);
+    sal_uInt16 nType = ScServiceProvider::GetProviderType(aNameStr);
     if ( nType != SC_SERVICE_INVALID )
     {
         //	drawing layer tables must be kept as long as the model is alive
@@ -2188,9 +2188,9 @@ void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRange
         aEvent.Source.set( static_cast< cppu::OWeakObject* >( this ) );
         aEvent.Base <<= aEvent.Source;
 
-        ULONG nRangeCount = rRanges.Count();
+        sal_uLong nRangeCount = rRanges.Count();
         aEvent.Changes.realloc( static_cast< sal_Int32 >( nRangeCount ) );
-        for ( ULONG nIndex = 0; nIndex < nRangeCount; ++nIndex )
+        for ( sal_uLong nIndex = 0; nIndex < nRangeCount; ++nIndex )
         {
             uno::Reference< table::XCellRange > xRangeObj;
 
@@ -2228,7 +2228,7 @@ void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRange
     if ( rOperation.compareToAscii("cell-change") == 0 && pDocShell )
     {
         ScMarkData aMarkData;
-        aMarkData.MarkFromRangeList( rRanges, FALSE );
+        aMarkData.MarkFromRangeList( rRanges, sal_False );
         ScDocument* pDoc = pDocShell->GetDocument();
         SCTAB nTabCount = pDoc->GetTableCount();
         for (SCTAB nTab = 0; nTab < nTabCount; nTab++)
@@ -2241,14 +2241,14 @@ void ScModelObj::NotifyChanges( const ::rtl::OUString& rOperation, const ScRange
                     if (pScript)
                     {
                         ScRangeList aTabRanges;     // collect ranges on this sheet
-                        ULONG nRangeCount = rRanges.Count();
-                        for ( ULONG nIndex = 0; nIndex < nRangeCount; ++nIndex )
+                        sal_uLong nRangeCount = rRanges.Count();
+                        for ( sal_uLong nIndex = 0; nIndex < nRangeCount; ++nIndex )
                         {
                             ScRange aRange( *rRanges.GetObject( nIndex ) );
                             if ( aRange.aStart.Tab() == nTab )
                                 aTabRanges.Append( aRange );
                         }
-                        ULONG nTabRangeCount = aTabRanges.Count();
+                        sal_uLong nTabRangeCount = aTabRanges.Count();
                         if ( nTabRangeCount > 0 )
                         {
                             uno::Reference<uno::XInterface> xTarget;
@@ -2346,7 +2346,7 @@ void ScDrawPagesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-uno::Reference<drawing::XDrawPage> ScDrawPagesObj::GetObjectByIndex_Impl(INT32 nIndex) const
+uno::Reference<drawing::XDrawPage> ScDrawPagesObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const
 {
     if (pDocShell)
     {
@@ -2354,7 +2354,7 @@ uno::Reference<drawing::XDrawPage> ScDrawPagesObj::GetObjectByIndex_Impl(INT32 n
         DBG_ASSERT(pDrawLayer,"kann Draw-Layer nicht anlegen");
         if ( pDrawLayer && nIndex >= 0 && nIndex < pDocShell->GetDocument()->GetTableCount() )
         {
-            SdrPage* pPage = pDrawLayer->GetPage((USHORT)nIndex);
+            SdrPage* pPage = pDrawLayer->GetPage((sal_uInt16)nIndex);
             DBG_ASSERT(pPage,"Draw-Page nicht gefunden");
             if (pPage)
             {
@@ -2377,7 +2377,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sa
         String aNewName;
         pDocShell->GetDocument()->CreateValidTabName(aNewName);
         ScDocFunc aFunc(*pDocShell);
-        if ( aFunc.InsertTable( (SCTAB)nPos, aNewName, TRUE, TRUE ) )
+        if ( aFunc.InsertTable( (SCTAB)nPos, aNewName, sal_True, sal_True ) )
             xRet.set(GetObjectByIndex_Impl( nPos ));
     }
     return xRet;
@@ -2395,7 +2395,7 @@ void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>&
         {
             SCTAB nPageNum = static_cast<SCTAB>(pPage->GetPageNum());
             ScDocFunc aFunc(*pDocShell);
-            aFunc.DeleteTable( nPageNum, TRUE, TRUE );
+            aFunc.DeleteTable( nPageNum, sal_True, sal_True );
         }
     }
 }
@@ -2486,12 +2486,12 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         String aNamStr(aName);
         ScDocFunc aFunc(*pDocShell);
-        bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE );
+        bDone = aFunc.InsertTable( nPosition, aNamStr, sal_True, sal_True );
     }
     if (!bDone)
         throw uno::RuntimeException();		// no other exceptions specified
@@ -2501,13 +2501,13 @@ void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int1
                                             throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         String aNamStr(aName);
         SCTAB nSource;
         if ( pDocShell->GetDocument()->GetTable( aNamStr, nSource ) )
-            bDone = pDocShell->MoveTable( nSource, nDestination, FALSE, TRUE );
+            bDone = pDocShell->MoveTable( nSource, nDestination, sal_False, sal_True );
     }
     if (!bDone)
         throw uno::RuntimeException();		// no other exceptions specified
@@ -2518,7 +2518,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName,
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         String aNamStr(aName);
@@ -2526,7 +2526,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName,
         SCTAB nSource;
         if ( pDocShell->GetDocument()->GetTable( aNamStr, nSource ) )
         {
-            bDone = pDocShell->MoveTable( nSource, nDestination, TRUE, TRUE );
+            bDone = pDocShell->MoveTable( nSource, nDestination, sal_True, sal_True );
             if (bDone)
             {
                 // #i92477# any index past the last sheet means "append" in MoveTable
@@ -2536,7 +2536,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName,
                     nResultTab = nTabCount - 1;
 
                 ScDocFunc aFunc(*pDocShell);
-                bDone = aFunc.RenameTable( nResultTab, aNewStr, TRUE, TRUE );
+                bDone = aFunc.RenameTable( nResultTab, aNewStr, sal_True, sal_True );
             }
         }
     }
@@ -2549,8 +2549,8 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
-    BOOL bIllArg = FALSE;
+    sal_Bool bDone = sal_False;
+    sal_Bool bIllArg = sal_False;
 
     //!	Type of aElement can be some specific interface instead of XInterface
 
@@ -2574,17 +2574,17 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const
                 {
                     SCTAB nPosition = pDoc->GetTableCount();
                     ScDocFunc aFunc(*pDocShell);
-                    bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE );
+                    bDone = aFunc.InsertTable( nPosition, aNamStr, sal_True, sal_True );
                     if (bDone)
                         pSheetObj->InitInsertSheet( pDocShell, nPosition );
                     //	Dokument und neuen Range am Objekt setzen
                 }
             }
             else
-                bIllArg = TRUE;
+                bIllArg = sal_True;
         }
         else
-            bIllArg = TRUE;
+            bIllArg = sal_True;
     }
 
     if (!bDone)
@@ -2601,8 +2601,8 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
-    BOOL bIllArg = FALSE;
+    sal_Bool bDone = sal_False;
+    sal_Bool bIllArg = sal_False;
 
     //!	Type of aElement can be some specific interface instead of XInterface
 
@@ -2619,10 +2619,10 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const
                 if ( pDocShell->GetDocument()->GetTable( aNamStr, nPosition ) )
                 {
                     ScDocFunc aFunc(*pDocShell);
-                    if ( aFunc.DeleteTable( nPosition, TRUE, TRUE ) )
+                    if ( aFunc.DeleteTable( nPosition, sal_True, sal_True ) )
                     {
                         //	InsertTable kann jetzt eigentlich nicht schiefgehen...
-                        bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE );
+                        bDone = aFunc.InsertTable( nPosition, aNamStr, sal_True, sal_True );
                         if (bDone)
                             pSheetObj->InitInsertSheet( pDocShell, nPosition );
                     }
@@ -2634,10 +2634,10 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const
                 }
             }
             else
-                bIllArg = TRUE;
+                bIllArg = sal_True;
         }
         else
-            bIllArg = TRUE;
+            bIllArg = sal_True;
     }
 
     if (!bDone)
@@ -2654,7 +2654,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName )
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         SCTAB nIndex;
@@ -2662,7 +2662,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName )
         if ( pDocShell->GetDocument()->GetTable( aString, nIndex ) )
         {
             ScDocFunc aFunc(*pDocShell);
-            bDone = aFunc.DeleteTable( nIndex, TRUE, TRUE );
+            bDone = aFunc.DeleteTable( nIndex, sal_True, sal_True );
         }
         else
         {
@@ -2681,7 +2681,7 @@ uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((USHORT)nSheet)));
+    uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((sal_uInt16)nSheet)));
     if (! xSheet.is())
         throw lang::IndexOutOfBoundsException();
 
@@ -2692,7 +2692,7 @@ uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPos
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((USHORT)nSheet)));
+    uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((sal_uInt16)nSheet)));
     if (! xSheet.is())
         throw lang::IndexOutOfBoundsException();
 
@@ -2816,9 +2816,9 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const rtl::OUString& aName )
     {
         SCTAB nIndex;
         if ( pDocShell->GetDocument()->GetTable( String(aName), nIndex ) )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -2879,14 +2879,14 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if ( pDocShell && nCount > 0 && nPosition >= 0 && nStartCol+nPosition <= nEndCol &&
             nStartCol+nPosition+nCount-1 <= MAXCOL )
     {
         ScDocFunc aFunc(*pDocShell);
         ScRange aRange( (SCCOL)(nStartCol+nPosition), 0, nTab,
                         (SCCOL)(nStartCol+nPosition+nCount-1), MAXROW, nTab );
-        bDone = aFunc.InsertCells( aRange, NULL, INS_INSCOLS, TRUE, TRUE );
+        bDone = aFunc.InsertCells( aRange, NULL, INS_INSCOLS, sal_True, sal_True );
     }
     if (!bDone)
         throw uno::RuntimeException();		// no other exceptions specified
@@ -2896,14 +2896,14 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     //	Der zu loeschende Bereich muss innerhalb des Objekts liegen
     if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartCol+nIndex+nCount-1 <= nEndCol )
     {
         ScDocFunc aFunc(*pDocShell);
         ScRange aRange( (SCCOL)(nStartCol+nIndex), 0, nTab,
                         (SCCOL)(nStartCol+nIndex+nCount-1), MAXROW, nTab );
-        bDone = aFunc.DeleteCells( aRange, NULL, DEL_DELCOLS, TRUE, TRUE );
+        bDone = aFunc.DeleteCells( aRange, NULL, DEL_DELCOLS, sal_True, sal_True );
     }
     if (!bDone)
         throw uno::RuntimeException();		// no other exceptions specified
@@ -2985,9 +2985,9 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const rtl::OUString& aName )
     String aString(aName);
     if ( ::AlphaToCol( nCol, aString) )
         if ( pDocShell && nCol >= nStartCol && nCol <= nEndCol )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;		// nicht gefunden
+    return sal_False;		// nicht gefunden
 }
 
 // XPropertySet
@@ -3021,33 +3021,33 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue(
     {
         sal_Int32 nNewWidth = 0;
         if ( aValue >>= nNewWidth )
-            aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, SC_SIZE_ORIGINAL,
-                                    (USHORT)HMMToTwips(nNewWidth), TRUE, TRUE );
+            aFunc.SetWidthOrHeight( sal_True, 1, nColArr, nTab, SC_SIZE_ORIGINAL,
+                                    (sal_uInt16)HMMToTwips(nNewWidth), sal_True, sal_True );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
     {
-        BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+        sal_Bool bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
         ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
-        aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, eMode, 0, TRUE, TRUE );
+        aFunc.SetWidthOrHeight( sal_True, 1, nColArr, nTab, eMode, 0, sal_True, sal_True );
         //	SC_SIZE_DIRECT with size 0: hide
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_OWIDTH ) )
     {
-        BOOL bOpt = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+        sal_Bool bOpt = ScUnoHelpFunctions::GetBoolFromAny( aValue );
         if (bOpt)
-            aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab,
-                                    SC_SIZE_OPTIMAL, STD_EXTRA_WIDTH, TRUE, TRUE );
-        // FALSE for columns currently has no effect
+            aFunc.SetWidthOrHeight( sal_True, 1, nColArr, nTab,
+                                    SC_SIZE_OPTIMAL, STD_EXTRA_WIDTH, sal_True, sal_True );
+        // sal_False for columns currently has no effect
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) )
     {
         //!	single function to set/remove all breaks?
-        BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+        sal_Bool bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
         for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
             if (bSet)
-                aFunc.InsertPageBreak( TRUE, ScAddress(nCol,0,nTab), TRUE, TRUE, TRUE );
+                aFunc.InsertPageBreak( sal_True, ScAddress(nCol,0,nTab), sal_True, sal_True, sal_True );
             else
-                aFunc.RemovePageBreak( TRUE, ScAddress(nCol,0,nTab), TRUE, TRUE, TRUE );
+                aFunc.RemovePageBreak( sal_True, ScAddress(nCol,0,nTab), sal_True, sal_True, sal_True );
     }
 }
 
@@ -3068,7 +3068,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro
     if ( aNameString.EqualsAscii( SC_UNONAME_CELLWID ) )
     {
         // for hidden column, return original height
-        USHORT nWidth = pDoc->GetOriginalWidth( nStartCol, nTab );
+        sal_uInt16 nWidth = pDoc->GetOriginalWidth( nStartCol, nTab );
         aAny <<= (sal_Int32)TwipsToHMM(nWidth);
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
@@ -3079,7 +3079,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_OWIDTH ) )
     {
-        BOOL bOpt = !(pDoc->GetColFlags( nStartCol, nTab ) & CR_MANUALSIZE);
+        sal_Bool bOpt = !(pDoc->GetColFlags( nStartCol, nTab ) & CR_MANUALSIZE);
         ScUnoHelpFunctions::SetBoolInAny( aAny, bOpt );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) )
@@ -3145,14 +3145,14 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if ( pDocShell && nCount > 0 && nPosition >= 0 && nStartRow+nPosition <= nEndRow &&
             nStartRow+nPosition+nCount-1 <= MAXROW )
     {
         ScDocFunc aFunc(*pDocShell);
         ScRange aRange( 0, (SCROW)(nStartRow+nPosition), nTab,
                         MAXCOL, (SCROW)(nStartRow+nPosition+nCount-1), nTab );
-        bDone = aFunc.InsertCells( aRange, NULL, INS_INSROWS, TRUE, TRUE );
+        bDone = aFunc.InsertCells( aRange, NULL, INS_INSROWS, sal_True, sal_True );
     }
     if (!bDone)
         throw uno::RuntimeException();		// no other exceptions specified
@@ -3162,14 +3162,14 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     //	Der zu loeschende Bereich muss innerhalb des Objekts liegen
     if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartRow+nIndex+nCount-1 <= nEndRow )
     {
         ScDocFunc aFunc(*pDocShell);
         ScRange aRange( 0, (SCROW)(nStartRow+nIndex), nTab,
                         MAXCOL, (SCROW)(nStartRow+nIndex+nCount-1), nTab );
-        bDone = aFunc.DeleteCells( aRange, NULL, DEL_DELROWS, TRUE, TRUE );
+        bDone = aFunc.DeleteCells( aRange, NULL, DEL_DELROWS, sal_True, sal_True );
     }
     if (!bDone)
         throw uno::RuntimeException();		// no other exceptions specified
@@ -3254,13 +3254,13 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
 
             // TODO: It's probably cleaner to use a different property name
             // for this.
-            pDoc->SetRowHeightOnly( nStartRow, nEndRow, nTab, (USHORT)HMMToTwips(nNewHeight) );
+            pDoc->SetRowHeightOnly( nStartRow, nEndRow, nTab, (sal_uInt16)HMMToTwips(nNewHeight) );
         }
         else
         {
-            BOOL bOpt = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+            sal_Bool bOpt = ScUnoHelpFunctions::GetBoolFromAny( aValue );
             if (bOpt)
-                aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_OPTIMAL, 0, TRUE, TRUE );
+                aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, nTab, SC_SIZE_OPTIMAL, 0, sal_True, sal_True );
             else
             {
                 //! manually set old heights again?
@@ -3271,14 +3271,14 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
     {
         sal_Int32 nNewHeight = 0;
         if ( aValue >>= nNewHeight )
-            aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_ORIGINAL,
-                                    (USHORT)HMMToTwips(nNewHeight), TRUE, TRUE );
+            aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, nTab, SC_SIZE_ORIGINAL,
+                                    (sal_uInt16)HMMToTwips(nNewHeight), sal_True, sal_True );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
     {
-        BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+        sal_Bool bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
         ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
-        aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
+        aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, nTab, eMode, 0, sal_True, sal_True );
         //	SC_SIZE_DIRECT with size 0: hide
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLFILT ) )
@@ -3292,12 +3292,12 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
     else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE) )
     {
         //!	single function to set/remove all breaks?
-        BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+        sal_Bool bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
         for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
             if (bSet)
-                aFunc.InsertPageBreak( FALSE, ScAddress(0,nRow,nTab), TRUE, TRUE, TRUE );
+                aFunc.InsertPageBreak( sal_False, ScAddress(0,nRow,nTab), sal_True, sal_True, sal_True );
             else
-                aFunc.RemovePageBreak( FALSE, ScAddress(0,nRow,nTab), TRUE, TRUE, TRUE );
+                aFunc.RemovePageBreak( sal_False, ScAddress(0,nRow,nTab), sal_True, sal_True, sal_True );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLBACK ) || aNameString.EqualsAscii( SC_UNONAME_CELLTRAN ) )
     {
@@ -3330,7 +3330,7 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper
     if ( aNameString.EqualsAscii( SC_UNONAME_CELLHGT ) )
     {
         // for hidden row, return original height
-        USHORT nHeight = pDoc->GetOriginalHeight( nStartRow, nTab );
+        sal_uInt16 nHeight = pDoc->GetOriginalHeight( nStartRow, nTab );
         aAny <<= (sal_Int32)TwipsToHMM(nHeight);
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) )
@@ -3346,7 +3346,7 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_OHEIGHT ) )
     {
-        BOOL bOpt = !(pDoc->GetRowFlags( nStartRow, nTab ) & CR_MANUALSIZE);
+        sal_Bool bOpt = !(pDoc->GetRowFlags( nStartRow, nTab ) & CR_MANUALSIZE);
         ScUnoHelpFunctions::SetBoolInAny( aAny, bOpt );
     }
     else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) )
@@ -3500,7 +3500,7 @@ void SAL_CALL ScAnnotationsObj::insertNew(
         ScAddress aPos( (SCCOL)aPosition.Column, (SCROW)aPosition.Row, nTab );
 
         ScDocFunc aFunc( *pDocShell );
-        aFunc.ReplaceNote( aPos, rText, 0, 0, TRUE );
+        aFunc.ReplaceNote( aPos, rText, 0, 0, sal_True );
     }
 }
 
@@ -3513,11 +3513,11 @@ void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Run
         if ( GetAddressByIndex_Impl( nIndex, aPos ) )
         {
             ScMarkData aMarkData;
-            aMarkData.SelectTable( aPos.Tab(), TRUE );
+            aMarkData.SelectTable( aPos.Tab(), sal_True );
             aMarkData.SetMultiMarkArea( ScRange(aPos) );
 
             ScDocFunc aFunc(*pDocShell);
-            aFunc.DeleteContents( aMarkData, IDF_NOTE, TRUE, TRUE );
+            aFunc.DeleteContents( aMarkData, IDF_NOTE, sal_True, sal_True );
         }
     }
 }
@@ -3538,7 +3538,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera
 sal_Int32 SAL_CALL ScAnnotationsObj::getCount() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    ULONG nCount = 0;
+    sal_uLong nCount = 0;
     if (pDocShell)
     {
         ScCellIterator aCellIter( pDocShell->GetDocument(), 0,0, nTab, MAXCOL,MAXROW, nTab );
@@ -3606,7 +3606,7 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XScenarios
 
-BOOL ScScenariosObj::GetScenarioIndex_Impl( const rtl::OUString& rName, SCTAB& rIndex )
+sal_Bool ScScenariosObj::GetScenarioIndex_Impl( const rtl::OUString& rName, SCTAB& rIndex )
 {
     //!	Case-insensitiv ????
 
@@ -3622,16 +3622,16 @@ BOOL ScScenariosObj::GetScenarioIndex_Impl( const rtl::OUString& rName, SCTAB& r
                 if ( aTabName == aString )
                 {
                     rIndex = i;
-                    return TRUE;
+                    return sal_True;
                 }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 ScTableSheetObj* ScScenariosObj::GetObjectByIndex_Impl(sal_Int32 nIndex)
 {
-    USHORT nCount = (USHORT)getCount();
+    sal_uInt16 nCount = (sal_uInt16)getCount();
     if ( pDocShell && nIndex >= 0 && nIndex < nCount )
         return new ScTableSheetObj( pDocShell, nTab+static_cast<SCTAB>(nIndex)+1 );
 
@@ -3656,13 +3656,13 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName,
     if ( pDocShell )
     {
         ScMarkData aMarkData;
-        aMarkData.SelectTable( nTab, TRUE );
+        aMarkData.SelectTable( nTab, sal_True );
 
-        USHORT nRangeCount = (USHORT)aRanges.getLength();
+        sal_uInt16 nRangeCount = (sal_uInt16)aRanges.getLength();
         if (nRangeCount)
         {
             const table::CellRangeAddress* pAry = aRanges.getConstArray();
-            for (USHORT i=0; i<nRangeCount; i++)
+            for (sal_uInt16 i=0; i<nRangeCount; i++)
             {
                 DBG_ASSERT( pAry[i].Sheet == nTab, "addScenario mit falscher Tab" );
                 ScRange aRange( (SCCOL)pAry[i].StartColumn, (SCROW)pAry[i].StartRow, nTab,
@@ -3676,7 +3676,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName,
         String aCommStr(aComment);
 
         Color aColor( COL_LIGHTGRAY );	// Default
-        USHORT nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY | SC_SCENARIO_PROTECT;
+        sal_uInt16 nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY | SC_SCENARIO_PROTECT;
 
         pDocShell->MakeScenario( nTab, aNameStr, aCommStr, aColor, nFlags, aMarkData );
     }
@@ -3690,7 +3690,7 @@ void SAL_CALL ScScenariosObj::removeByName( const rtl::OUString& aName )
     if ( pDocShell && GetScenarioIndex_Impl( aName, nIndex ) )
     {
         ScDocFunc aFunc(*pDocShell);
-        aFunc.DeleteTable( nTab+nIndex+1, TRUE, TRUE );
+        aFunc.DeleteTable( nTab+nIndex+1, sal_True, sal_True );
     }
 }
 
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index b7adabd64..dabe216d6 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -55,7 +55,7 @@
 
 TYPEINIT1( ScHeaderFooterChangedHint, SfxHint );
 
-ScHeaderFooterChangedHint::ScHeaderFooterChangedHint(USHORT nP) :
+ScHeaderFooterChangedHint::ScHeaderFooterChangedHint(sal_uInt16 nP) :
     nPart( nP )
 {
 }
@@ -103,13 +103,13 @@ ScEditEngineDefaulter* ScSharedHeaderFooterEditSource::GetEditEngine()
 //	each ScHeaderFooterEditSource object has its own ScHeaderFooterTextData
 
 ScHeaderFooterEditSource::ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent,
-                                                    USHORT nP ) :
+                                                    sal_uInt16 nP ) :
     ScSharedHeaderFooterEditSource( new ScHeaderFooterTextData( *pContent, nP ) )
 {
 }
 
 ScHeaderFooterEditSource::ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent,
-                                                    USHORT nP ) :
+                                                    sal_uInt16 nP ) :
     ScSharedHeaderFooterEditSource( new ScHeaderFooterTextData( rContent, nP ) )
 {
 }
@@ -196,7 +196,7 @@ ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddre
     aCellPos( rP ),
     pEditEngine( NULL ),
     pForwarder( NULL ),
-    bDataValid( FALSE )
+    bDataValid( sal_False )
 {
     if (pDocShell)
         pDocShell->GetDocument()->AddUnoObject(*this);
@@ -237,7 +237,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
         {
             SfxItemPool* pEnginePool = EditEngine::CreatePool();
             pEnginePool->FreezeIdRanges();
-            pEditEngine = new ScEditEngineDefaulter( pEnginePool, TRUE );
+            pEditEngine = new ScEditEngineDefaulter( pEnginePool, sal_True );
         }
         pForwarder = new SvxEditEngineForwarder(*pEditEngine);
     }
@@ -250,7 +250,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
             if ( const EditTextObject* pEditObj = pNote->GetEditTextObject() )
                 pEditEngine->SetText( *pEditObj );		// incl. Umbrueche
 
-    bDataValid = TRUE;
+    bDataValid = sal_True;
     return pForwarder;
 }
 
@@ -288,7 +288,7 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
     else if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             pDocShell = NULL;						// ungueltig geworden
@@ -297,7 +297,7 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint )
             DELETEZ( pEditEngine );		// EditEngine uses document's pool
         }
         else if ( nId == SFX_HINT_DATACHANGED )
-            bDataValid = FALSE;						// Text muss neu geholt werden
+            bDataValid = sal_False;						// Text muss neu geholt werden
     }
 }
 
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 94e22b67c..c04ea766f 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -126,26 +126,26 @@ enum ScUnoCollectMode
 class ScUnoEditEngine : public ScEditEngineDefaulter
 {
     ScUnoCollectMode	eMode;
-    USHORT				nFieldCount;
+    sal_uInt16				nFieldCount;
     TypeId				aFieldType;
     SvxFieldData*		pFound;			// lokale Kopie
-    USHORT				nFieldPar;
+    sal_uInt16				nFieldPar;
     xub_StrLen			nFieldPos;
-    USHORT				nFieldIndex;
+    sal_uInt16				nFieldIndex;
 
 public:
                 ScUnoEditEngine(ScEditEngineDefaulter* pSource);
                 ~ScUnoEditEngine();
 
                     //!	nPos should be xub_StrLen
-    virtual String	CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+    virtual String	CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
                                     Color*& rTxtColor, Color*& rFldColor );
 
-    USHORT			CountFields(TypeId aType);
-    SvxFieldData*	FindByIndex(USHORT nIndex, TypeId aType);
-    SvxFieldData*	FindByPos(USHORT nPar, xub_StrLen nPos, TypeId aType);
+    sal_uInt16			CountFields(TypeId aType);
+    SvxFieldData*	FindByIndex(sal_uInt16 nIndex, TypeId aType);
+    SvxFieldData*	FindByPos(sal_uInt16 nPar, xub_StrLen nPos, TypeId aType);
 
-    USHORT			GetFieldPar() const		{ return nFieldPar; }
+    sal_uInt16			GetFieldPar() const		{ return nFieldPar; }
     xub_StrLen		GetFieldPos() const		{ return nFieldPos; }
 };
 
@@ -170,7 +170,7 @@ ScUnoEditEngine::~ScUnoEditEngine()
 }
 
 String ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField,
-            USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor )
+            sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor )
 {
     String aRet(EditEngine::CalcFieldValue( rField, nPara, nPos, rTxtColor, rFldColor ));
     if (eMode != SC_UNO_COLLECT_NONE)
@@ -199,7 +199,7 @@ String ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField,
     return aRet;
 }
 
-USHORT ScUnoEditEngine::CountFields(TypeId aType)
+sal_uInt16 ScUnoEditEngine::CountFields(TypeId aType)
 {
     eMode = SC_UNO_COLLECT_COUNT;
     aFieldType = aType;
@@ -211,7 +211,7 @@ USHORT ScUnoEditEngine::CountFields(TypeId aType)
     return nFieldCount;
 }
 
-SvxFieldData* ScUnoEditEngine::FindByIndex(USHORT nIndex, TypeId aType)
+SvxFieldData* ScUnoEditEngine::FindByIndex(sal_uInt16 nIndex, TypeId aType)
 {
     eMode = SC_UNO_COLLECT_FINDINDEX;
     nFieldIndex = nIndex;
@@ -224,7 +224,7 @@ SvxFieldData* ScUnoEditEngine::FindByIndex(USHORT nIndex, TypeId aType)
     return pFound;
 }
 
-SvxFieldData* ScUnoEditEngine::FindByPos(USHORT nPar, xub_StrLen nPos, TypeId aType)
+SvxFieldData* ScUnoEditEngine::FindByPos(sal_uInt16 nPar, xub_StrLen nPos, TypeId aType)
 {
     eMode = SC_UNO_COLLECT_FINDPOS;
     nFieldPar = nPar;
@@ -291,15 +291,15 @@ void ScCellFieldsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XIndexAccess (via XTextFields)
 
-ScCellFieldObj* ScCellFieldsObj::GetObjectByIndex_Impl(INT32 Index) const
+ScCellFieldObj* ScCellFieldsObj::GetObjectByIndex_Impl(sal_Int32 Index) const
 {
     //!	Feld-Funktionen muessen an den Forwarder !!!
     ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine();
     ScUnoEditEngine aTempEngine(pEditEngine);
 
-    if ( aTempEngine.FindByIndex( (USHORT)Index, NULL ) )	// in der Zelle ist der Typ egal
+    if ( aTempEngine.FindByIndex( (sal_uInt16)Index, NULL ) )	// in der Zelle ist der Typ egal
     {
-        USHORT nPar = aTempEngine.GetFieldPar();
+        sal_uInt16 nPar = aTempEngine.GetFieldPar();
         xub_StrLen nPos = aTempEngine.GetFieldPos();
         ESelection aSelection( nPar, nPos, nPar, nPos+1 );		// Feld ist 1 Zeichen
         return new ScCellFieldObj( pDocShell, aCellPos, aSelection );
@@ -634,7 +634,7 @@ void SAL_CALL ScCellFieldObj::attach( const uno::Reference<text::XTextRange>& xT
         uno::Reference<text::XText> xText(xTextRange->getText());
         if (xText.is())
         {
-            xText->insertTextContent( xTextRange, this, TRUE );
+            xText->insertTextContent( xTextRange, this, sal_True );
         }
     }
 }
@@ -700,7 +700,7 @@ void SAL_CALL ScCellFieldObj::setPropertyValue(
         {
             SvxURLField* pURL = (SvxURLField*)pField;	// ist eine Kopie in der ScUnoEditEngine
 
-            BOOL bOk = TRUE;
+            sal_Bool bOk = sal_True;
             if ( aNameString.EqualsAscii( SC_UNONAME_URL ) )
             {
                 if (aValue >>= aStrVal)
@@ -717,7 +717,7 @@ void SAL_CALL ScCellFieldObj::setPropertyValue(
                     pURL->SetTargetFrame( aStrVal );
             }
             else
-                bOk = FALSE;
+                bOk = sal_False;
 
             if (bOk)
             {
@@ -870,7 +870,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellFieldObj::getSupportedServiceNames()
 
 //------------------------------------------------------------------------
 
-ScHeaderFieldsObj::ScHeaderFieldsObj(ScHeaderFooterContentObj* pContent, USHORT nP, USHORT nT) :
+ScHeaderFieldsObj::ScHeaderFieldsObj(ScHeaderFooterContentObj* pContent, sal_uInt16 nP, sal_uInt16 nT) :
     pContentObj( pContent ),
     nPart( nP ),
     nType( nT ),
@@ -911,7 +911,7 @@ ScHeaderFieldsObj::~ScHeaderFieldsObj()
 
 // XIndexAccess (via XTextFields)
 
-ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(INT32 Index) const
+ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_Int32 Index) const
 {
     //!	Feld-Funktionen muessen an den Forwarder !!!
     ScEditEngineDefaulter* pEditEngine = ((ScHeaderFooterEditSource*)pEditSource)->GetEditEngine();
@@ -929,13 +929,13 @@ ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(INT32 Index) const
         case SC_SERVICE_SHEETFIELD:	aTypeId = TYPE(SvxTableField);	 break;
         // bei SC_SERVICE_INVALID bleibt TypeId Null
     }
-    SvxFieldData* pData = aTempEngine.FindByIndex( (USHORT)Index, aTypeId );
+    SvxFieldData* pData = aTempEngine.FindByIndex( (sal_uInt16)Index, aTypeId );
     if ( pData )
     {
-        USHORT nPar = aTempEngine.GetFieldPar();
+        sal_uInt16 nPar = aTempEngine.GetFieldPar();
         xub_StrLen nPos = aTempEngine.GetFieldPos();
 
-        USHORT nFieldType = nType;
+        sal_uInt16 nFieldType = nType;
         if ( nFieldType == SC_SERVICE_INVALID )
         {
             if ( pData->ISA( SvxPageField ) )		  nFieldType = SC_SERVICE_PAGEFIELD;
@@ -1125,8 +1125,8 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue )
 //UNUSED2008-05      pEditSource = NULL;
 //UNUSED2008-05  }
 
-ScHeaderFieldObj::ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP,
-                                            USHORT nT, const ESelection& rSel) :
+ScHeaderFieldObj::ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, sal_uInt16 nP,
+                                            sal_uInt16 nT, const ESelection& rSel) :
     OComponentHelper( getMutex() ),
     pPropSet( (nT == SC_SERVICE_FILEFIELD) ? lcl_GetFileFieldPropertySet() : lcl_GetHeaderFieldPropertySet() ),
     pContentObj( pContent ),
@@ -1208,7 +1208,7 @@ void SAL_CALL ScHeaderFieldObj::release() throw()
     OComponentHelper::release();
 }
 
-void ScHeaderFieldObj::InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP,
+void ScHeaderFieldObj::InitDoc( ScHeaderFooterContentObj* pContent, sal_uInt16 nP,
                                         const ESelection& rSel )
 {
     if ( pContent && !pEditSource )
@@ -1328,7 +1328,7 @@ void SAL_CALL ScHeaderFieldObj::attach( const uno::Reference<text::XTextRange>&
         uno::Reference<text::XText> xText(xTextRange->getText());
         if (xText.is())
         {
-            xText->insertTextContent( xTextRange, this, TRUE );
+            xText->insertTextContent( xTextRange, this, sal_True );
         }
     }
 }
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 946cc2425..2325a98bc 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -137,7 +137,7 @@ ScCondFormatEntryItem::ScCondFormatEntryItem() :
 //------------------------------------------------------------------------
 
 ScTableConditionalFormat::ScTableConditionalFormat(
-        ScDocument* pDoc, ULONG nKey, FormulaGrammar::Grammar eGrammar)
+        ScDocument* pDoc, sal_uLong nKey, FormulaGrammar::Grammar eGrammar)
 {
     //	Eintrag aus dem Dokument lesen...
 
@@ -153,8 +153,8 @@ ScTableConditionalFormat::ScTableConditionalFormat(
                 if (pDoc->IsInExternalReferenceMarking())
                     pFormat->MarkUsedExternalReferences();
 
-                USHORT nEntryCount = pFormat->Count();
-                for (USHORT i=0; i<nEntryCount; i++)
+                sal_uInt16 nEntryCount = pFormat->Count();
+                for (sal_uInt16 i=0; i<nEntryCount; i++)
                 {
                     ScCondFormatEntryItem aItem;
                     const ScCondFormatEntry* pFormatEntry = pFormat->GetEntry(i);
@@ -190,8 +190,8 @@ void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat,
     //	ScConditionalFormat = Core-Struktur, muss leer sein
 
     DBG_ASSERT( rFormat.IsEmpty(), "FillFormat: Format nicht leer" );
-    USHORT nCount = (USHORT)aEntries.Count();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = (sal_uInt16)aEntries.Count();
+    for (sal_uInt16 i=0; i<nCount; i++)
     {
         ScTableConditionalEntry* pEntry = (ScTableConditionalEntry*)aEntries.GetObject(i);
         if ( !pEntry )
@@ -243,7 +243,7 @@ void ScTableConditionalFormat::AddEntry_Impl(const ScCondFormatEntryItem& aEntry
 
 // XSheetConditionalFormat
 
-ScTableConditionalEntry* ScTableConditionalFormat::GetObjectByIndex_Impl(USHORT nIndex) const
+ScTableConditionalEntry* ScTableConditionalFormat::GetObjectByIndex_Impl(sal_uInt16 nIndex) const
 {
     return (ScTableConditionalEntry*)aEntries.GetObject(nIndex);
 }
@@ -388,7 +388,7 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex )
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    uno::Reference<sheet::XSheetConditionalEntry> xEntry(GetObjectByIndex_Impl((USHORT)nIndex));
+    uno::Reference<sheet::XSheetConditionalEntry> xEntry(GetObjectByIndex_Impl((sal_uInt16)nIndex));
     if (xEntry.is())
         return uno::makeAny(xEntry);
     else
@@ -429,7 +429,7 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const rtl::OUString& aNam
     for (long i=0; i<nCount; i++)
         if ( aName == lcl_GetEntryNameFromIndex(i) )
         {
-            xEntry.set(GetObjectByIndex_Impl((USHORT)i));
+            xEntry.set(GetObjectByIndex_Impl((sal_uInt16)i));
             break;
         }
 
@@ -462,9 +462,9 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const rtl::OUString& aNam
     long nCount = aEntries.Count();
     for (long i=0; i<nCount; i++)
         if ( aName == lcl_GetEntryNameFromIndex(i) )
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 // XUnoTunnel
@@ -607,30 +607,30 @@ void SAL_CALL ScTableConditionalEntry::setStyleName( const rtl::OUString& aStyle
 
 //------------------------------------------------------------------------
 
-ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, ULONG nKey,
+ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey,
                                             const formula::FormulaGrammar::Grammar eGrammar) :
     aPropSet( lcl_GetValidatePropertyMap() )
 {
     //	Eintrag aus dem Dokument lesen...
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if ( pDoc && nKey )
     {
         const ScValidationData*	pData = pDoc->GetValidationEntry( nKey );
         if (pData)
         {
-            nMode = sal::static_int_cast<USHORT>( pData->GetOperation() );
+            nMode = sal::static_int_cast<sal_uInt16>( pData->GetOperation() );
             aSrcPos = pData->GetValidSrcPos();  // #b4974740# valid pos for expressions
             aExpr1 = pData->GetExpression( aSrcPos, 0, 0, eGrammar );
             aExpr2 = pData->GetExpression( aSrcPos, 1, 0, eGrammar );
             meGrammar1 = meGrammar2 = eGrammar;
-            nValMode = sal::static_int_cast<USHORT>( pData->GetDataMode() );
+            nValMode = sal::static_int_cast<sal_uInt16>( pData->GetDataMode() );
             bIgnoreBlank = pData->IsIgnoreBlank();
             nShowList = pData->GetListType();
             bShowInput = pData->GetInput( aInputTitle, aInputMessage );
             ScValidErrorStyle eStyle;
             bShowError = pData->GetErrMsg( aErrorTitle, aErrorMessage, eStyle );
-            nErrorStyle = sal::static_int_cast<USHORT>( eStyle );
+            nErrorStyle = sal::static_int_cast<sal_uInt16>( eStyle );
 
             // During save to XML, sheet::ValidationType_ANY formulas are not
             // saved, even if in the list, see
@@ -639,7 +639,7 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, ULONG nKey,
             if (nValMode != SC_VALID_ANY && pDoc->IsInExternalReferenceMarking())
                 pData->MarkUsedExternalReferences();
 
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
     if (!bFound)
@@ -694,10 +694,10 @@ void ScTableValidationObj::ClearData_Impl()
 {
     nMode		 = SC_COND_NONE;
     nValMode	 = SC_VALID_ANY;
-    bIgnoreBlank = TRUE;
+    bIgnoreBlank = sal_True;
     nShowList    = sheet::TableValidationVisibility::UNSORTED;
-    bShowInput	 = FALSE;
-    bShowError	 = FALSE;
+    bShowInput	 = sal_False;
+    bShowError	 = sal_False;
     nErrorStyle	 = SC_VALERR_STOP;
     aSrcPos.Set(0,0,0);
     aExpr1.Erase();
@@ -728,7 +728,7 @@ void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator nOpera
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    nMode = sal::static_int_cast<USHORT>( lcl_ConditionOperatorToMode( nOperator ) );
+    nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode( nOperator ) );
 }
 
 rtl::OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException)
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index bcac6e286..07f2eafe2 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -105,7 +105,7 @@ ScTempDocSource::ScTempDocSource( ScTempDocCache& rDocCache ) :
         pTempDoc = CreateDocument();
     else
     {
-        rCache.SetInUse( TRUE );
+        rCache.SetInUse( sal_True );
         if ( !rCache.GetDocument() )
             rCache.SetDocument( CreateDocument() );
     }
@@ -116,7 +116,7 @@ ScTempDocSource::~ScTempDocSource()
     if ( pTempDoc )
         delete pTempDoc;
     else
-        rCache.SetInUse( FALSE );
+        rCache.SetInUse( sal_False );
 }
 
 ScDocument* ScTempDocSource::GetDocument()
@@ -131,7 +131,7 @@ ScDocument* ScTempDocSource::GetDocument()
 
 ScTempDocCache::ScTempDocCache() :
     pDoc( NULL ),
-    bInUse( FALSE )
+    bInUse( sal_False )
 {
 }
 
@@ -160,7 +160,7 @@ void ScTempDocCache::Clear()
 //!	merge this with ScAreaLink::Refresh
 //!	copy directly without a clipboard document?
 
-BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
+sal_Bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
                     ScDocument* pDestDoc, const ScAddress& rDestPos )
 {
     SCTAB nSrcTab = rSrcRange.aStart.Tab();
@@ -200,7 +200,7 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
             if ( (nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
             {
                 ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
-                USHORT nErrCode = pFCell->GetErrCode();
+                sal_uInt16 nErrCode = pFCell->GetErrCode();
                 if ( nErrCode == 0 && pFCell->IsValue() )
                 {
                     sal_uInt32 nNewFormat = pFCell->GetStandardFormat( *pClipDoc->GetFormatTable(), nFormat );
@@ -216,10 +216,10 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
     ScMarkData aDestMark;
     aDestMark.SelectOneTable( nDestTab );
     aDestMark.SetMarkArea( aNewRange );
-    pDestDoc->CopyFromClip( aNewRange, aDestMark, IDF_ALL & ~IDF_FORMULA, NULL, pClipDoc, FALSE );
+    pDestDoc->CopyFromClip( aNewRange, aDestMark, IDF_ALL & ~IDF_FORMULA, NULL, pClipDoc, sal_False );
 
     delete pClipDoc;
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -329,7 +329,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue(
 
         // options aren't initialized from configuration - always get the same default behaviour
 
-        BOOL bDone = ScDocOptionsHelper::setPropertyValue( *pOptions, aPropertyMap, aPropertyName, aValue );
+        sal_Bool bDone = ScDocOptionsHelper::setPropertyValue( *pOptions, aPropertyMap, aPropertyName, aValue );
         if (!bDone)
             throw beans::UnknownPropertyException();
     }
@@ -356,7 +356,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess )
 
 // XFunctionAccess
 
-BOOL lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,const ScCompiler& rCompiler )
+sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,const ScCompiler& rCompiler )
 {
     // function names are always case-insensitive
     String aUpper( ScGlobal::pCharClass->upper( rName ) );
@@ -368,28 +368,28 @@ BOOL lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,cons
     if ( eOp != ocNone )
     {
         rArray.AddOpCode( eOp );
-        return TRUE;
+        return sal_True;
     }
 
     // 2. old add in functions
 
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     if ( ScGlobal::GetFuncCollection()->SearchFunc( aUpper, nIndex ) )
     {
         rArray.AddExternal( aUpper.GetBuffer() );
-        return TRUE;
+        return sal_True;
     }
 
     // 3. new (uno) add in functions
 
-    String aIntName(ScGlobal::GetAddInCollection()->FindFunction( aUpper, FALSE ));
+    String aIntName(ScGlobal::GetAddInCollection()->FindFunction( aUpper, sal_False ));
     if (aIntName.Len())
     {
         rArray.AddExternal( aIntName.GetBuffer() );		// international name
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;		// no valid function name
+    return sal_False;		// no valid function name
 }
 
 void lcl_AddRef( ScTokenArray& rArray, long nStartRow, long nColCount, long nRowCount )
@@ -521,7 +521,7 @@ class ArrayOfArrayProc
 {
 public:
 static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArray& rTokenArr,
-                                long& rDocRow, BOOL& rArgErr, BOOL& rOverflow )
+                                long& rDocRow, sal_Bool& rArgErr, sal_Bool& rOverflow )
 {
     SequencesContainer< T > aContainer( rArg, rTokenArr, rDocRow, pDoc );
     aContainer.process();
@@ -579,8 +579,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
     //	add arguments to token array
     //
 
-    BOOL bArgErr = FALSE;
-    BOOL bOverflow = FALSE;
+    sal_Bool bArgErr = sal_False;
+    sal_Bool bOverflow = sal_False;
     long nDocRow = 0;
     long nArgCount = aArguments.getLength();
     const uno::Any* pArgArr = aArguments.getConstArray();
@@ -656,12 +656,12 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
                     long nRowCount = aSrcRange.aEnd.Row() - aSrcRange.aStart.Row() + 1;
 
                     if ( nStartRow + nRowCount > MAXROWCOUNT )
-                        bOverflow = TRUE;
+                        bOverflow = sal_True;
                     else
                     {
                         // copy data
                         if ( !lcl_CopyData( pSrcDoc, aSrcRange, pDoc, ScAddress( 0, (SCROW)nDocRow, 0 ) ) )
-                            bOverflow = TRUE;
+                            bOverflow = sal_True;
                     }
 
                     nDocRow += nRowCount;
@@ -669,13 +669,13 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
                         lcl_AddRef( aTokenArr, nStartRow, nColCount, nRowCount );
                 }
                 else
-                    bArgErr = TRUE;
+                    bArgErr = sal_True;
             }
             else
-                bArgErr = TRUE;
+                bArgErr = sal_True;
         }
         else
-            bArgErr = TRUE;					// invalid type
+            bArgErr = sal_True;					// invalid type
     }
     aTokenArr.AddOpCode(ocClose);
     aTokenArr.AddOpCode(ocStop);
@@ -691,14 +691,14 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
         // GRAM_PODF_A1 doesn't really matter for the token array but fits with
         // other API compatibility grammars.
         ScFormulaCell* pFormula = new ScFormulaCell( pDoc, aFormulaPos,
-                &aTokenArr, formula::FormulaGrammar::GRAM_PODF_A1, (BYTE)(mbArray ? MM_FORMULA : MM_NONE) );
+                &aTokenArr, formula::FormulaGrammar::GRAM_PODF_A1, (sal_uInt8)(mbArray ? MM_FORMULA : MM_NONE) );
         pDoc->PutCell( aFormulaPos, pFormula );		//! necessary?
 
         //	call GetMatrix before GetErrCode because GetMatrix always recalculates
         //	if there is no matrix result
 
         const ScMatrix* pMat = mbArray ? pFormula->GetMatrix() : 0;
-        USHORT nErrCode = pFormula->GetErrCode();
+        sal_uInt16 nErrCode = pFormula->GetErrCode();
         if ( nErrCode == 0 )
         {
             if ( pMat )
@@ -726,7 +726,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
         else
         {
             //	any other error: IllegalArgumentException
-            bArgErr = TRUE;
+            bArgErr = sal_True;
         }
 
         pDoc->DeleteAreaTab( 0, 0, MAXCOL, MAXROW, 0, IDF_ALL );
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index b6dd5d039..55afa871a 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -129,8 +129,8 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const
     if (pDocShell)
     {
         sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
-        USHORT nCount = pLinkManager->GetLinks().Count();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pLinkManager->GetLinks().Count();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i];
             if (pBase->ISA(ScTableLink))
@@ -187,8 +187,8 @@ void SAL_CALL ScSheetLinkObj::removeRefreshListener(
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aRefreshListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aRefreshListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<util::XRefreshListener>* pObj = aRefreshListeners[n];
         if ( *pObj == xListener )
@@ -205,7 +205,7 @@ void ScSheetLinkObj::Refreshed_Impl()
 {
     lang::EventObject aEvent;
     aEvent.Source.set((cppu::OWeakObject*)this);
-    for ( USHORT n=0; n<aRefreshListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aRefreshListeners.Count(); n++ )
         (*aRefreshListeners[n])->refreshed( aEvent );
 }
 
@@ -213,7 +213,7 @@ void ScSheetLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh )
 {
     ScTableLink* pLink = GetLink_Impl();
     if( pLink )
-        pLink->SetRefreshDelay( (ULONG) nRefresh );
+        pLink->SetRefreshDelay( (sal_uLong) nRefresh );
 }
 
 // XPropertySet
@@ -417,11 +417,11 @@ void ScSheetLinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XSheetLinks
 
-ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(INT32 nIndex)
+ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex)
 {
     if (pDocShell)
     {
-        INT32 nCount = 0;
+        sal_Int32 nCount = 0;
         ScStrCollection aNames;	// um doppelte wegzulassen
         ScDocument* pDoc = pDocShell->GetDocument();
         SCTAB nTabCount = pDoc->GetTableCount();
@@ -480,7 +480,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumerat
 sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    INT32 nCount = 0;
+    sal_Int32 nCount = 0;
     if (pDocShell)
     {
         ScStrCollection aNames;	// um doppelte wegzulassen
@@ -556,10 +556,10 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName )
                 //!	case-insensitiv ???
                 String aLinkDoc(pDoc->GetLinkDoc( nTab ));
                 if ( aLinkDoc == aNameStr )
-                    return TRUE;
+                    return sal_True;
             }
     }
-    return FALSE;
+    return sal_False;
 }
 
 uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException)
@@ -574,10 +574,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(u
         SCTAB nTabCount = pDoc->GetTableCount();
         String aName;
 
-        INT32 nLinkCount = getCount();
+        sal_Int32 nLinkCount = getCount();
         uno::Sequence<rtl::OUString> aSeq(nLinkCount);
         rtl::OUString* pAry = aSeq.getArray();
-        USHORT nPos = 0;
+        sal_uInt16 nPos = 0;
         for (SCTAB nTab=0; nTab<nTabCount; nTab++)
         {
             if (pDoc->IsLinked(nTab))
@@ -598,14 +598,14 @@ uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(u
 
 //------------------------------------------------------------------------
 
-ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, USHORT nPos )
+ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, sal_uInt16 nPos )
 {
     if (pDocShell)
     {
         sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
-        USHORT nTotalCount = pLinkManager->GetLinks().Count();
-        USHORT nAreaCount = 0;
-        for (USHORT i=0; i<nTotalCount; i++)
+        sal_uInt16 nTotalCount = pLinkManager->GetLinks().Count();
+        sal_uInt16 nAreaCount = 0;
+        for (sal_uInt16 i=0; i<nTotalCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i];
             if (pBase->ISA(ScAreaLink))
@@ -619,7 +619,7 @@ ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, USHORT nPos )
     return NULL;	// nicht gefunden
 }
 
-ScAreaLinkObj::ScAreaLinkObj(ScDocShell* pDocSh, USHORT nP) :
+ScAreaLinkObj::ScAreaLinkObj(ScDocShell* pDocSh, sal_uInt16 nP) :
     aPropSet( lcl_GetSheetLinkMap() ),
     pDocShell( pDocSh ),
     nPos( nP )
@@ -670,7 +670,7 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr
         String aOptions (pLink->GetOptions());
         String aSource  (pLink->GetSource());
         ScRange aDest   (pLink->GetDestArea());
-        ULONG nRefresh	= pLink->GetRefreshDelay();
+        sal_uLong nRefresh	= pLink->GetRefreshDelay();
 
         //!	Undo fuer Loeschen
         //!	Undo zusammenfassen
@@ -679,7 +679,7 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr
         pLinkManager->Remove( pLink );
         pLink = NULL;	// bei Remove geloescht
 
-        BOOL bFitBlock = TRUE;			// verschieben, wenn durch Update Groesse geaendert
+        sal_Bool bFitBlock = sal_True;			// verschieben, wenn durch Update Groesse geaendert
         if (pNewFile)
         {
             aFile = String( *pNewFile );
@@ -694,11 +694,11 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr
         if (pNewDest)
         {
             ScUnoConversion::FillScRange( aDest, *pNewDest );
-            bFitBlock = FALSE;	// neuer Bereich angegeben -> keine Inhalte verschieben
+            bFitBlock = sal_False;	// neuer Bereich angegeben -> keine Inhalte verschieben
         }
 
         ScDocFunc aFunc(*pDocShell);
-        aFunc.InsertAreaLink( aFile, aFilter, aOptions, aSource, aDest, nRefresh, bFitBlock, TRUE );
+        aFunc.InsertAreaLink( aFile, aFilter, aOptions, aSource, aDest, nRefresh, bFitBlock, sal_True );
     }
 }
 
@@ -706,7 +706,7 @@ void ScAreaLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh )
 {
     ScAreaLink* pLink = lcl_GetAreaLink( pDocShell, nPos );
     if( pLink )
-        pLink->SetRefreshDelay( (ULONG) nRefresh );
+        pLink->SetRefreshDelay( (sal_uLong) nRefresh );
 }
 
 // XRefreshable
@@ -738,8 +738,8 @@ void SAL_CALL ScAreaLinkObj::removeRefreshListener(
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aRefreshListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aRefreshListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<util::XRefreshListener>* pObj = aRefreshListeners[n];
         if ( *pObj == xListener )
@@ -756,7 +756,7 @@ void ScAreaLinkObj::Refreshed_Impl()
 {
     lang::EventObject aEvent;
     aEvent.Source.set((cppu::OWeakObject*)this);
-    for ( USHORT n=0; n<aRefreshListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aRefreshListeners.Count(); n++ )
         (*aRefreshListeners[n])->refreshed( aEvent );
 }
 
@@ -960,10 +960,10 @@ void ScAreaLinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XAreaLinks
 
-ScAreaLinkObj* ScAreaLinksObj::GetObjectByIndex_Impl(INT32 nIndex)
+ScAreaLinkObj* ScAreaLinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex)
 {
     if ( pDocShell && nIndex >= 0 && nIndex < getCount() )
-        return new ScAreaLinkObj( pDocShell, (USHORT)nIndex );
+        return new ScAreaLinkObj( pDocShell, (sal_uInt16)nIndex );
 
     return NULL;	// nicht gefunden
 }
@@ -989,14 +989,14 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP
         ScDocFunc aFunc(*pDocShell);
         aFunc.InsertAreaLink( aFileStr, aFilterStr, aOptionStr,
                                 aSourceStr, ScRange(aDestAddr),
-                                0, FALSE, TRUE );					// keine Inhalte verschieben
+                                0, sal_False, sal_True );					// keine Inhalte verschieben
     }
 }
 
 void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, (USHORT)nIndex);
+    ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, (sal_uInt16)nIndex);
     if (pLink)
     {
         //!	SetAddUndo oder so
@@ -1020,12 +1020,12 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati
 sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    INT32 nAreaCount = 0;
+    sal_Int32 nAreaCount = 0;
     if (pDocShell)
     {
         sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
-        USHORT nTotalCount = pLinkManager->GetLinks().Count();
-        for (USHORT i=0; i<nTotalCount; i++)
+        sal_uInt16 nTotalCount = pLinkManager->GetLinks().Count();
+        for (sal_uInt16 i=0; i<nTotalCount; i++)
         {
             ::sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[i];
             if (pBase->ISA(ScAreaLink))
@@ -1182,8 +1182,8 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener(
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aRefreshListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aRefreshListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<util::XRefreshListener>* pObj = aRefreshListeners[n];
         if ( *pObj == xListener )
@@ -1210,7 +1210,7 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults(  )
         ScDocument* pDoc = pDocShell->GetDocument();
         if ( pDoc )
         {
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             if ( pDoc->FindDdeLink( aAppl, aTopic, aItem, SC_DDE_IGNOREMODE, nPos ) )
             {
                 const ScMatrix* pMatrix = pDoc->GetDdeLinkResultMatrix( nPos );
@@ -1248,7 +1248,7 @@ void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >&
         ScDocument* pDoc = pDocShell->GetDocument();
         if ( pDoc )
         {
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             if ( pDoc->FindDdeLink( aAppl, aTopic, aItem, SC_DDE_IGNOREMODE, nPos ) )
             {
                 uno::Any aAny;
@@ -1271,7 +1271,7 @@ void ScDDELinkObj::Refreshed_Impl()
 {
     lang::EventObject aEvent;
     aEvent.Source.set((cppu::OWeakObject*)this);
-    for ( USHORT n=0; n<aRefreshListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aRefreshListeners.Count(); n++ )
         (*aRefreshListeners[n])->refreshed( aEvent );
 }
 
@@ -1302,13 +1302,13 @@ void ScDDELinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XDDELinks
 
-ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(INT32 nIndex)
+ScDDELinkObj* ScDDELinksObj::GetObjectByIndex_Impl(sal_Int32 nIndex)
 {
     if (pDocShell)
     {
         String aAppl, aTopic, aItem;
         if ( nIndex <= USHRT_MAX &&
-                pDocShell->GetDocument()->GetDdeLinkData( (USHORT)nIndex, aAppl, aTopic, aItem ) )
+                pDocShell->GetDocument()->GetDdeLinkData( (sal_uInt16)nIndex, aAppl, aTopic, aItem ) )
             return new ScDDELinkObj( pDocShell, aAppl, aTopic, aItem );
     }
     return NULL;
@@ -1322,8 +1322,8 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const rtl::OUString& aName)
         String aAppl, aTopic, aItem;
 
         ScDocument* pDoc = pDocShell->GetDocument();
-        USHORT nCount = pDoc->GetDdeLinkCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pDoc->GetDdeLinkCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             pDoc->GetDdeLinkData( i, aAppl, aTopic, aItem );
             if ( lcl_BuildDDEName(aAppl, aTopic, aItem) == aNamStr )
@@ -1347,7 +1347,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio
 sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    INT32 nAreaCount = 0;
+    sal_Int32 nAreaCount = 0;
     if (pDocShell)
         nAreaCount = pDocShell->GetDocument()->GetDdeLinkCount();
     return nAreaCount;
@@ -1399,11 +1399,11 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno
         String aAppl, aTopic, aItem;
 
         ScDocument* pDoc = pDocShell->GetDocument();
-        USHORT nCount = pDoc->GetDdeLinkCount();
+        sal_uInt16 nCount = pDoc->GetDdeLinkCount();
         uno::Sequence<rtl::OUString> aSeq(nCount);
         rtl::OUString* pAry = aSeq.getArray();
 
-        for (USHORT i=0; i<nCount; i++)
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             pDoc->GetDdeLinkData( i, aAppl, aTopic, aItem );
             pAry[i] = lcl_BuildDDEName(aAppl, aTopic, aItem);
@@ -1423,15 +1423,15 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const rtl::OUString& aName )
         String aAppl, aTopic, aItem;
 
         ScDocument* pDoc = pDocShell->GetDocument();
-        USHORT nCount = pDoc->GetDdeLinkCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pDoc->GetDdeLinkCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             pDoc->GetDdeLinkData( i, aAppl, aTopic, aItem );
             if ( lcl_BuildDDEName(aAppl, aTopic, aItem) == aNamStr )
-                return TRUE;
+                return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 // XDDELinks
@@ -1449,7 +1449,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink(
         ScDocument* pDoc = pDocShell->GetDocument();
         if ( pDoc )
         {
-            BYTE nMod = SC_DDE_DEFAULT;
+            sal_uInt8 nMod = SC_DDE_DEFAULT;
             switch ( nMode )
             {
                 case sheet::DDELinkMode_DEFAULT:
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index 84b6d4a2e..a16b9cb49 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -162,7 +162,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
 {
     if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
         return *(sal_Bool*)aAny.getValue();
-    return FALSE;
+    return sal_False;
 }
 
 //	static
@@ -301,7 +301,7 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& Se
 //UNUSED2008-05  
 //UNUSED2008-05  sal_Bool SAL_CALL ScEmptyEnumerationAccess::hasElements() throw(uno::RuntimeException)
 //UNUSED2008-05  {
-//UNUSED2008-05      return FALSE;
+//UNUSED2008-05      return sal_False;
 //UNUSED2008-05  }
 
 //------------------------------------------------------------------------
@@ -319,7 +319,7 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& Se
 //UNUSED2008-05  sal_Bool SAL_CALL ScEmptyEnumeration::hasMoreElements() throw(uno::RuntimeException)
 //UNUSED2008-05  {
 //UNUSED2008-05      ScUnoGuard aGuard;
-//UNUSED2008-05      return FALSE;
+//UNUSED2008-05      return sal_False;
 //UNUSED2008-05  }
 //UNUSED2008-05  
 //UNUSED2008-05  uno::Any SAL_CALL ScEmptyEnumeration::nextElement() throw(container::NoSuchElementException,
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 6f2f60556..17f5b862c 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -548,12 +548,12 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName,
     if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER )		nNewType |= RT_COLHEADER;
     if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER )			nNewType |= RT_ROWHEADER;
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         ScDocument* pDoc = pDocShell->GetDocument();
         ScRangeName* pNames = pDoc->GetRangeName();
-        USHORT nIndex = 0;
+        sal_uInt16 nIndex = 0;
         if (pNames && !pNames->SearchName(aNameStr, nIndex))
         {
             ScRangeName* pNewRanges = new ScRangeName( *pNames );
@@ -564,7 +564,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName,
             {
                 ScDocFunc aFunc(*pDocShell);
                 aFunc.SetNewRangeNames( pNewRanges, sal_True );
-                bDone = TRUE;
+                bDone = sal_True;
             }
             else
             {
@@ -609,7 +609,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName )
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         ScRangeName* pNames = pDocShell->GetDocument()->GetRangeName();
@@ -624,7 +624,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName )
                     pNewRanges->AtFree(nPos);
                     ScDocFunc aFunc(*pDocShell);
                     aFunc.SetNewRangeNames( pNewRanges, sal_True );
-                    bDone = TRUE;
+                    bDone = sal_True;
                 }
         }
     }
@@ -761,13 +761,13 @@ sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const rtl::OUString& aName )
 /** called from the XActionLockable interface methods on initial locking */
 void ScNamedRangesObj::lock()
 {
-    pDocShell->GetDocument()->CompileNameFormula( TRUE ); // CreateFormulaString
+    pDocShell->GetDocument()->CompileNameFormula( sal_True ); // CreateFormulaString
 }
 
 /** called from the XActionLockable interface methods on final unlock */
 void ScNamedRangesObj::unlock()
 {
-    pDocShell->GetDocument()->CompileNameFormula( FALSE ); // CompileFormulaString
+    pDocShell->GetDocument()->CompileNameFormula( sal_False ); // CompileFormulaString
 }
 
 // document::XActionLockable
@@ -1041,7 +1041,7 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex )
                                                 throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if (pDocShell)
     {
         ScDocument* pDoc = pDocShell->GetDocument();
@@ -1065,7 +1065,7 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex )
                 pDoc->CompileColRowNameFormula();
                 pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID );
                 pDocShell->SetDocumentModified();
-                bDone = TRUE;
+                bDone = sal_True;
 
                 //!	Undo ?!?! (hier und aus Dialog)
             }
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index f98a0b53f..e0117f34a 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -97,7 +97,7 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions,
         {
             sal_Int32 nIntVal = 0;
             if ( aValue >>= nIntVal )
-                rOptions.SetIterCount( (USHORT)nIntVal );
+                rOptions.SetIterCount( (sal_uInt16)nIntVal );
         }
         break;
         case PROP_UNO_ITEREPSILON :
@@ -176,7 +176,7 @@ uno::Any ScDocOptionsHelper::getPropertyValue(
         break;
         case PROP_UNO_NULLDATE:    
         {
-            USHORT nD, nM, nY;
+            sal_uInt16 nD, nM, nY;
             rOptions.GetDate( nD, nM, nY );
             util::Date aDate( nD, nM, nY );
             aRet <<= aDate;
@@ -216,7 +216,7 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue(
 {
     ScUnoGuard aGuard;
 
-    BOOL bDone = ScDocOptionsHelper::setPropertyValue( aOptions, *GetPropertySet().getPropertyMap(), aPropertyName, aValue );
+    sal_Bool bDone = ScDocOptionsHelper::setPropertyValue( aOptions, *GetPropertySet().getPropertyMap(), aPropertyName, aValue );
 
     if (!bDone)
         ScModelObj::setPropertyValue( aPropertyName, aValue );
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index a38b6b719..5f5eb8ea1 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -125,7 +125,7 @@ static const sal_Char __FAR_DATA pFilterHtmlWeb[]	= "calc_HTML_WebQuery";
 static const sal_Char __FAR_DATA pFilterRtf[]		= "Rich Text Format (StarCalc)";
 
 
-static BOOL lcl_MayBeAscii( SvStream& rStream )
+static sal_Bool lcl_MayBeAscii( SvStream& rStream )
 {
     // ASCII/CSV is considered possible if there are no null bytes, or a Byte
     // Order Mark is present, or if, for Unicode UCS2/UTF-16, all null bytes
@@ -136,12 +136,12 @@ static BOOL lcl_MayBeAscii( SvStream& rStream )
     const size_t nBufSize = 2048;
     sal_uInt16 aBuffer[ nBufSize ];
     sal_uInt8* pByte = reinterpret_cast<sal_uInt8*>(aBuffer);
-    ULONG nBytesRead = rStream.Read( pByte, nBufSize*2);
+    sal_uLong nBytesRead = rStream.Read( pByte, nBufSize*2);
 
     if ( nBytesRead >= 2 && (aBuffer[0] == 0xfffe || aBuffer[0] == 0xfeff) )
     {
         // Unicode BOM file may contain null bytes.
-        return TRUE;
+        return sal_True;
     }
 
     const sal_uInt16* p = aBuffer;
@@ -159,13 +159,13 @@ static BOOL lcl_MayBeAscii( SvStream& rStream )
     return nMask != 0;
 }
 
-static BOOL lcl_MayBeDBase( SvStream& rStream )
+static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 {
     // Look for dbf marker, see connectivity/source/inc/dbase/DTable.hxx
     // DBFType for values.
-    const BYTE nValidMarks[] = {
+    const sal_uInt8 nValidMarks[] = {
         0x03, 0x04, 0x05, 0x30, 0x43, 0xB3, 0x83, 0x8b, 0x8e, 0xf5 };
-    BYTE nMark;
+    sal_uInt8 nMark;
     rStream.Seek(STREAM_SEEK_TO_BEGIN);
     rStream >> nMark;
     bool bValidMark = false;
@@ -175,24 +175,24 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
             bValidMark = true;
     }
     if ( !bValidMark )
-        return FALSE;
+        return sal_False;
 
     const size_t nHeaderBlockSize = 32;
     // Empty dbf is >= 32*2+1 bytes in size.
     const size_t nEmptyDbf = nHeaderBlockSize * 2 + 1;
 
     rStream.Seek(STREAM_SEEK_TO_END);
-    ULONG nSize = rStream.Tell();
+    sal_uLong nSize = rStream.Tell();
     if ( nSize < nEmptyDbf )
-        return FALSE;
+        return sal_False;
 
     // length of header starts at 8
     rStream.Seek(8);
-    USHORT nHeaderLen;
+    sal_uInt16 nHeaderLen;
     rStream >> nHeaderLen;
 
     if ( nHeaderLen < nEmptyDbf || nSize < nHeaderLen )
-        return FALSE;
+        return sal_False;
 
     // Last byte of header must be 0x0d, this is how it's specified.
     // #i9581#,#i26407# but some applications don't follow the specification
@@ -200,8 +200,8 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
     // even boundary. Some (#i88577# ) even pad more or pad using a 0x1a ^Z
     // control character (#i8857#). This results in:
     // Last byte of header must be 0x0d on 32 bytes boundary.
-    USHORT nBlocks = (nHeaderLen - 1) / nHeaderBlockSize;
-    BYTE nEndFlag = 0;
+    sal_uInt16 nBlocks = (nHeaderLen - 1) / nHeaderBlockSize;
+    sal_uInt8 nEndFlag = 0;
     while ( nBlocks > 1 && nEndFlag != 0x0d ) {
         rStream.Seek( nBlocks-- * nHeaderBlockSize );
         rStream >> nEndFlag;
@@ -211,12 +211,12 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
 }
 
 #if 0
-static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
+static sal_Bool lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
 {
     if ( !pFilter )
-        return FALSE;
+        return sal_False;
 
-    //	TRUE for XML file or template
+    //	sal_True for XML file or template
     //	(template filter has no internal name -> allow configuration key names)
 
     String aName(pFilter->GetFilterName());
@@ -310,7 +310,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
 
     SfxAllItemSet *pSet = new SfxAllItemSet( SFX_APP()->GetPool() );
     TransformParameters( SID_OPENDOC, lDescriptor, *pSet );
-    SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+    SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
 
     bWasReadOnly = pItem && pItem->GetValue();
 
@@ -333,10 +333,10 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
             pFilter = aMatcher.GetFilter4EA( aTypeName );
 
         // ctor of SfxMedium uses owner transition of ItemSet
-        SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, FALSE, NULL, pSet );
-        aMedium.UseInteractionHandler( TRUE );
+        SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, sal_False, NULL, pSet );
+        aMedium.UseInteractionHandler( sal_True );
 
-        BOOL bIsStorage = aMedium.IsStorage();
+        sal_Bool bIsStorage = aMedium.IsStorage();
         if ( aMedium.GetErrorCode() == ERRCODE_NONE )
         {
             // remember input stream and content and put them into the descriptor later
@@ -380,7 +380,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                         String aFilterName;
                         if ( pFilter )
                             aFilterName = pFilter->GetName();
-                        aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : FALSE, &aFilterName );
+                        aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : sal_False, &aFilterName );
                     }
                     catch( lang::WrappedTargetException& aWrap )
                     {
@@ -441,22 +441,22 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                 pFilter = 0;
                 if ( pStream )
                 {
-                    SotStorageRef aStorage = new SotStorage ( pStream, FALSE );
+                    SotStorageRef aStorage = new SotStorage ( pStream, sal_False );
                     if ( !aStorage->GetError() )
                     {
                         // Excel-5: detect through contained streams
                         // there are some "excel" formats from 3rd party vendors that need to be distinguished
                         String aStreamName(RTL_CONSTASCII_STRINGPARAM("Workbook"));
-                        BOOL bExcel97Stream = ( aStorage->IsStream( aStreamName ) );
+                        sal_Bool bExcel97Stream = ( aStorage->IsStream( aStreamName ) );
 
                         aStreamName = String(RTL_CONSTASCII_STRINGPARAM("Book"));
-                        BOOL bExcel5Stream = ( aStorage->IsStream( aStreamName ) );
+                        sal_Bool bExcel5Stream = ( aStorage->IsStream( aStreamName ) );
                         if ( bExcel97Stream || bExcel5Stream )
                         {
                             if ( bExcel97Stream )
                             {
                                 String aOldName;
-                                BOOL bIsCalcFilter = TRUE;
+                                sal_Bool bIsCalcFilter = sal_True;
                                 if ( pPreselectedFilter )
                                 {
                                     // cross filter; now this should be a type detection only, not a filter detection
@@ -485,7 +485,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                             else if ( bExcel5Stream )
                             {
                                 String aOldName;
-                                BOOL bIsCalcFilter = TRUE;
+                                sal_Bool bIsCalcFilter = sal_True;
                                 if ( pPreselectedFilter )
                                 {
                                     // cross filter; now this should be a type detection only, not a filter detection
@@ -529,18 +529,18 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
         #define M_ALT(ANZ)  (0x0200+(ANZ))
         #define M_ENDE      0x8000
 
-                        static const UINT16 pLotus[] =      // Lotus 1/1A/2
+                        static const sal_uInt16 pLotus[] =      // Lotus 1/1A/2
                             { 0x0000, 0x0000, 0x0002, 0x0000,
                             M_ALT(2), 0x0004, 0x0006,
                             0x0004, M_ENDE };
 
-                        static const UINT16 pLotusNew[] =   // Lotus >= 9.7
+                        static const sal_uInt16 pLotusNew[] =   // Lotus >= 9.7
                             { 0x0000, 0x0000, M_DC, 0x0000,     // Rec# + Len (0x1a)
                               M_ALT(3), 0x0003, 0x0004, 0x0005, // File Revision Code 97->ME
                               0x0010, 0x0004, 0x0000, 0x0000,
                               M_ENDE };
 
-                        static const UINT16 pExcel1[] =     // Excel BIFF2, BIFF3, BIFF4
+                        static const sal_uInt16 pExcel1[] =     // Excel BIFF2, BIFF3, BIFF4
                             {   0x09,                                   // lobyte of BOF rec ID (0x0009, 0x0209, 0x0409)
                                 M_ALT(3), 0x00, 0x02, 0x04,             // hibyte of BOF rec ID (0x0009, 0x0209, 0x0409)
                                 M_ALT(3), 4, 6, 8,                      // lobyte of BOF rec size (4, 6, 8, 16)
@@ -550,7 +550,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                                 0x00,                                   // hibyte of data type (0x0010, 0x0020, 0x0040)
                                 M_ENDE };
 
-                        static const UINT16 pExcel2[] =     // Excel BIFF4 Workspace
+                        static const sal_uInt16 pExcel2[] =     // Excel BIFF4 Workspace
                             {   0x09,                                   // lobyte of BOF rec ID (0x0409)
                                 0x04,                                   // hibyte of BOF rec ID (0x0409)
                                 M_ALT(3), 4, 6, 8,                      // lobyte of BOF rec size (4, 6, 8, 16)
@@ -560,7 +560,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                                 0x01,                                   // hibyte of data type (0x0100)
                                 M_ENDE };
 
-                        static const UINT16 pExcel3[] =     // #i23425# Excel BIFF5, BIFF7, BIFF8 (simple book stream)
+                        static const sal_uInt16 pExcel3[] =     // #i23425# Excel BIFF5, BIFF7, BIFF8 (simple book stream)
                             {   0x09,                                   // lobyte of BOF rec ID (0x0809)
                                 0x08,                                   // hibyte of BOF rec ID (0x0809)
                                 M_ALT(4), 4, 6, 8, 16,                  // lobyte of BOF rec size
@@ -570,7 +570,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                                 0x00,                                   // hibyte of data type
                                 M_ENDE };
 
-                        static const UINT16 pSc10[] =       // StarCalc 1.0 Dokumente
+                        static const sal_uInt16 pSc10[] =       // StarCalc 1.0 Dokumente
                             { 'B', 'l', 'a', 'i', 's', 'e', '-', 'T', 'a', 'b', 'e', 'l', 'l',
                             'e', 0x000A, 0x000D, 0x0000,    // Sc10CopyRight[16]
                             M_DC, M_DC, M_DC, M_DC, M_DC, M_DC, M_DC, M_DC, M_DC, M_DC, M_DC,
@@ -579,21 +579,21 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                             0x0000,
                             M_ENDE };
 
-                        static const UINT16 pLotus2[] =     // Lotus >3
+                        static const sal_uInt16 pLotus2[] =     // Lotus >3
                             { 0x0000, 0x0000, 0x001A, 0x0000,   // Rec# + Len (26)
                             M_ALT(2), 0x0000, 0x0002,         // File Revision Code
                             0x0010,
                             0x0004, 0x0000,                   // File Revision Subcode
                             M_ENDE };
 
-                        static const UINT16 pQPro[] =
+                        static const sal_uInt16 pQPro[] =
                                { 0x0000, 0x0000, 0x0002, 0x0000,
                                  M_ALT(4), 0x0001, 0x0002, // WB1, WB2
                                  0x0006, 0x0007,           // QPro 6/7 (?)
                                  0x0010,
                                  M_ENDE };
 
-                        static const UINT16 pDIF1[] =       // DIF mit CR-LF
+                        static const sal_uInt16 pDIF1[] =       // DIF mit CR-LF
                             {
                             'T', 'A', 'B', 'L', 'E',
                             M_DC, M_DC,
@@ -602,7 +602,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                             '\"',
                             M_ENDE };
 
-                        static const UINT16 pDIF2[] =       // DIF mit CR oder LF
+                        static const sal_uInt16 pDIF2[] =       // DIF mit CR oder LF
                             {
                             'T', 'A', 'B', 'L', 'E',
                             M_DC,
@@ -611,13 +611,13 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                             '\"',
                             M_ENDE };
 
-                        static const UINT16 pSylk[] =       // Sylk
+                        static const sal_uInt16 pSylk[] =       // Sylk
                             {
                             'I', 'D', ';',
                             M_ALT(3), 'P', 'N', 'E',        // 'P' plus undocumented Excel extensions 'N' and 'E'
                             M_ENDE };
 
-                        static const UINT16 *ppFilterPatterns[] =      // Arrays mit Suchmustern
+                        static const sal_uInt16 *ppFilterPatterns[] =      // Arrays mit Suchmustern
                             {
                             pLotus,
                             pExcel1,
@@ -631,7 +631,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                             pLotus2,
                             pQPro
                             };
-                        const UINT16 nFilterCount = sizeof(ppFilterPatterns) / sizeof(ppFilterPatterns[0]);
+                        const sal_uInt16 nFilterCount = sizeof(ppFilterPatterns) / sizeof(ppFilterPatterns[0]);
 
                         static const sal_Char* const pFilterName[] =     // zugehoerige Filter
                             {
@@ -648,43 +648,43 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                             pFilterQPro6
                             };
 
-                        // const UINT16 nByteMask = 0xFF;
+                        // const sal_uInt16 nByteMask = 0xFF;
 
                         // suchen Sie jetzt!
                         // ... realisiert ueber 'Mustererkennung'
 
-                        BYTE            nAkt;
-                        BOOL            bSync;          // Datei und Muster stimmen ueberein
-                        USHORT          nFilter;        // Zaehler ueber alle Filter
-                        const UINT16    *pSearch;       // aktuelles Musterwort
+                        sal_uInt8            nAkt;
+                        sal_Bool            bSync;          // Datei und Muster stimmen ueberein
+                        sal_uInt16          nFilter;        // Zaehler ueber alle Filter
+                        const sal_uInt16    *pSearch;       // aktuelles Musterwort
 
                         for ( nFilter = 0 ; nFilter < nFilterCount ; nFilter++ )
                         {
                             rStr.Seek( 0 ); // am Anfang war alles Uebel...
                             rStr >> nAkt;
                             pSearch = ppFilterPatterns[ nFilter ];
-                            bSync = TRUE;
+                            bSync = sal_True;
                             while( !rStr.IsEof() && bSync )
                             {
-                                register UINT16 nMuster = *pSearch;
+                                register sal_uInt16 nMuster = *pSearch;
 
                                 if( nMuster < 0x0100 )
                                 { //                                direkter Byte-Vergleich
-                                    if( ( BYTE ) nMuster != nAkt )
-                                        bSync = FALSE;
+                                    if( ( sal_uInt8 ) nMuster != nAkt )
+                                        bSync = sal_False;
                                 }
                                 else if( nMuster & M_DC )
                                 { //                                             don't care
                                 }
                                 else if( nMuster & M_ALT(0) )
                                 { //                                      alternative Bytes
-                                    BYTE nAnzAlt = ( BYTE ) nMuster;
-                                    bSync = FALSE;          // zunaechst unsynchron
+                                    sal_uInt8 nAnzAlt = ( sal_uInt8 ) nMuster;
+                                    bSync = sal_False;          // zunaechst unsynchron
                                     while( nAnzAlt > 0 )
                                     {
                                         pSearch++;
-                                        if( ( BYTE ) *pSearch == nAkt )
-                                            bSync = TRUE;   // jetzt erst Synchronisierung
+                                        if( ( sal_uInt8 ) *pSearch == nAkt )
+                                            bSync = sal_True;   // jetzt erst Synchronisierung
                                         nAnzAlt--;
                                     }
                                 }
@@ -700,7 +700,7 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
                                     {   // gefundenen Filter einstellen
                                         pFilter = aMatcher.GetFilter4FilterName( String::CreateFromAscii(pFilterName[ nFilter ]) );
                                     }
-                                    bSync = FALSE;              // leave inner loop
+                                    bSync = sal_False;              // leave inner loop
                                     nFilter = nFilterCount;     // leave outer loop
                                 }
                                 else
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 3fd9db7a0..73cc2520a 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -371,7 +371,7 @@ sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName)
             }
         }
 
-        USHORT i;
+        sal_uInt16 i;
         for (i=0; i<SC_SERVICE_COUNT; i++)
         {
             DBG_ASSERT( aOldNames[i], "ScServiceProvider::GetProviderType: no oldname => crash");
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 253335403..2eae7fb74 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -102,7 +102,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) :
       pShapePropertySet(NULL),
       pShapePropertyState(NULL),
       pImplementationId(NULL),
-      bIsTextShape(FALSE),
+      bIsTextShape(sal_False),
       bInitializedNotifier(false)
 {
     comphelper::increment( m_refCount );
@@ -249,22 +249,22 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo(
     return mxPropSetInfo;
 }
 
-BOOL lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum )
+sal_Bool lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum )
 {
-    USHORT nCount = rModel.GetPageCount();
-    for (USHORT i=0; i<nCount; i++)
+    sal_uInt16 nCount = rModel.GetPageCount();
+    for (sal_uInt16 i=0; i<nCount; i++)
         if ( rModel.GetPage(i) == pPage )
         {
             rNum = static_cast<SCTAB>(i);
-            return TRUE;
+            return sal_True;
         }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point& rCaptionPoint )
+sal_Bool lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point& rCaptionPoint )
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
     rtl::OUString sType(xShape->getShapeType());
     sal_Bool bCaptionShape(sType.equalsAscii("com.sun.star.drawing.CaptionShape"));
     if (bCaptionShape)
@@ -273,7 +273,7 @@ BOOL lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point&
         if (xShapeProp.is())
         {
             xShapeProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CaptionPoint" )) ) >>= rCaptionPoint;
-            bReturn = TRUE;
+            bReturn = sal_True;
         }
     }
     return bReturn;
@@ -1353,7 +1353,7 @@ class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE
 private:
     ScShapeObj* mpShape;
 
-    ScMacroInfo* getInfo( BOOL bCreate = FALSE )
+    ScMacroInfo* getInfo( sal_Bool bCreate = sal_False )
     {
         if( mpShape )
             if( SdrObject* pObj = mpShape->GetSdrObject() )
@@ -1393,7 +1393,7 @@ public:
                 rtl::OUString sValue;
                 if ( pProperties->Value >>= sValue )
                 {
-                    ScMacroInfo* pInfo = getInfo( TRUE );
+                    ScMacroInfo* pInfo = getInfo( sal_True );
                     DBG_ASSERT( pInfo, "shape macro info could not be created!" );
                     if ( !pInfo )
                         break;
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 15f45ce70..9919571c7 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -85,21 +85,21 @@ ScCellSearchObj::ScCellSearchObj() :
 {
     pSearchItem = new SvxSearchItem( SCITEM_SEARCHDATA );
     //	Defaults:
-    pSearchItem->SetWordOnly(FALSE);
-    pSearchItem->SetExact(FALSE);
-    pSearchItem->SetMatchFullHalfWidthForms(FALSE);
-    pSearchItem->SetUseAsianOptions(FALSE);		// or all asian bits would have to be handled
-    pSearchItem->SetBackward(FALSE);
-    pSearchItem->SetSelection(FALSE);
-    pSearchItem->SetRegExp(FALSE);
-    pSearchItem->SetPattern(FALSE);
-    pSearchItem->SetLevenshtein(FALSE);
-    pSearchItem->SetLEVRelaxed(FALSE);
+    pSearchItem->SetWordOnly(sal_False);
+    pSearchItem->SetExact(sal_False);
+    pSearchItem->SetMatchFullHalfWidthForms(sal_False);
+    pSearchItem->SetUseAsianOptions(sal_False);		// or all asian bits would have to be handled
+    pSearchItem->SetBackward(sal_False);
+    pSearchItem->SetSelection(sal_False);
+    pSearchItem->SetRegExp(sal_False);
+    pSearchItem->SetPattern(sal_False);
+    pSearchItem->SetLevenshtein(sal_False);
+    pSearchItem->SetLEVRelaxed(sal_False);
     pSearchItem->SetLEVOther(2);
     pSearchItem->SetLEVShorter(2);
     pSearchItem->SetLEVLonger(2);
     //	Calc-Flags
-    pSearchItem->SetRowDirection(FALSE);
+    pSearchItem->SetRowDirection(sal_False);
     pSearchItem->SetCellType(SVX_SEARCHIN_FORMULA);
 
     //	Selection-Flag wird beim Aufruf gesetzt
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index e3936b7db..6f9c8cc1d 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -377,7 +377,7 @@ const SfxItemPropertyMap* lcl_GetFooterStyleMap()
 #define SC_FAMILYNAME_CELL	"CellStyles"
 #define SC_FAMILYNAME_PAGE	"PageStyles"
 
-static UINT16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE };
+static sal_uInt16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE };
 
 //------------------------------------------------------------------------
 
@@ -418,11 +418,11 @@ struct ScDisplayNameMap
     String	aProgName;
 };
 
-const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType )
+const ScDisplayNameMap* lcl_GetStyleNameMap( sal_uInt16 nType )
 {
     if ( nType == SFX_STYLE_FAMILY_PARA )
     {
-        static BOOL bCellMapFilled = FALSE;
+        static sal_Bool bCellMapFilled = sal_False;
         static ScDisplayNameMap aCellMap[6];
         if ( !bCellMapFilled )
         {
@@ -443,13 +443,13 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType )
 
             //	last entry remains empty
 
-            bCellMapFilled = TRUE;
+            bCellMapFilled = sal_True;
         }
         return aCellMap;
     }
     else if ( nType == SFX_STYLE_FAMILY_PAGE )
     {
-        static BOOL bPageMapFilled = FALSE;
+        static sal_Bool bPageMapFilled = sal_False;
         static ScDisplayNameMap aPageMap[3];
         if ( !bPageMapFilled )
         {
@@ -461,7 +461,7 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType )
 
             //	last entry remains empty
 
-            bPageMapFilled = TRUE;
+            bPageMapFilled = sal_True;
         }
         return aPageMap;
     }
@@ -475,7 +475,7 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType )
 #define SC_SUFFIX_USER		" (user)"
 #define SC_SUFFIX_USER_LEN	7
 
-BOOL lcl_EndsWithUser( const String& rString )
+sal_Bool lcl_EndsWithUser( const String& rString )
 {
     const sal_Unicode *pChar = rString.GetBuffer();
     xub_StrLen nLen = rString.Len();
@@ -490,9 +490,9 @@ BOOL lcl_EndsWithUser( const String& rString )
 }
 
 // static
-String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName, UINT16 nType )
+String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName, sal_uInt16 nType )
 {
-    BOOL bDisplayIsProgrammatic = FALSE;
+    sal_Bool bDisplayIsProgrammatic = sal_False;
 
     const ScDisplayNameMap* pNames = lcl_GetStyleNameMap( nType );
     if (pNames)
@@ -502,7 +502,7 @@ String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName
             if (pNames->aDispName == rDispName)
                 return pNames->aProgName;
             else if (pNames->aProgName == rDispName)
-                bDisplayIsProgrammatic = TRUE;			// display name matches any programmatic name
+                bDisplayIsProgrammatic = sal_True;			// display name matches any programmatic name
         }
         while( (++pNames)->aDispName.Len() );
     }
@@ -521,7 +521,7 @@ String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName
 }
 
 // static
-String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName, UINT16 nType )
+String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName, sal_uInt16 nType )
 {
     if ( lcl_EndsWithUser( rProgName ) )
     {
@@ -580,7 +580,7 @@ void ScStyleFamiliesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XStyleFamilies
 
-ScStyleFamilyObj*ScStyleFamiliesObj::GetObjectByType_Impl(UINT16 nType) const
+ScStyleFamilyObj*ScStyleFamiliesObj::GetObjectByType_Impl(sal_uInt16 nType) const
 {
     if ( pDocShell )
     {
@@ -593,7 +593,7 @@ ScStyleFamilyObj*ScStyleFamiliesObj::GetObjectByType_Impl(UINT16 nType) const
     return NULL;
 }
 
-ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByIndex_Impl(UINT32 nIndex) const
+ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByIndex_Impl(sal_uInt32 nIndex) const
 {
     if ( nIndex < SC_STYLE_FAMILY_COUNT )
         return GetObjectByType_Impl(aStyleFamilyTypes[nIndex]);
@@ -699,9 +699,9 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const rtl::OUString& aURL,
     {
         //	collect options
 
-        BOOL bLoadReplace = TRUE;			// defaults
-        BOOL bLoadCellStyles = TRUE;
-        BOOL bLoadPageStyles = TRUE;
+        sal_Bool bLoadReplace = sal_True;			// defaults
+        sal_Bool bLoadCellStyles = sal_True;
+        sal_Bool bLoadPageStyles = sal_True;
 
         const beans::PropertyValue* pPropArray = aOptions.getConstArray();
         long nPropCount = aOptions.getLength();
@@ -732,13 +732,13 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO
     beans::PropertyValue* pArray = aSequence.getArray();
 
     pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_OVERWSTL );
-    ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, TRUE );
+    ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, sal_True );
 
     pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_LOADCELL );
-    ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, TRUE );
+    ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, sal_True );
 
     pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_LOADPAGE );
-    ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, TRUE );
+    ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, sal_True );
 
     return aSequence;
 }
@@ -771,7 +771,7 @@ void ScStyleFamilyObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XStyleFamily
 
-ScStyleObj* ScStyleFamilyObj::GetObjectByIndex_Impl(UINT32 nIndex)
+ScStyleObj* ScStyleFamilyObj::GetObjectByIndex_Impl(sal_uInt32 nIndex)
 {
     if ( pDocShell )
     {
@@ -781,7 +781,7 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByIndex_Impl(UINT32 nIndex)
         SfxStyleSheetIterator aIter( pStylePool, eFamily );
         if ( nIndex < aIter.Count() )
         {
-            SfxStyleSheetBase* pStyle = aIter[(USHORT)nIndex];
+            SfxStyleSheetBase* pStyle = aIter[(sal_uInt16)nIndex];
             if ( pStyle )
             {
                 return new ScStyleObj( pDocShell, eFamily, String (pStyle->GetName()) );
@@ -819,7 +819,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const
         if ( pStyleObj && pStyleObj->GetFamily() == eFamily &&
                 !pStyleObj->IsInserted() )	// noch nicht eingefuegt?
         {
-            String aNameStr(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<UINT16>(eFamily) ));
+            String aNameStr(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<sal_uInt16>(eFamily) ));
 
             ScDocument* pDoc = pDocShell->GetDocument();
             ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
@@ -866,10 +866,10 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName )
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     if ( pDocShell )
     {
-        String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<UINT16>(eFamily) ));
+        String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<sal_uInt16>(eFamily) ));
 
         ScDocument* pDoc = pDocShell->GetDocument();
         ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
@@ -880,7 +880,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName )
         SfxStyleSheetBase* pStyle = pStylePool->Find( aString, eFamily );
         if (pStyle)
         {
-            bFound = TRUE;
+            bFound = sal_True;
             if ( eFamily == SFX_STYLE_FAMILY_PARA )
             {
                 // wie ScViewFunc::RemoveStyleSheetInUse
@@ -965,7 +965,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const rtl::OUString& aName )
 {
     ScUnoGuard aGuard;
     uno::Reference< style::XStyle > xObj(
-        GetObjectByName_Impl( ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<UINT16>(eFamily) ) ));
+        GetObjectByName_Impl( ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<sal_uInt16>(eFamily) ) ));
     if (xObj.is())
         return uno::makeAny(xObj);
     else
@@ -983,19 +983,19 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamilyObj::getElementNames()
         ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
 
         SfxStyleSheetIterator aIter( pStylePool, eFamily );
-        UINT16 nCount = aIter.Count();
+        sal_uInt16 nCount = aIter.Count();
 
         String aName;
         uno::Sequence<rtl::OUString> aSeq(nCount);
         rtl::OUString* pAry = aSeq.getArray();
         SfxStyleSheetBase* pStyle = aIter.First();
-        UINT16 nPos = 0;
+        sal_uInt16 nPos = 0;
         while (pStyle)
         {
             DBG_ASSERT( nPos<nCount, "Anzahl durcheinandergekommen" );
             if (nPos<nCount)
                 pAry[nPos++] = ScStyleNameConversion::DisplayToProgrammaticName(
-                                    pStyle->GetName(), sal::static_int_cast<UINT16>(eFamily) );
+                                    pStyle->GetName(), sal::static_int_cast<sal_uInt16>(eFamily) );
             pStyle = aIter.Next();
         }
         return aSeq;
@@ -1009,7 +1009,7 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const rtl::OUString& aName )
     ScUnoGuard aGuard;
     if ( pDocShell )
     {
-        String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<UINT16>(eFamily) ));
+        String aString(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<sal_uInt16>(eFamily) ));
 
         ScDocument* pDoc = pDocShell->GetDocument();
         ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
@@ -1051,7 +1051,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr
         }
         if ( nResId > 0 )
         {
-            ::rtl::OUString sDisplayName( ScGlobal::GetRscString( static_cast< USHORT >( nResId ) ) );
+            ::rtl::OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) );
             aRet = uno::makeAny( sDisplayName );
         }
     }
@@ -1211,7 +1211,7 @@ rtl::OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException)
     ScUnoGuard aGuard;
     SfxStyleSheetBase* pStyle = GetStyle_Impl();
     if (pStyle)
-        return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetParent(), sal::static_int_cast<UINT16>(eFamily) );
+        return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetParent(), sal::static_int_cast<sal_uInt16>(eFamily) );
     return rtl::OUString();
 }
 
@@ -1229,7 +1229,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle )
         //!	DocFunc-Funktion??
         //!	Undo ?????????????
 
-        String aString(ScStyleNameConversion::ProgrammaticToDisplayName( rParentStyle, sal::static_int_cast<UINT16>(eFamily) ));
+        String aString(ScStyleNameConversion::ProgrammaticToDisplayName( rParentStyle, sal::static_int_cast<sal_uInt16>(eFamily) ));
         sal_Bool bOk = pStyle->SetParent( aString );
         if (bOk)
         {
@@ -1267,7 +1267,7 @@ rtl::OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException)
     ScUnoGuard aGuard;
     SfxStyleSheetBase* pStyle = GetStyle_Impl();
     if (pStyle)
-        return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetName(), sal::static_int_cast<UINT16>(eFamily) );
+        return ScStyleNameConversion::DisplayToProgrammaticName( pStyle->GetName(), sal::static_int_cast<sal_uInt16>(eFamily) );
     return rtl::OUString();
 }
 
@@ -1296,7 +1296,7 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName )
                 pDoc->GetPool()->CellStyleCreated( aString );
 
             //	Zellvorlagen = 2, Seitenvorlagen = 4
-            UINT16 nId = ( eFamily == SFX_STYLE_FAMILY_PARA ) ?
+            sal_uInt16 nId = ( eFamily == SFX_STYLE_FAMILY_PARA ) ?
                             SID_STYLE_FAMILY2 : SID_STYLE_FAMILY4;
             SfxBindings* pBindings = pDocShell->GetViewBindings();
             if (pBindings)
@@ -1311,7 +1311,7 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName )
 // static
 uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules()
 {
-    SvxNumRule aRule( 0, 0, TRUE );			// nothing supported
+    SvxNumRule aRule( 0, 0, sal_True );			// nothing supported
     return SvxCreateNumRule( &aRule );
 }
 
@@ -1364,7 +1364,7 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString&
 
     if ( pItemSet && pResultEntry )
     {
-        USHORT nWhich = pResultEntry->nWID;
+        sal_uInt16 nWhich = pResultEntry->nWID;
         if ( nWhich == SC_WID_UNO_TBLBORD )
         {
             nWhich = ATTR_BORDER;
@@ -1434,7 +1434,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty
 
     if ( pStyleSet && pResultEntry )
     {
-        USHORT nWhich = pResultEntry->nWID;
+        sal_uInt16 nWhich = pResultEntry->nWID;
 
         if ( IsScItemWid( nWhich ) )
         {
@@ -1619,9 +1619,9 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() throw (uno::RuntimeExcepti
             // #i22448# apply the default BoxInfoItem for page styles again
             // (same content as in ScStyleSheet::GetItemSet, to control the dialog)
             SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER );
-            aBoxInfoItem.SetTable( FALSE );
-            aBoxInfoItem.SetDist( TRUE );
-            aBoxInfoItem.SetValid( VALID_DISTANCE, TRUE );
+            aBoxInfoItem.SetTable( sal_False );
+            aBoxInfoItem.SetDist( sal_True );
+            aBoxInfoItem.SetValid( VALID_DISTANCE, sal_True );
             rSet.Put( aBoxInfoItem );
 
             pDocShell->PageStyleModified( aStyleName, sal_True );
@@ -1750,14 +1750,14 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
                                     // #67847# language for number formats
                                     SvNumberFormatter* pFormatter =
                                             pDocShell->GetDocument()->GetFormatTable();
-                                    UINT32 nOldFormat = ((const SfxUInt32Item&)
+                                    sal_uInt32 nOldFormat = ((const SfxUInt32Item&)
                                             rSet.Get( ATTR_VALUE_FORMAT )).GetValue();
                                     LanguageType eOldLang = ((const SvxLanguageItem&)
                                             rSet.Get( ATTR_LANGUAGE_FORMAT )).GetLanguage();
                                     nOldFormat = pFormatter->
                                             GetFormatForLanguageIfBuiltIn( nOldFormat, eOldLang );
 
-                                    UINT32 nNewFormat = 0;
+                                    sal_uInt32 nNewFormat = 0;
                                     *pValue >>= nNewFormat;
                                     rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) );
 
@@ -1774,7 +1774,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
                                 {
                                     sal_Int16 nVal = 0;
                                     *pValue >>= nVal;
-                                    rSet.Put( SfxUInt16Item( pEntry->nWID, (USHORT)HMMToTwips(nVal) ) );
+                                    rSet.Put( SfxUInt16Item( pEntry->nWID, (sal_uInt16)HMMToTwips(nVal) ) );
                                 }
                                 break;
                             case ATTR_ROTATE_VALUE:
@@ -1798,18 +1798,18 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
                                         switch( eOrient )
                                         {
                                             case table::CellOrientation_STANDARD:
-                                                rSet.Put( SfxBoolItem( ATTR_STACKED, FALSE ) );
+                                                rSet.Put( SfxBoolItem( ATTR_STACKED, sal_False ) );
                                             break;
                                             case table::CellOrientation_TOPBOTTOM:
-                                                rSet.Put( SfxBoolItem( ATTR_STACKED, FALSE ) );
+                                                rSet.Put( SfxBoolItem( ATTR_STACKED, sal_False ) );
                                                 rSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) );
                                             break;
                                             case table::CellOrientation_BOTTOMTOP:
-                                                rSet.Put( SfxBoolItem( ATTR_STACKED, FALSE ) );
+                                                rSet.Put( SfxBoolItem( ATTR_STACKED, sal_False ) );
                                                 rSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) );
                                             break;
                                             case table::CellOrientation_STACKED:
-                                                rSet.Put( SfxBoolItem( ATTR_STACKED, TRUE ) );
+                                                rSet.Put( SfxBoolItem( ATTR_STACKED, sal_True ) );
                                             break;
                                             default:
                                             {
@@ -1850,26 +1850,26 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
                                 break;
                             case ATTR_PAGE_PAPERBIN:
                                 {
-                                    BYTE nTray = PAPERBIN_PRINTER_SETTINGS;
-                                    BOOL bFound = FALSE;
+                                    sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS;
+                                    sal_Bool bFound = sal_False;
 
                                     rtl::OUString aName;
                                     if ( *pValue >>= aName )
                                     {
                                         if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_PAPERBIN_DEFAULTNAME ) ) )
-                                            bFound = TRUE;
+                                            bFound = sal_True;
                                         else
                                         {
                                             Printer* pPrinter = pDocShell->GetPrinter();
                                             if (pPrinter)
                                             {
                                                 String aNameStr = aName;
-                                                USHORT nCount = pPrinter->GetPaperBinCount();
-                                                for (USHORT i=0; i<nCount; i++)
+                                                sal_uInt16 nCount = pPrinter->GetPaperBinCount();
+                                                for (sal_uInt16 i=0; i<nCount; i++)
                                                     if ( aNameStr == pPrinter->GetPaperBinName(i) )
                                                     {
-                                                        nTray = (BYTE) i;
-                                                        bFound = TRUE;
+                                                        nTray = (sal_uInt8) i;
+                                                        bFound = sal_True;
                                                         break;
                                                     }
                                             }
@@ -1995,7 +1995,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
 
         if ( pItemSet && pResultEntry )
         {
-            USHORT nWhich = pResultEntry->nWID;
+            sal_uInt16 nWhich = pResultEntry->nWID;
 
             if ( IsScItemWid( nWhich ) )
             {
@@ -2004,7 +2004,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
                     case ATTR_VALUE_FORMAT:
                         if ( pDocShell )
                         {
-                            UINT32 nOldFormat = ((const SfxUInt32Item&)
+                            sal_uInt32 nOldFormat = ((const SfxUInt32Item&)
                                     pItemSet->Get( ATTR_VALUE_FORMAT )).GetValue();
                             LanguageType eOldLang = ((const SvxLanguageItem&)
                                     pItemSet->Get( ATTR_LANGUAGE_FORMAT )).GetLanguage();
@@ -2020,7 +2020,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
                     case ATTR_STACKED:
                         {
                             sal_Int32 nRot = ((const SfxInt32Item&)pItemSet->Get(ATTR_ROTATE_VALUE)).GetValue();
-                            BOOL bStacked = ((const SfxBoolItem&)pItemSet->Get(nWhich)).GetValue();
+                            sal_Bool bStacked = ((const SfxBoolItem&)pItemSet->Get(nWhich)).GetValue();
                             SvxOrientationItem( nRot, bStacked, 0 ).QueryValue( aAny );
                         }
                         break;
@@ -2040,7 +2040,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
                         {
                             // property PrinterPaperTray is the name of the tray
 
-                            BYTE nValue = ((const SvxPaperBinItem&)pItemSet->Get(nWhich)).GetValue();
+                            sal_uInt8 nValue = ((const SvxPaperBinItem&)pItemSet->Get(nWhich)).GetValue();
                             rtl::OUString aName;
                             if ( nValue == PAPERBIN_PRINTER_SETTINGS )
                                 aName = rtl::OUString::createFromAscii( SC_PAPERBIN_DEFAULTNAME );
@@ -2117,7 +2117,7 @@ rtl::OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeExc
 sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName )
                                                     throw(uno::RuntimeException)
 {
-    BOOL bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
+    sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
     return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SCSTYLE_SERVICE ) )||
            rServiceName.equalsAsciiL( 
             RTL_CONSTASCII_STRINGPARAM ( bPage ? SCPAGESTYLE_SERVICE : SCCELLSTYLE_SERVICE ));
@@ -2126,7 +2126,7 @@ sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName
 uno::Sequence<rtl::OUString> SAL_CALL ScStyleObj::getSupportedServiceNames()
                                                     throw(uno::RuntimeException)
 {
-    BOOL bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
+    sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
     pArray[0] = rtl::OUString::createFromAscii( SCSTYLE_SERVICE );
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 5d6602b40..21fbe9e59 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -245,7 +245,7 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType
     }
     if (nImgId)
     {
-        BOOL bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+        sal_Bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
         ImageList aEntryImages( ScResId( bHighContrast ? RID_IMAGELIST_H_NAVCONT : RID_IMAGELIST_NAVCONT ) );
         const Image& rImage = aEntryImages.GetImage( nImgId );
         rRet <<= uno::Reference< awt::XBitmap > (VCLUnoHelper::CreateBitmap( rImage.GetBitmapEx() ));
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index e8e1295c8..5428223b7 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -75,7 +75,7 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet()
         SVX_UNOEDIT_NUMBERING_PROPERTIE,	// for completeness of service ParagraphProperties
         {0,0,0,0,0,0}
     };
-    static BOOL bTwipsSet = FALSE;
+    static sal_Bool bTwipsSet = sal_False;
 
     if (!bTwipsSet)
     {
@@ -95,7 +95,7 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet()
 
             ++pEntry;
         }
-        bTwipsSet = TRUE;
+        bTwipsSet = sal_True;
     }
     static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() ); 
     return &aHdFtPropertySet_Impl;
@@ -140,7 +140,7 @@ void ScHeaderFooterContentObj::RemoveListener( SfxListener& rListener )
     rListener.EndListening( aBC );
 }
 
-void ScHeaderFooterContentObj::UpdateText( USHORT nPart, EditEngine& rSource )
+void ScHeaderFooterContentObj::UpdateText( sal_uInt16 nPart, EditEngine& rSource )
 {
     EditTextObject* pNew = rSource.CreateTextObject();
     switch (nPart)
@@ -231,13 +231,13 @@ ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation(
 //------------------------------------------------------------------------
 
 ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent,
-                                                    USHORT nP ) :
+                                                    sal_uInt16 nP ) :
     rContentObj( rContent ),
     nPart( nP ),
     pEditEngine( NULL ),
     pForwarder( NULL ),
-    bDataValid( FALSE ),
-    bInUpdate( FALSE )
+    bDataValid( sal_False ),
+    bInUpdate( sal_False )
 {
     rContentObj.acquire();				// must not go away
     rContentObj.AddListener( *this );
@@ -262,7 +262,7 @@ void ScHeaderFooterTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
         if ( ((const ScHeaderFooterChangedHint&)rHint).GetPart() == nPart )
         {
             if (!bInUpdate)				// not for own updates
-                bDataValid = FALSE;		// text has to be fetched again
+                bDataValid = sal_False;		// text has to be fetched again
         }
     }
 }
@@ -273,9 +273,9 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
     {
         SfxItemPool* pEnginePool = EditEngine::CreatePool();
         pEnginePool->FreezeIdRanges();
-        ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, TRUE );
+        ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool, sal_True );
 
-        pHdrEngine->EnableUndo( FALSE );
+        pHdrEngine->EnableUndo( sal_False );
         pHdrEngine->SetRefMapMode( MAP_TWIP );
 
         //	default font must be set, independently of document
@@ -313,7 +313,7 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
     if (pData)
         pEditEngine->SetText(*pData);
 
-    bDataValid = TRUE;
+    bDataValid = sal_True;
     return pForwarder;
 }
 
@@ -321,18 +321,18 @@ void ScHeaderFooterTextData::UpdateData()
 {
     if ( pEditEngine )
     {
-        bInUpdate = TRUE;	// don't reset bDataValid during UpdateText
+        bInUpdate = sal_True;	// don't reset bDataValid during UpdateText
 
         rContentObj.UpdateText( nPart, *pEditEngine );
 
-        bInUpdate = FALSE;
+        bInUpdate = sal_False;
     }
 }
 
 //------------------------------------------------------------------------
 
 ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent,
-                                                USHORT nP ) :
+                                                sal_uInt16 nP ) :
     aTextData( rContent, nP ),
     pUnoText( NULL )
 {
@@ -401,7 +401,7 @@ rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeExce
     rtl::OUString aRet;
     const EditTextObject* pData;
 
-    USHORT nPart = aTextData.GetPart();
+    sal_uInt16 nPart = aTextData.GetPart();
     ScHeaderFooterContentObj& rContentObj = aTextData.GetContentObj();
 
     if (nPart == SC_HDFT_LEFT)
@@ -413,7 +413,7 @@ rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeExce
     if (pData)
     {
         // for pure text, no font info is needed in pool defaults
-        ScHeaderEditEngine aEditEngine( EditEngine::CreatePool(), TRUE );
+        ScHeaderEditEngine aEditEngine( EditEngine::CreatePool(), sal_True );
 
         ScHeaderFieldData aData;
         FillDummyFieldData( aData );
@@ -431,7 +431,7 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const rtl::OUString& aText ) thr
     String aString(aText);
 
     // for pure text, no font info is needed in pool defaults
-    ScHeaderEditEngine aEditEngine( EditEngine::CreatePool(), TRUE );
+    ScHeaderEditEngine aEditEngine( EditEngine::CreatePool(), sal_True );
     aEditEngine.SetText( aString );
 
     aTextData.GetContentObj().UpdateText( aTextData.GetPart(), aEditEngine );
@@ -504,7 +504,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
             aSelection.nEndPos = aSelection.nStartPos + 1;
             pHeaderField->InitDoc( &aTextData.GetContentObj(), aTextData.GetPart(), aSelection );
 
-            //	#91431# for bAbsorb=FALSE, the new selection must be behind the inserted content
+            //	#91431# for bAbsorb=sal_False, the new selection must be behind the inserted content
             //	(the xml filter relies on this)
             if (!bAbsorb)
                 aSelection.nStartPos = aSelection.nEndPos;
@@ -943,7 +943,7 @@ ScSimpleEditSourceHelper::ScSimpleEditSourceHelper()
     pEnginePool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
     pEnginePool->FreezeIdRanges();
 
-    pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );		// TRUE: become owner of pool
+    pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, sal_True );		// TRUE: become owner of pool
     pForwarder = new SvxEditEngineForwarder( *pEditEngine );
     pOriginalSource = new ScSimpleEditSource( pForwarder );
 }
@@ -988,10 +988,10 @@ ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) :
     pEditEngine( NULL ),
     pForwarder( NULL ),
     pOriginalSource( NULL ),
-    bDataValid( FALSE ),
-    bInUpdate( FALSE ),
-    bDirty( FALSE ),
-    bDoUpdate( TRUE )
+    bDataValid( sal_False ),
+    bInUpdate( sal_False ),
+    bDirty( sal_False ),
+    bDoUpdate( sal_True )
 {
     if (pDocShell)
         pDocShell->GetDocument()->AddUnoObject(*this);
@@ -1043,12 +1043,12 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder()
         {
             SfxItemPool* pEnginePool = EditEngine::CreatePool();
             pEnginePool->FreezeIdRanges();
-            pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
+            pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, sal_True );
         }
-        //	currently, GetPortions doesn't work if UpdateMode is FALSE,
+        //	currently, GetPortions doesn't work if UpdateMode is sal_False,
         //	this will be fixed (in EditEngine) by src600
-//		pEditEngine->SetUpdateMode( FALSE );
-        pEditEngine->EnableUndo( FALSE );
+//		pEditEngine->SetUpdateMode( sal_False );
+        pEditEngine->EnableUndo( sal_False );
         if (pDocShell)
             pEditEngine->SetRefDevice(pDocShell->GetRefDevice());
         else
@@ -1086,7 +1086,7 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder()
         }
     }
 
-    bDataValid = TRUE;
+    bDataValid = sal_True;
     return pForwarder;
 }
 
@@ -1101,17 +1101,17 @@ void ScCellTextData::UpdateData()
             //	or things like attributes after the text would be lost
             //	(are not stored in the cell)
 
-            bInUpdate = TRUE;	// prevents bDataValid from being reset
+            bInUpdate = sal_True;	// prevents bDataValid from being reset
 
             ScDocFunc aFunc(*pDocShell);
-            aFunc.PutData( aCellPos, *pEditEngine, FALSE, TRUE );	// always as text
+            aFunc.PutData( aCellPos, *pEditEngine, sal_False, sal_True );	// always as text
 
-            bInUpdate = FALSE;
-            bDirty = FALSE;
+            bInUpdate = sal_False;
+            bDirty = sal_False;
         }
     }
     else
-        bDirty = TRUE;
+        bDirty = sal_True;
 }
 
 void ScCellTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
@@ -1124,7 +1124,7 @@ void ScCellTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
     else if ( rHint.ISA( SfxSimpleHint ) )
     {
-        ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nId = ((const SfxSimpleHint&)rHint).GetId();
         if ( nId == SFX_HINT_DYING )
         {
             pDocShell = NULL;						// invalid now
@@ -1135,7 +1135,7 @@ void ScCellTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
         else if ( nId == SFX_HINT_DATACHANGED )
         {
             if (!bInUpdate)							// not for own UpdateData calls
-                bDataValid = FALSE;					// text has to be read from the cell again
+                bDataValid = sal_False;					// text has to be read from the cell again
         }
     }
 }
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index da099303a..ef19f02b0 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -137,7 +137,7 @@ SC_SIMPLE_SERVICE_INFO( ScViewPaneBase, "ScViewPaneObj", "com.sun.star.sheet.Spr
 
 //------------------------------------------------------------------------
 
-ScViewPaneBase::ScViewPaneBase(ScTabViewShell* pViewSh, USHORT nP) :
+ScViewPaneBase::ScViewPaneBase(ScTabViewShell* pViewSh, sal_uInt16 nP) :
     pViewShell( pViewSh ),
     nPane( nP )
 {
@@ -323,7 +323,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells()
 
 namespace
 {
-    bool lcl_prepareFormShellCall( ScTabViewShell* _pViewShell, USHORT _nPane, FmFormShell*& _rpFormShell, Window*& _rpWindow, SdrView*& _rpSdrView )
+    bool lcl_prepareFormShellCall( ScTabViewShell* _pViewShell, sal_uInt16 _nPane, FmFormShell*& _rpFormShell, Window*& _rpWindow, SdrView*& _rpSdrView )
     {
         if ( !_pViewShell )
             return false;
@@ -437,7 +437,7 @@ awt::Rectangle ScViewPaneBase::GetVisArea() const
 
 //------------------------------------------------------------------------
 
-ScViewPaneObj::ScViewPaneObj(ScTabViewShell* pViewSh, USHORT nP) :
+ScViewPaneObj::ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP) :
     ScViewPaneBase( pViewSh, nP )
 {
 }
@@ -593,7 +593,7 @@ void ScTabViewObj::SheetChanged( bool bSameTabButMoved )
         uno::Reference< uno::XInterface > xSource(xView, uno::UNO_QUERY);
         aEvent.Source = xSource;
         aEvent.ActiveSheet = new ScTableSheetObj(pDocSh, pViewData->GetTabNo());
-        for ( USHORT n=0; n<aActivationListeners.Count(); n++ )
+        for ( sal_uInt16 n=0; n<aActivationListeners.Count(); n++ )
         {
             try
             {
@@ -671,26 +671,26 @@ uno::Sequence<sal_Int8> SAL_CALL ScTabViewObj::getImplementationId()
 
 // XDocumentView
 
-BOOL lcl_TabInRanges( SCTAB nTab, const ScRangeList& rRanges )
+sal_Bool lcl_TabInRanges( SCTAB nTab, const ScRangeList& rRanges )
 {
-    ULONG nCount = rRanges.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = rRanges.Count();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         const ScRange* pRange = rRanges.GetObject(i);
         if ( nTab >= pRange->aStart.Tab() && nTab <= pRange->aEnd.Tab() )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrObject* pSelObj )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     SCTAB nObjectTab = 0;
 
     SdrModel* pModel = rDrawView.GetModel();
-    USHORT nPageCount = pModel->GetPageCount();
-    for (USHORT i=0; i<nPageCount && !bFound; i++)
+    sal_uInt16 nPageCount = pModel->GetPageCount();
+    for (sal_uInt16 i=0; i<nPageCount && !bFound; i++)
     {
         SdrPage* pPage = pModel->GetPage(i);
         if (pPage)
@@ -701,7 +701,7 @@ void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrObject*
             {
                 if ( pObject == pSelObj )
                 {
-                    bFound = TRUE;
+                    bFound = sal_True;
                     nObjectTab = static_cast<SCTAB>(i);
                 }
                 pObject = aIter.Next();
@@ -723,11 +723,11 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
     ScTabViewShell* pViewSh = GetViewShell();
 
     if ( !pViewSh )
-        return FALSE;
+        return sal_False;
 
     //!	Type of aSelection can be some specific interface instead of XInterface
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     uno::Reference<uno::XInterface> xInterface(aSelection, uno::UNO_QUERY);
     if ( !xInterface.is() )  //clear all selections
     {
@@ -739,7 +739,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
         }
         else //#102232#; if there is  no DrawView remove range selection
             pViewSh->Unmark();
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     if (bDrawSelModeSet) // remove DrawSelMode if set by API; if necessary it will be set again later
@@ -780,13 +780,13 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
                 if (pDisp)
                     pDisp->Execute( pFunc->GetSlotID(), SFX_CALLMODE_SYNCHRON );
             }
-            pViewSh->SetDrawShell(FALSE);
-            pViewSh->SetDrawSelMode(FALSE);	// nach dem Dispatcher-Execute
+            pViewSh->SetDrawShell(sal_False);
+            pViewSh->SetDrawSelMode(sal_False);	// nach dem Dispatcher-Execute
 
             //	Ranges selektieren
 
             const ScRangeList& rRanges = pRangesImp->GetRangeList();
-            ULONG nRangeCount = rRanges.Count();
+            sal_uLong nRangeCount = rRanges.Count();
             // for empty range list, remove selection (cursor remains where it was)
             if ( nRangeCount == 0 )
                 pViewSh->Unmark();
@@ -801,7 +801,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
                     pViewSh->SetTabNo( pFirst->aStart.Tab() );
                 pViewSh->DoneBlockMode();
                 pViewSh->InitOwnBlockMode();
-                pViewData->GetMarkData().MarkFromRangeList( rRanges, TRUE );
+                pViewData->GetMarkData().MarkFromRangeList( rRanges, sal_True );
                 pViewSh->MarkDataChanged();
                 pViewData->GetDocShell()->PostPaintGridAll();	// Markierung (alt&neu)
                 if ( pFirst )
@@ -813,7 +813,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
 
                 //!	Methode an der View, um RangeList zu selektieren
             }
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     else if ( pShapeImp || xShapeColl.is() )			// Drawing-Layer
@@ -834,7 +834,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
                     if ( pPV && pObj->GetPage() == pPV->GetPage() )
                     {
                         pDrawView->MarkObj( pObj, pPV );
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -883,14 +883,14 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
                         }
                     }
                     if (bAllMarked)
-                        bRet = TRUE;
+                        bRet = sal_True;
                 }
                 else
-                    bRet = TRUE; // empty XShapes (all shapes are deselected)
+                    bRet = sal_True; // empty XShapes (all shapes are deselected)
             }
 
             if (bRet)
-                pViewSh->SetDrawShell(TRUE);
+                pViewSh->SetDrawShell(sal_True);
         }
     }
 
@@ -913,7 +913,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
         if (pDrawView)
         {
             const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList();
-            ULONG nMarkCount = rMarkList.GetMarkCount();
+            sal_uLong nMarkCount = rMarkList.GetMarkCount();
             if (nMarkCount)
             {
                 //	ShapeCollection erzeugen (wie in SdXImpressView::getSelection im Draw)
@@ -922,7 +922,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
                 SvxShapeCollection* pShapes = new SvxShapeCollection();
                 uno::Reference<uno::XInterface> xRet(static_cast<cppu::OWeakObject*>(pShapes));
 
-                for (ULONG i=0; i<nMarkCount; i++)
+                for (sal_uLong i=0; i<nMarkCount; i++)
                 {
                     SdrObject* pDrawObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
                     if (pDrawObj)
@@ -958,7 +958,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
             ScMarkData aFilteredMark( rMark );
             ScViewUtil::UnmarkFiltered( aFilteredMark, pDocSh->GetDocument());
             ScRangeList aRangeList;
-            aFilteredMark.FillRangeListWithMarks( &aRangeList, FALSE);
+            aFilteredMark.FillRangeListWithMarks( &aRangeList, sal_False);
             // Theoretically a selection may start and end on a filtered row.
             switch (aRangeList.Count())
             {
@@ -998,7 +998,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
             //	remember if the selection was from the cursor position without anything selected
             //	(used when rendering the selection)
 
-            pObj->SetCursorOnly( TRUE );
+            pObj->SetCursorOnly( sal_True );
         }
     }
 
@@ -1015,7 +1015,7 @@ rtl::OUString ScTabViewObj::getPrinterName(void) const
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)
     {
-        SfxPrinter* pPrinter = pViewSh->GetPrinter(TRUE);
+        SfxPrinter* pPrinter = pViewSh->GetPrinter(sal_True);
         if (pPrinter)
             return pPrinter->GetName();
     }
@@ -1032,7 +1032,7 @@ void ScTabViewObj::setPrinterName(const rtl::OUString& PrinterName)
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)
     {
-        SfxPrinter* pPrinter = pViewSh->GetPrinter(TRUE);
+        SfxPrinter* pPrinter = pViewSh->GetPrinter(sal_True);
         if (pPrinter)
         {
             String aString(PrinterName);
@@ -1080,7 +1080,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getCount() throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
-    USHORT nPanes = 0;
+    sal_uInt16 nPanes = 0;
     if (pViewSh)
     {
         nPanes = 1;
@@ -1098,7 +1098,7 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex )
                                     lang::WrappedTargetException, uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    uno::Reference<sheet::XViewPane> xPane(GetObjectByIndex_Impl((USHORT)nIndex));
+    uno::Reference<sheet::XViewPane> xPane(GetObjectByIndex_Impl((sal_uInt16)nIndex));
     if (xPane.is())
         return uno::makeAny(xPane);
     else
@@ -1120,7 +1120,7 @@ sal_Bool SAL_CALL ScTabViewObj::hasElements() throw(uno::RuntimeException)
 
 // XSpreadsheetView
 
-ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(USHORT nIndex) const
+ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) const
 {
     static ScSplitPos ePosHV[4] =
         { SC_SPLIT_TOPLEFT, SC_SPLIT_BOTTOMLEFT, SC_SPLIT_TOPRIGHT, SC_SPLIT_BOTTOMRIGHT };
@@ -1129,22 +1129,22 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(USHORT nIndex) const
     if (pViewSh)
     {
         ScSplitPos eWhich = SC_SPLIT_BOTTOMLEFT;	// default Position
-        BOOL bError = FALSE;
+        sal_Bool bError = sal_False;
         ScViewData* pViewData = pViewSh->GetViewData();
-        BOOL bHor = ( pViewData->GetHSplitMode() != SC_SPLIT_NONE );
-        BOOL bVer = ( pViewData->GetVSplitMode() != SC_SPLIT_NONE );
+        sal_Bool bHor = ( pViewData->GetHSplitMode() != SC_SPLIT_NONE );
+        sal_Bool bVer = ( pViewData->GetVSplitMode() != SC_SPLIT_NONE );
         if ( bHor && bVer )
         {
             //	links oben, links unten, rechts oben, rechts unten - wie in Excel
             if ( nIndex < 4 )
                 eWhich = ePosHV[nIndex];
             else
-                bError = TRUE;
+                bError = sal_True;
         }
         else if ( bHor )
         {
             if ( nIndex > 1 )
-                bError = TRUE;
+                bError = sal_True;
             else if ( nIndex == 1 )
                 eWhich = SC_SPLIT_BOTTOMRIGHT;
             // sonst SC_SPLIT_BOTTOMLEFT
@@ -1152,16 +1152,16 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(USHORT nIndex) const
         else if ( bVer )
         {
             if ( nIndex > 1 )
-                bError = TRUE;
+                bError = sal_True;
             else if ( nIndex == 0 )
                 eWhich = SC_SPLIT_TOPLEFT;
             // sonst SC_SPLIT_BOTTOMLEFT
         }
         else if ( nIndex > 0 )
-            bError = TRUE;			// nicht geteilt: nur 0 gueltig
+            bError = sal_True;			// nicht geteilt: nur 0 gueltig
 
         if (!bError)
-            return new ScViewPaneObj( pViewSh, sal::static_int_cast<USHORT>(eWhich) );
+            return new ScViewPaneObj( pViewSh, sal::static_int_cast<sal_uInt16>(eWhich) );
     }
 
     return NULL;
@@ -1237,7 +1237,7 @@ uno::Reference< uno::XInterface > ScTabViewObj::GetClickedObject(const Point& rP
                 Window* pActiveWin = pData->GetActiveWin();
                 Point aPos = pActiveWin->PixelToLogic(rPoint);
 
-                USHORT nHitLog = (USHORT) pActiveWin->PixelToLogic(
+                sal_uInt16 nHitLog = (sal_uInt16) pActiveWin->PixelToLogic(
                                  Size(pDrawView->GetHitTolerancePixel(),0)).Width();
 
                 sal_uInt32 nCount(pDrawPage->GetObjCount());
@@ -1290,7 +1290,7 @@ sal_Bool ScTabViewObj::MousePressed( const awt::MouseEvent& e )
         aMouseEvent.PopupTrigger = e.PopupTrigger;
         aMouseEvent.Target = xTarget;
 
-        for ( USHORT n=0; n<aMouseClickHandlers.Count(); n++ )
+        for ( sal_uInt16 n=0; n<aMouseClickHandlers.Count(); n++ )
         {
             try
             {
@@ -1384,7 +1384,7 @@ sal_Bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e )
             aMouseEvent.PopupTrigger = e.PopupTrigger;
             aMouseEvent.Target = xTarget;
 
-            for ( USHORT n=0; n<aMouseClickHandlers.Count(); n++ )
+            for ( sal_uInt16 n=0; n<aMouseClickHandlers.Count(); n++ )
             {
                 try
                 {
@@ -1410,10 +1410,10 @@ void ScTabViewObj::StartMouseListening()
 
 void ScTabViewObj::EndMouseListening()
 {
-    USHORT nCount(aMouseClickHandlers.Count());
+    sal_uInt16 nCount(aMouseClickHandlers.Count());
     lang::EventObject aEvent;
     aEvent.Source = (cppu::OWeakObject*)this;
-    for ( USHORT n=0; n<nCount; n++ )
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         try
         {
@@ -1432,10 +1432,10 @@ void ScTabViewObj::StartActivationListening()
 
 void ScTabViewObj::EndActivationListening()
 {
-    USHORT nCount = aActivationListeners.Count();
+    sal_uInt16 nCount = aActivationListeners.Count();
     lang::EventObject aEvent;
     aEvent.Source = (cppu::OWeakObject*)this;
-    for ( USHORT n=0; n<nCount; n++ )
+    for ( sal_uInt16 n=0; n<nCount; n++ )
     {
         try
         {
@@ -1455,7 +1455,7 @@ void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference<
 
     if (aListener.is())
     {
-        USHORT nCount = aMouseClickHandlers.Count();
+        sal_uInt16 nCount = aMouseClickHandlers.Count();
         uno::Reference<awt::XEnhancedMouseClickHandler> *pObj =
                 new uno::Reference<awt::XEnhancedMouseClickHandler>( aListener );
         aMouseClickHandlers.Insert( pObj, nCount );
@@ -1469,8 +1469,8 @@ void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Referenc
                                     throw (uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aMouseClickHandlers.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aMouseClickHandlers.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<awt::XEnhancedMouseClickHandler> *pObj = aMouseClickHandlers[n];
         if ( *pObj == aListener )
@@ -1489,7 +1489,7 @@ void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sh
 
     if (aListener.is())
     {
-        USHORT nCount = aActivationListeners.Count();
+        sal_uInt16 nCount = aActivationListeners.Count();
         uno::Reference<sheet::XActivationEventListener> *pObj =
                 new uno::Reference<sheet::XActivationEventListener>( aListener );
         aActivationListeners.Insert( pObj, nCount );
@@ -1503,8 +1503,8 @@ void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference<
                                     throw (uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aActivationListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aActivationListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<sheet::XActivationEventListener> *pObj = aActivationListeners[n];
         if ( *pObj == aListener )
@@ -1518,16 +1518,16 @@ void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference<
 
 #if 0
 
-BOOL ScTabViewObj::getPagebreakMode(void) const
+sal_Bool ScTabViewObj::getPagebreakMode(void) const
 {
     ScUnoGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)
         return pViewSh->GetViewData()->IsPagebreakMode();
-    return FALSE;
+    return sal_False;
 }
 
-void ScTabViewObj::setPagebreakMode(BOOL PagebreakMode)
+void ScTabViewObj::setPagebreakMode(sal_Bool PagebreakMode)
 {
     ScUnoGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -1537,18 +1537,18 @@ void ScTabViewObj::setPagebreakMode(BOOL PagebreakMode)
 
 #endif
 
-INT16 ScTabViewObj::GetZoom(void) const
+sal_Int16 ScTabViewObj::GetZoom(void) const
 {
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)
     {
         const Fraction& rZoomY = pViewSh->GetViewData()->GetZoomY();	// Y wird angezeigt
-        return (INT16)(( rZoomY.GetNumerator() * 100 ) / rZoomY.GetDenominator());
+        return (sal_Int16)(( rZoomY.GetNumerator() * 100 ) / rZoomY.GetDenominator());
     }
     return 0;
 }
 
-void ScTabViewObj::SetZoom(INT16 nZoom)
+void ScTabViewObj::SetZoom(sal_Int16 nZoom)
 {
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)
@@ -1565,7 +1565,7 @@ void ScTabViewObj::SetZoom(INT16 nZoom)
             }
         }
         Fraction aFract( nZoom, 100 );
-        pViewSh->SetZoom( aFract, aFract, TRUE );
+        pViewSh->SetZoom( aFract, aFract, sal_True );
         pViewSh->PaintGrid();
         pViewSh->PaintTop();
         pViewSh->PaintLeft();
@@ -1574,9 +1574,9 @@ void ScTabViewObj::SetZoom(INT16 nZoom)
     }
 }
 
-INT16 ScTabViewObj::GetZoomType(void) const
+sal_Int16 ScTabViewObj::GetZoomType(void) const
 {
-    INT16 aZoomType = view::DocumentZoomType::OPTIMAL;
+    sal_Int16 aZoomType = view::DocumentZoomType::OPTIMAL;
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)
     {
@@ -1603,7 +1603,7 @@ INT16 ScTabViewObj::GetZoomType(void) const
     return aZoomType;
 }
 
-void ScTabViewObj::SetZoomType(INT16 aZoomType)
+void ScTabViewObj::SetZoomType(sal_Int16 aZoomType)
 {
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)
@@ -1646,11 +1646,11 @@ void ScTabViewObj::SetZoomType(INT16 aZoomType)
             {
                 case SVX_ZOOM_WHOLEPAGE:
                 case SVX_ZOOM_PAGEWIDTH:
-                    pView->SetZoomType( eZoomType, TRUE );
+                    pView->SetZoomType( eZoomType, sal_True );
                     break;
 
                 default:
-                    pView->SetZoomType( SVX_ZOOM_PERCENT, TRUE );
+                    pView->SetZoomType( SVX_ZOOM_PERCENT, sal_True );
             }
             SetZoom( nZoom );
         }
@@ -1670,7 +1670,7 @@ sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException)
                  pViewData->GetVSplitMode() == SC_SPLIT_NORMAL );
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException)
@@ -1686,7 +1686,7 @@ sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException)
                  pViewData->GetVSplitMode() == SC_SPLIT_FIX );
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeException)
@@ -1732,7 +1732,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn() throw(uno::RuntimeException)
 
             SCsCOL nCol;
             SCsROW nRow;
-            pViewData->GetPosFromPixel( nSplit, 0, ePos, nCol, nRow, FALSE );
+            pViewData->GetPosFromPixel( nSplit, 0, ePos, nCol, nRow, sal_False );
             if ( nCol > 0 )
                 return nCol;
         }
@@ -1754,7 +1754,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException)
             ScSplitPos ePos = SC_SPLIT_TOPLEFT;		// es ist vertikal geteilt
             SCsCOL nCol;
             SCsROW nRow;
-            pViewData->GetPosFromPixel( 0, nSplit, ePos, nCol, nRow, FALSE );
+            pViewData->GetPosFromPixel( 0, nSplit, ePos, nCol, nRow, sal_False );
             if ( nRow > 0 )
                 return nRow;
         }
@@ -1769,8 +1769,8 @@ void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixel
     ScTabViewShell* pViewSh = GetViewShell();
     if (pViewSh)
     {
-        pViewSh->SplitAtPixel( Point( nPixelX, nPixelY ), TRUE, TRUE );
-        pViewSh->FreezeSplitters( FALSE );
+        pViewSh->SplitAtPixel( Point( nPixelX, nPixelY ), sal_True, sal_True );
+        pViewSh->FreezeSplitters( sal_False );
         pViewSh->InvalidateSplit();
     }
 }
@@ -1792,11 +1792,11 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow
             aWinStart = pWin->GetPosPixel();
 
         ScViewData* pViewData = pViewSh->GetViewData();
-        Point aSplit(pViewData->GetScrPos( (SCCOL)nColumns, (SCROW)nRows, SC_SPLIT_BOTTOMLEFT, TRUE ));
+        Point aSplit(pViewData->GetScrPos( (SCCOL)nColumns, (SCROW)nRows, SC_SPLIT_BOTTOMLEFT, sal_True ));
         aSplit += aWinStart;
 
-        pViewSh->SplitAtPixel( aSplit, TRUE, TRUE );
-        pViewSh->FreezeSplitters( TRUE );
+        pViewSh->SplitAtPixel( aSplit, sal_True, sal_True );
+        pViewSh->FreezeSplitters( sal_True );
         pViewSh->InvalidateSplit();
     }
 }
@@ -1816,8 +1816,8 @@ void SAL_CALL ScTabViewObj::removeSelectionChangeListener(
                                                     throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aSelectionListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aSelectionListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<view::XSelectionChangeListener> *pObj = aSelectionListeners[n];
         if ( *pObj == xListener )		//! wozu der Mumpitz mit queryInterface?
@@ -1832,7 +1832,7 @@ void ScTabViewObj::SelectionChanged()
 {
     lang::EventObject aEvent;
     aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
-    for ( USHORT n=0; n<aSelectionListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aSelectionListeners.Count(); n++ )
         (*aSelectionListeners[n])->selectionChanged( aEvent );
 
     // handle sheet events
@@ -2079,8 +2079,8 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString&
                                     uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aPropertyChgListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aPropertyChgListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<beans::XPropertyChangeListener> *pObj = aPropertyChgListeners[n];
         if ( *pObj == xListener )		//! wozu der Mumpitz mit queryInterface?
@@ -2111,7 +2111,7 @@ void ScTabViewObj::VisAreaChanged()
 {
     beans::PropertyChangeEvent aEvent;
     aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
-    for ( USHORT n=0; n<aPropertyChgListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aPropertyChgListeners.Count(); n++ )
         (*aPropertyChgListeners[n])->propertyChange( aEvent );
 }
 
@@ -2126,9 +2126,9 @@ void SAL_CALL ScTabViewObj::startRangeSelection(
     if (pViewSh)
     {
         String aInitVal, aTitle;
-        BOOL bCloseOnButtonUp = FALSE;
-        BOOL bSingleCell = FALSE;
-        BOOL bMultiSelection = FALSE;
+        sal_Bool bCloseOnButtonUp = sal_False;
+        sal_Bool bSingleCell = sal_False;
+        sal_Bool bMultiSelection = sal_False;
 
         rtl::OUString aStrVal;
         const beans::PropertyValue* pPropArray = aArguments.getConstArray();
@@ -2183,8 +2183,8 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionListener(
                                     throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aRangeSelListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aRangeSelListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<sheet::XRangeSelectionListener> *pObj = aRangeSelListeners[n];
         if ( *pObj == xListener )
@@ -2210,8 +2210,8 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionChangeListener(
                                     throw(uno::RuntimeException)
 {
     ScUnoGuard aGuard;
-    USHORT nCount = aRangeChgListeners.Count();
-    for ( USHORT n=nCount; n--; )
+    sal_uInt16 nCount = aRangeChgListeners.Count();
+    for ( sal_uInt16 n=nCount; n--; )
     {
         uno::Reference<sheet::XRangeSelectionChangeListener> *pObj = aRangeChgListeners[n];
         if ( *pObj == xListener )
@@ -2228,7 +2228,7 @@ void ScTabViewObj::RangeSelDone( const String& rText )
     aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
     aEvent.RangeDescriptor = rtl::OUString( rText );
 
-    for ( USHORT n=0; n<aRangeSelListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aRangeSelListeners.Count(); n++ )
         (*aRangeSelListeners[n])->done( aEvent );
 }
 
@@ -2238,7 +2238,7 @@ void ScTabViewObj::RangeSelAborted( const String& rText )
     aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
     aEvent.RangeDescriptor = rtl::OUString( rText );
 
-    for ( USHORT n=0; n<aRangeSelListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aRangeSelListeners.Count(); n++ )
         (*aRangeSelListeners[n])->aborted( aEvent );
 }
 
@@ -2248,7 +2248,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText )
     aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
     aEvent.RangeDescriptor = rtl::OUString( rText );
 
-    for ( USHORT n=0; n<aRangeChgListeners.Count(); n++ )
+    for ( sal_uInt16 n=0; n<aRangeChgListeners.Count(); n++ )
         (*aRangeChgListeners[n])->descriptorChanged( aEvent );
 }
 
@@ -2349,7 +2349,7 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref
     ScUnoGuard aGuard;
     ScEditShell* pShell = PTR_CAST( ScEditShell, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) );
     if (pShell)
-        pShell->GetEditView()->InsertText( xTrans, ::rtl::OUString(), FALSE );
+        pShell->GetEditView()->InsertText( xTrans, ::rtl::OUString(), sal_False );
     else
     {
         ScDrawTextObjectBar* pTextShell = PTR_CAST( ScDrawTextObjectBar, GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) );
@@ -2360,7 +2360,7 @@ void SAL_CALL ScTabViewObj::insertTransferable( const ::com::sun::star::uno::Ref
             OutlinerView* pOutView = pView->GetTextEditOutlinerView();
             if ( pOutView )
             {
-                pOutView->GetEditView().InsertText( xTrans, ::rtl::OUString(), FALSE );
+                pOutView->GetEditView().InsertText( xTrans, ::rtl::OUString(), sal_False );
                 return;
             }
         }
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index 77f80b889..436defe17 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -167,7 +167,7 @@ implnCut( const uno::Reference< frame::XModel>& xModel )
     ScTabViewShell* pViewShell =  getBestViewShell( xModel );
     if ( pViewShell )
     {
-        pViewShell->CutToClip( NULL, TRUE );
+        pViewShell->CutToClip( NULL, sal_True );
 
         // mark the copied transfer object so it is used in ScVbaRange::Insert
         ScTransferObj* pClipObj = ScTransferObj::GetOwnClipboard( NULL );
@@ -176,7 +176,7 @@ implnCut( const uno::Reference< frame::XModel>& xModel )
     }
 }
 
-void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
+void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
 {
     PasteCellsWarningReseter resetWarningBox;
     sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
@@ -202,7 +202,7 @@ void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, USHORT nFl
                 }
                 pTabViewShell->PasteFromClip( nFlags, pDoc,
                     nFunction, bSkipEmpty, bTranspose, bAsLink,
-                    eMoveMode, IDF_NONE, TRUE );
+                    eMoveMode, IDF_NONE, sal_True );
                 pTabViewShell->CellContentChanged();
             }
         }
diff --git a/sc/source/ui/vba/makefile.mk b/sc/source/ui/vba/makefile.mk
index 5842b9023..dd489830b 100644
--- a/sc/source/ui/vba/makefile.mk
+++ b/sc/source/ui/vba/makefile.mk
@@ -37,10 +37,6 @@ VISIBILITY_HIDDEN=TRUE
 .INCLUDE :  settings.mk
 DLLPRE =
 
-.IF "$(ENABLE_VBA)"!="YES"
-dummy:
-        @echo "not building vba..."
-.ENDIF
 .IF "$(L10N_framework)"==""
 INCPRE=$(INCCOM)$/$(TARGET)
 
diff --git a/sc/source/ui/vba/testvba/makefile.mk b/sc/source/ui/vba/testvba/makefile.mk
index fb131f314..534085e32 100644
--- a/sc/source/ui/vba/testvba/makefile.mk
+++ b/sc/source/ui/vba/testvba/makefile.mk
@@ -36,11 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 DLLPRE =
 
-.IF "$(ENABLE_VBA)"!="YES"
-dummy:
-        @echo "not building vba..."
-.ENDIF
-
 INCPRE=$(INCCOM)$/$(TARGET)
 CDEFS+=-DVBA_OOBUILD_HACK
 # ------------------------------------------------------------------
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index a0683a815..c87aee064 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -481,7 +481,6 @@ void SAL_CALL
 ScVbaApplication::wait( double time ) throw (uno::RuntimeException)
 {
     StarBASIC* pBasic = SFX_APP()->GetBasic();
-    SFX_APP()->EnterBasicCall();
     SbxArrayRef aArgs = new SbxArray;
     SbxVariableRef aRef = new SbxVariable;
     aRef->PutDouble( time );
@@ -495,8 +494,6 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException)
         // forces a broadcast
         SbxVariableRef pNew = new  SbxMethod( *((SbxMethod*)pMeth));
     }
-    SFX_APP()->LeaveBasicCall();
-
 }
 
 uno::Any SAL_CALL 
@@ -1164,7 +1161,6 @@ uno::Any SAL_CALL
 ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException )
 {
     StarBASIC* pBasic = SFX_APP()->GetBasic();
-    SFX_APP()->EnterBasicCall();
     SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD );
     uno::Any aRet;	
     if ( pMeth )
@@ -1175,7 +1171,6 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep
                 OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetString(), RTL_TEXTENCODING_UTF8 ).getStr() );
         aRet = sbxToUnoValue( pNew );
     }
-    SFX_APP()->LeaveBasicCall();
     return aRet;
 }
 
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index 02dbf74bf..c8e81d24c 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -229,7 +229,7 @@ uno::Any SAL_CALL
 ScVbaFont::getSize() throw ( uno::RuntimeException )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
         return ScVbaFont_BASE::getSize();
 }
@@ -256,7 +256,7 @@ uno::Any SAL_CALL
 ScVbaFont::getColorIndex() throw ( uno::RuntimeException )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getColorIndex();
 }
@@ -355,7 +355,7 @@ uno::Any SAL_CALL
 ScVbaFont::getBold() throw ( uno::RuntimeException )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getBold();
 }
@@ -398,7 +398,7 @@ uno::Any SAL_CALL
 ScVbaFont::getUnderline() throw ( uno::RuntimeException )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
 
     sal_Int32 nValue = awt::FontUnderline::NONE;
@@ -425,7 +425,7 @@ uno::Any SAL_CALL
 ScVbaFont::getStrikethrough() throw ( uno::RuntimeException )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getStrikethrough();
 }
@@ -434,7 +434,7 @@ uno::Any SAL_CALL
 ScVbaFont::getShadow() throw (uno::RuntimeException)
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getShadow();
 }
@@ -443,7 +443,7 @@ uno::Any SAL_CALL
 ScVbaFont::getItalic() throw ( uno::RuntimeException )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_POSTURE, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_POSTURE, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
 
     return ScVbaFont_BASE::getItalic();
@@ -453,7 +453,7 @@ uno::Any SAL_CALL
 ScVbaFont::getName() throw ( uno::RuntimeException )
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
     return ScVbaFont_BASE::getName();
 }
@@ -476,7 +476,7 @@ uno::Any SAL_CALL
 ScVbaFont::getOutlineFont() throw (uno::RuntimeException)
 {
     if ( GetDataSet() )
-        if (  GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, TRUE, NULL) == SFX_ITEM_DONTCARE )
+        if (  GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE )
             return aNULL();
     return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ) );
 }
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index c9df5c256..35acf878d 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -582,8 +582,8 @@ ScVbaFormat<Ifc1>::getLocked(  ) throw (script::BasicErrorException, uno::Runtim
             SfxItemSet* pDataSet = getCurrentDataSet();
             if ( pDataSet )
             {
-                const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, TRUE);
-                SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, TRUE, NULL);
+                const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, sal_True);
+                SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, sal_True, NULL);
                 if(eState != SFX_ITEM_DONTCARE)
                     aCellProtection =  uno::makeAny(rProtAttr.GetProtection());
             }
@@ -615,8 +615,8 @@ ScVbaFormat<Ifc1>::getFormulaHidden(  ) throw (script::BasicErrorException, uno:
             SfxItemSet* pDataSet = getCurrentDataSet();
             if ( pDataSet )
             {
-                const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, TRUE);
-                SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, TRUE, NULL);
+                const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, sal_True);
+                SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, sal_True, NULL);
                 if(eState != SFX_ITEM_DONTCARE)
                     aBoolRet = uno::makeAny(rProtAttr.GetHideFormula());
             }
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 1248b4c73..847052138 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -160,7 +160,7 @@ public:
     }
 };
 
-void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall)
+void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, sal_uInt16 nSlot, SfxCallMode nCall)
 {
     ScTabViewShell* pViewShell = getBestViewShell( xModel );
     SfxViewFrame* pViewFrame = NULL;
@@ -202,10 +202,10 @@ implnCut()
 {
     ScTabViewShell* pViewShell =  getCurrentBestViewShell();
     if ( pViewShell )
-        pViewShell->CutToClip( NULL, TRUE );
+        pViewShell->CutToClip( NULL, sal_True );
 }
 
-void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
+void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
 {
     PasteCellsWarningReseter resetWarningBox;
     sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
@@ -231,7 +231,7 @@ void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_B
                     pDoc = pOwnClip->GetDocument();	
                 pTabViewShell->PasteFromClip( nFlags, pDoc,
                     nFunction, bSkipEmpty, bTranspose, bAsLink,
-                    eMoveMode, IDF_NONE, TRUE );
+                    eMoveMode, IDF_NONE, sal_True );
                 pTabViewShell->CellContentChanged();
             }
         }
@@ -460,7 +460,7 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
                 }
             }
             else
-                pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
+                pDispatcher->Execute( (sal_uInt16)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
         }
             
     }
diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx
index 529b9a273..3675aa2d9 100755..100644
--- a/sc/source/ui/vba/vbahyperlinks.cxx
+++ b/sc/source/ui/vba/vbahyperlinks.cxx
@@ -48,7 +48,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan
     if( (rScInner.Count() == 0) || (rScOuter.Count() == 0) )
         throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Empty range objects" ) ), uno::Reference< uno::XInterface >() );
 
-    for( ULONG nIndex = 0, nCount = rScInner.Count(); nIndex < nCount; ++nIndex )
+    for( sal_uLong nIndex = 0, nCount = rScInner.Count(); nIndex < nCount; ++nIndex )
         if( !rScOuter.In( *rScInner.GetObject( nIndex ) ) )
             return false;
     return true;
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index eeba5be38..82911a3b0 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -76,7 +76,7 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeEx
     if( nCount )
     {
         ScAddress::Details aDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
-        USHORT nFlags = SCA_VALID;
+        sal_uInt16 nFlags = SCA_VALID;
         nFlags |= ( SCA_TAB_ABSOLUTE | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB2_ABSOLUTE | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE );
         ScRangeList aRangeList;
         for( sal_Int32 i=0; i<nCount; i++ )
@@ -109,7 +109,7 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw
         if( getScRangeListForAddress( rAreas, excel::getDocShell( mxModel ) , aRange, aCellRanges ) ) 
         {
             uno::Sequence< table::CellRangeAddress > aSeq( aCellRanges.Count() );
-            USHORT i=0;
+            sal_uInt16 i=0;
             for( ScRange* pRange = aCellRanges.First(); pRange; pRange = aCellRanges.Next() )
             {
                 table::CellRangeAddress aRangeAddress;
@@ -148,7 +148,7 @@ uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeEx
 
 void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) throw (css::uno::RuntimeException)
 {
-    USHORT scaleToPageY = 0;
+    sal_uInt16 scaleToPageY = 0;
     try
     {
         sal_Bool aValue;
@@ -171,7 +171,7 @@ uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() throw (css::uno::RuntimeEx
 
 void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) throw (css::uno::RuntimeException)
 {
-    USHORT scaleToPageX = 0;
+    sal_uInt16 scaleToPageX = 0;
     try
     {
         sal_Bool aValue = sal_False;
@@ -194,7 +194,7 @@ uno::Any SAL_CALL ScVbaPageSetup::getZoom() throw (css::uno::RuntimeException)
 
 void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::RuntimeException)
 {
-    USHORT pageScale = 0;
+    sal_uInt16 pageScale = 0;
     try
     {
         if( zoom.getValueTypeClass() == uno::TypeClass_BOOLEAN )
@@ -216,7 +216,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru
         }
 
         // these only exist in S08
-        USHORT nScale = 0;
+        sal_uInt16 nScale = 0;
         mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleToPages")), uno::makeAny( nScale ));
         mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleToPagesX")), uno::makeAny( nScale ));
         mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleToPagesY")), uno::makeAny( nScale ));
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 843f61cbe..fc9988613 100755
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -188,13 +188,13 @@ double lcl_hmmToPoints( double nVal ) { return ( (double)((nVal /1000 ) * 567 )
 
 static const sal_Int16 supportedIndexTable[] = {  excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal };
 
-USHORT lcl_pointsToTwips( double nVal ) 
+sal_uInt16 lcl_pointsToTwips( double nVal ) 
 { 
     nVal = nVal * static_cast<double>(20);
     short nTwips = static_cast<short>(nVal);
     return nTwips;
 }
-double lcl_TwipsToPoints( USHORT nVal ) 
+double lcl_TwipsToPoints( sal_uInt16 nVal ) 
 { 
     double nPoints = nVal;
     return nPoints / 20; 
@@ -549,7 +549,7 @@ public:
         {
 
             SfxItemSet* pDataSet = 	excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
-            SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
+            SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, sal_True, NULL);
             // one of the cells in the range is not like the other ;-)
             // so return a zero length format to indicate that
             if ( eState == SFX_ITEM_DONTCARE )
@@ -1151,7 +1151,7 @@ public:
 };
 
 bool
-getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv )
+getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv )
 {
     
     ScDocument* pDoc = NULL;
@@ -1159,8 +1159,8 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc
     {
         pDoc = pDocSh->GetDocument();
         String aString(sAddress);
-        USHORT nMask = SCA_VALID;
-        //USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
+        sal_uInt16 nMask = SCA_VALID;
+        //sal_uInt16 nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
         rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, 0 );
         if ( rResFlags & SCA_VALID )
         {
@@ -1205,7 +1205,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
             eConv = pDocSh->GetDocument()->GetAddressConvention();
         }	
 
-        USHORT nFlags = 0;
+        sal_uInt16 nFlags = 0;
         if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv ) )
             return false;
     
@@ -2028,7 +2028,7 @@ ScVbaRange::Address(  const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut
         if ( refStyle == excel::XlReferenceStyle::xlR1C1 )
             dDetails = ScAddress::Details( formula::FormulaGrammar::CONV_XL_R1C1, 0, 0 );
     }
-    USHORT nFlags = SCA_VALID;
+    sal_uInt16 nFlags = SCA_VALID;
     ScDocShell* pDocShell =  getScDocShell();
     ScDocument* pDoc =  pDocShell->GetDocument();
 
@@ -2036,8 +2036,8 @@ ScVbaRange::Address(  const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut
     table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
     ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
     String sRange;
-    USHORT ROW_ABSOLUTE = ( SCA_ROW_ABSOLUTE | SCA_ROW2_ABSOLUTE );
-    USHORT COL_ABSOLUTE = ( SCA_COL_ABSOLUTE | SCA_COL2_ABSOLUTE );
+    sal_uInt16 ROW_ABSOLUTE = ( SCA_ROW_ABSOLUTE | SCA_ROW2_ABSOLUTE );
+    sal_uInt16 COL_ABSOLUTE = ( SCA_COL_ABSOLUTE | SCA_COL2_ABSOLUTE );
     // default
     nFlags |= ( SCA_TAB_ABSOLUTE | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB2_ABSOLUTE | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE );
     if ( RowAbsolute.hasValue() )
@@ -2225,7 +2225,7 @@ void setCursor(  const SCCOL& nCol, const SCROW& nRow, const uno::Reference< fra
         if ( bInSel )
             pShell->SetCursor( nCol, nRow );
         else
-            pShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_NONE, FALSE, FALSE, TRUE, FALSE );
+            pShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_NONE, sal_False, sal_False, sal_True, sal_False );
     }
 }
 
@@ -2607,7 +2607,7 @@ ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeExcept
 
     SfxItemSet* pDataSet = getCurrentDataSet();
     
-    SfxItemState eState = pDataSet->GetItemState( ATTR_LINEBREAK, TRUE, NULL);
+    SfxItemState eState = pDataSet->GetItemState( ATTR_LINEBREAK, sal_True, NULL);
     if ( eState == SFX_ITEM_DONTCARE )
         return aNULL();
     
@@ -2747,10 +2747,10 @@ uno::Any SAL_CALL ScVbaRange::getCellRange(  ) throw (uno::RuntimeException)
     throw uno::RuntimeException();
 }
 
-static USHORT 
+static sal_uInt16 
 getPasteFlags (sal_Int32 Paste)
 {
-    USHORT nFlags = IDF_NONE;	
+    sal_uInt16 nFlags = IDF_NONE;	
     switch (Paste) {
         case excel::XlPasteType::xlPasteComments: 
         nFlags = IDF_NOTE;break;
@@ -2778,10 +2778,10 @@ getPasteFlags (sal_Int32 Paste)
 return nFlags;
 }
 
-static USHORT 
+static sal_uInt16 
 getPasteFormulaBits( sal_Int32 Operation)
 {
-    USHORT nFormulaBits = PASTE_NOFUNC ;
+    sal_uInt16 nFormulaBits = PASTE_NOFUNC ;
     switch (Operation)
     {
     case excel::XlPasteSpecialOperation::xlPasteSpecialOperationAdd: 
@@ -2828,8 +2828,8 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
     if ( Transpose.hasValue() )
         Transpose >>= bTranspose;
 
-    USHORT nFlags = getPasteFlags(nPaste);
-    USHORT nFormulaBits = getPasteFormulaBits(nOperation);
+    sal_uInt16 nFlags = getPasteFlags(nPaste);
+    sal_uInt16 nFormulaBits = getPasteFormulaBits(nOperation);
     excel::implnPasteSpecial(pShell->GetModel(), nFlags,nFormulaBits,bSkipBlanks,bTranspose);
     // restore selection
     xSelection->select( uno::makeAny( xSel ) );
@@ -3357,9 +3357,9 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
         nOrientation = ::comphelper::getINT16( Orientation );
         // persist new option to be next calls default
         if ( nOrientation == excel::XlSortOrientation::xlSortRows )
-            aSortParam.bByRow = FALSE;
+            aSortParam.bByRow = sal_False;
         else
-            aSortParam.bByRow = TRUE;
+            aSortParam.bByRow = sal_True;
 
     }
 
@@ -3419,26 +3419,26 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
     {
         nOrder1 = ::comphelper::getINT16(Order1);
         if (  nOrder1 == excel::XlSortOrder::xlAscending ) 
-            aSortParam.bAscending[0]  = TRUE;
+            aSortParam.bAscending[0]  = sal_True;
         else
-            aSortParam.bAscending[0]  = FALSE;
+            aSortParam.bAscending[0]  = sal_False;
 
     }
     if ( Order2.hasValue() )
     {
         nOrder2 = ::comphelper::getINT16(Order2);
         if ( nOrder2 == excel::XlSortOrder::xlAscending ) 
-            aSortParam.bAscending[1]  = TRUE;
+            aSortParam.bAscending[1]  = sal_True;
         else
-            aSortParam.bAscending[1]  = FALSE;
+            aSortParam.bAscending[1]  = sal_False;
     }
     if ( Order3.hasValue() )
     {
         nOrder3 = ::comphelper::getINT16(Order3);
         if ( nOrder3 == excel::XlSortOrder::xlAscending ) 
-            aSortParam.bAscending[2]  = TRUE;
+            aSortParam.bAscending[2]  = sal_True;
         else
-            aSortParam.bAscending[2]  = FALSE;
+            aSortParam.bAscending[2]  = sal_False;
     }
 
     uno::Reference< table::XCellRange > xKey1;	
@@ -3526,7 +3526,7 @@ ScVbaRange::End( ::sal_Int32 Direction )  throw (uno::RuntimeException)
         aArgs.Put( sfxAsync, sfxAsync.Which() );
         SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
 
-        USHORT nSID = 0;
+        sal_uInt16 nSID = 0;
     
         switch( Direction )
         {
@@ -3683,7 +3683,7 @@ double
 ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno::RuntimeException)
 {
     ScDocument* pDoc = getScDocument();
-    USHORT nWidth = pDoc->GetOriginalWidth( static_cast< SCCOL >( rAddress.StartColumn ), static_cast< SCTAB >( rAddress.Sheet ) );
+    sal_uInt16 nWidth = pDoc->GetOriginalWidth( static_cast< SCCOL >( rAddress.StartColumn ), static_cast< SCTAB >( rAddress.Sheet ) );
     double nPoints = lcl_TwipsToPoints( nWidth );
     nPoints = lcl_Round2DecPlaces( nPoints );
     return nPoints;
@@ -3693,7 +3693,7 @@ double
 ScVbaRange::getCalcRowHeight( const table::CellRangeAddress& rAddress ) throw (uno::RuntimeException)
 {
     ScDocument* pDoc = getDocumentFromRange( mxRange );
-    USHORT nWidth = pDoc->GetOriginalHeight( rAddress.StartRow, rAddress.Sheet );
+    sal_uInt16 nWidth = pDoc->GetOriginalHeight( rAddress.StartRow, rAddress.Sheet );
     double nPoints = lcl_TwipsToPoints( nWidth );
     nPoints = lcl_Round2DecPlaces( nPoints );
     return nPoints;	
@@ -3732,11 +3732,11 @@ ScVbaRange::getColumnWidth() throw (uno::RuntimeException)
         table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();	
         sal_Int32 nStartCol = thisAddress.StartColumn;
         sal_Int32 nEndCol = thisAddress.EndColumn;
-        USHORT nColTwips = 0;
+        sal_uInt16 nColTwips = 0;
         for( sal_Int32 nCol = nStartCol ; nCol <= nEndCol; ++nCol )
         {
             thisAddress.StartColumn = nCol;
-            USHORT nCurTwips = pShell->GetDocument()->GetOriginalWidth( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCTAB >( thisAddress.Sheet ) );
+            sal_uInt16 nCurTwips = pShell->GetDocument()->GetOriginalWidth( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCTAB >( thisAddress.Sheet ) );
             if ( nCol == nStartCol ) 
                 nColTwips =  nCurTwips;
             if ( nColTwips != nCurTwips )
@@ -3773,15 +3773,15 @@ ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeEx
                 nColWidth = ( nColWidth + fExtraWidth ) * getDefaultCharWidth( pDocShell );
             RangeHelper thisRange( mxRange );	
             table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
-            USHORT nTwips = lcl_pointsToTwips( nColWidth );
+            sal_uInt16 nTwips = lcl_pointsToTwips( nColWidth );
             
             ScDocFunc aFunc(*pDocShell);
             SCCOLROW nColArr[2];
             nColArr[0] = thisAddress.StartColumn;
             nColArr[1] = thisAddress.EndColumn;
             // #163561# use mode SC_SIZE_DIRECT: hide for width 0, show for other values
-            aFunc.SetWidthOrHeight( TRUE, 1, nColArr, thisAddress.Sheet, SC_SIZE_DIRECT,
-                                                                                nTwips, TRUE, TRUE );		
+            aFunc.SetWidthOrHeight( sal_True, 1, nColArr, thisAddress.Sheet, SC_SIZE_DIRECT,
+                                                                                nTwips, sal_True, sal_True );		
             
         }
 }
@@ -3896,7 +3896,7 @@ ScVbaRange::getRowHeight() throw (uno::RuntimeException)
     
     sal_Int32 nStartRow = thisAddress.StartRow;
     sal_Int32 nEndRow = thisAddress.EndRow;
-        USHORT nRowTwips = 0;
+        sal_uInt16 nRowTwips = 0;
     // #TODO probably possible to use the SfxItemSet ( and see if
     //  SFX_ITEM_DONTCARE is set ) to improve performance
 // #CHECKME looks like this is general behaviour not just row Range specific
@@ -3907,7 +3907,7 @@ ScVbaRange::getRowHeight() throw (uno::RuntimeException)
         for ( sal_Int32 nRow = nStartRow ; nRow <= nEndRow; ++nRow )
         {
             thisAddress.StartRow = nRow;
-            USHORT nCurTwips = pShell->GetDocument()->GetOriginalHeight( thisAddress.StartRow, thisAddress.Sheet );
+            sal_uInt16 nCurTwips = pShell->GetDocument()->GetOriginalHeight( thisAddress.StartRow, thisAddress.Sheet );
             if ( nRow == nStartRow )
                 nRowTwips = nCurTwips;
             if ( nRowTwips != nCurTwips )
@@ -3936,7 +3936,7 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti
     nHeight = lcl_Round2DecPlaces( nHeight );
     RangeHelper thisRange( mxRange );	
     table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
-    USHORT nTwips = lcl_pointsToTwips( nHeight );
+    sal_uInt16 nTwips = lcl_pointsToTwips( nHeight );
     
     ScDocShell* pDocShell = getDocShellFromRange( mxRange );
     ScDocFunc aFunc(*pDocShell);
@@ -3944,8 +3944,8 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti
     nRowArr[0] = thisAddress.StartRow;
     nRowArr[1] = thisAddress.EndRow;
     // #163561# use mode SC_SIZE_DIRECT: hide for height 0, show for other values
-    aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, thisAddress.Sheet, SC_SIZE_DIRECT,
-                                                                        nTwips, TRUE, TRUE );		
+    aFunc.SetWidthOrHeight( sal_False, 1, nRowArr, thisAddress.Sheet, SC_SIZE_DIRECT,
+                                                                        nTwips, sal_True, sal_True );		
 }
 
 uno::Any SAL_CALL 
@@ -3957,10 +3957,10 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException)
     {
         RangeHelper thisRange( mxRange );
         table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
-        BOOL bColumn = FALSE;
+        sal_Bool bColumn = sal_False;
         
         if (thisAddress.StartRow==0)
-            bColumn = TRUE;
+            bColumn = sal_True;
         
         uno::Reference< frame::XModel > xModel = pShell->GetModel();
         if ( xModel.is() )
@@ -3997,10 +3997,10 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti
         table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
         if ((thisAddress.StartColumn==0) && (thisAddress.StartRow==0))
             return;
-        BOOL bColumn = FALSE;
+        sal_Bool bColumn = sal_False;
         
         if (thisAddress.StartRow==0)
-            bColumn = TRUE;
+            bColumn = sal_True;
         
         ScAddress aAddr( static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.StartRow, thisAddress.Sheet );	
         uno::Reference< frame::XModel > xModel = pShell->GetModel();
@@ -4008,9 +4008,9 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti
         {
             ScTabViewShell* pViewShell = excel::getBestViewShell( xModel );
             if ( nPageBreak == excel::XlPageBreak::xlPageBreakManual )
-                pViewShell->InsertPageBreak( bColumn, TRUE, &aAddr);
+                pViewShell->InsertPageBreak( bColumn, sal_True, &aAddr);
             else if ( nPageBreak == excel::XlPageBreak::xlPageBreakNone )
-                pViewShell->DeletePageBreak( bColumn, TRUE, &aAddr);
+                pViewShell->DeletePageBreak( bColumn, sal_True, &aAddr);
         }
     }
 }
@@ -4204,7 +4204,7 @@ ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet )
         ScDBCollection* pNames = pDocShell->GetDocument()->GetDBCollection();
         if (pNames)
         {
-            USHORT nPos = 0;
+            sal_uInt16 nPos = 0;
             if (pNames->SearchName( sName , nPos ))
                 pRet = (*pNames)[nPos];
         }
@@ -4220,7 +4220,7 @@ void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam )
         if ( pViewData )
         {
             OSL_TRACE("Pushing out SelectAll query");
-            pViewData->GetView()->Query( aParam, NULL, TRUE );
+            pViewData->GetView()->Query( aParam, NULL, sal_True );
         }
     }
 }
@@ -4401,7 +4401,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
                 SCROW nStartRow = autoFiltAddress.StartRow;
                 SCCOL nEndCol = autoFiltAddress.EndColumn;
                 SCROW nEndRow = autoFiltAddress.EndRow;
-                pDocument->GetDataArea( autoFiltAddress.Sheet, nStartCol, nStartRow, nEndCol, nEndRow, TRUE, true );
+                pDocument->GetDataArea( autoFiltAddress.Sheet, nStartCol, nStartRow, nEndCol, nEndRow, sal_True, true );
                 autoFiltAddress.StartColumn = nStartCol;
                 autoFiltAddress.StartRow = nStartRow;
                 autoFiltAddress.EndColumn = nEndCol;
@@ -4674,15 +4674,15 @@ ScVbaRange::Autofit() throw (uno::RuntimeException)
             SCCOLROW nColArr[2];
             nColArr[0] = thisAddress.StartColumn;
             nColArr[1] = thisAddress.EndColumn;
-            BOOL bDirection = TRUE;
+            sal_Bool bDirection = sal_True;
             if ( mbIsRows )
             {
-                bDirection = FALSE;
+                bDirection = sal_False;
                 nColArr[0] = thisAddress.StartRow;
                 nColArr[1] = thisAddress.EndRow;
             }
             aFunc.SetWidthOrHeight( bDirection, 1, nColArr, thisAddress.Sheet, SC_SIZE_OPTIMAL,
-                                                                                0, TRUE, TRUE );		
+                                                                                0, sal_True, sal_True );		
             
     }	
 }
@@ -5196,7 +5196,7 @@ ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const
     }
     ScDocFunc aFunc(*pDocSh);
 #ifdef VBA_OOBUILD_HACK
-    aFunc.FillAuto( aSourceRange, NULL, eDir, eCmd, eDateCmd, nCount, fStep, fEndValue, TRUE, TRUE );
+    aFunc.FillAuto( aSourceRange, NULL, eDir, eCmd, eDateCmd, nCount, fStep, fEndValue, sal_True, sal_True );
 #endif
 }
 sal_Bool SAL_CALL
@@ -5420,7 +5420,7 @@ ScVbaRange::PreviousNext( bool bIsPrevious )
     SCTAB nTab = refRange.aStart.Tab();
 
     ScDocument* pDoc = getScDocument(); 
-    pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, TRUE,TRUE, markedRange );	
+    pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, sal_True,sal_True, markedRange );	
     refRange.aStart.SetCol( nNewX );
     refRange.aStart.SetRow( nNewY );
     refRange.aStart.SetTab( nTab );
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 079ec5282..4dc75d98e 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -773,7 +773,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException)
 {
     sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
     _view >>= nWindowView;
-    USHORT nSlot = FID_NORMALVIEWMODE;
+    sal_uInt16 nSlot = FID_NORMALVIEWMODE;
     switch ( nWindowView )
     {
         case excel::XlWindowView::xlNormalView:
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 8e764d10e..2bbd6aee8 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -415,7 +415,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException)
                 bSelectSingle = false;
             }
             else
-                rMarkData.SelectTable( static_cast< SCTAB >( pSheet->getSheetID() ), TRUE );
+                rMarkData.SelectTable( static_cast< SCTAB >( pSheet->getSheetID() ), sal_True );
             
         }
     }
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index ab2159b50..3a7415651 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -68,7 +68,7 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) :
     nFunction( SID_FILL_ADD_PRED )
 {
     SetPool( &pViewData->GetViewShell()->GetPool() );
-    SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
+    ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
     SetUndoManager( pMgr );
     if ( !pViewData->GetDocument()->IsUndoEnabled() )
     {
@@ -89,7 +89,7 @@ ScAuditingShell::~ScAuditingShell()
 void ScAuditingShell::Execute( SfxRequest& rReq )
 {
     SfxBindings& rBindings = pViewData->GetBindings();
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch ( nSlot )
     {
         case SID_FILL_ADD_PRED:
@@ -104,7 +104,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
             break;
         case SID_CANCEL:		// Escape
         case SID_FILL_NONE:
-            pViewData->GetViewShell()->SetAuditShell( FALSE );
+            pViewData->GetViewShell()->SetAuditShell( sal_False );
             break;
 
         case SID_FILL_SELECT:
@@ -114,15 +114,15 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
                 {
                     const SfxPoolItem* pXItem;
                     const SfxPoolItem* pYItem;
-                    if ( pReqArgs->GetItemState( SID_RANGE_COL, TRUE, &pXItem ) == SFX_ITEM_SET
-                      && pReqArgs->GetItemState( SID_RANGE_ROW, TRUE, &pYItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( SID_RANGE_COL, sal_True, &pXItem ) == SFX_ITEM_SET
+                      && pReqArgs->GetItemState( SID_RANGE_ROW, sal_True, &pYItem ) == SFX_ITEM_SET )
                     {
                         DBG_ASSERT( pXItem->ISA(SfxInt16Item) && pYItem->ISA(SfxInt32Item),
                                         "falsche Items" );
                         SCsCOL nCol = static_cast<SCsCOL>(((const SfxInt16Item*) pXItem)->GetValue());
                         SCsROW nRow = static_cast<SCsROW>(((const SfxInt32Item*) pYItem)->GetValue());
                         ScViewFunc* pView = pViewData->GetView();
-                        pView->MoveCursorAbs( nCol, nRow, SC_FOLLOW_LINE, FALSE, FALSE );
+                        pView->MoveCursorAbs( nCol, nRow, SC_FOLLOW_LINE, sal_False, sal_False );
                         switch ( nFunction )
                         {
                             case SID_FILL_ADD_PRED:
@@ -149,7 +149,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
 
 void ScAuditingShell::GetState( SfxItemSet& rSet )
 {
-    rSet.Put( SfxBoolItem( nFunction, TRUE ) );			// aktive Funktion markieren
+    rSet.Put( SfxBoolItem( nFunction, sal_True ) );			// aktive Funktion markieren
 }
 
 
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 92082a8b4..d5bfd61c0 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -71,9 +71,6 @@
 #define	CellMovement
 #include "scslots.hxx"
 
-#define SearchSettings
-#include <svx/svxslots.hxx>
-
 TYPEINIT1( ScCellShell, ScFormatShell );
 
 SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell , ScResId(SCSTR_CELLSHELL) )
@@ -88,7 +85,7 @@ SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell , ScResId(SCSTR_CELLSHELL) )
 ScCellShell::ScCellShell(ScViewData* pData) :
     ScFormatShell(pData),
     pImpl( new CellShell_Impl() ),
-    bPastePossible(FALSE)
+    bPastePossible(sal_False)
 {
     SetHelpId(HID_SCSHELL_CELLSH);
     SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Cell")));
@@ -98,7 +95,7 @@ ScCellShell::~ScCellShell()
 {
     if ( pImpl->m_pClipEvtLstnr )
     {
-        pImpl->m_pClipEvtLstnr->AddRemoveListener( GetViewData()->GetActiveWin(), FALSE );
+        pImpl->m_pClipEvtLstnr->AddRemoveListener( GetViewData()->GetActiveWin(), sal_False );
 
         //  #103849# The listener may just now be waiting for the SolarMutex and call the link
         //  afterwards, in spite of RemoveListener. So the link has to be reset, too.
@@ -119,9 +116,9 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
     ScRange aMarkRange;
     ScMarkType eMarkType = GetViewData()->GetSimpleArea( aMarkRange );
-    BOOL bSimpleArea = (eMarkType == SC_MARK_SIMPLE);
-    BOOL bOnlyNotBecauseOfMatrix;
-    BOOL bEditable = pTabViewShell->SelectionEditable( &bOnlyNotBecauseOfMatrix );
+    sal_Bool bSimpleArea = (eMarkType == SC_MARK_SIMPLE);
+    sal_Bool bOnlyNotBecauseOfMatrix;
+    sal_Bool bEditable = pTabViewShell->SelectionEditable( &bOnlyNotBecauseOfMatrix );
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDocShell* pDocShell = GetViewData()->GetDocShell();
     ScMarkData& rMark = GetViewData()->GetMarkData();
@@ -133,11 +130,11 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
     nRow2 = aMarkRange.aEnd.Row();
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
-        BOOL bDisable = FALSE;
-        BOOL bNeedEdit = TRUE;		// muss Selektion editierbar sein?
+        sal_Bool bDisable = sal_False;
+        sal_Bool bNeedEdit = sal_True;		// muss Selektion editierbar sein?
         switch ( nWhich )
         {
             case FID_FILL_TO_BOTTOM:	// Fuellen oben/unten
@@ -171,7 +168,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
             case FID_FILL_SERIES:		// Block fuellen
             case SID_OPENDLG_TABOP:		// Mehrfachoperationen, mind. 2 Zellen markiert?
                 if (pDoc->GetChangeTrack()!=NULL &&nWhich ==SID_OPENDLG_TABOP)
-                    bDisable = TRUE;
+                    bDisable = sal_True;
                 else
                     bDisable = (!bSimpleArea) || (nCol1 == nCol2 && nRow1 == nRow2);
 
@@ -209,7 +206,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
                 //! muss man leben.. wird in Copy-Routine abgefangen, sonst
                 //! muesste hier nochmal Aufwand getrieben werden
                 if ( !(!bEditable && bOnlyNotBecauseOfMatrix) )
-                    bNeedEdit = FALSE;			// erlaubt, wenn geschuetzt/ReadOnly
+                    bNeedEdit = sal_False;			// erlaubt, wenn geschuetzt/ReadOnly
                 break;
 
             case SID_AUTOFORMAT:		// Autoformat, mind. 3x3 selektiert
@@ -221,11 +218,11 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
                 {
                     if ( !bEditable && bOnlyNotBecauseOfMatrix )
                     {
-                        bNeedEdit = FALSE;
+                        bNeedEdit = sal_False;
                     }
                     if ( pDocShell && pDocShell->IsDocShared() )
                     {
-                        bDisable = TRUE;
+                        bDisable = sal_True;
                     }
                 }
                 break;
@@ -236,14 +233,14 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
             case SID_ENABLE_HYPHENATION :
                 // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
                 if ( !bEditable && bOnlyNotBecauseOfMatrix )
-                    bNeedEdit = FALSE;
+                    bNeedEdit = sal_False;
                 break;
 
             case FID_VALIDATION:
                 {
                     if ( pDocShell && pDocShell->IsDocShared() )
                     {
-                        bDisable = TRUE;
+                        bDisable = sal_True;
                     }
                 }
                 break;
@@ -256,14 +253,14 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
             break;
         }
         if (!bDisable && bNeedEdit && !bEditable)
-            bDisable = TRUE;
+            bDisable = sal_True;
 
         if (bDisable)
             rSet.DisableItem(nWhich);
         else if (nWhich == SID_ENABLE_HYPHENATION)
         {
             // toggle slots need a bool item
-            rSet.Put( SfxBoolItem( nWhich, FALSE ) );
+            rSet.Put( SfxBoolItem( nWhich, sal_False ) );
         }
         nWhich = aIter.NextWhich();
     }
@@ -281,11 +278,11 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
                         GetViewData()->GetTabNo() );
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
-        BOOL bDisable = FALSE;
-        BOOL bNeedEdit = TRUE;		// muss Cursorposition editierbar sein?
+        sal_Bool bDisable = sal_False;
+        sal_Bool bNeedEdit = sal_True;		// muss Cursorposition editierbar sein?
         switch ( nWhich )
         {
             case SID_THESAURUS:
@@ -295,7 +292,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
                     if (!bDisable)
                     {
                         //	test for available languages
-                        USHORT nLang = ScViewUtil::GetEffLanguage( pDoc, aCursor );
+                        sal_uInt16 nLang = ScViewUtil::GetEffLanguage( pDoc, aCursor );
                         bDisable = !ScModule::HasThesaurusLanguage( nLang );
                     }
                 }
@@ -311,9 +308,9 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
                         if (!pDoc->IsBlockEditable( aCursor.Tab(), aRange.aStart.Col(),aRange.aStart.Row(),
                                             aRange.aEnd.Col(),aRange.aEnd.Row() ))
                         {
-                            bDisable = TRUE;
+                            bDisable = sal_True;
                         }
-                        bNeedEdit=FALSE;
+                        bNeedEdit=sal_False;
                     }
 
                 }
@@ -322,7 +319,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
                 {
                     if ( pDocShell && pDocShell->IsDocShared() )
                     {
-                        bDisable = TRUE;
+                        bDisable = sal_True;
                     }
                 }
                 break;
@@ -330,7 +327,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
         if (!bDisable && bNeedEdit)
             if (!pDoc->IsBlockEditable( aCursor.Tab(), aCursor.Col(),aCursor.Row(),
                                         aCursor.Col(),aCursor.Row() ))
-                bDisable = TRUE;
+                bDisable = sal_True;
         if (bDisable)
             rSet.DisableItem(nWhich);
         nWhich = aIter.NextWhich();
@@ -374,7 +371,7 @@ sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHe
 void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats )
 {
     Window* pWin = GetViewData()->GetActiveWin();
-    BOOL bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
+    sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
 
     TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) );
 
@@ -402,11 +399,11 @@ void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats )
 
 //	Einfuegen, Inhalte einfuegen
 
-BOOL lcl_IsCellPastePossible( const TransferableDataHelper& rData )
+sal_Bool lcl_IsCellPastePossible( const TransferableDataHelper& rData )
 {
-    BOOL bPossible = FALSE;
+    sal_Bool bPossible = sal_False;
     if ( ScTransferObj::GetOwnClipboard( NULL ) || ScDrawTransferObj::GetOwnClipboard( NULL ) )
-        bPossible = TRUE;
+        bPossible = sal_True;
     else
     {
         if ( rData.HasFormat( SOT_FORMAT_BITMAP ) ||
@@ -426,7 +423,7 @@ BOOL lcl_IsCellPastePossible( const TransferableDataHelper& rData )
              rData.HasFormat( SOT_FORMATSTR_ID_HTML_SIMPLE ) ||
              rData.HasFormat( SOT_FORMATSTR_ID_DIF ) )
         {
-            bPossible = TRUE;
+            bPossible = sal_True;
         }
     }
     return bPossible;
@@ -459,14 +456,14 @@ void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet )
         pImpl->m_pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScCellShell, ClipboardChanged ) );
         pImpl->m_pClipEvtLstnr->acquire();
         Window* pWin = GetViewData()->GetActiveWin();
-        pImpl->m_pClipEvtLstnr->AddRemoveListener( pWin, TRUE );
+        pImpl->m_pClipEvtLstnr->AddRemoveListener( pWin, sal_True );
 
         // get initial state
         TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) );
         bPastePossible = lcl_IsCellPastePossible( aDataHelper );
     }
 
-    BOOL bDisable = !bPastePossible;
+    sal_Bool bDisable = !bPastePossible;
 
     //	Zellschutz / Multiselektion
 
@@ -477,11 +474,11 @@ void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet )
         SCTAB nTab = GetViewData()->GetTabNo();
         ScDocument* pDoc = GetViewData()->GetDocShell()->GetDocument();
         if (!pDoc->IsBlockEditable( nTab, nCol,nRow, nCol,nRow ))
-            bDisable = TRUE;
+            bDisable = sal_True;
         ScRange aDummy;
         ScMarkType eMarkType = GetViewData()->GetSimpleArea( aDummy);
         if (eMarkType != SC_MARK_SIMPLE && eMarkType != SC_MARK_SIMPLE_FILTERED)
-            bDisable = TRUE;
+            bDisable = sal_True;
     }
 
     if (bDisable)
@@ -519,8 +516,8 @@ void ScCellShell::GetState(SfxItemSet &rSet)
     // removed: SID_BORDER_OBJECT (old Basic)
 
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
-//     BOOL bOle = pTabViewShell->GetViewFrame()->GetFrame().IsInPlace();
-// 	BOOL bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo());
+//     sal_Bool bOle = pTabViewShell->GetViewFrame()->GetFrame().IsInPlace();
+// 	sal_Bool bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo());
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScViewData* pData       = GetViewData();
     ScDocument* pDoc		= pData->GetDocument();
@@ -535,7 +532,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
 
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch ( nWhich )
@@ -551,7 +548,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                     if ( pData->GetSimpleArea( aRange ) == SC_MARK_SIMPLE )
                     {
                         String aStr;
-                        USHORT nFlags = SCA_VALID | SCA_TAB_3D;
+                        sal_uInt16 nFlags = SCA_VALID | SCA_TAB_3D;
                         aRange.Format(aStr,nFlags,pDoc);
                         rSet.Put( SfxStringItem( nWhich, aStr ) );
                     }
@@ -615,7 +612,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                      * 1: ER	Click erweitert Selektion
                      * 2: ERG	Click definiert weitere Selektion
                      */
-                    USHORT nMode = pTabViewShell->GetLockedModifiers();
+                    sal_uInt16 nMode = pTabViewShell->GetLockedModifiers();
 
                     switch ( nMode )
                     {
@@ -657,7 +654,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                             String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("...")) ) );
                     else
                     {
-                        USHORT nErrCode = 0;
+                        sal_uInt16 nErrCode = 0;
                         ScBaseCell* pCell;
                         pDoc->GetCell( nPosX, nPosY, nTab, pCell );
                         if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA )
@@ -750,7 +747,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                     if ( !pDoc->IsScenario(nTab) )
                     {
                         String aStr;
-                        USHORT nFlags;
+                        sal_uInt16 nFlags;
                         SCTAB nScTab = nTab + 1;
                         String aProtect;
                         bool bSheetProtected = pDoc->IsTabProtected(nTab);
@@ -761,7 +758,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                             aList.Insert( new String( aStr ), LIST_APPEND );
                             pDoc->GetScenarioData( nScTab, aStr, aDummyCol, nFlags );
                             aList.Insert( new String( aStr ), LIST_APPEND );
-                            // Protection is TRUE if both Sheet and Scenario are protected
+                            // Protection is sal_True if both Sheet and Scenario are protected
                             aProtect = (bSheetProtected && (nFlags & SC_SCENARIO_PROTECT)) ? '1' : '0';
                             aList.Insert( new String( aProtect), LIST_APPEND );
                             ++nScTab;
@@ -770,7 +767,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                     else
                     {
                         String	aComment;
-                        USHORT	nDummyFlags;
+                        sal_uInt16	nDummyFlags;
                         pDoc->GetScenarioData( nTab, aComment, aDummyCol, nDummyFlags );
                         DBG_ASSERT( aList.Count() == 0, "List not empty!" );
                         aList.Insert( new String( aComment ) );
@@ -778,8 +775,8 @@ void ScCellShell::GetState(SfxItemSet &rSet)
 
                     rSet.Put( SfxStringListItem( nWhich, &aList ) );
 
-                    ULONG nCount = aList.Count();
-                    for ( ULONG i=0; i<nCount; i++ )
+                    sal_uLong nCount = aList.Count();
+                    for ( sal_uLong i=0; i<nCount; i++ )
                         delete (String*) aList.GetObject(i);
                 }
                 break;
@@ -801,7 +798,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                     if ( pDoc->IsTabProtected(nTab) )
                     {
                         const SfxItemSet&		rAttrSet  = GetSelectionPattern()->GetItemSet();
-                        const ScProtectionAttr& rProtAttr = (const ScProtectionAttr&)rAttrSet.Get( ATTR_PROTECTION, TRUE );
+                        const ScProtectionAttr& rProtAttr = (const ScProtectionAttr&)rAttrSet.Get( ATTR_PROTECTION, sal_True );
                         if ( rProtAttr.GetProtection() )
                             rSet.DisableItem( nWhich );
                     }
@@ -827,7 +824,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                 {
                     //! test for data pilot operation
                 }
-                else if (!pTabViewShell->OutlinePossible(FALSE))
+                else if (!pTabViewShell->OutlinePossible(sal_False))
                     rSet.DisableItem( nWhich );
                 break;
 
@@ -837,7 +834,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                 {
                     //! test for data pilot operation
                 }
-                else if (!pTabViewShell->OutlinePossible(TRUE))
+                else if (!pTabViewShell->OutlinePossible(sal_True))
                     rSet.DisableItem( nWhich );
                 break;
 
@@ -850,7 +847,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
                     }
                     else
                     {
-                        BOOL bCol, bRow;
+                        sal_Bool bCol, bRow;
                         pTabViewShell->TestRemoveOutline( bCol, bRow );
                         if ( !bCol && !bRow )
                             rSet.DisableItem( nWhich );
@@ -906,21 +903,21 @@ void ScCellShell::GetState(SfxItemSet &rSet)
 
             case SID_DELETE_NOTE:
                 {
-                    BOOL bEnable = FALSE;
+                    sal_Bool bEnable = sal_False;
                     if ( rMark.IsMarked() || rMark.IsMultiMarked() )
                     {
                         if ( pDoc->IsSelectionEditable( rMark ) )
                         {
                             // look for at least one note in selection
                             ScRangeList aRanges;
-                            rMark.FillRangeListWithMarks( &aRanges, FALSE );
-                            ULONG nCount = aRanges.Count();
-                            for (ULONG nPos=0; nPos<nCount && !bEnable; nPos++)
+                            rMark.FillRangeListWithMarks( &aRanges, sal_False );
+                            sal_uLong nCount = aRanges.Count();
+                            for (sal_uLong nPos=0; nPos<nCount && !bEnable; nPos++)
                             {
                                 ScCellIterator aCellIter( pDoc, *aRanges.GetObject(nPos) );
                                 for( ScBaseCell* pCell = aCellIter.GetFirst(); pCell && !bEnable; pCell = aCellIter.GetNext() )
                                     if ( pCell->HasNote() )
-                                        bEnable = TRUE;             // note found
+                                        bEnable = sal_True;             // note found
                             }
                         }
                     }
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 47951fc09..1911537a9 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -109,7 +109,7 @@
 #include <svx/dialogs.hrc> //CHINA001
 #include "scabstdlg.hxx" //CHINA001
 #define IS_AVAILABLE(WhichId,ppItem) \
-    (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+    (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 
 #define C2U(cChar)  rtl::OUString::createFromAscii(cChar)
 
@@ -130,7 +130,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
     SfxBindings&		rBindings	= pTabViewShell->GetViewFrame()->GetBindings();
     const SfxItemSet*	pReqArgs	= rReq.GetArgs();
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
 
     pTabViewShell->HideListBox();					// Autofilter-DropDown-Listbox
 
@@ -221,7 +221,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     else
                     {
                         ScDocument* pDoc = GetViewData()->GetDocument();
-                        BOOL bTheFlag=(pDoc->GetChangeTrack()!=NULL);
+                        sal_Bool bTheFlag=(pDoc->GetChangeTrack()!=NULL);
 
 //CHINA001						ScInsertCellDlg* pDlg = new ScInsertCellDlg( pTabViewShell->GetDialogParent(),
 //CHINA001						bTheFlag);
@@ -294,7 +294,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     {
                         ScRange aRange;
                         ScDocument* pDoc = GetViewData()->GetDocument();
-                        BOOL bTheFlag=GetViewData()->IsMultiMarked() ||
+                        sal_Bool bTheFlag=GetViewData()->IsMultiMarked() ||
                             (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE_FILTERED) ||
                             (pDoc->GetChangeTrack() != NULL);
 
@@ -349,7 +349,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
         case SID_DELETE:
             {
-                USHORT	nFlags = IDF_NONE;
+                sal_uInt16	nFlags = IDF_NONE;
 
                 if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() )
                 {
@@ -360,7 +360,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         aFlags = ((const SfxStringItem*)pItem)->GetValue();
 
                     aFlags.ToUpperAscii();
-                    BOOL	bCont = TRUE;
+                    sal_Bool	bCont = sal_True;
 
                     for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ )
                     {
@@ -368,7 +368,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         {
                             case 'A': // Alle
                             nFlags |= IDF_ALL;
-                            bCont = FALSE; // nicht mehr weitermachen!
+                            bCont = sal_False; // nicht mehr weitermachen!
                             break;
                             case 'S': nFlags |= IDF_STRING;	break;
                             case 'V': nFlags |= IDF_VALUE; break;
@@ -461,10 +461,10 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
         case FID_FILL_TAB:
             {
-                USHORT nFlags = IDF_NONE;
-                USHORT nFunction = PASTE_NOFUNC;
-                BOOL bSkipEmpty = FALSE;
-                BOOL bAsLink	= FALSE;
+                sal_uInt16 nFlags = IDF_NONE;
+                sal_uInt16 nFunction = PASTE_NOFUNC;
+                sal_Bool bSkipEmpty = sal_False;
+                sal_Bool bAsLink	= sal_False;
 
                 if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() )
                 {
@@ -475,7 +475,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         aFlags = ((const SfxStringItem*)pItem)->GetValue();
 
                     aFlags.ToUpperAscii();
-                    BOOL	bCont = TRUE;
+                    sal_Bool	bCont = sal_True;
 
                     for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ )
                     {
@@ -483,7 +483,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         {
                             case 'A': // Alle
                             nFlags |= IDF_ALL;
-                            bCont = FALSE; // nicht mehr weitermachen!
+                            bCont = sal_False; // nicht mehr weitermachen!
                             break;
                             case 'S': nFlags |= IDF_STRING;	break;
                             case 'V': nFlags |= IDF_VALUE; break;
@@ -507,7 +507,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                                                                             RID_SCDLG_INSCONT, 0, /* nCheckDefaults */
                                                                                             &ScGlobal::GetRscString(STR_FILL_TAB));
                     DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
-                    pDlg->SetFillMode(TRUE);
+                    pDlg->SetFillMode(sal_True);
 
                     if (pDlg->Execute() == RET_OK)
                     {
@@ -557,14 +557,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 SCCOL nEndCol;
                 SCROW nEndRow;
                 SCTAB nEndTab;
-                USHORT nPossDir = FDS_OPT_NONE;
+                sal_uInt16 nPossDir = FDS_OPT_NONE;
                 FillDir		eFillDir	 = FILL_TO_BOTTOM;
                 FillCmd		eFillCmd	 = FILL_LINEAR;
                 FillDateCmd	eFillDateCmd = FILL_DAY;
                 double fStartVal = MAXDOUBLE;
                 double fIncVal	 = 1;
                 double fMaxVal	 = MAXDOUBLE;
-                BOOL   bDoIt	 = FALSE;
+                sal_Bool   bDoIt	 = sal_False;
 
                 GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab,
                                               nEndCol, nEndRow, nEndTab );
@@ -592,7 +592,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     sal_uInt32 nKey;
                     double	fTmpVal;
 
-                    bDoIt=FALSE;
+                    bDoIt=sal_False;
 
                     if( IS_AVAILABLE( FID_FILL_SERIES, &pItem ) )
                         aFillDir = ((const SfxStringItem*)pItem)->GetValue();
@@ -647,7 +647,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     if( pFormatter->IsNumberFormat( aFillMax, nKey, fTmpVal ))
                         fMaxVal = fTmpVal;
 
-                    bDoIt	= TRUE;
+                    bDoIt	= sal_True;
 
                 }
                 else // (pReqArgs == NULL) => Dialog hochziehen
@@ -752,7 +752,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
                     if ( nStartCol != nEndCol && nStartRow != nEndRow )
                     {
-                        pDlg->SetEdStartValEnabled(FALSE);
+                        pDlg->SetEdStartValEnabled(sal_False);
                     }
 
                     if ( pDlg->Execute() == RET_OK )
@@ -770,7 +770,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         fStartVal		= pDlg->GetStart();
                         fIncVal			= pDlg->GetStep();
                         fMaxVal			= pDlg->GetMax();
-                        bDoIt			= TRUE;
+                        bDoIt			= sal_True;
                     }
                     delete pDlg;
                 }
@@ -816,7 +816,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         }
                         rReq.AppendItem( SfxStringItem( FN_PARAM_2, aPara ) );
 
-                        ULONG nFormatKey = pFormatter->GetStandardFormat(NUMBERFORMAT_NUMBER,
+                        sal_uLong nFormatKey = pFormatter->GetStandardFormat(NUMBERFORMAT_NUMBER,
                                     ScGlobal::eLnge );
 
                         pFormatter->GetOutputString( fIncVal, nFormatKey, aPara, &pColor );
@@ -952,7 +952,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
         case SID_OUTLINE_HIDE:
             if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(),
                                     GetViewData()->GetCurY(), GetViewData()->GetTabNo() ) )
-                pTabViewShell->SetDataPilotDetails( FALSE );
+                pTabViewShell->SetDataPilotDetails( sal_False );
             else
                 pTabViewShell->HideMarkedOutlines();
             rReq.Done();
@@ -965,7 +965,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 if ( pDPObj )
                 {
                     Sequence<sheet::DataPilotFieldFilter> aFilters;
-                    USHORT nOrientation;
+                    sal_uInt16 nOrientation;
                     if ( pTabViewShell->HasSelectionForDrillDown( nOrientation ) )
                     {
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -977,7 +977,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         if ( pDlg->Execute() == RET_OK )
                         {
                             String aNewDimName( pDlg->GetDimensionName() );
-                            pTabViewShell->SetDataPilotDetails( TRUE, &aNewDimName );
+                            pTabViewShell->SetDataPilotDetails( sal_True, &aNewDimName );
                         }
                     }
                     else if ( !pDPObj->IsServiceData() &&
@@ -986,7 +986,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                    aFilters ) )
                         pTabViewShell->ShowDataPilotSourceData( *pDPObj, aFilters );
                     else
-                        pTabViewShell->SetDataPilotDetails( TRUE );
+                        pTabViewShell->SetDataPilotDetails( sal_True );
                 }
                 else
                     pTabViewShell->ShowMarkedOutlines();
@@ -996,8 +996,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
         case SID_OUTLINE_MAKE:
             {
-                BOOL bColumns = FALSE;
-                BOOL bOk = TRUE;
+                sal_Bool bColumns = sal_False;
+                sal_Bool bOk = sal_True;
 
                 if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(),
                                         GetViewData()->GetCurY(), GetViewData()->GetTabNo() ) )
@@ -1035,12 +1035,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     else
                         pTabViewShell->GroupDataPilot();
 
-                    bOk = FALSE;
+                    bOk = sal_False;
                 }
                 else if( pReqArgs != NULL )
                 {
                     const SfxPoolItem* pItem;
-                    bOk = FALSE;
+                    bOk = sal_False;
 
                     if( IS_AVAILABLE( SID_OUTLINE_MAKE, &pItem ) )
                     {
@@ -1049,30 +1049,30 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
                         switch( aCol.GetChar(0) )
                         {
-                            case 'R': bColumns=FALSE; bOk = TRUE;break;
-                            case 'C': bColumns=TRUE; bOk = TRUE;break;
+                            case 'R': bColumns=sal_False; bOk = sal_True;break;
+                            case 'C': bColumns=sal_True; bOk = sal_True;break;
                         }
                     }
                 }
                 else			// Dialog, wenn nicht ganze Zeilen/Spalten markiert
                 {
                     if ( GetViewData()->SimpleColMarked() && !GetViewData()->SimpleRowMarked() )
-                        bColumns = TRUE;
+                        bColumns = sal_True;
                     else if ( !GetViewData()->SimpleColMarked() && GetViewData()->SimpleRowMarked() )
-                        bColumns = FALSE;
+                        bColumns = sal_False;
                     else
                     {
 //CHINA001						ScGroupDlg* pDlg = new ScGroupDlg(pTabViewShell->GetDialogParent(),
-//CHINA001						RID_SCDLG_GRP_MAKE, FALSE );
+//CHINA001						RID_SCDLG_GRP_MAKE, sal_False );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                         DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
 
-                        AbstractScGroupDlg* pDlg = pFact->CreateAbstractScGroupDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_GRP_MAKE, RID_SCDLG_GRP_MAKE,FALSE);
+                        AbstractScGroupDlg* pDlg = pFact->CreateAbstractScGroupDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_GRP_MAKE, RID_SCDLG_GRP_MAKE,sal_False);
                         DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
                         if ( pDlg->Execute() == RET_OK )
                             bColumns = pDlg->GetColsChecked();
                         else
-                            bOk = FALSE;
+                            bOk = sal_False;
                         delete pDlg;
                     }
                 }
@@ -1092,19 +1092,19 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
         case SID_OUTLINE_REMOVE:
             {
-                BOOL bColumns = FALSE;
-                BOOL bOk = TRUE;
+                sal_Bool bColumns = sal_False;
+                sal_Bool bOk = sal_True;
 
                 if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(),
                                         GetViewData()->GetCurY(), GetViewData()->GetTabNo() ) )
                 {
                     pTabViewShell->UngroupDataPilot();
-                    bOk = FALSE;
+                    bOk = sal_False;
                 }
                 else if( pReqArgs != NULL )
                 {
                     const SfxPoolItem* pItem;
-                    bOk = FALSE;
+                    bOk = sal_False;
 
                     if( IS_AVAILABLE( SID_OUTLINE_REMOVE, &pItem ) )
                     {
@@ -1113,36 +1113,36 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
                         switch( aCol.GetChar(0) )
                         {
-                            case 'R': bColumns=FALSE; bOk = TRUE;break;
-                            case 'C': bColumns=TRUE; bOk = TRUE;break;
+                            case 'R': bColumns=sal_False; bOk = sal_True;break;
+                            case 'C': bColumns=sal_True; bOk = sal_True;break;
                         }
                     }
                 }
                 else			// Dialog nur, wenn Aufheben fuer Zeilen und Spalten moeglich
                 {
-                    BOOL bColPoss, bRowPoss;
+                    sal_Bool bColPoss, bRowPoss;
                     pTabViewShell->TestRemoveOutline( bColPoss, bRowPoss );
                     if ( bColPoss && bRowPoss )
                     {
                         //CHINA001 ScGroupDlg* pDlg = new ScGroupDlg( 	pTabViewShell->GetDialogParent(),
-                        //CHINA001 									RID_SCDLG_GRP_KILL, TRUE );
+                        //CHINA001 									RID_SCDLG_GRP_KILL, sal_True );
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                         DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
 
-                        AbstractScGroupDlg* pDlg = pFact->CreateAbstractScGroupDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_GRP_KILL, RID_SCDLG_GRP_KILL,TRUE);
+                        AbstractScGroupDlg* pDlg = pFact->CreateAbstractScGroupDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_GRP_KILL, RID_SCDLG_GRP_KILL,sal_True);
                         DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
                         if ( pDlg->Execute() == RET_OK )
                             bColumns = pDlg->GetColsChecked();
                         else
-                            bOk = FALSE;
+                            bOk = sal_False;
                         delete pDlg;
                     }
                     else if ( bColPoss )
-                        bColumns = TRUE;
+                        bColumns = sal_True;
                     else if ( bRowPoss )
-                        bColumns = FALSE;
+                        bColumns = sal_False;
                     else
-                        bOk = FALSE;
+                        bOk = sal_False;
                 }
                 if (bOk)
                 {
@@ -1165,7 +1165,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
         case SID_COPY:				// fuer Grafiken in DrawShell
             {
                 WaitObject aWait( GetViewData()->GetDialogParent() );
-                pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE );
+                pTabViewShell->CopyToClip( NULL, sal_False, sal_False, sal_True );
                 rReq.Done();
             }
             break;
@@ -1173,7 +1173,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
         case SID_CUT:				// fuer Grafiken in DrawShell
             {
                 WaitObject aWait( GetViewData()->GetDialogParent() );
-                pTabViewShell->CutToClip( NULL, TRUE );
+                pTabViewShell->CutToClip( NULL, sal_True );
                 rReq.Done();
             }
             break;
@@ -1189,10 +1189,10 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             {
                 WaitObject aWait( GetViewData()->GetDialogParent() );
 
-                ULONG nFormat = 0;
+                sal_uLong nFormat = 0;
                 const SfxPoolItem* pItem;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET &&
                      pItem->ISA(SfxUInt32Item) )
                 {
                     nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
@@ -1201,9 +1201,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 if ( nFormat )
                 {
                     Window* pWin = GetViewData()->GetActiveWin();
-                    BOOL bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != NULL );
-                    BOOL bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
-                    BOOL bOle = ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE );
+                    sal_Bool bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != NULL );
+                    sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
+                    sal_Bool bOle = ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE );
 
                     if ( bCells && bOle )
                         pTabViewShell->PasteFromSystem();
@@ -1222,16 +1222,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
         case FID_INS_CELL_CONTENTS:
             {
-                USHORT nFlags = IDF_NONE;
-                USHORT nFunction = PASTE_NOFUNC;
-                BOOL bSkipEmpty = FALSE;
-                BOOL bTranspose = FALSE;
-                BOOL bAsLink	= FALSE;
+                sal_uInt16 nFlags = IDF_NONE;
+                sal_uInt16 nFunction = PASTE_NOFUNC;
+                sal_Bool bSkipEmpty = sal_False;
+                sal_Bool bTranspose = sal_False;
+                sal_Bool bAsLink	= sal_False;
                 InsCellCmd eMoveMode = INS_NONE;
 
                 Window* pWin = GetViewData()->GetActiveWin();
                 ScDocument* pDoc = GetViewData()->GetDocument();
-                BOOL bOtherDoc = !pDoc->IsClipboardSource();
+                sal_Bool bOtherDoc = !pDoc->IsClipboardSource();
                 ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
                 if ( pOwnClip )
                 {
@@ -1246,7 +1246,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                             aFlags = ((const SfxStringItem*)pItem)->GetValue();
 
                         aFlags.ToUpperAscii();
-                        BOOL	bCont = TRUE;
+                        sal_Bool	bCont = sal_True;
 
                         for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ )
                         {
@@ -1254,7 +1254,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                             {
                                 case 'A': // Alle
                                 nFlags |= IDF_ALL;
-                                bCont = FALSE; // nicht mehr weitermachen!
+                                bCont = sal_False; // nicht mehr weitermachen!
                                 break;
                                 case 'S': nFlags |= IDF_STRING;	break;
                                 case 'V': nFlags |= IDF_VALUE; break;
@@ -1312,7 +1312,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                         SCROW  nClipStartY, nClipSizeY;
                                         pOwnClip->GetDocument()->GetClipStart( nClipStartX, nClipStartY );
                                         // for CutMode, filtered rows can always be included
-                                        pOwnClip->GetDocument()->GetClipArea( nClipSizeX, nClipSizeY, TRUE );
+                                        pOwnClip->GetDocument()->GetClipArea( nClipSizeX, nClipSizeY, sal_True );
                                         int nDisableShift = 0;
                                         if ( nClipStartX <= nPosX + nClipSizeX &&
                                                 nPosX <= nClipStartX + nClipSizeX )
@@ -1349,7 +1349,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                             else
                                 pTabViewShell->PasteFromClip( nFlags, pOwnClip->GetDocument(),
                                     nFunction, bSkipEmpty, bTranspose, bAsLink,
-                                    eMoveMode, IDF_NONE, TRUE );	// allow warning dialog
+                                    eMoveMode, IDF_NONE, sal_True );	// allow warning dialog
                         }
 
                         if( !pReqArgs )
@@ -1393,18 +1393,18 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 //	Clipboard-ID als Parameter angegeben? Basic "PasteSpecial(Format)"
                 const SfxPoolItem* pItem=NULL;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET &&
                      pItem->ISA(SfxUInt32Item) )
                 {
-                    ULONG nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
-                    BOOL bRet=TRUE;
+                    sal_uLong nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
+                    sal_Bool bRet=sal_True;
                     {
                         WaitObject aWait( GetViewData()->GetDialogParent() );
-                        BOOL bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
+                        sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
                         if ( bDraw && nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
                             pTabViewShell->PasteDraw();
                         else
-                            bRet = pTabViewShell->PasteFromSystem(nFormat, TRUE);       // TRUE: keine Fehlermeldungen
+                            bRet = pTabViewShell->PasteFromSystem(nFormat, sal_True);       // TRUE: keine Fehlermeldungen
                     }
 
                     if ( bRet )
@@ -1427,21 +1427,21 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     }
                     else                                    // Zeichenobjekte oder fremde Daten
                     {
-                        BOOL bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
+                        sal_Bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
 
                         SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                         GetPossibleClipboardFormats( aFormats );
 
-                        USHORT nFormatCount = aFormats.Count();
+                        sal_uInt16 nFormatCount = aFormats.Count();
                         if ( nFormatCount )
                         {
                             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                             SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( pTabViewShell->GetDialogParent() );
                             if ( pDlg )
                             {
-                            for (USHORT i=0; i<nFormatCount; i++)
+                            for (sal_uInt16 i=0; i<nFormatCount; i++)
                             {
-                                ULONG nFormatId = aFormats.GetClipbrdFormatId( i );
+                                sal_uLong nFormatId = aFormats.GetClipbrdFormatId( i );
                                 String aName = aFormats.GetClipbrdFormatName( i );
                                 // special case for paste dialog: '*' is replaced by object type
                                 if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE )
@@ -1451,7 +1451,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
                             TransferableDataHelper aDataHelper(
                                 TransferableDataHelper::CreateFromSystemClipboard( pWin ) );
-                            ULONG nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );
+                            sal_uLong nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );
                             if (nFormat > 0)
                             {
                                 {
@@ -1487,22 +1487,22 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
         //
 
         case FID_INS_ROWBRK:
-            pTabViewShell->InsertPageBreak( FALSE );
+            pTabViewShell->InsertPageBreak( sal_False );
             rReq.Done();
             break;
 
         case FID_INS_COLBRK:
-            pTabViewShell->InsertPageBreak( TRUE );
+            pTabViewShell->InsertPageBreak( sal_True );
             rReq.Done();
             break;
 
         case FID_DEL_ROWBRK:
-            pTabViewShell->DeletePageBreak( FALSE );
+            pTabViewShell->DeletePageBreak( sal_False );
             rReq.Done();
             break;
 
         case FID_DEL_COLBRK:
-            pTabViewShell->DeletePageBreak( TRUE );
+            pTabViewShell->DeletePageBreak( sal_True );
             rReq.Done();
             break;
 
@@ -1642,15 +1642,15 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             break;
 
         case SID_DEC_INDENT:
-            pTabViewShell->ChangeIndent( FALSE );
+            pTabViewShell->ChangeIndent( sal_False );
             break;
         case SID_INC_INDENT:
-            pTabViewShell->ChangeIndent( TRUE );
+            pTabViewShell->ChangeIndent( sal_True );
             break;
 
         case FID_USE_NAME:
             {
-                USHORT nFlags = pTabViewShell->GetCreateNameFlags();
+                sal_uInt16 nFlags = pTabViewShell->GetCreateNameFlags();
 
                 //CHINA001 ScNameCreateDlg* pDlg = new ScNameCreateDlg( 	pTabViewShell->GetDialogParent(), nFlags );
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -1673,7 +1673,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem;
                 if ( pReqArgs && SFX_ITEM_SET ==
-                        pReqArgs->GetItemState( SCITEM_CONSOLIDATEDATA, TRUE, &pItem ) )
+                        pReqArgs->GetItemState( SCITEM_CONSOLIDATEDATA, sal_True, &pItem ) )
                 {
                     const ScConsolidateParam& rParam =
                             ((const ScConsolidateItem*)pItem)->GetData();
@@ -1736,29 +1736,29 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             }
             else
             {
-                USHORT			nId  = ScNameDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScNameDlgWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
             }
             break;
 
         case SID_DEFINE_COLROWNAMERANGES:
             {
 
-                USHORT			nId  = ScColRowNameRangesDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScColRowNameRangesDlgWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
 
             }
             break;
 
         case SID_UPDATECHART:
             {
-                BOOL bAll = FALSE;
+                sal_Bool bAll = sal_False;
 
                 if( pReqArgs )
                 {
@@ -1828,7 +1828,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                 pScMod->InputKeyEvent( KeyEvent('=',KeyCode()) );
 
                                 String aName = pDlg->GetSelectedName();
-                                pHdl->InsertFunction( aName, FALSE );		// ohne "()"
+                                pHdl->InsertFunction( aName, sal_False );		// ohne "()"
                             }
                         }
                         break;
@@ -1874,7 +1874,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 {
                     bool bShow;
                     const SfxPoolItem* pItem;
-                    if ( pReqArgs && (pReqArgs->GetItemState( FID_NOTE_VISIBLE, TRUE, &pItem ) == SFX_ITEM_SET) )
+                    if ( pReqArgs && (pReqArgs->GetItemState( FID_NOTE_VISIBLE, sal_True, &pItem ) == SFX_ITEM_SET) )
                         bShow = ((const SfxBoolItem*) pItem)->GetValue();
                     else
                         bShow = !pNote->IsCaptionShown();
@@ -1904,14 +1904,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 const SfxItemSet *pArgs = rReq.GetArgs();
                 const SfxPoolItem* pItem = 0;
                 if ( pArgs )
-                    pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
+                    pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem);
                 if ( pItem )
                 {
                     const SfxStringItem* pStringItem = PTR_CAST( SfxStringItem, pItem );
                     if ( pStringItem )
                         aChars = pStringItem->GetValue();
                     const SfxPoolItem* pFtItem = NULL;
-                    pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem);
+                    pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem);
                     const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
                     if ( pFontItem )
                         aFontName = pFontItem->GetValue();
@@ -1931,7 +1931,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             }
             else
             {
-                //CHINA001 SvxCharacterMap* pDlg = new SvxCharacterMap( 	pTabViewShell->GetDialogParent(), FALSE );
+                //CHINA001 SvxCharacterMap* pDlg = new SvxCharacterMap( 	pTabViewShell->GetDialogParent(), sal_False );
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
 
                 // font color doesn't matter here
@@ -1940,7 +1940,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                                                 pTabViewShell->GetSelectionScriptType() );
 
                 SfxAllItemSet aSet( GetPool() );
-                aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
+                aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
                 aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), GetPool().GetWhich(SID_ATTR_CHAR_FONT) ) );
 
                 SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( pTabViewShell->GetDialogParent(), aSet,
@@ -1948,8 +1948,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
                 if ( pDlg->Execute() == RET_OK )
                 {
-                    SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, FALSE );
-                    SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
+                    SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, sal_False );
+                    SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False );
 
                     if ( pItem && pFontItem )
                     {
@@ -2000,7 +2000,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     const String& rName	  = pHyper->GetName();
                     const String& rURL	  = pHyper->GetURL();
                     const String& rTarget = pHyper->GetTargetFrame();
-                    USHORT nType = (USHORT) pHyper->GetInsertMode();
+                    sal_uInt16 nType = (sal_uInt16) pHyper->GetInsertMode();
 
                     pTabViewShell->InsertURL( rName, rURL, rTarget, nType );
                     rReq.Done();
@@ -2037,7 +2037,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 String aFilter;
                 String aOptions;
                 String aSource;
-                ULONG nRefresh=0;
+                sal_uLong nRefresh=0;
 
                 SFX_REQUEST_ARG( rReq, pFile, SfxStringItem, SID_FILE_NAME, sal_False );
                 SFX_REQUEST_ARG( rReq, pSource, SfxStringItem, FN_PARAM_1, sal_False );
@@ -2098,12 +2098,12 @@ void ScCellShell::ExecuteTrans( SfxRequest& rReq )
 
 void ScCellShell::ExecuteExternalSource(
     const String& _rFile, const String& _rFilter, const String& _rOptions,
-    const String& _rSource, ULONG _nRefresh, SfxRequest& _rRequest )
+    const String& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest )
 {
     if ( _rFile.Len() && _rSource.Len() )         // filter may be empty
     {
         ScRange aLinkRange;
-        BOOL bMove = FALSE;
+        sal_Bool bMove = sal_False;
 
         ScViewData* pData = GetViewData();
         ScMarkData& rMark = pData->GetMarkData();
@@ -2111,14 +2111,14 @@ void ScCellShell::ExecuteExternalSource(
         if ( rMark.IsMarked() )
         {
             rMark.GetMarkArea( aLinkRange );
-            bMove = TRUE;                       // insert/delete cells to fit range
+            bMove = sal_True;                       // insert/delete cells to fit range
         }
         else
             aLinkRange = ScRange( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() );
 
         ScDocFunc aFunc(*pData->GetDocShell());
         aFunc.InsertAreaLink( _rFile, _rFilter, _rOptions, _rSource,
-                                aLinkRange, _nRefresh, bMove, FALSE );
+                                aLinkRange, _nRefresh, bMove, sal_False );
         _rRequest.Done();
     }
     else
@@ -2130,7 +2130,7 @@ IMPL_LINK( ScCellShell, DialogClosed, AbstractScLinkedAreaDlg*, EMPTYARG )
     DBG_ASSERT( pImpl->m_pLinkedDlg, "ScCellShell::DialogClosed(): invalid request" );
     DBG_ASSERT( pImpl->m_pRequest, "ScCellShell::DialogClosed(): invalid request" );
     String sFile, sFilter, sOptions, sSource;
-    ULONG nRefresh = 0;
+    sal_uLong nRefresh = 0;
 
     if ( pImpl->m_pLinkedDlg->GetResult() == RET_OK )
     {
@@ -2174,12 +2174,12 @@ void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTa
         SCCOL nClipEndX;
         SCROW nClipEndY;
         pClipDoc->GetClipStart( nClipStartX, nClipStartY );
-        pClipDoc->GetClipArea( nClipEndX, nClipEndY, TRUE );
+        pClipDoc->GetClipArea( nClipEndX, nClipEndY, sal_True );
         nClipEndX = nClipEndX + nClipStartX;
         nClipEndY = nClipEndY + nClipStartY;   // GetClipArea returns the difference
 
         ScRange aSource( nClipStartX, nClipStartY, nSourceTab, nClipEndX, nClipEndY, nSourceTab );
-        BOOL bDone = pTabViewShell->DataPilotMove( aSource, pViewData->GetCurPos() );
+        sal_Bool bDone = pTabViewShell->DataPilotMove( aSource, pViewData->GetCurPos() );
         if ( !bDone )
             pTabViewShell->ErrorMessage( STR_ERR_DATAPILOT_INPUT );
     }
@@ -2198,7 +2198,7 @@ void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTa
                 nFlags &= ~IDF_FORMULA;
 
             pTabViewShell->PasteFromClip( nFlags, pClipDoc,
-                    PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
+                    PASTE_NOFUNC, sal_False, sal_False, sal_False, INS_NONE, IDF_NONE,
                     bShowDialog );		// allow warning dialog
         }
     }
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 62af646c6..945cab103 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -91,7 +91,7 @@ using namespace com::sun::star;
 
 
 #define IS_AVAILABLE(WhichId,ppItem) \
-    (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+    (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 
 //------------------------------------------------------------------
 
@@ -135,14 +135,14 @@ bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& rRange )
     return bRet;
 }
 
-BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
+sal_Bool lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
 {
     ScTabViewShell* pTabViewShell   = pData->GetViewShell();
     ScDBData*	pDBData             = pTabViewShell->GetDBData();
     ScDocument* pDoc                = pData->GetDocument();
     SCTAB nTab                      = pData->GetTabNo();
     ScDirection eFillDir            = DIR_TOP;
-    BOOL  bSort                     = TRUE;
+    sal_Bool  bSort                     = sal_True;
     ScRange aExternalRange;
 
     if( rSortParam.nCol1 != rSortParam.nCol2 )
@@ -161,7 +161,7 @@ BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
     SCCOL nStartCol = aExternalRange.aStart.Col();
     SCROW nEndRow   = aExternalRange.aEnd.Row();
     SCCOL nEndCol   = aExternalRange.aEnd.Col();
-    pDoc->GetDataArea( aExternalRange.aStart.Tab(), nStartCol, nStartRow, nEndCol, nEndRow, FALSE, false );
+    pDoc->GetDataArea( aExternalRange.aStart.Tab(), nStartCol, nStartRow, nEndCol, nEndRow, sal_False, false );
     aExternalRange.aStart.SetRow( nStartRow );
     aExternalRange.aStart.SetCol( nStartCol );
     aExternalRange.aEnd.SetRow( nEndRow );
@@ -170,7 +170,7 @@ BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
     if(( rSortParam.nCol1 == rSortParam.nCol2 && aExternalRange.aStart.Col() != aExternalRange.aEnd.Col() ) ||
         ( rSortParam.nRow1 == rSortParam.nRow2 && aExternalRange.aStart.Row() != aExternalRange.aEnd.Row() ) )
     {
-        USHORT nFmt = SCA_VALID;
+        sal_uInt16 nFmt = SCA_VALID;
         String aExtendStr,aCurrentStr;
 
         pTabViewShell->AddHighlightRange( aExternalRange,Color( COL_LIGHTBLUE ) );
@@ -190,13 +190,13 @@ BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
         {
             if( bResult == BTN_EXTEND_RANGE )
             {
-                pTabViewShell->MarkRange( aExternalRange, FALSE );
+                pTabViewShell->MarkRange( aExternalRange, sal_False );
                 pDBData->SetArea( nTab, aExternalRange.aStart.Col(), aExternalRange.aStart.Row(), aExternalRange.aEnd.Col(), aExternalRange.aEnd.Row() );
             }
         }
         else
         {
-            bSort = FALSE;
+            bSort = sal_False;
             pData->GetDocShell()->CancelAutoDBRange();
         }
 
@@ -221,7 +221,7 @@ namespace
 void ScCellShell::ExecuteDB( SfxRequest& rReq )
 {
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
-    USHORT nSlotId = rReq.GetSlot();
+    sal_uInt16 nSlotId = rReq.GetSlot();
     const SfxItemSet*	pReqArgs	= rReq.GetArgs();
     ScModule*			pScMod		= SC_MOD();
 
@@ -240,14 +240,14 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 //	check if database beamer is open
 
                 SfxViewFrame* pViewFrame = pTabViewShell->GetViewFrame();
-                BOOL bWasOpen = FALSE;
+                sal_Bool bWasOpen = sal_False;
                 {
                     uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface();
                     uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame(
                                                         rtl::OUString::createFromAscii("_beamer"),
                                                         frame::FrameSearchFlag::CHILDREN);
                     if ( xBeamerFrame.is() )
-                        bWasOpen = TRUE;
+                        bWasOpen = sal_True;
                 }
 
                 if ( bWasOpen )
@@ -260,12 +260,12 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 {
                     //	show database beamer: SfxViewFrame call must be synchronous
 
-                    pViewFrame->ExecuteSlot( rReq, (BOOL) FALSE );		// FALSE = synchronous
+                    pViewFrame->ExecuteSlot( rReq, (sal_Bool) sal_False );		// sal_False = synchronous
 
                     //	select current database in database beamer
 
                     ScImportParam aImportParam;
-                    ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD);		// don't create if none found
+                    ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD);		// don't create if none found
                     if (pDBData)
                         pDBData->GetImportParam( aImportParam );
 
@@ -277,8 +277,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 
         case SID_REIMPORT_DATA:
             {
-                BOOL bOk = FALSE;
-                ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD);
+                sal_Bool bOk = sal_False;
+                ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD);
                 if (pDBData)
                 {
                     ScImportParam aImportParam;
@@ -287,7 +287,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     {
                         pTabViewShell->ImportData( aImportParam );
                         pDBData->SetImportParam( aImportParam );	//! Undo ??
-                        bOk = TRUE;
+                        bOk = sal_True;
                     }
                 }
 
@@ -301,12 +301,12 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 
         case SID_REFRESH_DBAREA:
             {
-                ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD);
+                ScDBData* pDBData = pTabViewShell->GetDBData(sal_True,SC_DB_OLD);
                 if (pDBData)
                 {
                     //	Import wiederholen wie SID_REIMPORT_DATA
 
-                    BOOL bContinue = TRUE;
+                    sal_Bool bContinue = sal_True;
                     ScImportParam aImportParam;
                     pDBData->GetImportParam( aImportParam );
                     if (aImportParam.bImport && !pDBData->HasImportSelection())
@@ -363,7 +363,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 
                     ScDBData* pDBData = pTabViewShell->GetDBData();
                     pDBData->GetSubTotalParam( aSubTotalParam );
-                    aSubTotalParam.bRemoveOnly = FALSE;
+                    aSubTotalParam.bRemoveOnly = sal_False;
 
                     aArgSet.Put( ScSubTotalItem( SCITEM_SUBTDATA, GetViewData(), &aSubTotalParam ) );
                     //CHINA001 pDlg = new ScSubTotalDlg( pTabViewShell->GetDialogParent(), &aArgSet );
@@ -391,8 +391,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         else // if (bResult == SCRET_REMOVE)
                         {
                             pOutSet = &aArgSet;
-                            aSubTotalParam.bRemoveOnly = TRUE;
-                            aSubTotalParam.bReplace    = TRUE;
+                            aSubTotalParam.bRemoveOnly = sal_True;
+                            aSubTotalParam.bReplace    = sal_True;
                             aArgSet.Put( ScSubTotalItem( SCITEM_SUBTDATA,
                                                          GetViewData(),
                                                          &aSubTotalParam ) );
@@ -428,7 +428,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     ScDocument* pDoc    = GetViewData()->GetDocument();
 
                     pDBData->GetSortParam( aSortParam );
-                    BOOL bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, nTab );
+                    sal_Bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, nTab );
 
                     if( nCol < aSortParam.nCol1 )
                         nCol = aSortParam.nCol1;
@@ -436,16 +436,16 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         nCol = aSortParam.nCol2;
 
                     aSortParam.bHasHeader		= bHasHeader;
-                    aSortParam.bByRow			= TRUE;
-                    aSortParam.bCaseSens		= FALSE;
-                    aSortParam.bIncludePattern	= TRUE;
-                    aSortParam.bInplace 		= TRUE;
-                    aSortParam.bDoSort[0]		= TRUE;
+                    aSortParam.bByRow			= sal_True;
+                    aSortParam.bCaseSens		= sal_False;
+                    aSortParam.bIncludePattern	= sal_True;
+                    aSortParam.bInplace 		= sal_True;
+                    aSortParam.bDoSort[0]		= sal_True;
                     aSortParam.nField[0]		= nCol;
                     aSortParam.bAscending[0]	= (nSlotId == SID_SORT_ASCENDING);
 
-                    for ( USHORT i=1; i<MAXSORT; i++ )
-                        aSortParam.bDoSort[i] = FALSE;
+                    for ( sal_uInt16 i=1; i<MAXSORT; i++ )
+                        aSortParam.bDoSort[i] = sal_False;
 
                     aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) );
 
@@ -476,49 +476,49 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         ScDocument* pDoc = GetViewData()->GetDocument();
 
                         pDBData->GetSortParam( aSortParam );
-                        BOOL bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() );
+                        sal_Bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() );
                         if( bHasHeader )
                             aSortParam.bHasHeader = bHasHeader;
 
-                        aSortParam.bInplace = TRUE;				// von Basic immer
+                        aSortParam.bInplace = sal_True;				// von Basic immer
 
                         const SfxPoolItem* pItem;
-                        if ( pArgs->GetItemState( SID_SORT_BYROW, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_BYROW, sal_True, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bByRow = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_HASHEADER, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_HASHEADER, sal_True, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bHasHeader = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_CASESENS, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_CASESENS, sal_True, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bCaseSens = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_ATTRIBS, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_ATTRIBS, sal_True, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bIncludePattern = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pArgs->GetItemState( SID_SORT_USERDEF, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( SID_SORT_USERDEF, sal_True, &pItem ) == SFX_ITEM_SET )
                         {
-                            USHORT nUserIndex = ((const SfxUInt16Item*)pItem)->GetValue();
+                            sal_uInt16 nUserIndex = ((const SfxUInt16Item*)pItem)->GetValue();
                             aSortParam.bUserDef = ( nUserIndex != 0 );
                             if ( nUserIndex )
                                 aSortParam.nUserIndex = nUserIndex - 1;		// Basic: 1-basiert
                         }
 
                         SCCOLROW nField0 = 0;
-                        if ( pArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET )
                             nField0 = ((const SfxInt32Item*)pItem)->GetValue();
                         aSortParam.bDoSort[0] = ( nField0 != 0 );
                         aSortParam.nField[0] = nField0 > 0 ? (nField0-1) : 0;
-                        if ( pArgs->GetItemState( FN_PARAM_2, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_2, sal_True, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bAscending[0] = ((const SfxBoolItem*)pItem)->GetValue();
                         SCCOLROW nField1 = 0;
-                        if ( pArgs->GetItemState( FN_PARAM_3, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_3, sal_True, &pItem ) == SFX_ITEM_SET )
                             nField1 = ((const SfxInt32Item*)pItem)->GetValue();
                         aSortParam.bDoSort[1] = ( nField1 != 0 );
                         aSortParam.nField[1] = nField1 > 0 ? (nField1-1) : 0;
-                        if ( pArgs->GetItemState( FN_PARAM_4, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_4, sal_True, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bAscending[1] = ((const SfxBoolItem*)pItem)->GetValue();
                         SCCOLROW nField2 = 0;
-                        if ( pArgs->GetItemState( FN_PARAM_5, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_5, sal_True, &pItem ) == SFX_ITEM_SET )
                             nField2 = ((const SfxInt32Item*)pItem)->GetValue();
                         aSortParam.bDoSort[2] = ( nField2 != 0 );
                         aSortParam.nField[2] = nField2 > 0 ? (nField2-1) : 0;
-                        if ( pArgs->GetItemState( FN_PARAM_6, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pArgs->GetItemState( FN_PARAM_6, sal_True, &pItem ) == SFX_ITEM_SET )
                             aSortParam.bAscending[2] = ((const SfxBoolItem*)pItem)->GetValue();
 
                         // Teilergebnisse bei Bedarf neu
@@ -541,7 +541,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         SfxItemSet	aArgSet( GetPool(), SCITEM_SORTDATA, SCITEM_SORTDATA );
 
                         pDBData->GetSortParam( aSortParam );
-                        BOOL bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() );
+                        sal_Bool bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() );
                         if( bHasHeader )
                             aSortParam.bHasHeader = bHasHeader;
 
@@ -573,7 +573,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                     rOutParam.bCaseSens ) );
                                 rReq.AppendItem( SfxBoolItem( SID_SORT_ATTRIBS,
                                     rOutParam.bIncludePattern ) );
-                                USHORT nUser = rOutParam.bUserDef ? ( rOutParam.nUserIndex + 1 ) : 0;
+                                sal_uInt16 nUser = rOutParam.bUserDef ? ( rOutParam.nUserIndex + 1 ) : 0;
                                 rReq.AppendItem( SfxUInt16Item( SID_SORT_USERDEF, nUser ) );
                                 if ( rOutParam.bDoSort[0] )
                                 {
@@ -616,16 +616,16 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 {
                     DBG_ERROR("SID_FILTER with arguments?");
                     pTabViewShell->Query( ((const ScQueryItem&)
-                            pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, TRUE );
+                            pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, sal_True );
                     rReq.Done();
                 }
                 else
                 {
-                    USHORT			nId  = ScFilterDlgWrapper::GetChildWindowId();
+                    sal_uInt16			nId  = ScFilterDlgWrapper::GetChildWindowId();
                     SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                     SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                    pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                    pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
                 }
             }
             break;
@@ -637,16 +637,16 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 {
                     DBG_ERROR("SID_SPECIAL_FILTER with arguments?");
                     pTabViewShell->Query( ((const ScQueryItem&)
-                            pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, TRUE );
+                            pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, sal_True );
                     rReq.Done();
                 }
                 else
                 {
-                    USHORT			nId  = ScSpecialFilterDlgWrapper::GetChildWindowId();
+                    sal_uInt16			nId  = ScSpecialFilterDlgWrapper::GetChildWindowId();
                     SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                     SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                    pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                    pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
                 }
             }
             break;
@@ -655,7 +655,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem;
                 if ( pReqArgs && SFX_ITEM_SET ==
-                        pReqArgs->GetItemState( SCITEM_QUERYDATA, TRUE, &pItem ) )
+                        pReqArgs->GetItemState( SCITEM_QUERYDATA, sal_True, &pItem ) )
                 {
                     const ScQueryItem& rQueryItem = static_cast<const ScQueryItem&>(*pItem);
 
@@ -673,9 +673,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 
                     ScRange aAdvSource;
                     if (rQueryItem.GetAdvancedQuerySource(aAdvSource))
-                        pTabViewShell->Query( rQueryItem.GetQueryData(), &aAdvSource, TRUE );
+                        pTabViewShell->Query( rQueryItem.GetQueryData(), &aAdvSource, sal_True );
                     else
-                        pTabViewShell->Query( rQueryItem.GetQueryData(), NULL, TRUE );
+                        pTabViewShell->Query( rQueryItem.GetQueryData(), NULL, sal_True );
                     rReq.Done( *pReqArgs );
                 }
             }
@@ -689,9 +689,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 pDBData->GetQueryParam( aParam );
                 SCSIZE nEC = aParam.GetEntryCount();
                 for (SCSIZE i=0; i<nEC; i++)
-                    aParam.GetEntry(i).bDoQuery = FALSE;
-                aParam.bDuplicate = TRUE;
-                pTabViewShell->Query( aParam, NULL, TRUE );
+                    aParam.GetEntry(i).bDoQuery = sal_False;
+                aParam.bDuplicate = sal_True;
+                pTabViewShell->Query( aParam, NULL, sal_True );
                 rReq.Done();
             }
             break;
@@ -710,7 +710,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem;
                 if ( pReqArgs && SFX_ITEM_SET ==
-                        pReqArgs->GetItemState( SCITEM_PIVOTDATA, TRUE, &pItem ) )
+                        pReqArgs->GetItemState( SCITEM_PIVOTDATA, sal_True, &pItem ) )
                 {
                     SCTAB nCurTab = GetViewData()->GetTabNo();
                     SCTAB nRefTab = GetViewData()->GetRefTabNo();
@@ -758,10 +758,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 else	 		// create new table
                 {
                     //	select database range or data
-                    pTabViewShell->GetDBData( TRUE, SC_DB_OLD );
+                    pTabViewShell->GetDBData( sal_True, SC_DB_OLD );
                     ScMarkData& rMark = GetViewData()->GetMarkData();
                     if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
-                        pTabViewShell->MarkDataArea( FALSE );
+                        pTabViewShell->MarkDataArea( sal_False );
 
                     //	output to cursor position for non-sheet data
                     ScAddress aDestPos( pData->GetCurX(), pData->GetCurY(),
@@ -769,7 +769,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 
                     //	first select type of source data
 
-                    BOOL bEnableExt = ScDPObject::HasRegisteredSources();
+                    sal_Bool bEnableExt = ScDPObject::HasRegisteredSources();
                     //CHINA001 ScDataPilotSourceTypeDlg* pTypeDlg = new ScDataPilotSourceTypeDlg(
                     //CHINA001 							pTabViewShell->GetDialogParent(), bEnableExt );
 
@@ -838,7 +838,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                     pTabViewShell->MarkRange(aRange);
                                 }
 
-                                BOOL bOK = TRUE;
+                                sal_Bool bOK = sal_True;
                                 if ( pDoc->HasSubTotalCells( aRange ) )
                                 {
                                     //	confirm selection if it contains SubTotal cells
@@ -847,7 +847,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                                     WinBits(WB_YES_NO | WB_DEF_YES),
                                                     ScGlobal::GetRscString(STR_DATAPILOT_SUBTOTAL) );
                                     if (aBox.Execute() == RET_NO)
-                                        bOK = FALSE;
+                                        bOK = sal_False;
                                 }
                                 if (bOK)
                                 {
@@ -876,12 +876,12 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 
                     pDBData->GetArea( nTab, nCol1, nRow1, nCol2, nRow2 );
 
-                    bAreaOk = TRUE;
+                    bAreaOk = sal_True;
                     if ( nRow2-nRow1 < 1 )
                     {
                         // "mindestens eine Datenzeile"
                         pTabViewShell->ErrorMessage(STR_PIVOT_INVALID_DBAREA);
-                        bAreaOk = FALSE;
+                        bAreaOk = sal_False;
                     }
                     else if (!pDBData->HasHeader())
                     {
@@ -890,10 +890,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                 ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) 	// Koepfe aus erster Zeile?
                             ).Execute() == RET_YES )
                         {
-                            pDBData->SetHeader( TRUE ); 	//! Undo ??
+                            pDBData->SetHeader( sal_True ); 	//! Undo ??
                         }
                         else
-                            bAreaOk = FALSE;
+                            bAreaOk = sal_False;
                     }
 #endif
                 }
@@ -903,10 +903,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 {
                     //	start layout dialog
 
-                    USHORT nId  = ScPivotLayoutWrapper::GetChildWindowId();
+                    sal_uInt16 nId  = ScPivotLayoutWrapper::GetChildWindowId();
                     SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                     SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
-                    pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                    pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
                 }
                 delete pNewDPObject;
             }
@@ -915,11 +915,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
         case SID_DEFINE_DBNAME:
             {
 
-                USHORT			nId  = ScDbNameDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScDbNameDlgWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
 
             }
             break;
@@ -950,11 +950,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     {
                         const String	aStrNoName( ScGlobal::GetRscString(STR_DB_NONAME) );
                         List			aList;
-                        USHORT			nDBCount = pDBCol->GetCount();
+                        sal_uInt16			nDBCount = pDBCol->GetCount();
                         ScDBData*		pDbData  = NULL;
                         String*			pDBName  = NULL;
 
-                        for ( USHORT i=0; i < nDBCount; i++ )
+                        for ( sal_uInt16 i=0; i < nDBCount; i++ )
                         {
                             pDbData = (ScDBData*)(pDBCol->At( i ));
                             if ( pDbData )
@@ -1024,11 +1024,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     ScValidationMode eMode = SC_VALID_ANY;
                     ScConditionMode eOper = SC_COND_EQUAL;
                     String aExpr1, aExpr2;
-                    BOOL bBlank = TRUE;
+                    sal_Bool bBlank = sal_True;
                     sal_Int16 nListType = ValidListType::UNSORTED;
-                    BOOL bShowHelp = FALSE;
+                    sal_Bool bShowHelp = sal_False;
                     String aHelpTitle, aHelpText;
-                    BOOL bShowError = FALSE;
+                    sal_Bool bShowError = sal_False;
                     ScValidErrorStyle eErrStyle = SC_VALERR_STOP;
                     String aErrTitle, aErrText;
 
@@ -1037,7 +1037,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     SCROW nCurY = GetViewData()->GetCurY();
                     SCTAB nTab = GetViewData()->GetTabNo();
                     ScAddress aCursorPos( nCurX, nCurY, nTab );
-                    ULONG nIndex = ((SfxUInt32Item*)pDoc->GetAttr(
+                    sal_uLong nIndex = ((SfxUInt32Item*)pDoc->GetAttr(
                                 nCurX, nCurY, nTab, ATTR_VALIDDATA ))->GetValue();
                     if ( nIndex )
                     {
@@ -1046,7 +1046,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                         {
                             eMode = pOldData->GetDataMode();
                             eOper = pOldData->GetOperation();
-                            ULONG nNumFmt = 0;
+                            sal_uLong nNumFmt = 0;
                             if ( eMode == SC_VALID_DATE || eMode == SC_VALID_TIME )
                             {
                                 short nType = ( eMode == SC_VALID_DATE ) ? NUMBERFORMAT_DATE
@@ -1062,8 +1062,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                             bShowHelp = pOldData->GetInput( aHelpTitle, aHelpText );
                             bShowError = pOldData->GetErrMsg( aErrTitle, aErrText, eErrStyle );
 
-                            aArgSet.Put( SfxAllEnumItem( FID_VALID_MODE,        sal::static_int_cast<USHORT>(eMode) ) );
-                            aArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE,    sal::static_int_cast<USHORT>(eOper) ) );
+                            aArgSet.Put( SfxAllEnumItem( FID_VALID_MODE,        sal::static_int_cast<sal_uInt16>(eMode) ) );
+                            aArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE,    sal::static_int_cast<sal_uInt16>(eOper) ) );
                             aArgSet.Put( SfxStringItem(	 FID_VALID_VALUE1,		aExpr1 ) );
                             aArgSet.Put( SfxStringItem(	 FID_VALID_VALUE2,		aExpr2 ) );
                             aArgSet.Put( SfxBoolItem(	 FID_VALID_BLANK,		bBlank ) );
@@ -1072,7 +1072,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                             aArgSet.Put( SfxStringItem(	 FID_VALID_HELPTITLE,	aHelpTitle ) );
                             aArgSet.Put( SfxStringItem(	 FID_VALID_HELPTEXT,	aHelpText ) );
                             aArgSet.Put( SfxBoolItem(	 FID_VALID_SHOWERR,		bShowError ) );
-                            aArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE,    sal::static_int_cast<USHORT>(eErrStyle) ) );
+                            aArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE,    sal::static_int_cast<sal_uInt16>(eErrStyle) ) );
                             aArgSet.Put( SfxStringItem(  FID_VALID_ERRTITLE,	aErrTitle ) );
                             aArgSet.Put( SfxStringItem(  FID_VALID_ERRTEXT,		aErrText ) );
                         }
@@ -1097,11 +1097,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     {
                         const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
-                        if ( pOutSet->GetItemState( FID_VALID_MODE, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_MODE, sal_True, &pItem ) == SFX_ITEM_SET )
                             eMode = (ScValidationMode) ((const SfxAllEnumItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_CONDMODE, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_CONDMODE, sal_True, &pItem ) == SFX_ITEM_SET )
                             eOper = (ScConditionMode) ((const SfxAllEnumItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_VALUE1, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_VALUE1, sal_True, &pItem ) == SFX_ITEM_SET )
                         {
                             String aTemp1 = ((const SfxStringItem*)pItem)->GetValue();
                             if (eMode == SC_VALID_DATE || eMode == SC_VALID_TIME)
@@ -1111,14 +1111,14 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                 if (pDoc->GetFormatTable()->IsNumberFormat(aTemp1, nNumIndex, nVal))
                                     aExpr1 =String( ::rtl::math::doubleToUString( nVal,
                                             rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                                            ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), TRUE));
+                                            ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), sal_True));
                                 else
                                     aExpr1 = aTemp1;
                             }
                             else
                                 aExpr1 = aTemp1;
                         }
-                        if ( pOutSet->GetItemState( FID_VALID_VALUE2, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_VALUE2, sal_True, &pItem ) == SFX_ITEM_SET )
                         {
                             String aTemp2 = ((const SfxStringItem*)pItem)->GetValue();
                             if (eMode == SC_VALID_DATE || eMode == SC_VALID_TIME)
@@ -1128,7 +1128,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                 if (pDoc->GetFormatTable()->IsNumberFormat(aTemp2, nNumIndex, nVal))
                                     aExpr2 =String( ::rtl::math::doubleToUString( nVal,
                                             rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
-                                            ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), TRUE));
+                                            ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0), sal_True));
                                 else
                                     aExpr2 = aTemp2;
                             }
@@ -1136,25 +1136,25 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                                 aExpr2 = aTemp2;
                         }
 
-                        if ( pOutSet->GetItemState( FID_VALID_BLANK, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_BLANK, sal_True, &pItem ) == SFX_ITEM_SET )
                             bBlank = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_LISTTYPE, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_LISTTYPE, sal_True, &pItem ) == SFX_ITEM_SET )
                             nListType = ((const SfxInt16Item*)pItem)->GetValue();
 
-                        if ( pOutSet->GetItemState( FID_VALID_SHOWHELP, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_SHOWHELP, sal_True, &pItem ) == SFX_ITEM_SET )
                             bShowHelp = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_HELPTITLE, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_HELPTITLE, sal_True, &pItem ) == SFX_ITEM_SET )
                             aHelpTitle = ((const SfxStringItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_HELPTEXT, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_HELPTEXT, sal_True, &pItem ) == SFX_ITEM_SET )
                             aHelpText = ((const SfxStringItem*)pItem)->GetValue();
 
-                        if ( pOutSet->GetItemState( FID_VALID_SHOWERR, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_SHOWERR, sal_True, &pItem ) == SFX_ITEM_SET )
                             bShowError = ((const SfxBoolItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_ERRSTYLE, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_ERRSTYLE, sal_True, &pItem ) == SFX_ITEM_SET )
                             eErrStyle = (ScValidErrorStyle) ((const SfxAllEnumItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_ERRTITLE, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_ERRTITLE, sal_True, &pItem ) == SFX_ITEM_SET )
                             aErrTitle = ((const SfxStringItem*)pItem)->GetValue();
-                        if ( pOutSet->GetItemState( FID_VALID_ERRTEXT, TRUE, &pItem ) == SFX_ITEM_SET )
+                        if ( pOutSet->GetItemState( FID_VALID_ERRTEXT, sal_True, &pItem ) == SFX_ITEM_SET )
                             aErrText = ((const SfxStringItem*)pItem)->GetValue();
 
                         ScValidationData aData( eMode, eOper, aExpr1, aExpr2, pDoc, aCursorPos );
@@ -1245,11 +1245,11 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
     SCROW		nPosY		= pData->GetCurY();
     SCTAB		nTab		= pData->GetTabNo();
 
-    BOOL bAutoFilter = FALSE;
-    BOOL bAutoFilterTested = FALSE;
+    sal_Bool bAutoFilter = sal_False;
+    sal_Bool bAutoFilterTested = sal_False;
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         switch (nWhich)
@@ -1258,8 +1258,8 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
                 {
                     //	importierte Daten ohne Selektion
                     //	oder Filter,Sortierung,Teilergebis (auch ohne Import)
-                    BOOL bOk = FALSE;
-                    ScDBData* pDBData = pTabViewShell->GetDBData(FALSE,SC_DB_OLD);
+                    sal_Bool bOk = sal_False;
+                    ScDBData* pDBData = pTabViewShell->GetDBData(sal_False,SC_DB_OLD);
                     if (pDBData && pDoc->GetChangeTrack() == NULL)
                     {
                         if ( pDBData->HasImportParam() )
@@ -1309,7 +1309,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
             case SID_REIMPORT_DATA:
                 {
                     //	nur importierte Daten ohne Selektion
-                    ScDBData* pDBData = pTabViewShell->GetDBData(FALSE,SC_DB_OLD);
+                    ScDBData* pDBData = pTabViewShell->GetDBData(sal_False,SC_DB_OLD);
                     if (!pDBData || !pDBData->HasImportParam() || pDBData->HasImportSelection() ||
                         pDoc->GetChangeTrack()!=NULL)
                     {
@@ -1329,9 +1329,9 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
                 break;
             case SID_SBA_BRW_INSERT:
                 {
-                    //	SBA will ein BOOL-Item, damit ueberhaupt enabled
+                    //	SBA will ein sal_Bool-Item, damit ueberhaupt enabled
 
-                    BOOL bEnable = TRUE;
+                    sal_Bool bEnable = sal_True;
                     rSet.Put(SfxBoolItem(nWhich, bEnable));
                 }
                 break;
@@ -1342,7 +1342,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
                     if (!bAutoFilterTested)
                     {
                         bAutoFilter = pDoc->HasAutoFilter( nPosX, nPosY, nTab );
-                        bAutoFilterTested = TRUE;
+                        bAutoFilterTested = sal_True;
                     }
                     if ( nWhich == SID_AUTO_FILTER )
                     {
@@ -1370,16 +1370,16 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
                     SCCOL nStartCol, nEndCol;
                     SCROW  nStartRow, nEndRow;
                     SCTAB  nStartTab, nEndTab;
-                    BOOL bAnyQuery = FALSE;
+                    sal_Bool bAnyQuery = sal_False;
 
-                    BOOL bSelected = (GetViewData()->GetSimpleArea(
+                    sal_Bool bSelected = (GetViewData()->GetSimpleArea(
                                 nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab )
                             == SC_MARK_SIMPLE);
 
                     if ( bSelected )
                     {
                         if (nStartCol==nEndCol && nStartRow==nEndRow)
-                            bSelected = FALSE;
+                            bSelected = sal_False;
                     }
                     else
                     {
@@ -1397,7 +1397,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
                         ScQueryParam aParam;
                         pDBData->GetQueryParam( aParam );
                         if ( aParam.GetEntry(0).bDoQuery )
-                            bAnyQuery = TRUE;
+                            bAnyQuery = sal_True;
                     }
 
                     if ( !bAnyQuery )
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index e08ec21f4..ad3dc2a46 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -74,7 +74,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
     SfxBindings&		rBindings	= pTabViewShell->GetViewFrame()->GetBindings();
     ScModule*			pScMod		= SC_MOD();
     const SfxItemSet*	pReqArgs	= rReq.GetArgs();
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
 
     if (nSlot != SID_CURRENTCELL)		// der kommt beim MouseButtonUp
         pTabViewShell->HideListBox();	// Autofilter-DropDown-Listbox
@@ -89,7 +89,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     //	#53318# inplace macht die EditShell Aerger...
                     //!	kann nicht immer umgeschaltet werden ????
                     if (!pTabViewShell->GetViewFrame()->GetFrame().IsInPlace())
-                        pTabViewShell->SetDontSwitch(TRUE);			// EditShell nicht abschalten
+                        pTabViewShell->SetDontSwitch(sal_True);			// EditShell nicht abschalten
                     // kein break
 
             case FID_CELL_FORMAT:
@@ -102,7 +102,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     pScMod->InputEnterHandler();
                     pTabViewShell->UpdateInputHandler();
 
-                    pTabViewShell->SetDontSwitch(FALSE);
+                    pTabViewShell->SetDontSwitch(sal_False);
 
                     break;
 
@@ -126,7 +126,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                  * 1: ER	Click erweitert Selektion
                  * 2: ERG	Click definiert weitere Selektion
                  */
-                UINT16 nMode = ((const SfxUInt16Item&)pReqArgs->Get( nSlot )).GetValue();
+                sal_uInt16 nMode = ((const SfxUInt16Item&)pReqArgs->Get( nSlot )).GetValue();
 
                 switch ( nMode )
                 {
@@ -144,7 +144,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                 //	no arguments (also executed by double click on the status bar controller):
                 //	advance to next selection mode
 
-                USHORT nModifiers = pTabViewShell->GetLockedModifiers();
+                sal_uInt16 nModifiers = pTabViewShell->GetLockedModifiers();
                 switch ( nModifiers )
                 {
                     case KEY_SHIFT:	nModifiers = KEY_MOD1;	break;		// EXT -> ADD
@@ -248,7 +248,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     }
                     else if ( aString.Len() > 0 && ( aString.GetChar(0) == '=' || aString.GetChar(0) == '+' || aString.GetChar(0) == '-' ) )
                     {
-                        pTabViewShell->EnterData( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), aString, TRUE, pData );
+                        pTabViewShell->EnterData( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), aString, sal_True, pData );
                     }
                     else
                     {
@@ -303,22 +303,22 @@ void ScCellShell::Execute( SfxRequest& rReq )
 
         case SID_OPENDLG_FUNCTION:
             {
-                USHORT nId = SID_OPENDLG_FUNCTION;
+                sal_uInt16 nId = SID_OPENDLG_FUNCTION;
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
                 rReq.Ignore();
             }
             break;
 
         case SID_OPENDLG_CONSOLIDATE:
             {
-                USHORT			nId  = ScConsolidateDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScConsolidateDlgWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
             }
             break;
 
@@ -340,10 +340,10 @@ void ScCellShell::Execute( SfxRequest& rReq )
                                                         ATTR_PATTERN_END );
 
                     const SfxPoolItem*	pAttr = NULL;
-                    USHORT				nWhich = 0;
+                    sal_uInt16				nWhich = 0;
 
                     for ( nWhich=ATTR_PATTERN_START; nWhich<=ATTR_PATTERN_END; nWhich++ )
-                        if ( pReqArgs->GetItemState( nWhich, TRUE, &pAttr ) == SFX_ITEM_SET )
+                        if ( pReqArgs->GetItemState( nWhich, sal_True, &pAttr ) == SFX_ITEM_SET )
                             pNewSet->Put( *pAttr );
 
                     pTabViewShell->ApplyAttributes( pNewSet, pEmptySet );
@@ -366,31 +366,31 @@ void ScCellShell::Execute( SfxRequest& rReq )
 
         case SID_OPENDLG_SOLVE:
             {
-                USHORT			nId  = ScSolverDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScSolverDlgWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
             }
             break;
 
         case SID_OPENDLG_OPTSOLVER:
             {
-                USHORT nId = ScOptSolverDlgWrapper::GetChildWindowId();
+                sal_uInt16 nId = ScOptSolverDlgWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
             }
             break;
 
         case SID_OPENDLG_TABOP:
             {
-                USHORT			nId  = ScTabOpDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScTabOpDlgWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
             }
             break;
 
@@ -432,7 +432,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                         String aName;
                         String aComment;
                         Color  aColor;
-                        USHORT nFlags;
+                        sal_uInt16 nFlags;
 
                         pDoc->GetName( nTab, aBaseName );
                         aBaseName += '_';
@@ -441,13 +441,13 @@ void ScCellShell::Execute( SfxRequest& rReq )
 
                         //	vorneweg testen, ob der Prefix als gueltig erkannt wird
                         //	wenn nicht, nur doppelte vermeiden
-                        BOOL bPrefix = pDoc->ValidTabName( aBaseName );
+                        sal_Bool bPrefix = pDoc->ValidTabName( aBaseName );
                         DBG_ASSERT(bPrefix, "ungueltiger Tabellenname");
 
                         while ( pDoc->IsScenario(nTab+i) )
                             i++;
 
-                        BOOL bValid;
+                        sal_Bool bValid;
                         SCTAB nDummy;
                         do
                         {
@@ -466,9 +466,9 @@ void ScCellShell::Execute( SfxRequest& rReq )
                             String aArgName;
                             String aArgComment;
                             const SfxPoolItem* pItem;
-                            if ( pReqArgs->GetItemState( SID_SCENARIOS, TRUE, &pItem ) == SFX_ITEM_SET )
+                            if ( pReqArgs->GetItemState( SID_SCENARIOS, sal_True, &pItem ) == SFX_ITEM_SET )
                                 aArgName = ((const SfxStringItem*)pItem)->GetValue();
-                            if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, TRUE, &pItem ) == SFX_ITEM_SET )
+                            if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, sal_True, &pItem ) == SFX_ITEM_SET )
                                 aArgComment = ((const SfxStringItem*)pItem)->GetValue();
 
                             aColor = Color( COL_LIGHTGRAY );		// Default
@@ -480,13 +480,13 @@ void ScCellShell::Execute( SfxRequest& rReq )
                         }
                         else
                         {
-                            BOOL bSheetProtected = pDoc->IsTabProtected(nTab);
+                            sal_Bool bSheetProtected = pDoc->IsTabProtected(nTab);
                             //CHINA001 ScNewScenarioDlg* pNewDlg =
-                            //CHINA001 	new ScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, FALSE, bSheetProtected );
+                            //CHINA001 	new ScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, sal_False, bSheetProtected );
                             ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                             DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
 
-                            AbstractScNewScenarioDlg* pNewDlg = pFact->CreateScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, RID_SCDLG_NEWSCENARIO, FALSE,bSheetProtected);
+                            AbstractScNewScenarioDlg* pNewDlg = pFact->CreateScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, RID_SCDLG_NEWSCENARIO, sal_False,bSheetProtected);
                             DBG_ASSERT(pNewDlg, "Dialog create fail!");//CHINA001
                             if ( pNewDlg->Execute() == RET_OK )
                             {
@@ -525,8 +525,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     const SfxUInt16Item&  rUInt16Item = (const SfxUInt16Item&)pReqArgs->Get( FID_ROW_HEIGHT );
 
                     // #101390#; the value of the macro is in HMM so use HMMToTwips to convert
-                    pTabViewShell->SetMarkedWidthOrHeight( FALSE, SC_SIZE_DIRECT,
-                                    sal::static_int_cast<USHORT>( HMMToTwips(rUInt16Item.GetValue()) ) );
+                    pTabViewShell->SetMarkedWidthOrHeight( sal_False, SC_SIZE_DIRECT,
+                                    sal::static_int_cast<sal_uInt16>( HMMToTwips(rUInt16Item.GetValue()) ) );
                     if( ! rReq.IsAPI() )
                         rReq.Done();
                 }
@@ -534,7 +534,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                 {
                     ScViewData* pData      = GetViewData();
                     FieldUnit	eMetric    = SC_MOD()->GetAppOptions().GetAppMetric();
-                    USHORT		nCurHeight = pData->GetDocument()->
+                    sal_uInt16		nCurHeight = pData->GetDocument()->
                                                 GetRowHeight( pData->GetCurY(),
                                                               pData->GetTabNo() );
 //CHINA001					ScMetricInputDlg* pDlg =
@@ -559,10 +559,10 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     if ( pDlg->Execute() == RET_OK )
                     {
                         long nVal = pDlg->GetInputValue();
-                        pTabViewShell->SetMarkedWidthOrHeight( FALSE, SC_SIZE_DIRECT, (USHORT)nVal );
+                        pTabViewShell->SetMarkedWidthOrHeight( sal_False, SC_SIZE_DIRECT, (sal_uInt16)nVal );
 
                         // #101390#; the value of the macro should be in HMM so use TwipsToEvenHMM to convert
-                        rReq.AppendItem( SfxUInt16Item( FID_ROW_HEIGHT, (USHORT)TwipsToEvenHMM(nVal) ) );
+                        rReq.AppendItem( SfxUInt16Item( FID_ROW_HEIGHT, (sal_uInt16)TwipsToEvenHMM(nVal) ) );
                         rReq.Done();
 
                     }
@@ -578,8 +578,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     const SfxUInt16Item&  rUInt16Item = (const SfxUInt16Item&)pReqArgs->Get( FID_ROW_OPT_HEIGHT );
 
                     // #101390#; the value of the macro is in HMM so use HMMToTwips to convert
-                    pTabViewShell->SetMarkedWidthOrHeight( FALSE, SC_SIZE_OPTIMAL,
-                                    sal::static_int_cast<USHORT>( HMMToTwips(rUInt16Item.GetValue()) ) );
+                    pTabViewShell->SetMarkedWidthOrHeight( sal_False, SC_SIZE_OPTIMAL,
+                                    sal::static_int_cast<sal_uInt16>( HMMToTwips(rUInt16Item.GetValue()) ) );
                     ScGlobal::nLastRowHeightExtra = rUInt16Item.GetValue();
 
                     if( ! rReq.IsAPI() )
@@ -611,11 +611,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     if ( pDlg->Execute() == RET_OK )
                     {
                         long nVal = pDlg->GetInputValue();
-                        pTabViewShell->SetMarkedWidthOrHeight( FALSE, SC_SIZE_OPTIMAL, (USHORT)nVal );
+                        pTabViewShell->SetMarkedWidthOrHeight( sal_False, SC_SIZE_OPTIMAL, (sal_uInt16)nVal );
                         ScGlobal::nLastRowHeightExtra = nVal;
 
                         // #101390#; the value of the macro should be in HMM so use TwipsToEvenHMM to convert
-                        rReq.AppendItem( SfxUInt16Item( FID_ROW_OPT_HEIGHT, (USHORT)TwipsToEvenHMM(nVal) ) );
+                        rReq.AppendItem( SfxUInt16Item( FID_ROW_OPT_HEIGHT, (sal_uInt16)TwipsToEvenHMM(nVal) ) );
                         rReq.Done();
 
                     }
@@ -631,8 +631,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     const SfxUInt16Item&  rUInt16Item = (const SfxUInt16Item&)pReqArgs->Get( FID_COL_WIDTH );
 
                     // #101390#; the value of the macro is in HMM so use HMMToTwips to convert
-                    pTabViewShell->SetMarkedWidthOrHeight( TRUE, SC_SIZE_DIRECT,
-                                    sal::static_int_cast<USHORT>( HMMToTwips(rUInt16Item.GetValue()) ) );
+                    pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_DIRECT,
+                                    sal::static_int_cast<sal_uInt16>( HMMToTwips(rUInt16Item.GetValue()) ) );
                     if( ! rReq.IsAPI() )
                         rReq.Done();
                 }
@@ -640,7 +640,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                 {
                     FieldUnit   eMetric	   = SC_MOD()->GetAppOptions().GetAppMetric();
                     ScViewData* pData      = GetViewData();
-                    USHORT		nCurHeight = pData->GetDocument()->
+                    sal_uInt16		nCurHeight = pData->GetDocument()->
                                                 GetColWidth( pData->GetCurX(),
                                                              pData->GetTabNo() );
 //CHINA001					ScMetricInputDlg* pDlg =
@@ -665,10 +665,10 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     if ( pDlg->Execute() == RET_OK )
                     {
                         long nVal = pDlg->GetInputValue();
-                        pTabViewShell->SetMarkedWidthOrHeight( TRUE, SC_SIZE_DIRECT, (USHORT)nVal );
+                        pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_DIRECT, (sal_uInt16)nVal );
 
                         // #101390#; the value of the macro should be in HMM so use TwipsToEvenHMM to convert
-                        rReq.AppendItem( SfxUInt16Item( FID_COL_WIDTH, (USHORT)TwipsToEvenHMM(nVal)) );
+                        rReq.AppendItem( SfxUInt16Item( FID_COL_WIDTH, (sal_uInt16)TwipsToEvenHMM(nVal)) );
                         rReq.Done();
 
                     }
@@ -684,8 +684,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     const SfxUInt16Item&  rUInt16Item = (const SfxUInt16Item&)pReqArgs->Get( FID_COL_OPT_WIDTH );
 
                     // #101390#; the value of the macro is in HMM so use HMMToTwips to convert
-                    pTabViewShell->SetMarkedWidthOrHeight( TRUE, SC_SIZE_OPTIMAL,
-                                    sal::static_int_cast<USHORT>( HMMToTwips(rUInt16Item.GetValue()) ) );
+                    pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_OPTIMAL,
+                                    sal::static_int_cast<sal_uInt16>( HMMToTwips(rUInt16Item.GetValue()) ) );
                     ScGlobal::nLastColWidthExtra = rUInt16Item.GetValue();
 
                     if( ! rReq.IsAPI() )
@@ -717,11 +717,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     if ( pDlg->Execute() == RET_OK )
                     {
                         long nVal = pDlg->GetInputValue();
-                        pTabViewShell->SetMarkedWidthOrHeight( TRUE, SC_SIZE_OPTIMAL, (USHORT)nVal );
+                        pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_OPTIMAL, (sal_uInt16)nVal );
                         ScGlobal::nLastColWidthExtra = nVal;
 
                         // #101390#; the value of the macro should be in HMM so use TwipsToEvenHMM to convert
-                        rReq.AppendItem( SfxUInt16Item( FID_COL_OPT_WIDTH, (USHORT)TwipsToEvenHMM(nVal) ) );
+                        rReq.AppendItem( SfxUInt16Item( FID_COL_OPT_WIDTH, (sal_uInt16)TwipsToEvenHMM(nVal) ) );
                         rReq.Done();
                     }
                     delete pDlg;
@@ -730,24 +730,24 @@ void ScCellShell::Execute( SfxRequest& rReq )
             break;
 
         case FID_COL_OPT_DIRECT:
-            pTabViewShell->SetMarkedWidthOrHeight( TRUE, SC_SIZE_OPTIMAL, STD_EXTRA_WIDTH );
+            pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_OPTIMAL, STD_EXTRA_WIDTH );
             rReq.Done();
             break;
 
         case FID_ROW_HIDE:
-            pTabViewShell->SetMarkedWidthOrHeight( FALSE, SC_SIZE_DIRECT, 0 );
+            pTabViewShell->SetMarkedWidthOrHeight( sal_False, SC_SIZE_DIRECT, 0 );
             rReq.Done();
             break;
         case FID_ROW_SHOW:
-            pTabViewShell->SetMarkedWidthOrHeight( FALSE, SC_SIZE_SHOW, 0 );
+            pTabViewShell->SetMarkedWidthOrHeight( sal_False, SC_SIZE_SHOW, 0 );
             rReq.Done();
             break;
         case FID_COL_HIDE:
-            pTabViewShell->SetMarkedWidthOrHeight( TRUE, SC_SIZE_DIRECT, 0 );
+            pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_DIRECT, 0 );
             rReq.Done();
             break;
         case FID_COL_SHOW:
-            pTabViewShell->SetMarkedWidthOrHeight( TRUE, SC_SIZE_SHOW, 0 );
+            pTabViewShell->SetMarkedWidthOrHeight( sal_True, SC_SIZE_SHOW, 0 );
             rReq.Done();
             break;
 
@@ -789,11 +789,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
                 if( bMerge )
                 {
                     // merge - check if to move contents of covered cells
-                    BOOL bMoveContents = FALSE;
-                    BOOL bApi = rReq.IsAPI();
+                    sal_Bool bMoveContents = sal_False;
+                    sal_Bool bApi = rReq.IsAPI();
                     const SfxPoolItem* pItem;
                     if ( pReqArgs &&
-                        pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+                        pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
                     {
                         DBG_ASSERT(pItem && pItem->ISA(SfxBoolItem), "falsches Item");
                         bMoveContents = ((const SfxBoolItem*)pItem)->GetValue();
@@ -833,7 +833,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
 
                 const ScMarkData& rMark = GetViewData()->GetMarkData();
                 if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
-                    pTabViewShell->MarkDataArea( TRUE );
+                    pTabViewShell->MarkDataArea( sal_True );
 
                 GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab,
                                               nEndCol,nEndRow,nEndTab );
@@ -845,7 +845,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     {
                         const SfxStringItem& rNameItem = (const SfxStringItem&)pReqArgs->Get( SID_AUTOFORMAT );
                         ScAutoFormat* pFormat = ScGlobal::GetAutoFormat();
-                        USHORT nIndex = pFormat->FindIndexPerName( rNameItem.GetValue() );
+                        sal_uInt16 nIndex = pFormat->FindIndexPerName( rNameItem.GetValue() );
 
                         pTabViewShell->AutoFormat( nIndex );
 
@@ -911,7 +911,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
                     //    pObjSh->GetInPlaceObject()->GetIPClient())
                     //{
                     //    GetViewData()->GetDocShell()->
-                    //        DoInPlaceActivate(FALSE);       // OLE beenden
+                    //        DoInPlaceActivate(sal_False);       // OLE beenden
                     //}
                 }
 
@@ -925,7 +925,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
 
         case SID_DETECTIVE_FILLMODE:
             {
-                BOOL bOldMode = pTabViewShell->IsAuditShell();
+                sal_Bool bOldMode = pTabViewShell->IsAuditShell();
                 pTabViewShell->SetAuditShell( !bOldMode );
                 pTabViewShell->Invalidate( nSlot );
             }
@@ -933,11 +933,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
 
         case SID_OPENDLG_CONDFRMT:
             {
-                USHORT			nId  = ScCondFormatDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScCondFormatDlgWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
             }
             break;
 
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 2c451fb82..f28710104 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -53,7 +53,7 @@
 //------------------------------------------------------------------
 
 #define IS_AVAILABLE(WhichId,ppItem) \
-    (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+    (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 
 
 void ScCellShell::ExecuteCursor( SfxRequest& rReq )
@@ -61,10 +61,10 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
     ScViewData* pData = GetViewData();
     ScTabViewShell*	pTabViewShell  	= pData->GetViewShell();
     const SfxItemSet*	pReqArgs = rReq.GetArgs();
-    USHORT				nSlotId  = rReq.GetSlot();
+    sal_uInt16				nSlotId  = rReq.GetSlot();
     SCsCOLROW	        nRepeat = 1;
-    BOOL				bSel = FALSE;
-    BOOL				bKeep = FALSE;
+    sal_Bool				bSel = sal_False;
+    sal_Bool				bKeep = sal_False;
 
     if ( pReqArgs != NULL )
     {
@@ -78,13 +78,13 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
     {
         //	evaluate locked selection mode
 
-        USHORT nLocked = pTabViewShell->GetLockedModifiers();
+        sal_uInt16 nLocked = pTabViewShell->GetLockedModifiers();
         if ( nLocked & KEY_SHIFT )
-            bSel = TRUE;				// EXT
+            bSel = sal_True;				// EXT
         else if ( nLocked & KEY_MOD1 )
         {
             // ADD mode: keep the selection, start a new block when marking with shift again
-            bKeep = TRUE;
+            bKeep = sal_True;
             pTabViewShell->SetNewStartIfMarking();
         }
     }
@@ -170,7 +170,7 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ )
 void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
 {
     const SfxItemSet*	pReqArgs = rReq.GetArgs();
-    USHORT				nSlotId  = rReq.GetSlot();
+    sal_uInt16				nSlotId  = rReq.GetSlot();
     short				nRepeat = 1;
 
     if ( pReqArgs != NULL )
@@ -199,14 +199,14 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
             return;
     }
     rReq.AppendItem( SfxInt16Item(FN_PARAM_1, nRepeat ) );
-    rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) );
+    rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) );
     ExecuteSlot( rReq, GetInterface() );
 }
 
 void ScCellShell::ExecuteMove( SfxRequest& rReq )
 {
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
-    USHORT nSlotId  = rReq.GetSlot();
+    sal_uInt16 nSlotId  = rReq.GetSlot();
 
     if(nSlotId != SID_CURSORTOPOFSCREEN && nSlotId != SID_CURSORENDOFSCREEN)
         pTabViewShell->ExecuteInputDirect();
@@ -226,25 +226,25 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
         //	weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert
 
         case SID_NEXT_UNPROTECT:
-            pTabViewShell->FindNextUnprot( FALSE, !rReq.IsAPI() );
+            pTabViewShell->FindNextUnprot( sal_False, !rReq.IsAPI() );
             break;
 
         case SID_PREV_UNPROTECT:
-            pTabViewShell->FindNextUnprot( TRUE, !rReq.IsAPI() );
+            pTabViewShell->FindNextUnprot( sal_True, !rReq.IsAPI() );
             break;
 
         case SID_CURSORENTERUP:
             if (rReq.IsAPI())
-                pTabViewShell->MoveCursorRel( 0, -1, SC_FOLLOW_LINE, FALSE );
+                pTabViewShell->MoveCursorRel( 0, -1, SC_FOLLOW_LINE, sal_False );
             else
-                pTabViewShell->MoveCursorEnter( TRUE );
+                pTabViewShell->MoveCursorEnter( sal_True );
             break;
 
         case SID_CURSORENTERDOWN:
             if (rReq.IsAPI())
-                pTabViewShell->MoveCursorRel( 0, 1, SC_FOLLOW_LINE, FALSE );
+                pTabViewShell->MoveCursorRel( 0, 1, SC_FOLLOW_LINE, sal_False );
             else
-                pTabViewShell->MoveCursorEnter( FALSE );
+                pTabViewShell->MoveCursorEnter( sal_False );
             break;
 
         case SID_SELECT_COL:
@@ -288,11 +288,11 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
             break;
 
         case SID_CURSORTOPOFSCREEN:
-            pTabViewShell->MoveCursorScreen( 0, -1, SC_FOLLOW_LINE, FALSE );
+            pTabViewShell->MoveCursorScreen( 0, -1, SC_FOLLOW_LINE, sal_False );
             break;
 
         case SID_CURSORENDOFSCREEN:
-            pTabViewShell->MoveCursorScreen( 0, 1, SC_FOLLOW_LINE, FALSE );
+            pTabViewShell->MoveCursorScreen( 0, 1, SC_FOLLOW_LINE, sal_False );
             break;
 
         default:
@@ -305,7 +305,7 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
 
 void ScCellShell::ExecutePageSel( SfxRequest& rReq )
 {
-    USHORT				nSlotId  = rReq.GetSlot();
+    sal_uInt16				nSlotId  = rReq.GetSlot();
     switch ( nSlotId )
     {
         case SID_CURSORHOME_SEL:		rReq.SetSlot( SID_CURSORHOME );  break;
@@ -316,7 +316,7 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq )
             DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePageSel)");
             return;
     }
-    rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) );
+    rReq.AppendItem( SfxBoolItem(FN_PARAM_2, sal_True) );
     ExecuteSlot( rReq, GetInterface() );
 }
 
@@ -324,9 +324,9 @@ void ScCellShell::ExecutePage( SfxRequest& rReq )
 {
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
     const SfxItemSet*	pReqArgs = rReq.GetArgs();
-    USHORT				nSlotId  = rReq.GetSlot();
-    BOOL				bSel = FALSE;
-    BOOL				bKeep = FALSE;
+    sal_uInt16				nSlotId  = rReq.GetSlot();
+    sal_Bool				bSel = sal_False;
+    sal_Bool				bKeep = sal_False;
 
     if ( pReqArgs != NULL )
     {
@@ -338,13 +338,13 @@ void ScCellShell::ExecutePage( SfxRequest& rReq )
     {
         //	evaluate locked selection mode
 
-        USHORT nLocked = pTabViewShell->GetLockedModifiers();
+        sal_uInt16 nLocked = pTabViewShell->GetLockedModifiers();
         if ( nLocked & KEY_SHIFT )
-            bSel = TRUE;				// EXT
+            bSel = sal_True;				// EXT
         else if ( nLocked & KEY_MOD1 )
         {
             // ADD mode: keep the selection, start a new block when marking with shift again
-            bKeep = TRUE;
+            bKeep = sal_True;
             pTabViewShell->SetNewStartIfMarking();
         }
     }
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 80c794d15..68d618f6b 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -84,7 +84,7 @@ ScColBar::~ScColBar()
 {
 }
 
-inline BOOL ScColBar::UseNumericHeader() const
+inline sal_Bool ScColBar::UseNumericHeader() const
 {
     return pViewData->GetDocument()->GetAddressConvention() == formula::FormulaGrammar::CONV_XL_R1C1;
 }
@@ -94,7 +94,7 @@ SCCOLROW ScColBar::GetPos()
     return pViewData->GetPosX(eWhich);
 }
 
-USHORT ScColBar::GetEntrySize( SCCOLROW nEntryNo )
+sal_uInt16 ScColBar::GetEntrySize( SCCOLROW nEntryNo )
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
@@ -102,7 +102,7 @@ USHORT ScColBar::GetEntrySize( SCCOLROW nEntryNo )
     if (pDoc->ColHidden(static_cast<SCCOL>(nEntryNo), nTab, nLastCol))
         return 0;
     else
-        return (USHORT) ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(nEntryNo), nTab ), pViewData->GetPPTX() );
+        return (sal_uInt16) ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(nEntryNo), nTab ), pViewData->GetPPTX() );
 }
 
 String ScColBar::GetEntryText( SCCOLROW nEntryNo )
@@ -112,9 +112,9 @@ String ScColBar::GetEntryText( SCCOLROW nEntryNo )
         : ScColToAlpha( static_cast<SCCOL>(nEntryNo) );
 }
 
-void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
+void ScColBar::SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize )
 {
-    USHORT nSizeTwips;
+    sal_uInt16 nSizeTwips;
     ScSizeMode eMode = SC_SIZE_DIRECT;
     if (nNewSize>0 && nNewSize<10) nNewSize=10;				// (Pixel)
 
@@ -124,7 +124,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
         eMode = SC_SIZE_OPTIMAL;
     }
     else
-        nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTX() );
+        nSizeTwips = (sal_uInt16) ( nNewSize / pViewData->GetPPTX() );
 
     ScMarkData& rMark = pViewData->GetMarkData();
 //	SCTAB nTab = pViewData->GetTabNo();
@@ -161,7 +161,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
         nRangeCnt = 1;
     }
 
-    pViewData->GetView()->SetWidthOrHeight( TRUE, nRangeCnt, pRanges, eMode, nSizeTwips );
+    pViewData->GetView()->SetWidthOrHeight( sal_True, nRangeCnt, pRanges, eMode, nSizeTwips );
     delete[] pRanges;
 }
 
@@ -170,10 +170,10 @@ void ScColBar::HideEntries( SCCOLROW nStart, SCCOLROW nEnd )
     SCCOLROW nRange[2];
     nRange[0] = nStart;
     nRange[1] = nEnd;
-    pViewData->GetView()->SetWidthOrHeight( TRUE, 1, nRange, SC_SIZE_DIRECT, 0 );
+    pViewData->GetView()->SetWidthOrHeight( sal_True, 1, nRange, SC_SIZE_DIRECT, 0 );
 }
 
-void ScColBar::SetMarking( BOOL bSet )
+void ScColBar::SetMarking( sal_Bool bSet )
 {
     pViewData->GetMarkData().SetMarking( bSet );
     if (!bSet)
@@ -202,19 +202,19 @@ void ScColBar::SelectWindow()
     }
     pViewSh->ActivatePart( eActive );
 
-    pFuncSet->SetColumn( TRUE );
+    pFuncSet->SetColumn( sal_True );
     pFuncSet->SetWhich( eActive );
 
     pViewSh->ActiveGrabFocus();
 }
 
-BOOL ScColBar::IsDisabled()
+sal_Bool ScColBar::IsDisabled()
 {
     ScModule* pScMod = SC_MOD();
     return pScMod->IsFormulaMode() || pScMod->IsModalMode();
 }
 
-BOOL ScColBar::ResizeAllowed()
+sal_Bool ScColBar::ResizeAllowed()
 {
     return !pViewData->HasEditView( pViewData->GetActivePart() ) &&
             !pViewData->GetDocShell()->IsReadOnly();
@@ -235,7 +235,7 @@ String ScColBar::GetDragHelp( long nVal )
     return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_WIDTH) );
 }
 
-BOOL ScColBar::IsLayoutRTL()		// overloaded only for columns
+sal_Bool ScColBar::IsLayoutRTL()		// overloaded only for columns
 {
     return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
 }
@@ -262,7 +262,7 @@ SCCOLROW ScRowBar::GetPos()
     return pViewData->GetPosY(eWhich);
 }
 
-USHORT ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
+sal_uInt16 ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
@@ -270,7 +270,7 @@ USHORT ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
     if (pDoc->RowHidden(nEntryNo, nTab, nLastRow))
         return 0;
     else
-        return (USHORT) ScViewData::ToPixel( pDoc->GetOriginalHeight( nEntryNo,
+        return (sal_uInt16) ScViewData::ToPixel( pDoc->GetOriginalHeight( nEntryNo,
                     nTab ), pViewData->GetPPTY() );
 }
 
@@ -279,9 +279,9 @@ String ScRowBar::GetEntryText( SCCOLROW nEntryNo )
     return String::CreateFromInt32( nEntryNo + 1 );
 }
 
-void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
+void ScRowBar::SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize )
 {
-    USHORT nSizeTwips;
+    sal_uInt16 nSizeTwips;
     ScSizeMode eMode = SC_SIZE_DIRECT;
     if (nNewSize>0 && nNewSize<10) nNewSize=10;				// (Pixel)
 
@@ -291,7 +291,7 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
         eMode = SC_SIZE_OPTIMAL;
     }
     else
-        nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTY() );
+        nSizeTwips = (sal_uInt16) ( nNewSize / pViewData->GetPPTY() );
 
     ScMarkData& rMark = pViewData->GetMarkData();
 //	SCTAB nTab = pViewData->GetTabNo();
@@ -328,7 +328,7 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
         nRangeCnt = 1;
     }
 
-    pViewData->GetView()->SetWidthOrHeight( FALSE, nRangeCnt, pRanges, eMode, nSizeTwips );
+    pViewData->GetView()->SetWidthOrHeight( sal_False, nRangeCnt, pRanges, eMode, nSizeTwips );
     delete[] pRanges;
 }
 
@@ -337,10 +337,10 @@ void ScRowBar::HideEntries( SCCOLROW nStart, SCCOLROW nEnd )
     SCCOLROW nRange[2];
     nRange[0] = nStart;
     nRange[1] = nEnd;
-    pViewData->GetView()->SetWidthOrHeight( FALSE, 1, nRange, SC_SIZE_DIRECT, 0 );
+    pViewData->GetView()->SetWidthOrHeight( sal_False, 1, nRange, SC_SIZE_DIRECT, 0 );
 }
 
-void ScRowBar::SetMarking( BOOL bSet )
+void ScRowBar::SetMarking( sal_Bool bSet )
 {
     pViewData->GetMarkData().SetMarking( bSet );
     if (!bSet)
@@ -369,19 +369,19 @@ void ScRowBar::SelectWindow()
     }
     pViewSh->ActivatePart( eActive );
 
-    pFuncSet->SetColumn( FALSE );
+    pFuncSet->SetColumn( sal_False );
     pFuncSet->SetWhich( eActive );
 
     pViewSh->ActiveGrabFocus();
 }
 
-BOOL ScRowBar::IsDisabled()
+sal_Bool ScRowBar::IsDisabled()
 {
     ScModule* pScMod = SC_MOD();
     return pScMod->IsFormulaMode() || pScMod->IsModalMode();
 }
 
-BOOL ScRowBar::ResizeAllowed()
+sal_Bool ScRowBar::ResizeAllowed()
 {
     return !pViewData->HasEditView( pViewData->GetActivePart() ) &&
             !pViewData->GetDocShell()->IsReadOnly();
@@ -411,7 +411,7 @@ SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo )
     return pDoc->GetHiddenRowCount( nEntryNo, nTab );
 }
 
-BOOL ScRowBar::IsMirrored()			// overloaded only for rows
+sal_Bool ScRowBar::IsMirrored()			// overloaded only for rows
 {
     return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
 }
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 308df116b..2fa86fdc6 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -75,7 +75,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDBCollection* pDBCol = pDoc->GetDBCollection();
 
-    USHORT nFoundAt = 0;
+    sal_uInt16 nFoundAt = 0;
     if ( pDBCol->SearchName( rDBName, nFoundAt ) )
     {
         ScDBData* pData = (*pDBCol)[nFoundAt];
@@ -93,7 +93,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
             SetTabNo( nTab );
 
             MoveCursorAbs( nStartCol, nStartRow, ScFollowMode( SC_FOLLOW_JUMP ),
-                               FALSE, FALSE );	// bShift,bControl
+                               sal_False, sal_False );	// bShift,bControl
             DoneBlockMode();
             InitBlockMode( nStartCol, nStartRow, nTab );
             MarkCursor( nEndCol, nEndRow, nTab );
@@ -104,7 +104,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
 
 //	aktuellen Datenbereich fuer Sortieren / Filtern suchen
 
-ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection eSel )
+ScDBData* ScDBFunc::GetDBData( sal_Bool bMark, ScGetDBMode eMode, ScGetDBSelection eSel )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDBData* pData = NULL;
@@ -159,7 +159,10 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e
                     ScDocument* pDoc = pDocSh->GetDocument();
                     SCCOL nCol1 = aRange.aStart.Col(), nCol2 = aRange.aEnd.Col();
                     SCROW nRow1 = aRange.aStart.Row(), nRow2 = aRange.aEnd.Row();
-                    if (pDoc->ShrinkToUsedDataArea( aRange.aStart.Tab(), nCol1, nRow1, nCol2, nRow2, bShrinkColumnsOnly))
+                    bool bShrunk;
+                    pDoc->ShrinkToUsedDataArea( bShrunk, aRange.aStart.Tab(), 
+                            nCol1, nRow1, nCol2, nRow2, bShrinkColumnsOnly);
+                    if (bShrunk)
                     {
                         aRange.aStart.SetCol(nCol1);
                         aRange.aEnd.SetCol(nCol2);
@@ -183,7 +186,7 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e
     {
         ScRange aFound;
         pData->GetArea(aFound);
-        MarkRange( aFound, FALSE );
+        MarkRange( aFound, sal_False );
     }
     return pData;
 }
@@ -199,7 +202,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List&
     ScDBCollection* pOldColl = pDoc->GetDBCollection();
     ScDBCollection* pUndoColl = NULL;
     ScDBCollection* pRedoColl = NULL;
-    const BOOL bRecord (pDoc->IsUndoEnabled());
+    const sal_Bool bRecord (pDoc->IsUndoEnabled());
 
     long nDelCount = rDelAreaList.Count();
     for (long nDelPos=0; nDelPos<nDelCount; nDelPos++)
@@ -223,9 +226,9 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List&
 
     //	neue Targets am SBA anmelden nicht mehr noetig
 
-    pDoc->CompileDBFormula( TRUE );		// CreateFormulaString
+    pDoc->CompileDBFormula( sal_True );		// CreateFormulaString
     pDoc->SetDBCollection( new ScDBCollection( rNewColl ) );
-    pDoc->CompileDBFormula( FALSE );	// CompileFormulaString
+    pDoc->CompileDBFormula( sal_False );	// CompileFormulaString
     pOldColl = NULL;
     pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID );
     aModificator.SetDocumentModified();
@@ -245,7 +248,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List&
 
 // Sortieren
 
-void ScDBFunc::UISort( const ScSortParam& rSortParam, BOOL bRecord )
+void ScDBFunc::UISort( const ScSortParam& rSortParam, sal_Bool bRecord )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
@@ -272,12 +275,12 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, BOOL bRecord )
     }
 }
 
-void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint )
+void ScDBFunc::Sort( const ScSortParam& rSortParam, sal_Bool bRecord, sal_Bool bPaint )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDBDocFunc aDBDocFunc( *pDocSh );
-    BOOL bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, FALSE );
+    sal_Bool bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, sal_False );
     if ( bSuccess && !rSortParam.bInplace )
     {
         //	Ziel markieren
@@ -291,23 +294,23 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint )
 
 //	Filtern
 
-void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord )
+void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, sal_Bool bRecord )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDBDocFunc aDBDocFunc( *pDocSh );
-    BOOL bSuccess = aDBDocFunc.Query( nTab, rQueryParam, pAdvSource, bRecord, FALSE );
+    sal_Bool bSuccess = aDBDocFunc.Query( nTab, rQueryParam, pAdvSource, bRecord, sal_False );
 
     if (bSuccess)
     {
-        BOOL bCopy = !rQueryParam.bInplace;
+        sal_Bool bCopy = !rQueryParam.bInplace;
         if (bCopy)
         {
             //	Zielbereich markieren (DB-Bereich wurde ggf. angelegt)
             ScDocument* pDoc = pDocSh->GetDocument();
             ScDBData* pDestData = pDoc->GetDBAtCursor(
                                             rQueryParam.nDestCol, rQueryParam.nDestRow,
-                                            rQueryParam.nDestTab, TRUE );
+                                            rQueryParam.nDestTab, sal_True );
             if (pDestData)
             {
                 ScRange aDestRange;
@@ -335,19 +338,19 @@ void ScDBFunc::ToggleAutoFilter()
 
     ScQueryParam	aParam;
     ScDocument*		pDoc	= GetViewData()->GetDocument();
-    ScDBData*		pDBData = GetDBData( FALSE, SC_DB_MAKE, SC_DBSEL_ROW_DOWN );
+    ScDBData*		pDBData = GetDBData( sal_False, SC_DB_MAKE, SC_DBSEL_ROW_DOWN );
 
-    pDBData->SetByRow( TRUE );				//! Undo, vorher abfragen ??
+    pDBData->SetByRow( sal_True );				//! Undo, vorher abfragen ??
     pDBData->GetQueryParam( aParam );
 
 
     SCCOL  nCol;
     SCROW  nRow = aParam.nRow1;
     SCTAB  nTab = GetViewData()->GetTabNo();
-    INT16   nFlag;
-    BOOL	bHasAuto = TRUE;
-    BOOL	bHeader  = pDBData->HasHeader();
-    BOOL	bPaint   = FALSE;
+    sal_Int16   nFlag;
+    sal_Bool	bHasAuto = sal_True;
+    sal_Bool	bHeader  = pDBData->HasHeader();
+    sal_Bool	bPaint   = sal_False;
 
     //!		stattdessen aus DB-Bereich abfragen?
 
@@ -357,7 +360,7 @@ void ScDBFunc::ToggleAutoFilter()
                 GetAttr( nCol, nRow, nTab, ATTR_MERGE_FLAG ))->GetValue();
 
         if ( (nFlag & SC_MF_AUTO) == 0 )
-            bHasAuto = FALSE;
+            bHasAuto = sal_False;
     }
 
     if (bHasAuto)								// aufheben
@@ -379,21 +382,21 @@ void ScDBFunc::ToggleAutoFilter()
         ScRange aRange;
         pDBData->GetArea( aRange );
         pDocSh->GetUndoManager()->AddUndoAction(
-            new ScUndoAutoFilter( pDocSh, aRange, pDBData->GetName(), FALSE ) );
+            new ScUndoAutoFilter( pDocSh, aRange, pDBData->GetName(), sal_False ) );
 
-        pDBData->SetAutoFilter(FALSE);
+        pDBData->SetAutoFilter(sal_False);
 
         //	Filter aufheben (incl. Paint / Undo)
 
         SCSIZE nEC = aParam.GetEntryCount();
         for (SCSIZE i=0; i<nEC; i++)
-            aParam.GetEntry(i).bDoQuery = FALSE;
-        aParam.bDuplicate = TRUE;
-        Query( aParam, NULL, TRUE );
+            aParam.GetEntry(i).bDoQuery = sal_False;
+        aParam.bDuplicate = sal_True;
+        Query( aParam, NULL, sal_True );
 
         pDocSh->GetUndoManager()->LeaveListAction();
 
-        bPaint = TRUE;
+        bPaint = sal_True;
     }
     else									// Filterknoepfe einblenden
     {
@@ -408,17 +411,17 @@ void ScDBFunc::ToggleAutoFilter()
                         ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) 	// Koepfe aus erster Zeile?
                     ).Execute() == RET_YES )
                 {
-                    pDBData->SetHeader( TRUE ); 	//! Undo ??
-                    bHeader = TRUE;
+                    pDBData->SetHeader( sal_True ); 	//! Undo ??
+                    bHeader = sal_True;
                 }
             }
 
             ScRange aRange;
             pDBData->GetArea( aRange );
             pDocSh->GetUndoManager()->AddUndoAction(
-                new ScUndoAutoFilter( pDocSh, aRange, pDBData->GetName(), TRUE ) );
+                new ScUndoAutoFilter( pDocSh, aRange, pDBData->GetName(), sal_True ) );
 
-            pDBData->SetAutoFilter(TRUE);
+            pDBData->SetAutoFilter(sal_True);
 
             for (nCol=aParam.nCol1; nCol<=aParam.nCol2; nCol++)
             {
@@ -428,7 +431,7 @@ void ScDBFunc::ToggleAutoFilter()
             }
             pDocSh->PostPaint( aParam.nCol1, nRow, nTab, aParam.nCol2, nRow, nTab,
                                                      PAINT_GRID );
-            bPaint = TRUE;
+            bPaint = sal_True;
         }
         else
         {
@@ -458,7 +461,7 @@ void ScDBFunc::HideAutoFilter()
     ScDocument* pDoc = pDocSh->GetDocument();
 
     ScQueryParam aParam;
-    ScDBData* pDBData = GetDBData( FALSE );
+    ScDBData* pDBData = GetDBData( sal_False );
 
     SCTAB nTab;
     SCCOL nCol1, nCol2;
@@ -467,7 +470,7 @@ void ScDBFunc::HideAutoFilter()
 
     for (SCCOL nCol=nCol1; nCol<=nCol2; nCol++)
     {
-        INT16 nFlag = ((ScMergeFlagAttr*) pDoc->
+        sal_Int16 nFlag = ((ScMergeFlagAttr*) pDoc->
                                 GetAttr( nCol, nRow1, nTab, ATTR_MERGE_FLAG ))->GetValue();
         pDoc->ApplyAttr( nCol, nRow1, nTab, ScMergeFlagAttr( nFlag & ~SC_MF_AUTO ) );
     }
@@ -475,9 +478,9 @@ void ScDBFunc::HideAutoFilter()
     ScRange aRange;
     pDBData->GetArea( aRange );
     pDocSh->GetUndoManager()->AddUndoAction(
-        new ScUndoAutoFilter( pDocSh, aRange, pDBData->GetName(), FALSE ) );
+        new ScUndoAutoFilter( pDocSh, aRange, pDBData->GetName(), sal_False ) );
 
-    pDBData->SetAutoFilter(FALSE);
+    pDBData->SetAutoFilter(sal_False);
 
     pDocSh->PostPaint( nCol1,nRow1,nTab, nCol2,nRow1,nTab, PAINT_GRID );
     aModificator.SetDocumentModified();
@@ -489,7 +492,7 @@ void ScDBFunc::HideAutoFilter()
 
 //		Re-Import
 
-BOOL ScDBFunc::ImportData( const ScImportParam& rParam, BOOL bRecord )
+sal_Bool ScDBFunc::ImportData( const ScImportParam& rParam, sal_Bool bRecord )
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScEditableTester aTester( pDoc, GetViewData()->GetTabNo(), rParam.nCol1,rParam.nRow1,
@@ -497,7 +500,7 @@ BOOL ScDBFunc::ImportData( const ScImportParam& rParam, BOOL bRecord )
     if ( !aTester.IsEditable() )
     {
         ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     ScDBDocFunc aDBDocFunc( *GetViewData()->GetDocShell() );
diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx
index faa37bd72..387a0eab9 100644
--- a/sc/source/ui/view/dbfunc2.cxx
+++ b/sc/source/ui/view/dbfunc2.cxx
@@ -53,9 +53,9 @@
 class ScDrawLayer;
 class ScChartCollection;
 
-void ScDBFunc::UpdateCharts( BOOL bAllCharts )
+void ScDBFunc::UpdateCharts( sal_Bool bAllCharts )
 {
-    USHORT nFound = 0;
+    sal_uInt16 nFound = 0;
     ScViewData* pViewData = GetViewData();
     ScDocument* pDoc = pViewData->GetDocument();
 
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 7e9518f97..c3a7b02f4 100755..100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -112,14 +112,14 @@ using ::std::hash_set;
 
 //	Outline-Gruppierung erzeugen
 
-void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord )
+void ScDBFunc::MakeOutline( sal_Bool bColumns, sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.MakeOutline( aRange, bColumns, bRecord, FALSE );
+        aFunc.MakeOutline( aRange, bColumns, bRecord, sal_False );
     }
     else
         ErrorMessage(STR_NOMULTISELECT);
@@ -127,14 +127,14 @@ void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord )
 
 //	Outline-Gruppierung loeschen
 
-void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord )
+void ScDBFunc::RemoveOutline( sal_Bool bColumns, sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
-        aFunc.RemoveOutline( aRange, bColumns, bRecord, FALSE );
+        aFunc.RemoveOutline( aRange, bColumns, bRecord, sal_False );
     }
     else
         ErrorMessage(STR_NOMULTISELECT);
@@ -142,10 +142,10 @@ void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord )
 
 //	Menue-Status: Outlines loeschen
 
-void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
+void ScDBFunc::TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow )
 {
-    BOOL bColFound = FALSE;
-    BOOL bRowFound = FALSE;
+    sal_Bool bColFound = sal_False;
+    sal_Bool bRowFound = sal_False;
 
     SCCOL nStartCol, nEndCol;
     SCROW nStartRow, nEndRow;
@@ -161,8 +161,8 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
             ScOutlineEntry* pEntry;
             SCCOLROW nStart;
             SCCOLROW nEnd;
-            BOOL bColMarked = ( nStartRow == 0 && nEndRow == MAXROW );
-            BOOL bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL );
+            sal_Bool bColMarked = ( nStartRow == 0 && nEndRow == MAXROW );
+            sal_Bool bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL );
 
             //	Spalten
 
@@ -175,7 +175,7 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
                     nStart = pEntry->GetStart();
                     nEnd   = pEntry->GetEnd();
                     if ( nStartCol<=static_cast<SCCOL>(nEnd) && nEndCol>=static_cast<SCCOL>(nStart) )
-                        bColFound = TRUE;
+                        bColFound = sal_True;
                 }
             }
 
@@ -190,7 +190,7 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
                     nStart = pEntry->GetStart();
                     nEnd   = pEntry->GetEnd();
                     if ( nStartRow<=nEnd && nEndRow>=nStart )
-                        bRowFound = TRUE;
+                        bRowFound = sal_True;
                 }
             }
         }
@@ -200,14 +200,14 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
     rRow = bRowFound;
 }
 
-void ScDBFunc::RemoveAllOutlines( BOOL bRecord )
+void ScDBFunc::RemoveAllOutlines( sal_Bool bRecord )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
 
     HideCursor();
-    BOOL bOk = aFunc.RemoveAllOutlines( nTab, bRecord, FALSE );
+    sal_Bool bOk = aFunc.RemoveAllOutlines( nTab, bRecord, sal_False );
     ShowCursor();
 
     if (bOk)
@@ -216,7 +216,7 @@ void ScDBFunc::RemoveAllOutlines( BOOL bRecord )
 
 //	Auto-Outlines
 
-void ScDBFunc::AutoOutline( BOOL bRecord )
+void ScDBFunc::AutoOutline( sal_Bool bRecord )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab );		// ganze Tabelle, wenn nichts markiert
@@ -229,19 +229,19 @@ void ScDBFunc::AutoOutline( BOOL bRecord )
 
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
-    aFunc.AutoOutline( aRange, bRecord, FALSE );
+    aFunc.AutoOutline( aRange, bRecord, sal_False );
 }
 
 //	Outline-Ebene auswaehlen
 
-void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPaint )
+void ScDBFunc::SelectLevel( sal_Bool bColumns, sal_uInt16 nLevel, sal_Bool bRecord, sal_Bool bPaint )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
 
     HideCursor();
-    BOOL bOk = aFunc.SelectLevel( nTab, bColumns, nLevel, bRecord, bPaint, FALSE );
+    sal_Bool bOk = aFunc.SelectLevel( nTab, bColumns, nLevel, bRecord, bPaint, sal_False );
     ShowCursor();
 
     if (bOk)
@@ -250,14 +250,14 @@ void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPa
 
 //	einzelne Outline-Gruppe einblenden
 
-void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint )
+void ScDBFunc::ShowOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bRecord, sal_Bool bPaint )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
 
     HideCursor();
-    BOOL bOk = aFunc.ShowOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, FALSE );
+    sal_Bool bOk = aFunc.ShowOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, sal_False );
     ShowCursor();
 
     if ( bOk && bPaint )
@@ -266,14 +266,14 @@ void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR
 
 //	einzelne Outline-Gruppe ausblenden
 
-void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint )
+void ScDBFunc::HideOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bRecord, sal_Bool bPaint )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScOutlineDocFunc aFunc(*pDocSh);
 
     HideCursor();
-    BOOL bOk = aFunc.HideOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, FALSE );
+    sal_Bool bOk = aFunc.HideOutline( nTab, bColumns, nLevel, nEntry, bRecord, bPaint, sal_False );
     ShowCursor();
 
     if ( bOk && bPaint )
@@ -282,9 +282,9 @@ void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR
 
 //	Menue-Status: markierten Bereich ein-/ausblenden
 
-BOOL ScDBFunc::OutlinePossible(BOOL bHide)
+sal_Bool ScDBFunc::OutlinePossible(sal_Bool bHide)
 {
-    BOOL bEnable = FALSE;
+    sal_Bool bEnable = sal_False;
 
     SCCOL nStartCol;
     SCROW nStartRow;
@@ -317,13 +317,13 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
                 {
                     if ( nStartCol<=static_cast<SCCOL>(nEnd) && nEndCol>=static_cast<SCCOL>(nStart) )
                         if (!pEntry->IsHidden())
-                            bEnable = TRUE;
+                            bEnable = sal_True;
                 }
                 else
                 {
                     if ( nStart>=nStartCol && nEnd<=nEndCol )
                         if (pEntry->IsHidden())
-                            bEnable = TRUE;
+                            bEnable = sal_True;
                 }
             }
 
@@ -339,13 +339,13 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
                 {
                     if ( nStartRow<=nEnd && nEndRow>=nStart )
                         if (!pEntry->IsHidden())
-                            bEnable = TRUE;
+                            bEnable = sal_True;
                 }
                 else
                 {
                     if ( nStart>=nStartRow && nEnd<=nEndRow )
                         if (pEntry->IsHidden())
-                            bEnable = TRUE;
+                            bEnable = sal_True;
                 }
             }
         }
@@ -356,7 +356,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
 
 //	markierten Bereich einblenden
 
-void ScDBFunc::ShowMarkedOutlines( BOOL bRecord )
+void ScDBFunc::ShowMarkedOutlines( sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -364,7 +364,7 @@ void ScDBFunc::ShowMarkedOutlines( BOOL bRecord )
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
         HideCursor();
-        BOOL bDone = aFunc.ShowMarkedOutlines( aRange, bRecord, FALSE );
+        sal_Bool bDone = aFunc.ShowMarkedOutlines( aRange, bRecord, sal_False );
         ShowCursor();
         if (bDone)
             UpdateScrollBars();
@@ -375,7 +375,7 @@ void ScDBFunc::ShowMarkedOutlines( BOOL bRecord )
 
 //	markierten Bereich ausblenden
 
-void ScDBFunc::HideMarkedOutlines( BOOL bRecord )
+void ScDBFunc::HideMarkedOutlines( sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -383,7 +383,7 @@ void ScDBFunc::HideMarkedOutlines( BOOL bRecord )
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScOutlineDocFunc aFunc(*pDocSh);
         HideCursor();
-        BOOL bDone = aFunc.HideMarkedOutlines( aRange, bRecord, FALSE );
+        sal_Bool bDone = aFunc.HideMarkedOutlines( aRange, bRecord, sal_False );
         ShowCursor();
         if (bDone)
             UpdateScrollBars();
@@ -398,17 +398,17 @@ void ScDBFunc::HideMarkedOutlines( BOOL bRecord )
 //			Teilergebnisse
 //
 
-void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
+void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, sal_Bool bRecord,
                             const ScSortParam* pForceNewSort )
 {
-    BOOL bDo = !rParam.bRemoveOnly;							// FALSE = nur loeschen
+    sal_Bool bDo = !rParam.bRemoveOnly;							// sal_False = nur loeschen
 
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
     ScMarkData& rMark = GetViewData()->GetMarkData();
     SCTAB nTab = GetViewData()->GetTabNo();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScDBData* pDBData = pDoc->GetDBAtArea( nTab, rParam.nCol1, rParam.nRow1,
                                                 rParam.nCol2, rParam.nRow2 );
@@ -433,12 +433,12 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
     }
 
     WaitObject aWait( GetViewData()->GetDialogParent() );
-    BOOL bOk = TRUE;
-    BOOL bDelete = FALSE;
+    sal_Bool bOk = sal_True;
+    sal_Bool bDelete = sal_False;
     if (rParam.bReplace)
         if (pDoc->TestRemoveSubTotals( nTab, rParam ))
         {
-            bDelete = TRUE;
+            bDelete = sal_True;
             bOk = ( MessBox( GetViewData()->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
                 // "StarCalc" "Daten loeschen?"
                 ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
@@ -459,7 +459,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
 
         if (bRecord)										// alte Daten sichern
         {
-            BOOL bOldFilter = bDo && rParam.bDoSort;
+            sal_Bool bOldFilter = bDo && rParam.bDoSort;
 
             nTabCount = pDoc->GetTableCount();
             pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
@@ -475,20 +475,20 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
                 pTable->GetColArray()->GetRange( nOutStartCol, nOutEndCol );
                 pTable->GetRowArray()->GetRange( nOutStartRow, nOutEndRow );
 
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
-                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
+                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
             }
             else
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, bOldFilter );
 
             //	Datenbereich sichern - incl. Filter-Ergebnis
             pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab,
-                                    IDF_ALL, FALSE, pUndoDoc );
+                                    IDF_ALL, sal_False, pUndoDoc );
 
             //	alle Formeln wegen Referenzen
             pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
-                                        IDF_FORMULA, FALSE, pUndoDoc );
+                                        IDF_FORMULA, sal_False, pUndoDoc );
 
             //	DB- und andere Bereiche
             ScRangeName* pDocRange = pDoc->GetRangeName();
@@ -506,7 +506,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
 
         if (rParam.bReplace)
             pDoc->RemoveSubTotals( nTab, aNewParam );
-        BOOL bSuccess = TRUE;
+        sal_Bool bSuccess = sal_True;
         if (bDo)
         {
             // Sortieren
@@ -520,7 +520,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
                 ScSortParam aOldSort;
                 pDBData->GetSortParam( aOldSort );
                 ScSortParam aSortParam( aNewParam, pForceNewSort ? *pForceNewSort : aOldSort );
-                Sort( aSortParam, FALSE, FALSE );
+                Sort( aSortParam, sal_False, sal_False );
             }
 
             bSuccess = pDoc->DoSubTotals( nTab, aNewParam );
@@ -569,11 +569,11 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
 //			Consolidate
 //
 
-void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, BOOL bRecord )
+void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord )
 {
     ScDocShell* pDocShell = GetViewData()->GetDocShell();
     pDocShell->DoConsolidate( rParam, bRecord );
-    SetTabNo( rParam.nTab, TRUE );
+    SetTabNo( rParam.nTab, sal_True );
 }
 
 //
@@ -587,8 +587,8 @@ String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber )
     return aName;
 }
 
-bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable,
-                                const ScDPObject& rSource, BOOL bApi )
+bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, sal_Bool bNewTable,
+                                const ScDPObject& rSource, sal_Bool bApi )
 {
     //	#70096# error message if no fields are set
     //	this must be removed when drag&drop of fields from a toolbox is available
@@ -601,7 +601,7 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
 
     ScDocShell* pDocSh	= GetViewData()->GetDocShell();
     ScDocument* pDoc 	= GetViewData()->GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     ScRange aDestRange = rDest;
     if ( bNewTable )
@@ -622,7 +622,7 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
         while ( !pDoc->InsertTab( nNewTab, lcl_MakePivotTabName( aName, i ) ) && i <= MAXTAB )
             i++;
 
-        BOOL bAppend = ( nNewTab+1 == pDoc->GetTableCount() );
+        sal_Bool bAppend = ( nNewTab+1 == pDoc->GetTableCount() );
         if (bUndo)
         {
             pDocSh->GetUndoManager()->AddUndoAction(
@@ -630,7 +630,7 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
         }
 
         GetViewData()->InsertTab( nNewTab );
-        SetTabNo( nNewTab, TRUE );
+        SetTabNo( nNewTab, sal_True );
 
         aDestRange = ScRange( 0, 0, nNewTab );
     }
@@ -657,10 +657,10 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
     else
         aObj.SetSaveData( rData );
 
-    BOOL bAllowMove = ( pDPObj != NULL );	// allow re-positioning when editing existing table
+    sal_Bool bAllowMove = ( pDPObj != NULL );	// allow re-positioning when editing existing table
 
     ScDBDocFunc aFunc( *pDocSh );
-    bool bSuccess = aFunc.DataPilotUpdate( pDPObj, &aObj, TRUE, FALSE, bAllowMove );
+    bool bSuccess = aFunc.DataPilotUpdate( pDPObj, &aObj, sal_True, sal_False, bAllowMove );
 
     CursorPosChanged();		// shells may be switched
 
@@ -683,13 +683,13 @@ void ScDBFunc::DeletePivotTable()
     if ( pDPObj )
     {
         ScDBDocFunc aFunc( *pDocSh );
-        aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, FALSE );
+        aFunc.DataPilotUpdate( pDPObj, NULL, sal_True, sal_False );
         CursorPosChanged();		// shells may be switched
     }
     else
         ErrorMessage(STR_PIVOT_NOTFOUND);
 }
-ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, BOOL bRecord, BOOL bApi )
+sal_uLong RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, sal_Bool bRecord, sal_Bool bApi )
 {
     if( !pDPObj )
         return STR_PIVOT_NOTFOUND;
@@ -698,19 +698,19 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh,
         pDoc = pDocSh->GetDocument();
 
     if( !pDoc  )
-        return static_cast<ULONG>(-1);
+        return static_cast<sal_uLong>(-1);
 
     if( !pDocSh && ( pDocSh = PTR_CAST( ScDocShell, pDoc->GetDocumentShell() ) ) == NULL )
-        return static_cast<ULONG>(-1);
+        return static_cast<sal_uLong>(-1);
 
-    if( ULONG nErrId = pDPObj->RefreshCache() )
+    if( sal_uLong nErrId = pDPObj->RefreshCache() )
         return nErrId;
     else if ( nErrId == 0 )
     {
         //Refresh all dpobjects
         ScDPCollection* pDPCollection = pDoc->GetDPCollection();
-        USHORT nCount = pDPCollection->GetCount();
-        for (USHORT i=0; i<nCount; i++)
+        sal_uInt16 nCount = pDPCollection->GetCount();
+        for (sal_uInt16 i=0; i<nCount; i++)
         {
             if ( (*pDPCollection)[i]->GetCacheId() == pDPObj->GetCacheId()  )
             {
@@ -726,7 +726,7 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh,
     return 0U;
 }
 
-ULONG  ScDBFunc::RecalcPivotTable()
+sal_uLong  ScDBFunc::RecalcPivotTable()
 {
     ScDocShell* pDocSh  = GetViewData()->GetDocShell();
     ScDocument* pDoc	= GetViewData()->GetDocument();
@@ -741,9 +741,9 @@ ULONG  ScDBFunc::RecalcPivotTable()
         // Wang Xu Ming -- 2009-6-17
         // DataPilot Migration
         //ScDBDocFunc aFunc( *pDocSh );
-        //aFunc.DataPilotUpdate( pDPObj, pDPObj, TRUE, FALSE );
+        //aFunc.DataPilotUpdate( pDPObj, pDPObj, sal_True, sal_False );
         //CursorPosChanged();      // shells may be switched
-        ULONG nErrId = RefreshDPObject( pDPObj, pDoc, pDocSh, TRUE, FALSE );//pDPObj->RefreshCache();
+        sal_uLong nErrId = RefreshDPObject( pDPObj, pDoc, pDocSh, sal_True, sal_False );//pDPObj->RefreshCache();
         if ( nErrId == 0 )
         {
             // There is no undo for the refresh of the cache table, but the undo history for cell changes
@@ -751,7 +751,7 @@ ULONG  ScDBFunc::RecalcPivotTable()
             //GetViewData()->GetDocShell()->GetUndoManager()->Clear();
         }
         else if (nErrId <= USHRT_MAX)
-            ErrorMessage(static_cast<USHORT>(nErrId));
+            ErrorMessage(static_cast<sal_uInt16>(nErrId));
       return nErrId;
       // End Comments
     }
@@ -773,10 +773,10 @@ void ScDBFunc::GetSelectedMemberList( ScStrCollection& rEntries, long& rDimensio
 
     ScRangeListRef xRanges;
     GetViewData()->GetMultiArea( xRanges );         // incl. cursor if nothing is selected
-    ULONG nRangeCount = xRanges->Count();
-    BOOL bContinue = TRUE;
+    sal_uLong nRangeCount = xRanges->Count();
+    sal_Bool bContinue = sal_True;
 
-    for (ULONG nRangePos=0; nRangePos<nRangeCount && bContinue; nRangePos++)
+    for (sal_uLong nRangePos=0; nRangePos<nRangeCount && bContinue; nRangePos++)
     {
         ScRange aRange = *xRanges->GetObject(nRangePos);
         SCCOL nStartCol = aRange.aStart.Col();
@@ -791,7 +791,7 @@ void ScDBFunc::GetSelectedMemberList( ScStrCollection& rEntries, long& rDimensio
                 sheet::DataPilotTableHeaderData aData;
                 pDPObj->GetHeaderPositionData(ScAddress(nCol, nRow, nTab), aData);
                 if ( aData.Dimension < 0 )
-                    bContinue = FALSE;              // not part of any dimension
+                    bContinue = sal_False;              // not part of any dimension
                 else
                 {
                     if ( nStartDimension < 0 )      // first member?
@@ -804,7 +804,7 @@ void ScDBFunc::GetSelectedMemberList( ScStrCollection& rEntries, long& rDimensio
                          aData.Hierarchy != nStartHierarchy ||
                          aData.Level     != nStartLevel )
                     {
-                        bContinue = FALSE;          // cannot mix dimensions
+                        bContinue = sal_False;          // cannot mix dimensions
                     }
                 }
                 if ( bContinue )
@@ -826,11 +826,11 @@ void ScDBFunc::GetSelectedMemberList( ScStrCollection& rEntries, long& rDimensio
         rEntries.FreeAll();         // remove all if not valid
 }
 
-BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts )
+sal_Bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& rParts )
 {
     // determine if the date group dialog has to be shown for the current selection
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     SCCOL nCurX = GetViewData()->GetCurX();
     SCROW nCurY = GetViewData()->GetCurY();
@@ -846,12 +846,12 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
             String aBaseDimName( aDimName );
 
-            BOOL bInGroupDim = FALSE;
-            BOOL bFoundParts = FALSE;
+            sal_Bool bInGroupDim = sal_False;
+            sal_Bool bFoundParts = sal_False;
 
             ScDPDimensionSaveData* pDimData =
                 const_cast<ScDPDimensionSaveData*>( pDPObj->GetSaveData()->GetExistingDimensionData() );
@@ -869,7 +869,7 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
                         //  (parts are collected below)
 
                         rOldInfo = pNumGroupDim->GetDateInfo();
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
                     else if ( pNumGroupDim->GetInfo().DateValues )
                     {
@@ -878,10 +878,10 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
 
                         rOldInfo = pNumGroupDim->GetInfo();
                         rParts = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS;               // not found in CollectDateParts
-                        bFoundParts = TRUE;
-                        bFound = TRUE;
+                        bFoundParts = sal_True;
+                        bFound = sal_True;
                     }
-                    bInGroupDim = TRUE;
+                    bInGroupDim = sal_True;
                 }
                 else if ( pGroupDim )
                 {
@@ -894,9 +894,9 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
 
                         rOldInfo = pGroupDim->GetDateInfo();
                         aBaseDimName = pGroupDim->GetSourceDimName();
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
-                    bInGroupDim = TRUE;
+                    bInGroupDim = sal_True;
                 }
             }
             if ( bFound && !bFoundParts )
@@ -918,12 +918,12 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
                     SCTAB nSelTab = aSelRange.aStart.Tab();
                     if ( pDoc->HasValueData( nSelCol, nSelRow, nSelTab ) )
                     {
-                        ULONG nIndex = static_cast<const SfxUInt32Item*>(pDoc->GetAttr(
+                        sal_uLong nIndex = static_cast<const SfxUInt32Item*>(pDoc->GetAttr(
                                         nSelCol, nSelRow, nSelTab, ATTR_VALUE_FORMAT))->GetValue();
                         short nType = pDoc->GetFormatTable()->GetType(nIndex);
                         if ( nType == NUMBERFORMAT_DATE || nType == NUMBERFORMAT_TIME || nType == NUMBERFORMAT_DATETIME )
                         {
-                            bFound = TRUE;
+                            bFound = sal_True;
                             // use currently selected value for automatic limits
                             if( rOldInfo.AutoStart )
                                 rOldInfo.Start = pDoc->GetValue( aSelRange.aStart );
@@ -939,11 +939,11 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32&
     return bFound;
 }
 
-BOOL ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
+sal_Bool ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
 {
     // determine if the numeric group dialog has to be shown for the current selection
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
 
     SCCOL nCurX = GetViewData()->GetCurX();
     SCROW nCurY = GetViewData()->GetCurY();
@@ -959,10 +959,10 @@ BOOL ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
-            BOOL bInGroupDim = FALSE;
+            sal_Bool bInGroupDim = sal_False;
 
             ScDPDimensionSaveData* pDimData =
                 const_cast<ScDPDimensionSaveData*>( pDPObj->GetSaveData()->GetExistingDimensionData() );
@@ -975,10 +975,10 @@ BOOL ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
                     //  -> edit settings of this dimension
 
                     rOldInfo = pNumGroupDim->GetInfo();
-                    bFound = TRUE;
+                    bFound = sal_True;
                 }
                 else if ( pDimData->GetNamedGroupDim( aDimName ) )
-                    bInGroupDim = TRUE;                                    // in a group dimension
+                    bInGroupDim = sal_True;                                    // in a group dimension
             }
             if ( !bFound && !bInGroupDim )
             {
@@ -992,7 +992,7 @@ BOOL ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
                     if ( pDoc->HasValueData( aSelRange.aStart.Col(), aSelRange.aStart.Row(),
                                              aSelRange.aStart.Tab() ) )
                     {
-                        bFound = TRUE;
+                        bFound = sal_True;
                         // use currently selected value for automatic limits
                         if( rOldInfo.AutoStart )
                             rOldInfo.Start = pDoc->GetValue( aSelRange.aStart );
@@ -1019,7 +1019,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
             ScDPSaveData aData( *pDPObj->GetSaveData() );
@@ -1073,7 +1073,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar
                 ScDPNumGroupInfo aEmpty;
                 bool bFirst = true;
                 sal_Int32 nMask = 1;
-                for (USHORT nBit=0; nBit<32; nBit++)
+                for (sal_uInt16 nBit=0; nBit<32; nBit++)
                 {
                     if ( nParts & nMask )
                     {
@@ -1128,7 +1128,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar
             ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
             ScDPObject* pNewObj = new ScDPObject( *pDPObj );
             pNewObj->SetSaveData( aData );
-            aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+            aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
             delete pNewObj;
 
             // unmark cell selection
@@ -1149,7 +1149,7 @@ void ScDBFunc::NumGroupDataPilot( const ScDPNumGroupInfo& rInfo )
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
             ScDPSaveData aData( *pDPObj->GetSaveData() );
@@ -1172,7 +1172,7 @@ void ScDBFunc::NumGroupDataPilot( const ScDPNumGroupInfo& rInfo )
             ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
             ScDPObject* pNewObj = new ScDPObject( *pDPObj );
             pNewObj->SetSaveData( aData );
-            aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+            aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
             delete pNewObj;
 
             // unmark cell selection
@@ -1193,7 +1193,7 @@ void ScDBFunc::GroupDataPilot()
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
             ScDPSaveData aData( *pDPObj->GetSaveData() );
@@ -1214,8 +1214,8 @@ void ScDBFunc::GroupDataPilot()
 
             // remove the selected items from their groups
             // (empty groups are removed, too)
-            USHORT nEntryCount = aEntries.GetCount();
-            USHORT nEntry;
+            sal_uInt16 nEntryCount = aEntries.GetCount();
+            sal_uInt16 nEntry;
             if ( pGroupDimension )
             {
                 for (nEntry=0; nEntry<nEntryCount; nEntry++)
@@ -1260,7 +1260,7 @@ void ScDBFunc::GroupDataPilot()
                         const ScDPSaveGroupItem* pBaseGroup = pBaseGroupDim->GetGroupByIndex( nGroup );
 
                         StrData aStrData( pBaseGroup->GetGroupName() );
-                        USHORT nCollIndex;
+                        sal_uInt16 nCollIndex;
                         if ( !aEntries.Search( &aStrData, nCollIndex ) )    //! ignore case?
                         {
                             // add an additional group for each item that is not in the selection
@@ -1316,7 +1316,7 @@ void ScDBFunc::GroupDataPilot()
             ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
             ScDPObject* pNewObj = new ScDPObject( *pDPObj );
             pNewObj->SetSaveData( aData );
-            aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+            aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
             delete pNewObj;
 
             // unmark cell selection
@@ -1337,14 +1337,14 @@ void ScDBFunc::UngroupDataPilot()
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
 
             ScDPSaveData aData( *pDPObj->GetSaveData() );
             ScDPDimensionSaveData* pDimData = aData.GetDimensionData();     // created if not there
             //! test first if DimensionData exists?
 
-            BOOL bApply = FALSE;
+            sal_Bool bApply = sal_False;
 
             ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aDimName );
             const ScDPSaveNumGroupDimension* pNumGroupDim = pDimData->GetNumGroupDim( aDimName );
@@ -1360,8 +1360,8 @@ void ScDBFunc::UngroupDataPilot()
             }
             else if ( pGroupDim )
             {
-                USHORT nEntryCount = aEntries.GetCount();
-                for (USHORT nEntry=0; nEntry<nEntryCount; nEntry++)
+                sal_uInt16 nEntryCount = aEntries.GetCount();
+                for (sal_uInt16 nEntry=0; nEntry<nEntryCount; nEntry++)
                 {
                     String aEntryName = aEntries[nEntry]->GetString();
                     pGroupDim->RemoveGroup( aEntryName );
@@ -1383,14 +1383,14 @@ void ScDBFunc::UngroupDataPilot()
                     // also remove SaveData settings for the dimension that no longer exists
                     aData.RemoveDimensionByName( aDimName );
                 }
-                bApply = TRUE;
+                bApply = sal_True;
             }
             else if ( pNumGroupDim )
             {
                 // remove the numerical grouping
                 pDimData->RemoveNumGroupDimension( aDimName );
                 // SaveData settings can remain unchanged - the same dimension still exists
-                bApply = TRUE;
+                bApply = sal_True;
             }
 
             if ( bApply )
@@ -1399,7 +1399,7 @@ void ScDBFunc::UngroupDataPilot()
                 ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
                 ScDPObject* pNewObj = new ScDPObject( *pDPObj );
                 pNewObj->SetSaveData( aData );
-                aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+                aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
                 delete pNewObj;
 
                 // unmark cell selection
@@ -1474,13 +1474,13 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
         return;
     }
 
-    USHORT nErrorId = 0;
+    sal_uInt16 nErrorId = 0;
 
     pDPObj->BuildAllDimensionMembers();
     ScDPSaveData aData( *pDPObj->GetSaveData() );
-    BOOL bChange = FALSE;
+    sal_Bool bChange = sal_False;
 
-    USHORT nOrient = DataPilotFieldOrientation_HIDDEN;
+    sal_uInt16 nOrient = DataPilotFieldOrientation_HIDDEN;
     long nField = pDPObj->GetHeaderDim( rPos, nOrient );
     if ( nField >= 0 )
     {
@@ -1502,7 +1502,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
                     ScDPSaveDimension* pSaveDim = aData.GetDimensionByName( aOldText );
                     pSaveDim->SetName( aNewName );
 
-                    bChange = TRUE;
+                    bChange = sal_True;
                 }
                 else
                     nErrorId = STR_INVALIDNAME;
@@ -1510,7 +1510,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
         }
         else if (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW)
         {
-            BOOL bDataLayout = false;
+            sal_Bool bDataLayout = false;
             String aDimName = pDPObj->GetDimName(nField, bDataLayout);
             ScDPSaveDimension* pDim = bDataLayout ? aData.GetDataLayoutDimension() : aData.GetDimensionByName(aDimName);
             if (pDim)
@@ -1570,7 +1570,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
         {
             if ( aData.GetExistingDimensionData() && !(aPosData.Flags & MemberResultFlags::SUBTOTAL))
             {
-                BOOL bIsDataLayout;
+                sal_Bool bIsDataLayout;
                 String aDimName = pDPObj->GetDimName( aPosData.Dimension, bIsDataLayout );
 
                 ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
@@ -1598,7 +1598,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
                         if ( pSaveMember )
                             pSaveMember->SetName( aNewName );
 
-                        bChange = TRUE;
+                        bChange = sal_True;
                     }
                     else
                         nErrorId = STR_INVALIDNAME;
@@ -1611,7 +1611,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
             }
             else if (aPosData.Dimension >= 0 && aPosData.MemberName.getLength() > 0)
             {
-                BOOL bDataLayout = false;
+                sal_Bool bDataLayout = false;
                 String aDimName = pDPObj->GetDimName(static_cast<long>(aPosData.Dimension), bDataLayout);
                 if (bDataLayout)
                 {
@@ -1718,7 +1718,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
         ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
         ScDPObject* pNewObj = new ScDPObject( *pDPObj );
         pNewObj->SetSaveData( aData );
-        aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+        aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
         delete pNewObj;
     }
     else
@@ -1765,13 +1765,13 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
     if ( pUserListId )
         pDPObj->BuildAllDimensionMembers();
     
-    USHORT nOrientation;
+    sal_uInt16 nOrientation;
     long nDimIndex = pDPObj->GetHeaderDim(rPos, nOrientation);
     if (nDimIndex < 0)
         // Invalid dimension index.  Bail out.
         return false;
 
-    BOOL bDataLayout;
+    sal_Bool bDataLayout;
     ScDPSaveData* pSaveData = pDPObj->GetSaveData();
     if (!pSaveData)
         return false;
@@ -1897,9 +1897,9 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
     return aFunc.DataPilotUpdate(pDPObj, pNewObj.get(), true, false);
 }
 
-BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
+sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDPObject* pDPObj = pDoc->GetDPAtCursor( rSource.aStart.Col(), rSource.aStart.Row(), rSource.aStart.Tab() );
     if ( pDPObj && pDPObj == pDoc->GetDPAtCursor( rDest.Col(), rDest.Row(), rDest.Tab() ) )
@@ -1933,7 +1933,7 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
 
         if ( bValid )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( aDestData.Dimension, bIsDataLayout );
             if ( !bIsDataLayout )
             {
@@ -1980,12 +1980,12 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
                 ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
                 ScDPObject* pNewObj = new ScDPObject( *pDPObj );
                 pNewObj->SetSaveData( aData );
-                aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );      //! bApi for drag&drop?
+                aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );      //! bApi for drag&drop?
                 delete pNewObj;
 
                 Unmark();       // entry was moved - no use in leaving the old cell selected
 
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -1993,9 +1993,9 @@ BOOL ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
     return bRet;
 }
 
-BOOL ScDBFunc::HasSelectionForDrillDown( USHORT& rOrientation )
+sal_Bool ScDBFunc::HasSelectionForDrillDown( sal_uInt16& rOrientation )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     ScDPObject* pDPObj = GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(),
                                         GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
@@ -2007,7 +2007,7 @@ BOOL ScDBFunc::HasSelectionForDrillDown( USHORT& rOrientation )
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
             if ( !bIsDataLayout )
             {
@@ -2015,12 +2015,12 @@ BOOL ScDBFunc::HasSelectionForDrillDown( USHORT& rOrientation )
                 ScDPSaveDimension* pDim = pSaveData->GetExistingDimensionByName( aDimName );
                 if ( pDim )
                 {
-                    USHORT nDimOrient = pDim->GetOrientation();
+                    sal_uInt16 nDimOrient = pDim->GetOrientation();
                     ScDPSaveDimension* pInner = pSaveData->GetInnermostDimension( nDimOrient );
                     if ( pDim == pInner )
                     {
                         rOrientation = nDimOrient;
-                        bRet = TRUE;
+                        bRet = sal_True;
                     }
                 }
             }
@@ -2030,7 +2030,7 @@ BOOL ScDBFunc::HasSelectionForDrillDown( USHORT& rOrientation )
     return bRet;
 }
 
-void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName )
+void ScDBFunc::SetDataPilotDetails( sal_Bool bShow, const String* pNewDimensionName )
 {
     ScDPObject* pDPObj = GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(),
                                         GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
@@ -2042,7 +2042,7 @@ void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName
 
         if ( aEntries.GetCount() > 0 )
         {
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
             if ( !bIsDataLayout )
             {
@@ -2062,7 +2062,7 @@ void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName
                         pDuplicated = aData.DuplicateDimension( *pNewDimensionName );
                     }
 
-                    USHORT nOrientation = pDim->GetOrientation();
+                    sal_uInt16 nOrientation = pDim->GetOrientation();
                     pNewDim->SetOrientation( nOrientation );
 
                     long nPosition = LONG_MAX;
@@ -2089,17 +2089,17 @@ void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName
                     ScStrCollection aVisibleEntries;
                     pDPObj->GetMemberResultNames( aVisibleEntries, nSelectDimension );
 
-                    USHORT nVisCount = aVisibleEntries.GetCount();
-                    for (USHORT nVisPos=0; nVisPos<nVisCount; nVisPos++)
+                    sal_uInt16 nVisCount = aVisibleEntries.GetCount();
+                    for (sal_uInt16 nVisPos=0; nVisPos<nVisCount; nVisPos++)
                     {
                         String aVisName = aVisibleEntries[nVisPos]->GetString();
                         ScDPSaveMember* pMember = pDim->GetMemberByName( aVisName );
-                        pMember->SetShowDetails( FALSE );
+                        pMember->SetShowDetails( sal_False );
                     }
                 }
 
-                USHORT nEntryCount = aEntries.GetCount();
-                for (USHORT nEntry=0; nEntry<nEntryCount; nEntry++)
+                sal_uInt16 nEntryCount = aEntries.GetCount();
+                for (sal_uInt16 nEntry=0; nEntry<nEntryCount; nEntry++)
                 {
                     String aEntryName = aEntries[nEntry]->GetString();
                     ScDPSaveMember* pMember = pDim->GetMemberByName( aEntryName );
@@ -2110,7 +2110,7 @@ void ScDBFunc::SetDataPilotDetails( BOOL bShow, const String* pNewDimensionName
                 ScDBDocFunc aFunc( *GetViewData()->GetDocShell() );
                 ScDPObject* pNewObj = new ScDPObject( *pDPObj );
                 pNewObj->SetSaveData( aData );
-                aFunc.DataPilotUpdate( pDPObj, pNewObj, TRUE, FALSE );
+                aFunc.DataPilotUpdate( pDPObj, pNewObj, sal_True, sal_False );
                 delete pNewObj;
 
                 // unmark cell selection
@@ -2178,7 +2178,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
             continue;
 
         ScPatternAttr aPattern( pInsDoc->GetPool() );
-        aPattern.GetItemSet().Put( SfxUInt32Item(ATTR_VALUE_FORMAT, static_cast<UINT32>(nNumFmt)) );
+        aPattern.GetItemSet().Put( SfxUInt32Item(ATTR_VALUE_FORMAT, static_cast<sal_uInt32>(nNumFmt)) );
         pInsDoc->ApplyPatternAreaTab(nCol, 1, nCol, nRowSize-1, nNewTab, aPattern);
     }
 
@@ -2187,7 +2187,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
     pInsDoc->GetCellArea( nNewTab, nEndCol, nEndRow );
     pInsDoc->SetClipArea( ScRange( 0, 0, nNewTab, nEndCol, nEndRow, nNewTab ) );
 
-    SfxUndoManager* pMgr = GetViewData()->GetDocShell()->GetUndoManager();
+    ::svl::IUndoManager* pMgr = GetViewData()->GetDocShell()->GetUndoManager();
     String aUndo = ScGlobal::GetRscString( STR_UNDO_DOOUTLINE );
     pMgr->EnterListAction( aUndo, aUndo );
 
@@ -2203,7 +2203,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
 //			DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen
 //
 
-void ScDBFunc::RepeatDB( BOOL bRecord )
+void ScDBFunc::RepeatDB( sal_Bool bRecord )
 {
     SCCOL nCurX = GetViewData()->GetCurX();
     SCROW nCurY = GetViewData()->GetCurY();
@@ -2211,33 +2211,33 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDBData* pDBData = GetDBData();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScQueryParam aQueryParam;
     pDBData->GetQueryParam( aQueryParam );
-    BOOL bQuery = aQueryParam.GetEntry(0).bDoQuery;
+    sal_Bool bQuery = aQueryParam.GetEntry(0).bDoQuery;
 
     ScSortParam aSortParam;
     pDBData->GetSortParam( aSortParam );
-    BOOL bSort = aSortParam.bDoSort[0];
+    sal_Bool bSort = aSortParam.bDoSort[0];
 
     ScSubTotalParam aSubTotalParam;
     pDBData->GetSubTotalParam( aSubTotalParam );
-    BOOL bSubTotal = aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly;
+    sal_Bool bSubTotal = aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly;
 
     if ( bQuery || bSort || bSubTotal )
     {
-        BOOL bQuerySize = FALSE;
+        sal_Bool bQuerySize = sal_False;
         ScRange aOldQuery;
         ScRange aNewQuery;
         if (bQuery && !aQueryParam.bInplace)
         {
             ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow,
-                                                    aQueryParam.nDestTab, TRUE );
+                                                    aQueryParam.nDestTab, sal_True );
             if (pDest && pDest->IsDoSize())
             {
                 pDest->GetArea( aOldQuery );
-                bQuerySize = TRUE;
+                bQuerySize = sal_True;
             }
         }
 
@@ -2271,18 +2271,18 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
                 pTable->GetColArray()->GetRange( nOutStartCol, nOutEndCol );
                 pTable->GetRowArray()->GetRange( nOutStartRow, nOutEndRow );
 
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, FALSE, pUndoDoc );
-                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, FALSE, pUndoDoc );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+                pDoc->CopyToDocument( static_cast<SCCOL>(nOutStartCol), 0, nTab, static_cast<SCCOL>(nOutEndCol), MAXROW, nTab, IDF_NONE, sal_False, pUndoDoc );
+                pDoc->CopyToDocument( 0, nOutStartRow, nTab, MAXCOL, nOutEndRow, nTab, IDF_NONE, sal_False, pUndoDoc );
             }
             else
-                pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
+                pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
 
             //	Datenbereich sichern - incl. Filter-Ergebnis
-            pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, sal_False, pUndoDoc );
 
             //	alle Formeln wegen Referenzen
-            pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, sal_False, pUndoDoc );
 
             //	DB- und andere Bereiche
             ScRangeName* pDocRange = pDoc->GetRangeName();
@@ -2297,14 +2297,14 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
         {
             //	Sortieren ohne SubTotals
 
-            aSubTotalParam.bRemoveOnly = TRUE;		// wird unten wieder zurueckgesetzt
-            DoSubTotals( aSubTotalParam, FALSE );
+            aSubTotalParam.bRemoveOnly = sal_True;		// wird unten wieder zurueckgesetzt
+            DoSubTotals( aSubTotalParam, sal_False );
         }
 
         if (bSort)
         {
             pDBData->GetSortParam( aSortParam );			// Bereich kann sich geaendert haben
-            Sort( aSortParam, FALSE, FALSE);
+            Sort( aSortParam, sal_False, sal_False);
         }
         if (bQuery)
         {
@@ -2316,10 +2316,10 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
                     aAdvSource.aStart.Col(), aAdvSource.aStart.Row(),
                     aAdvSource.aEnd.Col(), aAdvSource.aEnd.Row(),
                     aAdvSource.aStart.Tab(), aQueryParam );
-                Query( aQueryParam, &aAdvSource, FALSE );
+                Query( aQueryParam, &aAdvSource, sal_False );
             }				
             else
-                Query( aQueryParam, NULL, FALSE );
+                Query( aQueryParam, NULL, sal_False );
 
             //	bei nicht-inplace kann die Tabelle umgestellt worden sein
             if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab )
@@ -2328,8 +2328,8 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
         if (bSubTotal)
         {
             pDBData->GetSubTotalParam( aSubTotalParam );	// Bereich kann sich geaendert haben
-            aSubTotalParam.bRemoveOnly = FALSE;
-            DoSubTotals( aSubTotalParam, FALSE );
+            aSubTotalParam.bRemoveOnly = sal_False;
+            DoSubTotals( aSubTotalParam, sal_False );
         }
 
         if (bRecord)
@@ -2344,7 +2344,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
             if (bQuerySize)
             {
                 ScDBData* pDest = pDoc->GetDBAtCursor( aQueryParam.nDestCol, aQueryParam.nDestRow,
-                                                        aQueryParam.nDestTab, TRUE );
+                                                        aQueryParam.nDestTab, sal_True );
                 if (pDest)
                 {
                     pDest->GetArea( aNewQuery );
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index 2bd6db27a..d6f8704d1 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -53,16 +53,16 @@ using namespace com::sun::star;
 //==================================================================
 
 // static
-USHORT ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCharts )
+sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, sal_Bool bAllCharts )
 {
     ScDrawLayer* pModel = pDoc->GetDrawLayer();
     if (!pModel)
         return 0;
 
-    USHORT nFound = 0;
+    sal_uInt16 nFound = 0;
 
-    USHORT nPageCount = pModel->GetPageCount();
-    for (USHORT nPageNo=0; nPageNo<nPageCount; nPageNo++)
+    sal_uInt16 nPageCount = pModel->GetPageCount();
+    for (sal_uInt16 nPageNo=0; nPageNo<nPageCount; nPageNo++)
     {
         SdrPage* pPage = pModel->GetPage(nPageNo);
         DBG_ASSERT(pPage,"Page ?");
@@ -74,12 +74,12 @@ USHORT ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL b
             if ( pObject->GetObjIdentifier() == OBJ_OLE2 && pDoc->IsChart( pObject ) )
             {
                 String aName = ((SdrOle2Obj*)pObject)->GetPersistName();
-                BOOL bHit = TRUE;
+                sal_Bool bHit = sal_True;
                 if ( !bAllCharts )
                 {
                     ScRangeList aRanges;
-                    BOOL bColHeaders = FALSE;
-                    BOOL bRowHeaders = FALSE;
+                    sal_Bool bColHeaders = sal_False;
+                    sal_Bool bRowHeaders = sal_False;
                     pDoc->GetOldChartParameters( aName, aRanges, bColHeaders, bRowHeaders );
                     bHit = aRanges.In( rPos );
                 }
diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx
index bc64e241f..fdefb9486 100644
--- a/sc/source/ui/view/drawattr.cxx
+++ b/sc/source/ui/view/drawattr.cxx
@@ -41,7 +41,7 @@ String __EXPORT SvxDrawToolItem::GetValueText() const
 
 //------------------------------------------------------------------------
 
-String __EXPORT SvxDrawToolItem::GetValueText( USHORT nVal ) const
+String __EXPORT SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const
 {
     const sal_Char* p;
 
@@ -71,9 +71,9 @@ SfxPoolItem* __EXPORT SvxDrawToolItem::Clone( SfxItemPool * ) const
 
 //------------------------------------------------------------------------
 
-SfxPoolItem* __EXPORT SvxDrawToolItem::Create( SvStream& rStream, USHORT nVer ) const
+SfxPoolItem* __EXPORT SvxDrawToolItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
 {
-    USHORT nVal;
+    sal_uInt16 nVal;
     rStream >> nVal;
     return new SvxDrawToolItem(nVal);
 }
diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx
index e599e4e70..f340861fb 100644
--- a/sc/source/ui/view/drawutil.cxx
+++ b/sc/source/ui/view/drawutil.cxx
@@ -62,7 +62,7 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab,
     long nTwipsY = 0;
     for (SCCOL i=nStartCol; i<nEndCol; i++)
     {
-        USHORT nWidth = pDoc->GetColWidth(i,nTab);
+        sal_uInt16 nWidth = pDoc->GetColWidth(i,nTab);
         nTwipsX += (long) nWidth;
         nPixelX += ScViewData::ToPixel( nWidth, nPPTX );
     }
@@ -76,7 +76,7 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab,
             continue;
         }
 
-        USHORT nHeight = pDoc->GetRowHeight(nRow, nTab);
+        sal_uInt16 nHeight = pDoc->GetRowHeight(nRow, nTab);
         nTwipsY += static_cast<long>(nHeight);
         nPixelY += ScViewData::ToPixel(nHeight, nPPTY);
     }
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index cacfd77ad..0cf2a53a6 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -48,7 +48,7 @@
 
 void ScIMapDlgSet( const Graphic& rGraphic, const ImageMap* pImageMap,
                     const TargetList* pTargetList, void* pEditingObj );		// imapwrap
-USHORT ScIMapChildWindowId();
+sal_uInt16 ScIMapChildWindowId();
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -60,8 +60,8 @@ ScDrawView::ScDrawView( OutputDevice* pOut, ScViewData* pData ) :
     nTab( pData->GetTabNo() ),
     pDropMarker( NULL ),
     pDropMarkObj( NULL ),
-    bInConstruct( TRUE )
-    //HMHbDisableHdl( FALSE )
+    bInConstruct( sal_True )
+    //HMHbDisableHdl( sal_False )
 {
     // #i73602# Use default from the configuration
     SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_Calc());
@@ -80,8 +80,8 @@ void ScDrawView::SetAnchor( ScAnchorType eType )
     if( AreObjectsMarked() )
     {
         const SdrMarkList* pMark = &GetMarkedObjectList();
-        ULONG nCount = pMark->GetMarkCount();
-        for( ULONG i=0; i<nCount; i++ )
+        sal_uLong nCount = pMark->GetMarkCount();
+        for( sal_uLong i=0; i<nCount; i++ )
         {
             pObj = pMark->GetMark(i)->GetMarkedSdrObj();
             ScDrawLayer::SetAnchor( pObj, eType );
@@ -94,21 +94,21 @@ void ScDrawView::SetAnchor( ScAnchorType eType )
 
 ScAnchorType ScDrawView::GetAnchor() const
 {
-    BOOL bPage = FALSE;
-    BOOL bCell = FALSE;
+    sal_Bool bPage = sal_False;
+    sal_Bool bCell = sal_False;
     const SdrObject* pObj = NULL;
     if( AreObjectsMarked() )
     {
         const SdrMarkList* pMark = &GetMarkedObjectList();
-        ULONG nCount = pMark->GetMarkCount();
+        sal_uLong nCount = pMark->GetMarkCount();
         Point p0;
-        for( ULONG i=0; i<nCount; i++ )
+        for( sal_uLong i=0; i<nCount; i++ )
         {
             pObj = pMark->GetMark(i)->GetMarkedSdrObj();
             if( ScDrawLayer::GetAnchor( pObj ) == SCA_CELL )
-                bCell =TRUE;
+                bCell =sal_True;
             else
-                bPage = TRUE;
+                bPage = sal_True;
         }
     }
     if( bPage && !bCell )
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 3d47dcae7..c682823b8 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -71,18 +71,18 @@ Point aDragStartDiff;
 
 // -----------------------------------------------------------------------
 
-void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle )
+void lcl_CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle )
 {
-    rAnyOle = rOneOle = FALSE;
-    ULONG nCount = rMarkList.GetMarkCount();
-    for (ULONG i=0; i<nCount; i++)
+    rAnyOle = rOneOle = sal_False;
+    sal_uLong nCount = rMarkList.GetMarkCount();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         SdrMark* pMark = rMarkList.GetMark(i);
         SdrObject* pObj = pMark->GetMarkedSdrObj();
-        UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+        sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
         if (nSdrObjKind == OBJ_OLE2)
         {
-            rAnyOle = TRUE;
+            rAnyOle = sal_True;
             rOneOle = (nCount == 1);
             break;
         }
@@ -94,8 +94,8 @@ void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle )
             {
                 if ( pSubObj->GetObjIdentifier() == OBJ_OLE2 )
                 {
-                    rAnyOle = TRUE;
-                    // rOneOle remains FALSE - a group isn't treated like a single OLE object
+                    rAnyOle = sal_True;
+                    // rOneOle remains sal_False - a group isn't treated like a single OLE object
                     return;
                 }
                 pSubObj = aIter.Next();
@@ -107,7 +107,7 @@ void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle )
 #if 0
 void lcl_RefreshChartData( SdrModel* pModel, ScDocument* pSourceDoc )
 {
-    USHORT nPages = pModel->GetPageCount();
+    sal_uInt16 nPages = pModel->GetPageCount();
     for (SCTAB nTab=0; nTab<nPages; nTab++)
     {
         SdrPage* pPage = pModel->GetPage(nTab);
@@ -142,9 +142,9 @@ void lcl_RefreshChartData( SdrModel* pModel, ScDocument* pSourceDoc )
 #endif
 
 
-BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
+sal_Bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( AreObjectsMarked() )
     {
@@ -155,7 +155,7 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
 
         aDragStartDiff = rStartPos - aMarkedRect.TopLeft();
 
-        BOOL bAnyOle, bOneOle;
+        sal_Bool bAnyOle, bOneOle;
         const SdrMarkList& rMarkList = GetMarkedObjectList();
         lcl_CheckOle( rMarkList, bAnyOle, bOneOle );
 
@@ -197,7 +197,7 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
 
 void ScDrawView::DoCopy()
 {
-    BOOL bAnyOle, bOneOle;
+    sal_Bool bAnyOle, bOneOle;
     const SdrMarkList& rMarkList = GetMarkedObjectList();
     lcl_CheckOle( rMarkList, bAnyOle, bOneOle );
 
@@ -233,7 +233,7 @@ void ScDrawView::DoCopy()
 
 uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
 {
-    BOOL bAnyOle, bOneOle;
+    sal_Bool bAnyOle, bOneOle;
     const SdrMarkList& rMarkList = GetMarkedObjectList();
     lcl_CheckOle( rMarkList, bAnyOle, bOneOle );
 
@@ -296,12 +296,12 @@ void ScDrawView::SetMarkedOriginalSize()
 
     const SdrMarkList& rMarkList = GetMarkedObjectList();
     long nDone = 0;
-    ULONG nCount = rMarkList.GetMarkCount();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = rMarkList.GetMarkCount();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
-        USHORT nIdent = pObj->GetObjIdentifier();
-        BOOL bDo = FALSE;
+        sal_uInt16 nIdent = pObj->GetObjIdentifier();
+        sal_Bool bDo = sal_False;
         Size aOriginalSize;
         if (nIdent == OBJ_OLE2)
         {
@@ -315,7 +315,7 @@ void ScDrawView::SetMarkedOriginalSize()
                 {
                     MapMode aMapMode( MAP_100TH_MM );
                     aOriginalSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize( &aMapMode );
-                    bDo = TRUE;
+                    bDo = sal_True;
                 }
                 else
                 {
@@ -327,7 +327,7 @@ void ScDrawView::SetMarkedOriginalSize()
                         aOriginalSize = OutputDevice::LogicToLogic(
                                             Size( aSz.Width, aSz.Height ),
                                             aUnit, MAP_100TH_MM );
-                        bDo = TRUE;
+                        bDo = sal_True;
                     } catch( embed::NoVisualAreaSizeException& )
                     {
                         OSL_ENSURE( sal_False, "Can't get the original size of the object!" );
@@ -357,7 +357,7 @@ void ScDrawView::SetMarkedOriginalSize()
                 {
                     aOriginalSize = pActWin->LogicToLogic(
                                     rGraphic.GetPrefSize(), &aSourceMap, &aDestMap );
-                    bDo = TRUE;
+                    bDo = sal_True;
                 }
             }
         }
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 51f293c56..d9c57e8b0 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -82,12 +82,12 @@ using namespace com::sun::star;
 
 void ScDrawView::Construct()
 {
-    EnableExtendedKeyInputDispatcher(FALSE);
-    EnableExtendedMouseEventDispatcher(FALSE);
-    EnableExtendedCommandEventDispatcher(FALSE);
+    EnableExtendedKeyInputDispatcher(sal_False);
+    EnableExtendedMouseEventDispatcher(sal_False);
+    EnableExtendedCommandEventDispatcher(sal_False);
 
-    SetFrameDragSingles(TRUE);
-//	SetSolidMarkHdl(TRUE);				// einstellbar -> UpdateUserViewOptions
+    SetFrameDragSingles(sal_True);
+//	SetSolidMarkHdl(sal_True);				// einstellbar -> UpdateUserViewOptions
 
     SetMinMoveDistancePixel( 2 );
     SetHitTolerancePixel( 2 );
@@ -97,8 +97,8 @@ void ScDrawView::Construct()
         SCTAB nViewTab = pViewData->GetTabNo();
         ShowSdrPage(GetModel()->GetPage(nViewTab));
 
-        BOOL bEx = pViewData->GetViewShell()->IsDrawSelMode();
-        BOOL bProt = pDoc->IsTabProtected( nViewTab ) ||
+        sal_Bool bEx = pViewData->GetViewShell()->IsDrawSelMode();
+        sal_Bool bProt = pDoc->IsTabProtected( nViewTab ) ||
                      pViewData->GetSfxDocShell()->IsReadOnly();
 
         SdrLayer* pLayer;
@@ -108,7 +108,7 @@ void ScDrawView::Construct()
             SetLayerLocked( pLayer->GetName(), bProt || !bEx );
         pLayer = rAdmin.GetLayerPerID(SC_LAYER_INTERN);
         if (pLayer)
-            SetLayerLocked( pLayer->GetName(), TRUE );
+            SetLayerLocked( pLayer->GetName(), sal_True );
         pLayer = rAdmin.GetLayerPerID(SC_LAYER_FRONT);
         if (pLayer)
         {
@@ -125,7 +125,7 @@ void ScDrawView::Construct()
             SetLayerVisible( pLayer->GetName(), sal_False);
         }
 
-        SetSwapAsynchron(TRUE);
+        SetSwapAsynchron(sal_True);
     }
     else
     {
@@ -136,7 +136,7 @@ void ScDrawView::Construct()
     RecalcScale();
     UpdateWorkArea();
 
-    bInConstruct = FALSE;
+    bInConstruct = sal_False;
 }
 
 void ScDrawView::ImplClearCalcDropMarker()
@@ -155,16 +155,16 @@ __EXPORT ScDrawView::~ScDrawView()
 
 void ScDrawView::AddCustomHdl()
 {
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
 
     const SdrMarkList &rMrkList = GetMarkedObjectList();
-    UINT32 nCount = rMrkList.GetMarkCount();
-    for(UINT32 nPos=0; nPos<nCount; nPos++ )
+    sal_uInt32 nCount = rMrkList.GetMarkCount();
+    for(sal_uInt32 nPos=0; nPos<nCount; nPos++ )
     {
         const SdrObject* pObj = rMrkList.GetMark(nPos)->GetMarkedSdrObj();
         if(ScDrawLayer::GetAnchor(pObj) == SCA_CELL)
         {
-            const INT32 nDelta = 1;
+            const sal_Int32 nDelta = 1;
 
             Rectangle aBoundRect = pObj->GetCurrentBoundRect();
             Point aPos;
@@ -179,7 +179,7 @@ void ScDrawView::AddCustomHdl()
             long nPosY = (long) (aPos.Y() / HMM_PER_TWIPS) + nDelta;
 
             SCCOL nCol;
-            INT32 nWidth = 0;
+            sal_Int32 nWidth = 0;
 
             for(nCol=0; nCol<=MAXCOL && nWidth<=nPosX; nCol++)
                 nWidth += pDoc->GetColWidth(nCol,nTab);
@@ -188,7 +188,7 @@ void ScDrawView::AddCustomHdl()
                 --nCol;
 
             SCROW nRow = nPosY <= 0 ? 0 : pDoc->GetRowForHeight( nTab,
-                    (ULONG) nPosY);
+                    (sal_uLong) nPosY);
             if(nRow > 0)
                 --nRow;
 
@@ -205,7 +205,7 @@ void ScDrawView::InvalidateAttribs()
     SfxBindings& rBindings = pViewData->GetBindings();
 
         // echte Statuswerte:
-    rBindings.InvalidateAll( TRUE );
+    rBindings.InvalidateAll( sal_True );
 }
 
 void ScDrawView::InvalidateDrawTextAttrs()
@@ -261,7 +261,7 @@ void ScDrawView::InvalidateDrawTextAttrs()
 //	}
 //}
 
-void ScDrawView::SetMarkedToLayer( BYTE nLayerNo )
+void ScDrawView::SetMarkedToLayer( sal_uInt8 nLayerNo )
 {
     if (AreObjectsMarked())
     {
@@ -270,8 +270,8 @@ void ScDrawView::SetMarkedToLayer( BYTE nLayerNo )
         BegUndo( ScGlobal::GetRscString( STR_UNDO_SELATTR ) );
 
         const SdrMarkList& rMark = GetMarkedObjectList();
-        ULONG nCount = rMark.GetMarkCount();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = rMark.GetMarkCount();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj();
             if ( !pObj->ISA(SdrUnoObj) && (pObj->GetLayer() != SC_LAYER_INTERN) )
@@ -415,9 +415,9 @@ void ScDrawView::MarkListHasChanged()
     if ( pClient && pClient->IsObjectInPlaceActive() && !bUnoRefDialog )
     {
         //	#41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen
-        //HMHbDisableHdl = TRUE;
+        //HMHbDisableHdl = sal_True;
         pClient->DeactivateObject();
-        //HMHbDisableHdl = FALSE;
+        //HMHbDisableHdl = sal_False;
         //	Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate
     }
 
@@ -428,7 +428,7 @@ void ScDrawView::MarkListHasChanged()
     SdrMediaObj* pMediaObj = NULL;
 
     const SdrMarkList& rMarkList = GetMarkedObjectList();
-    ULONG nMarkCount = rMarkList.GetMarkCount();
+    sal_uLong nMarkCount = rMarkList.GetMarkCount();
 
     if ( nMarkCount == 0 && !pViewData->GetViewShell()->IsDrawSelMode() && !bInConstruct )
     {
@@ -437,7 +437,7 @@ void ScDrawView::MarkListHasChanged()
         LockInternalLayer();
     }
 
-    BOOL bSubShellSet = FALSE;
+    sal_Bool bSubShellSet = sal_False;
     if (nMarkCount == 1)
     {
         SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -445,56 +445,56 @@ void ScDrawView::MarkListHasChanged()
         {
             pOle2Obj = (SdrOle2Obj*) pObj;
             if (!pDoc->IsChart(pObj) )
-                pViewSh->SetOleObjectShell(TRUE);
+                pViewSh->SetOleObjectShell(sal_True);
             else
-                pViewSh->SetChartShell(TRUE);
-            bSubShellSet = TRUE;
+                pViewSh->SetChartShell(sal_True);
+            bSubShellSet = sal_True;
         }
         else if (pObj->GetObjIdentifier() == OBJ_GRAF)
         {
             pGrafObj = (SdrGrafObj*) pObj;
-            pViewSh->SetGraphicShell(TRUE);
-            bSubShellSet = TRUE;
+            pViewSh->SetGraphicShell(sal_True);
+            bSubShellSet = sal_True;
         }
         else if (pObj->GetObjIdentifier() == OBJ_MEDIA)
         {
             pMediaObj = (SdrMediaObj*) pObj;
-            pViewSh->SetMediaShell(TRUE);
-            bSubShellSet = TRUE;
+            pViewSh->SetMediaShell(sal_True);
+            bSubShellSet = sal_True;
         }
         else if (pObj->GetObjIdentifier() != OBJ_TEXT   // Verhindern, das beim Anlegen
                     || !pViewSh->IsDrawTextShell())		// eines TextObjekts auf die
         {												// DrawShell umgeschaltet wird.
-            pViewSh->SetDrawShell(TRUE);				//@#70206#
+            pViewSh->SetDrawShell(sal_True);				//@#70206#
         }
     }
 
     if ( nMarkCount && !bSubShellSet )
     {
-        BOOL bOnlyControls = TRUE;
-        BOOL bOnlyGraf     = TRUE;
-        for (ULONG i=0; i<nMarkCount; i++)
+        sal_Bool bOnlyControls = sal_True;
+        sal_Bool bOnlyGraf     = sal_True;
+        for (sal_uLong i=0; i<nMarkCount; i++)
         {
             SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
             if ( pObj->ISA( SdrObjGroup ) )
             {
                 const SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList();
-                ULONG nListCount = pLst->GetObjCount();
+                sal_uLong nListCount = pLst->GetObjCount();
                 if ( nListCount == 0 )
                 {
                     //	#104156# An empty group (may occur during Undo) is no control or graphics object.
                     //	Creating the form shell during undo would lead to problems with the undo manager.
-                    bOnlyControls = FALSE;
-                    bOnlyGraf = FALSE;
+                    bOnlyControls = sal_False;
+                    bOnlyGraf = sal_False;
                 }
-                for ( USHORT j = 0; j < nListCount; ++j )
+                for ( sal_uInt16 j = 0; j < nListCount; ++j )
                 {
                     SdrObject *pSubObj = pLst->GetObj( j );
 
                     if (!pSubObj->ISA(SdrUnoObj))
-                        bOnlyControls = FALSE;
+                        bOnlyControls = sal_False;
                     if (pSubObj->GetObjIdentifier() != OBJ_GRAF)
-                        bOnlyGraf = FALSE;
+                        bOnlyGraf = sal_False;
 
                     if ( !bOnlyControls && !bOnlyGraf ) break;
                 }
@@ -502,9 +502,9 @@ void ScDrawView::MarkListHasChanged()
             else
             {
                 if (!pObj->ISA(SdrUnoObj))
-                    bOnlyControls = FALSE;
+                    bOnlyControls = sal_False;
                 if (pObj->GetObjIdentifier() != OBJ_GRAF)
-                    bOnlyGraf = FALSE;
+                    bOnlyGraf = sal_False;
             }
 
             if ( !bOnlyControls && !bOnlyGraf ) break;
@@ -512,15 +512,15 @@ void ScDrawView::MarkListHasChanged()
 
         if(bOnlyControls)
         {
-            pViewSh->SetDrawFormShell(TRUE);			// jetzt UNO-Controls
+            pViewSh->SetDrawFormShell(sal_True);			// jetzt UNO-Controls
         }
         else if(bOnlyGraf)
         {
-            pViewSh->SetGraphicShell(TRUE);
+            pViewSh->SetGraphicShell(sal_True);
         }
         else if(nMarkCount>1)
         {
-            pViewSh->SetDrawShell(TRUE);
+            pViewSh->SetDrawShell(sal_True);
         }
     }
 
@@ -529,7 +529,7 @@ void ScDrawView::MarkListHasChanged()
     //	Verben anpassen
 
     SfxViewFrame* pViewFrame = pViewSh->GetViewFrame();
-    BOOL bOle = pViewSh->GetViewFrame()->GetFrame().IsInPlace();
+    sal_Bool bOle = pViewSh->GetViewFrame()->GetFrame().IsInPlace();
     uno::Sequence< embed::VerbDescriptor > aVerbs;
     if ( pOle2Obj && !bOle )
     {
@@ -603,7 +603,7 @@ void __EXPORT ScDrawView::UpdateUserViewOptions()
         const ScViewOptions&	rOpt = pViewData->GetOptions();
         const ScGridOptions&	rGrid = rOpt.GetGridOptions();
 
-        BOOL bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES );
+        sal_Bool bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES );
 
         SetDragStripes( rOpt.GetOption( VOPT_HELPLINES ) );
         SetSolidMarkHdl( rOpt.GetOption( VOPT_SOLIDHANDLES ) );
@@ -630,7 +630,7 @@ void __EXPORT ScDrawView::UpdateUserViewOptions()
 #pragma optimize ( "", on )
 #endif
 
-BOOL ScDrawView::SelectObject( const String& rName )
+sal_Bool ScDrawView::SelectObject( const String& rName )
 {
     UnmarkAll();
 
@@ -708,7 +708,7 @@ BOOL ScDrawView::SelectObject( const String& rName )
 //UNUSED2008-05      return EMPTY_STRING;        // nichts gefunden
 //UNUSED2008-05  }
 
-FASTBOOL ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions)
+FASTBOOL ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, sal_uLong nOptions)
 {
     //	Markierung nicht aendern, wenn Ole-Objekt aktiv
     //	(bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!)
@@ -763,7 +763,7 @@ void ScDrawView::DeleteMarked()
         (void)pCaptObj; // prevent 'unused variable' compiler warning in pro builds
         ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
         ScDocShell* pDocShell = pViewData ? pViewData->GetDocShell() : 0;
-        SfxUndoManager* pUndoMgr = pDocShell ? pDocShell->GetUndoManager() : 0;
+        ::svl::IUndoManager* pUndoMgr = pDocShell ? pDocShell->GetUndoManager() : 0;
         bool bUndo = pDrawLayer && pDocShell && pUndoMgr && pDoc->IsUndoEnabled();
 
         // remove the cell note from document, we are its owner now
@@ -795,7 +795,7 @@ void ScDrawView::DeleteMarked()
 
 SdrEndTextEditKind ScDrawView::ScEndTextEdit()
 {
-    BOOL bIsTextEdit = IsTextEdit();
+    sal_Bool bIsTextEdit = IsTextEdit();
     SdrEndTextEditKind eKind = SdrEndTextEdit();
 
     if ( bIsTextEdit && pViewData )
@@ -818,7 +818,7 @@ void ScDrawView::MarkDropObj( SdrObject* pObj )
     }
 }
 
-//UNUSED2009-05 void ScDrawView::CaptionTextDirection( USHORT nSlot )
+//UNUSED2009-05 void ScDrawView::CaptionTextDirection( sal_uInt16 nSlot )
 //UNUSED2009-05 {
 //UNUSED2009-05     if(nSlot != SID_TEXTDIRECTION_LEFT_TO_RIGHT && nSlot != SID_TEXTDIRECTION_TOP_TO_BOTTOM)
 //UNUSED2009-05         return;
@@ -838,7 +838,7 @@ void ScDrawView::MarkDropObj( SdrObject* pObj )
 //UNUSED2009-05             if ( pPoor )
 //UNUSED2009-05             {
 //UNUSED2009-05                 FuText* pText = static_cast<FuText*>(pPoor);
-//UNUSED2009-05                 pText->StopEditMode(TRUE);
+//UNUSED2009-05                 pText->StopEditMode(sal_True);
 //UNUSED2009-05             }
 //UNUSED2009-05         }
 //UNUSED2009-05     }
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 3ca671d93..044a2bf7f 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -111,8 +111,8 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) :
     pEditView		(pView),
     pViewData		(pData),
     pClipEvtLstnr	(NULL),
-    bPastePossible	(FALSE),
-    bIsInsertMode	(TRUE)
+    bPastePossible	(sal_False),
+    bIsInsertMode	(sal_True)
 {
     SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() );
     SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() );
@@ -123,7 +123,7 @@ ScEditShell::~ScEditShell()
 {
     if ( pClipEvtLstnr )
     {
-        pClipEvtLstnr->AddRemoveListener( pViewData->GetActiveWin(), FALSE );
+        pClipEvtLstnr->AddRemoveListener( pViewData->GetActiveWin(), sal_False );
 
         //  #122057# The listener may just now be waiting for the SolarMutex and call the link
         //  afterwards, in spite of RemoveListener. So the link has to be reset, too.
@@ -150,13 +150,13 @@ void lcl_RemoveAttribs( EditView& rEditView )
 {
     ScEditEngineDefaulter* pEngine = static_cast<ScEditEngineDefaulter*>(rEditView.GetEditEngine());
 
-    BOOL bOld = pEngine->GetUpdateMode();
-    pEngine->SetUpdateMode(FALSE);
+    sal_Bool bOld = pEngine->GetUpdateMode();
+    pEngine->SetUpdateMode(sal_False);
 
     String aName = ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );
     pEngine->GetUndoManager().EnterListAction( aName, aName );
 
-    rEditView.RemoveAttribs(TRUE);
+    rEditView.RemoveAttribs(sal_True);
     pEngine->RepeatDefaults();		// #97226# paragraph attributes from cell formats must be preserved
 
     pEngine->GetUndoManager().LeaveListAction();
@@ -176,7 +176,7 @@ void lclInsertCharacter( EditView* pTableView, EditView* pTopView, sal_Unicode c
 void ScEditShell::Execute( SfxRequest& rReq )
 {
     const SfxItemSet*	pReqArgs	= rReq.GetArgs();
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
     SfxBindings&		rBindings	= pViewData->GetBindings();
 
     ScInputHandler* pHdl = GetMyInputHdl();
@@ -198,7 +198,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
     EditEngine* pEngine = pTableView->GetEditEngine();
 
     pHdl->DataChanging();
-    BOOL bSetSelIsRef = FALSE;
+    sal_Bool bSetSelIsRef = sal_False;
 
     switch ( nSlot )
     {
@@ -262,10 +262,10 @@ void ScEditShell::Execute( SfxRequest& rReq )
 
         case SID_CLIPBOARD_FORMAT_ITEMS:
             {
-                ULONG nFormat = 0;
+                sal_uLong nFormat = 0;
                 const SfxPoolItem* pItem;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET &&
+                     pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET &&
                      pItem->ISA(SfxUInt32Item) )
                 {
                     nFormat = ((const SfxUInt32Item*)pItem)->GetValue();
@@ -288,7 +288,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
             {
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( pViewData->GetDialogParent() );
-                ULONG nFormat = 0;
+                sal_uLong nFormat = 0;
                 if ( pDlg )
                 {
                     pDlg->Insert( SOT_FORMAT_STRING, EMPTY_STRING );
@@ -326,7 +326,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
 
         case SID_SELECTALL:
             {
-                USHORT nPar = pEngine->GetParagraphCount();
+                sal_uInt16 nPar = pEngine->GetParagraphCount();
                 if (nPar)
                 {
                     xub_StrLen nLen = pEngine->GetTextLen(nPar-1);
@@ -339,8 +339,8 @@ void ScEditShell::Execute( SfxRequest& rReq )
 
         case SID_CHARMAP:
             {
-                USHORT nScript = pTableView->GetSelectedScriptType();
-                USHORT nFontWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? EE_CHAR_FONTINFO_CJK :
+                sal_uInt16 nScript = pTableView->GetSelectedScriptType();
+                sal_uInt16 nFontWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? EE_CHAR_FONTINFO_CJK :
                                 ( ( nScript == SCRIPTTYPE_COMPLEX ) ? EE_CHAR_FONTINFO_CTL :
                                                                         EE_CHAR_FONTINFO );
                 const SvxFontItem& rItem = (const SvxFontItem&)
@@ -352,13 +352,13 @@ void ScEditShell::Execute( SfxRequest& rReq )
                 const SfxItemSet *pArgs = rReq.GetArgs();
                 const SfxPoolItem* pItem = 0;
                 if( pArgs )
-                    pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), FALSE, &pItem);
+                    pArgs->GetItemState(GetPool().GetWhich(SID_CHARMAP), sal_False, &pItem);
 
                 if ( pItem )
                 {
                     aString = ((const SfxStringItem*)pItem)->GetValue();
                     const SfxPoolItem* pFtItem = NULL;
-                    pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), FALSE, &pFtItem);
+                    pArgs->GetItemState( GetPool().GetWhich(SID_ATTR_SPECIALCHAR), sal_False, &pFtItem);
                     const SfxStringItem* pFontItem = PTR_CAST( SfxStringItem, pFtItem );
                     if ( pFontItem )
                     {
@@ -386,7 +386,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
                 if ( aString.Len() )
                 {
                     //	if string contains WEAK characters, set all fonts
-                    BYTE nSetScript;
+                    sal_uInt8 nSetScript;
                     ScDocument* pDoc = pViewData->GetDocument();
                     if ( pDoc->HasStringWeakCharacters( aString ) )
                         nSetScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
@@ -396,7 +396,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
                     SfxItemSet aSet( pTableView->GetEmptyItemSet() );
                     SvxScriptSetItem aSetItem( SID_ATTR_CHAR_FONT, GetPool() );
                     aSetItem.PutItemForScriptType( nSetScript, aNewItem );
-                    aSet.Put( aSetItem.GetItemSet(), FALSE );
+                    aSet.Put( aSetItem.GetItemSet(), sal_False );
 
                     //	SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist
                     pTableView->GetEditEngine()->QuickSetAttribs( aSet, pTableView->GetSelection() );
@@ -422,12 +422,12 @@ void ScEditShell::Execute( SfxRequest& rReq )
             {
                 ScDocument*		pDoc = pViewData->GetDocument();
                 //CHINA001 ScNamePasteDlg* pDlg = new ScNamePasteDlg( pViewData->GetDialogParent(),
-                //CHINA001 								pDoc->GetRangeName(), FALSE );
+                //CHINA001 								pDoc->GetRangeName(), sal_False );
                                                 // "Liste" disablen
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
 
-                AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pViewData->GetDialogParent(), pDoc->GetRangeName(), RID_SCDLG_NAMES_PASTE, FALSE );
+                AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pViewData->GetDialogParent(), pDoc->GetRangeName(), RID_SCDLG_NAMES_PASTE, sal_False );
                 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
                 short nRet = pDlg->Execute();
                 // pDlg is needed below
@@ -489,7 +489,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
 
         case SID_TOGGLE_REL:
             {
-                BOOL bOk = FALSE;
+                sal_Bool bOk = sal_False;
                 if (pEngine->GetParagraphCount() == 1)
                 {
                     String aText = pEngine->GetText();
@@ -508,10 +508,10 @@ void ScEditShell::Execute( SfxRequest& rReq )
                             pTopView->GetEditEngine()->SetText( aNew );
                             pTopView->SetSelection( aNewSel );
                         }
-                        bOk = TRUE;
+                        bOk = sal_True;
 
                         //	Referenz wird selektiert -> beim Tippen nicht ueberschreiben
-                        bSetSelIsRef = TRUE;
+                        bSetSelIsRef = sal_True;
                     }
                 }
                 if (!bOk)
@@ -523,7 +523,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
             if( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET )
                 {
                     const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
                     const String& rName		= pHyper->GetName();
@@ -531,7 +531,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
                     const String& rTarget	= pHyper->GetTargetFrame();
                     SvxLinkInsertMode eMode = pHyper->GetInsertMode();
 
-                    BOOL bDone = FALSE;
+                    sal_Bool bDone = sal_False;
                     if ( eMode == HLINK_DEFAULT || eMode == HLINK_FIELD )
                     {
                         const SvxURLField* pURLField = GetURLField();
@@ -565,14 +565,14 @@ void ScEditShell::Execute( SfxRequest& rReq )
                                 pTopView->SetSelection( aSel );		// select inserted field
                             }
 
-                            bDone = TRUE;
+                            bDone = sal_True;
                         }
                     }
 
                     if (!bDone)
                     {
                         pViewData->GetViewShell()->
-                            InsertURL( rName, rURL, rTarget, (USHORT) eMode );
+                            InsertURL( rName, rURL, rTarget, (sal_uInt16) eMode );
 
                         //	InsertURL an der ViewShell schaltet bei "Button"
                         //	die EditShell ab, darum sofort return
@@ -617,13 +617,13 @@ void ScEditShell::Execute( SfxRequest& rReq )
 
     pHdl->DataChanged();
     if (bSetSelIsRef)
-        pHdl->SetSelIsRef(TRUE);
+        pHdl->SetSelIsRef(sal_True);
 }
 
 void lcl_DisableAll( SfxItemSet& rSet )    // disable all slots
 {
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         rSet.DisableItem( nWhich );
@@ -646,7 +646,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet )
     EditView* pActiveView = pHdl ? pHdl->GetActiveView() : pEditView;
 
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         switch (nWhich)
@@ -708,7 +708,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet )
                     rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
 
                     // disable thesaurus context menu entry if there is nothing to look up
-                    BOOL bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang );
+                    sal_Bool bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang );
                     if (!bIsLookUpWord || !bCanDoThesaurus)
                         rSet.DisableItem( SID_THES );
                 }
@@ -760,7 +760,7 @@ void __EXPORT ScEditShell::GetClipState( SfxItemSet& rSet )
         pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScEditShell, ClipboardChanged ) );
         pClipEvtLstnr->acquire();
         Window* pWin = pViewData->GetActiveWin();
-        pClipEvtLstnr->AddRemoveListener( pWin, TRUE );
+        pClipEvtLstnr->AddRemoveListener( pWin, sal_True );
 
         // get initial state
         TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
@@ -768,7 +768,7 @@ void __EXPORT ScEditShell::GetClipState( SfxItemSet& rSet )
     }
 
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         switch (nWhich)
@@ -814,7 +814,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
     SfxItemSet			aSet( pEditView->GetEmptyItemSet() );
     SfxBindings&		rBindings	= pViewData->GetBindings();
     const SfxItemSet*	pArgs		= rReq.GetArgs();
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
 
     switch ( nSlot )
     {
@@ -824,7 +824,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
                 if (pArgs)
                 {
                     // #i78017 establish the same behaviour as in Writer
-                    USHORT nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+                    sal_uInt16 nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
                     if (nSlot == SID_ATTR_CHAR_FONT)
                     {
                         nScript = pEditView->GetSelectedScriptType();
@@ -833,10 +833,10 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
 
                     SfxItemPool& rPool = GetPool();
                     SvxScriptSetItem aSetItem( nSlot, rPool );
-                    USHORT nWhich = rPool.GetWhich( nSlot );
+                    sal_uInt16 nWhich = rPool.GetWhich( nSlot );
                     aSetItem.PutItemForScriptType( nScript, pArgs->Get( nWhich ) );
 
-                    aSet.Put( aSetItem.GetItemSet(), FALSE );
+                    aSet.Put( aSetItem.GetItemSet(), sal_False );
                 }
             }
             break;
@@ -856,21 +856,21 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
         case SID_ATTR_CHAR_WEIGHT:
             {
                 // #i78017 establish the same behaviour as in Writer
-                USHORT nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+                sal_uInt16 nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
 
                 SfxItemPool& rPool = GetPool();
 
-                BOOL bOld = FALSE;
+                sal_Bool bOld = sal_False;
                 SvxScriptSetItem aOldSetItem( nSlot, rPool );
-                aOldSetItem.GetItemSet().Put( pEditView->GetAttribs(), FALSE );
+                aOldSetItem.GetItemSet().Put( pEditView->GetAttribs(), sal_False );
                 const SfxPoolItem* pCore = aOldSetItem.GetItemOfScript( nScript );
                 if ( pCore && ((const SvxWeightItem*)pCore)->GetWeight() > WEIGHT_NORMAL )
-                    bOld = TRUE;
+                    bOld = sal_True;
 
                 SvxScriptSetItem aSetItem( nSlot, rPool );
                 aSetItem.PutItemForScriptType( nScript,
                             SvxWeightItem( bOld ? WEIGHT_NORMAL : WEIGHT_BOLD, EE_CHAR_WEIGHT ) );
-                aSet.Put( aSetItem.GetItemSet(), FALSE );
+                aSet.Put( aSetItem.GetItemSet(), sal_False );
 
                 rBindings.Invalidate( nSlot );
             }
@@ -879,21 +879,21 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
         case SID_ATTR_CHAR_POSTURE:
             {
                 // #i78017 establish the same behaviour as in Writer
-                USHORT nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+                sal_uInt16 nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
 
                 SfxItemPool& rPool = GetPool();
 
-                BOOL bOld = FALSE;
+                sal_Bool bOld = sal_False;
                 SvxScriptSetItem aOldSetItem( nSlot, rPool );
-                aOldSetItem.GetItemSet().Put( pEditView->GetAttribs(), FALSE );
+                aOldSetItem.GetItemSet().Put( pEditView->GetAttribs(), sal_False );
                 const SfxPoolItem* pCore = aOldSetItem.GetItemOfScript( nScript );
                 if ( pCore && ((const SvxPostureItem*)pCore)->GetValue() != ITALIC_NONE )
-                    bOld = TRUE;
+                    bOld = sal_True;
 
                 SvxScriptSetItem aSetItem( nSlot, rPool );
                 aSetItem.PutItemForScriptType( nScript,
                             SvxPostureItem( bOld ? ITALIC_NONE : ITALIC_NORMAL, EE_CHAR_ITALIC ) );
-                aSet.Put( aSetItem.GetItemSet(), FALSE );
+                aSet.Put( aSetItem.GetItemSet(), sal_False );
 
                 rBindings.Invalidate( nSlot );
             }
@@ -944,7 +944,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
 
         case SID_ATTR_CHAR_STRIKEOUT:
             {
-                BOOL bOld = ((const SvxCrossedOutItem&)pEditView->GetAttribs().
+                sal_Bool bOld = ((const SvxCrossedOutItem&)pEditView->GetAttribs().
                                 Get(EE_CHAR_STRIKEOUT)).GetValue() != STRIKEOUT_NONE;
                 aSet.Put( SvxCrossedOutItem( bOld ? STRIKEOUT_NONE : STRIKEOUT_SINGLE, EE_CHAR_STRIKEOUT ) );
                 rBindings.Invalidate( nSlot );
@@ -953,7 +953,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
 
         case SID_ATTR_CHAR_SHADOWED:
             {
-                BOOL bOld = ((const SvxShadowedItem&)pEditView->GetAttribs().
+                sal_Bool bOld = ((const SvxShadowedItem&)pEditView->GetAttribs().
                                 Get(EE_CHAR_SHADOW)).GetValue();
                 aSet.Put( SvxShadowedItem( !bOld, EE_CHAR_SHADOW ) );
                 rBindings.Invalidate( nSlot );
@@ -962,7 +962,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
 
         case SID_ATTR_CHAR_CONTOUR:
             {
-                BOOL bOld = ((const SvxContourItem&)pEditView->GetAttribs().
+                sal_Bool bOld = ((const SvxContourItem&)pEditView->GetAttribs().
                                 Get(EE_CHAR_OUTLINE)).GetValue();
                 aSet.Put( SvxContourItem( !bOld, EE_CHAR_OUTLINE ) );
                 rBindings.Invalidate( nSlot );
@@ -996,8 +996,8 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
     //
 
     EditEngine* pEngine = pEditView->GetEditEngine();
-    BOOL bOld = pEngine->GetUpdateMode();
-    pEngine->SetUpdateMode(FALSE);
+    sal_Bool bOld = pEngine->GetUpdateMode();
+    pEngine->SetUpdateMode(sal_False);
 
     pEditView->SetAttribs( aSet );
 
@@ -1023,11 +1023,11 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
 
     //	choose font info according to selection script type
 
-    USHORT nScript = pEditView->GetSelectedScriptType();
+    sal_uInt16 nScript = pEditView->GetSelectedScriptType();
     if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType();
 
     // #i55929# input-language-dependent script type (depends on input language if nothing selected)
-    USHORT nInputScript = nScript;
+    sal_uInt16 nInputScript = nScript;
     if ( !pEditView->GetSelection().HasRange() )
     {
         LanguageType nInputLang = pViewData->GetActiveWin()->GetInputLanguage();
@@ -1047,7 +1047,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
 
     //	Unterstreichung
 
-    SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, TRUE );
+    SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, sal_True );
     if ( eState == SFX_ITEM_DONTCARE )
     {
         rSet.InvalidateItem( SID_ULINE_VAL_NONE );
@@ -1059,7 +1059,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
     {
         FontUnderline eUnderline = ((const SvxUnderlineItem&)
                     aAttribs.Get(EE_CHAR_UNDERLINE)).GetLineStyle();
-        USHORT nId = SID_ULINE_VAL_NONE;
+        sal_uInt16 nId = SID_ULINE_VAL_NONE;
         switch (eUnderline)
         {
             case UNDERLINE_SINGLE:	nId = SID_ULINE_VAL_SINGLE;	break;
@@ -1068,7 +1068,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
             default:
                 break;
         }
-        rSet.Put( SfxBoolItem( nId, TRUE ) );
+        rSet.Put( SfxBoolItem( nId, sal_True ) );
     }
 
     //!	Testen, ob Klammer-Hervorhebung aktiv ist !!!!
@@ -1077,7 +1077,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
         rSet.ClearItem( EE_CHAR_WEIGHT );	// hervorgehobene Klammern hier nicht
 }
 
-String ScEditShell::GetSelectionText( BOOL bWholeWord )
+String ScEditShell::GetSelectionText( sal_Bool bWholeWord )
 {
     String aStrSelection;
 
@@ -1115,20 +1115,20 @@ void ScEditShell::ExecuteUndo(SfxRequest& rReq)
     pHdl->DataChanging();
 
     const SfxItemSet* pReqArgs = rReq.GetArgs();
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch ( nSlot )
     {
         case SID_UNDO:
         case SID_REDO:
             {
-                BOOL bIsUndo = ( nSlot == SID_UNDO );
+                sal_Bool bIsUndo = ( nSlot == SID_UNDO );
 
-                USHORT nCount = 1;
+                sal_uInt16 nCount = 1;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
                     nCount = ((const SfxUInt16Item*)pItem)->GetValue();
 
-                for (USHORT i=0; i<nCount; i++)
+                for (sal_uInt16 i=0; i<nCount; i++)
                 {
                     if ( bIsUndo )
                     {
@@ -1146,7 +1146,7 @@ void ScEditShell::ExecuteUndo(SfxRequest& rReq)
             }
             break;
     }
-    pViewData->GetBindings().InvalidateAll(FALSE);
+    pViewData->GetBindings().InvalidateAll(sal_False);
 
     pHdl->DataChanged();
 }
@@ -1159,7 +1159,7 @@ void ScEditShell::GetUndoState(SfxItemSet &rSet)
     if ( pViewFrm && GetUndoManager() )
     {
         SfxWhichIter aIter(rSet);
-        USHORT nWhich = aIter.FirstWhich();
+        sal_uInt16 nWhich = aIter.FirstWhich();
         while( nWhich )
         {
             pViewFrm->GetSlotState( nWhich, NULL, &rSet );
@@ -1174,7 +1174,7 @@ void ScEditShell::GetUndoState(SfxItemSet &rSet)
     EditView* pTopView = pHdl->GetTopView();
     if (pTopView)
     {
-        SfxUndoManager& rTopMgr = pTopView->GetEditEngine()->GetUndoManager();
+        ::svl::IUndoManager& rTopMgr = pTopView->GetEditEngine()->GetUndoManager();
         if ( rTopMgr.GetUndoActionCount() == 0 )
             rSet.DisableItem( SID_UNDO );
         if ( rTopMgr.GetRedoActionCount() == 0 )
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index d7d401aef..137ace592 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -105,14 +105,11 @@
 #define FormatForSelection
 #include "scslots.hxx"
 
-#define Interior
-#include <svx/svxslots.hxx>
-
 #include "scabstdlg.hxx" //CHINA001
 
 namespace {
 
-SvxCellHorJustify lclConvertSlotToHAlign( USHORT nSlot )
+SvxCellHorJustify lclConvertSlotToHAlign( sal_uInt16 nSlot )
 {
     SvxCellHorJustify eHJustify = SVX_HOR_JUSTIFY_STANDARD;
     switch( nSlot )
@@ -127,7 +124,7 @@ SvxCellHorJustify lclConvertSlotToHAlign( USHORT nSlot )
     return eHJustify;
 }
 
-SvxCellVerJustify lclConvertSlotToVAlign( USHORT nSlot )
+SvxCellVerJustify lclConvertSlotToVAlign( sal_uInt16 nSlot )
 {
     SvxCellVerJustify eVJustify = SVX_VER_JUSTIFY_STANDARD;
     switch( nSlot )
@@ -161,7 +158,7 @@ ScFormatShell::ScFormatShell(ScViewData* pData) :
     ScTabViewShell*	pTabViewShell = GetViewData()->GetViewShell();
 
     SetPool( &pTabViewShell->GetPool() );
-    SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
+    ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
     SetUndoManager( pMgr );
     if ( !pViewData->GetDocument()->IsUndoEnabled() )
     {
@@ -183,15 +180,15 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet )
     ScTabViewShell*	pTabViewShell  		= GetViewData()->GetViewShell();
     SfxStyleSheetBasePool*	pStylePool	= pDoc->GetStyleSheetPool();
 
-    BOOL bProtected = FALSE;
+    sal_Bool bProtected = sal_False;
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB i=0; i<nTabCount; i++)
         if (pDoc->IsTabProtected(i))				// ueberhaupt eine Tabelle geschuetzt?
-            bProtected = TRUE;
+            bProtected = sal_True;
 
     SfxWhichIter	aIter(rSet);
-    USHORT			nWhich = aIter.FirstWhich();
-    USHORT			nSlotId = 0;
+    sal_uInt16			nWhich = aIter.FirstWhich();
+    sal_uInt16			nSlotId = 0;
 
     while ( nWhich )
     {
@@ -242,7 +239,7 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet )
             {
                 ISfxTemplateCommon* pDesigner = SFX_APP()->
                         GetCurrentTemplateCommon(pTabViewShell->GetViewFrame()->GetBindings());
-                BOOL bPage = pDesigner && SFX_STYLE_FAMILY_PAGE == pDesigner->GetActualFamily();
+                sal_Bool bPage = pDesigner && SFX_STYLE_FAMILY_PAGE == pDesigner->GetActualFamily();
 
                 if ( bProtected || bPage )
                     rSet.DisableItem( nSlotId );
@@ -254,7 +251,7 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet )
             {
                 ISfxTemplateCommon* pDesigner = SFX_APP()->
                         GetCurrentTemplateCommon(pTabViewShell->GetViewFrame()->GetBindings());
-                BOOL bPage = pDesigner && SFX_STYLE_FAMILY_PAGE == pDesigner->GetActualFamily();
+                sal_Bool bPage = pDesigner && SFX_STYLE_FAMILY_PAGE == pDesigner->GetActualFamily();
 
                 if ( bProtected && !bPage )
                     rSet.DisableItem( nSlotId );
@@ -283,7 +280,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
     //--------------------------------------------------------------------
     SfxBindings&		rBindings	= pViewData->GetBindings();
     const SfxItemSet*   pArgs   	= rReq.GetArgs();
-    const USHORT        nSlotId 	= rReq.GetSlot();
+    const sal_uInt16        nSlotId 	= rReq.GetSlot();
     const SCTAB		    nCurTab		= GetViewData()->GetTabNo();
     ScDocShell*			pDocSh		= GetViewData()->GetDocShell();
     ScTabViewShell*		pTabViewShell= GetViewData()->GetViewShell();
@@ -291,7 +288,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
     ScMarkData&			rMark		= GetViewData()->GetMarkData();
     ScModule*			pScMod		= SC_MOD();
     String				aRefName;
-    BOOL				bUndo		= pDoc->IsUndoEnabled();
+    sal_Bool				bUndo		= pDoc->IsUndoEnabled();
 
     if (   (nSlotId == SID_STYLE_NEW)
         || (nSlotId == SID_STYLE_EDIT)
@@ -305,18 +302,18 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
         SfxStyleSheetBasePool*  pStylePool	= pDoc->GetStyleSheetPool();
         SfxStyleSheetBase*      pStyleSheet = NULL;
 
-        BOOL bStyleToMarked = FALSE;
-        BOOL bListAction = FALSE;
-        BOOL bAddUndo = FALSE;			// add ScUndoModifyStyle (style modified)
+        sal_Bool bStyleToMarked = sal_False;
+        sal_Bool bListAction = sal_False;
+        sal_Bool bAddUndo = sal_False;			// add ScUndoModifyStyle (style modified)
         ScStyleSaveData aOldData;		// for undo/redo
         ScStyleSaveData aNewData;
 
         SfxStyleFamily eFamily = SFX_STYLE_FAMILY_PARA;
         const SfxPoolItem* pFamItem;
-        if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, TRUE, &pFamItem ) )
+        if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, sal_True, &pFamItem ) )
             eFamily = (SfxStyleFamily)((const SfxUInt16Item*)pFamItem)->GetValue();
         else
-        if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME, TRUE, &pFamItem ) )
+        if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME, sal_True, &pFamItem ) )
         {
             String sFamily = ((const SfxStringItem*)pFamItem)->GetValue();
             if (sFamily.CompareToAscii("CellStyles") == COMPARE_EQUAL)
@@ -327,9 +324,9 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
         }
 
         String                  aStyleName;
-        USHORT                  nRetMask = 0xffff;
+        sal_uInt16                  nRetMask = 0xffff;
 //      #96983# only stylist sends focus to sheet
-//        BOOL                    bGrabFocus = ( SID_STYLE_APPLY == nSlotId );
+//        sal_Bool                    bGrabFocus = ( SID_STYLE_APPLY == nSlotId );
 
         pStylePool->SetSearchMask( eFamily, SFXSTYLEBIT_ALL );
 
@@ -338,11 +335,11 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
             case SID_STYLE_NEW:
                 {
                     const SfxPoolItem* pNameItem;
-                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, TRUE, &pNameItem ))
+                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, sal_True, &pNameItem ))
                         aStyleName  = ((const SfxStringItem*)pNameItem)->GetValue();
 
                     const SfxPoolItem* pRefItem=NULL;
-                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_REFERENCE, TRUE, &pRefItem ))
+                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_REFERENCE, sal_True, &pRefItem ))
                     {
                         if(pRefItem!=NULL)
                             aRefName  = ((const SfxStringItem*)pRefItem)->GetValue();
@@ -385,7 +382,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
             case SID_STYLE_NEW_BY_EXAMPLE:
                 {
                     const SfxPoolItem* pNameItem;
-                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, TRUE, &pNameItem ))
+                    if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, sal_True, &pNameItem ))
                         aStyleName  = ((const SfxStringItem*)pNameItem)->GetValue();
                     pStyleSheet = pStylePool->Find( aStyleName, eFamily );
 
@@ -395,14 +392,14 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
             case SID_STYLE_WATERCAN:
             {
-                BOOL bWaterCan = pScMod->GetIsWaterCan();
+                sal_Bool bWaterCan = pScMod->GetIsWaterCan();
 
                 if( !bWaterCan )
                 {
                     const SfxPoolItem* pItem;
 
                     if ( SFX_ITEM_SET ==
-                         pArgs->GetItemState( nSlotId, TRUE, &pItem ) )
+                         pArgs->GetItemState( nSlotId, sal_True, &pItem ) )
                     {
                         const SfxStringItem* pStrItem = PTR_CAST(SfxStringItem,pItem);
                         if ( pStrItem )
@@ -422,13 +419,13 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
                 if ( !bWaterCan && pStyleSheet )
                 {
-                    pScMod->SetWaterCan( TRUE );
+                    pScMod->SetWaterCan( sal_True );
                     pTabViewShell->SetActivePointer( Pointer(POINTER_FILL) );
                     rReq.Done();
                 }
                 else
                 {
-                    pScMod->SetWaterCan( FALSE );
+                    pScMod->SetWaterCan( sal_False );
                     pTabViewShell->SetActivePointer( Pointer(POINTER_ARROW) );
                     rReq.Done();
                 }
@@ -456,12 +453,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                             pTabViewShell->RemoveStyleSheetInUse( pStyleSheet );
                             pStylePool->Remove( pStyleSheet );
                             pTabViewShell->InvalidateAttribs();
-                            nRetMask = TRUE;
-                            bAddUndo = TRUE;
+                            nRetMask = sal_True;
+                            bAddUndo = sal_True;
                             rReq.Done();
                         }
                         else
-                            nRetMask = FALSE;
+                            nRetMask = sal_False;
                     }
                     break;
 
@@ -512,10 +509,10 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                             {
                                 String aUndo = ScGlobal::GetRscString( STR_UNDO_EDITCELLSTYLE );
                                 pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
-                                bListAction = TRUE;
+                                bListAction = sal_True;
                             }
 
-                            BOOL			bConvertBack = FALSE;
+                            sal_Bool			bConvertBack = sal_False;
                             SfxStyleSheet*	pSheetInUse = (SfxStyleSheet*)
                                                           pTabViewShell->GetStyleSheetFromMarked();
 
@@ -535,7 +532,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                                 //!!! bei Gelenheit mal eine Methode, die
                                 //    das fuer einen bestimmten Style macht
                                 pDoc->StylesToNames();
-                                bConvertBack = TRUE;
+                                bConvertBack = sal_True;
                                 pStylePool->Remove(pStyleSheet);
                             }
 
@@ -560,7 +557,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
                             //	call SetStyleSheetToMarked after adding the ScUndoModifyStyle
                             //	(pStyleSheet pointer is used!)
-                            bStyleToMarked = TRUE;
+                            bStyleToMarked = sal_True;
                         }
                         else // ( nSlotId == SID_STYLE_UPDATE_BY_EXAMPLE )
                         {
@@ -574,7 +571,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                                 {
                                     String aUndo = ScGlobal::GetRscString( STR_UNDO_EDITCELLSTYLE );
                                     pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
-                                    bListAction = TRUE;
+                                    bListAction = sal_True;
                                 }
 
                                 pStyleSheet->GetItemSet().Put( aAttrSet );
@@ -582,12 +579,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
                                 //	call SetStyleSheetToMarked after adding the ScUndoModifyStyle
                                 //	(pStyleSheet pointer is used!)
-                                bStyleToMarked = TRUE;
+                                bStyleToMarked = sal_True;
                             }
                         }
 
                         aNewData.InitFromStyle( pStyleSheet );
-                        bAddUndo = TRUE;
+                        bAddUndo = sal_True;
                         rReq.Done();
                     }
                     break;
@@ -609,14 +606,14 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                         {
                             if ( pDoc->RemovePageStyleInUse( pStyleSheet->GetName() ) )
                             {
-                                ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(TRUE), nCurTab ).UpdatePages();
+                                ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(sal_True), nCurTab ).UpdatePages();
                                 rBindings.Invalidate( SID_STATUS_PAGESTYLE );
                                 rBindings.Invalidate( FID_RESET_PRINTZOOM );
                             }
                             pStylePool->Remove( pStyleSheet );
                             rBindings.Invalidate( SID_STYLE_FAMILY4 );
                             pDocSh->SetDocumentModified();
-                            bAddUndo = TRUE;
+                            bAddUndo = sal_True;
                             rReq.Done();
                         }
                     }
@@ -636,7 +633,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                                     if ( aOldName != aStyleName )
                                     {
                                         pDoc->SetPageStyle( nTab, aStyleName );
-                                        ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(TRUE), nTab ).UpdatePages();
+                                        ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(sal_True), nTab ).UpdatePages();
                                         if( !pUndoAction )
                                             pUndoAction = new ScUndoApplyPageStyle( pDocSh, aStyleName );
                                         pUndoAction->AddSheetAction( nTab, aOldName );
@@ -665,7 +662,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                             SfxStyleSheetBase*	pCurStyle = pStylePool->Find( rStrCurStyle, eFamily );
                             SfxItemSet			aAttrSet  = pCurStyle->GetItemSet();
                             SCTAB				nInTab;
-                            BOOL				bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab );
+                            sal_Bool				bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab );
 
                             // wenn bereits vorhanden, erstmal entfernen...
                             if ( pStyleSheet )
@@ -681,12 +678,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
                             // wenn in Verwendung -> Update
                             if ( bUsed )
-                                ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(TRUE), nInTab ).UpdatePages();
+                                ScPrintFunc( pDocSh, pTabViewShell->GetPrinter(sal_True), nInTab ).UpdatePages();
 
                             aNewData.InitFromStyle( pStyleSheet );
-                            bAddUndo = TRUE;
+                            bAddUndo = sal_True;
                             rReq.Done();
-                            nRetMask = TRUE;
+                            nRetMask = sal_True;
                         }
                     }
                     break;
@@ -713,7 +710,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                 // ScDocShell*     pDocSh  = GetViewData()->GetDocShell();
                 //CHINA001 ScStyleDlg*		pDlg    = NULL;
                 SfxAbstractTabDialog* pDlg    = NULL; //CHINA001
-                USHORT			nRsc	= 0;
+                sal_uInt16			nRsc	= 0;
 
                 //	#37034#/#37245# alte Items aus der Vorlage merken
                 SfxItemSet aOldSet = pStyleSheet->GetItemSet();
@@ -732,16 +729,16 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
                             const SfxPoolItem* pItem;
                             if ( rSet.GetItemState( ATTR_VALUE_FORMAT,
-                                    FALSE, &pItem ) == SFX_ITEM_SET )
+                                    sal_False, &pItem ) == SFX_ITEM_SET )
                             {
                                 // NumberFormat Value aus Value und Language
                                 // erzeugen und eintueten
-                                ULONG nFormat =
+                                sal_uLong nFormat =
                                     ((SfxUInt32Item*)pItem)->GetValue();
                                 LanguageType eLang =
                                     ((SvxLanguageItem*)&rSet.Get(
                                     ATTR_LANGUAGE_FORMAT ))->GetLanguage();
-                                ULONG nLangFormat = pDoc->GetFormatTable()->
+                                sal_uLong nLangFormat = pDoc->GetFormatTable()->
                                     GetFormatForLanguageIfBuiltIn( nFormat, eLang );
                                 if ( nLangFormat != nFormat )
                                 {
@@ -757,16 +754,16 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                             pDocSh->PutItem( *pNumberInfoItem );
                             nRsc = RID_SCDLG_STYLES_PAR;
 
-                            //	auf jeden Fall ein SvxBoxInfoItem mit Table = FALSE im Set:
+                            //	auf jeden Fall ein SvxBoxInfoItem mit Table = sal_False im Set:
                             //	(wenn gar kein Item da ist, loescht der Dialog auch das
                             //	 BORDER_OUTER SvxBoxItem aus dem Vorlagen-Set)
 
-                            if ( rSet.GetItemState( ATTR_BORDER_INNER, FALSE ) != SFX_ITEM_SET )
+                            if ( rSet.GetItemState( ATTR_BORDER_INNER, sal_False ) != SFX_ITEM_SET )
                             {
                                 SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER );
-                                aBoxInfoItem.SetTable(FALSE);		// keine inneren Linien
-                                aBoxInfoItem.SetDist(TRUE);
-                                aBoxInfoItem.SetMinDist(FALSE);
+                                aBoxInfoItem.SetTable(sal_False);		// keine inneren Linien
+                                aBoxInfoItem.SetDist(sal_True);
+                                aBoxInfoItem.SetMinDist(sal_False);
                                 rSet.Put( aBoxInfoItem );
                             }
                         }
@@ -791,7 +788,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                         pParent = pTabViewShell->GetDialogParent();
                 }
 
-                pTabViewShell->SetInFormatDialog(TRUE);
+                pTabViewShell->SetInFormatDialog(sal_True);
 
                 //CHINA001 pDlg = new ScStyleDlg( pParent, *pStyleSheet, nRsc );
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -800,7 +797,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                 pDlg = pFact->CreateScStyleDlg( pParent, *pStyleSheet, nRsc, nRsc );
                 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
                 short nResult = pDlg->Execute();
-                pTabViewShell->SetInFormatDialog(FALSE);
+                pTabViewShell->SetInFormatDialog(sal_False);
 
                 if ( nResult == RET_OK )
                 {
@@ -818,7 +815,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 //							pDoc->CellStyleChanged( *pStyleSheet, aOldSet );
 
                             SfxItemSet& rNewSet = pStyleSheet->GetItemSet();
-                            BOOL bNumFormatChanged;
+                            sal_Bool bNumFormatChanged;
                             if ( ScGlobal::CheckWidthInvalidate(
                                                 bNumFormatChanged, aOldSet, rNewSet ) )
                                 pDoc->InvalidateTextWidth( NULL, NULL, bNumFormatChanged );
@@ -826,11 +823,11 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                             SCTAB nTabCount = pDoc->GetTableCount();
                             for (SCTAB nTab=0; nTab<nTabCount; nTab++)
                                 if (pDoc->IsStreamValid(nTab))
-                                    pDoc->SetStreamValid(nTab, FALSE);
+                                    pDoc->SetStreamValid(nTab, sal_False);
 
-                            ULONG nOldFormat = ((const SfxUInt32Item&)aOldSet.
+                            sal_uLong nOldFormat = ((const SfxUInt32Item&)aOldSet.
                                                     Get( ATTR_VALUE_FORMAT )).GetValue();
-                            ULONG nNewFormat = ((const SfxUInt32Item&)rNewSet.
+                            sal_uLong nNewFormat = ((const SfxUInt32Item&)rNewSet.
                                                     Get( ATTR_VALUE_FORMAT )).GetValue();
                             if ( nNewFormat != nOldFormat )
                             {
@@ -873,7 +870,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                         }
 
                         aNewData.InitFromStyle( pStyleSheet );
-                        bAddUndo = TRUE;
+                        bAddUndo = sal_True;
                     }
                 }
                 else
@@ -924,7 +921,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
     ScModule*			pScMod		= SC_MOD();
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
     const SfxItemSet*	pReqArgs	= rReq.GetArgs();
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
 
     pTabViewShell->HideListBox();					// Autofilter-DropDown-Listbox
 
@@ -988,11 +985,11 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
             rReq.Done();
             break;
         case SID_NUMBER_INCDEC:
-            pTabViewShell->ChangeNumFmtDecimals( TRUE );
+            pTabViewShell->ChangeNumFmtDecimals( sal_True );
             rReq.Done();
             break;
         case SID_NUMBER_DECDEC:
-            pTabViewShell->ChangeNumFmtDecimals( FALSE );
+            pTabViewShell->ChangeNumFmtDecimals( sal_False );
             rReq.Done();
             break;
 
@@ -1000,7 +997,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
             if ( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if(pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET)
+                if(pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET)
                 {
                     String aCode = ((const SfxStringItem*)pItem)->GetValue();
                     pTabViewShell->SetNumFmtByStr( aCode );
@@ -1012,7 +1009,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
             if ( pReqArgs )
             {
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( ATTR_VALUE_FORMAT, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( ATTR_VALUE_FORMAT, sal_True, &pItem ) == SFX_ITEM_SET )
                 {
                     // We have to accomplish this using ApplyAttributes()
                     // because we also need the language information to be
@@ -1022,7 +1019,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
                     SfxItemPool* pDocPool = GetViewData()->GetDocument()->GetPool();
                     SfxItemSet aNewSet( *pDocPool, ATTR_PATTERN_START, ATTR_PATTERN_END );
                     aNewSet.Put( *pItem );
-                    pTabViewShell->ApplyAttributes( &aNewSet, &rOldSet, TRUE );
+                    pTabViewShell->ApplyAttributes( &aNewSet, &rOldSet, sal_True );
                 }
             }
             break;
@@ -1057,7 +1054,7 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq )
     ScTabViewShell*	pTabViewShell  		= GetViewData()->GetViewShell();
     SfxBindings&			rBindings	= pViewData->GetBindings();
     const SfxItemSet*       pSet		= rReq.GetArgs();
-    USHORT					nSlot		= rReq.GetSlot();
+    sal_uInt16					nSlot		= rReq.GetSlot();
 
     pTabViewShell->HideListBox();	// Autofilter-DropDown-Listbox
 
@@ -1082,7 +1079,7 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq )
             if( pSet )
             {
                 const SfxPoolItem* pItem = NULL;
-                if( pSet->GetItemState(GetPool().GetWhich(nSlot), TRUE, &pItem  ) == SFX_ITEM_SET )
+                if( pSet->GetItemState(GetPool().GetWhich(nSlot), sal_True, &pItem  ) == SFX_ITEM_SET )
                 {
 
                     switch ( nSlot )
@@ -1148,7 +1145,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
     SfxBindings&			rBindings	= pViewData->GetBindings();
     const ScPatternAttr*    pAttrs		= pTabViewShell->GetSelectionPattern();
     const SfxItemSet*       pSet		= rReq.GetArgs();
-    USHORT					nSlot		= rReq.GetSlot();
+    sal_uInt16					nSlot		= rReq.GetSlot();
     SfxAllItemSet*			pNewSet = 0;
 
     pTabViewShell->HideListBox();					// Autofilter-DropDown-Listbox
@@ -1168,7 +1165,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
             case SID_ATTR_CHAR_WEIGHT:
             {
                 // #i78017 establish the same behaviour as in Writer
-                BYTE nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+                sal_uInt8 nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
 
                 SfxItemPool& rPool = GetPool();
                 SvxScriptSetItem aSetItem( nSlot, rPool );
@@ -1180,7 +1177,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
 
                     FontWeight eWeight = WEIGHT_BOLD;
                     SvxScriptSetItem aOldSetItem( nSlot, rPool );
-                    aOldSetItem.GetItemSet().Put( pAttrs->GetItemSet(), FALSE );
+                    aOldSetItem.GetItemSet().Put( pAttrs->GetItemSet(), sal_False );
                     const SfxPoolItem* pCore = aOldSetItem.GetItemOfScript( nScript );
                     if ( pCore && ((const SvxWeightItem*)pCore)->GetWeight() == WEIGHT_BOLD )
                         eWeight = WEIGHT_NORMAL;
@@ -1188,14 +1185,14 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
                     aSetItem.PutItemForScriptType( nScript, SvxWeightItem( eWeight, ATTR_FONT_WEIGHT ) );
                 }
                 pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() );
-                pNewSet->Put( aSetItem.GetItemSet(), FALSE );
+                pNewSet->Put( aSetItem.GetItemSet(), sal_False );
             }
             break;
 
             case SID_ATTR_CHAR_POSTURE:
             {
                 // #i78017 establish the same behaviour as in Writer
-                BYTE nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+                sal_uInt8 nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
 
                 SfxItemPool& rPool = GetPool();
                 SvxScriptSetItem aSetItem( nSlot, rPool );
@@ -1207,7 +1204,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
 
                     FontItalic eItalic = ITALIC_NORMAL;
                     SvxScriptSetItem aOldSetItem( nSlot, rPool );
-                    aOldSetItem.GetItemSet().Put( pAttrs->GetItemSet(), FALSE );
+                    aOldSetItem.GetItemSet().Put( pAttrs->GetItemSet(), sal_False );
                     const SfxPoolItem* pCore = aOldSetItem.GetItemOfScript( nScript );
                     if ( pCore && ((const SvxPostureItem*)pCore)->GetPosture() == ITALIC_NORMAL )
                         eItalic = ITALIC_NONE;
@@ -1215,7 +1212,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
                     aSetItem.PutItemForScriptType( nScript, SvxPostureItem( eItalic, ATTR_FONT_POSTURE ) );
                 }
                 pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() );
-                pNewSet->Put( aSetItem.GetItemSet(), FALSE );
+                pNewSet->Put( aSetItem.GetItemSet(), sal_False );
             }
             break;
 
@@ -1294,12 +1291,12 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
         SvxCellHorJustify        eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
         SvxCellVerJustify        eVerJustify = SVX_VER_JUSTIFY_STANDARD;
 
-        if (rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, TRUE,&pItem ) == SFX_ITEM_SET)
+        if (rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True,&pItem ) == SFX_ITEM_SET)
         {
             pHorJustify = (const SvxHorJustifyItem*)pItem;
             eHorJustify = SvxCellHorJustify( pHorJustify->GetValue() );
         }
-        if (rAttrSet.GetItemState(ATTR_VER_JUSTIFY, TRUE,&pItem ) == SFX_ITEM_SET)
+        if (rAttrSet.GetItemState(ATTR_VER_JUSTIFY, sal_True,&pItem ) == SFX_ITEM_SET)
         {
             pVerJustify = (const SvxVerJustifyItem*)pItem;
             eVerJustify = SvxCellVerJustify( pVerJustify->GetValue() );
@@ -1413,7 +1410,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 
     if ( !pNewAttrs )
     {
-        USHORT nSlot = rReq.GetSlot();
+        sal_uInt16 nSlot = rReq.GetSlot();
 
         switch ( nSlot )
         {
@@ -1425,7 +1422,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
             case SID_ATTR_ALIGN_LINEBREAK:					// ohne Parameter als Toggle
                 {
                     const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern();
-                    BOOL bOld = ((const SfxBoolItem&)pAttrs->GetItem(ATTR_LINEBREAK)).GetValue();
+                    sal_Bool bOld = ((const SfxBoolItem&)pAttrs->GetItem(ATTR_LINEBREAK)).GetValue();
                     SfxBoolItem aBreakItem( ATTR_LINEBREAK, !bOld );
                     pTabViewShell->ApplyAttr( aBreakItem );
 
@@ -1454,7 +1451,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
     }
     else
     {
-        USHORT nSlot = rReq.GetSlot();
+        sal_uInt16 nSlot = rReq.GetSlot();
 
         switch ( nSlot )
         {
@@ -1475,13 +1472,13 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
             case SID_ATTR_CHAR_FONTHEIGHT:
                 {
                     // #i78017 establish the same behaviour as in Writer
-                    BYTE nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
+                    sal_uInt8 nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
                     if (nSlot == SID_ATTR_CHAR_FONT)
                         nScript = pTabViewShell->GetSelectionScriptType();
 
                     SfxItemPool& rPool = GetPool();
                     SvxScriptSetItem aSetItem( nSlot, rPool );
-                    USHORT nWhich = rPool.GetWhich( nSlot );
+                    sal_uInt16 nWhich = rPool.GetWhich( nSlot );
                     aSetItem.PutItemForScriptType( nScript, pNewAttrs->Get( nWhich ) );
 
                     pTabViewShell->ApplyUserItemSet( aSetItem.GetItemSet() );
@@ -1508,13 +1505,13 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
                             pDefLine->SetOutWidth( pLine->GetOutWidth() );
                             pDefLine->SetInWidth ( pLine->GetInWidth() );
                             pDefLine->SetDistance( pLine->GetDistance() );
-                            pTabViewShell->SetSelectionFrameLines( pDefLine, FALSE );
+                            pTabViewShell->SetSelectionFrameLines( pDefLine, sal_False );
                         }
                         else
                         {
                             pTabViewShell->SetDefaultFrameLine( pLine );
                             pTabViewShell->GetDefaultFrameLine()->SetColor( COL_BLACK );
-                            pTabViewShell->SetSelectionFrameLines( pLine, FALSE );
+                            pTabViewShell->SetSelectionFrameLines( pLine, sal_False );
                         }
                     }
                     else
@@ -1522,7 +1519,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
                         Color           aColorBlack( COL_BLACK );
                         SvxBorderLine   aDefLine( &aColorBlack, 20, 0, 0 );
                         pTabViewShell->SetDefaultFrameLine( &aDefLine );
-                        pTabViewShell->SetSelectionFrameLines( NULL, FALSE );
+                        pTabViewShell->SetSelectionFrameLines( NULL, sal_False );
                     }
                 }
                 break;
@@ -1538,13 +1535,13 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
                     if ( pDefLine )
                     {
                         pDefLine->SetColor( rColor );
-                        pTabViewShell->SetSelectionFrameLines( pDefLine, TRUE );
+                        pTabViewShell->SetSelectionFrameLines( pDefLine, sal_True );
                     }
                     else
                     {
                         SvxBorderLine   aDefLine( &rColor, 20, 0, 0 );
                         pTabViewShell->SetDefaultFrameLine( &aDefLine );
-                        pTabViewShell->SetSelectionFrameLines( &aDefLine, FALSE );
+                        pTabViewShell->SetSelectionFrameLines( &aDefLine, sal_False );
                     }
                 }
                 break;
@@ -1572,7 +1569,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
                     // Border-Items vom Controller auswerten:
                     const SfxPoolItem* pItem = 0;
 
-                    if ( pNewAttrs->GetItemState( ATTR_BORDER, TRUE, &pItem )
+                    if ( pNewAttrs->GetItemState( ATTR_BORDER, sal_True, &pItem )
                          == SFX_ITEM_SET )
                     {
                         //	#100959# The SvxFrameToolBoxControl toolbox controller uses a default
@@ -1593,7 +1590,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
                         rReq.AppendItem( aBoxItem );
                     }
 
-                    if ( pNewAttrs->GetItemState( ATTR_BORDER_INNER, TRUE, &pItem )
+                    if ( pNewAttrs->GetItemState( ATTR_BORDER_INNER, sal_True, &pItem )
                          == SFX_ITEM_SET )
                     {
                         SvxBoxInfoItem aBoxInfoItem( *(const SvxBoxInfoItem*)pItem );
@@ -1674,12 +1671,12 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
     const SvxBorderLine* pLine      = pTabViewShell->GetDefaultFrameLine();
     const SvxBrushItem&  rBrushItem = (const SvxBrushItem&)rAttrSet.Get( ATTR_BACKGROUND );
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
 
-    rSet.Put( rAttrSet, FALSE );
+    rSet.Put( rAttrSet, sal_False );
 
     //	choose font info according to selection script type
-    BYTE nScript = 0;		// GetSelectionScriptType never returns 0
+    sal_uInt8 nScript = 0;		// GetSelectionScriptType never returns 0
     if ( rSet.GetItemState( ATTR_FONT ) != SFX_ITEM_UNKNOWN )
     {
         if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
@@ -1728,10 +1725,10 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
 {
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
     const SfxItemSet& rAttrSet	= pTabViewShell->GetSelectionPattern()->GetItemSet();
-    rSet.Put( rAttrSet, FALSE ); // ItemStates mitkopieren
+    rSet.Put( rAttrSet, sal_False ); // ItemStates mitkopieren
 
     //	choose font info according to selection script type
-    BYTE nScript = 0;		// GetSelectionScriptType never returns 0
+    sal_uInt8 nScript = 0;		// GetSelectionScriptType never returns 0
     if ( rSet.GetItemState( ATTR_FONT_WEIGHT ) != SFX_ITEM_UNKNOWN )
     {
         if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
@@ -1752,7 +1749,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
     // Unterstreichung
     //------------------------
 
-    eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, TRUE );
+    eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, sal_True );
     if ( eState == SFX_ITEM_DONTCARE )
     {
         rSet.InvalidateItem( SID_ULINE_VAL_NONE );
@@ -1764,7 +1761,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
     {
         FontUnderline eUnderline = ((const SvxUnderlineItem&)
                     rAttrSet.Get(ATTR_FONT_UNDERLINE)).GetLineStyle();
-        USHORT nId = SID_ULINE_VAL_NONE;
+        sal_uInt16 nId = SID_ULINE_VAL_NONE;
         switch (eUnderline)
         {
             case UNDERLINE_SINGLE:	nId = SID_ULINE_VAL_SINGLE;	break;
@@ -1773,7 +1770,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
             default:
                 break;
         }
-        rSet.Put( SfxBoolItem( nId, TRUE ) );
+        rSet.Put( SfxBoolItem( nId, sal_True ) );
     }
 
     //------------------------
@@ -1784,11 +1781,11 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
     const SvxVerJustifyItem* pVerJustify = NULL;
     SvxCellHorJustify        eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
     SvxCellVerJustify        eVerJustify = SVX_VER_JUSTIFY_STANDARD;
-    USHORT		 			 nWhich		 = 0;
-    BOOL					 bJustifyStd = FALSE;
-    SfxBoolItem				 aBoolItem	 ( 0, TRUE );
+    sal_uInt16		 			 nWhich		 = 0;
+    sal_Bool					 bJustifyStd = sal_False;
+    SfxBoolItem				 aBoolItem	 ( 0, sal_True );
 
-    eState 	 = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, TRUE,
+    eState 	 = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, sal_True,
                                         (const SfxPoolItem**)&pHorJustify );
     switch ( eState )
     {
@@ -1819,7 +1816,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
 
                     case SVX_HOR_JUSTIFY_REPEAT:
                     default:
-                        bJustifyStd = TRUE;
+                        bJustifyStd = sal_True;
                         break;
                 }
             }
@@ -1833,7 +1830,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
             break;
 
         default:
-            bJustifyStd = TRUE;
+            bJustifyStd = sal_True;
             break;
     }
 
@@ -1844,12 +1841,12 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
     }
     else if ( bJustifyStd )
     {
-        aBoolItem.SetValue( FALSE );
+        aBoolItem.SetValue( sal_False );
         aBoolItem.SetWhich( SID_ALIGNLEFT );	  rSet.Put( aBoolItem );
         aBoolItem.SetWhich( SID_ALIGNRIGHT );	  rSet.Put( aBoolItem );
         aBoolItem.SetWhich( SID_ALIGNCENTERHOR ); rSet.Put( aBoolItem );
         aBoolItem.SetWhich( SID_ALIGNBLOCK );	  rSet.Put( aBoolItem );
-        bJustifyStd = FALSE;
+        bJustifyStd = sal_False;
     }
 
     //------------------------
@@ -1857,9 +1854,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
     //------------------------
 
     nWhich = 0;
-    aBoolItem.SetValue( TRUE );
+    aBoolItem.SetValue( sal_True );
 
-    eState = rAttrSet.GetItemState( ATTR_VER_JUSTIFY, TRUE,
+    eState = rAttrSet.GetItemState( ATTR_VER_JUSTIFY, sal_True,
                                     (const SfxPoolItem**)&pVerJustify );
 
     switch ( eState )
@@ -1884,7 +1881,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
 
                     case SVX_VER_JUSTIFY_STANDARD:
                     default:
-                        bJustifyStd = TRUE;
+                        bJustifyStd = sal_True;
                         break;
                 }
             }
@@ -1897,7 +1894,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
             break;
 
         default:
-            bJustifyStd = TRUE;
+            bJustifyStd = sal_True;
             break;
     }
 
@@ -1908,7 +1905,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
     }
     else if ( bJustifyStd )
     {
-        aBoolItem.SetValue( FALSE );
+        aBoolItem.SetValue( sal_False );
         aBoolItem.SetWhich( SID_ALIGNTOP );	  	  rSet.Put( aBoolItem );
         aBoolItem.SetWhich( SID_ALIGNBOTTOM );	  rSet.Put( aBoolItem );
         aBoolItem.SetWhich( SID_ALIGNCENTERVER ); rSet.Put( aBoolItem );
@@ -1939,7 +1936,7 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet )
     ScTabViewShell*	pTabViewShell  	= GetViewData()->GetViewShell();
     const SfxItemSet& rAttrSet    = pTabViewShell->GetSelectionPattern()->GetItemSet();
     SfxWhichIter	aIter(rSet);
-    USHORT			nWhich = aIter.FirstWhich();
+    sal_uInt16			nWhich = aIter.FirstWhich();
 
     SvxCellHorJustify eHAlign = SVX_HOR_JUSTIFY_STANDARD;
     bool bHasHAlign = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY ) != SFX_ITEM_DONTCARE;
@@ -1991,7 +1988,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
     ScDocument* pDoc		= pViewData->GetDocument();
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch ( nWhich )
@@ -2003,7 +2000,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
                     const SfxItemSet& rAttrSet  = pTabViewShell->GetSelectionPattern()->GetItemSet();
                     if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) != SFX_ITEM_DONTCARE )
                     {
-                        ULONG nNumberFormat = ((const SfxUInt32Item&)rAttrSet.Get(
+                        sal_uLong nNumberFormat = ((const SfxUInt32Item&)rAttrSet.Get(
                                                     ATTR_VALUE_FORMAT )).GetValue();
 
                         SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
@@ -2032,13 +2029,13 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq )
         pTabViewShell->UpdateInputHandler();
     }
 
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch( nSlot )
     {
         case SID_TEXTDIRECTION_LEFT_TO_RIGHT:
         case SID_TEXTDIRECTION_TOP_TO_BOTTOM:
         {
-            BOOL bVert = (nSlot == SID_TEXTDIRECTION_TOP_TO_BOTTOM);
+            sal_Bool bVert = (nSlot == SID_TEXTDIRECTION_TOP_TO_BOTTOM);
             ScPatternAttr aAttr( GetViewData()->GetDocument()->GetPool() );
             SfxItemSet& rItemSet = aAttr.GetItemSet();
             rItemSet.Put( SfxBoolItem( ATTR_STACKED, bVert ) );
@@ -2064,15 +2061,15 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet )
     ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
     const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
 
-    BOOL bVertDontCare =
+    sal_Bool bVertDontCare =
         (rAttrSet.GetItemState( ATTR_VERTICAL_ASIAN ) == SFX_ITEM_DONTCARE) ||
         (rAttrSet.GetItemState( ATTR_STACKED ) == SFX_ITEM_DONTCARE);
-    BOOL bLeftRight = !bVertDontCare &&
+    sal_Bool bLeftRight = !bVertDontCare &&
         !((const SfxBoolItem&) rAttrSet.Get( ATTR_STACKED )).GetValue();
-    BOOL bTopBottom = !bVertDontCare && !bLeftRight &&
+    sal_Bool bTopBottom = !bVertDontCare && !bLeftRight &&
         ((const SfxBoolItem&) rAttrSet.Get( ATTR_VERTICAL_ASIAN )).GetValue();
 
-    BOOL bBidiDontCare = (rAttrSet.GetItemState( ATTR_WRITINGDIR ) == SFX_ITEM_DONTCARE);
+    sal_Bool bBidiDontCare = (rAttrSet.GetItemState( ATTR_WRITINGDIR ) == SFX_ITEM_DONTCARE);
     EEHorizontalTextDirection eBidiDir = EE_HTEXTDIR_DEFAULT;
     if ( !bBidiDontCare )
     {
@@ -2088,11 +2085,11 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet )
     }
 
     SvtLanguageOptions	aLangOpt;
-    BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled();
-    BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled();
+    sal_Bool bDisableCTLFont = !aLangOpt.IsCTLFontEnabled();
+    sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled();
 
     SfxWhichIter aIter( rSet );
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while( nWhich )
     {
         switch( nWhich )
@@ -2142,7 +2139,7 @@ void ScFormatShell::ExecFormatPaintbrush( SfxRequest& rReq )
     }
     else
     {
-        BOOL bLock = FALSE;
+        sal_Bool bLock = sal_False;
         const SfxItemSet *pArgs = rReq.GetArgs();
         if( pArgs && pArgs->Count() >= 1 )
             bLock = static_cast<const SfxBoolItem&>(pArgs->Get(SID_FORMATPAINTBRUSH)).GetValue();
@@ -2153,7 +2150,7 @@ void ScFormatShell::ExecFormatPaintbrush( SfxRequest& rReq )
             pView->Unmark();
 
         ScDocument* pBrushDoc = new ScDocument( SCDOCMODE_CLIP );
-        pView->CopyToClip( pBrushDoc, FALSE, TRUE );
+        pView->CopyToClip( pBrushDoc, sal_False, sal_True );
         pView->SetBrushDocument( pBrushDoc, bLock );
     }
 }
diff --git a/sc/source/ui/view/galwrap.cxx b/sc/source/ui/view/galwrap.cxx
index 65146deca..e17fa0d34 100644
--- a/sc/source/ui/view/galwrap.cxx
+++ b/sc/source/ui/view/galwrap.cxx
@@ -46,12 +46,12 @@ Graphic GalleryGetGraphic()
     return pGal->GetGraphic();
 }
 
-USHORT GallerySGA_FORMAT_GRAPHIC()
+sal_uInt16 GallerySGA_FORMAT_GRAPHIC()
 {
     return SGA_FORMAT_GRAPHIC;
 }
 
-BOOL GalleryIsLinkage()
+sal_Bool GalleryIsLinkage()
 {
     GalleryExplorer* pGal = SVX_GALLERY();
     DBG_ASSERT( pGal, "Wo ist die Gallery?" );
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx
index bb5afda14..cfc6d1752 100644
--- a/sc/source/ui/view/gridmerg.cxx
+++ b/sc/source/ui/view/gridmerg.cxx
@@ -41,7 +41,7 @@ ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePix
     nOneX( nOnePixelX ),
     nOneY( nOnePixelY ),
     nCount( 0 ),
-    bVertical( FALSE )
+    bVertical( sal_False )
 {
     //	optimize (DrawGrid) only for pixel MapMode,
     //	to avoid rounding errors
@@ -104,7 +104,7 @@ void ScGridMerger::AddHorLine( long nX1, long nX2, long nY )
         if ( bVertical )
         {
             Flush();
-            bVertical = FALSE;
+            bVertical = sal_False;
         }
         AddLine( nX1, nX2, nY );
     }
@@ -119,7 +119,7 @@ void ScGridMerger::AddVerLine( long nX, long nY1, long nY2 )
         if ( !bVertical )
         {
             Flush();
-            bVertical = TRUE;
+            bVertical = sal_True;
         }
         AddLine( nY1, nY2, nX );
     }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 64df802e8..46b5d977d 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -133,9 +133,9 @@ using namespace com::sun::star;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
 
-const BYTE SC_NESTEDBUTTON_NONE = 0;
-const BYTE SC_NESTEDBUTTON_DOWN = 1;
-const BYTE SC_NESTEDBUTTON_UP   = 2;
+const sal_uInt8 SC_NESTEDBUTTON_NONE = 0;
+const sal_uInt8 SC_NESTEDBUTTON_DOWN = 1;
+const sal_uInt8 SC_NESTEDBUTTON_UP   = 2;
 
 #define SC_AUTOFILTER_ALL		0
 #define	SC_AUTOFILTER_TOP10     1
@@ -151,8 +151,8 @@ enum ScFilterBoxMode
 };
 
 extern SfxViewShell* pScActiveViewShell;			// global.cxx
-extern USHORT nScClickMouseModifier;				// global.cxx
-extern USHORT nScFillModeMouseModifier;				// global.cxx
+extern sal_uInt16 nScClickMouseModifier;				// global.cxx
+extern sal_uInt16 nScFillModeMouseModifier;				// global.cxx
 
 #define SC_FILTERLISTBOX_LINES	12
 
@@ -176,12 +176,12 @@ private:
     ScGridWindow*	pGridWin;
     SCCOL			nCol;
     SCROW			nRow;
-    BOOL			bButtonDown;
-    BOOL			bInit;
-    BOOL			bCancelled;
-    BOOL            bInSelect;
+    sal_Bool			bButtonDown;
+    sal_Bool			bInit;
+    sal_Bool			bCancelled;
+    sal_Bool            bInSelect;
     bool            mbListHasDates;
-    ULONG			nSel;
+    sal_uLong			nSel;
     ScFilterBoxMode	eMode;
 
 protected:
@@ -199,11 +199,11 @@ public:
     SCCOL			GetCol() const			{ return nCol; }
     SCROW			GetRow() const			{ return nRow; }
     ScFilterBoxMode	GetMode() const			{ return eMode; }
-    BOOL			IsDataSelect() const	{ return (eMode == SC_FILTERBOX_DATASELECT); }
+    sal_Bool			IsDataSelect() const	{ return (eMode == SC_FILTERBOX_DATASELECT); }
     void			EndInit();
-    BOOL            IsInInit() const        { return bInit; }
-    void			SetCancelled()			{ bCancelled = TRUE; }
-    BOOL            IsInSelect() const      { return bInSelect; }
+    sal_Bool            IsInInit() const        { return bInit; }
+    void			SetCancelled()			{ bCancelled = sal_True; }
+    sal_Bool            IsInSelect() const      { return bInSelect; }
     void            SetListHasDates(bool b) { mbListHasDates = b; }
     bool            HasDates() const        { return mbListHasDates; }
 };
@@ -217,10 +217,10 @@ ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid,
     pGridWin( pGrid ),
     nCol( nNewCol ),
     nRow( nNewRow ),
-    bButtonDown( FALSE ),
-    bInit( TRUE ),
-    bCancelled( FALSE ),
-    bInSelect( FALSE ),
+    bButtonDown( sal_False ),
+    bInit( sal_True ),
+    bCancelled( sal_False ),
+    bInSelect( sal_False ),
     mbListHasDates(false),
     nSel( 0 ),
     eMode( eNewMode )
@@ -235,13 +235,13 @@ __EXPORT ScFilterListBox::~ScFilterListBox()
 
 void ScFilterListBox::EndInit()
 {
-    USHORT nPos = GetSelectEntryPos();
+    sal_uInt16 nPos = GetSelectEntryPos();
     if ( LISTBOX_ENTRY_NOTFOUND == nPos )
         nSel = 0;
     else
         nSel = nPos;
 
-    bInit = FALSE;
+    bInit = sal_False;
 }
 
 void __EXPORT ScFilterListBox::LoseFocus()
@@ -262,7 +262,7 @@ long ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
         KeyCode aCode = aKeyEvt.GetKeyCode();
         if ( !aCode.GetModifier() )				// ohne alle Modifiers
         {
-            USHORT nKey = aCode.GetCode();
+            sal_uInt16 nKey = aCode.GetCode();
             if ( nKey == KEY_RETURN )
             {
                 SelectHdl();					// auswaehlen
@@ -289,16 +289,16 @@ void __EXPORT ScFilterListBox::SelectHdl()
 {
     if ( !IsTravelSelect() && !bInit && !bCancelled )
     {
-        USHORT nPos = GetSelectEntryPos();
+        sal_uInt16 nPos = GetSelectEntryPos();
         if ( LISTBOX_ENTRY_NOTFOUND != nPos )
         {
             nSel = nPos;
             if (!bButtonDown)
             {
                 // #i81298# set bInSelect flag, so the box isn't deleted from modifications within FilterSelect
-                bInSelect = TRUE;
+                bInSelect = sal_True;
                 pGridWin->FilterSelect( nSel );
-                bInSelect = FALSE;
+                bInSelect = sal_False;
             }
         }
     }
@@ -333,7 +333,7 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow()
 
 // ============================================================================
 
-BOOL lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange )
+sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange )
 {
     //	wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle
     //	mit Origin links oben liegt, enthaelt der Bereich genau die Matrix.
@@ -341,7 +341,7 @@ BOOL lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange )
 
     if ( !pDoc->IsBlockEditable( rRange.aStart.Tab(), rRange.aStart.Col(),rRange.aStart.Row(),
                                     rRange.aEnd.Col(),rRange.aEnd.Row() ) )
-        return FALSE;
+        return sal_False;
 
     ScAddress aPos;
     const ScBaseCell* pCell = pDoc->GetCell( rRange.aEnd );
@@ -371,24 +371,24 @@ void lcl_UnLockComment( ScDrawView* pView, SdrPageView* pPV, SdrModel* pDrDoc, c
 
 sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTAB nTab, ScBaseCell*& rpCell )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     do
     {
         pDoc->GetCell( rPosX, rPosY, nTab, rpCell );
         if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE )
         {
             if ( rPosX <= 0 )
-                return FALSE;							// alles leer bis links
+                return sal_False;							// alles leer bis links
             else
                 --rPosX;								// weitersuchen
         }
                 else if ( rpCell->GetCellType() == CELLTYPE_EDIT)
-                    bFound = TRUE;
+                    bFound = sal_True;
                 else if (rpCell->GetCellType() == CELLTYPE_FORMULA &&
                   static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell())
-                    bFound = TRUE;
+                    bFound = sal_True;
         else
-            return FALSE;								// andere Zelle
+            return sal_False;								// andere Zelle
     }
     while ( !bFound );
 
@@ -416,27 +416,27 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
             mpDPFieldPopup(NULL),
             mpFilterButton(NULL), 
             nCursorHideCount( 0 ),
-            bMarking( FALSE ),
+            bMarking( sal_False ),
             nButtonDown( 0 ),
-            bEEMouse( FALSE ),
+            bEEMouse( sal_False ),
             nMouseStatus( SC_GM_NONE ),
             nNestedButtonState( SC_NESTEDBUTTON_NONE ),
-            bDPMouse( FALSE ),
-            bRFMouse( FALSE ),
+            bDPMouse( sal_False ),
+            bRFMouse( sal_False ),
             nPagebreakMouse( SC_PD_NONE ),
-            bPagebreakDrawn( FALSE ),
+            bPagebreakDrawn( sal_False ),
             nPageScript( 0 ),
-            bDragRect( FALSE ),
+            bDragRect( sal_False ),
             meDragInsertMode( INS_NONE ),
             nCurrentPointer( 0 ),
-            bIsInScroll( FALSE ),
-            bIsInPaint( FALSE ),
+            bIsInScroll( sal_False ),
+            bIsInPaint( sal_False ),
             aComboButton( this ),
             aCurMousePos( 0,0 ),
             nPaintCount( 0 ),
-            bNeedsRepaint( FALSE ),
-            bAutoMarkVisible( FALSE ),
-            bListValButton( FALSE )
+            bNeedsRepaint( sal_False ),
+            bAutoMarkVisible( sal_False ),
+            bListValButton( sal_False )
 {
     switch(eWhich)
     {
@@ -471,7 +471,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
     SetUniqueId( HID_SC_WIN_GRIDWIN );
 
     SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 __EXPORT ScGridWindow::~ScGridWindow()
@@ -528,7 +528,7 @@ IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo*, pInfo )
     return 0;
 }
 
-void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr )
+void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSelection, const String& rStr )
 {
     //!	gridwin2 ?
 
@@ -538,13 +538,13 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti
     if ( pDPObj && nCol > 0 )
     {
         // look for the dimension header left of the drop-down arrow
-        USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
+        sal_uInt16 nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
         long nField = pDPObj->GetHeaderDim( ScAddress( nCol-1, nRow, nTab ), nOrient );
         if ( nField >= 0 && nOrient == sheet::DataPilotFieldOrientation_PAGE )
         {
             ScDPSaveData aSaveData( *pDPObj->GetSaveData() );
 
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nField, bIsDataLayout );
             if ( !bIsDataLayout )
             {
@@ -558,7 +558,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti
                 ScDPObject aNewObj( *pDPObj );
                 aNewObj.SetSaveData( aSaveData );
                 ScDBDocFunc aFunc( *pViewData->GetDocShell() );
-                aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE );
+                aFunc.DataPilotUpdate( pDPObj, &aNewObj, sal_True, sal_False );
                 pViewData->GetView()->CursorPosChanged();		// shells may be switched
             }
         }
@@ -572,10 +572,10 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
     delete pFilterBox;
     delete pFilterFloat;
 
-    USHORT i;
+    sal_uInt16 i;
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
     long nSizeX  = 0;
     long nSizeY  = 0;
@@ -614,13 +614,13 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
     TypedScStrCollection aStrings( 128, 128 );
 
     //	get list box entries and selection
-    BOOL bHasCurrentPage = FALSE;
+    sal_Bool bHasCurrentPage = sal_False;
     String aCurrentPage;
     ScDPObject*	pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
     if ( pDPObj && nCol > 0 )
     {
         // look for the dimension header left of the drop-down arrow
-        USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
+        sal_uInt16 nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
         long nField = pDPObj->GetHeaderDim( ScAddress( nCol-1, nRow, nTab ), nOrient );
         if ( nField >= 0 && nOrient == sheet::DataPilotFieldOrientation_PAGE )
         {
@@ -629,7 +629,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
             // get current page from SaveData
 
             ScDPSaveData* pSaveData = pDPObj->GetSaveData();
-            BOOL bIsDataLayout;
+            sal_Bool bIsDataLayout;
             String aDimName = pDPObj->GetDimName( nField, bIsDataLayout );
             if ( pSaveData && !bIsDataLayout )
             {
@@ -637,7 +637,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
                 if ( pDim && pDim->HasCurrentPage() )
                 {
                     aCurrentPage = pDim->GetCurrentPage();
-                    bHasCurrentPage = TRUE;
+                    bHasCurrentPage = sal_True;
                 }
             }
         }
@@ -645,7 +645,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
 
     //	include all entry widths for the size of the drop-down
     long nMaxText = 0;
-    USHORT nCount = aStrings.GetCount();
+    sal_uInt16 nCount = aStrings.GetCount();
     for (i=0; i<nCount; i++)
     {
         TypedStrData* pData = aStrings[i];
@@ -676,13 +676,13 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
 
     pFilterBox->SetSizePixel( aSize );
     pFilterBox->Show();					// Show must be called before SetUpdateMode
-    pFilterBox->SetUpdateMode(FALSE);
+    pFilterBox->SetUpdateMode(sal_False);
 
     pFilterFloat->SetOutputSizePixel( aSize );
     pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS);
 
     //	fill the list box
-    BOOL bWait = ( nCount > 100 );
+    sal_Bool bWait = ( nCount > 100 );
 
     if (bWait)
         EnterWait();
@@ -695,9 +695,9 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
     if (bWait)
         LeaveWait();
 
-    pFilterBox->SetUpdateMode(TRUE);
+    pFilterBox->SetUpdateMode(sal_True);
 
-    USHORT nSelPos = LISTBOX_ENTRY_NOTFOUND;
+    sal_uInt16 nSelPos = LISTBOX_ENTRY_NOTFOUND;
     if (bHasCurrentPage)
         nSelPos = pFilterBox->GetEntryPos( aCurrentPage );
 
@@ -748,7 +748,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
 
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
     long nSizeX  = 0;
     long nSizeY  = 0;
@@ -793,7 +793,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
     Size aSize( nSizeX, nHeight );
     pFilterBox->SetSizePixel( aSize );
     pFilterBox->Show();					// Show muss vor SetUpdateMode kommen !!!
-    pFilterBox->SetUpdateMode(FALSE);
+    pFilterBox->SetUpdateMode(sal_False);
 
     //	SetOutputSizePixel/StartPopupMode erst unten, wenn die Groesse feststeht
 
@@ -844,12 +844,12 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
     pFilterFloat->SetOutputSizePixel( aSize );
     pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS );
 
-    pFilterBox->SetUpdateMode(TRUE);
+    pFilterBox->SetUpdateMode(sal_True);
     pFilterBox->GrabFocus();
 
     //	Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet
 //!	SvLBoxEntry* pSelect = NULL;
-    USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
+    sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
     if (aCurrent.Len())
     {
         nPos = pFilterBox->GetEntryPos( aCurrent );
@@ -870,15 +870,15 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
     CaptureMouse();
 }
 
-void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
+void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, sal_Bool bDataSelect )
 {
     delete pFilterBox;
     delete pFilterFloat;
 
-    USHORT i;
+    sal_uInt16 i;
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
     long nSizeX  = 0;
     long nSizeY  = 0;
@@ -920,15 +920,15 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
     pFilterBox->SetTabJustify( 1, bLayoutRTL ? AdjustRight : AdjustLeft );
 */
 
-    BOOL bEmpty = FALSE;
+    sal_Bool bEmpty = sal_False;
     TypedScStrCollection aStrings( 128, 128 );
     if ( bDataSelect )									// Auswahl-Liste
     {
         //	Liste fuellen
-        aStrings.SetCaseSensitive( TRUE );
+        aStrings.SetCaseSensitive( sal_True );
         pDoc->GetDataEntries( nCol, nRow, nTab, aStrings );
         if ( aStrings.GetCount() == 0 )
-            bEmpty = TRUE;
+            bEmpty = sal_True;
     }
     else												// AutoFilter
     {
@@ -940,8 +940,8 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
         long nMaxText = 0;
 
         //	default entries
-        static const USHORT nDefIDs[] = { SCSTR_ALLFILTER, SCSTR_TOP10FILTER, SCSTR_STDFILTER };
-        const USHORT nDefCount = sizeof(nDefIDs) / sizeof(USHORT);
+        static const sal_uInt16 nDefIDs[] = { SCSTR_ALLFILTER, SCSTR_TOP10FILTER, SCSTR_STDFILTER };
+        const sal_uInt16 nDefCount = sizeof(nDefIDs) / sizeof(sal_uInt16);
         for (i=0; i<nDefCount; i++)
         {
             String aEntry( (ScResId) nDefIDs[i] );
@@ -959,7 +959,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
 
         //	check widths of numerical entries (string entries are not included)
         //	so all numbers are completely visible
-        USHORT nCount = aStrings.GetCount();
+        sal_uInt16 nCount = aStrings.GetCount();
         for (i=0; i<nCount; i++)
         {
             TypedStrData* pData = aStrings[i];
@@ -997,14 +997,14 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
 
         pFilterBox->SetSizePixel( aSize );
         pFilterBox->Show();					// Show muss vor SetUpdateMode kommen !!!
-        pFilterBox->SetUpdateMode(FALSE);
+        pFilterBox->SetUpdateMode(sal_False);
 
         pFilterFloat->SetOutputSizePixel( aSize );
         pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS);
 
         //	Listbox fuellen
-        USHORT nCount = aStrings.GetCount();
-        BOOL bWait = ( nCount > 100 );
+        sal_uInt16 nCount = aStrings.GetCount();
+        sal_Bool bWait = ( nCount > 100 );
 
         if (bWait)
             EnterWait();
@@ -1015,11 +1015,11 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
         if (bWait)
             LeaveWait();
 
-        pFilterBox->SetUpdateMode(TRUE);
+        pFilterBox->SetUpdateMode(sal_True);
     }
 
 //!	SvLBoxEntry* pSelect = NULL;
-    USHORT nSelPos = LISTBOX_ENTRY_NOTFOUND;
+    sal_uInt16 nSelPos = LISTBOX_ENTRY_NOTFOUND;
 
     if (!bDataSelect)						// AutoFilter: aktiven Eintrag selektieren
     {
@@ -1029,7 +1029,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
             ScQueryParam aParam;
             pDBData->GetQueryParam( aParam );		// kann nur MAXQUERY Eintraege ergeben
 
-            BOOL bValid = TRUE;
+            sal_Bool bValid = sal_True;
             for (SCSIZE j=0; j<MAXQUERY && bValid; j++)			// bisherige Filter-Einstellungen
                 if (aParam.GetEntry(j).bDoQuery)
                 {
@@ -1038,7 +1038,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
                     ScQueryEntry& rEntry = aParam.GetEntry(j);
                     if (j>0)
                         if (rEntry.eConnect != SC_AND)
-                            bValid = FALSE;
+                            bValid = sal_False;
                     if (rEntry.nField == nCol)
                     {
                         if (rEntry.eOp == SC_EQUAL)
@@ -1065,7 +1065,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
     else
     {
 
-        ULONG nIndex = ((SfxUInt32Item*)pDoc->GetAttr(
+        sal_uLong nIndex = ((SfxUInt32Item*)pDoc->GetAttr(
                                 nCol, nRow, nTab, ATTR_VALIDDATA ))->GetValue();
         if ( nIndex )
         {
@@ -1086,13 +1086,13 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
                 bool bSortList = ( pData->GetListType() == ValidListType::SORTEDASCENDING);
                 if ( bSortList )
                 {
-                    USHORT nStrIndex;
+                    sal_uInt16 nStrIndex;
                     if (aStrings.Search(pNew,nStrIndex))
                         nSelPos = nStrIndex;
                 }
                 else
                 {
-                    USHORT nCount = aStrings.GetCount();
+                    sal_uInt16 nCount = aStrings.GetCount();
                     for (i = 0; ((i < nCount) && ( LISTBOX_ENTRY_NOTFOUND == nSelPos)); i++)
                     {
                         if ( aStrings.Compare(aStrings[i], pNew)==0 ) 
@@ -1143,7 +1143,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
     }
 }
 
-void ScGridWindow::FilterSelect( ULONG nSel )
+void ScGridWindow::FilterSelect( sal_uLong nSel )
 {
     String aString;
 /*
@@ -1155,7 +1155,7 @@ void ScGridWindow::FilterSelect( ULONG nSel )
             aString = pStringEntry->GetText();
     }
 */
-    aString = pFilterBox->GetEntry( static_cast< USHORT >( nSel ) );
+    aString = pFilterBox->GetEntry( static_cast< sal_uInt16 >( nSel ) );
 
     SCCOL nCol = pFilterBox->GetCol();
     SCROW nRow = pFilterBox->GetRow();
@@ -1196,7 +1196,7 @@ void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr )
     }
 }
 
-void ScGridWindow::ExecFilter( ULONG nSel,
+void ScGridWindow::ExecFilter( sal_uLong nSel,
                                SCCOL nCol, SCROW nRow,
                                const String& aValue, bool bCheckForDates )
 {
@@ -1223,13 +1223,13 @@ void ScGridWindow::ExecFilter( ULONG nSel,
         }
         else
         {
-            BOOL bDeleteOld = FALSE;
+            sal_Bool bDeleteOld = sal_False;
             SCSIZE nQueryPos = 0;
-            BOOL bFound = FALSE;
+            sal_Bool bFound = sal_False;
             if (!aParam.bInplace)
-                bDeleteOld = TRUE;
+                bDeleteOld = sal_True;
             if (aParam.bRegExp)
-                bDeleteOld = TRUE;
+                bDeleteOld = sal_True;
             for (SCSIZE i=0; i<MAXQUERY && !bDeleteOld; i++)	// bisherige Filter-Einstellungen
                 if (aParam.GetEntry(i).bDoQuery)
                 {
@@ -1238,14 +1238,14 @@ void ScGridWindow::ExecFilter( ULONG nSel,
                     ScQueryEntry& rEntry = aParam.GetEntry(i);
                     if (i>0)
                         if (rEntry.eConnect != SC_AND)
-                            bDeleteOld = TRUE;
+                            bDeleteOld = sal_True;
 
                     if (rEntry.nField == nCol)
                     {
                         if (bFound)							// diese Spalte zweimal?
-                            bDeleteOld = TRUE;
+                            bDeleteOld = sal_True;
                         nQueryPos = i;
-                        bFound = TRUE;
+                        bFound = sal_True;
                     }
                     if (!bFound)
                         nQueryPos = i + 1;
@@ -1257,8 +1257,8 @@ void ScGridWindow::ExecFilter( ULONG nSel,
                 for (SCSIZE i=0; i<nEC; i++)
                     aParam.GetEntry(i).Clear();
                 nQueryPos = 0;
-                aParam.bInplace = TRUE;
-                aParam.bRegExp = FALSE;
+                aParam.bInplace = sal_True;
+                aParam.bRegExp = sal_False;
             }
 
             if ( nQueryPos < MAXQUERY || SC_AUTOFILTER_ALL == nSel )	// loeschen geht immer
@@ -1267,8 +1267,8 @@ void ScGridWindow::ExecFilter( ULONG nSel,
                 {
                     ScQueryEntry& rNewEntry = aParam.GetEntry(nQueryPos);
 
-                    rNewEntry.bDoQuery		 = TRUE;
-                    rNewEntry.bQueryByString = TRUE;
+                    rNewEntry.bDoQuery		 = sal_True;
+                    rNewEntry.bQueryByString = sal_True;
                     rNewEntry.nField		 = nCol;
                     rNewEntry.bQueryByDate   = bCheckForDates;
                     if ( nSel == SC_AUTOFILTER_TOP10 )
@@ -1297,7 +1297,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
                     pViewData->GetViewShell()->UpdateInputHandler();
                 }
 
-                pViewData->GetView()->Query( aParam, NULL, TRUE );
+                pViewData->GetView()->Query( aParam, NULL, sal_True );
                 pDBData->SetQueryParam( aParam );							// speichern
             }
             else					//	"Zuviele Bedingungen"
@@ -1331,7 +1331,7 @@ void ScGridWindow::MoveMouseStatus( ScGridWindow& rDestWin )
         rDestWin.nRFIndex = nRFIndex;
         rDestWin.nRFAddX  = nRFAddX;
         rDestWin.nRFAddY  = nRFAddY;
-        bRFMouse = FALSE;
+        bRFMouse = sal_False;
     }
 
     if (nPagebreakMouse)
@@ -1345,26 +1345,26 @@ void ScGridWindow::MoveMouseStatus( ScGridWindow& rDestWin )
     }
 }
 
-BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
+sal_Bool ScGridWindow::TestMouse( const MouseEvent& rMEvt, sal_Bool bAction )
 {
     //	MouseEvent buttons must only be checked if bAction==TRUE
     //	to allow changing the mouse pointer in MouseMove,
     //	but not start AutoFill with right button (#74229#).
-    //	with bAction==TRUE, SetFillMode / SetDragMode is called
+    //	with bAction==sal_True, SetFillMode / SetDragMode is called
 
     if ( bAction && !rMEvt.IsLeft() )
-        return FALSE;
+        return sal_False;
 
-    BOOL bNewPointer = FALSE;
+    sal_Bool bNewPointer = sal_False;
 
     SfxInPlaceClient* pClient = pViewData->GetViewShell()->GetIPClient();
-    BOOL bOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
+    sal_Bool bOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
 
     if ( pViewData->IsActive() && !bOleActive )
     {
         ScDocument* pDoc = pViewData->GetDocument();
         SCTAB nTab = pViewData->GetTabNo();
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
         //	Auto-Fill
 
@@ -1393,7 +1393,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
                         //	where the Marking flag is set and MarkToSimple won't work anymore.
                         pViewData->GetMarkData().MarkToSimple();
                     }
-                    bNewPointer = TRUE;
+                    bNewPointer = sal_True;
                 }
             }
         }
@@ -1414,21 +1414,21 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
                     aStartPos.X() += 2;
                     aEndPos.X()   += 2;
                 }
-                BOOL bTop = ( aMousePos.X() >= aStartPos.X()-3 && aMousePos.X() <= aStartPos.X()+1 &&
+                sal_Bool bTop = ( aMousePos.X() >= aStartPos.X()-3 && aMousePos.X() <= aStartPos.X()+1 &&
                               aMousePos.Y() >= aStartPos.Y()-3 && aMousePos.Y() <= aStartPos.Y()+1 );
-                BOOL bBottom = ( aMousePos.X() >= aEndPos.X()-3 && aMousePos.X() <= aEndPos.X()+1 &&
+                sal_Bool bBottom = ( aMousePos.X() >= aEndPos.X()-3 && aMousePos.X() <= aEndPos.X()+1 &&
                                  aMousePos.Y() >= aEndPos.Y()-3 && aMousePos.Y() <= aEndPos.Y()+1 );
                 if ( bTop || bBottom )
                 {
                     SetPointer( Pointer( POINTER_CROSS ) );
                     if (bAction)
                     {
-                        BYTE nMode = bTop ? SC_FILL_EMBED_LT : SC_FILL_EMBED_RB;
+                        sal_uInt8 nMode = bTop ? SC_FILL_EMBED_LT : SC_FILL_EMBED_RB;
                         pViewData->SetDragMode(
                                     aRange.aStart.Col(), aRange.aStart.Row(),
                                     aRange.aEnd.Col(), aRange.aEnd.Row(), nMode );
                     }
-                    bNewPointer = TRUE;
+                    bNewPointer = sal_True;
                 }
             }
         }
@@ -1488,7 +1488,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
     // merken, dass FilterBox geloescht wird, damit sichergestellt
     // ist, dass in diesem Handler nicht an gleicher Stelle wieder
     // eine neue geoeffnet wird.
-    BOOL	bWasFilterBox = ( pFilterBox != NULL &&
+    sal_Bool	bWasFilterBox = ( pFilterBox != NULL &&
                                 ((Window*)pFilterBox)->IsVisible() &&
                                 !pFilterBox->IsDataSelect() );
     SCCOL	nOldColFBox	  = bWasFilterBox ? pFilterBox->GetCol() : 0;
@@ -1499,7 +1499,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
 
     HideNoteMarker();	// Notiz-Anzeige
 
-    bEEMouse = FALSE;
+    bEEMouse = sal_False;
 
     ScModule* pScMod = SC_MOD();
     if (pScMod->IsModalMode(pViewData->GetSfxDocShell()))
@@ -1511,11 +1511,11 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
     pScActiveViewShell = pViewData->GetViewShell();			// falls auf Link geklickt wird
     nScClickMouseModifier = rMEvt.GetModifier();			// um Control-Klick immer zu erkennen
 
-    BOOL bDetective = pViewData->GetViewShell()->IsAuditShell();
-    BOOL bRefMode =	pViewData->IsRefMode();					// Referenz angefangen
-    BOOL bFormulaMode = pScMod->IsFormulaMode();			// naechster Klick -> Referenz
-    BOOL bEditMode = pViewData->HasEditView(eWhich);		// auch bei Mode==SC_INPUT_TYPE
-    BOOL bDouble = (rMEvt.GetClicks() == 2);
+    sal_Bool bDetective = pViewData->GetViewShell()->IsAuditShell();
+    sal_Bool bRefMode =	pViewData->IsRefMode();					// Referenz angefangen
+    sal_Bool bFormulaMode = pScMod->IsFormulaMode();			// naechster Klick -> Referenz
+    sal_Bool bEditMode = pViewData->HasEditView(eWhich);		// auch bei Mode==SC_INPUT_TYPE
+    sal_Bool bDouble = (rMEvt.GetClicks() == 2);
 
     //	DeactivateIP passiert nur noch bei MarkListHasChanged
 
@@ -1596,7 +1596,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
                 GrabFocus();
 
             pScMod->SetInputMode( SC_INPUT_TABLE );
-            bEEMouse = TRUE;
+            bEEMouse = sal_True;
             bEditMode = pEditView->MouseButtonDown( rMEvt );
             return;
         }
@@ -1617,7 +1617,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
 
     if ( HitRangeFinder( rMEvt.GetPosPixel(), bRFSize, &nRFIndex, &nRFAddX, &nRFAddY ) )
     {
-        bRFMouse = TRUE;		// die anderen Variablen sind oben initialisiert
+        bRFMouse = sal_True;		// die anderen Variablen sind oben initialisiert
 
         if ( pViewData->GetActivePart() != eWhich )
             pViewData->GetView()->ActivatePart( eWhich );	//! schon oben immer ???
@@ -1627,7 +1627,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
         return;
     }
 
-    BOOL bCrossPointer = TestMouse( rMEvt, TRUE );
+    sal_Bool bCrossPointer = TestMouse( rMEvt, sal_True );
     if ( bCrossPointer )
     {
         if ( bDouble )
@@ -1642,10 +1642,10 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
                                             &nPagebreakBreak, &nPagebreakPrev );
         if (nPagebreakMouse)
         {
-            bPagebreakDrawn = FALSE;
+            bPagebreakDrawn = sal_False;
             // CaptureMouse();
             StartTracking();
-            PagebreakMove( rMEvt, FALSE );
+            PagebreakMove( rMEvt, sal_False );
             return;
         }
     }
@@ -1659,7 +1659,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
             return;
         }
 
-        pViewData->GetViewShell()->SetDrawShell( FALSE );				// kein Draw-Objekt selektiert
+        pViewData->GetViewShell()->SetDrawShell( sal_False );				// kein Draw-Objekt selektiert
 
         //	TestMouse schon oben passiert
     }
@@ -1698,7 +1698,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
             Rectangle aButtonRect = GetListValButtonRect( aListValPos );
             if ( aButtonRect.IsInside( aPos ) )
             {
-                DoAutoFilterMenue( aListValPos.Col(), aListValPos.Row(), TRUE );
+                DoAutoFilterMenue( aListValPos.Col(), aListValPos.Row(), sal_True );
 
                 nMouseStatus = SC_GM_FILTER;    // not set in DoAutoFilterMenue for bDataSelect
                 CaptureMouse();
@@ -1739,7 +1739,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
             //		Links in Edit-Zellen
             //
 
-    BOOL bAlt = rMEvt.IsMod2();
+    sal_Bool bAlt = rMEvt.IsMod2();
     if ( !bAlt && rMEvt.IsLeft() &&
             GetEditUrl(rMEvt.GetPosPixel()) )			// Klick auf Link: Cursor nicht bewegen
     {
@@ -1769,7 +1769,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
                 ReleaseMouse();
                 StartTracking();
             }
-            pViewData->GetMarkData().SetMarking(TRUE);
+            pViewData->GetMarkData().SetMarking(sal_True);
             return;
         }
     }
@@ -1797,7 +1797,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
         nMouseStatus = SC_GM_NONE;
                                         // Selection-Engine: Markieren abbrechen
         pViewData->GetView()->GetSelEngine()->Reset();
-        rMark.SetMarking(FALSE);
+        rMark.SetMarking(sal_False);
         if (pViewData->IsAnyFillMode())
         {
             pViewData->GetView()->StopRefMode();
@@ -1854,7 +1854,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
         pViewData->GetView()->InvalidateAttribs();
         rBindings.Invalidate( SID_HYPERLINK_GETLINK );
-        bEEMouse = FALSE;
+        bEEMouse = sal_False;
         return;
     }
 
@@ -1866,8 +1866,8 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
     if (bRFMouse)
     {
-        RFMouseMove( rMEvt, TRUE );		// Range wieder richtigherum
-        bRFMouse = FALSE;
+        RFMouseMove( rMEvt, sal_True );		// Range wieder richtigherum
+        bRFMouse = sal_False;
         SetPointer( Pointer( POINTER_ARROW ) );
         ReleaseMouse();
         return;
@@ -1875,7 +1875,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
     if (nPagebreakMouse)
     {
-        PagebreakMove( rMEvt, TRUE );
+        PagebreakMove( rMEvt, sal_True );
         nPagebreakMouse = SC_PD_NONE;
         SetPointer( Pointer( POINTER_ARROW ) );
         ReleaseMouse();
@@ -1884,7 +1884,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
 
     if (nMouseStatus == SC_GM_WATERUNDO)	// Undo im Giesskannenmodus
     {
-        SfxUndoManager* pMgr = pViewData->GetDocShell()->GetUndoManager();
+        ::svl::IUndoManager* pMgr = pViewData->GetDocShell()->GetUndoManager();
         if ( pMgr->GetUndoActionCount() && pMgr->GetUndoActionId() == STR_UNDO_APPLYCELLSTYLE )
             pMgr->Undo();
         else
@@ -1895,7 +1895,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
     if (DrawMouseButtonUp(rMEvt))       // includes format paint brush handling for drawing objects
         return;
 
-    rMark.SetMarking(FALSE);
+    rMark.SetMarking(sal_False);
 
     SetPointer( Pointer( POINTER_ARROW ) );
 
@@ -1911,16 +1911,16 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
 //		DBG_ASSERT( nStartCol==pViewData->GetRefStartX() && nStartRow==pViewData->GetRefStartY(),
 //								"Block falsch fuer AutoFill" );
         ScRange aDelRange;
-        BOOL bIsDel = pViewData->GetDelMark( aDelRange );
+        sal_Bool bIsDel = pViewData->GetDelMark( aDelRange );
 
         ScViewFunc* pView = pViewData->GetView();
         pView->StopRefMode();
         pViewData->ResetFillMode();
-        pView->GetFunctionSet()->SetAnchorFlag( FALSE );	// #i5819# don't use AutoFill anchor flag for selection
+        pView->GetFunctionSet()->SetAnchorFlag( sal_False );	// #i5819# don't use AutoFill anchor flag for selection
 
         if ( bIsDel )
         {
-            pView->MarkRange( aDelRange, FALSE );
+            pView->MarkRange( aDelRange, sal_False );
             pView->DeleteContents( IDF_CONTENTS );
             SCTAB nTab = pViewData->GetTabNo();
             ScRange aBlockRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab );
@@ -1930,7 +1930,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
                     aBlockRange.aEnd.SetCol( aDelRange.aStart.Col() - 1 );
                 else
                     aBlockRange.aEnd.SetRow( aDelRange.aStart.Row() - 1 );
-                pView->MarkRange( aBlockRange, FALSE );
+                pView->MarkRange( aBlockRange, sal_False );
             }
         }
         else
@@ -1952,11 +1952,11 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
         ScTabView* pView = pViewData->GetView();
         pView->StopRefMode();
         pViewData->ResetFillMode();
-        pView->GetFunctionSet()->SetAnchorFlag( FALSE );
+        pView->GetFunctionSet()->SetAnchorFlag( sal_False );
 
         if ( aEndPos != aBlockRange.aEnd )
         {
-            pViewData->GetDocShell()->GetDocFunc().ResizeMatrix( aBlockRange, aEndPos, FALSE );
+            pViewData->GetDocShell()->GetDocFunc().ResizeMatrix( aBlockRange, aEndPos, sal_False );
             pViewData->GetView()->MarkRange( ScRange( aBlockRange.aStart, aEndPos ) );
         }
     }
@@ -1966,11 +1966,11 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
         ScTabView* pView = pViewData->GetView();
         pView->StopRefMode();
         pViewData->ResetFillMode();
-        pView->GetFunctionSet()->SetAnchorFlag( FALSE );
+        pView->GetFunctionSet()->SetAnchorFlag( sal_False );
         pViewData->GetDocShell()->UpdateOle(pViewData);
     }
 
-    BOOL bRefMode =	pViewData->IsRefMode();
+    sal_Bool bRefMode =	pViewData->IsRefMode();
     if (bRefMode)
         pScMod->EndReference();
 
@@ -2006,7 +2006,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
                                                                 pStyleSheet->GetName() );
 
                         ScPrintFunc( pViewData->GetDocShell(),
-                                     pViewData->GetViewShell()->GetPrinter(TRUE),
+                                     pViewData->GetViewShell()->GetPrinter(sal_True),
                                      pViewData->GetTabNo() ).UpdatePages();
 
                         rBindings.Invalidate( SID_STATUS_PAGESTYLE );
@@ -2032,7 +2032,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
             //		double click (only left button)
             //
 
-    BOOL bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
+    sal_Bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
     if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() )
     {
         //	data pilot table
@@ -2053,7 +2053,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
             if ( ( aData.Flags & sheet::MemberResultFlags::HASMEMBER ) &&
                  ! ( aData.Flags & sheet::MemberResultFlags::SUBTOTAL ) )
             {
-                USHORT nDummy;
+                sal_uInt16 nDummy;
                 if ( pView->HasSelectionForDrillDown( nDummy ) )
                 {
                     // execute slot to show dialog
@@ -2065,7 +2065,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
                     ScDPObject aNewObj( *pDPObj );
                     pDPObj->ToggleDetails( aData, &aNewObj );
                     ScDBDocFunc aFunc( *pViewData->GetDocShell() );
-                    aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE );
+                    aFunc.DataPilotUpdate( pDPObj, &aNewObj, sal_True, sal_False );
                     pViewData->GetView()->CursorPosChanged();       // shells may be switched
                 }
             }
@@ -2119,7 +2119,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
             //		Links in edit cells
             //
 
-    BOOL bAlt = rMEvt.IsMod2();
+    sal_Bool bAlt = rMEvt.IsMod2();
     if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN )
     {
         //	beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war
@@ -2162,7 +2162,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
             //
 
     //	SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return
-    //	TRUE for any call, so IsLeft must be checked here, too.
+    //	sal_True for any call, so IsLeft must be checked here, too.
 
     if ( rMEvt.IsLeft() && pViewData->GetView()->GetSelEngine()->SelMouseButtonUp( rMEvt ) )
     {
@@ -2170,7 +2170,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
         pViewData->GetView()->UpdateAutoFillMark();
 
         SfxDispatcher* pDisp = pViewData->GetViewShell()->GetDispatcher();
-        BOOL bFormulaMode = pScMod->IsFormulaMode();
+        sal_Bool bFormulaMode = pScMod->IsFormulaMode();
         DBG_ASSERT( pDisp || bFormulaMode, "Cursor auf nicht aktiver View bewegen ?" );
 
         //	#i14927# execute SID_CURRENTCELL (for macro recording) only if there is no
@@ -2183,7 +2183,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
             String aAddr;								// CurrentCell
             if( rMark.IsMarked() )
             {
-//				BOOL bKeep = rMark.IsMultiMarked();		//! wohin damit ???
+//				sal_Bool bKeep = rMark.IsMultiMarked();		//! wohin damit ???
 
                 ScRange aScRange;
                 rMark.GetMarkArea( aScRange );
@@ -2240,7 +2240,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
 
     if (bEEMouse && nButtonDown && !rMEvt.GetButtons())
     {
-        bEEMouse = FALSE;
+        bEEMouse = sal_False;
         nButtonDown = 0;
         nMouseStatus = SC_GM_NONE;
         return;
@@ -2282,7 +2282,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
         }
     }
 
-    BOOL bFormulaMode = pScMod->IsFormulaMode();			// naechster Klick -> Referenz
+    sal_Bool bFormulaMode = pScMod->IsFormulaMode();			// naechster Klick -> Referenz
 
     if (bEEMouse && pViewData->HasEditView( eWhich ))
     {
@@ -2302,19 +2302,19 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
 
     if (bRFMouse)
     {
-        RFMouseMove( rMEvt, FALSE );
+        RFMouseMove( rMEvt, sal_False );
         return;
     }
 
     if (nPagebreakMouse)
     {
-        PagebreakMove( rMEvt, FALSE );
+        PagebreakMove( rMEvt, sal_False );
         return;
     }
 
     //	anderen Mauszeiger anzeigen?
 
-    BOOL bEditMode = pViewData->HasEditView(eWhich);
+    sal_Bool bEditMode = pViewData->HasEditView(eWhich);
 
                     //! Testen ob RefMode-Dragging !!!
     if ( bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo()) )
@@ -2335,7 +2335,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
              nPosY >= (SCsROW) nEditRow && nPosY <= (SCsROW) nEndRow )
         {
             //	Field can only be URL field
-            BOOL bAlt = rMEvt.IsMod2();
+            sal_Bool bAlt = rMEvt.IsMod2();
             if ( !bAlt && !nButtonDown && pEditView && pEditView->GetFieldUnderMousePointer() )
                 SetPointer( Pointer( POINTER_REFHAND ) );
             else if ( pEditView && pEditView->GetEditEngine()->IsVertical() )
@@ -2346,29 +2346,29 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
         }
     }
 
-    BOOL bWater = SC_MOD()->GetIsWaterCan() || pViewData->GetView()->HasPaintBrush();
+    sal_Bool bWater = SC_MOD()->GetIsWaterCan() || pViewData->GetView()->HasPaintBrush();
     if (bWater)
         SetPointer( Pointer(POINTER_FILL) );
 
     if (!bWater)
     {
-        BOOL bCross = FALSE;
+        sal_Bool bCross = sal_False;
 
         //	Range-Finder
 
-        BOOL bCorner;
+        sal_Bool bCorner;
         if ( HitRangeFinder( rMEvt.GetPosPixel(), bCorner ) )
         {
             if (bCorner)
                 SetPointer( Pointer( POINTER_CROSS ) );
             else
                 SetPointer( Pointer( POINTER_HAND ) );
-            bCross = TRUE;
+            bCross = sal_True;
         }
 
         //	Page-Break-Modus
 
-        USHORT nBreakType;
+        sal_uInt16 nBreakType;
         if ( !nButtonDown && pViewData->IsPagebreakMode() &&
                 ( nBreakType = HitPageBreak( rMEvt.GetPosPixel() ) ) != 0 )
         {
@@ -2395,25 +2395,25 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
                     break;
             }
             SetPointer( Pointer( eNew ) );
-            bCross = TRUE;
+            bCross = sal_True;
         }
 
         //	Fill-Cursor anzeigen ?
 
         if ( !bFormulaMode && !nButtonDown )
-            if (TestMouse( rMEvt, FALSE ))
-                bCross = TRUE;
+            if (TestMouse( rMEvt, sal_False ))
+                bCross = sal_True;
 
         if ( nButtonDown && pViewData->IsAnyFillMode() )
         {
             SetPointer( Pointer( POINTER_CROSS ) );
-            bCross = TRUE;
+            bCross = sal_True;
             nScFillModeMouseModifier = rMEvt.GetModifier();	// ausgewertet bei AutoFill und Matrix
         }
 
         if (!bCross)
         {
-            BOOL bAlt = rMEvt.IsMod2();
+            sal_Bool bAlt = rMEvt.IsMod2();
 
             if (bEditMode)									// Edit-Mode muss zuerst kommen!
                 SetPointer( Pointer( POINTER_ARROW ) );
@@ -2458,7 +2458,7 @@ void lcl_InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent, const MouseE
 long ScGridWindow::PreNotify( NotifyEvent& rNEvt )
 {
     bool bDone = false;
-    USHORT nType = rNEvt.GetType();
+    sal_uInt16 nType = rNEvt.GetType();
     if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN )
     {
         Window* pWindow = rNEvt.GetWindow();
@@ -2517,24 +2517,24 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
         if (!pViewData->GetView()->IsInActivatePart())
         {
             if (bDPMouse)
-                bDPMouse = FALSE;				// gezeichnet wird per bDragRect
+                bDPMouse = sal_False;				// gezeichnet wird per bDragRect
             if (bDragRect)
             {
                 // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
-                bDragRect = FALSE;
+                bDragRect = sal_False;
                 UpdateDragRectOverlay();
             }
             if (bRFMouse)
             {
-                RFMouseMove( rMEvt, TRUE );		// richtig abbrechen geht dabei nicht...
-                bRFMouse = FALSE;
+                RFMouseMove( rMEvt, sal_True );		// richtig abbrechen geht dabei nicht...
+                bRFMouse = sal_False;
             }
             if (nPagebreakMouse)
             {
                 // if (bPagebreakDrawn)
                 //	DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
-                //					aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
-                bPagebreakDrawn = FALSE;
+                //					aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), sal_False );
+                bPagebreakDrawn = sal_False;
                 UpdateDragRectOverlay();
                 nPagebreakMouse = SC_PD_NONE;
             }
@@ -2543,7 +2543,7 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
             StopMarking();
             MouseButtonUp( rMEvt );		// mit Status SC_GM_IGNORE aus StopMarking
 
-            BOOL bRefMode =	pViewData->IsRefMode();
+            sal_Bool bRefMode =	pViewData->IsRefMode();
             if (bRefMode)
                 SC_MOD()->EndReference();		// #63148# Dialog nicht verkleinert lassen
         }
@@ -2569,7 +2569,7 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
 
     HideNoteMarker();
 
-    CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, TRUE );
+    CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, sal_True );
 
     if (bEEMouse && pViewData->HasEditView( eWhich ))
     {
@@ -2580,7 +2580,7 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
 
         // #63263# don't remove the edit view while switching views
         ScModule* pScMod = SC_MOD();
-        pScMod->SetInEditCommand( TRUE );
+        pScMod->SetInEditCommand( sal_True );
 
         pEditView->Command( aDragEvent );
 
@@ -2588,7 +2588,7 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
         if (pHdl)
             pHdl->DataChanged();
 
-        pScMod->SetInEditCommand( FALSE );
+        pScMod->SetInEditCommand( sal_False );
         if (!pViewData->IsActive())				// dropped to different view?
         {
             ScInputHandler* pViewHdl = pScMod->GetInputHdl( pViewData->GetViewShell() );
@@ -2608,7 +2608,7 @@ void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, Window* pWi
 {
     SCCOL nCol = pViewData->GetCurX();
     SCROW nRow = pViewData->GetCurY();
-    Rectangle aEditArea = pViewData->GetEditArea( eWhich, nCol, nRow, pWin, NULL, TRUE );
+    Rectangle aEditArea = pViewData->GetEditArea( eWhich, nCol, nRow, pWin, NULL, sal_True );
     aEditArea.Right() = aEditArea.Left();
     aEditArea = pWin->PixelToLogic( aEditArea );
     pWin->SetCursorRect( &aEditArea );
@@ -2621,7 +2621,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
     // deactivate the inplace client without any problem regarding parent
     // windows and code on the stack.
     // For more information, see #126086# and #128122#
-    USHORT nCmd = rCEvt.GetCommand();
+    sal_uInt16 nCmd = rCEvt.GetCommand();
     ScTabViewShell* pTabViewSh = pViewData->GetViewShell();
     SfxInPlaceClient* pClient = pTabViewSh->GetIPClient();
     if ( pClient &&
@@ -2640,7 +2640,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
          nCmd == COMMAND_EXTTEXTINPUT ||
          nCmd == COMMAND_CURSORPOS )
     {
-        BOOL bEditView = pViewData->HasEditView( eWhich );
+        sal_Bool bEditView = pViewData->HasEditView( eWhich );
         if (!bEditView)
         {
             //	only if no cell editview is active, look at drawview
@@ -2670,7 +2670,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
         ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() );
         if ( pHdl )
         {
-            pHdl->InputCommand( rCEvt, TRUE );
+            pHdl->InputCommand( rCEvt, sal_True );
             return;										// done
         }
 
@@ -2733,20 +2733,20 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
 
     if ( nCmd == COMMAND_WHEEL || nCmd == COMMAND_STARTAUTOSCROLL || nCmd == COMMAND_AUTOSCROLL )
     {
-        BOOL bDone = pViewData->GetView()->ScrollCommand( rCEvt, eWhich );
+        sal_Bool bDone = pViewData->GetView()->ScrollCommand( rCEvt, eWhich );
         if (!bDone)
             Window::Command(rCEvt);
         return;
     }
     // #i7560# FormulaMode check is below scrolling - scrolling is allowed during formula input
-    BOOL bDisable = pScMod->IsFormulaMode() ||
+    sal_Bool bDisable = pScMod->IsFormulaMode() ||
                     pScMod->IsModalMode(pViewData->GetSfxDocShell());
     if (bDisable)
         return;
 
     if ( nCmd == COMMAND_CONTEXTMENU && !SC_MOD()->GetIsWaterCan() )
     {
-        BOOL bMouse = rCEvt.IsMouseEvent();
+        sal_Bool bMouse = rCEvt.IsMouseEvent();
         if ( bMouse && nMouseStatus == SC_GM_IGNORE )
             return;
 
@@ -2791,12 +2791,12 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
             SelectForContextMenu( aPosPixel, nCellX, nCellY );
         }
 
-        BOOL bDone = FALSE;
-        BOOL bEdit = pViewData->HasEditView(eWhich);
+        sal_Bool bDone = sal_False;
+        sal_Bool bEdit = pViewData->HasEditView(eWhich);
         if ( !bEdit )
         {
                 // Edit-Zelle mit Spelling-Errors ?
-            if ( bMouse && GetEditUrlOrError( TRUE, aPosPixel ) )
+            if ( bMouse && GetEditUrlOrError( sal_True, aPosPixel ) )
             {
                 //	GetEditUrlOrError hat den Cursor schon bewegt
 
@@ -2842,7 +2842,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
                 Link aLink = LINK( this, ScGridWindow, PopupSpellingHdl );
                 pEditView->ExecuteSpellPopup( aMenuPos, &aLink );
 
-                bDone = TRUE;
+                bDone = sal_True;
             }
         }
         else if ( !bMouse )
@@ -2851,7 +2851,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
 
             SCCOL nCurX = pViewData->GetCurX();
             SCROW nCurY = pViewData->GetCurY();
-            aMenuPos = pViewData->GetScrPos( nCurX, nCurY, eWhich, TRUE );
+            aMenuPos = pViewData->GetScrPos( nCurX, nCurY, eWhich, sal_True );
             long nSizeXPix;
             long nSizeYPix;
             pViewData->GetMergeSizePixel( nCurX, nCurY, nSizeXPix, nSizeYPix );
@@ -2999,24 +2999,24 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX,
 
     //  look for existing selection
 
-    BOOL bHitSelected = FALSE;
+    sal_Bool bHitSelected = sal_False;
     if ( pDrawView && pDrawView->IsMarkedObjHit( aLogicPos ) )
     {
         //  clicked on selected object -> don't change anything
-        bHitSelected = TRUE;
+        bHitSelected = sal_True;
     }
     else if ( pViewData->GetMarkData().IsCellMarked(nCellX, nCellY) )
     {
         //  clicked on selected cell -> don't change anything
-        bHitSelected = TRUE;
+        bHitSelected = sal_True;
     }
 
     //  select drawing object or move cell cursor
 
     if ( !bHitSelected )
     {
-        BOOL bWasDraw = ( pDrawView && pDrawView->AreObjectsMarked() );
-        BOOL bHitDraw = FALSE;
+        sal_Bool bWasDraw = ( pDrawView && pDrawView->AreObjectsMarked() );
+        sal_Bool bHitDraw = sal_False;
         if ( pDrawView )
         {
             pDrawView->UnmarkAllObj();
@@ -3031,7 +3031,7 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX,
             pView->Unmark();
             pView->SetCursor(nCellX, nCellY);
             if ( bWasDraw )
-                pViewData->GetViewShell()->SetDrawShell( FALSE );   // switch shells
+                pViewData->GetViewShell()->SetDrawShell( sal_False );   // switch shells
         }
     }
 }
@@ -3061,7 +3061,7 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
     {
         //	query for existing note marker before calling ViewShell's keyboard handling
         //	which may remove the marker
-        BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() );
+        sal_Bool bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() );
         ScTabViewShell* pViewSh = pViewData->GetViewShell();
 
         if (pViewData->GetDocShell()->GetProgress())
@@ -3096,7 +3096,7 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
             if ( bHadKeyMarker )
                 HideNoteMarker();		// hide when previously visible
             else
-                ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), TRUE );
+                ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), sal_True );
             return;
         }
     }
@@ -3110,15 +3110,15 @@ void ScGridWindow::StopMarking()
 
     if (nButtonDown)
     {
-        pViewData->GetMarkData().SetMarking(FALSE);
+        pViewData->GetMarkData().SetMarking(sal_False);
         nMouseStatus = SC_GM_IGNORE;
     }
 }
 
 void ScGridWindow::UpdateInputContext()
 {
-    BOOL bReadOnly = pViewData->GetDocShell()->IsReadOnly();
-    ULONG nOptions = bReadOnly ? 0 : ( INPUTCONTEXT_TEXT | INPUTCONTEXT_EXTTEXTINPUT );
+    sal_Bool bReadOnly = pViewData->GetDocShell()->IsReadOnly();
+    sal_uLong nOptions = bReadOnly ? 0 : ( INPUTCONTEXT_TEXT | INPUTCONTEXT_EXTTEXTINPUT );
 
     //	when font from InputContext is used,
     //	it must be taken from the cursor position's cell attributes
@@ -3133,11 +3133,11 @@ void ScGridWindow::UpdateInputContext()
                                 // sensitiver Bereich (Pixel)
 #define SCROLL_SENSITIVE 20
 
-BOOL ScGridWindow::DropScroll( const Point& rMousePos )
+sal_Bool ScGridWindow::DropScroll( const Point& rMousePos )
 {
 /*	doch auch auf nicht aktiven Views...
     if ( !pViewData->IsActive() )
-        return FALSE;
+        return sal_False;
 */
     SCsCOL nDx = 0;
     SCsROW nDy = 0;
@@ -3174,15 +3174,15 @@ BOOL ScGridWindow::DropScroll( const Point& rMousePos )
 //			pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange)
+sal_Bool lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange)
 {
     //	Testet, ob bei eingeschalteten RedLining,
     //  bei einem Drop ein Scenario betroffen ist.
 
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
     SCTAB nTab = aDragRange.aStart.Tab();
     SCTAB nTabCount = pDoc->GetTableCount();
 
@@ -3190,7 +3190,7 @@ BOOL lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange)
     {
         if( pDoc->IsScenario(nTab) && pDoc->HasScenarioRange(nTab, aDragRange))
         {
-            bReturn = TRUE;
+            bReturn = sal_True;
         }
         else
         {
@@ -3198,7 +3198,7 @@ BOOL lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange)
             {
                 if(pDoc->HasScenarioRange(i, aDragRange))
                 {
-                    bReturn = TRUE;
+                    bReturn = sal_True;
                     break;
                 }
             }
@@ -3229,8 +3229,8 @@ ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const ScRange&
 
 //--------------------------------------------------------
 
-extern BOOL bPasteIsDrop;		// viewfun4 -> move to header
-extern BOOL bPasteIsMove;		// viewfun7 -> move to header
+extern sal_Bool bPasteIsDrop;		// viewfun4 -> move to header
+extern sal_Bool bPasteIsMove;		// viewfun7 -> move to header
 
 //--------------------------------------------------------
 
@@ -3240,7 +3240,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
     {
         // if (bDragRect)
         //	pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
-        bDragRect = FALSE;
+        bDragRect = sal_False;
         UpdateDragRectOverlay();
         return rEvt.mnAction;
     }
@@ -3253,7 +3253,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
         {
             if (bDragRect)
             {
-                bDragRect = FALSE;
+                bDragRect = sal_False;
                 UpdateDragRectOverlay();
             }
             return DND_ACTION_NONE;
@@ -3270,7 +3270,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
                 if (bDragRect)			// Rechteck loeschen
                 {
                     // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
-                    bDragRect = FALSE;
+                    bDragRect = sal_False;
                     UpdateDragRectOverlay();
                 }
 
@@ -3289,7 +3289,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
 
         if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE )		// whole sheet?
         {
-            BOOL bOk = pThisDoc->IsDocEditable();
+            sal_Bool bOk = pThisDoc->IsDocEditable();
             return bOk ? rEvt.mnAction : 0;						// don't draw selection frame
         }
 
@@ -3327,7 +3327,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
             if (bDragRect)
             {
                 // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
-                bDragRect = FALSE;
+                bDragRect = sal_False;
                 UpdateDragRectOverlay();
             }
             return DND_ACTION_NONE;
@@ -3361,14 +3361,14 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
 
                 if ( bValid )
                 {
-                    BOOL bIsDataLayout;
+                    sal_Bool bIsDataLayout;
                     String aDimName = pDPObj->GetDimName( aDestData.Dimension, bIsDataLayout );
                     const ScDPSaveDimension* pDim = pDPObj->GetSaveData()->GetExistingDimensionByName( aDimName );
                     if ( pDim )
                     {
                         ScRange aOutRange = pDPObj->GetOutRange();
 
-                        USHORT nOrient = pDim->GetOrientation();
+                        sal_uInt16 nOrient = pDim->GetOrientation();
                         if ( nOrient == sheet::DataPilotFieldOrientation_COLUMN )
                         {
                             eDragInsertMode = INS_CELLSRIGHT;
@@ -3390,7 +3390,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
                 // no valid sorting in a DataPilot table -> disallow
                 if ( bDragRect )
                 {
-                    bDragRect = FALSE;
+                    bDragRect = sal_False;
                     UpdateDragRectOverlay();
                 }
                 return DND_ACTION_NONE;
@@ -3420,7 +3420,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
                 {
                     if ( bDragRect )
                     {
-                        bDragRect = FALSE;
+                        bDragRect = sal_False;
                         UpdateDragRectOverlay();
                     }
                     return DND_ACTION_NONE;
@@ -3451,7 +3451,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
             nDragStartY = nNewDragY;
             nDragEndX = nDragStartX+nSizeX-1;
             nDragEndY = nDragStartY+nSizeY-1;
-            bDragRect = TRUE;
+            bDragRect = sal_True;
             meDragInsertMode = eDragInsertMode;
 
             // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
@@ -3467,7 +3467,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
                 aRange.Format( aHelpStr, SCA_VALID );	// non-3D
 
                 Point aPos = Pointer::GetPosPixel();
-                USHORT nAlign = QUICKHELP_BOTTOM|QUICKHELP_RIGHT;
+                sal_uInt16 nAlign = QUICKHELP_BOTTOM|QUICKHELP_RIGHT;
                 Rectangle aRect( aPos, aPos );
                 Help::ShowQuickHelp(aRect, aHelpStr, nAlign);
             }
@@ -3559,7 +3559,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
                     case DND_ACTION_MOVE:
                     case DND_ACTION_COPYMOVE:
                         {
-                            BOOL bMove = ( nMyAction == DND_ACTION_MOVE );
+                            sal_Bool bMove = ( nMyAction == DND_ACTION_MOVE );
                             if ( IsDropFormatSupported( SOT_FORMATSTR_ID_EMBED_SOURCE ) ||
                                  IsDropFormatSupported( SOT_FORMATSTR_ID_LINK_SOURCE ) ||
                                  IsDropFormatSupported( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ) ||
@@ -3611,7 +3611,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
                     // Simple check for protection: It's not known here if the drop will result
                     // in cells or drawing objects (some formats can be both) and how many cells
                     // the result will be. But if IsFormatEditable for the drop cell position
-                    // is FALSE (ignores matrix formulas), nothing can be pasted, so the drop
+                    // is sal_False (ignores matrix formulas), nothing can be pasted, so the drop
                     // can already be rejected here.
 
                     Point aPos = rEvt.maPosPixel;
@@ -3636,7 +3636,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
     return nRet;
 }
 
-ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xTransfer, bool bPreferText = false )
+sal_uLong lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xTransfer, bool bPreferText = false )
 {
     TransferableDataHelper aDataHelper( xTransfer );
 
@@ -3654,7 +3654,7 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT
             return SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR;
     }
 
-    ULONG nFormatId = 0;
+    sal_uLong nFormatId = 0;
     if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING ) )
         nFormatId = SOT_FORMATSTR_ID_DRAWING;
     else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ) )
@@ -3663,7 +3663,7 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT
     {
         //	If it's a Writer object, insert RTF instead of OLE
 
-        BOOL bDoRtf = FALSE;
+        sal_Bool bDoRtf = sal_False;
         SotStorageStreamRef xStm;
         TransferableObjectDescriptor aObjDesc;
         if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) &&
@@ -3721,11 +3721,11 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT
     return nFormatId;
 }
 
-ULONG lcl_GetDropLinkId( const uno::Reference<datatransfer::XTransferable>& xTransfer )
+sal_uLong lcl_GetDropLinkId( const uno::Reference<datatransfer::XTransferable>& xTransfer )
 {
     TransferableDataHelper aDataHelper( xTransfer );
 
-    ULONG nFormatId = 0;
+    sal_uLong nFormatId = 0;
     if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE ) )
         nFormatId = SOT_FORMATSTR_ID_LINK_SOURCE;
     else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE_OLE ) )
@@ -3754,7 +3754,7 @@ sal_Int8 ScGridWindow::ExecutePrivateDrop( const ExecuteDropEvent& rEvt )
     // hide drop marker
     // if (bDragRect)
     //	pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
-    bDragRect = FALSE;
+    bDragRect = sal_False;
     UpdateDragRectOverlay();
 
     ScModule* pScMod = SC_MOD();
@@ -3775,10 +3775,10 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
     ScDocument* pThisDoc   = pViewData->GetDocument();
     ScViewFunc* pView	   = pViewData->GetView();
     SCTAB       nThisTab   = pViewData->GetTabNo();
-    USHORT nFlags = pTransObj->GetDragSourceFlags();
+    sal_uInt16 nFlags = pTransObj->GetDragSourceFlags();
 
-    BOOL bIsNavi = ( nFlags & SC_DROP_NAVIGATOR ) != 0;
-    BOOL bIsMove = ( nDndAction == DND_ACTION_MOVE && !bIsNavi );
+    sal_Bool bIsNavi = ( nFlags & SC_DROP_NAVIGATOR ) != 0;
+    sal_Bool bIsMove = ( nDndAction == DND_ACTION_MOVE && !bIsNavi );
 
     // workaround for wrong nDndAction on Windows when pressing solely
     // the Alt key during drag and drop;
@@ -3788,7 +3788,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
         bIsMove = ( nDndAction & DND_ACTION_MOVE && !bIsNavi );
     }
 
-    BOOL bIsLink = ( nDndAction == DND_ACTION_LINK );
+    sal_Bool bIsLink = ( nDndAction == DND_ACTION_LINK );
 
     ScRange aSource = pTransObj->GetRange();
 
@@ -3829,7 +3829,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
             bFiltered = ScViewUtil::HasFiltered( aDest, pThisDoc);
     }
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     if (!bFiltered && pSourceDoc == pThisDoc)
     {
@@ -3838,9 +3838,9 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
             if ( pThisDoc->IsDocEditable() )
             {
                 SCTAB nSrcTab = aSource.aStart.Tab();
-                pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, TRUE );	// with Undo
-                pView->SetTabNo( nThisTab, TRUE );
-                bDone = TRUE;
+                pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, sal_True );	// with Undo
+                pView->SetTabNo( nThisTab, sal_True );
+                bDone = sal_True;
             }
         }
         else										// move/copy block
@@ -3852,10 +3852,10 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 aSource.Format( aRangeName, SCR_ABS_3D, pThisDoc );
                 SfxStringItem aNameItem( SID_CHART_NAME, aChartName );
                 SfxStringItem aRangeItem( SID_CHART_SOURCE, aRangeName );
-                USHORT nId = bIsMove ? SID_CHART_SOURCE : SID_CHART_ADDSOURCE;
+                sal_uInt16 nId = bIsMove ? SID_CHART_SOURCE : SID_CHART_ADDSOURCE;
                 pViewData->GetDispatcher().Execute( nId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
                                             &aRangeItem, &aNameItem, (void*) NULL );
-                bDone = TRUE;
+                bDone = sal_True;
             }
             else if ( pThisDoc->GetDPAtCursor( nDestPosX, nDestPosY, nThisTab ) )
             {
@@ -3865,7 +3865,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 if ( aDestPos != aSource.aStart )
                     bDone = pViewData->GetView()->DataPilotMove( aSource, aDestPos );
                 else
-                    bDone = TRUE;   // same position: nothing
+                    bDone = sal_True;   // same position: nothing
             }
             else if ( nDestPosX != aSource.aStart.Col() || nDestPosY != aSource.aStart.Row() ||
                         nSourceTab != nThisTab )
@@ -3873,11 +3873,11 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 String aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE : STR_UNDO_COPY );
                 pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
 
-                bDone = TRUE;
+                bDone = sal_True;
                 if ( meDragInsertMode != INS_NONE )
                 {
-                    // call with bApi = TRUE to avoid error messages in drop handler
-                    bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, TRUE /*bRecord*/, TRUE /*bApi*/, TRUE /*bPartOfPaste*/ );
+                    // call with bApi = sal_True to avoid error messages in drop handler
+                    bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, sal_True /*bRecord*/, sal_True /*bApi*/, sal_True /*bPartOfPaste*/ );
                     if ( bDone )
                     {
                         if ( nThisTab == nSourceTab )
@@ -3902,13 +3902,13 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 {
                     if ( bIsLink )
                     {
-                        // call with bApi = TRUE to avoid error messages in drop handler
-                        bDone = pView->LinkBlock( aSource, aDest.aStart, TRUE /*bApi*/ );
+                        // call with bApi = sal_True to avoid error messages in drop handler
+                        bDone = pView->LinkBlock( aSource, aDest.aStart, sal_True /*bApi*/ );
                     }
                     else
                     {
-                        // call with bApi = TRUE to avoid error messages in drop handler
-                        bDone = pView->MoveBlockTo( aSource, aDest.aStart, bIsMove, TRUE /*bRecord*/, TRUE /*bPaint*/, TRUE /*bApi*/ );
+                        // call with bApi = sal_True to avoid error messages in drop handler
+                        bDone = pView->MoveBlockTo( aSource, aDest.aStart, bIsMove, sal_True /*bRecord*/, sal_True /*bPaint*/, sal_True /*bApi*/ );
                     }
                 }
 
@@ -3927,8 +3927,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                     if ( ( eCmd == DEL_CELLSUP  && nDestPosX == aSource.aStart.Col() ) ||
                          ( eCmd == DEL_CELLSLEFT && nDestPosY == aSource.aStart.Row() ) )
                     {
-                        // call with bApi = TRUE to avoid error messages in drop handler
-                        bDone = pDocSh->GetDocFunc().DeleteCells( aSource, NULL, eCmd, TRUE /*bRecord*/, TRUE /*bApi*/ );
+                        // call with bApi = sal_True to avoid error messages in drop handler
+                        bDone = pDocSh->GetDocFunc().DeleteCells( aSource, NULL, eCmd, sal_True /*bRecord*/, sal_True /*bApi*/ );
                         if ( bDone )
                         {
                             if ( eCmd == DEL_CELLSUP && nDestPosY > aSource.aEnd.Row() )
@@ -3947,7 +3947,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
 
                 if ( bDone )
                 {
-                    pView->MarkRange( aDest, FALSE, FALSE );
+                    pView->MarkRange( aDest, sal_False, sal_False );
                     pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
                 }
 
@@ -3957,7 +3957,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                     Sound::Beep();	// instead of error message in drop handler
             }
             else
-                bDone = TRUE;		// nothing to do
+                bDone = sal_True;		// nothing to do
         }
 
         if (bDone)
@@ -3995,7 +3995,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 }
 
                 pView->ImportTables( pSrcShell,nTabSelCount, nTabs, bIsLink, nThisTab );
-                bDone = TRUE;
+                bDone = sal_True;
             }
         }
         else if ( bIsLink )
@@ -4010,11 +4010,11 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 String aUndo = ScGlobal::GetRscString( STR_UNDO_COPY );
                 pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
 
-                bDone = TRUE;
+                bDone = sal_True;
                 if ( meDragInsertMode != INS_NONE )
                 {
-                    // call with bApi = TRUE to avoid error messages in drop handler
-                    bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, TRUE /*bRecord*/, TRUE /*bApi*/, TRUE /*bPartOfPaste*/ );
+                    // call with bApi = sal_True to avoid error messages in drop handler
+                    bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, sal_True /*bRecord*/, sal_True /*bApi*/, sal_True /*bPartOfPaste*/ );
                     if ( bDone )
                     {
                         pDocSh->UpdateOle( pViewData );
@@ -4055,7 +4055,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
 
                     pView->EnterMatrix( aFormula );
 
-                    pView->MarkRange( aDest, FALSE, FALSE );
+                    pView->MarkRange( aDest, sal_False, sal_False );
                     pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
                 }
 
@@ -4070,11 +4070,11 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
             String aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE : STR_UNDO_COPY );
             pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
 
-            bDone = TRUE;
+            bDone = sal_True;
             if ( meDragInsertMode != INS_NONE )
             {
-                // call with bApi = TRUE to avoid error messages in drop handler
-                bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, TRUE /*bRecord*/, TRUE /*bApi*/, TRUE /*bPartOfPaste*/ );
+                // call with bApi = sal_True to avoid error messages in drop handler
+                bDone = pDocSh->GetDocFunc().InsertCells( aDest, NULL, meDragInsertMode, sal_True /*bRecord*/, sal_True /*bApi*/, sal_True /*bPartOfPaste*/ );
                 if ( bDone )
                 {
                     pDocSh->UpdateOle( pViewData );
@@ -4089,7 +4089,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
                 bDone = pView->PasteFromClip( IDF_ALL, pTransObj->GetDocument() );  // clip-doc
                 if ( bDone )
                 {
-                    pView->MarkRange( aDest, FALSE, FALSE );
+                    pView->MarkRange( aDest, sal_False, sal_False );
                     pView->SetCursor( aDest.aEnd.Col(), aDest.aEnd.Row() );
                 }
             }
@@ -4120,14 +4120,14 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
     {
         //	try to insert a link
 
-        BOOL bOk = TRUE;
+        sal_Bool bOk = sal_True;
         String aThisName;
         ScDocShell* pDocSh = pViewData->GetDocShell();
         if (pDocSh && pDocSh->HasName())
             aThisName = pDocSh->GetMedium()->GetName();
 
         if ( rData.aLinkDoc == aThisName )				// error - no link within a document
-            bOk = FALSE;
+            bOk = sal_False;
         else
         {
             ScViewFunc* pView = pViewData->GetView();
@@ -4139,7 +4139,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
                 SCsCOL	nPosX;
                 SCsROW	nPosY;
                 pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
-                pView->MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, FALSE, FALSE );
+                pView->MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, sal_False, sal_False );
 
                 pView->InsertAreaLink( rData.aLinkDoc, EMPTY_STRING, EMPTY_STRING,
                                         rData.aLinkArea, 0 );
@@ -4147,7 +4147,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
             else
             {
                 DBG_ERROR("drop with link: no sheet nor area");
-                bOk = FALSE;
+                bOk = sal_False;
             }
         }
 
@@ -4158,10 +4158,10 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
 
     if (rData.pDrawTransfer)
     {
-        USHORT nFlags = rData.pDrawTransfer->GetDragSourceFlags();
+        sal_uInt16 nFlags = rData.pDrawTransfer->GetDragSourceFlags();
 
-        BOOL bIsNavi = ( nFlags & SC_DROP_NAVIGATOR ) != 0;
-        BOOL bIsMove = ( rEvt.mnAction == DND_ACTION_MOVE && !bIsNavi );
+        sal_Bool bIsNavi = ( nFlags & SC_DROP_NAVIGATOR ) != 0;
+        sal_Bool bIsMove = ( rEvt.mnAction == DND_ACTION_MOVE && !bIsNavi );
 
         bPasteIsMove = bIsMove;
 
@@ -4169,7 +4169,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
 
         if (bPasteIsMove)
             rData.pDrawTransfer->SetDragWasInternal();
-        bPasteIsMove = FALSE;
+        bPasteIsMove = sal_False;
 
         return rEvt.mnAction;
     }
@@ -4192,7 +4192,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
         }
     }
 
-    BOOL bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
+    sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
 
     ScDocument* pThisDoc = pViewData->GetDocument();
     SdrObject* pHitObj = pThisDoc->GetObjectAtPoint( pViewData->GetTabNo(), PixelToLogic(aPos) );
@@ -4200,23 +4200,23 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
     {
         //	dropped on drawing object
         //	PasteOnDrawObject checks for valid formats
-        if ( pViewData->GetView()->PasteOnDrawObject( rEvt.maDropEvent.Transferable, pHitObj, TRUE ) )
+        if ( pViewData->GetView()->PasteOnDrawObject( rEvt.maDropEvent.Transferable, pHitObj, sal_True ) )
             return rEvt.mnAction;
     }
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
-    ULONG nFormatId = bIsLink ?
+    sal_uLong nFormatId = bIsLink ?
                         lcl_GetDropLinkId( rEvt.maDropEvent.Transferable ) :
                         lcl_GetDropFormatId( rEvt.maDropEvent.Transferable );
     if ( nFormatId )
     {
-        pScMod->SetInExecuteDrop( TRUE );   // #i28468# prevent error messages from PasteDataFormat
-        bPasteIsDrop = TRUE;
+        pScMod->SetInExecuteDrop( sal_True );   // #i28468# prevent error messages from PasteDataFormat
+        bPasteIsDrop = sal_True;
         bDone = pViewData->GetView()->PasteDataFormat(
                     nFormatId, rEvt.maDropEvent.Transferable, nPosX, nPosY, &aLogicPos, bIsLink );
-        bPasteIsDrop = FALSE;
-        pScMod->SetInExecuteDrop( FALSE );
+        bPasteIsDrop = sal_False;
+        pScMod->SetInExecuteDrop( sal_False );
     }
 
     sal_Int8 nRet = bDone ? rEvt.mnAction : DND_ACTION_NONE;
@@ -4255,7 +4255,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
 
                 //	#96821# bSameDocClipboard argument for PasteDraw is needed
                 //	because only DragData is checked directly inside PasteDraw
-                pViewData->GetView()->PasteDraw( aLogicPos, pDrawTransfer->GetModel(), FALSE,
+                pViewData->GetView()->PasteDraw( aLogicPos, pDrawTransfer->GetModel(), sal_False,
                             pDrawTransfer->GetSourceDocID() == pViewData->GetDocument()->GetDocumentID() );
             }
         }
@@ -4268,12 +4268,12 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
         uno::Reference<datatransfer::XTransferable> xTransferable = aDataHelper.GetTransferable();
         if ( xTransferable.is() )
         {
-            ULONG nFormatId = lcl_GetDropFormatId( xTransferable, true );
+            sal_uLong nFormatId = lcl_GetDropFormatId( xTransferable, true );
             if ( nFormatId )
             {
-                bPasteIsDrop = TRUE;
+                bPasteIsDrop = sal_True;
                 pViewData->GetView()->PasteDataFormat( nFormatId, xTransferable, nPosX, nPosY, &aLogicPos );
-                bPasteIsDrop = FALSE;
+                bPasteIsDrop = sal_False;
             }
         }
     }
@@ -4294,10 +4294,10 @@ void ScGridWindow::UpdateEditViewPos()
 
         //	hide EditView?
 
-        BOOL bHide = ( nEndCol<pViewData->GetPosX(eHWhich) || nEndRow<pViewData->GetPosY(eVWhich) );
+        sal_Bool bHide = ( nEndCol<pViewData->GetPosX(eHWhich) || nEndRow<pViewData->GetPosY(eVWhich) );
         if ( SC_MOD()->IsFormulaMode() )
             if ( pViewData->GetTabNo() != pViewData->GetRefTabNo() )
-                bHide = TRUE;
+                bHide = sal_True;
 
         if (bHide)
         {
@@ -4311,8 +4311,8 @@ void ScGridWindow::UpdateEditViewPos()
         }
         else
         {
-            // bForceToTop = TRUE for editing
-            Rectangle aPixRect = pViewData->GetEditArea( eWhich, nCol, nRow, this, NULL, TRUE );
+            // bForceToTop = sal_True for editing
+            Rectangle aPixRect = pViewData->GetEditArea( eWhich, nCol, nRow, this, NULL, sal_True );
             Point aScrPos = PixelToLogic( aPixRect.TopLeft(), pViewData->GetLogicMode() );
 
             Rectangle aRect = pView->GetOutputArea();
@@ -4328,8 +4328,8 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY )
     ClickExtern();
     HideNoteMarker();
 
-    bIsInScroll = TRUE;
-    //BOOL bXor=DrawBeforeScroll();
+    bIsInScroll = sal_True;
+    //sal_Bool bXor=DrawBeforeScroll();
 
     SetMapMode(MAP_PIXEL);
     Scroll( nDifX, nDifY, SCROLL_CHILDREN );
@@ -4338,7 +4338,7 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY )
     UpdateEditViewPos();
 
     DrawAfterScroll(); //bXor);
-    bIsInScroll = FALSE;
+    bIsInScroll = sal_False;
 }
 
 // 	Formeln neu zeichnen -------------------------------------------------
@@ -4353,7 +4353,7 @@ void ScGridWindow::UpdateFormulas()
         //	nicht anfangen, verschachtelt zu painten
         //	(dann wuerde zumindest der MapMode nicht mehr stimmen)
 
-        bNeedsRepaint = TRUE;			// -> am Ende vom Paint nochmal Invalidate auf alles
+        bNeedsRepaint = sal_True;			// -> am Ende vom Paint nochmal Invalidate auf alles
         aRepaintPixel = Rectangle();	// alles
         return;
     }
@@ -4380,7 +4380,7 @@ void ScGridWindow::UpdateFormulas()
 
     Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich );
     long nMirrorWidth = GetSizePixel().Width();
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
     // unused variable long nLayoutSign = bLayoutRTL ? -1 : 1;
     if ( bLayoutRTL )
     {
@@ -4396,7 +4396,7 @@ void ScGridWindow::UpdateFormulas()
     double nPPTY = pViewData->GetPPTY();
 
     ScTableInfo aTabInfo;
-    pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab, nPPTX, nPPTY, FALSE, FALSE );
+    pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab, nPPTX, nPPTY, sal_False, sal_False );
 
     Fraction aZoomX = pViewData->GetZoomX();
     Fraction aZoomY = pViewData->GetZoomY();
@@ -4416,7 +4416,7 @@ void ScGridWindow::UpdateFormulas()
     CheckNeedsRepaint();    // #i90362# used to be called via Draw() - still needed here
 }
 
-void ScGridWindow::UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange)
+void ScGridWindow::UpdateAutoFillMark(sal_Bool bMarked, const ScRange& rMarkRange)
 {
     if ( bMarked != bAutoMarkVisible || ( bMarked && rMarkRange.aEnd != aAutoMarkPos ) )
     {
@@ -4430,9 +4430,9 @@ void ScGridWindow::UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange)
     }
 }
 
-void ScGridWindow::UpdateListValPos( BOOL bVisible, const ScAddress& rPos )
+void ScGridWindow::UpdateListValPos( sal_Bool bVisible, const ScAddress& rPos )
 {
-    BOOL bOldButton = bListValButton;
+    sal_Bool bOldButton = bListValButton;
     ScAddress aOldPos = aListValPos;
 
     bListValButton = bVisible;
@@ -4489,7 +4489,7 @@ void __EXPORT ScGridWindow::GetFocus()
 {
     ScTabViewShell* pViewShell = pViewData->GetViewShell();
     pViewShell->GotFocus();
-    pViewShell->SetFormShellAtTop( FALSE );     // focus in GridWindow -> FormShell no longer on top
+    pViewShell->SetFormShellAtTop( sal_False );     // focus in GridWindow -> FormShell no longer on top
 
     if (pViewShell->HasAccessibilityObjects())
         pViewShell->BroadcastAccessibility(ScAccGridWinFocusGotHint(eWhich, GetAccessible()));
@@ -4522,10 +4522,10 @@ Point ScGridWindow::GetMousePosPixel() const  { return aCurMousePos; }
 
 //------------------------------------------------------------------------
 
-BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
-                                USHORT* pIndex, SCsCOL* pAddX, SCsROW* pAddY )
+sal_Bool ScGridWindow::HitRangeFinder( const Point& rMouse, sal_Bool& rCorner,
+                                sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY )
 {
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     ScInputHandler* pHdl = SC_MOD()->GetInputHdl( pViewData->GetViewShell() );
     if (pHdl)
     {
@@ -4535,7 +4535,7 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
         {
             ScDocument* pDoc = pViewData->GetDocument();
             SCTAB nTab = pViewData->GetTabNo();
-            BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+            sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
             long nLayoutSign = bLayoutRTL ? -1 : 1;
 
             SCsCOL nPosX;
@@ -4546,25 +4546,25 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
 
 //			Point aNext = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich );
 
-            Point aNext = pViewData->GetScrPos( nPosX, nPosY, eWhich, TRUE );
+            Point aNext = pViewData->GetScrPos( nPosX, nPosY, eWhich, sal_True );
             long nSizeXPix;
             long nSizeYPix;
             pViewData->GetMergeSizePixel( nPosX, nPosY, nSizeXPix, nSizeYPix );
             aNext.X() += nSizeXPix * nLayoutSign;
             aNext.Y() += nSizeYPix;
 
-            BOOL bCornerHor;
+            sal_Bool bCornerHor;
             if ( bLayoutRTL )
                 bCornerHor = ( rMouse.X() >= aNext.X() && rMouse.X() <= aNext.X() + 8 );
             else
                 bCornerHor = ( rMouse.X() >= aNext.X() - 8 && rMouse.X() <= aNext.X() );
 
-            BOOL bCellCorner = ( bCornerHor &&
+            sal_Bool bCellCorner = ( bCornerHor &&
                                  rMouse.Y() >= aNext.Y() - 8 && rMouse.Y() <= aNext.Y() );
             //	corner is hit only if the mouse is within the cell
 
-            USHORT nCount = (USHORT)pRangeFinder->Count();
-            for (USHORT i=nCount; i;)
+            sal_uInt16 nCount = (sal_uInt16)pRangeFinder->Count();
+            for (sal_uInt16 i=nCount; i;)
             {
                 //	rueckwaerts suchen, damit der zuletzt gepaintete Rahmen gefunden wird
                 --i;
@@ -4574,7 +4574,7 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
                     if (pIndex)	*pIndex = i;
                     if (pAddX)	*pAddX = nPosX - pData->aRef.aStart.Col();
                     if (pAddY)	*pAddY = nPosY - pData->aRef.aStart.Row();
-                    bFound = TRUE;
+                    bFound = sal_True;
                     rCorner = ( bCellCorner && aAddr == pData->aRef.aEnd );
                     break;
                 }
@@ -4590,7 +4590,7 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
 #define SCE_RIGHT	8
 #define SCE_ALL		15
 
-void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges )
+void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, sal_uInt16 nEdges )
 {
     //	der Range ist immer richtigherum
 
@@ -4600,19 +4600,19 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
     SCCOL nCol2 = rRange.aEnd.Col();
     SCROW nRow2 = rRange.aEnd.Row();
     SCTAB nTab2 = rRange.aEnd.Tab();
-    BOOL bHiddenEdge = FALSE;
+    sal_Bool bHiddenEdge = sal_False;
     SCROW nTmp;
 
     ScDocument* pDoc = pDocSh->GetDocument();
     while ( nCol1 > 0 && pDoc->ColHidden(nCol1, nTab1) )
     {
         --nCol1;
-        bHiddenEdge = TRUE;
+        bHiddenEdge = sal_True;
     }
     while ( nCol2 < MAXCOL && pDoc->ColHidden(nCol2, nTab1) )
     {
         ++nCol2;
-        bHiddenEdge = TRUE;
+        bHiddenEdge = sal_True;
     }
     nTmp = pDoc->FirstVisibleRow(0, nRow1, nTab1);
     if (!ValidRow(nTmp))
@@ -4620,7 +4620,7 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
     if (nTmp < nRow1)
     {
         nRow1 = nTmp;
-        bHiddenEdge = TRUE;
+        bHiddenEdge = sal_True;
     }
     nTmp = pDoc->FirstVisibleRow(nRow2, MAXROW, nTab1);
     if (!ValidRow(nTmp))
@@ -4628,7 +4628,7 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
     if (nTmp > nRow2)
     {
         nRow2 = nTmp;
-        bHiddenEdge = TRUE;
+        bHiddenEdge = sal_True;
     }
 
     if ( nCol2 > nCol1 + 1 && nRow2 > nRow1 + 1 && !bHiddenEdge )
@@ -4724,7 +4724,7 @@ void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRan
     }
 }
 
-void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
+void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, sal_Bool bUp )
 {
     ScInputHandler* pHdl = SC_MOD()->GetInputHdl( pViewData->GetViewShell() );
     if (!pHdl)
@@ -4745,7 +4745,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
 
     //	Scrolling
 
-    BOOL bTimer = FALSE;
+    sal_Bool bTimer = sal_False;
     Point aPos = rMEvt.GetPosPixel();
     SCsCOL nDx = 0;
     SCsROW nDy = 0;
@@ -4760,7 +4760,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
     {
         if ( nDx != 0) pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) );
         if ( nDy != 0 ) pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) );
-        bTimer = TRUE;
+        bTimer = sal_True;
     }
 
     //	Umschalten bei Fixierung (damit Scrolling funktioniert)
@@ -4852,13 +4852,13 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
 
 //------------------------------------------------------------------------
 
-BOOL ScGridWindow::GetEditUrl( const Point& rPos,
+sal_Bool ScGridWindow::GetEditUrl( const Point& rPos,
                                 String* pName, String* pUrl, String* pTarget )
 {
-    return GetEditUrlOrError( FALSE, rPos, pName, pUrl, pTarget );
+    return GetEditUrlOrError( sal_False, rPos, pName, pUrl, pTarget );
 }
 
-BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
+sal_Bool ScGridWindow::GetEditUrlOrError( sal_Bool bSpellErr, const Point& rPos,
                                 String* pName, String* pUrl, String* pTarget )
 {
     //!	nPosX/Y mit uebergeben?
@@ -4871,24 +4871,24 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
     ScDocument* pDoc = pDocSh->GetDocument();
     ScBaseCell* pCell = NULL;
 
-    BOOL bFound = lcl_GetHyperlinkCell( pDoc, nPosX, nPosY, nTab, pCell );
+    sal_Bool bFound = lcl_GetHyperlinkCell( pDoc, nPosX, nPosY, nTab, pCell );
     if( !bFound )
-        return FALSE;
+        return sal_False;
 
     ScHideTextCursor aHideCursor( pViewData, eWhich );	// before GetEditArea (MapMode is changed)
 
     const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab );
-    // bForceToTop = FALSE, use the cell's real position
-    Rectangle aEditRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, FALSE );
+    // bForceToTop = sal_False, use the cell's real position
+    Rectangle aEditRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, sal_False );
     if (rPos.Y() < aEditRect.Top())
-        return FALSE;
+        return sal_False;
 
         //	vertikal kann (noch) nicht angeklickt werden:
 
     if (pPattern->GetCellOrientation() != SVX_ORIENTATION_STANDARD)
-        return FALSE;
+        return sal_False;
 
-    BOOL bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() ||
+    sal_Bool bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() ||
                     ((SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern->
                         GetItem( ATTR_HOR_JUSTIFY )).GetValue() == SVX_HOR_JUSTIFY_BLOCK);
     SvxCellHorJustify eHorJust = (SvxCellHorJustify)((SvxHorJustifyItem&)pPattern->
@@ -4989,11 +4989,11 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
     Point aLogicClick = PixelToLogic(rPos,aEditMode);
     if ( aLogicEdit.IsInside(aLogicClick) )
     {
-//		aEngine.SetUpdateMode(FALSE);
+//		aEngine.SetUpdateMode(sal_False);
         EditView aTempView( &aEngine, this );
         aTempView.SetOutputArea( aLogicEdit );
 
-        BOOL bRet = FALSE;
+        sal_Bool bRet = sal_False;
         MapMode aOld = GetMapMode();
         SetMapMode(aEditMode);					// kein return mehr
 
@@ -5022,7 +5022,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
                         if (pTarget)
                             *pTarget = pURLField->GetTargetFrame();
                     }
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
             }
         }
@@ -5033,22 +5033,22 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
 
         return bRet;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange )
+sal_Bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange )
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
     SCTAB nTabCount = pDoc->GetTableCount();
     if ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) && !pDoc->IsScenario(nTab) )
     {
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
         Size aButSize = pViewData->GetScenButSize();
         long nBWidth  = aButSize.Width();
         if (!nBWidth)
-            return FALSE;					// noch kein Button gezeichnet -> da ist auch keiner
+            return sal_False;					// noch kein Button gezeichnet -> da ist auch keiner
         long nBHeight = aButSize.Height();
         long nHSpace  = (long)( SC_SCENARIO_HSPACE * pViewData->GetPPTX() );
 
@@ -5056,31 +5056,31 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang
 
         ScMarkData aMarks;
         for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++)
-            pDoc->MarkScenario( i, nTab, aMarks, FALSE, SC_SCENARIO_SHOWFRAME );
+            pDoc->MarkScenario( i, nTab, aMarks, sal_False, SC_SCENARIO_SHOWFRAME );
         ScRangeList aRanges;
-        aMarks.FillRangeListWithMarks( &aRanges, FALSE );
+        aMarks.FillRangeListWithMarks( &aRanges, sal_False );
 
 
-        ULONG nRangeCount = aRanges.Count();
-        for (ULONG j=0; j<nRangeCount; j++)
+        sal_uLong nRangeCount = aRanges.Count();
+        for (sal_uLong j=0; j<nRangeCount; j++)
         {
             ScRange aRange = *aRanges.GetObject(j);
             //	Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn
             //	dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden
             pDoc->ExtendTotalMerge( aRange );
 
-            BOOL bTextBelow = ( aRange.aStart.Row() == 0 );
+            sal_Bool bTextBelow = ( aRange.aStart.Row() == 0 );
 
             Point aButtonPos;
             if ( bTextBelow )
             {
                 aButtonPos = pViewData->GetScrPos( aRange.aEnd.Col()+1, aRange.aEnd.Row()+1,
-                                                    eWhich, TRUE );
+                                                    eWhich, sal_True );
             }
             else
             {
                 aButtonPos = pViewData->GetScrPos( aRange.aEnd.Col()+1, aRange.aStart.Row(),
-                                                    eWhich, TRUE );
+                                                    eWhich, sal_True );
                 aButtonPos.Y() -= nBHeight;
             }
             if ( bLayoutRTL )
@@ -5092,12 +5092,12 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang
             if ( aButRect.IsInside( rPosPixel ) )
             {
                 rScenRange = aRange;
-                return TRUE;
+                return sal_True;
             }
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // #114409#
@@ -5183,11 +5183,11 @@ void ScGridWindow::UpdateCursorOverlay()
     ScDocument* pDoc = pViewData->GetDocument();
     const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab);
     const ScMergeFlagAttr& rMergeFlag = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG);
-    BOOL bOverlapped = rMergeFlag.IsOverlapped();
+    sal_Bool bOverlapped = rMergeFlag.IsOverlapped();
 
     //  left or above of the screen?
 
-    BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
+    sal_Bool bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
     if (!bVis)
     {
         SCCOL nEndX = nX;
@@ -5202,12 +5202,12 @@ void ScGridWindow::UpdateCursorOverlay()
 
     if ( bVis && !bOverlapped && !pViewData->HasEditView(eWhich) && pViewData->IsActive() )
     {
-        Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
         //  completely right of/below the screen?
         //  (test with logical start position in aScrPos)
-        BOOL bMaybeVisible;
+        sal_Bool bMaybeVisible;
         if ( bLayoutRTL )
             bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 );
         else
@@ -5224,7 +5224,7 @@ void ScGridWindow::UpdateCursorOverlay()
             if ( bLayoutRTL )
                 aScrPos.X() -= nSizeXPix - 2;       // move instead of mirroring
 
-            BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ||
+            sal_Bool bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ||
                             pViewData->GetVSplitMode() == SC_SPLIT_FIX );
             if ( pViewData->GetActivePart()==eWhich || bFix )
             {
@@ -5381,9 +5381,9 @@ void ScGridWindow::UpdateAutoFillOverlay()
 
         SCTAB nTab = pViewData->GetTabNo();
         ScDocument* pDoc = pViewData->GetDocument();
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
-        Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
+        Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True );
         long nSizeXPix;
         long nSizeYPix;
         pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
@@ -5470,7 +5470,7 @@ void ScGridWindow::UpdateDragRectOverlay()
         double nPPTY = pViewData->GetPPTY();
         SCCOLROW i;
 
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
         long nLayoutSign = bLayoutRTL ? -1 : 1;
 
         if (ValidCol(nX2) && nX2>=nX1)
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index ef787e049..ebaf62e9f 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -85,7 +85,7 @@ DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW
     if (!pDPObj)
         return DataPilotFieldOrientation_HIDDEN;
 
-    USHORT nOrient = DataPilotFieldOrientation_HIDDEN;
+    sal_uInt16 nOrient = DataPilotFieldOrientation_HIDDEN;
 
     // Check for page field first.
     if (nCol > 0)
@@ -94,7 +94,7 @@ DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW
         long nField = pDPObj->GetHeaderDim( ScAddress( nCol-1, nRow, nTab ), nOrient );
         if ( nField >= 0 && nOrient == DataPilotFieldOrientation_PAGE )
         {
-            BOOL bIsDataLayout = FALSE;
+            sal_Bool bIsDataLayout = sal_False;
             String aFieldName = pDPObj->GetDimName( nField, bIsDataLayout );
             if ( aFieldName.Len() && !bIsDataLayout )
                 return DataPilotFieldOrientation_PAGE;
@@ -107,7 +107,7 @@ DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW
     long nField = pDPObj->GetHeaderDim(ScAddress(nCol, nRow, nTab), nOrient);
     if (nField >= 0 && (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW) )
     {
-        BOOL bIsDataLayout = FALSE;
+        sal_Bool bIsDataLayout = sal_False;
         String aFieldName = pDPObj->GetDimName(nField, bIsDataLayout);
         if (aFieldName.Len() && !bIsDataLayout)
             return static_cast<DataPilotFieldOrientation>(nOrient);
@@ -117,14 +117,14 @@ DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW
 }
 
 // private method for mouse button handling
-BOOL ScGridWindow::DoPageFieldSelection( SCCOL nCol, SCROW nRow )
+sal_Bool ScGridWindow::DoPageFieldSelection( SCCOL nCol, SCROW nRow )
 {
     if (GetDPFieldOrientation( nCol, nRow ) == sheet::DataPilotFieldOrientation_PAGE)
     {
         LaunchPageFieldMenu( nCol, nRow );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt )
@@ -135,7 +135,7 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent&
     Point aDiffPix = rMEvt.GetPosPixel();
 
     aDiffPix -= aScrPos;
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
     if ( bLayoutRTL )
         aDiffPix.X() = -aDiffPix.X();
 
@@ -180,12 +180,12 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
 
     if (pDPObj)
     {
-        USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
+        sal_uInt16 nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
         ScAddress aPos( nCol, nRow, nTab );
         long nField = pDPObj->GetHeaderDim( aPos, nOrient );
         if ( nField >= 0 )
         {
-            bDPMouse   = TRUE;
+            bDPMouse   = sal_True;
             nDPField   = nField;
             pDragDPObj = pDPObj;
 
@@ -197,7 +197,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
                 return;
             }
 
-            DPTestMouse( rMEvt, TRUE );
+            DPTestMouse( rMEvt, sal_True );
             StartTracking();
         }
         else if ( pDPObj->IsFilterButton(aPos) )
@@ -240,7 +240,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
                 ScDPObject aNewObj( *pDPObj );
                 aNewObj.SetSheetDesc( aNewDesc );
                 ScDBDocFunc aFunc( *pViewData->GetDocShell() );
-                aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE );
+                aFunc.DataPilotUpdate( pDPObj, &aNewObj, sal_True, sal_False );
                 pViewData->GetView()->CursorPosChanged();		// shells may be switched
             }
             delete pDlg;
@@ -259,14 +259,14 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
 //	Data Pilot interaction
 //
 
-void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
+void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, sal_Bool bMove )
 {
     DBG_ASSERT(pDragDPObj, "pDragDPObj missing");
 
     //	scroll window if at edges
     //!	move this to separate method
 
-    BOOL bTimer = FALSE;
+    sal_Bool bTimer = sal_False;
     Point aPixel = rMEvt.GetPosPixel();
 
     SCsCOL nDx = 0;
@@ -282,14 +282,14 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
         nDy = 1;
     if ( nDx != 0 || nDy != 0 )
     {
-        UpdateDragRect( FALSE, Rectangle() );
+        UpdateDragRect( sal_False, Rectangle() );
 
         if ( nDx  != 0)
             pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) );
         if ( nDy != 0 )
             pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) );
 
-        bTimer = TRUE;
+        bTimer = sal_True;
     }
 
     //	---
@@ -297,20 +297,20 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
     SCsCOL	nPosX;
     SCsROW	nPosY;
     pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), eWhich, nPosX, nPosY );
-    BOOL	bMouseLeft;
-    BOOL	bMouseTop;
+    sal_Bool	bMouseLeft;
+    sal_Bool	bMouseTop;
     pViewData->GetMouseQuadrant( aPixel, eWhich, nPosX, nPosY, bMouseLeft, bMouseTop );
 
     ScAddress aPos( nPosX, nPosY, pViewData->GetTabNo() );
 
     Rectangle aPosRect;
-    USHORT nOrient;
+    sal_uInt16 nOrient;
     long nDimPos;
-    BOOL bHasRange = pDragDPObj->GetHeaderDrag( aPos, bMouseLeft, bMouseTop, nDPField,
+    sal_Bool bHasRange = pDragDPObj->GetHeaderDrag( aPos, bMouseLeft, bMouseTop, nDPField,
                                                 aPosRect, nOrient, nDimPos );
     UpdateDragRect( bHasRange && bMove, aPosRect );
 
-    BOOL bIsDataLayout;
+    sal_Bool bIsDataLayout;
     sal_Int32 nDimFlags = 0;
     String aDimName = pDragDPObj->GetDimName( nDPField, bIsDataLayout, &nDimFlags );
     bool bAllowed = !bHasRange || ScDPObject::IsOrientationAllowed( nOrient, nDimFlags );
@@ -359,7 +359,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
             aNewObj.SetSaveData( aSaveData );
             ScDBDocFunc aFunc( *pViewData->GetDocShell() );
             // when dragging fields, allow re-positioning (bAllowMove)
-            aFunc.DataPilotUpdate( pDragDPObj, &aNewObj, TRUE, FALSE, TRUE );
+            aFunc.DataPilotUpdate( pDragDPObj, &aNewObj, sal_True, sal_False, sal_True );
             pViewData->GetView()->CursorPosChanged();		// shells may be switched
         }
     }
@@ -372,7 +372,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
 
 bool ScGridWindow::DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj)
 {
-    BOOL bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
+    sal_Bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
 
     // Get the geometry of the cell.
     Point aScrPos = pViewData->GetScrPos(rPos.Col(), rPos.Row(), eWhich);
@@ -464,7 +464,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
     pDPObj->FillLabelData(pDPData->maDPParam);
     pDPData->mpDPObj = pDPObj;
 
-    USHORT nOrient;
+    sal_uInt16 nOrient;
     pDPData->mnDim = pDPObj->GetHeaderDim(rPos, nOrient);
 
     if (pDPData->maDPParam.maLabelArray.size() <= static_cast<size_t>(pDPData->mnDim))
@@ -524,7 +524,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
         }
     }
 
-    BOOL bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
+    sal_Bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
 
     Rectangle aCellRect(rScrPos, rScrSize);
     const Size& rPopupSize = mpDPFieldPopup->getWindowSize();
@@ -561,7 +561,7 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu()
     aNewDPObj.BuildAllDimensionMembers();
     ScDPSaveData* pSaveData = aNewDPObj.GetSaveData();
 
-    BOOL bIsDataLayout;
+    sal_Bool bIsDataLayout;
     String aDimName = pDPObj->GetDimName(pDPData->mnDim, bIsDataLayout);
     ScDPSaveDimension* pDim = pSaveData->GetDimensionByName(aDimName);
     if (!pDim)
@@ -599,21 +599,21 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu()
 
 void ScGridWindow::DPMouseMove( const MouseEvent& rMEvt )
 {
-    DPTestMouse( rMEvt, TRUE );
+    DPTestMouse( rMEvt, sal_True );
 }
 
 void ScGridWindow::DPMouseButtonUp( const MouseEvent& rMEvt )
 {
-    bDPMouse = FALSE;
+    bDPMouse = sal_False;
     ReleaseMouse();
 
-    DPTestMouse( rMEvt, FALSE );
+    DPTestMouse( rMEvt, sal_False );
     SetPointer( Pointer( POINTER_ARROW ) );
 }
 
 // -----------------------------------------------------------------------
 
-void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect )
+void ScGridWindow::UpdateDragRect( sal_Bool bShowRange, const Rectangle& rPosRect )
 {
     SCCOL nStartX = ( rPosRect.Left()   >= 0 ) ? static_cast<SCCOL>(rPosRect.Left())   : SCCOL_MAX;
     SCROW nStartY = ( rPosRect.Top()    >= 0 ) ? static_cast<SCROW>(rPosRect.Top())    : SCROW_MAX;
@@ -627,18 +627,18 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect )
     }
 
     // if ( bDragRect )
-    //	DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE );
+    //	DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, sal_False );
     if ( bShowRange )
     {
         nDragStartX = nStartX;
         nDragStartY = nStartY;
         nDragEndX = nEndX;
         nDragEndY = nEndY;
-        bDragRect = TRUE;
-        // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE );
+        bDragRect = sal_True;
+        // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, sal_False );
     }
     else
-        bDragRect = FALSE;
+        bDragRect = sal_False;
 
     UpdateDragRectOverlay();
 }
@@ -647,10 +647,10 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect )
 
 //	Page-Break-Modus
 
-USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
+sal_uInt16 ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
                                     SCCOLROW* pBreak, SCCOLROW* pPrev )
 {
-    USHORT nFound = SC_PD_NONE;		// 0
+    sal_uInt16 nFound = SC_PD_NONE;		// 0
     ScRange aSource;
     SCCOLROW nBreak = 0;
     SCCOLROW nPrev = 0;
@@ -658,8 +658,8 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
     ScPageBreakData* pPageData = pViewData->GetView()->GetPageBreakData();
     if ( pPageData )
     {
-        BOOL bHori = FALSE;
-        BOOL bVert = FALSE;
+        sal_Bool bHori = sal_False;
+        sal_Bool bVert = sal_False;
         SCCOL nHitX = 0;
         SCROW nHitY = 0;
 
@@ -674,38 +674,38 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
         //	Horizontal mehr Toleranz als vertikal, weil mehr Platz ist
         if ( nMouseX <= aTL.X() + 4 )
         {
-            bHori = TRUE;
+            bHori = sal_True;
             nHitX = nPosX;
         }
         else if ( nMouseX >= aBR.X() - 6 )
         {
-            bHori = TRUE;
+            bHori = sal_True;
             nHitX = nPosX+1;					// linker Rand der naechsten Zelle
         }
         if ( nMouseY <= aTL.Y() + 2 )
         {
-            bVert = TRUE;
+            bVert = sal_True;
             nHitY = nPosY;
         }
         else if ( nMouseY >= aBR.Y() - 4 )
         {
-            bVert = TRUE;
+            bVert = sal_True;
             nHitY = nPosY+1;					// oberer Rand der naechsten Zelle
         }
 
         if ( bHori || bVert )
         {
-            USHORT nCount = sal::static_int_cast<USHORT>( pPageData->GetCount() );
-            for (USHORT nPos=0; nPos<nCount && !nFound; nPos++)
+            sal_uInt16 nCount = sal::static_int_cast<sal_uInt16>( pPageData->GetCount() );
+            for (sal_uInt16 nPos=0; nPos<nCount && !nFound; nPos++)
             {
                 ScPrintRangeData& rData = pPageData->GetData(nPos);
                 ScRange aRange = rData.GetPrintRange();
-                BOOL bLHit = ( bHori && nHitX == aRange.aStart.Col() );
-                BOOL bRHit = ( bHori && nHitX == aRange.aEnd.Col() + 1 );
-                BOOL bTHit = ( bVert && nHitY == aRange.aStart.Row() );
-                BOOL bBHit = ( bVert && nHitY == aRange.aEnd.Row() + 1 );
-                BOOL bInsideH = ( nPosX >= aRange.aStart.Col() && nPosX <= aRange.aEnd.Col() );
-                BOOL bInsideV = ( nPosY >= aRange.aStart.Row() && nPosY <= aRange.aEnd.Row() );
+                sal_Bool bLHit = ( bHori && nHitX == aRange.aStart.Col() );
+                sal_Bool bRHit = ( bHori && nHitX == aRange.aEnd.Col() + 1 );
+                sal_Bool bTHit = ( bVert && nHitY == aRange.aStart.Row() );
+                sal_Bool bBHit = ( bVert && nHitY == aRange.aEnd.Row() + 1 );
+                sal_Bool bInsideH = ( nPosX >= aRange.aStart.Col() && nPosX <= aRange.aEnd.Col() );
+                sal_Bool bInsideV = ( nPosY >= aRange.aStart.Row() && nPosY <= aRange.aEnd.Row() );
 
                 if ( bLHit )
                 {
@@ -779,14 +779,14 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
     return nFound;
 }
 
-void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
+void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, sal_Bool bUp )
 {
     //!	Scrolling und Umschalten mit RFMouseMove zusammenfassen !
     //!	(Weginvertieren vor dem Scrolling ist anders)
 
     //	Scrolling
 
-    BOOL bTimer = FALSE;
+    sal_Bool bTimer = sal_False;
     Point aPos = rMEvt.GetPosPixel();
     SCsCOL nDx = 0;
     SCsROW nDy = 0;
@@ -802,14 +802,14 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
         if ( bPagebreakDrawn )			// weginvertieren
         {
             // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
-            //				aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
-            bPagebreakDrawn = FALSE;
+            //				aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), sal_False );
+            bPagebreakDrawn = sal_False;
             UpdateDragRectOverlay();
         }
 
         if ( nDx != 0 ) pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) );
         if ( nDy != 0 ) pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) );
-        bTimer = TRUE;
+        bTimer = sal_True;
     }
 
     //	Umschalten bei Fixierung (damit Scrolling funktioniert)
@@ -841,14 +841,14 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
     SCsCOL nPosX;
     SCsROW nPosY;
     pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
-    BOOL bLeft, bTop;
+    sal_Bool bLeft, bTop;
     pViewData->GetMouseQuadrant( aPos, eWhich, nPosX, nPosY, bLeft, bTop );
     if ( !bLeft ) ++nPosX;
     if ( !bTop )  ++nPosY;
 
-    BOOL bBreak = ( nPagebreakMouse == SC_PD_BREAK_H || nPagebreakMouse == SC_PD_BREAK_V );
-    BOOL bHide = FALSE;
-    BOOL bToEnd = FALSE;
+    sal_Bool bBreak = ( nPagebreakMouse == SC_PD_BREAK_H || nPagebreakMouse == SC_PD_BREAK_V );
+    sal_Bool bHide = sal_False;
+    sal_Bool bToEnd = sal_False;
     ScRange aDrawRange = aPagebreakSource;
     if ( bBreak )
     {
@@ -862,7 +862,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                 aDrawRange.aEnd.SetCol( nPosX - 1 );
             }
             else
-                bHide = TRUE;
+                bHide = sal_True;
         }
         else
         {
@@ -874,7 +874,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                 aDrawRange.aEnd.SetRow( nPosY - 1 );
             }
             else
-                bHide = TRUE;
+                bHide = sal_True;
         }
     }
     else
@@ -888,18 +888,18 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
             if ( nPosX > 0 )
                 aDrawRange.aEnd.SetCol( nPosX-1 );
             else
-                bHide = TRUE;
+                bHide = sal_True;
         }
         if ( nPagebreakMouse & SC_PD_RANGE_B )
         {
             if ( nPosY > 0 )
                 aDrawRange.aEnd.SetRow( nPosY-1 );
             else
-                bHide = TRUE;
+                bHide = sal_True;
         }
         if ( aDrawRange.aStart.Col() > aDrawRange.aEnd.Col() ||
              aDrawRange.aStart.Row() > aDrawRange.aEnd.Row() )
-            bHide = TRUE;
+            bHide = sal_True;
     }
 
     if ( !bPagebreakDrawn || bUp || aDrawRange != aPagebreakDrag )
@@ -910,16 +910,16 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
         {
             // weginvertieren
             // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
-            //				aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
-            bPagebreakDrawn = FALSE;
+            //				aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), sal_False );
+            bPagebreakDrawn = sal_False;
         }
         aPagebreakDrag = aDrawRange;
         if ( !bUp && !bHide )
         {
             // hininvertieren
             // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
-            //				aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
-            bPagebreakDrawn = TRUE;
+            //				aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), sal_False );
+            bPagebreakDrawn = sal_True;
         }
         UpdateDragRectOverlay();
     }
@@ -932,11 +932,11 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
         ScDocShell* pDocSh = pViewData->GetDocShell();
         ScDocument* pDoc = pDocSh->GetDocument();
         SCTAB nTab = pViewData->GetTabNo();
-        BOOL bUndo (pDoc->IsUndoEnabled());
+        sal_Bool bUndo (pDoc->IsUndoEnabled());
 
         if ( bBreak )
         {
-            BOOL bColumn = ( nPagebreakMouse == SC_PD_BREAK_H );
+            sal_Bool bColumn = ( nPagebreakMouse == SC_PD_BREAK_H );
             SCCOLROW nNew = bColumn ? static_cast<SCCOLROW>(nPosX) : static_cast<SCCOLROW>(nPosY);
             if ( nNew != nPagebreakBreak )
             {
@@ -946,18 +946,18 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                     pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
                 }
 
-                BOOL bGrow = !bHide && nNew > nPagebreakBreak;
+                sal_Bool bGrow = !bHide && nNew > nPagebreakBreak;
                 if ( bColumn )
                 {
                     if (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakBreak), nTab) & BREAK_MANUAL)
                     {
                         ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab );
-                        pViewFunc->DeletePageBreak( TRUE, TRUE, &aOldAddr, FALSE );
+                        pViewFunc->DeletePageBreak( sal_True, sal_True, &aOldAddr, sal_False );
                     }
                     if ( !bHide && !bToEnd )	// am Ende nicht
                     {
                         ScAddress aNewAddr( static_cast<SCCOL>(nNew), nPosY, nTab );
-                        pViewFunc->InsertPageBreak( TRUE, TRUE, &aNewAddr, FALSE );
+                        pViewFunc->InsertPageBreak( sal_True, sal_True, &aNewAddr, sal_False );
                     }
                     if ( bGrow )
                     {
@@ -966,12 +966,12 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                         if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && !bManualBreak )
                         {
                             ScAddress aPrev( static_cast<SCCOL>(nPagebreakPrev), nPosY, nTab );
-                            pViewFunc->InsertPageBreak( TRUE, TRUE, &aPrev, FALSE );
+                            pViewFunc->InsertPageBreak( sal_True, sal_True, &aPrev, sal_False );
                         }
 
                         if (!pDocSh->AdjustPrintZoom( ScRange(
                                       static_cast<SCCOL>(nPagebreakPrev),0,nTab, static_cast<SCCOL>(nNew-1),0,nTab ) ))
-                            bGrow = FALSE;
+                            bGrow = sal_False;
                     }
                 }
                 else
@@ -979,12 +979,12 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                     if (pDoc->HasRowBreak(nPagebreakBreak, nTab) & BREAK_MANUAL)
                     {
                         ScAddress aOldAddr( nPosX, nPagebreakBreak, nTab );
-                        pViewFunc->DeletePageBreak( FALSE, TRUE, &aOldAddr, FALSE );
+                        pViewFunc->DeletePageBreak( sal_False, sal_True, &aOldAddr, sal_False );
                     }
                     if ( !bHide && !bToEnd )	// am Ende nicht
                     {
                         ScAddress aNewAddr( nPosX, nNew, nTab );
-                        pViewFunc->InsertPageBreak( FALSE, TRUE, &aNewAddr, FALSE );
+                        pViewFunc->InsertPageBreak( sal_False, sal_True, &aNewAddr, sal_False );
                     }
                     if ( bGrow )
                     {
@@ -993,12 +993,12 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
                         if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && !bManualBreak )
                         {
                             ScAddress aPrev( nPosX, nPagebreakPrev, nTab );
-                            pViewFunc->InsertPageBreak( FALSE, TRUE, &aPrev, FALSE );
+                            pViewFunc->InsertPageBreak( sal_False, sal_True, &aPrev, sal_False );
                         }
 
                         if (!pDocSh->AdjustPrintZoom( ScRange(
                                       0,nPagebreakPrev,nTab, 0,nNew-1,nTab ) ))
-                            bGrow = FALSE;
+                            bGrow = sal_False;
                     }
                 }
 
@@ -1009,7 +1009,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
 
                 if (!bGrow)		// sonst in AdjustPrintZoom schon passiert
                 {
-                    pViewFunc->UpdatePageBreakData( TRUE );
+                    pViewFunc->UpdatePageBreakData( sal_True );
                     pDocSh->SetDocumentModified();
                 }
             }
@@ -1019,10 +1019,10 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
             //	Druckbereich setzen
 
             String aNewRanges;
-            USHORT nOldCount = pDoc->GetPrintRangeCount( nTab );
+            sal_uInt16 nOldCount = pDoc->GetPrintRangeCount( nTab );
             if ( nOldCount )
             {
-                for (USHORT nPos=0; nPos<nOldCount; nPos++)
+                for (sal_uInt16 nPos=0; nPos<nOldCount; nPos++)
                 {
                     const ScRange* pOld = pDoc->GetPrintRange( nTab, nPos );
                     if ( pOld )
@@ -1044,7 +1044,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
             else if (!bHide)
                 aPagebreakDrag.Format( aNewRanges, SCA_VALID );
 
-            pViewFunc->SetPrintRanges( pDoc->IsPrintEntireSheet( nTab ), &aNewRanges, NULL, NULL, FALSE );
+            pViewFunc->SetPrintRanges( pDoc->IsPrintEntireSheet( nTab ), &aNewRanges, NULL, NULL, sal_False );
         }
     }
 
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 3be14273a..e939a3af2 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -53,9 +53,9 @@
 
 // -----------------------------------------------------------------------
 
-BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr();
     if (pDraw && !pViewData->IsRefMode())
     {
@@ -64,7 +64,7 @@ BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
         if ( pDraw->IsDetectiveHit( aLogicPos ) )
         {
             //	auf Detektiv-Pfeilen gar nichts (Doppelklick wird bei ButtonUp ausgewertet)
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else
         {
@@ -80,15 +80,15 @@ BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
     if ( pDrView && !rMEvt.IsLeft() && !bRet )
     {
         pDrView->BrkAction();
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return bRet;
 }
 
-BOOL ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt)
 {
     ScViewFunc* pView = pViewData->GetView();
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     FuPoor* pDraw = pView->GetDrawFuncPtr();
     if (pDraw && !pViewData->IsRefMode())
     {
@@ -102,7 +102,7 @@ BOOL ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt)
             ScDrawView* pDrView = pViewData->GetScDrawView();
             if ( pDrView )
             {
-                BOOL bReplaceAll = TRUE;
+                sal_Bool bReplaceAll = sal_True;
                 pDrView->SetAttrToMarked(*pDrawBrush, bReplaceAll);
             }
 
@@ -114,13 +114,13 @@ BOOL ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt)
     return bRet;
 }
 
-BOOL ScGridWindow::DrawMouseMove(const MouseEvent& rMEvt)
+sal_Bool ScGridWindow::DrawMouseMove(const MouseEvent& rMEvt)
 {
     FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr();
     if (pDraw && !pViewData->IsRefMode())
     {
         pDraw->SetWindow( this );
-        BOOL bRet = pDraw->MouseMove( rMEvt );
+        sal_Bool bRet = pDraw->MouseMove( rMEvt );
         if ( bRet )
             UpdateStatusPosSize();
         return bRet;
@@ -128,7 +128,7 @@ BOOL ScGridWindow::DrawMouseMove(const MouseEvent& rMEvt)
     else
     {
         SetPointer( Pointer( POINTER_ARROW ) );
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -145,44 +145,44 @@ void ScGridWindow::DrawEndAction()
     //	ReleaseMouse beim Aufruf
 }
 
-BOOL ScGridWindow::DrawCommand(const CommandEvent& rCEvt)
+sal_Bool ScGridWindow::DrawCommand(const CommandEvent& rCEvt)
 {
     ScDrawView* pDrView = pViewData->GetScDrawView();
     FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr();
     if (pDrView && pDraw && !pViewData->IsRefMode())
     {
         pDraw->SetWindow( this );
-        BYTE nUsed = pDraw->Command( rCEvt );
+        sal_uInt8 nUsed = pDraw->Command( rCEvt );
         if( nUsed == SC_CMD_USED )
             nButtonDown = 0;					// MouseButtonUp wird verschluckt...
         if( nUsed || pDrView->IsAction() )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt)
+sal_Bool ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt)
 {
     ScDrawView* pDrView = pViewData->GetScDrawView();
     FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr();
     if (pDrView && pDraw && !pViewData->IsRefMode())
     {
         pDraw->SetWindow( this );
-        BOOL bOldMarked = pDrView->AreObjectsMarked();
+        sal_Bool bOldMarked = pDrView->AreObjectsMarked();
         if (pDraw->KeyInput( rKEvt ))
         {
-            BOOL bLeaveDraw = FALSE;
-            BOOL bUsed = TRUE;
-            BOOL bNewMarked = pDrView->AreObjectsMarked();
+            sal_Bool bLeaveDraw = sal_False;
+            sal_Bool bUsed = sal_True;
+            sal_Bool bNewMarked = pDrView->AreObjectsMarked();
             if ( !pViewData->GetView()->IsDrawSelMode() )
                 if ( !bNewMarked )
                 {
-                    pViewData->GetViewShell()->SetDrawShell( FALSE );
-                    bLeaveDraw = TRUE;
+                    pViewData->GetViewShell()->SetDrawShell( sal_False );
+                    bLeaveDraw = sal_True;
                     if ( !bOldMarked &&
                         rKEvt.GetKeyCode().GetCode() == KEY_DELETE )
-                        bUsed = FALSE;					// nichts geloescht
+                        bUsed = sal_False;					// nichts geloescht
                 }
             if (!bLeaveDraw)
                 UpdateStatusPosSize();		// #108137# for moving/resizing etc. by keyboard
@@ -190,10 +190,10 @@ BOOL ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt)
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, ULONG nLayer )
+void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, sal_uLong nLayer )
 {
     // #109985#
     const ScViewOptions& rOpts = pViewData->GetOptions();
@@ -244,11 +244,11 @@ void ScGridWindow::DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pCo
     }
 }
 
-MapMode ScGridWindow::GetDrawMapMode( BOOL bForce )
+MapMode ScGridWindow::GetDrawMapMode( sal_Bool bForce )
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
 
     MapMode aDrawMode = pViewData->GetLogicMode();
 
@@ -286,11 +286,11 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce )
     return aDrawMode;
 }
 
-//BOOL ScGridWindow::DrawBeforeScroll()
+//sal_Bool ScGridWindow::DrawBeforeScroll()
 //{
 //	ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
 //
-//	BOOL bXor = FALSE;
+//	sal_Bool bXor = sal_False;
 //	if (pDrView)
 //	{
 //	    bXor=pDrView->IsShownXorVisible(this);
@@ -299,7 +299,7 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce )
 //	return bXor;
 //}
 
-void ScGridWindow::DrawAfterScroll(/*BOOL bVal*/)
+void ScGridWindow::DrawAfterScroll(/*sal_Bool bVal*/)
 {
     Update();		// immer, damit das Verhalten mit/ohne DrawingLayer gleich ist
 
@@ -311,7 +311,7 @@ void ScGridWindow::DrawAfterScroll(/*BOOL bVal*/)
 
         OutlinerView* pOlView = pDrView->GetTextEditOutlinerView();
         if (pOlView && pOlView->GetWindow() == this)
-            pOlView->ShowCursor(FALSE);					// ist beim Scrollen weggekommen
+            pOlView->ShowCursor(sal_False);					// ist beim Scrollen weggekommen
     }
 }
 
@@ -322,7 +322,7 @@ void ScGridWindow::DrawAfterScroll(/*BOOL bVal*/)
 //		pDrView->DrawMarks(this);
 //}
 
-//BOOL ScGridWindow::NeedDrawMarks()
+//sal_Bool ScGridWindow::NeedDrawMarks()
 //{
 //	ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
 //	return pDrView && pDrView->IsMarkHdlShown() && pDrView->AreObjectsMarked();
@@ -336,8 +336,8 @@ void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddres
         const ScViewOptions& rOpts = pViewData->GetOptions();
         if(rOpts.GetOption( VOPT_ANCHOR ))
         {
-            BOOL bNegativePage = pViewData->GetDocument()->IsNegativePage( pViewData->GetTabNo() );
-            Point aPos = pViewData->GetScrPos( rAddress.Col(), rAddress.Row(), eWhich, TRUE );
+            sal_Bool bNegativePage = pViewData->GetDocument()->IsNegativePage( pViewData->GetTabNo() );
+            Point aPos = pViewData->GetScrPos( rAddress.Col(), rAddress.Row(), eWhich, sal_True );
             aPos = PixelToLogic(aPos);
             rHdl.AddHdl(new SdrHdl(aPos, bNegativePage ? HDL_ANCHOR_TR : HDL_ANCHOR));
         }
@@ -374,7 +374,7 @@ void ScGridWindow::UpdateStatusPosSize()
     //	position and size of selected object(s) if something is selected,
     //	mouse position otherwise
 
-    BOOL bActionItem = FALSE;
+    sal_Bool bActionItem = sal_False;
     if ( pDrView->IsAction() )				// action rectangle
     {
         Rectangle aRect;
@@ -385,7 +385,7 @@ void ScGridWindow::UpdateStatusPosSize()
             aSet.Put( SfxPointItem( SID_ATTR_POSITION, aRect.TopLeft() ) );
             aSet.Put( SvxSizeItem( SID_ATTR_SIZE,
                     Size( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() ) ) );
-            bActionItem = TRUE;
+            bActionItem = sal_True;
         }
     }
     if ( !bActionItem )
@@ -410,10 +410,10 @@ void ScGridWindow::UpdateStatusPosSize()
     pViewData->GetBindings().SetState(aSet);
 }
 
-BOOL ScGridWindow::DrawHasMarkedObj()
+sal_Bool ScGridWindow::DrawHasMarkedObj()
 {
     ScDrawView* p = pViewData->GetScDrawView();
-    return p ? p->AreObjectsMarked() : FALSE;
+    return p ? p->AreObjectsMarked() : sal_False;
 }
 
 //void ScGridWindow::DrawStartTimer()
@@ -422,7 +422,7 @@ BOOL ScGridWindow::DrawHasMarkedObj()
     //if (pDrView)
     //{
         /* jetzt in DrawMarks
-        USHORT nWinNum = pDrView->FindWin(this);
+        sal_uInt16 nWinNum = pDrView->FindWin(this);
         if (nWinNum!=SDRVIEWWIN_NOTFOUND)
             pDrView->AfterInitRedraw(nWinNum);
         */
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 0c1dc2f47..5c5e65eaf 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -95,9 +95,9 @@ void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible )
 }
 
 void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel,
-                        const String& rTitle, const Color& rColor, BOOL bTextBelow,
+                        const String& rTitle, const Color& rColor, sal_Bool bTextBelow,
                         double nPPTX, double nPPTY, const Fraction& rZoomY,
-                        ScDocument* pDoc, ScViewData* pButtonViewData, BOOL bLayoutRTL )
+                        ScDocument* pDoc, ScViewData* pButtonViewData, sal_Bool bLayoutRTL )
 {
     //	pButtonViewData wird nur benutzt, um die Button-Groesse zu setzen,
     //	darf ansonsten NULL sein!
@@ -156,20 +156,20 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel,
     long nBHeight = nVer + aTextSize.Height() + 1;
     Size aButSize( nBWidth, nBHeight );
     long nButtonPos = bLayoutRTL ? aOuter.Left() : aOuter.Right()-nBWidth+1;
-    aComboButton.Draw( Point(nButtonPos, nButtonY), aButSize, FALSE );
+    aComboButton.Draw( Point(nButtonPos, nButtonY), aButSize, sal_False );
     if (pButtonViewData)
         pButtonViewData->SetScenButSize( aButSize );
 
     long nTextStart = bLayoutRTL ? aInner.Right() - aTextSize.Width() + 1 : aInner.Left();
 
-    BOOL bWasClip = FALSE;
+    sal_Bool bWasClip = sal_False;
     Region aOldClip;
-    BOOL bClip = ( aTextSize.Width() > aOuter.Right() - nBWidth - aInner.Left() );
+    sal_Bool bClip = ( aTextSize.Width() > aOuter.Right() - nBWidth - aInner.Left() );
     if ( bClip )
     {
         if (pDev->IsClipRegion())
         {
-            bWasClip = TRUE;
+            bWasClip = sal_True;
             aOldClip = pDev->GetActiveClipRegion();
         }
         long nClipStartX = bLayoutRTL ? aOuter.Left() + nBWidth : aInner.Left();
@@ -214,15 +214,15 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP
 
         ScMarkData aMarks;
         for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++)
-            pDoc->MarkScenario( i, nTab, aMarks, FALSE, SC_SCENARIO_SHOWFRAME );
+            pDoc->MarkScenario( i, nTab, aMarks, sal_False, SC_SCENARIO_SHOWFRAME );
         ScRangeListRef xRanges = new ScRangeList;
-        aMarks.FillRangeListWithMarks( xRanges, FALSE );
+        aMarks.FillRangeListWithMarks( xRanges, sal_False );
 
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
         long nLayoutSign = bLayoutRTL ? -1 : 1;
 
-        USHORT nRangeCount = (USHORT)xRanges->Count();
-        for (USHORT j=0; j<nRangeCount; j++)
+        sal_uInt16 nRangeCount = (sal_uInt16)xRanges->Count();
+        for (sal_uInt16 j=0; j<nRangeCount; j++)
         {
             ScRange aRange = *xRanges->GetObject(j);
             //	Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn
@@ -234,16 +234,16 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP
             if ( aRange.Intersects( aViewRange ) )			//! Platz fuer Text/Button?
             {
                 Point aStartPos = pViewData->GetScrPos(
-                                    aRange.aStart.Col(), aRange.aStart.Row(), eWhich, TRUE );
+                                    aRange.aStart.Col(), aRange.aStart.Row(), eWhich, sal_True );
                 Point aEndPos = pViewData->GetScrPos(
-                                    aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, TRUE );
+                                    aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, sal_True );
                 //	on the grid:
                 aStartPos.X() -= nLayoutSign;
                 aStartPos.Y() -= 1;
                 aEndPos.X() -= nLayoutSign;
                 aEndPos.Y() -= 1;
 
-                BOOL bTextBelow = ( aRange.aStart.Row() == 0 );
+                sal_Bool bTextBelow = ( aRange.aStart.Row() == 0 );
 
                 String aCurrent;
                 Color aColor( COL_LIGHTGRAY );
@@ -251,7 +251,7 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP
                     if ( pDoc->IsActiveScenario(nAct) && pDoc->HasScenarioRange(nAct,aRange) )
                     {
                         String aDummyComment;
-                        USHORT nDummyFlags;
+                        sal_uInt16 nDummyFlags;
                         pDoc->GetName( nAct, aCurrent );
                         pDoc->GetScenarioData( nAct, aDummyComment, aColor, nDummyFlags );
                     }
@@ -276,8 +276,8 @@ void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData,
                         ScHighlightRanges& rHighlightRanges )
 {
     SCTAB nTab = pViewData->GetTabNo();
-    ULONG nCount = rHighlightRanges.Count();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = rHighlightRanges.Count();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         ScHighlightEntry* pEntry = rHighlightRanges.GetObject( i );
         if (pEntry)
@@ -288,7 +288,7 @@ void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData,
                 rOutputData.DrawRefMark(
                                     aRange.aStart.Col(), aRange.aStart.Row(),
                                     aRange.aEnd.Col(), aRange.aEnd.Row(),
-                                    pEntry->aColor, FALSE );
+                                    pEntry->aColor, sal_False );
             }
         }
     }
@@ -358,7 +358,7 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect )
         }
         else
         {
-            bNeedsRepaint = TRUE;
+            bNeedsRepaint = sal_True;
             aRepaintPixel = LogicToPixel(rRect);	// nur betroffenen Bereich
         }
         return;
@@ -367,7 +367,7 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect )
     if (bIsInPaint)
         return;
 
-    bIsInPaint = TRUE;
+    bIsInPaint = sal_True;
 
     Rectangle aPixRect = LogicToPixel( rRect );
 
@@ -412,7 +412,7 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect )
 
     Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS );			// nicht weiterzeichnen
 
-    bIsInPaint = FALSE;
+    bIsInPaint = sal_False;
 }
 
 //
@@ -422,8 +422,8 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect )
 void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode )
 {
     ScModule* pScMod = SC_MOD();
-    BOOL bTextWysiwyg = pScMod->GetInputOptions().GetTextWysiwyg();
-    BOOL bGridFirst = TRUE;		//! entscheiden!!!
+    sal_Bool bTextWysiwyg = pScMod->GetInputOptions().GetTextWysiwyg();
+    sal_Bool bGridFirst = sal_True;		//! entscheiden!!!
 
     if (pViewData->IsMinimized())
         return;
@@ -472,7 +472,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
 
     Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich );
     long nMirrorWidth = GetSizePixel().Width();
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
     if ( bLayoutRTL )
     {
@@ -489,7 +489,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     SCCOL nCurEndX = nCurX;
     SCROW nCurEndY = nCurY;
     pDoc->ExtendMerge( nCurX, nCurY, nCurEndX, nCurEndY, nTab );
-    BOOL bCurVis = nCursorHideCount==0 &&
+    sal_Bool bCurVis = nCursorHideCount==0 &&
                     ( nCurEndX+1 >= nX1 && nCurX <= nX2+1 && nCurEndY+1 >= nY1 && nCurY <= nY2+1 );
 
     //	AutoFill-Anfasser
@@ -509,14 +509,14 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     double nPPTY = pViewData->GetPPTY();
 
     const ScViewOptions& rOpts = pViewData->GetOptions();
-    BOOL bFormulaMode = rOpts.GetOption( VOPT_FORMULAS );
-    BOOL bMarkClipped = rOpts.GetOption( VOPT_CLIPMARKS );
+    sal_Bool bFormulaMode = rOpts.GetOption( VOPT_FORMULAS );
+    sal_Bool bMarkClipped = rOpts.GetOption( VOPT_CLIPMARKS );
 
         // Datenblock
 
     ScTableInfo aTabInfo;
     pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab,
-                                        nPPTX, nPPTY, FALSE, bFormulaMode,
+                                        nPPTX, nPPTY, sal_False, bFormulaMode,
                                         &pViewData->GetMarkData() );
 
     //--------------------------------------------------------------------
@@ -530,7 +530,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     aOutputData.SetMirrorWidth( nMirrorWidth );			// needed for RTL
 
     std::auto_ptr< VirtualDevice > xFmtVirtDev;
-    BOOL bLogicText = bTextWysiwyg;                     // call DrawStrings in logic MapMode?
+    sal_Bool bLogicText = bTextWysiwyg;                     // call DrawStrings in logic MapMode?
 
     if ( bTextWysiwyg )
     {
@@ -549,11 +549,11 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
         xFmtVirtDev->SetMapMode( MAP_100TH_MM );
         aOutputData.SetFmtDevice( xFmtVirtDev.get() );
 
-        bLogicText = TRUE;                      // use logic MapMode
+        bLogicText = sal_True;                      // use logic MapMode
     }
 
     const svtools::ColorConfig& rColorCfg = pScMod->GetColorConfig();
-    Color aGridColor( rColorCfg.GetColorValue( svtools::CALCGRID, FALSE ).nColor );
+    Color aGridColor( rColorCfg.GetColorValue( svtools::CALCGRID, sal_False ).nColor );
     if ( aGridColor.GetColor() == COL_TRANSPARENT )
     {
         //	use view options' grid color only if color config has "automatic" color
@@ -567,21 +567,21 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     aOutputData.SetShowSpellErrors  ( pDoc->GetDocOptions().IsAutoSpell() );
     aOutputData.SetMarkClipped		( bMarkClipped );
 
-    aOutputData.SetUseStyleColor( TRUE );		// always set in table view
+    aOutputData.SetUseStyleColor( sal_True );		// always set in table view
 
     aOutputData.SetEditObject( GetEditObject() );
     aOutputData.SetViewShell( pViewData->GetViewShell() );
 
-    BOOL bGrid = rOpts.GetOption( VOPT_GRID );
-    BOOL bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
+    sal_Bool bGrid = rOpts.GetOption( VOPT_GRID );
+    sal_Bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
 
     if ( eMode == SC_UPDATE_CHANGED )
     {
         aOutputData.FindChanged();
-        aOutputData.SetSingleGrid(TRUE);
+        aOutputData.SetSingleGrid(sal_True);
     }
 
-    BOOL bPageMode = pViewData->IsPagebreakMode();
+    sal_Bool bPageMode = pViewData->IsPagebreakMode();
     if (bPageMode)										// nach FindChanged
     {
         // SetPagebreakMode initialisiert auch bPrinted Flags
@@ -589,7 +589,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     }
 
     EditView*	pEditView = NULL;
-    BOOL		bEditMode = pViewData->HasEditView(eWhich);
+    sal_Bool		bEditMode = pViewData->HasEditView(eWhich);
     if ( bEditMode && pViewData->GetRefTabNo() == nTab )
     {
         SCCOL nEditCol;
@@ -601,13 +601,13 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
         if ( nEditEndCol >= nX1 && nEditCol <= nX2 && nEditEndRow >= nY1 && nEditRow <= nY2 )
             aOutputData.SetEditCell( nEditCol, nEditRow );
         else
-            bEditMode = FALSE;
+            bEditMode = sal_False;
 
         //	nur Edit-Area zu zeichnen?
         //!	dann muss trotzdem noch der Rand / das Gitter gemalt werden!
 
 //		if ( nEditCol <= nX1 && nEditEndCol >= nX2 && nEditRow <= nY1 && nEditEndRow >= nY2 )
-//			bOnlyEdit = TRUE;
+//			bOnlyEdit = sal_True;
     }
 
     // define drawing layer map mode and paint rectangle
@@ -726,7 +726,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
         DrawRedraw( aOutputData, eMode, SC_LAYER_BACK );
     }
     else
-        aOutputData.SetSolidBackground(TRUE);
+        aOutputData.SetSolidBackground(sal_True);
 
     pContentDev->SetMapMode(MAP_PIXEL);
     aOutputData.DrawBackground();
@@ -744,15 +744,15 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
     aOutputData.DrawShadow();
     aOutputData.DrawFrame();
     if ( !bLogicText )
-        aOutputData.DrawStrings(FALSE);		// in pixel MapMode
+        aOutputData.DrawStrings(sal_False);		// in pixel MapMode
 
     // edit cells and printer-metrics text must be before the buttons
     // (DataPilot buttons contain labels in UI font)
 
     pContentDev->SetMapMode(pViewData->GetLogicMode(eWhich));
     if ( bLogicText )
-        aOutputData.DrawStrings(TRUE);      // in logic MapMode if bTextWysiwyg is set
-    aOutputData.DrawEdit(TRUE);
+        aOutputData.DrawStrings(sal_True);      // in logic MapMode if bTextWysiwyg is set
+    aOutputData.DrawEdit(sal_True);
     pContentDev->SetMapMode(MAP_PIXEL);
 
         // Autofilter- und Pivot-Buttons
@@ -777,15 +777,15 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
 
     SCTAB nTabCount = pDoc->GetTableCount();
     ScHighlightRanges* pHigh = pViewData->GetView()->GetHighlightRanges();
-    BOOL bHasScenario = ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) && !pDoc->IsScenario(nTab) );
-    BOOL bHasChange = ( pDoc->GetChangeTrack() != NULL );
+    sal_Bool bHasScenario = ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) && !pDoc->IsScenario(nTab) );
+    sal_Bool bHasChange = ( pDoc->GetChangeTrack() != NULL );
 
     if ( bHasChange || bHasScenario || pHigh != NULL )
     {
 
         //! SetChangedClip() mit DrawMarks() zusammenfassen?? (anderer MapMode!)
 
-        BOOL bAny = TRUE;
+        sal_Bool bAny = sal_True;
         if (eMode == SC_UPDATE_CHANGED)
             bAny = aOutputData.SetChangedClip();
         if (bAny)
@@ -819,7 +819,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
             pContentDev->SetClipRegion();
         }
 
-        //BOOL bDraw = TRUE;
+        //sal_Bool bDraw = sal_True;
         //if (eMode == SC_UPDATE_CHANGED)
         //	bDraw = NeedDrawMarks() && aOutputData.SetChangedClip();
         //if (bDraw)
@@ -874,7 +874,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
         Color aRefColor( rColorCfg.GetColorValue(svtools::CALCREFERENCE).nColor );
         aOutputData.DrawRefMark( pViewData->GetRefStartX(), pViewData->GetRefStartY(),
                                  pViewData->GetRefEndX(), pViewData->GetRefEndY(),
-                                 aRefColor, FALSE );
+                                 aRefColor, sal_False );
     }
 
         //	Range-Finder
@@ -886,8 +886,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
         if ( pRangeFinder && !pRangeFinder->IsHidden() &&
                 pRangeFinder->GetDocName() == pDocSh->GetTitle() )
         {
-            USHORT nCount = (USHORT)pRangeFinder->Count();
-            for (USHORT i=0; i<nCount; i++)
+            sal_uInt16 nCount = (sal_uInt16)pRangeFinder->Count();
+            for (sal_uInt16 i=0; i<nCount; i++)
             {
                 ScRangeFindData* pData = pRangeFinder->GetObject(i);
                 if (pData)
@@ -898,7 +898,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
                         aOutputData.DrawRefMark( aRef.aStart.Col(), aRef.aStart.Row(),
                                                 aRef.aEnd.Col(), aRef.aEnd.Row(),
                                                 Color( ScRangeFindList::GetColorName( i ) ),
-                                                TRUE );
+                                                sal_True );
                 }
             }
         }
@@ -982,7 +982,7 @@ void ScGridWindow::CheckNeedsRepaint()
 
     if (bNeedsRepaint)
     {
-        bNeedsRepaint = FALSE;
+        bNeedsRepaint = sal_False;
         if (aRepaintPixel.IsEmpty())
             Invalidate();
         else
@@ -1032,7 +1032,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
         else
         {
             //	use EditEngine to draw mixed-script string
-            pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE );
+            pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), sal_True );
             pEditEng->SetRefMapMode( pContentDev->GetMapMode() );
             SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() );
             rDefPattern.FillEditItemSet( pEditDefaults );
@@ -1040,8 +1040,8 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
             pEditEng->SetDefaults( pEditDefaults );
         }
 
-        USHORT nCount = sal::static_int_cast<USHORT>( pPageData->GetCount() );
-        for (USHORT nPos=0; nPos<nCount; nPos++)
+        sal_uInt16 nCount = sal::static_int_cast<sal_uInt16>( pPageData->GetCount() );
+        for (sal_uInt16 nPos=0; nPos<nCount; nPos++)
         {
             ScPrintRangeData& rData = pPageData->GetData(nPos);
             ScRange aRange = rData.GetPrintRange();
@@ -1058,9 +1058,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                     pContentDev->SetFillColor( aManual );
 
                 Point aStart = pViewData->GetScrPos(
-                                    aRange.aStart.Col(), aRange.aStart.Row(), eWhich, TRUE );
+                                    aRange.aStart.Col(), aRange.aStart.Row(), eWhich, sal_True );
                 Point aEnd = pViewData->GetScrPos(
-                                    aRange.aEnd.Col() + 1, aRange.aEnd.Row() + 1, eWhich, TRUE );
+                                    aRange.aEnd.Col() + 1, aRange.aEnd.Row() + 1, eWhich, sal_True );
                 aStart.X() -= 2;
                 aStart.Y() -= 2;
 
@@ -1094,7 +1094,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                         else
                             pContentDev->SetFillColor( aAutomatic );
                         Point aBreak = pViewData->GetScrPos(
-                                        nBreak, aRange.aStart.Row(), eWhich, TRUE );
+                                        nBreak, aRange.aStart.Row(), eWhich, sal_True );
                         pContentDev->DrawRect( Rectangle( aBreak.X()-1, aStart.Y(), aBreak.X(), aEnd.Y() ) );
                     }
                 }
@@ -1113,7 +1113,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                         else
                             pContentDev->SetFillColor( aAutomatic );
                         Point aBreak = pViewData->GetScrPos(
-                                        aRange.aStart.Col(), nBreak, eWhich, TRUE );
+                                        aRange.aStart.Col(), nBreak, eWhich, sal_True );
                         pContentDev->DrawRect( Rectangle( aStart.X(), aBreak.Y()-1, aEnd.X(), aBreak.Y() ) );
                     }
                 }
@@ -1133,9 +1133,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                             if ( nPrEndX >= nX1 && nPrStartX <= nX2 )
                             {
                                 Point aPageStart = pViewData->GetScrPos(
-                                                        nPrStartX, nPrStartY, eWhich, TRUE );
+                                                        nPrStartX, nPrStartY, eWhich, sal_True );
                                 Point aPageEnd = pViewData->GetScrPos(
-                                                        nPrEndX+1,nPrEndY+1, eWhich, TRUE );
+                                                        nPrEndX+1,nPrEndY+1, eWhich, sal_True );
 
                                 long nPageNo = rData.GetFirstPage();
                                 if ( rData.IsTopDown() )
@@ -1217,9 +1217,9 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
     ScQueryParam*	pQueryParam = NULL;
 
     RowInfo*        pRowInfo = rTabInfo.mpRowInfo;
-    USHORT          nArrCount = rTabInfo.mnArrCount;
+    sal_uInt16          nArrCount = rTabInfo.mnArrCount;
 
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
     Point aOldPos  = aComboButton.GetPosPixel();	// Zustand fuer MouseDown/Up
     Size  aOldSize = aComboButton.GetSizePixel();   // merken
@@ -1241,7 +1241,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
                     if (!pQueryParam)
                         pQueryParam = new ScQueryParam;
 
-                    BOOL bNewData = TRUE;
+                    sal_Bool bNewData = sal_True;
                     if (pDBData)
                     {
                         SCCOL nStartCol;
@@ -1252,7 +1252,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
                         pDBData->GetArea( nAreaTab, nStartCol, nStartRow, nEndCol, nEndRow );
                         if ( nCol >= nStartCol && nCol <= nEndCol &&
                              nRow >= nStartRow && nRow <= nEndRow )
-                            bNewData = FALSE;
+                            bNewData = sal_False;
                     }
                     if (bNewData)
                     {
@@ -1268,10 +1268,10 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
 
                     //	pQueryParam kann nur MAXQUERY Eintraege enthalten
 
-                    BOOL bSimpleQuery = TRUE;
-                    BOOL bColumnFound = FALSE;
+                    sal_Bool bSimpleQuery = sal_True;
+                    sal_Bool bColumnFound = sal_False;
                     if (!pQueryParam->bInplace)
-                        bSimpleQuery = FALSE;
+                        bSimpleQuery = sal_False;
                     for (nQuery=0; nQuery<MAXQUERY && bSimpleQuery; nQuery++)
                         if (pQueryParam->GetEntry(nQuery).bDoQuery)
                         {
@@ -1279,10 +1279,10 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
                             //	(auch bei ">1" soll der Spaltenkopf blau werden)
 
                             if (pQueryParam->GetEntry(nQuery).nField == nCol)
-                                bColumnFound = TRUE;
+                                bColumnFound = sal_True;
                             if (nQuery > 0)
                                 if (pQueryParam->GetEntry(nQuery).eConnect != SC_AND)
-                                    bSimpleQuery = FALSE;
+                                    bSimpleQuery = sal_False;
                         }
 
                     bool bArrowState = bSimpleQuery && bColumnFound;
@@ -1337,7 +1337,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
             aComboButton.SetPosPixel( aRect.TopLeft() );
             aComboButton.SetSizePixel( aRect.GetSize() );
             pContentDev->SetClipRegion( aRect );
-            aComboButton.Draw( FALSE, FALSE );
+            aComboButton.Draw( sal_False, sal_False );
             pContentDev->SetClipRegion();           // always called from Draw() without clip region
             aComboButton.SetPosPixel( aOldPos );    // restore old state
             aComboButton.SetSizePixel( aOldSize );  // for MouseUp/Down (AutoFilter)
@@ -1352,7 +1352,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos )
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
     ScDDComboBoxButton aButton( this );             // for optimal size
@@ -1376,7 +1376,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos )
         nNextCol = nCol + pMerge->GetColMerge();    // next cell after the merged area
     while ( nNextCol <= MAXCOL && pDoc->ColHidden(nNextCol, nTab) )
         ++nNextCol;
-    BOOL bNextCell = ( nNextCol <= MAXCOL );
+    sal_Bool bNextCell = ( nNextCol <= MAXCOL );
     if ( bNextCell )
         nAvailable = ScViewData::ToPixel( pDoc->GetColWidth( nNextCol, nTab ), pViewData->GetPPTX() );
 
@@ -1385,7 +1385,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos )
     if ( nCellSizeY < aBtnSize.Height() )
         aBtnSize.Height() = nCellSizeY;
 
-    Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich, TRUE );
+    Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich, sal_True );
     aPos.X() += nCellSizeX * nLayoutSign;               // start of next cell
     if (!bNextCell)
         aPos.X() -= aBtnSize.Width() * nLayoutSign;     // right edge of cell if next cell not available
@@ -1398,7 +1398,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos )
     return Rectangle( aPos, aBtnSize );
 }
 
-BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab )
+sal_Bool ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab )
 {
     ScDocument*		pDoc	= pViewData->GetDocument();
     ScDBData*		pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab );
@@ -1411,12 +1411,12 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab )
         DBG_ERROR("Auto-Filter-Button ohne DBData");
     }
 
-    BOOL	bSimpleQuery = TRUE;
-    BOOL	bColumnFound = FALSE;
+    sal_Bool	bSimpleQuery = sal_True;
+    sal_Bool	bColumnFound = sal_False;
     SCSIZE	nQuery;
 
     if ( !aQueryParam.bInplace )
-        bSimpleQuery = FALSE;
+        bSimpleQuery = sal_False;
 
     //	aQueryParam kann nur MAXQUERY Eintraege enthalten
 
@@ -1424,11 +1424,11 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab )
         if ( aQueryParam.GetEntry(nQuery).bDoQuery )
         {
             if (aQueryParam.GetEntry(nQuery).nField == nCol)
-                bColumnFound = TRUE;
+                bColumnFound = sal_True;
 
             if (nQuery > 0)
                 if (aQueryParam.GetEntry(nQuery).eConnect != SC_AND)
-                    bSimpleQuery = FALSE;
+                    bSimpleQuery = sal_False;
         }
 
     return ( bSimpleQuery && bColumnFound );
@@ -1437,8 +1437,8 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab )
 void ScGridWindow::DrawComboButton( const Point&	rCellPos,
                                     long			nCellSizeX,
                                     long			nCellSizeY,
-                                    BOOL            bArrowState,
-                                    BOOL			bBtnIn )
+                                    sal_Bool            bArrowState,
+                                    sal_Bool			bBtnIn )
 {
     Point	aScrPos	 = rCellPos;
     Size	aBtnSize = aComboButton.GetSizePixel();
@@ -1454,7 +1454,7 @@ void ScGridWindow::DrawComboButton( const Point&	rCellPos,
         aComboButton.SetSizePixel( aBtnSize );
     }
 
-    BOOL bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
+    sal_Bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
 
     if ( bLayoutRTL )
         aScrPos.X() -= nCellSizeX - 1;
@@ -1470,7 +1470,7 @@ void ScGridWindow::DrawComboButton( const Point&	rCellPos,
 }
 
 void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
-                                    BOOL bTestMerge, BOOL bRepeat )
+                                    sal_Bool bTestMerge, sal_Bool bRepeat )
 {
     //!	if INVERT_HIGHLIGHT swaps foreground and background (like on Mac),
     //!	use INVERT_HIGHLIGHT only for cells that have no background color set
@@ -1483,7 +1483,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
 
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
     SCCOL nTestX2 = nX2;
@@ -1520,31 +1520,31 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
 
     Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich );
     long nScrY = aScrPos.Y();
-    BOOL bWasHidden = FALSE;
+    sal_Bool bWasHidden = sal_False;
     for (SCROW nY=nY1; nY<=nY2; nY++)
     {
-        BOOL bFirstRow = ( nY == nPosY );						// first visible row?
-        BOOL bDoHidden = FALSE;									// versteckte nachholen ?
-        USHORT nHeightTwips = pDoc->GetRowHeight( nY,nTab );
-        BOOL bDoRow = ( nHeightTwips != 0 );
+        sal_Bool bFirstRow = ( nY == nPosY );						// first visible row?
+        sal_Bool bDoHidden = sal_False;									// versteckte nachholen ?
+        sal_uInt16 nHeightTwips = pDoc->GetRowHeight( nY,nTab );
+        sal_Bool bDoRow = ( nHeightTwips != 0 );
         if (bDoRow)
         {
             if (bTestMerge)
                 if (bWasHidden)					// auf versteckte zusammengefasste testen
                 {
 //					--nY;						// nY geaendert -> vorherige zeichnen
-                    bDoHidden = TRUE;
-                    bDoRow = TRUE;
+                    bDoHidden = sal_True;
+                    bDoRow = sal_True;
                 }
 
-            bWasHidden = FALSE;
+            bWasHidden = sal_False;
         }
         else
         {
-            bWasHidden = TRUE;
+            bWasHidden = sal_True;
             if (bTestMerge)
                 if (nY==nY2)
-                    bDoRow = TRUE;				// letzte Zeile aus Block
+                    bDoRow = sal_True;				// letzte Zeile aus Block
         }
 
         if ( bDoRow )
@@ -1597,7 +1597,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                             }
                         }
 
-                        if ( rMark.IsCellMarked( nThisX, nThisY, TRUE ) == bRepeat )
+                        if ( rMark.IsCellMarked( nThisX, nThisY, sal_True ) == bRepeat )
                         {
                             if ( !pMergeFlag->IsOverlapped() )
                             {
@@ -1622,7 +1622,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                     }
                     else		// !bTestMerge
                     {
-                        if ( rMark.IsCellMarked( nX, nY, TRUE ) == bRepeat &&
+                        if ( rMark.IsCellMarked( nX, nY, sal_True ) == bRepeat &&
                                                 nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY )
                         {
                             aInvert.AddRect( Rectangle( nScrX,nScrY,nEndX,nEndY ) );
@@ -1649,13 +1649,13 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
 
 //  ScMarkData& rMark = pViewData->GetMarkData();
     ScMarkData aMultiMark( pViewData->GetMarkData() );
-    aMultiMark.SetMarking( FALSE );
+    aMultiMark.SetMarking( sal_False );
     aMultiMark.MarkToMulti();
 
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
 
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
     if ( !aMultiMark.IsMultiMarked() )
@@ -1671,8 +1671,8 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
     PutInOrder( nX1, nX2 );
     PutInOrder( nY1, nY2 );
 
-    BOOL bTestMerge = TRUE;
-    BOOL bRepeat = TRUE;
+    sal_Bool bTestMerge = sal_True;
+    sal_Bool bRepeat = sal_True;
 
     SCCOL nTestX2 = nX2;
     SCROW nTestY2 = nY2;
@@ -1708,30 +1708,30 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
 
     Point aScrPos = pViewData->GetScrPos( nX1, nY1, eWhich );
     long nScrY = aScrPos.Y();
-    BOOL bWasHidden = FALSE;
+    sal_Bool bWasHidden = sal_False;
     for (SCROW nY=nY1; nY<=nY2; nY++)
     {
-        BOOL bFirstRow = ( nY == nPosY );						// first visible row?
-        BOOL bDoHidden = FALSE;									// versteckte nachholen ?
-        USHORT nHeightTwips = pDoc->GetRowHeight( nY,nTab );
-        BOOL bDoRow = ( nHeightTwips != 0 );
+        sal_Bool bFirstRow = ( nY == nPosY );						// first visible row?
+        sal_Bool bDoHidden = sal_False;									// versteckte nachholen ?
+        sal_uInt16 nHeightTwips = pDoc->GetRowHeight( nY,nTab );
+        sal_Bool bDoRow = ( nHeightTwips != 0 );
         if (bDoRow)
         {
             if (bTestMerge)
                 if (bWasHidden)					// auf versteckte zusammengefasste testen
                 {
-                    bDoHidden = TRUE;
-                    bDoRow = TRUE;
+                    bDoHidden = sal_True;
+                    bDoRow = sal_True;
                 }
 
-            bWasHidden = FALSE;
+            bWasHidden = sal_False;
         }
         else
         {
-            bWasHidden = TRUE;
+            bWasHidden = sal_True;
             if (bTestMerge)
                 if (nY==nY2)
-                    bDoRow = TRUE;				// letzte Zeile aus Block
+                    bDoRow = sal_True;				// letzte Zeile aus Block
         }
 
         if ( bDoRow )
@@ -1784,7 +1784,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
                             }
                         }
 
-                        if ( aMultiMark.IsCellMarked( nThisX, nThisY, TRUE ) == bRepeat )
+                        if ( aMultiMark.IsCellMarked( nThisX, nThisY, sal_True ) == bRepeat )
                         {
                             if ( !pMergeFlag->IsOverlapped() )
                             {
@@ -1809,7 +1809,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
                     }
                     else		// !bTestMerge
                     {
-                        if ( aMultiMark.IsCellMarked( nX, nY, TRUE ) == bRepeat &&
+                        if ( aMultiMark.IsCellMarked( nX, nY, sal_True ) == bRepeat &&
                                                 nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY )
                         {
                             aInvert.AddRect( Rectangle( nScrX,nScrY,nEndX,nEndY ) );
@@ -1855,7 +1855,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
 //UNUSED2008-05      double nPPTY = pViewData->GetPPTY();
 //UNUSED2008-05      SCCOLROW i;
 //UNUSED2008-05  
-//UNUSED2008-05      BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+//UNUSED2008-05      sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 //UNUSED2008-05      long nLayoutSign = bLayoutRTL ? -1 : 1;
 //UNUSED2008-05  
 //UNUSED2008-05      if (ValidCol(nX2) && nX2>=nX1)
@@ -1914,7 +1914,7 @@ void ScGridWindow::DrawCursor()
 //
 //	//	links/oben ausserhalb des Bildschirms ?
 //
-//	BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
+//	sal_Bool bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
 //	if (!bVis)
 //	{
 //		SCCOL nEndX = nX;
@@ -1935,12 +1935,12 @@ void ScGridWindow::DrawCursor()
 //
 //		MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);
 //
-//		Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
-//		BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+//		Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True );
+//		sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 //
 //		//	completely right of/below the screen?
 //		//	(test with logical start position in aScrPos)
-//		BOOL bMaybeVisible;
+//		sal_Bool bMaybeVisible;
 //		if ( bLayoutRTL )
 //			bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 );
 //		else
@@ -1957,7 +1957,7 @@ void ScGridWindow::DrawCursor()
 //			if ( bLayoutRTL )
 //				aScrPos.X() -= nSizeXPix - 2;		// move instead of mirroring
 //
-//			BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ||
+//			sal_Bool bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ||
 //							pViewData->GetVSplitMode() == SC_SPLIT_FIX );
 //			if ( pViewData->GetActivePart()==eWhich || bFix )
 //			{
@@ -1996,9 +1996,9 @@ void ScGridWindow::DrawAutoFillMark()
 //		SCROW nY = aAutoMarkPos.Row();
 //		SCTAB nTab = pViewData->GetTabNo();
 //		ScDocument* pDoc = pViewData->GetDocument();
-//		BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+//		sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 //
-//		Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
+//		Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True );
 //		long nSizeXPix;
 //		long nSizeYPix;
 //		pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 821d5da30..eae890edd 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -85,22 +85,22 @@ ScHideTextCursor::~ScHideTextCursor()
     {
         //	restore text cursor
         if ( pViewData->HasEditView(eWhich) && pWin->HasFocus() )
-            pViewData->GetEditView(eWhich)->ShowCursor( FALSE, TRUE );
+            pViewData->GetEditView(eWhich)->ShowCursor( sal_False, sal_True );
     }
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
+sal_Bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, sal_Bool bKeyboard )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
 
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB		nTab = pViewData->GetTabNo();
     ScAddress	aCellPos( nPosX, nPosY, nTab );
 
     String aTrackText;
-    BOOL bLeftEdge = FALSE;
+    sal_Bool bLeftEdge = sal_False;
 
     //	Change-Tracking
 
@@ -174,7 +174,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
 
             //	bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle
             if ( pFound->GetType() == SC_CAT_DELETE_COLS )
-                bLeftEdge = TRUE;
+                bLeftEdge = sal_True;
 
             DateTime aDT = pFound->GetDateTime();
             aTrackText  = pFound->GetUser();
@@ -201,23 +201,23 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
     const ScPostIt* pNote = pDoc->GetNote( aCellPos );
     if ( (aTrackText.Len() > 0) || (pNote && !pNote->IsCaptionShown()) )
     {
-        BOOL bNew = TRUE;
-        BOOL bFast = FALSE;
+        sal_Bool bNew = sal_True;
+        sal_Bool bFast = sal_False;
         if ( pNoteMarker )			// schon eine Notiz angezeigt
         {
             if ( pNoteMarker->GetDocPos() == aCellPos )	// dieselbe
-                bNew = FALSE;							// dann stehenlassen
+                bNew = sal_False;							// dann stehenlassen
             else
-                bFast = TRUE;							// sonst sofort
+                bFast = sal_True;							// sonst sofort
 
             //	marker which was shown for ctrl-F1 isn't removed by mouse events
             if ( pNoteMarker->IsByKeyboard() && !bKeyboard )
-                bNew = FALSE;
+                bNew = sal_False;
         }
         if ( bNew )
         {
             if ( bKeyboard )
-                bFast = TRUE;			// keyboard also shows the marker immediately
+                bFast = sal_True;			// keyboard also shows the marker immediately
 
             delete pNoteMarker;
 
@@ -232,7 +232,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
 
             /*  If caption is shown from right or bottom windows, adjust
                 mapmode to include size of top-left window. */
-            MapMode aMapMode = GetDrawMapMode( TRUE );
+            MapMode aMapMode = GetDrawMapMode( sal_True );
             Size aLeftSize = pLeft->PixelToLogic( pLeft->GetOutputSizePixel(), aMapMode );
             Point aOrigin = aMapMode.GetOrigin();
             if( (this == pRight) || (this == pDiagonal) )
@@ -246,7 +246,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
                                             aMapMode, bLeftEdge, bFast, bKeyboard );
         }
 
-        bDone = TRUE;		// something is shown (old or new)
+        bDone = sal_True;		// something is shown (old or new)
     }
 
     return bDone;
@@ -256,11 +256,11 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
 
 void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
 {
-    BOOL bDone = FALSE;
-    BOOL bHelpEnabled = ( rHEvt.GetMode() & ( HELPMODE_BALLOON | HELPMODE_QUICK ) ) != 0;
+    sal_Bool bDone = sal_False;
+    sal_Bool bHelpEnabled = ( rHEvt.GetMode() & ( HELPMODE_BALLOON | HELPMODE_QUICK ) ) != 0;
     SdrView* pDrView = pViewData->GetScDrawView();
 
-    BOOL bDrawTextEdit = FALSE;
+    sal_Bool bDrawTextEdit = sal_False;
     if (pDrView)
         bDrawTextEdit = pDrView->IsTextEdit();
 
@@ -273,10 +273,10 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
         SCsROW nPosY;
         pViewData->GetPosFromPixel( aPosPixel.X(), aPosPixel.Y(), eWhich, nPosX, nPosY );
 
-        if ( ShowNoteMarker( nPosX, nPosY, FALSE ) )
+        if ( ShowNoteMarker( nPosX, nPosY, sal_False ) )
         {
             Window::RequestHelp( rHEvt );	// alte Tip/Balloon ausschalten
-            bDone = TRUE;
+            bDone = sal_True;
         }
     }
 
@@ -374,8 +374,8 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
 
                 ScHideTextCursor aHideCursor( pViewData, eWhich );		// MapMode is changed in GetEditArea
 
-                // bForceToTop = FALSE, use the cell's real position
-                aPixRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, FALSE );
+                // bForceToTop = sal_False, use the cell's real position
+                aPixRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, sal_False );
             }
         }
 
@@ -389,7 +389,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
             else if ( rHEvt.GetMode() & HELPMODE_QUICK )
                 Help::ShowQuickHelp(this,aScreenRect, aHelpText);
 
-            bDone = TRUE;
+            bDone = sal_True;
         }
     }
 
@@ -407,13 +407,13 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
 
     if ( nMouseStatus == SC_GM_TABDOWN && pViewData->GetRefType() == SC_REFTYPE_FILL &&
             Help::IsQuickHelpEnabled() )
-        bDone = TRUE;
+        bDone = sal_True;
 
     if (!bDone)
         Window::RequestHelp( rHEvt );
 }
 
-BOOL ScGridWindow::IsMyModel(SdrEditView* pSdrView)
+sal_Bool ScGridWindow::IsMyModel(SdrEditView* pSdrView)
 {
     return pSdrView &&
             pSdrView->GetModel() == pViewData->GetDocument()->GetDrawLayer();
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index ce69872d5..495b77600 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -66,7 +66,7 @@
 //==================================================================
 
 ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine,
-                                    SCCOLROW nNewSize, USHORT nNewFlags ) :
+                                    SCCOLROW nNewSize, sal_uInt16 nNewFlags ) :
             Window		( pParent ),
             pSelEngine	( pSelectionEngine ),
             nFlags		( nNewFlags ),
@@ -74,24 +74,24 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn
             nSize		( nNewSize ),
             nMarkStart	( 0 ),
             nMarkEnd	( 0 ),
-            bMarkRange	( FALSE ),
-            bDragging	( FALSE ),
-            bIgnoreMove	( FALSE )
+            bMarkRange	( sal_False ),
+            bDragging	( sal_False ),
+            bIgnoreMove	( sal_False )
 {
     // --- RTL --- no default mirroring for this window, the spreadsheet itself
     // is also not mirrored
     // #107811# mirror the vertical window for correct border drawing
     // #106948# table layout depends on sheet format, not UI setting, so the
     // borders of the vertical window have to be handled manually, too.
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 
     aNormFont = GetFont();
-    aNormFont.SetTransparent( TRUE );		//! WEIGHT_NORMAL hart setzen ???
+    aNormFont.SetTransparent( sal_True );		//! WEIGHT_NORMAL hart setzen ???
     aBoldFont = aNormFont;
     aBoldFont.SetWeight( WEIGHT_BOLD );
 
     SetFont(aBoldFont);
-    bBoldSet = TRUE;
+    bBoldSet = sal_True;
 
     Size aSize = LogicToPixel( Size(
         GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888")) ),
@@ -127,7 +127,7 @@ ScHeaderControl::~ScHeaderControl()
 
 void ScHeaderControl::DoPaint( SCCOLROW nStart, SCCOLROW nEnd )
 {
-    BOOL bLayoutRTL = IsLayoutRTL();
+    sal_Bool bLayoutRTL = IsLayoutRTL();
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
     Rectangle aRect( Point(0,0), GetOutputSizePixel() );
@@ -144,15 +144,15 @@ void ScHeaderControl::DoPaint( SCCOLROW nStart, SCCOLROW nEnd )
     Invalidate(aRect);
 }
 
-void ScHeaderControl::SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd )
+void ScHeaderControl::SetMark( sal_Bool bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd )
 {
-    BOOL bEnabled = SC_MOD()->GetInputOptions().GetMarkHeader();	//! cachen?
+    sal_Bool bEnabled = SC_MOD()->GetInputOptions().GetMarkHeader();	//! cachen?
     if (!bEnabled)
-        bNewSet = FALSE;
+        bNewSet = sal_False;
 
     //	Variablen setzen
 
-    BOOL bOldSet	 = bMarkRange;
+    sal_Bool bOldSet	 = bMarkRange;
     SCCOLROW nOldStart = nMarkStart;
     SCCOLROW nOldEnd	 = nMarkEnd;
     PutInOrder( nNewStart, nNewEnd );
@@ -204,7 +204,7 @@ long ScHeaderControl::GetScrPos( SCCOLROW nEntryNo )
         nScrPos = 0;
         for (SCCOLROW i=GetPos(); i<nEntryNo && nScrPos<nMax; i++)
         {
-            USHORT nAdd = GetEntrySize(i);
+            sal_uInt16 nAdd = GetEntrySize(i);
             if (nAdd)
                 nScrPos += nAdd;
             else
@@ -269,8 +269,8 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
     //	Linien zusammengefasst
 
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-    BOOL bHighContrast = rStyleSettings.GetHighContrastMode();
-    BOOL bDark = rStyleSettings.GetFaceColor().IsDark();
+    sal_Bool bHighContrast = rStyleSettings.GetHighContrastMode();
+    sal_Bool bDark = rStyleSettings.GetFaceColor().IsDark();
     // Use the same distinction for bDark as in Window::DrawSelectionBackground
 
     Color aTextColor = rStyleSettings.GetButtonTextColor();
@@ -286,21 +286,21 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
     Color aSelLineColor = rStyleSettings.GetHighlightColor();
     aSelLineColor.Merge( aBlack, 0xe0 );        // darken just a little bit
 
-    BOOL bLayoutRTL = IsLayoutRTL();
+    sal_Bool bLayoutRTL = IsLayoutRTL();
     long nLayoutSign = bLayoutRTL ? -1 : 1;
-    BOOL bMirrored = IsMirrored();
+    sal_Bool bMirrored = IsMirrored();
 
 //	const FunctionSet*	pFuncSet = pSelEngine->GetFunctionSet();
     String				aString;
-    USHORT				nBarSize;
+    sal_uInt16				nBarSize;
     Point				aScrPos;
     Size				aTextSize;
 //	Size				aSize = GetOutputSizePixel();
 
     if (bVertical)
-        nBarSize = (USHORT) GetSizePixel().Width();
+        nBarSize = (sal_uInt16) GetSizePixel().Width();
     else
-        nBarSize = (USHORT) GetSizePixel().Height();
+        nBarSize = (sal_uInt16) GetSizePixel().Height();
 
     SCCOLROW	nPos = GetPos();
 
@@ -333,7 +333,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
 
     for (SCCOLROW i=nPos; i<nSize; i++)
     {
-        USHORT nSizePix = GetEntrySize( i );
+        sal_uInt16 nSizePix = GetEntrySize( i );
         if (nSizePix)
         {
             nLineEnd += nSizePix * nLayoutSign;
@@ -464,7 +464,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
     //	borders, light border at top isn't used anymore
     //  use SC_HDRPAINT_SEL_BOTTOM for different color
 
-    for (USHORT nPass = SC_HDRPAINT_SEL_BOTTOM; nPass < SC_HDRPAINT_COUNT; nPass++)
+    for (sal_uInt16 nPass = SC_HDRPAINT_SEL_BOTTOM; nPass < SC_HDRPAINT_COUNT; nPass++)
     {
         //	set line color etc. before entry loop
         switch ( nPass )
@@ -494,7 +494,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
                     else
                         aTransRect = Rectangle( nTransStart, 0, nTransEnd, nBarSize-1 );
                     SetBackground( Color( rStyleSettings.GetFaceColor() ) );
-                    DrawSelectionBackground( aTransRect, 0, TRUE, FALSE, FALSE );
+                    DrawSelectionBackground( aTransRect, 0, sal_True, sal_False, sal_False );
                     SetBackground();
                 }
                 break;
@@ -514,7 +514,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
                 nScrPos = nPEnd + nLayoutSign;		//	beyond nPEnd -> stop
             else
             {
-                USHORT nSizePix = GetEntrySize( nEntryNo );
+                sal_uInt16 nSizePix = GetEntrySize( nEntryNo );
 
                 if (nSizePix == 0)
                 {
@@ -530,8 +530,8 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
                     else
                         aEndPos = Point( aScrPos.X()+(nSizePix-1)*nLayoutSign, aScrPos.Y()+nBarSize-1 );
 
-                    BOOL bMark = bMarkRange && nEntryNo >= nMarkStart && nEntryNo <= nMarkEnd;
-                    BOOL bNextToMark = bMarkRange && nEntryNo + 1 >= nMarkStart && nEntryNo <= nMarkEnd;
+                    sal_Bool bMark = bMarkRange && nEntryNo >= nMarkStart && nEntryNo <= nMarkEnd;
+                    sal_Bool bNextToMark = bMarkRange && nEntryNo + 1 >= nMarkStart && nEntryNo <= nMarkEnd;
 
                     switch ( nPass )
                     {
@@ -609,9 +609,9 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
 //		Maus - Handling
 //
 
-SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder )
+SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, sal_Bool& rBorder )
 {
-    BOOL	bFound=FALSE;
+    sal_Bool	bFound=sal_False;
     SCCOLROW	nCount = 1;
     SCCOLROW	nPos = GetPos();
     SCCOLROW	nHitNo = nPos;
@@ -621,7 +621,7 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder )
     Size	aSize = GetOutputSizePixel();
     long	nWinSize = bVertical ? aSize.Height() : aSize.Width();
 
-    BOOL bLayoutRTL = IsLayoutRTL();
+    sal_Bool bLayoutRTL = IsLayoutRTL();
     long nLayoutSign = bLayoutRTL ? -1 : 1;
     long nEndPos = bLayoutRTL ? -1 : nWinSize;
 
@@ -640,7 +640,7 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder )
         nDif = nMousePos - nScrPos;
         if (nDif >= -2 && nDif <= 2 && nCount > 0)
         {
-            bFound=TRUE;
+            bFound=sal_True;
             nHitNo=nEntryNo-1;
         }
         else if (nDif * nLayoutSign >= 0 && nEntryNo < nSize)
@@ -660,7 +660,7 @@ bool ScHeaderControl::IsSelectionAllowed(SCCOLROW nPos) const
         return false;
 
     ScViewData* pViewData = pViewSh->GetViewData();
-    USHORT nTab = pViewData->GetTabNo();
+    sal_uInt16 nTab = pViewData->GetTabNo();
     ScDocument* pDoc = pViewData->GetDocument();
     const ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
     bool bSelectAllowed = true;
@@ -697,10 +697,10 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
     if (IsDisabled())
         return;
 
-    bIgnoreMove = FALSE;
+    bIgnoreMove = sal_False;
     SelectWindow();
 
-    BOOL bFound;
+    sal_Bool bFound;
     SCCOLROW nHitNo = GetMousePos( rMEvt, bFound );
     if (!IsSelectionAllowed(nHitNo))
         return;
@@ -708,7 +708,7 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
     if ( bFound && rMEvt.IsLeft() && ResizeAllowed() )
     {
         nDragNo = nHitNo;
-        USHORT nClicks = rMEvt.GetClicks();
+        sal_uInt16 nClicks = rMEvt.GetClicks();
         if ( nClicks && nClicks%2==0 )
         {
             SetEntrySize( nDragNo, HDR_SIZE_OPTIMUM );
@@ -726,8 +726,8 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
 
             // CaptureMouse();
             StartTracking();
-            bDragging = TRUE;
-            bDragMoved = FALSE;
+            bDragging = sal_True;
+            bDragMoved = sal_False;
         }
     }
     else if (rMEvt.IsLeft())
@@ -741,7 +741,7 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
             aVis.Top() = LONG_MIN, aVis.Bottom() = LONG_MAX;
         pSelEngine->SetVisibleArea( aVis );
 
-        SetMarking( TRUE );		//	muss vor SelMouseButtonDown sein
+        SetMarking( sal_True );		//	muss vor SelMouseButtonDown sein
         pSelEngine->SelMouseButtonDown( rMEvt );
 
         //	#74215# In column/row headers a simple click already is a selection.
@@ -764,20 +764,20 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt )
     if ( IsDisabled() )
         return;
 
-    SetMarking( FALSE );
-    bIgnoreMove = FALSE;
-//    BOOL bFound;
+    SetMarking( sal_False );
+    bIgnoreMove = sal_False;
+//    sal_Bool bFound;
 //    SCCOLROW nHitNo = GetMousePos( rMEvt, bFound );
 
     if ( bDragging )
     {
         DrawInvert( nDragPos );
         ReleaseMouse();
-        bDragging	= FALSE;
+        bDragging	= sal_False;
 
         long nScrPos	= GetScrPos( nDragNo );
         long nMousePos 	= bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X();
-        BOOL bLayoutRTL = IsLayoutRTL();
+        sal_Bool bLayoutRTL = IsLayoutRTL();
         long nNewWidth  = bLayoutRTL ? ( nScrPos - nMousePos + 1 )
                                      : ( nMousePos + 2 - nScrPos );
 
@@ -802,7 +802,7 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt )
         {
             if (nNewWidth<0) nNewWidth=0;
             if (bDragMoved)
-                SetEntrySize( nDragNo, (USHORT) nNewWidth );
+                SetEntrySize( nDragNo, (sal_uInt16) nNewWidth );
         }
     }
     else
@@ -820,7 +820,7 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt )
         return;
     }
 
-    BOOL bFound;
+    sal_Bool bFound;
     (void)GetMousePos( rMEvt, bFound );
 
     if ( bDragging )
@@ -834,7 +834,7 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt )
             DrawInvert( nDragPos );
 
             if (nDragPos <= nDragStart-SC_DRAG_MIN || nDragPos >= nDragStart+SC_DRAG_MIN)
-                bDragMoved = TRUE;
+                bDragMoved = sal_True;
         }
     }
     else
@@ -864,7 +864,7 @@ void ScHeaderControl::Tracking( const TrackingEvent& rTEvt )
 
 void ScHeaderControl::Command( const CommandEvent& rCEvt )
 {
-    USHORT nCmd = rCEvt.GetCommand();
+    sal_uInt16 nCmd = rCEvt.GetCommand();
     if ( nCmd == COMMAND_CONTEXTMENU )
     {
         StopMarking();		// Selektion / Dragging beenden
@@ -885,7 +885,7 @@ void ScHeaderControl::Command( const CommandEvent& rCEvt )
                     SC_MOD()->InputEnterHandler();  // always end edit mode
 
                 MouseEvent aMEvt( rCEvt.GetMousePosPixel() );
-                BOOL bBorder;
+                sal_Bool bBorder;
                 SCCOLROW nPos = GetMousePos( aMEvt, bBorder );
                 if (!IsSelectionAllowed(nPos))
                     // Selecting this cell is not allowed, neither is context menu.
@@ -901,13 +901,13 @@ void ScHeaderControl::Command( const CommandEvent& rCEvt )
                                          sal::static_int_cast<SCCOL>(nPos), MAXROW, nTab );
 
                 // see if any part of the range is already selected
-                BOOL bSelected = FALSE;
+                sal_Bool bSelected = sal_False;
                 ScRangeList aRanges;
-                pViewData->GetMarkData().FillRangeListWithMarks( &aRanges, FALSE );
-                ULONG nRangeCount = aRanges.Count();
-                for (ULONG i=0; i<nRangeCount && !bSelected; i++)
+                pViewData->GetMarkData().FillRangeListWithMarks( &aRanges, sal_False );
+                sal_uLong nRangeCount = aRanges.Count();
+                for (sal_uLong i=0; i<nRangeCount && !bSelected; i++)
                     if ( aRanges.GetObject(i)->Intersects( aNewRange ) )
-                        bSelected = TRUE;
+                        bSelected = sal_True;
 
                 // select the range if no part of it was selected
                 if ( !bSelected )
@@ -929,11 +929,11 @@ void ScHeaderControl::StopMarking()
     if ( bDragging )
     {
         DrawInvert( nDragPos );
-        bDragging = FALSE;
+        bDragging = sal_False;
     }
 
-    SetMarking( FALSE );
-    bIgnoreMove = TRUE;
+    SetMarking( sal_False );
+    bIgnoreMove = sal_True;
 
     //	#86260# don't call pSelEngine->Reset, so selection across the parts of
     //	a split/frozen view is possible
@@ -946,7 +946,7 @@ void ScHeaderControl::ShowDragHelp()
     if (Help::IsQuickHelpEnabled())
     {
         long nScrPos	= GetScrPos( nDragNo );
-        BOOL bLayoutRTL = IsLayoutRTL();
+        sal_Bool bLayoutRTL = IsLayoutRTL();
         long nVal = bLayoutRTL ? ( nScrPos - nDragPos + 1 )
                                : ( nDragPos + 2 - nScrPos );
 
@@ -957,7 +957,7 @@ void ScHeaderControl::ShowDragHelp()
         Point aMousePos = OutputToScreenPixel(GetPointerPosPixel());
 
         Rectangle aRect;
-        USHORT nAlign;
+        sal_uInt16 nAlign;
         if (!bVertical)
         {
             //	oberhalb
@@ -985,7 +985,7 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt )
     //	Wenn eigene QuickHelp angezeigt wird, nicht durch RequestHelp
     //	wieder wegnehmen lassen
 
-    BOOL bOwn = bDragging && Help::IsQuickHelpEnabled();
+    sal_Bool bOwn = bDragging && Help::IsQuickHelpEnabled();
     if (!bOwn)
         Window::RequestHelp(rHEvt);
 }
@@ -1005,24 +1005,24 @@ SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo )
     return nHidden;
 }
 
-BOOL ScHeaderControl::IsLayoutRTL()
+sal_Bool ScHeaderControl::IsLayoutRTL()
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScHeaderControl::IsMirrored()
+sal_Bool ScHeaderControl::IsMirrored()
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScHeaderControl::IsDisabled()
+sal_Bool ScHeaderControl::IsDisabled()
 {
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScHeaderControl::ResizeAllowed()
+sal_Bool ScHeaderControl::ResizeAllowed()
 {
-    return TRUE;
+    return sal_True;
 }
 
 void ScHeaderControl::SelectWindow()
@@ -1038,7 +1038,7 @@ String ScHeaderControl::GetDragHelp( long /* nVal */ )
     return EMPTY_STRING;
 }
 
-void ScHeaderControl::SetMarking( BOOL /* bSet */ )
+void ScHeaderControl::SetMarking( sal_Bool /* bSet */ )
 {
 }
 
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index d9efd072f..c3328c381 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -55,7 +55,7 @@ ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& r
     SetBackground( aYellow );
 
     aTextFont = GetFont();
-    aTextFont.SetTransparent( TRUE );
+    aTextFont.SetTransparent( sal_True );
     aTextFont.SetWeight( WEIGHT_NORMAL );
     aHeadFont = aTextFont;
     aHeadFont.SetWeight( WEIGHT_BOLD );
diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx
index b8ea6cf3b..8c19cfd90 100644
--- a/sc/source/ui/view/imapwrap.cxx
+++ b/sc/source/ui/view/imapwrap.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/viewfrm.hxx>
 
 
-USHORT ScIMapChildWindowId()
+sal_uInt16 ScIMapChildWindowId()
 {
     return SvxIMapDlgChildWindow::GetChildWindowId();
 }
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx
index 77af9751e..e0d4fb0fb 100644
--- a/sc/source/ui/view/invmerge.cxx
+++ b/sc/source/ui/view/invmerge.cxx
@@ -163,7 +163,7 @@ void ScInvertMerger::AddRect( const Rectangle& rRect )
     }
     else
     {
-        BOOL bDone = FALSE;
+        sal_Bool bDone = sal_False;
         if ( aJustified.Top()    == aLineRect.Top()    &&
              aJustified.Bottom() == aLineRect.Bottom() )
         {
@@ -171,12 +171,12 @@ void ScInvertMerger::AddRect( const Rectangle& rRect )
             if ( aJustified.Left() == aLineRect.Right() + 1 )
             {
                 aLineRect.Right() = aJustified.Right();
-                bDone = TRUE;
+                bDone = sal_True;
             }
             else if ( aJustified.Right() + 1 == aLineRect.Left() )	// for RTL layout
             {
                 aLineRect.Left() = aJustified.Left();
-                bDone = TRUE;
+                bDone = sal_True;
             }
         }
         if (!bDone)
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 2ea78687b..184cf9b55 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -48,7 +48,7 @@
 
 ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal,
                             ScDocument* pD, ScAddress aPos, const String& rUser,
-                            const MapMode& rMap, BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard ) :
+                            const MapMode& rMap, sal_Bool bLeftEdge, sal_Bool bForce, sal_Bool bKeyboard ) :
     pWindow( pWin ),
     pRightWin( pRight ),
     pBottomWin( pBottom ),
@@ -61,7 +61,7 @@ ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Windo
     bByKeyboard( bKeyboard ),
     pModel( NULL ),
     pObject( NULL ),
-    bVisible( FALSE )
+    bVisible( sal_False )
 {
     Size aSizePixel = pWindow->GetOutputSizePixel();
     if( pRightWin )
@@ -104,7 +104,7 @@ IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG )
             rOutliner.SetRefDevice(pPrinter);
         }
 
-        if( SdrPage* pPage = pModel->AllocPage( FALSE ) )
+        if( SdrPage* pPage = pModel->AllocPage( sal_False ) )
         {
             pObject = ScNoteUtil::CreateTempCaption( *pDoc, aDocPos, *pPage, aUserText, aVisRect, bLeft );
             if( pObject )
@@ -114,7 +114,7 @@ IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG )
             pModel->InsertPage( pPage );
 
         }
-        bVisible = TRUE;
+        bVisible = sal_True;
     }
 
     Draw();
@@ -126,7 +126,7 @@ void lcl_DrawWin( SdrObject* pObject, Window* pWindow, const MapMode& rMap )
     MapMode aOld = pWindow->GetMapMode();
     pWindow->SetMapMode( rMap );
 
-    ULONG nOldDrawMode = pWindow->GetDrawMode();
+    sal_uLong nOldDrawMode = pWindow->GetDrawMode();
     if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
     {
         pWindow->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL |
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 38fb5a12a..d89ed65ce 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -46,10 +46,10 @@ const long SC_OL_POSOFFSET                  = 2;
 const size_t SC_OL_NOLEVEL                  = static_cast< size_t >( -1 );
 const size_t SC_OL_HEADERENTRY              = static_cast< size_t >( -1 );
 
-const USHORT SC_OL_IMAGE_PLUS               = 9;
-const USHORT SC_OL_IMAGE_MINUS              = SC_OL_IMAGE_PLUS + 1;
-const USHORT SC_OL_IMAGE_NOTPRESSED         = SC_OL_IMAGE_MINUS + 1;
-const USHORT SC_OL_IMAGE_PRESSED            = SC_OL_IMAGE_NOTPRESSED + 1;
+const sal_uInt16 SC_OL_IMAGE_PLUS               = 9;
+const sal_uInt16 SC_OL_IMAGE_MINUS              = SC_OL_IMAGE_PLUS + 1;
+const sal_uInt16 SC_OL_IMAGE_NOTPRESSED         = SC_OL_IMAGE_MINUS + 1;
+const sal_uInt16 SC_OL_IMAGE_PRESSED            = SC_OL_IMAGE_NOTPRESSED + 1;
 
 // ============================================================================
 
@@ -72,7 +72,7 @@ ScOutlineWindow::ScOutlineWindow( Window* pParent, ScOutlineMode eMode, ScViewDa
     mnFocusEntry( SC_OL_HEADERENTRY ),
     mbDontDrawFocus( false )
 {
-    EnableRTL( FALSE );                 // mirroring is done manually
+    EnableRTL( sal_False );                 // mirroring is done manually
 
     InitSettings();
     maFocusRect.SetEmpty();
@@ -94,7 +94,7 @@ ScOutlineWindow::~ScOutlineWindow()
 
 void ScOutlineWindow::SetHeaderSize( long nNewSize )
 {
-    BOOL bLayoutRTL = GetDoc().IsLayoutRTL( GetTab() );
+    sal_Bool bLayoutRTL = GetDoc().IsLayoutRTL( GetTab() );
     mbMirrorEntries = bLayoutRTL && mbHoriz;
     mbMirrorLevels = bLayoutRTL && !mbHoriz;
 
@@ -178,7 +178,7 @@ const ScOutlineArray* ScOutlineWindow::GetOutlineArray() const
 const ScOutlineEntry* ScOutlineWindow::GetOutlineEntry( size_t nLevel, size_t nEntry ) const
 {
     const ScOutlineArray* pArray = GetOutlineArray();
-    return pArray ? pArray->GetEntry( sal::static_int_cast<USHORT>(nLevel), sal::static_int_cast<USHORT>(nEntry) ) : NULL;
+    return pArray ? pArray->GetEntry( sal::static_int_cast<sal_uInt16>(nLevel), sal::static_int_cast<sal_uInt16>(nEntry) ) : NULL;
 }
 
 bool ScOutlineWindow::IsHidden( SCCOLROW nColRowIndex ) const
@@ -269,8 +269,8 @@ size_t ScOutlineWindow::GetLevelFromPos( long nLevelPos ) const
 long ScOutlineWindow::GetColRowPos( SCCOLROW nColRowIndex ) const
 {
     long nDocPos = mbHoriz ?
-        mrViewData.GetScrPos( static_cast<SCCOL>(nColRowIndex), 0, meWhich, TRUE ).X() :
-        mrViewData.GetScrPos( 0, static_cast<SCROW>(nColRowIndex), meWhich, TRUE ).Y();
+        mrViewData.GetScrPos( static_cast<SCCOL>(nColRowIndex), 0, meWhich, sal_True ).X() :
+        mrViewData.GetScrPos( 0, static_cast<SCROW>(nColRowIndex), meWhich, sal_True ).Y();
     return mnMainFirstPos + nDocPos;
 }
 
@@ -413,13 +413,13 @@ bool ScOutlineWindow::ItemHit( const Point& rPos, size_t& rnLevel, size_t& rnEnt
     // --- expand/collapse buttons and expanded lines ---
 
     // search outline entries backwards
-    size_t nEntry = pArray->GetCount( sal::static_int_cast<USHORT>(nLevel) );
+    size_t nEntry = pArray->GetCount( sal::static_int_cast<sal_uInt16>(nLevel) );
     while ( nEntry )
     {
         --nEntry;
 
-        const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<USHORT>(nLevel),
-                                                         sal::static_int_cast<USHORT>(nEntry) );
+        const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<sal_uInt16>(nLevel),
+                                                         sal::static_int_cast<sal_uInt16>(nEntry) );
         SCCOLROW nStart = pEntry->GetStart();
         SCCOLROW nEnd = pEntry->GetEnd();
 
@@ -471,16 +471,16 @@ void ScOutlineWindow::DoFunction( size_t nLevel, size_t nEntry ) const
 {
     ScDBFunc& rFunc = *mrViewData.GetView();
     if ( nEntry == SC_OL_HEADERENTRY )
-        rFunc.SelectLevel( mbHoriz, sal::static_int_cast<USHORT>(nLevel) );
+        rFunc.SelectLevel( mbHoriz, sal::static_int_cast<sal_uInt16>(nLevel) );
     else
     {
         const ScOutlineEntry* pEntry = GetOutlineEntry( nLevel, nEntry );
         if ( pEntry )
         {
             if ( pEntry->IsHidden() )
-                rFunc.ShowOutline( mbHoriz, sal::static_int_cast<USHORT>(nLevel), sal::static_int_cast<USHORT>(nEntry) );
+                rFunc.ShowOutline( mbHoriz, sal::static_int_cast<sal_uInt16>(nLevel), sal::static_int_cast<sal_uInt16>(nEntry) );
             else
-                rFunc.HideOutline( mbHoriz, sal::static_int_cast<USHORT>(nLevel), sal::static_int_cast<USHORT>(nEntry) );
+                rFunc.HideOutline( mbHoriz, sal::static_int_cast<sal_uInt16>(nLevel), sal::static_int_cast<sal_uInt16>(nEntry) );
         }
     }
 }
@@ -542,7 +542,7 @@ void ScOutlineWindow::DrawRectRel(
     DrawRect( GetRectangle( nLevelStart, nEntryStart, nLevelEnd, nEntryEnd ) );
 }
 
-void ScOutlineWindow::DrawImageRel( long nLevelPos, long nEntryPos, USHORT nId )
+void ScOutlineWindow::DrawImageRel( long nLevelPos, long nEntryPos, sal_uInt16 nId )
 {
     DBG_ASSERT( mpSymbols, "ScOutlineWindow::DrawImageRel - no images" );
     const Image& rImage = mpSymbols->GetImage( nId );
@@ -559,7 +559,7 @@ void ScOutlineWindow::DrawBorderRel( size_t nLevel, size_t nEntry, bool bPressed
     if ( GetImagePos( nLevel, nEntry, aPos ) )
     {
         DBG_ASSERT( mpSymbols, "ScOutlineWindow::DrawBorderRel - no images" );
-        USHORT nId = bPressed ? SC_OL_IMAGE_PRESSED : SC_OL_IMAGE_NOTPRESSED;
+        sal_uInt16 nId = bPressed ? SC_OL_IMAGE_PRESSED : SC_OL_IMAGE_NOTPRESSED;
         bool bClip = (nEntry != SC_OL_HEADERENTRY);
         if ( bClip )
             SetEntryAreaClipRegion();
@@ -633,7 +633,7 @@ void ScOutlineWindow::Paint( const Rectangle& /* rRect */ )
     {
         long nEntryPos = GetHeaderEntryPos();
         for ( size_t nLevel = 0; nLevel < nLevelCount; ++nLevel )
-            DrawImageRel( GetLevelPos( nLevel ), nEntryPos, static_cast< USHORT >( nLevel + 1 ) );
+            DrawImageRel( GetLevelPos( nLevel ), nEntryPos, static_cast< sal_uInt16 >( nLevel + 1 ) );
 
         SetLineColor( maLineColor );
         long nLinePos = mnHeaderPos + (mbMirrorEntries ? 0 : (mnHeaderSize - 1));
@@ -652,7 +652,7 @@ void ScOutlineWindow::Paint( const Rectangle& /* rRect */ )
         long nLevelPos = GetLevelPos( nLevel );
         long nEntryPos1 = 0, nEntryPos2 = 0, nImagePos = 0;
 
-        size_t nEntryCount = pArray->GetCount( sal::static_int_cast<USHORT>(nLevel) );
+        size_t nEntryCount = pArray->GetCount( sal::static_int_cast<sal_uInt16>(nLevel) );
         size_t nEntry;
 
         // first draw all lines in the current level
@@ -660,8 +660,8 @@ void ScOutlineWindow::Paint( const Rectangle& /* rRect */ )
         SetFillColor( maLineColor );
         for ( nEntry = 0; nEntry < nEntryCount; ++nEntry )
         {
-            const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<USHORT>(nLevel),
-                                                             sal::static_int_cast<USHORT>(nEntry) );
+            const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<sal_uInt16>(nLevel),
+                                                             sal::static_int_cast<sal_uInt16>(nEntry) );
             SCCOLROW nStart = pEntry->GetStart();
             SCCOLROW nEnd = pEntry->GetEnd();
 
@@ -693,8 +693,8 @@ void ScOutlineWindow::Paint( const Rectangle& /* rRect */ )
         {
             --nEntry;
 
-            const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<USHORT>(nLevel),
-                                                             sal::static_int_cast<USHORT>(nEntry) );
+            const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<sal_uInt16>(nLevel),
+                                                             sal::static_int_cast<sal_uInt16>(nEntry) );
             SCCOLROW nStart = pEntry->GetStart();
 //            SCCOLROW nEnd = pEntry->GetEnd();
 
@@ -706,7 +706,7 @@ void ScOutlineWindow::Paint( const Rectangle& /* rRect */ )
             // draw, if not hidden by higher levels
             if ( bDraw )
             {
-                USHORT nImageId = pEntry->IsHidden() ? SC_OL_IMAGE_PLUS : SC_OL_IMAGE_MINUS;
+                sal_uInt16 nImageId = pEntry->IsHidden() ? SC_OL_IMAGE_PLUS : SC_OL_IMAGE_MINUS;
                 DrawImageRel( nLevelPos, nImagePos, nImageId );
             }
         }
@@ -762,7 +762,7 @@ bool ScOutlineWindow::ImplMoveFocusByEntry( bool bForward, bool bFindVisible )
         return false;
 
     bool bWrapped = false;
-    size_t nEntryCount = pArray->GetCount( sal::static_int_cast<USHORT>(mnFocusLevel) );
+    size_t nEntryCount = pArray->GetCount( sal::static_int_cast<sal_uInt16>(mnFocusLevel) );
     // #i29530# entry count may be decreased after changing active sheet
     if( mnFocusEntry >= nEntryCount )
         mnFocusEntry = SC_OL_HEADERENTRY;
@@ -813,8 +813,8 @@ bool ScOutlineWindow::ImplMoveFocusByLevel( bool bForward )
     }
     else
     {
-        const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<USHORT>(mnFocusLevel),
-                                                         sal::static_int_cast<USHORT>(mnFocusEntry) );
+        const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<sal_uInt16>(mnFocusLevel),
+                                                         sal::static_int_cast<sal_uInt16>(mnFocusEntry) );
         if ( pEntry )
         {
             SCCOLROW nStart = pEntry->GetStart();
@@ -828,8 +828,8 @@ bool ScOutlineWindow::ImplMoveFocusByLevel( bool bForward )
                 // next level -> find first child entry
                 nNewLevel = mnFocusLevel + 1;
                 // TODO - change ScOutlineArray interface to size_t usage
-                USHORT nTmpEntry = 0;
-                bFound = pArray->GetEntryIndexInRange( sal::static_int_cast<USHORT>(nNewLevel), nStart, nEnd, nTmpEntry );
+                sal_uInt16 nTmpEntry = 0;
+                bFound = pArray->GetEntryIndexInRange( sal::static_int_cast<sal_uInt16>(nNewLevel), nStart, nEnd, nTmpEntry );
                 nNewEntry = nTmpEntry;
             }
             else if ( !bForward && (mnFocusLevel > 0) )
@@ -837,8 +837,8 @@ bool ScOutlineWindow::ImplMoveFocusByLevel( bool bForward )
                 // previous level -> find parent entry
                 nNewLevel = mnFocusLevel - 1;
                 // TODO - change ScOutlineArray interface to size_t usage
-                USHORT nTmpEntry = 0;
-                bFound = pArray->GetEntryIndex( sal::static_int_cast<USHORT>(nNewLevel), nStart, nTmpEntry );
+                sal_uInt16 nTmpEntry = 0;
+                bFound = pArray->GetEntryIndex( sal::static_int_cast<sal_uInt16>(nNewLevel), nStart, nTmpEntry );
                 nNewEntry = nTmpEntry;
             }
 
@@ -1000,7 +1000,7 @@ void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt )
     bool bShift = (rKCode.GetModifier() == KEY_SHIFT);
     bool bCtrl = (rKCode.GetModifier() == KEY_MOD1);
 
-    USHORT nCode = rKCode.GetCode();
+    sal_uInt16 nCode = rKCode.GetCode();
     bool bUpDownKey = (nCode == KEY_UP) || (nCode == KEY_DOWN);
     bool bLeftRightKey = (nCode == KEY_LEFT) || (nCode == KEY_RIGHT);
 
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index f0056c634..5a3df57b8 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -90,7 +90,7 @@ private:
     const ScAppOptions&		rOpt;
     const ScStrCollection&	rUsers;
     String					aLastUserName;
-    USHORT					nLastUserIndex;
+    sal_uInt16					nLastUserIndex;
     ColorData				nColor;
 
 public:
@@ -141,7 +141,7 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction )
         {
             aLastUserName = rAction.GetUser();
             StrData aData(aLastUserName);
-            USHORT nIndex;
+            sal_uInt16 nIndex;
             if (!rUsers.Search(&aData, nIndex))
             {
                 // empty string is possible if a name wasn't found while saving a 5.0 file
@@ -182,25 +182,25 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
     pEditObj( NULL ),
     pViewShell( NULL ),
     pDrawView( NULL ), // #114135#
-    bEditMode( FALSE ),
-    bMetaFile( FALSE ),
-    bSingleGrid( FALSE ),
-    bPagebreakMode( FALSE ),
-    bSolidBackground( FALSE ),
-    bUseStyleColor( FALSE ),
+    bEditMode( sal_False ),
+    bMetaFile( sal_False ),
+    bSingleGrid( sal_False ),
+    bPagebreakMode( sal_False ),
+    bSolidBackground( sal_False ),
+    bUseStyleColor( sal_False ),
     bForceAutoColor( SC_MOD()->GetAccessOptions().GetIsAutomaticFontColor() ),
-    bSyntaxMode( FALSE ),
+    bSyntaxMode( sal_False ),
     pValueColor( NULL ),
     pTextColor( NULL ),
     pFormulaColor( NULL ),
     aGridColor( COL_BLACK ),
-    bShowNullValues( TRUE ),
-    bShowFormulas( FALSE ),
-    bShowSpellErrors( FALSE ),
-    bMarkClipped( FALSE ),			// FALSE fuer Drucker/Metafile etc.
-    bSnapPixel( FALSE ),
-    bAnyRotated( FALSE ),
-    bAnyClipped( FALSE ),
+    bShowNullValues( sal_True ),
+    bShowFormulas( sal_False ),
+    bShowSpellErrors( sal_False ),
+    bMarkClipped( sal_False ),			// sal_False fuer Drucker/Metafile etc.
+    bSnapPixel( sal_False ),
+    bAnyRotated( sal_False ),
+    bAnyClipped( sal_False ),
     mpTargetPaintWindow(0) // #i74769# use SdrPaintWindow direct
 {
     if (pZoomX)
@@ -261,27 +261,27 @@ void ScOutputData::SetGridColor( const Color& rColor )
     aGridColor = rColor;
 }
 
-void ScOutputData::SetMarkClipped( BOOL bSet )
+void ScOutputData::SetMarkClipped( sal_Bool bSet )
 {
     bMarkClipped = bSet;
 }
 
-void ScOutputData::SetShowNullValues( BOOL bSet )
+void ScOutputData::SetShowNullValues( sal_Bool bSet )
 {
     bShowNullValues = bSet;
 }
 
-void ScOutputData::SetShowFormulas( BOOL bSet )
+void ScOutputData::SetShowFormulas( sal_Bool bSet )
 {
     bShowFormulas = bSet;
 }
 
-void ScOutputData::SetShowSpellErrors( BOOL bSet )
+void ScOutputData::SetShowSpellErrors( sal_Bool bSet )
 {
     bShowSpellErrors = bSet;
 }
 
-void ScOutputData::SetSnapPixel( BOOL bSet )
+void ScOutputData::SetSnapPixel( sal_Bool bSet )
 {
     bSnapPixel = bSet;
 }
@@ -290,20 +290,20 @@ void ScOutputData::SetEditCell( SCCOL nCol, SCROW nRow )
 {
     nEditCol = nCol;
     nEditRow = nRow;
-    bEditMode = TRUE;
+    bEditMode = sal_True;
 }
 
-void ScOutputData::SetMetaFileMode( BOOL bNewMode )
+void ScOutputData::SetMetaFileMode( sal_Bool bNewMode )
 {
     bMetaFile = bNewMode;
 }
 
-void ScOutputData::SetSingleGrid( BOOL bNewMode )
+void ScOutputData::SetSingleGrid( sal_Bool bNewMode )
 {
     bSingleGrid = bNewMode;
 }
 
-void ScOutputData::SetSyntaxMode( BOOL bNewMode )
+void ScOutputData::SetSyntaxMode( sal_Bool bNewMode )
 {
     bSyntaxMode = bNewMode;
     if (bNewMode)
@@ -315,7 +315,7 @@ void ScOutputData::SetSyntaxMode( BOOL bNewMode )
         }
 }
 
-void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
+void ScOutputData::DrawGrid( sal_Bool bGrid, sal_Bool bPage )
 {
     SCCOL nX;
     SCROW nY;
@@ -325,12 +325,12 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
     ScBreakType nBreak    = BREAK_NONE;
     ScBreakType nBreakOld = BREAK_NONE;
 
-    BOOL bSingle;
+    sal_Bool bSingle;
     Color aPageColor;
     Color aManualColor;
 
     if (bPagebreakMode)
-        bPage = FALSE;			// keine "normalen" Umbrueche ueber volle Breite/Hoehe
+        bPage = sal_False;			// keine "normalen" Umbrueche ueber volle Breite/Hoehe
 
     //!	um den einen Pixel sieht das Metafile (oder die Druck-Ausgabe) anders aus
     //!	als die Bildschirmdarstellung, aber wenigstens passen Druck und Metafile zusammen
@@ -371,7 +371,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
     {
         SCCOL nXplus1 = nX+1;
         SCCOL nXplus2 = nX+2;
-        USHORT nWidth = pRowInfo[0].pCellInfo[nXplus1].nWidth;
+        sal_uInt16 nWidth = pRowInfo[0].pCellInfo[nXplus1].nWidth;
         if (nWidth)
         {
             nPosX += nWidth * nLayoutSign;
@@ -399,7 +399,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
                 }
             }
 
-            BOOL bDraw = bGrid || nBreakOld;	// einfaches Gitter nur wenn eingestellt
+            sal_Bool bDraw = bGrid || nBreakOld;	// einfaches Gitter nur wenn eingestellt
 
             //!	Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
             //!	Umbruch mitten in den Wiederholungsspalten liegt.
@@ -409,13 +409,13 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
             if ( eType == OUTTYPE_PRINTER && !bMetaFile )
             {
                 if ( nX == MAXCOL )
-                    bDraw = FALSE;
+                    bDraw = sal_False;
                 else if (pDoc->HasColBreak(nXplus1, nTab))
-                    bDraw = FALSE;
+                    bDraw = sal_False;
             }
 #endif
 
-            USHORT nWidthXplus2 = pRowInfo[0].pCellInfo[nXplus2].nWidth;
+            sal_uInt16 nWidthXplus2 = pRowInfo[0].pCellInfo[nXplus2].nWidth;
             bSingle = bSingleGrid;									//! in Fillinfo holen !!!!!
             if ( nX<MAXCOL && !bSingle )
             {
@@ -423,9 +423,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
                 for (nArrY=1; nArrY+1<nArrCount && !bSingle; nArrY++)
                 {
                     if (pRowInfo[nArrY].pCellInfo[nXplus2].bHOverlapped)
-                        bSingle = TRUE;
+                        bSingle = sal_True;
                     if (pRowInfo[nArrY].pCellInfo[nXplus1].bHideGrid)
-                        bSingle = TRUE;
+                        bSingle = sal_True;
                 }
             }
 
@@ -444,7 +444,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
                         RowInfo* pThisRowInfo = &pRowInfo[nArrY];
                         nNextY = nPosY + pThisRowInfo->nHeight;
 
-                        BOOL bHOver = pThisRowInfo->pCellInfo[nXplus1].bHideGrid;
+                        sal_Bool bHOver = pThisRowInfo->pCellInfo[nXplus1].bHideGrid;
                         if (!bHOver)
                         {
                             if (nWidthXplus2)
@@ -528,7 +528,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
                 }
             }
 
-            BOOL bDraw = bGrid || nBreakOld;	// einfaches Gitter nur wenn eingestellt
+            sal_Bool bDraw = bGrid || nBreakOld;	// einfaches Gitter nur wenn eingestellt
 
             //!	Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
             //!	Umbruch mitten in den Wiederholungszeilen liegt.
@@ -538,18 +538,18 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
             if ( eType == OUTTYPE_PRINTER && !bMetaFile )
             {
                 if ( nY == MAXROW )
-                    bDraw = FALSE;
+                    bDraw = sal_False;
                 else if (pDoc->HasRowBreak(nYplus1, nTab))
-                    bDraw = FALSE;
+                    bDraw = sal_False;
             }
 #endif
 
-            BOOL bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1);
+            sal_Bool bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1);
             bSingle = !bNextYisNextRow;				// Hidden
             for (SCCOL i=nX1; i<=nX2 && !bSingle; i++)
             {
                 if (pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped)
-                    bSingle = TRUE;
+                    bSingle = sal_True;
             }
 
             if (bDraw)
@@ -568,7 +568,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
                         nNextX = nPosX + pRowInfo[0].pCellInfo[i+1].nWidth * nLayoutSign;
                         if (nNextX != nPosX)								// sichtbar
                         {
-                            BOOL bVOver;
+                            sal_Bool bVOver;
                             if ( bNextYisNextRow )
                                 bVOver = pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped;
                             else
@@ -608,15 +608,15 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
 
 void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData )
 {
-    bPagebreakMode = TRUE;
+    bPagebreakMode = sal_True;
     if (!pPageData)
         return;						// noch nicht initialisiert -> alles "nicht gedruckt"
 
     //	gedruckten Bereich markieren
-    //	(in FillInfo ist schon alles auf FALSE initialisiert)
+    //	(in FillInfo ist schon alles auf sal_False initialisiert)
 
-    USHORT nRangeCount = sal::static_int_cast<USHORT>(pPageData->GetCount());
-    for (USHORT nPos=0; nPos<nRangeCount; nPos++)
+    sal_uInt16 nRangeCount = sal::static_int_cast<sal_uInt16>(pPageData->GetCount());
+    for (sal_uInt16 nPos=0; nPos<nRangeCount; nPos++)
     {
         ScRange aRange = pPageData->GetData( nPos ).GetPrintRange();
 
@@ -632,7 +632,7 @@ void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData )
                                            pThisRowInfo->nRowNo <= nEndY )
             {
                 for (SCCOL nX=nStartX; nX<=nEndX; nX++)
-                    pThisRowInfo->pCellInfo[nX+1].bPrinted = TRUE;
+                    pThisRowInfo->pCellInfo[nX+1].bPrinted = sal_True;
             }
         }
     }
@@ -669,11 +669,11 @@ void ScOutputData::FindRotated()
 
                 if ( pPattern )		// Spalte nicht ausgeblendet
                 {
-                    BYTE nDir = pPattern->GetRotateDir( pCondSet );
+                    sal_uInt8 nDir = pPattern->GetRotateDir( pCondSet );
                     if (nDir != SC_ROTDIR_NONE)
                     {
                         pInfo->nRotateDir = nDir;
-                        bAnyRotated = TRUE;
+                        bAnyRotated = sal_True;
                     }
                 }
             }
@@ -683,12 +683,12 @@ void ScOutputData::FindRotated()
 
 //	----------------------------------------------------------------------------
 
-USHORT lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
+sal_uInt16 lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
 {
     const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab );
     const SfxItemSet* pCondSet = pDoc->GetCondResult( nCol, nRow, nTab );
 
-    USHORT nRet = SC_ROTDIR_NONE;
+    sal_uInt16 nRet = SC_ROTDIR_NONE;
 
     long nAttrRotate = pPattern->GetRotateVal( pCondSet );
     if ( nAttrRotate )
@@ -723,7 +723,7 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow
     const SvxBrushItem* pBackground = (const SvxBrushItem*)
                             &pPattern->GetItem( ATTR_BACKGROUND, pCondSet );
 
-    USHORT nDir = lcl_GetRotateDir( pDoc, nCol, nRow, nTab );
+    sal_uInt16 nDir = lcl_GetRotateDir( pDoc, nCol, nRow, nTab );
 
     //	CENTER wird wie RIGHT behandelt...
     if ( nDir == SC_ROTDIR_RIGHT || nDir == SC_ROTDIR_CENTER )
@@ -756,12 +756,12 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow
 
 //	----------------------------------------------------------------------------
 
-BOOL lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther,
-                    SCCOL nX1, SCCOL nX2, BOOL bShowProt, BOOL bPagebreakMode )
+sal_Bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther,
+                    SCCOL nX1, SCCOL nX2, sal_Bool bShowProt, sal_Bool bPagebreakMode )
 {
     if ( rFirst.bChanged   != rOther.bChanged ||
          rFirst.bEmptyBack != rOther.bEmptyBack )
-        return FALSE;
+        return sal_False;
 
     SCCOL nX;
     if ( bShowProt )
@@ -772,27 +772,27 @@ BOOL lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther,
             const ScPatternAttr* pPat2 = rOther.pCellInfo[nX+1].pPatternAttr;
             if ( !pPat1 || !pPat2 ||
                     &pPat1->GetItem(ATTR_PROTECTION) != &pPat2->GetItem(ATTR_PROTECTION) )
-                return FALSE;
+                return sal_False;
         }
     }
     else
     {
         for ( nX=nX1; nX<=nX2; nX++ )
             if ( rFirst.pCellInfo[nX+1].pBackground != rOther.pCellInfo[nX+1].pBackground )
-                return FALSE;
+                return sal_False;
     }
 
     if ( rFirst.nRotMaxCol != SC_ROTMAX_NONE || rOther.nRotMaxCol != SC_ROTMAX_NONE )
         for ( nX=nX1; nX<=nX2; nX++ )
             if ( rFirst.pCellInfo[nX+1].nRotateDir != rOther.pCellInfo[nX+1].nRotateDir )
-                return FALSE;
+                return sal_False;
 
     if ( bPagebreakMode )
         for ( nX=nX1; nX<=nX2; nX++ )
             if ( rFirst.pCellInfo[nX+1].bPrinted != rOther.pCellInfo[nX+1].bPrinted )
-                return FALSE;
+                return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScOutputData::DrawBackground()
@@ -817,11 +817,11 @@ void ScOutputData::DrawBackground()
 
     pDev->SetLineColor();
 
-    BOOL bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);
-    BOOL bDoAll = bShowProt || bPagebreakMode || bSolidBackground;
+    sal_Bool bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);
+    sal_Bool bDoAll = bShowProt || bPagebreakMode || bSolidBackground;
 
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor &&
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
+    sal_Bool bCellContrast = bUseStyleColor &&
             Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
     long nPosY = nScrY;
@@ -934,16 +934,16 @@ void ScOutputData::DrawBackground()
 
 void ScOutputData::DrawShadow()
 {
-    DrawExtraShadow( FALSE, FALSE, FALSE, FALSE );
+    DrawExtraShadow( sal_False, sal_False, sal_False, sal_False );
 }
 
-void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom)
+void ScOutputData::DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRight, sal_Bool bBottom)
 {
     pDev->SetLineColor();
 
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
+    sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
     Color aAutoTextColor;
     if ( bCellContrast )
         aAutoTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
@@ -960,8 +960,8 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot
     long nPosY = nScrY - pRowInfo[0].nHeight;
     for (SCSIZE nArrY=0; nArrY<nArrCount; nArrY++)
     {
-        BOOL bCornerY = ( nArrY == 0 ) || ( nArrY+1 == nArrCount );
-        BOOL bSkipY = ( nArrY==0 && !bTop ) || ( nArrY+1 == nArrCount && !bBottom );
+        sal_Bool bCornerY = ( nArrY == 0 ) || ( nArrY+1 == nArrCount );
+        sal_Bool bSkipY = ( nArrY==0 && !bTop ) || ( nArrY+1 == nArrCount && !bBottom );
 
         RowInfo* pThisRowInfo = &pRowInfo[nArrY];
         long nRowHeight = pThisRowInfo->nHeight;
@@ -971,10 +971,10 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot
             long nPosX = nInitPosX - pRowInfo[0].pCellInfo[nX1].nWidth * nLayoutSign;
             for (SCCOL nArrX=nX1; nArrX<=nX2+2; nArrX++)
             {
-                BOOL bCornerX = ( nArrX==nX1 || nArrX==nX2+2 );
-                BOOL bSkipX = ( nArrX==nX1 && !bLeft ) || ( nArrX==nX2+2 && !bRight );
+                sal_Bool bCornerX = ( nArrX==nX1 || nArrX==nX2+2 );
+                sal_Bool bSkipX = ( nArrX==nX1 && !bLeft ) || ( nArrX==nX2+2 && !bRight );
 
-                for (USHORT nPass=0; nPass<2; nPass++)			// horizontal / vertikal
+                for (sal_uInt16 nPass=0; nPass<2; nPass++)			// horizontal / vertikal
                 {
                     const SvxShadowItem* pAttr = nPass ?
                             pThisRowInfo->pCellInfo[nArrX].pVShadowOrigin :
@@ -985,10 +985,10 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot
                                 pThisRowInfo->pCellInfo[nArrX].eVShadowPart :
                                 pThisRowInfo->pCellInfo[nArrX].eHShadowPart;
 
-                        BOOL bDo = TRUE;
+                        sal_Bool bDo = sal_True;
                         if ( (nPass==0 && bCornerX) || (nPass==1 && bCornerY) )
                             if ( ePart != SC_SHADOW_CORNER )
-                                bDo = FALSE;
+                                bDo = sal_False;
 
                         if (bDo)
                         {
@@ -1145,20 +1145,20 @@ long lclGetSnappedY( OutputDevice& rDev, long nPosY, bool bSnapPixel )
     return (bSnapPixel && nPosY) ? rDev.PixelToLogic( rDev.LogicToPixel( Size( 0, nPosY ) ) ).Height() : nPosY;
 }
 
-size_t lclGetArrayColFromCellInfoX( USHORT nCellInfoX, USHORT nCellInfoFirstX, USHORT nCellInfoLastX, bool bRTL )
+size_t lclGetArrayColFromCellInfoX( sal_uInt16 nCellInfoX, sal_uInt16 nCellInfoFirstX, sal_uInt16 nCellInfoLastX, bool bRTL )
 {
     return static_cast< size_t >( bRTL ? (nCellInfoLastX + 2 - nCellInfoX) : (nCellInfoX - nCellInfoFirstX) );
 }
 
 void ScOutputData::DrawFrame()
 {
-    ULONG nOldDrawMode = pDev->GetDrawMode();
+    sal_uLong nOldDrawMode = pDev->GetDrawMode();
 
     Color aSingleColor;
-    BOOL bUseSingleColor = FALSE;
+    sal_Bool bUseSingleColor = sal_False;
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
+    sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
 
     //	#107519# if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used
     //	for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines
@@ -1169,18 +1169,18 @@ void ScOutputData::DrawFrame()
     {
         pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_WHITEFILL) );
         aSingleColor.SetColor( COL_BLACK );
-        bUseSingleColor = TRUE;
+        bUseSingleColor = sal_True;
     }
     else if ( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) )
     {
         pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) );
         aSingleColor = rStyleSettings.GetWindowTextColor();		// same as used in VCL for DRAWMODE_SETTINGSLINE
-        bUseSingleColor = TRUE;
+        bUseSingleColor = sal_True;
     }
     else if ( bCellContrast )
     {
         aSingleColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
-        bUseSingleColor = TRUE;
+        bUseSingleColor = sal_True;
     }
 
     const Color* pForceColor = bUseSingleColor ? &aSingleColor : 0;
@@ -1229,7 +1229,7 @@ void ScOutputData::DrawFrame()
     // set X offset for left-to-right sheets; for right-to-left sheets this is done after for() loop
     if( !bLayoutRTL )
         rArray.SetXOffset( nOldSnapX );
-    for( USHORT nInfoIdx = nX1; nInfoIdx <= nX2 + 2; ++nInfoIdx )
+    for( sal_uInt16 nInfoIdx = nX1; nInfoIdx <= nX2 + 2; ++nInfoIdx )
     {
         size_t nCol = lclGetArrayColFromCellInfoX( nInfoIdx, nX1, nX2, bLayoutRTL );
         long nNewPosX = nOldPosX + pRowInfo[ 0 ].pCellInfo[ nInfoIdx ].nWidth * nLayoutSign;
@@ -1273,13 +1273,13 @@ void ScOutputData::DrawFrame()
 //	Linie unter der Zelle
 
 const SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc,
-                        SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nRotDir,
-                        BOOL bTopLine )
+                        SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nRotDir,
+                        sal_Bool bTopLine )
 {
     if ( nRotDir != SC_ROTDIR_LEFT && nRotDir != SC_ROTDIR_RIGHT )
         return NULL;
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     while (!bFound)
     {
         if ( nRotDir == SC_ROTDIR_LEFT )
@@ -1303,7 +1303,7 @@ const SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc,
         if ( !pPattern->GetRotateVal( pCondSet ) ||
                 ((const SvxRotateModeItem&)pPattern->GetItem(
                     ATTR_ROTATE_MODE, pCondSet)).GetValue() == SVX_ROTATE_MODE_STANDARD )
-            bFound = TRUE;
+            bFound = sal_True;
     }
 
     if (bTopLine)
@@ -1421,8 +1421,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
     const SfxItemSet*	 pCondSet;
 
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
+    sal_Bool bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
 
     //	color (pForceColor) is determined externally, including DrawMode changes
 
@@ -1470,7 +1470,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
             {
                 if (nX==nX1) nPosX = nInitPosX;		// calculated individually for preceding positions
 
-                USHORT nArrX = nX + 1;
+                sal_uInt16 nArrX = nX + 1;
 
                 CellInfo* pInfo = &rThisRowInfo.pCellInfo[nArrX];
                 long nColWidth = pRowInfo[0].pCellInfo[nArrX].nWidth;
@@ -1628,7 +1628,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
             nX = nX1 > 0 ? (nX1-1) : static_cast<SCCOL>(0);
             for (; nX<=nX2+1; nX++)			// sichtbarer Teil +- 1
             {
-                USHORT nArrX = nX + 1;
+                sal_uInt16 nArrX = nX + 1;
                 CellInfo& rInfo = rThisRowInfo.pCellInfo[nArrX];
                 if ( rInfo.nRotateDir > SC_ROTDIR_STANDARD &&
                         !rInfo.bHOverlapped && !rInfo.bVOverlapped )
@@ -1642,17 +1642,17 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
 
                     //	horizontal: angrenzende Linie verlaengern
                     //	(nur, wenn die gedrehte Zelle eine Umrandung hat)
-                    USHORT nDir = rInfo.nRotateDir;
+                    sal_uInt16 nDir = rInfo.nRotateDir;
                     if ( rArray.GetCellStyleTop( nCol, nRow ).Prim() && eRotMode != SVX_ROTATE_MODE_TOP )
                     {
-                        svx::frame::Style aStyle( lcl_FindHorLine( pDoc, nX, nY, nTab, nDir, TRUE ), nPPTY );
+                        svx::frame::Style aStyle( lcl_FindHorLine( pDoc, nX, nY, nTab, nDir, sal_True ), nPPTY );
                         rArray.SetCellStyleTop( nCol, nRow, aStyle );
                         if( nRow > 0 )
                             rArray.SetCellStyleBottom( nCol, nRow - 1, aStyle );
                     }
                     if ( rArray.GetCellStyleBottom( nCol, nRow ).Prim() && eRotMode != SVX_ROTATE_MODE_BOTTOM )
                     {
-                        svx::frame::Style aStyle( lcl_FindHorLine( pDoc, nX, nY, nTab, nDir, FALSE ), nPPTY );
+                        svx::frame::Style aStyle( lcl_FindHorLine( pDoc, nX, nY, nTab, nDir, sal_False ), nPPTY );
                         rArray.SetCellStyleBottom( nCol, nRow, aStyle );
                         if( nRow + 1 < rArray.GetRowCount() )
                             rArray.SetCellStyleTop( nCol, nRow + 1, aStyle );
@@ -1697,7 +1697,7 @@ PolyPolygon ScOutputData::GetChangedArea()
     aDrawingRect.Left() = nScrX;
     aDrawingRect.Right() = nScrX+nScrW-1;
 
-    BOOL	bHad	= FALSE;
+    sal_Bool	bHad	= sal_False;
     long	nPosY	= nScrY;
     SCSIZE	nArrY;
     for (nArrY=1; nArrY+1<nArrCount; nArrY++)
@@ -1709,14 +1709,14 @@ PolyPolygon ScOutputData::GetChangedArea()
             if (!bHad)
             {
                 aDrawingRect.Top() = nPosY;
-                bHad = TRUE;
+                bHad = sal_True;
             }
             aDrawingRect.Bottom() = nPosY + pRowInfo[nArrY].nHeight - 1;
         }
         else if (bHad)
         {
             aPoly.Insert( Polygon( pDev->PixelToLogic(aDrawingRect) ) );
-            bHad = FALSE;
+            bHad = sal_False;
         }
         nPosY += pRowInfo[nArrY].nHeight;
     }
@@ -1727,7 +1727,7 @@ PolyPolygon ScOutputData::GetChangedArea()
     return aPoly;
 }
 
-BOOL ScOutputData::SetChangedClip()
+sal_Bool ScOutputData::SetChangedClip()
 {
     PolyPolygon aPoly;
 
@@ -1735,7 +1735,7 @@ BOOL ScOutputData::SetChangedClip()
     aDrawingRect.Left() = nScrX;
     aDrawingRect.Right() = nScrX+nScrW-1;
 
-    BOOL	bHad	= FALSE;
+    sal_Bool	bHad	= sal_False;
     long	nPosY	= nScrY;
     SCSIZE	nArrY;
     for (nArrY=1; nArrY+1<nArrCount; nArrY++)
@@ -1747,14 +1747,14 @@ BOOL ScOutputData::SetChangedClip()
             if (!bHad)
             {
                 aDrawingRect.Top() = nPosY;
-                bHad = TRUE;
+                bHad = sal_True;
             }
             aDrawingRect.Bottom() = nPosY + pRowInfo[nArrY].nHeight - 1;
         }
         else if (bHad)
         {
             aPoly.Insert( Polygon( pDev->PixelToLogic(aDrawingRect) ) );
-            bHad = FALSE;
+            bHad = sal_False;
         }
         nPosY += pRowInfo[nArrY].nHeight;
     }
@@ -1762,7 +1762,7 @@ BOOL ScOutputData::SetChangedClip()
     if (bHad)
         aPoly.Insert( Polygon( pDev->PixelToLogic(aDrawingRect) ) );
 
-    BOOL bRet = (aPoly.Count() != 0);
+    sal_Bool bRet = (aPoly.Count() != 0);
     if (bRet)
         pDev->SetClipRegion(Region(aPoly));
     return bRet;
@@ -1773,12 +1773,12 @@ void ScOutputData::FindChanged()
     SCCOL	nX;
     SCSIZE	nArrY;
 
-    BOOL bWasIdleDisabled = pDoc->IsIdleDisabled();
-    pDoc->DisableIdle( TRUE );
+    sal_Bool bWasIdleDisabled = pDoc->IsIdleDisabled();
+    pDoc->DisableIdle( sal_True );
     for (nArrY=0; nArrY<nArrCount; nArrY++)
-        pRowInfo[nArrY].bChanged = FALSE;
+        pRowInfo[nArrY].bChanged = sal_False;
 
-    BOOL bProgress = FALSE;
+    sal_Bool bProgress = sal_False;
     for (nArrY=0; nArrY<nArrCount; nArrY++)
     {
         RowInfo* pThisRowInfo = &pRowInfo[nArrY];
@@ -1791,22 +1791,22 @@ void ScOutputData::FindChanged()
                     ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
                     if ( !bProgress && pFCell->GetDirty() )
                     {
-                        ScProgress::CreateInterpretProgress( pDoc, TRUE );
-                        bProgress = TRUE;
+                        ScProgress::CreateInterpretProgress( pDoc, sal_True );
+                        bProgress = sal_True;
                     }
                     if (!pFCell->IsRunning())
                     {
                         (void)pFCell->GetValue();
                         if (pFCell->IsChanged())
                         {
-                            pThisRowInfo->bChanged = TRUE;
+                            pThisRowInfo->bChanged = sal_True;
                             if ( pThisRowInfo->pCellInfo[nX+1].bMerged )
                             {
                                 SCSIZE nOverY = nArrY + 1;
                                 while ( nOverY<nArrCount &&
                                         pRowInfo[nOverY].pCellInfo[nX+1].bVOverlapped )
                                 {
-                                    pRowInfo[nOverY].bChanged = TRUE;
+                                    pRowInfo[nOverY].bChanged = sal_True;
                                     ++nOverY;
                                 }
                             }
@@ -1843,7 +1843,7 @@ void ScOutputData::DrawMark( Window* pWin )
             else
                 aRect.Right() = aRect.Left() - 1;
 
-            BOOL bOldMarked = FALSE;
+            sal_Bool bOldMarked = sal_False;
             for (SCCOL nX=nX1; nX<=nX2; nX++)
             {
                 if (pThisRowInfo->pCellInfo[nX+1].bMarked != bOldMarked)
@@ -1880,7 +1880,7 @@ void ScOutputData::DrawMark( Window* pWin )
 
 void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
                                 SCCOL nRefEndX, SCROW nRefEndY,
-                                const Color& rColor, BOOL bHandle )
+                                const Color& rColor, sal_Bool bHandle )
 {
     PutInOrder( nRefStartX, nRefEndX );
     PutInOrder( nRefStartY, nRefEndY );
@@ -1903,14 +1903,14 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
         }
         long nLayoutSign = bLayoutRTL ? -1 : 1;
 
-        BOOL bTop    = FALSE;
-        BOOL bBottom = FALSE;
-        BOOL bLeft   = FALSE;
-        BOOL bRight	 = FALSE;
+        sal_Bool bTop    = sal_False;
+        sal_Bool bBottom = sal_False;
+        sal_Bool bLeft   = sal_False;
+        sal_Bool bRight	 = sal_False;
 
         long nPosY = nScrY;
-        BOOL bNoStartY = ( nY1 < nRefStartY );
-        BOOL bNoEndY   = FALSE;
+        sal_Bool bNoStartY = ( nY1 < nRefStartY );
+        sal_Bool bNoEndY   = sal_False;
         for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++)		// loop to end for bNoEndY check
         {
             SCROW nY = pRowInfo[nArrY].nRowNo;
@@ -1918,17 +1918,17 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
             if ( nY==nRefStartY || (nY>nRefStartY && bNoStartY) )
             {
                 nMinY = nPosY;
-                bTop = TRUE;
+                bTop = sal_True;
             }
             if ( nY==nRefEndY )
             {
                 nMaxY = nPosY + pRowInfo[nArrY].nHeight - 2;
-                bBottom = TRUE;
+                bBottom = sal_True;
             }
             if ( nY>nRefEndY && bNoEndY )
             {
                 nMaxY = nPosY-2;
-                bBottom = TRUE;
+                bBottom = sal_True;
             }
             bNoStartY = ( nY < nRefStartY );
             bNoEndY   = ( nY < nRefEndY );
@@ -1944,12 +1944,12 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
             if ( nX==nRefStartX )
             {
                 nMinX = nPosX;
-                bLeft = TRUE;
+                bLeft = sal_True;
             }
             if ( nX==nRefEndX )
             {
                 nMaxX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - 2 ) * nLayoutSign;
-                bRight = TRUE;
+                bRight = sal_True;
             }
             nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
         }
@@ -1986,7 +1986,7 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
 
 void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
                                 SCCOL nRefEndX, SCROW nRefEndY,
-                                const Color& rColor, USHORT nType )
+                                const Color& rColor, sal_uInt16 nType )
 {
     PutInOrder( nRefStartX, nRefEndX );
     PutInOrder( nRefStartY, nRefEndY );
@@ -2009,14 +2009,14 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
         }
         long nLayoutSign = bLayoutRTL ? -1 : 1;
 
-        BOOL bTop    = FALSE;
-        BOOL bBottom = FALSE;
-        BOOL bLeft   = FALSE;
-        BOOL bRight	 = FALSE;
+        sal_Bool bTop    = sal_False;
+        sal_Bool bBottom = sal_False;
+        sal_Bool bLeft   = sal_False;
+        sal_Bool bRight	 = sal_False;
 
         long nPosY = nScrY;
-        BOOL bNoStartY = ( nY1 < nRefStartY );
-        BOOL bNoEndY   = FALSE;
+        sal_Bool bNoStartY = ( nY1 < nRefStartY );
+        sal_Bool bNoEndY   = sal_False;
         for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++)		// loop to end for bNoEndY check
         {
             SCROW nY = pRowInfo[nArrY].nRowNo;
@@ -2024,17 +2024,17 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
             if ( nY==nRefStartY || (nY>nRefStartY && bNoStartY) )
             {
                 nMinY = nPosY - 1;
-                bTop = TRUE;
+                bTop = sal_True;
             }
             if ( nY==nRefEndY )
             {
                 nMaxY = nPosY + pRowInfo[nArrY].nHeight - 1;
-                bBottom = TRUE;
+                bBottom = sal_True;
             }
             if ( nY>nRefEndY && bNoEndY )
             {
                 nMaxY = nPosY - 1;
-                bBottom = TRUE;
+                bBottom = sal_True;
             }
             bNoStartY = ( nY < nRefStartY );
             bNoEndY   = ( nY < nRefEndY );
@@ -2050,12 +2050,12 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
             if ( nX==nRefStartX )
             {
                 nMinX = nPosX - nLayoutSign;
-                bLeft = TRUE;
+                bLeft = sal_True;
             }
             if ( nX==nRefEndX )
             {
                 nMaxX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - 1 ) * nLayoutSign;
-                bRight = TRUE;
+                bRight = sal_True;
             }
             nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
         }
@@ -2064,9 +2064,9 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
              nMaxY >= nMinY )
         {
             if ( nType == SC_CAT_DELETE_ROWS )
-                bLeft = bRight = bBottom = FALSE;		//! dicke Linie ???
+                bLeft = bRight = bBottom = sal_False;		//! dicke Linie ???
             else if ( nType == SC_CAT_DELETE_COLS )
-                bTop = bBottom = bRight = FALSE;		//! dicke Linie ???
+                bTop = bBottom = bRight = sal_False;		//! dicke Linie ???
 
             pDev->SetLineColor( rColor );
             if (bTop && bBottom && bLeft && bRight)
@@ -2143,7 +2143,7 @@ void ScOutputData::DrawChangeTrack()
                     aColorChanger.Update( *pAction );
                     Color aColor( aColorChanger.GetColor() );
                     DrawOneChange( aRange.aStart.Col(), aRange.aStart.Row(),
-                                    aRange.aEnd.Col(), aRange.aEnd.Row(), aColor, sal::static_int_cast<USHORT>(eActionType) );
+                                    aRange.aEnd.Col(), aRange.aEnd.Row(), aColor, sal::static_int_cast<sal_uInt16>(eActionType) );
 
                 }
             }
@@ -2159,7 +2159,7 @@ void ScOutputData::DrawChangeTrack()
                     aColorChanger.Update( *pAction );
                     Color aColor( aColorChanger.GetColor() );
                     DrawOneChange( aRange.aStart.Col(), aRange.aStart.Row(),
-                                    aRange.aEnd.Col(), aRange.aEnd.Row(), aColor, sal::static_int_cast<USHORT>(eActionType) );
+                                    aRange.aEnd.Col(), aRange.aEnd.Row(), aColor, sal::static_int_cast<sal_uInt16>(eActionType) );
                 }
             }
         }
@@ -2170,7 +2170,7 @@ void ScOutputData::DrawChangeTrack()
 
 void ScOutputData::DrawNoteMarks()
 {
-    BOOL bFirst = TRUE;
+    sal_Bool bFirst = sal_True;
 
     long nInitPosX = nScrX;
     if ( bLayoutRTL )
@@ -2188,12 +2188,12 @@ void ScOutputData::DrawNoteMarks()
             {
                 CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
                 ScBaseCell* pCell = pInfo->pCell;
-                BOOL bIsMerged = FALSE;
+                sal_Bool bIsMerged = sal_False;
 
                 if ( nX==nX1 && pInfo->bHOverlapped && !pInfo->bVOverlapped )
                 {
                     // find start of merged cell
-                    bIsMerged = TRUE;
+                    bIsMerged = sal_True;
                     SCROW nY = pRowInfo[nArrY].nRowNo;
                     SCCOL nMergeX = nX;
                     SCROW nMergeY = nY;
@@ -2215,7 +2215,7 @@ void ScOutputData::DrawNoteMarks()
                         else
                             pDev->SetFillColor(COL_LIGHTRED);
 
-                        bFirst = FALSE;
+                        bFirst = sal_False;
                     }
 
                     long nMarkX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - 4 ) * nLayoutSign;
@@ -2266,7 +2266,7 @@ void ScOutputData::AddPDFNotes()
             {
                 CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
                 ScBaseCell* pCell = pInfo->pCell;
-                BOOL bIsMerged = FALSE;
+                sal_Bool bIsMerged = sal_False;
                 SCROW nY = pRowInfo[nArrY].nRowNo;
                 SCCOL nMergeX = nX;
                 SCROW nMergeY = nY;
@@ -2274,7 +2274,7 @@ void ScOutputData::AddPDFNotes()
                 if ( nX==nX1 && pInfo->bHOverlapped && !pInfo->bVOverlapped )
                 {
                     // find start of merged cell
-                    bIsMerged = TRUE;
+                    bIsMerged = sal_True;
                     pDoc->ExtendOverlapped( nMergeX, nMergeY, nX, nY, nTab );
                     pCell = pDoc->GetCell( ScAddress(nMergeX,nMergeY,nTab) );
                     // use origin's pCell for NotePtr test below
@@ -2334,7 +2334,7 @@ void ScOutputData::DrawClipMarks()
 
     Color aArrowFillCol( COL_LIGHTRED );
 
-    ULONG nOldDrawMode = pDev->GetDrawMode();
+    sal_uLong nOldDrawMode = pDev->GetDrawMode();
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     if ( bUseStyleColor && rStyleSettings.GetHighContrastMode() )
     {
@@ -2447,7 +2447,7 @@ void ScOutputData::DrawClipMarks()
                         pDev->DrawRect(aMarkRect);
                         //!	Test
 #endif
-                        SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, TRUE );
+                        SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, sal_True );
                     }
                     if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_LEFT : SC_CLIPMARK_RIGHT ) )
                     {
@@ -2460,7 +2460,7 @@ void ScOutputData::DrawClipMarks()
                         pDev->DrawRect(aMarkRect);
                         //!	Test
 #endif
-                        SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, FALSE );
+                        SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, sal_False );
                     }
                 }
                 nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth * nLayoutSign;
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index aff5a5abe..65a011fec 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -84,7 +84,7 @@
 
 #define DRAWTEXT_MAX	32767
 
-const USHORT SC_SHRINKAGAIN_MAX = 7;
+const sal_uInt16 SC_SHRINKAGAIN_MAX = 7;
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -105,8 +105,8 @@ class ScDrawStringsVars
     SvxCellHorJustify	eAttrHorJust;
     SvxCellVerJustify	eAttrVerJust;
     const SvxMarginItem* pMargin;
-    USHORT				nIndent;
-    BOOL				bRotated;
+    sal_uInt16				nIndent;
+    sal_Bool				bRotated;
 
     String				aString;				// Inhalte
     Size				aTextSize;
@@ -117,28 +117,28 @@ class ScDrawStringsVars
     long                nExpWidth;
 
     ScBaseCell*			pLastCell;
-    ULONG				nValueFormat;
-    BOOL				bLineBreak;
-    BOOL                bRepeat;
-    BOOL                bShrink;
+    sal_uLong				nValueFormat;
+    sal_Bool				bLineBreak;
+    sal_Bool                bRepeat;
+    sal_Bool                bShrink;
 
-    BOOL				bPixelToLogic;
-    BOOL				bCellContrast;
+    sal_Bool				bPixelToLogic;
+    sal_Bool				bCellContrast;
 
     Color				aBackConfigColor;		// used for ScPatternAttr::GetFont calls
     Color				aTextConfigColor;
 
 public:
-                ScDrawStringsVars(ScOutputData* pData, BOOL bPTL);
+                ScDrawStringsVars(ScOutputData* pData, sal_Bool bPTL);
                 ~ScDrawStringsVars();
 
                 //	SetPattern = ex-SetVars
                 //	SetPatternSimple: ohne Font
 
-    void		SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, ScBaseCell* pCell, BYTE nScript );
+    void		SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, ScBaseCell* pCell, sal_uInt8 nScript );
     void		SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet );
 
-    BOOL		SetText( ScBaseCell* pCell );	// TRUE -> pOldPattern vergessen
+    sal_Bool		SetText( ScBaseCell* pCell );	// sal_True -> pOldPattern vergessen
     void        SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth );
     void		SetAutoText( const String& rAutoText );
 
@@ -148,26 +148,26 @@ public:
     SvxCellVerJustify		GetVerJust() const		{ return eAttrVerJust; }
     const SvxMarginItem*	GetMargin() const		{ return pMargin; }
 
-    USHORT	GetLeftTotal() const		{ return pMargin->GetLeftMargin() + nIndent; }
+    sal_uInt16	GetLeftTotal() const		{ return pMargin->GetLeftMargin() + nIndent; }
 
     const String&			GetString() const		{ return aString; }
     const Size&				GetTextSize() const		{ return aTextSize; }
     long					GetOriginalWidth() const { return nOriginalWidth; }
 
-    ULONG	GetValueFormat() const					{ return nValueFormat; }
-    BOOL	GetLineBreak() const					{ return bLineBreak; }
-    BOOL    IsRepeat() const                        { return bRepeat; }
-    BOOL    IsShrink() const                        { return bShrink; }
+    sal_uLong	GetValueFormat() const					{ return nValueFormat; }
+    sal_Bool	GetLineBreak() const					{ return bLineBreak; }
+    sal_Bool    IsRepeat() const                        { return bRepeat; }
+    sal_Bool    IsShrink() const                        { return bShrink; }
 
     long	GetAscent() const	{ return nAscentPixel; }
-    BOOL	IsRotated() const	{ return bRotated; }
+    sal_Bool	IsRotated() const	{ return bRotated; }
 
-    void    SetShrinkScale( long nScale, BYTE nScript );
+    void    SetShrinkScale( long nScale, sal_uInt8 nScript );
 
-    BOOL	HasCondHeight() const	{ return pCondSet && SFX_ITEM_SET ==
-                                        pCondSet->GetItemState( ATTR_FONT_HEIGHT, TRUE ); }
+    sal_Bool	HasCondHeight() const	{ return pCondSet && SFX_ITEM_SET ==
+                                        pCondSet->GetItemState( ATTR_FONT_HEIGHT, sal_True ); }
 
-    BOOL    HasEditCharacters() const;
+    sal_Bool    HasEditCharacters() const;
 
 private:
     void        SetHashText();
@@ -180,7 +180,7 @@ private:
 
 //==================================================================
 
-ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, BOOL bPTL) :
+ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, sal_Bool bPTL) :
     pOutput		( pData ),
     pPattern	( NULL ),
     pCondSet	( NULL ),
@@ -189,7 +189,7 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, BOOL bPTL) :
     eAttrVerJust( SVX_VER_JUSTIFY_BOTTOM ),
     pMargin		( NULL ),
     nIndent		( 0 ),
-    bRotated	( FALSE ),
+    bRotated	( sal_False ),
     nOriginalWidth( 0 ),
     nMaxDigitWidth( 0 ),
     nSignWidth( 0 ),
@@ -197,13 +197,13 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, BOOL bPTL) :
     nExpWidth( 0 ),
     pLastCell	( NULL ),
     nValueFormat( 0 ),
-    bLineBreak	( FALSE ),
-    bRepeat     ( FALSE ),
-    bShrink     ( FALSE ),
+    bLineBreak	( sal_False ),
+    bRepeat     ( sal_False ),
+    bShrink     ( sal_False ),
     bPixelToLogic( bPTL )
 {
     ScModule* pScMod = SC_MOD();
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
     bCellContrast = pOutput->bUseStyleColor &&
             Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
@@ -216,7 +216,7 @@ ScDrawStringsVars::~ScDrawStringsVars()
 {
 }
 
-void ScDrawStringsVars::SetShrinkScale( long nScale, BYTE nScript )
+void ScDrawStringsVars::SetShrinkScale( long nScale, sal_uInt8 nScript )
 {
     // text remains valid, size is updated
 
@@ -259,7 +259,7 @@ void ScDrawStringsVars::SetShrinkScale( long nScale, BYTE nScript )
 }
 
 void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet,
-                                    ScBaseCell* pCell, BYTE nScript )
+                                    ScBaseCell* pCell, sal_uInt8 nScript )
 {
     nMaxDigitWidth = 0;
     nSignWidth     = 0;
@@ -335,20 +335,20 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
             break;
         case SVX_ORIENTATION_STACKED:
             nRot = 0;
-            bRotated = FALSE;
+            bRotated = sal_False;
             break;
         case SVX_ORIENTATION_TOPBOTTOM:
             nRot = 2700;
-            bRotated = FALSE;
+            bRotated = sal_False;
             break;
         case SVX_ORIENTATION_BOTTOMTOP:
             nRot = 900;
-            bRotated = FALSE;
+            bRotated = sal_False;
             break;
         default:
             DBG_ERROR("Falscher SvxCellOrientation Wert");
             nRot = 0;
-            bRotated = FALSE;
+            bRotated = sal_False;
             break;
     }
     aFont.SetOrientation( nRot );
@@ -390,7 +390,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
 
     //	Zahlenformat
 
-//    ULONG nOld = nValueFormat;
+//    sal_uLong nOld = nValueFormat;
     nValueFormat = pPattern->GetNumberFormat( pOutput->pDoc->GetFormatTable(), pCondSet );
 
 /*	s.u.
@@ -428,13 +428,13 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
 
     //	Zahlenformat
 
-    ULONG nOld = nValueFormat;
+    sal_uLong nOld = nValueFormat;
 //	nValueFormat = pPattern->GetNumberFormat( pFormatter );
     const SfxPoolItem* pFormItem;
-    if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,TRUE,&pFormItem) != SFX_ITEM_SET )
+    if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,sal_True,&pFormItem) != SFX_ITEM_SET )
         pFormItem = &pPattern->GetItem(ATTR_VALUE_FORMAT);
     const SfxPoolItem* pLangItem;
-    if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,TRUE,&pLangItem) != SFX_ITEM_SET )
+    if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,sal_True,&pLangItem) != SFX_ITEM_SET )
         pLangItem = &pPattern->GetItem(ATTR_LANGUAGE_FORMAT);
     nValueFormat = pOutput->pDoc->GetFormatTable()->GetFormatForLanguageIfBuiltIn(
                     ((SfxUInt32Item*)pFormItem)->GetValue(),
@@ -457,16 +457,16 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
     bShrink = static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue();
 }
 
-inline BOOL SameValue( ScBaseCell* pCell, ScBaseCell* pOldCell )	// pCell ist != 0
+inline sal_Bool SameValue( ScBaseCell* pCell, ScBaseCell* pOldCell )	// pCell ist != 0
 {
     return pOldCell && pOldCell->GetCellType() == CELLTYPE_VALUE &&
             pCell->GetCellType() == CELLTYPE_VALUE &&
             ((ScValueCell*)pCell)->GetValue() == ((ScValueCell*)pOldCell)->GetValue();
 }
 
-BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell )
+sal_Bool ScDrawStringsVars::SetText( ScBaseCell* pCell )
 {
-    BOOL bChanged = FALSE;
+    sal_Bool bChanged = sal_False;
 
     if (pCell)
     {
@@ -475,7 +475,7 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell )
             pLastCell = pCell;			//	Zelle merken
 
             Color* pColor;
-            ULONG nFormat = GetValueFormat();
+            sal_uLong nFormat = GetValueFormat();
             ScCellFormat::GetString( pCell,
                                      nFormat, aString, &pColor,
                                      *pOutput->pDoc->GetFormatTable(),
@@ -491,7 +491,7 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell )
                 OutputDevice* pDev = pOutput->pDev;
                 aFont.SetColor(*pColor);
                 pDev->SetFont( aFont );	// nur fuer Ausgabe
-                bChanged = TRUE;
+                bChanged = sal_True;
                 pLastCell = NULL;		// naechstes Mal wieder hierherkommen
             }
 
@@ -542,7 +542,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth )
             return;
     }
 
-    ULONG nFormat = GetValueFormat();
+    sal_uLong nFormat = GetValueFormat();
     if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
     {
         // Not 'General' number format.  Set hash text and bail out.
@@ -710,7 +710,7 @@ void ScDrawStringsVars::TextChanged()
         aTextSize = pRefDevice->LogicToPixel( aTextSize );
 }
 
-BOOL ScDrawStringsVars::HasEditCharacters() const
+sal_Bool ScDrawStringsVars::HasEditCharacters() const
 {
     static const sal_Unicode pChars[] =
     {
@@ -833,13 +833,13 @@ void ScOutputData::SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell )
     }
 }
 
-BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
+sal_Bool ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
                                     SCCOL& rOverX, SCROW& rOverY,
-                                    BOOL bVisRowChanged )
+                                    sal_Bool bVisRowChanged )
 {
-    BOOL bDoMerge = FALSE;
-    BOOL bIsLeft = ( nX == nVisX1 );
-    BOOL bIsTop  = ( nY == nVisY1 ) || bVisRowChanged;
+    sal_Bool bDoMerge = sal_False;
+    sal_Bool bIsLeft = ( nX == nVisX1 );
+    sal_Bool bIsTop  = ( nY == nVisY1 ) || bVisRowChanged;
 
     CellInfo* pInfo = &pRowInfo[nArrY].pCellInfo[nX+1];
     if ( pInfo->bHOverlapped && pInfo->bVOverlapped )
@@ -851,21 +851,21 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
 
                                     // weiter solange versteckt
 /*	if (!bDoMerge)
-        return FALSE;
+        return sal_False;
 */
 
     rOverX = nX;
     rOverY = nY;
-    BOOL bHOver = pInfo->bHOverlapped;
-    BOOL bVOver = pInfo->bVOverlapped;
-    BOOL bHidden;
+    sal_Bool bHOver = pInfo->bHOverlapped;
+    sal_Bool bVOver = pInfo->bVOverlapped;
+    sal_Bool bHidden;
 
     while (bHOver)				// nY konstant
     {
         --rOverX;
         bHidden = pDoc->ColHidden(rOverX, nTab);
         if ( !bDoMerge && !bHidden )
-            return FALSE;
+            return sal_False;
 
         if (rOverX >= nX1 && !bHidden)
         {
@@ -877,7 +877,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
         {
 //			if (!bClipVirt)
 //				rVirtPosX -= (long) (pDoc->GetColWidth( rOverX, nTab ) * nPPTX);
-            USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
+            sal_uInt16 nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
                                 rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue();
             bHOver = ((nOverlap & SC_MF_HOR) != 0);
             bVOver = ((nOverlap & SC_MF_VER) != 0);
@@ -889,7 +889,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
         --rOverY;
         bHidden = pDoc->RowHidden(rOverY, nTab);
         if ( !bDoMerge && !bHidden )
-            return FALSE;
+            return sal_False;
 
         if (nArrY>0)
             --nArrY;						// lokale Kopie !
@@ -907,118 +907,118 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
         {
 //			if (!bClipVirt)
 //				rVirtPosY -= (long) (pDoc->GetRowHeight( rOverY, nTab ) * nPPTY);
-            USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
+            sal_uInt16 nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
                                 rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue();
             bHOver = ((nOverlap & SC_MF_HOR) != 0);
             bVOver = ((nOverlap & SC_MF_VER) != 0);
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-inline BOOL StringDiffer( const ScPatternAttr*& rpOldPattern, const ScPatternAttr*& rpNewPattern )
+inline sal_Bool StringDiffer( const ScPatternAttr*& rpOldPattern, const ScPatternAttr*& rpNewPattern )
 {
     DBG_ASSERT( rpNewPattern, "pNewPattern" );
 
     if ( rpNewPattern == rpOldPattern )
-        return FALSE;
+        return sal_False;
     else if ( !rpOldPattern )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT ) != &rpOldPattern->GetItem( ATTR_FONT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_CJK_FONT ) != &rpOldPattern->GetItem( ATTR_CJK_FONT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_CTL_FONT ) != &rpOldPattern->GetItem( ATTR_CTL_FONT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_HEIGHT ) != &rpOldPattern->GetItem( ATTR_FONT_HEIGHT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_CJK_FONT_HEIGHT ) != &rpOldPattern->GetItem( ATTR_CJK_FONT_HEIGHT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_CTL_FONT_HEIGHT ) != &rpOldPattern->GetItem( ATTR_CTL_FONT_HEIGHT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_WEIGHT ) != &rpOldPattern->GetItem( ATTR_FONT_WEIGHT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_CJK_FONT_WEIGHT ) != &rpOldPattern->GetItem( ATTR_CJK_FONT_WEIGHT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_CTL_FONT_WEIGHT ) != &rpOldPattern->GetItem( ATTR_CTL_FONT_WEIGHT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_POSTURE ) != &rpOldPattern->GetItem( ATTR_FONT_POSTURE ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_CJK_FONT_POSTURE ) != &rpOldPattern->GetItem( ATTR_CJK_FONT_POSTURE ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_CTL_FONT_POSTURE ) != &rpOldPattern->GetItem( ATTR_CTL_FONT_POSTURE ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_UNDERLINE ) != &rpOldPattern->GetItem( ATTR_FONT_UNDERLINE ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_OVERLINE ) != &rpOldPattern->GetItem( ATTR_FONT_OVERLINE ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_WORDLINE ) != &rpOldPattern->GetItem( ATTR_FONT_WORDLINE ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_CROSSEDOUT ) != &rpOldPattern->GetItem( ATTR_FONT_CROSSEDOUT ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_CONTOUR ) != &rpOldPattern->GetItem( ATTR_FONT_CONTOUR ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_SHADOWED ) != &rpOldPattern->GetItem( ATTR_FONT_SHADOWED ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_COLOR ) != &rpOldPattern->GetItem( ATTR_FONT_COLOR ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_HOR_JUSTIFY ) != &rpOldPattern->GetItem( ATTR_HOR_JUSTIFY ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_VER_JUSTIFY ) != &rpOldPattern->GetItem( ATTR_VER_JUSTIFY ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_STACKED ) != &rpOldPattern->GetItem( ATTR_STACKED ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_LINEBREAK ) != &rpOldPattern->GetItem( ATTR_LINEBREAK ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_MARGIN ) != &rpOldPattern->GetItem( ATTR_MARGIN ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_ROTATE_VALUE ) != &rpOldPattern->GetItem( ATTR_ROTATE_VALUE ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FORBIDDEN_RULES ) != &rpOldPattern->GetItem( ATTR_FORBIDDEN_RULES ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_EMPHASISMARK ) != &rpOldPattern->GetItem( ATTR_FONT_EMPHASISMARK ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_FONT_RELIEF ) != &rpOldPattern->GetItem( ATTR_FONT_RELIEF ) )
-        return TRUE;
+        return sal_True;
     else if ( &rpNewPattern->GetItem( ATTR_BACKGROUND ) != &rpOldPattern->GetItem( ATTR_BACKGROUND ) )
-        return TRUE;	// needed with automatic text color
+        return sal_True;	// needed with automatic text color
     else
     {
         rpOldPattern = rpNewPattern;
-        return FALSE;
+        return sal_False;
     }
 }
 
-inline void lcl_CreateInterpretProgress( BOOL& bProgress, ScDocument* pDoc,
+inline void lcl_CreateInterpretProgress( sal_Bool& bProgress, ScDocument* pDoc,
         ScFormulaCell* pFCell )
 {
     if ( !bProgress && pFCell->GetDirty() )
     {
-        ScProgress::CreateInterpretProgress( pDoc, TRUE );
-        bProgress = TRUE;
+        ScProgress::CreateInterpretProgress( pDoc, sal_True );
+        bProgress = sal_True;
     }
 }
 
-inline BYTE GetScriptType( ScDocument* pDoc, ScBaseCell* pCell,
+inline sal_uInt8 GetScriptType( ScDocument* pDoc, ScBaseCell* pCell,
                             const ScPatternAttr* pPattern,
                             const SfxItemSet* pCondSet )
 {
     return pDoc->GetCellScriptType( pCell, pPattern->GetNumberFormat( pDoc->GetFormatTable(), pCondSet ) );
 }
 
-inline BOOL IsAmbiguousScript( BYTE nScript )
+inline sal_Bool IsAmbiguousScript( sal_uInt8 nScript )
 {
     return ( nScript != SCRIPTTYPE_LATIN &&
              nScript != SCRIPTTYPE_ASIAN &&
              nScript != SCRIPTTYPE_COMPLEX );
 }
 
-BOOL ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY )
+sal_Bool ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY )
 {
     // pThisRowInfo may be NULL
 
-    BOOL bEmpty;
+    sal_Bool bEmpty;
     if ( pThisRowInfo && nX <= nX2 )
         bEmpty = pThisRowInfo->pCellInfo[nX+1].bEmptyCellText;
     else
@@ -1029,23 +1029,23 @@ BOOL ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY )
         //	for the range nX1..nX2 in RowInfo, cell protection attribute is already evaluated
         //	into bEmptyCellText in ScDocument::FillInfo / lcl_HidePrint (printfun)
 
-        BOOL bIsPrint = ( eType == OUTTYPE_PRINTER );
+        sal_Bool bIsPrint = ( eType == OUTTYPE_PRINTER );
 
         if ( bIsPrint || bTabProtected )
         {
             const ScProtectionAttr* pAttr = (const ScProtectionAttr*)
                     pDoc->GetEffItem( nX, nY, nTab, ATTR_PROTECTION );
             if ( bIsPrint && pAttr->GetHidePrint() )
-                bEmpty = TRUE;
+                bEmpty = sal_True;
             else if ( bTabProtected )
             {
                 if ( pAttr->GetHideCell() )
-                    bEmpty = TRUE;
+                    bEmpty = sal_True;
                 else if ( bShowFormulas && pAttr->GetHideFormula() )
                 {
                     ScBaseCell* pCell = pDoc->GetCell( ScAddress( nX, nY, nTab ) );
                     if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA )
-                        bEmpty = TRUE;
+                        bEmpty = sal_True;
                 }
             }
         }
@@ -1060,7 +1060,7 @@ void ScOutputData::GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTabP, ScBaseCe
         rpCell = NULL;
 }
 
-BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY )
+sal_Bool ScOutputData::IsAvailable( SCCOL nX, SCROW nY )
 {
     //	apply the same logic here as in DrawStrings/DrawEdit:
     //	Stop at non-empty or merged or overlapped cell,
@@ -1069,17 +1069,17 @@ BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY )
     const ScBaseCell* pCell = pDoc->GetCell( ScAddress( nX, nY, nTab ) );
     if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE && !IsEmptyCellText( NULL, nX, nY ) )
     {
-        return FALSE;
+        return sal_False;
     }
 
     const ScPatternAttr* pPattern = pDoc->GetPattern( nX, nY, nTab );
     if ( ((const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE)).IsMerged() ||
          ((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).IsOverlapped() )
     {
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // nX, nArrY:		loop variables from DrawStrings / DrawEdit
@@ -1096,7 +1096,7 @@ BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY )
 void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY,
                                   SCCOL nCellX, SCROW nCellY, long nNeeded,
                                   const ScPatternAttr& rPattern,
-                                  USHORT nHorJustify, bool bCellIsValue,
+                                  sal_uInt16 nHorJustify, bool bCellIsValue,
                                   bool bBreak, bool bOverwrite,
                                   OutputAreaParam& rParam )
 {
@@ -1138,7 +1138,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
         }
         else
         {
-            USHORT nDocHeight = pDoc->GetRowHeight( nCompRow, nTab );
+            sal_uInt16 nDocHeight = pDoc->GetRowHeight( nCompRow, nTab );
             if ( nDocHeight )
                 nCellPosY += (long) ( nDocHeight * nPPTY );
             ++nCompRow;
@@ -1147,7 +1147,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
     nCellPosY -= (long) pDoc->GetScaledRowHeight( nCellY, nCompRow-1, nTab, nPPTY );
 
     const ScMergeAttr* pMerge = (const ScMergeAttr*)&rPattern.GetItem( ATTR_MERGE );
-    BOOL bMerged = pMerge->IsMerged();
+    sal_Bool bMerged = pMerge->IsMerged();
     long nMergeCols = pMerge->GetColMerge();
     if ( nMergeCols == 0 )
         nMergeCols = 1;
@@ -1237,13 +1237,13 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
                 rParam.maClipRect.Right() += nAdd * nLayoutSign;
 
                 if ( rThisRowInfo.nRowNo == nCellY && nRightX >= nX1 && nRightX <= nX2 )
-                    rThisRowInfo.pCellInfo[nRightX].bHideGrid = TRUE;
+                    rThisRowInfo.pCellInfo[nRightX].bHideGrid = sal_True;
             }
 
             while ( nLeftMissing > 0 && nLeftX > 0 && ( bOverwrite || IsAvailable( nLeftX-1, nCellY ) ) )
             {
                 if ( rThisRowInfo.nRowNo == nCellY && nLeftX >= nX1 && nLeftX <= nX2 )
-                    rThisRowInfo.pCellInfo[nLeftX].bHideGrid = TRUE;
+                    rThisRowInfo.pCellInfo[nLeftX].bHideGrid = sal_True;
 
                 --nLeftX;
                 long nAdd = (long) ( pDoc->GetColWidth( nLeftX, nTab ) * nPPTX );
@@ -1257,14 +1257,14 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
         if ( nRightMissing > 0 && bMarkClipped && nRightX >= nX1 && nRightX <= nX2 && !bBreak && !bCellIsValue )
         {
             rThisRowInfo.pCellInfo[nRightX+1].nClipMark |= SC_CLIPMARK_RIGHT;
-            bAnyClipped = TRUE;
+            bAnyClipped = sal_True;
             long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX );
             rParam.maClipRect.Right() -= nMarkPixel * nLayoutSign;
         }
         if ( nLeftMissing > 0 && bMarkClipped && nLeftX >= nX1 && nLeftX <= nX2 && !bBreak && !bCellIsValue )
         {
             rThisRowInfo.pCellInfo[nLeftX+1].nClipMark |= SC_CLIPMARK_LEFT;
-            bAnyClipped = TRUE;
+            bAnyClipped = sal_True;
             long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX );
             rParam.maClipRect.Left() += nMarkPixel * nLayoutSign;
         }
@@ -1274,7 +1274,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
     }
     else
     {
-        rParam.mbLeftClip = rParam.mbRightClip = FALSE;
+        rParam.mbLeftClip = rParam.mbRightClip = sal_False;
 
         // leave space for AutoFilter on screen
         // (for automatic line break: only if not formatting for printer, as in ScColumn::GetNeededSize)
@@ -1285,7 +1285,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
         {
             // filter drop-down width is now independent from row height
             const long nFilter = DROPDOWN_BITMAP_SIZE;
-            BOOL bFit = ( nNeeded + nFilter <= nMergeSizeX );
+            sal_Bool bFit = ( nNeeded + nFilter <= nMergeSizeX );
             if ( bFit || bCellIsValue )
             {
                 // content fits even in the remaining area without the filter button
@@ -1298,7 +1298,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
                 // -> set clip flags, so "###" replacement is used (but also within the smaller area)
 
                 if ( !bFit )
-                    rParam.mbLeftClip = rParam.mbRightClip = TRUE;
+                    rParam.mbLeftClip = rParam.mbRightClip = sal_True;
             }
         }
     }
@@ -1320,7 +1320,7 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
 #endif
 }
 
-void ScOutputData::DrawStrings( BOOL bPixelToLogic )
+void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 {
     DBG_ASSERT( pDev == pRefDevice ||
                 pDev->GetMapMode().GetMapUnit() == pRefDevice->GetMapMode().GetMapUnit(),
@@ -1328,14 +1328,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
 
     vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
 
-    BOOL bWasIdleDisabled = pDoc->IsIdleDisabled();
-    pDoc->DisableIdle( TRUE );
+    sal_Bool bWasIdleDisabled = pDoc->IsIdleDisabled();
+    pDoc->DisableIdle( sal_True );
     Size aMinSize = pRefDevice->PixelToLogic(Size(0,100));		// erst darueber wird ausgegeben
-//    UINT32 nMinHeight = aMinSize.Height() / 200;                // 1/2 Pixel
+//    sal_uInt32 nMinHeight = aMinSize.Height() / 200;                // 1/2 Pixel
 
     ScDrawStringsVars aVars( this, bPixelToLogic );
 
-    BOOL bProgress = FALSE;
+    sal_Bool bProgress = sal_False;
 
     long nInitPosX = nScrX;
     if ( bLayoutRTL )
@@ -1352,14 +1352,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
 
     // variables for GetOutputArea
     OutputAreaParam aAreaParam;
-    BOOL bCellIsValue = FALSE;
+    sal_Bool bCellIsValue = sal_False;
     long nNeededWidth = 0;
     SvxCellHorJustify eOutHorJust = SVX_HOR_JUSTIFY_STANDARD;
     const ScPatternAttr* pPattern = NULL;
     const SfxItemSet* pCondSet = NULL;
     const ScPatternAttr* pOldPattern = NULL;
     const SfxItemSet* pOldCondSet = NULL;
-    BYTE nOldScript = 0;
+    sal_uInt8 nOldScript = 0;
 
     // alternative pattern instances in case we need to modify the pattern 
     // before processing the cell value.
@@ -1378,35 +1378,35 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                 nPosX -= pRowInfo[0].pCellInfo[nLoopStartX+1].nWidth * nLayoutSign;
             for (SCCOL nX=nLoopStartX; nX<=nX2; nX++)
             {
-                BOOL bMergeEmpty = FALSE;
+                sal_Bool bMergeEmpty = sal_False;
                 CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
-                BOOL bEmpty = nX < nX1 || pInfo->bEmptyCellText;
+                sal_Bool bEmpty = nX < nX1 || pInfo->bEmptyCellText;
 
                 SCCOL nCellX = nX;					// position where the cell really starts
                 SCROW nCellY = nY;
-                BOOL bDoCell = FALSE;
-                BOOL bNeedEdit = FALSE;
+                sal_Bool bDoCell = sal_False;
+                sal_Bool bNeedEdit = sal_False;
 
                 //
                 //	Part of a merged cell?
                 //
 
-                BOOL bOverlapped = ( pInfo->bHOverlapped || pInfo->bVOverlapped );
+                sal_Bool bOverlapped = ( pInfo->bHOverlapped || pInfo->bVOverlapped );
                 if ( bOverlapped )
                 {
-                    bEmpty = TRUE;
+                    bEmpty = sal_True;
 
                     SCCOL nOverX;					// start of the merged cells
                     SCROW nOverY;
-                    BOOL bVisChanged = !pRowInfo[nArrY-1].bChanged;
+                    sal_Bool bVisChanged = !pRowInfo[nArrY-1].bChanged;
                     if (GetMergeOrigin( nX,nY, nArrY, nOverX,nOverY, bVisChanged ))
                     {
                         nCellX = nOverX;
                         nCellY = nOverY;
-                        bDoCell = TRUE;
+                        bDoCell = sal_True;
                     }
                     else
-                        bMergeEmpty = TRUE;
+                        bMergeEmpty = sal_True;
                 }
 
                 //
@@ -1424,7 +1424,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                          !pDoc->HasAttrib( nTempX,nY,nTab, nX1,nY,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
                     {
                         nCellX = nTempX;
-                        bDoCell = TRUE;
+                        bDoCell = sal_True;
                     }
                 }
 
@@ -1445,7 +1445,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                          !pDoc->HasAttrib( nTempX,nY,nTab, nX,nY,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
                     {
                         nCellX = nTempX;
-                        bDoCell = TRUE;
+                        bDoCell = sal_True;
                     }
                 }
 
@@ -1454,14 +1454,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                 //
 
                 if (!bEmpty)
-                    bDoCell = TRUE;
+                    bDoCell = sal_True;
 
                 //
                 //	don't output the cell that's being edited
                 //
 
                 if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow )
-                    bDoCell = FALSE;
+                    bDoCell = sal_False;
 
                 //
                 //	output the cell text
@@ -1475,9 +1475,9 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                     else
                         GetVisibleCell( nCellX, nCellY, nTab, pCell );		// get from document
                     if ( !pCell )
-                        bDoCell = FALSE;
+                        bDoCell = sal_False;
                     else if ( pCell->GetCellType() == CELLTYPE_EDIT )
-                        bNeedEdit = TRUE;
+                        bNeedEdit = sal_True;
                 }
                 if (bDoCell && !bNeedEdit)
                 {
@@ -1513,7 +1513,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                         pPattern = pAltPattern;
                     }
 
-                    BYTE nScript = GetScriptType( pDoc, pCell, pPattern, pCondSet );
+                    sal_uInt8 nScript = GetScriptType( pDoc, pCell, pPattern, pCondSet );
                     if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType();
                     if ( pPattern != pOldPattern || pCondSet != pOldCondSet ||
                          nScript != nOldScript || bSyntaxMode )
@@ -1531,11 +1531,11 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                     //	use edit engine for rotated, stacked or mixed-script text
                     if ( aVars.GetOrient() == SVX_ORIENTATION_STACKED ||
                          aVars.IsRotated() || IsAmbiguousScript(nScript) )
-                        bNeedEdit = TRUE;
+                        bNeedEdit = sal_True;
                 }
                 if (bDoCell && !bNeedEdit)
                 {
-                    BOOL bFormulaCell = (pCell->GetCellType() == CELLTYPE_FORMULA );
+                    sal_Bool bFormulaCell = (pCell->GetCellType() == CELLTYPE_FORMULA );
                     if ( bFormulaCell )
                         lcl_CreateInterpretProgress( bProgress, pDoc, (ScFormulaCell*)pCell );
                     if ( aVars.SetText(pCell) )
@@ -1561,9 +1561,9 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                     if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust == SVX_HOR_JUSTIFY_REPEAT )
                         eOutHorJust = SVX_HOR_JUSTIFY_LEFT;		// repeat is not yet implemented
 
-                    BOOL bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() == SVX_HOR_JUSTIFY_BLOCK );
-                    BOOL bRepeat = aVars.IsRepeat() && !bBreak;
-                    BOOL bShrink = aVars.IsShrink() && !bBreak && !bRepeat;
+                    sal_Bool bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() == SVX_HOR_JUSTIFY_BLOCK );
+                    sal_Bool bRepeat = aVars.IsRepeat() && !bBreak;
+                    sal_Bool bShrink = aVars.IsShrink() && !bBreak && !bRepeat;
 
                     nTotalMargin = 
                         static_cast<long>(aVars.GetLeftTotal() * nPPTX) + 
@@ -1573,8 +1573,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
 
                     // GetOutputArea gives justfied rectangles
                     GetOutputArea( nX, nArrY, nPosX, nPosY, nCellX, nCellY, nNeededWidth,
-                                   *pPattern, sal::static_int_cast<USHORT>(eOutHorJust),
-                                   bCellIsValue || bRepeat || bShrink, bBreak, FALSE,
+                                   *pPattern, sal::static_int_cast<sal_uInt16>(eOutHorJust),
+                                   bCellIsValue || bRepeat || bShrink, bBreak, sal_False,
                                    aAreaParam );
 
                     if ( bShrink )
@@ -1583,7 +1583,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                         {
                             // Only horizontal scaling is handled here.
                             // DrawEdit is used to vertically scale 90 deg rotated text.
-                            bNeedEdit = TRUE;
+                            bNeedEdit = sal_True;
                         }
                         else if ( aAreaParam.mbLeftClip || aAreaParam.mbRightClip )     // horizontal
                         {
@@ -1597,7 +1597,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                                 aVars.SetShrinkScale( nScale, nOldScript );
                                 long nNewSize = aVars.GetTextSize().Width();
 
-                                USHORT nShrinkAgain = 0;
+                                sal_uInt16 nShrinkAgain = 0;
                                 while ( nNewSize > nAvailable && nShrinkAgain < SC_SHRINKAGAIN_MAX )
                                 {
                                     // If the text is still too large, reduce the scale again by 10%, until it fits,
@@ -1611,7 +1611,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                                 // If even at half the size the font still isn't rendered smaller,
                                 // fall back to normal clipping (showing ### for numbers).
                                 if ( nNewSize <= nAvailable )
-                                    aAreaParam.mbLeftClip = aAreaParam.mbRightClip = FALSE;
+                                    aAreaParam.mbLeftClip = aAreaParam.mbRightClip = sal_False;
 
                                 pOldPattern = NULL;
                             }
@@ -1661,8 +1661,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                     //	right are handled by the flag for nX2
                     SCCOL nMarkX = ( nCellX <= nX2 ) ? nCellX : nX2;
                     RowInfo* pMarkRowInfo = ( nCellY == nY ) ? pThisRowInfo : &pRowInfo[0];
-                    pMarkRowInfo->pCellInfo[nMarkX+1].bEditEngine = TRUE;
-                    bDoCell = FALSE;	// don't draw here
+                    pMarkRowInfo->pCellInfo[nMarkX+1].bEditEngine = sal_True;
+                    bDoCell = sal_False;	// don't draw here
                 }
                 if ( bDoCell )
                 {
@@ -1674,7 +1674,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                                     (long) ( aVars.GetLeftTotal() * nPPTX ) +
                                     (long) ( aVars.GetMargin()->GetRightMargin() * nPPTX );
                         if ( nNeededWidth <= aAreaParam.maClipRect.GetWidth() )
-                            aAreaParam.mbLeftClip = aAreaParam.mbRightClip = FALSE;
+                            aAreaParam.mbLeftClip = aAreaParam.mbRightClip = sal_False;
 
                         //	If the "###" replacement doesn't fit into the cells, no clip marks
                         //	are shown, as the "###" already denotes too little space.
@@ -1686,38 +1686,38 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                     long nAvailWidth = aAreaParam.maAlignRect.GetWidth();
                     long nOutHeight = aAreaParam.maAlignRect.GetHeight();
 
-                    BOOL bOutside = ( aAreaParam.maClipRect.Right() < nScrX || aAreaParam.maClipRect.Left() >= nScrX + nScrW );
+                    sal_Bool bOutside = ( aAreaParam.maClipRect.Right() < nScrX || aAreaParam.maClipRect.Left() >= nScrX + nScrW );
                     if ( aAreaParam.maClipRect.Left() < nScrX )
                     {
                         aAreaParam.maClipRect.Left() = nScrX;
-                        aAreaParam.mbLeftClip = TRUE;
+                        aAreaParam.mbLeftClip = sal_True;
                     }
                     if ( aAreaParam.maClipRect.Right() > nScrX + nScrW )
                     {
                         aAreaParam.maClipRect.Right() = nScrX + nScrW;			//! minus one?
-                        aAreaParam.mbRightClip = TRUE;
+                        aAreaParam.mbRightClip = sal_True;
                     }
 
-                    BOOL bHClip = aAreaParam.mbLeftClip || aAreaParam.mbRightClip;
-                    BOOL bVClip = FALSE;
+                    sal_Bool bHClip = aAreaParam.mbLeftClip || aAreaParam.mbRightClip;
+                    sal_Bool bVClip = sal_False;
 
                     if ( aAreaParam.maClipRect.Top() < nScrY )
                     {
                         aAreaParam.maClipRect.Top() = nScrY;
-                        bVClip = TRUE;
+                        bVClip = sal_True;
                     }
                     if ( aAreaParam.maClipRect.Bottom() > nScrY + nScrH )
                     {
                         aAreaParam.maClipRect.Bottom() = nScrY + nScrH;         //! minus one?
-                        bVClip = TRUE;
+                        bVClip = sal_True;
                     }
 
                     //
                     //		horizontalen Platz testen
                     //
 
-                    BOOL bRightAdjusted = FALSE;		// to correct text width calculation later
-                    BOOL bNeedEditEngine = FALSE;
+                    sal_Bool bRightAdjusted = sal_False;		// to correct text width calculation later
+                    sal_Bool bNeedEditEngine = sal_False;
                     if ( !bNeedEditEngine && !bOutside )
                     {
                         switch (eOutHorJust)
@@ -1728,7 +1728,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                             case SVX_HOR_JUSTIFY_RIGHT:
                                 nJustPosX += nAvailWidth - aVars.GetTextSize().Width() -
                                             (long) ( aVars.GetMargin()->GetRightMargin() * nPPTX );
-                                bRightAdjusted = TRUE;
+                                bRightAdjusted = sal_True;
                                 break;
                             case SVX_HOR_JUSTIFY_CENTER:
                                 nJustPosX += ( nAvailWidth - aVars.GetTextSize().Width() +
@@ -1780,7 +1780,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                             if ( eType != OUTTYPE_PRINTER ||
                                     ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
                                     ( aVars.HasCondHeight() ) )
-                                bVClip = TRUE;
+                                bVClip = sal_True;
                         }
 
                         if ( bHClip || bVClip )
@@ -1884,7 +1884,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
                         }
 
                         // PDF: whole-cell hyperlink from formula?
-                        BOOL bHasURL = pPDFData && pCell && pCell->GetCellType() == CELLTYPE_FORMULA &&
+                        sal_Bool bHasURL = pPDFData && pCell && pCell->GetCellType() == CELLTYPE_FORMULA &&
                                         static_cast<ScFormulaCell*>(pCell)->IsHyperLinkCell();
                         if ( bHasURL )
                         {
@@ -1907,7 +1907,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
 
 void lcl_ClearEdit( EditEngine& rEngine )		// Text und Attribute
 {
-    rEngine.SetUpdateMode( FALSE );
+    rEngine.SetUpdateMode( sal_False );
 
     rEngine.SetText(EMPTY_STRING);
     //	keine Para-Attribute uebrigbehalten...
@@ -1917,22 +1917,22 @@ void lcl_ClearEdit( EditEngine& rEngine )		// Text und Attribute
                     SfxItemSet( *rPara.GetPool(), rPara.GetRanges() ) );
 }
 
-BOOL lcl_SafeIsValue( ScBaseCell* pCell )
+sal_Bool lcl_SafeIsValue( ScBaseCell* pCell )
 {
     if (!pCell)
-        return FALSE;
+        return sal_False;
 
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     switch ( pCell->GetCellType() )
     {
         case CELLTYPE_VALUE:
-            bRet = TRUE;
+            bRet = sal_True;
             break;
         case CELLTYPE_FORMULA:
             {
                 ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
                 if ( pFCell->IsRunning() || pFCell->IsValue() )
-                    bRet = TRUE;
+                    bRet = sal_True;
             }
             break;
         default:
@@ -1945,21 +1945,21 @@ BOOL lcl_SafeIsValue( ScBaseCell* pCell )
 
 void lcl_ScaleFonts( EditEngine& rEngine, long nPercent )
 {
-    BOOL bUpdateMode = rEngine.GetUpdateMode();
+    sal_Bool bUpdateMode = rEngine.GetUpdateMode();
     if ( bUpdateMode )
-        rEngine.SetUpdateMode( FALSE );
+        rEngine.SetUpdateMode( sal_False );
 
-    USHORT nParCount = rEngine.GetParagraphCount();
-    for (USHORT nPar=0; nPar<nParCount; nPar++)
+    sal_uInt16 nParCount = rEngine.GetParagraphCount();
+    for (sal_uInt16 nPar=0; nPar<nParCount; nPar++)
     {
         SvUShorts aPortions;
         rEngine.GetPortions( nPar, aPortions );
 
-        USHORT nPCount = aPortions.Count();
-        USHORT nStart = 0;
-        for ( USHORT nPos=0; nPos<nPCount; nPos++ )
+        sal_uInt16 nPCount = aPortions.Count();
+        sal_uInt16 nStart = 0;
+        for ( sal_uInt16 nPos=0; nPos<nPCount; nPos++ )
         {
-            USHORT nEnd = aPortions.GetObject( nPos );
+            sal_uInt16 nEnd = aPortions.GetObject( nPos );
             ESelection aSel( nPar, nStart, nPar, nEnd );
             SfxItemSet aAttribs = rEngine.GetAttribs( aSel );
 
@@ -1982,10 +1982,10 @@ void lcl_ScaleFonts( EditEngine& rEngine, long nPercent )
     }
 
     if ( bUpdateMode )
-        rEngine.SetUpdateMode( TRUE );
+        rEngine.SetUpdateMode( sal_True );
 }
 
-long lcl_GetEditSize( EditEngine& rEngine, BOOL bWidth, BOOL bSwap, long nAttrRotate )
+long lcl_GetEditSize( EditEngine& rEngine, sal_Bool bWidth, sal_Bool bSwap, long nAttrRotate )
 {
     if ( bSwap )
         bWidth = !bWidth;
@@ -2014,7 +2014,7 @@ long lcl_GetEditSize( EditEngine& rEngine, BOOL bWidth, BOOL bSwap, long nAttrRo
 
 void ScOutputData::ShrinkEditEngine( EditEngine& rEngine, const Rectangle& rAlignRect,
             long nLeftM, long nTopM, long nRightM, long nBottomM,
-            BOOL bWidth, USHORT nOrient, long nAttrRotate, BOOL bPixelToLogic,
+            sal_Bool bWidth, sal_uInt16 nOrient, long nAttrRotate, sal_Bool bPixelToLogic,
             long& rEngineWidth, long& rEngineHeight, long& rNeededPixel, bool& rLeftClip, bool& rRightClip )
 {
     if ( !bWidth )
@@ -2029,28 +2029,28 @@ void ScOutputData::ShrinkEditEngine( EditEngine& rEngine, const Rectangle& rAlig
         if ( nScaleSize <= rAlignRect.GetHeight() )
             return;
 
-        BOOL bSwap = ( nOrient == SVX_ORIENTATION_TOPBOTTOM || nOrient == SVX_ORIENTATION_BOTTOMTOP );
+        sal_Bool bSwap = ( nOrient == SVX_ORIENTATION_TOPBOTTOM || nOrient == SVX_ORIENTATION_BOTTOMTOP );
         long nAvailable = rAlignRect.GetHeight() - nTopM - nBottomM;
         long nScale = ( nAvailable * 100 ) / nScaleSize;
 
         lcl_ScaleFonts( rEngine, nScale );
-        rEngineHeight = lcl_GetEditSize( rEngine, FALSE, bSwap, nAttrRotate );
+        rEngineHeight = lcl_GetEditSize( rEngine, sal_False, bSwap, nAttrRotate );
         long nNewSize = bPixelToLogic ?
             pRefDevice->LogicToPixel(Size(0,rEngineHeight)).Height() : rEngineHeight;
 
-        USHORT nShrinkAgain = 0;
+        sal_uInt16 nShrinkAgain = 0;
         while ( nNewSize > nAvailable && nShrinkAgain < SC_SHRINKAGAIN_MAX )
         {
             // further reduce, like in DrawStrings
             lcl_ScaleFonts( rEngine, 90 );     // reduce by 10%
-            rEngineHeight = lcl_GetEditSize( rEngine, FALSE, bSwap, nAttrRotate );
+            rEngineHeight = lcl_GetEditSize( rEngine, sal_False, bSwap, nAttrRotate );
             nNewSize = bPixelToLogic ?
                 pRefDevice->LogicToPixel(Size(0,rEngineHeight)).Height() : rEngineHeight;
             ++nShrinkAgain;
         }
 
         // sizes for further processing (alignment etc):
-        rEngineWidth = lcl_GetEditSize( rEngine, TRUE, bSwap, nAttrRotate );
+        rEngineWidth = lcl_GetEditSize( rEngine, sal_True, bSwap, nAttrRotate );
         long nPixelWidth = bPixelToLogic ?
             pRefDevice->LogicToPixel(Size(rEngineWidth,0)).Width() : rEngineWidth;
         rNeededPixel = nPixelWidth + nLeftM + nRightM;
@@ -2068,44 +2068,44 @@ void ScOutputData::ShrinkEditEngine( EditEngine& rEngine, const Rectangle& rAlig
         long nScale = ( nAvailable * 100 ) / nScaleSize;
 
         lcl_ScaleFonts( rEngine, nScale );
-        rEngineWidth = lcl_GetEditSize( rEngine, TRUE, FALSE, nAttrRotate );
+        rEngineWidth = lcl_GetEditSize( rEngine, sal_True, sal_False, nAttrRotate );
         long nNewSize = bPixelToLogic ?
             pRefDevice->LogicToPixel(Size(rEngineWidth,0)).Width() : rEngineWidth;
 
-        USHORT nShrinkAgain = 0;
+        sal_uInt16 nShrinkAgain = 0;
         while ( nNewSize > nAvailable && nShrinkAgain < SC_SHRINKAGAIN_MAX )
         {
             // further reduce, like in DrawStrings
             lcl_ScaleFonts( rEngine, 90 );     // reduce by 10%
-            rEngineWidth = lcl_GetEditSize( rEngine, TRUE, FALSE, nAttrRotate );
+            rEngineWidth = lcl_GetEditSize( rEngine, sal_True, sal_False, nAttrRotate );
             nNewSize = bPixelToLogic ?
                 pRefDevice->LogicToPixel(Size(rEngineWidth,0)).Width() : rEngineWidth;
             ++nShrinkAgain;
         }
         if ( nNewSize <= nAvailable )
-            rLeftClip = rRightClip = FALSE;
+            rLeftClip = rRightClip = sal_False;
 
         // sizes for further processing (alignment etc):
         rNeededPixel = nNewSize + nLeftM + nRightM;
-        rEngineHeight = lcl_GetEditSize( rEngine, FALSE, FALSE, nAttrRotate );
+        rEngineHeight = lcl_GetEditSize( rEngine, sal_False, sal_False, nAttrRotate );
     }
 }
 
-void ScOutputData::DrawEdit(BOOL bPixelToLogic)
+void ScOutputData::DrawEdit(sal_Bool bPixelToLogic)
 {
     vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
 
     Size aMinSize = pRefDevice->PixelToLogic(Size(0,100));		// erst darueber wird ausgegeben
-//    UINT32 nMinHeight = aMinSize.Height() / 200;                // 1/2 Pixel
+//    sal_uInt32 nMinHeight = aMinSize.Height() / 200;                // 1/2 Pixel
 
     ScModule* pScMod = SC_MOD();
     sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor &&
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
+    sal_Bool bCellContrast = bUseStyleColor &&
             Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
     ScFieldEditEngine* pEngine = NULL;
-    BOOL bHyphenatorSet = FALSE;
+    sal_Bool bHyphenatorSet = sal_False;
     const ScPatternAttr* pOldPattern = NULL;
     const SfxItemSet*	 pOldCondSet = NULL;
     ScBaseCell* pCell = NULL;
@@ -2151,7 +2151,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
 
                     SCCOL nCellX = nX;					// position where the cell really starts
                     SCROW nCellY = nY;
-                    BOOL bDoCell = FALSE;
+                    sal_Bool bDoCell = sal_False;
 
                     long nPosY = nRowPosY;
                     if ( nArrY == 0 )
@@ -2160,11 +2160,11 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                         nY = pRowInfo[1].nRowNo;
                         SCCOL nOverX;					// start of the merged cells
                         SCROW nOverY;
-                        if (GetMergeOrigin( nX,nY, 1, nOverX,nOverY, TRUE ))
+                        if (GetMergeOrigin( nX,nY, 1, nOverX,nOverY, sal_True ))
                         {
                             nCellX = nOverX;
                             nCellY = nOverY;
-                            bDoCell = TRUE;
+                            bDoCell = sal_True;
                         }
                     }
                     else if ( nX == nX2 && !pThisRowInfo->pCellInfo[nX+1].pCell )
@@ -2180,16 +2180,16 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                              !pDoc->HasAttrib( nTempX,nY,nTab, nX,nY,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
                         {
                             nCellX = nTempX;
-                            bDoCell = TRUE;
+                            bDoCell = sal_True;
                         }
                     }
                     else
                     {
-                        bDoCell = TRUE;
+                        bDoCell = sal_True;
                     }
 
                     if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow )
-                        bDoCell = FALSE;
+                        bDoCell = sal_False;
 
                     const ScPatternAttr* pPattern = NULL;
                     const SfxItemSet* pCondSet = NULL;
@@ -2210,11 +2210,11 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                             GetVisibleCell( nCellX, nCellY, nTab, pCell );
                         }
                         if ( !pCell )
-                            bDoCell = FALSE;
+                            bDoCell = sal_False;
                     }
                     if (bDoCell)
                     {
-                        BOOL bHidden = FALSE;
+                        sal_Bool bHidden = sal_False;
 
                         //
                         //	Create EditEngine
@@ -2225,9 +2225,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                             //	Ein RefDevice muss auf jeden Fall gesetzt werden,
                             //	sonst legt sich die EditEngine ein VirtualDevice an!
                             pEngine = new ScFieldEditEngine( pDoc->GetEnginePool() );
-                            pEngine->SetUpdateMode( FALSE );
+                            pEngine->SetUpdateMode( sal_False );
                             pEngine->SetRefDevice( pFmtDevice );	// always set
-                            ULONG nCtrl = pEngine->GetControlWord();
+                            sal_uLong nCtrl = pEngine->GetControlWord();
                             if ( bShowSpellErrors )
                                 nCtrl |= EE_CNTRL_ONLINESPELLING;
                             if ( eType == OUTTYPE_PRINTER )
@@ -2241,17 +2241,17 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                 (EEHorizontalTextDirection)pDoc->GetEditTextDirection( nTab ) );
                         }
                         else
-                            lcl_ClearEdit( *pEngine );		// also calls SetUpdateMode(FALSE)
+                            lcl_ClearEdit( *pEngine );		// also calls SetUpdateMode(sal_False)
 
 
-                        BOOL bCellIsValue = lcl_SafeIsValue(pCell);
+                        sal_Bool bCellIsValue = lcl_SafeIsValue(pCell);
 
                         SvxCellHorJustify eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
                                             pPattern->GetItem(ATTR_HOR_JUSTIFY, pCondSet)).GetValue();
-                        BOOL bBreak = ( eHorJust == SVX_HOR_JUSTIFY_BLOCK ) ||
+                        sal_Bool bBreak = ( eHorJust == SVX_HOR_JUSTIFY_BLOCK ) ||
                                         ((const SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK, pCondSet)).GetValue();
-                        BOOL bRepeat = ( eHorJust == SVX_HOR_JUSTIFY_REPEAT && !bBreak );
-                        BOOL bShrink = !bBreak && !bRepeat && static_cast<const SfxBoolItem&>
+                        sal_Bool bRepeat = ( eHorJust == SVX_HOR_JUSTIFY_REPEAT && !bBreak );
+                        sal_Bool bShrink = !bBreak && !bRepeat && static_cast<const SfxBoolItem&>
                                         (pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue();
                         SvxCellOrientation eOrient = pPattern->GetCellOrientation( pCondSet );
                         long nAttrRotate = ((const SfxInt32Item&)pPattern->
@@ -2271,10 +2271,10 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                         {
                             //!	Flag setzen, um die Zelle in DrawRotated wiederzufinden ?
                             //!	(oder Flag schon bei DrawBackground, dann hier keine Abfrage)
-                            bHidden = TRUE;		// gedreht wird getrennt ausgegeben
+                            bHidden = sal_True;		// gedreht wird getrennt ausgegeben
                         }
 
-                        BOOL bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED &&
+                        sal_Bool bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED &&
                                 ((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN, pCondSet )).GetValue() );
                         if ( bAsianVertical )
                         {
@@ -2304,7 +2304,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
 //!							pDev->DrawPixel( aPos,
 //!											((const SvxColorItem&)pPattern->
 //!											GetItem( ATTR_FONT_COLOR )).GetValue() );
-//!							bHidden = TRUE;
+//!							bHidden = sal_True;
 //!						}
 
                         if (!bHidden)
@@ -2314,7 +2314,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
 
                             const SvxMarginItem* pMargin = (const SvxMarginItem*)
                                                     &pPattern->GetItem(ATTR_MARGIN, pCondSet);
-                            USHORT nIndent = 0;
+                            sal_uInt16 nIndent = 0;
                             if ( eHorJust == SVX_HOR_JUSTIFY_LEFT )
                                 nIndent = ((const SfxUInt16Item&)pPattern->
                                                     GetItem(ATTR_INDENT, pCondSet)).GetValue();
@@ -2352,7 +2352,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
 
                                 //!	handle nArrY == 0
                                 GetOutputArea( nXForPos, nArrYForPos, nPosX, nPosY, nCellX, nCellY, 0,
-                                               *pPattern, sal::static_int_cast<USHORT>(eOutHorJust),
+                                               *pPattern, sal::static_int_cast<sal_uInt16>(eOutHorJust),
                                                bCellIsValue, true, false, aAreaParam );
 
                                 //! special ScEditUtil handling if formatting for printer
@@ -2380,7 +2380,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
 
                                     Fraction aFract(1,1);
                                     Rectangle aUtilRect = ScEditUtil( pDoc, nCellX, nCellY, nTab, Point(0,0), pFmtDevice,
-                                        HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( pPattern, FALSE );
+                                        HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( pPattern, sal_False );
                                     aLogicSize.Width() = aUtilRect.GetWidth();
                                 }
                                 pEngine->SetPaperSize(aLogicSize);
@@ -2410,7 +2410,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                 pOldPattern = pPattern;
                                 pOldCondSet = pCondSet;
 
-                                ULONG nControl = pEngine->GetControlWord();
+                                sal_uLong nControl = pEngine->GetControlWord();
                                 if (eOrient==SVX_ORIENTATION_STACKED)
                                     nControl |= EE_CNTRL_ONECHARPERLINE;
                                 else
@@ -2422,7 +2422,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                     //	set hyphenator the first time it is needed
                                     com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() );
                                     pEngine->SetHyphenator( xXHyphenator );
-                                    bHyphenatorSet = TRUE;
+                                    bHyphenatorSet = sal_True;
                                 }
 
                                 Color aBackCol = ((const SvxBrushItem&)
@@ -2482,7 +2482,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
 
                             //	Read content from cell
 
-                            BOOL bWrapFields = FALSE;
+                            sal_Bool bWrapFields = sal_False;
                             if (pCell)
                             {
                                 if (pCell->GetCellType() == CELLTYPE_EDIT)
@@ -2499,7 +2499,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                             //	Fields aren't wrapped, so clipping is enabled to prevent
                                             //	a field from being drawn beyond the cell size
 
-                                            bWrapFields = TRUE;
+                                            bWrapFields = sal_True;
                                         }
                                     }
                                     else 
@@ -2509,7 +2509,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                 }
                                 else
                                 {
-                                    ULONG nFormat = pPattern->GetNumberFormat(
+                                    sal_uLong nFormat = pPattern->GetNumberFormat(
                                                                 pDoc->GetFormatTable(), pCondSet );
                                     String aString;
                                     Color* pColor;
@@ -2536,7 +2536,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                             }
 
                             pEngine->SetVertical( bAsianVertical );
-                            pEngine->SetUpdateMode( TRUE );		// after SetText, before CalcTextWidth/GetTextHeight
+                            pEngine->SetUpdateMode( sal_True );		// after SetText, before CalcTextWidth/GetTextHeight
 
                             //
                             //	Get final output area using the calculated width
@@ -2569,15 +2569,15 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                             {
                                 // for break, the first GetOutputArea call is sufficient
                                 GetOutputArea( nXForPos, nArrYForPos, nPosX, nPosY, nCellX, nCellY, nNeededPixel,
-                                               *pPattern, sal::static_int_cast<USHORT>(eOutHorJust),
+                                               *pPattern, sal::static_int_cast<sal_uInt16>(eOutHorJust),
                                                bCellIsValue || bRepeat || bShrink, false, false, aAreaParam );
 
                                 if ( bShrink )
                                 {
-                                    BOOL bWidth = ( eOrient == SVX_ORIENTATION_STANDARD && !bAsianVertical );
+                                    sal_Bool bWidth = ( eOrient == SVX_ORIENTATION_STANDARD && !bAsianVertical );
                                     ShrinkEditEngine( *pEngine, aAreaParam.maAlignRect,
                                         nLeftM, nTopM, nRightM, nBottomM, bWidth,
-                                        sal::static_int_cast<USHORT>(eOrient), 0, bPixelToLogic,
+                                        sal::static_int_cast<sal_uInt16>(eOrient), 0, bPixelToLogic,
                                         nEngineWidth, nEngineHeight, nNeededPixel, 
                                         aAreaParam.mbLeftClip, aAreaParam.mbRightClip );
                                 }
@@ -2669,7 +2669,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                     nStartX += nLeftM;
                             }
 
-                            BOOL bOutside = ( aAreaParam.maClipRect.Right() < nScrX || aAreaParam.maClipRect.Left() >= nScrX + nScrW );
+                            sal_Bool bOutside = ( aAreaParam.maClipRect.Right() < nScrX || aAreaParam.maClipRect.Left() >= nScrX + nScrW );
                             if ( aAreaParam.maClipRect.Left() < nScrX )
                             {
                                 aAreaParam.maClipRect.Left() = nScrX;
@@ -2684,23 +2684,23 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                             if ( !bHidden && !bOutside )
                             {
                                 bool bClip = aAreaParam.mbLeftClip || aAreaParam.mbRightClip;
-                                BOOL bSimClip = FALSE;
+                                sal_Bool bSimClip = sal_False;
 
                                 if ( bWrapFields )
                                 {
                                     //	Fields in a cell with automatic breaks: clip to cell width
-                                    bClip = TRUE;
+                                    bClip = sal_True;
                                 }
 
                                 if ( aAreaParam.maClipRect.Top() < nScrY )
                                 {
                                     aAreaParam.maClipRect.Top() = nScrY;
-                                    bClip = TRUE;
+                                    bClip = sal_True;
                                 }
                                 if ( aAreaParam.maClipRect.Bottom() > nScrY + nScrH )
                                 {
                                     aAreaParam.maClipRect.Bottom() = nScrY + nScrH;     //! minus one?
-                                    bClip = TRUE;
+                                    bClip = sal_True;
                                 }
 
                                 Size aCellSize;			// output area, excluding margins, in logical units
@@ -2713,7 +2713,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                 {
                                     const ScMergeAttr* pMerge =
                                             (ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
-                                    BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
+                                    sal_Bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
 
                                     //	Don't clip for text height when printing rows with optimal height,
                                     //	except when font size is from conditional formatting.
@@ -2721,10 +2721,10 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                     if ( eType != OUTTYPE_PRINTER ||
                                         ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
                                         ( pCondSet && SFX_ITEM_SET ==
-                                            pCondSet->GetItemState(ATTR_FONT_HEIGHT, TRUE) ) )
-                                        bClip = TRUE;
+                                            pCondSet->GetItemState(ATTR_FONT_HEIGHT, sal_True) ) )
+                                        bClip = sal_True;
                                     else
-                                        bSimClip = TRUE;
+                                        bSimClip = sal_True;
 
                                     //	Show clip marks if height is at least 5pt too small and
                                     //	there are several lines of text.
@@ -2748,7 +2748,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                             pClipMarkCell = &pThisRowInfo->pCellInfo[nX+1];
 
                                         pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT;		//! also allow left?
-                                        bAnyClipped = TRUE;
+                                        bAnyClipped = sal_True;
 
                                         long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX );
                                         if ( aAreaParam.maClipRect.Right() - nMarkPixel > aAreaParam.maClipRect.Left() )
@@ -2763,7 +2763,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                     if ( nClipStartY < nRowPosY )
                                     {
                                         long nDif = nRowPosY - nClipStartY;
-                                        bClip = TRUE;
+                                        bClip = sal_True;
                                         nClipStartY = nRowPosY;
                                         aClipSize.Height() -= nDif;
                                     }
@@ -2810,7 +2810,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                             eHorJust==SVX_HOR_JUSTIFY_CENTER ||
                                             (eHorJust==SVX_HOR_JUSTIFY_STANDARD && bCellIsValue) )
                                         {
-                                            pEngine->SetUpdateMode( FALSE );
+                                            pEngine->SetUpdateMode( sal_False );
 
                                             SvxAdjust eEditAdjust =
                                                 (eHorJust==SVX_HOR_JUSTIFY_CENTER) ?
@@ -2821,7 +2821,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                             // #55142# reset adjustment for the next cell
                                             pOldPattern = NULL;
 
-                                            pEngine->SetUpdateMode( TRUE );
+                                            pEngine->SetUpdateMode( sal_True );
                                         }
                                     }
                                     else
@@ -2911,7 +2911,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                 {
                                     //	For right-to-left, EditEngine always calculates its lines
                                     //	beginning from the right edge, but EditLine::nStartPosX is
-                                    //	of USHORT type, so the PaperSize must be limited to USHRT_MAX.
+                                    //	of sal_uInt16 type, so the PaperSize must be limited to USHRT_MAX.
                                     Size aLogicPaper = pEngine->GetPaperSize();
                                     if ( aLogicPaper.Width() > USHRT_MAX )
                                     {
@@ -2930,7 +2930,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
 
                                     Point aDocStart = aLogicClip.TopLeft();
                                     aDocStart -= aLogicStart;
-                                    pEngine->Draw( pDev, aLogicClip, aDocStart, FALSE );
+                                    pEngine->Draw( pDev, aLogicClip, aDocStart, sal_False );
                                 }
                                 else
                                 {
@@ -2952,7 +2952,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
                                 }
 
                                 // PDF: whole-cell hyperlink from formula?
-                                BOOL bHasURL = pPDFData && pCell && pCell->GetCellType() == CELLTYPE_FORMULA &&
+                                sal_Bool bHasURL = pPDFData && pCell && pCell->GetCellType() == CELLTYPE_FORMULA &&
                                                 static_cast<ScFormulaCell*>(pCell)->IsHyperLinkCell();
                                 if ( bHasURL )
                                 {
@@ -2992,7 +2992,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
 
 //	-------------------------------------------------------------------------------
 
-void ScOutputData::DrawRotated(BOOL bPixelToLogic)
+void ScOutputData::DrawRotated(sal_Bool bPixelToLogic)
 {
     //!	nRotMax speichern
     SCCOL nRotMax = nX2;
@@ -3003,12 +3003,12 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
 
     ScModule* pScMod = SC_MOD();
     sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor &&
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
+    sal_Bool bCellContrast = bUseStyleColor &&
             Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
     ScFieldEditEngine* pEngine = NULL;
-    BOOL bHyphenatorSet = FALSE;
+    sal_Bool bHyphenatorSet = sal_False;
     const ScPatternAttr* pPattern;
     const SfxItemSet*	 pCondSet;
     const ScPatternAttr* pOldPattern = NULL;
@@ -3046,10 +3046,10 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                 {
                     SCROW nY = pThisRowInfo->nRowNo;
 
-                    BOOL bHidden = FALSE;
+                    sal_Bool bHidden = sal_False;
                     if (bEditMode)
                         if ( nX == nEditCol && nY == nEditRow )
-                            bHidden = TRUE;
+                            bHidden = sal_True;
 
                     if (!bHidden)
                     {
@@ -3058,9 +3058,9 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                             //	Ein RefDevice muss auf jeden Fall gesetzt werden,
                             //	sonst legt sich die EditEngine ein VirtualDevice an!
                             pEngine = new ScFieldEditEngine( pDoc->GetEnginePool() );
-                            pEngine->SetUpdateMode( FALSE );
+                            pEngine->SetUpdateMode( sal_False );
                             pEngine->SetRefDevice( pFmtDevice );	// always set
-                            ULONG nCtrl = pEngine->GetControlWord();
+                            sal_uLong nCtrl = pEngine->GetControlWord();
                             if ( bShowSpellErrors )
                                 nCtrl |= EE_CNTRL_ONLINESPELLING;
                             if ( eType == OUTTYPE_PRINTER )
@@ -3074,20 +3074,20 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                 (EEHorizontalTextDirection)pDoc->GetEditTextDirection( nTab ) );
                         }
                         else
-                            lcl_ClearEdit( *pEngine );		// also calls SetUpdateMode(FALSE)
+                            lcl_ClearEdit( *pEngine );		// also calls SetUpdateMode(sal_False)
 
                         long nPosY = nRowPosY;
-                        BOOL bVisChanged = FALSE;
+                        sal_Bool bVisChanged = sal_False;
 
                         //!	Rest von zusammengefasster Zelle weiter oben funktioniert nicht!
 
-                        BOOL bFromDoc = FALSE;
+                        sal_Bool bFromDoc = sal_False;
                         pPattern = pInfo->pPatternAttr;
                         pCondSet = pInfo->pConditionSet;
                         if (!pPattern)
                         {
                             pPattern = pDoc->GetPattern( nX, nY, nTab );
-                            bFromDoc = TRUE;
+                            bFromDoc = sal_True;
                         }
                         pCell = pInfo->pCell;
                         if (bFromDoc)
@@ -3097,29 +3097,29 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                             GetVisibleCell( nX, nY, nTab, pCell );
 
                         if ( !pCell || IsEmptyCellText( pThisRowInfo, nX, nY ) )
-                            bHidden = TRUE;		// nRotateDir is also set without a cell
+                            bHidden = sal_True;		// nRotateDir is also set without a cell
 
                         long nCellWidth = (long) pRowInfo[0].pCellInfo[nX+1].nWidth;
 
                         SvxCellHorJustify eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
                                             pPattern->GetItem(ATTR_HOR_JUSTIFY, pCondSet)).GetValue();
-                        BOOL bBreak = ( eHorJust == SVX_HOR_JUSTIFY_BLOCK ) ||
+                        sal_Bool bBreak = ( eHorJust == SVX_HOR_JUSTIFY_BLOCK ) ||
                                     ((const SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK, pCondSet)).GetValue();
-                        BOOL bRepeat = ( eHorJust == SVX_HOR_JUSTIFY_REPEAT && !bBreak );
-                        BOOL bShrink = !bBreak && !bRepeat && static_cast<const SfxBoolItem&>
+                        sal_Bool bRepeat = ( eHorJust == SVX_HOR_JUSTIFY_REPEAT && !bBreak );
+                        sal_Bool bShrink = !bBreak && !bRepeat && static_cast<const SfxBoolItem&>
                                         (pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue();
                         SvxCellOrientation eOrient = pPattern->GetCellOrientation( pCondSet );
 
                         const ScMergeAttr* pMerge =
                                 (ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
-                        BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
+                        sal_Bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
 
                         long nStartX = nPosX;
                         long nStartY = nPosY;
                         if (nX<nX1)
                         {
                             if ((bBreak || eOrient!=SVX_ORIENTATION_STANDARD) && !bMerged)
-                                bHidden = TRUE;
+                                bHidden = sal_True;
                             else
                             {
                                 nStartX = nInitPosX;
@@ -3175,7 +3175,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                 pOldPattern = pPattern;
                                 pOldCondSet = pCondSet;
 
-                                ULONG nControl = pEngine->GetControlWord();
+                                sal_uLong nControl = pEngine->GetControlWord();
                                 if (eOrient==SVX_ORIENTATION_STACKED)
                                     nControl |= EE_CNTRL_ONECHARPERLINE;
                                 else
@@ -3187,7 +3187,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                     //	set hyphenator the first time it is needed
                                     com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() );
                                     pEngine->SetHyphenator( xXHyphenator );
-                                    bHyphenatorSet = TRUE;
+                                    bHyphenatorSet = sal_True;
                                 }
 
                                 Color aBackCol = ((const SvxBrushItem&)
@@ -3203,7 +3203,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
 
                             const SvxMarginItem* pMargin = (const SvxMarginItem*)
                                                     &pPattern->GetItem(ATTR_MARGIN, pCondSet);
-                            USHORT nIndent = 0;
+                            sal_uInt16 nIndent = 0;
                             if ( eHorJust == SVX_HOR_JUSTIFY_LEFT )
                                 nIndent = ((const SfxUInt16Item&)pPattern->
                                                     GetItem(ATTR_INDENT, pCondSet)).GetValue();
@@ -3288,7 +3288,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                 }
                                 else
                                 {
-                                    ULONG nFormat = pPattern->GetNumberFormat(
+                                    sal_uLong nFormat = pPattern->GetNumberFormat(
                                                                 pDoc->GetFormatTable(), pCondSet );
                                     String aString;
                                     Color* pColor;
@@ -3314,7 +3314,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                 DBG_ERROR("pCell == NULL");
                             }
 
-                            pEngine->SetUpdateMode( TRUE );		// after SetText, before CalcTextWidth/GetTextHeight
+                            pEngine->SetUpdateMode( sal_True );		// after SetText, before CalcTextWidth/GetTextHeight
 
                             long nEngineWidth  = (long) pEngine->CalcTextWidth();
                             long nEngineHeight = pEngine->GetTextHeight();
@@ -3333,7 +3333,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                                             Size(0,nEngineHeight)).Height();
                                     long nEffHeight = nOutHeight - (long)(nEnginePixel * nAbsCos) + 2;
                                     long nNewWidth = (long)(nEffHeight / nAbsSin) + 2;
-                                    BOOL bFits = ( nNewWidth >= aPaperSize.Width() );
+                                    sal_Bool bFits = ( nNewWidth >= aPaperSize.Width() );
                                     if ( bFits )
                                         nSteps = 0;
                                     else
@@ -3354,7 +3354,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                             pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize));
                                         else
                                             pEngine->SetPaperSize(aPaperSize);	// Scale ist immer 1
-                                        //pEngine->QuickFormatDoc( TRUE );
+                                        //pEngine->QuickFormatDoc( sal_True );
                                         nEngineWidth  = (long) pEngine->CalcTextWidth();
                                         nEngineHeight = pEngine->GetTextHeight();
                                     }
@@ -3382,13 +3382,13 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                             }
 
                             if (!nAttrRotate)			//	hier nur gedrehter Text
-                                bHidden = TRUE;			//! vorher abfragen !!!
+                                bHidden = sal_True;			//! vorher abfragen !!!
 
                             //!	weglassen, was nicht hereinragt
 
                             if (!bHidden)
                             {
-                                BOOL bClip = FALSE;
+                                sal_Bool bClip = sal_False;
                                 Size aClipSize = Size( nScrX+nScrW-nStartX, nScrY+nScrH-nStartY );
 
                                 //	weiterschreiben
@@ -3400,7 +3400,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                     aCellSize = Size( nOutWidth, nOutHeight );	// Scale ist 1
 
                                 long nGridWidth = nEngineWidth;
-                                BOOL bNegative = FALSE;
+                                sal_Bool bNegative = sal_False;
                                 if ( eRotMode != SVX_ROTATE_MODE_STANDARD )
                                 {
                                     nGridWidth = aCellSize.Width() +
@@ -3424,8 +3424,8 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                     nNeededWidth =  pRefDevice->LogicToPixel(Size(nNeededWidth,0)).Width();
 
                                 GetOutputArea( nX, nArrY, nCellStartX, nPosY, nCellX, nCellY, nNeededWidth,
-                                                *pPattern, sal::static_int_cast<USHORT>(eOutHorJust),
-                                                FALSE, FALSE, TRUE, aAreaParam );
+                                                *pPattern, sal::static_int_cast<sal_uInt16>(eOutHorJust),
+                                                sal_False, sal_False, sal_True, aAreaParam );
 
                                 if ( bShrink )
                                 {
@@ -3433,18 +3433,18 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                         pRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width() : nEngineWidth;
                                     long nNeededPixel = nPixelWidth + nLeftM + nRightM;
 
-                                    aAreaParam.mbLeftClip = aAreaParam.mbRightClip = TRUE;
+                                    aAreaParam.mbLeftClip = aAreaParam.mbRightClip = sal_True;
 
                                     // always do height
                                     ShrinkEditEngine( *pEngine, aAreaParam.maAlignRect, nLeftM, nTopM, nRightM, nBottomM,
-                                        FALSE, sal::static_int_cast<USHORT>(eOrient), nAttrRotate, bPixelToLogic,
+                                        sal_False, sal::static_int_cast<sal_uInt16>(eOrient), nAttrRotate, bPixelToLogic,
                                         nEngineWidth, nEngineHeight, nNeededPixel, aAreaParam.mbLeftClip, aAreaParam.mbRightClip );
 
                                     if ( eRotMode == SVX_ROTATE_MODE_STANDARD )
                                     {
                                         // do width only if rotating within the cell (standard mode)
                                         ShrinkEditEngine( *pEngine, aAreaParam.maAlignRect, nLeftM, nTopM, nRightM, nBottomM,
-                                            TRUE, sal::static_int_cast<USHORT>(eOrient), nAttrRotate, bPixelToLogic,
+                                            sal_True, sal::static_int_cast<sal_uInt16>(eOrient), nAttrRotate, bPixelToLogic,
                                             nEngineWidth, nEngineHeight, nNeededPixel, aAreaParam.mbLeftClip, aAreaParam.mbRightClip );
                                     }
 
@@ -3457,14 +3457,14 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                         nEngineWidth = (long) ( nRealHeight / fabs( nSin ) );
                                 }
 
-                                // BOOL bVClip = ( nEngineHeight > aCellSize.Height() );
+                                // sal_Bool bVClip = ( nEngineHeight > aCellSize.Height() );
 
                                 long nClipStartX = nStartX;
                                 if (nX<nX1)
                                 {
                                     //! Clipping unnoetig, wenn links am Fenster
 
-                                    bClip = TRUE;					// nur Rest ausgeben!
+                                    bClip = sal_True;					// nur Rest ausgeben!
                                     if (nStartX<nScrX)
                                     {
                                         long nDif = nScrX - nStartX;
@@ -3479,13 +3479,13 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                     if ( nClipStartY < nRowPosY )
                                     {
                                         long nDif = nRowPosY - nClipStartY;
-                                        bClip = TRUE;
+                                        bClip = sal_True;
                                         nClipStartY = nRowPosY;
                                         aClipSize.Height() -= nDif;
                                     }
                                 }
 
-                                bClip = TRUE;		// always clip at the window/page border
+                                bClip = sal_True;		// always clip at the window/page border
 
                                 //Rectangle aClipRect;
                                 if (bClip)
@@ -3542,7 +3542,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                         if (eHorJust==SVX_HOR_JUSTIFY_RIGHT ||
                                             eHorJust==SVX_HOR_JUSTIFY_CENTER)
                                         {
-                                            pEngine->SetUpdateMode( FALSE );
+                                            pEngine->SetUpdateMode( sal_False );
 
                                             SvxAdjust eSvxAdjust =
                                                 (eHorJust==SVX_HOR_JUSTIFY_RIGHT) ?
@@ -3556,7 +3556,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                             else
                                                 pEngine->SetPaperSize(aPaperSize);
 
-                                            pEngine->SetUpdateMode( TRUE );
+                                            pEngine->SetUpdateMode( sal_True );
                                         }
                                     }
                                     else
@@ -3670,7 +3670,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
                                 {
                                     //	For right-to-left, EditEngine always calculates its lines
                                     //	beginning from the right edge, but EditLine::nStartPosX is
-                                    //	of USHORT type, so the PaperSize must be limited to USHRT_MAX.
+                                    //	of sal_uInt16 type, so the PaperSize must be limited to USHRT_MAX.
                                     Size aLogicPaper = pEngine->GetPaperSize();
                                     if ( aLogicPaper.Width() > USHRT_MAX )
                                     {
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index 953e648e0..c72703eb2 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -211,7 +211,7 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer)
 
     pModel->UseHyphenator();
 
-    ULONG nOldDrawMode = pDev->GetDrawMode();
+    sal_uLong nOldDrawMode = pDev->GetDrawMode();
     if ( bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
     {
         pDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL |
@@ -245,7 +245,7 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer)
 // #109985#
 void ScOutputData::DrawingSingle(const sal_uInt16 nLayer)
 {
-    BOOL	bHad	= FALSE;
+    sal_Bool	bHad	= sal_False;
     long	nPosY	= nScrY;
     SCSIZE	nArrY;
     for (nArrY=1; nArrY+1<nArrCount; nArrY++)
@@ -256,13 +256,13 @@ void ScOutputData::DrawingSingle(const sal_uInt16 nLayer)
         {
             if (!bHad)
             {
-                bHad = TRUE;
+                bHad = sal_True;
             }
         }
         else if (bHad)
         {
             DrawSelectiveObjects( nLayer );
-            bHad = FALSE;
+            bHad = sal_False;
         }
         nPosY += pRowInfo[nArrY].nHeight;
     }
diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx
index 4db10a23e..9ace7b88a 100644
--- a/sc/source/ui/view/pfuncache.cxx
+++ b/sc/source/ui/view/pfuncache.cxx
@@ -113,7 +113,7 @@ void ScPrintFuncCache::InitLocations( const ScMarkData& rMark, OutputDevice* pDe
         if ( rMark.GetTableSelect( nTab ) )
         {
             ScPrintFunc aFunc( pDev, pDocSh, nTab, nFirstAttr[nTab], nTotalPages, pSelRange, &aSelection.GetOptions() );
-            aFunc.SetRenderFlag( TRUE );
+            aFunc.SetRenderFlag( sal_True );
 
             long nDisplayStart = GetDisplayStart( nTab );
 
@@ -125,7 +125,7 @@ void ScPrintFuncCache::InitLocations( const ScMarkData& rMark, OutputDevice* pDe
                 aPage.Select( aPageRange );
 
                 ScPreviewLocationData aLocData( pDoc, pDev );
-                aFunc.DoPrint( aPage, nTabStart, nDisplayStart, FALSE, NULL, &aLocData );
+                aFunc.DoPrint( aPage, nTabStart, nDisplayStart, sal_False, NULL, &aLocData );
 
                 ScRange aCellRange;
                 Rectangle aPixRect;
@@ -156,7 +156,7 @@ bool ScPrintFuncCache::FindLocation( const ScAddress& rCell, ScPrintPageLocation
     return false;   // not found    
 }
 
-BOOL ScPrintFuncCache::IsSameSelection( const ScPrintSelectionStatus& rStatus ) const
+sal_Bool ScPrintFuncCache::IsSameSelection( const ScPrintSelectionStatus& rStatus ) const
 {
     return aSelection == rStatus;
 }
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 472d3457d..179f4958c 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -67,7 +67,7 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) :
 {
     SetPool( &pViewSh->GetPool() );
     ScViewData* pViewData = pViewSh->GetViewData();
-    SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
+    ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
     SetUndoManager( pMgr );
     if ( !pViewData->GetDocument()->IsUndoEnabled() )
     {
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 82f0c62da..49d85e983 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -76,7 +76,7 @@ ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
 {
     SetPool( &pViewSh->GetPool() );
     ScViewData* pViewData = pViewSh->GetViewData();
-    SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
+    ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
     SetUndoManager( pMgr );
     if ( !pViewData->GetDocument()->IsUndoEnabled() )
     {
@@ -147,7 +147,7 @@ void ScPivotShell::Execute( SfxRequest& rReq )
                     ScDPObject aNewObj( *pDPObj );
                     aNewObj.SetSheetDesc( aNewDesc );
                     ScDBDocFunc aFunc( *pViewData->GetDocShell() );
-                    aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE );
+                    aFunc.DataPilotUpdate( pDPObj, &aNewObj, sal_True, sal_False );
                     pViewData->GetView()->CursorPosChanged();       // shells may be switched
                 }
                 delete pDlg;
@@ -162,10 +162,10 @@ void __EXPORT ScPivotShell::GetState( SfxItemSet& rSet )
 {
     ScDocShell* pDocSh = pViewShell->GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
-    BOOL bDisable = pDocSh->IsReadOnly() || pDoc->GetChangeTrack();
+    sal_Bool bDisable = pDocSh->IsReadOnly() || pDoc->GetChangeTrack();
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while (nWhich)
     {
         switch (nWhich)
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index f96aa09cd..2a45480dc 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -99,34 +99,34 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView
     Window( pParent ),
     nPageNo( 0 ),
     nZoom( 100 ),
-    bValid( FALSE ),
+    bValid( sal_False ),
     nTabsTested( 0 ),
     nTab( 0 ),
     nTabStart( 0 ),
     nDisplayStart( 0 ),
     nTotalPages( 0 ),
-    bStateValid( FALSE ),
-    bLocationValid( FALSE ),
+    bStateValid( sal_False ),
+    bLocationValid( sal_False ),
     pLocationData( NULL ),
     pDrawView( NULL ),
-    bInPaint( FALSE ),
-    bInGetState( FALSE ),
+    bInPaint( sal_False ),
+    bInGetState( sal_False ),
     pDocShell( pDocSh ),
     pViewShell( pViewSh ),
-    bLeftRulerMove( FALSE ),
-    bRightRulerMove( FALSE ),
-    bTopRulerMove( FALSE ),
-    bBottomRulerMove( FALSE ),
-    bHeaderRulerMove( FALSE ),
-    bFooterRulerMove( FALSE ),
-    bLeftRulerChange( FALSE ),
-    bRightRulerChange( FALSE ),
-    bTopRulerChange( FALSE ),
-    bBottomRulerChange( FALSE ),
-    bHeaderRulerChange( FALSE ),
-    bFooterRulerChange( FALSE ),
-    bPageMargin ( FALSE ),
-    bColRulerMove( FALSE ),
+    bLeftRulerMove( sal_False ),
+    bRightRulerMove( sal_False ),
+    bTopRulerMove( sal_False ),
+    bBottomRulerMove( sal_False ),
+    bHeaderRulerMove( sal_False ),
+    bFooterRulerMove( sal_False ),
+    bLeftRulerChange( sal_False ),
+    bRightRulerChange( sal_False ),
+    bTopRulerChange( sal_False ),
+    bBottomRulerChange( sal_False ),
+    bHeaderRulerChange( sal_False ),
+    bFooterRulerChange( sal_False ),
+    bPageMargin ( sal_False ),
+    bColRulerMove( sal_False ),
     mnScale( 0 ),
     nColNumberButttonDown( 0 ),
     nHeaderHeight ( 0 ),
@@ -169,8 +169,8 @@ void ScPreview::UpdateDrawView()		// nTab muss richtig sein
             pDrawView = new FmFormView( pModel, this );
             // #55259# die DrawView uebernimmt den Design-Modus vom Model
             // (Einstellung "Im Entwurfsmodus oeffnen"), darum hier zuruecksetzen
-            pDrawView->SetDesignMode( TRUE );
-            pDrawView->SetPrintPreview( TRUE );
+            pDrawView->SetDesignMode( sal_True );
+            pDrawView->SetPrintPreview( sal_True );
             pDrawView->ShowSdrPage(pPage);
         }
 #if 0
@@ -202,7 +202,7 @@ void ScPreview::TestLastPage()
             DBG_ASSERT(nPages[nTab],"alle Tabellen leer?");
             nTabPage = nPages[nTab] - 1;
             nTabStart = 0;
-            for (USHORT i=0; i<nTab; i++)
+            for (sal_uInt16 i=0; i<nTab; i++)
                 nTabStart += nPages[i];
 
             ScDocument* pDoc = pDocShell->GetDocument();
@@ -283,8 +283,8 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ )
 
     aState.nDocPages = nTotalPages;
 
-    bValid = TRUE;
-    bStateValid = TRUE;
+    bValid = sal_True;
+    bStateValid = sal_True;
     DoInvalidate();
 }
 
@@ -296,11 +296,11 @@ void ScPreview::RecalcPages()					// nur nPageNo geaendert
 
     SCTAB nOldTab = nTab;
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     while (nPageNo >= nTotalPages && nTabsTested < nTabCount)
     {
         CalcPages( nTabsTested );
-        bDone = TRUE;
+        bDone = sal_True;
     }
 
     if (!bDone)
@@ -328,7 +328,7 @@ void ScPreview::RecalcPages()					// nur nPageNo geaendert
     TestLastPage();			// testen, ob hinter letzter Seite
 
     if ( nTab != nOldTab )
-        bStateValid = FALSE;
+        bStateValid = sal_False;
 
     DoInvalidate();
 }
@@ -347,8 +347,8 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
     Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor() ), 10000 );
     MapMode aMMMode( MAP_100TH_MM, Point(), aHorPrevZoom, aPreviewZoom );
 
-    BOOL bDoPrint = ( pFillLocation == NULL );
-    BOOL bValidPage = ( nPageNo < nTotalPages );
+    sal_Bool bDoPrint = ( pFillLocation == NULL );
+    sal_Bool bValidPage = ( nPageNo < nTotalPages );
 
     ScModule* pScMod = SC_MOD();
     const svtools::ColorConfig& rColorCfg = pScMod->GetColorConfig();
@@ -381,7 +381,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
         pPrintFunc->SetOffset(aOffset);
         pPrintFunc->SetManualZoom(nZoom);
         pPrintFunc->SetDateTime(aDate,aTime);
-        pPrintFunc->SetClearFlag(TRUE);
+        pPrintFunc->SetClearFlag(sal_True);
         pPrintFunc->SetUseStyleColor( pScMod->GetAccessOptions().GetIsForPagePreviews() );
 
         pPrintFunc->SetDrawView( pDrawView );
@@ -396,7 +396,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
         DBG_ASSERT(nPrinted<=1, "was'n nu los?");
 
         SetMapMode(aMMMode);
-//		USHORT nPrintZoom = pPrintFunc->GetZoom();
+//		sal_uInt16 nPrintZoom = pPrintFunc->GetZoom();
 
         if (nPrinted)	// wenn nichts, alles grau zeichnen
         {
@@ -409,7 +409,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
         {
             pPrintFunc->GetPrintState( aState );
             aState.nDocPages = nTotalPages;
-            bStateValid = TRUE;
+            bStateValid = sal_True;
         }
         delete pPrintFunc;
     }
@@ -423,8 +423,8 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
 
         Size aWinSize = GetOutputSize();
         Point aWinEnd( aWinSize.Width(), aWinSize.Height() );
-        BOOL bRight  = nPageEndX <= aWinEnd.X();
-        BOOL bBottom = nPageEndY <= aWinEnd.Y();
+        sal_Bool bRight  = nPageEndX <= aWinEnd.X();
+        sal_Bool bBottom = nPageEndY <= aWinEnd.Y();
         if (bRight || bBottom)
         {
             SetLineColor();
@@ -514,11 +514,11 @@ void __EXPORT ScPreview::Paint( const Rectangle& /* rRect */ )
     long   nRightMargin = 0;
     long   nTopMargin = 0;
     long   nBottomMargin = 0;
-    BOOL   bHeaderOn = FALSE;
-    BOOL   bFooterOn = FALSE;
+    sal_Bool   bHeaderOn = sal_False;
+    sal_Bool   bFooterOn = sal_False;
 
     ScDocument* pDoc = pDocShell->GetDocument();
-    BOOL   bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+    sal_Bool   bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
     Size aPaintPageSize;
     if ( nPageNo < nTotalPages )
@@ -534,7 +534,7 @@ void __EXPORT ScPreview::Paint( const Rectangle& /* rRect */ )
         pPrintFunc->SetOffset(aOffset);
         pPrintFunc->SetManualZoom(nZoom);
         pPrintFunc->SetDateTime(aDate,aTime);
-        pPrintFunc->SetClearFlag(TRUE);
+        pPrintFunc->SetClearFlag(sal_True);
         pPrintFunc->SetUseStyleColor( pScMod->GetAccessOptions().GetIsForPagePreviews() );
         pPrintFunc->SetDrawView( pDrawView );
 
@@ -606,7 +606,7 @@ void __EXPORT ScPreview::Paint( const Rectangle& /* rRect */ )
         {
             pPrintFunc->GetPrintState( aState );
             aState.nDocPages = nTotalPages;
-            bStateValid = TRUE;
+            bStateValid = sal_True;
         }
 
         delete pPrintFunc;
@@ -617,8 +617,8 @@ void __EXPORT ScPreview::Paint( const Rectangle& /* rRect */ )
     long nPageEndY = aPaintPageSize.Height() - aOffset.Y();
     Size aWinSize = GetOutputSize();
     Point aWinEnd( aWinSize.Width(), aWinSize.Height() );
-    BOOL bRight  = nPageEndX <= aWinEnd.X();
-    BOOL bBottom = nPageEndY <= aWinEnd.Y();
+    sal_Bool bRight  = nPageEndX <= aWinEnd.X();
+    sal_Bool bBottom = nPageEndY <= aWinEnd.Y();
 
     if( bPageMargin )
     {
@@ -670,10 +670,10 @@ void __EXPORT ScPreview::Paint( const Rectangle& /* rRect */ )
 
 void __EXPORT ScPreview::Command( const CommandEvent& rCEvt )
 {
-    USHORT nCmd = rCEvt.GetCommand();
+    sal_uInt16 nCmd = rCEvt.GetCommand();
     if ( nCmd == COMMAND_WHEEL || nCmd == COMMAND_STARTAUTOSCROLL || nCmd == COMMAND_AUTOSCROLL )
     {
-        BOOL bDone = pViewShell->ScrollCommand( rCEvt );
+        sal_Bool bDone = pViewShell->ScrollCommand( rCEvt );
         if (!bDone)
             Window::Command(rCEvt);
     }
@@ -690,11 +690,11 @@ void __EXPORT ScPreview::KeyInput( const KeyEvent& rKEvt )
     //  (in ScPreview, not ScPreviewShell -> only if the preview window has the focus)
 
     const KeyCode& rKeyCode = rKEvt.GetKeyCode();
-    USHORT nKey = rKeyCode.GetCode();
-    BOOL bHandled = FALSE;
+    sal_uInt16 nKey = rKeyCode.GetCode();
+    sal_Bool bHandled = sal_False;
     if(!rKeyCode.GetModifier())
     {
-        USHORT nSlot = 0;
+        sal_uInt16 nSlot = 0;
         switch(nKey)
         {
             case KEY_ADD:      nSlot = SID_PREVIEW_ZOOMIN;  break;
@@ -703,7 +703,7 @@ void __EXPORT ScPreview::KeyInput( const KeyEvent& rKEvt )
         }
         if(nSlot)
         {
-            bHandled = TRUE;
+            bHandled = sal_True;
             pViewShell->GetViewFrame()->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_ASYNCHRON );
         }
     }
@@ -718,19 +718,19 @@ const ScPreviewLocationData& ScPreview::GetLocationData()
     if ( !pLocationData )
     {
         pLocationData = new ScPreviewLocationData( pDocShell->GetDocument(), this );
-        bLocationValid = FALSE;
+        bLocationValid = sal_False;
     }
     if ( !bLocationValid )
     {
         pLocationData->Clear();
         DoPrint( pLocationData );
-        bLocationValid = TRUE;
+        bLocationValid = sal_True;
     }
     return *pLocationData;
 }
 
 
-void ScPreview::DataChanged(BOOL bNewTime)
+void ScPreview::DataChanged(sal_Bool bNewTime)
 {
     if (bNewTime)
     {
@@ -738,7 +738,7 @@ void ScPreview::DataChanged(BOOL bNewTime)
         aTime = Time();
     }
 
-    bValid = FALSE;
+    bValid = sal_False;
     InvalidateLocationData( SC_HINT_DATACHANGED );
     Invalidate();
 }
@@ -766,7 +766,7 @@ String ScPreview::GetPosString()
 }
 
 
-void ScPreview::SetZoom(USHORT nNewZoom)
+void ScPreview::SetZoom(sal_uInt16 nNewZoom)
 {
     if (nNewZoom < 20)
         nNewZoom = 20;
@@ -783,11 +783,11 @@ void ScPreview::SetZoom(USHORT nNewZoom)
         MapMode aMMMode( MAP_100TH_MM, Point(), aHorPrevZoom, aPreviewZoom );
         SetMapMode( aMMMode );
 
-        bInPaint = TRUE;				// don't scroll during SetYOffset in UpdateScrollBars
+        bInPaint = sal_True;				// don't scroll during SetYOffset in UpdateScrollBars
         pViewShell->UpdateScrollBars();
-        bInPaint = FALSE;
+        bInPaint = sal_False;
 
-        bStateValid = FALSE;
+        bStateValid = sal_False;
         InvalidateLocationData( SC_HINT_ACC_VISAREACHANGED );
         DoInvalidate();
         Invalidate();
@@ -848,7 +848,7 @@ Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab )
 }
 
 
-USHORT ScPreview::GetOptimalZoom(BOOL bWidthOnly)
+sal_uInt16 ScPreview::GetOptimalZoom(sal_Bool bWidthOnly)
 {
     double nWinScaleX = ScGlobal::nScreenPPTX / pDocShell->GetOutputFactor();
     double nWinScaleY = ScGlobal::nScreenPPTY;
@@ -876,7 +876,7 @@ USHORT ScPreview::GetOptimalZoom(BOOL bWidthOnly)
         if (nOptimal>400)
             nOptimal = 400;
 
-        return (USHORT) nOptimal;
+        return (sal_uInt16) nOptimal;
     }
     else
         return nZoom;
@@ -1023,14 +1023,14 @@ void __EXPORT ScPreview::MouseButtonDown( const MouseEvent& rMEvt )
         if( bLeftRulerChange )
         {
            DrawInvert( aButtonDownChangePoint.X(), POINTER_HSIZEBAR );
-           bLeftRulerMove = TRUE;
-           bRightRulerMove = FALSE;
+           bLeftRulerMove = sal_True;
+           bRightRulerMove = sal_False;
         }
         else if( bRightRulerChange )
         {
            DrawInvert( aButtonDownChangePoint.X(), POINTER_HSIZEBAR );
-           bLeftRulerMove = FALSE;
-           bRightRulerMove = TRUE;
+           bLeftRulerMove = sal_False;
+           bRightRulerMove = sal_True;
         }
     }
 
@@ -1040,26 +1040,26 @@ void __EXPORT ScPreview::MouseButtonDown( const MouseEvent& rMEvt )
         if( bTopRulerChange )
         {
             DrawInvert( aButtonDownChangePoint.Y(), POINTER_VSIZEBAR );
-            bTopRulerMove = TRUE;
-            bBottomRulerMove = FALSE;
+            bTopRulerMove = sal_True;
+            bBottomRulerMove = sal_False;
         }
         else if( bBottomRulerChange )
         {
             DrawInvert( aButtonDownChangePoint.Y(), POINTER_VSIZEBAR );
-            bTopRulerMove = FALSE;
-            bBottomRulerMove = TRUE;
+            bTopRulerMove = sal_False;
+            bBottomRulerMove = sal_True;
         }
         else if( bHeaderRulerChange )
         {
             DrawInvert( aButtonDownChangePoint.Y(), POINTER_VSIZEBAR );
-            bHeaderRulerMove = TRUE;
-            bFooterRulerMove = FALSE;
+            bHeaderRulerMove = sal_True;
+            bFooterRulerMove = sal_False;
         }
         else if( bFooterRulerChange )
         {
             DrawInvert( aButtonDownChangePoint.Y(), POINTER_VSIZEBAR );
-            bHeaderRulerMove = FALSE;
-            bFooterRulerMove = TRUE;
+            bHeaderRulerMove = sal_False;
+            bFooterRulerMove = sal_True;
         }
     }
 
@@ -1085,7 +1085,7 @@ void __EXPORT ScPreview::MouseButtonDown( const MouseEvent& rMEvt )
             DrawInvert( PixelToLogic( Point( nRight[ nColNumberButttonDown-1 ], 0 ),aMMMode ).X() ,POINTER_HSPLIT );
 
         DrawInvert( aButtonDownChangePoint.X(), POINTER_HSPLIT );
-        bColRulerMove = TRUE;
+        bColRulerMove = sal_True;
     }
 }
 
@@ -1104,11 +1104,11 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
         {
             SetPointer( Pointer( POINTER_ARROW ) );
 
-            BOOL bMoveRulerAction= TRUE;
+            sal_Bool bMoveRulerAction= sal_True;
 
             ScDocument * pDoc = pDocShell->GetDocument();
             String   aOldName = pDoc->GetPageStyle( nTab );
-            BOOL  bUndo( pDoc->IsUndoEnabled() );
+            sal_Bool  bUndo( pDoc->IsUndoEnabled() );
             ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
             SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aOldName, SFX_STYLE_FAMILY_PAGE );
 
@@ -1124,22 +1124,22 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
 
                 if(( bLeftRulerChange || bRightRulerChange ) && ( aButtonUpPt.X() <= ( 0 - aOffset.X() ) || aButtonUpPt.X() > nWidth * HMM_PER_TWIPS - aOffset.X() ) )
                 {
-                    bMoveRulerAction = FALSE;
+                    bMoveRulerAction = sal_False;
                     Paint(Rectangle(0,0,10000,10000));
                 }
                 else if( bLeftRulerChange && ( aButtonUpPt.X() / HMM_PER_TWIPS > nWidth - aLRItem.GetRight() - aOffset.X() / HMM_PER_TWIPS ) )
                 {
-                    bMoveRulerAction = FALSE;
+                    bMoveRulerAction = sal_False;
                     Paint(Rectangle(0,0,10000,10000));
                 }
                 else if( bRightRulerChange && ( aButtonUpPt.X() / HMM_PER_TWIPS < aLRItem.GetLeft() - aOffset.X() / HMM_PER_TWIPS ) )
                 {
-                    bMoveRulerAction = FALSE;
+                    bMoveRulerAction = sal_False;
                     Paint(Rectangle(0,0,10000,10000));
                 }
                 else if( aButtonDownPt.X() == aButtonUpPt.X() )
                 {
-                    bMoveRulerAction = FALSE;
+                    bMoveRulerAction = sal_False;
                     DrawInvert( aButtonUpPt.X(), POINTER_HSIZEBAR );
                 }
                 if( bMoveRulerAction )
@@ -1172,33 +1172,33 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
 
                     Rectangle aRect(0,0,10000,10000);
                     Paint( aRect );
-                    bLeftRulerChange = FALSE;
-                    bRightRulerChange = FALSE;
+                    bLeftRulerChange = sal_False;
+                    bRightRulerChange = sal_False;
                 }
             }
-            bLeftRulerMove = FALSE;
-            bRightRulerMove = FALSE;
+            bLeftRulerMove = sal_False;
+            bRightRulerMove = sal_False;
         }
 
         if( rMEvt.IsLeft() && GetPointer() == POINTER_VSIZEBAR )
         {
             SetPointer( POINTER_ARROW );
 
-            BOOL  bMoveRulerAction = TRUE;
+            sal_Bool  bMoveRulerAction = sal_True;
             if( ( bTopRulerChange || bBottomRulerChange || bHeaderRulerChange || bFooterRulerChange ) && ( aButtonUpPt.Y() <= ( 0 - aOffset.Y() ) || aButtonUpPt.Y() > nHeight * HMM_PER_TWIPS -aOffset.Y() ) )
             {
-                bMoveRulerAction = FALSE;
+                bMoveRulerAction = sal_False;
                 Paint( Rectangle(0,0,10000,10000) );
             }
             else if( aButtonDownPt.Y() == aButtonUpPt.Y() )
             {
-                bMoveRulerAction = FALSE;
+                bMoveRulerAction = sal_False;
                 DrawInvert( aButtonUpPt.Y(), POINTER_VSIZEBAR );
             }
             if( bMoveRulerAction )
             {
                 ScDocument * pDoc = pDocShell->GetDocument();
-                BOOL  bUndo( pDoc->IsUndoEnabled() );
+                sal_Bool  bUndo( pDoc->IsUndoEnabled() );
                 ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
                 SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE );
                 DBG_ASSERT( pStyleSheet, "PageStyle not found" );
@@ -1214,18 +1214,18 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
 
                     if( bTopRulerMove && bTopRulerChange )
                     {
-                        aULItem.SetUpperValue( (USHORT)( aButtonUpPt.Y() / HMM_PER_TWIPS + aOffset.Y() / HMM_PER_TWIPS ) );
+                        aULItem.SetUpperValue( (sal_uInt16)( aButtonUpPt.Y() / HMM_PER_TWIPS + aOffset.Y() / HMM_PER_TWIPS ) );
                         rStyleSet.Put( aULItem );
                     }
                     else if( bBottomRulerMove && bBottomRulerChange )
                     {
-                        aULItem.SetLowerValue( (USHORT)( nHeight - aButtonUpPt.Y() / HMM_PER_TWIPS - aOffset.Y() / HMM_PER_TWIPS ) );
+                        aULItem.SetLowerValue( (sal_uInt16)( nHeight - aButtonUpPt.Y() / HMM_PER_TWIPS - aOffset.Y() / HMM_PER_TWIPS ) );
                         rStyleSet.Put( aULItem );
                     }
                     else if( bHeaderRulerMove && bHeaderRulerChange )
                     {
                         const SfxPoolItem* pItem = NULL;
-                        if ( rStyleSet.GetItemState( ATTR_PAGE_HEADERSET, FALSE, &pItem ) == SFX_ITEM_SET )
+                        if ( rStyleSet.GetItemState( ATTR_PAGE_HEADERSET, sal_False, &pItem ) == SFX_ITEM_SET )
                         {
                             SfxItemSet& pHeaderSet = ((SvxSetItem*)pItem)->GetItemSet();
                             Size  aHeaderSize = ((const SvxSizeItem&)pHeaderSet.Get(ATTR_PAGE_SIZE)).GetSize();
@@ -1239,7 +1239,7 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                     else if( bFooterRulerMove && bFooterRulerChange )
                     {
                         const SfxPoolItem* pItem = NULL;
-                        if( rStyleSet.GetItemState( ATTR_PAGE_FOOTERSET, FALSE, &pItem ) == SFX_ITEM_SET )
+                        if( rStyleSet.GetItemState( ATTR_PAGE_FOOTERSET, sal_False, &pItem ) == SFX_ITEM_SET )
                         {
                             SfxItemSet& pFooterSet = ((SvxSetItem*)pItem)->GetItemSet();
                             Size aFooterSize = ((const SvxSizeItem&)pFooterSet.Get(ATTR_PAGE_SIZE)).GetSize();
@@ -1268,26 +1268,26 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
 
                     Rectangle  aRect(0,0,10000,10000);
                     Paint( aRect );
-                    bTopRulerChange = FALSE;
-                    bBottomRulerChange = FALSE;
-                    bHeaderRulerChange = FALSE;
-                    bFooterRulerChange = FALSE;
+                    bTopRulerChange = sal_False;
+                    bBottomRulerChange = sal_False;
+                    bHeaderRulerChange = sal_False;
+                    bFooterRulerChange = sal_False;
                  }
               }
-              bTopRulerMove = FALSE;
-              bBottomRulerMove = FALSE;
-              bHeaderRulerMove = FALSE;
-              bFooterRulerMove = FALSE;
+              bTopRulerMove = sal_False;
+              bBottomRulerMove = sal_False;
+              bHeaderRulerMove = sal_False;
+              bFooterRulerMove = sal_False;
         }
         if( rMEvt.IsLeft() && GetPointer() == POINTER_HSPLIT )
         {
             SetPointer(POINTER_ARROW);
             ScDocument* pDoc = pDocShell->GetDocument();
-            BOOL  bLayoutRTL = pDoc->IsLayoutRTL( nTab );
-            BOOL  bMoveRulerAction = TRUE;
+            sal_Bool  bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+            sal_Bool  bMoveRulerAction = sal_True;
             if( aButtonDownPt.X() == aButtonUpPt.X() )
             {
-                bMoveRulerAction = FALSE;
+                bMoveRulerAction = sal_False;
                 if( nColNumberButttonDown == aPageArea.aStart.Col() )
                     DrawInvert( PixelToLogic( Point( nLeftPosition, 0 ),aMMMode ).X() ,POINTER_HSPLIT );
                 else
@@ -1314,7 +1314,7 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
 
                 if( nNewColWidth >= 0 )
                 {
-                    aFunc.SetWidthOrHeight( TRUE, 1,nCols, nTab, SC_SIZE_DIRECT, (USHORT)nNewColWidth, TRUE, TRUE);
+                    aFunc.SetWidthOrHeight( sal_True, 1,nCols, nTab, SC_SIZE_DIRECT, (sal_uInt16)nNewColWidth, sal_True, sal_True);
                 }
                 if ( ValidTab( nTab ) )
                 {
@@ -1324,7 +1324,7 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                 Rectangle  nRect(0,0,10000,10000);
                 Paint( nRect );
             }
-            bColRulerMove = FALSE;
+            bColRulerMove = sal_False;
         }
         ReleaseMouse();
 }
@@ -1385,7 +1385,7 @@ void __EXPORT ScPreview::MouseMove( const MouseEvent& rMEvt )
     Point   aHeaderLeft = LogicToPixel( Point(  -aOffset.X(), nHeaderHeight ), aMMMode );
     Point   aFooderLeft = LogicToPixel( Point( -aOffset.X(), nFooterHeight ), aMMMode );
 
-    BOOL   bOnColRulerChange = FALSE;
+    sal_Bool   bOnColRulerChange = sal_False;
 
     for( SCCOL i=aPageArea.aStart.Col(); i<= aPageArea.aEnd.Col(); i++ )
     {
@@ -1395,7 +1395,7 @@ void __EXPORT ScPreview::MouseMove( const MouseEvent& rMEvt )
             && ( aPixPt.Y() > aColumnTop.Y() ) && ( aPixPt.Y() < aColumnBottom.Y() ) && !bLeftRulerMove && !bRightRulerMove
             && !bTopRulerMove && !bBottomRulerMove && !bHeaderRulerMove && !bFooterRulerMove )
         {
-            bOnColRulerChange = TRUE;
+            bOnColRulerChange = sal_True;
             if( !rMEvt.GetButtons() && GetPointer() == POINTER_HSPLIT )
                 nColNumberButttonDown = i;
             break;
@@ -1404,41 +1404,41 @@ void __EXPORT ScPreview::MouseMove( const MouseEvent& rMEvt )
 
     if( aPixPt.X() < ( aLeftTop.X() + 2 ) && aPixPt.X() > ( aLeftTop.X() - 2 ) && !bRightRulerMove )
     {
-        bLeftRulerChange = TRUE;
-        bRightRulerChange = FALSE;
+        bLeftRulerChange = sal_True;
+        bRightRulerChange = sal_False;
     }
     else if( aPixPt.X() < ( aRightTop.X() + 2 ) && aPixPt.X() > ( aRightTop.X() - 2 ) && !bLeftRulerMove )
     {
-        bLeftRulerChange = FALSE;
-        bRightRulerChange = TRUE;
+        bLeftRulerChange = sal_False;
+        bRightRulerChange = sal_True;
     }
     else if( aPixPt.Y() < ( aTopLeft.Y() + 2 ) && aPixPt.Y() > ( aTopLeft.Y() - 2 ) && !bBottomRulerMove && !bHeaderRulerMove && !bFooterRulerMove )
     {
-        bTopRulerChange = TRUE;
-        bBottomRulerChange = FALSE;
-        bHeaderRulerChange = FALSE;
-        bFooterRulerChange = FALSE;
+        bTopRulerChange = sal_True;
+        bBottomRulerChange = sal_False;
+        bHeaderRulerChange = sal_False;
+        bFooterRulerChange = sal_False;
     }
     else if( aPixPt.Y() < ( aBottomLeft.Y() + 2 ) && aPixPt.Y() > ( aBottomLeft.Y() - 2 ) && !bTopRulerMove && !bHeaderRulerMove && !bFooterRulerMove )
     {
-        bTopRulerChange = FALSE;
-        bBottomRulerChange = TRUE;
-        bHeaderRulerChange = FALSE;
-        bFooterRulerChange = FALSE;
+        bTopRulerChange = sal_False;
+        bBottomRulerChange = sal_True;
+        bHeaderRulerChange = sal_False;
+        bFooterRulerChange = sal_False;
     }
     else if( aPixPt.Y() < ( aHeaderLeft.Y() + 2 ) && aPixPt.Y() > ( aHeaderLeft.Y() - 2 ) && !bTopRulerMove && !bBottomRulerMove && !bFooterRulerMove )
     {
-        bTopRulerChange = FALSE;
-        bBottomRulerChange = FALSE;
-        bHeaderRulerChange = TRUE;
-        bFooterRulerChange = FALSE;
+        bTopRulerChange = sal_False;
+        bBottomRulerChange = sal_False;
+        bHeaderRulerChange = sal_True;
+        bFooterRulerChange = sal_False;
     }
     else if( aPixPt.Y() < ( aFooderLeft.Y() + 2 ) && aPixPt.Y() > ( aFooderLeft.Y() - 2 ) && !bTopRulerMove && !bBottomRulerMove && !bHeaderRulerMove )
     {
-        bTopRulerChange = FALSE;
-        bBottomRulerChange = FALSE;
-        bHeaderRulerChange = FALSE;
-        bFooterRulerChange = TRUE;
+        bTopRulerChange = sal_False;
+        bBottomRulerChange = sal_False;
+        bHeaderRulerChange = sal_False;
+        bFooterRulerChange = sal_True;
     }
 
     if( bPageMargin )
@@ -1529,9 +1529,9 @@ void __EXPORT ScPreview::MouseMove( const MouseEvent& rMEvt )
     }
 }
 //Issue51656 Add resizeable margin on page preview from maoyg
-void ScPreview::InvalidateLocationData(ULONG nId)
+void ScPreview::InvalidateLocationData(sal_uLong nId)
 {
-    bLocationValid = FALSE;
+    bLocationValid = sal_False;
     if (pViewShell->HasAccessibilityObjects())
         pViewShell->BroadcastAccessibility( SfxSimpleHint( nId ) );
 }
@@ -1558,7 +1558,7 @@ com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> ScPre
 }
 
 //Issue51656 Add resizeable margin on page preview from maoyg
-void ScPreview::DragMove( long nDragMovePos, USHORT nFlags )
+void ScPreview::DragMove( long nDragMovePos, sal_uInt16 nFlags )
 {
     Fraction aPreviewZoom( nZoom, 100 );
     Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor() ), 10000 );
@@ -1585,7 +1585,7 @@ void ScPreview::DragMove( long nDragMovePos, USHORT nFlags )
     }
 }
 
-void ScPreview::DrawInvert( long nDragPos, USHORT nFlags )
+void ScPreview::DrawInvert( long nDragPos, sal_uInt16 nFlags )
 {
     long  nHeight = (long) lcl_GetDocPageSize( pDocShell->GetDocument(), nTab ).Height();
     long  nWidth = (long) lcl_GetDocPageSize( pDocShell->GetDocument(), nTab ).Width();
diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx
index a5fd77cf0..ba2436ebc 100644
--- a/sc/source/ui/view/prevloc.cxx
+++ b/sc/source/ui/view/prevloc.cxx
@@ -58,11 +58,11 @@ struct ScPreviewLocationEntry
     ScPreviewLocationType	eType;
     Rectangle				aPixelRect;
     ScRange					aCellRange;
-    BOOL					bRepeatCol;
-    BOOL					bRepeatRow;
+    sal_Bool					bRepeatCol;
+    sal_Bool					bRepeatRow;
 
     ScPreviewLocationEntry( ScPreviewLocationType eNewType, const Rectangle& rPixel, const ScRange& rRange,
-                            BOOL bRepCol, BOOL bRepRow ) :
+                            sal_Bool bRepCol, sal_Bool bRepRow ) :
         eType( eNewType ),
         aPixelRect( rPixel ),
         aCellRange( rRange ),
@@ -203,7 +203,7 @@ void ScPreviewLocationData::Clear()
     nDrawRanges = 0;
 }
 
-void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow,
+void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange& rRange, sal_Bool bRepCol, sal_Bool bRepRow,
                                             const MapMode& rDrawMap )
 {
     Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
@@ -228,23 +228,23 @@ void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange&
     }
 }
 
-void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol )
+void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, sal_Bool bRepCol )
 {
     SCTAB nTab = 0;	//! ?
     ScRange aRange( nStartCol, 0, nTab, nEndCol, 0, nTab );
     Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
-    aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_COLHEADER, aPixelRect, aRange, bRepCol, FALSE ) );
+    aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_COLHEADER, aPixelRect, aRange, bRepCol, sal_False ) );
 }
 
-void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow )
+void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, sal_Bool bRepRow )
 {
     SCTAB nTab = 0;	//! ?
     ScRange aRange( 0, nStartRow, nTab, 0, nEndRow, nTab );
     Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
-    aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_ROWHEADER, aPixelRect, aRange, FALSE, bRepRow ) );
+    aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_ROWHEADER, aPixelRect, aRange, sal_False, bRepRow ) );
 }
 
-void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft )
+void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, sal_Bool bHeader, sal_Bool bLeft )
 {
     ScRange aRange;		//! ?
     Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
@@ -252,26 +252,26 @@ void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, BOOL bHeade
     ScPreviewLocationType eType = bHeader ?
                 ( bLeft ? SC_PLOC_LEFTHEADER : SC_PLOC_RIGHTHEADER ) :
                 ( bLeft ? SC_PLOC_LEFTFOOTER : SC_PLOC_RIGHTFOOTER );
-    aEntries.Insert( new ScPreviewLocationEntry( eType, aPixelRect, aRange, FALSE, FALSE ) );
+    aEntries.Insert( new ScPreviewLocationEntry( eType, aPixelRect, aRange, sal_False, sal_False ) );
 }
 
 void ScPreviewLocationData::AddNoteMark( const Rectangle& rRect, const ScAddress& rPos )
 {
     ScRange aRange( rPos );
     Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
-    aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_NOTEMARK, aPixelRect, aRange, FALSE, FALSE ) );
+    aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_NOTEMARK, aPixelRect, aRange, sal_False, sal_False ) );
 }
 
 void ScPreviewLocationData::AddNoteText( const Rectangle& rRect, const ScAddress& rPos )
 {
     ScRange aRange( rPos );
     Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
-    aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_NOTETEXT, aPixelRect, aRange, FALSE, FALSE ) );
+    aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_NOTETEXT, aPixelRect, aRange, sal_False, sal_False ) );
 }
 
 //------------------------------------------------------------------
 
-void ScPreviewLocationData::GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const
+void ScPreviewLocationData::GetDrawRange( sal_uInt16 nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const
 {
     DBG_ASSERT( nPos < nDrawRanges, "wrong position" );
     if ( nPos < nDrawRanges )
@@ -284,8 +284,8 @@ void ScPreviewLocationData::GetDrawRange( USHORT nPos, Rectangle& rPixelRect, Ma
 
 ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAddress& rPos, ScPreviewLocationType eType )
 {
-    ULONG nCount = rEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nCount = rEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)rEntries.GetObject(nListPos);
         if ( pEntry->eType == eType && pEntry->aCellRange.In( rPos ) )
@@ -307,7 +307,7 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd
 //UNUSED2008-05      SCCOL nEndCol = rRange.aEnd.Col();
 //UNUSED2008-05      while ( nCol <= nEndCol && nPosX < aOffsetLogic.Width() )
 //UNUSED2008-05      {
-//UNUSED2008-05          USHORT nDocW = pDoc->GetColWidth( nCol, nTab );
+//UNUSED2008-05          sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nTab );
 //UNUSED2008-05          if (nDocW)
 //UNUSED2008-05              nPosX += (long) (nDocW * nScaleX);
 //UNUSED2008-05          ++nCol;
@@ -316,12 +316,12 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd
 //UNUSED2008-05          --nCol;
 //UNUSED2008-05  
 //UNUSED2008-05      long nPosY = 0;
-//UNUSED2008-05      ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
+//UNUSED2008-05      ScCoupledCompressedArrayIterator< SCROW, sal_uInt8, sal_uInt16> aIter(
 //UNUSED2008-05              pDoc->GetRowFlagsArray( nTab), rRange.aStart.Row(),
 //UNUSED2008-05              rRange.aEnd.Row(), CR_HIDDEN, 0, pDoc->GetRowHeightArray( nTab));
 //UNUSED2008-05      while ( aIter && nPosY < aOffsetLogic.Height() )
 //UNUSED2008-05      {
-//UNUSED2008-05          USHORT nDocH = *aIter;
+//UNUSED2008-05          sal_uInt16 nDocH = *aIter;
 //UNUSED2008-05          if (nDocH)
 //UNUSED2008-05              nPosY += (long) (nDocH * nScaleY);
 //UNUSED2008-05          ++aIter;
@@ -343,7 +343,7 @@ Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, cons
     SCCOL nEndCol = rCellPos.Col();
     for (SCCOL nCol = rRange.aStart.Col(); nCol < nEndCol; nCol++)
     {
-        USHORT nDocW = pDoc->GetColWidth( nCol, nTab );
+        sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nTab );
         if (nDocW)
             nPosX += (long) (nDocW * nScaleX);
     }
@@ -362,7 +362,7 @@ Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, cons
     return Rectangle( Point( aOffsetPixel.Width(), aOffsetPixel.Height() ), aSizePixel );
 }
 
-BOOL ScPreviewLocationData::GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const
+sal_Bool ScPreviewLocationData::GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const
 {
     ScPreviewLocationEntry* pEntry = lcl_GetEntryByAddress( aEntries, rCellPos, SC_PLOC_CELLRANGE );
     if ( pEntry )
@@ -372,90 +372,90 @@ BOOL ScPreviewLocationData::GetCellPosition( const ScAddress& rCellPos, Rectangl
                                aOffsetRect.Top() + pEntry->aPixelRect.Top(),
                                aOffsetRect.Right() + pEntry->aPixelRect.Left(),
                                aOffsetRect.Bottom() + pEntry->aPixelRect.Top() );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScPreviewLocationData::HasCellsInRange( const Rectangle& rVisiblePixel ) const
+sal_Bool ScPreviewLocationData::HasCellsInRange( const Rectangle& rVisiblePixel ) const
 {
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         ScPreviewLocationType eType = pEntry->eType;
         if ( eType == SC_PLOC_CELLRANGE || eType == SC_PLOC_COLHEADER || eType == SC_PLOC_ROWHEADER )
             if ( pEntry->aPixelRect.IsOver( rVisiblePixel ) )
-                return TRUE;
+                return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScPreviewLocationData::GetHeaderPosition( Rectangle& rRect ) const
+sal_Bool ScPreviewLocationData::GetHeaderPosition( Rectangle& rRect ) const
 {
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == SC_PLOC_LEFTHEADER || pEntry->eType == SC_PLOC_RIGHTHEADER )
         {
             rRect = pEntry->aPixelRect;
-            return TRUE;
+            return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScPreviewLocationData::GetFooterPosition( Rectangle& rRect ) const
+sal_Bool ScPreviewLocationData::GetFooterPosition( Rectangle& rRect ) const
 {
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == SC_PLOC_LEFTFOOTER || pEntry->eType == SC_PLOC_RIGHTFOOTER )
         {
             rRect = pEntry->aPixelRect;
-            return TRUE;
+            return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScPreviewLocationData::IsHeaderLeft() const
+sal_Bool ScPreviewLocationData::IsHeaderLeft() const
 {
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == SC_PLOC_LEFTHEADER )
-            return TRUE;
+            return sal_True;
         if ( pEntry->eType == SC_PLOC_RIGHTHEADER )
-            return FALSE;
+            return sal_False;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScPreviewLocationData::IsFooterLeft() const
+sal_Bool ScPreviewLocationData::IsFooterLeft() const
 {
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == SC_PLOC_LEFTFOOTER )
-            return TRUE;
+            return sal_True;
         if ( pEntry->eType == SC_PLOC_RIGHTFOOTER )
-            return FALSE;
+            return sal_False;
     }
-    return FALSE;
+    return sal_False;
 }
 
-long ScPreviewLocationData::GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const
+long ScPreviewLocationData::GetNoteCountInRange( const Rectangle& rVisiblePixel, sal_Bool bNoteMarks ) const
 {
     ScPreviewLocationType eType = bNoteMarks ? SC_PLOC_NOTEMARK : SC_PLOC_NOTETEXT;
 
-    ULONG nRet = 0;
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nRet = 0;
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == eType && pEntry->aPixelRect.IsOver( rVisiblePixel ) )
@@ -464,37 +464,37 @@ long ScPreviewLocationData::GetNoteCountInRange( const Rectangle& rVisiblePixel,
     return nRet;
 }
 
-BOOL ScPreviewLocationData::GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks,
+sal_Bool ScPreviewLocationData::GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, sal_Bool bNoteMarks,
                                             ScAddress& rCellPos, Rectangle& rNoteRect ) const
 {
     ScPreviewLocationType eType = bNoteMarks ? SC_PLOC_NOTEMARK : SC_PLOC_NOTETEXT;
 
-    ULONG nPos = 0;
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nPos = 0;
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == eType && pEntry->aPixelRect.IsOver( rVisiblePixel ) )
         {
-            if ( nPos == sal::static_int_cast<ULONG>(nIndex) )
+            if ( nPos == sal::static_int_cast<sal_uLong>(nIndex) )
             {
                 rCellPos = pEntry->aCellRange.aStart;
                 rNoteRect = pEntry->aPixelRect;
-                return TRUE;
+                return sal_True;
             }
             ++nPos;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-Rectangle ScPreviewLocationData::GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks, const ScAddress& aCellPos) const
+Rectangle ScPreviewLocationData::GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, sal_Bool bNoteMarks, const ScAddress& aCellPos) const
 {
     ScPreviewLocationType eType = bNoteMarks ? SC_PLOC_NOTEMARK : SC_PLOC_NOTETEXT;
 
-    ULONG nPos = 0;
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nPos = 0;
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == eType && pEntry->aPixelRect.IsOver( rVisiblePixel ) )
@@ -513,18 +513,18 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
     const double nScaleY = HMM_PER_TWIPS;
 
     // from left to right:
-    BOOL bHasHeaderCol = FALSE;
-    BOOL bHasRepCols   = FALSE;
-    BOOL bHasMainCols  = FALSE;
+    sal_Bool bHasHeaderCol = sal_False;
+    sal_Bool bHasRepCols   = sal_False;
+    sal_Bool bHasMainCols  = sal_False;
     SCCOL nRepeatColStart = 0;
     SCCOL nRepeatColEnd   = 0;
     SCCOL nMainColStart   = 0;
     SCCOL nMainColEnd     = 0;
 
     // from top to bottom:
-    BOOL bHasHeaderRow = FALSE;
-    BOOL bHasRepRows   = FALSE;
-    BOOL bHasMainRows  = FALSE;
+    sal_Bool bHasHeaderRow = sal_False;
+    sal_Bool bHasRepRows   = sal_False;
+    sal_Bool bHasMainRows  = sal_False;
     SCROW nRepeatRowStart = 0;
     SCROW nRepeatRowEnd   = 0;
     SCROW nMainRowStart   = 0;
@@ -533,15 +533,15 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
     Rectangle aHeaderRect, aRepeatRect, aMainRect;
     SCTAB nTab = 0;
 
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == SC_PLOC_CELLRANGE )
         {
             if ( pEntry->bRepeatCol )
             {
-                bHasRepCols = TRUE;
+                bHasRepCols = sal_True;
                 nRepeatColStart = pEntry->aCellRange.aStart.Col();
                 nRepeatColEnd = pEntry->aCellRange.aEnd.Col();
                 aRepeatRect.Left() = pEntry->aPixelRect.Left();
@@ -549,7 +549,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
             }
             else
             {
-                bHasMainCols = TRUE;
+                bHasMainCols = sal_True;
                 nMainColStart = pEntry->aCellRange.aStart.Col();
                 nMainColEnd = pEntry->aCellRange.aEnd.Col();
                 aMainRect.Left() = pEntry->aPixelRect.Left();
@@ -557,7 +557,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
             }
             if ( pEntry->bRepeatRow )
             {
-                bHasRepRows = TRUE;
+                bHasRepRows = sal_True;
                 nRepeatRowStart = pEntry->aCellRange.aStart.Row();
                 nRepeatRowEnd = pEntry->aCellRange.aEnd.Row();
                 aRepeatRect.Top() = pEntry->aPixelRect.Top();
@@ -565,7 +565,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
             }
             else
             {
-                bHasMainRows = TRUE;
+                bHasMainRows = sal_True;
                 nMainRowStart = pEntry->aCellRange.aStart.Row();
                 nMainRowEnd = pEntry->aCellRange.aEnd.Row();
                 aMainRect.Top() = pEntry->aPixelRect.Top();
@@ -576,14 +576,14 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
         else if ( pEntry->eType == SC_PLOC_ROWHEADER )
         {
             // row headers result in an additional column
-            bHasHeaderCol = TRUE;
+            bHasHeaderCol = sal_True;
             aHeaderRect.Left() = pEntry->aPixelRect.Left();
             aHeaderRect.Right() = pEntry->aPixelRect.Right();
         }
         else if ( pEntry->eType == SC_PLOC_COLHEADER )
         {
             // column headers result in an additional row
-            bHasHeaderRow = TRUE;
+            bHasHeaderRow = sal_True;
             aHeaderRect.Top() = pEntry->aPixelRect.Top();
             aHeaderRect.Bottom() = pEntry->aPixelRect.Bottom();
         }
@@ -613,7 +613,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
 
         if ( bHasHeaderCol )
         {
-            pColInfo[nColPos].Set( TRUE, 0, aHeaderRect.Left(), aHeaderRect.Right() );
+            pColInfo[nColPos].Set( sal_True, 0, aHeaderRect.Left(), aHeaderRect.Right() );
             ++nColPos;
         }
         if ( bHasRepCols )
@@ -622,12 +622,12 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
             for ( nCol=nRepeatColStart; nCol<=nRepeatColEnd; nCol++ )
                 if (!pDoc->ColHidden(nCol, nTab))
                 {
-                    USHORT nDocW = pDoc->GetColWidth( nCol, nTab );
+                    sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nTab );
                     long nNextX = nPosX + (long) (nDocW * nScaleX);
 
                     long nPixelStart = pWindow->LogicToPixel( Size( nPosX, 0 ), aCellMapMode ).Width();
                     long nPixelEnd = pWindow->LogicToPixel( Size( nNextX, 0 ), aCellMapMode ).Width() - 1;
-                    pColInfo[nColPos].Set( FALSE, nCol,
+                    pColInfo[nColPos].Set( sal_False, nCol,
                                                 aRepeatRect.Left() + nPixelStart,
                                                 aRepeatRect.Left() + nPixelEnd );
 
@@ -641,12 +641,12 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
             for ( nCol=nMainColStart; nCol<=nMainColEnd; nCol++ )
                 if (!pDoc->ColHidden(nCol, nTab))
                 {
-                    USHORT nDocW = pDoc->GetColWidth( nCol, nTab );
+                    sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nTab );
                     long nNextX = nPosX + (long) (nDocW * nScaleX);
 
                     long nPixelStart = pWindow->LogicToPixel( Size( nPosX, 0 ), aCellMapMode ).Width();
                     long nPixelEnd = pWindow->LogicToPixel( Size( nNextX, 0 ), aCellMapMode ).Width() - 1;
-                    pColInfo[nColPos].Set( FALSE, nCol,
+                    pColInfo[nColPos].Set( sal_False, nCol,
                                                 aMainRect.Left() + nPixelStart,
                                                 aMainRect.Left() + nPixelEnd );
 
@@ -678,7 +678,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
 
         if ( bHasHeaderRow )
         {
-            pRowInfo[nRowPos].Set( TRUE, 0, aHeaderRect.Top(), aHeaderRect.Bottom() );
+            pRowInfo[nRowPos].Set( sal_True, 0, aHeaderRect.Top(), aHeaderRect.Bottom() );
             ++nRowPos;
         }
         if ( bHasRepRows )
@@ -689,12 +689,12 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
                 if (pDoc->RowHidden(nRow, nTab))
                     continue;
 
-                USHORT nDocH = pDoc->GetOriginalHeight( nRow, nTab );
+                sal_uInt16 nDocH = pDoc->GetOriginalHeight( nRow, nTab );
                 long nNextY = nPosY + (long) (nDocH * nScaleY);
 
                 long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
                 long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
-                pRowInfo[nRowPos].Set( FALSE, nRow,
+                pRowInfo[nRowPos].Set( sal_False, nRow,
                         aRepeatRect.Top() + nPixelStart,
                         aRepeatRect.Top() + nPixelEnd );
 
@@ -710,12 +710,12 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
                 if (pDoc->RowHidden(nRow, nTab))
                     continue;
 
-                USHORT nDocH = pDoc->GetOriginalHeight( nRow, nTab );
+                sal_uInt16 nDocH = pDoc->GetOriginalHeight( nRow, nTab );
                 long nNextY = nPosY + (long) (nDocH * nScaleY);
 
                 long nPixelStart = pWindow->LogicToPixel( Size( 0, nPosY ), aCellMapMode ).Height();
                 long nPixelEnd = pWindow->LogicToPixel( Size( 0, nNextY ), aCellMapMode ).Height() - 1;
-                pRowInfo[nRowPos].Set( FALSE, nRow,
+                pRowInfo[nRowPos].Set( sal_False, nRow,
                         aMainRect.Top() + nPixelStart,
                         aMainRect.Top() + nPixelEnd );
 
@@ -774,19 +774,19 @@ Rectangle ScPreviewLocationData::GetCellOutputRect(const ScAddress& rCellPos) co
 
 // GetMainCellRange is used for links in PDF export
 
-BOOL ScPreviewLocationData::GetMainCellRange( ScRange& rRange, Rectangle& rPixRect ) const
+sal_Bool ScPreviewLocationData::GetMainCellRange( ScRange& rRange, Rectangle& rPixRect ) const
 {
-    ULONG nCount = aEntries.Count();
-    for (ULONG nListPos=0; nListPos<nCount; nListPos++)
+    sal_uLong nCount = aEntries.Count();
+    for (sal_uLong nListPos=0; nListPos<nCount; nListPos++)
     {
         ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)aEntries.GetObject(nListPos);
         if ( pEntry->eType == SC_PLOC_CELLRANGE && !pEntry->bRepeatCol && !pEntry->bRepeatRow )
         {
             rRange = pEntry->aCellRange;
             rPixRect = pEntry->aPixelRect;
-            return TRUE;
+            return sal_True;
         }
     }
-    return FALSE;       // not found
+    return sal_False;       // not found
 }
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index a04456601..a504e239f 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -124,7 +124,7 @@ void ScPreviewShell::Construct( Window* pParent )
     pVerScroll = new ScrollBar(pParent, WB_VSCROLL);
 
     // SSA: --- RTL --- no mirroring for horizontal scrollbars
-    pHorScroll->EnableRTL( FALSE );
+    pHorScroll->EnableRTL( sal_False );
 
     pHorScroll->SetEndScrollHdl( LINK( this, ScPreviewShell, ScrollHandler ) );
     pVerScroll->SetEndScrollHdl( LINK( this, ScPreviewShell, ScrollHandler ) );
@@ -133,8 +133,8 @@ void ScPreviewShell::Construct( Window* pParent )
 
     SetPool( &SC_MOD()->GetPool() );
     SetWindow( pPreview );
-    StartListening(*pDocShell,TRUE);
-    StartListening(*SFX_APP(),TRUE);        // #i62045# #i62046# application is needed for Calc's own hints
+    StartListening(*pDocShell,sal_True);
+    StartListening(*SFX_APP(),sal_True);        // #i62045# #i62046# application is needed for Calc's own hints
     SfxBroadcaster* pDrawBC = pDocShell->GetDocument()->GetDrawBroadcaster();
     if (pDrawBC)
         StartListening(*pDrawBC);
@@ -261,9 +261,9 @@ void __EXPORT ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size
                               Size( nBarW, nBarH ) );
 
     if ( SVX_ZOOM_WHOLEPAGE == eZoom )
-        pPreview->SetZoom( pPreview->GetOptimalZoom(FALSE) );
+        pPreview->SetZoom( pPreview->GetOptimalZoom(sal_False) );
     else if ( SVX_ZOOM_PAGEWIDTH == eZoom )
-        pPreview->SetZoom( pPreview->GetOptimalZoom(TRUE) );
+        pPreview->SetZoom( pPreview->GetOptimalZoom(sal_True) );
 
     UpdateScrollBars();
 }
@@ -373,7 +373,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
     long nTotalPages    = pPreview->GetTotalPages();
     long nPageNo        = 0;
     long nPerPageLength = 0;
-    BOOL bIsDivide      = TRUE;
+    sal_Bool bIsDivide      = sal_True;
 
     if( nTotalPages )
         nPerPageLength = nMaxRange / nTotalPages;
@@ -383,12 +383,12 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
         nPageNo = nPos / nPerPageLength;
         if( nPos % nPerPageLength )
         {
-            bIsDivide = FALSE;
+            bIsDivide = sal_False;
             nPageNo ++;
         }
     }
 
-    BOOL bHoriz = ( pScroll == pHorScroll );
+    sal_Bool bHoriz = ( pScroll == pHorScroll );
 
     if( bHoriz )
         pPreview->SetXOffset( nPos );
@@ -402,7 +402,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
             Point  aPos      = pScroll->GetParent()->OutputToNormalizedScreenPixel( pScroll->GetPosPixel() );
             String aHelpStr;
             Rectangle aRect;
-            USHORT   nAlign;
+            sal_uInt16   nAlign;
 
             if( nDelta < 0 )
             {
@@ -420,7 +420,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
             }
             else if( nDelta > 0 )
             {
-                BOOL bAllTested	= pPreview->AllTested();
+                sal_Bool bAllTested	= pPreview->AllTested();
                 if ( nTotalPages && ( nPageNo < nTotalPages || !bAllTested ) )
                     pPreview->SetPageNo( nPageNo );
 
@@ -444,9 +444,9 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
     return 0;
 }
 
-BOOL ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt )
+sal_Bool ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     const CommandWheelData* pData = rCEvt.GetWheelData();
     if ( pData && pData->GetMode() == COMMAND_WHEEL_ZOOM )
     {
@@ -460,10 +460,10 @@ BOOL ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt )
         if ( nNew != nOld )
         {
             eZoom = SVX_ZOOM_PERCENT;
-            pPreview->SetZoom( (USHORT)nNew );
+            pPreview->SetZoom( (sal_uInt16)nNew );
         }
 
-        bDone = TRUE;
+        bDone = sal_True;
     }
     else
     {
@@ -473,12 +473,12 @@ BOOL ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt )
     return bDone;
 }
 
-SfxPrinter* __EXPORT ScPreviewShell::GetPrinter( BOOL bCreate )
+SfxPrinter* __EXPORT ScPreviewShell::GetPrinter( sal_Bool bCreate )
 {
     return pDocShell->GetPrinter(bCreate);
 }
 
-USHORT __EXPORT ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool )
+sal_uInt16 __EXPORT ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags, bool )
 {
     return pDocShell->SetPrinter( pNewPrinter, nDiffFlags );
 }
@@ -496,7 +496,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
 
 //------------------------------------------------------------------------
 
-void __EXPORT ScPreviewShell::Activate(BOOL bMDI)
+void __EXPORT ScPreviewShell::Activate(sal_Bool bMDI)
 {
     SfxViewShell::Activate(bMDI);
 
@@ -511,7 +511,7 @@ void __EXPORT ScPreviewShell::Activate(BOOL bMDI)
     }
 }
 
-void __EXPORT ScPreviewShell::Deactivate(BOOL bMDI)
+void __EXPORT ScPreviewShell::Deactivate(sal_Bool bMDI)
 {
     SfxViewShell::Deactivate(bMDI);
 
@@ -524,7 +524,7 @@ void __EXPORT ScPreviewShell::Deactivate(BOOL bMDI)
 
 void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
 {
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     const SfxItemSet* pReqArgs = rReq.GetArgs();
 
     switch ( nSlot )
@@ -550,7 +550,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
         case SID_NEXT_TABLE: // Accelerator
         case SID_PREVIEW_NEXT:
             {
-                BOOL bAllTested	= pPreview->AllTested();
+                sal_Bool bAllTested	= pPreview->AllTested();
                 long nPage = pPreview->GetPageNo();
                 long nTotal = pPreview->GetTotalPages();
                 if (nTotal && (nPage+1 < nTotal || !bAllTested))
@@ -581,8 +581,8 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
         case SID_ATTR_ZOOM:
         case FID_SCALE:
             {
-                USHORT		nZoom		= 100;
-                BOOL		bCancel		= FALSE;
+                sal_uInt16		nZoom		= 100;
+                sal_Bool		bCancel		= sal_False;
 
                 eZoom = SVX_ZOOM_PERCENT;
 
@@ -631,10 +631,10 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
                     {
                         case SVX_ZOOM_OPTIMAL:
                         case SVX_ZOOM_WHOLEPAGE:
-                            nZoom = pPreview->GetOptimalZoom(FALSE);
+                            nZoom = pPreview->GetOptimalZoom(sal_False);
                             break;
                         case SVX_ZOOM_PAGEWIDTH:
-                            nZoom = pPreview->GetOptimalZoom(TRUE);
+                            nZoom = pPreview->GetOptimalZoom(sal_True);
                             break;
                         default:
                         {
@@ -649,7 +649,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
             break;
         case SID_PREVIEW_ZOOMIN:
             {
-                USHORT nNew = pPreview->GetZoom() + 20 ;
+                sal_uInt16 nNew = pPreview->GetZoom() + 20 ;
                 nNew -= nNew % 20;
                 pPreview->SetZoom( nNew );
                 eZoom = SVX_ZOOM_PERCENT;
@@ -658,7 +658,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
             break;
         case SID_PREVIEW_ZOOMOUT:
             {
-                USHORT nNew = pPreview->GetZoom() - 1;
+                sal_uInt16 nNew = pPreview->GetZoom() - 1;
                 nNew -= nNew % 20;
                 pPreview->SetZoom( nNew );
                 eZoom = SVX_ZOOM_PERCENT;
@@ -667,7 +667,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
             break;
         case SID_PREVIEW_MARGIN:
             {
-                BOOL bMargin = pPreview->GetPageMargins();
+                sal_Bool bMargin = pPreview->GetPageMargins();
                 pPreview->SetPageMargins( !bMargin );
                 pPreview->Invalidate();
                 rReq.Done();
@@ -677,9 +677,9 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem;
                 eZoom = SVX_ZOOM_PERCENT;
-                if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_ZOOMSLIDER, TRUE, &pItem ) )
+                if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_ZOOMSLIDER, sal_True, &pItem ) )
                 {
-                    const USHORT nCurrentZoom = ((const SvxZoomSliderItem*)pItem)->GetValue();
+                    const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem*)pItem)->GetValue();
                     if( nCurrentZoom )
                     {
                         pPreview->SetZoom( nCurrentZoom );
@@ -697,9 +697,9 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
                 SfxStyleSheetBase* pStyleSheet  = pStylePool->Find( aOldName, SFX_STYLE_FAMILY_PAGE );
                 DBG_ASSERT( pStyleSheet, "PageStyle not found! :-/" );
 
-                if ( pReqArgs && pStyleSheet && SFX_ITEM_SET == pReqArgs->GetItemState( SID_PREVIEW_SCALINGFACTOR, TRUE, &pItem ) )
+                if ( pReqArgs && pStyleSheet && SFX_ITEM_SET == pReqArgs->GetItemState( SID_PREVIEW_SCALINGFACTOR, sal_True, &pItem ) )
                 {
-                    const USHORT nCurrentZoom   = ((const SvxZoomSliderItem *)pItem)->GetValue();
+                    const sal_uInt16 nCurrentZoom   = ((const SvxZoomSliderItem *)pItem)->GetValue();
                     SfxItemSet& rSet            = pStyleSheet->GetItemSet();
                     rSet.Put( SfxUInt16Item( ATTR_PAGE_SCALE, nCurrentZoom ) );
                     ScPrintFunc aPrintFunc( pDocShell, pDocShell->GetPrinter(), nTab );
@@ -739,16 +739,16 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
 
 void __EXPORT ScPreviewShell::GetState( SfxItemSet& rSet )
 {
-    pPreview->SetInGetState(TRUE);
+    pPreview->SetInGetState(sal_True);
 
     SCTAB nTab		= pPreview->GetTab();
     long nPage		= pPreview->GetPageNo();
     long nTotal		= pPreview->GetTotalPages();
-    USHORT nZoom	= pPreview->GetZoom();
-    BOOL bAllTested	= pPreview->AllTested();
+    sal_uInt16 nZoom	= pPreview->GetZoom();
+    sal_Bool bAllTested	= pPreview->AllTested();
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch (nWhich)
@@ -809,7 +809,7 @@ void __EXPORT ScPreviewShell::GetState( SfxItemSet& rSet )
                         if ( pStyleSheet )
                         {
                             SfxItemSet& rStyleSet   = pStyleSheet->GetItemSet();
-                            USHORT nCurrentZoom     = ((const SfxUInt16Item&)rStyleSet.Get(ATTR_PAGE_SCALE)).GetValue();
+                            sal_uInt16 nCurrentZoom     = ((const SfxUInt16Item&)rStyleSet.Get(ATTR_PAGE_SCALE)).GetValue();
                             if( nCurrentZoom )
                             {
                                 SvxZoomSliderItem aZoomSliderItem( nCurrentZoom, MINZOOM_SLIDER, MAXZOOM_SLIDER, SID_PREVIEW_SCALINGFACTOR );
@@ -826,7 +826,7 @@ void __EXPORT ScPreviewShell::GetState( SfxItemSet& rSet )
                 rSet.Put( SfxStringItem( nWhich, pPreview->GetPosString() ) );
                 break;
             case SID_PRINTPREVIEW:
-                rSet.Put( SfxBoolItem( nWhich, TRUE ) );
+                rSet.Put( SfxBoolItem( nWhich, sal_True ) );
                 break;
             case SID_FORMATPAGE:
             case SID_PREVIEW_MARGIN:
@@ -838,7 +838,7 @@ void __EXPORT ScPreviewShell::GetState( SfxItemSet& rSet )
         nWhich = aIter.NextWhich();
     }
 
-    pPreview->SetInGetState(FALSE);
+    pPreview->SetInGetState(sal_False);
 }
 
 void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData )
@@ -856,7 +856,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData )
         rData.aShortDocName = rData.aLongDocName = rData.aTitle;
     rData.nPageNo		= pPreview->GetPageNo() + 1;
 
-    BOOL bAllTested	= pPreview->AllTested();
+    sal_Bool bAllTested	= pPreview->AllTested();
     if (bAllTested)
         rData.nTotalPages = pPreview->GetTotalPages();
     else
@@ -865,7 +865,7 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData )
     //	eNumType kennt der Dialog selber
 }
 
-void __EXPORT ScPreviewShell::WriteUserData(String& rData, BOOL /* bBrowse */)
+void __EXPORT ScPreviewShell::WriteUserData(String& rData, sal_Bool /* bBrowse */)
 {
     //	nZoom
     //	nPageNo
@@ -875,13 +875,13 @@ void __EXPORT ScPreviewShell::WriteUserData(String& rData, BOOL /* bBrowse */)
     rData += String::CreateFromInt32(pPreview->GetPageNo());
 }
 
-void __EXPORT ScPreviewShell::ReadUserData(const String& rData, BOOL /* bBrowse */)
+void __EXPORT ScPreviewShell::ReadUserData(const String& rData, sal_Bool /* bBrowse */)
 {
     xub_StrLen nCount = rData.GetTokenCount();
     if (nCount)
     {
         xub_StrLen nIndex = 0;
-        pPreview->SetZoom((USHORT)rData.GetToken( 0, SC_USERDATA_SEP, nIndex ).ToInt32());
+        pPreview->SetZoom((sal_uInt16)rData.GetToken( 0, SC_USERDATA_SEP, nIndex ).ToInt32());
         pPreview->SetPageNo(rData.GetToken( 0, SC_USERDATA_SEP, nIndex ).ToInt32());
         eZoom = SVX_ZOOM_PERCENT;
     }
@@ -932,7 +932,7 @@ void __EXPORT ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::
     }
 }
 
-void ScPreviewShell::DoScroll( USHORT nMode )
+void ScPreviewShell::DoScroll( sal_uInt16 nMode )
 {
     Point	aCurPos, aPrevPos;
 
@@ -1127,7 +1127,7 @@ void ScPreviewShell::BroadcastAccessibility( const SfxHint &rHint )
         pAccessibilityBroadcaster->Broadcast( rHint );
 }
 
-BOOL ScPreviewShell::HasAccessibilityObjects()
+sal_Bool ScPreviewShell::HasAccessibilityObjects()
 {
     return pAccessibilityBroadcaster && pAccessibilityBroadcaster->HasListeners();
 }
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 1853734a8..cbb82487e 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -307,16 +307,16 @@
 
 void __EXPORT ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
-    BOOL bDataChanged = FALSE;
+    sal_Bool bDataChanged = sal_False;
 
     if (rHint.ISA(SfxSimpleHint))
     {
-        ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId();
+        sal_uLong nSlot = ((const SfxSimpleHint&)rHint).GetId();
         switch ( nSlot )
         {
             case FID_DATACHANGED:
             case SID_SCPRINTOPTIONS:
-                bDataChanged = TRUE;
+                bDataChanged = sal_True;
                 break;
             case SC_HINT_DRWLAYER_NEW:
                 {
@@ -331,20 +331,20 @@ void __EXPORT ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
     {
         if ( ((const ScPaintHint&)rHint).GetPrintFlag() )
         {
-            USHORT nParts = ((const ScPaintHint&)rHint).GetParts();
+            sal_uInt16 nParts = ((const ScPaintHint&)rHint).GetParts();
             if (nParts & ( PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE ))
-                bDataChanged = TRUE;
+                bDataChanged = sal_True;
         }
     }
     else if (rHint.ISA(SdrHint))
     {
         // SdrHints are no longer used for invalidating, thus react on objectchange instead
         if(HINT_OBJCHG == ((const SdrHint&)rHint).GetKind())
-            bDataChanged = TRUE;
+            bDataChanged = sal_True;
     }
 
     if (bDataChanged)
-        pPreview->DataChanged(TRUE);
+        pPreview->DataChanged(sal_True);
 }
 
 
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 2cc90d67c..321806b07 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -102,8 +102,8 @@ ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r)
     nPagesX   = r.nPagesX;
     if (r.pHidden && nPagesX)
     {
-        pHidden = new BOOL[nPagesX];
-        memcpy( pHidden, r.pHidden, nPagesX * sizeof(BOOL) );
+        pHidden = new sal_Bool[nPagesX];
+        memcpy( pHidden, r.pHidden, nPagesX * sizeof(sal_Bool) );
     }
     else
         pHidden = NULL;
@@ -118,8 +118,8 @@ const ScPageRowEntry& ScPageRowEntry::operator=(const ScPageRowEntry& r)
     nPagesX   = r.nPagesX;
     if (r.pHidden && nPagesX)
     {
-        pHidden = new BOOL[nPagesX];
-        memcpy( pHidden, r.pHidden, nPagesX * sizeof(BOOL) );
+        pHidden = new sal_Bool[nPagesX];
+        memcpy( pHidden, r.pHidden, nPagesX * sizeof(sal_Bool) );
     }
     else
         pHidden = NULL;
@@ -148,15 +148,15 @@ void ScPageRowEntry::SetHidden(size_t nX)
         {
             if (!pHidden)
             {
-                pHidden = new BOOL[nPagesX];
-                memset( pHidden, FALSE, nPagesX * sizeof(BOOL) );
+                pHidden = new sal_Bool[nPagesX];
+                memset( pHidden, sal_False, nPagesX * sizeof(sal_Bool) );
             }
-            pHidden[nX] = TRUE;
+            pHidden[nX] = sal_True;
         }
     }
 }
 
-BOOL ScPageRowEntry::IsHidden(size_t nX) const
+sal_Bool ScPageRowEntry::IsHidden(size_t nX) const
 {
     return nX>=nPagesX || ( pHidden && pHidden[nX] );		//! inline?
 }
@@ -220,9 +220,9 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions )
     if (!bState)
         nZoom = 100;
     nManualZoom = 100;
-    bClearWin = FALSE;
-    bUseStyleColor = FALSE;
-    bIsRender = FALSE;
+    bClearWin = sal_False;
+    bUseStyleColor = sal_False;
+    bIsRender = sal_False;
 
     InitParam(pOptions);
 
@@ -240,10 +240,10 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTa
         nPageStart			( nPage ),
         nDocPages			( nDocP ),
         pUserArea			( pArea ),
-        bState				( FALSE ),
-        bSourceRangeValid	( FALSE ),
-        bPrintCurrentTable	( FALSE ),
-        bMultiArea			( FALSE ),
+        bState				( sal_False ),
+        bSourceRangeValid	( sal_False ),
+        bPrintCurrentTable	( sal_False ),
+        bMultiArea			( sal_False ),
         nTabPages			( 0 ),
         nTotalPages			( 0 ),
         pPageData			( pData )
@@ -263,10 +263,10 @@ ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, SCTAB nTab,
         nPageStart			( nPage ),
         nDocPages			( nDocP ),
         pUserArea			( pArea ),
-        bState				( FALSE ),
-        bSourceRangeValid	( FALSE ),
-        bPrintCurrentTable	( FALSE ),
-        bMultiArea			( FALSE ),
+        bState				( sal_False ),
+        bSourceRangeValid	( sal_False ),
+        bPrintCurrentTable	( sal_False ),
+        bMultiArea			( sal_False ),
         nTabPages			( 0 ),
         nTotalPages			( 0 ),
         pPageData			( NULL )
@@ -281,9 +281,9 @@ ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell,
         pPrinter			( NULL ),
         pDrawView			( NULL ),
         pUserArea			( NULL ),
-        bSourceRangeValid	( FALSE ),
-        bPrintCurrentTable	( FALSE ),
-        bMultiArea			( FALSE ),
+        bSourceRangeValid	( sal_False ),
+        bPrintCurrentTable	( sal_False ),
+        bMultiArea			( sal_False ),
         pPageData			( NULL )
 {
     pDev = pOutDev;
@@ -300,7 +300,7 @@ ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell,
     nTotalPages	= rState.nTotalPages;
     nPageStart	= rState.nPageStart;
     nDocPages	= rState.nDocPages;
-    bState		= TRUE;
+    bState		= sal_True;
 
     Construct( pOptions );
 }
@@ -314,9 +314,9 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, Window* pWindow, SCTAB nTab,
         nPageStart          ( nPage ),
         nDocPages           ( nDocP ),
         pUserArea           ( pArea ),
-        bState              ( FALSE ),
-        bPrintCurrentTable  ( FALSE ),
-        bMultiArea          ( FALSE ),
+        bState              ( sal_False ),
+        bPrintCurrentTable  ( sal_False ),
+        bMultiArea          ( sal_False ),
         nTabPages           ( 0 ),
         nTotalPages         ( 0 ),
         pPageData           ( NULL )
@@ -330,8 +330,8 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, Window* pWindow,
         pPrinter            ( NULL ),
         pDrawView           ( NULL ),
         pUserArea           ( NULL ),
-        bPrintCurrentTable  ( FALSE ),
-        bMultiArea          ( FALSE ),
+        bPrintCurrentTable  ( sal_False ),
+        bMultiArea          ( sal_False ),
         pPageData           ( NULL )
 {
     pDev = pWindow;
@@ -348,7 +348,7 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, Window* pWindow,
     nTotalPages = rState.nTotalPages;
     nPageStart  = rState.nPageStart;
     nDocPages   = rState.nDocPages;
-    bState      = TRUE;
+    bState      = sal_True;
 
     Construct( pOptions );
 }
@@ -369,7 +369,7 @@ void ScPrintFunc::GetPrintState( ScPrintState& rState )
     rState.nDocPages	= nDocPages;
 }
 
-BOOL ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const
+sal_Bool ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const
 {
     rRange = aLastSourceRange;
     return bSourceRangeValid;
@@ -379,7 +379,7 @@ void ScPrintFunc::FillPageData()
 {
     if (pPageData)
     {
-        USHORT nCount = sal::static_int_cast<USHORT>( pPageData->GetCount() );
+        sal_uInt16 nCount = sal::static_int_cast<sal_uInt16>( pPageData->GetCount() );
         ScPrintRangeData& rData = pPageData->GetData(nCount);		// hochzaehlen
 
         rData.SetPrintRange( ScRange( nStartCol, nStartRow, nPrintTab,
@@ -435,7 +435,7 @@ void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 )
                             GetItem(ATTR_PROTECTION, rCellInfo.pConditionSet)).GetHidePrint())
                 {
                     pThisRowInfo->pCellInfo[nX+1].pCell			 = NULL;
-                    pThisRowInfo->pCellInfo[nX+1].bEmptyCellText = TRUE;
+                    pThisRowInfo->pCellInfo[nX+1].bEmptyCellText = sal_True;
                 }
         }
     }
@@ -450,7 +450,7 @@ void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 )
 //		-	Vorschau bei Vorlagen
 
 void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPrintFactor */,
-                            const Rectangle& rBound, ScViewData* pViewData, BOOL bMetaFile )
+                            const Rectangle& rBound, ScViewData* pViewData, sal_Bool bMetaFile )
 {
     //!	nPrintFactor auswerten !!!
 
@@ -458,7 +458,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
     if (pViewData)
         nTab = pViewData->GetTabNo();
 
-    BOOL bDoGrid, bNullVal, bFormula;
+    sal_Bool bDoGrid, bNullVal, bFormula;
     ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
     SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE );
     if (pStyleSheet)
@@ -518,7 +518,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
 
     Rectangle aLines;
     ScRange aRange( nX1,nY1,nTab, nX2,nY2,nTab );
-//    BOOL bAddLines = pDoc->HasLines( aRange, aLines );
+//    sal_Bool bAddLines = pDoc->HasLines( aRange, aLines );
 
     long nTwipsSizeX = 0;
     for (SCCOL i=nX1; i<=nX2; i++)
@@ -535,7 +535,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
 
                             //!		Flag bei FillInfo uebergeben !!!!!
     ScRange aERange;
-    BOOL bEmbed = pDoc->IsEmbedded();
+    sal_Bool bEmbed = pDoc->IsEmbedded();
     if (bEmbed)
     {
         pDoc->GetEmbedded(aERange);
@@ -546,7 +546,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
 
     ScTableInfo aTabInfo;
     pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab,
-                                        nScaleX, nScaleY, FALSE, bFormula );
+                                        nScaleX, nScaleY, sal_False, bFormula );
     lcl_HidePrint( aTabInfo, nX1, nX2 );
 
     if (bEmbed)
@@ -579,7 +579,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
     {
         pDrawView = new FmFormView( pModel, pDev );
         pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab));
-        pDrawView->SetPrintPreview( TRUE );
+        pDrawView->SetPrintPreview( sal_True );
         aOutputData.SetDrawView( pDrawView );
     }
 
@@ -632,7 +632,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
         if (!bMetaFile && pViewData)
             pDev->SetMapMode(aMode);
 
-        aOutputData.DrawGrid( TRUE, FALSE );	// keine Seitenumbrueche
+        aOutputData.DrawGrid( sal_True, sal_False );	// keine Seitenumbrueche
 
         pDev->SetLineColor( COL_BLACK );
 
@@ -642,7 +642,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
         long nRight = nScrX + aOutputData.GetScrW() - aOne.Width();
         long nBottom = nScrY + aOutputData.GetScrH() - aOne.Height();
 
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
         // extra line at the left edge for left-to-right, right for right-to-left
         if ( bLayoutRTL )
@@ -672,7 +672,7 @@ void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet )
 
     if ( pHFSet == NULL )
     {
-        rParam.bEnable	= FALSE;
+        rParam.bEnable	= sal_False;
         rParam.pBorder	= NULL;
         rParam.pBack	= NULL;
         rParam.pShadow	= NULL;
@@ -686,9 +686,9 @@ void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet )
         const SvxLRSpaceItem* pHFLR = &(const SvxLRSpaceItem&) pHFSet->Get(ATTR_LRSPACE);
         long nTmp;
         nTmp = pHFLR->GetLeft();
-        rParam.nLeft = nTmp < 0 ? 0 : USHORT(nTmp);
+        rParam.nLeft = nTmp < 0 ? 0 : sal_uInt16(nTmp);
         nTmp = pHFLR->GetRight();
-        rParam.nRight = nTmp < 0 ? 0 : USHORT(nTmp);
+        rParam.nRight = nTmp < 0 ? 0 : sal_uInt16(nTmp);
         rParam.pBorder	= (const SvxBoxItem*)   &pHFSet->Get(ATTR_BORDER);
         rParam.pBack	= (const SvxBrushItem*) &pHFSet->Get(ATTR_BACKGROUND);
         rParam.pShadow	= (const SvxShadowItem*)&pHFSet->Get(ATTR_SHADOW);;
@@ -710,27 +710,27 @@ void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet )
 //	bNew = TRUE:	benutzten Bereich aus dem Dokument suchen
 //	bNew = FALSE:	nur ganze Zeilen/Spalten begrenzen
 
-BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew )
+sal_Bool ScPrintFunc::AdjustPrintArea( sal_Bool bNew )
 {
     SCCOL nOldEndCol = nEndCol;	// nur wichtig bei !bNew
     SCROW nOldEndRow = nEndRow;
-    BOOL bChangeCol = TRUE;			// bei bNew werden beide angepasst
-    BOOL bChangeRow = TRUE;
+    sal_Bool bChangeCol = sal_True;			// bei bNew werden beide angepasst
+    sal_Bool bChangeRow = sal_True;
 
-    BOOL bNotes = aTableParam.bNotes;
+    sal_Bool bNotes = aTableParam.bNotes;
     if ( bNew )
     {
         nStartCol = 0;
         nStartRow = 0;
         if (!pDoc->GetPrintArea( nPrintTab, nEndCol, nEndRow, bNotes ))
-            return FALSE;	// nix
+            return sal_False;	// nix
     }
     else
     {
-        BOOL bFound = TRUE;
+        sal_Bool bFound = sal_True;
         bChangeCol = ( nStartCol == 0 && nEndCol == MAXCOL );
         bChangeRow = ( nStartRow == 0 && nEndRow == MAXROW );
-        BOOL bForcedChangeRow = FALSE;
+        sal_Bool bForcedChangeRow = sal_False;
 
         // #i53558# Crop entire column of old row limit to real print area with
         // some fuzzyness.
@@ -743,11 +743,11 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew )
             const SCROW nFuzzy = 23*42;
             if (nPAEndRow + nFuzzy < nEndRow)
             {
-                bForcedChangeRow = TRUE;
+                bForcedChangeRow = sal_True;
                 nEndRow = nPAEndRow;
             }
             else
-                bFound = TRUE;  // user seems to _want_ to print some empty rows
+                bFound = sal_True;  // user seems to _want_ to print some empty rows
         }
         // TODO: in case we extend the number of columns we may have to do the
         // same for horizontal cropping.
@@ -760,14 +760,14 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew )
             bFound = pDoc->GetPrintAreaVer( nPrintTab, nStartCol, nEndCol, nEndRow, bNotes );
 
         if (!bFound)
-            return FALSE;	// leer
+            return sal_False;	// leer
 
         if (bForcedChangeRow)
-            bChangeRow = TRUE;
+            bChangeRow = sal_True;
     }
 
     pDoc->ExtendMerge( nStartCol,nStartRow, nEndCol,nEndRow, nPrintTab,
-                        FALSE, TRUE );		// kein Refresh, incl. Attrs
+                        sal_False, sal_True );		// kein Refresh, incl. Attrs
 
     if ( bChangeCol )
     {
@@ -789,7 +789,7 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew )
     if (!bChangeCol) nEndCol = nOldEndCol;
     if (!bChangeRow) nEndRow = nOldEndRow;
 
-    return TRUE;
+    return sal_True;
 }
 
 long ScPrintFunc::TextHeight( const EditTextObject* pObject )
@@ -798,7 +798,7 @@ long ScPrintFunc::TextHeight( const EditTextObject* pObject )
         return 0;
 
 //	pEditEngine->SetPageNo( nTotalPages );
-    pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, FALSE );
+    pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, sal_False );
 
     return (long) pEditEngine->GetTextHeight();
 }
@@ -867,9 +867,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     const SvxLRSpaceItem* pLRItem = (const SvxLRSpaceItem*) &pParamSet->Get( ATTR_LRSPACE );
     long nTmp;
     nTmp = pLRItem->GetLeft();
-    nLeftMargin = nTmp < 0 ? 0 : USHORT(nTmp);
+    nLeftMargin = nTmp < 0 ? 0 : sal_uInt16(nTmp);
     nTmp = pLRItem->GetRight();
-    nRightMargin = nTmp < 0 ? 0 : USHORT(nTmp);
+    nRightMargin = nTmp < 0 ? 0 : sal_uInt16(nTmp);
     const SvxULSpaceItem* pULItem = (const SvxULSpaceItem*) &pParamSet->Get( ATTR_ULSPACE );
     nTopMargin    = pULItem->GetUpper();
     nBottomMargin = pULItem->GetLower();
@@ -900,7 +900,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
 
     const SvxSetItem* pHeaderSetItem;
     const SfxItemSet* pHeaderSet = NULL;
-    if ( pParamSet->GetItemState( ATTR_PAGE_HEADERSET, FALSE,
+    if ( pParamSet->GetItemState( ATTR_PAGE_HEADERSET, sal_False,
                             (const SfxPoolItem**)&pHeaderSetItem ) == SFX_ITEM_SET )
     {
         pHeaderSet = &pHeaderSetItem->GetItemSet();
@@ -916,7 +916,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
 
     const SvxSetItem* pFooterSetItem;
     const SfxItemSet* pFooterSet = NULL;
-    if ( pParamSet->GetItemState( ATTR_PAGE_FOOTERSET, FALSE,
+    if ( pParamSet->GetItemState( ATTR_PAGE_FOOTERSET, sal_False,
                             (const SfxPoolItem**)&pFooterSetItem ) == SFX_ITEM_SET )
     {
         pFooterSet = &pFooterSetItem->GetItemSet();
@@ -935,19 +935,19 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     const SfxUInt16Item*     pScaleToPagesItem   = NULL;
     SfxItemState             eState;
 
-    eState = pParamSet->GetItemState( ATTR_PAGE_SCALE, FALSE,
+    eState = pParamSet->GetItemState( ATTR_PAGE_SCALE, sal_False,
                                       (const SfxPoolItem**)&pScaleItem );
     if ( SFX_ITEM_DEFAULT == eState )
         pScaleItem = (const SfxUInt16Item*)
                     &pParamSet->GetPool()->GetDefaultItem( ATTR_PAGE_SCALE );
 
-    eState = pParamSet->GetItemState( ATTR_PAGE_SCALETO, FALSE,
+    eState = pParamSet->GetItemState( ATTR_PAGE_SCALETO, sal_False,
                                       (const SfxPoolItem**)&pScaleToItem );
     if ( SFX_ITEM_DEFAULT == eState )
         pScaleToItem = (const ScPageScaleToItem*)
                     &pParamSet->GetPool()->GetDefaultItem( ATTR_PAGE_SCALETO );
 
-    eState = pParamSet->GetItemState( ATTR_PAGE_SCALETOPAGES, FALSE,
+    eState = pParamSet->GetItemState( ATTR_PAGE_SCALETOPAGES, sal_False,
                                       (const SfxPoolItem**)&pScaleToPagesItem );
     if ( SFX_ITEM_DEFAULT == eState )
         pScaleToPagesItem = (const SfxUInt16Item*)
@@ -955,7 +955,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
 
     DBG_ASSERT( pScaleItem && pScaleToItem && pScaleToPagesItem, "Missing ScaleItem! :-/" );
 
-    aTableParam.bCellContent    = TRUE;
+    aTableParam.bCellContent    = sal_True;
     aTableParam.bNotes			= GET_BOOL(pParamSet,ATTR_PAGE_NOTES);
     aTableParam.bGrid			= GET_BOOL(pParamSet,ATTR_PAGE_GRID);
     aTableParam.bHeaders		= GET_BOOL(pParamSet,ATTR_PAGE_HEADERS);
@@ -968,12 +968,12 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     aTableParam.bLeftRight		= !aTableParam.bLeftRight;
     aTableParam.nFirstPageNo	= GET_USHORT(pParamSet,ATTR_PAGE_FIRSTPAGENO);
     if (!aTableParam.nFirstPageNo)
-        aTableParam.nFirstPageNo = (USHORT) nPageStart;		// von vorheriger Tabelle
+        aTableParam.nFirstPageNo = (sal_uInt16) nPageStart;		// von vorheriger Tabelle
 
     if ( pScaleItem && pScaleToItem && pScaleToPagesItem )
     {
-        UINT16	nScaleAll     = pScaleItem->GetValue();
-        UINT16	nScaleToPages = pScaleToPagesItem->GetValue();
+        sal_uInt16	nScaleAll     = pScaleItem->GetValue();
+        sal_uInt16	nScaleToPages = pScaleToPagesItem->GetValue();
 
         aTableParam.bScaleNone		= (nScaleAll     == 100);
         aTableParam.bScaleAll		= (nScaleAll      > 0  );
@@ -986,10 +986,10 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     }
     else
     {
-        aTableParam.bScaleNone		= TRUE;
-        aTableParam.bScaleAll		= FALSE;
-        aTableParam.bScaleTo        = FALSE;
-        aTableParam.bScalePageNum	= FALSE;
+        aTableParam.bScaleNone		= sal_True;
+        aTableParam.bScaleAll		= sal_False;
+        aTableParam.bScaleTo        = sal_False;
+        aTableParam.bScalePageNum	= sal_False;
         aTableParam.nScaleAll		= 0;
         aTableParam.nScaleWidth     = 0;
         aTableParam.nScaleHeight    = 0;
@@ -999,7 +999,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     //	skip empty pages only if options with that flag are passed
     aTableParam.bSkipEmpty = pOptions && pOptions->GetSkipEmpty();
     if ( pPageData )
-        aTableParam.bSkipEmpty = FALSE;
+        aTableParam.bSkipEmpty = sal_False;
     // Wenn pPageData gesetzt ist, interessieren fuer die Umbruch-Vorschau
     // nur die Umbrueche, leere Seiten werden nicht speziell behandelt
 
@@ -1017,7 +1017,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     if ( pUserArea )				// UserArea (Selektion) hat Vorrang
     {
         bPrintCurrentTable    =
-        aAreaParam.bPrintArea = TRUE;					// Selektion
+        aAreaParam.bPrintArea = sal_True;					// Selektion
         aAreaParam.aPrintArea = *pUserArea;
 
         //	Die Tabellen-Abfrage ist schon in DocShell::Print, hier immer
@@ -1031,7 +1031,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
         if ( pPrintArea )								// mindestens eine gesetzt ?
         {
             bPrintCurrentTable    =
-            aAreaParam.bPrintArea = TRUE;
+            aAreaParam.bPrintArea = sal_True;
             aAreaParam.aPrintArea = *pPrintArea;
 
             bMultiArea = ( pDoc->GetPrintRangeCount(nPrintTab) > 1 );
@@ -1048,39 +1048,39 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
         //	#74834# don't print hidden tables if there's no print range defined there
         if ( pDoc->IsVisible( nPrintTab ) )
         {
-            aAreaParam.bPrintArea = FALSE;
-            bPrintCurrentTable = TRUE;
+            aAreaParam.bPrintArea = sal_False;
+            bPrintCurrentTable = sal_True;
         }
         else
         {
-            aAreaParam.bPrintArea = TRUE;	// otherwise the table is always counted
-            bPrintCurrentTable = FALSE;
+            aAreaParam.bPrintArea = sal_True;	// otherwise the table is always counted
+            bPrintCurrentTable = sal_False;
         }
     }
 
     if ( pRepeatCol )
     {
-        aAreaParam.bRepeatCol = TRUE;
+        aAreaParam.bRepeatCol = sal_True;
         aAreaParam.aRepeatCol = *pRepeatCol;
         nRepeatStartCol	= pRepeatCol->aStart.Col();
         nRepeatEndCol	= pRepeatCol->aEnd  .Col();
     }
     else
     {
-        aAreaParam.bRepeatCol = FALSE;
+        aAreaParam.bRepeatCol = sal_False;
         nRepeatStartCol = nRepeatEndCol = SCCOL_REPEAT_NONE;
     }
 
     if ( pRepeatRow )
     {
-        aAreaParam.bRepeatRow = TRUE;
+        aAreaParam.bRepeatRow = sal_True;
         aAreaParam.aRepeatRow = *pRepeatRow;
         nRepeatStartRow	= pRepeatRow->aStart.Row();
         nRepeatEndRow	= pRepeatRow->aEnd  .Row();
     }
     else
     {
-        aAreaParam.bRepeatRow = FALSE;
+        aAreaParam.bRepeatRow = sal_False;
         nRepeatStartRow = nRepeatEndRow = SCROW_REPEAT_NONE;
     }
 
@@ -1181,8 +1181,8 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
     Point aPos;
     Size aDrawSize = aGrfSize;
 
-    FASTBOOL bDraw = TRUE;
-//	FASTBOOL bRetouche = TRUE;
+    FASTBOOL bDraw = sal_True;
+//	FASTBOOL bRetouche = sal_True;
     switch ( ePos )
     {
         case GPOS_LT: aPos = rOrg.TopLeft();
@@ -1217,7 +1217,7 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
         case GPOS_AREA:
                       aPos = rOrg.TopLeft();
                       aDrawSize = rOrg.GetSize();
-//					  bRetouche = FALSE;
+//					  bRetouche = sal_False;
                       break;
         case GPOS_TILED:
                     {
@@ -1266,13 +1266,13 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
                             aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0) );
                         }
 
-                        bDraw = FALSE;
-//						bRetouche = FALSE;
+                        bDraw = sal_False;
+//						bRetouche = sal_False;
                     }
                     break;
 
         case GPOS_NONE:
-                      bDraw = FALSE;
+                      bDraw = sal_False;
                       break;
 
         default: DBG_ASSERT( !pOut, "new Graphic position?" );
@@ -1329,8 +1329,8 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
     if (nEffHeight<=0 || nEffWidth<=0)
         return;											// leer
 
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor &&
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
+    sal_Bool bCellContrast = bUseStyleColor &&
             Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
     if ( pBackground && !bCellContrast )
@@ -1407,18 +1407,18 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
     if (pBorderData)
     {
         ScDocument* pBorderDoc = new ScDocument( SCDOCMODE_UNDO );
-        pBorderDoc->InitUndo( pDoc, 0,0, TRUE,TRUE );
+        pBorderDoc->InitUndo( pDoc, 0,0, sal_True,sal_True );
         if (pBorderData)
             pBorderDoc->ApplyAttr( 0,0,0, *pBorderData );
 
         ScTableInfo aTabInfo;
         pBorderDoc->FillInfo( aTabInfo, 0,0, 0,0, 0,
-                                            nScaleX, nScaleY, FALSE, FALSE );
+                                            nScaleX, nScaleY, sal_False, sal_False );
         DBG_ASSERT(aTabInfo.mnArrCount,"nArrCount == 0");
 
-        aTabInfo.mpRowInfo[1].nHeight = (USHORT) nEffHeight;
+        aTabInfo.mpRowInfo[1].nHeight = (sal_uInt16) nEffHeight;
         aTabInfo.mpRowInfo[0].pCellInfo[1].nWidth =
-            aTabInfo.mpRowInfo[1].pCellInfo[1].nWidth = (USHORT) nEffWidth;
+            aTabInfo.mpRowInfo[1].pCellInfo[1].nWidth = (sal_uInt16) nEffWidth;
 
         ScOutputData aOutputData( pDev, OUTTYPE_PRINTER, aTabInfo, pBorderDoc, 0,
                                     nScrX+nLeft, nScrY+nTop, 0,0, 0,0, nScaleX, nScaleY );
@@ -1435,7 +1435,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
 
 void ScPrintFunc::PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY )
 {
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
     Size aOnePixel = pDev->PixelToLogic(Size(1,1));
@@ -1459,7 +1459,7 @@ void ScPrintFunc::PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY )
 
     for (nCol=nX1; nCol<=nX2; nCol++)
     {
-        USHORT nDocW = pDoc->GetColWidth( nCol, nPrintTab );
+        sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nPrintTab );
         if (nDocW)
         {
             long nWidth = (long) (nDocW * nScaleX);
@@ -1488,7 +1488,7 @@ void ScPrintFunc::PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY )
     long nOneX = aOnePixel.Width();
     long nOneY = aOnePixel.Height();
 
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
 
     long nWidth = (long) (PRINT_HEADER_WIDTH * nScaleX);
     long nEndX = nScrX + nWidth;
@@ -1503,7 +1503,7 @@ void ScPrintFunc::PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY )
 
     for (SCROW nRow=nY1; nRow<=nY2; nRow++)
     {
-        USHORT nDocH = pDoc->GetRowHeight( nRow, nPrintTab );
+        sal_uInt16 nDocH = pDoc->GetRowHeight( nRow, nPrintTab );
         if (nDocH)
         {
             long nHeight = (long) (nDocH * nScaleY);
@@ -1524,7 +1524,7 @@ void ScPrintFunc::PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY )
 }
 
 void ScPrintFunc::LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY,
-                                BOOL bRepCol, ScPreviewLocationData& rLocationData )
+                                sal_Bool bRepCol, ScPreviewLocationData& rLocationData )
 {
     Size aOnePixel = pDev->PixelToLogic(Size(1,1));
     long nOneX = aOnePixel.Width();
@@ -1536,7 +1536,7 @@ void ScPrintFunc::LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY,
     long nPosX = nScrX - nOneX;
     for (SCCOL nCol=nX1; nCol<=nX2; nCol++)
     {
-        USHORT nDocW = pDoc->GetColWidth( nCol, nPrintTab );
+        sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nPrintTab );
         if (nDocW)
             nPosX += (long) (nDocW * nScaleX);
     }
@@ -1545,13 +1545,13 @@ void ScPrintFunc::LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY,
 }
 
 void ScPrintFunc::LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY,
-                                BOOL bRepRow, ScPreviewLocationData& rLocationData )
+                                sal_Bool bRepRow, ScPreviewLocationData& rLocationData )
 {
     Size aOnePixel = pDev->PixelToLogic(Size(1,1));
     long nOneX = aOnePixel.Width();
     long nOneY = aOnePixel.Height();
 
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
 
     long nWidth = (long) (PRINT_HEADER_WIDTH * nScaleX);
     long nEndX = nScrX + nWidth;
@@ -1565,7 +1565,7 @@ void ScPrintFunc::LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY,
 }
 
 void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
-                                long nScrX, long nScrY, BOOL bRepCol, BOOL bRepRow,
+                                long nScrX, long nScrY, sal_Bool bRepCol, sal_Bool bRepRow,
                                 ScPreviewLocationData& rLocationData )
 {
     //	get MapMode for drawing objects (same MapMode as in ScOutputData::PrintDrawingLayer)
@@ -1595,7 +1595,7 @@ void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
     long nPosX = nScrX - nOneX;
     for (nCol=nX1; nCol<=nX2; nCol++)
     {
-        USHORT nDocW = pDoc->GetColWidth( nCol, nPrintTab );
+        sal_uInt16 nDocW = pDoc->GetColWidth( nCol, nPrintTab );
         if (nDocW)
             nPosX += (long) (nDocW * nScaleX);
     }
@@ -1609,7 +1609,7 @@ void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
 
 void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
                                 long nScrX, long nScrY,
-                                BOOL bShLeft, BOOL bShTop, BOOL bShRight, BOOL bShBottom )
+                                sal_Bool bShLeft, sal_Bool bShTop, sal_Bool bShRight, sal_Bool bShBottom )
 {
     // #i47547# nothing to do if the end of the print area is before the end of
     // the repeat columns/rows (don't use negative size for ScOutputData)
@@ -1618,7 +1618,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
 
                             //!		Flag bei FillInfo uebergeben !!!!!
     ScRange aERange;
-    BOOL bEmbed = pDoc->IsEmbedded();
+    sal_Bool bEmbed = pDoc->IsEmbedded();
     if (bEmbed)
     {
         pDoc->GetEmbedded(aERange);
@@ -1633,7 +1633,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
 
     ScTableInfo aTabInfo;
     pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nPrintTab,
-                                        nScaleX, nScaleY, TRUE, aTableParam.bFormulas );
+                                        nScaleX, nScaleY, sal_True, aTableParam.bFormulas );
     lcl_HidePrint( aTabInfo, nX1, nX2 );
 
     if (bEmbed)
@@ -1683,14 +1683,14 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
             aOutputData.SetRefDevice( pRefDev );
     }
 
-//	aOutputData.SetMetaFileMode(TRUE);
+//	aOutputData.SetMetaFileMode(sal_True);
     if( aTableParam.bCellContent )
         aOutputData.DrawBackground();
 
     pDev->SetClipRegion( Rectangle( aPos, Size( aOutputData.GetScrW(), aOutputData.GetScrH() ) ) );
     pDev->SetClipRegion();
 
-//	aOutputData.SetMetaFileMode(FALSE);
+//	aOutputData.SetMetaFileMode(sal_False);
     if( aTableParam.bCellContent )
     {
         aOutputData.DrawExtraShadow( bShLeft, bShTop, bShRight, bShBottom );
@@ -1698,12 +1698,12 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
         aOutputData.DrawStrings();
 
     //	pDev->SetMapMode(aLogicMode);
-        aOutputData.DrawEdit(FALSE);
+        aOutputData.DrawEdit(sal_False);
     }
 
 //	pDev->SetMapMode(aOffsetMode);
     if (aTableParam.bGrid)
-        aOutputData.DrawGrid( TRUE, FALSE );	// keine Seitenumbrueche
+        aOutputData.DrawGrid( sal_True, sal_False );	// keine Seitenumbrueche
 
 /*!!!!!!!!!!!		Notizen in Tabelle markieren ??????????????????????????
 
@@ -1731,20 +1731,20 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
     aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768#
 }
 
-BOOL ScPrintFunc::IsMirror( long nPageNo )			// Raender spiegeln ?
+sal_Bool ScPrintFunc::IsMirror( long nPageNo )			// Raender spiegeln ?
 {
     SvxPageUsage eUsage = (SvxPageUsage) ( nPageUsage & 0x000f );
     return ( eUsage == SVX_PAGE_MIRROR && (nPageNo & 1) );
 }
 
-BOOL ScPrintFunc::IsLeft( long nPageNo )			// linke Fussnoten ?
+sal_Bool ScPrintFunc::IsLeft( long nPageNo )			// linke Fussnoten ?
 {
     SvxPageUsage eUsage = (SvxPageUsage) ( nPageUsage & 0x000f );
-    BOOL bLeft;
+    sal_Bool bLeft;
     if (eUsage == SVX_PAGE_LEFT)
-        bLeft = TRUE;
+        bLeft = sal_True;
     else if (eUsage == SVX_PAGE_RIGHT)
-        bLeft = FALSE;
+        bLeft = sal_False;
     else
         bLeft = (nPageNo & 1) != 0;
     return bLeft;
@@ -1761,9 +1761,9 @@ void ScPrintFunc::MakeEditEngine()
     {
         //	can't use document's edit engine pool here,
         //	because pool must have twips as default metric
-        pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), TRUE );
+        pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True );
 
-        pEditEngine->EnableUndo(FALSE);
+        pEditEngine->EnableUndo(sal_False);
         pEditEngine->SetRefDevice( pDev );
         pEditEngine->SetWordDelimiters(
                 ScEditUtil::ModifyDelimiters( pEditEngine->GetWordDelimiters() ) );
@@ -1791,14 +1791,14 @@ void ScPrintFunc::MakeEditEngine()
 }
 
 //	nStartY = logic
-void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
-                            BOOL bDoPrint, ScPreviewLocationData* pLocationData )
+void ScPrintFunc::PrintHF( long nPageNo, sal_Bool bHeader, long nStartY,
+                            sal_Bool bDoPrint, ScPreviewLocationData* pLocationData )
 {
     const ScPrintHFParam& rParam = bHeader ? aHdr : aFtr;
 
     pDev->SetMapMode( aTwipMode );			// Kopf-/Fusszeilen in Twips
 
-    BOOL bLeft = IsLeft(nPageNo) && !rParam.bShared;
+    sal_Bool bLeft = IsLeft(nPageNo) && !rParam.bShared;
     const ScPageHFItem* pHFItem = bLeft ? rParam.pLeft : rParam.pRight;
 
     long nLineStartX = aPageRect.Left()  + rParam.nLeft;
@@ -1883,7 +1883,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
         if (pObject)
         {
             pEditDefaults->Put( SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ) );
-            pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, FALSE );
+            pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, sal_False );
             Point aDraw = aStart;
             long nDif = aPaperSize.Height() - (long) pEditEngine->GetTextHeight();
             if (nDif > 0)
@@ -1897,7 +1897,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
         if (pObject)
         {
             pEditDefaults->Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
-            pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, FALSE );
+            pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, sal_False );
             Point aDraw = aStart;
             long nDif = aPaperSize.Height() - (long) pEditEngine->GetTextHeight();
             if (nDif > 0)
@@ -1911,7 +1911,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
         if (pObject)
         {
             pEditDefaults->Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
-            pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, FALSE );
+            pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, sal_False );
             Point aDraw = aStart;
             long nDif = aPaperSize.Height() - (long) pEditEngine->GetTextHeight();
             if (nDif > 0)
@@ -1929,7 +1929,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
     }
 }
 
-long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData )
+long ScPrintFunc::DoNotes( long nNoteStart, sal_Bool bDoPrint, ScPreviewLocationData* pLocationData )
 {
     if (bDoPrint)
         pDev->SetMapMode(aTwipMode);
@@ -1957,10 +1957,10 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData
     long nPosY = aPageRect.Top();
 
     long nCount = 0;
-    BOOL bOk;
+    sal_Bool bOk;
     do
     {
-        bOk = FALSE;
+        bOk = sal_False;
         ScAddress* pPos = (ScAddress*) aNotePosList.GetObject( nNoteStart+nCount );
         if (pPos)
         {
@@ -1996,7 +1996,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData
                     nPosY += nTextHeight;
                     nPosY += 200;					// Abstand
                     ++nCount;
-                    bOk = TRUE;
+                    bOk = sal_True;
                 }
             }
         }
@@ -2006,7 +2006,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData
     return nCount;
 }
 
-long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData )
+long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, sal_Bool bDoPrint, ScPreviewLocationData* pLocationData )
 {
     if ( nNoteStart >= (long) aNotePosList.Count() || !aTableParam.bNotes )
         return 0;
@@ -2055,12 +2055,12 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr
         if (aHdr.bEnable)
         {
             long nHeaderY = aPageRect.Top()-aHdr.nHeight;
-            PrintHF( nPageNo, TRUE, nHeaderY, bDoPrint, pLocationData );
+            PrintHF( nPageNo, sal_True, nHeaderY, bDoPrint, pLocationData );
         }
         if (aFtr.bEnable)
         {
             long nFooterY = aPageRect.Bottom()+aFtr.nDistance;
-            PrintHF( nPageNo, FALSE, nFooterY, bDoPrint, pLocationData );
+            PrintHF( nPageNo, sal_False, nFooterY, bDoPrint, pLocationData );
         }
     }
 
@@ -2076,9 +2076,9 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr
 }
 
 void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
-                                BOOL bDoPrint, ScPreviewLocationData* pLocationData )
+                                sal_Bool bDoPrint, ScPreviewLocationData* pLocationData )
 {
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
     //	nPageNo is the page number within all sheets of one "start page" setting
@@ -2117,11 +2117,11 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
     if ( aAreaParam.bRepeatCol )
         if ( nX1 > nRepeatStartCol && nX1 <= nRepeatEndCol )
             nX1 = nRepeatEndCol + 1;
-    BOOL bDoRepCol = (aAreaParam.bRepeatCol && nX1 > nRepeatEndCol);
+    sal_Bool bDoRepCol = (aAreaParam.bRepeatCol && nX1 > nRepeatEndCol);
     if ( aAreaParam.bRepeatRow )
         if ( nY1 > nRepeatStartRow && nY1 <= nRepeatEndRow )
             nY1 = nRepeatEndRow + 1;
-    BOOL bDoRepRow = (aAreaParam.bRepeatRow && nY1 > nRepeatEndRow);
+    sal_Bool bDoRepRow = (aAreaParam.bRepeatRow && nY1 > nRepeatEndRow);
 
     // use new object hide flags in SdrPaintView
     if(pDrawView)
@@ -2143,12 +2143,12 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
     if (aHdr.bEnable)
     {
         long nHeaderY = aPageRect.Top()-aHdr.nHeight;
-        PrintHF( nPageNo, TRUE, nHeaderY, bDoPrint, pLocationData );
+        PrintHF( nPageNo, sal_True, nHeaderY, bDoPrint, pLocationData );
     }
     if (aFtr.bEnable)
     {
         long nFooterY = aPageRect.Bottom()+aFtr.nDistance;
-        PrintHF( nPageNo, FALSE, nFooterY, bDoPrint, pLocationData );
+        PrintHF( nPageNo, sal_False, nFooterY, bDoPrint, pLocationData );
     }
 
     //	Position ( Raender / zentrieren )
@@ -2318,34 +2318,34 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
     {
         if ( bDoPrint )
             PrintArea( nRepeatStartCol,nRepeatStartRow, nRepeatEndCol,nRepeatEndRow,
-                            nRepStartX,nRepStartY, TRUE,TRUE,FALSE,FALSE );
+                            nRepStartX,nRepStartY, sal_True,sal_True,sal_False,sal_False );
         if ( pLocationData )
             LocateArea( nRepeatStartCol,nRepeatStartRow, nRepeatEndCol,nRepeatEndRow,
-                            nRepStartX,nRepStartY, TRUE,TRUE, *pLocationData );
+                            nRepStartX,nRepStartY, sal_True,sal_True, *pLocationData );
     }
     if (bDoRepCol)
     {
         if ( bDoPrint )
             PrintArea( nRepeatStartCol,nY1, nRepeatEndCol,nY2, nRepStartX,nDataY,
-                        TRUE,!bDoRepRow,FALSE,TRUE );
+                        sal_True,!bDoRepRow,sal_False,sal_True );
         if ( pLocationData )
-            LocateArea( nRepeatStartCol,nY1, nRepeatEndCol,nY2, nRepStartX,nDataY, TRUE,FALSE, *pLocationData );
+            LocateArea( nRepeatStartCol,nY1, nRepeatEndCol,nY2, nRepStartX,nDataY, sal_True,sal_False, *pLocationData );
     }
     if (bDoRepRow)
     {
         if ( bDoPrint )
             PrintArea( nX1,nRepeatStartRow, nX2,nRepeatEndRow, nDataX,nRepStartY,
-                        !bDoRepCol,TRUE,TRUE,FALSE );
+                        !bDoRepCol,sal_True,sal_True,sal_False );
         if ( pLocationData )
-            LocateArea( nX1,nRepeatStartRow, nX2,nRepeatEndRow, nDataX,nRepStartY, FALSE,TRUE, *pLocationData );
+            LocateArea( nX1,nRepeatStartRow, nX2,nRepeatEndRow, nDataX,nRepStartY, sal_False,sal_True, *pLocationData );
     }
 
     //	Daten ausgeben
 
     if ( bDoPrint )
-        PrintArea( nX1,nY1, nX2,nY2, nDataX,nDataY, !bDoRepCol,!bDoRepRow,TRUE,TRUE );
+        PrintArea( nX1,nY1, nX2,nY2, nDataX,nDataY, !bDoRepCol,!bDoRepRow,sal_True,sal_True );
     if ( pLocationData )
-        LocateArea( nX1,nY1, nX2,nY2, nDataX,nDataY, FALSE,FALSE, *pLocationData );
+        LocateArea( nX1,nY1, nX2,nY2, nDataX,nDataY, sal_False,sal_False, *pLocationData );
 
     //	Spalten-/Zeilenkoepfe ausgeben
     //	nach den Daten (ueber evtl. weitergezeichneten Schatten)
@@ -2374,23 +2374,23 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
             if ( bDoPrint )
                 PrintColHdr( nRepeatStartCol,nRepeatEndCol, nRepStartX,nInnerStartY );
             if ( pLocationData )
-                LocateColHdr( nRepeatStartCol,nRepeatEndCol, nRepStartX,nInnerStartY, TRUE, *pLocationData );
+                LocateColHdr( nRepeatStartCol,nRepeatEndCol, nRepStartX,nInnerStartY, sal_True, *pLocationData );
         }
         if ( bDoPrint )
             PrintColHdr( nX1,nX2, nDataX,nInnerStartY );
         if ( pLocationData )
-            LocateColHdr( nX1,nX2, nDataX,nInnerStartY, FALSE, *pLocationData );
+            LocateColHdr( nX1,nX2, nDataX,nInnerStartY, sal_False, *pLocationData );
         if (bDoRepRow)
         {
             if ( bDoPrint )
                 PrintRowHdr( nRepeatStartRow,nRepeatEndRow, nInnerStartX,nRepStartY );
             if ( pLocationData )
-                LocateRowHdr( nRepeatStartRow,nRepeatEndRow, nInnerStartX,nRepStartY, TRUE, *pLocationData );
+                LocateRowHdr( nRepeatStartRow,nRepeatEndRow, nInnerStartX,nRepStartY, sal_True, *pLocationData );
         }
         if ( bDoPrint )
             PrintRowHdr( nY1,nY2, nInnerStartX,nDataY );
         if ( pLocationData )
-            LocateRowHdr( nY1,nY2, nInnerStartX,nDataY, FALSE, *pLocationData );
+            LocateRowHdr( nY1,nY2, nInnerStartX,nDataY, sal_False, *pLocationData );
     }
 
     //	einfacher Rahmen
@@ -2424,7 +2424,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
     }
 
     aLastSourceRange = ScRange( nX1, nY1, nPrintTab, nX2, nY2, nPrintTab );
-    bSourceRangeValid = TRUE;
+    bSourceRangeValid = sal_True;
 }
 
 void ScPrintFunc::SetOffset( const Point& rOfs )
@@ -2432,24 +2432,24 @@ void ScPrintFunc::SetOffset( const Point& rOfs )
     aSrcOffset = rOfs;
 }
 
-void ScPrintFunc::SetManualZoom( USHORT nNewZoom )
+void ScPrintFunc::SetManualZoom( sal_uInt16 nNewZoom )
 {
     nManualZoom = nNewZoom;
 }
 
-void ScPrintFunc::SetClearFlag( BOOL bFlag )
+void ScPrintFunc::SetClearFlag( sal_Bool bFlag )
 {
     bClearWin = bFlag;
 }
 
-void ScPrintFunc::SetUseStyleColor( BOOL bFlag )
+void ScPrintFunc::SetUseStyleColor( sal_Bool bFlag )
 {
     bUseStyleColor = bFlag;
     if (pEditEngine)
         pEditEngine->EnableAutoColor( bUseStyleColor );
 }
 
-void ScPrintFunc::SetRenderFlag( BOOL bFlag )
+void ScPrintFunc::SetRenderFlag( sal_Bool bFlag )
 {
     bIsRender = bFlag;		// set when using XRenderable (PDF)
 }
@@ -2470,10 +2470,10 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects()
 //	richtig zu setzen - immer ohne UserArea
 //
 
-BOOL ScPrintFunc::UpdatePages()
+sal_Bool ScPrintFunc::UpdatePages()
 {
     if (!pParamSet)
-        return FALSE;
+        return sal_False;
 
     //	Zoom
 
@@ -2500,12 +2500,12 @@ BOOL ScPrintFunc::UpdatePages()
             pDocShell->PostPaint(0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID);
         }
 
-    return TRUE;
+    return sal_True;
 }
 
 long ScPrintFunc::CountPages()							// setzt auch nPagesX, nPagesY
 {
-    BOOL bAreaOk = FALSE;
+    sal_Bool bAreaOk = sal_False;
 
     if (pDoc->HasTable( nPrintTab ))
     {
@@ -2523,13 +2523,13 @@ long ScPrintFunc::CountPages()							// setzt auch nPagesX, nPagesY
                 nStartRow = rRange.aStart.Row();
                 nEndCol   = rRange.aEnd  .Col();
                 nEndRow   = rRange.aEnd  .Row();
-                bAreaOk   = AdjustPrintArea(FALSE);			// begrenzen
+                bAreaOk   = AdjustPrintArea(sal_False);			// begrenzen
             }
             else
-                bAreaOk = FALSE;
+                bAreaOk = sal_False;
         }
         else												// aus Dokument suchen
-            bAreaOk = AdjustPrintArea(TRUE);
+            bAreaOk = AdjustPrintArea(sal_True);
     }
 
     if (bAreaOk)
@@ -2538,8 +2538,8 @@ long ScPrintFunc::CountPages()							// setzt auch nPagesX, nPagesY
         size_t nY;
         if (bMultiArea)
         {
-            USHORT nRCount = pDoc->GetPrintRangeCount( nPrintTab );
-            for (USHORT i=0; i<nRCount; i++)
+            sal_uInt16 nRCount = pDoc->GetPrintRangeCount( nPrintTab );
+            for (sal_uInt16 i=0; i<nRCount; i++)
             {
                 CalcZoom(i);
                 if ( aTableParam.bSkipEmpty )
@@ -2581,19 +2581,19 @@ long ScPrintFunc::CountNotePages()
     SCCOL nCol;
     SCROW nRow;
 
-    BOOL bError = FALSE;
+    sal_Bool bError = sal_False;
     if (!aAreaParam.bPrintArea)
-        bError = !AdjustPrintArea(TRUE);			// komplett aus Dok suchen
+        bError = !AdjustPrintArea(sal_True);			// komplett aus Dok suchen
 
-    USHORT nRepeats = 1;							// wie oft durchgehen ?
+    sal_uInt16 nRepeats = 1;							// wie oft durchgehen ?
     if (bMultiArea)
         nRepeats = pDoc->GetPrintRangeCount(nPrintTab);
     if (bError)
         nRepeats = 0;
 
-    for (USHORT nStep=0; nStep<nRepeats; nStep++)
+    for (sal_uInt16 nStep=0; nStep<nRepeats; nStep++)
     {
-        BOOL bDoThis = TRUE;
+        sal_Bool bDoThis = sal_True;
         if (bMultiArea)				// alle Areas durchgehen
         {
             const ScRange* pThisRange = pDoc->GetPrintRange( nPrintTab, nStep );
@@ -2603,7 +2603,7 @@ long ScPrintFunc::CountNotePages()
                 nStartRow = pThisRange->aStart.Row();
                 nEndCol   = pThisRange->aEnd  .Col();
                 nEndRow   = pThisRange->aEnd  .Row();
-                bDoThis = AdjustPrintArea(FALSE);
+                bDoThis = AdjustPrintArea(sal_False);
             }
         }
 
@@ -2629,7 +2629,7 @@ long ScPrintFunc::CountNotePages()
     long nNoteAdd;
     do
     {
-        nNoteAdd = PrintNotes( nPages, nNoteNr, FALSE, NULL );
+        nNoteAdd = PrintNotes( nPages, nNoteNr, sal_False, NULL );
         if (nNoteAdd)
         {
             nNoteNr += nNoteAdd;
@@ -2691,8 +2691,8 @@ void ScPrintFunc::ApplyPrintSettings()
                 aEnumSize.Width() = aEnumSize.Height();
                 aEnumSize.Height() = nTemp;
         }
-        Paper ePaper = SvxPaperInfo::GetSvxPaper( aEnumSize, MAP_TWIP, TRUE );
-        USHORT nPaperBin = ((const SvxPaperBinItem&)pParamSet->Get(ATTR_PAGE_PAPERBIN)).GetValue();
+        Paper ePaper = SvxPaperInfo::GetSvxPaper( aEnumSize, MAP_TWIP, sal_True );
+        sal_uInt16 nPaperBin = ((const SvxPaperBinItem&)pParamSet->Get(ATTR_PAGE_PAPERBIN)).GetValue();
 
         pPrinter->SetPaper( ePaper );
         if ( PAPER_USER == ePaper )
@@ -2714,7 +2714,7 @@ void ScPrintFunc::ApplyPrintSettings()
 //	nDisplayStart = lfd. Nummer fuer Anzeige der Seitennummer
 
 long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
-                                long nStartPage, long nDisplayStart, BOOL bDoPrint,
+                                long nStartPage, long nDisplayStart, sal_Bool bDoPrint,
                                 SfxProgress* pProgress, ScPreviewLocationData* pLocationData )
 {
     DBG_ASSERT(pDev,"Device == NULL");
@@ -2744,10 +2744,10 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
     long nPrinted = 0;
     long nEndPage = rPageRanges.GetTotalRange().Max();
 
-    USHORT nRepeats = 1;					// wie oft durchgehen ?
+    sal_uInt16 nRepeats = 1;					// wie oft durchgehen ?
     if (bMultiArea)
         nRepeats = pDoc->GetPrintRangeCount(nPrintTab);
-    for (USHORT nStep=0; nStep<nRepeats; nStep++)
+    for (sal_uInt16 nStep=0; nStep<nRepeats; nStep++)
     {
         if (bMultiArea)						// Bereich neu belegen ?
         {
@@ -2832,7 +2832,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
     {
         if ( nPageNo+nStartPage <= nEndPage )
         {
-            BOOL bPageSelected = rPageRanges.IsSelected( nPageNo+nStartPage+1 );
+            sal_Bool bPageSelected = rPageRanges.IsSelected( nPageNo+nStartPage+1 );
             nNoteAdd = PrintNotes( nPageNo+nStartPage, nNoteNr, bDoPrint && bPageSelected,
                                     ( bPageSelected ? pLocationData : NULL ) );
             if ( nNoteAdd )
@@ -2846,7 +2846,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
                 if (bPageSelected)
                 {
                     ++nPrinted;
-                    bSourceRangeValid = FALSE;		// last page was no cell range
+                    bSourceRangeValid = sal_False;		// last page was no cell range
                 }
                 ++nPageNo;
             }
@@ -2862,9 +2862,9 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
     return nPrinted;
 }
 
-void ScPrintFunc::CalcZoom( USHORT nRangeNo )						// Zoom berechnen
+void ScPrintFunc::CalcZoom( sal_uInt16 nRangeNo )						// Zoom berechnen
 {
-    USHORT nRCount = pDoc->GetPrintRangeCount( nPrintTab );
+    sal_uInt16 nRCount = pDoc->GetPrintRangeCount( nPrintTab );
     const ScRange* pThisRange = NULL;
     if ( nRangeNo != RANGENO_NORANGE || nRangeNo < nRCount )
         pThisRange = pDoc->GetPrintRange( nPrintTab, nRangeNo );
@@ -2876,7 +2876,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo )						// Zoom berechnen
         nEndRow   = pThisRange->aEnd  .Row();
     }
 
-    if (!AdjustPrintArea(FALSE))						// leer
+    if (!AdjustPrintArea(sal_False))						// leer
     {
         nZoom = 100;
         nPagesX = nPagesY = nTotalY = 0;
@@ -2888,7 +2888,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo )						// Zoom berechnen
     if (aTableParam.bScalePageNum)
     {
         nZoom = 100;
-        USHORT nPagesToFit = aTableParam.nScalePageNum;
+        sal_uInt16 nPagesToFit = aTableParam.nScalePageNum;
 
         sal_uInt16 nLastFitZoom = 0, nLastNonFitZoom = 0;
         while (true)
@@ -2929,8 +2929,8 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo )						// Zoom berechnen
     else if (aTableParam.bScaleTo)
     {
         nZoom = 100;
-        USHORT nW = aTableParam.nScaleWidth;
-        USHORT nH = aTableParam.nScaleHeight;
+        sal_uInt16 nW = aTableParam.nScaleWidth;
+        sal_uInt16 nH = aTableParam.nScaleHeight;
 
         sal_uInt16 nLastFitZoom = 0, nLastNonFitZoom = 0;
         while (true)
@@ -3041,7 +3041,7 @@ void lcl_SetHidden( ScDocument* pDoc, SCTAB nPrintTab, ScPageRowEntry& rPageRowE
     SCROW nStartRow = rPageRowEntry.GetStartRow();
     SCROW nEndRow   = rPageRowEntry.GetEndRow();
 
-    BOOL bLeftIsEmpty = FALSE;
+    sal_Bool bLeftIsEmpty = sal_False;
     ScRange aTempRange;
     Rectangle aTempRect = pDoc->GetMMRect( 0,0, 0,0, 0 );
 
@@ -3052,10 +3052,10 @@ void lcl_SetHidden( ScDocument* pDoc, SCTAB nPrintTab, ScPageRowEntry& rPageRowE
                                     bLeftIsEmpty, &aTempRange, &aTempRect ) )
         {
             rPageRowEntry.SetHidden(i);
-            bLeftIsEmpty = TRUE;
+            bLeftIsEmpty = sal_True;
         }
         else
-            bLeftIsEmpty = FALSE;
+            bLeftIsEmpty = sal_False;
 
         nStartCol = nEndCol+1;
     }
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 351198227..758f6795e 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -95,7 +95,7 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
 
 #define IMPL_CHILD_CTOR(Class,sid) \
     Class::Class( Window*  	 			pParentP,					\
-                    USHORT		 		nId,						\
+                    sal_uInt16		 		nId,						\
                     SfxBindings*		p,							\
                     SfxChildWinInfo*	pInfo )						\
         : SfxChildWindow(pParentP, nId)								\
@@ -115,7 +115,7 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
         pWindow = pViewShell ?										\
             pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL;	\
         if (pViewShell && !pWindow)												\
-            pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE );			\
+            pViewShell->GetViewFrame()->SetChildWindow( nId, sal_False );			\
     }
 
 
@@ -204,15 +204,15 @@ IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION )
 // ScSimpleRefDlgWrapper
 //-------------------------------------------------------------------------
 
-static BOOL		bScSimpleRefFlag;
+static sal_Bool		bScSimpleRefFlag;
 static long		nScSimpleRefHeight;
 static long		nScSimpleRefWidth;
 static long		nScSimpleRefX;
 static long		nScSimpleRefY;
-static BOOL		bAutoReOpen=TRUE;
+static sal_Bool		bAutoReOpen=sal_True;
 
 ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP,
-                                USHORT		 		nId,
+                                sal_uInt16		 		nId,
                                 SfxBindings*		p,
                                 SfxChildWinInfo*	pInfo )
         : SfxChildWindow(pParentP, nId)
@@ -245,11 +245,11 @@ ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP,
 
     if (!pWindow)
     {
-        SC_MOD()->SetRefDialog( nId, FALSE );
+        SC_MOD()->SetRefDialog( nId, sal_False );
     }
 }
 
-void ScSimpleRefDlgWrapper::SetDefaultPosSize(Point aPos, Size aSize, BOOL bSet)
+void ScSimpleRefDlgWrapper::SetDefaultPosSize(Point aPos, Size aSize, sal_Bool bSet)
 {
     bScSimpleRefFlag=bSet;
     if(bScSimpleRefFlag)
@@ -272,7 +272,7 @@ String ScSimpleRefDlgWrapper::GetRefString()
     return aResult;
 }
 
-void ScSimpleRefDlgWrapper::SetAutoReOpen(BOOL bFlag)
+void ScSimpleRefDlgWrapper::SetAutoReOpen(sal_Bool bFlag)
 {
     bAutoReOpen=bFlag;
 }
@@ -302,7 +302,7 @@ void ScSimpleRefDlgWrapper::SetUnoLinks( const Link& rDone,
     }
 }
 
-void ScSimpleRefDlgWrapper::SetFlags( BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection )
+void ScSimpleRefDlgWrapper::SetFlags( sal_Bool bCloseOnButtonUp, sal_Bool bSingleCell, sal_Bool bMultiSelection )
 {
     if(pWindow!=NULL)
     {
@@ -325,7 +325,7 @@ void ScSimpleRefDlgWrapper::StartRefInput()
 //-------------------------------------------------------------------------
 
 ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper(	Window* pParentP,
-                                            USHORT nId,
+                                            sal_uInt16 nId,
                                             SfxBindings* pBindings,
                                             SfxChildWinInfo* pInfo ) :
                                             SfxChildWindow( pParentP, nId )
@@ -341,7 +341,7 @@ ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper(	Window* pParentP,
             ((ScAcceptChgDlg*)pWindow)->Initialize( pInfo );
         }
         if (pViewShell && !pWindow)
-            pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE );
+            pViewShell->GetViewFrame()->SetChildWindow( nId, sal_False );
 }
 
 void ScAcceptChgDlgWrapper::ReInitDlg()
@@ -401,7 +401,7 @@ namespace
 }
 
 ScValidityRefChildWin::ScValidityRefChildWin( Window*  	 			pParentP,					\
-                                             USHORT		 		nId,						\
+                                             sal_uInt16		 		nId,						\
                                              SfxBindings*		p,							\
                                              SfxChildWinInfo*	/*pInfo*/ )						\
                                              : SfxChildWindow(pParentP, nId),
@@ -409,7 +409,7 @@ ScValidityRefChildWin::ScValidityRefChildWin( Window*  	 			pParentP,					\
                                              m_bFreeWindowLock( false ),
                                              m_pSavedWndParent( NULL )
 {
-    SetWantsFocus( FALSE );\
+    SetWantsFocus( sal_False );\
         ScTabViewShell* pViewShell =								\
             NULL != ( pWindow =  ScValidationDlg::Find1AliveObject( pParentP ) ) ? static_cast<ScValidationDlg*>(pWindow)->GetTabViewShell() :
             lcl_GetTabViewShell( p );
@@ -417,7 +417,7 @@ ScValidityRefChildWin::ScValidityRefChildWin( Window*  	 			pParentP,					\
             pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
         DBG_ASSERT( pViewShell, "missing view shell :-(" );			\
         if (pViewShell && !pWindow)												\
-            pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE );			\
+            pViewShell->GetViewFrame()->SetChildWindow( nId, sal_False );			\
         else if( pWindow /*&& pWindow->ISA(ScValidationDlg)*/ )
         {}//pWindow = new Window( pParentP, WB_HIDE );
 
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index a72d3782a..7b768f0c4 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -46,14 +46,14 @@
 #include "docsh.hxx"
 #include "tabprotection.hxx"
 
-extern USHORT nScFillModeMouseModifier;				// global.cxx
+extern sal_uInt16 nScFillModeMouseModifier;				// global.cxx
 
 using namespace com::sun::star;
 
 // STATIC DATA -----------------------------------------------------------
 
 static Point aSwitchPos;				//! Member
-static BOOL bDidSwitch = FALSE;
+static sal_Bool bDidSwitch = sal_False;
 
 // -----------------------------------------------------------------------
 
@@ -64,8 +64,8 @@ static BOOL bDidSwitch = FALSE;
 ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) :
         pViewData( pNewViewData ),
         pEngine( NULL ),
-        bAnchor( FALSE ),
-        bStarted( FALSE )
+        bAnchor( sal_False ),
+        bStarted( sal_False )
 {
     DBG_ASSERT(pViewData, "ViewData==0 bei FunctionSet");
 }
@@ -103,19 +103,19 @@ void __EXPORT ScViewFunctionSet::BeginDrag()
     }
 
     ScModule* pScMod = SC_MOD();
-    BOOL bRefMode = pScMod->IsFormulaMode();
+    sal_Bool bRefMode = pScMod->IsFormulaMode();
     if (!bRefMode)
     {
         pViewData->GetView()->FakeButtonUp( GetWhich() );	// ButtonUp wird verschluckt
 
         ScMarkData& rMark = pViewData->GetMarkData();
-//		rMark.SetMarking(FALSE);						// es fehlt ein ButtonUp
+//		rMark.SetMarking(sal_False);						// es fehlt ein ButtonUp
         rMark.MarkToSimple();
         if ( rMark.IsMarked() && !rMark.IsMultiMarked() )
         {
             ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
-            // bApi = TRUE -> no error mesages
-            BOOL bCopied = pViewData->GetView()->CopyToClip( pClipDoc, FALSE, TRUE );
+            // bApi = sal_True -> no error mesages
+            sal_Bool bCopied = pViewData->GetView()->CopyToClip( pClipDoc, sal_False, sal_True );
             if ( bCopied )
             {
                 sal_Int8 nDragActions = pViewData->GetView()->SelectionEditable() ?
@@ -165,7 +165,7 @@ void __EXPORT ScViewFunctionSet::CreateAnchor()
 {
     if (bAnchor) return;
 
-    BOOL bRefMode = SC_MOD()->IsFormulaMode();
+    sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
     if (bRefMode)
         SetAnchor( pViewData->GetRefStartX(), pViewData->GetRefStartY() );
     else
@@ -174,22 +174,22 @@ void __EXPORT ScViewFunctionSet::CreateAnchor()
 
 void ScViewFunctionSet::SetAnchor( SCCOL nPosX, SCROW nPosY )
 {
-    BOOL bRefMode = SC_MOD()->IsFormulaMode();
+    sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
     ScTabView* pView = pViewData->GetView();
     SCTAB nTab = pViewData->GetTabNo();
 
     if (bRefMode)
     {
-        pView->DoneRefMode( FALSE );
+        pView->DoneRefMode( sal_False );
         aAnchorPos.Set( nPosX, nPosY, nTab );
         pView->InitRefMode( aAnchorPos.Col(), aAnchorPos.Row(), aAnchorPos.Tab(),
                             SC_REFTYPE_REF );
-        bStarted = TRUE;
+        bStarted = sal_True;
     }
     else if (pViewData->IsAnyFillMode())
     {
         aAnchorPos.Set( nPosX, nPosY, nTab );
-        bStarted = TRUE;
+        bStarted = sal_True;
     }
     else
     {
@@ -200,46 +200,46 @@ void ScViewFunctionSet::SetAnchor( SCCOL nPosX, SCROW nPosY )
         }
         else
         {
-            pView->DoneBlockMode( TRUE );
+            pView->DoneBlockMode( sal_True );
             aAnchorPos.Set( nPosX, nPosY, nTab );
             ScMarkData& rMark = pViewData->GetMarkData();
             if ( rMark.IsMarked() || rMark.IsMultiMarked() )
             {
                 pView->InitBlockMode( aAnchorPos.Col(), aAnchorPos.Row(),
-                                        aAnchorPos.Tab(), TRUE );
-                bStarted = TRUE;
+                                        aAnchorPos.Tab(), sal_True );
+                bStarted = sal_True;
             }
             else
-                bStarted = FALSE;
+                bStarted = sal_False;
         }
     }
-    bAnchor = TRUE;
+    bAnchor = sal_True;
 }
 
 void __EXPORT ScViewFunctionSet::DestroyAnchor()
 {
-    BOOL bRefMode = SC_MOD()->IsFormulaMode();
+    sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
     if (bRefMode)
-        pViewData->GetView()->DoneRefMode( TRUE );
+        pViewData->GetView()->DoneRefMode( sal_True );
     else
-        pViewData->GetView()->DoneBlockMode( TRUE );
+        pViewData->GetView()->DoneBlockMode( sal_True );
 
-    bAnchor = FALSE;
+    bAnchor = sal_False;
 }
 
-void ScViewFunctionSet::SetAnchorFlag( BOOL bSet )
+void ScViewFunctionSet::SetAnchorFlag( sal_Bool bSet )
 {
     bAnchor = bSet;
 }
 
-BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL /* bDontSelectAtCursor */ )
+sal_Bool __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool /* bDontSelectAtCursor */ )
 {
     if ( bDidSwitch )
     {
         if ( rPointPixel == aSwitchPos )
-            return FALSE;					// nicht auf falschem Fenster scrollen
+            return sal_False;					// nicht auf falschem Fenster scrollen
         else
-            bDidSwitch = FALSE;
+            bDidSwitch = sal_False;
     }
     aSwitchPos = rPointPixel;		// nur wichtig, wenn bDidSwitch
 
@@ -256,21 +256,21 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
     //	Scrolling
 
     Size aWinSize = pEngine->GetWindow()->GetOutputSizePixel();
-    BOOL bRightScroll  = ( aEffPos.X() >= aWinSize.Width() );
-    BOOL bBottomScroll = ( aEffPos.Y() >= aWinSize.Height() );
-    BOOL bNegScroll    = ( aEffPos.X() < 0 || aEffPos.Y() < 0 );
-    BOOL bScroll = bRightScroll || bBottomScroll || bNegScroll;
+    sal_Bool bRightScroll  = ( aEffPos.X() >= aWinSize.Width() );
+    sal_Bool bBottomScroll = ( aEffPos.Y() >= aWinSize.Height() );
+    sal_Bool bNegScroll    = ( aEffPos.X() < 0 || aEffPos.Y() < 0 );
+    sal_Bool bScroll = bRightScroll || bBottomScroll || bNegScroll;
 
     SCsCOL	nPosX;
     SCsROW	nPosY;
     pViewData->GetPosFromPixel( aEffPos.X(), aEffPos.Y(), GetWhich(),
-                                nPosX, nPosY, TRUE, TRUE );		// mit Repair
+                                nPosX, nPosY, sal_True, sal_True );		// mit Repair
 
     //	fuer AutoFill in der Mitte der Zelle umschalten
     //	dabei aber nicht das Scrolling nach rechts/unten verhindern
     if ( pViewData->IsFillMode() || pViewData->GetFillMode() == SC_FILL_MATRIX )
     {
-        BOOL bLeft, bTop;
+        sal_Bool bLeft, bTop;
         pViewData->GetMouseQuadrant( aEffPos, GetWhich(), nPosX, nPosY, bLeft, bTop );
         ScDocument* pDoc = pViewData->GetDocument();
         SCTAB nTab = pViewData->GetTabNo();
@@ -297,18 +297,18 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
             if ( aEffPos.X() >= aWinSize.Width() )
             {
                 if ( eWhich == SC_SPLIT_TOPLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_TOPRIGHT ), bScroll = FALSE, bDidSwitch = TRUE;
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_TOPRIGHT ), bScroll = sal_False, bDidSwitch = sal_True;
                 else if ( eWhich == SC_SPLIT_BOTTOMLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bScroll = FALSE, bDidSwitch = TRUE;
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bScroll = sal_False, bDidSwitch = sal_True;
             }
 
         if ( pViewData->GetVSplitMode() == SC_SPLIT_FIX )
             if ( aEffPos.Y() >= aWinSize.Height() )
             {
                 if ( eWhich == SC_SPLIT_TOPLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMLEFT ), bScroll = FALSE, bDidSwitch = TRUE;
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMLEFT ), bScroll = sal_False, bDidSwitch = sal_True;
                 else if ( eWhich == SC_SPLIT_TOPRIGHT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bScroll = FALSE, bDidSwitch = TRUE;
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bScroll = sal_False, bDidSwitch = sal_True;
             }
     }
 
@@ -316,7 +316,7 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
     return SetCursorAtCell( nPosX, nPosY, bScroll );
 }
 
-BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScroll )
+sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Bool bScroll )
 {
     ScTabView* pView = pViewData->GetView();
     SCTAB nTab = pViewData->GetTabNo();
@@ -332,19 +332,19 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
         bool bSkipUnprotected = !pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS);
 
         if ( bSkipProtected && bSkipUnprotected )
-            return FALSE;
+            return sal_False;
 
         bool bCellProtected = pDoc->HasAttrib(nPosX, nPosY, nTab, nPosX, nPosY, nTab, HASATTR_PROTECTED);
         if ( (bCellProtected && bSkipProtected) || (!bCellProtected && bSkipUnprotected) )
             // Don't select this cell!
-            return FALSE;
+            return sal_False;
     }
 
     ScModule* pScMod = SC_MOD();
     ScTabViewShell* pViewShell = pViewData->GetViewShell();
     bool bRefMode = ( pViewShell ? pViewShell->IsRefInputMode() : false );
 
-    BOOL bHide = !bRefMode && !pViewData->IsAnyFillMode() &&
+    sal_Bool bHide = !bRefMode && !pViewData->IsAnyFillMode() &&
             ( nPosX != (SCsCOL) pViewData->GetCurX() || nPosY != (SCsROW) pViewData->GetCurY() );
 
     if (bHide)
@@ -368,7 +368,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
         {
             if (!bAnchor)
             {
-                pView->DoneRefMode( TRUE );
+                pView->DoneRefMode( sal_True );
                 pView->InitRefMode( nPosX, nPosY, pViewData->GetTabNo(), SC_REFTYPE_REF );
             }
 
@@ -392,7 +392,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
         }
 
         ScRange aDelRange;
-        BOOL bOldDelMark = pViewData->GetDelMark( aDelRange );
+        sal_Bool bOldDelMark = pViewData->GetDelMark( aDelRange );
 
         if ( nPosX+1 >= (SCsCOL) nStartX && nPosX <= (SCsCOL) nEndX &&
              nPosY+1 >= (SCsROW) nStartY && nPosY <= (SCsROW) nEndY &&
@@ -468,8 +468,8 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
 #endif
             }
 
-            BOOL bNegX = ( nPosX < (SCsCOL) nStartX );
-            BOOL bNegY = ( nPosY < (SCsROW) nStartY );
+            sal_Bool bNegX = ( nPosX < (SCsCOL) nStartX );
+            sal_Bool bNegY = ( nPosY < (SCsROW) nStartY );
 
             long nSizeX = 0;
             if ( bNegX )
@@ -503,12 +503,12 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
             if ( nSizeX > nSizeY )			// Fill immer nur in einer Richtung
             {
                 nPosY = nEndY;
-                bNegY = FALSE;
+                bNegY = sal_False;
             }
             else
             {
                 nPosX = nEndX;
-                bNegX = FALSE;
+                bNegX = sal_False;
             }
 
             SCCOL nRefStX = bNegX ? nEndX : nStartX;
@@ -524,7 +524,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
     }
     else if (pViewData->IsAnyFillMode())
     {
-        BYTE nMode = pViewData->GetFillMode();
+        sal_uInt8 nMode = pViewData->GetFillMode();
         if ( nMode == SC_FILL_EMBED_LT || nMode == SC_FILL_EMBED_RB )
         {
             DBG_ASSERT( pDoc->IsEmbedded(), "!pDoc->IsEmbedded()" );
@@ -564,7 +564,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
     }
     else					// normales Markieren
     {
-        BOOL bHideCur = bAnchor && ( (SCCOL)nPosX != pViewData->GetCurX() ||
+        sal_Bool bHideCur = bAnchor && ( (SCCOL)nPosX != pViewData->GetCurX() ||
                                      (SCROW)nPosY != pViewData->GetCurY() );
         if (bHideCur)
             pView->HideAllCursors();			// sonst zweimal: Block und SetCursor
@@ -573,29 +573,29 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
         {
             if (!bStarted)
             {
-                BOOL bMove = ( nPosX != (SCsCOL) aAnchorPos.Col() ||
+                sal_Bool bMove = ( nPosX != (SCsCOL) aAnchorPos.Col() ||
                                 nPosY != (SCsROW) aAnchorPos.Row() );
                 if ( bMove || ( pEngine && pEngine->GetMouseEvent().IsShift() ) )
                 {
                     pView->InitBlockMode( aAnchorPos.Col(), aAnchorPos.Row(),
-                                            aAnchorPos.Tab(), TRUE );
-                    bStarted = TRUE;
+                                            aAnchorPos.Tab(), sal_True );
+                    bStarted = sal_True;
                 }
             }
             if (bStarted)
-                pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab, FALSE, FALSE, TRUE );
+                pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab, sal_False, sal_False, sal_True );
         }
         else
         {
             ScMarkData& rMark = pViewData->GetMarkData();
             if (rMark.IsMarked() || rMark.IsMultiMarked())
             {
-                pView->DoneBlockMode(TRUE);
-                pView->InitBlockMode( nPosX, nPosY, nTab, TRUE );
+                pView->DoneBlockMode(sal_True);
+                pView->InitBlockMode( nPosX, nPosY, nTab, sal_True );
                 pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab );
 
                 aAnchorPos.Set( nPosX, nPosY, nTab );
-                bStarted = TRUE;
+                bStarted = sal_True;
             }
             // #i3875# *Hack* When a new cell is Ctrl-clicked with no pre-selected cells, 
             // it highlights that new cell as well as the old cell where the cursor is 
@@ -606,18 +606,18 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
                 SCCOL nOldX = pViewData->GetCurX();
                 SCROW nOldY = pViewData->GetCurY();
                 
-                pView->InitBlockMode( nOldX, nOldY, nTab, TRUE );
+                pView->InitBlockMode( nOldX, nOldY, nTab, sal_True );
                 pView->MarkCursor( (SCCOL) nOldX, (SCROW) nOldY, nTab );
                 
                 if ( nOldX != nPosX || nOldY != nPosY )
                 {
-                    pView->DoneBlockMode( TRUE );
-                    pView->InitBlockMode( nPosX, nPosY, nTab, TRUE );
+                    pView->DoneBlockMode( sal_True );
+                    pView->InitBlockMode( nPosX, nPosY, nTab, sal_True );
                     pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab );
                     aAnchorPos.Set( nPosX, nPosY, nTab );
                 }
                 
-                bStarted = TRUE;
+                bStarted = sal_True;
             }
         }
 
@@ -630,17 +630,17 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
     if (bHide)
         pView->ShowAllCursors();
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
+sal_Bool __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
 {
-    BOOL bRefMode = SC_MOD()->IsFormulaMode();
+    sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
     if (bRefMode)
-        return FALSE;
+        return sal_False;
 
     if (pViewData->IsAnyFillMode())
-        return FALSE;
+        return sal_False;
 
     ScMarkData& rMark = pViewData->GetMarkData();
     if (bAnchor || !rMark.IsMultiMarked())
@@ -651,7 +651,7 @@ BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
         return pViewData->GetMarkData().IsCellMarked( (SCCOL) nPosX, (SCROW) nPosY );
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void __EXPORT ScViewFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ )
@@ -664,18 +664,18 @@ void __EXPORT ScViewFunctionSet::DeselectAll()
     if (pViewData->IsAnyFillMode())
         return;
 
-    BOOL bRefMode = SC_MOD()->IsFormulaMode();
+    sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
     if (bRefMode)
     {
-        pViewData->GetView()->DoneRefMode( FALSE );
+        pViewData->GetView()->DoneRefMode( sal_False );
     }
     else
     {
-        pViewData->GetView()->DoneBlockMode( FALSE );
+        pViewData->GetView()->DoneBlockMode( sal_False );
         pViewData->GetViewShell()->UpdateInputHandler();
     }
 
-    bAnchor = FALSE;
+    bAnchor = sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -687,7 +687,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
 {
     //	Parameter einstellen
     SetSelectionMode( MULTIPLE_SELECTION );
-    EnableDrag( TRUE );
+    EnableDrag( sal_True );
 }
 
 
@@ -699,15 +699,15 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
 
 ScHeaderFunctionSet::ScHeaderFunctionSet( ScViewData* pNewViewData ) :
         pViewData( pNewViewData ),
-        bColumn( FALSE ),
+        bColumn( sal_False ),
         eWhich( SC_SPLIT_TOPLEFT ),
-        bAnchor( FALSE ),
+        bAnchor( sal_False ),
         nCursorPos( 0 )
 {
     DBG_ASSERT(pViewData, "ViewData==0 bei FunctionSet");
 }
 
-void ScHeaderFunctionSet::SetColumn( BOOL bSet )
+void ScHeaderFunctionSet::SetColumn( sal_Bool bSet )
 {
     bColumn = bSet;
 }
@@ -728,41 +728,41 @@ void __EXPORT ScHeaderFunctionSet::CreateAnchor()
         return;
 
     ScTabView* pView = pViewData->GetView();
-    pView->DoneBlockMode( TRUE );
+    pView->DoneBlockMode( sal_True );
     if (bColumn)
     {
-        pView->InitBlockMode( static_cast<SCCOL>(nCursorPos), 0, pViewData->GetTabNo(), TRUE, TRUE, FALSE );
+        pView->InitBlockMode( static_cast<SCCOL>(nCursorPos), 0, pViewData->GetTabNo(), sal_True, sal_True, sal_False );
         pView->MarkCursor( static_cast<SCCOL>(nCursorPos), MAXROW, pViewData->GetTabNo() );
     }
     else
     {
-        pView->InitBlockMode( 0, nCursorPos, pViewData->GetTabNo(), TRUE, FALSE, TRUE );
+        pView->InitBlockMode( 0, nCursorPos, pViewData->GetTabNo(), sal_True, sal_False, sal_True );
         pView->MarkCursor( MAXCOL, nCursorPos, pViewData->GetTabNo() );
     }
-    bAnchor = TRUE;
+    bAnchor = sal_True;
 }
 
 void __EXPORT ScHeaderFunctionSet::DestroyAnchor()
 {
-    pViewData->GetView()->DoneBlockMode( TRUE );
-    bAnchor = FALSE;
+    pViewData->GetView()->DoneBlockMode( sal_True );
+    bAnchor = sal_False;
 }
 
-BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL /* bDontSelectAtCursor */ )
+sal_Bool __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool /* bDontSelectAtCursor */ )
 {
     if ( bDidSwitch )
     {
         //	die naechste gueltige Position muss vom anderen Fenster kommen
         if ( rPointPixel == aSwitchPos )
-            return FALSE;					// nicht auf falschem Fenster scrollen
+            return sal_False;					// nicht auf falschem Fenster scrollen
         else
-            bDidSwitch = FALSE;
+            bDidSwitch = sal_False;
     }
 
     //	Scrolling
 
     Size aWinSize = pViewData->GetActiveWin()->GetOutputSizePixel();
-    BOOL bScroll;
+    sal_Bool bScroll;
     if (bColumn)
         bScroll = ( rPointPixel.X() < 0 || rPointPixel.X() >= aWinSize.Width() );
     else
@@ -770,7 +770,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
 
     //	ueber Fixier-Grenze bewegt?
 
-    BOOL bSwitched = FALSE;
+    sal_Bool bSwitched = sal_False;
     if ( bColumn )
     {
         if ( pViewData->GetHSplitMode() == SC_SPLIT_FIX )
@@ -778,9 +778,9 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
             if ( rPointPixel.X() > aWinSize.Width() )
             {
                 if ( eWhich == SC_SPLIT_TOPLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_TOPRIGHT ), bSwitched = TRUE;
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_TOPRIGHT ), bSwitched = sal_True;
                 else if ( eWhich == SC_SPLIT_BOTTOMLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bSwitched = TRUE;
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bSwitched = sal_True;
             }
         }
     }
@@ -791,17 +791,17 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
             if ( rPointPixel.Y() > aWinSize.Height() )
             {
                 if ( eWhich == SC_SPLIT_TOPLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMLEFT ), bSwitched = TRUE;
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMLEFT ), bSwitched = sal_True;
                 else if ( eWhich == SC_SPLIT_TOPRIGHT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bSwitched = TRUE;
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bSwitched = sal_True;
             }
         }
     }
     if (bSwitched)
     {
         aSwitchPos = rPointPixel;
-        bDidSwitch = TRUE;
-        return FALSE;				// nicht mit falschen Positionen rechnen
+        bDidSwitch = sal_True;
+        return sal_False;				// nicht mit falschen Positionen rechnen
     }
 
     //
@@ -809,7 +809,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
     SCsCOL	nPosX;
     SCsROW	nPosY;
     pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(),
-                                nPosX, nPosY, FALSE );
+                                nPosX, nPosY, sal_False );
     if (bColumn)
     {
         nCursorPos = static_cast<SCCOLROW>(nPosX);
@@ -822,7 +822,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
     }
 
     ScTabView* pView = pViewData->GetView();
-    BOOL bHide = pViewData->GetCurX() != nPosX ||
+    sal_Bool bHide = pViewData->GetCurX() != nPosX ||
                  pViewData->GetCurY() != nPosY;
     if (bHide)
         pView->HideAllCursors();
@@ -833,11 +833,11 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
 
     if ( !bAnchor || !pView->IsBlockMode() )
     {
-        pView->DoneBlockMode( TRUE );
+        pView->DoneBlockMode( sal_True );
         pViewData->GetMarkData().MarkToMulti();			//! wer verstellt das ???
-        pView->InitBlockMode( nPosX, nPosY, pViewData->GetTabNo(), TRUE, bColumn, !bColumn );
+        pView->InitBlockMode( nPosX, nPosY, pViewData->GetTabNo(), sal_True, bColumn, !bColumn );
 
-        bAnchor = TRUE;
+        bAnchor = sal_True;
     }
 
     pView->MarkCursor( nPosX, nPosY, pViewData->GetTabNo(), bColumn, !bColumn );
@@ -848,15 +848,15 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
     if (bHide)
         pView->ShowAllCursors();
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL __EXPORT ScHeaderFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
+sal_Bool __EXPORT ScHeaderFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
 {
     SCsCOL	nPosX;
     SCsROW	nPosY;
     pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(),
-                                nPosX, nPosY, FALSE );
+                                nPosX, nPosY, sal_False );
 
     ScMarkData& rMark = pViewData->GetMarkData();
     if (bColumn)
@@ -871,8 +871,8 @@ void __EXPORT ScHeaderFunctionSet::DeselectAtPoint( const Point& /* rPointPixel
 
 void __EXPORT ScHeaderFunctionSet::DeselectAll()
 {
-    pViewData->GetView()->DoneBlockMode( FALSE );
-    bAnchor = FALSE;
+    pViewData->GetView()->DoneBlockMode( sal_False );
+    bAnchor = sal_False;
 }
 
 //------------------------------------------------------------------------
@@ -882,7 +882,7 @@ ScHeaderSelectionEngine::ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunct
 {
     //	Parameter einstellen
     SetSelectionMode( MULTIPLE_SELECTION );
-    EnableDrag( FALSE );
+    EnableDrag( sal_False );
 }
 
 
diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx
index 43ef60b3e..870c56f66 100644
--- a/sc/source/ui/view/selectionstate.cxx
+++ b/sc/source/ui/view/selectionstate.cxx
@@ -57,7 +57,7 @@ ScSelectionState::ScSelectionState( ScViewData& rViewData ) :
         if( rMarkData.IsMultiMarked() )
         {
             meType = SC_SELECTTYPE_SHEET;
-            rMarkData.FillRangeListWithMarks( &maSheetSel, FALSE );
+            rMarkData.FillRangeListWithMarks( &maSheetSel, sal_False );
         }
         // else type is SC_SELECTTYPE_NONE - already initialized
     }
@@ -69,10 +69,10 @@ bool operator==( const ScSelectionState& rL, const ScSelectionState& rR )
     if( bEqual ) switch( rL.GetSelectionType() )
     {
         case SC_SELECTTYPE_EDITCELL:
-            bEqual &= ( rL.GetEditSelection().IsEqual( rR.GetEditSelection() ) != FALSE );
+            bEqual &= ( rL.GetEditSelection().IsEqual( rR.GetEditSelection() ) != sal_False );
         // run through!
         case SC_SELECTTYPE_SHEET:
-            bEqual &= (rL.GetSheetSelection() == rR.GetSheetSelection()) == TRUE;
+            bEqual &= (rL.GetSheetSelection() == rR.GetSheetSelection()) == sal_True;
         // run through!
         case SC_SELECTTYPE_NONE:
             bEqual &= rL.GetCellCursor() == rR.GetCellCursor();
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 67a306383..97723f916 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -49,7 +49,7 @@
 
 SFX_IMPL_CHILDWINDOW( ScSpellDialogChildWindow, SID_SPELL_DIALOG )
 
-ScSpellDialogChildWindow::ScSpellDialogChildWindow( Window* pParentP, USHORT nId,
+ScSpellDialogChildWindow::ScSpellDialogChildWindow( Window* pParentP, sal_uInt16 nId,
         SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
     ::svx::SpellDialogChildWindow( pParentP, nId, pBindings, pInfo ),
     mpViewShell( 0 ),
@@ -148,7 +148,7 @@ void ScSpellDialogChildWindow::Reset()
         }
 
         mpViewData->SetSpellingView( 0 );
-        mpViewShell->KillEditView( TRUE );
+        mpViewShell->KillEditView( sal_True );
         mpDocShell->PostPaintGridAll();
         mpViewShell->UpdateInputHandler();
         mpDoc->DisableIdle( mbOldIdleDisabled );
@@ -220,7 +220,7 @@ void ScSpellDialogChildWindow::Init()
     }
 
     mbOldIdleDisabled = mpDoc->IsIdleDisabled();
-    mpDoc->DisableIdle( TRUE );   // #42726# stop online spelling
+    mpDoc->DisableIdle( sal_True );   // #42726# stop online spelling
 
     // *** create Undo/Redo documents *** -------------------------------------
 
@@ -254,7 +254,7 @@ void ScSpellDialogChildWindow::Init()
     Rectangle aRect( Point( 0, 0 ), Point( 0, 0 ) );
     pEditView->SetOutputArea( aRect );
     mxEngine->SetControlWord( EE_CNTRL_USECHARATTRIBS );
-    mxEngine->EnableUndo( FALSE );
+    mxEngine->EnableUndo( sal_False );
     mxEngine->SetPaperSize( aRect.GetSize() );
     mxEngine->SetText( EMPTY_STRING );
     mxEngine->ClearModifyFlag();
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index d336e5bbb..528b1720d 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -115,7 +115,7 @@ bool ScConversionEngineBase::FindNextConversionCell()
 
         String aNewStr = GetText();
 
-        BOOL bMultiTab = (rMark.GetSelectCount() > 1);
+        sal_Bool bMultiTab = (rMark.GetSelectCount() > 1);
         String aVisibleStr;
         if( bMultiTab )
             mrDoc.GetString( mnCurrCol, mnCurrRow, mnStartTab, aVisibleStr );
@@ -249,7 +249,7 @@ bool ScConversionEngineBase::FindNextConversionCell()
     if( bFound )
     {
         pViewShell->AlignToCursor( nNewCol, nNewRow, SC_FOLLOW_JUMP );
-        pViewShell->SetCursor( nNewCol, nNewRow, TRUE );
+        pViewShell->SetCursor( nNewCol, nNewRow, sal_True );
         mrViewData.GetView()->MakeEditView( this, nNewCol, nNewRow );
         EditView* pEditView = mrViewData.GetSpellingView();
         // maSelState.GetEditSelection() returns (0,0) if not in edit mode -> ok
@@ -329,7 +329,7 @@ void ScSpellingEngine::ConvertAll( EditView& rEditView )
 {
     EESpellState eState = EE_SPELL_OK;
     if( FindNextConversionCell() )
-        eState = rEditView.StartSpeller( static_cast< BOOL >( TRUE ) );
+        eState = rEditView.StartSpeller( static_cast< sal_Bool >( sal_True ) );
 
     DBG_ASSERT( eState != EE_SPELL_NOSPELLER, "ScSpellingEngine::Convert - no spell checker" );
     if( eState == EE_SPELL_NOLANGUAGE )
@@ -340,7 +340,7 @@ void ScSpellingEngine::ConvertAll( EditView& rEditView )
     }
 }
 
-BOOL ScSpellingEngine::SpellNextDocument()
+sal_Bool ScSpellingEngine::SpellNextDocument()
 {
     return FindNextConversionCell();
 }
@@ -369,7 +369,7 @@ void ScSpellingEngine::ShowFinishDialog()
 
 Window* ScSpellingEngine::GetDialogParent()
 {
-    USHORT nWinId = ScSpellDialogChildWindow::GetChildWindowId();
+    sal_uInt16 nWinId = ScSpellDialogChildWindow::GetChildWindowId();
     SfxViewFrame* pViewFrm = mrViewData.GetViewShell()->GetViewFrame();
     if( pViewFrm->HasChildWindow( nWinId ) )
         if( SfxChildWindow* pChild = pViewFrm->GetChildWindow( nWinId ) )
@@ -438,13 +438,13 @@ void ScTextConversionEngine::ConvertAll( EditView& rEditView )
     {
         rEditView.StartTextConversion(
             maConvParam.GetSourceLang(), maConvParam.GetTargetLang(), maConvParam.GetTargetFont(),
-            maConvParam.GetOptions(), maConvParam.IsInteractive(), TRUE );
+            maConvParam.GetOptions(), maConvParam.IsInteractive(), sal_True );
         // #i34769# restore initial cursor position
         RestoreCursorPos();
     }
 }
 
-BOOL ScTextConversionEngine::ConvertNextDocument()
+sal_Bool ScTextConversionEngine::ConvertNextDocument()
 {
     return FindNextConversionCell();
 }
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 073ab3064..816b49b60 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -61,7 +61,7 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) :
             pViewData( pData ),
             nMouseClickPageId( TabBar::PAGE_NOT_FOUND ),
             nSelPageIdByMouse( TabBar::PAGE_NOT_FOUND ),
-            bErrorShown( FALSE )
+            bErrorShown( sal_False )
 {
     ScDocument* pDoc = pViewData->GetDocument();
 
@@ -100,9 +100,9 @@ ScTabControl::~ScTabControl()
 {
 }
 
-USHORT ScTabControl::GetMaxId() const
+sal_uInt16 ScTabControl::GetMaxId() const
 {
-    USHORT nVisCnt = GetPageCount();
+    sal_uInt16 nVisCnt = GetPageCount();
     if (nVisCnt)
         return GetPageId(nVisCnt-1);
 
@@ -111,7 +111,7 @@ USHORT ScTabControl::GetMaxId() const
 
 SCTAB ScTabControl::GetPrivatDropPos(const Point& rPos )
 {
-    USHORT nPos = ShowDropPos(rPos);
+    sal_uInt16 nPos = ShowDropPos(rPos);
 
     SCTAB nRealPos = static_cast<SCTAB>(nPos);
 
@@ -121,7 +121,7 @@ SCTAB ScTabControl::GetPrivatDropPos(const Point& rPos )
 
         SCTAB nCount = pDoc->GetTableCount();
 
-        USHORT nViewPos=0;
+        sal_uInt16 nViewPos=0;
         nRealPos = nCount;
         for (SCTAB i=0; i<nCount; i++)
         {
@@ -187,7 +187,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
         // Click in the area next to the existing tabs:
         // #i70320# if several sheets are selected, deselect all ecxept the current sheet,
         // otherwise add new sheet
-        USHORT nSlot = ( GetSelectPageCount() > 1 ) ? FID_TAB_DESELECTALL : FID_INS_TABLE;
+        sal_uInt16 nSlot = ( GetSelectPageCount() > 1 ) ? FID_TAB_DESELECTALL : FID_INS_TABLE;
         SfxDispatcher* pDispatcher = pViewData->GetViewShell()->GetViewFrame()->GetDispatcher();
         pDispatcher->Execute( nSlot, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
         // forget page ID, to be really sure that the dialog is not called twice
@@ -223,9 +223,9 @@ void ScTabControl::Select()
         return;
     }
 
-    USHORT nCurId = GetCurPageId();
+    sal_uInt16 nCurId = GetCurPageId();
     if (!nCurId) return;			// kann vorkommen, wenn bei Excel-Import alles versteckt ist
-    USHORT nPage = nCurId - 1;
+    sal_uInt16 nPage = nCurId - 1;
 
     // OLE-inplace deaktivieren
     if ( nPage != static_cast<sal_uInt16>(pViewData->GetTabNo()) )
@@ -233,7 +233,7 @@ void ScTabControl::Select()
 
     //	InputEnterHandler nur wenn nicht Referenzeingabe
 
-    BOOL bRefMode = pScMod->IsFormulaMode();
+    sal_Bool bRefMode = pScMod->IsFormulaMode();
     if (!bRefMode)
         pScMod->InputEnterHandler();
 
@@ -241,7 +241,7 @@ void ScTabControl::Select()
         rMark.SelectTable( i, IsPageSelected(static_cast<sal_uInt16>(i)+1) );
 
 /*		Markierungen werden per Default nicht pro Tabelle gehalten
-    USHORT nSelCnt = GetSelectPageCount();
+    sal_uInt16 nSelCnt = GetSelectPageCount();
     if (nSelCnt>1)
         pDoc->ExtendMarksFromTable( nPage );
 */
@@ -289,7 +289,7 @@ void ScTabControl::UpdateStatus()
 {
     ScDocument* pDoc = pViewData->GetDocument();
     ScMarkData& rMark = pViewData->GetMarkData();
-    BOOL bActive = pViewData->IsActive();
+    sal_Bool bActive = pViewData->IsActive();
 
     SCTAB nCount = pDoc->GetTableCount();
     SCTAB i;
@@ -297,7 +297,7 @@ void ScTabControl::UpdateStatus()
     SCTAB nMaxCnt = Max( nCount, static_cast<SCTAB>(GetMaxId()) );
     Color aTabBgColor;
 
-    BOOL bModified = FALSE;										// Tabellen-Namen
+    sal_Bool bModified = sal_False;										// Tabellen-Namen
     for (i=0; i<nMaxCnt && !bModified; i++)
     {
         if (pDoc->IsVisible(i))
@@ -311,7 +311,7 @@ void ScTabControl::UpdateStatus()
         }
 
         if ( (GetPageText(static_cast<sal_uInt16>(i)+1) != aString) || (GetTabBgColor(static_cast<sal_uInt16>(i)+1) != aTabBgColor) )
-            bModified = TRUE;
+            bModified = sal_True;
     }
 
     if (bModified)
@@ -340,10 +340,10 @@ void ScTabControl::UpdateStatus()
 
     if (bActive)
     {
-        bModified = FALSE;											// Selektion
+        bModified = sal_False;											// Selektion
         for (i=0; i<nMaxCnt && !bModified; i++)
             if ( rMark.GetTableSelect(i) != IsPageSelected(static_cast<sal_uInt16>(i)+1) )
-                bModified = TRUE;
+                bModified = sal_True;
 
         // #i99576# the following loop is mis-optimized on unxsoli4 and the reason
         // why this file is in NOOPTFILES.
@@ -356,7 +356,7 @@ void ScTabControl::UpdateStatus()
     }
 }
 
-void ScTabControl::ActivateView(BOOL bActivate)
+void ScTabControl::ActivateView(sal_Bool bActivate)
 {
 //	ScDocument* pDoc = pViewData->GetDocument();
     ScMarkData& rMark = pViewData->GetMarkData();
@@ -364,29 +364,29 @@ void ScTabControl::ActivateView(BOOL bActivate)
 //	ResetMark direkt in TabView
 //	pDoc->ResetMark();
 
-    USHORT nCurId = GetCurPageId();
+    sal_uInt16 nCurId = GetCurPageId();
     if (!nCurId) return;			// kann vorkommen, wenn bei Excel-Import alles versteckt ist
-    USHORT nPage = nCurId - 1;
-//    USHORT nCount = GetMaxId();
+    sal_uInt16 nPage = nCurId - 1;
+//    sal_uInt16 nCount = GetMaxId();
 
     /*
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<nCount; i++)
     {
-        SelectPage( i+1, FALSE );
+        SelectPage( i+1, sal_False );
         if (bActivate)
-            rMark.SelectTable( i, FALSE );
+            rMark.SelectTable( i, sal_False );
     }
     */
     if (bActivate)
     {
-        SelectPage( nPage+1, TRUE );
-        rMark.SelectTable( static_cast<SCTAB>(nPage), TRUE );
+        SelectPage( nPage+1, sal_True );
+        rMark.SelectTable( static_cast<SCTAB>(nPage), sal_True );
     }
     Invalidate();
 }
 
-void ScTabControl::SetSheetLayoutRTL( BOOL bSheetRTL )
+void ScTabControl::SetSheetLayoutRTL( sal_Bool bSheetRTL )
 {
     SetEffectiveRTL( bSheetRTL );
     nSelPageIdByMouse = TabBar::PAGE_NOT_FOUND;
@@ -397,12 +397,12 @@ void ScTabControl::Command( const CommandEvent& rCEvt )
 {
     ScModule*		pScMod	 = SC_MOD();
     ScTabViewShell* pViewSh  = pViewData->GetViewShell();
-    BOOL 			bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
+    sal_Bool 			bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
 
     // ViewFrame erstmal aktivieren (Bug 19493):
     pViewSh->SetActive();
 
-    USHORT nCmd = rCEvt.GetCommand();
+    sal_uInt16 nCmd = rCEvt.GetCommand();
     if ( nCmd == COMMAND_CONTEXTMENU )
     {
         if (!bDisable)
@@ -410,19 +410,19 @@ void ScTabControl::Command( const CommandEvent& rCEvt )
             // #i18735# select the page that is under the mouse cursor
             // if multiple tables are selected and the one under the cursor
             // is not part of them then unselect them
-            USHORT nId = GetPageId( rCEvt.GetMousePosPixel() );
+            sal_uInt16 nId = GetPageId( rCEvt.GetMousePosPixel() );
             if (nId)
             {
-                BOOL bAlreadySelected = IsPageSelected( nId );
+                sal_Bool bAlreadySelected = IsPageSelected( nId );
                 //make the clicked page the current one
                 SetCurPageId( nId );
                 //change the selection when the current one is not already
                 //selected or part of a multi selection
                 if(!bAlreadySelected)
                 {
-                    USHORT nCount = GetMaxId();
+                    sal_uInt16 nCount = GetMaxId();
 
-                    for (USHORT i=1; i<=nCount; i++)
+                    for (sal_uInt16 i=1; i<=nCount; i++)
                         SelectPage( i, i==nId );
                     Select();
                 }
@@ -441,12 +441,12 @@ void ScTabControl::Command( const CommandEvent& rCEvt )
 void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
 {
     ScModule* pScMod = SC_MOD();
-    BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
+    sal_Bool bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
 
     if (!bDisable)
     {
         Region aRegion( Rectangle(0,0,0,0) );
-        CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, TRUE );	// needed for StartDrag
+        CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, sal_True );	// needed for StartDrag
         if (TabBar::StartDrag( aCEvt, aRegion ))
             DoDrag( aRegion );
     }
@@ -483,9 +483,9 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ )
     pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK );
 }
 
-USHORT lcl_DocShellNr( ScDocument* pDoc )
+sal_uInt16 lcl_DocShellNr( ScDocument* pDoc )
 {
-    USHORT nShellCnt = 0;
+    sal_uInt16 nShellCnt = 0;
     SfxObjectShell* pShell = SfxObjectShell::GetFirst();
     while ( pShell )
     {
@@ -529,7 +529,7 @@ sal_Int8 ScTabControl::ExecuteDrop( const ExecuteDropEvent& rEvt )
                 pViewData->GetView()->MoveTable( lcl_DocShellNr(pDoc), nPos, rEvt.mnAction != DND_ACTION_MOVE );
 
                 rData.pCellTransfer->SetDragWasInternal();          // don't delete
-                return TRUE;
+                return sal_True;
             }
             else
                 Sound::Beep();
@@ -583,12 +583,12 @@ long ScTabControl::AllowRenaming()
     DBG_ASSERT( pViewSh, "pViewData->GetViewShell()" );
 
     long nRet = TABBAR_RENAMING_CANCEL;
-    USHORT nId = GetEditPageId();
+    sal_uInt16 nId = GetEditPageId();
     if ( nId )
     {
         SCTAB nTab = nId - 1;
         String aNewName = GetEditText();
-        BOOL bDone = pViewSh->RenameTable( aNewName, nTab );
+        sal_Bool bDone = pViewSh->RenameTable( aNewName, nTab );
         if ( bDone )
             nRet = TABBAR_RENAMING_YES;
         else if ( bErrorShown )
@@ -607,9 +607,9 @@ long ScTabControl::AllowRenaming()
         }
         else
         {
-            bErrorShown = TRUE;
+            bErrorShown = sal_True;
             pViewSh->ErrorMessage( STR_INVALIDTABNAME );
-            bErrorShown = FALSE;
+            bErrorShown = sal_False;
             nRet = TABBAR_RENAMING_NO;
         }
     }
diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index 657a85c0a..a681c3e87 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -44,8 +44,8 @@ ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pD
     Splitter( pParent, nWinStyle ),
     pViewData(pData)
 {
-    SetFixed(FALSE);
-    EnableRTL( FALSE );
+    SetFixed(sal_False);
+    EnableRTL( sal_False );
 }
 
 
@@ -90,7 +90,7 @@ void __EXPORT ScTabSplitter::Splitting( Point& rSplitPos )
 }
 
 
-void ScTabSplitter::SetFixed(BOOL bSet)
+void ScTabSplitter::SetFixed(sal_Bool bSet)
 {
     bFixed = bSet;
     if (bSet)
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 898c66d20..d186adede 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -220,14 +220,14 @@ using namespace ::com::sun::star;
 
 //	Corner-Button
 
-ScCornerButton::ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditional ) :
+ScCornerButton::ScCornerButton( Window* pParent, ScViewData* pData, sal_Bool bAdditional ) :
     Window( pParent, WinBits( 0 ) ),
     pViewData( pData ),
     bAdd( bAdditional )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     SetBackground( rStyleSettings.GetFaceColor() );
-    EnableRTL( FALSE );
+    EnableRTL( sal_False );
 }
 
 __EXPORT ScCornerButton::~ScCornerButton()
@@ -244,7 +244,7 @@ void __EXPORT ScCornerButton::Paint( const Rectangle& rRect )
 
     Window::Paint(rRect);
 
-    BOOL bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
+    sal_Bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
     long nDarkX = bLayoutRTL ? 0 : nPosX;
 
     if ( !bAdd && !rStyleSettings.GetHighContrastMode() )
@@ -308,42 +308,42 @@ void __EXPORT ScCornerButton::Resize()
 void __EXPORT ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt )
 {
     ScModule* pScMod = SC_MOD();
-    BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
+    sal_Bool bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
     if (!bDisable)
     {
         ScTabViewShell* pViewSh = pViewData->GetViewShell();
         pViewSh->SetActive();									// Appear und SetViewFrame
         pViewSh->ActiveGrabFocus();
 
-        BOOL bControl = rMEvt.IsMod1();
+        sal_Bool bControl = rMEvt.IsMod1();
         pViewSh->SelectAll( bControl );
     }
 }
 
 //==================================================================
 
-BOOL lcl_HasColOutline( const ScViewData& rViewData )
+sal_Bool lcl_HasColOutline( const ScViewData& rViewData )
 {
     const ScOutlineTable* pTable = rViewData.GetDocument()->GetOutlineTable(rViewData.GetTabNo());
     if (pTable)
     {
         const ScOutlineArray* pArray = pTable->GetColArray();
         if ( pArray->GetDepth() > 0 )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL lcl_HasRowOutline( const ScViewData& rViewData )
+sal_Bool lcl_HasRowOutline( const ScViewData& rViewData )
 {
     const ScOutlineTable* pTable = rViewData.GetDocument()->GetOutlineTable(rViewData.GetTabNo());
     if (pTable)
     {
         const ScOutlineArray* pArray = pTable->GetRowArray();
         if ( pArray->GetDepth() > 0 )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //==================================================================
@@ -358,34 +358,34 @@ BOOL lcl_HasRowOutline( const ScViewData& rViewData )
             pHdrSelEng( NULL ),												\
             aHdrFunc( &aViewData ),											\
             pDrawView( NULL ),												\
-            bDrawSelMode( FALSE ),											\
+            bDrawSelMode( sal_False ),											\
             aVScrollTop( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ),		\
             aVScrollBottom( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ),	\
             aHScrollLeft( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ),		\
             aHScrollRight( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ),	\
-            aCornerButton( pFrameWin, &aViewData, FALSE ),					\
-            aTopButton( pFrameWin, &aViewData, TRUE ),						\
+            aCornerButton( pFrameWin, &aViewData, sal_False ),					\
+            aTopButton( pFrameWin, &aViewData, sal_True ),						\
             aScrollBarBox( pFrameWin, WB_SIZEABLE ),						\
             pInputHintWindow( NULL ),										\
             pPageBreakData( NULL ),											\
             pHighlightRanges( NULL ),										\
             pBrushDocument( NULL ),                                         \
             pDrawBrushSet( NULL ),                                          \
-            bLockPaintBrush( FALSE ),                                       \
+            bLockPaintBrush( sal_False ),                                       \
             pTimerWindow( NULL ),											\
             nTipVisible( 0 ),												\
-            bDragging( FALSE ),												\
-            bIsBlockMode( FALSE ),											\
-            bBlockNeg( FALSE ),												\
-            bBlockCols( FALSE ),											\
-            bBlockRows( FALSE ),											\
+            bDragging( sal_False ),												\
+            bIsBlockMode( sal_False ),											\
+            bBlockNeg( sal_False ),												\
+            bBlockCols( sal_False ),											\
+            bBlockRows( sal_False ),											\
             mfPendingTabBarWidth( -1.0 ),                                   \
-            bMinimized( FALSE ),											\
-            bInUpdateHeader( FALSE ),										\
-            bInActivatePart( FALSE ),										\
-            bInZoomUpdate( FALSE ),											\
-            bMoveIsShift( FALSE ),											\
-            bNewStartIfMarking( FALSE )
+            bMinimized( sal_False ),											\
+            bInUpdateHeader( sal_False ),										\
+            bInActivatePart( sal_False ),										\
+            bInZoomUpdate( sal_False ),											\
+            bMoveIsShift( sal_False ),											\
+            bNewStartIfMarking( sal_False )
 
 
 ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) :
@@ -453,7 +453,7 @@ IMPL_LINK( ScTabView, TimerHdl, Timer*, EMPTYARG )
 // --- Resize ---------------------------------------------------------------------
 
 void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize,
-                        long nTotalWidth, BOOL bLayoutRTL )
+                        long nTotalWidth, sal_Bool bLayoutRTL )
 {
     Point aNewPos = rPos;
     if ( bLayoutRTL )
@@ -469,36 +469,36 @@ void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize,
     rWindow.SetPosSizePixel( aNewPos, rSize );
 }
 
-void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
+void ScTabView::DoResize( const Point& rOffset, const Size& rSize, sal_Bool bInner )
 {
     HideListBox();
 
-    BOOL bHasHint = ( pInputHintWindow != NULL );
+    sal_Bool bHasHint = ( pInputHintWindow != NULL );
     if (bHasHint)
         RemoveHintWindow();
 
-    BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
+    sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
     long nTotalWidth = rSize.Width();
     if ( bLayoutRTL )
         nTotalWidth += 2*rOffset.X();
 
-    BOOL bVScroll	 = aViewData.IsVScrollMode();
-    BOOL bHScroll	 = aViewData.IsHScrollMode();
-    BOOL bTabControl = aViewData.IsTabMode();
-    BOOL bHeaders	 = aViewData.IsHeaderMode();
-    BOOL bOutlMode	 = aViewData.IsOutlineMode();
-    BOOL bHOutline	 = bOutlMode && lcl_HasColOutline(aViewData);
-    BOOL bVOutline	 = bOutlMode && lcl_HasRowOutline(aViewData);
+    sal_Bool bVScroll	 = aViewData.IsVScrollMode();
+    sal_Bool bHScroll	 = aViewData.IsHScrollMode();
+    sal_Bool bTabControl = aViewData.IsTabMode();
+    sal_Bool bHeaders	 = aViewData.IsHeaderMode();
+    sal_Bool bOutlMode	 = aViewData.IsOutlineMode();
+    sal_Bool bHOutline	 = bOutlMode && lcl_HasColOutline(aViewData);
+    sal_Bool bVOutline	 = bOutlMode && lcl_HasRowOutline(aViewData);
 
     //	Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
     SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
     if ( eMode == SCROLLING_NO )
-        bHScroll = bVScroll = FALSE;
+        bHScroll = bVScroll = sal_False;
     else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO )	//! Auto ???
-        bHScroll = bVScroll = TRUE;
+        bHScroll = bVScroll = sal_True;
 
     if ( aViewData.GetDocShell()->IsPreview() )
-        bHScroll = bVScroll = bTabControl = bHeaders = bOutlMode = bHOutline = bVOutline = FALSE;
+        bHScroll = bVScroll = bTabControl = bHeaders = bOutlMode = bHOutline = bVOutline = sal_False;
 
     long nBarX = 0;
     long nBarY = 0;
@@ -895,40 +895,40 @@ void ScTabView::UpdateVarZoom()
     SvxZoomType eZoomType = GetZoomType();
     if ( eZoomType != SVX_ZOOM_PERCENT && !bInZoomUpdate )
     {
-        bInZoomUpdate = TRUE;
+        bInZoomUpdate = sal_True;
         const Fraction& rOldX = GetViewData()->GetZoomX();
         const Fraction& rOldY = GetViewData()->GetZoomY();
         long nOldPercent = ( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator();
-        USHORT nNewZoom = CalcZoom( eZoomType, (USHORT)nOldPercent );
+        sal_uInt16 nNewZoom = CalcZoom( eZoomType, (sal_uInt16)nOldPercent );
         Fraction aNew( nNewZoom, 100 );
 
         if ( aNew != rOldX || aNew != rOldY )
         {
-            SetZoom( aNew, aNew, FALSE );   // always separately per sheet
+            SetZoom( aNew, aNew, sal_False );   // always separately per sheet
             PaintGrid();
             PaintTop();
             PaintLeft();
             aViewData.GetViewShell()->GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
             aViewData.GetViewShell()->GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER );
         }
-        bInZoomUpdate = FALSE;
+        bInZoomUpdate = sal_False;
     }
 }
 
 void ScTabView::UpdateFixPos()
 {
-    BOOL bResize = FALSE;
+    sal_Bool bResize = sal_False;
     if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX )
         if (aViewData.UpdateFixX())
-            bResize = TRUE;
+            bResize = sal_True;
     if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX )
         if (aViewData.UpdateFixY())
-            bResize = TRUE;
+            bResize = sal_True;
     if (bResize)
-        RepeatResize(FALSE);
+        RepeatResize(sal_False);
 }
 
-void ScTabView::RepeatResize( BOOL bUpdateFix )
+void ScTabView::RepeatResize( sal_Bool bUpdateFix )
 {
     if ( bUpdateFix )
     {
@@ -954,12 +954,12 @@ void ScTabView::RepeatResize( BOOL bUpdateFix )
 
 void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ )
 {
-    BOOL bScrollBars = aViewData.IsVScrollMode();
-    BOOL bHeaders	 = aViewData.IsHeaderMode();
-    BOOL bOutlMode	 = aViewData.IsOutlineMode();
-    BOOL bHOutline	 = bOutlMode && lcl_HasColOutline(aViewData);
-    BOOL bVOutline	 = bOutlMode && lcl_HasRowOutline(aViewData);
-    BOOL bLayoutRTL  = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
+    sal_Bool bScrollBars = aViewData.IsVScrollMode();
+    sal_Bool bHeaders	 = aViewData.IsHeaderMode();
+    sal_Bool bOutlMode	 = aViewData.IsOutlineMode();
+    sal_Bool bHOutline	 = bOutlMode && lcl_HasColOutline(aViewData);
+    sal_Bool bVOutline	 = bOutlMode && lcl_HasRowOutline(aViewData);
+    sal_Bool bLayoutRTL  = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
 
     rBorder = SvBorder();
 
@@ -987,14 +987,14 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ )
 
 IMPL_LINK( ScTabView, TabBarResize, void*, EMPTYARG )
 {
-    BOOL bHScrollMode = aViewData.IsHScrollMode();
+    sal_Bool bHScrollMode = aViewData.IsHScrollMode();
 
     //	Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
     SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
     if ( eMode == SCROLLING_NO )
-        bHScrollMode = FALSE;
+        bHScrollMode = sal_False;
     else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO )	//! Auto ???
-        bHScrollMode = TRUE;
+        bHScrollMode = sal_True;
 
     if( bHScrollMode )
     {
@@ -1076,7 +1076,7 @@ Window* ScTabView::GetWindowByPos( ScSplitPos ePos )
 
 void ScTabView::SetActivePointer( const Pointer& rPointer )
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pGridWin[i])
             pGridWin[i]->SetPointer( rPointer );
 
@@ -1124,7 +1124,7 @@ void ScTabView::ActiveGrabFocus()
 ScSplitPos ScTabView::FindWindow( Window* pWindow ) const
 {
     ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT;		// Default
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if ( pGridWin[i] == pWindow )
             eVal = (ScSplitPos) i;
 
@@ -1137,10 +1137,10 @@ Point ScTabView::GetGridOffset() const
 
         // Groessen hier wie in DoResize
 
-    BOOL bHeaders	 = aViewData.IsHeaderMode();
-    BOOL bOutlMode	 = aViewData.IsOutlineMode();
-    BOOL bHOutline	 = bOutlMode && lcl_HasColOutline(aViewData);
-    BOOL bVOutline	 = bOutlMode && lcl_HasRowOutline(aViewData);
+    sal_Bool bHeaders	 = aViewData.IsHeaderMode();
+    sal_Bool bOutlMode	 = aViewData.IsOutlineMode();
+    sal_Bool bHOutline	 = bOutlMode && lcl_HasColOutline(aViewData);
+    sal_Bool bVOutline	 = bOutlMode && lcl_HasRowOutline(aViewData);
 
     // Outline-Controls
     if (bVOutline && pRowOutline[SC_SPLIT_BOTTOM])
@@ -1161,11 +1161,11 @@ Point ScTabView::GetGridOffset() const
 
 // ---  Scroll-Bars  --------------------------------------------------------
 
-BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
+sal_Bool ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
 {
     HideNoteMarker();
 
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     const CommandWheelData* pData = rCEvt.GetWheelData();
     if ( pData && pData->GetMode() == COMMAND_WHEEL_ZOOM )
     {
@@ -1186,7 +1186,7 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
             {
                 // scroll wheel doesn't set the AppOptions default
 
-                BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
+                sal_Bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
                 SetZoomType( SVX_ZOOM_PERCENT, bSyncZoom );
                 Fraction aFract( nNew, 100 );
                 SetZoom( aFract, aFract, bSyncZoom );
@@ -1197,7 +1197,7 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
                 aViewData.GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER );
             }
 
-            bDone = TRUE;
+            bDone = sal_True;
         }
     }
     else
@@ -1214,7 +1214,7 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
 
 IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll )
 {
-    BOOL bOnlineScroll = TRUE;		//! Optionen
+    sal_Bool bOnlineScroll = sal_True;		//! Optionen
 
     if ( bDragging )
     {
@@ -1230,7 +1230,7 @@ IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll )
 
             if ( pScroll == &aHScrollLeft || pScroll == &aHScrollRight )
             {
-                BOOL bMirror = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ) != Application::GetSettings().GetLayoutRTL();
+                sal_Bool bMirror = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ) != Application::GetSettings().GetLayoutRTL();
                 ScHSplitPos eWhich = (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT;
                 long nDelta = GetScrollBarPos( *pScroll, bMirror ) + nScrollMin - aViewData.GetPosX(eWhich);
                 if (nDelta)	ScrollX( nDelta, eWhich );
@@ -1238,20 +1238,20 @@ IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll )
             else							// VScroll...
             {
                 ScVSplitPos eWhich = (pScroll == &aVScrollTop) ? SC_SPLIT_TOP : SC_SPLIT_BOTTOM;
-                long nDelta = GetScrollBarPos( *pScroll, FALSE ) + nScrollMin - aViewData.GetPosY(eWhich);
+                long nDelta = GetScrollBarPos( *pScroll, sal_False ) + nScrollMin - aViewData.GetPosY(eWhich);
                 if (nDelta) ScrollY( nDelta, eWhich );
             }
         }
-        bDragging = FALSE;
+        bDragging = sal_False;
     }
     return 0;
 }
 
 IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
 {
-    BOOL bOnlineScroll = TRUE;		//! Optionen
+    sal_Bool bOnlineScroll = sal_True;		//! Optionen
 
-    BOOL bHoriz = ( pScroll == &aHScrollLeft || pScroll == &aHScrollRight );
+    sal_Bool bHoriz = ( pScroll == &aHScrollLeft || pScroll == &aHScrollRight );
     long nViewPos;
     if ( bHoriz )
         nViewPos = aViewData.GetPosX( (pScroll == &aHScrollLeft) ?
@@ -1260,15 +1260,15 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
         nViewPos = aViewData.GetPosY( (pScroll == &aVScrollTop) ?
                                         SC_SPLIT_TOP : SC_SPLIT_BOTTOM );
 
-    BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
-    BOOL bMirror = bHoriz && (bLayoutRTL != Application::GetSettings().GetLayoutRTL());
+    sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
+    sal_Bool bMirror = bHoriz && (bLayoutRTL != Application::GetSettings().GetLayoutRTL());
 
     ScrollType eType = pScroll->GetType();
     if ( eType == SCROLL_DRAG )
     {
         if (!bDragging)
         {
-            bDragging = TRUE;
+            bDragging = sal_True;
             nPrevDragPos = nViewPos;
         }
 
@@ -1303,7 +1303,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
 
             String aHelpStr;
             Rectangle aRect;
-            USHORT nAlign;
+            sal_uInt16 nAlign;
             if (bHoriz)
             {
                 aHelpStr = ScGlobal::GetRscString(STR_COLUMN);
@@ -1406,7 +1406,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
 
         if (nDelta)
         {
-            BOOL bUpdate = ( eType != SCROLL_DRAG );	// bei Drag die Ranges nicht aendern
+            sal_Bool bUpdate = ( eType != SCROLL_DRAG );	// bei Drag die Ranges nicht aendern
             if ( bHoriz )
                 ScrollX( nDelta, (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT, bUpdate );
             else
@@ -1417,9 +1417,9 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
     return 0;
 }
 
-void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
+void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, sal_Bool bUpdBars )
 {
-    BOOL bHasHint = ( pInputHintWindow != NULL );
+    sal_Bool bHasHint = ( pInputHintWindow != NULL );
     if (bHasHint)
         RemoveHintWindow();
 
@@ -1506,9 +1506,9 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
         TestHintWindow();		// neu positionieren
 }
 
-void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
+void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, sal_Bool bUpdBars )
 {
-    BOOL bHasHint = ( pInputHintWindow != NULL );
+    sal_Bool bHasHint = ( pInputHintWindow != NULL );
     if (bHasHint)
         RemoveHintWindow();
 
@@ -1666,7 +1666,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY
 
     if ( nWidth != pRowBar[SC_SPLIT_BOTTOM]->GetWidth() && !bInUpdateHeader )
     {
-        bInUpdateHeader = TRUE;
+        bInUpdateHeader = sal_True;
 
         pRowBar[SC_SPLIT_BOTTOM]->SetWidth( nWidth );
         if (pRowBar[SC_SPLIT_TOP])
@@ -1677,11 +1677,11 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY
         // auf VCL gibt's Update ohne Ende (jedes Update gilt fuer alle Fenster)
         //aCornerButton.Update();		// der bekommt sonst nie ein Update
 
-        bInUpdateHeader = FALSE;
+        bInUpdateHeader = sal_False;
     }
 }
 
-inline void ShowHide( Window* pWin, BOOL bShow )
+inline void ShowHide( Window* pWin, sal_Bool bShow )
 {
     DBG_ASSERT(pWin || !bShow, "Fenster ist nicht da");
     if (pWin)
@@ -1690,26 +1690,26 @@ inline void ShowHide( Window* pWin, BOOL bShow )
 
 void ScTabView::UpdateShow()
 {
-    BOOL bHScrollMode = aViewData.IsHScrollMode();
-    BOOL bVScrollMode = aViewData.IsVScrollMode();
-    BOOL bTabMode	  = aViewData.IsTabMode();
-    BOOL bOutlMode	  = aViewData.IsOutlineMode();
-    BOOL bHOutline	  = bOutlMode && lcl_HasColOutline(aViewData);
-    BOOL bVOutline	  = bOutlMode && lcl_HasRowOutline(aViewData);
-    BOOL bHeader	  = aViewData.IsHeaderMode();
+    sal_Bool bHScrollMode = aViewData.IsHScrollMode();
+    sal_Bool bVScrollMode = aViewData.IsVScrollMode();
+    sal_Bool bTabMode	  = aViewData.IsTabMode();
+    sal_Bool bOutlMode	  = aViewData.IsOutlineMode();
+    sal_Bool bHOutline	  = bOutlMode && lcl_HasColOutline(aViewData);
+    sal_Bool bVOutline	  = bOutlMode && lcl_HasRowOutline(aViewData);
+    sal_Bool bHeader	  = aViewData.IsHeaderMode();
 
-    BOOL bShowH = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE );
-    BOOL bShowV = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE );
+    sal_Bool bShowH = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE );
+    sal_Bool bShowV = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE );
 
     //	Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
     SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
     if ( eMode == SCROLLING_NO )
-        bHScrollMode = bVScrollMode = FALSE;
+        bHScrollMode = bVScrollMode = sal_False;
     else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO )	//! Auto ???
-        bHScrollMode = bVScrollMode = TRUE;
+        bHScrollMode = bVScrollMode = sal_True;
 
     if ( aViewData.GetDocShell()->IsPreview() )
-        bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = FALSE;
+        bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = sal_False;
 
         //
         //	Windows anlegen
@@ -1791,7 +1791,7 @@ IMPL_LINK( ScTabView, SplitHdl, Splitter*, pSplitter )
         DoVSplit( pVSplitter->GetSplitPosPixel() );
 
     if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX )
-        FreezeSplitters( TRUE );
+        FreezeSplitters( sal_True );
 
     DoResize( aBorderPos, aFrameSize );
 
@@ -1803,7 +1803,7 @@ void ScTabView::DoHSplit(long nSplitPos)
     //	nSplitPos is the real pixel position on the frame window,
     //	mirroring for RTL has to be done here.
 
-    BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
+    sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
     if ( bLayoutRTL )
         nSplitPos = pFrameWin->GetOutputSizePixel().Width() - nSplitPos - 1;
 
@@ -1844,7 +1844,7 @@ void ScTabView::DoHSplit(long nSplitPos)
             long nLeftWidth = nSplitPos - pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width();
             if ( nLeftWidth < 0 ) nLeftWidth = 0;
             nNewDelta = nOldDelta + aViewData.CellsAtX( nOldDelta, 1, SC_SPLIT_LEFT,
-                            (USHORT) nLeftWidth );
+                            (sal_uInt16) nLeftWidth );
             if ( nNewDelta > MAXCOL )
                 nNewDelta = MAXCOL;
             aViewData.SetPosX( SC_SPLIT_RIGHT, nNewDelta );
@@ -1858,7 +1858,7 @@ void ScTabView::DoHSplit(long nSplitPos)
 
         //	#61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
         //	dafuer muss hier schon der MapMode stimmen
-        for (USHORT i=0; i<4; i++)
+        for (sal_uInt16 i=0; i<4; i++)
             if (pGridWin[i])
                 pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() );
         SetNewVisArea();
@@ -1916,7 +1916,7 @@ void ScTabView::DoVSplit(long nSplitPos)
             long nTopHeight = nSplitPos - pColBar[SC_SPLIT_LEFT]->GetSizePixel().Height();
             if ( nTopHeight < 0 ) nTopHeight = 0;
             nNewDelta = nOldDelta + aViewData.CellsAtY( nOldDelta, 1, SC_SPLIT_TOP,
-                            (USHORT) nTopHeight );
+                            (sal_uInt16) nTopHeight );
             if ( nNewDelta > MAXROW )
                 nNewDelta = MAXROW;
             aViewData.SetPosY( SC_SPLIT_BOTTOM, nNewDelta );
@@ -1930,7 +1930,7 @@ void ScTabView::DoVSplit(long nSplitPos)
 
         //	#61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
         //	dafuer muss hier schon der MapMode stimmen
-        for (USHORT i=0; i<4; i++)
+        for (sal_uInt16 i=0; i<4; i++)
             if (pGridWin[i])
                 pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() );
         SetNewVisArea();
@@ -1986,7 +1986,7 @@ Point ScTabView::GetChartInsertPos( const Size& rSize, const ScRange& rCellRange
 
         ScDocument* pDoc = aViewData.GetDocument();
         SCTAB nTab = aViewData.GetTabNo();
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
         long nLayoutSign = bLayoutRTL ? -1 : 1;
 
         long nDocX = (long)( (double) pDoc->GetColOffset( MAXCOL + 1, nTab ) * HMM_PER_TWIPS ) * nLayoutSign;
@@ -2104,7 +2104,7 @@ Point ScTabView::GetChartDialogPos( const Size& rDialogSize, const Rectangle& rL
 
         ScDocument* pDoc = aViewData.GetDocument();
         SCTAB nTab = aViewData.GetTabNo();
-        BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+        sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
         bool bCenterHor = false;
 
@@ -2163,13 +2163,13 @@ Point ScTabView::GetChartDialogPos( const Size& rDialogSize, const Rectangle& rL
     return aRet;
 }
 
-void ScTabView::LockModifiers( USHORT nModifiers )
+void ScTabView::LockModifiers( sal_uInt16 nModifiers )
 {
     pSelEngine->LockModifiers( nModifiers );
     pHdrSelEng->LockModifiers( nModifiers );
 }
 
-USHORT ScTabView::GetLockedModifiers() const
+sal_uInt16 ScTabView::GetLockedModifiers() const
 {
     return pSelEngine->GetLockedModifiers();
 }
@@ -2185,7 +2185,7 @@ Point ScTabView::GetMousePosPixel()
     return aPos;
 }
 
-BOOL lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin )
+sal_Bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin )
 {
     if (pWin)
     {
@@ -2196,18 +2196,18 @@ BOOL lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin )
         Size aWinSize = pWin->GetOutputSizePixel();
         if ( aRel.X() >= 0 && aRel.X() < aWinSize.Width() + SPLIT_HANDLE_SIZE &&
                 aRel.Y() >= 0 && aRel.Y() < aWinSize.Height() + SPLIT_HANDLE_SIZE )
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 void ScTabView::SnapSplitPos( Point& rScreenPosPixel )
 {
-    BOOL bOverWin = FALSE;
-    USHORT i;
+    sal_Bool bOverWin = sal_False;
+    sal_uInt16 i;
     for (i=0; i<4; i++)
         if (lcl_MouseIsOverWin(rScreenPosPixel,pGridWin[i]))
-            bOverWin = TRUE;
+            bOverWin = sal_True;
 
     if (!bOverWin)
         return;
@@ -2231,19 +2231,19 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel )
     SCsCOL nPosX;
     SCsROW nPosY;
     //	#52949# bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters
-    aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY, TRUE, FALSE, FALSE );
-    BOOL bLeft;
-    BOOL bTop;
+    aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY, sal_True, sal_False, sal_False );
+    sal_Bool bLeft;
+    sal_Bool bTop;
     aViewData.GetMouseQuadrant( aMouse, ePos, nPosX, nPosY, bLeft, bTop );
     if (!bLeft)
         ++nPosX;
     if (!bTop)
         ++nPosY;
-    aMouse = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, TRUE );
+    aMouse = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, sal_True );
     rScreenPosPixel = pWin->OutputToNormalizedScreenPixel( aMouse );
 }
 
-void ScTabView::FreezeSplitters( BOOL bFreeze )
+void ScTabView::FreezeSplitters( sal_Bool bFreeze )
 {
     ScSplitMode eOldH = aViewData.GetHSplitMode();
     ScSplitMode eOldV = aViewData.GetVSplitMode();
@@ -2253,7 +2253,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze )
         ePos = SC_SPLIT_TOPLEFT;
     Window* pWin = pGridWin[ePos];
 
-    BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
+    sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
 
     if ( bFreeze )
     {
@@ -2275,8 +2275,8 @@ void ScTabView::FreezeSplitters( BOOL bFreeze )
                 aSplit.Y() = aViewData.GetVSplitPos() - aWinStart.Y();
 
             aViewData.GetPosFromPixel( aSplit.X(), aSplit.Y(), ePos, nPosX, nPosY );
-            BOOL bLeft;
-            BOOL bTop;
+            sal_Bool bLeft;
+            sal_Bool bTop;
             aViewData.GetMouseQuadrant( aSplit, ePos, nPosX, nPosY, bLeft, bTop );
             if (!bLeft)
                 ++nPosX;
@@ -2303,7 +2303,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze )
                 nBottomPos = aViewData.GetPosY(SC_SPLIT_BOTTOM);
         }
 
-        aSplit = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, TRUE );
+        aSplit = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, sal_True );
         if (nPosX > aViewData.GetPosX(SC_SPLIT_LEFT))		// (aSplit.X() > 0) doesn't work for RTL
         {
             long nSplitPos = aSplit.X() + aWinStart.X();
@@ -2341,12 +2341,12 @@ void ScTabView::FreezeSplitters( BOOL bFreeze )
 
     //	#61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
     //	dafuer muss hier schon der MapMode stimmen
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pGridWin[i])
             pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() );
     SetNewVisArea();
 
-    RepeatResize(FALSE);
+    RepeatResize(sal_False);
 
     UpdateShow();
     PaintLeft();
@@ -2377,7 +2377,7 @@ void ScTabView::SplitAtCursor()
 
     SCCOL nPosX = aViewData.GetCurX();
     SCROW nPosY = aViewData.GetCurY();
-    Point aSplit = aViewData.GetScrPos( nPosX, nPosY, ePos, TRUE );
+    Point aSplit = aViewData.GetScrPos( nPosX, nPosY, ePos, sal_True );
     if ( nPosX > 0 )
         DoHSplit( aSplit.X() + aWinStart.X() );
     else
@@ -2389,7 +2389,7 @@ void ScTabView::SplitAtCursor()
     RepeatResize();
 }
 
-void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer )		// fuer API
+void ScTabView::SplitAtPixel( const Point& rPixel, sal_Bool bHor, sal_Bool bVer )		// fuer API
 {
     //	Pixel ist auf die ganze View bezogen, nicht auf das erste GridWin
 
@@ -2426,7 +2426,7 @@ void ScTabView::SetNewVisArea()
     //	(auch wenn ansonsten der Edit-MapMode gesetzt ist)
     MapMode aOldMode[4];
     MapMode aDrawMode[4];
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<4; i++)
         if (pGridWin[i])
         {
@@ -2501,11 +2501,11 @@ void ScTabView::StartDataSelect()
             pWin->LaunchDPFieldMenu( nCol, nRow );
         break;
         default:
-            pWin->DoAutoFilterMenue( nCol, nRow, TRUE );
+            pWin->DoAutoFilterMenue( nCol, nRow, sal_True );
     }
 }
 
-void ScTabView::EnableRefInput(BOOL bFlag)
+void ScTabView::EnableRefInput(sal_Bool bFlag)
 {
     aHScrollLeft.EnableInput(bFlag);
     aHScrollRight.EnableInput(bFlag);
@@ -2515,20 +2515,20 @@ void ScTabView::EnableRefInput(BOOL bFlag)
 
     // ab hier dynamisch angelegte
 
-    if(pTabControl!=NULL) pTabControl->EnableInput(bFlag,TRUE);
+    if(pTabControl!=NULL) pTabControl->EnableInput(bFlag,sal_True);
 
     if(pGridWin[SC_SPLIT_BOTTOMLEFT]!=NULL)
-        pGridWin[SC_SPLIT_BOTTOMLEFT]->EnableInput(bFlag,FALSE);
+        pGridWin[SC_SPLIT_BOTTOMLEFT]->EnableInput(bFlag,sal_False);
     if(pGridWin[SC_SPLIT_BOTTOMRIGHT]!=NULL)
-        pGridWin[SC_SPLIT_BOTTOMRIGHT]->EnableInput(bFlag,FALSE);
+        pGridWin[SC_SPLIT_BOTTOMRIGHT]->EnableInput(bFlag,sal_False);
     if(pGridWin[SC_SPLIT_TOPLEFT]!=NULL)
-        pGridWin[SC_SPLIT_TOPLEFT]->EnableInput(bFlag,FALSE);
+        pGridWin[SC_SPLIT_TOPLEFT]->EnableInput(bFlag,sal_False);
     if(pGridWin[SC_SPLIT_TOPRIGHT]!=NULL)
-        pGridWin[SC_SPLIT_TOPRIGHT]->EnableInput(bFlag,FALSE);
+        pGridWin[SC_SPLIT_TOPRIGHT]->EnableInput(bFlag,sal_False);
     if(pColBar[SC_SPLIT_RIGHT]!=NULL)
-        pColBar[SC_SPLIT_RIGHT]->EnableInput(bFlag,FALSE);
+        pColBar[SC_SPLIT_RIGHT]->EnableInput(bFlag,sal_False);
     if(pRowBar[SC_SPLIT_TOP]!=NULL)
-        pRowBar[SC_SPLIT_TOP]->EnableInput(bFlag,FALSE);
+        pRowBar[SC_SPLIT_TOP]->EnableInput(bFlag,sal_False);
 }
 
 
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 27c0f7d75..c6475c8dc 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -77,8 +77,8 @@ void ScTabView::PaintMarks(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
     if (!ValidCol(nEndCol)) nEndCol = MAXCOL;
     if (!ValidRow(nEndRow)) nEndRow = MAXROW;
 
-    BOOL bLeft = (nStartCol==0 && nEndCol==MAXCOL);
-    BOOL bTop = (nStartRow==0 && nEndRow==MAXROW);
+    sal_Bool bLeft = (nStartCol==0 && nEndCol==MAXCOL);
+    sal_Bool bTop = (nStartRow==0 && nEndRow==MAXROW);
 
     if (bLeft)
         PaintLeftArea( nStartRow, nEndRow );
@@ -90,7 +90,7 @@ void ScTabView::PaintMarks(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
     PaintArea( nStartCol, nStartRow, nEndCol, nEndRow, SC_UPDATE_MARKS );
 }
 
-BOOL ScTabView::IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+sal_Bool ScTabView::IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
 {
     return bIsBlockMode
         && nBlockStartX == nCol
@@ -106,9 +106,9 @@ void ScTabView::InitOwnBlockMode()
 
         ScMarkData& rMark = aViewData.GetMarkData();
         if (!rMark.IsMarked() && !rMark.IsMultiMarked())
-            GetSelEngine()->CursorPosChanging( FALSE, FALSE );
+            GetSelEngine()->CursorPosChanging( sal_False, sal_False );
 
-//		bIsBlockMode = TRUE;
+//		bIsBlockMode = sal_True;
         bIsBlockMode = SC_BLOCKMODE_OWN;			//! Variable umbenennen!
         nBlockStartX = 0;
         nBlockStartY = 0;
@@ -122,7 +122,7 @@ void ScTabView::InitOwnBlockMode()
 }
 
 void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-                                BOOL bTestNeg, BOOL bCols, BOOL bRows )
+                                sal_Bool bTestNeg, sal_Bool bCols, sal_Bool bRows )
 {
     if (!bIsBlockMode)
     {
@@ -143,10 +143,10 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
                 bBlockNeg = rMark.IsCellMarked( nCurX, nCurY );
         }
         else
-            bBlockNeg = FALSE;
+            bBlockNeg = sal_False;
         rMark.SetMarkNegative(bBlockNeg);
 
-//		bIsBlockMode = TRUE;
+//		bIsBlockMode = sal_True;
         bIsBlockMode = SC_BLOCKMODE_NORMAL;			//! Variable umbenennen!
         bBlockCols = bCols;
         bBlockRows = bRows;
@@ -176,16 +176,16 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
 #endif
         UpdateSelectionOverlay();
 
-        bNewStartIfMarking = FALSE;		// use only once
+        bNewStartIfMarking = sal_False;		// use only once
     }
 }
 
 void ScTabView::SetNewStartIfMarking()
 {
-    bNewStartIfMarking = TRUE;
+    bNewStartIfMarking = sal_True;
 }
 
-void ScTabView::DoneBlockMode( BOOL bContinue )            // Default FALSE
+void ScTabView::DoneBlockMode( sal_Bool bContinue )            // Default FALSE
 {
     //	Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird,
     //	wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat.
@@ -194,8 +194,8 @@ void ScTabView::DoneBlockMode( BOOL bContinue )            // Default FALSE
     if (bIsBlockMode && !bMoveIsShift)
     {
         ScMarkData& rMark = aViewData.GetMarkData();
-        BOOL bFlag = rMark.GetMarkingFlag();
-        rMark.SetMarking(FALSE);
+        sal_Bool bFlag = rMark.GetMarkingFlag();
+        rMark.SetMarking(sal_False);
 
         if (bBlockNeg && !bContinue)
             rMark.MarkToMulti();
@@ -211,20 +211,20 @@ void ScTabView::DoneBlockMode( BOOL bContinue )            // Default FALSE
             SCTAB nTab = aViewData.GetTabNo();
             ScDocument* pDoc = aViewData.GetDocument();
             if ( pDoc->HasTable(nTab) )
-                PaintBlock( TRUE );								// TRUE -> Block loeschen
+                PaintBlock( sal_True );								// sal_True -> Block loeschen
             else
                 rMark.ResetMark();
         }
-//		bIsBlockMode = FALSE;
+//		bIsBlockMode = sal_False;
         bIsBlockMode = SC_BLOCKMODE_NONE;			//! Variable umbenennen!
 
         rMark.SetMarking(bFlag);
-        rMark.SetMarkNegative(FALSE);
+        rMark.SetMarkNegative(sal_False);
     }
 }
 
 void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
-                            BOOL bCols, BOOL bRows, BOOL bCellSelection )
+                            sal_Bool bCols, sal_Bool bRows, sal_Bool bCellSelection )
 {
     if (!ValidCol(nCurX)) nCurX = MAXCOL;
     if (!ValidRow(nCurY)) nCurY = MAXROW;
@@ -232,7 +232,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
     if (!bIsBlockMode)
     {
         DBG_ERROR( "MarkCursor nicht im BlockMode" );
-        InitBlockMode( nCurX, nCurY, nCurZ, FALSE, bCols, bRows );
+        InitBlockMode( nCurX, nCurY, nCurZ, sal_False, bCols, bRows );
     }
 
     if (bCols)
@@ -252,9 +252,9 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
         //	(z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde)
         //	oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert...
 
-        BOOL bOldShift = bMoveIsShift;
-        bMoveIsShift = FALSE;				//	wirklich umsetzen
-        DoneBlockMode(FALSE);				//!	direkt Variablen setzen? (-> kein Geflacker)
+        sal_Bool bOldShift = bMoveIsShift;
+        bMoveIsShift = sal_False;				//	wirklich umsetzen
+        DoneBlockMode(sal_False);				//!	direkt Variablen setzen? (-> kein Geflacker)
         bMoveIsShift = bOldShift;
 
         InitBlockMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
@@ -288,7 +288,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
             SCsCOL nBlockStartXOffset = 0;
             SCsROW nCurYOffset = 0;
             SCsROW nBlockStartYOffset = 0;
-            BOOL bBlockStartMerged = FALSE;
+            sal_Bool bBlockStartMerged = sal_False;
             const ScMergeAttr* pMergeAttr = NULL;
             ScDocument* pDocument = aViewData.GetDocument();
 
@@ -314,7 +314,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
                         nBlockStartXOrig - nCurX + nColSpan - 1 : 0;
                     nCurYOffset  = nCurY >= nBlockStartYOrig && nCurY < nBlockStartYOrig + nRowSpan - 1 ?
                         nBlockStartYOrig - nCurY + nRowSpan - 1 : 0;
-                    bBlockStartMerged = TRUE;
+                    bBlockStartMerged = sal_True;
                 }
             }
 
@@ -380,8 +380,8 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
         rMark.SetMarkArea( ScRange( nBlockStartX, nBlockStartY, nTab, nBlockEndX, nBlockEndY, nTab ) );
 
 #ifdef OLD_SELECTION_PAINT
-        BOOL bCont;
-        BOOL bDraw = aRect.GetXorDiff( nDrawStartCol, nDrawStartRow,
+        sal_Bool bCont;
+        sal_Bool bDraw = aRect.GetXorDiff( nDrawStartCol, nDrawStartRow,
                                         nDrawEndCol, nDrawEndRow, bCont );
         if ( bDraw )
         {
@@ -408,26 +408,26 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
     }
 
     if ( !bCols && !bRows )
-        aHdrFunc.SetAnchorFlag( FALSE );
+        aHdrFunc.SetAnchorFlag( sal_False );
 }
 
 void ScTabView::UpdateSelectionOverlay()
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if ( pGridWin[i] && pGridWin[i]->IsVisible() )
             pGridWin[i]->UpdateSelectionOverlay();
 }
 
 void ScTabView::UpdateShrinkOverlay()
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if ( pGridWin[i] && pGridWin[i]->IsVisible() )
             pGridWin[i]->UpdateShrinkOverlay();
 }
 
 void ScTabView::UpdateAllOverlays()
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if ( pGridWin[i] && pGridWin[i]->IsVisible() )
             pGridWin[i]->UpdateAllOverlays();
 }
@@ -436,21 +436,21 @@ void ScTabView::UpdateAllOverlays()
 //!	PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae.
 //!
 
-void ScTabView::PaintBlock( BOOL bReset )
+void ScTabView::PaintBlock( sal_Bool bReset )
 {
     ScDocument* pDoc = aViewData.GetDocument();
     ScMarkData& rMark = aViewData.GetMarkData();
     SCTAB nTab = aViewData.GetTabNo();
-    BOOL bMark = rMark.IsMarked();
-    BOOL bMulti = rMark.IsMultiMarked();
+    sal_Bool bMark = rMark.IsMarked();
+    sal_Bool bMulti = rMark.IsMultiMarked();
     if (bMark || bMulti)
     {
         ScRange aMarkRange;
         HideAllCursors();
         if (bMulti)
         {
-            BOOL bFlag = rMark.GetMarkingFlag();
-            rMark.SetMarking(FALSE);
+            sal_Bool bFlag = rMark.GetMarkingFlag();
+            rMark.SetMarking(sal_False);
             rMark.MarkToMulti();
             rMark.GetMultiMarkArea(aMarkRange);
             rMark.MarkToSimple();
@@ -469,7 +469,7 @@ void ScTabView::PaintBlock( BOOL bReset )
         nBlockEndY = aMarkRange.aEnd.Row();
         nBlockEndZ = aMarkRange.aEnd.Tab();
 
-        BOOL bDidReset = FALSE;
+        sal_Bool bDidReset = sal_False;
 
         if ( nTab>=nBlockStartZ && nTab<=nBlockEndZ )
         {
@@ -478,7 +478,7 @@ void ScTabView::PaintBlock( BOOL bReset )
                 // Invertieren beim Loeschen nur auf aktiver View
                 if ( aViewData.IsActive() )
                 {
-                    USHORT i;
+                    sal_uInt16 i;
                     if ( bMulti )
                     {
 #ifdef OLD_SELECTION_PAINT
@@ -486,11 +486,11 @@ void ScTabView::PaintBlock( BOOL bReset )
                             if (pGridWin[i] && pGridWin[i]->IsVisible())
                                 pGridWin[i]->InvertSimple( nBlockStartX, nBlockStartY,
                                                             nBlockEndX, nBlockEndY,
-                                                            TRUE, TRUE );
+                                                            sal_True, sal_True );
 #endif
                         rMark.ResetMark();
                         UpdateSelectionOverlay();
-                        bDidReset = TRUE;
+                        bDidReset = sal_True;
                     }
                     else
                     {
@@ -500,8 +500,8 @@ void ScTabView::PaintBlock( BOOL bReset )
                         //	  and convert everything to Multi
 
                         rMark.MarkToMulti();
-                        BOOL bOld = bBlockNeg;
-                        bBlockNeg = TRUE;
+                        sal_Bool bOld = bBlockNeg;
+                        bBlockNeg = sal_True;
                         // #73130# (negative) MarkArea must be set in case of repaint
                         rMark.SetMarkArea( ScRange( nBlockStartX,nBlockStartY, nTab,
                                                     nBlockEndX,nBlockEndY, nTab ) );
@@ -512,7 +512,7 @@ void ScTabView::PaintBlock( BOOL bReset )
 #endif
                         rMark.ResetMark();
                         UpdateSelectionOverlay();
-                        bDidReset = TRUE;
+                        bDidReset = sal_True;
                     }
 
                     //	repaint if controls are touched (#69680# in both cases)
@@ -548,7 +548,7 @@ void ScTabView::PaintBlock( BOOL bReset )
     }
 }
 
-void ScTabView::SelectAll( BOOL bContinue )
+void ScTabView::SelectAll( sal_Bool bContinue )
 {
     ScMarkData& rMark = aViewData.GetMarkData();
     SCTAB nTab = aViewData.GetTabNo();
@@ -578,7 +578,7 @@ void ScTabView::SelectAllTables()
     if (nCount>1)
     {
         for (SCTAB i=0; i<nCount; i++)
-            rMark.SelectTable( i, TRUE );
+            rMark.SelectTable( i, sal_True );
 
         //		Markierungen werden per Default nicht pro Tabelle gehalten
 //		pDoc->ExtendMarksFromTable( nTab );
@@ -606,7 +606,7 @@ void ScTabView::DeselectAllTables()
     rBind.Invalidate( FID_TAB_DESELECTALL );
 }
 
-BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
+sal_Bool lcl_FitsInWindow( double fScaleX, double fScaleY, sal_uInt16 nZoom,
                         long nWindowX, long nWindowY, ScDocument* pDoc, SCTAB nTab,
                         SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                         SCCOL nFixPosX, SCROW nFixPosY )
@@ -620,22 +620,22 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
     for (nCol=0; nCol<nFixPosX; nCol++)
     {
         //	for frozen panes, add both parts
-        USHORT nColTwips = pDoc->GetColWidth( nCol, nTab );
+        sal_uInt16 nColTwips = pDoc->GetColWidth( nCol, nTab );
         if (nColTwips)
         {
             nBlockX += (long)(nColTwips * fScaleX);
             if (nBlockX > nWindowX)
-                return FALSE;
+                return sal_False;
         }
     }
     for (nCol=nStartCol; nCol<=nEndCol; nCol++)
     {
-        USHORT nColTwips = pDoc->GetColWidth( nCol, nTab );
+        sal_uInt16 nColTwips = pDoc->GetColWidth( nCol, nTab );
         if (nColTwips)
         {
             nBlockX += (long)(nColTwips * fScaleX);
             if (nBlockX > nWindowX)
-                return FALSE;
+                return sal_False;
         }
     }
 
@@ -646,31 +646,31 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
             continue;
 
         //	for frozen panes, add both parts
-        USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
+        sal_uInt16 nRowTwips = pDoc->GetRowHeight(nRow, nTab);
         if (nRowTwips)
         {
             nBlockY += (long)(nRowTwips * fScaleY);
             if (nBlockY > nWindowY)
-                return FALSE;
+                return sal_False;
         }
     }
     for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow)
     {
-        USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
+        sal_uInt16 nRowTwips = pDoc->GetRowHeight(nRow, nTab);
         if (nRowTwips)
         {
             nBlockY += (long)(nRowTwips * fScaleY);
             if (nBlockY > nWindowY)
-                return FALSE;
+                return sal_False;
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
+sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
 {
-    USHORT nZoom = 0; // Ergebnis
+    sal_uInt16 nZoom = 0; // Ergebnis
 
     switch ( eType )
     {
@@ -741,11 +741,11 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
                         double nPPTX = ScGlobal::nScreenPPTX / pDocSh->GetOutputFactor();
                         double nPPTY = ScGlobal::nScreenPPTY;
 
-                        USHORT nMin = MINZOOM;
-                        USHORT nMax = MAXZOOM;
+                        sal_uInt16 nMin = MINZOOM;
+                        sal_uInt16 nMax = MAXZOOM;
                         while ( nMax > nMin )
                         {
-                            USHORT nTest = (nMin+nMax+1)/2;
+                            sal_uInt16 nTest = (nMin+nMax+1)/2;
                             if ( lcl_FitsInWindow(
                                         nPPTX, nPPTY, nTest, aWinSize.Width(), aWinSize.Height(),
                                         pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow,
@@ -787,7 +787,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
                     if ( pStyleSheet )
                     {
                         ScPrintFunc aPrintFunc( aViewData.GetDocShell(),
-                                                aViewData.GetViewShell()->GetPrinter(TRUE),
+                                                aViewData.GetViewShell()->GetPrinter(sal_True),
                                                 nCurTab );
 
                         Size aPageSize = aPrintFunc.GetDataSize();
@@ -843,7 +843,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
                         if (eType == SVX_ZOOM_WHOLEPAGE && nZoomY < nNew)
                             nNew = nZoomY;
 
-                        nZoom = (USHORT) nNew;
+                        nZoom = (sal_uInt16) nNew;
                     }
                 }
                 break;
@@ -875,7 +875,7 @@ void ScTabView::StopMarking()
 
 void ScTabView::HideNoteMarker()
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pGridWin[i] && pGridWin[i]->IsVisible())
             pGridWin[i]->HideNoteMarker();
 }
@@ -900,7 +900,7 @@ void ScTabView::MakeDrawLayer()
     }
 }
 
-void ScTabView::ErrorMessage( USHORT nGlobStrId )
+void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId )
 {
     if ( SC_MOD()->IsInExecuteDrop() )
     {
@@ -912,7 +912,7 @@ void ScTabView::ErrorMessage( USHORT nGlobStrId )
 
     Window* pParent = aViewData.GetDialogParent();
     ScWaitCursorOff aWaitOff( pParent );
-    BOOL bFocus = pParent && pParent->HasFocus();
+    sal_Bool bFocus = pParent && pParent->HasFocus();
 
     if(nGlobStrId==STR_PROTECTIONERR)
     {
@@ -928,7 +928,7 @@ void ScTabView::ErrorMessage( USHORT nGlobStrId )
         pParent->GrabFocus();
 }
 
-Window* ScTabView::GetParentOrChild( USHORT nChildId )
+Window* ScTabView::GetParentOrChild( sal_uInt16 nChildId )
 {
     SfxViewFrame* pViewFrm = aViewData.GetViewShell()->GetViewFrame();
 
@@ -946,7 +946,7 @@ Window* ScTabView::GetParentOrChild( USHORT nChildId )
     return aViewData.GetDialogParent();
 }
 
-void ScTabView::UpdatePageBreakData( BOOL bForcePaint )
+void ScTabView::UpdatePageBreakData( sal_Bool bForcePaint )
 {
     ScPageBreakData* pNewData = NULL;
 
@@ -956,7 +956,7 @@ void ScTabView::UpdatePageBreakData( BOOL bForcePaint )
         ScDocument* pDoc = pDocSh->GetDocument();
         SCTAB nTab = aViewData.GetTabNo();
 
-        USHORT nCount = pDoc->GetPrintRangeCount(nTab);
+        sal_uInt16 nCount = pDoc->GetPrintRangeCount(nTab);
         if (!nCount)
             nCount = 1;
         pNewData = new ScPageBreakData(nCount);
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 8d21d8ac2..c8521eb30 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -114,7 +114,7 @@ using namespace com::sun::star;
 // ---	Public-Funktionen
 //
 
-void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl )
+void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, sal_Bool bControl )
 {
     ScDocument* pDoc = aViewData.GetDocument();
     SCTAB nTab = aViewData.GetTabNo();
@@ -123,11 +123,11 @@ void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl )
     while (pDoc->IsVerOverlapped( nPosX, nPosY, nTab ))
         --nPosY;
 
-    BOOL bRefMode = SC_MOD()->IsFormulaMode();
+    sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
 
     if ( bRefMode )
     {
-        DoneRefMode( FALSE );
+        DoneRefMode( sal_False );
 
         if (bControl)
             SC_MOD()->AddRefEntry();
@@ -146,9 +146,9 @@ void ScTabView::UpdateAutoFillMark()
 {
     // single selection or cursor
     ScRange aMarkRange;
-    BOOL bMarked = (aViewData.GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE);
+    sal_Bool bMarked = (aViewData.GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE);
 
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<4; i++)
         if (pGridWin[i] && pGridWin[i]->IsVisible())
             pGridWin[i]->UpdateAutoFillMark( bMarked, aMarkRange );
@@ -174,7 +174,7 @@ void ScTabView::FakeButtonUp( ScSplitPos eWhich )
 
 void ScTabView::HideAllCursors()
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pGridWin[i])
             if (pGridWin[i]->IsVisible())
             {
@@ -188,7 +188,7 @@ void ScTabView::HideAllCursors()
 
 void ScTabView::ShowAllCursors()
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pGridWin[i])
             if (pGridWin[i]->IsVisible())
             {
@@ -276,7 +276,7 @@ void ScTabView::InvalidateAttribs()
 #pragma optimize ( "", off )
 #endif
 
-void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew )
+void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, sal_Bool bNew )
 {
     SCCOL nOldX = aViewData.GetCurX();
     SCROW nOldY = aViewData.GetCurY();
@@ -452,7 +452,7 @@ void ScTabView::SelectionChanged()
 
 void ScTabView::CursorPosChanged()
 {
-    BOOL bRefMode = SC_MOD()->IsFormulaMode();
+    sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
     if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert
         aViewData.GetDocShell()->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) );
 
@@ -474,7 +474,7 @@ void ScTabView::TestHintWindow()
 {
     //  show input help window and list drop-down button for validity
 
-    BOOL bListValButton = FALSE;
+    sal_Bool bListValButton = sal_False;
     ScAddress aListValPos;
 
     ScDocument* pDoc = aViewData.GetDocument();
@@ -556,13 +556,13 @@ void ScTabView::TestHintWindow()
         if ( pData && pData->HasSelectionList() )
         {
             aListValPos.Set( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() );
-            bListValButton = TRUE;
+            bListValButton = sal_True;
         }
     }
     else
         DELETEZ(pInputHintWindow);
 
-    for ( USHORT i=0; i<4; i++ )
+    for ( sal_uInt16 i=0; i<4; i++ )
         if ( pGridWin[i] && pGridWin[i]->IsVisible() )
             pGridWin[i]->UpdateListValPos( bListValButton, aListValPos );
 }
@@ -619,8 +619,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
     ScSplitPos eActive = aViewData.GetActivePart();
     ScHSplitPos eActiveX = WhichH(eActive);
     ScVSplitPos eActiveY = WhichV(eActive);
-    BOOL bHFix = (aViewData.GetHSplitMode() == SC_SPLIT_FIX);
-    BOOL bVFix = (aViewData.GetVSplitMode() == SC_SPLIT_FIX);
+    sal_Bool bHFix = (aViewData.GetHSplitMode() == SC_SPLIT_FIX);
+    sal_Bool bVFix = (aViewData.GetVSplitMode() == SC_SPLIT_FIX);
     if (bHFix)
         if (eActiveX == SC_SPLIT_LEFT && nCurX >= (SCsCOL)aViewData.GetFixPosX())
         {
@@ -664,7 +664,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
         long nSpaceY = ( aScrSize.Height() - nCellSizeY ) / 2;
         //	nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes
 
-        BOOL bForceNew = FALSE;		// force new calculation of JUMP position (vertical only)
+        sal_Bool bForceNew = sal_False;		// force new calculation of JUMP position (vertical only)
 
         // VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY )
 
@@ -679,7 +679,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
             Window* pCare = lcl_GetCareWin( aViewData.GetViewShell()->GetViewFrame() );
             if (pCare)
             {
-                BOOL bLimit = FALSE;
+                sal_Bool bLimit = sal_False;
                 Rectangle aDlgPixel;
                 Size aWinSize;
                 Window* pWin = GetActiveWin();
@@ -692,7 +692,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
                     {
                         if ( nCurX < nDeltaX || nCurX >= nDeltaX+nSizeX ||
                              nCurY < nDeltaY || nCurY >= nDeltaY+nSizeY )
-                            bLimit = TRUE;			// es wird sowieso gescrollt
+                            bLimit = sal_True;			// es wird sowieso gescrollt
                         else
                         {
                             //	Cursor ist auf dem Bildschirm
@@ -701,14 +701,14 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
                             aViewData.GetMergeSizePixel( nCurX, nCurY, nCSX, nCSY );
                             Rectangle aCursor( aStart, Size( nCSX, nCSY ) );
                             if ( aCursor.IsOver( aDlgPixel ) )
-                                bLimit = TRUE;		// Zelle vom Dialog ueberdeckt
+                                bLimit = sal_True;		// Zelle vom Dialog ueberdeckt
                         }
                     }
                 }
 
                 if (bLimit)
                 {
-                    BOOL bBottom = FALSE;
+                    sal_Bool bBottom = sal_False;
                     long nTopSpace = aDlgPixel.Top();
                     long nBotSpace = aWinSize.Height() - aDlgPixel.Bottom();
                     if ( nBotSpace > 0 && nBotSpace > nTopSpace )
@@ -723,14 +723,14 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
                         if ( nCurY >= nDiff )			// Pos. kann nicht negativ werden
                         {
                             nSpaceY = nDlgBot + ( nBotSpace - nCellSizeY ) / 2;
-                            bBottom = TRUE;
-                            bForceNew = TRUE;
+                            bBottom = sal_True;
+                            bForceNew = sal_True;
                         }
                     }
                     if ( !bBottom && nTopSpace > 0 )
                     {
                         nSpaceY = ( nTopSpace - nCellSizeY ) / 2;
-                        bForceNew = TRUE;
+                        bForceNew = sal_True;
                     }
                 }
             }
@@ -739,28 +739,28 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
 
         SCsCOL nNewDeltaX = nDeltaX;
         SCsROW nNewDeltaY = nDeltaY;
-        BOOL bDoLine = FALSE;
+        sal_Bool bDoLine = sal_False;
 
         switch (eMode)
         {
             case SC_FOLLOW_JUMP:
                 if ( nCurX < nDeltaX || nCurX >= nDeltaX+nSizeX )
                 {
-                    nNewDeltaX = nCurX - static_cast<SCsCOL>(aViewData.CellsAtX( nCurX, -1, eAlignX, static_cast<USHORT>(nSpaceX) ));
+                    nNewDeltaX = nCurX - static_cast<SCsCOL>(aViewData.CellsAtX( nCurX, -1, eAlignX, static_cast<sal_uInt16>(nSpaceX) ));
                     if (nNewDeltaX < 0) nNewDeltaX = 0;
                     nSizeX = (SCsCOL) aViewData.CellsAtX( nNewDeltaX, 1, eAlignX );
                 }
                 if ( nCurY < nDeltaY || nCurY >= nDeltaY+nSizeY || bForceNew )
                 {
-                    nNewDeltaY = nCurY - static_cast<SCsROW>(aViewData.CellsAtY( nCurY, -1, eAlignY, static_cast<USHORT>(nSpaceY) ));
+                    nNewDeltaY = nCurY - static_cast<SCsROW>(aViewData.CellsAtY( nCurY, -1, eAlignY, static_cast<sal_uInt16>(nSpaceY) ));
                     if (nNewDeltaY < 0) nNewDeltaY = 0;
                     nSizeY = (SCsROW) aViewData.CellsAtY( nNewDeltaY, 1, eAlignY );
                 }
-                bDoLine = TRUE;
+                bDoLine = sal_True;
                 break;
 
             case SC_FOLLOW_LINE:
-                bDoLine = TRUE;
+                bDoLine = sal_True;
                 break;
 
             case SC_FOLLOW_FIX:
@@ -792,7 +792,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
                     nSizeY = (SCsROW) aViewData.CellsAtY( nNewDeltaY, 1, eAlignY );
                 }
 
-                bDoLine = TRUE;
+                bDoLine = sal_True;
                 break;
 
             case SC_FOLLOW_NONE:
@@ -858,22 +858,22 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
         }
 }
 
-BOOL ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt )
+sal_Bool ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     // #i3875# *Hack*
-    BOOL bMod1Locked = aViewData.GetViewShell()->GetLockedModifiers() & KEY_MOD1 ? TRUE : FALSE;
+    sal_Bool bMod1Locked = aViewData.GetViewShell()->GetLockedModifiers() & KEY_MOD1 ? sal_True : sal_False;
     aViewData.SetSelCtrlMouseClick( rMEvt.IsMod1() || bMod1Locked );
 
     if ( pSelEngine )
     {
         bMoveIsShift = rMEvt.IsShift();
         bRet = pSelEngine->SelMouseButtonDown( rMEvt );
-        bMoveIsShift = FALSE;
+        bMoveIsShift = sal_False;
     }
 
-    aViewData.SetSelCtrlMouseClick( FALSE ); // #i3875# *Hack*
+    aViewData.SetSelCtrlMouseClick( sal_False ); // #i3875# *Hack*
 
     return bRet;
 }
@@ -883,7 +883,7 @@ BOOL ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt )
     //
 
 void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
-                                BOOL bShift, BOOL bControl, BOOL bKeepOld, BOOL bKeepSel )
+                                sal_Bool bShift, sal_Bool bControl, sal_Bool bKeepOld, sal_Bool bKeepSel )
 {
     if (!bKeepOld)
         aViewData.ResetOldCursor();
@@ -898,8 +898,8 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
     if ( bShift && bNewStartIfMarking && IsBlockMode() )
     {
         //	used for ADD selection mode: start a new block from the cursor position
-        DoneBlockMode( TRUE );
-        InitBlockMode( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), TRUE );
+        DoneBlockMode( sal_True );
+        InitBlockMode( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), sal_True );
     }
 
         //	aktiven Teil umschalten jetzt in AlignToCursor
@@ -911,11 +911,11 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
         SetCursor( nCurX, nCurY );		// Markierung stehenlassen
     else
     {
-        BOOL bSame = ( nCurX == aViewData.GetCurX() && nCurY == aViewData.GetCurY() );
+        sal_Bool bSame = ( nCurX == aViewData.GetCurX() && nCurY == aViewData.GetCurY() );
         bMoveIsShift = bShift;
         pSelEngine->CursorPosChanging( bShift, bControl );
-        bMoveIsShift = FALSE;
-        aFunctionSet.SetCursorAtCell( nCurX, nCurY, FALSE );
+        bMoveIsShift = sal_False;
+        aFunctionSet.SetCursorAtCell( nCurX, nCurY, sal_False );
 
         //	Wenn der Cursor nicht bewegt wurde, muss das SelectionChanged fuer das
         //	Aufheben der Selektion hier einzeln passieren:
@@ -927,7 +927,7 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
 }
 
 void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
-                                    BOOL bShift, BOOL bKeepSel )
+                                    sal_Bool bShift, sal_Bool bKeepSel )
 {
     ScDocument* pDoc = aViewData.GetDocument();
     SCTAB nTab = aViewData.GetTabNo();
@@ -962,12 +962,12 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
         nCurY = (nMovY != 0) ? nOldY+nMovY : (SCsROW) aViewData.GetOldCurY();
     }
 
-    BOOL bSkipCell = FALSE;
+    sal_Bool bSkipCell = sal_False;
     aViewData.ResetOldCursor();
 
     if (nMovX != 0 && VALIDCOLROW(nCurX,nCurY))
     {
-        BOOL bHFlip = FALSE;
+        sal_Bool bHFlip = sal_False;
         do
         {
             SCCOL nLastCol = -1;
@@ -984,13 +984,13 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
                     if (bHFlip)
                     {
                         nCurX = nOldX;
-                        bSkipCell = FALSE;
+                        bSkipCell = sal_False;
                     }
                     else
                     {
                         nMovX = -nMovX;
                         if (nMovX > 0) ++nCurX; else --nCurX;		// zuruecknehmen
-                        bHFlip = TRUE;
+                        bHFlip = sal_True;
                     }
                 }
                 else
@@ -1009,7 +1009,7 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
 
     if (nMovY != 0 && VALIDCOLROW(nCurX,nCurY))
     {
-        BOOL bVFlip = FALSE;
+        sal_Bool bVFlip = sal_False;
         do
         {
             SCROW nLastRow = -1;
@@ -1026,13 +1026,13 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
                     if (bVFlip)
                     {
                         nCurY = nOldY;
-                        bSkipCell = FALSE;
+                        bSkipCell = sal_False;
                     }
                     else
                     {
                         nMovY = -nMovY;
                         if (nMovY > 0) ++nCurY; else --nCurY;		// zuruecknehmen
-                        bVFlip = TRUE;
+                        bVFlip = sal_True;
                     }
                 }
                 else
@@ -1049,10 +1049,10 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
         }
     }
 
-    MoveCursorAbs( nCurX, nCurY, eMode, bShift, FALSE, TRUE, bKeepSel );
+    MoveCursorAbs( nCurX, nCurY, eMode, bShift, sal_False, sal_True, bKeepSel );
 }
 
-void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
+void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift, sal_Bool bKeepSel )
 {
     SCCOL nCurX;
     SCROW nCurY;
@@ -1080,7 +1080,7 @@ void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
     MoveCursorRel( nPageX, nPageY, eMode, bShift, bKeepSel );
 }
 
-void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
+void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift, sal_Bool bKeepSel )
 {
     SCCOL nCurX;
     SCROW nCurY;
@@ -1118,7 +1118,7 @@ void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
     MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, eMode, bShift, bKeepSel );
 }
 
-void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel )
+void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift, sal_Bool bKeepSel )
 {
     ScDocument* pDoc = aViewData.GetDocument();
     SCTAB nTab = aViewData.GetTabNo();
@@ -1148,7 +1148,7 @@ void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, B
     MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, eMode, bShift, bKeepSel );
 }
 
-void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift )
+void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, sal_Bool bShift )
 {
     ScDocument* pDoc = aViewData.GetDocument();
     SCTAB nTab = aViewData.GetTabNo();
@@ -1188,15 +1188,15 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode
     while (pDoc->IsVerOverlapped( nNewX, nNewY, nTab ))
         --nNewY;
 
-    MoveCursorAbs( nNewX, nNewY, eMode, bShift, FALSE, TRUE );
+    MoveCursorAbs( nNewX, nNewY, eMode, bShift, sal_False, sal_True );
 }
 
-void ScTabView::MoveCursorEnter( BOOL bShift )			// bShift -> hoch/runter
+void ScTabView::MoveCursorEnter( sal_Bool bShift )			// bShift -> hoch/runter
 {
     const ScInputOptions& rOpt = SC_MOD()->GetInputOptions();
     if (!rOpt.GetMoveSelection())
     {
-        aViewData.UpdateInputHandler(TRUE);
+        aViewData.UpdateInputHandler(sal_True);
         return;
     }
 
@@ -1229,14 +1229,14 @@ void ScTabView::MoveCursorEnter( BOOL bShift )			// bShift -> hoch/runter
         SCTAB nTab = aViewData.GetTabNo();
 
         ScDocument* pDoc = aViewData.GetDocument();
-        pDoc->GetNextPos( nNewX,nNewY, nTab, nMoveX,nMoveY, TRUE,FALSE, rMark );
+        pDoc->GetNextPos( nNewX,nNewY, nTab, nMoveX,nMoveY, sal_True,sal_False, rMark );
 
         MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY,
-                            SC_FOLLOW_LINE, FALSE, TRUE );
+                            SC_FOLLOW_LINE, sal_False, sal_True );
 
         //	update input line even if cursor was not moved
         if ( nNewX == nCurX && nNewY == nCurY )
-            aViewData.UpdateInputHandler(TRUE);
+            aViewData.UpdateInputHandler(sal_True);
     }
     else
     {
@@ -1253,12 +1253,12 @@ void ScTabView::MoveCursorEnter( BOOL bShift )			// bShift -> hoch/runter
             }
         }
 
-        MoveCursorRel( nMoveX,nMoveY, SC_FOLLOW_LINE, FALSE );
+        MoveCursorRel( nMoveX,nMoveY, SC_FOLLOW_LINE, sal_False );
     }
 }
 
 
-BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent )
+sal_Bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent )
 {
     const KeyCode& rKCode = rKeyEvent.GetKeyCode();
 
@@ -1267,8 +1267,8 @@ BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent )
             (rKCode.IsMod2() ? MOD_BOTH : MOD_CTRL) :
             (rKCode.IsMod2() ? MOD_ALT : MOD_NONE);
 
-    BOOL bSel = rKCode.IsShift();
-    USHORT nCode = rKCode.GetCode();
+    sal_Bool bSel = rKCode.IsShift();
+    sal_uInt16 nCode = rKCode.GetCode();
 
     // CURSOR keys
     SCsCOL nDX = 0;
@@ -1291,8 +1291,8 @@ BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent )
                 // added to avoid warnings
             }
         }
-        // always TRUE to suppress changes of col/row size (ALT+CURSOR)
-        return TRUE;
+        // always sal_True to suppress changes of col/row size (ALT+CURSOR)
+        return sal_True;
     }
 
     // PAGEUP/PAGEDOWN
@@ -1309,7 +1309,7 @@ BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent )
                 // added to avoid warnings
             }
         }
-        return TRUE;
+        return sal_True;
     }
 
     // HOME/END
@@ -1326,20 +1326,20 @@ BOOL ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent )
                 // added to avoid warnings
             }
         }
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
         // naechste/vorherige nicht geschuetzte Zelle
-void ScTabView::FindNextUnprot( BOOL bShift, BOOL bInSelection )
+void ScTabView::FindNextUnprot( sal_Bool bShift, sal_Bool bInSelection )
 {
     short nMove = bShift ? -1 : 1;
 
     ScMarkData& rMark = aViewData.GetMarkData();
-    BOOL bMarked = bInSelection && (rMark.IsMarked() || rMark.IsMultiMarked());
+    sal_Bool bMarked = bInSelection && (rMark.IsMarked() || rMark.IsMultiMarked());
 
     SCCOL nCurX;
     SCROW nCurY;
@@ -1349,14 +1349,14 @@ void ScTabView::FindNextUnprot( BOOL bShift, BOOL bInSelection )
     SCTAB nTab = aViewData.GetTabNo();
 
     ScDocument* pDoc = aViewData.GetDocument();
-    pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, bMarked,TRUE, rMark );
+    pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, bMarked,sal_True, rMark );
 
     SCCOL nTabCol = aViewData.GetTabStartCol();
     if ( nTabCol == SC_TABSTART_NONE )
         nTabCol = nCurX;					// auf diese Spalte zurueck bei Enter
 
     MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY,
-                        SC_FOLLOW_LINE, FALSE, TRUE );
+                        SC_FOLLOW_LINE, sal_False, sal_True );
 
     //	in MoveCursorRel wird die TabCol zurueckgesetzt...
     aViewData.SetTabStartCol( nTabCol );
@@ -1416,7 +1416,7 @@ void ScTabView::MarkRows()
     SelectionChanged();
 }
 
-void ScTabView::MarkDataArea( BOOL bIncludeCursor )
+void ScTabView::MarkDataArea( sal_Bool bIncludeCursor )
 {
     ScDocument* pDoc = aViewData.GetDocument();
     SCTAB nTab = aViewData.GetTabNo();
@@ -1443,17 +1443,17 @@ void ScTabView::MarkMatrixFormula()
     ScRange aMatrix;
     if ( pDoc->GetMatrixFormulaRange( aCursor, aMatrix ) )
     {
-        MarkRange( aMatrix, FALSE );		// cursor is already within the range
+        MarkRange( aMatrix, sal_False );		// cursor is already within the range
     }
 }
 
-void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinue )
+void ScTabView::MarkRange( const ScRange& rRange, sal_Bool bSetCursor, sal_Bool bContinue )
 {
     SCTAB nTab = rRange.aStart.Tab();
     SetTabNo( nTab );
 
     HideAllCursors();
-    DoneBlockMode( bContinue ); // bContinue==TRUE -> clear old mark
+    DoneBlockMode( bContinue ); // bContinue==sal_True -> clear old mark
     if (bSetCursor)             // Wenn Cursor gesetzt wird, immer auch alignen
     {
         SCCOL nAlignX = rRange.aStart.Col();
@@ -1493,7 +1493,7 @@ void ScTabView::Unmark()
         SCCOL nCurX;
         SCROW nCurY;
         aViewData.GetMoveCursor( nCurX,nCurY );
-        MoveCursorAbs( nCurX, nCurY, SC_FOLLOW_NONE, FALSE, FALSE );
+        MoveCursorAbs( nCurX, nCurY, SC_FOLLOW_NONE, sal_False, sal_False );
 
         SelectionChanged();
     }
@@ -1515,7 +1515,7 @@ void ScTabView::MarkDataChanged()
     UpdateSelectionOverlay();
 }
 
-void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection )
+void ScTabView::SelectNextTab( short nDir, sal_Bool bExtendSelection )
 {
     if (!nDir) return;
     DBG_ASSERT( nDir==-1 || nDir==1, "SelectNextTab: falscher Wert");
@@ -1544,14 +1544,14 @@ void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection )
         }
     }
 
-    SetTabNo( nTab, FALSE, bExtendSelection );
+    SetTabNo( nTab, sal_False, bExtendSelection );
     PaintExtras();
 }
 
 
 //	SetTabNo	- angezeigte Tabelle
 
-void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSameTabButMoved )
+void ScTabView::SetTabNo( SCTAB nTab, sal_Bool bNew, sal_Bool bExtendSelection, bool bSameTabButMoved )
 {
     if ( !ValidTab(nTab) )
     {
@@ -1565,7 +1565,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
         FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell();
         if (pFormSh)
         {
-            BOOL bAllowed = sal::static_int_cast<BOOL>( pFormSh->PrepareClose( TRUE ) );
+            sal_Bool bAllowed = sal::static_int_cast<sal_Bool>( pFormSh->PrepareClose( sal_True ) );
             if (!bAllowed)
             {
                 //!	Fehlermeldung? oder macht das die FormShell selber?
@@ -1588,14 +1588,14 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
         SCTAB nOldPos = nTab;
         while (!pDoc->IsVisible(nTab))				// naechste sichtbare suchen
         {
-            BOOL bUp = (nTab>=nOldPos);
+            sal_Bool bUp = (nTab>=nOldPos);
             if (bUp)
             {
                 ++nTab;
                 if (nTab>=nTabCount)
                 {
                     nTab = nOldPos;
-                    bUp = FALSE;
+                    bUp = sal_False;
                 }
             }
 
@@ -1606,7 +1606,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
                 else
                 {
                     DBG_ERROR("keine sichtbare Tabelle");
-                    pDoc->SetVisible( 0, TRUE );
+                    pDoc->SetVisible( 0, sal_True );
                 }
             }
         }
@@ -1616,7 +1616,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
         DrawDeselectAll();
 
         ScModule* pScMod = SC_MOD();
-        BOOL bRefMode = pScMod->IsFormulaMode();
+        sal_Bool bRefMode = pScMod->IsFormulaMode();
         if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert
         {
             DoneBlockMode();
@@ -1625,14 +1625,14 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
         }
 
         ScSplitPos eOldActive = aViewData.GetActivePart();      // before switching
-        BOOL bFocus = pGridWin[eOldActive]->HasFocus();
+        sal_Bool bFocus = pGridWin[eOldActive]->HasFocus();
 
         aViewData.SetTabNo( nTab );
         //	UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen
         //	Fenster findet (wird aus SetCursor gerufen)
         UpdateShow();
         aViewData.ResetOldCursor();
-        SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), TRUE );
+        SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), sal_True );
 
         SfxBindings& rBindings = aViewData.GetBindings();
         ScMarkData& rMark = aViewData.GetMarkData();
@@ -1661,7 +1661,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
             bExtendSelection = false;
 
         if (bExtendSelection)
-            rMark.SelectTable( nTab, TRUE );
+            rMark.SelectTable( nTab, sal_True );
         else
         {
             rMark.SelectOneTable( nTab );
@@ -1677,7 +1677,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
 
         if ( bRefMode )     // hide EditView if necessary (after aViewData.SetTabNo !)
         {
-            for ( USHORT i=0; i<4; i++ )
+            for ( sal_uInt16 i=0; i<4; i++ )
                 if ( pGridWin[i] )
                     if ( pGridWin[i]->IsVisible() )
                         pGridWin[i]->UpdateEditViewPos();
@@ -1725,13 +1725,13 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
 
             //	Fixierungen
 
-        BOOL bResize = FALSE;
+        sal_Bool bResize = sal_False;
         if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX )
             if (aViewData.UpdateFixX())
-                bResize = TRUE;
+                bResize = sal_True;
         if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX )
             if (aViewData.UpdateFixY())
-                bResize = TRUE;
+                bResize = sal_True;
         if (bResize)
             RepeatResize();
         InvalidateSplit();
@@ -1741,7 +1741,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
 
         //	#53551# Form-Layer muss den sichtbaren Ausschnitt der neuen Tabelle kennen
         //	dafuer muss hier schon der MapMode stimmen
-        for (USHORT i=0; i<4; i++)
+        for (sal_uInt16 i=0; i<4; i++)
             if (pGridWin[i])
                 pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() );
         SetNewVisArea();
@@ -1764,7 +1764,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection, bool bSa
 
         if(pScMod->IsRefDialogOpen())
         {
-            USHORT nCurRefDlgId=pScMod->GetCurRefDlgId();
+            sal_uInt16 nCurRefDlgId=pScMod->GetCurRefDlgId();
             SfxViewFrame* pViewFrm = aViewData.GetViewShell()->GetViewFrame();
             SfxChildWindow* pChildWnd = pViewFrm->GetChildWindow( nCurRefDlgId );
             if ( pChildWnd )
@@ -1785,11 +1785,11 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW
     DrawDeselectAll();
 
     if (pDrawView)
-        DrawEnableAnim( FALSE );
+        DrawEnableAnim( sal_False );
 
     EditView* pSpellingView = aViewData.GetSpellingView();
 
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pGridWin[i])
             if ( pGridWin[i]->IsVisible() && !aViewData.HasEditView((ScSplitPos)i) )
             {
@@ -1798,7 +1798,7 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW
                 SCCOL nScrX = aViewData.GetPosX( eHWhich );
                 SCROW nScrY = aViewData.GetPosY( eVWhich );
 
-                BOOL bPosVisible =
+                sal_Bool bPosVisible =
                      ( nCol >= nScrX && nCol <= nScrX + aViewData.VisibleCellsX(eHWhich) + 1 &&
                        nRow >= nScrY && nRow <= nScrY + aViewData.VisibleCellsY(eVWhich) + 1 );
 
@@ -1838,7 +1838,7 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW
 void ScTabView::UpdateEditView()
 {
     ScSplitPos eActive = aViewData.GetActivePart();
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (aViewData.HasEditView( (ScSplitPos) i ))
         {
             EditView* pEditView = aViewData.GetEditView( (ScSplitPos) i );
@@ -1846,22 +1846,22 @@ void ScTabView::UpdateEditView()
                 static_cast<ScEditEngineDefaulter*>(pEditView->GetEditEngine()),
                 pGridWin[i], GetViewData()->GetCurX(), GetViewData()->GetCurY() );
             if ( (ScSplitPos)i == eActive )
-                pEditView->ShowCursor( FALSE );
+                pEditView->ShowCursor( sal_False );
         }
 }
 
-void ScTabView::KillEditView( BOOL bNoPaint )
+void ScTabView::KillEditView( sal_Bool bNoPaint )
 {
-    USHORT i;
+    sal_uInt16 i;
     SCCOL nCol1 = aViewData.GetEditStartCol();
     SCROW nRow1 = aViewData.GetEditStartRow();
     SCCOL nCol2 = aViewData.GetEditEndCol();
     SCROW nRow2 = aViewData.GetEditEndRow();
-    BOOL bPaint[4];
-    BOOL bNotifyAcc(false);
+    sal_Bool bPaint[4];
+    sal_Bool bNotifyAcc(false);
 
-    BOOL bExtended = nRow1 != nRow2;                    // Col wird sowieso bis zum Ende gezeichnet
-    BOOL bAtCursor = nCol1 <= aViewData.GetCurX() &&
+    sal_Bool bExtended = nRow1 != nRow2;                    // Col wird sowieso bis zum Ende gezeichnet
+    sal_Bool bAtCursor = nCol1 <= aViewData.GetCurX() &&
                      nCol2 >= aViewData.GetCurX() &&
                      nRow1 == aViewData.GetCurY();
     for (i=0; i<4; i++)
@@ -1893,12 +1893,12 @@ void ScTabView::KillEditView( BOOL bNoPaint )
             }
 
     if (pDrawView)
-        DrawEnableAnim( TRUE );
+        DrawEnableAnim( sal_True );
 
         //	GrabFocus immer dann, wenn diese View aktiv ist und
         //	die Eingabezeile den Focus hat
 
-    BOOL bGrabFocus = FALSE;
+    sal_Bool bGrabFocus = sal_False;
     if (aViewData.IsActive())
     {
         ScInputHandler*	pInputHdl = SC_MOD()->GetInputHdl();
@@ -1906,7 +1906,7 @@ void ScTabView::KillEditView( BOOL bNoPaint )
         {
             ScInputWindow* pInputWin = pInputHdl->GetInputWindow();
             if (pInputWin && pInputWin->IsInputActive())
-                bGrabFocus = TRUE;
+                bGrabFocus = sal_True;
         }
     }
 
@@ -1941,7 +1941,7 @@ void ScTabView::UpdateFormulas()
     if ( aViewData.GetDocument()->IsAutoCalcShellDisabled() )
         return ;
 
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<4; i++)
         if (pGridWin[i])
             if (pGridWin[i]->IsVisible())
@@ -1962,7 +1962,7 @@ void ScTabView::UpdateFormulas()
 void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                             ScUpdateMode eMode )
 {
-    USHORT i;
+    sal_uInt16 i;
     SCCOL nCol1;
     SCROW nRow1;
     SCCOL nCol2;
@@ -1977,7 +1977,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
             {
                 ScHSplitPos eHWhich = WhichH( (ScSplitPos) i );
                 ScVSplitPos eVWhich = WhichV( (ScSplitPos) i );
-                BOOL bOut = FALSE;
+                sal_Bool bOut = sal_False;
 
                 nCol1 = nStartCol;
                 nRow1 = nStartRow;
@@ -1992,16 +1992,16 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
                     if ( eMode == SC_UPDATE_ALL )	// #91240# for UPDATE_ALL, paint anyway
                         nCol2 = nScrX;				// (because of extending strings to the right)
                     else
-                        bOut = TRUE;				// completely outside the window
+                        bOut = sal_True;				// completely outside the window
                 }
                 if (nRow1 < nScrY) nRow1 = nScrY;
-                if (nRow2 < nScrY) bOut = TRUE;
+                if (nRow2 < nScrY) bOut = sal_True;
 
                 SCCOL nLastX = nScrX + aViewData.VisibleCellsX( eHWhich ) + 1;
                 SCROW nLastY = nScrY + aViewData.VisibleCellsY( eVWhich ) + 1;
-                if (nCol1 > nLastX) bOut = TRUE;
+                if (nCol1 > nLastX) bOut = sal_True;
                 if (nCol2 > nLastX) nCol2 = nLastX;
-                if (nRow1 > nLastY) bOut = TRUE;
+                if (nRow1 > nLastY) bOut = sal_True;
                 if (nRow2 > nLastY) nRow2 = nLastY;
 
                 if (!bOut)
@@ -2010,7 +2010,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
                         pGridWin[i]->Draw( nCol1, nRow1, nCol2, nRow2, eMode );
                     else	// ALL oder MARKS
                     {
-                        BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
+                        sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
                         long nLayoutSign = bLayoutRTL ? -1 : 1;
 
                         Point aStart = aViewData.GetScrPos( nCol1, nRow1, (ScSplitPos) i );
@@ -2024,14 +2024,14 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
                         if ( eMode == SC_UPDATE_ALL && nRow2 >= MAXROW )
                             aEnd.Y() = pGridWin[i]->GetOutputSizePixel().Height();
 
-                        BOOL bShowChanges = TRUE;			//! ...
+                        sal_Bool bShowChanges = sal_True;			//! ...
                         if (bShowChanges)
                         {
                             aStart.X() -= nLayoutSign;		// include change marks
                             aStart.Y() -= 1;
                         }
 
-                        BOOL bMarkClipped = aViewData.GetOptions().GetOption( VOPT_CLIPMARKS );
+                        sal_Bool bMarkClipped = aViewData.GetOptions().GetOption( VOPT_CLIPMARKS );
                         if (bMarkClipped)
                         {
                             //	dazu muesste ScColumn::IsEmptyBlock optimiert werden
@@ -2070,8 +2070,8 @@ void ScTabView::PaintRangeFinder( long nNumber )
         if ( pRangeFinder && pRangeFinder->GetDocName() == aViewData.GetDocShell()->GetTitle() )
         {
             SCTAB nTab = aViewData.GetTabNo();
-            USHORT nCount = (USHORT)pRangeFinder->Count();
-            for (USHORT i=0; i<nCount; i++)
+            sal_uInt16 nCount = (sal_uInt16)pRangeFinder->Count();
+            for (sal_uInt16 i=0; i<nCount; i++)
                 if ( nNumber < 0 || nNumber == i )
                 {
                     ScRangeFindData* pData = pRangeFinder->GetObject(i);
@@ -2093,19 +2093,19 @@ void ScTabView::PaintRangeFinder( long nNumber )
                             //	wegnehmen -> Repaint
                             //	SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende
 
-                            BOOL bHiddenEdge = FALSE;
+                            sal_Bool bHiddenEdge = sal_False;
                             SCROW nTmp;
                             ScDocument* pDoc = aViewData.GetDocument();
                             SCCOL nLastCol = -1;
                             while ( nCol1 > 0 && pDoc->ColHidden(nCol1, nTab, nLastCol) )
                             {
                                 --nCol1;
-                                bHiddenEdge = TRUE;
+                                bHiddenEdge = sal_True;
                             }
                             while ( nCol2 < MAXCOL && pDoc->ColHidden(nCol2, nTab, nLastCol) )
                             {
                                 ++nCol2;
-                                bHiddenEdge = TRUE;
+                                bHiddenEdge = sal_True;
                             }
                             nTmp = pDoc->LastVisibleRow(0, nRow1, nTab);
                             if (!ValidRow(nTmp))
@@ -2113,7 +2113,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
                             if (nTmp < nRow1)
                             {
                                 nRow1 = nTmp;
-                                bHiddenEdge = TRUE;
+                                bHiddenEdge = sal_True;
                             }
                             nTmp = pDoc->FirstVisibleRow(nRow2, MAXROW, nTab);
                             if (!ValidRow(nTmp))
@@ -2121,7 +2121,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
                             if (nTmp > nRow2)
                             {
                                 nRow2 = nTmp;
-                                bHiddenEdge = TRUE;
+                                bHiddenEdge = sal_True;
                             }
 
                             if ( nCol2 - nCol1 > 1 && nRow2 - nRow1 > 1 && !bHiddenEdge )
@@ -2163,8 +2163,8 @@ void ScTabView::ClearHighlightRanges()
         pHighlightRanges = NULL;	// Repaint ohne Highlight
 
         SCTAB nTab = aViewData.GetTabNo();
-        ULONG nCount = pTemp->Count();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = pTemp->Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScHighlightEntry* pEntry = pTemp->GetObject( i );
             if (pEntry)
@@ -2210,7 +2210,7 @@ void ScTabView::DoChartSelection(
 //UNUSED2008-05  {
 //UNUSED2008-05      if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX )
 //UNUSED2008-05      {
-//UNUSED2008-05          for (USHORT  i=0; i<4; i++)
+//UNUSED2008-05          for (sal_uInt16  i=0; i<4; i++)
 //UNUSED2008-05              if (pGridWin[i])
 //UNUSED2008-05                  if (pGridWin[i]->IsVisible())
 //UNUSED2008-05                      pGridWin[i]->DrawDragRect( nStartX, nStartY, nEndX, nEndY );
@@ -2225,7 +2225,7 @@ void ScTabView::DoChartSelection(
 //UNUSED2008-05  {
 //UNUSED2008-05      if ( aViewData.GetTabNo() == nTab )
 //UNUSED2008-05      {
-//UNUSED2008-05          USHORT i;
+//UNUSED2008-05          sal_uInt16 i;
 //UNUSED2008-05          for (i=0; i<4; i++)
 //UNUSED2008-05              if (pGridWin[i])
 //UNUSED2008-05                  if (pGridWin[i]->IsVisible())
@@ -2247,7 +2247,7 @@ void ScTabView::DoChartSelection(
 
 void ScTabView::PaintGrid()
 {
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<4; i++)
         if (pGridWin[i])
             if (pGridWin[i]->IsVisible())
@@ -2258,7 +2258,7 @@ void ScTabView::PaintGrid()
 
 void ScTabView::PaintTop()
 {
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<2; i++)
     {
         if (pColBar[i])
@@ -2270,7 +2270,7 @@ void ScTabView::PaintTop()
 
 void ScTabView::CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress)
 {
-    UINT16 i;
+    sal_uInt16 i;
 
     for(i=0; i<4; i++)
     {
@@ -2303,10 +2303,10 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol )
     if (nStartCol>0)
         --nStartCol;				//! allgemeiner ?
 
-    BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
+    sal_Bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
-    for (USHORT i=0; i<2; i++)
+    for (sal_uInt16 i=0; i<2; i++)
     {
         ScHSplitPos eWhich = (ScHSplitPos) i;
         if (pColBar[eWhich])
@@ -2331,7 +2331,7 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol )
 
 void ScTabView::PaintLeft()
 {
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<2; i++)
     {
         if (pRowBar[i])
@@ -2360,7 +2360,7 @@ void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow )
     if (nStartRow>0)
         --nStartRow;
 
-    for (USHORT i=0; i<2; i++)
+    for (sal_uInt16 i=0; i<2; i++)
     {
         ScVSplitPos eWhich = (ScVSplitPos) i;
         if (pRowBar[eWhich])
@@ -2404,11 +2404,11 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY,
         return;
     }
 
-    BOOL bSingle = rMark.IsMultiMarked();
-    BOOL bMerge = pDoc->HasAttrib( nStartX, nStartY, nTab, nEndX, nEndY, nTab,
+    sal_Bool bSingle = rMark.IsMultiMarked();
+    sal_Bool bMerge = pDoc->HasAttrib( nStartX, nStartY, nTab, nEndX, nEndY, nTab,
                                     HASATTR_MERGED | HASATTR_OVERLAPPED );
 
-    USHORT i;
+    sal_uInt16 i;
     if ( bMerge || bSingle )
     {
         for (i=0; i<4; i++)
@@ -2450,7 +2450,7 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY,
         //	wenn Controls betroffen, neu malen
         //
 
-    BOOL bHide = TRUE;					// wird Teil der Markierung aufgehoben ?
+    sal_Bool bHide = sal_True;					// wird Teil der Markierung aufgehoben ?
     if (rMark.IsMarked())
     {
         ScRange aMarkRange;
@@ -2458,23 +2458,23 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY,
         if ( aMarkRange.aStart.Col() <= nStartX && aMarkRange.aEnd.Col() >= nEndX &&
              aMarkRange.aStart.Row() <= nStartY && aMarkRange.aEnd.Row() >= nEndY )
         {
-            bHide = FALSE;				// der ganze Bereich ist markiert
+            bHide = sal_False;				// der ganze Bereich ist markiert
         }
     }
 }
 
-BOOL ScTabView::PaintExtras()
+sal_Bool ScTabView::PaintExtras()
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     ScDocument* pDoc = aViewData.GetDocument();
     SCTAB nTab = aViewData.GetTabNo();
     if (!pDoc->HasTable(nTab))					// Tabelle geloescht ?
     {
         SCTAB nCount = pDoc->GetTableCount();
         aViewData.SetTabNo(nCount-1);
-        bRet = TRUE;
+        bRet = sal_True;
     }
-    pTabControl->UpdateStatus();						// TRUE = active
+    pTabControl->UpdateStatus();						// sal_True = active
     return bRet;
 }
 
@@ -2488,8 +2488,8 @@ void ScTabView::RecalcPPT()
 
     aViewData.RefreshZoom();                            // pre-calculate new PPT values
 
-    BOOL bChangedX = ( aViewData.GetPPTX() != nOldX );
-    BOOL bChangedY = ( aViewData.GetPPTY() != nOldY );
+    sal_Bool bChangedX = ( aViewData.GetPPTX() != nOldX );
+    sal_Bool bChangedY = ( aViewData.GetPPTY() != nOldY );
     if ( bChangedX || bChangedY )
     {
         //	call view SetZoom (including draw scale, split update etc)
@@ -2497,7 +2497,7 @@ void ScTabView::RecalcPPT()
 
         Fraction aZoomX = aViewData.GetZoomX();
         Fraction aZoomY = aViewData.GetZoomY();
-        SetZoom( aZoomX, aZoomY, FALSE );
+        SetZoom( aZoomX, aZoomY, sal_False );
 
         PaintGrid();
         if (bChangedX)
@@ -2507,7 +2507,7 @@ void ScTabView::RecalcPPT()
     }
 }
 
-void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
+void ScTabView::ActivateView( sal_Bool bActivate, sal_Bool bFirst )
 {
     if ( bActivate == aViewData.IsActive() && !bFirst )
     {
@@ -2518,13 +2518,13 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
 
     // wird nur bei MDI-(De)Activate gerufen
     // aViewData.Activate hinten wegen Cursor-Show bei KillEditView
-    //	Markierung nicht mehr loeschen - wenn an der ViewData Activate(FALSE) gesetzt ist,
+    //	Markierung nicht mehr loeschen - wenn an der ViewData Activate(sal_False) gesetzt ist,
     //	wird die Markierung nicht ausgegeben
 
     if (!bActivate)
     {
         ScModule* pScMod = SC_MOD();
-        BOOL bRefMode = pScMod->IsFormulaMode();
+        sal_Bool bRefMode = pScMod->IsFormulaMode();
 
             //	Referenzeingabe nicht abbrechen, um Referenzen auf
             //	andere Dokumente zuzulassen
@@ -2544,7 +2544,7 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
 
     aViewData.Activate(bActivate);
 
-    PaintBlock(FALSE);					// Repaint, Markierung je nach Active-Status
+    PaintBlock(sal_False);					// Repaint, Markierung je nach Active-Status
 
     if (!bActivate)
         HideAllCursors();				// Cursor
@@ -2594,9 +2594,9 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
     ScSplitPos eOld = aViewData.GetActivePart();
     if ( eOld != eWhich )
     {
-        bInActivatePart = TRUE;
+        bInActivatePart = sal_True;
 
-        BOOL bRefMode = SC_MOD()->IsFormulaMode();
+        sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
 
         //	#40565# the HasEditView call during SetCursor would fail otherwise
         if ( aViewData.HasEditView(eOld) && !bRefMode )
@@ -2606,11 +2606,11 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
         ScVSplitPos eOldV = WhichV(eOld);
         ScHSplitPos eNewH = WhichH(eWhich);
         ScVSplitPos eNewV = WhichV(eWhich);
-        BOOL bTopCap  = pColBar[eOldH] && pColBar[eOldH]->IsMouseCaptured();
-        BOOL bLeftCap = pRowBar[eOldV] && pRowBar[eOldV]->IsMouseCaptured();
+        sal_Bool bTopCap  = pColBar[eOldH] && pColBar[eOldH]->IsMouseCaptured();
+        sal_Bool bLeftCap = pRowBar[eOldV] && pRowBar[eOldV]->IsMouseCaptured();
 
-        BOOL bFocus = pGridWin[eOld]->HasFocus();
-        BOOL bCapture = pGridWin[eOld]->IsMouseCaptured();
+        sal_Bool bFocus = pGridWin[eOld]->HasFocus();
+        sal_Bool bCapture = pGridWin[eOld]->IsMouseCaptured();
         if (bCapture)
             pGridWin[eOld]->ReleaseMouse();
         pGridWin[eOld]->ClickExtern();
@@ -2638,8 +2638,8 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
 
         if ( bTopCap && pColBar[eNewH] )
         {
-            pColBar[eOldH]->SetIgnoreMove(TRUE);
-            pColBar[eNewH]->SetIgnoreMove(FALSE);
+            pColBar[eOldH]->SetIgnoreMove(sal_True);
+            pColBar[eNewH]->SetIgnoreMove(sal_False);
             pHdrSelEng->SetWindow( pColBar[eNewH] );
             long nWidth = pColBar[eNewH]->GetOutputSizePixel().Width();
             pHdrSelEng->SetVisibleArea( Rectangle( 0, LONG_MIN, nWidth-1, LONG_MAX ) );
@@ -2647,8 +2647,8 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
         }
         if ( bLeftCap && pRowBar[eNewV] )
         {
-            pRowBar[eOldV]->SetIgnoreMove(TRUE);
-            pRowBar[eNewV]->SetIgnoreMove(FALSE);
+            pRowBar[eOldV]->SetIgnoreMove(sal_True);
+            pRowBar[eNewV]->SetIgnoreMove(sal_False);
             pHdrSelEng->SetWindow( pRowBar[eNewV] );
             long nHeight = pRowBar[eNewV]->GetOutputSizePixel().Height();
             pHdrSelEng->SetVisibleArea( Rectangle( LONG_MIN, 0, LONG_MAX, nHeight-1 ) );
@@ -2660,7 +2660,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
         pGridWin[eWhich]->ShowCursor();
 
         SfxInPlaceClient* pClient = aViewData.GetViewShell()->GetIPClient();
-        BOOL bOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
+        sal_Bool bOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
 
         //	#103823# don't switch ViewShell's active window during RefInput, because the focus
         //	might change, and subsequent SetReference calls wouldn't find the right EditView
@@ -2675,13 +2675,13 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
             pGridWin[eWhich]->GrabFocus();
         }
 
-        bInActivatePart = FALSE;
+        bInActivatePart = sal_False;
     }
 }
 
 void ScTabView::HideListBox()
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pGridWin[i])
             pGridWin[i]->ClickExtern();
 }
@@ -2780,7 +2780,7 @@ void ScTabView::ZoomChanged()
 
 void ScTabView::CheckNeedsRepaint()
 {
-    USHORT i;
+    sal_uInt16 i;
     for (i=0; i<4; i++)
         if ( pGridWin[i] && pGridWin[i]->IsVisible() )
             pGridWin[i]->CheckNeedsRepaint();
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 0eb88511c..c89da1761 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -46,7 +46,7 @@
 #include "cell.hxx"
 #include "dociter.hxx"
 
-extern USHORT nScFillModeMouseModifier;				// global.cxx
+extern sal_uInt16 nScFillModeMouseModifier;				// global.cxx
 
 // STATIC DATA -----------------------------------------------------------
 
@@ -67,7 +67,7 @@ void ScTabView::HideTip()
 
 void ScTabView::ShowRefTip()
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if ( aViewData.GetRefType() == SC_REFTYPE_REF && Help::IsQuickHelpEnabled() )
     {
         SCCOL nStartX = aViewData.GetRefStartX();
@@ -76,8 +76,8 @@ void ScTabView::ShowRefTip()
         SCROW nEndY   = aViewData.GetRefEndY();
         if ( nEndX != nStartX || nEndY != nStartY )		// nicht fuer einzelne Zelle
         {
-            BOOL bLeft = ( nEndX < nStartX );
-            BOOL bTop  = ( nEndY < nStartY );
+            sal_Bool bLeft = ( nEndX < nStartX );
+            sal_Bool bTop  = ( nEndY < nStartY );
             PutInOrder( nStartX, nEndX );
             PutInOrder( nStartY, nEndY );
             SCCOL nCols = nEndX+1-nStartX;
@@ -98,7 +98,7 @@ void ScTabView::ShowRefTip()
 
                 Point aPos( bLeft ? aStart.X() : ( aEnd.X() + 3 ),
                             bTop ? aStart.Y() : ( aEnd.Y() + 3 ) );
-                USHORT nFlags = ( bLeft ? QUICKHELP_RIGHT : QUICKHELP_LEFT ) |
+                sal_uInt16 nFlags = ( bLeft ? QUICKHELP_RIGHT : QUICKHELP_LEFT ) |
                                 ( bTop ? QUICKHELP_BOTTOM : QUICKHELP_TOP );
 
                 // nicht ueber die editierte Formel
@@ -116,7 +116,7 @@ void ScTabView::ShowRefTip()
 
                 HideTip();
                 nTipVisible = Help::ShowTip( pWin, aRect, aHelp, nFlags );
-                bDone = TRUE;
+                bDone = sal_True;
             }
         }
     }
@@ -129,7 +129,7 @@ void ScTabView::StopRefMode()
 {
     if (aViewData.IsRefMode())
     {
-        aViewData.SetRefMode( FALSE, SC_REFTYPE_NONE );
+        aViewData.SetRefMode( sal_False, SC_REFTYPE_NONE );
 
         HideTip();
         UpdateShrinkOverlay();
@@ -149,7 +149,7 @@ void ScTabView::StopRefMode()
         }
 
         pSelEngine->Reset();
-        pSelEngine->SetAddMode( FALSE );		//! sollte das nicht bei Reset passieren?
+        pSelEngine->SetAddMode( sal_False );		//! sollte das nicht bei Reset passieren?
 
         ScSplitPos eOld = pSelEngine->GetWhich();
         ScSplitPos eNew = aViewData.GetActivePart();
@@ -171,14 +171,14 @@ void ScTabView::StopRefMode()
     AlignToCursor( aViewData.GetCurX(), aViewData.GetCurY(), SC_FOLLOW_NONE );
 }
 
-void ScTabView::DoneRefMode( BOOL bContinue )
+void ScTabView::DoneRefMode( sal_Bool bContinue )
 {
     ScDocument* pDoc = aViewData.GetDocument();
     if ( aViewData.GetRefType() == SC_REFTYPE_REF && bContinue )
         SC_MOD()->AddRefEntry();
 
-    BOOL bWasRef = aViewData.IsRefMode();
-    aViewData.SetRefMode( FALSE, SC_REFTYPE_NONE );
+    sal_Bool bWasRef = aViewData.IsRefMode();
+    aViewData.SetRefMode( sal_False, SC_REFTYPE_NONE );
 
     HideTip();
     UpdateShrinkOverlay();
@@ -253,7 +253,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
             PutInOrder(nStartY,nEndY);
             pDoc->SetEmbedded( ScRange(nStartX,nStartY,nTab, nEndX,nEndY,nTab) );
             ScDocShell* pDocSh = aViewData.GetDocShell();
-            pDocSh->UpdateOle( &aViewData, TRUE );
+            pDocSh->UpdateOle( &aViewData, sal_True );
             pDocSh->SetDocumentModified();
         }
 
@@ -300,18 +300,18 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
         if ( pWin )
             aPos = pWin->OutputToScreenPixel( aPos );
         Rectangle aRect( aPos, aPos );
-        USHORT nAlign = QUICKHELP_LEFT|QUICKHELP_TOP;
+        sal_uInt16 nAlign = QUICKHELP_LEFT|QUICKHELP_TOP;
         Help::ShowQuickHelp(pWin, aRect, aHelpStr, nAlign);
     }
 }
 
-void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, BOOL bPaint )
+void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, sal_Bool bPaint )
 {
     ScDocument* pDoc = aViewData.GetDocument();
     ScMarkData& rMark = aViewData.GetMarkData();
     if (!aViewData.IsRefMode())
     {
-        aViewData.SetRefMode( TRUE, eType );
+        aViewData.SetRefMode( sal_True, eType );
         aViewData.SetRefStart( nCurX, nCurY, nCurZ );
         aViewData.SetRefEnd( nCurX, nCurY, nCurZ );
 
@@ -336,13 +336,13 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT
 //UNUSED2008-05  void ScTabView::EndSelection()
 //UNUSED2008-05  {
 //UNUSED2008-05      ScModule* pScMod = SC_MOD();
-//UNUSED2008-05      BOOL bRefMode = pScMod->IsFormulaMode();
+//UNUSED2008-05      sal_Bool bRefMode = pScMod->IsFormulaMode();
 //UNUSED2008-05      if ( bRefMode )
 //UNUSED2008-05          pScMod->EndReference();
 //UNUSED2008-05  }
 
 // static
-void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL )
+void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, sal_Bool bLayoutRTL )
 {
     if ( nVisible == 0 )
         nVisible = 1;       // #i59893# don't use visible size 0
@@ -366,7 +366,7 @@ void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible,
 }
 
 // static
-long ScTabView::GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL )
+long ScTabView::GetScrollBarPos( ScrollBar& rScroll, sal_Bool bLayoutRTL )
 {
     if ( bLayoutRTL )
         return -rScroll.GetThumbPos() - rScroll.GetVisibleSize();
@@ -407,11 +407,11 @@ long lcl_GetScrollRange( SCCOLROW nDocEnd, SCCOLROW nPos, SCCOLROW nVis, SCCOLRO
 void ScTabView::UpdateScrollBars()
 {
     long		nDiff;
-    BOOL		bTop =   ( aViewData.GetVSplitMode() != SC_SPLIT_NONE );
-    BOOL		bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE );
+    sal_Bool		bTop =   ( aViewData.GetVSplitMode() != SC_SPLIT_NONE );
+    sal_Bool		bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE );
     ScDocument*	pDoc = aViewData.GetDocument();
     SCTAB		nTab = aViewData.GetTabNo();
-    BOOL        bMirror = pDoc->IsLayoutRTL( nTab ) != Application::GetSettings().GetLayoutRTL();
+    sal_Bool        bMirror = pDoc->IsLayoutRTL( nTab ) != Application::GetSettings().GetLayoutRTL();
     SCCOL		nUsedX;
     SCROW		nUsedY;
     pDoc->GetTableArea( nTab, nUsedX, nUsedY );		//! cachen !!!!!!!!!!!!!!!
@@ -434,7 +434,7 @@ void ScTabView::UpdateScrollBars()
 
     nVisYB = aViewData.VisibleCellsY( SC_SPLIT_BOTTOM );
     long nMaxYB = lcl_GetScrollRange( nUsedY, aViewData.GetPosY(SC_SPLIT_BOTTOM), nVisYB, MAXROW, nStartY );
-    SetScrollBar( aVScrollBottom, nMaxYB, nVisYB, aViewData.GetPosY( SC_SPLIT_BOTTOM ) - nStartY, FALSE );
+    SetScrollBar( aVScrollBottom, nMaxYB, nVisYB, aViewData.GetPosY( SC_SPLIT_BOTTOM ) - nStartY, sal_False );
 
     if (bRight)
     {
@@ -447,7 +447,7 @@ void ScTabView::UpdateScrollBars()
     {
         nVisYT = aViewData.VisibleCellsY( SC_SPLIT_TOP );
         long nMaxYT = lcl_GetScrollRange( nUsedY, aViewData.GetPosY(SC_SPLIT_TOP), nVisYT, MAXROW, 0 );
-        SetScrollBar( aVScrollTop, nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), FALSE );
+        SetScrollBar( aVScrollTop, nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), sal_False );
     }
 
     //		Bereich testen
@@ -493,7 +493,7 @@ void ScTabView::UpdateScrollBars()
 
 void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos )
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (WhichV((ScSplitPos)i)==eWhich)
         {
             ScGridWindow* pWin = pGridWin[i];
@@ -508,7 +508,7 @@ void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos )
 
 void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos )
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (WhichH((ScSplitPos)i)==eWhich)
         {
             ScGridWindow* pWin = pGridWin[i];
@@ -533,7 +533,7 @@ void ScTabView::InterpretVisible()
         return;
 
     SCTAB nTab = aViewData.GetTabNo();
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
     {
         //	rely on gridwin pointers to find used panes
         //	no IsVisible test in case the whole view is not yet shown
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 8c31f82b3..5f32a6f60 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -78,9 +78,9 @@ void __EXPORT ScTabView::Init()
         the sheet orientation, not the UI setting. Note: controls that are
         already constructed (e.g. scroll bars) have the RTL setting of the GUI.
         Eventually this has to be disabled manually (see below). */
-    pFrameWin->EnableRTL( FALSE );
+    pFrameWin->EnableRTL( sal_False );
 
-    USHORT i;
+    sal_uInt16 i;
 
     aScrollTimer.SetTimeout(10);
     aScrollTimer.SetTimeoutHdl( LINK( this, ScTabView, TimerHdl ) );
@@ -149,7 +149,7 @@ void __EXPORT ScTabView::Init()
 
 __EXPORT ScTabView::~ScTabView()
 {
-    USHORT i;
+    sal_uInt16 i;
 
     //	remove selection object
     ScModule* pScMod = SC_MOD();
@@ -208,14 +208,14 @@ __EXPORT ScTabView::~ScTabView()
     delete pTabControl;
 }
 
-void ScTabView::MakeDrawView( BYTE nForceDesignMode )
+void ScTabView::MakeDrawView( sal_uInt8 nForceDesignMode )
 {
     if (!pDrawView)
     {
         ScDrawLayer* pLayer = aViewData.GetDocument()->GetDrawLayer();
         DBG_ASSERT(pLayer, "wo ist der Draw Layer ??");
 
-        USHORT i;
+        sal_uInt16 i;
         pDrawView = new ScDrawView( pGridWin[SC_SPLIT_BOTTOMLEFT], &aViewData );
         for (i=0; i<4; i++)
             if (pGridWin[i])
@@ -240,7 +240,7 @@ void ScTabView::MakeDrawView( BYTE nForceDesignMode )
         //	#106334# used when switching back from page preview: restore saved design mode state
         //	(otherwise, keep the default from the draw view ctor)
         if ( nForceDesignMode != SC_FORCEMODE_NONE )
-            pDrawView->SetDesignMode( (BOOL)nForceDesignMode );
+            pDrawView->SetDesignMode( (sal_Bool)nForceDesignMode );
 
         //	an der FormShell anmelden
         FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell();
@@ -273,7 +273,7 @@ void ScTabView::TabChanged( bool bSameTabButMoved )
     {
         DrawDeselectAll();		// beendet auch Text-Edit-Modus
 
-        USHORT i;
+        sal_uInt16 i;
         for (i=0; i<4; i++)
             if (pGridWin[i])
                 pDrawView->VCRemoveWin(pGridWin[i]);	// fuer alte Page
@@ -296,7 +296,7 @@ void ScTabView::TabChanged( bool bSameTabButMoved )
 
     //	Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren
     //	(fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles...
-    rBindings.InvalidateAll(FALSE);
+    rBindings.InvalidateAll(sal_False);
 
 #if 0
     rBindings.Invalidate( SID_SELECT_SCENARIO );
@@ -349,10 +349,10 @@ void ScTabView::UpdateLayerLocks()
     if (pDrawView)
     {
         SCTAB nTab = aViewData.GetTabNo();
-        BOOL bEx = aViewData.GetViewShell()->IsDrawSelMode();
-        BOOL bProt = aViewData.GetDocument()->IsTabProtected( nTab ) ||
+        sal_Bool bEx = aViewData.GetViewShell()->IsDrawSelMode();
+        sal_Bool bProt = aViewData.GetDocument()->IsTabProtected( nTab ) ||
                      aViewData.GetSfxDocShell()->IsReadOnly();
-        BOOL bShared = aViewData.GetDocShell()->IsDocShared();
+        sal_Bool bShared = aViewData.GetDocShell()->IsDocShared();
 
         SdrLayer* pLayer;
         SdrLayerAdmin& rAdmin = pDrawView->GetModel()->GetLayerAdmin();
@@ -361,7 +361,7 @@ void ScTabView::UpdateLayerLocks()
             pDrawView->SetLayerLocked( pLayer->GetName(), bProt || !bEx || bShared );
         pLayer = rAdmin.GetLayerPerID(SC_LAYER_INTERN);
         if (pLayer)
-            pDrawView->SetLayerLocked( pLayer->GetName(), TRUE );
+            pDrawView->SetLayerLocked( pLayer->GetName(), sal_True );
         pLayer = rAdmin.GetLayerPerID(SC_LAYER_FRONT);
         if (pLayer)
             pDrawView->SetLayerLocked( pLayer->GetName(), bProt || bShared );
@@ -394,16 +394,16 @@ void ScTabView::DrawDeselectAll()
         pDrawView->UnmarkAll();
 
         if (!pViewSh->IsDrawSelMode())
-            pViewSh->SetDrawShell( FALSE );
+            pViewSh->SetDrawShell( sal_False );
     }
 }
 
-BOOL ScTabView::IsDrawTextEdit() const
+sal_Bool ScTabView::IsDrawTextEdit() const
 {
     if (pDrawView)
         return pDrawView->IsTextEdit();
     else
-        return FALSE;
+        return sal_False;
 }
 
 //UNUSED2008-05  String ScTabView::GetSelectedChartName() const
@@ -419,12 +419,12 @@ SvxZoomType ScTabView::GetZoomType() const
     return aViewData.GetZoomType();
 }
 
-void ScTabView::SetZoomType( SvxZoomType eNew, BOOL bAll )
+void ScTabView::SetZoomType( SvxZoomType eNew, sal_Bool bAll )
 {
     aViewData.SetZoomType( eNew, bAll );
 }
 
-void ScTabView::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll )
+void ScTabView::SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll )
 {
     aViewData.SetZoom( rNewX, rNewY, bAll );
     if (pDrawView)
@@ -440,7 +440,7 @@ void ScTabView::RefreshZoom()
     ZoomChanged();
 }
 
-void ScTabView::SetPagebreakMode( BOOL bSet )
+void ScTabView::SetPagebreakMode( sal_Bool bSet )
 {
     aViewData.SetPagebreakMode(bSet);
     if (pDrawView)
@@ -454,7 +454,7 @@ void ScTabView::ResetDrawDragMode()
         pDrawView->SetDragMode( SDRDRAG_MOVE );
 }
 
-void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChanged )
+void ScTabView::ViewOptionsHasChanged( sal_Bool bHScrollChanged, sal_Bool bGraphicsChanged )
 {
     //	DrawView erzeugen, wenn Gitter angezeigt werden soll
     if ( !pDrawView && aViewData.GetOptions().GetGridOptions().GetGridVisible() )
@@ -464,13 +464,13 @@ void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChang
         pDrawView->UpdateUserViewOptions();
 
     if (bGraphicsChanged)
-        DrawEnableAnim(TRUE);	// DrawEnableAnim checks the options state
+        DrawEnableAnim(sal_True);	// DrawEnableAnim checks the options state
 
     // if TabBar is set to visible, make sure its size is not 0
-    BOOL bGrow = ( aViewData.IsTabMode() && pTabControl->GetSizePixel().Width() <= 0 );
+    sal_Bool bGrow = ( aViewData.IsTabMode() && pTabControl->GetSizePixel().Width() <= 0 );
 
     // if ScrollBar is set to visible, TabBar must make room
-    BOOL bShrink = ( bHScrollChanged && aViewData.IsTabMode() && aViewData.IsHScrollMode() &&
+    sal_Bool bShrink = ( bHScrollChanged && aViewData.IsTabMode() && aViewData.IsHScrollMode() &&
                         pTabControl->GetSizePixel().Width() > SC_TABBAR_DEFWIDTH );
 
     if ( bGrow || bShrink )
@@ -510,14 +510,14 @@ void ScTabView::DrawMarkRect( const Rectangle& rRect )
 {
     //!	store rectangle for repaint during drag
 
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
     {
         if ( pGridWin[i] && pGridWin[i]->IsVisible() )
         {
             RasterOp aROp = pGridWin[i]->GetRasterOp();
-            BOOL bHasLine = pGridWin[i]->IsLineColor();
+            sal_Bool bHasLine = pGridWin[i]->IsLineColor();
             Color aLine	  = pGridWin[i]->GetLineColor();
-            BOOL bHasFill = pGridWin[i]->IsFillColor();
+            sal_Bool bHasFill = pGridWin[i]->IsFillColor();
             Color aFill   = pGridWin[i]->GetFillColor();
 
             pGridWin[i]->SetRasterOp( ROP_INVERT );
@@ -539,9 +539,9 @@ void ScTabView::DrawMarkRect( const Rectangle& rRect )
     }
 }
 
-void ScTabView::DrawEnableAnim(BOOL bSet)
+void ScTabView::DrawEnableAnim(sal_Bool bSet)
 {
-    USHORT i;
+    sal_uInt16 i;
     if ( pDrawView )
     {
         //	#71040# dont start animations if display of graphics is disabled
@@ -550,7 +550,7 @@ void ScTabView::DrawEnableAnim(BOOL bSet)
         {
             if ( !pDrawView->IsAnimationEnabled() )
             {
-                pDrawView->SetAnimationEnabled(TRUE);
+                pDrawView->SetAnimationEnabled(sal_True);
 
                 //	Animierte GIFs muessen wieder gestartet werden:
                 ScDocument* pDoc = aViewData.GetDocument();
@@ -561,12 +561,12 @@ void ScTabView::DrawEnableAnim(BOOL bSet)
         }
         else
         {
-            pDrawView->SetAnimationEnabled(FALSE);
+            pDrawView->SetAnimationEnabled(sal_False);
         }
     }
 }
 
-//HMHvoid ScTabView::DrawShowMarkHdl(BOOL bShow)
+//HMHvoid ScTabView::DrawShowMarkHdl(sal_Bool bShow)
 //HMH{
     //HMHif (!pDrawView)
     //HMH	return;
@@ -593,7 +593,7 @@ void ScTabView::UpdateDrawTextOutliner()
 void ScTabView::DigitLanguageChanged()
 {
     LanguageType eNewLang = SC_MOD()->GetOptDigitLanguage();
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if ( pGridWin[i] )
             pGridWin[i]->SetDigitLanguage( eNewLang );
 }
@@ -684,7 +684,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect )
 
 //---------------------------------------------------------------
 
-void ScTabView::SetBrushDocument( ScDocument* pNew, BOOL bLock )
+void ScTabView::SetBrushDocument( ScDocument* pNew, sal_Bool bLock )
 {
     delete pBrushDocument;
     delete pDrawBrushSet;
@@ -697,7 +697,7 @@ void ScTabView::SetBrushDocument( ScDocument* pNew, BOOL bLock )
     aViewData.GetBindings().Invalidate(SID_FORMATPAINTBRUSH);
 }
 
-void ScTabView::SetDrawBrushSet( SfxItemSet* pNew, BOOL bLock )
+void ScTabView::SetDrawBrushSet( SfxItemSet* pNew, sal_Bool bLock )
 {
     delete pBrushDocument;
     delete pDrawBrushSet;
@@ -714,7 +714,7 @@ void ScTabView::ResetBrushDocument()
 {
     if ( HasPaintBrush() )
     {
-        SetBrushDocument( NULL, FALSE );
+        SetBrushDocument( NULL, sal_False );
         SetActivePointer( Pointer( POINTER_ARROW ) );   // switch pointers also when ended with escape key
     }
 }
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index b6cd897da..9f3f203ea 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -57,9 +57,6 @@
 #define ScTabViewShell
 #include "scslots.hxx"
 
-#define	SearchSettings
-#include <svx/svxslots.hxx>
-
 TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener);
 
 SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 7b4bc6899..d98e50a2d 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -107,7 +107,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     SdrModel*	pDoc	= pView->GetModel();
 
     const SfxItemSet *pArgs = rReq.GetArgs();
-    USHORT nNewId = rReq.GetSlot();
+    sal_uInt16 nNewId = rReq.GetSlot();
 
     if ( nNewId == SID_DRAW_CHART )
     {
@@ -124,7 +124,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     if (nNewId == SID_INSERT_DRAW && pArgs)
     {
         const SfxPoolItem* pItem;
-        if ( pArgs->GetItemState( SID_INSERT_DRAW, TRUE, &pItem ) == SFX_ITEM_SET &&
+        if ( pArgs->GetItemState( SID_INSERT_DRAW, sal_True, &pItem ) == SFX_ITEM_SET &&
              pItem->ISA( SvxDrawToolItem ) )
         {
             SvxDrawToolEnum eSel = (SvxDrawToolEnum)((const SvxDrawToolItem*)pItem)->GetValue();
@@ -147,7 +147,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
                 case SVX_SNAP_DRAW_CAPTION_VERTICAL: nNewId = SID_DRAW_CAPTION_VERTICAL; break;
             }
         }
-        else                    // USHORT-Item vom Controller
+        else                    // sal_uInt16-Item vom Controller
         {
             rReq.Done();
             return;
@@ -157,11 +157,11 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     if ( nNewId == SID_DRAW_SELECT )
         nNewId = SID_OBJECT_SELECT;
 
-    USHORT nNewFormId = 0;
+    sal_uInt16 nNewFormId = 0;
     if ( nNewId == SID_FM_CREATE_CONTROL && pArgs )
     {
         const SfxPoolItem* pItem;
-        if ( pArgs->GetItemState( SID_FM_CONTROL_IDENTIFIER, TRUE, &pItem ) == SFX_ITEM_SET &&
+        if ( pArgs->GetItemState( SID_FM_CONTROL_IDENTIFIER, sal_True, &pItem ) == SFX_ITEM_SET &&
              pItem->ISA( SfxUInt16Item ) )
             nNewFormId = ((const SfxUInt16Item*)pItem)->GetValue();
     }
@@ -170,7 +170,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     if ( pArgs )
     {
         const SfxPoolItem* pItem;
-        if ( pArgs->GetItemState( nNewId, TRUE, &pItem ) == SFX_ITEM_SET && pItem->ISA( SfxStringItem ) )
+        if ( pArgs->GetItemState( nNewId, sal_True, &pItem ) == SFX_ITEM_SET && pItem->ISA( SfxStringItem ) )
             sStringItemValue = static_cast<const SfxStringItem*>(pItem)->GetValue();
     }
     bool bSwitchCustom = ( sStringItemValue.Len() && sDrawCustom.Len() && sStringItemValue != sDrawCustom );
@@ -181,15 +181,15 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     //	#97016# CTRL-SID_OBJECT_SELECT is used to select the first object,
     //	but not if SID_OBJECT_SELECT is the result of clicking a create function again,
     //	so this must be tested before changing nNewId below.
-    BOOL bSelectFirst = ( nNewId == SID_OBJECT_SELECT && (rReq.GetModifier() & KEY_MOD1) );
+    sal_Bool bSelectFirst = ( nNewId == SID_OBJECT_SELECT && (rReq.GetModifier() & KEY_MOD1) );
 
-    BOOL bEx = IsDrawSelMode();
+    sal_Bool bEx = IsDrawSelMode();
     if ( rReq.GetModifier() & KEY_MOD1 )
     {
         //	#97016# always allow keyboard selection also on background layer
         //	#98185# also allow creation of default objects if the same object type
         //	was already active
-        bEx = TRUE;
+        bEx = sal_True;
     }
     else if ( nNewId == nDrawSfxId && ( nNewId != SID_FM_CREATE_CONTROL ||
                                     nNewFormId == nFormSfxId || nNewFormId == 0 ) && !bSwitchCustom )
@@ -203,7 +203,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
         if ( nNewId == SID_FM_CREATE_CONTROL )
         {
             GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE);
-            GetViewFrame()->GetBindings().InvalidateAll(FALSE);
+            GetViewFrame()->GetBindings().InvalidateAll(sal_False);
             //!	was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen????
         }
 
@@ -211,13 +211,13 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
         nNewId = SID_OBJECT_SELECT;
     }
     else
-        bEx = TRUE;
+        bEx = sal_True;
 
     if ( nDrawSfxId == SID_FM_CREATE_CONTROL && nNewId != nDrawSfxId )
     {
         //	Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren
         GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE);
-        GetViewFrame()->GetBindings().InvalidateAll(FALSE);
+        GetViewFrame()->GetBindings().InvalidateAll(sal_False);
         //!	was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen????
     }
 
@@ -232,7 +232,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
         {
             // select first object
             pView->UnmarkAllObj();
-            pView->MarkNextObj(TRUE);
+            pView->MarkNextObj(sal_True);
 
             // ...and make it visible
             if(pView->AreObjectsMarked())
@@ -247,13 +247,13 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
     {
         if ( nNewId == SID_DRAW_TEXT || nNewId == SID_DRAW_TEXT_VERTICAL ||
                 nNewId == SID_DRAW_TEXT_MARQUEE || nNewId == SID_DRAW_NOTEEDIT )
-            SetDrawTextShell( TRUE );
+            SetDrawTextShell( sal_True );
         else
         {
             if ( bEx || pView->GetMarkedObjectList().GetMarkCount() != 0 )
                 SetDrawShellOrSub();
             else
-                SetDrawShell( FALSE );
+                SetDrawShell( sal_False );
         }
     }
 
@@ -287,7 +287,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
         case SID_DRAW_CAPTION:
         case SID_DRAW_CAPTION_VERTICAL:
             pTabView->SetDrawFuncPtr(new FuConstRectangle(this, pWin, pView, pDoc, aNewReq));
-            pView->SetFrameDragSingles( FALSE );
+            pView->SetFrameDragSingles( sal_False );
             rBindings.Invalidate( SID_BEZIER_EDIT );
             break;
 
@@ -312,13 +312,13 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
             break;
 
         case SID_FM_CREATE_CONTROL:
-            SetDrawFormShell(TRUE);
+            SetDrawFormShell(sal_True);
             pTabView->SetDrawFuncPtr(new FuConstUnoControl(this, pWin, pView, pDoc, aNewReq));
             nFormSfxId = nNewFormId;
             break;
 
         case SID_DRAW_CHART:
-//UNUSED2008-05  bChartDlgIsEdit = FALSE;
+//UNUSED2008-05  bChartDlgIsEdit = sal_False;
             pTabView->SetDrawFuncPtr(new FuMarkRect(this, pWin, pView, pDoc, aNewReq));
             break;
 
@@ -410,7 +410,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
 {
     SfxWhichIter	aIter(rSet);
-    USHORT			nWhich = aIter.FirstWhich();
+    sal_uInt16			nWhich = aIter.FirstWhich();
 
     while ( nWhich )
     {
@@ -419,7 +419,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
             case SID_INSERT_DRAW:
                 {
                     //	SID_OBJECT_SELECT nur, wenn "harter" Selektionsmodus
-                    USHORT nPutId = nDrawSfxId;
+                    sal_uInt16 nPutId = nDrawSfxId;
                     if ( nPutId == SID_OBJECT_SELECT && !IsDrawSelMode() )
                         nPutId = USHRT_MAX;
                     // nur die Images, die auch auf dem Controller liegen
@@ -451,7 +451,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
 
             case SID_DRAW_CHART:
                 {
-                    BOOL bOle = GetViewFrame()->GetFrame().IsInPlace();
+                    sal_Bool bOle = GetViewFrame()->GetFrame().IsInPlace();
                     if ( bOle || !SvtModuleOptions().IsChart() )
                         rSet.DisableItem( nWhich );
                 }
@@ -465,13 +465,13 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
     }
 }
 
-BOOL ScTabViewShell::SelectObject( const String& rName )
+sal_Bool ScTabViewShell::SelectObject( const String& rName )
 {
     ScDrawView* pView = GetViewData()->GetScDrawView();
     if (!pView)
-        return FALSE;
+        return sal_False;
 
-    BOOL bFound = pView->SelectObject( rName );
+    sal_Bool bFound = pView->SelectObject( rName );
     // DrawShell etc. is handled in MarkListHasChanged
 
     return bFound;
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index b3c9bfa48..8608b7dd1 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -89,7 +89,7 @@ using ::std::auto_ptr;
 
 #define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
 #define IS_AVAILABLE(WhichId,ppItem) \
-    (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+    (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 #define GET_STRING(nid) ((const SfxStringItem&)pReqArgs->Get(nid)).GetValue()
 #define GET_UINT16(nid) ((const SfxUInt16Item&)pReqArgs->Get(nid)).GetValue()
 #define GET_BOOL(nid)   ((const SfxBoolItem&)pReqArgs->Get(nid)).GetValue()
@@ -99,9 +99,9 @@ using ::std::auto_ptr;
 
 /** Try to parse the given range using Calc-style syntax first, then
     Excel-style if that fails. */
-USHORT lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* pDoc, USHORT /* nSlot */)
+sal_uInt16 lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */)
 {
-    USHORT nResult = rScRange.Parse(aAddress, pDoc);
+    sal_uInt16 nResult = rScRange.Parse(aAddress, pDoc);
     if ( (nResult & SCA_VALID) )
         return nResult;
 
@@ -110,9 +110,9 @@ USHORT lcl_ParseRange(ScRange& rScRange, const String& aAddress, ScDocument* pDo
 
 /** Try to parse the given address using Calc-style syntax first, then
     Excel-style if that fails. */
-USHORT lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocument* pDoc, USHORT /* nSlot */)
+sal_uInt16 lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */)
 {
-    USHORT nResult = rScAddress.Parse(aAddress, pDoc);
+    sal_uInt16 nResult = rScAddress.Parse(aAddress, pDoc);
     if ( (nResult & SCA_VALID) )
         return nResult;
 
@@ -125,7 +125,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
     SfxBindings&		rBindings	= pThisFrame->GetBindings();
     ScModule*			pScMod		= SC_MOD();
     const SfxItemSet*	pReqArgs	= rReq.GetArgs();
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
 
     if (nSlot != SID_CURRENTCELL)		// der kommt beim MouseButtonUp
         HideListBox();					// Autofilter-DropDown-Listbox
@@ -136,22 +136,22 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             {
                 const SfxPoolItem* pItem;
                 if ( pReqArgs &&
-                     pReqArgs->GetItemState(FID_INSERT_FILE,TRUE,&pItem) == SFX_ITEM_SET )
+                     pReqArgs->GetItemState(FID_INSERT_FILE,sal_True,&pItem) == SFX_ITEM_SET )
                 {
                     String aFileName = ((const SfxStringItem*)pItem)->GetValue();
 
                         // Einfuege-Position
 
                     Point aInsertPos;
-                    if ( pReqArgs->GetItemState(FN_PARAM_1,TRUE,&pItem) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState(FN_PARAM_1,sal_True,&pItem) == SFX_ITEM_SET )
                         aInsertPos = ((const SfxPointItem*)pItem)->GetValue();
                     else
                         aInsertPos = GetInsertPos();
 
                         //	als Link?
 
-                    BOOL bAsLink = FALSE;
-                    if ( pReqArgs->GetItemState(FN_PARAM_2,TRUE,&pItem) == SFX_ITEM_SET )
+                    sal_Bool bAsLink = sal_False;
+                    if ( pReqArgs->GetItemState(FN_PARAM_2,sal_True,&pItem) == SFX_ITEM_SET )
                         bAsLink = ((const SfxBoolItem*)pItem)->GetValue();
 
                         // ausfuehren
@@ -163,10 +163,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
         case SID_OPENDLG_EDIT_PRINTAREA:
             {
-                USHORT			nId  = ScPrintAreasDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScPrintAreasDlgWrapper::GetChildWindowId();
                 SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
             }
             break;
 
@@ -177,18 +177,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     String aPrintStr;
                     String aRowStr;
                     String aColStr;
-                    BOOL bEntire = FALSE;
+                    sal_Bool bEntire = sal_False;
                     const SfxPoolItem* pItem;
-                    if ( pReqArgs->GetItemState( SID_CHANGE_PRINTAREA, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( SID_CHANGE_PRINTAREA, sal_True, &pItem ) == SFX_ITEM_SET )
                         aPrintStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
-                    if ( pReqArgs->GetItemState( FN_PARAM_2, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( FN_PARAM_2, sal_True, &pItem ) == SFX_ITEM_SET )
                         aRowStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
-                    if ( pReqArgs->GetItemState( FN_PARAM_3, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( FN_PARAM_3, sal_True, &pItem ) == SFX_ITEM_SET )
                         aColStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
-                    if ( pReqArgs->GetItemState( FN_PARAM_4, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( FN_PARAM_4, sal_True, &pItem ) == SFX_ITEM_SET )
                         bEntire = static_cast<const SfxBoolItem*>(pItem)->GetValue();
 
-                    SetPrintRanges( bEntire, &aPrintStr, &aColStr, &aRowStr, FALSE );
+                    SetPrintRanges( bEntire, &aPrintStr, &aColStr, &aRowStr, sal_False );
 
                     rReq.Done();
                 }
@@ -198,18 +198,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
         case SID_ADD_PRINTAREA:
         case SID_DEFINE_PRINTAREA:		// Menue oder Basic
             {
-                BOOL bAdd = ( nSlot == SID_ADD_PRINTAREA );
+                sal_Bool bAdd = ( nSlot == SID_ADD_PRINTAREA );
                 if ( pReqArgs )
                 {
                     String aPrintStr;
                     const SfxPoolItem* pItem;
-                    if ( pReqArgs->GetItemState( SID_DEFINE_PRINTAREA, TRUE, &pItem ) == SFX_ITEM_SET )
+                    if ( pReqArgs->GetItemState( SID_DEFINE_PRINTAREA, sal_True, &pItem ) == SFX_ITEM_SET )
                         aPrintStr = static_cast<const SfxStringItem*>(pItem)->GetValue();
-                    SetPrintRanges( FALSE, &aPrintStr, NULL, NULL, bAdd );
+                    SetPrintRanges( sal_False, &aPrintStr, NULL, NULL, bAdd );
                 }
                 else
                 {
-                    SetPrintRanges( FALSE, NULL, NULL, NULL, bAdd );      // aus Selektion
+                    SetPrintRanges( sal_False, NULL, NULL, NULL, bAdd );      // aus Selektion
                     rReq.Done();
                 }
             }
@@ -218,7 +218,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
         case SID_DELETE_PRINTAREA:
             {
                 String aEmpty;
-                SetPrintRanges( FALSE, &aEmpty, NULL, NULL, FALSE );        // Druckbereich loeschen
+                SetPrintRanges( sal_False, &aEmpty, NULL, NULL, sal_False );        // Druckbereich loeschen
                 rReq.Done();
             }
             break;
@@ -251,18 +251,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             {
                 String aAddress;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
                     aAddress = ((const SfxStringItem*)pItem)->GetValue();
                 else if ( nSlot == SID_JUMPTOMARK && pReqArgs->GetItemState(
-                                            SID_JUMPTOMARK, TRUE, &pItem ) == SFX_ITEM_SET )
+                                            SID_JUMPTOMARK, sal_True, &pItem ) == SFX_ITEM_SET )
                     aAddress = ((const SfxStringItem*)pItem)->GetValue();
 
                 //	#i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1
                 //	isn't set (for recorded macros, because IsAPI is no longer available).
                 //	ScGridWindow::MouseButtonUp no longer executes the slot for a single
                 //	cell if there is a multi selection.
-                BOOL bUnmark = ( nSlot == SID_CURRENTCELL );
-                if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
+                sal_Bool bUnmark = ( nSlot == SID_CURRENTCELL );
+                if ( pReqArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET )
                     bUnmark = ((const SfxBoolItem*)pItem)->GetValue();
 
                 if ( nSlot == SID_JUMPTOMARK )
@@ -273,15 +273,15 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                                             RTL_TEXTENCODING_UTF8 );
                 }
 
-                BOOL bFound = FALSE;
+                sal_Bool bFound = sal_False;
                 ScViewData* pViewData = GetViewData();
                 ScDocument* pDoc	  = pViewData->GetDocument();
                 ScMarkData& rMark	  = pViewData->GetMarkData();
                 ScRange		aScRange;
                 ScAddress	aScAddress;
-                USHORT      nResult = lcl_ParseRange(aScRange, aAddress, pDoc, nSlot);
+                sal_uInt16      nResult = lcl_ParseRange(aScRange, aAddress, pDoc, nSlot);
                 SCTAB		nTab = pViewData->GetTabNo();
-                BOOL		bMark = TRUE;
+                sal_Bool		bMark = sal_True;
 
                 // Is this a range ?
                 if( nResult & SCA_VALID )
@@ -310,7 +310,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
                     aScRange = ScRange( aScAddress, aScAddress );
                     // Zellen sollen nicht markiert werden
-                    bMark = FALSE;
+                    bMark = sal_False;
                 }
                 // Ist es benahmster Bereich (erst Namen dann DBBereiche) ?
                 else
@@ -338,7 +338,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                         aScAddress.SetCol( pViewData->GetCurX() );
                         aScAddress.SetTab( nTab );
                         aScRange = ScRange( aScAddress, aScAddress );
-                        bMark	 = FALSE;
+                        bMark	 = sal_False;
                         nResult  = SCA_VALID;
                     }
                 }
@@ -349,10 +349,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 // wir haben was gefunden
                 if( nResult & SCA_VALID )
                 {
-                    bFound = TRUE;
+                    bFound = sal_True;
                     SCCOL nCol = aScRange.aStart.Col();
                     SCROW nRow = aScRange.aStart.Row();
-                    BOOL bNothing = ( pViewData->GetCurX()==nCol && pViewData->GetCurY()==nRow );
+                    sal_Bool bNothing = ( pViewData->GetCurX()==nCol && pViewData->GetCurY()==nRow );
 
                     // markieren
                     if( bMark )
@@ -367,18 +367,18 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                             bNothing = ( aCurrent == aOldMark );
                         }
                         else
-                            bNothing = FALSE;
+                            bNothing = sal_False;
 
                         if (!bNothing)
-                            MarkRange( aScRange, FALSE );	// Cursor kommt hinterher...
+                            MarkRange( aScRange, sal_False );	// Cursor kommt hinterher...
                     }
                     else
                     {
-                        //	remove old selection, unless bUnmark argument is FALSE (from navigator)
+                        //	remove old selection, unless bUnmark argument is sal_False (from navigator)
                         if( bUnmark )
                         {
                             MoveCursorAbs( nCol, nRow,
-                                SC_FOLLOW_NONE, FALSE, FALSE );
+                                SC_FOLLOW_NONE, sal_False, sal_False );
                         }
                     }
 
@@ -421,7 +421,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     SCTAB nNameTab;
                     if ( pDoc->GetTable( aAddress, nNameTab ) )
                     {
-                        bFound = TRUE;
+                        bFound = sal_True;
                         if ( nNameTab != nTab )
                             SetTabNo( nNameTab );
                     }
@@ -473,7 +473,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
                 SfxViewFrame*	pViewFrame = NULL;
                 ScDocShell* 	pDocSh = (ScDocShell*)SfxObjectShell::GetFirst();
-                BOOL			bFound = FALSE;
+                sal_Bool			bFound = sal_False;
 
                 // zu aktivierenden ViewFrame suchen
 
@@ -538,13 +538,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
         case FID_NORMALVIEWMODE:
         case FID_PAGEBREAKMODE:
             {
-                BOOL bWantPageBreak = nSlot == FID_PAGEBREAKMODE;
+                sal_Bool bWantPageBreak = nSlot == FID_PAGEBREAKMODE;
 
                 // check whether there is an explicit argument, use it
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
                 {
-                    BOOL bItemValue = ((const SfxBoolItem*)pItem)->GetValue();
+                    sal_Bool bItemValue = ((const SfxBoolItem*)pItem)->GetValue();
                     bWantPageBreak = (nSlot == FID_PAGEBREAKMODE) == bItemValue;
                 }
 
@@ -552,12 +552,12 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 {
                     SetPagebreakMode( bWantPageBreak );
                     UpdatePageBreakData();
-                    SetCurSubShell( GetCurObjectSelectionType(), TRUE );
+                    SetCurSubShell( GetCurObjectSelectionType(), sal_True );
                     PaintGrid();
                     PaintTop();
                     PaintLeft();
                     rBindings.Invalidate( nSlot );
-                    rReq.AppendItem( SfxBoolItem( nSlot, TRUE ) );
+                    rReq.AppendItem( SfxBoolItem( nSlot, sal_True ) );
                     rReq.Done();
                 }
             }
@@ -565,7 +565,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
         case FID_FUNCTION_BOX:
             {
-                USHORT nChildId = ScFunctionChildWindow::GetChildWindowId();
+                sal_uInt16 nChildId = ScFunctionChildWindow::GetChildWindowId();
                 if ( rReq.GetArgs() )
                     pThisFrame->SetChildWindow( nChildId, ((const SfxBoolItem&) (rReq.GetArgs()->Get(FID_FUNCTION_BOX))).GetValue());
                 else
@@ -582,9 +582,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
         case FID_TOGGLESYNTAX:
             {
-                BOOL bSet = !GetViewData()->IsSyntaxMode();
+                sal_Bool bSet = !GetViewData()->IsSyntaxMode();
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
                     bSet = ((const SfxBoolItem*)pItem)->GetValue();
                 GetViewData()->SetSyntaxMode( bSet );
                 PaintGrid();
@@ -595,9 +595,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             break;
         case FID_TOGGLEHEADERS:
             {
-                BOOL bSet = !GetViewData()->IsHeaderMode();
+                sal_Bool bSet = !GetViewData()->IsHeaderMode();
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
                     bSet = ((const SfxBoolItem*)pItem)->GetValue();
                 GetViewData()->SetHeaderMode( bSet );
                 RepeatResize();
@@ -611,9 +611,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             {
                 ScViewData* pViewData = GetViewData();
                 const ScViewOptions& rOpts = pViewData->GetOptions();
-                BOOL bFormulaMode = !rOpts.GetOption( VOPT_FORMULAS );
+                sal_Bool bFormulaMode = !rOpts.GetOption( VOPT_FORMULAS );
                 const SfxPoolItem *pItem;
-                if( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+                if( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
                     bFormulaMode = ((const SfxBoolItem *)pItem)->GetValue();
 
                 ScViewOptions rSetOpts = ScViewOptions( rOpts );
@@ -630,11 +630,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
         case FID_TOGGLEINPUTLINE:
             {
-                USHORT			nId  = ScInputWindowWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScInputWindowWrapper::GetChildWindowId();
                 SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
-                BOOL bSet = ( pWnd == NULL );
+                sal_Bool bSet = ( pWnd == NULL );
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
                     bSet = ((const SfxBoolItem*)pItem)->GetValue();
 
                 pThisFrame->SetChildWindow( nId, bSet );
@@ -647,14 +647,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
         case SID_ATTR_ZOOM: // Statuszeile
         case FID_SCALE:
             {
-                BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
+                sal_Bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
                 SvxZoomType	eOldZoomType = GetZoomType();
                 SvxZoomType	eNewZoomType = eOldZoomType;
                 const Fraction& rOldY = GetViewData()->GetZoomY();	// Y wird angezeigt
-                USHORT nOldZoom = (USHORT)(( rOldY.GetNumerator() * 100 )
+                sal_uInt16 nOldZoom = (sal_uInt16)(( rOldY.GetNumerator() * 100 )
                                             / rOldY.GetDenominator());
-                USHORT nZoom = nOldZoom;
-                BOOL bCancel = FALSE;
+                sal_uInt16 nZoom = nOldZoom;
+                sal_Bool bCancel = sal_False;
 
                 if ( pReqArgs )
                 {
@@ -671,7 +671,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     //CHINA001 SvxZoomDialog*	pDlg = NULL;
                     AbstractSvxZoomDialog* pDlg = NULL;
                     ScMarkData&		rMark = GetViewData()->GetMarkData();
-                    USHORT			nBtnFlags =   SVX_ZOOM_ENABLE_50
+                    sal_uInt16			nBtnFlags =   SVX_ZOOM_ENABLE_50
                                                 | SVX_ZOOM_ENABLE_75
                                                 | SVX_ZOOM_ENABLE_100
                                                 | SVX_ZOOM_ENABLE_150
@@ -757,10 +757,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
         case SID_ATTR_ZOOMSLIDER:
             {
                 const SfxPoolItem* pItem = NULL;
-                BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
-                if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, TRUE, &pItem) == SFX_ITEM_SET )
+                sal_Bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
+                if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem) == SFX_ITEM_SET )
                 {
-                    const USHORT nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue();
+                    const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue();
                     if( nCurrentZoom )
                     {
                         SetZoomType( SVX_ZOOM_PERCENT, bSyncZoom );
@@ -900,7 +900,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL )		// aufheben
                     RemoveSplit();
                 else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX )		// normal
-                    FreezeSplitters( FALSE );
+                    FreezeSplitters( sal_False );
                 else																// erzeugen
                     SplitAtCursor();
                 rReq.Done();
@@ -916,7 +916,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX )			// aufheben
                     RemoveSplit();
                 else
-                    FreezeSplitters( TRUE );		// erzeugen oder fixieren
+                    FreezeSplitters( sal_True );		// erzeugen oder fixieren
                 rReq.Done();
 
                 InvalidateSplit();
@@ -927,10 +927,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 
         case FID_CHG_SHOW:
             {
-                USHORT			nId  = ScHighlightChgDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScHighlightChgDlgWrapper::GetChildWindowId();
                 SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
             }
             break;
 
@@ -941,10 +941,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 rReq.Done ();
 
                 /*
-                USHORT			nId  = ScAcceptChgDlgWrapper::GetChildWindowId();
+                sal_uInt16			nId  = ScAcceptChgDlgWrapper::GetChildWindowId();
                 SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
 
-                pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+                pScMod->SetRefDialog( nId, pWnd ? sal_False : sal_True );
                 */
             }
             break;
@@ -960,7 +960,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 {
                     const SfxPoolItem* pItem;
                     if ( pReqArgs &&
-                         pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET &&
+                         pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET &&
                          pItem->ISA( SfxStringItem ) )
                     {
                         String aComment = ((const SfxStringItem*)pItem)->GetValue();
@@ -982,7 +982,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             if (!GetScDrawView())
             {
                 GetViewData()->GetDocShell()->MakeDrawLayer();
-                rBindings.InvalidateAll(FALSE);
+                rBindings.InvalidateAll(sal_False);
             }
             break;
 
@@ -1005,7 +1005,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 ScDocProtection* pProtect = pDoc->GetDocProtection();
                 if (pProtect && pProtect->isProtected())
                 {
-                    BOOL	bCancel = FALSE;
+                    sal_Bool	bCancel = sal_False;
                     String	aPassword;
 
                     if (pProtect->isProtectedWithPass())
@@ -1021,13 +1021,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                         if (pDlg->Execute() == RET_OK)
                             aPassword = pDlg->GetPassword();
                         else
-                            bCancel = TRUE;
+                            bCancel = sal_True;
                         delete pDlg;
                     }
                     if (!bCancel)
                     {
                         Unprotect( TABLEID_DOC, aPassword );
-                        rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, FALSE ) );
+                        rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, sal_False ) );
                         rReq.Done();
                     }
                 }
@@ -1046,7 +1046,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     {
                         String aPassword = pDlg->GetPassword();
                         Protect( TABLEID_DOC, aPassword );
-                        rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, TRUE ) );
+                        rReq.AppendItem( SfxBoolItem( FID_PROTECT_DOC, sal_True ) );
                         rReq.Done();
                     }
 
@@ -1135,7 +1135,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 #else
             auto_ptr<SfxPasswordDialog> pDlg;
             String				aPassword;
-            BOOL				bCancel = FALSE;
+            sal_Bool				bCancel = sal_False;
             bool                bNewProtection = ! bOldProtection;
 
             if( pReqArgs )
@@ -1167,7 +1167,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     if (pDlg->Execute() == RET_OK)
                         aPassword = pDlg->GetPassword();
                     else
-                        bCancel = TRUE;
+                        bCancel = sal_True;
                 }
 
                 if (!pReqArgs)
@@ -1190,7 +1190,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                 if (pDlg->Execute() == RET_OK)
                     aPassword = pDlg->GetPassword();
                 else
-                    bCancel = TRUE;
+                    bCancel = sal_True;
             }
 
             if( !bCancel )
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 367ea1449..361dc5528 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -106,13 +106,13 @@ using namespace com::sun::star;
 
 // STATIC DATA -----------------------------------------------------------
 
-USHORT ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC;
-USHORT ScTabViewShell::nInsCellsCtrlState = 0;
-USHORT ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM;
+sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC;
+sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0;
+sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM;
 
 // -----------------------------------------------------------------------
 
-void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
+void __EXPORT ScTabViewShell::Activate(sal_Bool bMDI)
 {
     SfxViewShell::Activate(bMDI);
 
@@ -124,7 +124,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
         ScModule* pScMod = SC_MOD();
         pScMod->ViewShellChanged();
 
-        ActivateView( TRUE, bFirstActivate );
+        ActivateView( sal_True, bFirstActivate );
         ActivateOlk( GetViewData() );
 
         //	#56870# AutoCorrect umsetzen, falls der Writer seins neu angelegt hat
@@ -165,12 +165,12 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
             }
         }
 
-        UpdateInputHandler( TRUE );
+        UpdateInputHandler( sal_True );
 
         if ( bFirstActivate )
         {
             SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_NAVIGATOR_UPDATEALL ) );
-            bFirstActivate = FALSE;
+            bFirstActivate = sal_False;
 
             // #116278# ReadExtOptions (view settings from Excel import) must also be done
             // after the ctor, because of the potential calls to Window::Show.
@@ -182,7 +182,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
             if ( pExtOpt && pExtOpt->IsChanged() )
             {
                 GetViewData()->ReadExtOptions(*pExtOpt);        // Excel view settings
-                SetTabNo( GetViewData()->GetTabNo(), TRUE );
+                SetTabNo( GetViewData()->GetTabNo(), sal_True );
                 pExtOpt->SetChanged( false );
             }
         }
@@ -208,7 +208,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
 
         if(pScMod->IsRefDialogOpen())
         {
-            USHORT nModRefDlgId=pScMod->GetCurRefDlgId();
+            sal_uInt16 nModRefDlgId=pScMod->GetCurRefDlgId();
             SfxChildWindow* pChildWnd = pThisFrame->GetChildWindow( nModRefDlgId );
             if ( pChildWnd )
             {
@@ -226,7 +226,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
     //	beim Umschalten zwischen Dokumenten)
 }
 
-void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI)
+void __EXPORT ScTabViewShell::Deactivate(sal_Bool bMDI)
 {
     HideTip();
 
@@ -248,17 +248,17 @@ void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI)
     {
         //	#85421# during shell deactivation, shells must not be switched, or the loop
         //	through the shell stack (in SfxDispatcher::DoDeactivate_Impl) will not work
-        BOOL bOldDontSwitch = bDontSwitch;
-        bDontSwitch = TRUE;
+        sal_Bool bOldDontSwitch = bDontSwitch;
+        bDontSwitch = sal_True;
 
         DeActivateOlk( GetViewData() );
-        ActivateView( FALSE, FALSE );
+        ActivateView( sal_False, sal_False );
 
         if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace
-            GetViewData()->GetDocShell()->UpdateOle(GetViewData(),TRUE);
+            GetViewData()->GetDocShell()->UpdateOle(GetViewData(),sal_True);
 
         if ( pHdl )
-            pHdl->NotifyChange( NULL, TRUE ); // Timer-verzoegert wg. Dokumentwechsel
+            pHdl->NotifyChange( NULL, sal_True ); // Timer-verzoegert wg. Dokumentwechsel
 
         if (pScActiveViewShell == this)
             pScActiveViewShell = NULL;
@@ -288,7 +288,7 @@ void ScTabViewShell::SetActive()
 #endif
 }
 
-USHORT __EXPORT ScTabViewShell::PrepareClose(BOOL bUI, BOOL bForBrowsing)
+sal_uInt16 __EXPORT ScTabViewShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing)
 {
     // Call EnterHandler even in formula mode here,
     // so a formula change in an embedded object isn't lost
@@ -315,8 +315,8 @@ USHORT __EXPORT ScTabViewShell::PrepareClose(BOOL bUI, BOOL bForBrowsing)
 
     if ( pFormShell )
     {
-        USHORT nRet = pFormShell->PrepareClose(bUI, bForBrowsing);
-        if (nRet!=TRUE)
+        sal_uInt16 nRet = pFormShell->PrepareClose(bUI, bForBrowsing);
+        if (nRet!=sal_True)
             return nRet;
     }
     return SfxViewShell::PrepareClose(bUI,bForBrowsing);
@@ -413,7 +413,7 @@ void __EXPORT ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &r
         aNewSize.Height() += aBorder.Top() + aBorder.Bottom();
     }
 
-    DoResize( rOfs, aNewSize, TRUE );					// rSize = Groesse von gridwin
+    DoResize( rOfs, aNewSize, sal_True );					// rSize = Groesse von gridwin
 
     UpdateOleZoom();									//	Zoom fuer In-Place berechnen
 
@@ -454,7 +454,7 @@ void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fract
         aNewY = aFrac400;
 
     GetViewData()->UpdateScreenZoom( aNewX, aNewY );
-    SetZoom( aNewX, aNewY, TRUE );
+    SetZoom( aNewX, aNewY, sal_True );
 
     PaintGrid();
     PaintTop();
@@ -477,7 +477,7 @@ void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const
     SCCOL nCol = pViewData->GetPosX(WhichH(ePos));
     SCROW nRow = pViewData->GetPosY(WhichV(ePos));
     SCTAB nTab = pViewData->GetTabNo();
-    BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+    sal_Bool bNegativePage = pDoc->IsNegativePage( nTab );
 
     Rectangle aLogicRect = pDoc->GetMMRect( nCol, nRow, nCol, nRow, nTab );
     if ( bNegativePage )
@@ -504,14 +504,14 @@ void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const
     SCsCOL nPosX;
     SCsROW nPosY;
     pViewData->GetPosFromPixel( aTest.X(), aTest.Y(), ePos, nPosX, nPosY );
-    BOOL bLeft;
-    BOOL bTop;
+    sal_Bool bLeft;
+    sal_Bool bTop;
     pViewData->GetMouseQuadrant( aTest, ePos, nPosX, nPosY, bLeft, bTop );
     if (!bLeft)
         ++nPosX;
     if (!bTop)
         ++nPosY;
-    aTest = pViewData->GetScrPos( (SCCOL)nPosX, (SCROW)nPosY, ePos, TRUE );
+    aTest = pViewData->GetScrPos( (SCCOL)nPosX, (SCROW)nPosY, ePos, sal_True );
 
     rRect.SetSize(Size(aTest.X(),aTest.Y()));
 #endif
@@ -546,7 +546,7 @@ void __EXPORT ScTabViewShell::ShowCursor(FASTBOOL /* bOn */)
 
 //------------------------------------------------------------------
 
-void __EXPORT ScTabViewShell::WriteUserData(String& rData, BOOL /* bBrowse */)
+void __EXPORT ScTabViewShell::WriteUserData(String& rData, sal_Bool /* bBrowse */)
 {
     GetViewData()->WriteUserData(rData);
 }
@@ -556,7 +556,7 @@ void ScTabViewShell::WriteUserDataSequence (uno::Sequence < beans::PropertyValue
     GetViewData()->WriteUserDataSequence (rSettings);
 }
 
-void __EXPORT ScTabViewShell::ReadUserData(const String& rData, BOOL /* bBrowse */)
+void __EXPORT ScTabViewShell::ReadUserData(const String& rData, sal_Bool /* bBrowse */)
 {
     if ( !GetViewData()->GetDocShell()->IsPreview() )
         DoReadUserData( rData );
@@ -571,13 +571,13 @@ void ScTabViewShell::ReadUserDataSequence (const uno::Sequence < beans::Property
 void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::PropertyValue >& rSettings )
 {
     Window* pOldWin = GetActiveWin();
-    BOOL bFocus = pOldWin && pOldWin->HasFocus();
+    sal_Bool bFocus = pOldWin && pOldWin->HasFocus();
 
     GetViewData()->ReadUserDataSequence(rSettings);
-    SetTabNo( GetViewData()->GetTabNo(), TRUE );
+    SetTabNo( GetViewData()->GetTabNo(), sal_True );
 
     if ( GetViewData()->IsPagebreakMode() )
-        SetCurSubShell( GetCurObjectSelectionType(), TRUE );
+        SetCurSubShell( GetCurObjectSelectionType(), sal_True );
 
     Window* pNewWin = GetActiveWin();
     if (pNewWin && pNewWin != pOldWin)
@@ -606,13 +606,13 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper
 void ScTabViewShell::DoReadUserData( const String& rData )
 {
     Window* pOldWin = GetActiveWin();
-    BOOL bFocus = pOldWin && pOldWin->HasFocus();
+    sal_Bool bFocus = pOldWin && pOldWin->HasFocus();
 
     GetViewData()->ReadUserData(rData);
-    SetTabNo( GetViewData()->GetTabNo(), TRUE );
+    SetTabNo( GetViewData()->GetTabNo(), sal_True );
 
     if ( GetViewData()->IsPagebreakMode() )
-        SetCurSubShell( GetCurObjectSelectionType(), TRUE );
+        SetCurSubShell( GetCurObjectSelectionType(), sal_True );
 
     Window* pNewWin = GetActiveWin();
     if (pNewWin && pNewWin != pOldWin)
@@ -648,7 +648,7 @@ void ScTabViewShell::DoReadUserData( const String& rData )
 //UNUSED2008-05  void ScTabViewShell::StateDisabled( SfxItemSet& rSet )
 //UNUSED2008-05  {
 //UNUSED2008-05      SfxWhichIter aIter( rSet );
-//UNUSED2008-05      USHORT       nWhich = aIter.FirstWhich();
+//UNUSED2008-05      sal_uInt16       nWhich = aIter.FirstWhich();
 //UNUSED2008-05
 //UNUSED2008-05      while ( nWhich )
 //UNUSED2008-05      {
@@ -659,7 +659,7 @@ void ScTabViewShell::DoReadUserData( const String& rData )
 
 void ScTabViewShell::SetDrawShellOrSub()
 {
-    bActiveDrawSh = TRUE;
+    bActiveDrawSh = sal_True;
 
     if(bActiveDrawFormSh)
     {
@@ -689,7 +689,7 @@ void ScTabViewShell::SetDrawShellOrSub()
     }
 }
 
-void ScTabViewShell::SetDrawShell( BOOL bActive )
+void ScTabViewShell::SetDrawShell( sal_Bool bActive )
 {
     if(bActive)
     {
@@ -705,17 +705,17 @@ void ScTabViewShell::SetDrawShell( BOOL bActive )
         {
             SetCurSubShell(OST_Cell);
         }
-        bActiveDrawFormSh=FALSE;
-        bActiveGraphicSh=FALSE;
-        bActiveMediaSh=FALSE;
-        bActiveOleObjectSh=FALSE;
-        bActiveChartSh=FALSE;
+        bActiveDrawFormSh=sal_False;
+        bActiveGraphicSh=sal_False;
+        bActiveMediaSh=sal_False;
+        bActiveOleObjectSh=sal_False;
+        bActiveChartSh=sal_False;
     }
 
-    BOOL bWasDraw = bActiveDrawSh || bActiveDrawTextSh;
+    sal_Bool bWasDraw = bActiveDrawSh || bActiveDrawTextSh;
 
     bActiveDrawSh = bActive;
-    bActiveDrawTextSh = FALSE;
+    bActiveDrawTextSh = sal_False;
 
     if ( !bActive )
     {
@@ -726,22 +726,22 @@ void ScTabViewShell::SetDrawShell( BOOL bActive )
         {
             //	Aktiven Teil an Cursor anpassen, etc.
             MoveCursorAbs( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
-                            SC_FOLLOW_NONE, FALSE, FALSE, TRUE );
+                            SC_FOLLOW_NONE, sal_False, sal_False, sal_True );
         }
     }
 }
 
-void ScTabViewShell::SetDrawTextShell( BOOL bActive )
+void ScTabViewShell::SetDrawTextShell( sal_Bool bActive )
 {
     bActiveDrawTextSh = bActive;
     if ( bActive )
     {
-        bActiveDrawFormSh=FALSE;
-        bActiveGraphicSh=FALSE;
-        bActiveMediaSh=FALSE;
-        bActiveOleObjectSh=FALSE;
-        bActiveChartSh=FALSE;
-        bActiveDrawSh = FALSE;
+        bActiveDrawFormSh=sal_False;
+        bActiveGraphicSh=sal_False;
+        bActiveMediaSh=sal_False;
+        bActiveOleObjectSh=sal_False;
+        bActiveChartSh=sal_False;
+        bActiveDrawSh = sal_False;
         SetCurSubShell(OST_DrawText);
     }
     else
@@ -749,7 +749,7 @@ void ScTabViewShell::SetDrawTextShell( BOOL bActive )
 
 }
 
-void ScTabViewShell::SetPivotShell( BOOL bActive )
+void ScTabViewShell::SetPivotShell( sal_Bool bActive )
 {
     bActivePivotSh = bActive;
 
@@ -760,12 +760,12 @@ void ScTabViewShell::SetPivotShell( BOOL bActive )
     {
         if ( bActive )
         {
-            bActiveDrawTextSh = bActiveDrawSh = FALSE;
-            bActiveDrawFormSh=FALSE;
-            bActiveGraphicSh=FALSE;
-            bActiveMediaSh=FALSE;
-            bActiveOleObjectSh=FALSE;
-            bActiveChartSh=FALSE;
+            bActiveDrawTextSh = bActiveDrawSh = sal_False;
+            bActiveDrawFormSh=sal_False;
+            bActiveGraphicSh=sal_False;
+            bActiveMediaSh=sal_False;
+            bActiveOleObjectSh=sal_False;
+            bActiveChartSh=sal_False;
             SetCurSubShell(OST_Pivot);
         }
         else
@@ -773,31 +773,31 @@ void ScTabViewShell::SetPivotShell( BOOL bActive )
     }
 }
 
-void ScTabViewShell::SetAuditShell( BOOL bActive )
+void ScTabViewShell::SetAuditShell( sal_Bool bActive )
 {
     bActiveAuditingSh = bActive;
     if ( bActive )
     {
-        bActiveDrawTextSh = bActiveDrawSh = FALSE;
-        bActiveDrawFormSh=FALSE;
-        bActiveGraphicSh=FALSE;
-        bActiveMediaSh=FALSE;
-        bActiveOleObjectSh=FALSE;
-        bActiveChartSh=FALSE;
+        bActiveDrawTextSh = bActiveDrawSh = sal_False;
+        bActiveDrawFormSh=sal_False;
+        bActiveGraphicSh=sal_False;
+        bActiveMediaSh=sal_False;
+        bActiveOleObjectSh=sal_False;
+        bActiveChartSh=sal_False;
         SetCurSubShell(OST_Auditing);
     }
     else
         SetCurSubShell(OST_Cell);
 }
 
-void ScTabViewShell::SetDrawFormShell( BOOL bActive )
+void ScTabViewShell::SetDrawFormShell( sal_Bool bActive )
 {
     bActiveDrawFormSh = bActive;
 
     if(bActiveDrawFormSh)
         SetCurSubShell(OST_DrawForm);
 }
-void ScTabViewShell::SetChartShell( BOOL bActive )
+void ScTabViewShell::SetChartShell( sal_Bool bActive )
 {
     bActiveChartSh = bActive;
 
@@ -805,7 +805,7 @@ void ScTabViewShell::SetChartShell( BOOL bActive )
         SetCurSubShell(OST_Chart);
 }
 
-void ScTabViewShell::SetGraphicShell( BOOL bActive )
+void ScTabViewShell::SetGraphicShell( sal_Bool bActive )
 {
     bActiveGraphicSh = bActive;
 
@@ -813,7 +813,7 @@ void ScTabViewShell::SetGraphicShell( BOOL bActive )
         SetCurSubShell(OST_Graphic);
 }
 
-void ScTabViewShell::SetMediaShell( BOOL bActive )
+void ScTabViewShell::SetMediaShell( sal_Bool bActive )
 {
     bActiveMediaSh = bActive;
 
@@ -821,7 +821,7 @@ void ScTabViewShell::SetMediaShell( BOOL bActive )
         SetCurSubShell(OST_Media);
 }
 
-void ScTabViewShell::SetOleObjectShell( BOOL bActive )
+void ScTabViewShell::SetOleObjectShell( sal_Bool bActive )
 {
     bActiveOleObjectSh = bActive;
 
@@ -831,7 +831,7 @@ void ScTabViewShell::SetOleObjectShell( BOOL bActive )
         SetCurSubShell(OST_Cell);
 }
 
-void ScTabViewShell::SetEditShell(EditView* pView, BOOL bActive )
+void ScTabViewShell::SetEditShell(EditView* pView, sal_Bool bActive )
 {
     if(bActive)
     {
@@ -849,7 +849,7 @@ void ScTabViewShell::SetEditShell(EditView* pView, BOOL bActive )
     bActiveEditSh = bActive;
 }
 
-void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
+void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, sal_Bool bForce)
 {
     ScViewData* pViewData	= GetViewData();
     ScDocShell* pDocSh		= pViewData->GetDocShell();
@@ -862,7 +862,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
         pCellShell->SetRepeatTarget( &aTarget );
     }
 
-    BOOL bPgBrk=pViewData->IsPagebreakMode();
+    sal_Bool bPgBrk=pViewData->IsPagebreakMode();
 
     if(bPgBrk && !pPageBreakShell)
     {
@@ -873,8 +873,8 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
 
     if ( eOST!=eCurOST || bForce )
     {
-        BOOL bCellBrush = FALSE;    // "format paint brush" allowed for cells
-        BOOL bDrawBrush = FALSE;    // "format paint brush" allowed for drawing objects
+        sal_Bool bCellBrush = sal_False;    // "format paint brush" allowed for cells
+        sal_Bool bDrawBrush = sal_False;    // "format paint brush" allowed for drawing objects
 
         if(eCurOST!=OST_NONE) RemoveSubShell();
 
@@ -887,7 +887,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
                     {
                         AddSubShell(*pCellShell);
                         if(bPgBrk) AddSubShell(*pPageBreakShell);
-                        bCellBrush = TRUE;
+                        bCellBrush = sal_True;
                     }
                     break;
             case	OST_Editing:
@@ -934,7 +934,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
                             pDrawShell->SetRepeatTarget( &aTarget );
                         }
                         AddSubShell(*pDrawShell);
-                        bDrawBrush = TRUE;
+                        bDrawBrush = sal_True;
                     }
                     break;
 
@@ -947,7 +947,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
                             pDrawFormShell->SetRepeatTarget( &aTarget );
                         }
                         AddSubShell(*pDrawFormShell);
-                        bDrawBrush = TRUE;
+                        bDrawBrush = sal_True;
                     }
                     break;
 
@@ -960,7 +960,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
                             pChartShell->SetRepeatTarget( &aTarget );
                         }
                         AddSubShell(*pChartShell);
-                        bDrawBrush = TRUE;
+                        bDrawBrush = sal_True;
                     }
                     break;
 
@@ -973,7 +973,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
                             pOleObjectShell->SetRepeatTarget( &aTarget );
                         }
                         AddSubShell(*pOleObjectShell);
-                        bDrawBrush = TRUE;
+                        bDrawBrush = sal_True;
                     }
                     break;
 
@@ -986,7 +986,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
                             pGraphicShell->SetRepeatTarget( &aTarget );
                         }
                         AddSubShell(*pGraphicShell);
-                        bDrawBrush = TRUE;
+                        bDrawBrush = sal_True;
                     }
                     break;
 
@@ -1013,7 +1013,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
                             pPivotShell->SetRepeatTarget( &aTarget );
                         }
                         AddSubShell(*pPivotShell);
-                        bCellBrush = TRUE;
+                        bCellBrush = sal_True;
                     }
                     break;
             case	OST_Auditing:
@@ -1029,7 +1029,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
                             pAuditingShell->SetRepeatTarget( &aTarget );
                         }
                         AddSubShell(*pAuditingShell);
-                        bCellBrush = TRUE;
+                        bCellBrush = sal_True;
                     }
                     break;
             default:
@@ -1048,7 +1048,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType	eOST, BOOL bForce)
     }
 }
 
-void ScTabViewShell::SetFormShellAtTop( BOOL bSet )
+void ScTabViewShell::SetFormShellAtTop( sal_Bool bSet )
 {
     if ( pFormShell && !bSet )
         pFormShell->ForgetActiveControl();      // let the FormShell know it no longer has the focus
@@ -1056,14 +1056,14 @@ void ScTabViewShell::SetFormShellAtTop( BOOL bSet )
     if ( bFormShellAtTop != bSet )
     {
         bFormShellAtTop = bSet;
-        SetCurSubShell( GetCurObjectSelectionType(), TRUE );
+        SetCurSubShell( GetCurObjectSelectionType(), sal_True );
     }
 }
 
 IMPL_LINK( ScTabViewShell, FormControlActivated, FmFormShell*, EMPTYARG )
 {
     // a form control got the focus, so the form shell has to be on top
-    SetFormShellAtTop( TRUE );
+    SetFormShellAtTop( sal_True );
     return 0;
 }
 
@@ -1077,9 +1077,9 @@ ObjectSelectionType ScTabViewShell::GetCurObjectSelectionType()
 
 SfxShell* ScTabViewShell::GetMySubShell() const
 {
-    //	GetSubShell() war frueher const, und GetSubShell(USHORT) sollte es auch sein...
+    //	GetSubShell() war frueher const, und GetSubShell(sal_uInt16) sollte es auch sein...
 
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     SfxShell* pSub = ((ScTabViewShell*)this)->GetSubShell(nPos);
     while (pSub)
     {
@@ -1106,17 +1106,17 @@ SfxShell* ScTabViewShell::GetMySubShell() const
 //UNUSED2008-05      }
 //UNUSED2008-05  }
 
-BOOL ScTabViewShell::IsDrawTextShell() const
+sal_Bool ScTabViewShell::IsDrawTextShell() const
 {
     return ( pDrawTextShell && ( GetMySubShell() == pDrawTextShell ) );
 }
 
-BOOL ScTabViewShell::IsAuditShell() const
+sal_Bool ScTabViewShell::IsAuditShell() const
 {
     return ( pAuditingShell && ( GetMySubShell() == pAuditingShell ) );
 }
 
-void ScTabViewShell::SetDrawTextUndo( SfxUndoManager* pNewUndoMgr )
+void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr )
 {
     // Default: Undo-Manager der DocShell
     if (!pNewUndoMgr)
@@ -1147,13 +1147,13 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell()
 
 //------------------------------------------------------------------
 
-SfxPrinter* __EXPORT ScTabViewShell::GetPrinter( BOOL bCreate )
+SfxPrinter* __EXPORT ScTabViewShell::GetPrinter( sal_Bool bCreate )
 {
     //	Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt)
     return GetViewData()->GetDocShell()->GetPrinter(bCreate);
 }
 
-USHORT __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool )
+sal_uInt16 __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags, bool )
 {
     return GetViewData()->GetDocShell()->SetPrinter( pNewPrinter, nDiffFlags );
 }
@@ -1172,7 +1172,7 @@ SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
 void ScTabViewShell::StopEditShell()
 {
     if ( pEditShell != NULL && !bDontSwitch )
-        SetEditShell(NULL, FALSE );
+        SetEditShell(NULL, sal_False );
 }
 
 //------------------------------------------------------------------
@@ -1190,7 +1190,7 @@ IMPL_LINK( ScTabViewShell, SimpleRefClose, String*, EMPTYARG )
         SetTabNo( GetViewData()->GetRefTabNo() );
     }
 
-    ScSimpleRefDlgWrapper::SetAutoReOpen( TRUE );
+    ScSimpleRefDlgWrapper::SetAutoReOpen( sal_True );
     return 0;
 }
 
@@ -1236,7 +1236,7 @@ IMPL_LINK( ScTabViewShell, SimpleRefChange, String*, pResult )
 
 void ScTabViewShell::StartSimpleRefDialog(
             const String& rTitle, const String& rInitVal,
-            BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection )
+            sal_Bool bCloseOnButtonUp, sal_Bool bSingleCell, sal_Bool bMultiSelection )
 {
     SfxViewFrame* pViewFrm = GetViewFrame();
 
@@ -1249,9 +1249,9 @@ void ScTabViewShell::StartSimpleRefDialog(
         pViewFrm->GetFrame().Appear();
     }
 
-    USHORT nId = ScSimpleRefDlgWrapper::GetChildWindowId();
+    sal_uInt16 nId = ScSimpleRefDlgWrapper::GetChildWindowId();
 
-    SC_MOD()->SetRefDialog( nId, TRUE, pViewFrm );
+    SC_MOD()->SetRefDialog( nId, sal_True, pViewFrm );
 
     ScSimpleRefDlgWrapper* pWnd = (ScSimpleRefDlgWrapper*)pViewFrm->GetChildWindow( nId );
     if (pWnd)
@@ -1262,7 +1262,7 @@ void ScTabViewShell::StartSimpleRefDialog(
                            LINK( this, ScTabViewShell, SimpleRefChange ) );
         pWnd->SetRefString( rInitVal );
         pWnd->SetFlags( bCloseOnButtonUp, bSingleCell, bMultiSelection );
-        pWnd->SetAutoReOpen( FALSE );
+        pWnd->SetAutoReOpen( sal_False );
         Window* pWin = pWnd->GetWindow();
         pWin->SetText( rTitle );
         pWnd->StartRefInput();
@@ -1272,7 +1272,7 @@ void ScTabViewShell::StartSimpleRefDialog(
 void ScTabViewShell::StopSimpleRefDialog()
 {
     SfxViewFrame* pViewFrm = GetViewFrame();
-    USHORT nId = ScSimpleRefDlgWrapper::GetChildWindowId();
+    sal_uInt16 nId = ScSimpleRefDlgWrapper::GetChildWindowId();
 
     ScSimpleRefDlgWrapper* pWnd = (ScSimpleRefDlgWrapper*)pViewFrm->GetChildWindow( nId );
     if (pWnd)
@@ -1285,29 +1285,29 @@ void ScTabViewShell::StopSimpleRefDialog()
 
 //------------------------------------------------------------------
 
-BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
+sal_Bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
 {
     ScModule* pScMod = SC_MOD();
 
     SfxViewFrame* pThisFrame = GetViewFrame();
     if ( pThisFrame->GetChildWindow( SID_OPENDLG_FUNCTION ) )
-        return FALSE;
+        return sal_False;
 
     KeyCode aCode   = rKEvt.GetKeyCode();
-    BOOL bShift     = aCode.IsShift();
-    BOOL bControl   = aCode.IsMod1();
-    BOOL bAlt	    = aCode.IsMod2();
-    USHORT nCode	= aCode.GetCode();
-    BOOL bUsed	    = FALSE;
-    BOOL bInPlace   = pScMod->IsEditMode(); 	// Editengine bekommt alles
-    BOOL bAnyEdit   = pScMod->IsInputMode();	// nur Zeichen & Backspace
-    BOOL bDraw		= IsDrawTextEdit();
+    sal_Bool bShift     = aCode.IsShift();
+    sal_Bool bControl   = aCode.IsMod1();
+    sal_Bool bAlt	    = aCode.IsMod2();
+    sal_uInt16 nCode	= aCode.GetCode();
+    sal_Bool bUsed	    = sal_False;
+    sal_Bool bInPlace   = pScMod->IsEditMode(); 	// Editengine bekommt alles
+    sal_Bool bAnyEdit   = pScMod->IsInputMode();	// nur Zeichen & Backspace
+    sal_Bool bDraw		= IsDrawTextEdit();
 
     HideNoteMarker();	// Notiz-Anzeige
 
     // don't do extra HideCursor/ShowCursor calls if EnterHandler will switch to a different sheet
-    BOOL bOnRefSheet = ( GetViewData()->GetRefTabNo() == GetViewData()->GetTabNo() );
-    BOOL bHideCursor = ( ( nCode == KEY_RETURN && bInPlace ) || nCode == KEY_TAB ) && bOnRefSheet;
+    sal_Bool bOnRefSheet = ( GetViewData()->GetRefTabNo() == GetViewData()->GetTabNo() );
+    sal_Bool bHideCursor = ( ( nCode == KEY_RETURN && bInPlace ) || nCode == KEY_TAB ) && bOnRefSheet;
 
     if (bHideCursor)
         HideAllCursors();
@@ -1320,17 +1320,17 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
     {
         bUsed = pScMod->InputKeyEvent( rKEvt );			// Eingabe
         if( !bUsed )
-            bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt ));    // accelerators
+            bUsed = sal::static_int_cast<sal_Bool>(SfxViewShell::KeyInput( rKEvt ));    // accelerators
     }
     else if( bAnyEdit )
     {
-        BOOL bIsType = FALSE;
-        USHORT nModi = aCode.GetModifier();
-        USHORT nGroup = aCode.GetGroup();
+        sal_Bool bIsType = sal_False;
+        sal_uInt16 nModi = aCode.GetModifier();
+        sal_uInt16 nGroup = aCode.GetGroup();
 
         if ( nGroup == KEYGROUP_NUM || nGroup == KEYGROUP_ALPHA || nGroup == 0 )
             if ( !bControl && !bAlt )
-                bIsType = TRUE;
+                bIsType = sal_True;
 
         if ( nGroup == KEYGROUP_MISC )
             switch ( nCode )
@@ -1353,14 +1353,14 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
                     bIsType = (nModi == 0);	// nur ohne Modifier
                     break;
                 default:
-                    bIsType = TRUE;
+                    bIsType = sal_True;
             }
 
         if( bIsType )
             bUsed = pScMod->InputKeyEvent( rKEvt );		// Eingabe
 
         if( !bUsed )
-            bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt ));    // accelerators
+            bUsed = sal::static_int_cast<sal_Bool>(SfxViewShell::KeyInput( rKEvt ));    // accelerators
 
         if ( !bUsed && !bIsType && nCode != KEY_RETURN )	// Eingabe nochmal hinterher
             bUsed = pScMod->InputKeyEvent( rKEvt );
@@ -1378,20 +1378,20 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
                     !(eFunc == KEYFUNC_COPY && eMarkType == SC_MARK_SIMPLE_FILTERED) )
             {
                 ErrorMessage(STR_NOMULTISELECT);
-                bUsed = TRUE;
+                bUsed = sal_True;
             }
         }
         if (!bUsed)
-            bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt ));    // accelerators
+            bUsed = sal::static_int_cast<sal_Bool>(SfxViewShell::KeyInput( rKEvt ));    // accelerators
 
         //	#74696# during inplace editing, some slots are handled by the
         //	container app and are executed during Window::KeyInput.
         //	-> don't pass keys to input handler that would be used there
         //	but should call slots instead.
-        BOOL bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KEYFUNC_DONTKNOW );
+        sal_Bool bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KEYFUNC_DONTKNOW );
 
         if( !bUsed && !bDraw && nCode != KEY_RETURN && !bParent )
-            bUsed = pScMod->InputKeyEvent( rKEvt, TRUE );		// Eingabe
+            bUsed = pScMod->InputKeyEvent( rKEvt, sal_True );		// Eingabe
     }
 
     if (!bInPlace && !bUsed && !bDraw)
@@ -1400,7 +1400,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
         {
             case KEY_RETURN:
                 {
-                    BOOL bNormal = !bControl && !bAlt;
+                    sal_Bool bNormal = !bControl && !bAlt;
                     if ( !bAnyEdit && bNormal )
                     {
                         //	je nach Optionen mit Enter in den Edit-Modus schalten
@@ -1409,17 +1409,17 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
                         if ( rOpt.GetEnterEdit() )
                         {
                             pScMod->SetInputMode( SC_INPUT_TABLE );
-                            bUsed = TRUE;
+                            bUsed = sal_True;
                         }
                     }
 
-                    BOOL bEditReturn = bControl && !bShift; 		// An Edit-Engine weiter
+                    sal_Bool bEditReturn = bControl && !bShift; 		// An Edit-Engine weiter
                     if ( !bUsed && !bEditReturn )
                     {
                         if ( bOnRefSheet )
                             HideAllCursors();
 
-                        BYTE nMode = SC_ENTER_NORMAL;
+                        sal_uInt8 nMode = SC_ENTER_NORMAL;
                         if ( bShift && bControl )
                             nMode = SC_ENTER_MATRIX;
                         else if ( bAlt )
@@ -1436,7 +1436,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
                                             SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
                         }
                         else
-                            UpdateInputHandler(TRUE);
+                            UpdateInputHandler(sal_True);
 
                         if ( bOnRefSheet )
                             ShowAllCursors();
@@ -1445,7 +1445,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
                         //	anderes Dokument diese ViewShell nicht die ist, auf der eingegeben
                         //	wird!
 
-                        bUsed = TRUE;
+                        bUsed = sal_True;
                     }
                 }
                 break;
@@ -1456,24 +1456,24 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
 
     if ( !bUsed && bAlt && !bControl )
     {
-        USHORT nSlotId = 0;
+        sal_uInt16 nSlotId = 0;
         switch (nCode)
         {
             case KEY_UP:
                 ModifyCellSize( DIR_TOP, bShift );
-                bUsed = TRUE;
+                bUsed = sal_True;
                 break;
             case KEY_DOWN:
                 ModifyCellSize( DIR_BOTTOM, bShift );
-                bUsed = TRUE;
+                bUsed = sal_True;
                 break;
             case KEY_LEFT:
                 ModifyCellSize( DIR_LEFT, bShift );
-                bUsed = TRUE;
+                bUsed = sal_True;
                 break;
             case KEY_RIGHT:
                 ModifyCellSize( DIR_RIGHT, bShift );
-                bUsed = TRUE;
+                bUsed = sal_True;
                 break;
             case KEY_PAGEUP:
                 nSlotId = bShift ? SID_CURSORPAGELEFT_SEL : SID_CURSORPAGELEFT_;
@@ -1485,7 +1485,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
         if ( nSlotId )
         {
             GetViewData()->GetDispatcher().Execute( nSlotId, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
-            bUsed = TRUE;
+            bUsed = sal_True;
         }
     }
 
@@ -1495,9 +1495,9 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
     return bUsed;
 }
 
-BOOL ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent)
+sal_Bool ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent)
 {
-    return sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKeyEvent ));
+    return sal::static_int_cast<sal_Bool>(SfxViewShell::KeyInput( rKeyEvent ));
 }
 
 FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent )
@@ -1533,31 +1533,31 @@ FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent )
     aTarget( this ),			\
     pDialogDPObject(NULL),		\
     pNavSettings(NULL),         \
-    bActiveDrawSh(FALSE),		\
-    bActiveDrawTextSh(FALSE),	\
-    bActivePivotSh(FALSE),		\
-    bActiveAuditingSh(FALSE),	\
-    bActiveDrawFormSh(FALSE),	\
-    bActiveOleObjectSh(FALSE),	\
-    bActiveChartSh(FALSE),		\
-    bActiveGraphicSh(FALSE),	\
-    bActiveMediaSh(FALSE),		\
-    bActiveEditSh(FALSE),       \
-    bFormShellAtTop(FALSE),     \
-    bDontSwitch(FALSE),			\
-    bInFormatDialog(FALSE),		\
-    bPrintSelected(FALSE),		\
-    bReadOnly(FALSE),			\
+    bActiveDrawSh(sal_False),		\
+    bActiveDrawTextSh(sal_False),	\
+    bActivePivotSh(sal_False),		\
+    bActiveAuditingSh(sal_False),	\
+    bActiveDrawFormSh(sal_False),	\
+    bActiveOleObjectSh(sal_False),	\
+    bActiveChartSh(sal_False),		\
+    bActiveGraphicSh(sal_False),	\
+    bActiveMediaSh(sal_False),		\
+    bActiveEditSh(sal_False),       \
+    bFormShellAtTop(sal_False),     \
+    bDontSwitch(sal_False),			\
+    bInFormatDialog(sal_False),		\
+    bPrintSelected(sal_False),		\
+    bReadOnly(sal_False),			\
     pScSbxObject(NULL),			\
-    /*bChartDlgIsEdit(FALSE),*/		\
-    bChartAreaValid(FALSE),		\
+    /*bChartDlgIsEdit(sal_False),*/		\
+    bChartAreaValid(sal_False),		\
     nCurRefDlgId(0),            \
     pAccessibilityBroadcaster(NULL)
 
 
 //------------------------------------------------------------------
 
-void ScTabViewShell::Construct( BYTE nForceDesignMode )
+void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode )
 {
     SfxApplication* pSfxApp  = SFX_APP();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
@@ -1573,12 +1573,12 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
 
     pCurFrameLine	= new SvxBorderLine( &aColBlack, 20, 0, 0 );
     pPivotSource	= new ScArea;
-    StartListening(*GetViewData()->GetDocShell(),TRUE);
-    StartListening(*GetViewFrame(),TRUE);
-    StartListening(*pSfxApp,TRUE);              // #i62045# #i62046# application is needed for Calc's own hints
+    StartListening(*GetViewData()->GetDocShell(),sal_True);
+    StartListening(*GetViewFrame(),sal_True);
+    StartListening(*pSfxApp,sal_True);              // #i62045# #i62046# application is needed for Calc's own hints
 
     SfxViewFrame* pFirst = SfxViewFrame::GetFirst(pDocSh);
-    BOOL bFirstView = !pFirst
+    sal_Bool bFirstView = !pFirst
           || (pFirst == GetViewFrame() && !SfxViewFrame::GetNext(*pFirst,pDocSh));
 
     if ( pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
@@ -1593,19 +1593,19 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
             pDoc->SetVisibleTab(nVisTab);
         }
         SetTabNo( nVisTab );
-        BOOL bNegativePage = pDoc->IsNegativePage( nVisTab );
+        sal_Bool bNegativePage = pDoc->IsNegativePage( nVisTab );
         // show the right cells
         GetViewData()->SetScreenPos( bNegativePage ? aVisArea.TopRight() : aVisArea.TopLeft() );
 
         if ( GetViewFrame()->GetFrame().IsInPlace() )                         // inplace
         {
-            pDocSh->SetInplace( TRUE );				// schon so initialisiert
+            pDocSh->SetInplace( sal_True );				// schon so initialisiert
             if (pDoc->IsEmbedded())
                 pDoc->ResetEmbedded();				// keine blaue Markierung
         }
         else if ( bFirstView )
         {
-            pDocSh->SetInplace( FALSE );
+            pDocSh->SetInplace( sal_False );
             GetViewData()->RefreshZoom();           // recalculate PPT
             if (!pDoc->IsEmbedded())
                 pDoc->SetEmbedded( aVisArea );					// VisArea markieren
@@ -1638,9 +1638,9 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
             //	wenn die ViewShell noch nicht kostruiert ist...
     if (pDoc->GetDrawLayer())
         MakeDrawView( nForceDesignMode );
-    ViewOptionsHasChanged(FALSE);	// legt auch evtl. DrawView an
+    ViewOptionsHasChanged(sal_False);	// legt auch evtl. DrawView an
 
-    SfxUndoManager* pMgr = pDocSh->GetUndoManager();
+    ::svl::IUndoManager* pMgr = pDocSh->GetUndoManager();
     SetUndoManager( pMgr );
     pFormShell->SetUndoManager( pMgr );
     if ( !pDoc->IsUndoEnabled() )
@@ -1653,7 +1653,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
 
     if ( bFirstView )	// first view?
     {
-        pDoc->SetDocVisible( TRUE );		// used when creating new sheets
+        pDoc->SetDocVisible( sal_True );		// used when creating new sheets
         if ( pDocSh->IsEmpty() )
         {
             // set first sheet's RTL flag (following will already be initialized because of SetDocVisible)
@@ -1667,7 +1667,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
                     pDoc->MakeTable(i,false);
             }
 
-            pDocSh->SetEmpty( FALSE );          // #i6232# make sure this is done only once
+            pDocSh->SetEmpty( sal_False );          // #i6232# make sure this is done only once
         }
 
         // ReadExtOptions is now in Activate
@@ -1688,7 +1688,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
             }
             if (!bLink)
                 if (pDoc->HasDdeLinks() || pDoc->HasAreaLinks())
-                    bLink = TRUE;
+                    bLink = sal_True;
             if (bLink)
             {
                 if ( !pFirst )
@@ -1701,17 +1701,17 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
                 }
             }
 
-            BOOL bReImport = FALSE;								// importierte Daten aktualisieren
+            sal_Bool bReImport = sal_False;								// importierte Daten aktualisieren
             ScDBCollection* pDBColl = pDoc->GetDBCollection();
             if ( pDBColl )
             {
-                USHORT nCount = pDBColl->GetCount();
-                for (USHORT i=0; i<nCount && !bReImport; i++)
+                sal_uInt16 nCount = pDBColl->GetCount();
+                for (sal_uInt16 i=0; i<nCount && !bReImport; i++)
                 {
                     ScDBData* pData = (*pDBColl)[i];
                     if ( pData->IsStripData() &&
                             pData->HasImportParam() && !pData->HasImportSelection() )
-                        bReImport = TRUE;
+                        bReImport = sal_True;
                 }
             }
             if (bReImport)
@@ -1732,10 +1732,10 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
     // ScDispatchProviderInterceptor registers itself in ctor
     xDisProvInterceptor = new ScDispatchProviderInterceptor( this );
 
-    bFirstActivate = TRUE; // NavigatorUpdate aufschieben bis Activate()
+    bFirstActivate = sal_True; // NavigatorUpdate aufschieben bis Activate()
 
     // #105575#; update only in the first creation of the ViewShell
-    pDocSh->SetUpdateEnabled(FALSE);
+    pDocSh->SetUpdateEnabled(sal_False);
 
     if ( GetViewFrame()->GetFrame().IsInPlace() )
         UpdateHeaderWidth(); // The implace activation requires headers to be calculated
@@ -1789,7 +1789,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
     //	has to be shown by the sfx. ReadUserData is deferred until the first Activate call.
     //	#106334# old DesignMode state from form layer must be restored, too
 
-    BYTE nForceDesignMode = SC_FORCEMODE_NONE;
+    sal_uInt8 nForceDesignMode = SC_FORCEMODE_NONE;
     if ( pOldSh && pOldSh->ISA( ScPreviewShell ) )
     {
         ScPreviewShell* pPreviewShell = ((ScPreviewShell*)pOldSh);
@@ -1801,13 +1801,13 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
     if ( GetViewData()->GetDocShell()->IsPreview() )
     {
         //	preview for template dialog: always show whole page
-        SetZoomType( SVX_ZOOM_WHOLEPAGE, TRUE );    // zoom value is recalculated at next Resize
+        SetZoomType( SVX_ZOOM_WHOLEPAGE, sal_True );    // zoom value is recalculated at next Resize
     }
     else
     {
         Fraction aFract( rAppOpt.GetZoom(), 100 );
-        SetZoom( aFract, aFract, TRUE );
-        SetZoomType( rAppOpt.GetZoomType(), TRUE );
+        SetZoom( aFract, aFract, sal_True );
+        SetZoomType( rAppOpt.GetZoomType(), sal_True );
     }
 
     /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface();
@@ -1905,7 +1905,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData )
 
 void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest )
 {
-    bChartAreaValid	= TRUE;
+    bChartAreaValid	= sal_True;
     aChartSource	= rSource;
     aChartPos		= rDest;
     nChartDestTab	= GetViewData()->GetTabNo();
@@ -1913,10 +1913,10 @@ void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangl
 
 //UNUSED2008-05  void ScTabViewShell::ResetChartArea()
 //UNUSED2008-05  {
-//UNUSED2008-05      bChartAreaValid = FALSE;
+//UNUSED2008-05      bChartAreaValid = sal_False;
 //UNUSED2008-05  }
 
-BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const
+sal_Bool ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const
 {
     rSource	= aChartSource;
     rDest	= aChartPos;
@@ -1924,7 +1924,7 @@ BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SC
     return bChartAreaValid;
 }
 
-//UNUSED2008-05  BOOL ScTabViewShell::IsChartDlgEdit() const
+//UNUSED2008-05  sal_Bool ScTabViewShell::IsChartDlgEdit() const
 //UNUSED2008-05  {
 //UNUSED2008-05      return bChartDlgIsEdit;
 //UNUSED2008-05  }
@@ -1947,10 +1947,10 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings()
 void ScTabViewShell::ExecTbx( SfxRequest& rReq )
 {
     const SfxItemSet* pReqArgs = rReq.GetArgs();
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     const SfxPoolItem* pItem = NULL;
     if ( pReqArgs )
-        pReqArgs->GetItemState( nSlot, TRUE, &pItem );
+        pReqArgs->GetItemState( nSlot, sal_True, &pItem );
 
     switch ( nSlot )
     {
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 3c679d5f7..597ccec0b 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -60,7 +60,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 {
     if (rHint.ISA(SfxSimpleHint))						// ohne Parameter
     {
-        ULONG nSlot = ((SfxSimpleHint&)rHint).GetId();
+        sal_uLong nSlot = ((SfxSimpleHint&)rHint).GetId();
         switch ( nSlot )
         {
             case FID_DATACHANGED:
@@ -69,13 +69,13 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 
             case FID_REFMODECHANGED:
                 {
-                    BOOL bRefMode = SC_MOD()->IsFormulaMode();
+                    sal_Bool bRefMode = SC_MOD()->IsFormulaMode();
                     if (!bRefMode)
                         StopRefMode();
                     else
                     {
                         GetSelEngine()->Reset();
-                        GetFunctionSet()->SetAnchorFlag(TRUE);
+                        GetFunctionSet()->SetAnchorFlag(sal_True);
                         //	AnchorFlag, damit gleich mit Control angehaengt werden kann
                     }
                 }
@@ -140,7 +140,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
                 break;
 
             case SC_HINT_FORCESETTAB:
-                SetTabNo( GetViewData()->GetTabNo(), TRUE );
+                SetTabNo( GetViewData()->GetTabNo(), sal_True );
                 break;
 
             default:
@@ -150,7 +150,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
     else if (rHint.ISA(ScPaintHint))					// neu zeichnen
     {
         ScPaintHint* pHint = (ScPaintHint*) &rHint;
-        USHORT nParts = pHint->GetParts();
+        sal_uInt16 nParts = pHint->GetParts();
         SCTAB nTab = GetViewData()->GetTabNo();
         if (pHint->GetStartTab() <= nTab && pHint->GetEndTab() >= nTab)
         {
@@ -211,7 +211,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 
                     EditView* pView = GetViewData()->GetEditView(eActive);	// ist nicht 0
 
-                    SetEditShell(pView ,TRUE);
+                    SetEditShell(pView ,sal_True);
                 }
             }
         }
@@ -224,7 +224,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
         const ScTablesHint& rTabHint = (const ScTablesHint&)rHint;
         SCTAB nTab1 = rTabHint.GetTab1();
         SCTAB nTab2 = rTabHint.GetTab2();
-        USHORT nId  = rTabHint.GetId();
+        sal_uInt16 nId  = rTabHint.GetId();
         switch (nId)
         {
             case SC_TAB_INSERTED:
@@ -290,14 +290,14 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
         if ( nNewTab >= pDoc->GetTableCount() )
             nNewTab = pDoc->GetTableCount() - 1;
 
-        BOOL bForce = !bStayOnActiveTab;
-        SetTabNo( nNewTab, bForce, FALSE, bStayOnActiveTab );
+        sal_Bool bForce = !bStayOnActiveTab;
+        SetTabNo( nNewTab, bForce, sal_False, bStayOnActiveTab );
     }
     else if (rHint.ISA(ScIndexHint))
     {
         const ScIndexHint& rIndexHint = (const ScIndexHint&)rHint;
-        USHORT nId = rIndexHint.GetId();
-        USHORT nIndex = rIndexHint.GetIndex();
+        sal_uInt16 nId = rIndexHint.GetId();
+        sal_uInt16 nIndex = rIndexHint.GetIndex();
         switch (nId)
         {
             case SC_HINT_SHOWRANGEFINDER:
@@ -396,7 +396,7 @@ void ScTabViewShell::MakeNumberInfoItem( ScDocument*		 pDoc,
         default:
             *ppItem = new SvxNumberInfoItem(
                                 pDoc->GetFormatTable(),
-                                (const USHORT)
+                                (const sal_uInt16)
                                 SID_ATTR_NUMBERFORMAT_INFO );
     }
 }
@@ -413,7 +413,7 @@ void ScTabViewShell::UpdateNumberFormatter(
     {
         const sal_uInt32* pDelArr = rInfoItem.GetDelArray();
 
-        for ( USHORT i=0; i<nDelCount; i++ )
+        for ( sal_uInt16 i=0; i<nDelCount; i++ )
             rInfoItem.GetNumberFormatter()->DeleteEntry( pDelArr[i] );
     }
 
diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx
index da9809db7..22691878c 100644
--- a/sc/source/ui/view/tabvwsh8.cxx
+++ b/sc/source/ui/view/tabvwsh8.cxx
@@ -60,9 +60,9 @@ void ScTabViewShell::SetDefaultFrameLine( const SvxBorderLine* pLine )
 
 //------------------------------------------------------------------
 
-BOOL __EXPORT ScTabViewShell::HasSelection( BOOL bText ) const
+sal_Bool __EXPORT ScTabViewShell::HasSelection( sal_Bool bText ) const
 {
-    BOOL bHas = FALSE;
+    sal_Bool bHas = sal_False;
     ScViewData* pData = (ScViewData*)GetViewData();		// const weggecasted
     if ( bText )
     {
@@ -81,7 +81,7 @@ BOOL __EXPORT ScTabViewShell::HasSelection( BOOL bText ) const
         if ( eMarkType == SC_MARK_SIMPLE )
             bHas = ( aRange.aStart != aRange.aEnd );    // more than 1 cell
         else
-            bHas = TRUE;                                // multiple selection or filtered
+            bHas = sal_True;                                // multiple selection or filtered
     }
     return bHas;
 }
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index d1beb28fb..03242c574 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -53,9 +53,9 @@
 
 // forwards -> galwrap.cxx (wg. CLOOKs)
 
-USHORT	GallerySGA_FORMAT_GRAPHIC();
+sal_uInt16	GallerySGA_FORMAT_GRAPHIC();
 Graphic GalleryGetGraphic		();
-BOOL	GalleryIsLinkage		();
+sal_Bool	GalleryIsLinkage		();
 String	GalleryGetFullPath		();
 String	GalleryGetFilterName	();
 
@@ -63,7 +63,7 @@ String	GalleryGetFilterName	();
 
 class SvxIMapDlg;
 
-USHORT			ScIMapChildWindowId();
+sal_uInt16			ScIMapChildWindowId();
 SvxIMapDlg*		ScGetIMapDlg();
 const void*		ScIMapDlgGetObj( SvxIMapDlg* pDlg );
 const ImageMap&	ScIMapDlgGetMap( SvxIMapDlg* pDlg );
@@ -72,7 +72,7 @@ const ImageMap&	ScIMapDlgGetMap( SvxIMapDlg* pDlg );
 
 void ScTabViewShell::ExecChildWin(SfxRequest& rReq)
 {
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch(nSlot)
     {
         case SID_GALLERY:
@@ -99,12 +99,12 @@ void ScTabViewShell::GetChildWinState( SfxItemSet& rSet )
 {
     if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GALLERY ) )
     {
-        USHORT nId = GalleryChildWindow::GetChildWindowId();
+        sal_uInt16 nId = GalleryChildWindow::GetChildWindowId();
         rSet.Put( SfxBoolItem( SID_GALLERY, GetViewFrame()->HasChildWindow( nId ) ) );
     }
     else if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_AVMEDIA_PLAYER ) )
     {
-        USHORT nId = ::avmedia::MediaPlayer::GetChildWindowId();
+        sal_uInt16 nId = ::avmedia::MediaPlayer::GetChildWindowId();
         rSet.Put( SfxBoolItem( SID_AVMEDIA_PLAYER, GetViewFrame()->HasChildWindow( nId ) ) );
     }
 }
@@ -118,10 +118,10 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq )
     if ( pArgs )
     {
         const SfxPoolItem* pItem = NULL;
-        SfxItemState eState = pArgs->GetItemState(SID_GALLERY_FORMATS, TRUE, &pItem);
+        SfxItemState eState = pArgs->GetItemState(SID_GALLERY_FORMATS, sal_True, &pItem);
         if ( eState == SFX_ITEM_SET )
         {
-            UINT32 nFormats = ((const SfxUInt32Item*)pItem)->GetValue();
+            sal_uInt32 nFormats = ((const SfxUInt32Item*)pItem)->GetValue();
 
             /******************************************************************
             * Graphik einfuegen
@@ -178,13 +178,13 @@ String __EXPORT ScTabViewShell::GetDescription() const
 
 void ScTabViewShell::ExecImageMap( SfxRequest& rReq )
 {
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     switch(nSlot)
     {
         case SID_IMAP:
         {
             SfxViewFrame* pThisFrame = GetViewFrame();
-            USHORT nId = ScIMapChildWindowId();
+            sal_uInt16 nId = ScIMapChildWindowId();
             pThisFrame->ToggleChildWindow( nId );
             GetViewFrame()->GetBindings().Invalidate( SID_IMAP );
 
@@ -238,7 +238,7 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq )
 void ScTabViewShell::GetImageMapState( SfxItemSet& rSet )
 {
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch ( nWhich )
@@ -247,15 +247,15 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet )
                 {
                     //	Disabled wird nicht mehr...
 
-                    BOOL bThere = FALSE;
+                    sal_Bool bThere = sal_False;
                     SfxViewFrame* pThisFrame = GetViewFrame();
-                    USHORT nId = ScIMapChildWindowId();
+                    sal_uInt16 nId = ScIMapChildWindowId();
                     if ( pThisFrame->KnowsChildWindow(nId) )
                         if ( pThisFrame->HasChildWindow(nId) )
-                            bThere = TRUE;
+                            bThere = sal_True;
 
                     ObjectSelectionType eType=GetCurObjectSelectionType();
-                    BOOL bEnable=(eType==OST_OleObject) ||(eType==OST_Graphic);
+                    sal_Bool bEnable=(eType==OST_OleObject) ||(eType==OST_Graphic);
                     if(!bThere && !bEnable)
                     {
                        rSet.DisableItem( nWhich );
@@ -269,7 +269,7 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet )
 
             case SID_IMAP_EXEC:
                 {
-                    BOOL bDisable = TRUE;
+                    sal_Bool bDisable = sal_True;
 
                     SdrView* pDrView = GetSdrView();
                     if ( pDrView )
@@ -278,7 +278,7 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet )
                         if ( rMarkList.GetMarkCount() == 1 )
                             if ( ScIMapDlgGetObj(ScGetIMapDlg()) ==
                                         (void*) rMarkList.GetMark(0)->GetMarkedSdrObj() )
-                                bDisable = FALSE;
+                                bDisable = sal_False;
                     }
 
                     rSet.Put( SfxBoolItem( SID_IMAP_EXEC, bDisable ) );
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 436fe7eab..95ddcec91 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -34,7 +34,6 @@
 
 #define _ZFORLIST_DECLARE_TABLE
 #include "scitems.hxx"
-#include <svl/slstitm.hxx>
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zformat.hxx>
@@ -69,7 +68,7 @@
 #include "compiler.hxx"
 
 
-BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
+sal_Bool ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
 {
     String aStr;
 
@@ -87,7 +86,7 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
         return true;
     }
 
-    USHORT nGlobStrId = 0;
+    sal_uInt16 nGlobStrId = 0;
     switch (eFunc)
     {
         case SUBTOTAL_FUNC_AVE:	 nGlobStrId = STR_FUN_TEXT_AVG; break;
@@ -146,10 +145,10 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
         }
 
         rFuncStr = aStr;
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -171,16 +170,16 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
     SCCOL		nPosX		= pViewData->GetCurX();
     SCROW		nPosY		= pViewData->GetCurY();
     SCTAB		nTab		= pViewData->GetTabNo();
-    USHORT		nMyId		= 0;
+    sal_uInt16		nMyId		= 0;
 
     SfxViewFrame* pThisFrame = GetViewFrame();
-    BOOL bOle = GetViewFrame()->GetFrame().IsInPlace();
+    sal_Bool bOle = GetViewFrame()->GetFrame().IsInPlace();
 
     SCTAB nTabCount = pDoc->GetTableCount();
     SCTAB nTabSelCount = rMark.GetSelectCount();
 
     SfxWhichIter	aIter(rSet);
-    USHORT			nWhich = aIter.FirstWhich();
+    sal_uInt16			nWhich = aIter.FirstWhich();
 
     while ( nWhich )
     {
@@ -210,7 +209,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
                 if ( nTabSelCount > 1 )
                 {
                     // #i22589# also take "Print Entire Sheet" into account here
-                    BOOL bHas = FALSE;
+                    sal_Bool bHas = sal_False;
                     for (SCTAB i=0; !bHas && i<nTabCount; i++)
                         bHas = rMark.GetTableSelect(i) && (pDoc->GetPrintRangeCount(i) || pDoc->IsPrintEntireSheet(i));
                     if (!bHas)
@@ -235,7 +234,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
 
             case SID_SEARCH_OPTIONS:
                 {
-                    USHORT nOptions = 0xffff;		// alles erlaubt
+                    sal_uInt16 nOptions = 0xffff;		// alles erlaubt
                                                     // wenn ReadOnly, kein Ersetzen:
                     if (GetViewData()->GetDocShell()->IsReadOnly())
                         nOptions &= ~( SEARCH_OPTIONS_REPLACE | SEARCH_OPTIONS_REPLACE_ALL );
@@ -265,12 +264,12 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
 
             case FID_TOGGLEINPUTLINE:
                 {
-                    USHORT nId = ScInputWindowWrapper::GetChildWindowId();
+                    sal_uInt16 nId = ScInputWindowWrapper::GetChildWindowId();
 
                     if ( pThisFrame->KnowsChildWindow( nId ) )
                     {
                         SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
-                        rSet.Put( SfxBoolItem( nWhich, pWnd ? TRUE : FALSE ) );
+                        rSet.Put( SfxBoolItem( nWhich, pWnd ? sal_True : sal_False ) );
                     }
                     else
                         rSet.DisableItem( nWhich );
@@ -294,9 +293,9 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
                     if ( pStyleSheet )
                     {
                         SfxItemSet& rStyleSet = pStyleSheet->GetItemSet();
-                        USHORT nScale = ((const SfxUInt16Item&)
+                        sal_uInt16 nScale = ((const SfxUInt16Item&)
                                             rStyleSet.Get(ATTR_PAGE_SCALE)).GetValue();
-                        USHORT nPages = ((const SfxUInt16Item&)
+                        sal_uInt16 nPages = ((const SfxUInt16Item&)
                                             rStyleSet.Get(ATTR_PAGE_SCALETOPAGES)).GetValue();
                         if ( nScale == 100 && nPages == 0 )
                             rSet.DisableItem( nWhich );
@@ -311,7 +310,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
                 else
                 {
                     const Fraction& rOldY = GetViewData()->GetZoomY();
-                    USHORT nZoom = (USHORT)(( rOldY.GetNumerator() * 100 )
+                    sal_uInt16 nZoom = (sal_uInt16)(( rOldY.GetNumerator() * 100 )
                                                 / rOldY.GetDenominator());
                     rSet.Put( SvxZoomItem( SVX_ZOOM_PERCENT, nZoom, nWhich ) );
                 }
@@ -324,7 +323,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
                     else
                     {
                         const Fraction& rOldY = GetViewData()->GetZoomY();
-                        USHORT nCurrentZoom = (USHORT)(( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator());
+                        sal_uInt16 nCurrentZoom = (sal_uInt16)(( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator());
 
                         if( nCurrentZoom )
                         {
@@ -347,7 +346,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
             case FID_TOGGLEFORMULA:
                 {
                     const ScViewOptions& rOpts = pViewData->GetOptions();
-                    BOOL bFormulaMode = rOpts.GetOption( VOPT_FORMULAS );
+                    sal_Bool bFormulaMode = rOpts.GetOption( VOPT_FORMULAS );
                     rSet.Put(SfxBoolItem(nWhich, bFormulaMode ));
                 }
                 break;
@@ -460,7 +459,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
 
             case SID_PRINTPREVIEW:
                 // #58924# Toggle-Slot braucht einen State
-                rSet.Put( SfxBoolItem( nWhich, FALSE ) );
+                rSet.Put( SfxBoolItem( nWhich, sal_False ) );
                 break;
 
             case SID_READONLY_MODE:
@@ -478,7 +477,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
 }
 
 //------------------------------------------------------------------
-void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage )
+void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
 {
     //CHINA001 ScAttrDlg*				pDlg	= NULL;
     SfxAbstractTabDialog * pDlg	= NULL; //CHINA001
@@ -507,7 +506,7 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage )
     pOldSet->MergeRange( SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_INFO );
     pOldSet->Put(*pNumberInfoItem );
 
-    bInFormatDialog = TRUE;
+    bInFormatDialog = sal_True;
     //CHINA001 pDlg = new ScAttrDlg( GetViewFrame(), GetDialogParent(), pOldSet );
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -517,14 +516,14 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage )
     if ( nTabPage != 0xffff )
         pDlg->SetCurPageId( nTabPage );
     short nResult = pDlg->Execute();
-    bInFormatDialog = FALSE;
+    bInFormatDialog = sal_False;
 
     if ( nResult == RET_OK )
     {
         const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
         const SfxPoolItem* pItem=NULL;
-        if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,TRUE,&pItem)==SFX_ITEM_SET)
+        if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,sal_True,&pItem)==SFX_ITEM_SET)
         {
 
             UpdateNumberFormatter( pDoc,(const SvxNumberInfoItem&)*pItem);
@@ -602,7 +601,7 @@ void ScTabViewShell::ExecuteInputDirect()
 
 //------------------------------------------------------------------
 
-void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEditing /* = TRUE */ )
+void ScTabViewShell::UpdateInputHandler( sal_Bool bForce /* = sal_False */, sal_Bool bStopEditing /* = sal_True */ )
 {
     ScInputHandler* pHdl = pInputHandler ? pInputHandler : SC_MOD()->GetInputHdl();
 
@@ -630,8 +629,8 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd
         PutInOrder( nStartRow, nEndRow );
         PutInOrder( nStartTab, nEndTab );
 
-        BOOL bHideFormula = FALSE;
-        BOOL bHideAll	  = FALSE;
+        sal_Bool bHideFormula = sal_False;
+        sal_Bool bHideAll	  = sal_False;
 
         if (pDoc->IsTabProtected(nTab))
         {
@@ -724,7 +723,7 @@ void __EXPORT ScTabViewShell::GetSaveState( SfxItemSet& rSet )
     SfxShell* pDocSh = GetViewData()->GetDocShell();
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while( nWhich )
     {
         if ( nWhich != SID_SAVEDOC || !GetViewData()->GetDocShell()->IsDocShared() )
@@ -738,92 +737,6 @@ void __EXPORT ScTabViewShell::GetSaveState( SfxItemSet& rSet )
 
 //------------------------------------------------------------------
 
-void ScTabViewShell::ExecuteUndo(SfxRequest& rReq)
-{
-    SfxShell* pSh = GetViewData()->GetDispatcher().GetShell(0);
-    SfxUndoManager* pUndoManager = pSh->GetUndoManager();
-
-    const SfxItemSet* pReqArgs = rReq.GetArgs();
-    ScDocShell* pDocSh = GetViewData()->GetDocShell();
-
-    USHORT nSlot = rReq.GetSlot();
-    switch ( nSlot )
-    {
-        case SID_UNDO:
-        case SID_REDO:
-            if ( pUndoManager )
-            {
-                BOOL bIsUndo = ( nSlot == SID_UNDO );
-
-                USHORT nCount = 1;
-                const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState( nSlot, TRUE, &pItem ) == SFX_ITEM_SET )
-                    nCount = ((const SfxUInt16Item*)pItem)->GetValue();
-
-                // lock paint for more than one cell undo action (not for editing within a cell)
-                BOOL bLockPaint = ( nCount > 1 && pUndoManager == GetUndoManager() );
-                if ( bLockPaint )
-                    pDocSh->LockPaint();
-
-                for (USHORT i=0; i<nCount; i++)
-                {
-                    if ( bIsUndo )
-                        pUndoManager->Undo(0);
-                    else
-                        pUndoManager->Redo(0);
-                }
-
-                if ( bLockPaint )
-                    pDocSh->UnlockPaint();
-
-                GetViewFrame()->GetBindings().InvalidateAll(sal_False);
-            }
-            break;
-//		default:
-//			GetViewFrame()->ExecuteSlot( rReq );
-    }
-}
-
-void ScTabViewShell::GetUndoState(SfxItemSet &rSet)
-{
-    SfxShell* pSh = GetViewData()->GetDispatcher().GetShell(0);
-    SfxUndoManager* pUndoManager = pSh->GetUndoManager();
-
-    SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
-    while ( nWhich )
-    {
-        switch (nWhich)
-        {
-            case SID_GETUNDOSTRINGS:
-            case SID_GETREDOSTRINGS:
-                {
-                    SfxStringListItem aStrLst( nWhich );
-                    if ( pUndoManager )
-                    {
-                        List* pList = aStrLst.GetList();
-                        BOOL bIsUndo = ( nWhich == SID_GETUNDOSTRINGS );
-                        USHORT nCount = bIsUndo ? pUndoManager->GetUndoActionCount() : pUndoManager->GetRedoActionCount();
-                        for (USHORT i=0; i<nCount; i++)
-                            pList->Insert( new String( bIsUndo ? pUndoManager->GetUndoActionComment(i) :
-                                                                 pUndoManager->GetRedoActionComment(i) ),
-                                           LIST_APPEND );
-                    }
-                    rSet.Put( aStrLst );
-                }
-                break;
-            default:
-                // get state from sfx view frame
-                GetViewFrame()->GetSlotState( nWhich, NULL, &rSet );
-        }
-
-        nWhich = aIter.NextWhich();
-    }
-}
-
-
-//------------------------------------------------------------------
-
 void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq )
 {
     ScViewOptions aViewOptions = GetViewData()->GetOptions();
@@ -832,11 +745,11 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq )
     SfxBindings& rBindings = GetViewFrame()->GetBindings();
     const SfxItemSet* pArgs = rReq.GetArgs();
     const SfxPoolItem* pItem;
-    USHORT nSlotId = rReq.GetSlot();
+    sal_uInt16 nSlotId = rReq.GetSlot();
     switch (nSlotId)
     {
         case SID_GRID_VISIBLE:
-            if ( pArgs && pArgs->GetItemState(nSlotId,TRUE,&pItem) == SFX_ITEM_SET )
+            if ( pArgs && pArgs->GetItemState(nSlotId,sal_True,&pItem) == SFX_ITEM_SET )
             {
                 aGridOptions.SetGridVisible( ((const SfxBoolItem*)pItem)->GetValue() );
                 aViewOptions.SetGridOptions(aGridOptions);
@@ -845,7 +758,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq )
             break;
 
         case SID_GRID_USE:
-            if ( pArgs && pArgs->GetItemState(nSlotId,TRUE,&pItem) == SFX_ITEM_SET )
+            if ( pArgs && pArgs->GetItemState(nSlotId,sal_True,&pItem) == SFX_ITEM_SET )
             {
                 aGridOptions.SetUseGridSnap( ((const SfxBoolItem*)pItem)->GetValue() );
                 aViewOptions.SetGridOptions(aGridOptions);
@@ -854,7 +767,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq )
             break;
 
         case SID_HELPLINES_MOVE:
-            if ( pArgs && pArgs->GetItemState(nSlotId,TRUE,&pItem) == SFX_ITEM_SET )
+            if ( pArgs && pArgs->GetItemState(nSlotId,sal_True,&pItem) == SFX_ITEM_SET )
             {
                 aViewOptions.SetOption( VOPT_HELPLINES, ((const SfxBoolItem*)pItem)->GetValue() );
                 rBindings.Invalidate(SID_HELPLINES_MOVE);
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index cd61a6c23..e716441a9 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -61,9 +61,11 @@
 #include <sfx2/viewfrm.hxx>
 #include <svtools/soerr.hxx>
 #include <svl/rectitem.hxx>
+#include <svl/slstitm.hxx>
 #include <svl/whiter.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <sot/exchange.hxx>
+#include <tools/diagnose_ex.h>
 
 #include "tabvwsh.hxx"
 #include "globstr.hrc"
@@ -114,7 +116,7 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj )
     }
 }
 
-BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
+sal_Bool ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
 {
     // #41081# Gueltigkeits-Hinweisfenster nicht ueber dem Objekt stehenlassen
     RemoveHintWindow();
@@ -122,7 +124,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
     uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef();
     Window* pWin = GetActiveWin();
     ErrCode nErr = ERRCODE_NONE;
-    BOOL bErrorShown = FALSE;
+    sal_Bool bErrorShown = sal_False;
 
     // linked objects aren't supported
 //	if ( xIPObj->IsLink() )
@@ -176,7 +178,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
             ((ScClient*)pClient)->SetGrafEdit( NULL );
 
             nErr = pClient->DoVerb( nVerb );
-            bErrorShown = TRUE;
+            bErrorShown = sal_True;
             // SfxViewShell::DoVerb zeigt seine Fehlermeldungen selber an
 
             // attach listener to selection changes in chart that affect cell
@@ -268,7 +270,7 @@ void ScTabViewShell::DeactivateOle()
 
 void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
 {
-    USHORT nSlot = rReq.GetSlot();
+    sal_uInt16 nSlot = rReq.GetSlot();
     if (nSlot != SID_OBJECTRESIZE )
     {
         SC_MOD()->InputEnterHandler();
@@ -338,7 +340,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
                             SdrMark* pMark = rMarkList.GetMark(0);
                             SdrObject* pObj = pMark->GetMarkedSdrObj();
 
-                            UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+                            sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
 
                             if (nSdrObjKind == OBJ_OLE2)
                             {
@@ -431,13 +433,13 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
 
 void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet)
 {
-    BOOL bOle = GetViewFrame()->GetFrame().IsInPlace();
-    BOOL bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo());
+    sal_Bool bOle = GetViewFrame()->GetFrame().IsInPlace();
+    sal_Bool bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo());
     ScDocShell* pDocShell = ( GetViewData() ? GetViewData()->GetDocShell() : NULL );
     bool bShared = ( pDocShell ? pDocShell->IsDocShared() : false );
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch ( nWhich )
@@ -487,5 +489,98 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet)
 }
 
 
+//------------------------------------------------------------------
+
+void ScTabViewShell::ExecuteUndo(SfxRequest& rReq)
+{
+    SfxShell* pSh = GetViewData()->GetDispatcher().GetShell(0);
+    ::svl::IUndoManager* pUndoManager = pSh->GetUndoManager();
+
+    const SfxItemSet* pReqArgs = rReq.GetArgs();
+    ScDocShell* pDocSh = GetViewData()->GetDocShell();
+
+    sal_uInt16 nSlot = rReq.GetSlot();
+    switch ( nSlot )
+    {
+        case SID_UNDO:
+        case SID_REDO:
+            if ( pUndoManager )
+            {
+                sal_Bool bIsUndo = ( nSlot == SID_UNDO );
+
+                sal_uInt16 nCount = 1;
+                const SfxPoolItem* pItem;
+                if ( pReqArgs && pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
+                    nCount = ((const SfxUInt16Item*)pItem)->GetValue();
+
+                // lock paint for more than one cell undo action (not for editing within a cell)
+                sal_Bool bLockPaint = ( nCount > 1 && pUndoManager == GetUndoManager() );
+                if ( bLockPaint )
+                    pDocSh->LockPaint();
+
+                try
+                {
+                    for (sal_uInt16 i=0; i<nCount; i++)
+                    {
+                        if ( bIsUndo )
+                            pUndoManager->Undo();
+                        else
+                            pUndoManager->Redo();
+                    }
+                }
+                catch ( const uno::Exception& )
+                {
+                    // no need to handle. By definition, the UndoManager handled this by clearing the
+                    // Undo/Redo stacks
+                }
+
+                if ( bLockPaint )
+                    pDocSh->UnlockPaint();
+
+                GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+            }
+            break;
+//		default:
+//			GetViewFrame()->ExecuteSlot( rReq );
+    }
+}
+
+void ScTabViewShell::GetUndoState(SfxItemSet &rSet)
+{
+    SfxShell* pSh = GetViewData()->GetDispatcher().GetShell(0);
+    ::svl::IUndoManager* pUndoManager = pSh->GetUndoManager();
+
+    SfxWhichIter aIter(rSet);
+    sal_uInt16 nWhich = aIter.FirstWhich();
+    while ( nWhich )
+    {
+        switch (nWhich)
+        {
+            case SID_GETUNDOSTRINGS:
+            case SID_GETREDOSTRINGS:
+                {
+                    SfxStringListItem aStrLst( nWhich );
+                    if ( pUndoManager )
+                    {
+                        List* pList = aStrLst.GetList();
+                        sal_Bool bIsUndo = ( nWhich == SID_GETUNDOSTRINGS );
+                        size_t nCount = bIsUndo ? pUndoManager->GetUndoActionCount() : pUndoManager->GetRedoActionCount();
+                        for (size_t i=0; i<nCount; i++)
+                            pList->Insert( new String( bIsUndo ? pUndoManager->GetUndoActionComment(i) :
+                                                                 pUndoManager->GetRedoActionComment(i) ),
+                                           LIST_APPEND );
+                    }
+                    rSet.Put( aStrLst );
+                }
+                break;
+            default:
+                // get state from sfx view frame
+                GetViewFrame()->GetSlotState( nWhich, NULL, &rSet );
+        }
+
+        nWhich = aIter.NextWhich();
+    }
+}
+
 
 
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index ace1aae4d..5236acd94 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -72,7 +72,7 @@
 
 //------------------------------------------------------------------
 
-void ScTabViewShell::SetCurRefDlgId( USHORT nNew )
+void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew )
 {
     //	CurRefDlgId is stored in ScModule to find if a ref dialog is open,
     //	and in the view to identify the view that has opened the dialog
@@ -81,7 +81,7 @@ void ScTabViewShell::SetCurRefDlgId( USHORT nNew )
 
 SfxModelessDialog* ScTabViewShell::CreateRefDialog(
                         SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo,
-                        Window* pParent, USHORT nSlotId )
+                        Window* pParent, sal_uInt16 nSlotId )
 {
     //	Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit
     //	z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#).
@@ -94,14 +94,14 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
         //	the dialog has been opened in a different view
         //	-> lock the dispatcher for this view (modal mode)
 
-        GetViewData()->GetDispatcher().Lock( TRUE );	// lock is reset when closing dialog
+        GetViewData()->GetDispatcher().Lock( sal_True );	// lock is reset when closing dialog
         return NULL;
     }
 
     SfxModelessDialog* pResult = 0;
 
     if(pCW)
-        pCW->SetHideNotDelete(TRUE);
+        pCW->SetHideNotDelete(sal_True);
 
     switch( nSlotId )
     {
@@ -159,10 +159,10 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
         case SID_DEFINE_DBNAME:
         {
             //	wenn auf einem bestehenden Bereich aufgerufen, den markieren
-            GetDBData( TRUE, SC_DB_OLD );
+            GetDBData( sal_True, SC_DB_OLD );
             const ScMarkData& rMark = GetViewData()->GetMarkData();
             if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
-                MarkDataArea( FALSE );
+                MarkDataArea( sal_False );
 
             pResult = new ScDbNameDlg( pB, pCW, pParent, GetViewData() );
         }
@@ -175,7 +175,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
                                      SCITEM_QUERYDATA,
                                      SCITEM_QUERYDATA );
 
-            ScDBData* pDBData = GetDBData( TRUE, SC_DB_MAKE, SC_DBSEL_ROW_DOWN);
+            ScDBData* pDBData = GetDBData( sal_True, SC_DB_MAKE, SC_DBSEL_ROW_DOWN);
             pDBData->GetQueryParam( aQueryParam );
 
             ScQueryItem aItem( SCITEM_QUERYDATA, GetViewData(), &aQueryParam );
@@ -200,7 +200,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
                                      SCITEM_QUERYDATA,
                                      SCITEM_QUERYDATA );
 
-            ScDBData* pDBData = GetDBData( TRUE, SC_DB_MAKE, SC_DBSEL_ROW_DOWN);
+            ScDBData* pDBData = GetDBData( sal_True, SC_DB_MAKE, SC_DBSEL_ROW_DOWN);
             pDBData->GetQueryParam( aQueryParam );
 
             aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA,
@@ -220,7 +220,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
             ScRefAddress  aCurPos	( pViewData->GetCurX(),
                                       pViewData->GetCurY(),
                                       pViewData->GetTabNo(),
-                                      FALSE, FALSE, FALSE );
+                                      sal_False, sal_False, sal_False );
 
             pResult = new ScTabOpDlg( pB, pCW, pParent, pViewData->GetDocument(), aCurPos );
         }
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx
index 0a9bb9e57..9984e9bfc 100644
--- a/sc/source/ui/view/tabvwshd.cxx
+++ b/sc/source/ui/view/tabvwshd.cxx
@@ -56,7 +56,7 @@
 //------------------------------------------------------------------
 
 #define IS_AVAILABLE(WhichId,ppItem) \
-    (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+    (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 
 //! 		Parent-Window fuer Dialoge
 //! 		Problem: OLE Server!
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 7d0fec8de..84a9c04b7 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -56,7 +56,7 @@
 
 //==================================================================
 
-String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord )
+String __EXPORT ScTabViewShell::GetSelectionText( sal_Bool bWholeWord )
 {
     String aStrSelection;
 
@@ -97,7 +97,9 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord )
                 SCROW nRow1, nRow2;
                 SCTAB nTab1, nTab2;
                 aRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-                if (pDoc->ShrinkToUsedDataArea( nTab1, nCol1, nRow1, nCol2, nRow2, false))
+                bool bShrunk;
+                pDoc->ShrinkToUsedDataArea( bShrunk, nTab1, nCol1, nRow1, nCol2, nRow2, false);
+                if (bShrunk)
                 {
                     aRange.aStart.SetCol( nCol1 );
                     aRange.aStart.SetRow( nRow1 );
@@ -138,10 +140,10 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord )
 //------------------------------------------------------------------------
 
 void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const String& rTarget,
-                                USHORT nMode )
+                                sal_uInt16 nMode )
 {
     SvxLinkInsertMode eMode = (SvxLinkInsertMode) nMode;
-    BOOL bAsText = ( eMode != HLINK_BUTTON );		// Default ist jetzt Text
+    sal_Bool bAsText = ( eMode != HLINK_BUTTON );		// Default ist jetzt Text
 
     if ( bAsText )
     {
@@ -156,11 +158,11 @@ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const S
         {
             //	#91216# if the view is not active, InsertURLField doesn't work
             //	-> use InsertBookmark to directly manipulate cell content
-            //	bTryReplace=TRUE -> if cell contains only one URL, replace it
+            //	bTryReplace=sal_True -> if cell contains only one URL, replace it
 
             SCCOL nPosX = GetViewData()->GetCurX();
             SCROW nPosY = GetViewData()->GetCurY();
-            InsertBookmark( rName, rURL, nPosX, nPosY, &rTarget, TRUE );
+            InsertBookmark( rName, rURL, nPosX, nPosY, &rTarget, sal_True );
         }
     }
     else
@@ -196,7 +198,7 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
     ScModule*		pScMod		= SC_MOD();
     ScInputHandler*	pHdl		= pScMod->GetInputHdl( pViewData->GetViewShell() );
 
-    BOOL bSelectFirst = FALSE;
+    sal_Bool bSelectFirst = sal_False;
     if ( !pScMod->IsEditMode() )
     {
         if ( !SelectionEditable() )
@@ -242,7 +244,7 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
 void ScTabViewShell::ExecSearch( SfxRequest& rReq )
 {
     const SfxItemSet*	pReqArgs	= rReq.GetArgs();
-    USHORT				nSlot		= rReq.GetSlot();
+    sal_uInt16				nSlot		= rReq.GetSlot();
     const SfxPoolItem*	pItem;
 
     switch ( nSlot )
@@ -250,13 +252,13 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
         case FID_SEARCH_NOW:
             {
                 if ( pReqArgs &&
-                     SFX_ITEM_SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, FALSE, &pItem) )
+                     SFX_ITEM_SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, sal_False, &pItem) )
                 {
                     DBG_ASSERT( pItem->ISA(SvxSearchItem), "falsches Item" );
                     const SvxSearchItem* pSearchItem = (const SvxSearchItem*) pItem;
 
                     ScGlobal::SetSearchItem( *pSearchItem );
-                    SearchAndReplace( pSearchItem, TRUE, rReq.IsAPI() );
+                    SearchAndReplace( pSearchItem, sal_True, rReq.IsAPI() );
                     rReq.Done();
                 }
             }
@@ -264,7 +266,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
 
         case SID_SEARCH_ITEM:
             if (pReqArgs && SFX_ITEM_SET ==
-                            pReqArgs->GetItemState(SID_SEARCH_ITEM, FALSE, &pItem))
+                            pReqArgs->GetItemState(SID_SEARCH_ITEM, sal_False, &pItem))
             {
                 //	Search-Item merken
                 DBG_ASSERT( pItem->ISA(SvxSearchItem), "falsches Item" );
@@ -280,7 +282,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
         case FID_REPLACE_ALL:
         case FID_SEARCH_ALL:
             {
-                if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, FALSE, &pItem))
+                if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, sal_False, &pItem))
                 {
                     //	SearchItem holen
 
@@ -289,7 +291,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
                     //	SearchItem fuellen
 
                     aSearchItem.SetSearchString(((SfxStringItem*)pItem)->GetValue());
-                    if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, FALSE, &pItem))
+                    if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, sal_False, &pItem))
                         aSearchItem.SetReplaceString(((SfxStringItem*)pItem)->GetValue());
 
                     if (nSlot == FID_SEARCH)
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index e7116c83b..08d934595 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -66,7 +66,7 @@ using ::boost::scoped_ptr;
 using namespace com::sun::star;
 
 #define IS_AVAILABLE(WhichId,ppItem) \
-    (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+    (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 
 //------------------------------------------------------------------
 
@@ -77,7 +77,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 
     SCTAB		nCurrentTab	= pViewData->GetTabNo();
     SCTAB		nTabCount	= pDoc->GetTableCount();
-    USHORT		nSlot		= rReq.GetSlot();
+    sal_uInt16		nSlot		= rReq.GetSlot();
     const SfxItemSet* pReqArgs = rReq.GetArgs();
 
     HideListBox();					// Autofilter-DropDown-Listbox
@@ -89,7 +89,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 String aName;
                 pDoc->GetName( nCurrentTab, aName );
 
-                BOOL bVisible=TRUE;
+                sal_Bool bVisible=sal_True;
                 if( pReqArgs != NULL )
                 {
                     const SfxPoolItem* pItem;
@@ -101,7 +101,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 {
                     ScMarkData& rMark = pViewData->GetMarkData();
                     SCTAB nTabSelCount = rMark.GetSelectCount();
-                    USHORT nVis = 0;
+                    sal_uInt16 nVis = 0;
                     for ( SCTAB i=0; i < nTabCount && nVis<2; i++ )
                         if (pDoc->IsVisible(i))
                             ++nVis;
@@ -123,7 +123,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
             {
                 ScMarkData& rMark = pViewData->GetMarkData();
                 SCTAB nTabSelCount = rMark.GetSelectCount();
-                USHORT nVis = 0;
+                sal_uInt16 nVis = 0;
                 for ( SCTAB i=0; i < nTabCount && nVis<2; i++ )
                     if (pDoc->IsVisible(i))
                         ++nVis;
@@ -180,21 +180,21 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                     DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
 
                     String aTabName;
-                    BOOL bFirst = TRUE;
+                    sal_Bool bFirst = sal_True;
                     for ( SCTAB i=0; i != nTabCount; i++ )
                     {
                         if (!pDoc->IsVisible(i))
                         {
                             pDoc->GetName( i, aTabName );
                             pDlg->Insert( aTabName, bFirst );
-                            bFirst = FALSE;
+                            bFirst = sal_False;
                         }
                     }
 
                     if ( pDlg->Execute() == RET_OK )
                     {
-                        USHORT nCount = pDlg->GetSelectEntryCount();
-                        for (USHORT nPos=0; nPos<nCount; nPos++)
+                        sal_uInt16 nCount = pDlg->GetSelectEntryCount();
+                        for (sal_uInt16 nPos=0; nPos<nCount; nPos++)
                         {
                             aName = pDlg->GetSelectEntry(nPos);
                             ShowTable( aName );
@@ -219,7 +219,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 
                 if ( pReqArgs != NULL )				// von Basic
                 {
-                    BOOL bOk = FALSE;
+                    sal_Bool bOk = sal_False;
                     const SfxPoolItem*	pTabItem;
                     const SfxPoolItem*	pNameItem;
                     String				aName;
@@ -257,14 +257,14 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                         {
                             SCTAB nTabs[MAXTABCOUNT];
                             SCTAB nCount = 0;
-                            USHORT n = 0;
+                            sal_uInt16 n = 0;
                             const String* pStr = pDlg->GetFirstTable( &n );
                             while ( pStr )
                             {
                                 nTabs[nCount++] = static_cast<SCTAB>(n);
                                 pStr = pDlg->GetNextTable( &n );
                             }
-                            BOOL bLink = pDlg->GetTablesAsLink();
+                            sal_Bool bLink = pDlg->GetTablesAsLink();
                             if (nCount != 0)
                             {
                                 if(pDlg->IsTableBefore())
@@ -389,7 +389,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 
                 if( pReqArgs != NULL )
                 {
-                    BOOL		bDone	= FALSE;
+                    sal_Bool		bDone	= sal_False;
                     const SfxPoolItem* pItem;
                     String		aName;
 
@@ -416,8 +416,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 }
                 else
                 {
-                    USHORT		nRet	= RET_OK;
-                    BOOL		bDone	= FALSE;
+                    sal_uInt16		nRet	= RET_OK;
+                    sal_Bool		bDone	= sal_False;
                     String		aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) );
                     String		aName;
                     String		aDlgTitle;
@@ -498,10 +498,10 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 if ( pDoc->GetChangeTrack() != NULL )
                     break;		// bei aktiviertem ChangeTracking kein TabMove
 
-                BOOL   bDoIt = FALSE;
-                USHORT nDoc = 0;
+                sal_Bool   bDoIt = sal_False;
+                sal_uInt16 nDoc = 0;
                 SCTAB nTab = pViewData->GetTabNo();
-                BOOL   bCpy = FALSE;
+                sal_Bool   bCpy = sal_False;
                 String aDocName;
 
                 if( pReqArgs != NULL )
@@ -525,7 +525,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                     {
                         SfxObjectShell* pSh		= SfxObjectShell::GetFirst();
                         ScDocShell*		pScSh	= NULL;
-                        USHORT			i=0;
+                        sal_uInt16			i=0;
 
                         while ( pSh )
                         {
@@ -552,7 +552,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                     else // Kein Dokumentname -> neues Dokument
                     {
                         nDoc = SC_DOC_NEW;
-                        bDoIt = TRUE;
+                        bDoIt = sal_True;
                     }
 
                     if ( bDoIt && nTab >= nTableCount )		// ggf. anhaengen
@@ -575,14 +575,14 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                     if(nTableCount==nTabSelCount)
                     {
                         pDlg->SetCopyTable();
-                        pDlg->EnableCopyTable(FALSE);
+                        pDlg->EnableCopyTable(sal_False);
                     }
                     if ( pDlg->Execute() == RET_OK )
                     {
                         nDoc = pDlg->GetSelectedDocument();
                         nTab = pDlg->GetSelectedTable();
                         bCpy = pDlg->GetCopyTable();
-                        bDoIt = TRUE;
+                        bDoIt = sal_True;
 
                         String aFoundDocName;
                         if ( nDoc != SC_DOC_NEW )
@@ -594,7 +594,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                                 if ( !pSh->GetDocument()->IsDocEditable() )
                                 {
                                     ErrorMessage(STR_READONLYERR);
-                                    bDoIt = FALSE;
+                                    bDoIt = sal_False;
                                 }
                             }
                         }
@@ -620,7 +620,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
             {
                 //	Parameter war ueberfluessig, weil die Methode an der Table haengt
 
-                BOOL bDoIt = rReq.IsAPI();
+                sal_Bool bDoIt = rReq.IsAPI();
                 if( !bDoIt )
                 {
                     //	wenn's nicht von Basic kommt, nochmal nachfragen:
@@ -641,7 +641,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 {
                     SCTAB nNewTab	= nCurrentTab;
                     SCTAB nFirstTab=0;
-                    BOOL   bTabFlag=FALSE;
+                    sal_Bool   bTabFlag=sal_False;
                     ScMarkData& rMark = pViewData->GetMarkData();
                     SvShorts TheTabs;
                     for(SCTAB i=0;i<nTabCount;i++)
@@ -649,7 +649,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                         if(rMark.GetTableSelect(i) &&!pDoc->IsTabProtected(i))
                         {
                             TheTabs.push_back(i);
-                            bTabFlag=TRUE;
+                            bTabFlag=sal_True;
                             if(nNewTab==i) nNewTab++;
                         }
                         if(!bTabFlag) nFirstTab=i;
@@ -668,25 +668,25 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
             {
                 ScDocShell* pDocSh = pViewData->GetDocShell();
                 ScDocFunc aFunc(*pDocSh);
-                BOOL bSet = !pDoc->IsLayoutRTL( nCurrentTab );
+                sal_Bool bSet = !pDoc->IsLayoutRTL( nCurrentTab );
 
                 const ScMarkData& rMark = pViewData->GetMarkData();
                 if ( rMark.GetSelectCount() != 0 )
                 {
                     //	handle several sheets
 
-                    SfxUndoManager* pUndoManager = pDocSh->GetUndoManager();
+                    ::svl::IUndoManager* pUndoManager = pDocSh->GetUndoManager();
                     String aUndo = ScGlobal::GetRscString( STR_UNDO_TAB_RTL );
                     pUndoManager->EnterListAction( aUndo, aUndo );
 
                     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
                         if ( rMark.GetTableSelect(nTab) )
-                            aFunc.SetLayoutRTL( nTab, bSet, FALSE );
+                            aFunc.SetLayoutRTL( nTab, bSet, sal_False );
 
                     pUndoManager->LeaveListAction();
                 }
                 else
-                    aFunc.SetLayoutRTL( nCurrentTab, bSet, FALSE );
+                    aFunc.SetLayoutRTL( nCurrentTab, bSet, sal_False );
             }
             break;
 
@@ -706,7 +706,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 
                 if( pReqArgs != NULL )
                 {
-                    BOOL                bDone = FALSE;
+                    sal_Bool                bDone = sal_False;
                     const SfxPoolItem*  pItem;
                     Color               aColor;
                     if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
@@ -741,8 +741,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 }
                 else
                 {
-                    USHORT      nRet    = RET_OK; /// temp
-                    BOOL        bDone   = FALSE; /// temp
+                    sal_uInt16      nRet    = RET_OK; /// temp
+                    sal_Bool        bDone   = sal_False; /// temp
                     Color       aTabBgColor;
                     Color       aNewTabBgColor;
 
@@ -839,7 +839,7 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
     SCTAB nTabSelCount = rMark.GetSelectCount();
 
     SfxWhichIter	aIter(rSet);
-    USHORT			nWhich = aIter.FirstWhich();
+    sal_uInt16			nWhich = aIter.FirstWhich();
 
     while ( nWhich )
     {
@@ -852,7 +852,7 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
 
             case FID_TABLE_HIDE:
                 {
-                    USHORT nVis = 0;
+                    sal_uInt16 nVis = 0;
                     for ( SCTAB i=0; i < nTabCount && nVis<2; i++ )
                         if (pDoc->IsVisible(i))
                             ++nVis;
@@ -864,10 +864,10 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
 
             case FID_TABLE_SHOW:
                 {
-                    BOOL bHasHidden = FALSE;
+                    sal_Bool bHasHidden = sal_False;
                     for ( SCTAB i=0; i < nTabCount && !bHasHidden; i++ )
                         if (!pDoc->IsVisible(i))
-                            bHasHidden = TRUE;
+                            bHasHidden = sal_True;
                     if ( !bHasHidden || pDoc->IsDocProtected() || nTabSelCount > 1 )
                         rSet.DisableItem( nWhich );
                 }
@@ -879,7 +879,7 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
                         rSet.DisableItem( nWhich );
                     else
                     {
-                        USHORT nVis = 0;
+                        sal_uInt16 nVis = 0;
                         for ( SCTAB i=0; i < nTabCount && nVis<2; i++ )
                             if (pDoc->IsVisible(i))
                                 ++nVis;
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index 8f6639753..3d6a2ea3e 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -72,7 +72,7 @@ void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ )
 
 void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
 {
-    USHORT nSlotId = rReq.GetSlot();
+    sal_uInt16 nSlotId = rReq.GetSlot();
     const SfxItemSet* pReqArgs = rReq.GetArgs();
 
         //	Objekte aktivieren/deaktivieren immer auf der sichtbaren View
@@ -115,9 +115,9 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
         case SID_OBJECT_WIDTH:
         case SID_OBJECT_HEIGHT:
             {
-                BOOL bDone = FALSE;
+                sal_Bool bDone = sal_False;
                 const SfxPoolItem* pItem;
-                if ( pReqArgs && pReqArgs->GetItemState( nSlotId, TRUE, &pItem ) == SFX_ITEM_SET )
+                if ( pReqArgs && pReqArgs->GetItemState( nSlotId, sal_True, &pItem ) == SFX_ITEM_SET )
                 {
                     long nNewVal = ((const SfxInt32Item*)pItem)->GetValue();
                     if ( nNewVal < 0 )
@@ -146,7 +146,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
                                 pDrView->ResizeMarkedObj( aRect.TopLeft(),
                                                 Fraction( 1, 1 ),
                                                 Fraction( nNewVal, aRect.GetHeight() ) );
-                            bDone = TRUE;
+                            bDone = sal_True;
                         }
                     }
                 }
@@ -183,7 +183,7 @@ void ScTabViewShell::GetObjectState( SfxItemSet& rSet )
     //	SID_OLE_OBJECT - removed (old Basic)
 
     SfxWhichIter aIter(rSet);
-    USHORT nWhich = aIter.FirstWhich();
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while ( nWhich )
     {
         switch (nWhich)
@@ -267,7 +267,7 @@ void ScTabViewShell::BroadcastAccessibility( const SfxHint &rHint )
         pAccessibilityBroadcaster->Broadcast( rHint );
 }
 
-BOOL ScTabViewShell::HasAccessibilityObjects()
+sal_Bool ScTabViewShell::HasAccessibilityObjects()
 {
     return pAccessibilityBroadcaster != NULL;
 }
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 50cd9a26b..400859b44 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -81,8 +81,8 @@ using namespace com::sun::star;
 
 #define TAG_TABBARWIDTH "tw:"
 
-static BOOL bMoveArea = FALSE;				//! Member?
-USHORT nEditAdjust = SVX_ADJUST_LEFT;		//! Member !!!
+static sal_Bool bMoveArea = sal_False;				//! Member?
+sal_uInt16 nEditAdjust = SVX_ADJUST_LEFT;		//! Member !!!
 
 //==================================================================
 
@@ -101,7 +101,7 @@ ScViewDataTable::ScViewDataTable() :
                 nFixPosY( 0 ),
                 nCurX( 0 ),
                 nCurY( 0 ),
-                bOldCurValid( FALSE )
+                bOldCurValid( sal_False )
 {
     nPosX[0]=nPosX[1]=0;
     nPosY[0]=nPosY[1]=0;
@@ -312,21 +312,21 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
         nTabNo		( 0 ),
         nRefTabNo	( 0 ),
         eEditActivePart( SC_SPLIT_BOTTOMLEFT ),
-        bActive		( TRUE ),					//! wie initialisieren?
-        bIsRefMode	( FALSE ),
-        bDelMarkValid( FALSE ),
+        bActive		( sal_True ),					//! wie initialisieren?
+        bIsRefMode	( sal_False ),
+        bDelMarkValid( sal_False ),
         nFillMode	( SC_FILL_NONE ),
-        bPagebreak	( FALSE ),
-        bSelCtrlMouseClick( FALSE )
+        bPagebreak	( sal_False ),
+        bSelCtrlMouseClick( sal_False )
 {
 
-    SetGridMode		( TRUE );
-    SetSyntaxMode	( FALSE );
-    SetHeaderMode	( TRUE );
-    SetTabMode		( TRUE );
-    SetVScrollMode	( TRUE );
-    SetHScrollMode	( TRUE );
-    SetOutlineMode	( TRUE );
+    SetGridMode		( sal_True );
+    SetSyntaxMode	( sal_False );
+    SetHeaderMode	( sal_True );
+    SetTabMode		( sal_True );
+    SetVScrollMode	( sal_True );
+    SetHScrollMode	( sal_True );
+    SetOutlineMode	( sal_True );
 
     aScrSize = Size( (long) ( STD_COL_WIDTH 		  * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ),
                      (long) ( ScGlobal::nStdRowHeight * PIXEL_PER_TWIPS * OLE_STD_CELLS_Y ) );
@@ -334,10 +334,10 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
     for ( SCTAB i = 1; i <= MAXTAB; i++ )
         pTabData[i] = NULL;
     pThisTab = pTabData[nTabNo];
-    for (USHORT j=0; j<4; j++)
+    for (sal_uInt16 j=0; j<4; j++)
     {
         pEditView[j] = NULL;
-        bEditActive[j] = FALSE;
+        bEditActive[j] = sal_False;
     }
 
     nEditEndCol = nEditStartCol = nEditCol = 0;
@@ -380,9 +380,9 @@ ScViewData::ScViewData( const ScViewData& rViewData )
         nTabNo		( rViewData.nTabNo ),
         nRefTabNo	( rViewData.nTabNo ),			// kein RefMode
         eEditActivePart( rViewData.eEditActivePart ),
-        bActive		( TRUE ),								//! wie initialisieren?
-        bIsRefMode	( FALSE ),
-        bDelMarkValid( FALSE ),
+        bActive		( sal_True ),								//! wie initialisieren?
+        bIsRefMode	( sal_False ),
+        bDelMarkValid( sal_False ),
         nFillMode	( SC_FILL_NONE ),
         bPagebreak	( rViewData.bPagebreak ),
         bSelCtrlMouseClick( rViewData.bSelCtrlMouseClick )
@@ -403,10 +403,10 @@ ScViewData::ScViewData( const ScViewData& rViewData )
         else
             pTabData[i] = NULL;
     pThisTab = pTabData[nTabNo];
-    for (USHORT j=0; j<4; j++)
+    for (sal_uInt16 j=0; j<4; j++)
     {
         pEditView[j] = NULL;
-        bEditActive[j] = FALSE;
+        bEditActive[j] = sal_False;
     }
 
     nEditEndCol = nEditStartCol = nEditCol = 0;
@@ -612,7 +612,7 @@ void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs )
 
 void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs )
 {
-    BOOL bAll = ( tabs.size() == 0 );
+    sal_Bool bAll = ( tabs.size() == 0 );
 
     if ( !bAll ) // create associated table data
         CreateTabData( tabs );
@@ -639,7 +639,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs )
     }
 }
 
-void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll )
+void ScViewData::SetZoomType( SvxZoomType eNew, sal_Bool bAll )
 {
     std::vector< SCTAB > vTabs; // Empty for all tabs
     if ( !bAll ) // get selected tabs
@@ -656,7 +656,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll )
 
 void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs )
 {
-    BOOL bAll = ( tabs.size() == 0 );
+    sal_Bool bAll = ( tabs.size() == 0 );
     if ( !bAll ) // create associated table data
         CreateTabData( tabs );
     Fraction aFrac20( 1,5 );
@@ -728,7 +728,7 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vec
     RefreshZoom();
 }
 
-void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll )
+void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, sal_Bool bAll )
 {
     std::vector< SCTAB > vTabs;
     if ( !bAll ) // get selected tabs
@@ -754,7 +754,7 @@ void ScViewData::RefreshZoom()
     aLogicMode.SetScaleY( GetZoomY() );
 }
 
-void ScViewData::SetPagebreakMode( BOOL bSet )
+void ScViewData::SetPagebreakMode( sal_Bool bSet )
 {
     bPagebreak = bSet;
 
@@ -821,7 +821,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const
 
     ScMarkData aNewMark( aMarkData );		// use a local copy for MarkToSimple
 
-    BOOL bMulti = aNewMark.IsMultiMarked();
+    sal_Bool bMulti = aNewMark.IsMultiMarked();
     if (bMulti)
     {
         aNewMark.MarkToSimple();
@@ -830,7 +830,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const
     if (bMulti)
     {
         rRange = new ScRangeList;
-        aNewMark.FillRangeListWithMarks( rRange, FALSE );
+        aNewMark.FillRangeListWithMarks( rRange, sal_False );
     }
     else
     {
@@ -841,7 +841,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const
     }
 }
 
-BOOL ScViewData::SimpleColMarked()
+sal_Bool ScViewData::SimpleColMarked()
 {
     SCCOL nStartCol;
     SCROW nStartRow;
@@ -851,12 +851,12 @@ BOOL ScViewData::SimpleColMarked()
     SCTAB nEndTab;
     if (GetSimpleArea(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) == SC_MARK_SIMPLE)
         if (nStartRow==0 && nEndRow==MAXROW)
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScViewData::SimpleRowMarked()
+sal_Bool ScViewData::SimpleRowMarked()
 {
     SCCOL nStartCol;
     SCROW nStartRow;
@@ -866,12 +866,12 @@ BOOL ScViewData::SimpleRowMarked()
     SCTAB nEndTab;
     if (GetSimpleArea(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) == SC_MARK_SIMPLE)
         if (nStartCol==0 && nEndCol==MAXCOL)
-            return TRUE;
+            return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScViewData::IsMultiMarked()
+sal_Bool ScViewData::IsMultiMarked()
 {
     // Test for "real" multi selection, calling MarkToSimple on a local copy,
     // and taking filtered in simple area marks into account.
@@ -891,7 +891,7 @@ void ScViewData::SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S
 }
 
 void ScViewData::SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                BYTE nMode )
+                                sal_uInt8 nMode )
 {
     nFillMode   = nMode;
     nFillStartX = nStartCol;
@@ -934,19 +934,19 @@ void ScViewData::SetOldCursor( SCCOL nNewX, SCROW nNewY )
 {
     pThisTab->nOldCurX = nNewX;
     pThisTab->nOldCurY = nNewY;
-    pThisTab->bOldCurValid = TRUE;
+    pThisTab->bOldCurValid = sal_True;
 }
 
 void ScViewData::ResetOldCursor()
 {
-    pThisTab->bOldCurValid = FALSE;
+    pThisTab->bOldCurValid = sal_False;
 }
 
 Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY,
                                     Window* pWin, const ScPatternAttr* pPattern,
-                                    BOOL bForceToTop )
+                                    sal_Bool bForceToTop )
 {
-    return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,TRUE),
+    return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,sal_True),
                         pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY() ).
                             GetEditArea( pPattern, bForceToTop );
 }
@@ -955,16 +955,16 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
                                 ScEditEngineDefaulter* pNewEngine,
                                 Window* pWin, SCCOL nNewX, SCROW nNewY )
 {
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
     ScHSplitPos eHWhich = WhichH(eWhich);
 
-    BOOL bWasThere = FALSE;
+    sal_Bool bWasThere = sal_False;
     if (pEditView[eWhich])
     {
         //	Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert
 
         if (bEditActive[eWhich])
-            bWasThere = TRUE;
+            bWasThere = sal_True;
         else
             pEditView[eWhich]->SetEditEngine(pNewEngine);
 
@@ -981,26 +981,26 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 
     //	bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576)
 
-    ULONG nEC = pNewEngine->GetControlWord();
+    sal_uLong nEC = pNewEngine->GetControlWord();
     pNewEngine->SetControlWord(nEC & ~EE_CNTRL_DOIDLEFORMAT);
 
-    ULONG nVC = pEditView[eWhich]->GetControlWord();
+    sal_uLong nVC = pEditView[eWhich]->GetControlWord();
     pEditView[eWhich]->SetControlWord(nVC & ~EV_CNTRL_AUTOSCROLL);
 
-    bEditActive[eWhich] = TRUE;
+    bEditActive[eWhich] = sal_True;
 
     const ScPatternAttr* pPattern = pDoc->GetPattern( nNewX, nNewY, nTabNo );
     SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
                                     pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue();
 
-    BOOL bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) ||
+    sal_Bool bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) ||
                     ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue();
 
-    BOOL bAsianVertical = pNewEngine->IsVertical();		// set by InputHandler
+    sal_Bool bAsianVertical = pNewEngine->IsVertical();		// set by InputHandler
 
     Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich),
                                         pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ).
-                                            GetEditArea( pPattern, TRUE );
+                                            GetEditArea( pPattern, sal_True );
 
     //	when right-aligned, leave space for the cursor
     //	in vertical mode, editing is always right-aligned
@@ -1030,13 +1030,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 
         //	For growing use only the alignment value from the attribute, numbers
         //	(existing or started) with default aligment extend to the right.
-        BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
-        BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT );		// visual left
-        BOOL bGrowBackwards = bGrowToLeft;							// logical left
+        sal_Bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
+        sal_Bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT );		// visual left
+        sal_Bool bGrowBackwards = bGrowToLeft;							// logical left
         if ( bLayoutRTL )
             bGrowBackwards = !bGrowBackwards;						// invert on RTL sheet
         if ( bAsianVertical )
-            bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE;	// keep old behavior for asian mode
+            bGrowCentered = bGrowToLeft = bGrowBackwards = sal_False;	// keep old behavior for asian mode
 
         long nSizeXPix;
         if (bBreak && !bAsianVertical)
@@ -1074,7 +1074,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 
             Fraction aFract(1,1);
             Rectangle aUtilRect = ScEditUtil( pDoc,nNewX,nNewY,nTabNo, Point(0,0), pWin,
-                                    HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( pPattern, FALSE );
+                                    HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ).GetEditArea( pPattern, sal_False );
             aPaperSize.Width() = aUtilRect.GetWidth();
         }
         pNewEngine->SetPaperSize( aPaperSize );
@@ -1091,7 +1091,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
         else if ( nEditAdjust == SVX_ADJUST_CENTER )
         {
             aVis.Right() = ( aPaper.Width() - 1 + nDiff ) / 2;
-            bMoveArea = TRUE;	// always
+            bMoveArea = sal_True;	// always
         }
         else
         {
@@ -1112,11 +1112,11 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 
         //	UpdateMode has been disabled in ScInputHandler::StartTable
         //	must be enabled before EditGrowY (GetTextHeight)
-        pNewEngine->SetUpdateMode( TRUE );
+        pNewEngine->SetUpdateMode( sal_True );
 
         pNewEngine->SetStatusEventHdl( LINK( this, ScViewData, EditEngineHdl ) );
 
-        EditGrowY( TRUE );		// adjust to existing text content
+        EditGrowY( sal_True );		// adjust to existing text content
         EditGrowX();
 
         Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0);
@@ -1135,7 +1135,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
     Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor();
 
     ScModule* pScMod = SC_MOD();
-    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+    //	#105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed sal_True)
     if ( aBackCol.GetTransparency() > 0 ||
             Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
     {
@@ -1155,7 +1155,7 @@ IMPL_LINK_INLINE_END( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG )
 
 IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus )
 {
-    ULONG nStatus = pStatus->GetStatusWord();
+    sal_uLong nStatus = pStatus->GetStatusWord();
     if (nStatus & (EE_STAT_HSCROLL | EE_STAT_TEXTHEIGHTCHANGED | EE_STAT_TEXTWIDTHCHANGED | EE_STAT_CURSOROUT))
     {
         EditGrowY();
@@ -1165,7 +1165,7 @@ IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus )
         {
             ScSplitPos eWhich = GetActivePart();
             if (pEditView[eWhich])
-                pEditView[eWhich]->ShowCursor(FALSE);
+                pEditView[eWhich]->ShowCursor(sal_False);
         }
     }
     return 0;
@@ -1182,7 +1182,7 @@ void ScViewData::EditGrowX()
     if ( !pCurView || !bEditActive[eWhich])
         return;
 
-    BOOL bLayoutRTL = pLocalDoc->IsLayoutRTL( nTabNo );
+    sal_Bool bLayoutRTL = pLocalDoc->IsLayoutRTL( nTabNo );
 
     ScEditEngineDefaulter* pEngine =
         (ScEditEngineDefaulter*) pCurView->GetEditEngine();
@@ -1198,22 +1198,22 @@ void ScViewData::EditGrowX()
     //	Margin ist schon bei der urspruenglichen Breite beruecksichtigt
     long nTextWidth = pEngine->CalcTextWidth();
 
-    BOOL bChanged = FALSE;
-    BOOL bAsianVertical = pEngine->IsVertical();
+    sal_Bool bChanged = sal_False;
+    sal_Bool bAsianVertical = pEngine->IsVertical();
 
     //	get bGrow... variables the same way as in SetEditEngine
     const ScPatternAttr* pPattern = pLocalDoc->GetPattern( nEditCol, nEditRow, nTabNo );
     SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
                                     pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue();
-    BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
-    BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT );		// visual left
-    BOOL bGrowBackwards = bGrowToLeft;							// logical left
+    sal_Bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
+    sal_Bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT );		// visual left
+    sal_Bool bGrowBackwards = bGrowToLeft;							// logical left
     if ( bLayoutRTL )
         bGrowBackwards = !bGrowBackwards;						// invert on RTL sheet
     if ( bAsianVertical )
-        bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE;	// keep old behavior for asian mode
+        bGrowCentered = bGrowToLeft = bGrowBackwards = sal_False;	// keep old behavior for asian mode
 
-    BOOL bUnevenGrow = FALSE;
+    sal_Bool bUnevenGrow = sal_False;
     if ( bGrowCentered )
     {
         while (aArea.GetWidth() + 0 < nTextWidth && ( nEditStartCol > nLeft || nEditEndCol < nRight ) )
@@ -1244,9 +1244,9 @@ void ScViewData::EditGrowX()
                 aArea.Right() = nCenter + aSize.Width() - nHalf - 1;
             }
 
-            bChanged = TRUE;
+            bChanged = sal_True;
             if ( nLogicLeft != nLogicRight )
-                bUnevenGrow = TRUE;
+                bUnevenGrow = sal_True;
         }
     }
     else if ( bGrowBackwards )
@@ -1269,7 +1269,7 @@ void ScViewData::EditGrowX()
                     aArea.Right() = aArea.Left() + aSize.Width() - 1;
             }
 
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
     }
     else
@@ -1292,7 +1292,7 @@ void ScViewData::EditGrowX()
                     aArea.Right() = aArea.Left() + aSize.Width() - 1;
             }
 
-            bChanged = TRUE;
+            bChanged = sal_True;
         }
     }
 
@@ -1333,7 +1333,7 @@ void ScViewData::EditGrowX()
                 aVis.Right() -= nMove;
             }
             pCurView->SetVisArea( aVis );
-            bMoveArea = FALSE;
+            bMoveArea = sal_False;
         }
 
         pCurView->SetOutputArea(aArea);
@@ -1353,7 +1353,7 @@ void ScViewData::EditGrowX()
     }
 }
 
-void ScViewData::EditGrowY( BOOL bInitial )
+void ScViewData::EditGrowY( sal_Bool bInitial )
 {
     ScSplitPos eWhich = GetActivePart();
     ScVSplitPos eVWhich = WhichV(eWhich);
@@ -1362,7 +1362,7 @@ void ScViewData::EditGrowY( BOOL bInitial )
     if ( !pCurView || !bEditActive[eWhich])
         return;
 
-    ULONG nControl = pEditView[eWhich]->GetControlWord();
+    sal_uLong nControl = pEditView[eWhich]->GetControlWord();
     if ( nControl & EV_CNTRL_AUTOSCROLL )
     {
         //	if end of screen had already been reached and scrolling enabled,
@@ -1394,13 +1394,13 @@ void ScViewData::EditGrowY( BOOL bInitial )
         //	because this occurs in the normal progress of editing a formula.
         //	Subsequent calls with empty text might involve changed attributes (including
         //	font height), so they are treated like normal text.
-        String aText = pEngine->GetText( (USHORT) 0 );
+        String aText = pEngine->GetText( (sal_uInt16) 0 );
         if ( ( aText.Len() == 0 && bInitial ) || aText.GetChar(0) == (sal_Unicode)'=' )
             nAllowedExtra = SC_GROWY_BIG_EXTRA;
     }
 
-    BOOL bChanged = FALSE;
-    BOOL bMaxReached = FALSE;
+    sal_Bool bChanged = sal_False;
+    sal_Bool bMaxReached = sal_False;
     while (aArea.GetHeight() + nAllowedExtra < nTextHeight && nEditEndRow < nBottom && !bMaxReached)
     {
         ++nEditEndRow;
@@ -1411,10 +1411,10 @@ void ScViewData::EditGrowY( BOOL bInitial )
         if ( aArea.Bottom() > aArea.Top() + aSize.Height() - 1 )
         {
             aArea.Bottom() = aArea.Top() + aSize.Height() - 1;
-            bMaxReached = TRUE;		// don't occupy more cells beyond paper size
+            bMaxReached = sal_True;		// don't occupy more cells beyond paper size
         }
 
-        bChanged = TRUE;
+        bChanged = sal_True;
         nAllowedExtra = SC_GROWY_SMALL_EXTRA;	// larger value is only for first row
     }
 
@@ -1436,7 +1436,7 @@ void ScViewData::EditGrowY( BOOL bInitial )
 void ScViewData::ResetEditView()
 {
     EditEngine* pEngine = NULL;
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pEditView[i])
         {
             if (bEditActive[i])
@@ -1445,7 +1445,7 @@ void ScViewData::ResetEditView()
                 pEngine->RemoveView(pEditView[i]);
                 pEditView[i]->SetOutputArea( Rectangle() );
             }
-            bEditActive[i] = FALSE;
+            bEditActive[i] = sal_False;
         }
 
     if (pEngine)
@@ -1454,7 +1454,7 @@ void ScViewData::ResetEditView()
 
 void ScViewData::KillEditView()
 {
-    for (USHORT i=0; i<4; i++)
+    for (sal_uInt16 i=0; i<4; i++)
         if (pEditView[i])
         {
             if (bEditActive[i])
@@ -1529,7 +1529,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich )
 }
 
 Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
-                                BOOL bAllowNeg ) const
+                                sal_Bool bAllowNeg ) const
 {
     ScHSplitPos eWhichX = SC_SPLIT_LEFT;
     ScVSplitPos eWhichY = SC_SPLIT_BOTTOM;
@@ -1559,7 +1559,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
         ((ScViewData*)this)->aScrSize.Height() = pView->GetGridHeight(eWhichY);
     }
 
-    USHORT nTSize;
+    sal_uInt16 nTSize;
 
     SCCOL	nPosX = GetPosX(eWhichX);
     SCCOL	nX;
@@ -1647,7 +1647,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
 //		Anzahl Zellen auf einem Bildschirm
 //
 
-SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeX ) const
+SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, sal_uInt16 nScrSizeX ) const
 {
     DBG_ASSERT( nDir==1 || nDir==-1, "falscher CellsAt Aufruf" );
 
@@ -1655,27 +1655,27 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHO
         ((ScViewData*)this)->aScrSize.Width()  = pView->GetGridWidth(eWhichX);
 
     SCsCOL	nX;
-    USHORT	nScrPosX = 0;
-    if (nScrSizeX == SC_SIZE_NONE) nScrSizeX = (USHORT) aScrSize.Width();
+    sal_uInt16	nScrPosX = 0;
+    if (nScrSizeX == SC_SIZE_NONE) nScrSizeX = (sal_uInt16) aScrSize.Width();
 
     if (nDir==1)
         nX = nPosX;				// vorwaerts
     else
         nX = nPosX-1;			// rueckwaerts
 
-    BOOL bOut = FALSE;
+    sal_Bool bOut = sal_False;
     for ( ; nScrPosX<=nScrSizeX && !bOut; nX = sal::static_int_cast<SCsCOL>(nX + nDir) )
     {
         SCsCOL	nColNo = nX;
         if ( nColNo < 0 || nColNo > MAXCOL )
-            bOut = TRUE;
+            bOut = sal_True;
         else
         {
-            USHORT nTSize = pDoc->GetColWidth( nColNo, nTabNo );
+            sal_uInt16 nTSize = pDoc->GetColWidth( nColNo, nTabNo );
             if (nTSize)
             {
                 long nSizeXPix = ToPixel( nTSize, nPPTX );
-                nScrPosX = sal::static_int_cast<USHORT>( nScrPosX + (USHORT) nSizeXPix );
+                nScrPosX = sal::static_int_cast<sal_uInt16>( nScrPosX + (sal_uInt16) nSizeXPix );
             }
         }
     }
@@ -1689,14 +1689,14 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHO
     return nX;
 }
 
-SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeY ) const
+SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, sal_uInt16 nScrSizeY ) const
 {
     DBG_ASSERT( nDir==1 || nDir==-1, "falscher CellsAt Aufruf" );
 
     if (pView)
         ((ScViewData*)this)->aScrSize.Height() = pView->GetGridHeight(eWhichY);
 
-    if (nScrSizeY == SC_SIZE_NONE) nScrSizeY = (USHORT) aScrSize.Height();
+    if (nScrSizeY == SC_SIZE_NONE) nScrSizeY = (sal_uInt16) aScrSize.Height();
 
     SCROW nY;
 
@@ -1757,7 +1757,7 @@ SCROW ScViewData::PrevCellsY( ScVSplitPos eWhichY ) const
 //UNUSED2008-05      return CellsAtY( MAXROW+1, -1, eWhichY, SC_SIZE_NONE );
 //UNUSED2008-05  }
 
-BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix )
+sal_Bool ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix )
 {
     const ScMergeAttr* pMerge = (const ScMergeAttr*) pDoc->GetAttr( nX,nY,nTabNo, ATTR_MERGE );
     if ( pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1 )
@@ -1778,25 +1778,25 @@ BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r
                 continue;
             }
 
-            USHORT nHeight = pDoc->GetRowHeight(nRow, nTabNo);
+            sal_uInt16 nHeight = pDoc->GetRowHeight(nRow, nTabNo);
             nOutHeight += ToPixel(nHeight, nPPTY);
         }
 
         rSizeXPix = nOutWidth;
         rSizeYPix = nOutHeight;
-        return TRUE;
+        return sal_True;
     }
     else
     {
         rSizeXPix = ToPixel( pDoc->GetColWidth( nX, nTabNo ), nPPTX );
         rSizeYPix = ToPixel( pDoc->GetRowHeight( nY, nTabNo ), nPPTY );
-        return FALSE;
+        return sal_False;
     }
 }
 
-BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
+sal_Bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
                                         SCsCOL& rPosX, SCsROW& rPosY,
-                                        BOOL bTestMerge, BOOL bRepair, BOOL bNextIfLarge )
+                                        sal_Bool bTestMerge, sal_Bool bRepair, sal_Bool bNextIfLarge )
 {
     //	special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint
 
@@ -1875,12 +1875,12 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
     {
         //!	public Methode um Position anzupassen
 
-        BOOL bHOver = FALSE;
+        sal_Bool bHOver = sal_False;
         while (pDoc->IsHorOverlapped( rPosX, rPosY, nTabNo ))
-            { --rPosX; bHOver=TRUE; }
-        BOOL bVOver = FALSE;
+            { --rPosX; bHOver=sal_True; }
+        sal_Bool bVOver = sal_False;
         while (pDoc->IsVerOverlapped( rPosX, rPosY, nTabNo ))
-            { --rPosY; bVOver=TRUE; }
+            { --rPosY; bVOver=sal_True; }
 
         if ( bRepair && ( bHOver || bVOver ) )
         {
@@ -1894,23 +1894,23 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
                 pDoc->RemoveFlagsTab( 0,0, MAXCOL,MAXROW, nTabNo, SC_MF_HOR | SC_MF_VER );
                 SCCOL nEndCol = MAXCOL;
                 SCROW nEndRow = MAXROW;
-                pDoc->ExtendMerge( 0,0, nEndCol,nEndRow, nTabNo, TRUE, FALSE );
+                pDoc->ExtendMerge( 0,0, nEndCol,nEndRow, nTabNo, sal_True, sal_False );
                 if (pDocShell)
                     pDocShell->PostPaint( ScRange(0,0,nTabNo,MAXCOL,MAXROW,nTabNo), PAINT_GRID );
             }
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void ScViewData::GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich,
-                                        SCsCOL nPosX, SCsROW nPosY, BOOL& rLeft, BOOL& rTop )
+                                        SCsCOL nPosX, SCsROW nPosY, sal_Bool& rLeft, sal_Bool& rTop )
 {
-    BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
+    sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
     long nLayoutSign = bLayoutRTL ? -1 : 1;
 
-    Point aCellStart = GetScrPos( nPosX, nPosY, eWhich, TRUE );
+    Point aCellStart = GetScrPos( nPosX, nPosY, eWhich, sal_True );
     long nSizeX;
     long nSizeY;
     GetMergeSizePixel( nPosX, nPosY, nSizeX, nSizeY );
@@ -1931,14 +1931,14 @@ void ScViewData::SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX )
             {
                 long nThis = pDoc->GetColWidth( i,nTabNo );
                 nTPosX -= nThis;
-                nPixPosX -= ToPixel(sal::static_int_cast<USHORT>(nThis), nPPTX);
+                nPixPosX -= ToPixel(sal::static_int_cast<sal_uInt16>(nThis), nPPTX);
             }
         else
             for ( i=nNewPosX; i<nOldPosX; i++ )
             {
                 long nThis = pDoc->GetColWidth( i,nTabNo );
                 nTPosX += nThis;
-                nPixPosX += ToPixel(sal::static_int_cast<USHORT>(nThis), nPPTX);
+                nPixPosX += ToPixel(sal::static_int_cast<sal_uInt16>(nThis), nPPTX);
             }
 
         pThisTab->nPosX[eWhich] = nNewPosX;
@@ -1968,7 +1968,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY )
                 SCROW nRows = std::min( nNewPosY, nHeightEndRow + 1) - i;
                 i = nHeightEndRow;
                 nTPosY -= nThis * nRows;
-                nPixPosY -= ToPixel(sal::static_int_cast<USHORT>(nThis), nPPTY) * nRows;
+                nPixPosY -= ToPixel(sal::static_int_cast<sal_uInt16>(nThis), nPPTY) * nRows;
             }
         else
             for ( i=nNewPosY; i<nOldPosY; i++ )
@@ -1977,7 +1977,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY )
                 SCROW nRows = std::min( nOldPosY, nHeightEndRow + 1) - i;
                 i = nHeightEndRow;
                 nTPosY += nThis * nRows;
-                nPixPosY += ToPixel(sal::static_int_cast<USHORT>(nThis), nPPTY) * nRows;
+                nPixPosY += ToPixel(sal::static_int_cast<sal_uInt16>(nThis), nPPTY) * nRows;
             }
 
         pThisTab->nPosY[eWhich] = nNewPosY;
@@ -1994,7 +1994,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY )
 
 void ScViewData::RecalcPixPos()				// nach Zoom-Aenderungen
 {
-    for (USHORT eWhich=0; eWhich<2; eWhich++)
+    for (sal_uInt16 eWhich=0; eWhich<2; eWhich++)
     {
         long nPixPosX = 0;
         SCCOL nPosX = pThisTab->nPosX[eWhich];
@@ -2027,7 +2027,7 @@ void ScViewData::SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
 {
     SCCOL nCol;
     SCROW nRow;
-    USHORT nTSize;
+    sal_uInt16 nTSize;
     long nSizePix;
     long nScrPosX = 0;
     long nScrPosY = 0;
@@ -2042,7 +2042,7 @@ void ScViewData::SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
         if (nTSize)
         {
             nSizePix = ToPixel( nTSize, nPPTX );
-            nScrPosX += (USHORT) nSizePix;
+            nScrPosX += (sal_uInt16) nSizePix;
         }
     }
 
@@ -2052,7 +2052,7 @@ void ScViewData::SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
         if (nTSize)
         {
             nSizePix = ToPixel( nTSize, nPPTY );
-            nScrPosY += (USHORT) nSizePix;
+            nScrPosY += (sal_uInt16) nSizePix;
         }
     }
 
@@ -2064,14 +2064,14 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart )
     long nSize;
     long nTwips;
     long nAdd;
-    BOOL bEnd;
+    sal_Bool bEnd;
 
     nSize = 0;
     nTwips = (long) (rVisAreaStart.X() / HMM_PER_TWIPS);
     if ( pDoc->IsLayoutRTL( nTabNo ) )
         nTwips = -nTwips;
     SCCOL nX1 = 0;
-    bEnd = FALSE;
+    bEnd = sal_False;
     while (!bEnd)
     {
         nAdd = (long) pDoc->GetColWidth(nX1,nTabNo);
@@ -2081,13 +2081,13 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart )
             ++nX1;
         }
         else
-            bEnd = TRUE;
+            bEnd = sal_True;
     }
 
     nSize = 0;
     nTwips = (long) (rVisAreaStart.Y() / HMM_PER_TWIPS);
     SCROW nY1 = 0;
-    bEnd = FALSE;
+    bEnd = sal_False;
     while (!bEnd)
     {
         nAdd = (long) pDoc->GetRowHeight(nY1,nTabNo);
@@ -2097,7 +2097,7 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart )
             ++nY1;
         }
         else
-            bEnd = TRUE;
+            bEnd = sal_True;
     }
 
     SetActivePart( SC_SPLIT_BOTTOMLEFT );
@@ -2156,7 +2156,7 @@ ScDrawView* ScViewData::GetScDrawView()
     return pView->GetScDrawView();
 }
 
-BOOL ScViewData::IsMinimized()
+sal_Bool ScViewData::IsMinimized()
 {
     DBG_ASSERT( pView, "IsMinimized() ohne View" );
     return pView->IsMinimized();
@@ -2167,7 +2167,7 @@ void ScViewData::UpdateScreenZoom( const Fraction& rNewX, const Fraction& rNewY
     Fraction aOldX = GetZoomX();
     Fraction aOldY = GetZoomY();
 
-    SetZoom( rNewX, rNewY, FALSE );
+    SetZoom( rNewX, rNewY, sal_False );
 
     Fraction aWidth = GetZoomX();
     aWidth *= Fraction( aScrSize.Width(),1 );
@@ -2200,7 +2200,7 @@ void ScViewData::CalcPPT()
         if (nEndCol<20)
             nEndCol = 20;			// same end position as when determining draw scale
 
-        USHORT nTwips = pDoc->GetCommonWidth( nEndCol, nTabNo );
+        sal_uInt16 nTwips = pDoc->GetCommonWidth( nEndCol, nTabNo );
         if ( nTwips )
         {
             double fOriginal = nTwips * nPPTX;
@@ -2236,10 +2236,10 @@ void ScViewData::WriteUserData(String& rData)
     //	PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten]
     //	wenn Zeilen groesser 8192, "+" statt "/"
 
-    USHORT nZoom = (USHORT)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator());
+    sal_uInt16 nZoom = (sal_uInt16)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator());
     rData = String::CreateFromInt32( nZoom );
     rData += '/';
-    nZoom = (USHORT)((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator());
+    nZoom = (sal_uInt16)((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator());
     rData += String::CreateFromInt32( nZoom );
     rData += '/';
     if (bPagebreak)
@@ -2325,10 +2325,10 @@ void ScViewData::ReadUserData(const String& rData)
     Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY;    //! evaluate (all sheets?)
 
     String aZoomStr = rData.GetToken(0);						// Zoom/PageZoom/Modus
-    USHORT nNormZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(0,'/').ToInt32());
+    sal_uInt16 nNormZoom = sal::static_int_cast<sal_uInt16>(aZoomStr.GetToken(0,'/').ToInt32());
     if ( nNormZoom >= MINZOOM && nNormZoom <= MAXZOOM )
         aZoomX = aZoomY = Fraction( nNormZoom, 100 );			//	"normaler" Zoom (immer)
-    USHORT nPageZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(1,'/').ToInt32());
+    sal_uInt16 nPageZoom = sal::static_int_cast<sal_uInt16>(aZoomStr.GetToken(1,'/').ToInt32());
     if ( nPageZoom >= MINZOOM && nPageZoom <= MAXZOOM )
         aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 );	// Pagebreak-Zoom, wenn gesetzt
     sal_Unicode cMode = aZoomStr.GetToken(2,'/').GetChar(0);	// 0 oder "0"/"1"
@@ -2500,7 +2500,7 @@ void ScViewData::WriteExtOptions( ScExtDocOptions& rDocOpt ) const
             // sheet selection and selected ranges
             const ScMarkData& rMarkData = GetMarkData();
             rTabSett.mbSelected = rMarkData.GetTableSelect( nTab );
-            rMarkData.FillRangeListWithMarks( &rTabSett.maSelection, TRUE );
+            rMarkData.FillRangeListWithMarks( &rTabSett.maSelection, sal_True );
 
             // grid color
             rTabSett.maGridColor.SetColor( COL_AUTO );
@@ -2649,7 +2649,7 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
 // Disabled, does not work correctly. Anyway, our own XML filters do not import a selection at all.
 //                const ScRangeList& rSel = rTabSett.maSelection;
 //                if( (rSel.Count() >= 2) || ((rSel.Count() == 1) && (*rSel.GetObject( 0 ) != ScRange( rCursor ))) )
-//                    rMarkData.MarkFromRangeList( rTabSett.maSelection, FALSE );
+//                    rMarkData.MarkFromRangeList( rTabSett.maSelection, sal_False );
 
                 // grid color -- #i47435# set automatic grid color explicitly
                 if( pOptions )
@@ -2958,11 +2958,11 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
 void ScViewData::SetOptions( const ScViewOptions& rOpt )
 {
     //	if visibility of horiz. ScrollBar is changed, TabBar may have to be resized...
-    BOOL bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) );
+    sal_Bool bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) );
 
     //	if graphics are turned on or off, animation has to be started or stopped
     //	graphics are controlled by VOBJ_TYPE_OLE
-    BOOL bGraphicsChanged =	( pOptions->GetObjMode(VOBJ_TYPE_OLE) !=
+    sal_Bool bGraphicsChanged =	( pOptions->GetObjMode(VOBJ_TYPE_OLE) !=
                                    rOpt.GetObjMode(VOBJ_TYPE_OLE) );
 
     *pOptions = rOpt;
@@ -2980,34 +2980,34 @@ Point ScViewData::GetMousePosPixel()
     return pView->GetMousePosPixel();
 }
 
-void ScViewData::UpdateInputHandler( BOOL bForce, BOOL bStopEditing )
+void ScViewData::UpdateInputHandler( sal_Bool bForce, sal_Bool bStopEditing )
 {
     if (pViewShell)
         pViewShell->UpdateInputHandler( bForce, bStopEditing );
 }
 
-BOOL ScViewData::IsOle()
+sal_Bool ScViewData::IsOle()
 {
     return pDocShell && pDocShell->IsOle();
 }
 
-BOOL ScViewData::UpdateFixX( SCTAB nTab )				// TRUE = Wert geaendert
+sal_Bool ScViewData::UpdateFixX( SCTAB nTab )				// sal_True = Wert geaendert
 {
     if (!ValidTab(nTab))		// Default
         nTab=nTabNo;		// akuelle Tabelle
 
     if (!pView || pTabData[nTab]->eHSplitMode != SC_SPLIT_FIX)
-        return FALSE;
+        return sal_False;
 
     ScDocument* pLocalDoc = GetDocument();
     if (!pLocalDoc->HasTable(nTab))          // #114007# if called from reload, the sheet may not exist
-        return FALSE;
+        return sal_False;
 
     SCCOL nFix = pTabData[nTab]->nFixPosX;
     long nNewPos = 0;
     for (SCCOL nX=pTabData[nTab]->nPosX[SC_SPLIT_LEFT]; nX<nFix; nX++)
     {
-        USHORT nTSize = pLocalDoc->GetColWidth( nX, nTab );
+        sal_uInt16 nTSize = pLocalDoc->GetColWidth( nX, nTab );
         if (nTSize)
         {
             long nPix = ToPixel( nTSize, nPPTX );
@@ -3020,29 +3020,29 @@ BOOL ScViewData::UpdateFixX( SCTAB nTab )				// TRUE = Wert geaendert
         pTabData[nTab]->nHSplitPos = nNewPos;
         if (nTab == nTabNo)
             RecalcPixPos();					//! sollte nicht noetig sein !!!
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
-BOOL ScViewData::UpdateFixY( SCTAB nTab )				// TRUE = Wert geaendert
+sal_Bool ScViewData::UpdateFixY( SCTAB nTab )				// sal_True = Wert geaendert
 {
     if (!ValidTab(nTab))		// Default
         nTab=nTabNo;		// akuelle Tabelle
 
     if (!pView || pTabData[nTab]->eVSplitMode != SC_SPLIT_FIX)
-        return FALSE;
+        return sal_False;
 
     ScDocument* pLocalDoc = GetDocument();
     if (!pLocalDoc->HasTable(nTab))          // #114007# if called from reload, the sheet may not exist
-        return FALSE;
+        return sal_False;
 
     SCROW nFix = pTabData[nTab]->nFixPosY;
     long nNewPos = 0;
     for (SCROW nY=pTabData[nTab]->nPosY[SC_SPLIT_TOP]; nY<nFix; nY++)
     {
-        USHORT nTSize = pLocalDoc->GetRowHeight( nY, nTab );
+        sal_uInt16 nTSize = pLocalDoc->GetRowHeight( nY, nTab );
         if (nTSize)
         {
             long nPix = ToPixel( nTSize, nPPTY );
@@ -3055,18 +3055,18 @@ BOOL ScViewData::UpdateFixY( SCTAB nTab )				// TRUE = Wert geaendert
         pTabData[nTab]->nVSplitPos = nNewPos;
         if (nTab == nTabNo)
             RecalcPixPos();					//! sollte nicht noetig sein !!!
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const
 {
     ScDocument* pLocalDoc = GetDocument();
-    BOOL bOnlineSpell = pLocalDoc->GetDocOptions().IsAutoSpell();
+    sal_Bool bOnlineSpell = pLocalDoc->GetDocOptions().IsAutoSpell();
 
-    ULONG nCntrl = rOutl.GetControlWord();
+    sal_uLong nCntrl = rOutl.GetControlWord();
     nCntrl |= EE_CNTRL_URLSFXEXECUTE;
     nCntrl |= EE_CNTRL_MARKFIELDS;
     nCntrl |= EE_CNTRL_AUTOCORRECT;
@@ -3106,7 +3106,7 @@ void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY,
     while (rScrY <= nEndPixels && nRow <= nEndRow)
     {
         SCROW nHeightEndRow;
-        USHORT nHeight = pDoc->GetRowHeight( nRow, nTabNo, NULL, &nHeightEndRow);
+        sal_uInt16 nHeight = pDoc->GetRowHeight( nRow, nTabNo, NULL, &nHeightEndRow);
         if (nHeightEndRow > nEndRow)
             nHeightEndRow = nEndRow;
         if (!nHeight)
@@ -3147,7 +3147,7 @@ void ScViewData::AddPixelsWhileBackward( long & rScrY, long nEndPixels,
     while (rScrY <= nEndPixels && nRow >= nStartRow)
     {
         SCROW nHeightStartRow;
-        USHORT nHeight = pDoc->GetRowHeight( nRow, nTabNo, &nHeightStartRow, NULL);
+        sal_uInt16 nHeight = pDoc->GetRowHeight( nRow, nTabNo, &nHeightStartRow, NULL);
         if (nHeightStartRow < nStartRow)
             nHeightStartRow = nStartRow;
         if (!nHeight)
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 20577811b..b3b7c2fa5 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -99,7 +99,7 @@ void VBA_DeleteModule( ScDocShell& rDocSh, String& sModuleName );
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::AdjustBlockHeight( BOOL bPaint, ScMarkData* pMarkData )
+sal_Bool ScViewFunc::AdjustBlockHeight( sal_Bool bPaint, ScMarkData* pMarkData )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     if (!pMarkData)
@@ -127,25 +127,25 @@ BOOL ScViewFunc::AdjustBlockHeight( BOOL bPaint, ScMarkData* pMarkData )
         aZoomX = aZoomY = Fraction( 1, 1 );
     }
 
-    BOOL bAnyChanged = FALSE;
+    sal_Bool bAnyChanged = sal_False;
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
     {
         if (pMarkData->GetTableSelect(nTab))
         {
             SCCOLROW* pOneRange = pRanges;
-            BOOL bChanged = FALSE;
+            sal_Bool bChanged = sal_False;
             SCROW nPaintY = 0;
             for (SCROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
             {
                 SCROW nStartNo = *(pOneRange++);
                 SCROW nEndNo = *(pOneRange++);
                 if (pDoc->SetOptimalHeight( nStartNo, nEndNo, nTab, 0, aProv.GetDevice(),
-                                            nPPTX, nPPTY, aZoomX, aZoomY, FALSE ))
+                                            nPPTX, nPPTY, aZoomX, aZoomY, sal_False ))
                 {
                     if (!bChanged)
                         nPaintY = nStartNo;
-                    bAnyChanged = bChanged = TRUE;
+                    bAnyChanged = bChanged = sal_True;
                 }
             }
             if ( bPaint && bChanged )
@@ -164,7 +164,7 @@ BOOL ScViewFunc::AdjustBlockHeight( BOOL bPaint, ScMarkData* pMarkData )
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint )
+sal_Bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, sal_Bool bPaint )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
@@ -173,9 +173,9 @@ BOOL ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint )
     double nPPTY = GetViewData()->GetPPTY();
     Fraction aZoomX = GetViewData()->GetZoomX();
     Fraction aZoomY = GetViewData()->GetZoomY();
-    USHORT nOldPixel = 0;
+    sal_uInt16 nOldPixel = 0;
     if (nStartRow == nEndRow)
-        nOldPixel = (USHORT) (pDoc->GetRowHeight(nStartRow,nTab) * nPPTY);
+        nOldPixel = (sal_uInt16) (pDoc->GetRowHeight(nStartRow,nTab) * nPPTY);
 
     ScSizeDeviceProvider aProv(pDocSh);
     if (aProv.IsPrinter())
@@ -184,14 +184,14 @@ BOOL ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint )
         nPPTY = aProv.GetPPTY();
         aZoomX = aZoomY = Fraction( 1, 1 );
     }
-    BOOL bChanged = pDoc->SetOptimalHeight( nStartRow, nEndRow, nTab, 0, aProv.GetDevice(),
-                                            nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
+    sal_Bool bChanged = pDoc->SetOptimalHeight( nStartRow, nEndRow, nTab, 0, aProv.GetDevice(),
+                                            nPPTX, nPPTY, aZoomX, aZoomY, sal_False );
 
     if (bChanged && ( nStartRow == nEndRow ))
     {
-        USHORT nNewPixel = (USHORT) (pDoc->GetRowHeight(nStartRow,nTab) * nPPTY);
+        sal_uInt16 nNewPixel = (sal_uInt16) (pDoc->GetRowHeight(nStartRow,nTab) * nPPTY);
         if ( nNewPixel == nOldPixel )
-            bChanged = FALSE;
+            bChanged = sal_False;
     }
 
     if ( bPaint && bChanged )
@@ -242,7 +242,7 @@ ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow,
 ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow,
         SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend )
 {
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     while (nCount < SC_AUTOSUM_MAXCOUNT)
     {
         if ( eDir == DIR_TOP )
@@ -398,7 +398,7 @@ bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList, const
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
+sal_Bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
     SCTAB nTab = GetViewData()->GetTabNo();
@@ -414,8 +414,8 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
     SCROW nSeekRow	 = nRow;
     SCCOLROW nExtend;		// wird per Reference gueltig bei ScAutoSumSum
 
-    BOOL bCol = FALSE;
-    BOOL bRow = FALSE;
+    sal_Bool bCol = sal_False;
+    sal_Bool bRow = sal_False;
 
     ScAutoSum eSum;
     if ( nRow != 0
@@ -425,19 +425,19 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
                 DIR_LEFT, nExtend /*out*/ )) == ScAutoSumData )
         )
     {
-        bRow = TRUE;
+        bRow = sal_True;
         nSeekRow = nRow - 1;
     }
     else if ( nCol != 0 && (eSum = lcl_IsAutoSumData( pDoc, nCol-1, nRow, nTab,
             DIR_LEFT, nExtend /*out*/ )) == ScAutoSumData )
     {
-        bCol = TRUE;
+        bCol = sal_True;
         nSeekCol = nCol - 1;
     }
     else if ( (eSum = lcl_SeekAutoSumData( pDoc, nCol, nSeekRow, nTab, DIR_TOP, nExtend /*out*/ )) != ScAutoSumNone )
-        bRow = TRUE;
+        bRow = sal_True;
     else if (( eSum = lcl_SeekAutoSumData( pDoc, nSeekCol, nRow, nTab, DIR_LEFT, nExtend /*out*/ )) != ScAutoSumNone )
-        bCol = TRUE;
+        bCol = sal_True;
 
     if ( bCol || bRow )
     {
@@ -457,7 +457,7 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
             else
                 nEndCol = nCol - 1;		// Datenbereich evtl. nach rechts erweitern
         }
-        BOOL bContinue = FALSE;
+        sal_Bool bContinue = sal_False;
         do
         {
             if ( eSum == ScAutoSumData )
@@ -497,9 +497,9 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
                 }
             }
         } while ( bContinue );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //----------------------------------------------------------------------------
@@ -701,7 +701,7 @@ bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor
 
     // set new mark range and cursor position
     const ScRange aMarkRange( nStartCol, nStartRow, nTab, nMarkEndCol, nMarkEndRow, nTab );
-    MarkRange( aMarkRange, FALSE, bContinue );
+    MarkRange( aMarkRange, sal_False, bContinue );
     if ( bSetCursor )
     {
         SetCursor( nMarkEndCol, nMarkEndRow );
@@ -809,8 +809,8 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData
 
     pInsDoc->SetClipArea( ScRange(aPos) );
     // auf Block einfuegen, mit Undo etc.
-    if ( PasteFromClip( IDF_CONTENTS, pInsDoc, PASTE_NOFUNC, FALSE, FALSE,
-            FALSE, INS_NONE, IDF_ATTRIB ) )
+    if ( PasteFromClip( IDF_CONTENTS, pInsDoc, PASTE_NOFUNC, sal_False, sal_False,
+            sal_False, INS_NONE, IDF_ATTRIB ) )
     {
         const SfxUInt32Item* pItem = (SfxUInt32Item*) pInsDoc->GetAttr(
             nCol, nRow, nTab, ATTR_VALUE_FORMAT );
@@ -834,12 +834,12 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData
 
 //----------------------------------------------------------------------------
 
-//UNUSED2008-05  void ScViewFunc::PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd )
+//UNUSED2008-05  void ScViewFunc::PaintWidthHeight( sal_Bool bColumns, SCCOLROW nStart, SCCOLROW nEnd )
 //UNUSED2008-05  {
 //UNUSED2008-05      SCTAB nTab = GetViewData()->GetTabNo();
 //UNUSED2008-05      ScDocument* pDoc = GetViewData()->GetDocument();
 //UNUSED2008-05
-//UNUSED2008-05      USHORT nParts = PAINT_GRID;
+//UNUSED2008-05      sal_uInt16 nParts = PAINT_GRID;
 //UNUSED2008-05      SCCOL nStartCol = 0;
 //UNUSED2008-05      SCROW nStartRow = 0;
 //UNUSED2008-05      SCCOL nEndCol = MAXCOL;         // fuer Test auf Merge
@@ -869,8 +869,8 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData
 //----------------------------------------------------------------------------
 //	manueller Seitenumbruch
 
-void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* pPos,
-                                    BOOL bSetModified )
+void ScViewFunc::InsertPageBreak( sal_Bool bColumn, sal_Bool bRecord, const ScAddress* pPos,
+                                    sal_Bool bSetModified )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScAddress aCursor;
@@ -879,18 +879,18 @@ void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* p
     else
         aCursor = ScAddress( GetViewData()->GetCurX(), GetViewData()->GetCurY(), nTab );
 
-    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
-                        InsertPageBreak( bColumn, aCursor, bRecord, bSetModified, FALSE );
+    sal_Bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
+                        InsertPageBreak( bColumn, aCursor, bRecord, bSetModified, sal_False );
 
     if ( bSuccess && bSetModified )
-        UpdatePageBreakData( TRUE );	// fuer PageBreak-Modus
+        UpdatePageBreakData( sal_True );	// fuer PageBreak-Modus
 }
 
 
 //----------------------------------------------------------------------------
 
-void ScViewFunc::DeletePageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* pPos,
-                                    BOOL bSetModified )
+void ScViewFunc::DeletePageBreak( sal_Bool bColumn, sal_Bool bRecord, const ScAddress* pPos,
+                                    sal_Bool bSetModified )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScAddress aCursor;
@@ -899,11 +899,11 @@ void ScViewFunc::DeletePageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* p
     else
         aCursor = ScAddress( GetViewData()->GetCurX(), GetViewData()->GetCurY(), nTab );
 
-    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
-                        RemovePageBreak( bColumn, aCursor, bRecord, bSetModified, FALSE );
+    sal_Bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
+                        RemovePageBreak( bColumn, aCursor, bRecord, bSetModified, sal_False );
 
     if ( bSuccess && bSetModified )
-        UpdatePageBreakData( TRUE );	// fuer PageBreak-Modus
+        UpdatePageBreakData( sal_True );	// fuer PageBreak-Modus
 }
 
 //----------------------------------------------------------------------------
@@ -913,13 +913,13 @@ void ScViewFunc::RemoveManualBreaks()
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
     SCTAB nTab = GetViewData()->GetTabNo();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     if (bUndo)
     {
         ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-        pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE );
-        pDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, FALSE, pUndoDoc );
+        pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_True );
+        pDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, sal_False, pUndoDoc );
         pDocSh->GetUndoManager()->AddUndoAction(
                                 new ScUndoRemoveBreaks( pDocSh, nTab, pUndoDoc ) );
     }
@@ -927,14 +927,14 @@ void ScViewFunc::RemoveManualBreaks()
     pDoc->RemoveManualBreaks(nTab);
     pDoc->UpdatePageBreaks(nTab);
 
-    UpdatePageBreakData( TRUE );
+    UpdatePageBreakData( sal_True );
     pDocSh->SetDocumentModified();
     pDocSh->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
 }
 
 //----------------------------------------------------------------------------
 
-void ScViewFunc::SetPrintZoom(USHORT nScale, USHORT nPages)
+void ScViewFunc::SetPrintZoom(sal_uInt16 nScale, sal_uInt16 nPages)
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     SCTAB nTab = GetViewData()->GetTabNo();
@@ -951,9 +951,9 @@ void ScViewFunc::AdjustPrintZoom()
 
 //----------------------------------------------------------------------------
 
-void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
+void ScViewFunc::SetPrintRanges( sal_Bool bEntireSheet, const String* pPrint,
                                 const String* pRepCol, const String* pRepRow,
-                                BOOL bAddPrint )
+                                sal_Bool bAddPrint )
 {
     //	on all selected tables
 
@@ -962,7 +962,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
     SCTAB nTabCount	= pDoc->GetTableCount();
     ScMarkData& rMark	= GetViewData()->GetMarkData();
     SCTAB nTab;
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
     ScPrintRangeSaver* pOldRanges = pDoc->CreatePrintRangeSaver();
 
@@ -987,8 +987,8 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
                 if ( pPrint->Len() )
                 {
                     const sal_Unicode sep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
-                    USHORT nTCount = pPrint->GetTokenCount(sep);
-                    for (USHORT i=0; i<nTCount; i++)
+                    sal_uInt16 nTCount = pPrint->GetTokenCount(sep);
+                    for (sal_uInt16 i=0; i<nTCount; i++)
                     {
                         String aToken = pPrint->GetToken(i, sep);
                         if ( aRange.ParseAny( aToken, pDoc, aDetails ) & SCA_VALID )
@@ -1006,12 +1006,12 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
                 {
                     rMark.MarkToMulti();
                     ScRangeListRef aList( new ScRangeList );
-                    rMark.FillRangeListWithMarks( aList, FALSE );
-                    USHORT nCnt = (USHORT) aList->Count();
+                    rMark.FillRangeListWithMarks( aList, sal_False );
+                    sal_uInt16 nCnt = (sal_uInt16) aList->Count();
                     if ( nCnt )
                     {
                         ScRangePtr pR;
-                        USHORT i;
+                        sal_uInt16 i;
                         for ( pR = aList->First(), i=0; i < nCnt;
                               pR = aList->Next(), i++ )
                         {
@@ -1068,9 +1068,9 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
 //----------------------------------------------------------------------------
 //	Zellen zusammenfassen
 
-BOOL ScViewFunc::TestMergeCells()			// Vorab-Test (fuer Menue)
+sal_Bool ScViewFunc::TestMergeCells()			// Vorab-Test (fuer Menue)
 {
-    //	simple test: TRUE if there's a selection but no multi selection and not filtered
+    //	simple test: sal_True if there's a selection but no multi selection and not filtered
 
     const ScMarkData& rMark = GetViewData()->GetMarkData();
     if ( rMark.IsMarked() || rMark.IsMultiMarked() )
@@ -1079,13 +1079,13 @@ BOOL ScViewFunc::TestMergeCells()			// Vorab-Test (fuer Menue)
         return GetViewData()->GetSimpleArea( aDummy) == SC_MARK_SIMPLE;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
+sal_Bool ScViewFunc::MergeCells( sal_Bool bApi, sal_Bool& rDoContents, sal_Bool bRecord )
 {
     //	Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc),
     //	damit dann nicht die Inhalte-QueryBox kommt
@@ -1093,7 +1093,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
     if (!aTester.IsEditable())
     {
         ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
     ScMarkData& rMark = GetViewData()->GetMarkData();
@@ -1101,7 +1101,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
     if (!rMark.IsMarked())
     {
         ErrorMessage(STR_NOMULTISELECT);
-        return FALSE;
+        return sal_False;
     }
 
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
@@ -1118,17 +1118,17 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
     if ( nStartCol == nEndCol && nStartRow == nEndRow )
     {
         // nichts zu tun
-        return TRUE;
+        return sal_True;
     }
 
     if ( pDoc->HasAttrib( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab,
                             HASATTR_MERGED | HASATTR_OVERLAPPED ) )
     {		// "Zusammenfassen nicht verschachteln !"
         ErrorMessage(STR_MSSG_MERGECELLS_0);
-        return FALSE;
+        return sal_False;
     }
 
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
 
     if ( !pDoc->IsBlockEmpty( nStartTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) ||
          !pDoc->IsBlockEmpty( nStartTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) )
@@ -1139,12 +1139,12 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
                             WinBits(WB_YES_NO_CANCEL | WB_DEF_NO),
                             ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
                             ScGlobal::GetRscString( STR_MERGE_NOTEMPTY ) );
-            USHORT nRetVal = aBox.Execute();
+            sal_uInt16 nRetVal = aBox.Execute();
 
             if ( nRetVal == RET_YES )
-                rDoContents = TRUE;
+                rDoContents = sal_True;
             else if ( nRetVal == RET_CANCEL )
-                bOk = FALSE;
+                bOk = sal_False;
         }
     }
 
@@ -1157,7 +1157,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
         if (bOk)
         {
             SetCursor( nStartCol, nStartRow );
-            //DoneBlockMode( FALSE);
+            //DoneBlockMode( sal_False);
             Unmark();
 
             pDocSh->UpdateOle(GetViewData());
@@ -1171,15 +1171,15 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::TestRemoveMerge()
+sal_Bool ScViewFunc::TestRemoveMerge()
 {
-    BOOL bMerged = FALSE;
+    sal_Bool bMerged = sal_False;
     ScRange aRange;
     if (GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE)
     {
         ScDocument* pDoc = GetViewData()->GetDocument();
         if ( pDoc->HasAttrib( aRange, HASATTR_MERGED ) )
-            bMerged = TRUE;
+            bMerged = sal_True;
     }
     return bMerged;
 }
@@ -1187,14 +1187,14 @@ BOOL ScViewFunc::TestRemoveMerge()
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::RemoveMerge( BOOL bRecord )
+sal_Bool ScViewFunc::RemoveMerge( sal_Bool bRecord )
 {
     ScRange aRange;
     ScEditableTester aTester( this );
     if (!aTester.IsEditable())
     {
         ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
     else if (GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE)
     {
@@ -1203,26 +1203,26 @@ BOOL ScViewFunc::RemoveMerge( BOOL bRecord )
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
 
         HideCursor();
-        BOOL bOk = pDocSh->GetDocFunc().UnmergeCells( aRange, bRecord, FALSE );
+        sal_Bool bOk = pDocSh->GetDocFunc().UnmergeCells( aRange, bRecord, sal_False );
         MarkRange( aExtended );
         ShowCursor();
 
         if (bOk)
             pDocSh->UpdateOle(GetViewData());
     }
-    return TRUE;		//! bOk ??
+    return sal_True;		//! bOk ??
 }
 
 //----------------------------------------------------------------------------
 
-void ScViewFunc::FillSimple( FillDir eDir, BOOL bRecord )
+void ScViewFunc::FillSimple( FillDir eDir, sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         const ScMarkData& rMark = GetViewData()->GetMarkData();
-        BOOL bSuccess = pDocSh->GetDocFunc().FillSimple( aRange, &rMark, eDir, bRecord, FALSE );
+        sal_Bool bSuccess = pDocSh->GetDocFunc().FillSimple( aRange, &rMark, eDir, bRecord, sal_False );
         if (bSuccess)
         {
             pDocSh->UpdateOle(GetViewData());
@@ -1236,16 +1236,16 @@ void ScViewFunc::FillSimple( FillDir eDir, BOOL bRecord )
 //----------------------------------------------------------------------------
 
 void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
-                             double fStart, double fStep, double fMax, BOOL bRecord )
+                             double fStart, double fStep, double fMax, sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         const ScMarkData& rMark = GetViewData()->GetMarkData();
-        BOOL bSuccess = pDocSh->GetDocFunc().
+        sal_Bool bSuccess = pDocSh->GetDocFunc().
                         FillSeries( aRange, &rMark, eDir, eCmd, eDateCmd,
-                                    fStart, fStep, fMax, bRecord, FALSE );
+                                    fStart, fStep, fMax, bRecord, sal_False );
         if (bSuccess)
         {
             pDocSh->UpdateOle(GetViewData());
@@ -1268,18 +1268,18 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
 //----------------------------------------------------------------------------
 
 void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
-                            SCCOL nEndCol, SCROW nEndRow, ULONG nCount, BOOL bRecord )
+                            SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, sal_Bool bRecord )
 {
     SCTAB nTab = GetViewData()->GetTabNo();
     ScRange aRange( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab );
     ScRange aSourceRange( aRange );
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     const ScMarkData& rMark = GetViewData()->GetMarkData();
-    BOOL bSuccess = pDocSh->GetDocFunc().
-                    FillAuto( aRange, &rMark, eDir, nCount, bRecord, FALSE );
+    sal_Bool bSuccess = pDocSh->GetDocFunc().
+                    FillAuto( aRange, &rMark, eDir, nCount, bRecord, sal_False );
     if (bSuccess)
     {
-        MarkRange( aRange, FALSE );			// aRange ist in FillAuto veraendert worden
+        MarkRange( aRange, sal_False );			// aRange ist in FillAuto veraendert worden
         pDocSh->UpdateOle(GetViewData());
         UpdateScrollBars();
 
@@ -1325,7 +1325,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
 
 //----------------------------------------------------------------------------
 
-void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink )
+void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, sal_Bool bSkipEmpty, sal_Bool bAsLink )
 {
     //! allow source sheet to be protected
     ScEditableTester aTester( this );
@@ -1339,11 +1339,11 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL
     ScDocument* pDoc = pDocSh->GetDocument();
     ScMarkData& rMark = GetViewData()->GetMarkData();
     SCTAB nTab = GetViewData()->GetTabNo();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     ScRange aMarkRange;
     rMark.MarkToSimple();
-    BOOL bMulti = rMark.IsMultiMarked();
+    sal_Bool bMulti = rMark.IsMultiMarked();
     if (bMulti)
         rMark.GetMultiMarkArea( aMarkRange );
     else if (rMark.IsMarked())
@@ -1357,7 +1357,7 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL
     {
         pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
         pUndoDoc->InitUndo( pDoc, nTab, nTab );
-//		pUndoDoc->SelectTable( nTab, TRUE );		// nur fuer Markierung
+//		pUndoDoc->SelectTable( nTab, sal_True );		// nur fuer Markierung
 
         SCTAB nTabCount = pDoc->GetTableCount();
         for (SCTAB i=0; i<nTabCount; i++)
@@ -1367,7 +1367,7 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL
                 aMarkRange.aStart.SetTab( i );
                 aMarkRange.aEnd.SetTab( i );
                 pDoc->CopyToDocument( aMarkRange, IDF_ALL, bMulti, pUndoDoc );
-//				pUndoDoc->SelectTable( i, TRUE );
+//				pUndoDoc->SelectTable( i, sal_True );
             }
     }
 
@@ -1482,8 +1482,8 @@ void ScViewFunc::TransliterateText( sal_Int32 nType )
         aFuncMark.SetMarkArea( ScRange( aCursor ) );
     }
 
-    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
-                        TransliterateText( aFuncMark, nType, TRUE, FALSE );
+    sal_Bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
+                        TransliterateText( aFuncMark, nType, sal_True, sal_False );
     if (bSuccess)
     {
         GetViewData()->GetViewShell()->UpdateInputHandler();
@@ -1517,7 +1517,7 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData()
 
 //----------------------------------------------------------------------------
 
-void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
+void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, sal_Bool bRecord )
 {
 #if 1
 
@@ -1527,7 +1527,7 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScMarkData& rMark = GetViewData()->GetMarkData();
 
-        BOOL bSuccess = pDocSh->GetDocFunc().AutoFormat( aRange, &rMark, nFormatNo, bRecord, FALSE );
+        sal_Bool bSuccess = pDocSh->GetDocFunc().AutoFormat( aRange, &rMark, nFormatNo, bRecord, sal_False );
         if (bSuccess)
             pDocSh->UpdateOle(GetViewData());
     }
@@ -1537,7 +1537,7 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
 #else
 
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -1556,9 +1556,9 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScDocument* pDoc = pDocSh->GetDocument();
         ScMarkData& rMark = GetViewData()->GetMarkData();
-        BOOL bSize = (*ScGlobal::GetAutoFormat())[nFormatNo]->GetIncludeWidthHeight();
+        sal_Bool bSize = (*ScGlobal::GetAutoFormat())[nFormatNo]->GetIncludeWidthHeight();
         if (bRecord && !pDoc->IsUndoEnabled())
-            bRecord = FALSE;
+            bRecord = sal_False;
 
         ScDocument* pUndoDoc = NULL;
         if ( bRecord )
@@ -1566,13 +1566,13 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
             pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
             pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab, bSize, bSize );
             pDoc->CopyToDocument( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab,
-                                    IDF_ATTRIB, FALSE, pUndoDoc );
+                                    IDF_ATTRIB, sal_False, pUndoDoc );
             if (bSize)
             {
                 pDoc->CopyToDocument( nStartCol,0,nStartTab, nEndCol,MAXROW,nEndTab,
-                                                            IDF_NONE, FALSE, pUndoDoc );
+                                                            IDF_NONE, sal_False, pUndoDoc );
                 pDoc->CopyToDocument( 0,nStartRow,nStartTab, MAXCOL,nEndRow,nEndTab,
-                                                            IDF_NONE, FALSE, pUndoDoc );
+                                                            IDF_NONE, sal_False, pUndoDoc );
             }
             pDoc->BeginDrawUndo();
         }
@@ -1583,14 +1583,14 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
 
         if (bSize)
         {
-            SetMarkedWidthOrHeight( TRUE, SC_SIZE_VISOPT, STD_EXTRA_WIDTH, FALSE, FALSE );
-            SetMarkedWidthOrHeight( FALSE, SC_SIZE_VISOPT, 0, FALSE, FALSE );
+            SetMarkedWidthOrHeight( sal_True, SC_SIZE_VISOPT, STD_EXTRA_WIDTH, sal_False, sal_False );
+            SetMarkedWidthOrHeight( sal_False, SC_SIZE_VISOPT, 0, sal_False, sal_False );
             pDocSh->PostPaint( 0,0,nStartTab, MAXCOL,MAXROW,nStartTab,
                                     PAINT_GRID | PAINT_LEFT | PAINT_TOP );
         }
         else
         {
-            BOOL bAdj = AdjustBlockHeight( FALSE );
+            sal_Bool bAdj = AdjustBlockHeight( sal_False );
             if (bAdj)
                 pDocSh->PostPaint( 0,nStartRow,nStartTab, MAXCOL,MAXROW,nStartTab,
                                     PAINT_GRID | PAINT_LEFT );
@@ -1621,22 +1621,22 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
 //	Suchen & Ersetzen
 
 void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
-                                        BOOL bAddUndo, BOOL bIsApi )
+                                        sal_Bool bAddUndo, sal_Bool bIsApi )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
     ScMarkData& rMark = GetViewData()->GetMarkData();
     if (bAddUndo && !pDoc->IsUndoEnabled())
-        bAddUndo = FALSE;
+        bAddUndo = sal_False;
 
     SCCOL nCol = GetViewData()->GetCurX();
     SCROW nRow = GetViewData()->GetCurY();
     SCTAB nTab = GetViewData()->GetTabNo();
-//    BOOL bAttrib = pSearchItem->GetPattern();
-    USHORT nCommand = pSearchItem->GetCommand();
-    BOOL bAllTables = pSearchItem->IsAllTables();
-    BOOL* pOldSelectedTables = NULL;
-    USHORT nOldSelectedCount = 0;
+//    sal_Bool bAttrib = pSearchItem->GetPattern();
+    sal_uInt16 nCommand = pSearchItem->GetCommand();
+    sal_Bool bAllTables = pSearchItem->IsAllTables();
+    sal_Bool* pOldSelectedTables = NULL;
+    sal_uInt16 nOldSelectedCount = 0;
     SCTAB nOldTab = nTab;
     SCTAB nLastTab = pDoc->GetTableCount() - 1;
     SCTAB nStartTab, nEndTab;
@@ -1644,7 +1644,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
     {
         nStartTab = 0;
         nEndTab = nLastTab;
-        pOldSelectedTables = new BOOL [ nEndTab + 1 ];
+        pOldSelectedTables = new sal_Bool [ nEndTab + 1 ];
         for ( SCTAB j = 0; j <= nEndTab; j++ )
         {
             pOldSelectedTables[j] = rMark.GetTableSelect( j );
@@ -1680,7 +1680,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
 
     if (   nCommand == SVX_SEARCHCMD_FIND
         || nCommand == SVX_SEARCHCMD_FIND_ALL)
-        bAddUndo = FALSE;
+        bAddUndo = sal_False;
 
     //!		bAttrib bei Undo beruecksichtigen !!!
 
@@ -1701,26 +1701,26 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
     {	//! alles selektieren, erst nachdem pUndoMark erzeugt wurde
         for ( SCTAB j = nStartTab; j <= nEndTab; j++ )
         {
-            rMark.SelectTable( j, TRUE );
+            rMark.SelectTable( j, sal_True );
         }
     }
 
-    DoneBlockMode(TRUE);				// Markierung nicht loeschen!
+    DoneBlockMode(sal_True);				// Markierung nicht loeschen!
     InitOwnBlockMode();
 
     //	wenn vom Anfang an gesucht wird, nicht nochmal fragen ob vom Anfang gesucht werden soll
-    BOOL bFirst = TRUE;
+    sal_Bool bFirst = sal_True;
     if ( nCol == 0 && nRow == 0 && nTab == nStartTab && !pSearchItem->GetBackward()  )
-        bFirst = FALSE;
+        bFirst = sal_False;
 
-    BOOL bFound = FALSE;
-    while (TRUE)
+    sal_Bool bFound = sal_False;
+    while (sal_True)
     {
         GetFrameWin()->EnterWait();
         if (pDoc->SearchAndReplace( *pSearchItem, nCol, nRow, nTab, rMark, aUndoStr, pUndoDoc ) )
         {
-            bFound = TRUE;
-            bFirst = TRUE;
+            bFound = sal_True;
+            bFirst = sal_True;
             if (bAddUndo)
             {
                 GetViewData()->GetDocShell()->GetUndoManager()->AddUndoAction(
@@ -1735,8 +1735,8 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
         else if ( bFirst && (nCommand == SVX_SEARCHCMD_FIND ||
                 nCommand == SVX_SEARCHCMD_REPLACE) )
         {
-            bFirst = FALSE;
-            USHORT nRetVal;
+            bFirst = sal_False;
+            sal_uInt16 nRetVal;
             GetFrameWin()->LeaveWait();
             if ( bIsApi )
                 nRetVal = RET_NO;
@@ -1744,7 +1744,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
             {
                 //	Suchen-Dialog als Parent, wenn vorhanden
                 Window* pParent = GetParentOrChild(SID_SEARCH_DLG);
-                USHORT nStrId;
+                sal_uInt16 nStrId;
                 if ( pSearchItem->GetBackward() )
                 {
                     if ( nStartTab == nEndTab )
@@ -1797,7 +1797,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
 
             break;						// Abbruch while True
         }
-    }								// of while TRUE
+    }								// of while sal_True
 
     if ( pOldSelectedTables )
     {	// urspruenglich selektierte Tabellen wiederherstellen
@@ -1807,11 +1807,11 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
         }
         if ( bFound )
         {	// durch Fundstelle neu selektierte Tabelle bleibt
-            rMark.SelectTable( nTab, TRUE );
+            rMark.SelectTable( nTab, sal_True );
             // wenn vorher nur eine selektiert war, ist es ein Tausch
             //! wenn nicht, ist jetzt evtl. eine mehr selektiert
             if ( nOldSelectedCount == 1 && nTab != nOldTab )
-                rMark.SelectTable( nOldTab, FALSE );
+                rMark.SelectTable( nOldTab, sal_False );
         }
         delete [] pOldSelectedTables;
     }
@@ -1826,10 +1826,10 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
         //	wenn nichts markiert ist, DoneBlockMode, damit von hier aus
         //	direkt per Shift-Cursor markiert werden kann:
         if (!rMark.IsMarked() && !rMark.IsMultiMarked())
-            DoneBlockMode(TRUE);
+            DoneBlockMode(sal_True);
 
         AlignToCursor( nCol, nRow, SC_FOLLOW_JUMP );
-        SetCursor( nCol, nRow, TRUE );
+        SetCursor( nCol, nRow, sal_True );
 
         if (   nCommand == SVX_SEARCHCMD_REPLACE
             || nCommand == SVX_SEARCHCMD_REPLACE_ALL )
@@ -1880,7 +1880,7 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
 
         GetFrameWin()->EnterWait();
 
-        BOOL  	bExact =
+        sal_Bool  	bExact =
                     pDoc->Solver(
                         rParam.aRefFormulaCell.Col(),
                         rParam.aRefFormulaCell.Row(),
@@ -1892,7 +1892,7 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
         GetFrameWin()->LeaveWait();
 
         SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-        ULONG nFormat = 0;
+        sal_uLong nFormat = 0;
         const ScPatternAttr* pPattern = pDoc->GetPattern( nDestCol, nDestRow, nDestTab );
         if ( pPattern )
             nFormat = pPattern->GetNumberFormat( pFormatter );
@@ -1918,12 +1918,12 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
         MessBox aBox( GetViewData()->GetDialogParent(),
                         WinBits(WB_YES_NO | WB_DEF_NO),
                         ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), aMsgStr );
-        USHORT nRetVal = aBox.Execute();
+        sal_uInt16 nRetVal = aBox.Execute();
 
         if ( RET_YES == nRetVal )
             EnterValue( nDestCol, nDestRow, nDestTab, nSolveResult );
 
-        GetViewData()->GetViewShell()->UpdateInputHandler( TRUE );
+        GetViewData()->GetViewShell()->UpdateInputHandler( sal_True );
     }
 }
 
@@ -1931,14 +1931,14 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
 //----------------------------------------------------------------------------
 //	Mehrfachoperation
 
-void ScViewFunc::TabOp( const ScTabOpParam& rParam, BOOL bRecord )
+void ScViewFunc::TabOp( const ScTabOpParam& rParam, sal_Bool bRecord )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScMarkData& rMark = GetViewData()->GetMarkData();
-        pDocSh->GetDocFunc().TabOp( aRange, &rMark, rParam, bRecord, FALSE );
+        pDocSh->GetDocFunc().TabOp( aRange, &rMark, rParam, bRecord, sal_False );
     }
     else
         ErrorMessage(STR_NOMULTISELECT);
@@ -1948,7 +1948,7 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, BOOL bRecord )
 //----------------------------------------------------------------------------
 
 void ScViewFunc::MakeScenario( const String& rName, const String& rComment,
-                                    const Color& rColor, USHORT nFlags )
+                                    const Color& rColor, sal_uInt16 nFlags )
 {
     ScDocShell* pDocSh	= GetViewData()->GetDocShell();
     ScMarkData&	rMark	= GetViewData()->GetMarkData();
@@ -1956,7 +1956,7 @@ void ScViewFunc::MakeScenario( const String& rName, const String& rComment,
 
     SCTAB nNewTab = pDocSh->MakeScenario( nTab, rName, rComment, rColor, nFlags, rMark );
     if (nFlags & SC_SCENARIO_COPYALL)
-        SetTabNo( nNewTab, TRUE );			// SC_SCENARIO_COPYALL -> sichtbar
+        SetTabNo( nNewTab, sal_True );			// SC_SCENARIO_COPYALL -> sichtbar
     else
     {
         SfxBindings& rBindings = GetViewData()->GetBindings();
@@ -1984,7 +1984,7 @@ void ScViewFunc::ExtendScenario()
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScPatternAttr aPattern( pDoc->GetPool() );
     aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) );
-    aPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) );
+    aPattern.GetItemSet().Put( ScProtectionAttr( sal_True ) );
     ApplySelectionPattern(aPattern);
 }
 
@@ -2005,13 +2005,13 @@ void ScViewFunc::UseScenario( const String& rName )
 //----------------------------------------------------------------------------
 //	Tabelle einfuegen
 
-BOOL ScViewFunc::InsertTable( const String& rName, SCTAB nTab, BOOL bRecord )
+sal_Bool ScViewFunc::InsertTable( const String& rName, SCTAB nTab, sal_Bool bRecord )
 {
     //	Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt
-    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
-                        InsertTable( nTab, rName, bRecord, FALSE );
+    sal_Bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
+                        InsertTable( nTab, rName, bRecord, sal_False );
     if (bSuccess)
-        SetTabNo( nTab, TRUE );
+        SetTabNo( nTab, sal_True );
 
     return bSuccess;
 }
@@ -2019,13 +2019,13 @@ BOOL ScViewFunc::InsertTable( const String& rName, SCTAB nTab, BOOL bRecord )
 //----------------------------------------------------------------------------
 //	Tabellen einfuegen
 
-BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
-                                            SCTAB nCount, BOOL bRecord )
+sal_Bool ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
+                                            SCTAB nCount, sal_Bool bRecord )
 {
     ScDocShell* pDocSh	= GetViewData()->GetDocShell();
     ScDocument* pDoc 	= pDocSh->GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     SvStrings *pNameList= NULL;
 
@@ -2037,7 +2037,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
         pDoc->BeginDrawUndo();							//	InsertTab erzeugt ein SdrUndoNewPage
     }
 
-    BOOL bFlag=FALSE;
+    sal_Bool bFlag=sal_False;
 
     String aValTabName;
     String *pStr;
@@ -2046,7 +2046,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
     {
         if(pNames!=NULL)
         {
-            pStr=pNames->GetObject(static_cast<USHORT>(i));
+            pStr=pNames->GetObject(static_cast<sal_uInt16>(i));
         }
         else
         {
@@ -2057,7 +2057,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
 
         if(pDoc->InsertTab( nTab+i,*pStr))
         {
-            bFlag=TRUE;
+            bFlag=sal_True;
             pDocSh->Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab+i ) );
         }
         else
@@ -2074,31 +2074,31 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
     {
         if (bRecord)
             pDocSh->GetUndoManager()->AddUndoAction(
-                        new ScUndoInsertTables( pDocSh, nTab, FALSE, pNameList));
+                        new ScUndoInsertTables( pDocSh, nTab, sal_False, pNameList));
 
         //	Views updaten:
 
-        SetTabNo( nTab, TRUE );
+        SetTabNo( nTab, sal_True );
         pDocSh->PostPaintExtras();
         pDocSh->SetDocumentModified();
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
-        return TRUE;
+        return sal_True;
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::AppendTable( const String& rName, BOOL bRecord )
+sal_Bool ScViewFunc::AppendTable( const String& rName, sal_Bool bRecord )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc   = pDocSh->GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     WaitObject aWait( GetFrameWin() );
 
@@ -2110,53 +2110,53 @@ BOOL ScViewFunc::AppendTable( const String& rName, BOOL bRecord )
         SCTAB nTab = pDoc->GetTableCount()-1;
         if (bRecord)
             pDocSh->GetUndoManager()->AddUndoAction(
-                        new ScUndoInsertTab( pDocSh, nTab, TRUE, rName));
+                        new ScUndoInsertTab( pDocSh, nTab, sal_True, rName));
         GetViewData()->InsertTab( nTab );
-        SetTabNo( nTab, TRUE );
+        SetTabNo( nTab, sal_True );
         pDocSh->PostPaintExtras();
         pDocSh->SetDocumentModified();
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
-        return TRUE;
+        return sal_True;
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 }
 
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRecord )
+sal_Bool ScViewFunc::DeleteTable( SCTAB nTab, sal_Bool bRecord )
 {
     ScDocShell* pDocSh	= GetViewData()->GetDocShell();
     ScDocument* pDoc 	= pDocSh->GetDocument();
 
-    BOOL bSuccess = pDocSh->GetDocFunc().DeleteTable( nTab, bRecord, FALSE );
+    sal_Bool bSuccess = pDocSh->GetDocFunc().DeleteTable( nTab, bRecord, sal_False );
     if (bSuccess)
     {
         SCTAB nNewTab = nTab;
         if ( nNewTab >= pDoc->GetTableCount() )
             --nNewTab;
-        SetTabNo( nNewTab, TRUE );
+        SetTabNo( nNewTab, sal_True );
     }
     return bSuccess;
 }
 
-BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
+sal_Bool ScViewFunc::DeleteTables(const SvShorts &TheTabs, sal_Bool bRecord )
 {
     ScDocShell* pDocSh	= GetViewData()->GetDocShell();
     ScDocument* pDoc 	= pDocSh->GetDocument();
-    BOOL bVbaEnabled = pDoc ? pDoc->IsInVBAMode() : FALSE;
+    sal_Bool bVbaEnabled = pDoc ? pDoc->IsInVBAMode() : sal_False;
     SCTAB		nNewTab = TheTabs.front();
     WaitObject aWait( GetFrameWin() );
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     while ( nNewTab > 0 && !pDoc->IsVisible( nNewTab ) )
         --nNewTab;
 
-    BOOL bWasLinked = FALSE;
+    sal_Bool bWasLinked = sal_False;
     ScDocument* pUndoDoc = NULL;
     ScRefUndoData* pUndoData = NULL;
     if (bRecord)
@@ -2172,16 +2172,16 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
         {
             SCTAB nTab = TheTabs[i];
             if (i==0)
-                pUndoDoc->InitUndo( pDoc, nTab,nTab, TRUE,TRUE );	// incl. Spalten/Zeilenflags
+                pUndoDoc->InitUndo( pDoc, nTab,nTab, sal_True,sal_True );	// incl. Spalten/Zeilenflags
             else
-                pUndoDoc->AddUndoTab( nTab,nTab, TRUE,TRUE );		// incl. Spalten/Zeilenflags
+                pUndoDoc->AddUndoTab( nTab,nTab, sal_True,sal_True );		// incl. Spalten/Zeilenflags
 
-            pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pUndoDoc );
+            pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,sal_False, pUndoDoc );
             pDoc->GetName( nTab, aOldName );
-            pUndoDoc->RenameTab( nTab, aOldName, FALSE );
+            pUndoDoc->RenameTab( nTab, aOldName, sal_False );
             if (pDoc->IsLinked(nTab))
             {
-                bWasLinked = TRUE;
+                bWasLinked = sal_True;
                 pUndoDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), pDoc->GetLinkDoc(nTab),
                                     pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab),
                                     pDoc->GetLinkTab(nTab),
@@ -2189,13 +2189,13 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
             }
             if ( pDoc->IsScenario(nTab) )
             {
-                pUndoDoc->SetScenario( nTab, TRUE );
+                pUndoDoc->SetScenario( nTab, sal_True );
                 String aComment;
                 Color  aColor;
-                USHORT nScenFlags;
+                sal_uInt16 nScenFlags;
                 pDoc->GetScenarioData( nTab, aComment, aColor, nScenFlags );
                 pUndoDoc->SetScenarioData( nTab, aComment, aColor, nScenFlags );
-                BOOL bActive = pDoc->IsActiveScenario( nTab );
+                sal_Bool bActive = pDoc->IsActiveScenario( nTab );
                 pUndoDoc->SetActiveScenario( nTab, bActive );
             }
             pUndoDoc->SetVisible( nTab, pDoc->IsVisible( nTab ) );
@@ -2216,15 +2216,15 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
         pUndoData = new ScRefUndoData( pDoc );
     }
 
-    BOOL bDelDone = FALSE;
+    sal_Bool bDelDone = sal_False;
 
     for (size_t i = TheTabs.size(); i > 0; i--)
     {
         String sCodeName;
-        BOOL bHasCodeName = pDoc->GetCodeName( TheTabs[i-1], sCodeName );
+        sal_Bool bHasCodeName = pDoc->GetCodeName( TheTabs[i-1], sCodeName );
         if (pDoc->DeleteTab( TheTabs[i-1], pUndoDoc ))
         {
-            bDelDone = TRUE;
+            bDelDone = sal_True;
             if( bVbaEnabled )
             {
                 if( bHasCodeName )
@@ -2248,7 +2248,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
         if ( nNewTab >= pDoc->GetTableCount() )
             nNewTab = pDoc->GetTableCount() - 1;
 
-        SetTabNo( nNewTab, TRUE );
+        SetTabNo( nNewTab, sal_True );
 
         if (bWasLinked)
         {
@@ -2275,11 +2275,11 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
 
 //----------------------------------------------------------------------------
 
-BOOL ScViewFunc::RenameTable( const String& rName, SCTAB nTab )
+sal_Bool ScViewFunc::RenameTable( const String& rName, SCTAB nTab )
 {
     //	Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt
-    BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
-                        RenameTable( nTab, rName, TRUE, FALSE );
+    sal_Bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
+                        RenameTable( nTab, rName, sal_True, sal_False );
     if (bSuccess)
     {
         //	Der Tabellenname koennte in einer Formel vorkommen...
@@ -2293,7 +2293,7 @@ BOOL ScViewFunc::RenameTable( const String& rName, SCTAB nTab )
 
 bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab )
 {
-    bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, TRUE, FALSE );
+    bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, sal_True, sal_False );
     if (bSuccess)
     {
         GetViewData()->GetViewShell()->UpdateInputHandler();
@@ -2303,7 +2303,7 @@ bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab )
 
 bool ScViewFunc::SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfoList )
 {
-    bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( rUndoSetTabBgColorInfoList, TRUE, FALSE );
+    bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( rUndoSetTabBgColorInfoList, sal_True, sal_False );
     if (bSuccess)
     {
         GetViewData()->GetViewShell()->UpdateInputHandler();
@@ -2315,7 +2315,7 @@ bool ScViewFunc::SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfo
 
 void ScViewFunc::InsertAreaLink( const String& rFile,
                                     const String& rFilter, const String& rOptions,
-                                    const String& rSource, ULONG nRefresh )
+                                    const String& rSource, sal_uLong nRefresh )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     SCCOL nPosX = GetViewData()->GetCurX();
@@ -2323,7 +2323,7 @@ void ScViewFunc::InsertAreaLink( const String& rFile,
     SCTAB nTab = GetViewData()->GetTabNo();
     ScAddress aPos( nPosX, nPosY, nTab );
 
-    pDocSh->GetDocFunc().InsertAreaLink( rFile, rFilter, rOptions, rSource, aPos, nRefresh, FALSE, FALSE );
+    pDocSh->GetDocFunc().InsertAreaLink( rFile, rFilter, rOptions, rSource, aPos, nRefresh, sal_False, sal_False );
 }
 
 
@@ -2356,7 +2356,7 @@ void ScViewFunc::InsertTableLink( const String& rFile,
         }
 
         if ( nTab <= MAXTAB )
-            ImportTables( pSrcSh, 1, &nTab, TRUE,
+            ImportTables( pSrcSh, 1, &nTab, sal_True,
                         GetViewData()->GetTabNo() );
     }
 }
@@ -2366,18 +2366,18 @@ void ScViewFunc::InsertTableLink( const String& rFile,
 //	Tabellen aus anderem Dokument kopieren / linken
 
 void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
-                                SCTAB nCount, const SCTAB* pSrcTabs, BOOL bLink,SCTAB nTab )
+                                SCTAB nCount, const SCTAB* pSrcTabs, sal_Bool bLink,SCTAB nTab )
 {
     ScDocument* pSrcDoc = pSrcShell->GetDocument();
 
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     //SCTAB nTab = GetViewData()->GetTabNo();
 
-    BOOL bError = FALSE;
-    BOOL bRefs = FALSE;
-    BOOL bName = FALSE;
+    sal_Bool bError = sal_False;
+    sal_Bool bRefs = sal_False;
+    sal_Bool bName = sal_False;
 
     if (pSrcDoc->GetDrawLayer())
         pDocSh->MakeDrawLayer();
@@ -2394,7 +2394,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
         pDoc->CreateValidTabName( aName );
         if ( !pDoc->InsertTab( nTab+i, aName ) )
         {
-            bError = TRUE;		// total error
+            bError = sal_True;		// total error
             break;	// for
         }
         ++nInsCount;
@@ -2403,22 +2403,22 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
     {
         SCTAB nSrcTab = pSrcTabs[i];
         SCTAB nDestTab1=nTab+i;
-        ULONG nErrVal = pDoc->TransferTab( pSrcDoc, nSrcTab, nDestTab1,
-            FALSE );		// no insert
+        sal_uLong nErrVal = pDoc->TransferTab( pSrcDoc, nSrcTab, nDestTab1,
+            sal_False );		// no insert
 
         switch (nErrVal)
         {
             case 0:						// interner Fehler oder voll Fehler
-                bError = TRUE;
+                bError = sal_True;
                 break;
             case 2:
-                bRefs = TRUE;
+                bRefs = sal_True;
                 break;
             case 3:
-                bName = TRUE;
+                bName = sal_True;
                 break;
             case 4:
-                bRefs = bName = TRUE;
+                bRefs = bName = sal_True;
                 break;
         }
 
@@ -2430,14 +2430,14 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
         {
             String aComment;
             Color  aColor;
-            USHORT nFlags;
+            sal_uInt16 nFlags;
 
             pSrcDoc->GetScenarioData(nSrcTab, aComment,aColor, nFlags);
-            pDoc->SetScenario( nDestTab1,TRUE);
+            pDoc->SetScenario( nDestTab1,sal_True);
             pDoc->SetScenarioData( nTab+i,aComment,aColor,nFlags);
-            BOOL bActive = pSrcDoc->IsActiveScenario(nSrcTab );
+            sal_Bool bActive = pSrcDoc->IsActiveScenario(nSrcTab );
             pDoc->SetActiveScenario( nDestTab1, bActive );
-            BOOL bVisible=pSrcDoc->IsVisible(nSrcTab);
+            sal_Bool bVisible=pSrcDoc->IsVisible(nSrcTab);
             pDoc->SetVisible(nDestTab1,bVisible );
 
         }
@@ -2454,9 +2454,9 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
             aFilterName = pMed->GetFilter()->GetFilterName();
         String aOptions = ScDocumentLoader::GetOptions(*pMed);
 
-        BOOL bWasThere = pDoc->HasLink( aFileName, aFilterName, aOptions );
+        sal_Bool bWasThere = pDoc->HasLink( aFileName, aFilterName, aOptions );
 
-        ULONG nRefresh = 0;
+        sal_uLong nRefresh = 0;
         String aTabStr;
         for (i=0; i<nInsCount; i++)
         {
@@ -2468,10 +2468,10 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
         if (!bWasThere)			// Link pro Quelldokument nur einmal eintragen
         {
             ScTableLink* pLink = new ScTableLink( pDocSh, aFileName, aFilterName, aOptions, nRefresh );
-            pLink->SetInCreate( TRUE );
+            pLink->SetInCreate( sal_True );
             pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFileName, &aFilterName );
             pLink->Update();
-            pLink->SetInCreate( FALSE );
+            pLink->SetInCreate( sal_False );
 
             SfxBindings& rBindings = GetViewData()->GetBindings();
             rBindings.Invalidate( SID_LINKS );
@@ -2487,7 +2487,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
 
     for (i=0; i<nInsCount; i++)
         GetViewData()->InsertTab(nTab);
-    SetTabNo(nTab,TRUE);
+    SetTabNo(nTab,sal_True);
     pDocSh->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB,
                                 PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS );
 
@@ -2509,16 +2509,16 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
 //----------------------------------------------------------------------------
 //	Tabelle in anderes Dokument verschieben / kopieren
 
-void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
+void ScViewFunc::MoveTable( sal_uInt16 nDestDocNo, SCTAB nDestTab, sal_Bool bCopy )
 {
     ScDocument* pDoc	   = GetViewData()->GetDocument();
     ScDocShell* pDocShell  = GetViewData()->GetDocShell();
     ScDocument*	pDestDoc   = NULL;
     ScDocShell* pDestShell = NULL;
     ScTabViewShell* pDestViewSh = NULL;
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
-    BOOL bNewDoc = ( nDestDocNo == SC_DOC_NEW );
+    sal_Bool bNewDoc = ( nDestDocNo == SC_DOC_NEW );
     if ( bNewDoc )
     {
         nDestTab = 0;           // als erstes einfuegen
@@ -2567,7 +2567,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
                 pDestDoc->DeleteTab(0);
             pDestDoc->RenameTab( 0,
                         String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("______42_____")),
-                        FALSE );
+                        sal_False );
         }
 
         ScMarkData& rMark		= GetViewData()->GetMarkData();
@@ -2604,7 +2604,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
         if (!bNewDoc && bUndo)
             pDestDoc->BeginDrawUndo();		// drawing layer must do its own undo actions
 
-        ULONG nErrVal =1;
+        sal_uLong nErrVal =1;
         if(nDestTab==SC_TAB_APPEND)
             nDestTab=pDestDoc->GetTableCount();
         SCTAB nDestTab1=nDestTab;
@@ -2625,7 +2625,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
             for(size_t i=0;i<TheTabs.size();i++)
             {
                 nErrVal = pDestDoc->TransferTab( pDoc, TheTabs[i], nDestTab1,
-                    FALSE );		// no insert
+                    sal_False );		// no insert
 
                 // TransferTab doesn't copy drawing objects with bInsertNew=FALSE
                 if ( nErrVal > 0 )
@@ -2635,15 +2635,15 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
                 {
                     String aComment;
                     Color  aColor;
-                    USHORT nFlags;
+                    sal_uInt16 nFlags;
 
                     pDoc->GetScenarioData(TheTabs[i], aComment,aColor, nFlags);
-                    pDestDoc->SetScenario(nDestTab1,TRUE);
+                    pDestDoc->SetScenario(nDestTab1,sal_True);
                     pDestDoc->SetScenarioData(nDestTab1,aComment,aColor,nFlags);
-                    BOOL bActive = pDoc->IsActiveScenario(TheTabs[i]);
+                    sal_Bool bActive = pDoc->IsActiveScenario(TheTabs[i]);
                     pDestDoc->SetActiveScenario(nDestTab1, bActive );
 
-                    BOOL bVisible=pDoc->IsVisible(TheTabs[i]);
+                    sal_Bool bVisible=pDoc->IsVisible(TheTabs[i]);
                     pDestDoc->SetVisible(nDestTab1,bVisible );
 
                 }
@@ -2660,7 +2660,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
             pDestDoc->GetName(nDestTab, sName);
             pDestShell->GetUndoManager()->AddUndoAction(
                             new ScUndoImportTab( pDestShell, nDestTab,
-                                static_cast<SCTAB>(TheTabs.size()), FALSE));
+                                static_cast<SCTAB>(TheTabs.size()), sal_False));
 
         }
         else
@@ -2697,7 +2697,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
         String sName;
         pDestDoc->GetName(nDestTab, sName);
         pDestShell->GetUndoManager()->AddUndoAction(
-                        new ScUndoInsertTab( pDestShell, nDestTab, TRUE, sName ) );
+                        new ScUndoInsertTab( pDestShell, nDestTab, sal_True, sName ) );
 */
         if (!bCopy)
         {
@@ -2714,7 +2714,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
                 pDestDoc->UpdateChartListenerCollection();
 
             pDestDoc->DeleteTab(static_cast<SCTAB>(TheTabs.size()));   // first old table
-//?			pDestDoc->SelectTable(0, TRUE);		// neue erste Tabelle selektieren
+//?			pDestDoc->SelectTable(0, sal_True);		// neue erste Tabelle selektieren
             if (pDestViewSh)
                 pDestViewSh->TabChanged();		// Pages auf dem Drawing-Layer
             pDestShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB,
@@ -2777,7 +2777,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
         for(int j=0;j<TheTabNames.Count();j++)
         {
             nTabCount	= pDoc->GetTableCount();
-            pString=TheTabNames[sal::static_int_cast<USHORT>(j)];
+            pString=TheTabNames[sal::static_int_cast<sal_uInt16>(j)];
             if(!pDoc->GetTable(*pString,nMovTab))
             {
                 nMovTab=nTabCount;
@@ -2786,20 +2786,20 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
             {
                 nDestTab1=nTabCount;
             }
-            pDocShell->MoveTable( nMovTab, nDestTab1, bCopy, FALSE );	// Undo ist hier
+            pDocShell->MoveTable( nMovTab, nDestTab1, bCopy, sal_False );	// Undo ist hier
 
             if(bCopy && pDoc->IsScenario(nMovTab))
             {
                 String aComment;
                 Color  aColor;
-                USHORT nFlags;
+                sal_uInt16 nFlags;
 
                 pDoc->GetScenarioData(nMovTab, aComment,aColor, nFlags);
-                pDoc->SetScenario(nDestTab1,TRUE);
+                pDoc->SetScenario(nDestTab1,sal_True);
                 pDoc->SetScenarioData(nDestTab1,aComment,aColor,nFlags);
-                BOOL bActive = pDoc->IsActiveScenario(nMovTab );
+                sal_Bool bActive = pDoc->IsActiveScenario(nMovTab );
                 pDoc->SetActiveScenario( nDestTab1, bActive );
-                BOOL bVisible=pDoc->IsVisible(nMovTab);
+                sal_Bool bVisible=pDoc->IsVisible(nMovTab);
                 pDoc->SetVisible(nDestTab1,bVisible );
             }
 
@@ -2839,7 +2839,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
         else if (!bCopy && nTab<nDestTab)
             nNewTab--;
 
-        SetTabNo( nNewTab, TRUE );
+        SetTabNo( nNewTab, sal_True );
 
         //#i29848# adjust references to data on the copied sheet
         if( bCopy )
@@ -2854,8 +2854,8 @@ void ScViewFunc::ShowTable( const String& rName )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
-    BOOL bFound = FALSE;
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bFound = sal_False;
     SCTAB nPos = 0;
     String aTabName;
     SCTAB nCount = pDoc->GetTableCount();
@@ -2865,18 +2865,18 @@ void ScViewFunc::ShowTable( const String& rName )
         if ( aTabName == rName )
         {
             nPos = i;
-            bFound = TRUE;
+            bFound = sal_True;
         }
     }
 
     if (bFound)
     {
-        pDoc->SetVisible( nPos, TRUE );
+        pDoc->SetVisible( nPos, sal_True );
         if (bUndo)
         {
-            pDocSh->GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( pDocSh, nPos, TRUE ) );
+            pDocSh->GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( pDocSh, nPos, sal_True ) );
         }
-        SetTabNo( nPos, TRUE );
+        SetTabNo( nPos, sal_True );
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
         pDocSh->PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_EXTRAS);
         pDocSh->SetDocumentModified();
@@ -2892,7 +2892,7 @@ void ScViewFunc::HideTable( SCTAB nTab )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
     SCTAB nVisible = 0;
     SCTAB nCount = pDoc->GetTableCount();
     for (SCTAB i=0; i<nCount; i++)
@@ -2903,16 +2903,16 @@ void ScViewFunc::HideTable( SCTAB nTab )
 
     if (nVisible > 1)
     {
-        pDoc->SetVisible( nTab, FALSE );
+        pDoc->SetVisible( nTab, sal_False );
         if (bUndo)
         {
-            pDocSh->GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( pDocSh, nTab, FALSE ) );
+            pDocSh->GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( pDocSh, nTab, sal_False ) );
         }
 
         //	Views updaten:
         pDocSh->Broadcast( ScTablesHint( SC_TAB_HIDDEN, nTab ) );
 
-        SetTabNo( nTab, TRUE );
+        SetTabNo( nTab, sal_True );
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
         pDocSh->PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_EXTRAS);
         pDocSh->SetDocumentModified();
@@ -2943,7 +2943,7 @@ void ScViewFunc::InsertSpecialChar( const String& rStr, const Font& rFont )
                                ATTR_FONT );
 
     //	if string contains WEAK characters, set all fonts
-    BYTE nScript;
+    sal_uInt8 nScript;
     ScDocument* pDoc = GetViewData()->GetDocument();
     if ( pDoc->HasStringWeakCharacters( rStr ) )
         nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX;
@@ -2964,7 +2964,7 @@ void ScViewFunc::InsertSpecialChar( const String& rStr, const Font& rFont )
 void ScViewFunc::UpdateLineAttrs( SvxBorderLine&	   rLine,
                                   const SvxBorderLine* pDestLine,
                                   const SvxBorderLine* pSrcLine,
-                                  BOOL 				   bColor )
+                                  sal_Bool 				   bColor )
 {
     if ( pSrcLine && pDestLine )
     {
@@ -3003,10 +3003,10 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine&	   rLine,
 //----------------------------------------------------------------------------
 
 void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
-                                         BOOL bColorOnly )
+                                         sal_Bool bColorOnly )
 {
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -3021,13 +3021,13 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
     const SfxItemSet&       rSelItemSet = pSelAttrs->GetItemSet();
 
     const SfxPoolItem*		pBorderAttr	= NULL;
-    SfxItemState            eItemState = rSelItemSet.GetItemState( ATTR_BORDER, TRUE, &pBorderAttr );
+    SfxItemState            eItemState = rSelItemSet.GetItemState( ATTR_BORDER, sal_True, &pBorderAttr );
 
     const SfxPoolItem*      pTLBRItem = 0;
-    SfxItemState            eTLBRState = rSelItemSet.GetItemState( ATTR_BORDER_TLBR, TRUE, &pTLBRItem );
+    SfxItemState            eTLBRState = rSelItemSet.GetItemState( ATTR_BORDER_TLBR, sal_True, &pTLBRItem );
 
     const SfxPoolItem*      pBLTRItem = 0;
-    SfxItemState            eBLTRState = rSelItemSet.GetItemState( ATTR_BORDER_BLTR, TRUE, &pBLTRItem );
+    SfxItemState            eBLTRState = rSelItemSet.GetItemState( ATTR_BORDER_BLTR, sal_True, &pBLTRItem );
 
     // any of the lines visible?
     if( (eItemState != SFX_ITEM_DEFAULT) || (eTLBRState != SFX_ITEM_DEFAULT) || (eBLTRState != SFX_ITEM_DEFAULT) )
@@ -3123,7 +3123,7 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
 void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew )
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
-    ULONG nIndex = pDoc->AddCondFormat(rNew);			// dafuer gibt's kein Undo
+    sal_uLong nIndex = pDoc->AddCondFormat(rNew);			// dafuer gibt's kein Undo
     SfxUInt32Item aItem( ATTR_CONDITIONAL, nIndex );
 
     ApplyAttr( aItem );			// mit Paint und Undo...
@@ -3135,7 +3135,7 @@ void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew )
 void ScViewFunc::SetValidation( const ScValidationData& rNew )
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
-    ULONG nIndex = pDoc->AddValidationEntry(rNew);		// dafuer gibt's kein Undo
+    sal_uLong nIndex = pDoc->AddValidationEntry(rNew);		// dafuer gibt's kein Undo
     SfxUInt32Item aItem( ATTR_VALIDDATA, nIndex );
 
     ApplyAttr( aItem );			// mit Paint und Undo...
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 4e0c01b20..243d58850 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -226,7 +226,7 @@ using namespace com::sun::star;
 //----------------------------------------------------------------------------
 //		C U T
 
-void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
+void ScViewFunc::CutToClip( ScDocument* pClipDoc, sal_Bool bIncludeObjects )
 {
     UpdateInputLine();
 
@@ -243,7 +243,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
         ScDocument* pDoc = GetViewData()->GetDocument();
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScMarkData& rMark = GetViewData()->GetMarkData();
-        const BOOL bRecord(pDoc->IsUndoEnabled());					// Undo/Redo
+        const sal_Bool bRecord(pDoc->IsUndoEnabled());					// Undo/Redo
 
         ScDocShellModificator aModificator( *pDocSh );
 
@@ -255,10 +255,10 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
             MarkDataChanged();
         }
 
-        CopyToClip( pClipDoc, TRUE, FALSE, bIncludeObjects );			// Ab ins Clipboard
+        CopyToClip( pClipDoc, sal_True, sal_False, bIncludeObjects );			// Ab ins Clipboard
 
         ScAddress aOldEnd( aRange.aEnd );		// Zusammengefasste Zellen im Bereich?
-        pDoc->ExtendMerge( aRange, TRUE );
+        pDoc->ExtendMerge( aRange, sal_True );
 
         ScDocument* pUndoDoc = NULL;
         if ( bRecord )
@@ -269,11 +269,11 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
             ScRange aCopyRange = aRange;
             aCopyRange.aStart.SetTab(0);
             aCopyRange.aEnd.SetTab(pDoc->GetTableCount()-1);
-            pDoc->CopyToDocument( aCopyRange, (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( aCopyRange, (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS, sal_False, pUndoDoc );
             pDoc->BeginDrawUndo();
         }
 
-        USHORT nExtFlags = 0;
+        sal_uInt16 nExtFlags = 0;
         pDocSh->UpdatePaintExt( nExtFlags, aRange );
 
         HideCursor();							// Cursor aendert sich !
@@ -305,9 +305,9 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
 //----------------------------------------------------------------------------
 //		C O P Y
 
-BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bIncludeObjects, BOOL bStopEdit )
+sal_Bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, sal_Bool bCut, sal_Bool bApi, sal_Bool bIncludeObjects, sal_Bool bStopEdit )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     if ( bStopEdit )
         UpdateInputLine();
 
@@ -322,11 +322,11 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
                         aRange.aEnd.Col(),   aRange.aEnd.Row(),
                         rMark ) )
         {
-            BOOL bSysClip = FALSE;
+            sal_Bool bSysClip = sal_False;
             if ( !pClipDoc )									// no clip doc specified
             {
                 pClipDoc = new ScDocument( SCDOCMODE_CLIP );	// create one (deleted by ScTransferObj)
-                bSysClip = TRUE;								// and copy into system
+                bSysClip = sal_True;								// and copy into system
             }
 
             if ( !bCut )
@@ -338,7 +338,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
 
             if ( bSysClip && bIncludeObjects )
             {
-                BOOL bAnyOle = pDoc->HasOLEObjectsInArea( aRange, &rMark );
+                sal_Bool bAnyOle = pDoc->HasOLEObjectsInArea( aRange, &rMark );
                 // update ScGlobal::pDrawClipDocShellRef
                 ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle ) );
             }
@@ -372,7 +372,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
 
                 ScGlobal::SetClipDocName( pDoc->GetDocumentShell()->GetTitle( SFX_TITLE_FULLNAME ) );
             }
-            pClipDoc->ExtendMerge( aRange, TRUE );
+            pClipDoc->ExtendMerge( aRange, sal_True );
 
             if (bSysClip)
             {
@@ -395,7 +395,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
                 SC_MOD()->SetClipObject( pTransferObj, NULL );		// internal clipboard
             }
 
-            bDone = TRUE;
+            bDone = sal_True;
         }
         else
         {
@@ -544,14 +544,14 @@ ScTransferObj* ScViewFunc::CopyToTransferable()
         {
             ScDocument *pClipDoc = new ScDocument( SCDOCMODE_CLIP );    // create one (deleted by ScTransferObj)
 
-            BOOL bAnyOle = pDoc->HasOLEObjectsInArea( aRange, &rMark );
+            sal_Bool bAnyOle = pDoc->HasOLEObjectsInArea( aRange, &rMark );
             ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle ) );
 
             ScClipParam aClipParam(aRange, false);
             pDoc->CopyToClip(aClipParam, pClipDoc, &rMark, false, false, true);
 
             ScDrawLayer::SetGlobalDrawPersist(NULL);
-            pClipDoc->ExtendMerge( aRange, TRUE );
+            pClipDoc->ExtendMerge( aRange, sal_True );
 
             ScDocShell* pDocSh = GetViewData()->GetDocShell();
             TransferableObjectDescriptor aObjDesc;
@@ -578,7 +578,7 @@ void ScViewFunc::PasteDraw()
                                      pViewData->GetActivePart() ) );
     ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard( pWin );
     if (pDrawClip)
-        PasteDraw( aPos, pDrawClip->GetModel(), FALSE,
+        PasteDraw( aPos, pDrawClip->GetModel(), sal_False,
             pDrawClip->GetSourceDocID() == pViewData->GetDocument()->GetDocumentID() );
 }
 
@@ -595,8 +595,8 @@ void ScViewFunc::PasteFromSystem()
         // #129384# keep a reference in case the clipboard is changed during PasteFromClip
         uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip );
         PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
-                        PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
-                        TRUE );		// allow warning dialog
+                        PASTE_NOFUNC, sal_False, sal_False, sal_False, INS_NONE, IDF_NONE,
+                        sal_True );		// allow warning dialog
     }
     else if (pDrawClip)
         PasteDraw();
@@ -606,9 +606,9 @@ void ScViewFunc::PasteFromSystem()
 
 //		if (pClipObj.Is())
         {
-            ULONG nBiff8 = SotExchange::RegisterFormatName(
+            sal_uLong nBiff8 = SotExchange::RegisterFormatName(
                     String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff8")));
-            ULONG nBiff5 = SotExchange::RegisterFormatName(
+            sal_uLong nBiff5 = SotExchange::RegisterFormatName(
                     String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5")));
 
                 //	als erstes SvDraw-Model, dann Grafik
@@ -632,7 +632,7 @@ void ScViewFunc::PasteFromSystem()
             {
                 //	If it's a Writer object, insert RTF instead of OLE
 
-                BOOL bDoRtf = FALSE;
+                sal_Bool bDoRtf = sal_False;
                 TransferableObjectDescriptor aObjDesc;
                 if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) )
                 {
@@ -706,8 +706,8 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran
     if (pOwnClip)
     {
         PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
-                        PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
-                        TRUE );		// allow warning dialog
+                        PASTE_NOFUNC, sal_False, sal_False, sal_False, INS_NONE, IDF_NONE,
+                        sal_True );		// allow warning dialog
     }
     else if (pDrawClip)
     {
@@ -716,17 +716,17 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran
         SCROW nPosY = pViewData->GetCurY();
         Window* pWin = GetActiveWin();
         Point aPos = pWin->PixelToLogic( pViewData->GetScrPos( nPosX, nPosY, pViewData->GetActivePart() ) );
-        PasteDraw( aPos, pDrawClip->GetModel(), FALSE, pDrawClip->GetSourceDocID() == pViewData->GetDocument()->GetDocumentID() );
+        PasteDraw( aPos, pDrawClip->GetModel(), sal_False, pDrawClip->GetSourceDocID() == pViewData->GetDocument()->GetDocumentID() );
     }
     else
     {
             TransferableDataHelper aDataHelper( rxTransferable );
         {
-            ULONG nBiff8 = SotExchange::RegisterFormatName(
+            sal_uLong nBiff8 = SotExchange::RegisterFormatName(
                     String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff8")));
-            ULONG nBiff5 = SotExchange::RegisterFormatName(
+            sal_uLong nBiff5 = SotExchange::RegisterFormatName(
                     String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5")));
-            ULONG nFormatId = 0;
+            sal_uLong nFormatId = 0;
                 //	als erstes SvDraw-Model, dann Grafik
                 //	(Grafik darf nur bei einzelner Grafik drinstehen)
 
@@ -737,7 +737,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran
             else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ))
             {
                 //	If it's a Writer object, insert RTF instead of OLE
-                BOOL bDoRtf = FALSE;
+                sal_Bool bDoRtf = sal_False;
                 TransferableObjectDescriptor aObjDesc;
                 if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) )
                 {
@@ -784,16 +784,16 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran
 
             PasteDataFormat( nFormatId, aDataHelper.GetTransferable(),
                 GetViewData()->GetCurX(), GetViewData()->GetCurY(),
-                NULL, FALSE, FALSE );
+                NULL, sal_False, sal_False );
         }
     }
 }
 
-BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi )
+sal_Bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, sal_Bool bApi )
 {
     UpdateInputLine();
 
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
     Window* pWin = GetActiveWin();
     ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
     if ( nFormatId == 0 && pOwnClip )
@@ -801,18 +801,18 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi )
         // #129384# keep a reference in case the clipboard is changed during PasteFromClip
         uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip );
         PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
-                        PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
+                        PASTE_NOFUNC, sal_False, sal_False, sal_False, INS_NONE, IDF_NONE,
                         !bApi );		// allow warning dialog
     }
     else
     {
         TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) );
         if ( !aDataHelper.GetTransferable().is() )
-            return FALSE;
+            return sal_False;
 
         bRet = PasteDataFormat( nFormatId, aDataHelper.GetTransferable(),
                                 GetViewData()->GetCurX(), GetViewData()->GetCurY(),
-                                NULL, FALSE, !bApi );		// allow warning dialog
+                                NULL, sal_False, !bApi );		// allow warning dialog
 
         if ( !bRet && !bApi )
             ErrorMessage(STR_PASTE_ERROR);
@@ -824,10 +824,10 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi )
 //----------------------------------------------------------------------------
 //		P A S T E
 
-BOOL ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransferable>& rxTransferable,
-                                    SdrObject* pHitObj, BOOL bLink )
+sal_Bool ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransferable>& rxTransferable,
+                                    SdrObject* pHitObj, sal_Bool bLink )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if ( bLink )
     {
         TransferableDataHelper aDataHelper( rxTransferable );
@@ -861,14 +861,14 @@ BOOL ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransfer
     return bRet;
 }
 
-BOOL lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-                        const ScMarkData& rTabSelection, USHORT nMask )
+sal_Bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+                        const ScMarkData& rTabSelection, sal_uInt16 nMask )
 {
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
         if ( rTabSelection.GetTableSelect(nTab) && pDoc->HasAttrib( nCol1, nRow1, nTab, nCol2, nRow2, nTab, nMask ) )
-            return TRUE;
-    return FALSE;
+            return sal_True;
+    return sal_False;
 }
 
 //
@@ -923,26 +923,26 @@ bool lcl_checkDestRangeForOverwrite(const ScRange& rDestRange, const ScDocument*
 
 }
 
-BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
-                                    USHORT nFunction, BOOL bSkipEmpty,
-                                    BOOL bTranspose, BOOL bAsLink,
-                                    InsCellCmd eMoveMode, USHORT nUndoExtraFlags,
-                                    BOOL bAllowDialogs )
+sal_Bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc,
+                                    sal_uInt16 nFunction, sal_Bool bSkipEmpty,
+                                    sal_Bool bTranspose, sal_Bool bAsLink,
+                                    InsCellCmd eMoveMode, sal_uInt16 nUndoExtraFlags,
+                                    sal_Bool bAllowDialogs )
 {
     if (!pClipDoc)
     {
         DBG_ERROR("PasteFromClip: pClipDoc=0 not allowed");
-        return FALSE;
+        return sal_False;
     }
 
     //	fuer Undo etc. immer alle oder keine Inhalte sichern
-    USHORT nContFlags = IDF_NONE;
+    sal_uInt16 nContFlags = IDF_NONE;
     if (nFlags & IDF_CONTENTS)
         nContFlags |= IDF_CONTENTS;
     if (nFlags & IDF_ATTRIB)
         nContFlags |= IDF_ATTRIB;
     // evtl. Attribute ins Undo ohne sie vom Clip ins Doc zu kopieren
-    USHORT nUndoFlags = nContFlags;
+    sal_uInt16 nUndoFlags = nContFlags;
     if (nUndoExtraFlags & IDF_ATTRIB)
         nUndoFlags |= IDF_ATTRIB;
     // do not copy note captions into undo document
@@ -954,11 +954,11 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
             nFlags, pClipDoc, nFunction, bSkipEmpty, bTranspose, bAsLink, bAllowDialogs,
             eMoveMode, nContFlags, nUndoFlags);
 
-    BOOL bCutMode = pClipDoc->IsCutMode();		// if transposing, take from original clipdoc
-    BOOL bIncludeFiltered = bCutMode;
+    sal_Bool bCutMode = pClipDoc->IsCutMode();		// if transposing, take from original clipdoc
+    sal_Bool bIncludeFiltered = bCutMode;
 
     // paste drawing: also if IDF_NOTE is set (to create drawing layer for note captions)
-    BOOL bPasteDraw = ( pClipDoc->GetDrawLayer() && ( nFlags & (IDF_OBJECTS|IDF_NOTE) ) );
+    sal_Bool bPasteDraw = ( pClipDoc->GetDrawLayer() && ( nFlags & (IDF_OBJECTS|IDF_NOTE) ) );
 
     ScDocShellRef aTransShellRef;	// for objects in xTransClip - must remain valid as long as xTransClip
     ScDocument* pOrigClipDoc = NULL;
@@ -968,12 +968,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
         SCCOL nX;
         SCROW nY;
         // include filtered rows until TransposeClip can skip them
-        bIncludeFiltered = TRUE;
-        pClipDoc->GetClipArea( nX, nY, TRUE );
+        bIncludeFiltered = sal_True;
+        pClipDoc->GetClipArea( nX, nY, sal_True );
         if ( nY > static_cast<sal_Int32>(MAXCOL) )						// zuviele Zeilen zum Transponieren
         {
             ErrorMessage(STR_PASTE_FULL);
-            return FALSE;
+            return sal_False;
         }
         pOrigClipDoc = pClipDoc;		// fuer Referenzen
 
@@ -999,7 +999,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     SCTAB nEndTab;
     SCCOL nClipSizeX;
     SCROW nClipSizeY;
-    pClipDoc->GetClipArea( nClipSizeX, nClipSizeY, TRUE );		// size in clipboard doc
+    pClipDoc->GetClipArea( nClipSizeX, nClipSizeY, sal_True );		// size in clipboard doc
 
     //	size in target doc: include filtered rows only if CutMode is set
     SCCOL nDestSizeX;
@@ -1009,8 +1009,8 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScMarkData& rMark = GetViewData()->GetMarkData();
-    SfxUndoManager* pUndoMgr = pDocSh->GetUndoManager();
-    const BOOL bRecord(pDoc->IsUndoEnabled());
+    ::svl::IUndoManager* pUndoMgr = pDocSh->GetUndoManager();
+    const sal_Bool bRecord(pDoc->IsUndoEnabled());
 
     ScDocShellModificator aModificator( *pDocSh );
 
@@ -1045,7 +1045,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     if (bNoPaste)
     {
         ErrorMessage(STR_MSSG_PASTEFROMCLIP_0);
-        return FALSE;
+        return sal_False;
     }
 
     SCROW nUnfilteredRows = aMarkRange.aEnd.Row() - aMarkRange.aStart.Row() + 1;
@@ -1053,7 +1053,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     if (bMarkIsFiltered)
     {
         ScViewUtil::UnmarkFiltered( aFilteredMark, pDoc);
-        aFilteredMark.FillRangeListWithMarks( &aRangeList, FALSE);
+        aFilteredMark.FillRangeListWithMarks( &aRangeList, sal_False);
         nUnfilteredRows = 0;
         for (ScRange* p = aRangeList.First(); p; p = aRangeList.Next())
         {
@@ -1068,7 +1068,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
         {
             /* FIXME: this should be a more descriptive error message then. */
             ErrorMessage(STR_MSSG_PASTEFROMCLIP_0);
-            return FALSE;
+            return sal_False;
         }
 #endif
     }
@@ -1097,7 +1097,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
                             WinBits(WB_YES_NO | WB_DEF_NO), aMessage );
             if ( aBox.Execute() != RET_YES )
             {
-                return FALSE;
+                return sal_False;
             }
         }
 
@@ -1125,7 +1125,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
                     if (!ScViewUtil::FitToUnfilteredRows( aMarkRange, pDoc, nDestSizeY+1))
                     {
                         ErrorMessage(STR_PASTE_FULL);
-                        return FALSE;
+                        return sal_False;
                     }
                 }
                 aMarkRange.GetVars( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab);
@@ -1133,7 +1133,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
                 if (bMarkIsFiltered)
                 {
                     ScViewUtil::UnmarkFiltered( aFilteredMark, pDoc);
-                    aFilteredMark.FillRangeListWithMarks( &aRangeList, TRUE);
+                    aFilteredMark.FillRangeListWithMarks( &aRangeList, sal_True);
                 }
             }
         }
@@ -1155,7 +1155,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
 
     //	Sollen Zellen eingefuegt werden?
     //	(zu grosse nEndCol/nEndRow werden weiter unten erkannt)
-    BOOL bInsertCells = ( eMoveMode != INS_NONE && !bOffLimits );
+    sal_Bool bInsertCells = ( eMoveMode != INS_NONE && !bOffLimits );
     if ( bInsertCells )
     {
         //	#94115# Instead of EnterListAction, the paste undo action is merged into the
@@ -1164,10 +1164,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
         MarkRange( aUserRange );			// wird vor CopyFromClip sowieso gesetzt
 
         // #72930# CutMode is reset on insertion of cols/rows but needed again on cell move
-        BOOL bCut = pClipDoc->IsCutMode();
-        if (!InsertCells( eMoveMode, bRecord, TRUE ))	// is inserting possible?
+        sal_Bool bCut = pClipDoc->IsCutMode();
+        if (!InsertCells( eMoveMode, bRecord, sal_True ))	// is inserting possible?
         {
-            return FALSE;
+            return sal_False;
             //	#i21036# EnterListAction isn't used, and InsertCells doesn't insert
             //	its undo action on failure, so no undo handling is needed here
         }
@@ -1176,7 +1176,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     }
     else if (!bOffLimits)
     {
-        BOOL bAskIfNotEmpty = bAllowDialogs &&
+        sal_Bool bAskIfNotEmpty = bAllowDialogs &&
                                 ( nFlags & IDF_CONTENTS ) &&
                                 nFunction == PASTE_NOFUNC &&
                                 SC_MOD()->GetInputOptions().GetReplaceCellsWarn();
@@ -1192,14 +1192,14 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     pClipDoc->GetClipStart( nClipStartX, nClipStartY );
     SCCOL nUndoEndCol = nClipStartX + nClipSizeX;
     SCROW nUndoEndRow = nClipStartY + nClipSizeY;	// end of source area in clipboard document
-    BOOL bClipOver = FALSE;
+    sal_Bool bClipOver = sal_False;
     // #i68690# ExtendMerge for the clip doc must be called with the clipboard's sheet numbers.
     // The same end column/row can be used for all calls because the clip doc doesn't contain
     // content outside the clip area.
     for (SCTAB nClipTab=0; nClipTab<=MAXTAB; nClipTab++)
         if ( pClipDoc->HasTable(nClipTab) )
-            if ( pClipDoc->ExtendMerge( nClipStartX,nClipStartY, nUndoEndCol,nUndoEndRow, nClipTab, FALSE ) )
-                bClipOver = TRUE;
+            if ( pClipDoc->ExtendMerge( nClipStartX,nClipStartY, nUndoEndCol,nUndoEndRow, nClipTab, sal_False ) )
+                bClipOver = sal_True;
     nUndoEndCol -= nClipStartX + nClipSizeX;
     nUndoEndRow -= nClipStartY + nClipSizeY;		// now contains only the difference added by ExtendMerge
     nUndoEndCol = sal::static_int_cast<SCCOL>( nUndoEndCol + nEndCol );
@@ -1214,10 +1214,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     if (nUndoEndCol>MAXCOL || nUndoEndRow>MAXROW)
     {
         ErrorMessage(STR_PASTE_FULL);
-        return FALSE;
+        return sal_False;
     }
 
-    pDoc->ExtendMergeSel( nStartCol,nStartRow, nUndoEndCol,nUndoEndRow, aFilteredMark, FALSE );
+    pDoc->ExtendMergeSel( nStartCol,nStartRow, nUndoEndCol,nUndoEndRow, aFilteredMark, sal_False );
 
         //	Test auf Zellschutz
 
@@ -1225,7 +1225,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     if (!aTester.IsEditable())
     {
         ErrorMessage(aTester.GetMessageId());
-        return FALSE;
+        return sal_False;
     }
 
         //! Test auf Ueberlappung
@@ -1259,8 +1259,8 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
                 {
                     ScRange aRange(nCol, nRow1, nStartTab);
                     pDoc->ExtendOverlapped(aRange);
-                    pDoc->ExtendMerge(aRange, TRUE, TRUE);
-                    rDocFunc.UnmergeCells(aRange, bRecord, TRUE);
+                    pDoc->ExtendMerge(aRange, sal_True, sal_True);
+                    rDocFunc.UnmergeCells(aRange, bRecord, sal_True);
                 }
             }
         }
@@ -1272,8 +1272,8 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
             pChangeTrack->ResetLastCut();	// kein CutMode mehr
     }
 
-    BOOL bColInfo = ( nStartRow==0 && nEndRow==MAXROW );
-    BOOL bRowInfo = ( nStartCol==0 && nEndCol==MAXCOL );
+    sal_Bool bColInfo = ( nStartRow==0 && nEndRow==MAXROW );
+    sal_Bool bRowInfo = ( nStartCol==0 && nEndCol==MAXCOL );
 
     ScDocument* pUndoDoc	= NULL;
     ScDocument* pRefUndoDoc = NULL;
@@ -1288,18 +1288,18 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
         // all sheets - CopyToDocument skips those that don't exist in pUndoDoc
         SCTAB nTabCount = pDoc->GetTableCount();
         pDoc->CopyToDocument( nStartCol, nStartRow, 0, nUndoEndCol, nUndoEndRow, nTabCount-1,
-                                nUndoFlags, FALSE, pUndoDoc );
+                                nUndoFlags, sal_False, pUndoDoc );
 
         if ( bCutMode )
         {
             pRefUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-            pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, FALSE, FALSE );
+            pRefUndoDoc->InitUndo( pDoc, 0, nTabCount-1, sal_False, sal_False );
 
             pUndoData = new ScRefUndoData( pDoc );
         }
     }
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab,
                                        nEndCol,   nEndRow,   nEndTab );		// content before the change
 
@@ -1326,7 +1326,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
             pMixDoc = new ScDocument( SCDOCMODE_UNDO );
             pMixDoc->InitUndo( pDoc, nStartTab, nEndTab );
             pDoc->CopyToDocument( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab,
-                                    IDF_CONTENTS, FALSE, pMixDoc );
+                                    IDF_CONTENTS, sal_False, pMixDoc );
         }
     }
 
@@ -1339,12 +1339,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     if ( bRecord )
         pDoc->BeginDrawUndo();
 
-    USHORT nNoObjFlags = nFlags & ~IDF_OBJECTS;
+    sal_uInt16 nNoObjFlags = nFlags & ~IDF_OBJECTS;
     if (!bAsLink)
     {
         //	copy normally (original range)
         pDoc->CopyFromClip( aUserRange, aFilteredMark, nNoObjFlags,
-                pRefUndoDoc, pClipDoc, TRUE, FALSE, bIncludeFiltered,
+                pRefUndoDoc, pClipDoc, sal_True, sal_False, bIncludeFiltered,
                 bSkipEmpty, (bMarkIsFiltered ? &aRangeList : NULL) );
 
         // bei Transpose Referenzen per Hand anpassen
@@ -1355,7 +1355,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     {
         //	copy with bAsLink=TRUE
         pDoc->CopyFromClip( aUserRange, aFilteredMark, nNoObjFlags, pRefUndoDoc, pClipDoc,
-                                TRUE, TRUE, bIncludeFiltered, bSkipEmpty );
+                                sal_True, sal_True, bIncludeFiltered, bSkipEmpty );
     }
     else
     {
@@ -1365,9 +1365,9 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
 
     // skipped rows and merged cells don't mix
     if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
-        rDocFunc.UnmergeCells( aUserRange, FALSE, TRUE );
+        rDocFunc.UnmergeCells( aUserRange, sal_False, sal_True );
 
-    pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, aFilteredMark, TRUE );    // Refresh
+    pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, aFilteredMark, sal_True );    // Refresh
                                                                                     // und Bereich neu
 
     if ( pMixDoc )				// Rechenfunktionen mit Original-Daten auszufuehren ?
@@ -1394,7 +1394,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
         //	Paste the drawing objects after the row heights have been updated.
 
         pDoc->CopyFromClip( aUserRange, aFilteredMark, IDF_OBJECTS, pRefUndoDoc, pClipDoc,
-                                TRUE, FALSE, bIncludeFiltered );
+                                sal_True, sal_False, bIncludeFiltered );
     }
 
     //
@@ -1439,7 +1439,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
             pUndoDoc->AddUndoTab( 0, nTabCount-1 );
             pRefUndoDoc->DeleteArea( nStartCol, nStartRow, nEndCol, nEndRow, aFilteredMark, IDF_ALL );
             pRefUndoDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
-                                            IDF_FORMULA, FALSE, pUndoDoc );
+                                            IDF_FORMULA, sal_False, pUndoDoc );
             delete pRefUndoDoc;
         }
 
@@ -1458,21 +1458,21 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
                                 nUndoEndCol, nUndoEndRow, nEndTab, aFilteredMark,
                                 pUndoDoc, pRedoDoc, nFlags | nUndoFlags,
                                 pUndoData, NULL, NULL, NULL,
-                                FALSE, &aOptions );		// FALSE = Redo data not yet copied
+                                sal_False, &aOptions );		// sal_False = Redo data not yet copied
 
         if ( bInsertCells )
         {
             //	Merge the paste undo action into the insert action.
             //	Use ScUndoWrapper so the ScUndoPaste pointer can be stored in the insert action.
 
-            pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), TRUE );
+            pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), sal_True );
         }
         else
             pUndoMgr->AddUndoAction( pUndo );
         pUndoMgr->LeaveListAction();
     }
 
-    USHORT nPaint = PAINT_GRID;
+    sal_uInt16 nPaint = PAINT_GRID;
     if (bColInfo)
     {
         nPaint |= PAINT_TOP;
@@ -1502,7 +1502,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 bool ScViewFunc::PasteMultiRangesFromClip(
@@ -1635,7 +1635,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(
 
     if (pDoc->IsUndoEnabled())
     {
-        SfxUndoManager* pUndoMgr = pDocSh->GetUndoManager();
+        ::svl::IUndoManager* pUndoMgr = pDocSh->GetUndoManager();
         String aUndo = ScGlobal::GetRscString(
             pClipDoc->IsCutMode() ? STR_UNDO_CUT : STR_UNDO_COPY);
         pUndoMgr->EnterListAction(aUndo, aUndo);
@@ -1703,13 +1703,13 @@ void ScViewFunc::PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData&
 //
 //	innerhalb des Dokuments
 
-BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
-                                BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi )
+sal_Bool ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
+                                sal_Bool bCut, sal_Bool bRecord, sal_Bool bPaint, sal_Bool bApi )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     HideAllCursors();		// wegen zusammengefassten
 
-    BOOL bSuccess = TRUE;
+    sal_Bool bSuccess = sal_True;
     SCTAB nDestTab = rDestPos.Tab();
     const ScMarkData& rMark = GetViewData()->GetMarkData();
     if ( rSource.aStart.Tab() == nDestTab && rSource.aEnd.Tab() == nDestTab && rMark.GetSelectCount() > 1 )
@@ -1768,7 +1768,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
                     rDestPos.Row() + rSource.aEnd.Row() - rSource.aStart.Row(),
                     nDestTab );
 
-        BOOL bIncludeFiltered = bCut;
+        sal_Bool bIncludeFiltered = bCut;
         if ( !bIncludeFiltered )
         {
             // find number of non-filtered rows
@@ -1780,7 +1780,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
             aDestEnd.SetRow( rDestPos.Row() + nPastedCount - 1 );
         }
 
-        MarkRange( ScRange( rDestPos, aDestEnd ), FALSE );			//! FALSE ???
+        MarkRange( ScRange( rDestPos, aDestEnd ), sal_False );			//! sal_False ???
 
         pDocSh->UpdateOle(GetViewData());
         SelectionChanged();
@@ -1790,7 +1790,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
 
 //	Link innerhalb des Dokuments
 
-BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi )
+sal_Bool ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, sal_Bool bApi )
 {
     //	Test auf Ueberlappung
 
@@ -1804,7 +1804,7 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B
         {
             if (!bApi)
                 ErrorMessage( STR_ERR_LINKOVERLAP );
-            return FALSE;
+            return sal_False;
         }
     }
 
@@ -1821,15 +1821,15 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B
     if ( GetViewData()->GetTabNo() != rDestPos.Tab() )
         SetTabNo( rDestPos.Tab() );
 
-    MoveCursorAbs( rDestPos.Col(), rDestPos.Row(), SC_FOLLOW_NONE, FALSE, FALSE );
+    MoveCursorAbs( rDestPos.Col(), rDestPos.Row(), SC_FOLLOW_NONE, sal_False, sal_False );
 
     //	Paste
 
-    PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, TRUE );		// als Link
+    PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, sal_False, sal_False, sal_True );		// als Link
 
     delete pClipDoc;
 
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index ad0770af5..da21c1726 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -85,7 +85,7 @@ using namespace com::sun::star;
 
 // STATIC DATA -----------------------------------------------------------
 
-BOOL bPasteIsDrop = FALSE;
+sal_Bool bPasteIsDrop = sal_False;
 
 //==================================================================
 
@@ -103,11 +103,11 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         ScDocument* pDoc = pDocSh->GetDocument();
         SCTAB nTab = GetViewData()->GetTabNo();
-        const BOOL bRecord (pDoc->IsUndoEnabled());
+        const sal_Bool bRecord (pDoc->IsUndoEnabled());
 
         const ScPatternAttr* pPattern = pDoc->GetPattern( nStartCol, nStartRow, nTab );
         ScTabEditEngine* pEngine = new ScTabEditEngine( *pPattern, pDoc->GetEnginePool() );
-        pEngine->EnableUndo( FALSE );
+        pEngine->EnableUndo( sal_False );
 
         Window* pActWin = GetActiveWin();
         if (pActWin)
@@ -119,10 +119,10 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
 
             // same method now for clipboard or drag&drop
             // mba: clipboard always must contain absolute URLs (could be from alien source)
-            aEditView.InsertText( rxTransferable, String(), TRUE );
+            aEditView.InsertText( rxTransferable, String(), sal_True );
         }
 
-        ULONG nParCnt = pEngine->GetParagraphCount();
+        sal_uLong nParCnt = pEngine->GetParagraphCount();
         if (nParCnt)
         {
             SCROW nEndRow = nStartRow + static_cast<SCROW>(nParCnt) - 1;
@@ -133,14 +133,14 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
             {
                 pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
                 pUndoDoc->InitUndo( pDoc, nTab, nTab );
-                pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nStartCol,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc );
+                pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nStartCol,nEndRow,nTab, IDF_ALL, sal_False, pUndoDoc );
             }
 
             SCROW nRow = nStartRow;
-            for( USHORT n = 0; n < nParCnt; n++ )
+            for( sal_uInt16 n = 0; n < nParCnt; n++ )
             {
                 EditTextObject* pObject = pEngine->CreateTextObject( n );
-                EnterData( nStartCol, nRow, nTab, pObject, FALSE, TRUE );
+                EnterData( nStartCol, nRow, nTab, pObject, sal_False, sal_True );
                             // kein Undo, auf einfache Strings testen
                 delete pObject;
                 if( ++nRow > MAXROW )
@@ -151,7 +151,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
             {
                 ScDocument* pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
                 pRedoDoc->InitUndo( pDoc, nTab, nTab );
-                pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nStartCol,nEndRow,nTab, IDF_ALL|IDF_NOCAPTIONS, FALSE, pRedoDoc );
+                pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nStartCol,nEndRow,nTab, IDF_ALL|IDF_NOCAPTIONS, sal_False, pRedoDoc );
 
                 ScMarkData aDestMark;
                 aDestMark.SelectOneTable( nTab );
@@ -186,17 +186,17 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
         ShowAllCursors();
     }
 }
-void ScViewFunc::DoRefConversion( BOOL bRecord )
+void ScViewFunc::DoRefConversion( sal_Bool bRecord )
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScMarkData& rMark = GetViewData()->GetMarkData();
     SCTAB nTabCount = pDoc->GetTableCount();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScRange aMarkRange;
     rMark.MarkToSimple();
-    BOOL bMulti = rMark.IsMultiMarked();
+    sal_Bool bMulti = rMark.IsMultiMarked();
     if (bMulti)
         rMark.GetMultiMarkArea( aMarkRange );
     else if (rMark.IsMarked())
@@ -215,7 +215,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord )
     }
 
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
 
     ScDocument* pUndoDoc = NULL;
     if (bRecord)
@@ -238,13 +238,13 @@ void ScViewFunc::DoRefConversion( BOOL bRecord )
 
     ScRangeListRef xRanges;
     GetViewData()->GetMultiArea( xRanges );
-    ULONG nCount = xRanges->Count();
+    sal_uLong nCount = xRanges->Count();
 
     for (SCTAB i=0; i<nTabCount; i++)
     {
         if (rMark.GetTableSelect(i))
         {
-            for (ULONG j=0; j<nCount; j++)
+            for (sal_uLong j=0; j<nCount; j++)
             {
                 ScRange aRange = *xRanges->GetObject(j);
                 aRange.aStart.SetTab(i);
@@ -270,7 +270,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord )
                             ScFormulaCell* pNewCell = new ScFormulaCell( pDoc, aPos,
                                                         pArr,formula::FormulaGrammar::GRAM_DEFAULT, MM_NONE );
                             pDoc->PutCell( aPos, pNewCell );
-                            bOk = TRUE;
+                            bOk = sal_True;
                         }
                     }
                     pCell = aIter.GetNext();
@@ -309,7 +309,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord )
         ErrorMessage(STR_ERR_NOREF);
 }
 //	Thesaurus - Undo ok
-void ScViewFunc::DoThesaurus( BOOL bRecord )
+void ScViewFunc::DoThesaurus( sal_Bool bRecord )
 {
     SCCOL nCol;
     SCROW nRow;
@@ -327,9 +327,9 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
     EditView* pEditView = NULL;
     ESelection* pEditSel = NULL;
     ScEditEngineDefaulter* pThesaurusEngine;
-    BOOL bIsEditMode = GetViewData()->HasEditView(eWhich);
+    sal_Bool bIsEditMode = GetViewData()->HasEditView(eWhich);
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     if (bIsEditMode)											// Edit-Mode aktiv
     {
         GetViewData()->GetEditView(eWhich, pEditView, nCol, nRow);
@@ -452,7 +452,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
         }
         delete pNewTObj;
     }
-    KillEditView(TRUE);
+    KillEditView(sal_True);
     delete pEditDefaults;
     delete pThesaurusEngine;
     delete pOldTObj;
@@ -461,18 +461,18 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
 }
 
 //UNUSED2008-05  //	Spelling Checker - Undo ok
-//UNUSED2008-05  void ScViewFunc::DoSpellingChecker( BOOL bRecord )
+//UNUSED2008-05  void ScViewFunc::DoSpellingChecker( sal_Bool bRecord )
 //UNUSED2008-05  {
 //UNUSED2008-05      DoSheetConversion( ScConversionParam( SC_CONVERSION_SPELLCHECK ), bRecord );
 //UNUSED2008-05  }
 
-void ScViewFunc::DoHangulHanjaConversion( BOOL bRecord )
+void ScViewFunc::DoHangulHanjaConversion( sal_Bool bRecord )
 {
     ScConversionParam aConvParam( SC_CONVERSION_HANGULHANJA, LANGUAGE_KOREAN, 0, true );
     DoSheetConversion( aConvParam, bRecord );
 }
 
-void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bRecord )
+void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, sal_Bool bRecord )
 {
     SCCOL nCol;
     SCROW nRow;
@@ -484,9 +484,9 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
     ScSplitPos eWhich = rViewData.GetActivePart();
     EditView* pEditView = NULL;
     ESelection* pEditSel = NULL;
-    BOOL bIsEditMode = rViewData.HasEditView(eWhich);
+    sal_Bool bIsEditMode = rViewData.HasEditView(eWhich);
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     if (bIsEditMode)                                            // Edit-Mode aktiv
     {
         rViewData.GetEditView(eWhich, pEditView, nCol, nRow);
@@ -503,7 +503,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
     nTab = rViewData.GetTabNo();
 
     rMark.MarkToMulti();
-    BOOL bMarked = rMark.IsMultiMarked();
+    sal_Bool bMarked = rMark.IsMultiMarked();
     if (bMarked)
     {
         ScEditableTester aTester( pDoc, rMark );
@@ -538,8 +538,8 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
 
     //  ab hier kein return mehr
 
-    BOOL bOldDis = pDoc->IsIdleDisabled();
-    pDoc->DisableIdle( TRUE );   // #42726# stop online spelling
+    sal_Bool bOldDis = pDoc->IsIdleDisabled();
+    pDoc->DisableIdle( sal_True );   // #42726# stop online spelling
 
     // *** create and init the edit engine *** --------------------------------
 
@@ -567,7 +567,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
     Rectangle aRect( Point( 0, 0 ), Point( 0, 0 ) );
     pEditView->SetOutputArea( aRect );
     pEngine->SetControlWord( EE_CNTRL_USECHARATTRIBS );
-    pEngine->EnableUndo( FALSE );
+    pEngine->EnableUndo( sal_False );
     pEngine->SetPaperSize( aRect.GetSize() );
     pEngine->SetText( EMPTY_STRING );
 
@@ -602,7 +602,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
     // *** final cleanup *** --------------------------------------------------
 
     rViewData.SetSpellingView( NULL );
-    KillEditView(TRUE);
+    KillEditView(sal_True);
     delete pEngine;
     delete pEditSel;
     pDocSh->PostPaintGridAll();
@@ -614,7 +614,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
 //UNUSED2008-05  IMPL_LINK_INLINE_START( ScViewFunc, SpellError, void *, nLang )
 //UNUSED2008-05  {
 //UNUSED2008-05      SvtLanguageTable aLangTab;
-//UNUSED2008-05      String aErr = aLangTab.GetString((LanguageType) (ULONG) nLang);
+//UNUSED2008-05      String aErr = aLangTab.GetString((LanguageType) (sal_uLong) nLang);
 //UNUSED2008-05      ErrorHandler::HandleError(*new StringErrorInfo(
 //UNUSED2008-05                                  ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr) );
 //UNUSED2008-05  
@@ -625,7 +625,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
 // Pasten von FORMAT_FILE-Items
 //	wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt
 
-BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
+sal_Bool ScViewFunc::PasteFile( const Point& rPos, const String& rFile, sal_Bool bLink )
 {
     INetURLObject aURL;
     aURL.SetSmartURL( rFile );
@@ -635,7 +635,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
     if( ::avmedia::MediaWindow::isMediaURL( aStrURL ) )
     {
         const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, aStrURL );
-        return BOOL( 0 != GetViewData()->GetDispatcher().Execute(
+        return sal_Bool( 0 != GetViewData()->GetDispatcher().Execute(
                                 SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON,
                                 &aMediaURLItem, 0L ) );
     }
@@ -647,10 +647,10 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
 
         // nur nach eigenen Filtern suchen, ohne Auswahlbox (wie in ScDocumentLoader)
         SfxFilterMatcher aMatcher( ScDocShell::Factory().GetFilterContainer()->GetName() );
-        SfxMedium aSfxMedium( aStrURL, (STREAM_READ | STREAM_SHARE_DENYNONE), FALSE );
+        SfxMedium aSfxMedium( aStrURL, (STREAM_READ | STREAM_SHARE_DENYNONE), sal_False );
         // #i73992# GuessFilter no longer calls UseInteractionHandler.
         // This is UI, so it can be called here.
-        aSfxMedium.UseInteractionHandler(TRUE);
+        aSfxMedium.UseInteractionHandler(sal_True);
         ErrCode nErr = aMatcher.GuessFilter( aSfxMedium, &pFlt );
 
         if ( pFlt && !nErr )
@@ -664,7 +664,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
 
             // Asynchron oeffnen, kann naemlich auch aus D&D heraus passieren
             // und das bekommt dem MAC nicht so gut ...
-            return BOOL( 0 != rDispatcher.Execute( SID_OPENDOC,
+            return sal_Bool( 0 != rDispatcher.Execute( SID_OPENDOC,
                                     SFX_CALLMODE_ASYNCHRON, &aFileNameItem, &aFilterItem, &aTargetItem, 0L) );
         }
     }
@@ -672,7 +672,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
     // 2. Kann die Datei ueber die Grafik-Filter eingefuegt werden?
     // (als Link, weil Gallery das so anbietet)
 
-    USHORT nFilterFormat;
+    sal_uInt16 nFilterFormat;
     Graphic aGraphic;
     GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter();
 
@@ -702,7 +702,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
         SCROW nPosY = aRange.aStart.Row();
 
         InsertBookmark( aStrURL, aStrURL, nPosX, nPosY );
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -725,11 +725,11 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
         // #105851# If an OLE object can't be created, insert a URL button
 
         GetViewData()->GetViewShell()->InsertURLButton( aStrURL, aStrURL, EMPTY_STRING, &rPos );
-        return TRUE;
+        return sal_True;
     }
 }
 
-BOOL ScViewFunc::PasteBookmark( ULONG nFormatId,
+sal_Bool ScViewFunc::PasteBookmark( sal_uLong nFormatId,
                                 const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
                                 SCCOL nPosX, SCROW nPosY )
@@ -737,15 +737,15 @@ BOOL ScViewFunc::PasteBookmark( ULONG nFormatId,
     INetBookmark aBookmark;
     TransferableDataHelper aDataHelper( rxTransferable );
     if ( !aDataHelper.GetINetBookmark( nFormatId, aBookmark ) )
-        return FALSE;
+        return sal_False;
 
     InsertBookmark( aBookmark.GetDescription(), aBookmark.GetURL(), nPosX, nPosY );
-    return TRUE;
+    return sal_True;
 }
 
 void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL,
                                     SCCOL nPosX, SCROW nPosY, const String* pTarget,
-                                    BOOL bTryReplace )
+                                    sal_Bool bTryReplace )
 {
     ScViewData* pViewData = GetViewData();
     if ( pViewData->HasEditView( pViewData->GetActivePart() ) &&
@@ -785,7 +785,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL,
         }
     }
 
-    USHORT nPara = aEngine.GetParagraphCount();
+    sal_uInt16 nPara = aEngine.GetParagraphCount();
     if (nPara)
         --nPara;
     xub_StrLen nTxtLen = aEngine.GetTextLen(nPara);
@@ -809,7 +809,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL,
     delete pData;
 }
 
-BOOL ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent )
+sal_Bool ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent )
 {
     ScAddress aPos( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
     ScDocument* pDoc = GetViewData()->GetDocShell()->GetDocument();
@@ -820,7 +820,7 @@ BOOL ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent )
         const EditTextObject* pData = ((ScEditCell*)pCell)->GetData();
         if (pData)
         {
-            BOOL bField = pData->IsFieldObject();
+            sal_Bool bField = pData->IsFieldObject();
             if (bField)
             {
                 const SvxFieldItem* pFieldItem = pData->GetField();
@@ -836,13 +836,13 @@ BOOL ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent )
                             pContent->SetURL( pURLField->GetURL() );
                             pContent->SetTargetFrame( pURLField->GetTargetFrame() );
                         }
-                        return TRUE;
+                        return sal_True;
                     }
                 }
             }
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 1ea0761c6..6b8739d16 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -85,12 +85,12 @@ using namespace com::sun::star;
 
 //------------------------------------------------------------------
 
-BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
+sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
                     const uno::Reference<datatransfer::XTransferable>& rxTransferable,
-                    SCCOL nPosX, SCROW nPosY, Point* pLogicPos, BOOL bLink, BOOL bAllowDialogs )
+                    SCCOL nPosX, SCROW nPosY, Point* pLogicPos, sal_Bool bLink, sal_Bool bAllowDialogs )
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
-    pDoc->SetPastingDrawFromOtherDoc( TRUE );
+    pDoc->SetPastingDrawFromOtherDoc( sal_True );
 
     Point aPos;						//	inserting position (1/100 mm)
     if (pLogicPos)
@@ -98,7 +98,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
     else
     {
         //	inserting position isn't needed for text formats
-        BOOL bIsTextFormat = ( ScImportExport::IsFormatSupported( nFormatId ) ||
+        sal_Bool bIsTextFormat = ( ScImportExport::IsFormatSupported( nFormatId ) ||
                                 nFormatId == FORMAT_RTF );
         if ( !bIsTextFormat )
         {
@@ -110,13 +110,13 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                 nXT += pDoc->GetColWidth(i,nTab);
             if (pDoc->IsNegativePage(nTab))
                 nXT = -nXT;
-            ULONG nYT = pDoc->GetRowHeight( 0, nPosY-1, nTab);
+            sal_uLong nYT = pDoc->GetRowHeight( 0, nPosY-1, nTab);
             aPos = Point( (long)(nXT * HMM_PER_TWIPS), (long)(nYT * HMM_PER_TWIPS) );
         }
     }
 
     TransferableDataHelper aDataHelper( rxTransferable );
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     //
     //	handle individual formats
@@ -172,10 +172,10 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                     SetCursor( nPosX, nPosY );
                     Unmark();
                     PasteFromClip( IDF_ALL, pClipDoc,
-                                    PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
+                                    PASTE_NOFUNC, sal_False, sal_False, sal_False, INS_NONE, IDF_NONE,
                                     bAllowDialogs );
                     delete pClipDoc;
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
 
                 xDocShRef->DoClose();
@@ -190,7 +190,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                 {
                     // try to get the replacement image from the clipboard
                     Graphic aGraphic;
-                    ULONG nGrFormat = 0;
+                    sal_uLong nGrFormat = 0;
 // (wg. Selection Manager bei Trustet Solaris)
 #ifndef SOLARIS
 /*
@@ -213,7 +213,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                     else
                         PasteObject( aPos, xObj, &aObjDesc.maSize );
 
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
                 else
                 {
@@ -265,7 +265,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                 {
                     // try to get the replacement image from the clipboard
                     Graphic aGraphic;
-                    ULONG nGrFormat = 0;
+                    sal_uLong nGrFormat = 0;
 
 // (wg. Selection Manager bei Trustet Solaris)
 #ifndef SOLARIS
@@ -289,7 +289,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
 
                     // let object stay in loaded state after insertion
                     SdrOle2Obj::Unload( xObj, embed::Aspects::MSOLE_CONTENT );
-                    bRet = TRUE;
+                    bRet = sal_True;
                 }
                 else
                 {
@@ -309,7 +309,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
         {
             //	use EditView's PasteSpecial / Drop
             PasteRTF( nPosX, nPosY, rxTransferable );
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else
         {
@@ -352,10 +352,10 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                         // Content was partially pasted, which can be undone by
                         // the user though.
                         if (aObj.IsOverflow())
-                            bRet = FALSE;
+                            bRet = sal_False;
                     }
                     else
-                        bRet = TRUE;
+                        bRet = sal_True;
                         // Yes, no failure, don't raise a "couldn't paste"
                         // dialog if user cancelled.
                     delete pDlg;
@@ -382,7 +382,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
             ScDocShell* pDocSh = GetViewData()->GetDocShell();
             SCTAB nTab = GetViewData()->GetTabNo();
 
-            ClickCursor(nPosX, nPosY, FALSE);				// set cursor position
+            ClickCursor(nPosX, nPosY, sal_False);				// set cursor position
 
             //	Creation of database area "Import1" isn't here, but in the DocShell
             //	slot execute, so it can be added to the undo action
@@ -398,7 +398,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
             }
             SfxStringItem aTarget(FN_PARAM_1, sTarget);
 
-            BOOL bAreaIsNew = !pDBData;
+            sal_Bool bAreaIsNew = !pDBData;
             SfxBoolItem aAreaNew(FN_PARAM_2, bAreaIsNew);
 
             ::svx::ODataAccessDescriptor aDesc;
@@ -416,7 +416,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
             rDisp.Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON,
                                         &aDataDesc, &aTarget, &aAreaNew, pCursorItem.get(), (void*)0 );
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     else if (nFormatId == SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)
@@ -459,8 +459,8 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
 
                 pScDrawView->InsertObjectSafe(pObj, *pScDrawView->GetSdrPageView());
 
-                GetViewData()->GetViewShell()->SetDrawShell( TRUE );
-                bRet = TRUE;
+                GetViewData()->GetViewShell()->SetDrawShell( sal_True );
+                bRet = sal_True;
             }
         }
     }
@@ -507,9 +507,9 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
             SvxDrawingLayerImport( pModel, xInputStream );
 
             // set everything to right layer:
-            ULONG nObjCount = 0;
-            USHORT nPages = pModel->GetPageCount();
-            for (USHORT i=0; i<nPages; i++)
+            sal_uLong nObjCount = 0;
+            sal_uInt16 nPages = pModel->GetPageCount();
+            for (sal_uInt16 i=0; i<nPages; i++)
             {
                 SdrPage* pPage = pModel->GetPage(i);
                 SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
@@ -529,7 +529,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
             PasteDraw( aPos, pModel, (nObjCount > 1) );		// grouped if more than 1 object
             delete pModel;
             aDragShellRef->DoClose();
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     else if ( (nFormatId == SOT_FORMATSTR_ID_BIFF_5) || (nFormatId == SOT_FORMATSTR_ID_BIFF_8) )
@@ -583,17 +583,17 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                 if ( pLogicPos )
                 {
                     // position specified (Drag&Drop) - change selection
-                    MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, FALSE, FALSE );
+                    MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, sal_False, sal_False );
                     Unmark();
                 }
 
                 pInsDoc->SetClipArea( aSource );
                 PasteFromClip( IDF_ALL, pInsDoc,
-                                PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
+                                PASTE_NOFUNC, sal_False, sal_False, sal_False, INS_NONE, IDF_NONE,
                                 bAllowDialogs );
                 delete pInsDoc;
 
-                bRet = TRUE;
+                bRet = sal_True;
             }
         }
     }
@@ -608,8 +608,8 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
         FileList aFileList;
         if ( aDataHelper.GetFileList( nFormatId, aFileList ) )
         {
-            ULONG nCount = aFileList.Count();
-            for( ULONG i = 0; i < nCount ; i++ )
+            sal_uLong nCount = aFileList.Count();
+            for( sal_uLong i = 0; i < nCount ; i++ )
             {
                 String aFile = aFileList.GetFile( i );
 
@@ -627,7 +627,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
                 aPos.X() += 400;
                 aPos.Y() += 400;
             }
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     else if ( nFormatId == SOT_FORMATSTR_ID_SOLK ||
@@ -638,7 +638,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
         bRet = PasteBookmark( nFormatId, rxTransferable, nPosX, nPosY );
     }
 
-    pDoc->SetPastingDrawFromOtherDoc( FALSE );
+    pDoc->SetPastingDrawFromOtherDoc( sal_False );
 
     return bRet;
 }
@@ -653,7 +653,7 @@ ByteString lcl_GetSubString( sal_Char* pData, long nStart, long nDataSize )
     return ByteString( pData + nStart );
 }
 
-BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rxTransferable )
+sal_Bool ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rxTransferable )
 {
     TransferableDataHelper aDataHelper( rxTransferable );
 
@@ -664,13 +664,13 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx
     if ( !aDataHelper.GetSequence( SOT_FORMATSTR_ID_LINK, aSequence ) )
     {
         DBG_ERROR("DDE Data not found.");
-        return FALSE;
+        return sal_False;
     }
 
     //	check size (only if string is available in transferable)
 
-    USHORT nCols = 1;
-    USHORT nRows = 1;
+    sal_uInt16 nCols = 1;
+    sal_uInt16 nRows = 1;
     if ( aDataHelper.HasFormat( SOT_FORMAT_STRING ) )
     {
         String aDataStr;
@@ -743,7 +743,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx
     EnterMatrix( aFormula );
     CursorPosChanged();
 
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index d744582f4..f57ba5b90 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -53,7 +53,7 @@
 void ScViewFunc::DetectiveAddPred()
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bDone = pDocSh->GetDocFunc().
+    sal_Bool bDone = pDocSh->GetDocFunc().
                     DetectiveAddPred( GetViewData()->GetCurPos() );
     if (!bDone)
         Sound::Beep();
@@ -64,7 +64,7 @@ void ScViewFunc::DetectiveAddPred()
 void ScViewFunc::DetectiveDelPred()
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bDone = pDocSh->GetDocFunc().
+    sal_Bool bDone = pDocSh->GetDocFunc().
                     DetectiveDelPred( GetViewData()->GetCurPos() );
     if (!bDone)
         Sound::Beep();
@@ -75,7 +75,7 @@ void ScViewFunc::DetectiveDelPred()
 void ScViewFunc::DetectiveAddSucc()
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bDone = pDocSh->GetDocFunc().
+    sal_Bool bDone = pDocSh->GetDocFunc().
                     DetectiveAddSucc( GetViewData()->GetCurPos() );
     if (!bDone)
         Sound::Beep();
@@ -86,7 +86,7 @@ void ScViewFunc::DetectiveAddSucc()
 void ScViewFunc::DetectiveDelSucc()
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bDone = pDocSh->GetDocFunc().
+    sal_Bool bDone = pDocSh->GetDocFunc().
                     DetectiveDelSucc( GetViewData()->GetCurPos() );
     if (!bDone)
         Sound::Beep();
@@ -97,7 +97,7 @@ void ScViewFunc::DetectiveDelSucc()
 void ScViewFunc::DetectiveAddError()
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bDone = pDocSh->GetDocFunc().
+    sal_Bool bDone = pDocSh->GetDocFunc().
                     DetectiveAddError( GetViewData()->GetCurPos() );
     if (!bDone)
         Sound::Beep();
@@ -108,7 +108,7 @@ void ScViewFunc::DetectiveAddError()
 void ScViewFunc::DetectiveDelAll()
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bDone = pDocSh->GetDocFunc().
+    sal_Bool bDone = pDocSh->GetDocFunc().
                     DetectiveDelAll( GetViewData()->GetTabNo() );
     if (!bDone)
         Sound::Beep();
@@ -119,7 +119,7 @@ void ScViewFunc::DetectiveDelAll()
 void ScViewFunc::DetectiveMarkInvalid()
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bDone = pDocSh->GetDocFunc().
+    sal_Bool bDone = pDocSh->GetDocFunc().
                     DetectiveMarkInvalid( GetViewData()->GetTabNo() );
     if (!bDone)
         Sound::Beep();
@@ -130,7 +130,7 @@ void ScViewFunc::DetectiveMarkInvalid()
 void ScViewFunc::DetectiveRefresh()
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bDone = pDocSh->GetDocFunc().DetectiveRefresh();
+    sal_Bool bDone = pDocSh->GetDocFunc().DetectiveRefresh();
     if (!bDone)
         Sound::Beep();
 
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index 2057448e4..24383a3dd 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -65,7 +65,7 @@ extern Point aDragStartDiff;
 
 // STATIC DATA -----------------------------------------------------------
 
-BOOL bPasteIsMove = FALSE;
+sal_Bool bPasteIsMove = sal_False;
 
 using namespace com::sun::star;
 
@@ -91,7 +91,7 @@ void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize )
 }
 
 void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
-        BOOL bGroup, BOOL bSameDocClipboard )
+        sal_Bool bGroup, sal_Bool bSameDocClipboard )
 {
     MakeDrawLayer();
     Point aPos( rLogicPos );
@@ -106,7 +106,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
         pRef->SetMapMode( MapMode(MAP_100TH_MM) );
     }
 
-    BOOL bNegativePage = GetViewData()->GetDocument()->IsNegativePage( GetViewData()->GetTabNo() );
+    sal_Bool bNegativePage = GetViewData()->GetDocument()->IsNegativePage( GetViewData()->GetTabNo() );
 
     SdrView* pDragEditView = NULL;
     ScModule* pScMod = SC_MOD();
@@ -132,7 +132,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
     if (bGroup)
         pScDrawView->BegUndo( ScGlobal::GetRscString( STR_UNDO_PASTE ) );
 
-    BOOL bSameDoc = ( pDragEditView && pDragEditView->GetModel() == pScDrawView->GetModel() );
+    sal_Bool bSameDoc = ( pDragEditView && pDragEditView->GetModel() == pScDrawView->GetModel() );
     if (bSameDoc)
     {
             // lokal kopieren - incl. Charts
@@ -148,7 +148,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
                 pDragEditView->GetSdrPageView()->GetPage() )
         {
             if ( nDiffX != 0 || nDiffY != 0 )
-                pDragEditView->MoveAllMarked(Size(nDiffX,nDiffY), FALSE);
+                pDragEditView->MoveAllMarked(Size(nDiffX,nDiffY), sal_False);
         }
         else
         {
@@ -165,8 +165,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
 
             SdrMarkList aMark = pDragEditView->GetMarkedObjectList();
             aMark.ForceSort();
-            ULONG nMarkAnz=aMark.GetMarkCount();
-            for (ULONG nm=0; nm<nMarkAnz; nm++) {
+            sal_uLong nMarkAnz=aMark.GetMarkCount();
+            for (sal_uLong nm=0; nm<nMarkAnz; nm++) {
                 const SdrMark* pM=aMark.GetMark(nm);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
 
@@ -209,7 +209,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
     }
     else
     {
-        bPasteIsMove = FALSE;		// kein internes Verschieben passiert
+        bPasteIsMove = sal_False;		// kein internes Verschieben passiert
 
         SdrView aView(pModel);      // #i71529# never create a base class of SdrView directly!
         SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0));
@@ -220,7 +220,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
         //	#41333# Markierung nicht aendern, wenn Ole-Objekt aktiv
         //	(bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!)
 
-        ULONG nOptions = 0;
+        sal_uLong nOptions = 0;
         SfxInPlaceClient* pClient = GetViewData()->GetViewShell()->GetIPClient();
         if ( pClient && pClient->IsObjectInPlaceActive() )
             nOptions |= SDRINSERT_DONTMARK;
@@ -237,12 +237,12 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
         // #89247# Set flag for ScDocument::UpdateChartListeners() which is
         // called during paste.
         if ( !bSameDocClipboard )
-            GetViewData()->GetDocument()->SetPastingDrawFromOtherDoc( TRUE );
+            GetViewData()->GetDocument()->SetPastingDrawFromOtherDoc( sal_True );
 
         pScDrawView->Paste( *pModel, aPos, NULL, nOptions );
 
         if ( !bSameDocClipboard )
-            GetViewData()->GetDocument()->SetPastingDrawFromOtherDoc( FALSE );
+            GetViewData()->GetDocument()->SetPastingDrawFromOtherDoc( sal_False );
 
         // #68991# Paste puts all objects on the active (front) layer
         // controls must be on SC_LAYER_CONTROLS
@@ -283,7 +283,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
     if (pRef)
         pRef->SetMapMode( aOldMapMode );
 
-    // GetViewData()->GetViewShell()->SetDrawShell( TRUE );
+    // GetViewData()->GetViewShell()->SetDrawShell( sal_True );
     // #99759# It is not sufficient to just set the DrawShell if we pasted, for
     // example, a chart.  SetDrawShellOrSub() would only work for D&D in the
     // same document but not if inserting from the clipboard, therefore
@@ -292,7 +292,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
 
 }
 
-BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::XEmbeddedObject >& xObj,
+sal_Bool ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::XEmbeddedObject >& xObj,
                                 const Size* pDescSize, const Graphic* pReplGraph, const ::rtl::OUString& aMediaType, sal_Int64 nAspect )
 {
     MakeDrawLayer();
@@ -368,28 +368,28 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X
 
         SdrPageView* pPV = pDrView->GetSdrPageView();
         pDrView->InsertObjectSafe( pSdrObj, *pPV );				// nicht markieren wenn Ole
-        GetViewData()->GetViewShell()->SetDrawShell( TRUE );
-        return TRUE;
+        GetViewData()->GetViewShell()->SetDrawShell( sal_True );
+        return sal_True;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
-BOOL ScViewFunc::PasteBitmap( const Point& rPos, const Bitmap& rBmp )
+sal_Bool ScViewFunc::PasteBitmap( const Point& rPos, const Bitmap& rBmp )
 {
     String aEmpty;
     Graphic aGraphic(rBmp);
     return PasteGraphic( rPos, aGraphic, aEmpty, aEmpty );
 }
 
-BOOL ScViewFunc::PasteMetaFile( const Point& rPos, const GDIMetaFile& rMtf )
+sal_Bool ScViewFunc::PasteMetaFile( const Point& rPos, const GDIMetaFile& rMtf )
 {
     String aEmpty;
     Graphic aGraphic(rMtf);
     return PasteGraphic( rPos, aGraphic, aEmpty, aEmpty );
 }
 
-BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
+sal_Bool ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
                                 const String& rFile, const String& rFilter )
 {
     MakeDrawLayer();
@@ -415,7 +415,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
     if ( GetViewData()->GetDocument()->IsNegativePage( GetViewData()->GetTabNo() ) )
         aPos.X() -= aSize.Width();
 
-    GetViewData()->GetViewShell()->SetDrawShell( TRUE );
+    GetViewData()->GetViewShell()->SetDrawShell( sal_True );
 
     Rectangle aRect(aPos, aSize);
     SdrGrafObj* pGrafObj = new SdrGrafObj(rGraphic, aRect);
@@ -437,12 +437,12 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
     if (rFile.Len())
         pGrafObj->SetGraphicLink( rFile, rFilter );
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& rGraphic )
+sal_Bool ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& rGraphic )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     SdrGrafObj* pNewGrafObj = NULL;
 
     ScDrawView* pScDrawView = GetScDrawView();
@@ -464,7 +464,7 @@ BOOL ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& rGrap
             pScDrawView->ReplaceObjectAtView(pPickObj, *pPV, pNewGrafObj);
             pScDrawView->EndUndo();
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else if (pPickObj->IsClosedObj() && !pPickObj->ISA(SdrOle2Obj))
         {
@@ -483,7 +483,7 @@ BOOL ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& rGrap
 
             pPickObj->SetMergedItemSetAndBroadcast(aSet);
 
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
     return bRet;
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 463377614..ac9207628 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -94,13 +94,13 @@
 
 ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) :
     ScTabView( pParent, rDocSh, pViewShell ),
-    bFormatValid( FALSE )
+    bFormatValid( sal_False )
 {
 }
 
 //UNUSED2008-05  ScViewFunc::ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ) :
 //UNUSED2008-05      ScTabView( pParent, rViewFunc, pViewShell ),
-//UNUSED2008-05      bFormatValid( FALSE )
+//UNUSED2008-05      bFormatValid( sal_False )
 //UNUSED2008-05  {
 //UNUSED2008-05  }
 
@@ -118,37 +118,37 @@ void ScViewFunc::StartFormatArea()
 
     //	start only with single cell (marked or cursor position)
     ScRange aMarkRange;
-    BOOL bOk = (GetViewData()->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE);
+    sal_Bool bOk = (GetViewData()->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE);
     if ( bOk && aMarkRange.aStart != aMarkRange.aEnd )
-        bOk = FALSE;
+        bOk = sal_False;
 
     if (bOk)
     {
-        bFormatValid = TRUE;
+        bFormatValid = sal_True;
         aFormatSource = aMarkRange.aStart;
         aFormatArea = ScRange( aFormatSource );
     }
     else
-        bFormatValid = FALSE;		// keinen alten Bereich behalten
+        bFormatValid = sal_False;		// keinen alten Bereich behalten
 }
 
-BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged )
+sal_Bool ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bAttrChanged )
 {
     //	ueberhaupt aktiviert?
     if ( !SC_MOD()->GetInputOptions().GetExtendFormat() )
-        return FALSE;
+        return sal_False;
 
     //	Test: Eingabe mit Zahlformat (bAttrChanged) immer als neue Attributierung behandeln
     //	(alte Area verwerfen). Wenn das nicht gewollt ist, den if-Teil weglassen:
     if ( bAttrChanged )
     {
         StartFormatArea();
-        return FALSE;
+        return sal_False;
     }
 
     //!	Abfrage, ob Zelle leer war ???
 
-    BOOL bFound = FALSE;
+    sal_Bool bFound = sal_False;
     ScRange aNewRange = aFormatArea;
     if ( bFormatValid && nTab == aFormatSource.Tab() )
     {
@@ -157,18 +157,18 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC
             //	innerhalb ?
             if ( nCol >= aFormatArea.aStart.Col() && nCol <= aFormatArea.aEnd.Col() )
             {
-                bFound = TRUE;			// Bereich nicht aendern
+                bFound = sal_True;			// Bereich nicht aendern
             }
             //	links ?
             if ( nCol+1 == aFormatArea.aStart.Col() )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 aNewRange.aStart.SetCol( nCol );
             }
             //	rechts ?
             if ( nCol == aFormatArea.aEnd.Col()+1 )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 aNewRange.aEnd.SetCol( nCol );
             }
         }
@@ -177,13 +177,13 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC
             //	oben ?
             if ( nRow+1 == aFormatArea.aStart.Row() )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 aNewRange.aStart.SetRow( nRow );
             }
             //	unten ?
             if ( nRow == aFormatArea.aEnd.Row()+1 )
             {
-                bFound = TRUE;
+                bFound = sal_True;
                 aNewRange.aEnd.SetRow( nRow );
             }
         }
@@ -193,7 +193,7 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC
         aFormatArea = aNewRange;	// erweitern
     else
     {
-        bFormatValid = FALSE;		// ausserhalb -> abbrechen
+        bFormatValid = sal_False;		// ausserhalb -> abbrechen
         if ( bAttrChanged )			// Wert mit Zahlformat eingegeben?
             StartFormatArea();		// dann ggf. neu starten
     }
@@ -202,12 +202,12 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC
 }
 
 void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
-                                    BOOL bAttrChanged, BOOL bAddUndo )
+                                    sal_Bool bAttrChanged, sal_Bool bAddUndo )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
     if (bAddUndo && !pDoc->IsUndoEnabled())
-        bAddUndo = FALSE;
+        bAddUndo = sal_False;
 
     const ScPatternAttr* pSource = pDoc->GetPattern(
                             aFormatSource.Col(), aFormatSource.Row(), nTab );
@@ -224,7 +224,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
         if ( pSrcStyle && pSrcStyle != pDocOld->GetStyleSheet() )
             pDoc->ApplyStyle( nCol, nRow, nTab, *pSrcStyle );
         pDoc->ApplyPattern( nCol, nRow, nTab, *pSource );
-        AdjustRowHeight( nRow, nRow, TRUE );				//! nicht doppelt ?
+        AdjustRowHeight( nRow, nRow, sal_True );				//! nicht doppelt ?
 
         if ( bAddUndo )
         {
@@ -233,7 +233,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
             pDocSh->GetUndoManager()->AddUndoAction(
                         new ScUndoCursorAttr( pDocSh, nCol, nRow, nTab,
                                               pOldPattern, pNewPattern, pSource,
-                                              TRUE ) );
+                                              sal_True ) );
 
             delete pOldPattern;		// wird im Undo kopiert (Pool)
         }
@@ -247,7 +247,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
 
 //		Hilfsroutinen
 
-USHORT ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula )
+sal_uInt16 ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, sal_Bool bFormula )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
@@ -266,14 +266,14 @@ USHORT ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula )
         aZoomX = aZoomY = Fraction( 1, 1 );
     }
 
-    USHORT nTwips = pDoc->GetOptimalColWidth( nCol, nTab, aProv.GetDevice(),
+    sal_uInt16 nTwips = pDoc->GetOptimalColWidth( nCol, nTab, aProv.GetDevice(),
                                 nPPTX, nPPTY, aZoomX, aZoomY, bFormula, &rMark );
     return nTwips;
 }
 
-BOOL ScViewFunc::SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ )
+sal_Bool ScViewFunc::SelectionEditable( sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ )
 {
-    BOOL bRet;
+    sal_Bool bRet;
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScMarkData& rMark = GetViewData()->GetMarkData();
     if (rMark.IsMarked() || rMark.IsMultiMarked())
@@ -293,50 +293,50 @@ BOOL ScViewFunc::SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ )
 #define LRU_MAX 10
 #endif
 
-BOOL lcl_FunctionKnown( USHORT nOpCode )
+sal_Bool lcl_FunctionKnown( sal_uInt16 nOpCode )
 {
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
     if ( pFuncList )
     {
-        ULONG nCount = pFuncList->GetCount();
-        for (ULONG i=0; i<nCount; i++)
+        sal_uLong nCount = pFuncList->GetCount();
+        for (sal_uLong i=0; i<nCount; i++)
             if ( pFuncList->GetFunction(i)->nFIndex == nOpCode )
-                return TRUE;
+                return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL lcl_AddFunction( ScAppOptions& rAppOpt, USHORT nOpCode )
+sal_Bool lcl_AddFunction( ScAppOptions& rAppOpt, sal_uInt16 nOpCode )
 {
-    USHORT nOldCount = rAppOpt.GetLRUFuncListCount();
-    USHORT* pOldList = rAppOpt.GetLRUFuncList();
-    USHORT nPos;
+    sal_uInt16 nOldCount = rAppOpt.GetLRUFuncListCount();
+    sal_uInt16* pOldList = rAppOpt.GetLRUFuncList();
+    sal_uInt16 nPos;
     for (nPos=0; nPos<nOldCount; nPos++)
         if (pOldList[nPos] == nOpCode)			// is the function already in the list?
         {
             if ( nPos == 0 )
-                return FALSE;					// already at the top -> no change
+                return sal_False;					// already at the top -> no change
 
             //	count doesn't change, so the original array is modified
 
-            for (USHORT nCopy=nPos; nCopy>0; nCopy--)
+            for (sal_uInt16 nCopy=nPos; nCopy>0; nCopy--)
                 pOldList[nCopy] = pOldList[nCopy-1];
             pOldList[0] = nOpCode;
 
-            return TRUE;						// list has changed
+            return sal_True;						// list has changed
         }
 
     if ( !lcl_FunctionKnown( nOpCode ) )
-        return FALSE;							// not in function list -> no change
+        return sal_False;							// not in function list -> no change
 
-    USHORT nNewCount = Min( (USHORT)(nOldCount + 1), (USHORT)LRU_MAX );
-    USHORT nNewList[LRU_MAX];
+    sal_uInt16 nNewCount = Min( (sal_uInt16)(nOldCount + 1), (sal_uInt16)LRU_MAX );
+    sal_uInt16 nNewList[LRU_MAX];
     nNewList[0] = nOpCode;
     for (nPos=1; nPos<nNewCount; nPos++)
         nNewList[nPos] = pOldList[nPos-1];
     rAppOpt.SetLRUFuncList( nNewList, nNewCount );
 
-    return TRUE;								// list has changed
+    return sal_True;								// list has changed
 }
 
 //		eigentliche Funktionen
@@ -344,7 +344,7 @@ BOOL lcl_AddFunction( ScAppOptions& rAppOpt, USHORT nOpCode )
 //	Eingabe - Undo OK
 
 void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
-                            BOOL bRecord, const EditTextObject* pData )
+                            sal_Bool bRecord, const EditTextObject* pData )
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScMarkData& rMark = GetViewData()->GetMarkData();
@@ -352,7 +352,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
     SCTAB nSelCount = rMark.GetSelectCount();
     SCTAB i;
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocShellModificator aModificator( *pDocSh );
@@ -360,20 +360,20 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
     ScEditableTester aTester( pDoc, nCol,nRow, nCol,nRow, rMark );
     if (aTester.IsEditable())
     {
-        BOOL bEditDeleted = FALSE;
-        BYTE nOldScript = 0;
+        sal_Bool bEditDeleted = sal_False;
+        sal_uInt8 nOldScript = 0;
 
         ScBaseCell** ppOldCells	= NULL;
-        BOOL* pHasFormat		= NULL;
-        ULONG* pOldFormats		= NULL;
+        sal_Bool* pHasFormat		= NULL;
+        sal_uLong* pOldFormats		= NULL;
         SCTAB* pTabs			= NULL;
         SCTAB nUndoPos = 0;
         EditTextObject* pUndoData = NULL;
         if ( bRecord )
         {
             ppOldCells		= new ScBaseCell*[nSelCount];
-            pHasFormat		= new BOOL[nSelCount];
-            pOldFormats		= new ULONG[nSelCount];
+            pHasFormat		= new sal_Bool[nSelCount];
+            pOldFormats		= new sal_uLong[nSelCount];
             pTabs			= new SCTAB[nSelCount];
             nUndoPos = 0;
 
@@ -387,13 +387,13 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
                     {
                         ppOldCells[nUndoPos] = pDocCell->CloneWithoutNote( *pDoc );
                         if ( pDocCell->GetCellType() == CELLTYPE_EDIT )
-                            bEditDeleted = TRUE;
+                            bEditDeleted = sal_True;
 
-                        BYTE nDocScript = pDoc->GetScriptType( nCol, nRow, i, pDocCell );
+                        sal_uInt8 nDocScript = pDoc->GetScriptType( nCol, nRow, i, pDocCell );
                         if ( nOldScript == 0 )
                             nOldScript = nDocScript;
                         else if ( nDocScript != nOldScript )
-                            bEditDeleted = TRUE;
+                            bEditDeleted = sal_True;
                     }
                     else
                     {
@@ -403,13 +403,13 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
                     const SfxPoolItem* pItem;
                     const ScPatternAttr* pPattern = pDoc->GetPattern(nCol, nRow, i);
                     if ( SFX_ITEM_SET == pPattern->GetItemSet().GetItemState(
-                                            ATTR_VALUE_FORMAT,FALSE,&pItem) )
+                                            ATTR_VALUE_FORMAT,sal_False,&pItem) )
                     {
-                        pHasFormat[nUndoPos] = TRUE;
+                        pHasFormat[nUndoPos] = sal_True;
                         pOldFormats[nUndoPos] = ((const SfxUInt32Item*)pItem)->GetValue();
                     }
                     else
-                        pHasFormat[nUndoPos] = FALSE;
+                        pHasFormat[nUndoPos] = sal_False;
 
                     ++nUndoPos;
                 }
@@ -457,7 +457,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
             }
         }
 
-        BOOL bNumFmtChanged = FALSE;
+        sal_Bool bNumFmtChanged = sal_False;
         if ( bFormula )
         {	// Formel, compile mit AutoCorrection
             for (i=0; i<nTabCount; i++)
@@ -467,27 +467,27 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
             ScCompiler aComp( pDoc, aPos);
             aComp.SetGrammar(pDoc->GetGrammar());
 //2do: AutoCorrection via CalcOptions abschaltbar machen
-            aComp.SetAutoCorrection( TRUE );
+            aComp.SetAutoCorrection( sal_True );
             if ( rString.GetChar(0) == '+' || rString.GetChar(0) == '-' )
             {
                 aComp.SetExtendedErrorDetection( true );
             }
             String aFormula( rString );
             ScTokenArray* pArr;
-            BOOL bAgain;
+            sal_Bool bAgain;
             do
             {
-                bAgain = FALSE;
-                BOOL bAddEqual = FALSE;
+                bAgain = sal_False;
+                sal_Bool bAddEqual = sal_False;
                 ScTokenArray* pArrFirst = pArr = aComp.CompileString( aFormula );
-                BOOL bCorrected = aComp.IsCorrected();
+                sal_Bool bCorrected = aComp.IsCorrected();
                 if ( bCorrected )
                 {	// probieren, mit erster Parser-Korrektur neu zu parsen
                     pArr = aComp.CompileString( aComp.GetCorrectedFormula() );
                 }
                 if ( !pArr->GetCodeError() )
                 {
-                    bAddEqual = TRUE;
+                    bAddEqual = sal_True;
                     aComp.CompileTokenArray();
                     bCorrected |= aComp.IsCorrected();
                 }
@@ -517,7 +517,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
                         aFormula = aCorrectedFormula;
                         if ( pArr != pArrFirst )
                             delete pArrFirst;
-                        bAgain = TRUE;
+                        bAgain = sal_True;
                     }
                     else
                     {
@@ -536,7 +536,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
             // Zellen RPN geloescht und der Fehler explizit gesetzt werden, da
             // via FormulaCell copy-ctor und Interpreter das, wenn moeglich,
             // wieder glattgebuegelt wird, zu intelligent.. z.B.: =1))
-            USHORT nError = pArr->GetCodeError();
+            sal_uInt16 nError = pArr->GetCodeError();
             if ( !nError )
             {
                 //	#68693# update list of recent functions with all functions that
@@ -544,12 +544,12 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
 
                 ScModule* pScMod = SC_MOD();
                 ScAppOptions aAppOpt = pScMod->GetAppOptions();
-                BOOL bOptChanged = FALSE;
+                sal_Bool bOptChanged = sal_False;
 
                 formula::FormulaToken** ppToken = pArr->GetArray();
-                USHORT nTokens = pArr->GetLen();
-                USHORT nLevel = 0;
-                for (USHORT nTP=0; nTP<nTokens; nTP++)
+                sal_uInt16 nTokens = pArr->GetLen();
+                sal_uInt16 nLevel = 0;
+                for (sal_uInt16 nTP=0; nTP<nTokens; nTP++)
                 {
                     formula::FormulaToken* pTok = ppToken[nTP];
                     OpCode eOp = pTok->GetOpCode();
@@ -558,8 +558,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
                     else if ( eOp == ocClose && nLevel )
                         --nLevel;
                     if ( nLevel == 0 && pTok->IsFunction() &&
-                            lcl_AddFunction( aAppOpt, sal::static_int_cast<USHORT>( eOp ) ) )
-                        bOptChanged = TRUE;
+                            lcl_AddFunction( aAppOpt, sal::static_int_cast<sal_uInt16>( eOp ) ) )
+                        bOptChanged = sal_True;
                 }
 
                 if ( bOptChanged )
@@ -571,14 +571,14 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
 
             ScFormulaCell aCell( pDoc, aPos, pArr,formula::FormulaGrammar::GRAM_DEFAULT, MM_NONE );
             delete pArr;
-            BOOL bAutoCalc = pDoc->GetAutoCalc();
+            sal_Bool bAutoCalc = pDoc->GetAutoCalc();
             SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
             for ( ; i<nTabCount; i++)
             {
                 if (rMark.GetTableSelect(i))
                 {
                     aPos.SetTab( i );
-                    ULONG nIndex = (ULONG) ((SfxUInt32Item*) pDoc->GetAttr(
+                    sal_uLong nIndex = (sal_uLong) ((SfxUInt32Item*) pDoc->GetAttr(
                         nCol, nRow, i, ATTR_VALUE_FORMAT ))->GetValue();
                     if ( pFormatter->GetType( nIndex ) == NUMBERFORMAT_TEXT ||
                          ( ( rString.GetChar(0) == '+' || rString.GetChar(0) == '-' ) && nError && rString.Equals( aFormula ) ) )
@@ -603,7 +603,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
                             pCell->GetCode()->DelRPN();
                             pCell->SetErrCode( nError );
                             if(pCell->GetCode()->IsHyperLink())
-                                pCell->GetCode()->SetHyperLink(FALSE);
+                                pCell->GetCode()->SetHyperLink(sal_False);
                         }
                         pDoc->PutCell( aPos, pCell );
                         if ( !bAutoCalc )
@@ -622,21 +622,21 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
             for (i=0; i<nTabCount; i++)
                 if (rMark.GetTableSelect(i))
                     if (pDoc->SetString( nCol, nRow, i, rString ))
-                        bNumFmtChanged = TRUE;
+                        bNumFmtChanged = sal_True;
         }
 
         //	row height must be changed if new text has a different script type
         for (i=0; i<nTabCount && !bEditDeleted; i++)
             if (rMark.GetTableSelect(i))
                 if ( pDoc->GetScriptType( nCol, nRow, i ) != nOldScript )
-                    bEditDeleted = TRUE;
+                    bEditDeleted = sal_True;
 
         HideAllCursors();
 
         if (bEditDeleted || pDoc->HasAttrib( nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_NEEDHEIGHT ))
             AdjustRowHeight(nRow,nRow);
 
-        BOOL bAutoFormat = TestFormatArea(nCol, nRow, nTab, bNumFmtChanged);
+        sal_Bool bAutoFormat = TestFormatArea(nCol, nRow, nTab, bNumFmtChanged);
         if (bAutoFormat)
             DoAutoAttributes(nCol, nRow, nTab, bNumFmtChanged, bRecord);
 
@@ -686,7 +686,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
     if ( pDoc && pDocSh )
     {
@@ -697,7 +697,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r
         {
             ScAddress aPos( nCol, nRow, nTab );
             ScBaseCell* pOldCell = pDoc->GetCell( aPos );
-            BOOL bNeedHeight = ( pOldCell && pOldCell->GetCellType() == CELLTYPE_EDIT )
+            sal_Bool bNeedHeight = ( pOldCell && pOldCell->GetCellType() == CELLTYPE_EDIT )
                                 || pDoc->HasAttrib(
                                     nCol,nRow,nTab, nCol,nRow,nTab, HASATTR_NEEDHEIGHT );
 
@@ -728,13 +728,13 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r
 }
 
 void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData,
-                            BOOL bRecord, BOOL bTestSimple )
+                            sal_Bool bRecord, sal_Bool bTestSimple )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScMarkData& rMark = GetViewData()->GetMarkData();
     ScDocument* pDoc = pDocSh->GetDocument();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScDocShellModificator aModificator( *pDocSh );
 
@@ -744,8 +744,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
         //
         // 		Test auf Attribute
         //
-        BOOL bSimple = FALSE;
-        BOOL bCommon = FALSE;
+        sal_Bool bSimple = sal_False;
+        sal_Bool bCommon = sal_False;
         ScPatternAttr* pCellAttrs = NULL;
         EditTextObject* pNewData = NULL;
         String aString;
@@ -765,9 +765,9 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
 
             if ( !bSimple && aEngine.GetParagraphCount() == 1 )
             {
-                String aParStr = aEngine.GetText( (USHORT) 0 );
+                String aParStr = aEngine.GetText( (sal_uInt16) 0 );
                 if ( aParStr.GetChar(0) == '=' )
-                    bSimple = TRUE;
+                    bSimple = sal_True;
             }
 
             if (bCommon)				// Attribute fuer Tabelle
@@ -915,7 +915,7 @@ void ScViewFunc::EnterMatrix( const String& rString )
             ScRange aResult( nCol, nRow, nTab,
                              sal::static_int_cast<SCCOL>(nCol+nSizeX-1),
                              sal::static_int_cast<SCROW>(nRow+nSizeY-1), nTab );
-            MarkRange( aResult, FALSE );
+            MarkRange( aResult, sal_False );
         }
     }
 
@@ -923,7 +923,7 @@ void ScViewFunc::EnterMatrix( const String& rString )
     if (pData->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = pData->GetDocShell();
-        BOOL bSuccess = pDocSh->GetDocFunc().EnterMatrix( aRange, &rMark, NULL, rString, FALSE, FALSE, EMPTY_STRING, formula::FormulaGrammar::GRAM_DEFAULT );
+        sal_Bool bSuccess = pDocSh->GetDocFunc().EnterMatrix( aRange, &rMark, NULL, rString, sal_False, sal_False, EMPTY_STRING, formula::FormulaGrammar::GRAM_DEFAULT );
         if (bSuccess)
             pDocSh->UpdateOle(GetViewData());
     }
@@ -931,9 +931,9 @@ void ScViewFunc::EnterMatrix( const String& rString )
         ErrorMessage(STR_NOMULTISELECT);
 }
 
-BYTE ScViewFunc::GetSelectionScriptType()
+sal_uInt8 ScViewFunc::GetSelectionScriptType()
 {
-    BYTE nScript = 0;
+    sal_uInt8 nScript = 0;
 
     ScDocument* pDoc = GetViewData()->GetDocument();
     const ScMarkData& rMark = GetViewData()->GetMarkData();
@@ -947,9 +947,9 @@ BYTE ScViewFunc::GetSelectionScriptType()
     else
     {
         ScRangeList aRanges;
-        rMark.FillRangeListWithMarks( &aRanges, FALSE );
-        ULONG nCount = aRanges.Count();
-        for (ULONG i=0; i<nCount; i++)
+        rMark.FillRangeListWithMarks( &aRanges, sal_False );
+        sal_uLong nCount = aRanges.Count();
+        for (sal_uLong i=0; i<nCount; i++)
         {
             ScRange aRange = *aRanges.GetObject(i);
             ScCellIterator aIter( pDoc, aRange );
@@ -1020,9 +1020,9 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem&		rLineOuter,
 
         rLineOuter = (const SvxBoxItem&)	(pAttrs->GetItem( ATTR_BORDER ));
         rLineInner = (const SvxBoxInfoItem&)(pAttrs->GetItem( ATTR_BORDER_INNER ));
-        rLineInner.SetTable(FALSE);
-        rLineInner.SetDist(TRUE);
-        rLineInner.SetMinDist(FALSE);
+        rLineInner.SetTable(sal_False);
+        rLineInner.SetDist(sal_True);
+        rLineInner.SetMinDist(sal_False);
     }
 }
 
@@ -1034,10 +1034,10 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem&		rLineOuter,
 
 void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
                                   const SfxItemSet* pOldSet,
-                                  BOOL				bRecord )
+                                  sal_Bool				bRecord )
 {
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -1097,17 +1097,17 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
      *
      */
 
-    BOOL bFrame =    (pDialogSet->GetItemState( ATTR_BORDER ) != SFX_ITEM_DEFAULT)
+    sal_Bool bFrame =    (pDialogSet->GetItemState( ATTR_BORDER ) != SFX_ITEM_DEFAULT)
                   || (pDialogSet->GetItemState( ATTR_BORDER_INNER ) != SFX_ITEM_DEFAULT);
 
     if ( pNewOuter==pOldOuter && pNewInner==pOldInner )
-        bFrame = FALSE;
+        bFrame = sal_False;
 
     //	das sollte doch der Pool abfangen: ?!??!??
 
     if ( bFrame && pNewOuter && pNewInner )
         if ( *pNewOuter == *pOldOuter && *pNewInner == *pOldInner )
-            bFrame = FALSE;
+            bFrame = sal_False;
 
     if ( pNewInner )
     {
@@ -1120,7 +1120,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
                     || pNewInner->IsValid(VALID_VERT) );
     }
     else
-        bFrame = FALSE;
+        bFrame = sal_False;
 
     if (!bFrame)
         ApplySelectionPattern( aNewAttrs, bRecord );				// nur normale
@@ -1129,8 +1129,8 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
         // wenn neue Items Default-Items sind, so muessen die
         // alten Items geputtet werden:
 
-        BOOL bDefNewOuter = ( SFX_ITEMS_STATICDEFAULT == pNewOuter->GetKind() );
-        BOOL bDefNewInner = ( SFX_ITEMS_STATICDEFAULT == pNewInner->GetKind() );
+        sal_Bool bDefNewOuter = ( SFX_ITEMS_STATICDEFAULT == pNewOuter->GetKind() );
+        sal_Bool bDefNewInner = ( SFX_ITEMS_STATICDEFAULT == pNewInner->GetKind() );
 
         ApplyPatternLines( aNewAttrs,
                            bDefNewOuter ? pOldOuter : pNewOuter,
@@ -1150,7 +1150,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
 void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem )
 {
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -1175,17 +1175,17 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem )
 //	Pattern und Rahmen
 
 void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter,
-                                    const SvxBoxInfoItem* pNewInner, BOOL bRecord )
+                                    const SvxBoxInfoItem* pNewInner, sal_Bool bRecord )
 {
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScMarkData aFuncMark( GetViewData()->GetMarkData() );       // local copy for UnmarkFiltered
     ScViewUtil::UnmarkFiltered( aFuncMark, pDoc );
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScRange aMarkRange;
     aFuncMark.MarkToSimple();
-    BOOL bMulti = aFuncMark.IsMultiMarked();
+    sal_Bool bMulti = aFuncMark.IsMultiMarked();
     if (bMulti)
         aFuncMark.GetMultiMarkArea( aMarkRange );
     else if (aFuncMark.IsMarked())
@@ -1227,7 +1227,7 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem
             pUndoDoc, bMulti, &rAttr, pNewOuter, pNewInner ) );
     }
 
-    USHORT nExt = SC_PF_TESTMERGE;
+    sal_uInt16 nExt = SC_PF_TESTMERGE;
     pDocSh->UpdatePaintExt( nExt, aMarkRange ); // content before the change
 
     pDoc->ApplySelectionFrame( aFuncMark, pNewOuter, pNewInner );
@@ -1248,7 +1248,7 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem
 //	nur Pattern
 
 void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
-                                            BOOL bRecord, BOOL bCursorOnly )
+                                            sal_Bool bRecord, sal_Bool bCursorOnly )
 {
     ScViewData* pViewData	= GetViewData();
     ScDocShell* pDocSh		= pViewData->GetDocShell();
@@ -1257,18 +1257,18 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
     ScViewUtil::UnmarkFiltered( aFuncMark, pDoc );
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     //	State from old ItemSet doesn't matter for paint flags, as any change will be
     //	from SFX_ITEM_SET in the new ItemSet (default is ignored in ApplyPattern).
     //	New alignment is checked (check in PostPaint isn't enough) in case a right
     //	alignment is changed to left.
     const SfxItemSet& rNewSet = rAttr.GetItemSet();
-    BOOL bSetLines = rNewSet.GetItemState( ATTR_BORDER, TRUE ) == SFX_ITEM_SET ||
-                     rNewSet.GetItemState( ATTR_SHADOW, TRUE ) == SFX_ITEM_SET;
-    BOOL bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY, TRUE ) == SFX_ITEM_SET;
+    sal_Bool bSetLines = rNewSet.GetItemState( ATTR_BORDER, sal_True ) == SFX_ITEM_SET ||
+                     rNewSet.GetItemState( ATTR_SHADOW, sal_True ) == SFX_ITEM_SET;
+    sal_Bool bSetAlign = rNewSet.GetItemState( ATTR_HOR_JUSTIFY, sal_True ) == SFX_ITEM_SET;
 
-    USHORT nExtFlags = 0;
+    sal_uInt16 nExtFlags = 0;
     if ( bSetLines )
         nExtFlags |= SC_PF_LINES;
     if ( bSetAlign )
@@ -1276,9 +1276,9 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
 
     ScDocShellModificator aModificator( *pDocSh );
 
-    BOOL bMulti = aFuncMark.IsMultiMarked();
+    sal_Bool bMulti = aFuncMark.IsMultiMarked();
     aFuncMark.MarkToMulti();
-    BOOL bOnlyTab = (!aFuncMark.IsMultiMarked() && !bCursorOnly && aFuncMark.GetSelectCount() > 1);
+    sal_Bool bOnlyTab = (!aFuncMark.IsMultiMarked() && !bCursorOnly && aFuncMark.GetSelectCount() > 1);
     if (bOnlyTab)
     {
         SCCOL nCol = pViewData->GetCurX();
@@ -1363,7 +1363,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
                         new ScUndoCursorAttr( pDocSh,
                                               nCol, nRow, nTab,
                                               pOldPat, pNewPat, &rAttr,
-                                              FALSE ) );	// FALSE = nicht automatisch
+                                              sal_False ) );	// sal_False = nicht automatisch
         }
         delete pOldPat;		// wird im Undo kopiert (Pool)
 
@@ -1381,10 +1381,10 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
         sal_Int32 nCount = 0;
         const SfxItemPropertyMap* pMap = ScCellObj::GetCellPropertyMap();
         PropertyEntryVector_t aPropVector = pMap->getPropertyEntries();
-        for ( USHORT nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; ++nWhich )
+        for ( sal_uInt16 nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; ++nWhich )
         {
             const SfxPoolItem* pItem = 0;
-            if ( rNewSet.GetItemState( nWhich, TRUE, &pItem ) == SFX_ITEM_SET && pItem )
+            if ( rNewSet.GetItemState( nWhich, sal_True, &pItem ) == SFX_ITEM_SET && pItem )
             {
                 PropertyEntryVector_t::const_iterator aIt = aPropVector.begin();
                 while ( aIt != aPropVector.end())
@@ -1412,7 +1412,7 @@ void ScViewFunc::ApplyUserItemSet( const SfxItemSet& rItemSet )
 {
     //	ItemSet from UI, may have different pool
 
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -1421,7 +1421,7 @@ void ScViewFunc::ApplyUserItemSet( const SfxItemSet& rItemSet )
 
     ScPatternAttr aNewAttrs( GetViewData()->GetDocument()->GetPool() );
     SfxItemSet& rNewSet = aNewAttrs.GetItemSet();
-    rNewSet.Put( rItemSet, FALSE );
+    rNewSet.Put( rItemSet, sal_False );
     ApplySelectionPattern( aNewAttrs );
 
     AdjustBlockHeight();
@@ -1447,10 +1447,10 @@ const SfxStyleSheet* ScViewFunc::GetStyleSheetFromMarked()
     return pSheet;
 }
 
-void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord )
+void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, sal_Bool bRecord )
 {
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -1467,7 +1467,7 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord
     ScViewUtil::UnmarkFiltered( aFuncMark, pDoc );
     SCTAB nTabCount		= pDoc->GetTableCount();
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScDocShellModificator aModificator( *pDocSh );
 
@@ -1489,7 +1489,7 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord
             ScRange aCopyRange = aMarkRange;
             aCopyRange.aStart.SetTab(0);
             aCopyRange.aEnd.SetTab(nTabCount-1);
-            pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pUndoDoc, &aFuncMark );
+            pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_True, pUndoDoc, &aFuncMark );
             aFuncMark.MarkToMulti();
 
             String aName = pStyleSheet->GetName();
@@ -1519,7 +1519,7 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord
                     pUndoDoc->AddUndoTab( i, i );
 
             ScRange aCopyRange( nCol, nRow, 0, nCol, nRow, nTabCount-1 );
-            pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, FALSE, pUndoDoc );
+            pDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, sal_False, pUndoDoc );
 
             ScRange aMarkRange ( nCol, nRow, nTab );
             ScMarkData aUndoMark = aFuncMark;
@@ -1558,7 +1558,7 @@ void ScViewFunc::RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet )
 
     VirtualDevice aVirtDev;
     aVirtDev.SetMapMode(MAP_PIXEL);
-    pDoc->StyleSheetChanged( pStyleSheet, TRUE, &aVirtDev,
+    pDoc->StyleSheetChanged( pStyleSheet, sal_True, &aVirtDev,
                                 pViewData->GetPPTX(),
                                 pViewData->GetPPTY(),
                                 pViewData->GetZoomX(),
@@ -1585,7 +1585,7 @@ void ScViewFunc::UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet )
 
     VirtualDevice aVirtDev;
     aVirtDev.SetMapMode(MAP_PIXEL);
-    pDoc->StyleSheetChanged( pStyleSheet, FALSE, &aVirtDev,
+    pDoc->StyleSheetChanged( pStyleSheet, sal_False, &aVirtDev,
                                 pViewData->GetPPTX(),
                                 pViewData->GetPPTY(),
                                 pViewData->GetZoomX(),
@@ -1601,14 +1601,14 @@ void ScViewFunc::UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet )
 
 //	Zellen einfuegen - Undo OK
 
-BOOL ScViewFunc::InsertCells( InsCellCmd eCmd, BOOL bRecord, BOOL bPartOfPaste )
+sal_Bool ScViewFunc::InsertCells( InsCellCmd eCmd, sal_Bool bRecord, sal_Bool bPartOfPaste )
 {
     ScRange aRange;
     if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
     {
         ScDocShell* pDocSh = GetViewData()->GetDocShell();
         const ScMarkData& rMark = GetViewData()->GetMarkData();
-        BOOL bSuccess = pDocSh->GetDocFunc().InsertCells( aRange, &rMark, eCmd, bRecord, FALSE, bPartOfPaste );
+        sal_Bool bSuccess = pDocSh->GetDocFunc().InsertCells( aRange, &rMark, eCmd, bRecord, sal_False, bPartOfPaste );
         if (bSuccess)
         {
             pDocSh->UpdateOle(GetViewData());
@@ -1634,13 +1634,13 @@ BOOL ScViewFunc::InsertCells( InsCellCmd eCmd, BOOL bRecord, BOOL bPartOfPaste )
     else
     {
         ErrorMessage(STR_NOMULTISELECT);
-        return FALSE;
+        return sal_False;
     }
 }
 
 //	Zellen loeschen - Undo OK
 
-void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord )
+void ScViewFunc::DeleteCells( DelCellCmd eCmd, sal_Bool bRecord )
 {
     ScRange aRange;
     if ( GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE )
@@ -1663,13 +1663,13 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord )
             }
             while ( nCount > 0 )
             {
-                pDocSh->GetDocFunc().DeleteCells( aDelRange, &rMark, eCmd, bRecord, FALSE );
+                pDocSh->GetDocFunc().DeleteCells( aDelRange, &rMark, eCmd, bRecord, sal_False );
                 --nCount;
             }
         }
         else
         {
-            pDocSh->GetDocFunc().DeleteCells( aRange, &rMark, eCmd, bRecord, FALSE );
+            pDocSh->GetDocFunc().DeleteCells( aRange, &rMark, eCmd, bRecord, sal_False );
         }
 
         pDocSh->UpdateOle(GetViewData());
@@ -1702,9 +1702,9 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord )
     else
     {
         if (eCmd == DEL_DELCOLS)
-            DeleteMulti( FALSE, bRecord );
+            DeleteMulti( sal_False, bRecord );
         else if (eCmd == DEL_DELROWS)
-            DeleteMulti( TRUE, bRecord );
+            DeleteMulti( sal_True, bRecord );
         else
             ErrorMessage(STR_NOMULTISELECT);
     }
@@ -1712,7 +1712,7 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord )
     Unmark();
 }
 
-void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
+void ScViewFunc::DeleteMulti( sal_Bool bRows, sal_Bool bRecord )
 {
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocShellModificator aModificator( *pDocSh );
@@ -1722,7 +1722,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
     ScViewUtil::UnmarkFiltered( aFuncMark, pDoc );
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
     SCCOLROW* pRanges = new SCCOLROW[MAXCOLROWCOUNT];
     SCCOLROW nRangeCnt = bRows ? aFuncMark.GetMarkRowRanges( pRanges ) :
                                 aFuncMark.GetMarkColumnRanges( pRanges );
@@ -1735,8 +1735,8 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
     //	Test ob erlaubt
 
     SCCOLROW* pOneRange = pRanges;
-    USHORT nErrorId = 0;
-    BOOL bNeedRefresh = FALSE;
+    sal_uInt16 nErrorId = 0;
+    sal_Bool bNeedRefresh = sal_False;
     SCCOLROW nRangeNo;
     for (nRangeNo=0; nRangeNo<nRangeCnt && !nErrorId; nRangeNo++)
     {
@@ -1788,7 +1788,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
         {
             // detect if the start of a merged cell is deleted, so the merge flags can be refreshed
 
-            bNeedRefresh = TRUE;
+            bNeedRefresh = sal_True;
         }
     }
 
@@ -1816,17 +1816,17 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
             SCCOLROW nStart = *(pOneRange++);
             SCCOLROW nEnd = *(pOneRange++);
             if (bRows)
-                pDoc->CopyToDocument( 0,nStart,nTab, MAXCOL,nEnd,nTab, IDF_ALL,FALSE,pUndoDoc );
+                pDoc->CopyToDocument( 0,nStart,nTab, MAXCOL,nEnd,nTab, IDF_ALL,sal_False,pUndoDoc );
             else
                 pDoc->CopyToDocument( static_cast<SCCOL>(nStart),0,nTab,
                         static_cast<SCCOL>(nEnd),MAXROW,nTab,
-                        IDF_ALL,FALSE,pUndoDoc );
+                        IDF_ALL,sal_False,pUndoDoc );
         }
 
                 //	alle Formeln wegen Referenzen
         SCTAB nTabCount = pDoc->GetTableCount();
-        pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE );
-        pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA,FALSE,pUndoDoc );
+        pUndoDoc->AddUndoTab( 0, nTabCount-1, sal_False, sal_False );
+        pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA,sal_False,pUndoDoc );
 
         pUndoData = new ScRefUndoData( pDoc );
 
@@ -1854,7 +1854,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
         SCROW nEndRow = MAXROW;
 
         pDoc->RemoveFlagsTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, SC_MF_HOR | SC_MF_VER );
-        pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab, TRUE );
+        pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab, sal_True );
     }
 
     if (bRecord)
@@ -1892,11 +1892,11 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
 
 //	Inhalte loeschen
 
-void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
+void ScViewFunc::DeleteContents( sal_uInt16 nFlags, sal_Bool bRecord )
 {
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
-    BOOL bEditable = SelectionEditable( &bOnlyNotBecauseOfMatrix );
+    sal_Bool bOnlyNotBecauseOfMatrix;
+    sal_Bool bEditable = SelectionEditable( &bOnlyNotBecauseOfMatrix );
     if ( !bEditable )
     {
         if ( !(bOnlyNotBecauseOfMatrix &&
@@ -1908,7 +1908,7 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
     }
 
     ScRange aMarkRange;
-    BOOL bSimple = FALSE;
+    sal_Bool bSimple = sal_False;
 
     ScDocument* pDoc = GetViewData()->GetDocument();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
@@ -1916,7 +1916,7 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
     ScViewUtil::UnmarkFiltered( aFuncMark, pDoc );
 
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScDocShellModificator aModificator( *pDocSh );
 
@@ -1932,16 +1932,16 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
             aFuncMark.SetMarkArea( aMarkRange );
         }
         else
-            bSimple = TRUE;
+            bSimple = sal_True;
     }
 
-    aFuncMark.SetMarking(FALSE);		// for MarkToMulti
+    aFuncMark.SetMarking(sal_False);		// for MarkToMulti
     aFuncMark.MarkToSimple();			// before bMulti test below
 
     DBG_ASSERT( aFuncMark.IsMarked() || aFuncMark.IsMultiMarked() || bSimple, "delete what?" );
 
     ScDocument* pUndoDoc = NULL;
-    BOOL bMulti = !bSimple && aFuncMark.IsMultiMarked();
+    sal_Bool bMulti = !bSimple && aFuncMark.IsMultiMarked();
     if (!bSimple)
     {
         aFuncMark.MarkToMulti();
@@ -1950,22 +1950,22 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
     ScRange aExtendedRange(aMarkRange);
     if (!bSimple)
     {
-        if ( pDoc->ExtendMerge( aExtendedRange, TRUE ) )
-            bMulti = FALSE;
+        if ( pDoc->ExtendMerge( aExtendedRange, sal_True ) )
+            bMulti = sal_False;
     }
 
     // keine Objekte auf geschuetzten Tabellen
-    BOOL bObjects = FALSE;
+    sal_Bool bObjects = sal_False;
     if ( nFlags & IDF_OBJECTS )
     {
-        bObjects = TRUE;
+        bObjects = sal_True;
         SCTAB nTabCount = pDoc->GetTableCount();
         for (SCTAB nTab=0; nTab<nTabCount; nTab++)
             if (aFuncMark.GetTableSelect(nTab) && pDoc->IsTabProtected(nTab))
-                bObjects = FALSE;
+                bObjects = sal_False;
     }
 
-    USHORT nExtFlags = 0;		// extra flags are needed only if attributes are deleted
+    sal_uInt16 nExtFlags = 0;		// extra flags are needed only if attributes are deleted
     if ( nFlags & IDF_ATTRIB )
         pDocSh->UpdatePaintExt( nExtFlags, aMarkRange );
 
@@ -1976,7 +1976,7 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
     //	4) Inhalte loeschen
     //	5) Undo-Aktion anlegen
 
-    BOOL bDrawUndo = bObjects || ( nFlags & IDF_NOTE );     // needed for shown notes
+    sal_Bool bDrawUndo = bObjects || ( nFlags & IDF_NOTE );     // needed for shown notes
     if ( bDrawUndo && bRecord )
         pDoc->BeginDrawUndo();
 
@@ -2005,7 +2005,7 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
 
         //	bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument
         //	nur mit IDF_HARDATTR zu langsam ist:
-        USHORT nUndoDocFlags = nFlags;
+        sal_uInt16 nUndoDocFlags = nFlags;
         if (nFlags & IDF_ATTRIB)
             nUndoDocFlags |= IDF_ATTRIB;
         if (nFlags & IDF_EDITATTR)			// Edit-Engine-Attribute
@@ -2051,7 +2051,7 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
         }
         else
         {
-            aFuncMark.FillRangeListWithMarks( &aChangeRanges, FALSE );
+            aFuncMark.FillRangeListWithMarks( &aChangeRanges, sal_False );
         }
         pModelObj->NotifyChanges( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "cell-change" ) ), aChangeRanges );
     }
@@ -2071,9 +2071,9 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
 
 //	Spaltenbreiten/Zeilenhoehen (ueber Header) - Undo OK
 
-void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
-                                    ScSizeMode eMode, USHORT nSizeTwips,
-                                    BOOL bRecord, BOOL bPaint, ScMarkData* pMarkData )
+void ScViewFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
+                                    ScSizeMode eMode, sal_uInt16 nSizeTwips,
+                                    sal_Bool bRecord, sal_Bool bPaint, ScMarkData* pMarkData )
 {
     if (nRangeCnt == 0)
         return;
@@ -2089,17 +2089,17 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
     SCTAB nCurTab = GetViewData()->GetTabNo();
     SCTAB nTab;
     if (bRecord && !pDoc->IsUndoEnabled())
-        bRecord = FALSE;
+        bRecord = sal_False;
 
     ScDocShellModificator aModificator( *pDocSh );
 
-    BOOL bAllowed = TRUE;
+    sal_Bool bAllowed = sal_True;
     for (nTab=0; nTab<nTabCount && bAllowed; nTab++)
         if (pMarkData->GetTableSelect(nTab))
         {
             for ( SCCOLROW i=0; i<nRangeCnt && bAllowed; i++ )
             {
-                BOOL bOnlyMatrix;
+                sal_Bool bOnlyMatrix;
                 if (bWidth)
                     bAllowed = pDoc->IsBlockEditable( nTab,
                             static_cast<SCCOL>(pRanges[2*i]),0,
@@ -2120,7 +2120,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
     SCCOLROW nStart = pRanges[0];
     SCCOLROW nEnd = pRanges[2*nRangeCnt-1];
 
-    BOOL bFormula = FALSE;
+    sal_Bool bFormula = sal_False;
     if ( eMode == SC_SIZE_OPTIMAL )
     {
         const ScViewOptions& rOpts = GetViewData()->GetOptions();
@@ -2142,20 +2142,20 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                 if (bWidth)
                 {
                     if ( nTab == nFirstTab )
-                        pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, FALSE );
+                        pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_True, sal_False );
                     else
-                        pUndoDoc->AddUndoTab( nTab, nTab, TRUE, FALSE );
+                        pUndoDoc->AddUndoTab( nTab, nTab, sal_True, sal_False );
                     pDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
                             static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE,
-                            FALSE, pUndoDoc );
+                            sal_False, pUndoDoc );
                 }
                 else
                 {
                     if ( nTab == nFirstTab )
-                        pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
+                        pUndoDoc->InitUndo( pDoc, nTab, nTab, sal_False, sal_True );
                     else
-                        pUndoDoc->AddUndoTab( nTab, nTab, FALSE, TRUE );
-                    pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pUndoDoc );
+                        pUndoDoc->AddUndoTab( nTab, nTab, sal_False, sal_True );
+                    pDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, sal_False, pUndoDoc );
                 }
             }
 
@@ -2171,8 +2171,8 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
     if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT )
         pMarkData->MarkToMulti();
 
-    BOOL bShow = nSizeTwips > 0 || eMode != SC_SIZE_DIRECT;
-    BOOL bOutline = FALSE;
+    sal_Bool bShow = nSizeTwips > 0 || eMode != SC_SIZE_DIRECT;
+    sal_Bool bOutline = sal_False;
 
     for (nTab=0; nTab<nTabCount; nTab++)
         if (pMarkData->GetTableSelect(nTab))
@@ -2190,7 +2190,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                 {
                     if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT )
                     {
-                        BOOL bAll = ( eMode==SC_SIZE_OPTIMAL );
+                        sal_Bool bAll = ( eMode==SC_SIZE_OPTIMAL );
                         if (!bAll)
                         {
                             //	fuer alle eingeblendeten CR_MANUALSIZE loeschen,
@@ -2204,7 +2204,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                                     continue;
                                 }
 
-                                BYTE nOld = pDoc->GetRowFlags(nRow, nTab);
+                                sal_uInt8 nOld = pDoc->GetRowFlags(nRow, nTab);
                                 if (nOld & CR_MANUALSIZE)
                                     pDoc->SetRowFlags(nRow, nTab, nOld & ~CR_MANUALSIZE);
                             }
@@ -2226,9 +2226,9 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                         pDoc->SetOptimalHeight( nStartNo, nEndNo, nTab, nSizeTwips, aProv.GetDevice(),
                                                     nPPTX, nPPTY, aZoomX, aZoomY, bAll );
                         if (bAll)
-                            pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE );
+                            pDoc->ShowRows( nStartNo, nEndNo, nTab, sal_True );
 
-                        //	Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt
+                        //	Manual-Flag wird bei bAll=sal_True schon in SetOptimalHeight gesetzt
                         //	(an bei Extra-Height, sonst aus).
                     }
                     else if ( eMode==SC_SIZE_DIRECT )
@@ -2236,13 +2236,13 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                         if (nSizeTwips)
                         {
                             pDoc->SetRowHeightRange( nStartNo, nEndNo, nTab, nSizeTwips );
-                            pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE );			// height was set manually
+                            pDoc->SetManualHeight( nStartNo, nEndNo, nTab, sal_True );			// height was set manually
                         }
                         pDoc->ShowRows( nStartNo, nEndNo, nTab, nSizeTwips != 0 );
                     }
                     else if ( eMode==SC_SIZE_SHOW )
                     {
-                        pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE );
+                        pDoc->ShowRows( nStartNo, nEndNo, nTab, sal_True );
                     }
                 }
                 else								// Spaltenbreiten
@@ -2251,7 +2251,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                     {
                         if ( eMode != SC_SIZE_VISOPT || !pDoc->ColHidden(nCol, nTab) )
                         {
-                            USHORT nThisSize = nSizeTwips;
+                            sal_uInt16 nThisSize = nSizeTwips;
 
                             if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT )
                                 nThisSize = nSizeTwips + GetOptimalColWidth( nCol, nTab, bFormula );
@@ -2269,12 +2269,12 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
                 {
                     if ( pDoc->UpdateOutlineCol( static_cast<SCCOL>(nStartNo),
                                 static_cast<SCCOL>(nEndNo), nTab, bShow ) )
-                        bOutline = TRUE;
+                        bOutline = sal_True;
                 }
                 else
                 {
                     if ( pDoc->UpdateOutlineRow( nStartNo, nEndNo, nTab, bShow ) )
-                        bOutline = TRUE;
+                        bOutline = sal_True;
                 }
             }
             pDoc->DecSizeRecalcLevel( nTab );		// nicht fuer jede Spalte einzeln
@@ -2363,8 +2363,8 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
 
 //	Spaltenbreiten/Zeilenhoehen (ueber Blockmarken)
 
-void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips,
-                                        BOOL bRecord, BOOL bPaint )
+void ScViewFunc::SetMarkedWidthOrHeight( sal_Bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips,
+                                        sal_Bool bRecord, sal_Bool bPaint )
 {
     ScMarkData& rMark = GetViewData()->GetMarkData();
 
@@ -2376,7 +2376,7 @@ void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT n
         SCTAB nTab = GetViewData()->GetTabNo();
         DoneBlockMode();
         InitOwnBlockMode();
-        rMark.SetMultiMarkArea( ScRange( nCol,nRow,nTab ), TRUE );
+        rMark.SetMultiMarkArea( ScRange( nCol,nRow,nTab ), sal_True );
         MarkDataChanged();
     }
 
@@ -2394,22 +2394,22 @@ void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT n
     rMark.MarkToSimple();
 }
 
-void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
+void ScViewFunc::ModifyCellSize( ScDirection eDir, sal_Bool bOptimal )
 {
     //!	Schrittweiten einstellbar
     //	Schrittweite ist auch Minimum
-    USHORT nStepX = STD_COL_WIDTH / 5;
-    USHORT nStepY = ScGlobal::nStdRowHeight;
+    sal_uInt16 nStepX = STD_COL_WIDTH / 5;
+    sal_uInt16 nStepY = ScGlobal::nStdRowHeight;
 
     ScModule* pScMod = SC_MOD();
-    BOOL bAnyEdit = pScMod->IsInputMode();
+    sal_Bool bAnyEdit = pScMod->IsInputMode();
     SCCOL nCol = GetViewData()->GetCurX();
     SCROW nRow = GetViewData()->GetCurY();
     SCTAB nTab = GetViewData()->GetTabNo();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
 
-    BOOL bAllowed, bOnlyMatrix;
+    sal_Bool bAllowed, bOnlyMatrix;
     if ( eDir == DIR_LEFT || eDir == DIR_RIGHT )
         bAllowed = pDoc->IsBlockEditable( nTab, nCol,0, nCol,MAXROW, &bOnlyMatrix );
     else
@@ -2422,8 +2422,8 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
 
     HideAllCursors();
 
-    USHORT nWidth = pDoc->GetColWidth( nCol, nTab );
-    USHORT nHeight = pDoc->GetRowHeight( nRow, nTab );
+    sal_uInt16 nWidth = pDoc->GetColWidth( nCol, nTab );
+    sal_uInt16 nHeight = pDoc->GetRowHeight( nRow, nTab );
     SCCOLROW nRange[2];
     if ( eDir == DIR_LEFT || eDir == DIR_RIGHT )
     {
@@ -2440,13 +2440,13 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
                     const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab );
                     const SvxMarginItem& rMItem =
                             (const SvxMarginItem&)pPattern->GetItem(ATTR_MARGIN);
-                    USHORT nMargin = rMItem.GetLeftMargin() + rMItem.GetRightMargin();
+                    sal_uInt16 nMargin = rMItem.GetLeftMargin() + rMItem.GetRightMargin();
                     if ( ((const SvxHorJustifyItem&) pPattern->
                             GetItem( ATTR_HOR_JUSTIFY )).GetValue() == SVX_HOR_JUSTIFY_LEFT )
-                        nMargin = sal::static_int_cast<USHORT>(
+                        nMargin = sal::static_int_cast<sal_uInt16>(
                             nMargin + ((const SfxUInt16Item&)pPattern->GetItem(ATTR_INDENT)).GetValue() );
 
-                    nWidth = (USHORT)(nEdit * pDocSh->GetOutputFactor() / HMM_PER_TWIPS)
+                    nWidth = (sal_uInt16)(nEdit * pDocSh->GetOutputFactor() / HMM_PER_TWIPS)
                                 + nMargin + STD_EXTRA_WIDTH;
                 }
             }
@@ -2466,8 +2466,8 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
                 }
 
                 long nPixel = pDoc->GetNeededSize( nCol, nRow, nTab, aProv.GetDevice(),
-                                            nPPTX, nPPTY, aZoomX, aZoomY, TRUE );
-                USHORT nTwips = (USHORT)( nPixel / nPPTX );
+                                            nPPTX, nPPTY, aZoomX, aZoomY, sal_True );
+                sal_uInt16 nTwips = (sal_uInt16)( nPixel / nPPTX );
                 if (nTwips != 0)
                     nWidth = nTwips + STD_EXTRA_WIDTH;
                 else
@@ -2477,21 +2477,21 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
         else						// vergroessern / verkleinern
         {
             if ( eDir == DIR_RIGHT )
-                nWidth = sal::static_int_cast<USHORT>( nWidth + nStepX );
+                nWidth = sal::static_int_cast<sal_uInt16>( nWidth + nStepX );
             else if ( nWidth > nStepX )
-                nWidth = sal::static_int_cast<USHORT>( nWidth - nStepX );
+                nWidth = sal::static_int_cast<sal_uInt16>( nWidth - nStepX );
             if ( nWidth < nStepX ) nWidth = nStepX;
             if ( nWidth > MAX_COL_WIDTH ) nWidth = MAX_COL_WIDTH;
         }
         nRange[0] = nRange[1] = nCol;
-        SetWidthOrHeight( TRUE, 1, nRange, SC_SIZE_DIRECT, nWidth );
+        SetWidthOrHeight( sal_True, 1, nRange, SC_SIZE_DIRECT, nWidth );
 
         //	hier bei Breite auch Hoehe anpassen (nur die eine Zeile)
 
         if (!bAnyEdit)
         {
             const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab );
-            BOOL bNeedHeight =
+            sal_Bool bNeedHeight =
                     ((const SfxBoolItem&)pPattern->GetItem( ATTR_LINEBREAK )).GetValue() ||
                     ((const SvxHorJustifyItem&)pPattern->
                         GetItem( ATTR_HOR_JUSTIFY )).GetValue() == SVX_HOR_JUSTIFY_BLOCK;
@@ -2511,15 +2511,15 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
         {
             eMode = SC_SIZE_DIRECT;
             if ( eDir == DIR_BOTTOM )
-                nHeight = sal::static_int_cast<USHORT>( nHeight + nStepY );
+                nHeight = sal::static_int_cast<sal_uInt16>( nHeight + nStepY );
             else if ( nHeight > nStepY )
-                nHeight = sal::static_int_cast<USHORT>( nHeight - nStepY );
+                nHeight = sal::static_int_cast<sal_uInt16>( nHeight - nStepY );
             if ( nHeight < nStepY ) nHeight = nStepY;
             if ( nHeight > MAX_COL_HEIGHT ) nHeight = MAX_COL_HEIGHT;
             //!	MAX_COL_HEIGHT umbenennen in MAX_ROW_HEIGHT in global.hxx !!!!!!
         }
         nRange[0] = nRange[1] = nRow;
-        SetWidthOrHeight( FALSE, 1, nRange, eMode, nHeight );
+        SetWidthOrHeight( sal_False, 1, nRange, eMode, nHeight );
     }
 
     if ( bAnyEdit )
@@ -2572,10 +2572,10 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword )
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
     ScDocFunc aFunc(*pDocSh);
-    BOOL bUndo(pDoc->IsUndoEnabled());
+    sal_Bool bUndo(pDoc->IsUndoEnabled());
 
     if ( nTab == TABLEID_DOC || rMark.GetSelectCount() <= 1 )
-        aFunc.Protect( nTab, rPassword, FALSE );
+        aFunc.Protect( nTab, rPassword, sal_False );
     else
     {
         //	modifying several tables is handled here
@@ -2589,7 +2589,7 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword )
         SCTAB nCount = pDocSh->GetDocument()->GetTableCount();
         for ( SCTAB i=0; i<nCount; i++ )
             if ( rMark.GetTableSelect(i) )
-                aFunc.Protect( i, rPassword, FALSE );
+                aFunc.Protect( i, rPassword, sal_False );
 
         if (bUndo)
             pDocSh->GetUndoManager()->LeaveListAction();
@@ -2598,17 +2598,17 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword )
     UpdateLayerLocks();			//!	broadcast to all views
 }
 
-BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword )
+sal_Bool ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword )
 {
     ScMarkData& rMark = GetViewData()->GetMarkData();
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
     ScDocFunc aFunc(*pDocSh);
-    BOOL bChanged = FALSE;
-    BOOL bUndo (pDoc->IsUndoEnabled());
+    sal_Bool bChanged = sal_False;
+    sal_Bool bUndo (pDoc->IsUndoEnabled());
 
     if ( nTab == TABLEID_DOC || rMark.GetSelectCount() <= 1 )
-        bChanged = aFunc.Unprotect( nTab, rPassword, FALSE );
+        bChanged = aFunc.Unprotect( nTab, rPassword, sal_False );
     else
     {
         //	modifying several tables is handled here
@@ -2622,8 +2622,8 @@ BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword )
         SCTAB nCount = pDocSh->GetDocument()->GetTableCount();
         for ( SCTAB i=0; i<nCount; i++ )
             if ( rMark.GetTableSelect(i) )
-                if ( aFunc.Unprotect( i, rPassword, FALSE ) )
-                    bChanged = TRUE;
+                if ( aFunc.Unprotect( i, rPassword, sal_False ) )
+                    bChanged = sal_True;
 
         if (bUndo)
             pDocSh->GetUndoManager()->LeaveListAction();
@@ -2637,18 +2637,18 @@ BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword )
 
 void ScViewFunc::SetNoteText( const ScAddress& rPos, const String& rNoteText )
 {
-    GetViewData()->GetDocShell()->GetDocFunc().SetNoteText( rPos, rNoteText, FALSE );
+    GetViewData()->GetDocShell()->GetDocFunc().SetNoteText( rPos, rNoteText, sal_False );
 }
 
 void ScViewFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate )
 {
-    GetViewData()->GetDocShell()->GetDocFunc().ReplaceNote( rPos, rNoteText, pAuthor, pDate, FALSE );
+    GetViewData()->GetDocShell()->GetDocFunc().ReplaceNote( rPos, rNoteText, pAuthor, pDate, sal_False );
 }
 
-void ScViewFunc::SetNumberFormat( short nFormatType, ULONG nAdd )
+void ScViewFunc::SetNumberFormat( short nFormatType, sal_uLong nAdd )
 {
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -2678,13 +2678,13 @@ void ScViewFunc::SetNumberFormat( short nFormatType, ULONG nAdd )
     SfxItemSet& rSet = aNewAttrs.GetItemSet();
     rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumberFormat ) );
     //	ATTR_LANGUAGE_FORMAT nicht
-    ApplySelectionPattern( aNewAttrs, TRUE );
+    ApplySelectionPattern( aNewAttrs, sal_True );
 }
 
 void ScViewFunc::SetNumFmtByStr( const String& rCode )
 {
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -2705,7 +2705,7 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode )
 
     //	Index fuer String bestimmen
 
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     sal_uInt32 nNumberFormat = pFormatter->GetEntryKey( rCode, eLanguage );
     if ( nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
     {
@@ -2723,16 +2723,16 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode )
         SfxItemSet& rSet = aNewAttrs.GetItemSet();
         rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumberFormat ) );
         rSet.Put( SvxLanguageItem( eLanguage, ATTR_LANGUAGE_FORMAT ) );
-        ApplySelectionPattern( aNewAttrs, TRUE );
+        ApplySelectionPattern( aNewAttrs, sal_True );
     }
 
     //!	sonst Fehler zuerueckgeben / Meldung ausgeben ???
 }
 
-void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
+void ScViewFunc::ChangeNumFmtDecimals( sal_Bool bIncrement )
 {
     // nur wegen Matrix nicht editierbar? Attribute trotzdem ok
-    BOOL bOnlyNotBecauseOfMatrix;
+    sal_Bool bOnlyNotBecauseOfMatrix;
     if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
     {
         ErrorMessage(STR_PROTECTIONERR);
@@ -2758,11 +2758,11 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
     //	was haben wir denn da?
 
     sal_uInt32 nNewFormat = nOldFormat;
-    BOOL bError = FALSE;
+    sal_Bool bError = sal_False;
 
     LanguageType eLanguage = pOldEntry->GetLanguage();
-    BOOL bThousand, bNegRed;
-    USHORT nPrecision, nLeading;
+    sal_Bool bThousand, bNegRed;
+    sal_uInt16 nPrecision, nLeading;
     pOldEntry->GetFormatSpecialInfo( bThousand, bNegRed, nPrecision, nLeading );
 
     short nOldType = pOldEntry->GetType();
@@ -2771,11 +2771,11 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
     {
         //	Datum, Zeit, Bruch, logisch, Text kann nicht angepasst werden
         //!	bei Wisssenschaftlich kann es der Numberformatter auch nicht
-        bError = TRUE;
+        bError = sal_True;
     }
 
     //!	Das SvNumberformat hat einen Member bStandard, verraet ihn aber nicht
-    BOOL bWasStandard = ( nOldFormat == pFormatter->GetStandardIndex( eLanguage ) );
+    sal_Bool bWasStandard = ( nOldFormat == pFormatter->GetStandardIndex( eLanguage ) );
     if (bWasStandard)
     {
         //	bei "Standard" die Nachkommastellen abhaengig vom Zellinhalt
@@ -2790,7 +2790,7 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
         nPrecision = 0;
         // 'E' fuer Exponential ist fest im Numberformatter
         if ( aOut.Search('E') != STRING_NOTFOUND )
-            bError = TRUE;								// Exponential nicht veraendern
+            bError = sal_True;								// Exponential nicht veraendern
         else
         {
             String aDecSep( pFormatter->GetFormatDecimalSep( nOldFormat ) );
@@ -2808,14 +2808,14 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
             if (nPrecision<20)
                 ++nPrecision;			// erhoehen
             else
-                bError = TRUE;			// 20 ist Maximum
+                bError = sal_True;			// 20 ist Maximum
         }
         else
         {
             if (nPrecision)
                 --nPrecision;			// vermindern
             else
-                bError = TRUE;			// weniger als 0 geht nicht
+                bError = sal_True;			// weniger als 0 geht nicht
         }
     }
 
@@ -2830,11 +2830,11 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
         {
             xub_StrLen nErrPos = 0;
             short nNewType = 0;
-            BOOL bOk = pFormatter->PutEntry( aNewPicture, nErrPos,
+            sal_Bool bOk = pFormatter->PutEntry( aNewPicture, nErrPos,
                                                 nNewType, nNewFormat, eLanguage );
             DBG_ASSERT( bOk, "falsches Zahlformat generiert" );
             if (!bOk)
-                bError = TRUE;
+                bError = sal_True;
         }
     }
 
@@ -2844,13 +2844,13 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
         SfxItemSet& rSet = aNewAttrs.GetItemSet();
         rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) );
         //	ATTR_LANGUAGE_FORMAT nicht
-        ApplySelectionPattern( aNewAttrs, TRUE );
+        ApplySelectionPattern( aNewAttrs, sal_True );
     }
     else
         Sound::Beep();				// war nix
 }
 
-void ScViewFunc::ChangeIndent( BOOL bIncrement )
+void ScViewFunc::ChangeIndent( sal_Bool bIncrement )
 {
     ScViewData* pViewData = GetViewData();
     ScDocShell* pDocSh	= pViewData->GetDocShell();
@@ -2867,7 +2867,7 @@ void ScViewFunc::ChangeIndent( BOOL bIncrement )
         aWorkMark.SetMultiMarkArea( ScRange(nCol,nRow,nTab) );
     }
 
-    BOOL bSuccess = pDocSh->GetDocFunc().ChangeIndent( aWorkMark, bIncrement, FALSE );
+    sal_Bool bSuccess = pDocSh->GetDocFunc().ChangeIndent( aWorkMark, bIncrement, sal_False );
     if (bSuccess)
     {
         pDocSh->UpdateOle(pViewData);
@@ -2875,13 +2875,13 @@ void ScViewFunc::ChangeIndent( BOOL bIncrement )
     }
 }
 
-BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol,
+sal_Bool ScViewFunc::InsertName( const String& rName, const String& rSymbol,
                                 const String& rType )
 {
     //	Type = P,R,C,F (und Kombinationen)
     //!	Undo...
 
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
     ScDocument* pDoc = pDocSh->GetDocument();
     SCTAB nTab = GetViewData()->GetTabNo();
@@ -2907,10 +2907,10 @@ BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol,
     {
         ScDocShellModificator aModificator( *pDocSh );
 
-        pDoc->CompileNameFormula( TRUE );	// CreateFormulaString
+        pDoc->CompileNameFormula( sal_True );	// CreateFormulaString
 
         // Eintrag bereits vorhanden? Dann vorher entfernen (=Aendern)
-        USHORT nFoundAt;
+        sal_uInt16 nFoundAt;
         if ( pList->SearchName( rName, nFoundAt ) )
         {									// alten Index uebernehmen
             pNewEntry->SetIndex( ((ScRangeData*)pList->At(nFoundAt))->GetIndex() );
@@ -2920,10 +2920,10 @@ BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol,
         if ( pList->Insert( pNewEntry ) )
         {
             pNewEntry = NULL;	// nicht loeschen
-            bOk = TRUE;
+            bOk = sal_True;
         }
 
-        pDoc->CompileNameFormula( FALSE );	// CompileFormulaString
+        pDoc->CompileNameFormula( sal_False );	// CompileFormulaString
         aModificator.SetDocumentModified();
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
     }
@@ -2932,20 +2932,20 @@ BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol,
     return bOk;
 }
 
-void ScViewFunc::CreateNames( USHORT nFlags )
+void ScViewFunc::CreateNames( sal_uInt16 nFlags )
 {
-    BOOL bDone = FALSE;
+    sal_Bool bDone = sal_False;
     ScRange aRange;
     if ( GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE )
-        bDone = GetViewData()->GetDocShell()->GetDocFunc().CreateNames( aRange, nFlags, FALSE );
+        bDone = GetViewData()->GetDocShell()->GetDocFunc().CreateNames( aRange, nFlags, sal_False );
 
     if (!bDone)
         ErrorMessage(STR_CREATENAME_MARKERR);
 }
 
-USHORT ScViewFunc::GetCreateNameFlags()
+sal_uInt16 ScViewFunc::GetCreateNameFlags()
 {
-    USHORT nFlags = 0;
+    sal_uInt16 nFlags = 0;
 
     SCCOL nStartCol, nEndCol;
     SCROW nStartRow, nEndRow;
@@ -2954,44 +2954,44 @@ USHORT ScViewFunc::GetCreateNameFlags()
     {
         ScDocument* pDoc = GetViewData()->GetDocument();
         SCTAB nTab = GetViewData()->GetTabNo();
-        BOOL bOk;
+        sal_Bool bOk;
         SCCOL i;
         SCROW j;
 
-        bOk = TRUE;
+        bOk = sal_True;
         SCCOL nFirstCol = nStartCol;
         SCCOL nLastCol  = nEndCol;
         if (nStartCol+1 < nEndCol) { ++nFirstCol; --nLastCol; }
         for (i=nFirstCol; i<=nLastCol && bOk; i++)
             if (!pDoc->HasStringData( i,nStartRow,nTab ))
-                bOk = FALSE;
+                bOk = sal_False;
         if (bOk)
             nFlags |= NAME_TOP;
         else							// Bottom nur wenn nicht Top
         {
-            bOk = TRUE;
+            bOk = sal_True;
             for (i=nFirstCol; i<=nLastCol && bOk; i++)
                 if (!pDoc->HasStringData( i,nEndRow,nTab ))
-                    bOk = FALSE;
+                    bOk = sal_False;
             if (bOk)
                 nFlags |= NAME_BOTTOM;
         }
 
-        bOk = TRUE;
+        bOk = sal_True;
         SCROW nFirstRow = nStartRow;
         SCROW nLastRow  = nEndRow;
         if (nStartRow+1 < nEndRow) { ++nFirstRow; --nLastRow; }
         for (j=nFirstRow; j<=nLastRow && bOk; j++)
             if (!pDoc->HasStringData( nStartCol,j,nTab ))
-                bOk = FALSE;
+                bOk = sal_False;
         if (bOk)
             nFlags |= NAME_LEFT;
         else							// Right nur wenn nicht Left
         {
-            bOk = TRUE;
+            bOk = sal_True;
             for (j=nFirstRow; j<=nLastRow && bOk; j++)
                 if (!pDoc->HasStringData( nEndCol,j,nTab ))
-                    bOk = FALSE;
+                    bOk = sal_False;
             if (bOk)
                 nFlags |= NAME_RIGHT;
         }
@@ -3009,7 +3009,7 @@ void ScViewFunc::InsertNameList()
 {
     ScAddress aPos( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
     ScDocShell* pDocSh = GetViewData()->GetDocShell();
-    if ( pDocSh->GetDocFunc().InsertNameList( aPos, FALSE ) )
+    if ( pDocSh->GetDocFunc().InsertNameList( aPos, sal_False ) )
         pDocSh->UpdateOle(GetViewData());
 }
 
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 45af1cce4..f1d5050cc 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -69,7 +69,7 @@
 
 //	static
 void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet,
-                                USHORT nWhichId, USHORT nScript )
+                                sal_uInt16 nWhichId, sal_uInt16 nScript )
 {
     //	take the effective item from rCoreSet according to nScript
     //	and put in rShellSet under the (base) nWhichId
@@ -87,12 +87,12 @@ void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSe
 }
 
 //	static
-USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
+sal_uInt16 ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
 {
     //	used for thesaurus
 
-    BYTE nScript = pDoc->GetScriptType( rPos.Col(), rPos.Row(), rPos.Tab() );
-    USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE :
+    sal_uInt8 nScript = pDoc->GetScriptType( rPos.Col(), rPos.Row(), rPos.Tab() );
+    sal_uInt16 nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE :
                     ( ( nScript == SCRIPTTYPE_COMPLEX ) ? ATTR_CTL_FONT_LANGUAGE : ATTR_FONT_LANGUAGE );
     const SfxPoolItem* pItem = pDoc->GetAttr( rPos.Col(), rPos.Row(), rPos.Tab(), nWhich);
     SvxLanguageItem* pLangIt = PTR_CAST( SvxLanguageItem, pItem );
@@ -117,7 +117,7 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
 }
 
 //	static
-sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID )
+sal_Int32 ScViewUtil::GetTransliterationType( sal_uInt16 nSlotID )
 {
     sal_Int32 nType = 0;
     switch ( nSlotID )
@@ -154,7 +154,7 @@ sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID )
 }
 
 //	static
-BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
+sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction,
                                 const ScChangeViewSettings& rSettings,
                                 ScDocument& rDocument )
 {
@@ -162,10 +162,10 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
     // die Reihenfolge von ShowRejected/ShowAccepted ist deswegen wichtig
 
     if ( !rSettings.IsShowRejected() && rAction.IsRejecting() )
-        return FALSE;
+        return sal_False;
 
     if ( !rSettings.IsShowAccepted() && rAction.IsAccepted() && !rAction.IsRejecting() )
-        return FALSE;
+        return sal_False;
 
     if ( rSettings.HasAuthor() )
     {
@@ -174,10 +174,10 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
             //	GetUser() am ChangeTrack ist der aktuelle Benutzer
             ScChangeTrack* pTrack = rDocument.GetChangeTrack();
             if ( !pTrack || rAction.GetUser() == pTrack->GetUser() )
-                return FALSE;
+                return sal_False;
         }
         else if ( rAction.GetUser() != rSettings.GetTheAuthorToShow() )
-            return FALSE;
+            return sal_False;
     }
 
     if ( rSettings.HasComment() )
@@ -188,12 +188,12 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
         aComStr+=')';
 
         if(!rSettings.IsValidComment(&aComStr))
-            return FALSE;
+            return sal_False;
     }
 
     if ( rSettings.HasRange() )
         if ( !rSettings.GetTheRangeList().Intersects( rAction.GetBigRange().MakeRange() ) )
-            return FALSE;
+            return sal_False;
 
     if ( rSettings.HasDate() && rSettings.GetTheDateMode() != SCDM_NO_DATEMODE )
     {
@@ -204,23 +204,23 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
         {	// korrespondiert mit ScHighlightChgDlg::OKBtnHdl
             case SCDM_DATE_BEFORE:
                 if ( aDateTime > rFirst )
-                    return FALSE;
+                    return sal_False;
                 break;
 
             case SCDM_DATE_SINCE:
                 if ( aDateTime < rFirst )
-                    return FALSE;
+                    return sal_False;
                 break;
 
             case SCDM_DATE_EQUAL:
             case SCDM_DATE_BETWEEN:
                 if ( aDateTime < rFirst || aDateTime > rLast )
-                    return FALSE;
+                    return sal_False;
                 break;
 
             case SCDM_DATE_NOTEQUAL:
                 if ( aDateTime >= rFirst && aDateTime <= rLast )
-                    return FALSE;
+                    return sal_False;
                 break;
 
             case SCDM_DATE_SAVE:
@@ -228,7 +228,7 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
                 ScChangeTrack* pTrack = rDocument.GetChangeTrack();
                 if ( !pTrack || pTrack->GetLastSavedActionNumber() >=
                         rAction.GetActionNumber() )
-                    return FALSE;
+                    return sal_False;
                 }
                 break;
 
@@ -241,17 +241,17 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
 
     if ( rSettings.HasActionRange() )
     {
-        ULONG nAction = rAction.GetActionNumber();
-        ULONG nFirstAction;
-        ULONG nLastAction;
+        sal_uLong nAction = rAction.GetActionNumber();
+        sal_uLong nFirstAction;
+        sal_uLong nLastAction;
         rSettings.GetTheActionRange( nFirstAction, nLastAction );
         if ( nAction < nFirstAction || nAction > nLastAction )
         {
-            return FALSE;
+            return sal_False;
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // static
@@ -324,7 +324,7 @@ bool ScViewUtil::HasFiltered( const ScRange& rRange, ScDocument* pDoc )
 }
 
 // static
-void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USHORT nSlotId )
+void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal_uInt16 nSlotId )
 {
     SvtCJKOptions aCJKOptions;
     SvtCTLOptions aCTLOptions;
@@ -363,28 +363,28 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USH
 
 //==================================================================
 
-BOOL ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont,
+sal_Bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont,
                                  SfxViewFrame& rFrame,
                                  SvxFontItem& 		rNewFont,
                                  String&			rString )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     if(pFact)
     {
         SfxAllItemSet aSet( rFrame.GetObjectShell()->GetPool() );
-        aSet.Put( SfxBoolItem( FN_PARAM_1, FALSE ) );
+        aSet.Put( SfxBoolItem( FN_PARAM_1, sal_False ) );
         aSet.Put( SvxFontItem( rOldFont.GetFamily(), rOldFont.GetFamilyName(), rOldFont.GetStyleName(), rOldFont.GetPitch(), rOldFont.GetCharSet(), aSet.GetPool()->GetWhich( SID_ATTR_CHAR_FONT ) ) );
         SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( &rFrame.GetWindow(), aSet, rFrame.GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP );
         if ( pDlg->Execute() == RET_OK )
         {
-            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, FALSE );
-            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
+            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pItem, SfxStringItem, SID_CHARMAP, sal_False );
+            SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False );
             if ( pItem )
                 rString  = pItem->GetValue();
             if ( pFontItem )
                 rNewFont = SvxFontItem( pFontItem->GetFamily(), pFontItem->GetFamilyName(), pFontItem->GetStyleName(), pFontItem->GetPitch(), pFontItem->GetCharSet(), rNewFont.Which() );
-            bRet = TRUE;
+            bRet = sal_True;
         }
         delete pDlg;
     }
@@ -435,7 +435,7 @@ void ScUpdateRect::SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 )
     nNewEndY = nY2;
 }
 
-BOOL ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
+sal_Bool ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
 {
     if ( nNewStartX == nOldStartX && nNewEndX == nOldEndX &&
          nNewStartY == nOldStartY && nNewEndY == nOldEndY )
@@ -444,7 +444,7 @@ BOOL ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
         rY1 = nNewStartY;
         rX2 = nNewStartX;
         rY2 = nNewStartY;
-        return FALSE;
+        return sal_False;
     }
 
     rX1 = Min(nNewStartX,nOldStartX);
@@ -479,13 +479,13 @@ BOOL ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 #ifdef OLD_SELECTION_PAINT
-BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont )
+sal_Bool ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, sal_Bool& rCont )
 {
-    rCont = FALSE;
+    rCont = sal_False;
 
     if (nNewStartX == nOldStartX && nNewEndX == nOldEndX &&
         nNewStartY == nOldStartY && nNewEndY == nOldEndY)
@@ -494,7 +494,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rY1 = nNewStartY;
         rX2 = nNewStartX;
         rY2 = nNewStartY;
-        return FALSE;
+        return sal_False;
     }
 
     rX1 = Min(nNewStartX,nOldStartX);
@@ -518,7 +518,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         {
             rY1 = Min( nNewStartY, nOldStartY );
             rY2 = Max( nNewStartY, nOldStartY ) - 1;
-            rCont = TRUE;
+            rCont = sal_True;
             nContY1 = Min( nNewEndY, nOldEndY ) + 1;
             nContY2 = Max( nNewEndY, nOldEndY );
             nContX1 = rX1;
@@ -541,7 +541,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         {
             rX1 = Min( nNewStartX, nOldStartX );
             rX2 = Max( nNewStartX, nOldStartX ) - 1;
-            rCont = TRUE;
+            rCont = sal_True;
             nContX1 = Min( nNewEndX, nOldEndX ) + 1;
             nContX2 = Max( nNewEndX, nOldEndX );
             nContY1 = rY1;
@@ -557,7 +557,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rX2 = nOldEndX;
         rY1 = Min( nNewStartY, nOldStartY );                // oben
         rY2 = Max( nNewStartY, nOldStartY ) - 1;
-        rCont = TRUE;
+        rCont = sal_True;
         nContY1 = rY2+1;
         nContY2 = nOldEndY;
         nContX1 = Min( nNewStartX, nOldStartX );            // links
@@ -572,7 +572,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rX1 = nOldStartX;
         rY1 = Min( nNewStartY, nOldStartY );                // oben
         rY2 = Max( nNewStartY, nOldStartY ) - 1;
-        rCont = TRUE;
+        rCont = sal_True;
         nContY1 = rY2+1;
         nContY2 = nOldEndY;
         nContX1 = Min( nNewEndX, nOldEndX ) + 1;            // rechts
@@ -587,7 +587,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rX2 = nOldEndX;
         rY1 = Min( nNewEndY, nOldEndY ) + 1;                // unten
         rY2 = Max( nNewEndY, nOldEndY );
-        rCont = TRUE;
+        rCont = sal_True;
         nContY1 = nOldStartY;
         nContY2 = rY1-1;
         nContX1 = Min( nNewStartX, nOldStartX );            // links
@@ -602,7 +602,7 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rX1 = nOldStartX;
         rY1 = Min( nNewEndY, nOldEndY ) + 1;                // unten
         rY2 = Max( nNewEndY, nOldEndY );
-        rCont = TRUE;
+        rCont = sal_True;
         nContY1 = nOldStartY;
         nContY2 = rY1-1;
         nContX1 = Min( nNewEndX, nOldEndX ) + 1;            // rechts
@@ -614,14 +614,14 @@ BOOL ScUpdateRect::GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, B
         rY1 = nOldStartY;
         rX2 = nOldEndX;
         rY2 = nOldEndY;
-        rCont = TRUE;
+        rCont = sal_True;
         nContX1 = nNewStartX;
         nContY1 = nNewStartY;
         nContX2 = nNewEndX;
         nContY2 = nNewEndY;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 void ScUpdateRect::GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index ff4696409..dd0a6043c 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -85,6 +85,7 @@ SHL1STDLIBS=       \
     $(CPPUHELPERLIB)	\
     $(COMPHELPERLIB)	\
     $(UCBHELPERLIB)	\
+    $(VBAHELPERLIB)	\
     $(TKLIB)		\
     $(VOSLIB)		\
     $(SALLIB)		\
@@ -282,8 +283,6 @@ LIB8OBJFILES = \
         $(SLO)$/dpgroupdlg.obj	\
         $(SLO)$/editfield.obj
 
-.IF "$(ENABLE_VBA)"=="YES"
-
 TARGET_VBA=vbaobj
 SHL9TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
 SHL9IMPLIB=	i$(TARGET_VBA)
@@ -291,11 +290,7 @@ SHL9IMPLIB=	i$(TARGET_VBA)
 SHL9VERSIONMAP=$(SOLARENV)/src/component.map
 SHL9DEF=$(MISC)$/$(SHL9TARGET).def
 DEF9NAME=$(SHL9TARGET)
-.IF "$(VBA_EXTENSION)"=="YES"
-SHL9RPATH=OXT
-.ELSE
 SHL9RPATH=OOO
-.ENDIF
 
 SHL9STDLIBS= \
         $(VBAHELPERLIB) \
@@ -327,22 +322,12 @@ SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib
     LIBCOMPNAME=$(COMMONBIN)$/$(SHL9TARGET)$(DLLPOST)
 .ENDIF
 
-.ENDIF
- 
-
 # --- Targets -------------------------------------------------------------
 
 .INCLUDE :  target.mk
 
-.IF "$(VBA_EXTENSION)"=="YES"
-    COMP=build_extn
-.ENDIF
-
 ALLTAR:	$(MISC)$/linkinc.ls  $(COMP)
 
-build_extn : $(SHL9TARGETN)
-    $(PERL) createExtPackage.pl $(COMMONBIN)$/vbaapi.oxt  $(SOLARBINDIR)$/oovbaapi.rdb $(LIBCOMPNAME)
-
 ALLTAR : $(MISC)/sc.component $(MISC)/scd.component $(MISC)/vbaobj.component
 
 $(MISC)/sc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
diff --git a/sc/util/sc.r b/sc/util/sc.r
deleted file mode 100644
index efd425e20..000000000
--- a/sc/util/sc.r
+++ /dev/null
@@ -1,777 +0,0 @@
-//*************************************************************************
-//*
-//*	  $Workfile:   SC.R  $
-//*
-//*	  Ersterstellung	KH
-//*
-//*	  Letzte Aenderung	$Author: hr $ $Date: 2000-09-18 16:45:16 $
-//*	  $Revision: 1.1.1.1 $
-//*
-//*	  $Logfile:   T:/sc/util/sc.r_v  $
-//*
-//*	  Copyright (c) 1990 - 1995, STAR DIVISION
-//*
-//*************************************************************************
-
-#include "Types.r"
-
-resource 'SIZE' (-1) {
-	reserved,
-	acceptSuspendResumeEvents,
-	reserved,
-	canBackground,
-	multiFinderAware,
-	backgroundAndForeground,
-	dontGetFrontClicks,
-	ignoreChildDiedEvents,
-	is32BitCompatible,
-	isHighLevelEventAware,
-	onlyLocalHLEvents,
-	isStationeryAware,
-	dontUseTextEditServices,
-	reserved,
-	reserved,
-	reserved,
-	4096000,
-	3584000
-};
-
-resource 'SIZE' (0) {
-	reserved,
-	acceptSuspendResumeEvents,
-	reserved,
-	canBackground,
-	multiFinderAware,
-	backgroundAndForeground,
-	dontGetFrontClicks,
-	ignoreChildDiedEvents,
-	is32BitCompatible,
-	isHighLevelEventAware,
-	onlyLocalHLEvents,
-	isStationeryAware,
-	dontUseTextEditServices,
-	reserved,
-	reserved,
-	reserved,
-	4096000,
-	3584000
-};
-
-resource 'ics8' (128) {
-	$"ECEC EC00 0000 FF00 0000 0000 0000 0000"
-	$"ECEC EC00 00FF 2BFF 0000 0000 0000 0000"
-	$"ECEC EC00 FF2B F92B FF00 0000 0000 0000"
-	$"ECEC ECFF 2BFF 2BFF 2BFF 0000 0000 0000"
-	$"ECEC FF2B F92B FF2B F92B FF00 0000 0000"
-	$"ECFF 2BFF 2BFF F5FF 2BFF 2BFF 0000 0000"
-	$"FF2B F92B FFF5 F5F5 FF2B F92B FF00 0000"
-	$"2BFF 2BFF F5FF F5FF F5FF 2B2B FFFF 0000"
-	$"F92B FFF5 F5F5 FFF5 F5F5 FFFF 2B2B FF00"
-	$"2BFF F5FF F5FF F5FF FFFF FFFF FFFF FFFF"
-	$"FFF5 F5F5 FFF5 F5FF F5EC F5F5 C0F5 C0F5"
-	$"ECFF F5FF F5FF F5FF FFEC FFC0 C0EC C0EC"
-	$"ECEC FFF5 F5F5 FFFF F5EC F5F5 ECF5 ECF5"
-	$"ECEC ECFF F5FF F5FF F5EC F5F5 FFF5 F5F5"
-	$"ECEC EC00 FFF5 F5FF C0EC ECFF 00FF FFC0"
-	$"ECEC EC00 00FF F5FF 00EC F5F5 FFF5 F5F5"
-};
-
-resource 'ics8' (129) {
-	$"0000 FFFF FFFF FFFF FFFF FFFF 0000 0000"
-	$"0000 FF00 0000 0000 0000 FF00 FF00 0000"
-	$"0000 FF00 ECEC ECC0 4848 FF00 00FF 0000"
-	$"0000 FF00 ECEC ECC0 0000 FFFF FFFF 0000"
-	$"0000 FF00 ECEC ECFF 0000 0000 00FF 0000"
-	$"0000 FF00 ECEC C000 FFFF 00FF FFFF 0000"
-	$"0000 FF00 EC00 48FF 0000 FF00 00FF 0000"
-	$"0000 FF00 EC00 C000 FFFF 00FF FFFF 0000"
-	$"0000 FF00 EC00 48FF 0000 FF00 00FF 0000"
-	$"0000 FF00 ECEC 48FF 0000 FF00 00FF 0000"
-	$"0000 FF00 ECEC B000 FFFF 00FF FFFF 0000"
-	$"0000 FF00 ECEC ECFF 0000 FF00 00FF 0000"
-	$"0000 FF00 ECEC ECFF 0000 FF00 00FF 0000"
-	$"0000 FF00 ECEC EC00 FFFF 00FF FFFF 0000"
-	$"0000 FF00 0000 0000 0000 0000 00FF 0000"
-	$"0000 FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-resource 'ics8' (130) {
-	$"00FF FFFF FFFF FFFF FFFF FFFF 0000 0000"
-	$"00FF F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"00FF F5EC ECEC C048 48C0 48FF FFFF 0000"
-	$"00FF F5EC ECEC 00FF FF00 FFFF 00FF 0000"
-	$"00FF F5EC ECEC FFF5 F5FF 00FF 00FF 0000"
-	$"00FF F5EC EC48 FFF5 F5FF 00FF FFFF 0000"
-	$"00FF F5EC F5C0 00FF FF00 FFFF 00FF 0000"
-	$"00FF F5EC F548 FFF5 F5FF F5FF 00FF 0000"
-	$"00FF F5EC EC48 FFF5 F5FF F5FF FFFF 0000"
-	$"00FF F5EC ECEC 00FF FF00 FFFF 00FF 0000"
-	$"00FF F5EC ECEC FFF5 FFFF FFFF 00FF 0000"
-	$"00FF F5EC ECEC FFF5 FF2B FF00 FFFF 0000"
-	$"00FF F5F5 F5F5 F5F5 FFFF 0000 00FF 0000"
-	$"00FF FFFF FFFF FFFF FF00 FF00 00FF 0000"
-	$"0000 00FF 0000 0000 0000 0000 00FF 0000"
-	$"0000 00FF FFFF FFFF FFFF FFFF FFFF"
-};
-
-resource 'ics8' (131) {
-	$"00FF FFFF FFFF FFFF FFFF FF00 0000 0000"
-	$"00FF F5F5 F5F5 F5F5 F5F5 FFFF 0000 0000"
-	$"00FF F5EC ECEC F5F5 F5F5 FF2B FF00 0000"
-	$"00FF F5EC ECEC F5F5 F5F5 FFFF FFFF 0000"
-	$"00FF F5EC ECEC F5F5 F5F5 F5F5 F5FF 0000"
-	$"00FF F5EC ECF5 F5F5 F5F5 F5F5 F5FF 0000"
-	$"00FF F5EC FFF5 FFFF F5FF FFF5 F5FF 0000"
-	$"00FF F5EC F5F5 F5F5 F5F5 F5F5 F5FF 0000"
-	$"00FF F5EC FFFF FFFF F5FF FFF5 F5FF 0000"
-	$"00FF F5EC ECF5 F5F5 F5F5 F5F5 F5FF 0000"
-	$"00FF F5EC FFFF F5FF FFF5 FFF5 F5FF 0000"
-	$"00FF F5EC ECEC F5F5 F5F5 F5F5 F5FF 0000"
-	$"00FF F5EC ECEC F5F5 F5F5 F5F5 F5FF 0000"
-	$"00FF F5EC ECEC F5F5 F5F5 F5F5 F5FF 0000"
-	$"00FF F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000"
-	$"00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-resource 'ics4' (128) {
-	$"6660 00F0 0000 0000 6660 0FCF 0000 0000"
-	$"6660 FCDC F000 0000 666F CFCF CF00 0000"
-	$"66FC DCFC DCF0 0000 6FCF CF0F CFCF 0000"
-	$"FCDC F000 FCDC F000 CFCF 0F0F 0FCC FF00"
-	$"DCF0 00F0 00FF CCF0 CF0F 0F0F FFFF FFFF"
-	$"F000 F00F 0600 7070 6F0F 0F0F F6F7 7676"
-	$"66F0 00FF 0600 6060 666F 0F0F 0600 F000"
-	$"6660 F00F 766F 0FF7 6660 0F0F 0600 F0"
-};
-
-resource 'ics4' (129) {
-	$"00FF FFFF FFFF 0000 00F0 0000 00F0 F000"
-	$"00F0 6667 CCF0 0F00 00F0 6667 00FF FF00"
-	$"00F0 666F 0000 0F00 00F0 6670 FF0F FF00"
-	$"00F0 60CF 00F0 0F00 00F0 6070 FF0F FF00"
-	$"00F0 60CF 00F0 0F00 00F0 66CF 00F0 0F00"
-	$"00F0 6650 FF0F FF00 00F0 666F 00F0 0F00"
-	$"00F0 666F 00F0 0F00 00F0 6660 FF0F FF00"
-	$"00F0 0000 0000 0F00 00FF FFFF FFFF FF"
-};
-
-resource 'ics4' (130) {
-	$"0FFF FFFF FFFF 0000 0F00 0000 000F 0000"
-	$"0F06 6670 070F FF00 0F06 660F F0FF 0F00"
-	$"0F06 66F0 0F0F 0F00 0F06 60F0 0F0F FF00"
-	$"0F06 070F F0FF 0F00 0F06 00F0 0F0F 0F00"
-	$"0F06 60F0 0F0F FF00 0F06 660F F0FF 0F00"
-	$"0F06 66F0 FFFF 0F00 0F06 66F0 FCF0 FF00"
-	$"0F00 0000 FF00 0F00 0FFF FFFF F0F0 0F00"
-	$"000F 0000 0000 0F00 000F FFFF FFFF FF"
-};
-
-resource 'ics4' (131) {
-	$"0FFF FFFF FFF0 0000 0F00 0000 00FF 0000"
-	$"0F06 6600 00FC F000 0F06 6600 00FF FF00"
-	$"0F06 6600 0000 0F00 0F06 6000 0000 0F00"
-	$"0F06 F0FF 0FF0 0F00 0F06 0000 0000 0F00"
-	$"0F06 FFFF 0FF0 0F00 0F06 6000 0000 0F00"
-	$"0F06 FF0F F0F0 0F00 0F06 6600 0000 0F00"
-	$"0F06 6600 0000 0F00 0F06 6600 0000 0F00"
-	$"0F00 0000 0000 0F00 0FFF FFFF FFFF FF"
-};
-
-resource 'ics#' (128) {
-	{	/* array: 2 elements */
-		/* [1] */
-		$"E200 A500 A880 B540 A220 D550 8888 554C"
-		$"2232 55FF 894A D5FF A34A B548 A9F7 E548",
-		/* [2] */
-		$"E200 E700 EF80 FFC0 FFE0 FFF0 FFF8 FFFC"
-		$"FFFE FFFF FFFF FFFF FFFF FFFF EFFF E7FF"
-	}
-};
-
-resource 'ics#' (129) {
-	{	/* array: 2 elements */
-		/* [1] */
-		$"3FF0 2228 2324 233C 2304 26DC 2924 2EDC"
-		$"2924 2524 22DC 2324 2324 22DC 2204 3FFC",
-		/* [2] */
-		$"3FF0 3FF8 3FFC 3FFC 3FFC 3FFC 3FFC 3FFC"
-		$"3FFC 3FFC 3FFC 3FFC 3FFC 3FFC 3FFC 3FFC"
-	}
-};
-
-resource 'ics#' (130) {
-	{	/* array: 2 elements */
-		/* [1] */
-		$"7FF0 4410 465C 45B4 4654 4A5C 55B4 5254"
-		$"4A5C 45B4 46F4 46AC 44C4 7FA4 1004 1FFC",
-		/* [2] */
-		$"7FF0 7FF0 7FFC 7FFC 7FFC 7FFC 7FFC 7FFC"
-		$"7FFC 7FFC 7FFC 7FFC 7FFC 7FFC 1FFC 1FFC"
-	}
-};
-
-resource 'ics#' (131) {
-	{	/* array: 2 elements */
-		/* [1] */
-		$"7FE0 4830 4828 483C 4804 5004 6B64 6004"
-		$"6F64 5004 4DA4 4804 4804 4804 4804 7FFC",
-		/* [2] */
-		$"7FE0 7FF0 7FF8 7FFC 7FFC 7FFC 7FFC 7FFC"
-		$"7FFC 7FFC 7FFC 7FFC 7FFC 7FFC 7FFC 7FFC"
-	}
-};
-
-resource 'ICN#' (128) {
-	{	/* array: 2 elements */
-		/* [1] */
-		$"F801 0000 8802 8000 8805 4000 880A A000"
-		$"8811 1000 882C A800 8851 5400 888A 2200"
-		$"8934 1500 8A8A 2A80 8C51 4440 8B20 82A0"
-		$"9451 4550 A28A 2888 D904 1054 928A 28AA"
-		$"C451 4511 A87F FFFF 9040 0001 88D8 6319"
-		$"8D6C B5AD 8A7F FFFF 897C F7BD 88D8 6319"
-		$"8840 0001 884C 6019 8856 B02D 887F FFFF"
-		$"885E F03D 884C 6019 8840 0001 F87F FFFF",
-		/* [2] */
-		$"F801 0000 F803 8000 F807 C000 F80F E000"
-		$"F81F F000 F83F F800 F87F FC00 F8FF FE00"
-		$"F9FF FF00 FBFF FF80 FFFF FFC0 FFFF FFE0"
-		$"FFFF FFF0 FFFF FFF8 FFFF FFFC FFFF FFFE"
-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-		$"FFFF FFFF FBFF FFFF F9FF FFFF F8FF FFFF"
-		$"F87F FFFF F87F FFFF F87F FFFF F87F FFFF"
-		$"F87F FFFF F87F FFFF F87F FFFF F87F FFFF"
-	}
-};
-
-resource 'ICN#' (130) {
-	{	/* array: 2 elements */
-		/* [1] */
-		$"3FFF FFF0 2080 0010 2085 EBD0 2084 081C"
-		$"20FB F7F4 2084 0814 2094 0814 2084 081C"
-		$"21FB F7F4 2204 0814 2274 0814 2404 081C"
-		$"25FB F7F4 2404 0814 24F4 0814 2404 081C"
-		$"25FB F7F4 2204 0814 2274 0814 2104 081C"
-		$"20FB F7F4 2084 0814 2094 0814 2084 0FEC"
-		$"20FB F844 2084 0884 2094 0904 2084 0AFC"
-		$"2080 0C04 3FFF FA04 0800 0004 0FFF FFFC",
-		/* [2] */
-		$"3FFF FFF0 3FFF FFF0 3FFF FFF0 3FFF FFFC"
-		$"3FFF FFFC 3FFF FFFC 3FFF FFFC 3FFF FFFC"
-		$"3FFF FFFC 3FFF FFFC 3FFF FFFC 3FFF FFFC"
-		$"3FFF FFFC 3FFF FFFC 3FFF FFFC 3FFF FFFC"
-		$"3FFF FFFC 3FFF FFFC 3FFF FFFC 3FFF FFFC"
-		$"3FFF FFFC 3FFF FFFC 3FFF FFFC 3FFF FFFC"
-		$"3FFF FFFC 3FFF FFFC 3FFF FFFC 3FFF FFFC"
-		$"3FFF FFFC 3FFF FFFC 0FFF FFFC 0FFF FFFC"
-	}
-};
-
-resource 'ICN#' (129) {
-	{	/* array: 2 elements */
-		/* [1] */
-		$"1FFF FE00 1040 0300 1075 EA80 1044 0A40"
-		$"107B F620 1044 0A10 1044 0BF8 1044 0808"
-		$"107B F7F8 1084 0808 1134 0808 1104 0808"
-		$"12FB F7F8 1204 0808 1274 0808 1204 0808"
-		$"12FB F7F8 1104 0808 1134 0808 1104 0808"
-		$"10FB F7F8 1044 0808 1054 0808 1044 0808"
-		$"107B F7F8 1044 0808 1054 0808 1044 0808"
-		$"107B F7F8 1044 0808 1040 0008 1FFF FFF8",
-		/* [2] */
-		$"1FFF FE00 1FFF FF00 1FFF FF80 1FFF FFC0"
-		$"1FFF FFE0 1FFF FFF0 1FFF FFF8 1FFF FFF8"
-		$"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8"
-		$"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8"
-		$"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8"
-		$"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8"
-		$"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8"
-		$"1FFF FFF8 1FFF FFF8 1FFF FFF8 1FFF FFF8"
-	}
-};
-
-resource 'ICN#' (131) {
-	{	/* array: 2 elements */
-		/* [1] */
-		$"3FFF FC00 2100 0600 2100 0500 2100 0480"
-		$"2100 0440 2100 0420 2100 07F0 2100 0010"
-		$"2100 0010 2200 0010 2400 0010 25DD DB10"
-		$"2800 0010 2800 0010 29DE F710 2800 0010"
-		$"2800 0010 29BF BB10 2400 0010 2400 0010"
-		$"2200 0010 2100 0010 2100 0010 2100 0010"
-		$"2100 0010 2100 0010 2100 0010 2100 0010"
-		$"2100 0010 2100 0010 2100 0010 3FFF FFF0",
-		/* [2] */
-		$"3FFF FC00 3FFF FE00 3FFF FF00 3FFF FF80"
-		$"3FFF FFC0 3FFF FFE0 3FFF FFF0 3FFF FFF0"
-		$"3FFF FFF0 3FFF FFF0 3FFF FFF0 3FFF FFF0"
-		$"3FFF FFF0 3FFF FFF0 3FFF FFF0 3FFF FFF0"
-		$"3FFF FFF0 3FFF FFF0 3FFF FFF0 3FFF FFF0"
-		$"3FFF FFF0 3FFF FFF0 3FFF FFF0 3FFF FFF0"
-		$"3FFF FFF0 3FFF FFF0 3FFF FFF0 3FFF FFF0"
-		$"3FFF FFF0 3FFF FFF0 3FFF FFF0 3FFF FFF0"
-	}
-};
-
-resource 'icl8' (129) {
-	$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
-	$"0000 00FF F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 FFFF 0000 0000 0000 0000"
-	$"0000 00FF F5EC ECEC ECEC FFFF 48C0 48FF"
-	$"FFFF FF48 C048 FF2B FF00 0000 0000 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48C0 4848"
-	$"4848 4848 C048 FF2B 2BFF 0000 0000 0000"
-	$"0000 00FF F5EC ECEC ECEC C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FF2B 2B2B FF00 0000 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 FF2B 2B2B 2BFF 0000 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 FFFF FFFF FFFF FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF FF00 0000"
-	$"0000 00FF F5EC ECEC EC48 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC 4848 FFFF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECF5 C0C0 C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF FF00 0000"
-	$"0000 00FF F5EC ECF5 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECF5 48FF FFFF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECF5 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECF5 C0C0 C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF FF00 0000"
-	$"0000 00FF F5EC ECF5 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC 4848 FFFF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC ECC0 C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC 48FF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC 48FF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF FF00 0000"
-	$"0000 00FF F5EC ECEC ECEC 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5F5 FF00 0000"
-	$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF FFFF FF"
-};
-
-resource 'icl8' (130) {
-	$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
-	$"0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC EC48 4848 48C0 48FF"
-	$"FFFF FF48 C048 FFFF FFFF 48FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC EC48 4848 48C0 4848"
-	$"4848 4848 C048 4848 4848 48FF FFFF 0000"
-	$"0000 FFF5 ECEC ECEC ECC0 C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 48FF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF FFFF 0000"
-	$"0000 FFF5 ECEC ECEC C0C0 C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF 00FF 0000"
-	$"0000 FFF5 ECEC EC48 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC EC48 48FF FFFF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC F548 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF FFFF 0000"
-	$"0000 FFF5 ECEC F5C0 C0C0 C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF 00FF 0000"
-	$"0000 FFF5 ECEC F548 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC F548 FFFF FFFF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC F548 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF FFFF 0000"
-	$"0000 FFF5 ECEC F5C0 C0C0 C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF 00FF 0000"
-	$"0000 FFF5 ECEC EC48 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC EC48 48FF FFFF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC ECEC 4848 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF FFFF 0000"
-	$"0000 FFF5 ECEC ECEC ECC0 C0C0 C000 FFFF"
-	$"FFFF FFFF 00FF FFFF FFFF FFFF 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 4848 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 48FF 48FF F5F5"
-	$"F5F5 F5F5 FFF5 F5F5 F5F5 F5FF 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 4848 48FF F5F5"
-	$"F5F5 F5F5 FFFF FFFF FFFF FF00 FFFF 0000"
-	$"0000 FFF5 ECEC ECEC ECC0 C0C0 C000 FFFF"
-	$"FFFF FFFF FF2B 2B2B 2BFF 0000 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 4848 48FF F5F5"
-	$"F5F5 F5F5 FF2B 2B2B FF00 0000 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 48FF 48FF F5F5"
-	$"F5F5 F5F5 FF2B 2BFF 0000 0000 00FF 0000"
-	$"0000 FFF5 ECEC ECEC EC48 4848 48FF F5F5"
-	$"F5F5 F5F5 FF2B FF00 FFFF FFFF FFFF 0000"
-	$"0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 FFFF 0000 0000 0000 00FF 0000"
-	$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FF00 FF00 0000 0000 00FF 0000"
-	$"0000 0000 FF00 0000 0000 0000 0000 0000"
-	$"0000 0000 0000 0000 0000 0000 00FF 0000"
-	$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-resource 'icl8' (131) {
-	$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
-	$"0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5FF FF00 0000 0000 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5FF 2BFF 0000 0000 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5FF 2B2B FF00 0000 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5FF 2B2B 2BFF 0000 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5FF 2B2B 2B2B FF00 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5FF FFFF FFFF FFFF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECF5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECFF FFFF F5FF FFFF F5FF"
-	$"FFFF F5FF FFF5 FFFF F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC F5FF FFFF F5FF FFFF FFF5"
-	$"FFFF FFFF F5FF FFFF F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC F5FF FFF5 FFFF FFFF FFFF"
-	$"FFF5 FFFF FFF5 FFFF F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECF5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECF5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 ECEC ECEC ECF5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-resource 'icl8' (128) {
-	$"ECEC ECEC EC00 0000 0000 0000 0000 00FF"
-	$"0000 0000 0000 0000 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 0000 0000 0000 0000 FF2B"
-	$"FF00 0000 0000 0000 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 0000 0000 0000 00FF 2BFD"
-	$"2BFF 0000 0000 0000 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 0000 0000 0000 FF2B FF2B"
-	$"FD2B FF00 0000 0000 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 0000 0000 00FF 2B2B 2BFF"
-	$"2B2B 2BFF 0000 0000 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 0000 0000 FF2B FDFD 2B2B"
-	$"FF2B FD2B FF00 0000 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 0000 00FF 2BFF 2B2B 2BFF"
-	$"F5FF 2BFD 2BFF 0000 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 0000 FF2B 2B2B FF2B FFF5"
-	$"F5F5 FF2B 2B2B FF00 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 00FF 2B2B FDFD 2BFF F5F5"
-	$"F5F5 F5FF 2BFD 2BFF 0000 0000 0000 0000"
-	$"ECEC ECEC EC00 FF2B FF2B 2B2B FFF5 FFF5"
-	$"F5F5 FFF5 FF2B FD2B FF00 0000 0000 0000"
-	$"ECEC ECEC ECFF 2B2B 2BFF 2BFF F5F5 F5FF"
-	$"F5FF F5F5 F5FF 2B2B 2BFF 0000 0000 0000"
-	$"ECEC ECEC FF2B FDFD 2B2B FFF5 F5F5 F5F5"
-	$"FBF5 F5F5 F5F5 FF2B FD2B FF00 0000 0000"
-	$"ECEC ECFF 2BFF 2B2B 2BFF F5FF F5F5 F5FF"
-	$"F5FF F5F5 F5FF F5FF 2BFD 2BFF 0000 0000"
-	$"ECEC FF2B 2B2B FF2B FFF5 F5F5 FFF5 FFF5"
-	$"F5F5 FFF5 FFF5 F5F5 FF2B 2B2B FF00 0000"
-	$"ECFF 2BFD FD2B 2BFF F5F5 F5F5 F5FB F5F5"
-	$"F5F5 F5FB F5F5 F5F5 F5FF 2BFD 2BFF 0000"
-	$"FF2B 2BFD 2B2B FFF5 FFF5 F5F5 FFF5 FFF5"
-	$"F5F5 FFF5 FFF5 F5F5 FFF5 FF2B FD2B FF00"
-	$"ECFF 2B2B 2BFF F5F5 F5FF F5FF F5F5 F5FF"
-	$"F5FF F5F5 F5FF F5FF F5F5 F5FF 2B2B 2BFF"
-	$"ECEC FF2B FFF5 F5F5 F5FF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"ECEC ECFF F5F5 F5F5 F5FF F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5F5 F5F5 F5FF"
-	$"ECEC ECEC FFF5 F5F5 FFFF F5C0 C0F5 F5F5"
-	$"F5C0 C0F5 F5F5 C0C0 F5F5 F5C0 C0F5 F5FF"
-	$"ECEC ECEC ECFF F5FF F5FF C000 C0EC F5F5"
-	$"C000 C0EC F5C0 00C0 ECF5 C000 C0EC F5FF"
-	$"ECEC ECEC EC00 FFF5 F5FF C0C0 C0C0 FFFF"
-	$"C0C0 C0C0 FFC0 C0C0 C0FF C0C0 C0C0 FFFF"
-	$"ECEC ECEC EC00 00FF F5FF C0EC FFEC F5F5"
-	$"C0EC FFEC F5C0 ECFF ECF5 C0EC FFEC F5FF"
-	$"ECEC ECEC EC00 0000 FFFF F5EC ECF5 F5F5"
-	$"F5EC ECF5 F5F5 ECEC F5F5 F5EC ECF5 F5FF"
-	$"ECEC ECEC EC00 0000 00FF F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5F5 F5F5 F5FF"
-	$"ECEC ECEC EC00 0000 00FF F5F5 C0C0 F5F5"
-	$"F5C0 C0F5 F5F5 F5F5 F5F5 F5C0 C0F5 F5FF"
-	$"ECEC ECEC EC00 0000 00FF F5C0 00C0 ECF5"
-	$"C000 C0EC F5F5 F5F5 F5F5 C000 C0EC F5FF"
-	$"ECEC ECEC EC00 0000 00FF FFC0 C0C0 C0FF"
-	$"C0C0 C0C0 FFFF FFFF FFFF C0C0 C0C0 FFFF"
-	$"ECEC ECEC EC00 0000 00FF F5C0 ECFF ECF5"
-	$"C0EC FFEC F5F5 F5F5 F5F5 C0EC FFEC F5FF"
-	$"ECEC ECEC EC00 0000 00FF F5F5 ECEC F5F5"
-	$"F5EC ECF5 F5F5 F5F5 F5F5 F5EC ECF5 F5FF"
-	$"ECEC ECEC EC00 0000 00FF F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5F5 F5F5 F5FF"
-	$"ECEC ECEC EC00 0000 00FF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-resource 'icl4' (128) {
-	$"6666 6000 0000 000F 0000 0000 0000 0000"
-	$"6666 6000 0000 00FC F000 0000 0000 0000"
-	$"6666 6000 0000 0FCA CF00 0000 0000 0000"
-	$"6666 6000 0000 FCFC ACF0 0000 0000 0000"
-	$"6666 6000 000F CCCF CCCF 0000 0000 0000"
-	$"6666 6000 00FC AACC FCAC F000 0000 0000"
-	$"6666 6000 0FCF CCCF 0FCA CF00 0000 0000"
-	$"6666 6000 FCCC FCF0 00FC CCF0 0000 0000"
-	$"6666 600F CCAA CF00 000F CACF 0000 0000"
-	$"6666 60FC FCCC F0F0 00F0 FCAC F000 0000"
-	$"6666 6FCC CFCF 000F 0F00 0FCC CF00 0000"
-	$"6666 FCAA CCF0 0000 E000 00FC ACF0 0000"
-	$"666F CFCC CF0F 000F 0F00 0F0F CACF 0000"
-	$"66FC CCFC F000 F0F0 00F0 F000 FCCC F000"
-	$"6FCA ACCF 0000 0E00 000E 0000 0FCA CF00"
-	$"FCCA CCF0 F000 F0F0 00F0 F000 F0FC ACF0"
-	$"6FCC CF00 0F0F 000F 0F00 0F0F 000F CCCF"
-	$"66FC F000 0FFF FFFF FFFF FFFF FFFF FFFF"
-	$"666F 0000 0F00 0000 0000 0000 0000 000F"
-	$"6666 F000 FF07 7000 0770 0077 0007 700F"
-	$"6666 6F0F 0F70 7600 7076 0707 6070 760F"
-	$"6666 60F0 0F77 77FF 7777 F777 7F77 77FF"
-	$"6666 600F 0F76 F600 76F6 076F 6076 F60F"
-	$"6666 6000 FF06 6000 0660 0066 0006 600F"
-	$"6666 6000 0F00 0000 0000 0000 0000 000F"
-	$"6666 6000 0F00 7700 0770 0000 0007 700F"
-	$"6666 6000 0F07 0760 7076 0000 0070 760F"
-	$"6666 6000 0FF7 777F 7777 FFFF FF77 77FF"
-	$"6666 6000 0F07 6F60 76F6 0000 0076 F60F"
-	$"6666 6000 0F00 6600 0660 0000 0006 600F"
-	$"6666 6000 0F00 0000 0000 0000 0000 000F"
-	$"6666 6000 0FFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-resource 'icl4' (129) {
-	$"000F FFFF FFFF FFFF FFFF FFF0 0000 0000"
-	$"000F 0000 0000 0000 0000 00FF 0000 0000"
-	$"000F 0666 66FF 070F FFF0 70FC F000 0000"
-	$"000F 0666 6600 0700 0000 70FC CF00 0000"
-	$"000F 0666 6677 70FF FFFF 0FFC CCF0 0000"
-	$"000F 0666 6600 0F00 0000 F0FC CCCF 0000"
-	$"000F 0666 6600 0F00 0000 F0FF FFFF F000"
-	$"000F 0666 6600 0F00 0000 F000 0000 F000"
-	$"000F 0666 6677 70FF FFFF 0FFF FFFF F000"
-	$"000F 0666 6000 0F00 0000 F000 0000 F000"
-	$"000F 0666 00FF 0F00 0000 F000 0000 F000"
-	$"000F 0666 0000 0F00 0000 F000 0000 F000"
-	$"000F 0660 7777 70FF FFFF 0FFF FFFF F000"
-	$"000F 0660 0000 0F00 0000 F000 0000 F000"
-	$"000F 0660 0FFF 0F00 0000 F000 0000 F000"
-	$"000F 0660 0000 0F00 0000 F000 0000 F000"
-	$"000F 0660 7777 70FF FFFF 0FFF FFFF F000"
-	$"000F 0660 0000 0F00 0000 F000 0000 F000"
-	$"000F 0666 00FF 0F00 0000 F000 0000 F000"
-	$"000F 0666 0000 0F00 0000 F000 0000 F000"
-	$"000F 0666 6777 70FF FFFF 0FFF FFFF F000"
-	$"000F 0666 6600 0F00 0000 F000 0000 F000"
-	$"000F 0666 660F 0F00 0000 F000 0000 F000"
-	$"000F 0666 6600 0F00 0000 F000 0000 F000"
-	$"000F 0666 6677 70FF FFFF 0FFF FFFF F000"
-	$"000F 0666 6600 0F00 0000 F000 0000 F000"
-	$"000F 0666 660F 0F00 0000 F000 0000 F000"
-	$"000F 0666 6600 0F00 0000 F000 0000 F000"
-	$"000F 0666 6677 70FF FFFF 0FFF FFFF F000"
-	$"000F 0666 6600 0F00 0000 F000 0000 F000"
-	$"000F 0000 0000 0000 0000 0000 0000 F000"
-	$"000F FFFF FFFF FFFF FFFF FFFF FFFF F0"
-};
-
-resource 'icl4' (130) {
-	$"00FF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
-	$"00F0 0000 0000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 070F FFF0 70FF FF0F 0000"
-	$"00F0 6666 6000 0700 0000 7000 000F FF00"
-	$"00F0 6666 6777 70FF FFFF 0FFF FFFF 0F00"
-	$"00F0 6666 6000 0F00 0000 F000 000F 0F00"
-	$"00F0 6666 600F 0F00 0000 F000 000F 0F00"
-	$"00F0 6666 6000 0F00 0000 F000 000F FF00"
-	$"00F0 6666 7777 70FF FFFF 0FFF FFFF 0F00"
-	$"00F0 6660 0000 0F00 0000 F000 000F 0F00"
-	$"00F0 6660 0FFF 0F00 0000 F000 000F 0F00"
-	$"00F0 6600 0000 0F00 0000 F000 000F FF00"
-	$"00F0 6607 7777 70FF FFFF 0FFF FFFF 0F00"
-	$"00F0 6600 0000 0F00 0000 F000 000F 0F00"
-	$"00F0 6600 FFFF 0F00 0000 F000 000F 0F00"
-	$"00F0 6600 0000 0F00 0000 F000 000F FF00"
-	$"00F0 6607 7777 70FF FFFF 0FFF FFFF 0F00"
-	$"00F0 6660 0000 0F00 0000 F000 000F 0F00"
-	$"00F0 6660 0FFF 0F00 0000 F000 000F 0F00"
-	$"00F0 6666 0000 0F00 0000 F000 000F FF00"
-	$"00F0 6666 6777 70FF FFFF 0FFF FFFF 0F00"
-	$"00F0 6666 6000 0F00 0000 F000 000F 0F00"
-	$"00F0 6666 600F 0F00 0000 F000 000F 0F00"
-	$"00F0 6666 6000 0F00 0000 FFFF FFF0 FF00"
-	$"00F0 6666 6777 70FF FFFF F000 0F00 0F00"
-	$"00F0 6666 6000 0F00 0000 F000 F000 0F00"
-	$"00F0 6666 600F 0F00 0000 F00F 0000 0F00"
-	$"00F0 6666 6000 0F00 0000 F0F0 FFFF FF00"
-	$"00F0 0000 0000 0000 0000 FF00 0000 0F00"
-	$"00FF FFFF FFFF FFFF FFFF F0F0 0000 0F00"
-	$"0000 F000 0000 0000 0000 0000 0000 0F00"
-	$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FF"
-};
-
-resource 'icl4' (131) {
-	$"00FF FFFF FFFF FFFF FFFF FF00 0000 0000"
-	$"00F0 0000 0000 0000 0000 0FF0 0000 0000"
-	$"00F0 6666 6000 0000 0000 0FCF 0000 0000"
-	$"00F0 6666 6000 0000 0000 0FCC F000 0000"
-	$"00F0 6666 6000 0000 0000 0FCC CF00 0000"
-	$"00F0 6666 6000 0000 0000 0FCC CCF0 0000"
-	$"00F0 6666 6000 0000 0000 0FFF FFFF 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 0000 0000 0000 0000 000F 0000"
-	$"00F0 6660 0000 0000 0000 0000 000F 0000"
-	$"00F0 666F FF0F FF0F FF0F F0FF 000F 0000"
-	$"00F0 6600 0000 0000 0000 0000 000F 0000"
-	$"00F0 6600 0000 0000 0000 0000 000F 0000"
-	$"00F0 660F FF0F FFF0 FFFF 0FFF 000F 0000"
-	$"00F0 6600 0000 0000 0000 0000 000F 0000"
-	$"00F0 6600 0000 0000 0000 0000 000F 0000"
-	$"00F0 660F F0FF FFFF F0FF F0FF 000F 0000"
-	$"00F0 6660 0000 0000 0000 0000 000F 0000"
-	$"00F0 6660 0000 0000 0000 0000 000F 0000"
-	$"00F0 6666 0000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 6666 6000 0000 0000 0000 000F 0000"
-	$"00F0 0000 0000 0000 0000 0000 000F 0000"
-	$"00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-};
-
-resource 'FREF' (128) {
-	'APPL',
-	0,
-	""
-};
-
-resource 'FREF' (129) {
-	'SVsc',
-	1,
-	""
-};
-
-resource 'FREF' (130) {
-	'sVsc',
-	2,
-	""
-};
-
-resource 'FREF' (131) {
-	'TEXT',
-	3,
-	""
-};
-
-resource 'BNDL' (128) {
-	'SVsc',
-	0,
-	{	/* array TypeArray: 2 elements */
-		/* [1] */
-		'FREF',
-		{	/* array IDArray: 4 elements */
-			/* [1] */
-			0, 128,
-			/* [2] */
-			1, 129,
-			/* [3] */
-			2, 130,
-			/* [4] */
-			3, 131
-		},
-		/* [2] */
-		'ICN#',
-		{	/* array IDArray: 4 elements */
-			/* [1] */
-			0, 128,
-			/* [2] */
-			1, 129,
-			/* [3] */
-			2, 130,
-			/* [4] */
-			3, 131
-		}
-	}
-};
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 91565a627..aaa1bdbd2 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -118,7 +118,7 @@ class AnalysisResourcePublisher : public Resource
 {
 public:
                     AnalysisResourcePublisher( const AnalysisResId& rId ) : Resource( rId ) {}
-    BOOL			IsAvailableRes( const ResId& rId ) const { return Resource::IsAvailableRes( rId ); }
+    sal_Bool			IsAvailableRes( const ResId& rId ) const { return Resource::IsAvailableRes( rId ); }
     void			FreeResource() { Resource::FreeResource(); }
 };
 
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index bde1cdb8c..f35d1db5b 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1995,7 +1995,7 @@ void Complex::Sqrt( void )
 }
 
 
-inline BOOL SinOverflow( double f )
+inline sal_Bool SinOverflow( double f )
 {
     return fabs( f ) >= 134217728;
 }